From e9dc03b0b4fd5b23d0791987a517851656831ddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Sz=C3=BCcs?= <bszucs1209@gmail.com>
Date: Thu, 26 Feb 2026 21:01:38 +0100
Subject: [PATCH 001/391] i18n: update Hungarian translations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Balázs Szücs <bszucs1209@gmail.com>
---
 po/hu.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index 6a3c61894..e7474e2c4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: com.mitchellh.ghostty\n"
 "Report-Msgid-Bugs-To: m@mitchellh.com\n"
 "POT-Creation-Date: 2026-02-17 23:16+0100\n"
-"PO-Revision-Date: 2026-02-10 18:32+0200\n"
+"PO-Revision-Date: 2026-02-26 21:00+0100\n"
 "Last-Translator: Balázs Szücs <bszucs1209@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: dist/linux/ghostty_nautilus.py:53
 msgid "Open in Ghostty"
-msgstr ""
+msgstr "Megnyitás a Ghostty alkalmazásban"
 
 #: src/apprt/gtk/ui/1.0/clipboard-confirmation-dialog.blp:12
 #: src/apprt/gtk/ui/1.4/clipboard-confirmation-dialog.blp:12
@@ -179,7 +179,7 @@ msgstr "Fül"
 #: src/apprt/gtk/ui/1.2/surface.blp:325 src/apprt/gtk/ui/1.5/window.blp:224
 #: src/apprt/gtk/ui/1.5/window.blp:320
 msgid "Change Tab Title…"
-msgstr ""
+msgstr "Fül címének módosítása…"
 
 #: src/apprt/gtk/ui/1.2/surface.blp:330 src/apprt/gtk/ui/1.5/window.blp:57
 #: src/apprt/gtk/ui/1.5/window.blp:107 src/apprt/gtk/ui/1.5/window.blp:229
@@ -336,7 +336,7 @@ msgstr "Terminál címének módosítása"
 
 #: src/apprt/gtk/class/title_dialog.zig:226
 msgid "Change Tab Title"
-msgstr ""
+msgstr "Fül címének módosítása"
 
 #: src/apprt/gtk/class/window.zig:1007
 msgid "Reloaded the configuration"

From 96f8f0d93c19efec5cc349f71965a405f5c9c2a3 Mon Sep 17 00:00:00 2001
From: Jake Guthmiller <jguthmiller@gmail.com>
Date: Sat, 7 Feb 2026 20:20:49 -0600
Subject: [PATCH 002/391] gtk: add setMonitor binding and kde-output-order-v1
 protocol

Add the missing setMonitor() function to the gtk4-layer-shell Zig
bindings and provide the gdk module so it can reference gdk.Monitor.

Register the kde-output-order-v1 Wayland protocol from
plasma-wayland-protocols and generate its scanner binding. This
protocol reports the compositor's monitor priority ordering and is
needed to correctly identify the primary monitor for
quick-terminal-screen support on Linux.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 pkg/gtk4-layer-shell/src/main.zig | 5 +++++
 src/build/SharedDeps.zig          | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/pkg/gtk4-layer-shell/src/main.zig b/pkg/gtk4-layer-shell/src/main.zig
index f7848ea94..e61ce3508 100644
--- a/pkg/gtk4-layer-shell/src/main.zig
+++ b/pkg/gtk4-layer-shell/src/main.zig
@@ -3,6 +3,7 @@ const std = @import("std");
 const c = @cImport({
     @cInclude("gtk4-layer-shell.h");
 });
+const gdk = @import("gdk");
 const gtk = @import("gtk");
 
 pub const ShellLayer = enum(c_uint) {
@@ -61,6 +62,10 @@ pub fn setKeyboardMode(window: *gtk.Window, mode: KeyboardMode) void {
     c.gtk_layer_set_keyboard_mode(@ptrCast(window), @intFromEnum(mode));
 }
 
+pub fn setMonitor(window: *gtk.Window, monitor: ?*gdk.Monitor) void {
+    c.gtk_layer_set_monitor(@ptrCast(window), if (monitor) |m| @ptrCast(m) else null);
+}
+
 pub fn setNamespace(window: *gtk.Window, name: [:0]const u8) void {
     c.gtk_layer_set_namespace(@ptrCast(window), name.ptr);
 }
diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig
index 9276c9914..bd922c591 100644
--- a/src/build/SharedDeps.zig
+++ b/src/build/SharedDeps.zig
@@ -636,12 +636,16 @@ fn addGtkNg(
         scanner.addCustomProtocol(
             plasma_wayland_protocols_dep.path("src/protocols/slide.xml"),
         );
+        scanner.addCustomProtocol(
+            plasma_wayland_protocols_dep.path("src/protocols/kde-output-order-v1.xml"),
+        );
         scanner.addSystemProtocol("staging/xdg-activation/xdg-activation-v1.xml");
 
         scanner.generate("wl_compositor", 1);
         scanner.generate("org_kde_kwin_blur_manager", 1);
         scanner.generate("org_kde_kwin_server_decoration_manager", 1);
         scanner.generate("org_kde_kwin_slide_manager", 1);
+        scanner.generate("kde_output_order_v1", 1);
         scanner.generate("xdg_activation_v1", 1);
 
         step.root_module.addImport("wayland", b.createModule(.{
@@ -661,6 +665,10 @@ fn addGtkNg(
                 "gtk",
                 gobject.module("gtk4"),
             );
+            if (gobject_) |gobject| layer_shell_module.addImport(
+                "gdk",
+                gobject.module("gdk4"),
+            );
             step.root_module.addImport(
                 "gtk4-layer-shell",
                 layer_shell_module,

From 6da660a9a5eb9e57175035d23434b4c44b1b4151 Mon Sep 17 00:00:00 2001
From: Jake Guthmiller <jguthmiller@gmail.com>
Date: Sat, 7 Feb 2026 20:22:15 -0600
Subject: [PATCH 003/391] gtk: implement quick-terminal-screen for Wayland

Implement the quick-terminal-screen config option on Linux/Wayland so
users can pin the quick terminal to a specific monitor instead of
always following the mouse cursor.

Use the kde_output_order_v1 protocol to identify the compositor's
primary monitor by connector name (e.g. "DP-1"). When the protocol is
unavailable, fall back to the first monitor in the GDK list.

- Add resolveQuickTerminalMonitor() to map config values to a
  gdk.Monitor: .mouse returns null (compositor decides), .main and
  .macos-menu-bar match by connector name via the protocol
- Call layer_shell.setMonitor() in both initQuickTerminal and
  syncQuickTerminal so config reloads take effect
- Update enteredMonitor to size the window using the configured
  monitor rather than whichever monitor was entered
- Update config documentation to reflect Linux support

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/apprt/gtk/winproto/wayland.zig | 128 +++++++++++++++++++++++++++--
 src/config/Config.zig              |   8 +-
 2 files changed, 128 insertions(+), 8 deletions(-)

diff --git a/src/apprt/gtk/winproto/wayland.zig b/src/apprt/gtk/winproto/wayland.zig
index ec02fbee5..f2216bbf2 100644
--- a/src/apprt/gtk/winproto/wayland.zig
+++ b/src/apprt/gtk/winproto/wayland.zig
@@ -14,6 +14,7 @@ const input = @import("../../../input.zig");
 const ApprtWindow = @import("../class/window.zig").Window;
 
 const wl = wayland.client.wl;
+const kde = wayland.client.kde;
 const org = wayland.client.org;
 const xdg = wayland.client.xdg;
 
@@ -33,6 +34,18 @@ pub const App = struct {
 
         kde_slide_manager: ?*org.KdeKwinSlideManager = null,
 
+        kde_output_order: ?*kde.OutputOrderV1 = null,
+
+        /// Connector name of the primary output (e.g., "DP-1") as reported
+        /// by kde_output_order_v1. The first output in each priority list
+        /// is the primary.
+        primary_output_name: ?[63:0]u8 = null,
+
+        /// Tracks the output order event cycle. Set to true after a `done`
+        /// event so the next `output` event is captured as the new primary.
+        /// Initialized to true so the first event after binding is captured.
+        output_order_done: bool = true,
+
         default_deco_mode: ?org.KdeKwinServerDecorationManager.Mode = null,
 
         xdg_activation: ?*xdg.ActivationV1 = null,
@@ -83,9 +96,16 @@ pub const App = struct {
         registry.setListener(*Context, registryListener, context);
         if (display.roundtrip() != .SUCCESS) return error.RoundtripFailed;
 
-        // Do another round-trip to get the default decoration mode
+        // Set up listeners for protocols that send events on bind.
+        // All listeners must be set before the roundtrip so that
+        // events aren't lost.
         if (context.kde_decoration_manager) |deco_manager| {
             deco_manager.setListener(*Context, decoManagerListener, context);
+        }
+        if (context.kde_output_order) |output_order| {
+            output_order.setListener(*Context, outputOrderListener, context);
+        }
+        if (context.kde_decoration_manager != null or context.kde_output_order != null) {
             if (display.roundtrip() != .SUCCESS) return error.RoundtripFailed;
         }
 
@@ -127,9 +147,55 @@ pub const App = struct {
         return true;
     }
 
-    pub fn initQuickTerminal(_: *App, apprt_window: *ApprtWindow) !void {
+    pub fn initQuickTerminal(self: *App, apprt_window: *ApprtWindow) !void {
         const window = apprt_window.as(gtk.Window);
         layer_shell.initForWindow(window);
+
+        // Set target monitor based on config (null lets compositor decide)
+        const monitor = resolveQuickTerminalMonitor(self.context, apprt_window);
+        layer_shell.setMonitor(window, monitor);
+    }
+
+    /// Resolve the quick-terminal-screen config to a specific monitor.
+    /// Returns null to let the compositor decide (used for .mouse mode).
+    fn resolveQuickTerminalMonitor(
+        context: *Context,
+        apprt_window: *ApprtWindow,
+    ) ?*gdk.Monitor {
+        const config = if (apprt_window.getConfig()) |v| v.get() else return null;
+        const display = apprt_window.as(gtk.Widget).getDisplay();
+
+        return switch (config.@"quick-terminal-screen") {
+            .mouse => null,
+            .main, .@"macos-menu-bar" => blk: {
+                const monitors = display.getMonitors();
+                const primary_name: ?[]const u8 = if (context.primary_output_name) |*buf|
+                    std.mem.sliceTo(buf, 0)
+                else
+                    null;
+
+                var fallback: ?*gdk.Monitor = null;
+                var i: u32 = 0;
+                while (monitors.getObject(i)) |item| : (i += 1) {
+                    // getObject returns transfer-full; release immediately.
+                    // The display keeps its own ref so the pointer stays valid.
+                    item.unref();
+                    const monitor = gobject.ext.cast(gdk.Monitor, item) orelse continue;
+                    if (fallback == null) fallback = monitor;
+
+                    if (primary_name) |name| {
+                        const connector = std.mem.sliceTo(
+                            monitor.getConnector() orelse continue,
+                            0,
+                        );
+                        if (std.mem.eql(u8, connector, name)) {
+                            break :blk monitor;
+                        }
+                    }
+                }
+                break :blk fallback;
+            },
+        };
     }
 
     fn getInterfaceType(comptime field: std.builtin.Type.StructField) ?type {
@@ -200,10 +266,20 @@ pub const App = struct {
             .global_remove => |v| remove: {
                 inline for (ctx_fields) |field| {
                     if (getInterfaceType(field) == null) continue;
-                    const global = @field(context, field.name) orelse break :remove;
-                    if (global.getId() == v.name) {
-                        global.destroy();
-                        @field(context, field.name) = null;
+                    if (@field(context, field.name)) |global| {
+                        if (global.getId() == v.name) {
+                            global.destroy();
+                            @field(context, field.name) = null;
+
+                            // Reset cached primary-output state if the protocol
+                            // providing it disappears.
+                            if (comptime std.mem.eql(u8, field.name, "kde_output_order")) {
+                                context.primary_output_name = null;
+                                context.primary_output_match_failed_logged = false;
+                                context.output_order_done = true;
+                            }
+                            break :remove;
+                        }
                     }
                 }
             },
@@ -221,6 +297,30 @@ pub const App = struct {
             },
         }
     }
+
+    fn outputOrderListener(
+        _: *kde.OutputOrderV1,
+        event: kde.OutputOrderV1.Event,
+        context: *Context,
+    ) void {
+        switch (event) {
+            .output => |v| {
+                if (context.output_order_done) {
+                    context.output_order_done = false;
+                    const name = std.mem.sliceTo(v.output_name, 0);
+                    if (name.len <= 63) {
+                        var buf: [63:0]u8 = @splat(0);
+                        @memcpy(buf[0..name.len], name);
+                        context.primary_output_name = buf;
+                        log.debug("primary output: {s}", .{name});
+                    }
+                }
+            },
+            .done => {
+                context.output_order_done = true;
+            },
+        }
+    }
 };
 
 /// Per-window (wl_surface) state for the Wayland protocol.
@@ -417,6 +517,11 @@ pub const Window = struct {
         });
         layer_shell.setNamespace(window, config.@"gtk-quick-terminal-namespace");
 
+        // Re-resolve the target monitor on every sync so that config reloads
+        // and primary-output changes take effect without recreating the window.
+        const target_monitor = App.resolveQuickTerminalMonitor(self.app_context, self.apprt_window);
+        layer_shell.setMonitor(window, target_monitor);
+
         layer_shell.setKeyboardMode(
             window,
             switch (config.@"quick-terminal-keyboard-interactivity") {
@@ -486,8 +591,17 @@ pub const Window = struct {
         const window = apprt_window.as(gtk.Window);
         const config = if (apprt_window.getConfig()) |v| v.get() else return;
 
+        // Use the configured monitor for sizing if not in mouse mode
+        const size_monitor = switch (config.@"quick-terminal-screen") {
+            .mouse => monitor,
+            .main, .@"macos-menu-bar" => App.resolveQuickTerminalMonitor(
+                apprt_window.winproto().wayland.app_context,
+                apprt_window,
+            ) orelse monitor,
+        };
+
         var monitor_size: gdk.Rectangle = undefined;
-        monitor.getGeometry(&monitor_size);
+        size_monitor.getGeometry(&monitor_size);
 
         const dims = config.@"quick-terminal-size".calculate(
             config.@"quick-terminal-position",
diff --git a/src/config/Config.zig b/src/config/Config.zig
index bf9860c13..94d2ba8d3 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -2680,7 +2680,13 @@ keybind: Keybinds = .{},
 /// The default value is `main` because this is the recommended screen
 /// by the operating system.
 ///
-/// Only implemented on macOS.
+/// On macOS, `macos-menu-bar` uses the screen containing the menu bar.
+/// On Linux/Wayland, `macos-menu-bar` is treated as equivalent to `main`.
+///
+/// Note: On Linux, there is no universal concept of a "primary" monitor.
+/// Ghostty uses the compositor-reported primary output when available and
+/// falls back to the first monitor reported by GDK if no primary output can
+/// be resolved.
 @"quick-terminal-screen": QuickTerminalScreen = .main,
 
 /// Duration (in seconds) of the quick terminal enter and exit animation.

From 630c2dff190af14b7915f3e0d4df639e95c4f21b Mon Sep 17 00:00:00 2001
From: Jake Guthmiller <jguthmiller@gmail.com>
Date: Sat, 7 Feb 2026 21:03:29 -0600
Subject: [PATCH 004/391] gtk: fix monitor ref ownership in Wayland quick
 terminal

Handle g_list_model_get_object transfer-full semantics in resolveQuickTerminalMonitor by retaining exactly one monitor reference to return and unreffing the rest.

Update init/sync/sizing call sites to unref the resolved monitor after setMonitor/getGeometry so monitor lifetimes are explicit and consistent.

Co-authored-by: chatgpt-codex-connector[bot] <199175422+chatgpt-codex-connector[bot]@users.noreply.github.com>
---
 src/apprt/gtk/winproto/wayland.zig | 64 +++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 15 deletions(-)

diff --git a/src/apprt/gtk/winproto/wayland.zig b/src/apprt/gtk/winproto/wayland.zig
index f2216bbf2..9ce89146f 100644
--- a/src/apprt/gtk/winproto/wayland.zig
+++ b/src/apprt/gtk/winproto/wayland.zig
@@ -41,6 +41,10 @@ pub const App = struct {
         /// is the primary.
         primary_output_name: ?[63:0]u8 = null,
 
+        /// Used to avoid repeatedly logging the same primary-name mismatch
+        /// when we can't map the compositor connector name to a GDK monitor.
+        primary_output_match_failed_logged: bool = false,
+
         /// Tracks the output order event cycle. Set to true after a `done`
         /// event so the next `output` event is captured as the new primary.
         /// Initialized to true so the first event after binding is captured.
@@ -153,6 +157,7 @@ pub const App = struct {
 
         // Set target monitor based on config (null lets compositor decide)
         const monitor = resolveQuickTerminalMonitor(self.context, apprt_window);
+        defer if (monitor) |v| v.unref();
         layer_shell.setMonitor(window, monitor);
     }
 
@@ -174,25 +179,44 @@ pub const App = struct {
                 else
                     null;
 
+                // We own a strong ref for every object returned by getObject.
+                // Keep one ref as a fallback to return, and release all others.
                 var fallback: ?*gdk.Monitor = null;
+                var matched_primary = false;
                 var i: u32 = 0;
                 while (monitors.getObject(i)) |item| : (i += 1) {
-                    // getObject returns transfer-full; release immediately.
-                    // The display keeps its own ref so the pointer stays valid.
-                    item.unref();
-                    const monitor = gobject.ext.cast(gdk.Monitor, item) orelse continue;
-                    if (fallback == null) fallback = monitor;
+                    const monitor = gobject.ext.cast(gdk.Monitor, item) orelse {
+                        item.unref();
+                        continue;
+                    };
+                    const keep_as_fallback = fallback == null;
+                    if (keep_as_fallback) fallback = monitor;
 
                     if (primary_name) |name| {
-                        const connector = std.mem.sliceTo(
-                            monitor.getConnector() orelse continue,
-                            0,
-                        );
-                        if (std.mem.eql(u8, connector, name)) {
-                            break :blk monitor;
+                        if (monitor.getConnector()) |connector_z| {
+                            const connector = std.mem.sliceTo(connector_z, 0);
+                            if (std.mem.eql(u8, connector, name)) {
+                                matched_primary = true;
+                                context.primary_output_match_failed_logged = false;
+                                if (fallback) |v| {
+                                    if (v != monitor) v.unref();
+                                }
+                                break :blk monitor;
+                            }
                         }
                     }
+
+                    if (!keep_as_fallback) monitor.unref();
                 }
+
+                if (primary_name != null and !matched_primary and !context.primary_output_match_failed_logged) {
+                    context.primary_output_match_failed_logged = true;
+                    log.debug(
+                        "could not match primary output connector to a GDK monitor; falling back to first monitor",
+                        .{},
+                    );
+                }
+
                 break :blk fallback;
             },
         };
@@ -312,7 +336,13 @@ pub const App = struct {
                         var buf: [63:0]u8 = @splat(0);
                         @memcpy(buf[0..name.len], name);
                         context.primary_output_name = buf;
+                        context.primary_output_match_failed_logged = false;
                         log.debug("primary output: {s}", .{name});
+                    } else {
+                        log.warn(
+                            "ignoring primary output name longer than 63 bytes from kde_output_order_v1",
+                            .{},
+                        );
                     }
                 }
             },
@@ -520,6 +550,7 @@ pub const Window = struct {
         // Re-resolve the target monitor on every sync so that config reloads
         // and primary-output changes take effect without recreating the window.
         const target_monitor = App.resolveQuickTerminalMonitor(self.app_context, self.apprt_window);
+        defer if (target_monitor) |v| v.unref();
         layer_shell.setMonitor(window, target_monitor);
 
         layer_shell.setKeyboardMode(
@@ -591,14 +622,17 @@ pub const Window = struct {
         const window = apprt_window.as(gtk.Window);
         const config = if (apprt_window.getConfig()) |v| v.get() else return;
 
-        // Use the configured monitor for sizing if not in mouse mode
-        const size_monitor = switch (config.@"quick-terminal-screen") {
-            .mouse => monitor,
+        const resolved_monitor = switch (config.@"quick-terminal-screen") {
+            .mouse => null,
             .main, .@"macos-menu-bar" => App.resolveQuickTerminalMonitor(
                 apprt_window.winproto().wayland.app_context,
                 apprt_window,
-            ) orelse monitor,
+            ),
         };
+        defer if (resolved_monitor) |v| v.unref();
+
+        // Use the configured monitor for sizing if not in mouse mode.
+        const size_monitor = resolved_monitor orelse monitor;
 
         var monitor_size: gdk.Rectangle = undefined;
         size_monitor.getGeometry(&monitor_size);

From e25d8a6f2f4a1d384866ab222f920f351b8905da Mon Sep 17 00:00:00 2001
From: Jake Guthmiller <jguthmiller@gmail.com>
Date: Fri, 13 Feb 2026 21:26:34 -0600
Subject: [PATCH 005/391] gtk: harden quick-terminal output-order state
 handling

Install Wayland protocol listeners at bind time so late-added globals
still receive events and listener setup stays tied to object lifetime.

Track whether kde_output_order_v1 emitted any outputs in a cycle and
clear cached primary-output state on empty or invalid updates. Also
reset this cycle tracking when the protocol global is removed to avoid
stale monitor selection.
---
 src/apprt/gtk/winproto/wayland.zig | 62 ++++++++++++++++++++++++------
 1 file changed, 51 insertions(+), 11 deletions(-)

diff --git a/src/apprt/gtk/winproto/wayland.zig b/src/apprt/gtk/winproto/wayland.zig
index 9ce89146f..52ac92831 100644
--- a/src/apprt/gtk/winproto/wayland.zig
+++ b/src/apprt/gtk/winproto/wayland.zig
@@ -50,6 +50,10 @@ pub const App = struct {
         /// Initialized to true so the first event after binding is captured.
         output_order_done: bool = true,
 
+        /// True if we've received an `output` event in the current cycle.
+        /// This lets us detect empty cycles and clear stale cached state.
+        output_order_seen_output: bool = false,
+
         default_deco_mode: ?org.KdeKwinServerDecorationManager.Mode = null,
 
         xdg_activation: ?*xdg.ActivationV1 = null,
@@ -100,15 +104,9 @@ pub const App = struct {
         registry.setListener(*Context, registryListener, context);
         if (display.roundtrip() != .SUCCESS) return error.RoundtripFailed;
 
-        // Set up listeners for protocols that send events on bind.
-        // All listeners must be set before the roundtrip so that
-        // events aren't lost.
-        if (context.kde_decoration_manager) |deco_manager| {
-            deco_manager.setListener(*Context, decoManagerListener, context);
-        }
-        if (context.kde_output_order) |output_order| {
-            output_order.setListener(*Context, outputOrderListener, context);
-        }
+        // Do another roundtrip to process events emitted by globals we bound
+        // during registry discovery (e.g. default decoration mode, output
+        // order). Listeners are installed at bind time in registryListener.
         if (context.kde_decoration_manager != null or context.kde_output_order != null) {
             if (display.roundtrip() != .SUCCESS) return error.RoundtripFailed;
         }
@@ -269,7 +267,15 @@ pub const App = struct {
                     ) == .eq) {
                         log.debug("matched {}", .{T});
 
-                        @field(context, field.name) = registry.bind(
+                        if (@field(context, field.name) != null) {
+                            log.warn(
+                                "duplicate global for {s}; keeping existing binding",
+                                .{v.interface},
+                            );
+                            break;
+                        }
+
+                        const global = registry.bind(
                             v.name,
                             T,
                             T.generated_version,
@@ -280,6 +286,22 @@ pub const App = struct {
                             );
                             return;
                         };
+                        @field(context, field.name) = global;
+
+                        // Install listeners immediately at bind time. This
+                        // keeps listener setup and object lifetime in one
+                        // place and also supports globals that appear later.
+                        if (comptime std.mem.eql(u8, field.name, "kde_decoration_manager")) {
+                            const deco_manager: *org.KdeKwinServerDecorationManager =
+                                @field(context, field.name).?;
+                            deco_manager.setListener(*Context, decoManagerListener, context);
+                        }
+                        if (comptime std.mem.eql(u8, field.name, "kde_output_order")) {
+                            const output_order: *kde.OutputOrderV1 =
+                                @field(context, field.name).?;
+                            output_order.setListener(*Context, outputOrderListener, context);
+                        }
+                        break;
                     }
                 }
             },
@@ -301,6 +323,7 @@ pub const App = struct {
                                 context.primary_output_name = null;
                                 context.primary_output_match_failed_logged = false;
                                 context.output_order_done = true;
+                                context.output_order_seen_output = false;
                             }
                             break :remove;
                         }
@@ -331,14 +354,24 @@ pub const App = struct {
             .output => |v| {
                 if (context.output_order_done) {
                     context.output_order_done = false;
+                    context.output_order_seen_output = true;
                     const name = std.mem.sliceTo(v.output_name, 0);
-                    if (name.len <= 63) {
+                    if (name.len == 0) {
+                        context.primary_output_name = null;
+                        context.primary_output_match_failed_logged = false;
+                        log.warn(
+                            "ignoring empty primary output name from kde_output_order_v1",
+                            .{},
+                        );
+                    } else if (name.len <= 63) {
                         var buf: [63:0]u8 = @splat(0);
                         @memcpy(buf[0..name.len], name);
                         context.primary_output_name = buf;
                         context.primary_output_match_failed_logged = false;
                         log.debug("primary output: {s}", .{name});
                     } else {
+                        context.primary_output_name = null;
+                        context.primary_output_match_failed_logged = false;
                         log.warn(
                             "ignoring primary output name longer than 63 bytes from kde_output_order_v1",
                             .{},
@@ -347,7 +380,14 @@ pub const App = struct {
                 }
             },
             .done => {
+                // An empty update means the compositor currently reports no
+                // outputs in priority order, so drop any stale cached primary.
+                if (!context.output_order_seen_output) {
+                    context.primary_output_name = null;
+                    context.primary_output_match_failed_logged = false;
+                }
                 context.output_order_done = true;
+                context.output_order_seen_output = false;
             },
         }
     }

From 34473b069bd74a729d001e3f71df3b03e890a739 Mon Sep 17 00:00:00 2001
From: Jake Guthmiller <jguthmiller@gmail.com>
Date: Fri, 13 Feb 2026 21:32:12 -0600
Subject: [PATCH 006/391] gtk: simplify quick-terminal monitor resolution and
 state management

Restructure resolveQuickTerminalMonitor into a two-phase approach
(match by name, then fall back to first monitor) to eliminate the
interleaved fallback/match ref tracking. Remove redundant switch in
enteredMonitor that duplicated the .mouse handling already in
resolveQuickTerminalMonitor. Hoist the primary_output_match_failed_logged
reset above the name-length branches in outputOrderListener.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/apprt/gtk/winproto/wayland.zig | 81 ++++++++++++------------------
 1 file changed, 31 insertions(+), 50 deletions(-)

diff --git a/src/apprt/gtk/winproto/wayland.zig b/src/apprt/gtk/winproto/wayland.zig
index 52ac92831..2624cd721 100644
--- a/src/apprt/gtk/winproto/wayland.zig
+++ b/src/apprt/gtk/winproto/wayland.zig
@@ -161,6 +161,7 @@ pub const App = struct {
 
     /// Resolve the quick-terminal-screen config to a specific monitor.
     /// Returns null to let the compositor decide (used for .mouse mode).
+    /// Caller owns the returned ref and must unref it.
     fn resolveQuickTerminalMonitor(
         context: *Context,
         apprt_window: *ApprtWindow,
@@ -172,50 +173,41 @@ pub const App = struct {
             .mouse => null,
             .main, .@"macos-menu-bar" => blk: {
                 const monitors = display.getMonitors();
-                const primary_name: ?[]const u8 = if (context.primary_output_name) |*buf|
-                    std.mem.sliceTo(buf, 0)
-                else
-                    null;
 
-                // We own a strong ref for every object returned by getObject.
-                // Keep one ref as a fallback to return, and release all others.
-                var fallback: ?*gdk.Monitor = null;
-                var matched_primary = false;
-                var i: u32 = 0;
-                while (monitors.getObject(i)) |item| : (i += 1) {
-                    const monitor = gobject.ext.cast(gdk.Monitor, item) orelse {
-                        item.unref();
-                        continue;
-                    };
-                    const keep_as_fallback = fallback == null;
-                    if (keep_as_fallback) fallback = monitor;
-
-                    if (primary_name) |name| {
+                // Try to find the monitor matching the primary output name.
+                if (context.primary_output_name) |*stored_name| {
+                    const name = std.mem.sliceTo(stored_name, 0);
+                    var i: u32 = 0;
+                    while (monitors.getObject(i)) |item| : (i += 1) {
+                        const monitor = gobject.ext.cast(gdk.Monitor, item) orelse {
+                            item.unref();
+                            continue;
+                        };
                         if (monitor.getConnector()) |connector_z| {
                             const connector = std.mem.sliceTo(connector_z, 0);
                             if (std.mem.eql(u8, connector, name)) {
-                                matched_primary = true;
                                 context.primary_output_match_failed_logged = false;
-                                if (fallback) |v| {
-                                    if (v != monitor) v.unref();
-                                }
                                 break :blk monitor;
                             }
                         }
+                        monitor.unref();
                     }
 
-                    if (!keep_as_fallback) monitor.unref();
+                    if (!context.primary_output_match_failed_logged) {
+                        context.primary_output_match_failed_logged = true;
+                        log.debug(
+                            "could not match primary output connector to a GDK monitor; falling back to first monitor",
+                            .{},
+                        );
+                    }
                 }
 
-                if (primary_name != null and !matched_primary and !context.primary_output_match_failed_logged) {
-                    context.primary_output_match_failed_logged = true;
-                    log.debug(
-                        "could not match primary output connector to a GDK monitor; falling back to first monitor",
-                        .{},
-                    );
-                }
-
-                break :blk fallback;
+                // Fall back to the first monitor in the list.
+                const first = monitors.getObject(0) orelse break :blk null;
+                break :blk gobject.ext.cast(gdk.Monitor, first) orelse {
+                    first.unref();
+                    break :blk null;
+                };
             },
         };
     }
@@ -355,27 +347,19 @@ pub const App = struct {
                 if (context.output_order_done) {
                     context.output_order_done = false;
                     context.output_order_seen_output = true;
+                    context.primary_output_match_failed_logged = false;
                     const name = std.mem.sliceTo(v.output_name, 0);
                     if (name.len == 0) {
                         context.primary_output_name = null;
-                        context.primary_output_match_failed_logged = false;
-                        log.warn(
-                            "ignoring empty primary output name from kde_output_order_v1",
-                            .{},
-                        );
+                        log.warn("ignoring empty primary output name from kde_output_order_v1", .{});
                     } else if (name.len <= 63) {
                         var buf: [63:0]u8 = @splat(0);
                         @memcpy(buf[0..name.len], name);
                         context.primary_output_name = buf;
-                        context.primary_output_match_failed_logged = false;
                         log.debug("primary output: {s}", .{name});
                     } else {
                         context.primary_output_name = null;
-                        context.primary_output_match_failed_logged = false;
-                        log.warn(
-                            "ignoring primary output name longer than 63 bytes from kde_output_order_v1",
-                            .{},
-                        );
+                        log.warn("ignoring primary output name longer than 63 bytes from kde_output_order_v1", .{});
                     }
                 }
             },
@@ -662,13 +646,10 @@ pub const Window = struct {
         const window = apprt_window.as(gtk.Window);
         const config = if (apprt_window.getConfig()) |v| v.get() else return;
 
-        const resolved_monitor = switch (config.@"quick-terminal-screen") {
-            .mouse => null,
-            .main, .@"macos-menu-bar" => App.resolveQuickTerminalMonitor(
-                apprt_window.winproto().wayland.app_context,
-                apprt_window,
-            ),
-        };
+        const resolved_monitor = App.resolveQuickTerminalMonitor(
+            apprt_window.winproto().wayland.app_context,
+            apprt_window,
+        );
         defer if (resolved_monitor) |v| v.unref();
 
         // Use the configured monitor for sizing if not in mouse mode.

From 19feaa058b333a559697fa21f7d600db0f2386fc Mon Sep 17 00:00:00 2001
From: Jake Guthmiller <jguthmiller@gmail.com>
Date: Sun, 1 Mar 2026 15:21:03 -0600
Subject: [PATCH 007/391] gtk: improve readability of Wayland quick-terminal
 monitor code

Flatten resolveQuickTerminalMonitor by replacing the labeled-block
switch with early returns, extract max_output_name_len constant, and
reduce nesting in the output-order event handler.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/apprt/gtk/winproto/wayland.zig | 114 +++++++++++++++--------------
 1 file changed, 59 insertions(+), 55 deletions(-)

diff --git a/src/apprt/gtk/winproto/wayland.zig b/src/apprt/gtk/winproto/wayland.zig
index 2624cd721..206221e26 100644
--- a/src/apprt/gtk/winproto/wayland.zig
+++ b/src/apprt/gtk/winproto/wayland.zig
@@ -26,6 +26,8 @@ pub const App = struct {
     context: *Context,
 
     const Context = struct {
+        const max_output_name_len = 63;
+
         kde_blur_manager: ?*org.KdeKwinBlurManager = null,
 
         // FIXME: replace with `zxdg_decoration_v1` once GTK merges
@@ -39,7 +41,7 @@ pub const App = struct {
         /// Connector name of the primary output (e.g., "DP-1") as reported
         /// by kde_output_order_v1. The first output in each priority list
         /// is the primary.
-        primary_output_name: ?[63:0]u8 = null,
+        primary_output_name: ?[max_output_name_len:0]u8 = null,
 
         /// Used to avoid repeatedly logging the same primary-name mismatch
         /// when we can't map the compositor connector name to a GDK monitor.
@@ -167,48 +169,48 @@ pub const App = struct {
         apprt_window: *ApprtWindow,
     ) ?*gdk.Monitor {
         const config = if (apprt_window.getConfig()) |v| v.get() else return null;
+
+        switch (config.@"quick-terminal-screen") {
+            .mouse => return null,
+            .main, .@"macos-menu-bar" => {},
+        }
+
         const display = apprt_window.as(gtk.Widget).getDisplay();
+        const monitors = display.getMonitors();
 
-        return switch (config.@"quick-terminal-screen") {
-            .mouse => null,
-            .main, .@"macos-menu-bar" => blk: {
-                const monitors = display.getMonitors();
-
-                // Try to find the monitor matching the primary output name.
-                if (context.primary_output_name) |*stored_name| {
-                    const name = std.mem.sliceTo(stored_name, 0);
-                    var i: u32 = 0;
-                    while (monitors.getObject(i)) |item| : (i += 1) {
-                        const monitor = gobject.ext.cast(gdk.Monitor, item) orelse {
-                            item.unref();
-                            continue;
-                        };
-                        if (monitor.getConnector()) |connector_z| {
-                            const connector = std.mem.sliceTo(connector_z, 0);
-                            if (std.mem.eql(u8, connector, name)) {
-                                context.primary_output_match_failed_logged = false;
-                                break :blk monitor;
-                            }
-                        }
-                        monitor.unref();
-                    }
-
-                    if (!context.primary_output_match_failed_logged) {
-                        context.primary_output_match_failed_logged = true;
-                        log.debug(
-                            "could not match primary output connector to a GDK monitor; falling back to first monitor",
-                            .{},
-                        );
+        // Try to find the monitor matching the primary output name.
+        if (context.primary_output_name) |*stored_name| {
+            const name = std.mem.sliceTo(stored_name, 0);
+            var i: u32 = 0;
+            while (monitors.getObject(i)) |item| : (i += 1) {
+                const monitor = gobject.ext.cast(gdk.Monitor, item) orelse {
+                    item.unref();
+                    continue;
+                };
+                if (monitor.getConnector()) |connector_z| {
+                    const connector = std.mem.sliceTo(connector_z, 0);
+                    if (std.mem.eql(u8, connector, name)) {
+                        context.primary_output_match_failed_logged = false;
+                        return monitor;
                     }
                 }
+                monitor.unref();
+            }
 
-                // Fall back to the first monitor in the list.
-                const first = monitors.getObject(0) orelse break :blk null;
-                break :blk gobject.ext.cast(gdk.Monitor, first) orelse {
-                    first.unref();
-                    break :blk null;
-                };
-            },
+            if (!context.primary_output_match_failed_logged) {
+                context.primary_output_match_failed_logged = true;
+                log.debug(
+                    "could not match primary output connector to a GDK monitor; falling back to first monitor",
+                    .{},
+                );
+            }
+        }
+
+        // Fall back to the first monitor in the list.
+        const first = monitors.getObject(0) orelse return null;
+        return gobject.ext.cast(gdk.Monitor, first) orelse {
+            first.unref();
+            return null;
         };
     }
 
@@ -344,23 +346,25 @@ pub const App = struct {
     ) void {
         switch (event) {
             .output => |v| {
-                if (context.output_order_done) {
-                    context.output_order_done = false;
-                    context.output_order_seen_output = true;
-                    context.primary_output_match_failed_logged = false;
-                    const name = std.mem.sliceTo(v.output_name, 0);
-                    if (name.len == 0) {
-                        context.primary_output_name = null;
-                        log.warn("ignoring empty primary output name from kde_output_order_v1", .{});
-                    } else if (name.len <= 63) {
-                        var buf: [63:0]u8 = @splat(0);
-                        @memcpy(buf[0..name.len], name);
-                        context.primary_output_name = buf;
-                        log.debug("primary output: {s}", .{name});
-                    } else {
-                        context.primary_output_name = null;
-                        log.warn("ignoring primary output name longer than 63 bytes from kde_output_order_v1", .{});
-                    }
+                // Only the first output event after a `done` is the new primary.
+                if (!context.output_order_done) return;
+                context.output_order_done = false;
+                context.output_order_seen_output = true;
+                // A new primary invalidates any cached match-failure state.
+                context.primary_output_match_failed_logged = false;
+
+                const name = std.mem.sliceTo(v.output_name, 0);
+                if (name.len == 0) {
+                    context.primary_output_name = null;
+                    log.warn("ignoring empty primary output name from kde_output_order_v1", .{});
+                } else if (name.len <= Context.max_output_name_len) {
+                    var buf: [Context.max_output_name_len:0]u8 = @splat(0);
+                    @memcpy(buf[0..name.len], name);
+                    context.primary_output_name = buf;
+                    log.debug("primary output: {s}", .{name});
+                } else {
+                    context.primary_output_name = null;
+                    log.warn("ignoring primary output name longer than {} bytes from kde_output_order_v1", .{Context.max_output_name_len});
                 }
             },
             .done => {

From c9822535436c60587d136129a7c5beb44829d81b Mon Sep 17 00:00:00 2001
From: Jake Guthmiller <jguthmiller@gmail.com>
Date: Sun, 1 Mar 2026 16:12:19 -0600
Subject: [PATCH 008/391] gtk: handle replacement Wayland globals before remove

Track registry global names for kde decoration manager and kde_output_order bindings so we can distinguish same-global duplicates from valid replacements announced before global_remove.

On global_remove, match and clear these bindings by registry global name to avoid dropping a replacement when the old global is removed.
---
 src/apprt/gtk/winproto/wayland.zig | 107 +++++++++++++++++++++--------
 1 file changed, 77 insertions(+), 30 deletions(-)

diff --git a/src/apprt/gtk/winproto/wayland.zig b/src/apprt/gtk/winproto/wayland.zig
index 206221e26..3dcbd89da 100644
--- a/src/apprt/gtk/winproto/wayland.zig
+++ b/src/apprt/gtk/winproto/wayland.zig
@@ -33,10 +33,12 @@ pub const App = struct {
         // FIXME: replace with `zxdg_decoration_v1` once GTK merges
         // https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6398
         kde_decoration_manager: ?*org.KdeKwinServerDecorationManager = null,
+        kde_decoration_manager_global_name: ?u32 = null,
 
         kde_slide_manager: ?*org.KdeKwinSlideManager = null,
 
         kde_output_order: ?*kde.OutputOrderV1 = null,
+        kde_output_order_global_name: ?u32 = null,
 
         /// Connector name of the primary output (e.g., "DP-1") as reported
         /// by kde_output_order_v1. The first output in each priority list
@@ -229,6 +231,18 @@ pub const App = struct {
         return T;
     }
 
+    /// Returns the Context field that stores the registry global name for
+    /// protocols that support replacement, or null for simple protocols.
+    fn getGlobalNameField(comptime field_name: []const u8) ?[]const u8 {
+        if (std.mem.eql(u8, field_name, "kde_decoration_manager")) {
+            return "kde_decoration_manager_global_name";
+        }
+        if (std.mem.eql(u8, field_name, "kde_output_order")) {
+            return "kde_output_order_global_name";
+        }
+        return null;
+    }
+
     fn registryListener(
         registry: *wl.Registry,
         event: wl.Registry.Event,
@@ -253,20 +267,34 @@ pub const App = struct {
 
                 inline for (ctx_fields) |field| {
                     const T = getInterfaceType(field) orelse continue;
-
-                    if (std.mem.orderZ(
-                        u8,
-                        v.interface,
-                        T.interface.name,
-                    ) == .eq) {
+                    if (std.mem.orderZ(u8, v.interface, T.interface.name) == .eq) {
                         log.debug("matched {}", .{T});
 
-                        if (@field(context, field.name) != null) {
-                            log.warn(
-                                "duplicate global for {s}; keeping existing binding",
-                                .{v.interface},
-                            );
-                            break;
+                        const existing_global = @field(context, field.name);
+                        const global_name_field = comptime getGlobalNameField(field.name);
+                        const existing_global_name: ?u32 = if (global_name_field) |name_field|
+                            @field(context, name_field)
+                        else
+                            null;
+
+                        // Already bound: skip duplicate, allow replacement for
+                        // protocols tracked by registry global name.
+                        if (existing_global != null) {
+                            if (global_name_field != null) {
+                                if (existing_global_name != null and existing_global_name.? == v.name) {
+                                    log.debug(
+                                        "duplicate global for {s} with name={}; keeping existing binding",
+                                        .{ v.interface, v.name },
+                                    );
+                                    break;
+                                }
+                            } else {
+                                log.warn(
+                                    "duplicate global for {s}; keeping existing binding",
+                                    .{v.interface},
+                                );
+                                break;
+                            }
                         }
 
                         const global = registry.bind(
@@ -280,20 +308,28 @@ pub const App = struct {
                             );
                             return;
                         };
+
+                        if (existing_global) |old| {
+                            log.debug(
+                                "replacement global for {s}; switching old_name={} to new_name={}",
+                                .{ v.interface, existing_global_name orelse 0, v.name },
+                            );
+                            old.destroy();
+                        }
+
                         @field(context, field.name) = global;
+                        if (global_name_field) |name_field| {
+                            @field(context, name_field) = v.name;
+                        }
 
                         // Install listeners immediately at bind time. This
                         // keeps listener setup and object lifetime in one
                         // place and also supports globals that appear later.
                         if (comptime std.mem.eql(u8, field.name, "kde_decoration_manager")) {
-                            const deco_manager: *org.KdeKwinServerDecorationManager =
-                                @field(context, field.name).?;
-                            deco_manager.setListener(*Context, decoManagerListener, context);
+                            global.setListener(*Context, decoManagerListener, context);
                         }
                         if (comptime std.mem.eql(u8, field.name, "kde_output_order")) {
-                            const output_order: *kde.OutputOrderV1 =
-                                @field(context, field.name).?;
-                            output_order.setListener(*Context, outputOrderListener, context);
+                            global.setListener(*Context, outputOrderListener, context);
                         }
                         break;
                     }
@@ -306,20 +342,31 @@ pub const App = struct {
             .global_remove => |v| remove: {
                 inline for (ctx_fields) |field| {
                     if (getInterfaceType(field) == null) continue;
-                    if (@field(context, field.name)) |global| {
-                        if (global.getId() == v.name) {
-                            global.destroy();
-                            @field(context, field.name) = null;
 
-                            // Reset cached primary-output state if the protocol
-                            // providing it disappears.
-                            if (comptime std.mem.eql(u8, field.name, "kde_output_order")) {
-                                context.primary_output_name = null;
-                                context.primary_output_match_failed_logged = false;
-                                context.output_order_done = true;
-                                context.output_order_seen_output = false;
+                    const global_name_field = comptime getGlobalNameField(field.name);
+                    if (global_name_field) |name_field| {
+                        if (@field(context, name_field)) |stored_name| {
+                            if (stored_name == v.name) {
+                                if (@field(context, field.name)) |global| global.destroy();
+                                @field(context, field.name) = null;
+                                @field(context, name_field) = null;
+
+                                if (comptime std.mem.eql(u8, field.name, "kde_output_order")) {
+                                    context.primary_output_name = null;
+                                    context.primary_output_match_failed_logged = false;
+                                    context.output_order_done = true;
+                                    context.output_order_seen_output = false;
+                                }
+                                break :remove;
+                            }
+                        }
+                    } else {
+                        if (@field(context, field.name)) |global| {
+                            if (global.getId() == v.name) {
+                                global.destroy();
+                                @field(context, field.name) = null;
+                                break :remove;
                             }
-                            break :remove;
                         }
                     }
                 }

From 18fa161222916c537fb5e71e6d7bbe2479805fb1 Mon Sep 17 00:00:00 2001
From: Jake Guthmiller <jguthmiller@gmail.com>
Date: Sun, 1 Mar 2026 17:50:57 -0600
Subject: [PATCH 009/391] gtk: simplify Wayland output-order state handling

---
 src/apprt/gtk/winproto/wayland.zig | 34 +++++++++++++++++-------------
 src/build/SharedDeps.zig           | 12 ++++-------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/apprt/gtk/winproto/wayland.zig b/src/apprt/gtk/winproto/wayland.zig
index 3dcbd89da..158774149 100644
--- a/src/apprt/gtk/winproto/wayland.zig
+++ b/src/apprt/gtk/winproto/wayland.zig
@@ -54,10 +54,6 @@ pub const App = struct {
         /// Initialized to true so the first event after binding is captured.
         output_order_done: bool = true,
 
-        /// True if we've received an `output` event in the current cycle.
-        /// This lets us detect empty cycles and clear stale cached state.
-        output_order_seen_output: bool = false,
-
         default_deco_mode: ?org.KdeKwinServerDecorationManager.Mode = null,
 
         xdg_activation: ?*xdg.ActivationV1 = null,
@@ -243,6 +239,13 @@ pub const App = struct {
         return null;
     }
 
+    /// Reset cached state derived from kde_output_order_v1.
+    fn resetOutputOrderState(context: *Context) void {
+        context.primary_output_name = null;
+        context.primary_output_match_failed_logged = false;
+        context.output_order_done = true;
+    }
+
     fn registryListener(
         registry: *wl.Registry,
         event: wl.Registry.Event,
@@ -315,6 +318,12 @@ pub const App = struct {
                                 .{ v.interface, existing_global_name orelse 0, v.name },
                             );
                             old.destroy();
+
+                            if (comptime std.mem.eql(u8, field.name, "kde_output_order")) {
+                                // Replacement means the previous primary may be stale
+                                // until the new object sends a fresh cycle.
+                                resetOutputOrderState(context);
+                            }
                         }
 
                         @field(context, field.name) = global;
@@ -352,10 +361,7 @@ pub const App = struct {
                                 @field(context, name_field) = null;
 
                                 if (comptime std.mem.eql(u8, field.name, "kde_output_order")) {
-                                    context.primary_output_name = null;
-                                    context.primary_output_match_failed_logged = false;
-                                    context.output_order_done = true;
-                                    context.output_order_seen_output = false;
+                                    resetOutputOrderState(context);
                                 }
                                 break :remove;
                             }
@@ -396,7 +402,6 @@ pub const App = struct {
                 // Only the first output event after a `done` is the new primary.
                 if (!context.output_order_done) return;
                 context.output_order_done = false;
-                context.output_order_seen_output = true;
                 // A new primary invalidates any cached match-failure state.
                 context.primary_output_match_failed_logged = false;
 
@@ -415,14 +420,13 @@ pub const App = struct {
                 }
             },
             .done => {
-                // An empty update means the compositor currently reports no
-                // outputs in priority order, so drop any stale cached primary.
-                if (!context.output_order_seen_output) {
-                    context.primary_output_name = null;
-                    context.primary_output_match_failed_logged = false;
+                if (context.output_order_done) {
+                    // No output arrived since the previous done. Treat this as
+                    // an empty update and drop any stale cached primary.
+                    resetOutputOrderState(context);
+                    return;
                 }
                 context.output_order_done = true;
-                context.output_order_seen_output = false;
             },
         }
     }
diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig
index bd922c591..4b1ea936d 100644
--- a/src/build/SharedDeps.zig
+++ b/src/build/SharedDeps.zig
@@ -661,14 +661,10 @@ fn addGtkNg(
             .optimize = optimize,
         })) |gtk4_layer_shell| {
             const layer_shell_module = gtk4_layer_shell.module("gtk4-layer-shell");
-            if (gobject_) |gobject| layer_shell_module.addImport(
-                "gtk",
-                gobject.module("gtk4"),
-            );
-            if (gobject_) |gobject| layer_shell_module.addImport(
-                "gdk",
-                gobject.module("gdk4"),
-            );
+            if (gobject_) |gobject| {
+                layer_shell_module.addImport("gtk", gobject.module("gtk4"));
+                layer_shell_module.addImport("gdk", gobject.module("gdk4"));
+            }
             step.root_module.addImport(
                 "gtk4-layer-shell",
                 layer_shell_module,

From beeb810c04d0b7c93cd74d215dd194eb03759cdb Mon Sep 17 00:00:00 2001
From: Jake Guthmiller <jguthmiller@gmail.com>
Date: Mon, 2 Mar 2026 23:33:19 -0600
Subject: [PATCH 010/391] gtk: address PR review feedback for
 quick-terminal-screen

---
 pkg/gtk4-layer-shell/src/main.zig  | 2 +-
 src/apprt/gtk/winproto/wayland.zig | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkg/gtk4-layer-shell/src/main.zig b/pkg/gtk4-layer-shell/src/main.zig
index e61ce3508..a15313231 100644
--- a/pkg/gtk4-layer-shell/src/main.zig
+++ b/pkg/gtk4-layer-shell/src/main.zig
@@ -63,7 +63,7 @@ pub fn setKeyboardMode(window: *gtk.Window, mode: KeyboardMode) void {
 }
 
 pub fn setMonitor(window: *gtk.Window, monitor: ?*gdk.Monitor) void {
-    c.gtk_layer_set_monitor(@ptrCast(window), if (monitor) |m| @ptrCast(m) else null);
+    c.gtk_layer_set_monitor(@ptrCast(window), @ptrCast(monitor));
 }
 
 pub fn setNamespace(window: *gtk.Window, name: [:0]const u8) void {
diff --git a/src/apprt/gtk/winproto/wayland.zig b/src/apprt/gtk/winproto/wayland.zig
index 158774149..d2b0b33db 100644
--- a/src/apprt/gtk/winproto/wayland.zig
+++ b/src/apprt/gtk/winproto/wayland.zig
@@ -178,7 +178,6 @@ pub const App = struct {
 
         // Try to find the monitor matching the primary output name.
         if (context.primary_output_name) |*stored_name| {
-            const name = std.mem.sliceTo(stored_name, 0);
             var i: u32 = 0;
             while (monitors.getObject(i)) |item| : (i += 1) {
                 const monitor = gobject.ext.cast(gdk.Monitor, item) orelse {
@@ -186,8 +185,7 @@ pub const App = struct {
                     continue;
                 };
                 if (monitor.getConnector()) |connector_z| {
-                    const connector = std.mem.sliceTo(connector_z, 0);
-                    if (std.mem.eql(u8, connector, name)) {
+                    if (std.mem.orderZ(u8, connector_z, stored_name) == .eq) {
                         context.primary_output_match_failed_logged = false;
                         return monitor;
                     }
@@ -282,6 +280,11 @@ pub const App = struct {
 
                         // Already bound: skip duplicate, allow replacement for
                         // protocols tracked by registry global name.
+                        // Compositors may re-advertise globals at runtime
+                        // (e.g. when a display server component restarts).
+                        // For protocols with a stored global name we detect
+                        // replacement (different name) vs harmless duplicate
+                        // (same name); simple protocols just keep the first.
                         if (existing_global != null) {
                             if (global_name_field != null) {
                                 if (existing_global_name != null and existing_global_name.? == v.name) {

From 2fe55152ca6fe74219f129ee6339b265a41d0252 Mon Sep 17 00:00:00 2001
From: Anh Thang Bui <buianhthang89@gmail.com>
Date: Fri, 26 Sep 2025 00:12:54 +0700
Subject: [PATCH 011/391] i18n: add Vietnamese translation

---
 CODEOWNERS              |   1 +
 po/vi.po                | 319 ++++++++++++++++++++++++++++++++++++++++
 src/os/i18n_locales.zig |   1 +
 3 files changed, 321 insertions(+)
 create mode 100644 po/vi.po

diff --git a/CODEOWNERS b/CODEOWNERS
index f377a73c6..1fbcf109a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -188,6 +188,7 @@
 /po/ru.po @ghostty-org/ru_RU
 /po/tr.po @ghostty-org/tr_TR
 /po/uk.po @ghostty-org/uk_UA
+/po/vi.po @ghostty-org/vi_VN
 /po/zh_CN.po @ghostty-org/zh_CN
 /po/zh_TW.po @ghostty-org/zh_TW
 
diff --git a/po/vi.po b/po/vi.po
new file mode 100644
index 000000000..03b61d1e7
--- /dev/null
+++ b/po/vi.po
@@ -0,0 +1,319 @@
+# Vietnamese translations for com.mitchellh.ghostty package.
+# Copyright (C) 2025 "Mitchell Hashimoto, Ghostty contributors"
+# This file is distributed under the same license as the com.mitchellh.ghostty package.
+# Anh Thang <buianhthang89@gmail.com>, 2025.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: com.mitchellh.ghostty\n"
+"Report-Msgid-Bugs-To: m@mitchellh.com\n"
+"POT-Creation-Date: 2025-07-22 17:18+0000\n"
+"PO-Revision-Date: 2025-09-25 23:52+0700\n"
+"Last-Translator: Anh Thang <buianhthang89@gmail.com>\n"
+"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"Language: vi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/apprt/gtk/ui/1.5/prompt-title-dialog.blp:5
+msgid "Change Terminal Title"
+msgstr "Đổi Tiêu đề Terminal"
+
+#: src/apprt/gtk/ui/1.5/prompt-title-dialog.blp:6
+msgid "Leave blank to restore the default title."
+msgstr "Để trống để khôi phục tiêu đề mặc định."
+
+#: src/apprt/gtk/ui/1.5/prompt-title-dialog.blp:9
+#: src/apprt/gtk/ui/1.5/ccw-paste.blp:10 src/apprt/gtk/ui/1.2/ccw-paste.blp:10
+#: src/apprt/gtk/CloseDialog.zig:44
+msgid "Cancel"
+msgstr "Hủy"
+
+#: src/apprt/gtk/ui/1.5/prompt-title-dialog.blp:10
+msgid "OK"
+msgstr "Đồng ý"
+
+#: src/apprt/gtk/ui/1.5/config-errors-dialog.blp:5
+#: src/apprt/gtk/ui/1.2/config-errors-dialog.blp:5
+msgid "Configuration Errors"
+msgstr "Lỗi Cấu hình"
+
+#: src/apprt/gtk/ui/1.5/config-errors-dialog.blp:6
+#: src/apprt/gtk/ui/1.2/config-errors-dialog.blp:6
+msgid ""
+"One or more configuration errors were found. Please review the errors below, "
+"and either reload your configuration or ignore these errors."
+msgstr ""
+"Đã tìm thấy một hoặc nhiều lỗi cấu hình. Vui lòng xem lại các lỗi bên dưới, "
+"và chọn tải lại cấu hình hoặc bỏ qua các lỗi này."
+
+#: src/apprt/gtk/ui/1.5/config-errors-dialog.blp:9
+#: src/apprt/gtk/ui/1.2/config-errors-dialog.blp:9
+msgid "Ignore"
+msgstr "Bỏ qua"
+
+#: src/apprt/gtk/ui/1.5/config-errors-dialog.blp:10
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:97
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:100
+#: src/apprt/gtk/ui/1.2/config-errors-dialog.blp:10
+msgid "Reload Configuration"
+msgstr "Tải lại Cấu hình"
+
+#: src/apprt/gtk/ui/1.0/menu-headerbar-split_menu.blp:6
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:38
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:50
+msgid "Split Up"
+msgstr "Chia Lên trên"
+
+#: src/apprt/gtk/ui/1.0/menu-headerbar-split_menu.blp:11
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:43
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:55
+msgid "Split Down"
+msgstr "Chia Xuống dưới"
+
+#: src/apprt/gtk/ui/1.0/menu-headerbar-split_menu.blp:16
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:48
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:60
+msgid "Split Left"
+msgstr "Chia Trái"
+
+#: src/apprt/gtk/ui/1.0/menu-headerbar-split_menu.blp:21
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:53
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:65
+msgid "Split Right"
+msgstr "Chia Phải"
+
+#: src/apprt/gtk/ui/1.5/command-palette.blp:16
+msgid "Execute a command…"
+msgstr "Thực thi một lệnh…"
+
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:6
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:6
+msgid "Copy"
+msgstr "Sao chép"
+
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:11
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:11
+#: src/apprt/gtk/ui/1.5/ccw-paste.blp:11 src/apprt/gtk/ui/1.2/ccw-paste.blp:11
+msgid "Paste"
+msgstr "Dán"
+
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:18
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:73
+msgid "Clear"
+msgstr "Xóa"
+
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:23
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:78
+msgid "Reset"
+msgstr "Thiết lập lại"
+
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:30
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:42
+msgid "Split"
+msgstr "Chia"
+
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:33
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:45
+msgid "Change Title…"
+msgstr "Đổi Tiêu đề…"
+
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:59
+msgid "Tab"
+msgstr "Thẻ"
+
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:62
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:30
+#: src/apprt/gtk/Window.zig:265
+msgid "New Tab"
+msgstr "Thẻ Mới"
+
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:67
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:35
+msgid "Close Tab"
+msgstr "Đóng Thẻ"
+
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:73
+msgid "Window"
+msgstr "Cửa sổ"
+
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:76
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:18
+msgid "New Window"
+msgstr "Cửa sổ Mới"
+
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:81
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:23
+msgid "Close Window"
+msgstr "Đóng Cửa sổ"
+
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:89
+msgid "Config"
+msgstr "Cấu hình"
+
+#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:92
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:95
+msgid "Open Configuration"
+msgstr "Mở Cấu hình"
+
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:85
+msgid "Command Palette"
+msgstr "Bảng lệnh"
+
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:90
+msgid "Terminal Inspector"
+msgstr "Trình kiểm tra Terminal"
+
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:107
+#: src/apprt/gtk/Window.zig:1038
+msgid "About Ghostty"
+msgstr "Giới thiệu về Ghostty"
+
+#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:112
+msgid "Quit"
+msgstr "Thoát"
+
+#: src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp:6
+#: src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp:6
+#: src/apprt/gtk/ui/1.2/ccw-osc-52-read.blp:6
+#: src/apprt/gtk/ui/1.2/ccw-osc-52-write.blp:6
+msgid "Authorize Clipboard Access"
+msgstr "Cho phép Truy cập Bảng tạm"
+
+#: src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp:7
+#: src/apprt/gtk/ui/1.2/ccw-osc-52-read.blp:7
+msgid ""
+"An application is attempting to read from the clipboard. The current "
+"clipboard contents are shown below."
+msgstr ""
+"Một ứng dụng đang cố gắng đọc từ bảng tạm. Nội dung bảng tạm hiện tại "
+"được hiển thị bên dưới."
+
+#: src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp:10
+#: src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp:10
+#: src/apprt/gtk/ui/1.2/ccw-osc-52-read.blp:10
+#: src/apprt/gtk/ui/1.2/ccw-osc-52-write.blp:10
+msgid "Deny"
+msgstr "Từ chối"
+
+#: src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp:11
+#: src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp:11
+#: src/apprt/gtk/ui/1.2/ccw-osc-52-read.blp:11
+#: src/apprt/gtk/ui/1.2/ccw-osc-52-write.blp:11
+msgid "Allow"
+msgstr "Cho phép"
+
+#: src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp:81
+#: src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp:77
+msgid "Remember choice for this split"
+msgstr "Nhớ lựa chọn cho lần chia này"
+
+#: src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp:82
+#: src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp:78
+msgid "Reload configuration to show this prompt again"
+msgstr "Tải lại cấu hình để hiển thị lời nhắc này lần nữa"
+
+#: src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp:7
+#: src/apprt/gtk/ui/1.2/ccw-osc-52-write.blp:7
+msgid ""
+"An application is attempting to write to the clipboard. The current "
+"clipboard contents are shown below."
+msgstr ""
+"Một ứng dụng đang cố gắng ghi vào bảng tạm. Nội dung bảng tạm hiện tại "
+"được hiển thị bên dưới."
+
+#: src/apprt/gtk/ui/1.5/ccw-paste.blp:6 src/apprt/gtk/ui/1.2/ccw-paste.blp:6
+msgid "Warning: Potentially Unsafe Paste"
+msgstr "Cảnh báo: Dán có thể không an toàn"
+
+#: src/apprt/gtk/ui/1.5/ccw-paste.blp:7 src/apprt/gtk/ui/1.2/ccw-paste.blp:7
+msgid ""
+"Pasting this text into the terminal may be dangerous as it looks like some "
+"commands may be executed."
+msgstr ""
+"Việc dán văn bản này vào terminal có thể nguy hiểm vì có vẻ như "
+"một số lệnh có thể được thực thi."
+
+#: src/apprt/gtk/CloseDialog.zig:47 src/apprt/gtk/Surface.zig:2531
+msgid "Close"
+msgstr "Đóng"
+
+#: src/apprt/gtk/CloseDialog.zig:87
+msgid "Quit Ghostty?"
+msgstr "Thoát Ghostty?"
+
+#: src/apprt/gtk/CloseDialog.zig:88
+msgid "Close Window?"
+msgstr "Đóng Cửa sổ?"
+
+#: src/apprt/gtk/CloseDialog.zig:89
+msgid "Close Tab?"
+msgstr "Đóng Thẻ?"
+
+#: src/apprt/gtk/CloseDialog.zig:90
+msgid "Close Split?"
+msgstr "Đóng Lần chia này?"
+
+#: src/apprt/gtk/CloseDialog.zig:96
+msgid "All terminal sessions will be terminated."
+msgstr "Tất cả các phiên terminal sẽ bị chấm dứt."
+
+#: src/apprt/gtk/CloseDialog.zig:97
+msgid "All terminal sessions in this window will be terminated."
+msgstr "Tất cả các phiên terminal trong cửa sổ này sẽ bị chấm dứt."
+
+#: src/apprt/gtk/CloseDialog.zig:98
+msgid "All terminal sessions in this tab will be terminated."
+msgstr "Tất cả các phiên terminal trong tab này sẽ bị chấm dứt."
+
+#: src/apprt/gtk/CloseDialog.zig:99
+msgid "The currently running process in this split will be terminated."
+msgstr "Tiến trình đang chạy trong lần chia này sẽ bị chấm dứt."
+
+#: src/apprt/gtk/Surface.zig:1266
+msgid "Copied to clipboard"
+msgstr "Đã sao chép vào bảng tạm"
+
+#: src/apprt/gtk/Surface.zig:1268
+msgid "Cleared clipboard"
+msgstr "Đã xóa bảng tạm"
+
+#: src/apprt/gtk/Surface.zig:2525
+msgid "Command succeeded"
+msgstr "Lệnh đã thành công"
+
+#: src/apprt/gtk/Surface.zig:2527
+msgid "Command failed"
+msgstr "Lệnh đã thất bại"
+
+#: src/apprt/gtk/Window.zig:216
+msgid "Main Menu"
+msgstr "Menu chính"
+
+#: src/apprt/gtk/Window.zig:239
+msgid "View Open Tabs"
+msgstr "Xem các Thẻ đang mở"
+
+#: src/apprt/gtk/Window.zig:266
+msgid "New Split"
+msgstr "Chia Mới"
+
+#: src/apprt/gtk/Window.zig:329
+msgid ""
+"⚠️ You're running a debug build of Ghostty! Performance will be degraded."
+msgstr ""
+"⚠️ Bạn đang chạy phiên bản gỡ lỗi của Ghostty! Hiệu suất sẽ bị giảm."
+
+#: src/apprt/gtk/Window.zig:775
+msgid "Reloaded the configuration"
+msgstr "Đã tải lại cấu hình"
+
+#: src/apprt/gtk/Window.zig:1019
+msgid "Ghostty Developers"
+msgstr "Nhà phát triển Ghostty"
+
+#: src/apprt/gtk/inspector.zig:144
+msgid "Ghostty: Terminal Inspector"
+msgstr "Ghostty: Trình kiểm tra Terminal"
diff --git a/src/os/i18n_locales.zig b/src/os/i18n_locales.zig
index 7a7daf998..aa39c6593 100644
--- a/src/os/i18n_locales.zig
+++ b/src/os/i18n_locales.zig
@@ -54,4 +54,5 @@ pub const locales = [_][:0]const u8{
     "hr",
     "lt",
     "lv",
+    "vi",
 };

From 4d30d886c636305875748b84ec06d489af669921 Mon Sep 17 00:00:00 2001
From: Anh Thang Bui <buianhthang89@gmail.com>
Date: Wed, 4 Mar 2026 09:39:48 +0700
Subject: [PATCH 012/391] update translation

---
 po/vi.po | 436 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 235 insertions(+), 201 deletions(-)

diff --git a/po/vi.po b/po/vi.po
index 03b61d1e7..04bc5d8ed 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,14 +1,14 @@
 # Vietnamese translations for com.mitchellh.ghostty package.
-# Copyright (C) 2025 "Mitchell Hashimoto, Ghostty contributors"
+# Copyright (C) 2026 "Mitchell Hashimoto, Ghostty contributors"
 # This file is distributed under the same license as the com.mitchellh.ghostty package.
-# Anh Thang <buianhthang89@gmail.com>, 2025.
+# Anh Thang <buianhthang89@gmail.com>, 2026.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: com.mitchellh.ghostty\n"
 "Report-Msgid-Bugs-To: m@mitchellh.com\n"
-"POT-Creation-Date: 2025-07-22 17:18+0000\n"
-"PO-Revision-Date: 2025-09-25 23:52+0700\n"
+"POT-Creation-Date: 2026-02-17 23:16+0100\n"
+"PO-Revision-Date: 2026-03-04 09:32+0700\n"
 "Last-Translator: Anh Thang <buianhthang89@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
 "Language: vi\n"
@@ -17,303 +17,337 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/apprt/gtk/ui/1.5/prompt-title-dialog.blp:5
-msgid "Change Terminal Title"
-msgstr "Đổi Tiêu đề Terminal"
+#: dist/linux/ghostty_nautilus.py:53
+msgid "Open in Ghostty"
+msgstr "Mở Ghostty"
 
-#: src/apprt/gtk/ui/1.5/prompt-title-dialog.blp:6
-msgid "Leave blank to restore the default title."
-msgstr "Để trống để khôi phục tiêu đề mặc định."
+#: src/apprt/gtk/ui/1.0/clipboard-confirmation-dialog.blp:12
+#: src/apprt/gtk/ui/1.4/clipboard-confirmation-dialog.blp:12
+#: src/apprt/gtk/class/clipboard_confirmation_dialog.zig:197
+#: src/apprt/gtk/class/clipboard_confirmation_dialog.zig:201
+msgid "Authorize Clipboard Access"
+msgstr "Cho phép Truy cập Bảng tạm"
 
-#: src/apprt/gtk/ui/1.5/prompt-title-dialog.blp:9
-#: src/apprt/gtk/ui/1.5/ccw-paste.blp:10 src/apprt/gtk/ui/1.2/ccw-paste.blp:10
-#: src/apprt/gtk/CloseDialog.zig:44
+#: src/apprt/gtk/ui/1.0/clipboard-confirmation-dialog.blp:17
+#: src/apprt/gtk/ui/1.4/clipboard-confirmation-dialog.blp:17
+msgid "Deny"
+msgstr "Từ chối"
+
+#: src/apprt/gtk/ui/1.0/clipboard-confirmation-dialog.blp:18
+#: src/apprt/gtk/ui/1.4/clipboard-confirmation-dialog.blp:18
+msgid "Allow"
+msgstr "Cho phép"
+
+#: src/apprt/gtk/ui/1.4/clipboard-confirmation-dialog.blp:92
+msgid "Remember choice for this split"
+msgstr "Ghi nhớ lựa chọn cho chia màn hình này"
+
+#: src/apprt/gtk/ui/1.4/clipboard-confirmation-dialog.blp:93
+msgid "Reload configuration to show this prompt again"
+msgstr "Tải lại cấu hình để hiển thị lại thông báo này"
+
+#: src/apprt/gtk/ui/1.2/close-confirmation-dialog.blp:7
+#: src/apprt/gtk/ui/1.5/title-dialog.blp:8
 msgid "Cancel"
 msgstr "Hủy"
 
-#: src/apprt/gtk/ui/1.5/prompt-title-dialog.blp:10
-msgid "OK"
-msgstr "Đồng ý"
+#: src/apprt/gtk/ui/1.2/close-confirmation-dialog.blp:8
+#: src/apprt/gtk/ui/1.2/search-overlay.blp:85
+#: src/apprt/gtk/ui/1.3/surface-child-exited.blp:17
+msgid "Close"
+msgstr "Đóng"
 
-#: src/apprt/gtk/ui/1.5/config-errors-dialog.blp:5
-#: src/apprt/gtk/ui/1.2/config-errors-dialog.blp:5
-msgid "Configuration Errors"
-msgstr "Lỗi Cấu hình"
-
-#: src/apprt/gtk/ui/1.5/config-errors-dialog.blp:6
 #: src/apprt/gtk/ui/1.2/config-errors-dialog.blp:6
+msgid "Configuration Errors"
+msgstr "Lỗi cấu hình"
+
+#: src/apprt/gtk/ui/1.2/config-errors-dialog.blp:7
 msgid ""
 "One or more configuration errors were found. Please review the errors below, "
 "and either reload your configuration or ignore these errors."
 msgstr ""
-"Đã tìm thấy một hoặc nhiều lỗi cấu hình. Vui lòng xem lại các lỗi bên dưới, "
-"và chọn tải lại cấu hình hoặc bỏ qua các lỗi này."
+"Phát hiện một hoặc nhiều lỗi cấu hình. Vui lòng xem xét các lỗi bên dưới, "
+"sau đó tải lại cấu hình hoặc bỏ qua các lỗi này."
 
-#: src/apprt/gtk/ui/1.5/config-errors-dialog.blp:9
-#: src/apprt/gtk/ui/1.2/config-errors-dialog.blp:9
+#: src/apprt/gtk/ui/1.2/config-errors-dialog.blp:10
 msgid "Ignore"
 msgstr "Bỏ qua"
 
-#: src/apprt/gtk/ui/1.5/config-errors-dialog.blp:10
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:97
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:100
-#: src/apprt/gtk/ui/1.2/config-errors-dialog.blp:10
+#: src/apprt/gtk/ui/1.2/config-errors-dialog.blp:11
+#: src/apprt/gtk/ui/1.2/surface.blp:366 src/apprt/gtk/ui/1.5/window.blp:300
 msgid "Reload Configuration"
-msgstr "Tải lại Cấu hình"
+msgstr "Tải lại cấu hình"
 
-#: src/apprt/gtk/ui/1.0/menu-headerbar-split_menu.blp:6
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:38
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:50
-msgid "Split Up"
-msgstr "Chia Lên trên"
+#: src/apprt/gtk/ui/1.2/debug-warning.blp:7
+#: src/apprt/gtk/ui/1.3/debug-warning.blp:6
+msgid ""
+"⚠️ You're running a debug build of Ghostty! Performance will be degraded."
+msgstr ""
+"⚠️ Bạn đang chạy bản build thử nghiệm (debug) của Ghostty! Hiệu năng sẽ bị giảm."
 
-#: src/apprt/gtk/ui/1.0/menu-headerbar-split_menu.blp:11
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:43
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:55
-msgid "Split Down"
-msgstr "Chia Xuống dưới"
+#: src/apprt/gtk/ui/1.5/inspector-window.blp:5
+msgid "Ghostty: Terminal Inspector"
+msgstr "Ghostty: Bộ kiểm tra Terminal"
 
-#: src/apprt/gtk/ui/1.0/menu-headerbar-split_menu.blp:16
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:48
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:60
-msgid "Split Left"
-msgstr "Chia Trái"
+#: src/apprt/gtk/ui/1.2/search-overlay.blp:29
+msgid "Find…"
+msgstr "Tìm kiếm…"
 
-#: src/apprt/gtk/ui/1.0/menu-headerbar-split_menu.blp:21
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:53
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:65
-msgid "Split Right"
-msgstr "Chia Phải"
+#: src/apprt/gtk/ui/1.2/search-overlay.blp:64
+msgid "Previous Match"
+msgstr "Kết quả trước"
 
-#: src/apprt/gtk/ui/1.5/command-palette.blp:16
-msgid "Execute a command…"
-msgstr "Thực thi một lệnh…"
+#: src/apprt/gtk/ui/1.2/search-overlay.blp:74
+msgid "Next Match"
+msgstr "Kết quả tiếp theo"
 
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:6
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:6
+#: src/apprt/gtk/ui/1.2/surface.blp:6
+msgid "Oh, no."
+msgstr "Ôi hỏng rồi."
+
+#: src/apprt/gtk/ui/1.2/surface.blp:7
+msgid "Unable to acquire an OpenGL context for rendering."
+msgstr "Không thể lấy ngữ cảnh OpenGL để kết xuất đồ họa."
+
+#: src/apprt/gtk/ui/1.2/surface.blp:97
+msgid ""
+"This terminal is in read-only mode. You can still view, select, and scroll "
+"through the content, but no input events will be sent to the running "
+"application."
+msgstr ""
+"Terminal này đang ở chế độ chỉ đọc. Bạn vẫn có thể xem, chọn và cuộn "
+"nội dung, nhưng các sự kiện nhập liệu sẽ không được gửi đến ứng dụng."
+
+#: src/apprt/gtk/ui/1.2/surface.blp:107
+msgid "Read-only"
+msgstr "Chỉ đọc"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:260 src/apprt/gtk/ui/1.5/window.blp:200
 msgid "Copy"
 msgstr "Sao chép"
 
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:11
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:11
-#: src/apprt/gtk/ui/1.5/ccw-paste.blp:11 src/apprt/gtk/ui/1.2/ccw-paste.blp:11
+#: src/apprt/gtk/ui/1.2/surface.blp:265 src/apprt/gtk/ui/1.5/window.blp:205
 msgid "Paste"
 msgstr "Dán"
 
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:18
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:73
+#: src/apprt/gtk/ui/1.2/surface.blp:270
+msgid "Notify on Next Command Finish"
+msgstr "Thông báo khi lệnh tiếp theo kết thúc"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:277 src/apprt/gtk/ui/1.5/window.blp:273
 msgid "Clear"
 msgstr "Xóa"
 
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:23
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:78
+#: src/apprt/gtk/ui/1.2/surface.blp:282 src/apprt/gtk/ui/1.5/window.blp:278
 msgid "Reset"
-msgstr "Thiết lập lại"
+msgstr "Đặt lại"
 
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:30
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:42
+#: src/apprt/gtk/ui/1.2/surface.blp:289 src/apprt/gtk/ui/1.5/window.blp:242
 msgid "Split"
-msgstr "Chia"
+msgstr "Chia màn hình"
 
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:33
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:45
+#: src/apprt/gtk/ui/1.2/surface.blp:292 src/apprt/gtk/ui/1.5/window.blp:245
 msgid "Change Title…"
-msgstr "Đổi Tiêu đề…"
+msgstr "Đổi tiêu đề…"
 
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:59
+#: src/apprt/gtk/ui/1.2/surface.blp:297 src/apprt/gtk/ui/1.5/window.blp:177
+#: src/apprt/gtk/ui/1.5/window.blp:250
+msgid "Split Up"
+msgstr "Chia lên trên"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:303 src/apprt/gtk/ui/1.5/window.blp:182
+#: src/apprt/gtk/ui/1.5/window.blp:255
+msgid "Split Down"
+msgstr "Chia xuống dưới"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:309 src/apprt/gtk/ui/1.5/window.blp:187
+#: src/apprt/gtk/ui/1.5/window.blp:260
+msgid "Split Left"
+msgstr "Chia sang trái"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:315 src/apprt/gtk/ui/1.5/window.blp:192
+#: src/apprt/gtk/ui/1.5/window.blp:265
+msgid "Split Right"
+msgstr "Chia sang phải"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:322
 msgid "Tab"
-msgstr "Thẻ"
+msgstr "Tab"
 
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:62
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:30
-#: src/apprt/gtk/Window.zig:265
+#: src/apprt/gtk/ui/1.2/surface.blp:325 src/apprt/gtk/ui/1.5/window.blp:224
+#: src/apprt/gtk/ui/1.5/window.blp:320
+msgid "Change Tab Title…"
+msgstr "Đổi tiêu đề Tab…"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:330 src/apprt/gtk/ui/1.5/window.blp:57
+#: src/apprt/gtk/ui/1.5/window.blp:107 src/apprt/gtk/ui/1.5/window.blp:229
 msgid "New Tab"
-msgstr "Thẻ Mới"
+msgstr "Tab mới"
 
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:67
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:35
+#: src/apprt/gtk/ui/1.2/surface.blp:335 src/apprt/gtk/ui/1.5/window.blp:234
 msgid "Close Tab"
-msgstr "Đóng Thẻ"
+msgstr "Đóng Tab"
 
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:73
+#: src/apprt/gtk/ui/1.2/surface.blp:342
 msgid "Window"
 msgstr "Cửa sổ"
 
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:76
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:18
+#: src/apprt/gtk/ui/1.2/surface.blp:345 src/apprt/gtk/ui/1.5/window.blp:212
 msgid "New Window"
-msgstr "Cửa sổ Mới"
+msgstr "Cửa sổ mới"
 
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:81
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:23
+#: src/apprt/gtk/ui/1.2/surface.blp:350 src/apprt/gtk/ui/1.5/window.blp:217
 msgid "Close Window"
-msgstr "Đóng Cửa sổ"
+msgstr "Đóng cửa sổ"
 
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:89
+#: src/apprt/gtk/ui/1.2/surface.blp:358
 msgid "Config"
 msgstr "Cấu hình"
 
-#: src/apprt/gtk/ui/1.0/menu-surface-context_menu.blp:92
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:95
+#: src/apprt/gtk/ui/1.2/surface.blp:361 src/apprt/gtk/ui/1.5/window.blp:295
 msgid "Open Configuration"
-msgstr "Mở Cấu hình"
+msgstr "Mở tệp cấu hình"
 
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:85
+#: src/apprt/gtk/ui/1.5/title-dialog.blp:5
+msgid "Leave blank to restore the default title."
+msgstr "Để trống để khôi phục tiêu đề mặc định."
+
+#: src/apprt/gtk/ui/1.5/title-dialog.blp:9
+msgid "OK"
+msgstr "Đồng ý"
+
+#: src/apprt/gtk/ui/1.5/window.blp:58 src/apprt/gtk/ui/1.5/window.blp:108
+msgid "New Split"
+msgstr "Chia màn hình mới"
+
+#: src/apprt/gtk/ui/1.5/window.blp:68 src/apprt/gtk/ui/1.5/window.blp:126
+msgid "View Open Tabs"
+msgstr "Xem các Tab đang mở"
+
+#: src/apprt/gtk/ui/1.5/window.blp:78 src/apprt/gtk/ui/1.5/window.blp:140
+msgid "Main Menu"
+msgstr "Trình đơn chính"
+
+#: src/apprt/gtk/ui/1.5/window.blp:285
 msgid "Command Palette"
 msgstr "Bảng lệnh"
 
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:90
+#: src/apprt/gtk/ui/1.5/window.blp:290
 msgid "Terminal Inspector"
-msgstr "Trình kiểm tra Terminal"
+msgstr "Bộ kiểm tra Terminal"
 
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:107
-#: src/apprt/gtk/Window.zig:1038
+#: src/apprt/gtk/ui/1.5/window.blp:307 src/apprt/gtk/class/window.zig:1727
 msgid "About Ghostty"
-msgstr "Giới thiệu về Ghostty"
+msgstr "Về Ghostty"
 
-#: src/apprt/gtk/ui/1.0/menu-window-titlebar_menu.blp:112
+#: src/apprt/gtk/ui/1.5/window.blp:312
 msgid "Quit"
 msgstr "Thoát"
 
-#: src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp:6
-#: src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp:6
-#: src/apprt/gtk/ui/1.2/ccw-osc-52-read.blp:6
-#: src/apprt/gtk/ui/1.2/ccw-osc-52-write.blp:6
-msgid "Authorize Clipboard Access"
-msgstr "Cho phép Truy cập Bảng tạm"
+#: src/apprt/gtk/ui/1.5/command-palette.blp:17
+msgid "Execute a command…"
+msgstr "Chạy một lệnh…"
 
-#: src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp:7
-#: src/apprt/gtk/ui/1.2/ccw-osc-52-read.blp:7
-msgid ""
-"An application is attempting to read from the clipboard. The current "
-"clipboard contents are shown below."
-msgstr ""
-"Một ứng dụng đang cố gắng đọc từ bảng tạm. Nội dung bảng tạm hiện tại "
-"được hiển thị bên dưới."
-
-#: src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp:10
-#: src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp:10
-#: src/apprt/gtk/ui/1.2/ccw-osc-52-read.blp:10
-#: src/apprt/gtk/ui/1.2/ccw-osc-52-write.blp:10
-msgid "Deny"
-msgstr "Từ chối"
-
-#: src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp:11
-#: src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp:11
-#: src/apprt/gtk/ui/1.2/ccw-osc-52-read.blp:11
-#: src/apprt/gtk/ui/1.2/ccw-osc-52-write.blp:11
-msgid "Allow"
-msgstr "Cho phép"
-
-#: src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp:81
-#: src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp:77
-msgid "Remember choice for this split"
-msgstr "Nhớ lựa chọn cho lần chia này"
-
-#: src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp:82
-#: src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp:78
-msgid "Reload configuration to show this prompt again"
-msgstr "Tải lại cấu hình để hiển thị lời nhắc này lần nữa"
-
-#: src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp:7
-#: src/apprt/gtk/ui/1.2/ccw-osc-52-write.blp:7
+#: src/apprt/gtk/class/clipboard_confirmation_dialog.zig:198
 msgid ""
 "An application is attempting to write to the clipboard. The current "
 "clipboard contents are shown below."
 msgstr ""
-"Một ứng dụng đang cố gắng ghi vào bảng tạm. Nội dung bảng tạm hiện tại "
-"được hiển thị bên dưới."
+"Một ứng dụng đang cố gắng ghi vào bảng tạm. Nội dung hiện tại của "
+"bảng tạm được hiển thị bên dưới."
 
-#: src/apprt/gtk/ui/1.5/ccw-paste.blp:6 src/apprt/gtk/ui/1.2/ccw-paste.blp:6
+#: src/apprt/gtk/class/clipboard_confirmation_dialog.zig:202
+msgid ""
+"An application is attempting to read from the clipboard. The current "
+"clipboard contents are shown below."
+msgstr ""
+"Một ứng dụng đang cố gắng đọc từ bảng tạm. Nội dung hiện tại của "
+"bảng tạm được hiển thị bên dưới."
+
+#: src/apprt/gtk/class/clipboard_confirmation_dialog.zig:205
 msgid "Warning: Potentially Unsafe Paste"
-msgstr "Cảnh báo: Dán có thể không an toàn"
+msgstr "Cảnh báo: Thao tác Dán có thể không an toàn"
 
-#: src/apprt/gtk/ui/1.5/ccw-paste.blp:7 src/apprt/gtk/ui/1.2/ccw-paste.blp:7
+#: src/apprt/gtk/class/clipboard_confirmation_dialog.zig:206
 msgid ""
 "Pasting this text into the terminal may be dangerous as it looks like some "
 "commands may be executed."
 msgstr ""
-"Việc dán văn bản này vào terminal có thể nguy hiểm vì có vẻ như "
-"một số lệnh có thể được thực thi."
+"Dán văn bản này vào terminal có thể nguy hiểm vì có vẻ như một số "
+"lệnh sẽ bị thực thi."
 
-#: src/apprt/gtk/CloseDialog.zig:47 src/apprt/gtk/Surface.zig:2531
-msgid "Close"
-msgstr "Đóng"
-
-#: src/apprt/gtk/CloseDialog.zig:87
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:184
 msgid "Quit Ghostty?"
 msgstr "Thoát Ghostty?"
 
-#: src/apprt/gtk/CloseDialog.zig:88
-msgid "Close Window?"
-msgstr "Đóng Cửa sổ?"
-
-#: src/apprt/gtk/CloseDialog.zig:89
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:185
 msgid "Close Tab?"
-msgstr "Đóng Thẻ?"
+msgstr "Đóng Tab?"
 
-#: src/apprt/gtk/CloseDialog.zig:90
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:186
+msgid "Close Window?"
+msgstr "Đóng cửa sổ?"
+
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:187
 msgid "Close Split?"
-msgstr "Đóng Lần chia này?"
+msgstr "Đóng phần chia màn hình?"
 
-#: src/apprt/gtk/CloseDialog.zig:96
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:193
 msgid "All terminal sessions will be terminated."
-msgstr "Tất cả các phiên terminal sẽ bị chấm dứt."
+msgstr "Tất cả các phiên làm việc terminal sẽ bị chấm dứt."
 
-#: src/apprt/gtk/CloseDialog.zig:97
-msgid "All terminal sessions in this window will be terminated."
-msgstr "Tất cả các phiên terminal trong cửa sổ này sẽ bị chấm dứt."
-
-#: src/apprt/gtk/CloseDialog.zig:98
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:194
 msgid "All terminal sessions in this tab will be terminated."
-msgstr "Tất cả các phiên terminal trong tab này sẽ bị chấm dứt."
+msgstr "Tất cả các phiên làm việc terminal trong tab này sẽ bị chấm dứt."
 
-#: src/apprt/gtk/CloseDialog.zig:99
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:195
+msgid "All terminal sessions in this window will be terminated."
+msgstr "Tất cả các phiên làm việc terminal trong cửa sổ này sẽ bị chấm dứt."
+
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:196
 msgid "The currently running process in this split will be terminated."
-msgstr "Tiến trình đang chạy trong lần chia này sẽ bị chấm dứt."
+msgstr "Tiến trình đang chạy trong phần chia này sẽ bị chấm dứt."
 
-#: src/apprt/gtk/Surface.zig:1266
-msgid "Copied to clipboard"
-msgstr "Đã sao chép vào bảng tạm"
+#: src/apprt/gtk/class/surface.zig:1108
+msgid "Command Finished"
+msgstr "Lệnh đã kết thúc"
 
-#: src/apprt/gtk/Surface.zig:1268
-msgid "Cleared clipboard"
-msgstr "Đã xóa bảng tạm"
+#: src/apprt/gtk/class/surface.zig:1109
+msgid "Command Succeeded"
+msgstr "Lệnh thành công"
 
-#: src/apprt/gtk/Surface.zig:2525
+#: src/apprt/gtk/class/surface.zig:1110
+msgid "Command Failed"
+msgstr "Lệnh thất bại"
+
+#: src/apprt/gtk/class/surface_child_exited.zig:109
 msgid "Command succeeded"
-msgstr "Lệnh đã thành công"
+msgstr "Lệnh thành công"
 
-#: src/apprt/gtk/Surface.zig:2527
+#: src/apprt/gtk/class/surface_child_exited.zig:113
 msgid "Command failed"
-msgstr "Lệnh đã thất bại"
+msgstr "Lệnh thất bại"
 
-#: src/apprt/gtk/Window.zig:216
-msgid "Main Menu"
-msgstr "Menu chính"
+#: src/apprt/gtk/class/title_dialog.zig:225
+msgid "Change Terminal Title"
+msgstr "Đổi tiêu đề Terminal"
 
-#: src/apprt/gtk/Window.zig:239
-msgid "View Open Tabs"
-msgstr "Xem các Thẻ đang mở"
+#: src/apprt/gtk/class/title_dialog.zig:226
+msgid "Change Tab Title"
+msgstr "Đổi tiêu đề Tab"
 
-#: src/apprt/gtk/Window.zig:266
-msgid "New Split"
-msgstr "Chia Mới"
-
-#: src/apprt/gtk/Window.zig:329
-msgid ""
-"⚠️ You're running a debug build of Ghostty! Performance will be degraded."
-msgstr ""
-"⚠️ Bạn đang chạy phiên bản gỡ lỗi của Ghostty! Hiệu suất sẽ bị giảm."
-
-#: src/apprt/gtk/Window.zig:775
+#: src/apprt/gtk/class/window.zig:1007
 msgid "Reloaded the configuration"
 msgstr "Đã tải lại cấu hình"
 
-#: src/apprt/gtk/Window.zig:1019
-msgid "Ghostty Developers"
-msgstr "Nhà phát triển Ghostty"
+#: src/apprt/gtk/class/window.zig:1566
+msgid "Copied to clipboard"
+msgstr "Đã sao chép vào bảng tạm"
 
-#: src/apprt/gtk/inspector.zig:144
-msgid "Ghostty: Terminal Inspector"
-msgstr "Ghostty: Trình kiểm tra Terminal"
+#: src/apprt/gtk/class/window.zig:1568
+msgid "Cleared clipboard"
+msgstr "Đã xóa sạch bảng tạm"
+
+#: src/apprt/gtk/class/window.zig:1708
+msgid "Ghostty Developers"
+msgstr "Các nhà phát triển Ghostty"

From b823c07ae30635b4641d45db0f06f6f416756b94 Mon Sep 17 00:00:00 2001
From: Jake Guthmiller <jguthmiller@gmail.com>
Date: Tue, 3 Mar 2026 20:56:24 -0600
Subject: [PATCH 013/391] PR feedback - simplify

---
 src/apprt/gtk/winproto/wayland.zig | 60 ++----------------------------
 1 file changed, 4 insertions(+), 56 deletions(-)

diff --git a/src/apprt/gtk/winproto/wayland.zig b/src/apprt/gtk/winproto/wayland.zig
index d2b0b33db..b5c9f6a52 100644
--- a/src/apprt/gtk/winproto/wayland.zig
+++ b/src/apprt/gtk/winproto/wayland.zig
@@ -45,10 +45,6 @@ pub const App = struct {
         /// is the primary.
         primary_output_name: ?[max_output_name_len:0]u8 = null,
 
-        /// Used to avoid repeatedly logging the same primary-name mismatch
-        /// when we can't map the compositor connector name to a GDK monitor.
-        primary_output_match_failed_logged: bool = false,
-
         /// Tracks the output order event cycle. Set to true after a `done`
         /// event so the next `output` event is captured as the new primary.
         /// Initialized to true so the first event after binding is captured.
@@ -186,20 +182,11 @@ pub const App = struct {
                 };
                 if (monitor.getConnector()) |connector_z| {
                     if (std.mem.orderZ(u8, connector_z, stored_name) == .eq) {
-                        context.primary_output_match_failed_logged = false;
                         return monitor;
                     }
                 }
                 monitor.unref();
             }
-
-            if (!context.primary_output_match_failed_logged) {
-                context.primary_output_match_failed_logged = true;
-                log.debug(
-                    "could not match primary output connector to a GDK monitor; falling back to first monitor",
-                    .{},
-                );
-            }
         }
 
         // Fall back to the first monitor in the list.
@@ -240,7 +227,6 @@ pub const App = struct {
     /// Reset cached state derived from kde_output_order_v1.
     fn resetOutputOrderState(context: *Context) void {
         context.primary_output_name = null;
-        context.primary_output_match_failed_logged = false;
         context.output_order_done = true;
     }
 
@@ -271,38 +257,6 @@ pub const App = struct {
                     if (std.mem.orderZ(u8, v.interface, T.interface.name) == .eq) {
                         log.debug("matched {}", .{T});
 
-                        const existing_global = @field(context, field.name);
-                        const global_name_field = comptime getGlobalNameField(field.name);
-                        const existing_global_name: ?u32 = if (global_name_field) |name_field|
-                            @field(context, name_field)
-                        else
-                            null;
-
-                        // Already bound: skip duplicate, allow replacement for
-                        // protocols tracked by registry global name.
-                        // Compositors may re-advertise globals at runtime
-                        // (e.g. when a display server component restarts).
-                        // For protocols with a stored global name we detect
-                        // replacement (different name) vs harmless duplicate
-                        // (same name); simple protocols just keep the first.
-                        if (existing_global != null) {
-                            if (global_name_field != null) {
-                                if (existing_global_name != null and existing_global_name.? == v.name) {
-                                    log.debug(
-                                        "duplicate global for {s} with name={}; keeping existing binding",
-                                        .{ v.interface, v.name },
-                                    );
-                                    break;
-                                }
-                            } else {
-                                log.warn(
-                                    "duplicate global for {s}; keeping existing binding",
-                                    .{v.interface},
-                                );
-                                break;
-                            }
-                        }
-
                         const global = registry.bind(
                             v.name,
                             T,
@@ -315,22 +269,18 @@ pub const App = struct {
                             return;
                         };
 
-                        if (existing_global) |old| {
-                            log.debug(
-                                "replacement global for {s}; switching old_name={} to new_name={}",
-                                .{ v.interface, existing_global_name orelse 0, v.name },
-                            );
+                        // Destroy old binding if this global was re-advertised.
+                        // Bind first so a failed bind preserves the old binding.
+                        if (@field(context, field.name)) |old| {
                             old.destroy();
 
                             if (comptime std.mem.eql(u8, field.name, "kde_output_order")) {
-                                // Replacement means the previous primary may be stale
-                                // until the new object sends a fresh cycle.
                                 resetOutputOrderState(context);
                             }
                         }
 
                         @field(context, field.name) = global;
-                        if (global_name_field) |name_field| {
+                        if (comptime getGlobalNameField(field.name)) |name_field| {
                             @field(context, name_field) = v.name;
                         }
 
@@ -405,8 +355,6 @@ pub const App = struct {
                 // Only the first output event after a `done` is the new primary.
                 if (!context.output_order_done) return;
                 context.output_order_done = false;
-                // A new primary invalidates any cached match-failure state.
-                context.primary_output_match_failed_logged = false;
 
                 const name = std.mem.sliceTo(v.output_name, 0);
                 if (name.len == 0) {

From bec4c61d4dbbd1ad667e7cdcafaf15d0836c3143 Mon Sep 17 00:00:00 2001
From: Jake Guthmiller <jguthmiller@gmail.com>
Date: Tue, 3 Mar 2026 21:28:02 -0600
Subject: [PATCH 014/391] PR feedback: heap-allocate primary_output_name

---
 src/apprt/gtk/winproto/wayland.zig | 32 ++++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/apprt/gtk/winproto/wayland.zig b/src/apprt/gtk/winproto/wayland.zig
index b5c9f6a52..a4678f4e4 100644
--- a/src/apprt/gtk/winproto/wayland.zig
+++ b/src/apprt/gtk/winproto/wayland.zig
@@ -26,7 +26,7 @@ pub const App = struct {
     context: *Context,
 
     const Context = struct {
-        const max_output_name_len = 63;
+        alloc: Allocator,
 
         kde_blur_manager: ?*org.KdeKwinBlurManager = null,
 
@@ -43,7 +43,7 @@ pub const App = struct {
         /// Connector name of the primary output (e.g., "DP-1") as reported
         /// by kde_output_order_v1. The first output in each priority list
         /// is the primary.
-        primary_output_name: ?[max_output_name_len:0]u8 = null,
+        primary_output_name: ?[:0]const u8 = null,
 
         /// Tracks the output order event cycle. Set to true after a `done`
         /// event so the next `output` event is captured as the new primary.
@@ -91,8 +91,11 @@ pub const App = struct {
         // a stable pointer, but it's too scary that we'd need one in the future
         // and not have it and corrupt memory or something so let's just do it.
         const context = try alloc.create(Context);
-        errdefer alloc.destroy(context);
-        context.* = .{};
+        errdefer {
+            if (context.primary_output_name) |name| alloc.free(name);
+            alloc.destroy(context);
+        }
+        context.* = .{ .alloc = alloc };
 
         // Get our display registry so we can get all the available interfaces
         // and bind to what we need.
@@ -114,6 +117,7 @@ pub const App = struct {
     }
 
     pub fn deinit(self: *App, alloc: Allocator) void {
+        if (self.context.primary_output_name) |name| alloc.free(name);
         alloc.destroy(self.context);
     }
 
@@ -173,7 +177,7 @@ pub const App = struct {
         const monitors = display.getMonitors();
 
         // Try to find the monitor matching the primary output name.
-        if (context.primary_output_name) |*stored_name| {
+        if (context.primary_output_name) |stored_name| {
             var i: u32 = 0;
             while (monitors.getObject(i)) |item| : (i += 1) {
                 const monitor = gobject.ext.cast(gdk.Monitor, item) orelse {
@@ -201,7 +205,7 @@ pub const App = struct {
         // Globals should be optional pointers
         const T = switch (@typeInfo(field.type)) {
             .optional => |o| switch (@typeInfo(o.child)) {
-                .pointer => |v| v.child,
+                .pointer => |v| if (v.size == .one) v.child else return null,
                 else => return null,
             },
             else => return null,
@@ -226,6 +230,7 @@ pub const App = struct {
 
     /// Reset cached state derived from kde_output_order_v1.
     fn resetOutputOrderState(context: *Context) void {
+        if (context.primary_output_name) |name| context.alloc.free(name);
         context.primary_output_name = null;
         context.output_order_done = true;
     }
@@ -357,17 +362,18 @@ pub const App = struct {
                 context.output_order_done = false;
 
                 const name = std.mem.sliceTo(v.output_name, 0);
+                if (context.primary_output_name) |old| context.alloc.free(old);
+
                 if (name.len == 0) {
                     context.primary_output_name = null;
                     log.warn("ignoring empty primary output name from kde_output_order_v1", .{});
-                } else if (name.len <= Context.max_output_name_len) {
-                    var buf: [Context.max_output_name_len:0]u8 = @splat(0);
-                    @memcpy(buf[0..name.len], name);
-                    context.primary_output_name = buf;
-                    log.debug("primary output: {s}", .{name});
                 } else {
-                    context.primary_output_name = null;
-                    log.warn("ignoring primary output name longer than {} bytes from kde_output_order_v1", .{Context.max_output_name_len});
+                    context.primary_output_name = context.alloc.dupeZ(u8, name) catch |err| {
+                        context.primary_output_name = null;
+                        log.warn("failed to allocate primary output name: {}", .{err});
+                        return;
+                    };
+                    log.debug("primary output: {s}", .{name});
                 }
             },
             .done => {

From e07aefa6010716ccc51c745b8e0dde9598b58812 Mon Sep 17 00:00:00 2001
From: Michielvk <16121929+Michielvk@users.noreply.github.com>
Date: Wed, 4 Mar 2026 18:22:29 +0100
Subject: [PATCH 015/391] fix: zsh shell integration when `sudo` and `ssh`
 aliases are defined

---
 src/shell-integration/zsh/ghostty-integration | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/shell-integration/zsh/ghostty-integration b/src/shell-integration/zsh/ghostty-integration
index 4d872d025..b02c745f2 100644
--- a/src/shell-integration/zsh/ghostty-integration
+++ b/src/shell-integration/zsh/ghostty-integration
@@ -249,7 +249,7 @@ _ghostty_deferred_init() {
     # Sudo
     if [[ "$GHOSTTY_SHELL_FEATURES" == *"sudo"* ]] && [[ -n "$TERMINFO" ]]; then
       # Wrap `sudo` command to ensure Ghostty terminfo is preserved
-      sudo() {
+      function sudo() {
         builtin local sudo_has_sudoedit_flags="no"
         for arg in "$@"; do
           # Check if argument is '-e' or '--edit' (sudoedit flags)
@@ -272,7 +272,7 @@ _ghostty_deferred_init() {
 
     # SSH Integration
     if [[ "$GHOSTTY_SHELL_FEATURES" == *ssh-* ]]; then
-      ssh() {
+      function ssh() {
         emulate -L zsh
         setopt local_options no_glob_subst
 

From dfa968d932ecb6928ebab9a9d460ae0ac629f985 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Thu, 5 Mar 2026 03:07:05 +0000
Subject: [PATCH 016/391] Update VOUCHED list (#11176)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11175#issuecomment-4001807388)
from @jcollie.

Vouch: @douglas

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 54684edf9..e10175b3c 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -54,6 +54,7 @@ dervedro
 diaaeddin
 doprz
 douglance
+douglas
 drepper
 elias8
 ephemera

From a5327a51f3fedea890f59ad75e7666a57bb743c4 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Thu, 5 Mar 2026 04:34:36 +0000
Subject: [PATCH 017/391] Update VOUCHED list (#11179)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11164#discussioncomment-16005149)
from @mitchellh.

Vouch: @Michielvk

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index e10175b3c..14e16df11 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -99,6 +99,7 @@ markdorison
 markhuot
 marrocco-simone
 matkotiric
+michielvk
 miguelelgallo
 mihi314
 mikailmm

From 961bf46884dc7f75a4bfd8640bf7f57baed6b540 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Wed, 4 Mar 2026 22:35:58 -0600
Subject: [PATCH 018/391] Fix Windows test in src/Command.zig

This was introduced in #10611. This doesn't fix all of the current
Windows build problems, but at least fixes one that I introduced.
---
 src/Command.zig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Command.zig b/src/Command.zig
index 3a40143b9..2b381912b 100644
--- a/src/Command.zig
+++ b/src/Command.zig
@@ -725,6 +725,11 @@ test "Command: redirect stdout to file" {
         .path = "C:\\Windows\\System32\\whoami.exe",
         .args = &.{"C:\\Windows\\System32\\whoami.exe"},
         .stdout = stdout,
+        .os_pre_exec = null,
+        .rt_pre_exec = null,
+        .rt_post_fork = null,
+        .rt_pre_exec_info = undefined,
+        .rt_post_fork_info = undefined,
     } else .{
         .path = "/bin/sh",
         .args = &.{ "/bin/sh", "-c", "echo hello" },

From 3dde6e2559e0aa67e04a6001485d87b80ed4c1dd Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 4 Mar 2026 20:37:16 -0800
Subject: [PATCH 019/391] terminal: bound link regex search work with Oniguruma
 retry limits

Fixes #11177

Use per-search Oniguruma match params (retry_limit_in_search) in
StringMap-backed link detection to avoid pathological backtracking hangs
on very long lines.

The units are ticks in the internal loop so its kind of opaque but
this seems to still match some very long URLs. The test case in question
was a 169K character line (which is now rejected).
---
 pkg/oniguruma/main.zig        |  2 +
 pkg/oniguruma/match_param.zig | 23 ++++++++++
 pkg/oniguruma/regex.zig       | 79 ++++++++++++++++++++++++++++++-----
 src/terminal/StringMap.zig    | 25 ++++++++++-
 4 files changed, 117 insertions(+), 12 deletions(-)
 create mode 100644 pkg/oniguruma/match_param.zig

diff --git a/pkg/oniguruma/main.zig b/pkg/oniguruma/main.zig
index a8e415cfb..2541cc358 100644
--- a/pkg/oniguruma/main.zig
+++ b/pkg/oniguruma/main.zig
@@ -1,4 +1,5 @@
 const initpkg = @import("init.zig");
+const match_param = @import("match_param.zig");
 const regex = @import("regex.zig");
 const region = @import("region.zig");
 const types = @import("types.zig");
@@ -10,6 +11,7 @@ pub const errors = @import("errors.zig");
 pub const init = initpkg.init;
 pub const deinit = initpkg.deinit;
 pub const Encoding = types.Encoding;
+pub const MatchParam = match_param.MatchParam;
 pub const Regex = regex.Regex;
 pub const Region = region.Region;
 pub const Syntax = types.Syntax;
diff --git a/pkg/oniguruma/match_param.zig b/pkg/oniguruma/match_param.zig
new file mode 100644
index 000000000..b28258ff0
--- /dev/null
+++ b/pkg/oniguruma/match_param.zig
@@ -0,0 +1,23 @@
+const c = @import("c.zig").c;
+const errors = @import("errors.zig");
+const Error = errors.Error;
+
+pub const MatchParam = struct {
+    value: *c.OnigMatchParam,
+
+    pub fn init() !MatchParam {
+        const value = c.onig_new_match_param() orelse return Error.Memory;
+        return .{ .value = value };
+    }
+
+    pub fn deinit(self: *MatchParam) void {
+        c.onig_free_match_param(self.value);
+    }
+
+    pub fn setRetryLimitInSearch(self: *MatchParam, limit: usize) !void {
+        _ = try errors.convertError(c.onig_set_retry_limit_in_search_of_match_param(
+            self.value,
+            @intCast(limit),
+        ));
+    }
+};
diff --git a/pkg/oniguruma/regex.zig b/pkg/oniguruma/regex.zig
index a73c7fc10..fd920e01a 100644
--- a/pkg/oniguruma/regex.zig
+++ b/pkg/oniguruma/regex.zig
@@ -3,6 +3,7 @@ const c = @import("c.zig").c;
 const types = @import("types.zig");
 const errors = @import("errors.zig");
 const testEnsureInit = @import("testing.zig").ensureInit;
+const MatchParam = @import("match_param.zig").MatchParam;
 const Region = @import("region.zig").Region;
 const Error = errors.Error;
 const ErrorInfo = errors.ErrorInfo;
@@ -43,6 +44,17 @@ pub const Regex = struct {
         self: *Regex,
         str: []const u8,
         options: Option,
+    ) !Region {
+        return self.searchWithParam(str, options, null);
+    }
+
+    /// Search an entire string for matches. This always returns a region
+    /// which may heap allocate (C allocator).
+    pub fn searchWithParam(
+        self: *Regex,
+        str: []const u8,
+        options: Option,
+        match_param: ?*MatchParam,
     ) !Region {
         var region: Region = .{};
 
@@ -51,7 +63,14 @@ pub const Regex = struct {
         // any errors to free that memory.
         errdefer region.deinit();
 
-        _ = try self.searchAdvanced(str, 0, str.len, &region, options);
+        _ = try self.searchAdvancedWithParam(
+            str,
+            0,
+            str.len,
+            &region,
+            options,
+            match_param,
+        );
         return region;
     }
 
@@ -64,15 +83,47 @@ pub const Regex = struct {
         region: *Region,
         options: Option,
     ) !usize {
-        const pos = try errors.convertError(c.onig_search(
-            self.value,
-            str.ptr,
-            str.ptr + str.len,
-            str.ptr + start,
-            str.ptr + end,
-            @ptrCast(region),
-            options.int(),
-        ));
+        return self.searchAdvancedWithParam(
+            str,
+            start,
+            end,
+            region,
+            options,
+            null,
+        );
+    }
+
+    /// onig_search_with_param directly
+    pub fn searchAdvancedWithParam(
+        self: *Regex,
+        str: []const u8,
+        start: usize,
+        end: usize,
+        region: *Region,
+        options: Option,
+        match_param: ?*MatchParam,
+    ) !usize {
+        const pos = try errors.convertError(if (match_param) |param|
+            c.onig_search_with_param(
+                self.value,
+                str.ptr,
+                str.ptr + str.len,
+                str.ptr + start,
+                str.ptr + end,
+                @ptrCast(region),
+                options.int(),
+                param.value,
+            )
+        else
+            c.onig_search(
+                self.value,
+                str.ptr,
+                str.ptr + str.len,
+                str.ptr + start,
+                str.ptr + end,
+                @ptrCast(region),
+                options.int(),
+            ));
 
         return @intCast(pos);
     }
@@ -90,4 +141,12 @@ test {
     try testing.expectEqual(@as(usize, 1), reg.count());
 
     try testing.expectError(Error.Mismatch, re.search("hello", .{}));
+
+    var match_param = try MatchParam.init();
+    defer match_param.deinit();
+    try match_param.setRetryLimitInSearch(1000);
+
+    var reg_param = try re.searchWithParam("hello foo bar", .{}, &match_param);
+    defer reg_param.deinit();
+    try testing.expectEqual(@as(usize, 1), reg_param.count());
 }
diff --git a/src/terminal/StringMap.zig b/src/terminal/StringMap.zig
index f7d88d1c8..18dd7b19c 100644
--- a/src/terminal/StringMap.zig
+++ b/src/terminal/StringMap.zig
@@ -11,6 +11,12 @@ const Screen = @import("Screen.zig");
 const Pin = @import("PageList.zig").Pin;
 const Allocator = std.mem.Allocator;
 
+// Retry budget for StringMap regex searches.
+//
+// Units are Oniguruma retry steps (internal backtracking/retry counter),
+// not bytes/characters/time.
+const oni_search_retry_limit = 100_000;
+
 string: [:0]const u8,
 map: []Pin,
 
@@ -44,11 +50,26 @@ pub const SearchIterator = struct {
     pub fn next(self: *SearchIterator) !?Match {
         if (self.offset >= self.map.string.len) return null;
 
-        var region = self.regex.search(
+        // Use per-search match params so we can bound regex retry steps
+        // (Oniguruma's internal backtracking work counter).
+        var match_param = try oni.MatchParam.init();
+        defer match_param.deinit();
+        try match_param.setRetryLimitInSearch(oni_search_retry_limit);
+
+        var region = self.regex.searchWithParam(
             self.map.string[self.offset..],
             .{},
+            &match_param,
         ) catch |err| switch (err) {
-            error.Mismatch => {
+            // Retry/stack-limit errors mean we hit our work budget and
+            // aborted matching.
+            // For iterator callers this is equivalent to "no further matches".
+            error.Mismatch,
+            error.RetryLimitInMatchOver,
+            error.RetryLimitInSearchOver,
+            error.MatchStackLimitOver,
+            error.SubexpCallLimitInSearchOver,
+            => {
                 self.offset = self.map.string.len;
                 return null;
             },

From c920a88cdcc19ed42ab013c1ba2bb9ad41592ada Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Wed, 4 Mar 2026 23:30:58 -0600
Subject: [PATCH 020/391] GTK: add 'move' to the drop target actions

Fixes #11175
---
 src/apprt/gtk/ui/1.2/surface.blp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apprt/gtk/ui/1.2/surface.blp b/src/apprt/gtk/ui/1.2/surface.blp
index d8483285f..55c54531c 100644
--- a/src/apprt/gtk/ui/1.2/surface.blp
+++ b/src/apprt/gtk/ui/1.2/surface.blp
@@ -221,7 +221,7 @@ Overlay terminal_page {
 
   DropTarget drop_target {
     drop => $drop();
-    actions: copy;
+    actions: copy | move;
   }
 }
 

From acf54a91668b524d9a5e6e800c34ce2d08fd4d48 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Thu, 5 Mar 2026 08:26:08 -0600
Subject: [PATCH 021/391] windows: use new callconv convention

---
 src/os/windows.zig | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/os/windows.zig b/src/os/windows.zig
index 1853f4162..87d1b662e 100644
--- a/src/os/windows.zig
+++ b/src/os/windows.zig
@@ -53,22 +53,22 @@ pub const exp = struct {
             hWritePipe: *windows.HANDLE,
             lpPipeAttributes: ?*const windows.SECURITY_ATTRIBUTES,
             nSize: windows.DWORD,
-        ) callconv(windows.WINAPI) windows.BOOL;
+        ) callconv(.winapi) windows.BOOL;
         pub extern "kernel32" fn CreatePseudoConsole(
             size: windows.COORD,
             hInput: windows.HANDLE,
             hOutput: windows.HANDLE,
             dwFlags: windows.DWORD,
             phPC: *HPCON,
-        ) callconv(windows.WINAPI) windows.HRESULT;
-        pub extern "kernel32" fn ResizePseudoConsole(hPC: HPCON, size: windows.COORD) callconv(windows.WINAPI) windows.HRESULT;
-        pub extern "kernel32" fn ClosePseudoConsole(hPC: HPCON) callconv(windows.WINAPI) void;
+        ) callconv(.winapi) windows.HRESULT;
+        pub extern "kernel32" fn ResizePseudoConsole(hPC: HPCON, size: windows.COORD) callconv(.winapi) windows.HRESULT;
+        pub extern "kernel32" fn ClosePseudoConsole(hPC: HPCON) callconv(.winapi) void;
         pub extern "kernel32" fn InitializeProcThreadAttributeList(
             lpAttributeList: LPPROC_THREAD_ATTRIBUTE_LIST,
             dwAttributeCount: windows.DWORD,
             dwFlags: windows.DWORD,
             lpSize: *windows.SIZE_T,
-        ) callconv(windows.WINAPI) windows.BOOL;
+        ) callconv(.winapi) windows.BOOL;
         pub extern "kernel32" fn UpdateProcThreadAttribute(
             lpAttributeList: LPPROC_THREAD_ATTRIBUTE_LIST,
             dwFlags: windows.DWORD,
@@ -77,7 +77,7 @@ pub const exp = struct {
             cbSize: windows.SIZE_T,
             lpPreviousValue: ?windows.PVOID,
             lpReturnSize: ?*windows.SIZE_T,
-        ) callconv(windows.WINAPI) windows.BOOL;
+        ) callconv(.winapi) windows.BOOL;
         pub extern "kernel32" fn PeekNamedPipe(
             hNamedPipe: windows.HANDLE,
             lpBuffer: ?windows.LPVOID,
@@ -85,7 +85,7 @@ pub const exp = struct {
             lpBytesRead: ?*windows.DWORD,
             lpTotalBytesAvail: ?*windows.DWORD,
             lpBytesLeftThisMessage: ?*windows.DWORD,
-        ) callconv(windows.WINAPI) windows.BOOL;
+        ) callconv(.winapi) windows.BOOL;
         // Duplicated here because lpCommandLine is not marked optional in zig std
         pub extern "kernel32" fn CreateProcessW(
             lpApplicationName: ?windows.LPWSTR,
@@ -98,7 +98,7 @@ pub const exp = struct {
             lpCurrentDirectory: ?windows.LPWSTR,
             lpStartupInfo: *windows.STARTUPINFOW,
             lpProcessInformation: *windows.PROCESS_INFORMATION,
-        ) callconv(windows.WINAPI) windows.BOOL;
+        ) callconv(.winapi) windows.BOOL;
     };
 
     pub const PROC_THREAD_ATTRIBUTE_NUMBER = 0x0000FFFF;

From f36b903479f54fc7202a95ca10509f3eac06e007 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Thu, 5 Mar 2026 14:40:10 +0000
Subject: [PATCH 022/391] Update VOUCHED list (#11191)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11190#issuecomment-4005537826)
from @00-kat.

Vouch: @AnthonyZhOon

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 14e16df11..ccc0d4f45 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -30,6 +30,7 @@ alexfeijoo44
 alexjuca
 amadeus
 andrejdaskalov
+anthonyzhoon
 atomk
 balazs-szucs
 bennettp123

From e1f4ee7fdd4d5fc4b6b86dd70986be75a0bacabd Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Thu, 5 Mar 2026 14:53:00 +0000
Subject: [PATCH 023/391] Update VOUCHED list (#11192)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11184#discussioncomment-16011801)
from @mitchellh.

Vouch: @mac0ne

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index ccc0d4f45..e246ba137 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -94,6 +94,7 @@ laxystem
 liby
 linustalacko
 lonsagisawa
+mac0ne
 mahnokropotkinvich
 marijagjorgjieva
 markdorison

From e8aad103263297d41335a27d9d1679a7ab47c08b Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Thu, 5 Mar 2026 09:26:52 -0600
Subject: [PATCH 024/391] windows: avoid the use of wcwidth

---
 src/benchmark/CodepointWidth.zig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/benchmark/CodepointWidth.zig b/src/benchmark/CodepointWidth.zig
index effabb036..30d3f91e7 100644
--- a/src/benchmark/CodepointWidth.zig
+++ b/src/benchmark/CodepointWidth.zig
@@ -6,6 +6,7 @@
 const CodepointWidth = @This();
 
 const std = @import("std");
+const builtin = @import("builtin");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const Benchmark = @import("Benchmark.zig");
@@ -104,6 +105,11 @@ fn stepNoop(ptr: *anyopaque) Benchmark.Error!void {
 extern "c" fn wcwidth(c: u32) c_int;
 
 fn stepWcwidth(ptr: *anyopaque) Benchmark.Error!void {
+    if (comptime builtin.os.tag == .windows) {
+        log.warn("wcwidth is not available on Windows", .{});
+        return;
+    }
+
     const self: *CodepointWidth = @ptrCast(@alignCast(ptr));
 
     const f = self.data_f orelse return;

From cccdb0d2ade79c0d3ef37635c5c9fe90a0ac14bf Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Thu, 5 Mar 2026 09:28:02 -0600
Subject: [PATCH 025/391] windows: add trivial implementation of expandHome

---
 src/os/homedir.zig | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/os/homedir.zig b/src/os/homedir.zig
index 0868a4fa5..14a4558cc 100644
--- a/src/os/homedir.zig
+++ b/src/os/homedir.zig
@@ -13,7 +13,7 @@ const Error = error{
 /// is generally an expensive process so the value should be cached.
 pub inline fn home(buf: []u8) !?[]const u8 {
     return switch (builtin.os.tag) {
-        inline .linux, .freebsd, .macos => try homeUnix(buf),
+        .linux, .freebsd, .macos => try homeUnix(buf),
         .windows => try homeWindows(buf),
 
         // iOS doesn't have a user-writable home directory
@@ -122,7 +122,13 @@ pub const ExpandError = error{
 pub fn expandHome(path: []const u8, buf: []u8) ExpandError![]const u8 {
     return switch (builtin.os.tag) {
         .linux, .freebsd, .macos => try expandHomeUnix(path, buf),
+
+        // `~/` is not an idiom generally used on Windows
+        .windows => return path,
+
+        // iOS doesn't have a user-writable home directory
         .ios => return path,
+
         else => @compileError("unimplemented"),
     };
 }

From d29e1cc1375e0a700df73604c528a550813c8b1a Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Thu, 5 Mar 2026 09:29:04 -0600
Subject: [PATCH 026/391] windows: use explicit error sets to work around lack
 of file locking

---
 src/cli/ssh-cache/DiskCache.zig | 43 ++++++++++++++++++++++++++++-----
 src/cli/ssh-cache/Entry.zig     |  4 ++-
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/cli/ssh-cache/DiskCache.zig b/src/cli/ssh-cache/DiskCache.zig
index 6214d0429..6fa74b43d 100644
--- a/src/cli/ssh-cache/DiskCache.zig
+++ b/src/cli/ssh-cache/DiskCache.zig
@@ -57,6 +57,16 @@ pub fn clear(self: DiskCache) !void {
 
 pub const AddResult = enum { added, updated };
 
+pub const AddError = std.fs.Dir.MakeError ||
+    std.fs.Dir.StatFileError ||
+    std.fs.File.OpenError ||
+    std.fs.File.ChmodError ||
+    std.io.Reader.LimitedAllocError ||
+    FixupPermissionsError ||
+    ReadEntriesError ||
+    WriteCacheFileError ||
+    Error;
+
 /// Add or update a hostname entry in the cache.
 /// Returns AddResult.added for new entries or AddResult.updated for existing ones.
 /// The cache file is created if it doesn't exist with secure permissions (0600).
@@ -64,7 +74,7 @@ pub fn add(
     self: DiskCache,
     alloc: Allocator,
     hostname: []const u8,
-) !AddResult {
+) AddError!AddResult {
     if (!isValidCacheKey(hostname)) return error.HostnameIsInvalid;
 
     // Create cache directory if needed
@@ -128,13 +138,19 @@ pub fn add(
     return result;
 }
 
+pub const RemoveError = std.fs.File.OpenError ||
+    FixupPermissionsError ||
+    ReadEntriesError ||
+    WriteCacheFileError ||
+    Error;
+
 /// Remove a hostname entry from the cache.
 /// No error is returned if the hostname doesn't exist or the cache file is missing.
 pub fn remove(
     self: DiskCache,
     alloc: Allocator,
     hostname: []const u8,
-) !void {
+) RemoveError!void {
     if (!isValidCacheKey(hostname)) return error.HostnameIsInvalid;
 
     // Open our file
@@ -168,13 +184,17 @@ pub fn remove(
     try self.writeCacheFile(entries, null);
 }
 
+pub const ContainsError = std.fs.File.OpenError ||
+    ReadEntriesError ||
+    error{HostnameIsInvalid};
+
 /// Check if a hostname exists in the cache.
 /// Returns false if the cache file doesn't exist.
 pub fn contains(
     self: DiskCache,
     alloc: Allocator,
     hostname: []const u8,
-) !bool {
+) ContainsError!bool {
     if (!isValidCacheKey(hostname)) return error.HostnameIsInvalid;
 
     // Open our file
@@ -194,7 +214,9 @@ pub fn contains(
     return entries.contains(hostname);
 }
 
-fn fixupPermissions(file: std.fs.File) (std.fs.File.StatError || std.fs.File.ChmodError)!void {
+pub const FixupPermissionsError = (std.fs.File.StatError || std.fs.File.ChmodError);
+
+fn fixupPermissions(file: std.fs.File) FixupPermissionsError!void {
     // Windows does not support chmod
     if (comptime builtin.os.tag == .windows) return;
 
@@ -206,11 +228,18 @@ fn fixupPermissions(file: std.fs.File) (std.fs.File.StatError || std.fs.File.Chm
     }
 }
 
+pub const WriteCacheFileError = std.fs.Dir.OpenError ||
+    std.fs.AtomicFile.InitError ||
+    std.fs.AtomicFile.FlushError ||
+    std.fs.AtomicFile.FinishError ||
+    Entry.FormatError ||
+    error{InvalidCachePath};
+
 fn writeCacheFile(
     self: DiskCache,
     entries: std.StringHashMap(Entry),
     expire_days: ?u32,
-) !void {
+) WriteCacheFileError!void {
     const cache_dir = std.fs.path.dirname(self.path) orelse return error.InvalidCachePath;
     const cache_basename = std.fs.path.basename(self.path);
 
@@ -270,10 +299,12 @@ pub fn deinitEntries(
     entries.deinit();
 }
 
+pub const ReadEntriesError = std.mem.Allocator.Error || std.io.Reader.LimitedAllocError;
+
 fn readEntries(
     alloc: Allocator,
     file: std.fs.File,
-) !std.StringHashMap(Entry) {
+) ReadEntriesError!std.StringHashMap(Entry) {
     var reader = file.reader(&.{});
     const content = try reader.interface.allocRemaining(
         alloc,
diff --git a/src/cli/ssh-cache/Entry.zig b/src/cli/ssh-cache/Entry.zig
index f3403dbd4..b586161f2 100644
--- a/src/cli/ssh-cache/Entry.zig
+++ b/src/cli/ssh-cache/Entry.zig
@@ -33,7 +33,9 @@ pub fn parse(line: []const u8) ?Entry {
     };
 }
 
-pub fn format(self: Entry, writer: *std.Io.Writer) !void {
+pub const FormatError = std.Io.Writer.Error;
+
+pub fn format(self: Entry, writer: *std.Io.Writer) FormatError!void {
     try writer.print(
         "{s}|{d}|{s}\n",
         .{ self.hostname, self.timestamp, self.terminfo_version },

From b1d3e36e2ea0d428dd333019c8346b6d4bcbc762 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Thu, 5 Mar 2026 10:03:58 -0600
Subject: [PATCH 027/391] windows: add GetComputerNameA so that
 hostname-related functions work

---
 src/os/hostname.zig | 37 +++++++++++++++++++++++++++++++------
 src/os/windows.zig  |  5 +++++
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/os/hostname.zig b/src/os/hostname.zig
index f728a2455..af9148fbf 100644
--- a/src/os/hostname.zig
+++ b/src/os/hostname.zig
@@ -1,4 +1,5 @@
 const std = @import("std");
+const builtin = @import("builtin");
 const posix = std.posix;
 
 pub const LocalHostnameValidationError = error{
@@ -99,9 +100,21 @@ pub fn isLocal(hostname: []const u8) LocalHostnameValidationError!bool {
     if (std.mem.eql(u8, "localhost", hostname)) return true;
 
     // If hostname is not "localhost" it must match our hostname.
-    var buf: [posix.HOST_NAME_MAX]u8 = undefined;
-    const ourHostname = try posix.gethostname(&buf);
-    return std.mem.eql(u8, hostname, ourHostname);
+    switch (builtin.os.tag) {
+        .windows => {
+            const windows = @import("windows.zig");
+            var buf: [256:0]u8 = undefined;
+            var nSize: windows.DWORD = buf.len;
+            if (windows.exp.kernel32.GetComputerNameA(&buf, &nSize) == 0) return false;
+            const ourHostname = buf[0..nSize];
+            return std.mem.eql(u8, hostname, ourHostname);
+        },
+        else => {
+            var buf: [posix.HOST_NAME_MAX]u8 = undefined;
+            const ourHostname = try posix.gethostname(&buf);
+            return std.mem.eql(u8, hostname, ourHostname);
+        },
+    }
 }
 
 test "isLocal returns true when provided hostname is localhost" {
@@ -109,9 +122,21 @@ test "isLocal returns true when provided hostname is localhost" {
 }
 
 test "isLocal returns true when hostname is local" {
-    var buf: [posix.HOST_NAME_MAX]u8 = undefined;
-    const localHostname = try posix.gethostname(&buf);
-    try std.testing.expect(try isLocal(localHostname));
+    switch (builtin.os.tag) {
+        .windows => {
+            const windows = @import("windows.zig");
+            var buf: [256:0]u8 = undefined;
+            var nSize: windows.DWORD = buf.len;
+            if (windows.exp.kernel32.GetComputerNameA(&buf, &nSize) == 0) return error.GetComputerNameFailed;
+            const localHostname = buf[0..nSize];
+            try std.testing.expect(try isLocal(localHostname));
+        },
+        else => {
+            var buf: [posix.HOST_NAME_MAX]u8 = undefined;
+            const localHostname = try posix.gethostname(&buf);
+            try std.testing.expect(try isLocal(localHostname));
+        },
+    }
 }
 
 test "isLocal returns false when hostname is not local" {
diff --git a/src/os/windows.zig b/src/os/windows.zig
index 87d1b662e..e92a54537 100644
--- a/src/os/windows.zig
+++ b/src/os/windows.zig
@@ -99,6 +99,11 @@ pub const exp = struct {
             lpStartupInfo: *windows.STARTUPINFOW,
             lpProcessInformation: *windows.PROCESS_INFORMATION,
         ) callconv(.winapi) windows.BOOL;
+        /// https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-getcomputernamea
+        pub extern "kernel32" fn GetComputerNameA(
+            lpBuffer: windows.LPSTR,
+            nSize: *windows.DWORD,
+        ) callconv(.winapi) windows.BOOL;
     };
 
     pub const PROC_THREAD_ATTRIBUTE_NUMBER = 0x0000FFFF;

From 96a5e71871dc583bdb4c04554a0ac6760e2db32a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Mar 2026 00:14:51 +0000
Subject: [PATCH 028/391] build(deps): bump docker/build-push-action from
 6.19.2 to 7.0.0

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.19.2 to 7.0.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/10e90e3645eae34f1e60eeb005ba3a3d33f178e8...d08e5c354a6adb9ed34480a06d141179aa583294)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2b59d2e97..cbd985558 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1380,7 +1380,7 @@ jobs:
           tar --verbose --extract --strip-components 1 --directory dist --file ghostty-source.tar.gz
 
       - name: Build and push
-        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
         with:
           context: dist
           file: dist/src/build/docker/debian/Dockerfile

From 04aff46022f679cf607b6987031c4f4fe5273b86 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 5 Mar 2026 19:43:18 -0800
Subject: [PATCH 029/391] macos: add build script, update AGENTS.md, skip UI
 tests

This is an update to address common agentic issues I run into,
but the `build.nu` script may be generally helpful to people using
the Nix env since `xcodebuild` is broken by default in Nix due to the
compiler/linker overrides Nix shell does.
---
 .gitignore                      |  1 +
 .prettierignore                 |  3 +++
 AGENTS.md                       |  6 +++++-
 macos/AGENTS.md                 |  6 ++++--
 macos/build.nu                  | 32 ++++++++++++++++++++++++++++++++
 src/build/GhosttyXcodebuild.zig |  2 ++
 6 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100755 macos/build.nu

diff --git a/.gitignore b/.gitignore
index 40a04dbae..74f3f85eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ glad.zip
 /ghostty.qcow2
 
 vgcore.*
+
diff --git a/.prettierignore b/.prettierignore
index f40567bfa..2699f7e10 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -11,6 +11,9 @@ zig-out/
 # macos is managed by XCode GUI
 macos/
 
+# Xcode asset catalogs
+**/*.xcassets/
+
 # produced by Icon Composer on macOS
 images/Ghostty.icon/icon.json
 
diff --git a/AGENTS.md b/AGENTS.md
index c6bd79b0e..ff8c289c8 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -5,7 +5,12 @@ A file for [guiding coding agents](https://agents.md/).
 ## Commands
 
 - **Build:** `zig build`
+  - If you're on macOS and don't need to build the macOS app, use
+    `-Demit-macos-app=false` to skip building the app bundle and speed up
+    compilation.
 - **Test (Zig):** `zig build test`
+  - Prefer to run targeted tests with `-Dtest-filter` because the full
+    test suite is slow to run.
 - **Test filter (Zig)**: `zig build test -Dtest-filter=<test name>`
 - **Formatting (Zig)**: `zig fmt .`
 - **Formatting (Swift)**: `swiftlint lint --fix`
@@ -14,7 +19,6 @@ A file for [guiding coding agents](https://agents.md/).
 ## Directory Structure
 
 - Shared Zig core: `src/`
-- C API: `include`
 - macOS app: `macos/`
 - GTK (Linux and FreeBSD) app: `src/apprt/gtk`
 
diff --git a/macos/AGENTS.md b/macos/AGENTS.md
index 50e91781d..929b37498 100644
--- a/macos/AGENTS.md
+++ b/macos/AGENTS.md
@@ -4,6 +4,8 @@
 - If code outside of this directory is modified, use
   `zig build -Demit-macos-app=false` before building the macOS app to update
   the underlying Ghostty library.
-- Use `xcodebuild` to build the macOS app, do not use `zig build`
+- Use `build.nu` to build the macOS app, do not use `zig build`
   (except to build the underlying library as mentioned above).
-- Run unit tests directly with `xcodebuild`
+  - Build: `build.nu [--scheme Ghostty] [--configuration Debug] [--action build]`
+  - Output: `build/<configuration>/Ghostty.app` (e.g. `build/Debug/Ghostty.app`)
+- Run unit tests directly with `build.nu --action test`
diff --git a/macos/build.nu b/macos/build.nu
new file mode 100755
index 000000000..8c456d9b6
--- /dev/null
+++ b/macos/build.nu
@@ -0,0 +1,32 @@
+#!/usr/bin/env nu
+
+# Build the macOS Ghostty app using xcodebuild with a clean environment
+# to avoid Nix shell interference (NIX_LDFLAGS, NIX_CFLAGS_COMPILE, etc.).
+
+def main [
+    --scheme: string = "Ghostty"       # Xcode scheme (Ghostty, Ghostty-iOS, DockTilePlugin)
+    --configuration: string = "Debug"  # Build configuration (Debug, Release, ReleaseLocal)
+    --action: string = "build"         # xcodebuild action (build, test, clean, etc.)
+] {
+    let project = ($env.FILE_PWD | path join "Ghostty.xcodeproj")
+    let build_dir = ($env.FILE_PWD | path join "build")
+
+    # Skip UI tests for CLI-based invocations because it requires
+    # special permissions.
+    let skip_testing = if $action == "test" {
+        [-skip-testing GhosttyUITests]
+    } else {
+        []
+    }
+
+    (^env -i
+        $"HOME=($env.HOME)"
+        "PATH=/usr/bin:/bin:/usr/sbin:/sbin"
+        xcodebuild
+        -project $project
+        -scheme $scheme
+        -configuration $configuration
+        $"SYMROOT=($build_dir)"
+        ...$skip_testing
+        $action)
+}
diff --git a/src/build/GhosttyXcodebuild.zig b/src/build/GhosttyXcodebuild.zig
index 5ca4c5e9a..81af994ca 100644
--- a/src/build/GhosttyXcodebuild.zig
+++ b/src/build/GhosttyXcodebuild.zig
@@ -104,6 +104,8 @@ pub fn init(
             "test",
             "-scheme",
             "Ghostty",
+            "-skip-testing",
+            "GhosttyUITests",
         });
         if (xc_arch) |arch| step.addArgs(&.{ "-arch", arch });
 

From 291fbf55cb9c6946d7c080c90d8163d0b720dfe0 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 5 Mar 2026 14:41:27 -0800
Subject: [PATCH 030/391] macos: AppleScript starting

---
 macos/Ghostty.sdef | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 macos/Ghostty.sdef

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
new file mode 100644
index 000000000..8a837dce8
--- /dev/null
+++ b/macos/Ghostty.sdef
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dictionary SYSTEM "file://localhost/System/Library/DTDs/sdef.dtd">
+
+<dictionary title="Ghostty Scripting Dictionary">
+  <suite name="Ghostty Suite" code="Ghst" description="Ghostty scripting support.">
+    <class name="application" code="capp" description="The Ghostty application.">
+      <element type="terminal" access="r"/>
+    </class>
+
+    <class name="terminal" code="Gtrm" plural="terminals" description="An individual terminal surface.">
+      <property name="id" code="Gtid" type="text" access="r" description="Stable ID for this terminal surface."/>
+      <property name="title" code="Gttl" type="text" access="r" description="Current terminal title."/>
+      <property name="working directory" code="Gwdr" type="text" access="r" description="Current working directory for the terminal process."/>
+    </class>
+
+    <command name="perform action" code="GhstPfAc" description="Perform a Ghostty action string on a terminal.">
+      <direct-parameter type="text" description="The Ghostty action string."/>
+      <parameter name="on" code="GonT" type="terminal" description="Target terminal."/>
+      <result type="boolean" description="True when the action was performed."/>
+    </command>
+  </suite>
+</dictionary>

From c90a782e592aa90e3a1479b80d5b9a3acdc63dff Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 5 Mar 2026 14:55:47 -0800
Subject: [PATCH 031/391] macos: implement basic read-only applescript stuff

---
 macos/Ghostty-Info.plist                      |  4 +
 macos/Ghostty.sdef                            | 25 ++++++-
 macos/Ghostty.xcodeproj/project.pbxproj       |  6 ++
 .../AppleScript/AppDelegate+AppleScript.swift | 67 +++++++++++++++++
 .../AppleScript/AppleScriptTerminal.swift     | 73 +++++++++++++++++++
 5 files changed, 173 insertions(+), 2 deletions(-)
 create mode 100644 macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
 create mode 100644 macos/Sources/Features/AppleScript/AppleScriptTerminal.swift

diff --git a/macos/Ghostty-Info.plist b/macos/Ghostty-Info.plist
index 4896681b9..01ccd7b11 100644
--- a/macos/Ghostty-Info.plist
+++ b/macos/Ghostty-Info.plist
@@ -55,8 +55,12 @@
 	</dict>
 	<key>MDItemKeywords</key>
 	<string>Terminal</string>
+	<key>NSAppleScriptEnabled</key>
+	<true/>
 	<key>NSHighResolutionCapable</key>
 	<true/>
+	<key>OSAScriptingDefinition</key>
+	<string>Ghostty.sdef</string>
 	<key>NSServices</key>
 	<array>
 		<dict>
diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index 8a837dce8..3182f6283 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -4,11 +4,15 @@
 <dictionary title="Ghostty Scripting Dictionary">
   <suite name="Ghostty Suite" code="Ghst" description="Ghostty scripting support.">
     <class name="application" code="capp" description="The Ghostty application.">
-      <element type="terminal" access="r"/>
+      <cocoa class="NSApplication"/>
+      <element type="terminal" access="r">
+        <cocoa key="terminals"/>
+      </element>
     </class>
 
     <class name="terminal" code="Gtrm" plural="terminals" description="An individual terminal surface.">
-      <property name="id" code="Gtid" type="text" access="r" description="Stable ID for this terminal surface."/>
+      <cocoa class="GhosttyScriptTerminal"/>
+      <property name="id" code="ID  " type="text" access="r" description="Stable ID for this terminal surface."/>
       <property name="title" code="Gttl" type="text" access="r" description="Current terminal title."/>
       <property name="working directory" code="Gwdr" type="text" access="r" description="Current working directory for the terminal process."/>
     </class>
@@ -19,4 +23,21 @@
       <result type="boolean" description="True when the action was performed."/>
     </command>
   </suite>
+
+  <!--
+    The Standard Suite definition below is copied from Apple's
+    /System/Library/ScriptingDefinitions/CocoaStandard.sdef, trimmed to only
+    include what we need.
+  -->
+  <suite name="Standard Suite" code="????" description="Common classes and commands for all applications.">
+    <command name="count" code="corecnte" description="Return the number of elements of a particular class within an object.">
+      <cocoa class="NSCountCommand"/>
+      <access-group identifier="*"/>
+      <direct-parameter type="specifier" requires-access="r" description="The objects to be counted."/>
+      <parameter name="each" code="kocl" type="type" optional="yes" description="The class of objects to be counted." hidden="yes">
+        <cocoa key="ObjectClass"/>
+      </parameter>
+      <result type="integer" description="The count."/>
+    </command>
+  </suite>
 </dictionary>
diff --git a/macos/Ghostty.xcodeproj/project.pbxproj b/macos/Ghostty.xcodeproj/project.pbxproj
index 5a3e7a52e..867c52436 100644
--- a/macos/Ghostty.xcodeproj/project.pbxproj
+++ b/macos/Ghostty.xcodeproj/project.pbxproj
@@ -12,6 +12,7 @@
 		552964E62B34A9B400030505 /* vim in Resources */ = {isa = PBXBuildFile; fileRef = 552964E52B34A9B400030505 /* vim */; };
 		819324582F24E78800A9ED8F /* DockTilePlugin.plugin in Copy DockTilePlugin */ = {isa = PBXBuildFile; fileRef = 8193244D2F24E6C000A9ED8F /* DockTilePlugin.plugin */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		819324642F24FF2100A9ED8F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A5B30538299BEAAB0047F10C /* Assets.xcassets */; };
+		8F3A9B4C2FA6B88000A18D13 /* Ghostty.sdef in Resources */ = {isa = PBXBuildFile; fileRef = 8F3A9B4B2FA6B88000A18D13 /* Ghostty.sdef */; };
 		9351BE8E3D22937F003B3499 /* nvim in Resources */ = {isa = PBXBuildFile; fileRef = 9351BE8E2D22937F003B3499 /* nvim */; };
 		A51BFC272B30F1B800E92F16 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = A51BFC262B30F1B800E92F16 /* Sparkle */; };
 		A53D0C8E2B53B0EA00305CE6 /* GhosttyKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5D495A1299BEC7E00DD1313 /* GhosttyKit.xcframework */; };
@@ -74,6 +75,7 @@
 		552964E52B34A9B400030505 /* vim */ = {isa = PBXFileReference; lastKnownFileType = folder; name = vim; path = "../zig-out/share/vim"; sourceTree = "<group>"; };
 		810ACC9F2E9D3301004F8F92 /* GhosttyUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GhosttyUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		8193244D2F24E6C000A9ED8F /* DockTilePlugin.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DockTilePlugin.plugin; sourceTree = BUILT_PRODUCTS_DIR; };
+		8F3A9B4B2FA6B88000A18D13 /* Ghostty.sdef */ = {isa = PBXFileReference; lastKnownFileType = text.sdef; path = Ghostty.sdef; sourceTree = "<group>"; };
 		9351BE8E2D22937F003B3499 /* nvim */ = {isa = PBXFileReference; lastKnownFileType = folder; name = nvim; path = "../zig-out/share/nvim"; sourceTree = "<group>"; };
 		A51BFC282B30F26D00E92F16 /* GhosttyDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = GhosttyDebug.entitlements; sourceTree = "<group>"; };
 		A546F1132D7B68D7003B11A0 /* locale */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locale; path = "../zig-out/share/locale"; sourceTree = "<group>"; };
@@ -134,6 +136,8 @@
 				"Features/App Intents/KeybindIntent.swift",
 				"Features/App Intents/NewTerminalIntent.swift",
 				"Features/App Intents/QuickTerminalIntent.swift",
+				"Features/AppleScript/AppDelegate+AppleScript.swift",
+				Features/AppleScript/AppleScriptTerminal.swift,
 				Features/ClipboardConfirmation/ClipboardConfirmation.xib,
 				Features/ClipboardConfirmation/ClipboardConfirmationController.swift,
 				Features/ClipboardConfirmation/ClipboardConfirmationView.swift,
@@ -322,6 +326,7 @@
 			isa = PBXGroup;
 			children = (
 				A571AB1C2A206FC600248498 /* Ghostty-Info.plist */,
+				8F3A9B4B2FA6B88000A18D13 /* Ghostty.sdef */,
 				A5B30538299BEAAB0047F10C /* Assets.xcassets */,
 				A553F4122E06EB1600257779 /* Ghostty.icon */,
 				A5B3053D299BEAAB0047F10C /* Ghostty.entitlements */,
@@ -557,6 +562,7 @@
 				A553F4142E06EB1600257779 /* Ghostty.icon in Resources */,
 				29C15B1D2CDC3B2900520DD4 /* bat in Resources */,
 				A586167C2B7703CC009BDB1D /* fish in Resources */,
+				8F3A9B4C2FA6B88000A18D13 /* Ghostty.sdef in Resources */,
 				55154BE02B33911F001622DC /* ghostty in Resources */,
 				A546F1142D7B68D7003B11A0 /* locale in Resources */,
 				A5985CE62C33060F00C57AD3 /* man in Resources */,
diff --git a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
new file mode 100644
index 000000000..7bd0513c3
--- /dev/null
+++ b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
@@ -0,0 +1,67 @@
+import AppKit
+
+/// Application-level Cocoa scripting hooks for the Ghostty AppleScript dictionary.
+///
+/// Cocoa scripting looks for specifically named Objective-C selectors derived
+/// from the `sdef` file. This extension implements those required entry points
+/// on `NSApplication`, which is the object behind the `application` class in
+/// `Ghostty.sdef`.
+@MainActor
+extension NSApplication {
+    /// Backing collection for `application.terminals`.
+    ///
+    /// Required selector name: `terminals`.
+    @objc(terminals)
+    var terminals: [ScriptTerminal] {
+        allSurfaceViews.map(ScriptTerminal.init)
+    }
+
+    /// Enables AppleScript unique-ID lookup for terminal references.
+    ///
+    /// Required selector name pattern for element `terminals`:
+    /// `valueInTerminalsWithUniqueID:`.
+    ///
+    /// This is what lets scripts do stable references like
+    /// `terminal id "..."` even as windows/tabs change.
+    @objc(valueInTerminalsWithUniqueID:)
+    func valueInTerminals(uniqueID: String) -> ScriptTerminal? {
+        allSurfaceViews
+            .first(where: { $0.id.uuidString == uniqueID })
+            .map(ScriptTerminal.init)
+    }
+
+    /// Handler for the `perform action` AppleScript command.
+    ///
+    /// Required selector name from the command in `sdef`:
+    /// `handlePerformActionScriptCommand:`.
+    ///
+    /// Cocoa scripting parses script syntax and provides:
+    /// - `directParameter`: the command string (`perform action "..."`).
+    /// - `evaluatedArguments["on"]`: the target terminal (`... on terminal ...`).
+    ///
+    /// We return a Bool to match the command's declared result type.
+    @objc(handlePerformActionScriptCommand:)
+    func handlePerformActionScriptCommand(_ command: NSScriptCommand) -> Any? {
+        guard let action = command.directParameter as? String else {
+            command.scriptErrorNumber = errAEParamMissed
+            command.scriptErrorString = "Missing action string."
+            return nil
+        }
+
+        guard let terminal = command.evaluatedArguments?["on"] as? ScriptTerminal else {
+            command.scriptErrorNumber = errAEParamMissed
+            command.scriptErrorString = "Missing terminal target."
+            return nil
+        }
+
+        return terminal.perform(action: action)
+    }
+
+    /// Discovers all currently alive terminal surfaces across normal and quick
+    /// terminal windows. This powers both terminal enumeration and ID lookup.
+    private var allSurfaceViews: [Ghostty.SurfaceView] {
+        NSApp.windows
+            .compactMap { $0.windowController as? BaseTerminalController }
+            .flatMap { $0.surfaceTree.root?.leaves() ?? [] }
+    }
+}
diff --git a/macos/Sources/Features/AppleScript/AppleScriptTerminal.swift b/macos/Sources/Features/AppleScript/AppleScriptTerminal.swift
new file mode 100644
index 000000000..3f6603d0e
--- /dev/null
+++ b/macos/Sources/Features/AppleScript/AppleScriptTerminal.swift
@@ -0,0 +1,73 @@
+import AppKit
+
+/// AppleScript-facing wrapper around a live Ghostty terminal surface.
+///
+/// This class is intentionally ObjC-visible because Cocoa scripting resolves
+/// AppleScript objects through Objective-C runtime names/selectors, not Swift
+/// protocol conformance.
+///
+/// Mapping from `Ghostty.sdef`:
+/// - `class terminal` -> this class (`@objc(GhosttyAppleScriptTerminal)`).
+/// - `property id` -> `@objc(id)` getter below.
+/// - `property title` -> `@objc(title)` getter below.
+/// - `property working directory` -> `@objc(workingDirectory)` getter below.
+///
+/// We keep only a weak reference to the underlying `SurfaceView` so this
+/// wrapper never extends the terminal's lifetime.
+@MainActor
+@objc(GhosttyScriptTerminal)
+final class ScriptTerminal: NSObject {
+    private weak var surfaceView: Ghostty.SurfaceView?
+
+    init(surfaceView: Ghostty.SurfaceView) {
+        self.surfaceView = surfaceView
+    }
+
+    /// Exposed as the AppleScript `id` property.
+    ///
+    /// This is a stable UUID string for the life of a surface and is also used
+    /// by `NSUniqueIDSpecifier` to re-identify a terminal object in scripts.
+    @objc(id)
+    var stableID: String {
+        surfaceView?.id.uuidString ?? ""
+    }
+
+    /// Exposed as the AppleScript `title` property.
+    @objc(title)
+    var title: String {
+        surfaceView?.title ?? ""
+    }
+
+    /// Exposed as the AppleScript `working directory` property.
+    ///
+    /// The `sdef` uses a spaced name, but Cocoa scripting maps that to the
+    /// camel-cased selector name `workingDirectory`.
+    @objc(workingDirectory)
+    var workingDirectory: String {
+        surfaceView?.pwd ?? ""
+    }
+
+    /// Used by command handling (`perform action ... on <terminal>`).
+    func perform(action: String) -> Bool {
+        guard let surfaceModel = surfaceView?.surfaceModel else { return false }
+        return surfaceModel.perform(action: action)
+    }
+
+    /// Provides Cocoa scripting with a canonical "path" back to this object.
+    ///
+    /// Without an object specifier, returned terminal objects can't be reliably
+    /// referenced in follow-up script statements because AppleScript cannot
+    /// express where the object came from (`application.terminals[id]`).
+    override var objectSpecifier: NSScriptObjectSpecifier? {
+        guard let appClassDescription = NSApplication.shared.classDescription as? NSScriptClassDescription else {
+            return nil
+        }
+
+        return NSUniqueIDSpecifier(
+            containerClassDescription: appClassDescription,
+            containerSpecifier: nil,
+            key: "terminals",
+            uniqueID: stableID
+        )
+    }
+}

From 52c0709d88c20f05edc1450d5e7105377f03206d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 5 Mar 2026 20:15:21 -0800
Subject: [PATCH 032/391] macos: add ability for agents to run debug app

---
 macos/AGENTS.md                                    | 14 ++++++++++++++
 macos/Ghostty.sdef                                 |  1 +
 .../AppleScript/AppDelegate+AppleScript.swift      |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/macos/AGENTS.md b/macos/AGENTS.md
index 929b37498..8fe34a0df 100644
--- a/macos/AGENTS.md
+++ b/macos/AGENTS.md
@@ -9,3 +9,17 @@
   - Build: `build.nu [--scheme Ghostty] [--configuration Debug] [--action build]`
   - Output: `build/<configuration>/Ghostty.app` (e.g. `build/Debug/Ghostty.app`)
 - Run unit tests directly with `build.nu --action test`
+## AppleScript
+
+- The AppleScript scripting definition is in `Ghostty.sdef`.
+- Test AppleScript support:
+  (1) Build with `build.nu`
+  (2) Launch and activate the app via osascript using the absolute path
+      to the built app bundle:
+      `osascript -e 'tell application "<absolute path to build/Debug/Ghostty.app>" to activate'`
+  (3) Wait a few seconds for the app to fully launch and open a terminal.
+  (4) Run test scripts with `osascript`, always targeting the app by
+      its absolute path (not by name) to avoid calling the wrong
+      application.
+  (5) When done, quit via:
+      `osascript -e 'tell application "<absolute path to build/Debug/Ghostty.app>" to quit'`
diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index 3182f6283..647fac3db 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -5,6 +5,7 @@
   <suite name="Ghostty Suite" code="Ghst" description="Ghostty scripting support.">
     <class name="application" code="capp" description="The Ghostty application.">
       <cocoa class="NSApplication"/>
+      <responds-to command="perform action"/>
       <element type="terminal" access="r">
         <cocoa key="terminals"/>
       </element>
diff --git a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
index 7bd0513c3..267863712 100644
--- a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
+++ b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
@@ -54,7 +54,7 @@ extension NSApplication {
             return nil
         }
 
-        return terminal.perform(action: action)
+        return NSNumber(value: terminal.perform(action: action))
     }
 
     /// Discovers all currently alive terminal surfaces across normal and quick

From 40c74811f16236df9afeb522dcbd9a98ebcb4a3f Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 5 Mar 2026 20:32:49 -0800
Subject: [PATCH 033/391] macos: fix perform action

---
 macos/Ghostty.sdef | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index 647fac3db..9ed37f764 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -5,7 +5,9 @@
   <suite name="Ghostty Suite" code="Ghst" description="Ghostty scripting support.">
     <class name="application" code="capp" description="The Ghostty application.">
       <cocoa class="NSApplication"/>
-      <responds-to command="perform action"/>
+      <responds-to command="perform action">
+        <cocoa method="handlePerformActionScriptCommand:"/>
+      </responds-to>
       <element type="terminal" access="r">
         <cocoa key="terminals"/>
       </element>

From ef669eeae7574335631d6897c07f60ce4015727c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 5 Mar 2026 20:46:52 -0800
Subject: [PATCH 034/391] macos: add AppleScript `split` command

Add a new `split` command to the AppleScript scripting dictionary that
splits a terminal in a given direction (right, left, down, up) and
returns the newly created terminal.

The command is exposed as:
  split terminal <terminal> direction <direction>

Also adds a `fourCharCode` String extension for converting four-character
ASCII strings to their FourCharCode (UInt32) representation.
---
 macos/Ghostty.sdef                            | 19 +++++
 macos/Ghostty.xcodeproj/project.pbxproj       |  3 +-
 .../AppleScript/ScriptSplitCommand.swift      | 74 +++++++++++++++++++
 ...iptTerminal.swift => ScriptTerminal.swift} |  5 +-
 .../Helpers/Extensions/String+Extension.swift |  9 +++
 5 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 macos/Sources/Features/AppleScript/ScriptSplitCommand.swift
 rename macos/Sources/Features/AppleScript/{AppleScriptTerminal.swift => ScriptTerminal.swift} (90%)

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index 9ed37f764..962e1329a 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -8,6 +8,7 @@
       <responds-to command="perform action">
         <cocoa method="handlePerformActionScriptCommand:"/>
       </responds-to>
+
       <element type="terminal" access="r">
         <cocoa key="terminals"/>
       </element>
@@ -25,6 +26,24 @@
       <parameter name="on" code="GonT" type="terminal" description="Target terminal."/>
       <result type="boolean" description="True when the action was performed."/>
     </command>
+
+    <enumeration name="split direction" code="GSpD" description="Direction for a new split.">
+      <enumerator name="right" code="GSrt" description="Split to the right."/>
+      <enumerator name="left" code="GSlf" description="Split to the left."/>
+      <enumerator name="down" code="GSdn" description="Split downward."/>
+      <enumerator name="up" code="GSup" description="Split upward."/>
+    </enumeration>
+
+    <command name="split" code="GhstSplt" description="Split a terminal in the given direction.">
+      <cocoa class="GhosttyScriptSplitCommand"/>
+      <parameter name="terminal" code="GSpT" type="terminal" description="The terminal to split.">
+        <cocoa key="terminal"/>
+      </parameter>
+      <parameter name="direction" code="GSpd" type="split direction" description="The direction to split.">
+        <cocoa key="direction"/>
+      </parameter>
+      <result type="terminal" description="The newly created terminal."/>
+    </command>
   </suite>
 
   <!--
diff --git a/macos/Ghostty.xcodeproj/project.pbxproj b/macos/Ghostty.xcodeproj/project.pbxproj
index 867c52436..ce3f2edcc 100644
--- a/macos/Ghostty.xcodeproj/project.pbxproj
+++ b/macos/Ghostty.xcodeproj/project.pbxproj
@@ -137,7 +137,8 @@
 				"Features/App Intents/NewTerminalIntent.swift",
 				"Features/App Intents/QuickTerminalIntent.swift",
 				"Features/AppleScript/AppDelegate+AppleScript.swift",
-				Features/AppleScript/AppleScriptTerminal.swift,
+				Features/AppleScript/ScriptSplitCommand.swift,
+				Features/AppleScript/ScriptTerminal.swift,
 				Features/ClipboardConfirmation/ClipboardConfirmation.xib,
 				Features/ClipboardConfirmation/ClipboardConfirmationController.swift,
 				Features/ClipboardConfirmation/ClipboardConfirmationView.swift,
diff --git a/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift b/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift
new file mode 100644
index 000000000..6e90eda50
--- /dev/null
+++ b/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift
@@ -0,0 +1,74 @@
+import AppKit
+
+/// Handler for the `split` AppleScript command defined in `Ghostty.sdef`.
+///
+/// Cocoa scripting instantiates this class because the command's `<cocoa>` element
+/// specifies `class="GhosttyScriptSplitCommand"`. The runtime calls
+/// `performDefaultImplementation()` to execute the command.
+@MainActor
+@objc(GhosttyScriptSplitCommand)
+final class ScriptSplitCommand: NSScriptCommand {
+    override func performDefaultImplementation() -> Any? {
+        guard let terminal = evaluatedArguments?["terminal"] as? ScriptTerminal else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing terminal target."
+            return nil
+        }
+
+        guard let surfaceView = terminal.surfaceView else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal surface is no longer available."
+            return nil
+        }
+
+        guard let directionCode = evaluatedArguments?["direction"] as? UInt32,
+              let direction = ScriptSplitDirection(code: directionCode) else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing or unknown split direction."
+            return nil
+        }
+
+        // Find the window controller that owns this surface.
+        guard let controller = surfaceView.window?.windowController as? BaseTerminalController else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal is not in a splittable window."
+            return nil
+        }
+
+        guard let newView = controller.newSplit(at: surfaceView, direction: direction.splitDirection) else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Failed to create split."
+            return nil
+        }
+
+        return ScriptTerminal(surfaceView: newView)
+    }
+}
+
+/// Four-character codes matching the `split direction` enumeration in `Ghostty.sdef`.
+private enum ScriptSplitDirection {
+    case right
+    case left
+    case down
+    case up
+
+    init?(code: UInt32) {
+        switch code {
+        case "GSrt".fourCharCode: self = .right
+        case "GSlf".fourCharCode: self = .left
+        case "GSdn".fourCharCode: self = .down
+        case "GSup".fourCharCode: self = .up
+        default: return nil
+        }
+    }
+
+    var splitDirection: SplitTree<Ghostty.SurfaceView>.NewDirection {
+        switch self {
+        case .right: .right
+        case .left: .left
+        case .down: .down
+        case .up: .up
+        }
+    }
+}
+
diff --git a/macos/Sources/Features/AppleScript/AppleScriptTerminal.swift b/macos/Sources/Features/AppleScript/ScriptTerminal.swift
similarity index 90%
rename from macos/Sources/Features/AppleScript/AppleScriptTerminal.swift
rename to macos/Sources/Features/AppleScript/ScriptTerminal.swift
index 3f6603d0e..1e47aa7b6 100644
--- a/macos/Sources/Features/AppleScript/AppleScriptTerminal.swift
+++ b/macos/Sources/Features/AppleScript/ScriptTerminal.swift
@@ -17,7 +17,10 @@ import AppKit
 @MainActor
 @objc(GhosttyScriptTerminal)
 final class ScriptTerminal: NSObject {
-    private weak var surfaceView: Ghostty.SurfaceView?
+    /// Weak reference to the underlying surface. Package-visible so that
+    /// other AppleScript command handlers (e.g. `ScriptSplitCommand`) can
+    /// access the live surface without exposing it to ObjC/AppleScript.
+    weak var surfaceView: Ghostty.SurfaceView?
 
     init(surfaceView: Ghostty.SurfaceView) {
         self.surfaceView = surfaceView
diff --git a/macos/Sources/Helpers/Extensions/String+Extension.swift b/macos/Sources/Helpers/Extensions/String+Extension.swift
index e28877ca8..4fa61cd78 100644
--- a/macos/Sources/Helpers/Extensions/String+Extension.swift
+++ b/macos/Sources/Helpers/Extensions/String+Extension.swift
@@ -27,4 +27,13 @@ extension String {
     }
 #endif
 
+    /// Converts a four-character ASCII string to its `FourCharCode` (`UInt32`) value.
+    var fourCharCode: UInt32 {
+        assert(count <= 4, "FourCharCode string must be at most 4 characters")
+        var result: UInt32 = 0
+        for byte in utf8.prefix(4) {
+            result = (result << 8) | UInt32(byte)
+        }
+        return result
+    }
 }

From 1742aeda503c57979b7faa54c9ecffa9a176abde Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 5 Mar 2026 20:57:08 -0800
Subject: [PATCH 035/391] macos: add focus and close AppleScript commands for
 terminals
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add two new AppleScript commands to the scripting dictionary:

- `focus terminal <terminal>` — focuses the given terminal and brings
  its window to the front.
- `close terminal <terminal>` — closes the given terminal without a
  confirmation prompt.

Each command is implemented as an NSScriptCommand subclass following
the same pattern as the existing split command.
---
 macos/AGENTS.md                               | 15 +++++----
 macos/Ghostty.sdef                            | 14 ++++++++
 .../AppleScript/ScriptCloseCommand.swift      | 33 +++++++++++++++++++
 .../AppleScript/ScriptFocusCommand.swift      | 33 +++++++++++++++++++
 4 files changed, 88 insertions(+), 7 deletions(-)
 create mode 100644 macos/Sources/Features/AppleScript/ScriptCloseCommand.swift
 create mode 100644 macos/Sources/Features/AppleScript/ScriptFocusCommand.swift

diff --git a/macos/AGENTS.md b/macos/AGENTS.md
index 8fe34a0df..f18234b88 100644
--- a/macos/AGENTS.md
+++ b/macos/AGENTS.md
@@ -1,19 +1,20 @@
 # macOS Ghostty Application
 
 - Use `swiftlint` for formatting and linting Swift code.
-- If code outside of this directory is modified, use
+- If code outside of `macos/` directory is modified, use
   `zig build -Demit-macos-app=false` before building the macOS app to update
   the underlying Ghostty library.
-- Use `build.nu` to build the macOS app, do not use `zig build`
+- Use `macos/build.nu` to build the macOS app, do not use `zig build`
   (except to build the underlying library as mentioned above).
-  - Build: `build.nu [--scheme Ghostty] [--configuration Debug] [--action build]`
-  - Output: `build/<configuration>/Ghostty.app` (e.g. `build/Debug/Ghostty.app`)
-- Run unit tests directly with `build.nu --action test`
+  - Build: `macos/build.nu [--scheme Ghostty] [--configuration Debug] [--action build]`
+  - Output: `macos/build/<configuration>/Ghostty.app` (e.g. `macos/build/Debug/Ghostty.app`)
+- Run unit tests directly with `macos/build.nu --action test`
+
 ## AppleScript
 
-- The AppleScript scripting definition is in `Ghostty.sdef`.
+- The AppleScript scripting definition is in `macos/Ghostty.sdef`.
 - Test AppleScript support:
-  (1) Build with `build.nu`
+  (1) Build with `macos/build.nu`
   (2) Launch and activate the app via osascript using the absolute path
       to the built app bundle:
       `osascript -e 'tell application "<absolute path to build/Debug/Ghostty.app>" to activate'`
diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index 962e1329a..2c27a861f 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -44,6 +44,20 @@
       </parameter>
       <result type="terminal" description="The newly created terminal."/>
     </command>
+
+    <command name="focus" code="GhstFcus" description="Focus a terminal, bringing its window to the front.">
+      <cocoa class="GhosttyScriptFocusCommand"/>
+      <parameter name="terminal" code="GFcT" type="terminal" description="The terminal to focus.">
+        <cocoa key="terminal"/>
+      </parameter>
+    </command>
+
+    <command name="close" code="GhstClos" description="Close a terminal.">
+      <cocoa class="GhosttyScriptCloseCommand"/>
+      <parameter name="terminal" code="GClT" type="terminal" description="The terminal to close.">
+        <cocoa key="terminal"/>
+      </parameter>
+    </command>
   </suite>
 
   <!--
diff --git a/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift b/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift
new file mode 100644
index 000000000..e8fdbb0a9
--- /dev/null
+++ b/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift
@@ -0,0 +1,33 @@
+import AppKit
+
+/// Handler for the `close` AppleScript command defined in `Ghostty.sdef`.
+///
+/// Cocoa scripting instantiates this class because the command's `<cocoa>` element
+/// specifies `class="GhosttyScriptCloseCommand"`. The runtime calls
+/// `performDefaultImplementation()` to execute the command.
+@MainActor
+@objc(GhosttyScriptCloseCommand)
+final class ScriptCloseCommand: NSScriptCommand {
+    override func performDefaultImplementation() -> Any? {
+        guard let terminal = evaluatedArguments?["terminal"] as? ScriptTerminal else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing terminal target."
+            return nil
+        }
+
+        guard let surfaceView = terminal.surfaceView else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal surface is no longer available."
+            return nil
+        }
+
+        guard let controller = surfaceView.window?.windowController as? BaseTerminalController else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal is not in a window."
+            return nil
+        }
+
+        controller.closeSurface(surfaceView, withConfirmation: false)
+        return nil
+    }
+}
diff --git a/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift b/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift
new file mode 100644
index 000000000..024aee4de
--- /dev/null
+++ b/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift
@@ -0,0 +1,33 @@
+import AppKit
+
+/// Handler for the `focus` AppleScript command defined in `Ghostty.sdef`.
+///
+/// Cocoa scripting instantiates this class because the command's `<cocoa>` element
+/// specifies `class="GhosttyScriptFocusCommand"`. The runtime calls
+/// `performDefaultImplementation()` to execute the command.
+@MainActor
+@objc(GhosttyScriptFocusCommand)
+final class ScriptFocusCommand: NSScriptCommand {
+    override func performDefaultImplementation() -> Any? {
+        guard let terminal = evaluatedArguments?["terminal"] as? ScriptTerminal else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing terminal target."
+            return nil
+        }
+
+        guard let surfaceView = terminal.surfaceView else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal surface is no longer available."
+            return nil
+        }
+
+        guard let controller = surfaceView.window?.windowController as? BaseTerminalController else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal is not in a window."
+            return nil
+        }
+
+        controller.focusSurface(surfaceView)
+        return nil
+    }
+}

From fd5ad1f574e3ad084db0e2a9b2161edaf53e85e5 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 5 Mar 2026 21:03:45 -0800
Subject: [PATCH 036/391] macos: add AppleScript commands for text input, key,
 and mouse events

Add five new AppleScript commands to Ghostty.sdef mirroring the existing
App Intents for terminal input:

- `input text`: send text to a terminal as if pasted
- `send key`: simulate a keyboard event with optional action and modifiers
- `send mouse button`: send a mouse button press/release event
- `send mouse position`: send a mouse cursor position event
- `send mouse scroll`: send a scroll event with precision and momentum

A shared `input action` enumeration (press/release) is used by both key
and mouse button commands. Modifier keys are passed as a comma-separated
string parameter (shift, control, option, command).
---
 macos/Ghostty.sdef                            | 92 ++++++++++++++++++
 .../Ghostty.Input.Mods+AppleScript.swift      | 18 ++++
 .../AppleScript/ScriptInputTextCommand.swift  | 39 ++++++++
 .../AppleScript/ScriptKeyEventCommand.swift   | 74 +++++++++++++++
 .../ScriptMouseButtonCommand.swift            | 93 +++++++++++++++++++
 .../AppleScript/ScriptMousePosCommand.swift   | 63 +++++++++++++
 .../ScriptMouseScrollCommand.swift            | 69 ++++++++++++++
 7 files changed, 448 insertions(+)
 create mode 100644 macos/Sources/Features/AppleScript/Ghostty.Input.Mods+AppleScript.swift
 create mode 100644 macos/Sources/Features/AppleScript/ScriptInputTextCommand.swift
 create mode 100644 macos/Sources/Features/AppleScript/ScriptKeyEventCommand.swift
 create mode 100644 macos/Sources/Features/AppleScript/ScriptMouseButtonCommand.swift
 create mode 100644 macos/Sources/Features/AppleScript/ScriptMousePosCommand.swift
 create mode 100644 macos/Sources/Features/AppleScript/ScriptMouseScrollCommand.swift

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index 2c27a861f..ba959fe01 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -58,6 +58,98 @@
         <cocoa key="terminal"/>
       </parameter>
     </command>
+
+    <command name="input text" code="GhstInTx" description="Input text to a terminal as if it was pasted.">
+      <cocoa class="GhosttyScriptInputTextCommand"/>
+      <direct-parameter type="text" description="The text to input."/>
+      <parameter name="to" code="GItT" type="terminal" description="The terminal to input text to.">
+        <cocoa key="terminal"/>
+      </parameter>
+    </command>
+
+    <enumeration name="input action" code="GIAc" description="Whether an input is pressed or released.">
+      <enumerator name="press" code="GIpr" description="Press."/>
+      <enumerator name="release" code="GIrl" description="Release."/>
+    </enumeration>
+
+    <command name="send key" code="GhstSKey" description="Send a keyboard event to a terminal.">
+      <cocoa class="GhosttyScriptKeyEventCommand"/>
+      <direct-parameter type="text" description="The key name (e.g. &quot;enter&quot;, &quot;a&quot;, &quot;space&quot;)."/>
+      <parameter name="action" code="GKeA" type="input action" optional="yes" description="Press or release (default: press).">
+        <cocoa key="action"/>
+      </parameter>
+      <parameter name="modifiers" code="GKeM" type="text" optional="yes" description="Comma-separated modifier keys: shift, control, option, command.">
+        <cocoa key="modifiers"/>
+      </parameter>
+      <parameter name="to" code="GKeT" type="terminal" description="The terminal to send the key event to.">
+        <cocoa key="terminal"/>
+      </parameter>
+    </command>
+
+    <enumeration name="mouse button" code="GMBt" description="A mouse button.">
+      <enumerator name="left button" code="GMlf" description="Left mouse button."/>
+      <enumerator name="right button" code="GMrt" description="Right mouse button."/>
+      <enumerator name="middle button" code="GMmd" description="Middle mouse button."/>
+    </enumeration>
+
+    <command name="send mouse button" code="GhstSMBt" description="Send a mouse button event to a terminal.">
+      <cocoa class="GhosttyScriptMouseButtonCommand"/>
+      <direct-parameter type="mouse button" description="The mouse button."/>
+      <parameter name="action" code="GMbA" type="input action" optional="yes" description="Press or release (default: press).">
+        <cocoa key="action"/>
+      </parameter>
+      <parameter name="modifiers" code="GMbM" type="text" optional="yes" description="Comma-separated modifier keys: shift, control, option, command.">
+        <cocoa key="modifiers"/>
+      </parameter>
+      <parameter name="to" code="GMbT" type="terminal" description="The terminal to send the event to.">
+        <cocoa key="terminal"/>
+      </parameter>
+    </command>
+
+    <command name="send mouse position" code="GhstSMPs" description="Send a mouse position event to a terminal.">
+      <cocoa class="GhosttyScriptMousePosCommand"/>
+      <parameter name="x" code="GMpX" type="real" description="Horizontal position in pixels.">
+        <cocoa key="x"/>
+      </parameter>
+      <parameter name="y" code="GMpY" type="real" description="Vertical position in pixels.">
+        <cocoa key="y"/>
+      </parameter>
+      <parameter name="modifiers" code="GMpM" type="text" optional="yes" description="Comma-separated modifier keys: shift, control, option, command.">
+        <cocoa key="modifiers"/>
+      </parameter>
+      <parameter name="to" code="GMpT" type="terminal" description="The terminal to send the event to.">
+        <cocoa key="terminal"/>
+      </parameter>
+    </command>
+
+    <enumeration name="scroll momentum" code="GSMo" description="Momentum phase for inertial scrolling.">
+      <enumerator name="none" code="SMno" description="No momentum."/>
+      <enumerator name="began" code="SMbg" description="Momentum began."/>
+      <enumerator name="changed" code="SMch" description="Momentum changed."/>
+      <enumerator name="ended" code="SMen" description="Momentum ended."/>
+      <enumerator name="cancelled" code="SMcn" description="Momentum cancelled."/>
+      <enumerator name="may begin" code="SMmb" description="Momentum may begin."/>
+      <enumerator name="stationary" code="SMst" description="Stationary."/>
+    </enumeration>
+
+    <command name="send mouse scroll" code="GhstSMSc" description="Send a mouse scroll event to a terminal.">
+      <cocoa class="GhosttyScriptMouseScrollCommand"/>
+      <parameter name="x" code="GMsX" type="real" description="Horizontal scroll delta.">
+        <cocoa key="x"/>
+      </parameter>
+      <parameter name="y" code="GMsY" type="real" description="Vertical scroll delta.">
+        <cocoa key="y"/>
+      </parameter>
+      <parameter name="precision" code="GMsP" type="boolean" optional="yes" description="High-precision scroll (e.g. trackpad). Default: false.">
+        <cocoa key="precision"/>
+      </parameter>
+      <parameter name="momentum" code="GMsM" type="scroll momentum" optional="yes" description="Momentum phase for inertial scrolling. Default: none.">
+        <cocoa key="momentum"/>
+      </parameter>
+      <parameter name="to" code="GMsT" type="terminal" description="The terminal to send the event to.">
+        <cocoa key="terminal"/>
+      </parameter>
+    </command>
   </suite>
 
   <!--
diff --git a/macos/Sources/Features/AppleScript/Ghostty.Input.Mods+AppleScript.swift b/macos/Sources/Features/AppleScript/Ghostty.Input.Mods+AppleScript.swift
new file mode 100644
index 000000000..72a274c08
--- /dev/null
+++ b/macos/Sources/Features/AppleScript/Ghostty.Input.Mods+AppleScript.swift
@@ -0,0 +1,18 @@
+extension Ghostty.Input.Mods {
+    /// Parses a comma-separated modifier string into `Ghostty.Input.Mods`.
+    ///
+    /// Recognized names: `shift`, `control`, `option`, `command`.
+    /// Returns `nil` if any unrecognized modifier name is encountered.
+    init?(scriptModifiers string: String) {
+        self = []
+        for part in string.split(separator: ",") {
+            switch part.trimmingCharacters(in: .whitespaces).lowercased() {
+            case "shift": insert(.shift)
+            case "control": insert(.ctrl)
+            case "option": insert(.alt)
+            case "command": insert(.super)
+            default: return nil
+            }
+        }
+    }
+}
diff --git a/macos/Sources/Features/AppleScript/ScriptInputTextCommand.swift b/macos/Sources/Features/AppleScript/ScriptInputTextCommand.swift
new file mode 100644
index 000000000..729c20e6c
--- /dev/null
+++ b/macos/Sources/Features/AppleScript/ScriptInputTextCommand.swift
@@ -0,0 +1,39 @@
+import AppKit
+
+/// Handler for the `input text` AppleScript command defined in `Ghostty.sdef`.
+///
+/// Cocoa scripting instantiates this class because the command's `<cocoa>` element
+/// specifies `class="GhosttyScriptInputTextCommand"`. The runtime calls
+/// `performDefaultImplementation()` to execute the command.
+@MainActor
+@objc(GhosttyScriptInputTextCommand)
+final class ScriptInputTextCommand: NSScriptCommand {
+    override func performDefaultImplementation() -> Any? {
+        guard let text = directParameter as? String else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing text to input."
+            return nil
+        }
+
+        guard let terminal = evaluatedArguments?["terminal"] as? ScriptTerminal else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing terminal target."
+            return nil
+        }
+
+        guard let surfaceView = terminal.surfaceView else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal surface is no longer available."
+            return nil
+        }
+
+        guard let surface = surfaceView.surfaceModel else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal surface model is not available."
+            return nil
+        }
+
+        surface.sendText(text)
+        return nil
+    }
+}
diff --git a/macos/Sources/Features/AppleScript/ScriptKeyEventCommand.swift b/macos/Sources/Features/AppleScript/ScriptKeyEventCommand.swift
new file mode 100644
index 000000000..8ac5afb9c
--- /dev/null
+++ b/macos/Sources/Features/AppleScript/ScriptKeyEventCommand.swift
@@ -0,0 +1,74 @@
+import AppKit
+
+/// Handler for the `send key` AppleScript command defined in `Ghostty.sdef`.
+///
+/// Cocoa scripting instantiates this class because the command's `<cocoa>` element
+/// specifies `class="GhosttyScriptKeyEventCommand"`. The runtime calls
+/// `performDefaultImplementation()` to execute the command.
+@MainActor
+@objc(GhosttyScriptKeyEventCommand)
+final class ScriptKeyEventCommand: NSScriptCommand {
+    override func performDefaultImplementation() -> Any? {
+        guard let keyName = directParameter as? String else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing key name."
+            return nil
+        }
+
+        guard let terminal = evaluatedArguments?["terminal"] as? ScriptTerminal else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing terminal target."
+            return nil
+        }
+
+        guard let surfaceView = terminal.surfaceView else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal surface is no longer available."
+            return nil
+        }
+
+        guard let surface = surfaceView.surfaceModel else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal surface model is not available."
+            return nil
+        }
+
+        guard let key = Ghostty.Input.Key(rawValue: keyName) else {
+            scriptErrorNumber = errAECoercionFail
+            scriptErrorString = "Unknown key name: \(keyName)"
+            return nil
+        }
+
+        let action: Ghostty.Input.Action
+        if let actionCode = evaluatedArguments?["action"] as? UInt32 {
+            switch actionCode {
+            case "GIpr".fourCharCode: action = .press
+            case "GIrl".fourCharCode: action = .release
+            default: action = .press
+            }
+        } else {
+            action = .press
+        }
+
+        let mods: Ghostty.Input.Mods
+        if let modsString = evaluatedArguments?["modifiers"] as? String {
+            guard let parsed = Ghostty.Input.Mods(scriptModifiers: modsString) else {
+                scriptErrorNumber = errAECoercionFail
+                scriptErrorString = "Unknown modifier in: \(modsString)"
+                return nil
+            }
+            mods = parsed
+        } else {
+            mods = []
+        }
+
+        let keyEvent = Ghostty.Input.KeyEvent(
+            key: key,
+            action: action,
+            mods: mods
+        )
+        surface.sendKeyEvent(keyEvent)
+
+        return nil
+    }
+}
diff --git a/macos/Sources/Features/AppleScript/ScriptMouseButtonCommand.swift b/macos/Sources/Features/AppleScript/ScriptMouseButtonCommand.swift
new file mode 100644
index 000000000..2070cb1ee
--- /dev/null
+++ b/macos/Sources/Features/AppleScript/ScriptMouseButtonCommand.swift
@@ -0,0 +1,93 @@
+import AppKit
+
+/// Handler for the `send mouse button` AppleScript command defined in `Ghostty.sdef`.
+///
+/// Cocoa scripting instantiates this class because the command's `<cocoa>` element
+/// specifies `class="GhosttyScriptMouseButtonCommand"`. The runtime calls
+/// `performDefaultImplementation()` to execute the command.
+@MainActor
+@objc(GhosttyScriptMouseButtonCommand)
+final class ScriptMouseButtonCommand: NSScriptCommand {
+    override func performDefaultImplementation() -> Any? {
+        guard let buttonCode = directParameter as? UInt32,
+              let button = ScriptMouseButtonValue(code: buttonCode) else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing or unknown mouse button."
+            return nil
+        }
+
+        guard let terminal = evaluatedArguments?["terminal"] as? ScriptTerminal else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing terminal target."
+            return nil
+        }
+
+        guard let surfaceView = terminal.surfaceView else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal surface is no longer available."
+            return nil
+        }
+
+        guard let surface = surfaceView.surfaceModel else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal surface model is not available."
+            return nil
+        }
+
+        let action: Ghostty.Input.MouseState
+        if let actionCode = evaluatedArguments?["action"] as? UInt32 {
+            switch actionCode {
+            case "GIpr".fourCharCode: action = .press
+            case "GIrl".fourCharCode: action = .release
+            default: action = .press
+            }
+        } else {
+            action = .press
+        }
+
+        let mods: Ghostty.Input.Mods
+        if let modsString = evaluatedArguments?["modifiers"] as? String {
+            guard let parsed = Ghostty.Input.Mods(scriptModifiers: modsString) else {
+                scriptErrorNumber = errAECoercionFail
+                scriptErrorString = "Unknown modifier in: \(modsString)"
+                return nil
+            }
+            mods = parsed
+        } else {
+            mods = []
+        }
+
+        let mouseEvent = Ghostty.Input.MouseButtonEvent(
+            action: action,
+            button: button.ghosttyButton,
+            mods: mods
+        )
+        surface.sendMouseButton(mouseEvent)
+
+        return nil
+    }
+}
+
+/// Four-character codes matching the `mouse button` enumeration in `Ghostty.sdef`.
+private enum ScriptMouseButtonValue {
+    case left
+    case right
+    case middle
+
+    init?(code: UInt32) {
+        switch code {
+        case "GMlf".fourCharCode: self = .left
+        case "GMrt".fourCharCode: self = .right
+        case "GMmd".fourCharCode: self = .middle
+        default: return nil
+        }
+    }
+
+    var ghosttyButton: Ghostty.Input.MouseButton {
+        switch self {
+        case .left: .left
+        case .right: .right
+        case .middle: .middle
+        }
+    }
+}
diff --git a/macos/Sources/Features/AppleScript/ScriptMousePosCommand.swift b/macos/Sources/Features/AppleScript/ScriptMousePosCommand.swift
new file mode 100644
index 000000000..8ee56ec91
--- /dev/null
+++ b/macos/Sources/Features/AppleScript/ScriptMousePosCommand.swift
@@ -0,0 +1,63 @@
+import AppKit
+
+/// Handler for the `send mouse position` AppleScript command defined in `Ghostty.sdef`.
+///
+/// Cocoa scripting instantiates this class because the command's `<cocoa>` element
+/// specifies `class="GhosttyScriptMousePosCommand"`. The runtime calls
+/// `performDefaultImplementation()` to execute the command.
+@MainActor
+@objc(GhosttyScriptMousePosCommand)
+final class ScriptMousePosCommand: NSScriptCommand {
+    override func performDefaultImplementation() -> Any? {
+        guard let x = evaluatedArguments?["x"] as? Double else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing x position."
+            return nil
+        }
+
+        guard let y = evaluatedArguments?["y"] as? Double else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing y position."
+            return nil
+        }
+
+        guard let terminal = evaluatedArguments?["terminal"] as? ScriptTerminal else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing terminal target."
+            return nil
+        }
+
+        guard let surfaceView = terminal.surfaceView else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal surface is no longer available."
+            return nil
+        }
+
+        guard let surface = surfaceView.surfaceModel else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal surface model is not available."
+            return nil
+        }
+
+        let mods: Ghostty.Input.Mods
+        if let modsString = evaluatedArguments?["modifiers"] as? String {
+            guard let parsed = Ghostty.Input.Mods(scriptModifiers: modsString) else {
+                scriptErrorNumber = errAECoercionFail
+                scriptErrorString = "Unknown modifier in: \(modsString)"
+                return nil
+            }
+            mods = parsed
+        } else {
+            mods = []
+        }
+
+        let mousePosEvent = Ghostty.Input.MousePosEvent(
+            x: x,
+            y: y,
+            mods: mods
+        )
+        surface.sendMousePos(mousePosEvent)
+
+        return nil
+    }
+}
diff --git a/macos/Sources/Features/AppleScript/ScriptMouseScrollCommand.swift b/macos/Sources/Features/AppleScript/ScriptMouseScrollCommand.swift
new file mode 100644
index 000000000..6ce24a317
--- /dev/null
+++ b/macos/Sources/Features/AppleScript/ScriptMouseScrollCommand.swift
@@ -0,0 +1,69 @@
+import AppKit
+
+/// Handler for the `send mouse scroll` AppleScript command defined in `Ghostty.sdef`.
+///
+/// Cocoa scripting instantiates this class because the command's `<cocoa>` element
+/// specifies `class="GhosttyScriptMouseScrollCommand"`. The runtime calls
+/// `performDefaultImplementation()` to execute the command.
+@MainActor
+@objc(GhosttyScriptMouseScrollCommand)
+final class ScriptMouseScrollCommand: NSScriptCommand {
+    override func performDefaultImplementation() -> Any? {
+        guard let x = evaluatedArguments?["x"] as? Double else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing x scroll delta."
+            return nil
+        }
+
+        guard let y = evaluatedArguments?["y"] as? Double else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing y scroll delta."
+            return nil
+        }
+
+        guard let terminal = evaluatedArguments?["terminal"] as? ScriptTerminal else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing terminal target."
+            return nil
+        }
+
+        guard let surfaceView = terminal.surfaceView else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal surface is no longer available."
+            return nil
+        }
+
+        guard let surface = surfaceView.surfaceModel else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Terminal surface model is not available."
+            return nil
+        }
+
+        let precision = evaluatedArguments?["precision"] as? Bool ?? false
+
+        let momentum: Ghostty.Input.Momentum
+        if let momentumCode = evaluatedArguments?["momentum"] as? UInt32 {
+            switch momentumCode {
+            case "SMno".fourCharCode: momentum = .none
+            case "SMbg".fourCharCode: momentum = .began
+            case "SMch".fourCharCode: momentum = .changed
+            case "SMen".fourCharCode: momentum = .ended
+            case "SMcn".fourCharCode: momentum = .cancelled
+            case "SMmb".fourCharCode: momentum = .mayBegin
+            case "SMst".fourCharCode: momentum = .stationary
+            default: momentum = .none
+            }
+        } else {
+            momentum = .none
+        }
+
+        let scrollEvent = Ghostty.Input.MouseScrollEvent(
+            x: x,
+            y: y,
+            mods: .init(precision: precision, momentum: momentum)
+        )
+        surface.sendMouseScroll(scrollEvent)
+
+        return nil
+    }
+}

From ffe622ed30c60eb2a0ed2fdd644b2b4f606b0ba0 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 5 Mar 2026 21:23:20 -0800
Subject: [PATCH 037/391] macos: add standard application properties and
 commands

Add standard Cocoa scripting definitions to the AppleScript dictionary:

- Application properties: name, frontmost, version
- Standard Suite commands: exists, quit

These are backed by built-in Cocoa scripting classes (NSExistsCommand,
NSQuitCommand) and standard NSApplication KVC keys, so no Swift code
changes are needed.
---
 macos/Ghostty.sdef | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index ba959fe01..dcb973974 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -5,6 +5,11 @@
   <suite name="Ghostty Suite" code="Ghst" description="Ghostty scripting support.">
     <class name="application" code="capp" description="The Ghostty application.">
       <cocoa class="NSApplication"/>
+      <property name="name" code="pnam" type="text" access="r" description="The name of the application."/>
+      <property name="frontmost" code="pisf" type="boolean" access="r" description="Is this the active application?">
+        <cocoa key="isActive"/>
+      </property>
+      <property name="version" code="vers" type="text" access="r" description="The version number of the application."/>
       <responds-to command="perform action">
         <cocoa method="handlePerformActionScriptCommand:"/>
       </responds-to>
@@ -167,5 +172,16 @@
       </parameter>
       <result type="integer" description="The count."/>
     </command>
+
+    <command name="exists" code="coredoex" description="Verify that an object exists.">
+      <cocoa class="NSExistsCommand"/>
+      <access-group identifier="*"/>
+      <direct-parameter type="any" requires-access="r" description="The object(s) to check."/>
+      <result type="boolean" description="Did the object(s) exist?"/>
+    </command>
+
+    <command name="quit" code="aevtquit" description="Quit the application.">
+      <cocoa class="NSQuitCommand"/>
+    </command>
   </suite>
 </dictionary>

From 547fd6f748e9c504019513b3ec95fdf5a1ec4efb Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 5 Mar 2026 21:25:00 -0800
Subject: [PATCH 038/391] typos: ignore apple four char codes

---
 typos.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/typos.toml b/typos.toml
index 6cdf04dbb..408d58f73 100644
--- a/typos.toml
+++ b/typos.toml
@@ -46,6 +46,9 @@ extend-ignore-re = [
   "\"hel\\\\x",
   # Ignore long hex-like IDs such as 815E26BA2EF1E00F005C67B1
   "[0-9A-F]{12,}",
+  # Ignore Apple four char codes
+  'code="[A-Za-z]{4,8}"',
+  '"[A-Za-z]{4}"\.fourCharCode',
 ]
 
 [default.extend-words]

From d03338c1b53e1f0bc1e5f711f91c5d474d27ceee Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 5 Mar 2026 21:29:55 -0800
Subject: [PATCH 039/391] macos: fix iOS build

---
 macos/Ghostty.xcodeproj/project.pbxproj | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/macos/Ghostty.xcodeproj/project.pbxproj b/macos/Ghostty.xcodeproj/project.pbxproj
index ce3f2edcc..6b89e28c9 100644
--- a/macos/Ghostty.xcodeproj/project.pbxproj
+++ b/macos/Ghostty.xcodeproj/project.pbxproj
@@ -137,6 +137,14 @@
 				"Features/App Intents/NewTerminalIntent.swift",
 				"Features/App Intents/QuickTerminalIntent.swift",
 				"Features/AppleScript/AppDelegate+AppleScript.swift",
+				"Features/AppleScript/Ghostty.Input.Mods+AppleScript.swift",
+				Features/AppleScript/ScriptCloseCommand.swift,
+				Features/AppleScript/ScriptFocusCommand.swift,
+				Features/AppleScript/ScriptInputTextCommand.swift,
+				Features/AppleScript/ScriptKeyEventCommand.swift,
+				Features/AppleScript/ScriptMouseButtonCommand.swift,
+				Features/AppleScript/ScriptMousePosCommand.swift,
+				Features/AppleScript/ScriptMouseScrollCommand.swift,
 				Features/AppleScript/ScriptSplitCommand.swift,
 				Features/AppleScript/ScriptTerminal.swift,
 				Features/ClipboardConfirmation/ClipboardConfirmation.xib,

From 341d8bdf754b85fe0dfaa57ceabe598e7eea0c59 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 6 Mar 2026 07:11:04 -0800
Subject: [PATCH 040/391] macos: AppleScript windows/tabs

Add ScriptWindow and ScriptTab classes to expose window/tab hierarchy
to AppleScript, along with the corresponding sdef definitions.
---
 macos/Ghostty.sdef                            |  22 +++
 macos/Ghostty.xcodeproj/project.pbxproj       |   2 +
 .../AppleScript/AppDelegate+AppleScript.swift | 112 ++++++++++-
 .../Features/AppleScript/ScriptTab.swift      |  85 +++++++++
 .../Features/AppleScript/ScriptWindow.swift   | 174 ++++++++++++++++++
 .../ObjectIdentifier+Extension.swift          |   7 +
 6 files changed, 396 insertions(+), 6 deletions(-)
 create mode 100644 macos/Sources/Features/AppleScript/ScriptTab.swift
 create mode 100644 macos/Sources/Features/AppleScript/ScriptWindow.swift
 create mode 100644 macos/Sources/Helpers/Extensions/ObjectIdentifier+Extension.swift

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index dcb973974..e2410a4bd 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -14,11 +14,33 @@
         <cocoa method="handlePerformActionScriptCommand:"/>
       </responds-to>
 
+      <element type="window" access="r">
+        <cocoa key="scriptWindows"/>
+      </element>
+
       <element type="terminal" access="r">
         <cocoa key="terminals"/>
       </element>
     </class>
 
+    <class name="window" code="Gwnd" plural="windows" description="A Ghostty window containing one or more tabs.">
+      <cocoa class="GhosttyScriptWindow"/>
+      <property name="id" code="ID  " type="text" access="r" description="Stable ID for this window."/>
+      <property name="selected tab" code="GWsT" type="tab" access="r" description="The selected tab in this window.">
+        <cocoa key="selectedTab"/>
+      </property>
+      <element type="tab" access="r">
+        <cocoa key="tabs"/>
+      </element>
+    </class>
+
+    <class name="tab" code="Gtab" plural="tabs" description="A tab within a Ghostty window.">
+      <cocoa class="GhosttyScriptTab"/>
+      <property name="id" code="ID  " type="text" access="r" description="Stable ID for this tab."/>
+      <property name="index" code="pidx" type="integer" access="r" description="1-based index of this tab in its window."/>
+      <property name="selected" code="GTsl" type="boolean" access="r" description="Whether this tab is selected in its window."/>
+    </class>
+
     <class name="terminal" code="Gtrm" plural="terminals" description="An individual terminal surface.">
       <cocoa class="GhosttyScriptTerminal"/>
       <property name="id" code="ID  " type="text" access="r" description="Stable ID for this terminal surface."/>
diff --git a/macos/Ghostty.xcodeproj/project.pbxproj b/macos/Ghostty.xcodeproj/project.pbxproj
index 6b89e28c9..f667bb76e 100644
--- a/macos/Ghostty.xcodeproj/project.pbxproj
+++ b/macos/Ghostty.xcodeproj/project.pbxproj
@@ -146,7 +146,9 @@
 				Features/AppleScript/ScriptMousePosCommand.swift,
 				Features/AppleScript/ScriptMouseScrollCommand.swift,
 				Features/AppleScript/ScriptSplitCommand.swift,
+				Features/AppleScript/ScriptTab.swift,
 				Features/AppleScript/ScriptTerminal.swift,
+				Features/AppleScript/ScriptWindow.swift,
 				Features/ClipboardConfirmation/ClipboardConfirmation.xib,
 				Features/ClipboardConfirmation/ClipboardConfirmationController.swift,
 				Features/ClipboardConfirmation/ClipboardConfirmationView.swift,
diff --git a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
index 267863712..519d2805f 100644
--- a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
+++ b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
@@ -2,10 +2,74 @@ import AppKit
 
 /// Application-level Cocoa scripting hooks for the Ghostty AppleScript dictionary.
 ///
-/// Cocoa scripting looks for specifically named Objective-C selectors derived
-/// from the `sdef` file. This extension implements those required entry points
-/// on `NSApplication`, which is the object behind the `application` class in
+/// Cocoa scripting is mostly convention-based: we do not register handlers in
+/// code, we expose Objective-C selectors with names Cocoa derives from
 /// `Ghostty.sdef`.
+///
+/// In practical terms:
+/// - An `<element>` in `sdef` maps to an ObjC collection accessor.
+/// - Unique-ID element lookup maps to `valueIn...WithUniqueID:`.
+/// - Some `<command>` declarations map to `handle...ScriptCommand:`.
+///
+/// This file implements the selectors Cocoa expects on `NSApplication`, which is
+/// the runtime object behind the `application` class in `Ghostty.sdef`.
+
+// MARK: - Windows
+
+@MainActor
+extension NSApplication {
+    /// Backing collection for `application.windows`.
+    ///
+    /// We expose one scripting window per native tab group so scripts see the
+    /// expected window/tab hierarchy instead of one AppKit window per tab.
+    ///
+    /// Required selector name from the `sdef` element key: `scriptWindows`.
+    ///
+    /// Cocoa scripting calls this whenever AppleScript evaluates a window list,
+    /// such as `windows`, `window 1`, or `every window whose ...`.
+    @objc(scriptWindows)
+    var scriptWindows: [ScriptWindow] {
+        // AppKit exposes one NSWindow per tab. AppleScript users expect one
+        // top-level window object containing multiple tabs, so we dedupe tab
+        // siblings into a single ScriptWindow.
+        var seen: Set<ObjectIdentifier> = []
+        var result: [ScriptWindow] = []
+
+        for controller in orderedTerminalControllers {
+            // Collapse each controller to one canonical representative for the
+            // whole tab group. Standalone windows map to themselves.
+            guard let primary = primaryTerminalController(for: controller) else {
+                continue
+            }
+
+            let primaryControllerID = ObjectIdentifier(primary)
+            guard seen.insert(primaryControllerID).inserted else {
+                // Another tab from this group already created the scripting
+                // window object.
+                continue
+            }
+
+            result.append(ScriptWindow(primaryController: primary))
+        }
+
+        return result
+    }
+
+    /// Enables AppleScript unique-ID lookup for window references.
+    ///
+    /// Required selector name pattern for element key `scriptWindows`:
+    /// `valueInScriptWindowsWithUniqueID:`.
+    ///
+    /// Cocoa calls this when a script resolves `window id "..."`.
+    /// Returning `nil` makes the object specifier fail naturally.
+    @objc(valueInScriptWindowsWithUniqueID:)
+    func valueInScriptWindows(uniqueID: String) -> ScriptWindow? {
+        scriptWindows.first(where: { $0.stableID == uniqueID })
+    }
+}
+
+// MARK: - Terminals
+
 @MainActor
 extension NSApplication {
     /// Backing collection for `application.terminals`.
@@ -29,7 +93,12 @@ extension NSApplication {
             .first(where: { $0.id.uuidString == uniqueID })
             .map(ScriptTerminal.init)
     }
+}
 
+// MARK: - Commands
+
+@MainActor
+extension NSApplication {
     /// Handler for the `perform action` AppleScript command.
     ///
     /// Required selector name from the command in `sdef`:
@@ -56,12 +125,43 @@ extension NSApplication {
 
         return NSNumber(value: terminal.perform(action: action))
     }
+}
 
+// MARK: - Private Helpers
+
+@MainActor
+extension NSApplication {
     /// Discovers all currently alive terminal surfaces across normal and quick
     /// terminal windows. This powers both terminal enumeration and ID lookup.
-    private var allSurfaceViews: [Ghostty.SurfaceView] {
-        NSApp.windows
-            .compactMap { $0.windowController as? BaseTerminalController }
+    fileprivate var allSurfaceViews: [Ghostty.SurfaceView] {
+        allTerminalControllers
             .flatMap { $0.surfaceTree.root?.leaves() ?? [] }
     }
+
+    /// All terminal controllers in undefined order.
+    fileprivate var allTerminalControllers: [BaseTerminalController] {
+        NSApp.windows.compactMap { $0.windowController as? BaseTerminalController }
+    }
+
+    /// All terminal controllers in front-to-back order.
+    fileprivate var orderedTerminalControllers: [BaseTerminalController] {
+        NSApp.orderedWindows.compactMap { $0.windowController as? BaseTerminalController }
+    }
+
+    /// Identifies the primary tab controller for a window's tab group.
+    ///
+    /// This gives us one stable representative for all tabs in the same native
+    /// AppKit tab group.
+    ///
+    /// For standalone windows this returns the window's controller directly.
+    /// For tabbed windows, "primary" is currently the first controller in the
+    /// tab group's ordered windows list.
+    fileprivate func primaryTerminalController(for controller: BaseTerminalController) -> BaseTerminalController? {
+        guard let window = controller.window else { return nil }
+        guard let tabGroup = window.tabGroup else { return controller }
+
+        return tabGroup.windows
+            .compactMap { $0.windowController as? BaseTerminalController }
+            .first
+    }
 }
diff --git a/macos/Sources/Features/AppleScript/ScriptTab.swift b/macos/Sources/Features/AppleScript/ScriptTab.swift
new file mode 100644
index 000000000..433da8160
--- /dev/null
+++ b/macos/Sources/Features/AppleScript/ScriptTab.swift
@@ -0,0 +1,85 @@
+import AppKit
+
+/// AppleScript-facing wrapper around a single tab in a scripting window.
+///
+/// `ScriptWindow.tabs` vends these objects so AppleScript can traverse
+/// `window -> tab` without knowing anything about AppKit controllers.
+@MainActor
+@objc(GhosttyScriptTab)
+final class ScriptTab: NSObject {
+    /// Stable identifier used by AppleScript `tab id "..."` references.
+    private let stableID: String
+
+    /// Weak back-reference to the scripting window that owns this tab wrapper.
+    ///
+    /// We only need this for dynamic properties (`index`, `selected`) and for
+    /// building an object specifier path.
+    private weak var window: ScriptWindow?
+
+    /// Live terminal controller for this tab.
+    ///
+    /// This can become `nil` if the tab closes while a script is running.
+    private weak var controller: BaseTerminalController?
+
+    /// Called by `ScriptWindow.tabs` / `ScriptWindow.selectedTab`.
+    ///
+    /// The ID is computed once so object specifiers built from this instance keep
+    /// a consistent tab identity.
+    init(window: ScriptWindow, controller: BaseTerminalController) {
+        self.stableID = Self.stableID(controller: controller)
+        self.window = window
+        self.controller = controller
+    }
+
+    /// Exposed as the AppleScript `id` property.
+    @objc(id)
+    var idValue: String {
+        stableID
+    }
+
+    /// Exposed as the AppleScript `index` property.
+    ///
+    /// Cocoa scripting expects this to be 1-based for user-facing collections.
+    @objc(index)
+    var index: Int {
+        guard let controller else { return 0 }
+        return window?.tabIndex(for: controller) ?? 0
+    }
+
+    /// Exposed as the AppleScript `selected` property.
+    ///
+    /// Powers script conditions such as `if selected of tab 1 then ...`.
+    @objc(selected)
+    var selected: Bool {
+        guard let controller else { return false }
+        return window?.tabIsSelected(controller) ?? false
+    }
+
+    /// Provides Cocoa scripting with a canonical "path" back to this object.
+    override var objectSpecifier: NSScriptObjectSpecifier? {
+        guard let window else { return nil }
+        guard let windowClassDescription = window.classDescription as? NSScriptClassDescription else {
+            return nil
+        }
+        guard let windowSpecifier = window.objectSpecifier else { return nil }
+
+        // This tells Cocoa how to re-find this tab later:
+        // application -> scriptWindows[id] -> tabs[id].
+        return NSUniqueIDSpecifier(
+            containerClassDescription: windowClassDescription,
+            containerSpecifier: windowSpecifier,
+            key: "tabs",
+            uniqueID: stableID
+        )
+    }
+}
+
+extension ScriptTab {
+    /// Stable ID for one tab controller.
+    ///
+    /// Tab identity belongs to `ScriptTab`, so both tab creation and tab ID
+    /// lookups in `ScriptWindow` call this helper.
+    static func stableID(controller: BaseTerminalController) -> String {
+        "tab-\(ObjectIdentifier(controller).hexString)"
+    }
+}
diff --git a/macos/Sources/Features/AppleScript/ScriptWindow.swift b/macos/Sources/Features/AppleScript/ScriptWindow.swift
new file mode 100644
index 000000000..eb00d720b
--- /dev/null
+++ b/macos/Sources/Features/AppleScript/ScriptWindow.swift
@@ -0,0 +1,174 @@
+import AppKit
+
+/// AppleScript-facing wrapper around a logical Ghostty window.
+///
+/// In AppKit, each tab is often its own `NSWindow`. AppleScript users, however,
+/// expect a single window object containing a list of tabs.
+///
+/// `ScriptWindow` is that compatibility layer:
+/// - It presents one object per tab group.
+/// - It translates tab-group state into `tabs` and `selected tab`.
+/// - It exposes stable IDs that Cocoa scripting can resolve later.
+@MainActor
+@objc(GhosttyScriptWindow)
+final class ScriptWindow: NSObject {
+    /// Stable identifier used by AppleScript `window id "..."` references.
+    ///
+    /// We precompute this once so the object keeps a consistent ID for its whole
+    /// lifetime, even if AppKit window bookkeeping changes after creation.
+    let stableID: String
+
+    /// Canonical representative for this scripting window's tab group.
+    ///
+    /// We intentionally keep only one controller reference; full tab membership
+    /// is derived lazily from current AppKit state whenever needed.
+    private weak var primaryController: BaseTerminalController?
+
+    /// `scriptWindows` in `AppDelegate+AppleScript` constructs these objects.
+    ///
+    /// `stableID` must match the same identity scheme used by
+    /// `valueInScriptWindowsWithUniqueID:` so Cocoa can re-resolve object
+    /// specifiers produced earlier in a script.
+    init(primaryController: BaseTerminalController) {
+        self.stableID = Self.stableID(primaryController: primaryController)
+        self.primaryController = primaryController
+    }
+
+    /// Exposed as the AppleScript `id` property.
+    ///
+    /// This is what scripts read with `id of window ...`.
+    @objc(id)
+    var idValue: String {
+        stableID
+    }
+
+    /// Exposed as the AppleScript `tabs` element.
+    ///
+    /// Cocoa asks for this collection when a script evaluates `tabs of window ...`
+    /// or any tab-filter expression. We build wrappers from live controller state
+    /// so tab additions/removals are reflected immediately.
+    @objc(tabs)
+    var tabs: [ScriptTab] {
+        controllers.map { ScriptTab(window: self, controller: $0) }
+    }
+
+    /// Exposed as the AppleScript `selected tab` property.
+    ///
+    /// This powers expressions like `selected tab of window 1`.
+    @objc(selectedTab)
+    var selectedTab: ScriptTab? {
+        guard let selectedController else { return nil }
+        return ScriptTab(window: self, controller: selectedController)
+    }
+
+    /// Enables unique-ID lookup for `tabs` references.
+    ///
+    /// Required selector pattern for the `tabs` element key:
+    /// `valueInTabsWithUniqueID:`.
+    ///
+    /// Cocoa uses this when a script resolves `tab id "..." of window ...`.
+    @objc(valueInTabsWithUniqueID:)
+    func valueInTabs(uniqueID: String) -> ScriptTab? {
+        guard let controller = controller(tabID: uniqueID) else { return nil }
+        return ScriptTab(window: self, controller: controller)
+    }
+
+    /// AppleScript tab indexes are 1-based, so we add one to Swift's 0-based
+    /// array index.
+    func tabIndex(for controller: BaseTerminalController) -> Int? {
+        controllers.firstIndex(where: { $0 === controller }).map { $0 + 1 }
+    }
+
+    /// Reports whether a given controller maps to this window's selected tab.
+    func tabIsSelected(_ controller: BaseTerminalController) -> Bool {
+        selectedController === controller
+    }
+
+    /// Resolves a previously generated tab ID back to a live controller.
+    private func controller(tabID: String) -> BaseTerminalController? {
+        controllers.first(where: { ScriptTab.stableID(controller: $0) == tabID })
+    }
+
+    /// Live controller list for this scripting window.
+    ///
+    /// We recalculate on every access so AppleScript immediately sees tab-group
+    /// changes (new tabs, closed tabs, tab moves) without rebuilding all objects.
+    private var controllers: [BaseTerminalController] {
+        guard let primaryController else { return [] }
+        guard let window = primaryController.window else { return [primaryController] }
+
+        if let tabGroup = window.tabGroup {
+            let groupControllers = tabGroup.windows.compactMap {
+                $0.windowController as? BaseTerminalController
+            }
+            if !groupControllers.isEmpty {
+                return groupControllers
+            }
+        }
+
+        return [primaryController]
+    }
+
+    /// Live selected controller for this scripting window.
+    ///
+    /// AppKit tracks selected tab on `NSWindowTabGroup.selectedWindow`; for
+    /// non-tabbed windows we fall back to the primary controller.
+    private var selectedController: BaseTerminalController? {
+        guard let primaryController else { return nil }
+        guard let window = primaryController.window else { return primaryController }
+
+        if let tabGroup = window.tabGroup,
+           let selectedController = tabGroup.selectedWindow?.windowController as? BaseTerminalController {
+            return selectedController
+        }
+
+        return controllers.first
+    }
+
+    /// Provides Cocoa scripting with a canonical "path" back to this object.
+    ///
+    /// Without this, Cocoa can return data but cannot reliably build object
+    /// references for later script statements. This specifier encodes:
+    /// `application -> scriptWindows[id]`.
+    override var objectSpecifier: NSScriptObjectSpecifier? {
+        guard let appClassDescription = NSApplication.shared.classDescription as? NSScriptClassDescription else {
+            return nil
+        }
+
+        return NSUniqueIDSpecifier(
+            containerClassDescription: appClassDescription,
+            containerSpecifier: nil,
+            key: "scriptWindows",
+            uniqueID: stableID
+        )
+    }
+}
+
+extension ScriptWindow {
+    /// Produces the window-level stable ID from the primary controller.
+    ///
+    /// - Tabbed windows are keyed by tab-group identity.
+    /// - Standalone windows are keyed by window identity.
+    /// - Detached controllers fall back to controller identity.
+    static func stableID(primaryController: BaseTerminalController) -> String {
+        guard let window = primaryController.window else {
+            return "controller-\(ObjectIdentifier(primaryController).hexString)"
+        }
+
+        if let tabGroup = window.tabGroup {
+            return stableID(tabGroup: tabGroup)
+        }
+
+        return stableID(window: window)
+    }
+
+    /// Stable ID for a standalone native window.
+    static func stableID(window: NSWindow) -> String {
+        "window-\(ObjectIdentifier(window).hexString)"
+    }
+
+    /// Stable ID for a native AppKit tab group.
+    static func stableID(tabGroup: NSWindowTabGroup) -> String {
+        "tab-group-\(ObjectIdentifier(tabGroup).hexString)"
+    }
+}
diff --git a/macos/Sources/Helpers/Extensions/ObjectIdentifier+Extension.swift b/macos/Sources/Helpers/Extensions/ObjectIdentifier+Extension.swift
new file mode 100644
index 000000000..d2440f1d4
--- /dev/null
+++ b/macos/Sources/Helpers/Extensions/ObjectIdentifier+Extension.swift
@@ -0,0 +1,7 @@
+import Foundation
+
+extension ObjectIdentifier {
+    var hexString: String {
+        String(UInt(bitPattern: self), radix: 16)
+    }
+}

From f72d41675bfd1d912f71a00c1e8716ddd6ae9654 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 6 Mar 2026 08:03:13 -0800
Subject: [PATCH 041/391] macos: fix AppleScript quit command being silently
 ignored

The application class in Ghostty.sdef was missing a responds-to
declaration for the quit command. Apple's Cocoa Scripting requires
the application class to explicitly declare it responds to quit via
handleQuitScriptCommand: for the aevtquit event to be dispatched.
---
 macos/Ghostty.sdef | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index e2410a4bd..5fc8c8a9e 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -13,6 +13,9 @@
       <responds-to command="perform action">
         <cocoa method="handlePerformActionScriptCommand:"/>
       </responds-to>
+      <responds-to command="quit">
+        <cocoa method="handleQuitScriptCommand:"/>
+      </responds-to>
 
       <element type="window" access="r">
         <cocoa key="scriptWindows"/>

From e514035519a88fa593dd1047fa22bcb39a9022c0 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 6 Mar 2026 08:06:37 -0800
Subject: [PATCH 042/391] macos: add terminals element to window and tab
 AppleScript classes

Expose terminal surfaces as elements on both ScriptWindow and ScriptTab,
allowing AppleScript to enumerate terminals scoped to a specific window
or tab (e.g. `terminals of window 1`, `terminals of tab 1 of window 1`).

Changes:
- Add `<element type="terminal">` to window and tab classes in Ghostty.sdef
- Add `terminals` computed property and `valueInTerminalsWithUniqueID:`
  lookup to ScriptWindow (returns all surfaces across all tabs)
- Add `terminals` computed property and `valueInTerminalsWithUniqueID:`
  lookup to ScriptTab (returns surfaces within that tab)
---
 macos/Ghostty.sdef                            |  6 ++++++
 .../Features/AppleScript/ScriptTab.swift      | 19 +++++++++++++++++++
 .../Features/AppleScript/ScriptWindow.swift   | 19 +++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index 5fc8c8a9e..c3d58e043 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -35,6 +35,9 @@
       <element type="tab" access="r">
         <cocoa key="tabs"/>
       </element>
+      <element type="terminal" access="r">
+        <cocoa key="terminals"/>
+      </element>
     </class>
 
     <class name="tab" code="Gtab" plural="tabs" description="A tab within a Ghostty window.">
@@ -42,6 +45,9 @@
       <property name="id" code="ID  " type="text" access="r" description="Stable ID for this tab."/>
       <property name="index" code="pidx" type="integer" access="r" description="1-based index of this tab in its window."/>
       <property name="selected" code="GTsl" type="boolean" access="r" description="Whether this tab is selected in its window."/>
+      <element type="terminal" access="r">
+        <cocoa key="terminals"/>
+      </element>
     </class>
 
     <class name="terminal" code="Gtrm" plural="terminals" description="An individual terminal surface.">
diff --git a/macos/Sources/Features/AppleScript/ScriptTab.swift b/macos/Sources/Features/AppleScript/ScriptTab.swift
index 433da8160..69ce56779 100644
--- a/macos/Sources/Features/AppleScript/ScriptTab.swift
+++ b/macos/Sources/Features/AppleScript/ScriptTab.swift
@@ -55,6 +55,25 @@ final class ScriptTab: NSObject {
         return window?.tabIsSelected(controller) ?? false
     }
 
+    /// Exposed as the AppleScript `terminals` element on a tab.
+    ///
+    /// Returns all terminal surfaces (split panes) within this tab.
+    @objc(terminals)
+    var terminals: [ScriptTerminal] {
+        guard let controller else { return [] }
+        return (controller.surfaceTree.root?.leaves() ?? [])
+            .map(ScriptTerminal.init)
+    }
+
+    /// Enables unique-ID lookup for `terminals` references on a tab.
+    @objc(valueInTerminalsWithUniqueID:)
+    func valueInTerminals(uniqueID: String) -> ScriptTerminal? {
+        guard let controller else { return nil }
+        return (controller.surfaceTree.root?.leaves() ?? [])
+            .first(where: { $0.id.uuidString == uniqueID })
+            .map(ScriptTerminal.init)
+    }
+
     /// Provides Cocoa scripting with a canonical "path" back to this object.
     override var objectSpecifier: NSScriptObjectSpecifier? {
         guard let window else { return nil }
diff --git a/macos/Sources/Features/AppleScript/ScriptWindow.swift b/macos/Sources/Features/AppleScript/ScriptWindow.swift
index eb00d720b..61c0f7788 100644
--- a/macos/Sources/Features/AppleScript/ScriptWindow.swift
+++ b/macos/Sources/Features/AppleScript/ScriptWindow.swift
@@ -73,6 +73,25 @@ final class ScriptWindow: NSObject {
         return ScriptTab(window: self, controller: controller)
     }
 
+    /// Exposed as the AppleScript `terminals` element on a window.
+    ///
+    /// Returns all terminal surfaces across every tab in this window.
+    @objc(terminals)
+    var terminals: [ScriptTerminal] {
+        controllers
+            .flatMap { $0.surfaceTree.root?.leaves() ?? [] }
+            .map(ScriptTerminal.init)
+    }
+
+    /// Enables unique-ID lookup for `terminals` references on a window.
+    @objc(valueInTerminalsWithUniqueID:)
+    func valueInTerminals(uniqueID: String) -> ScriptTerminal? {
+        controllers
+            .flatMap { $0.surfaceTree.root?.leaves() ?? [] }
+            .first(where: { $0.id.uuidString == uniqueID })
+            .map(ScriptTerminal.init)
+    }
+
     /// AppleScript tab indexes are 1-based, so we add one to Swift's 0-based
     /// array index.
     func tabIndex(for controller: BaseTerminalController) -> Int? {

From 122d0ecdfd9947d0c8c34953d0babc39502556e5 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 6 Mar 2026 08:11:56 -0800
Subject: [PATCH 043/391] macos: expose name (title) on window, tab, and
 terminal via AppleScript
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a `name` property (code `pnam`, cocoa key `title`) to the window, tab,
and terminal classes in the scripting definition. This follows the standard
Cocoa scripting convention where `name`/`pnam` maps to the `title` KVC key,
matching what Apple does in CocoaStandard.sdef for NSWindow.

Also fixes the pre-existing terminal `title` property which used a custom
four-char code (`Gttl`) that AppleScript could not resolve directly — only
via `properties of terminal`. All three classes now use the standard `pnam`
code so `name of window 1`, `name of tab 1 of window 1`, and
`name of terminal 1` all work correctly.
---
 macos/Ghostty.sdef                                    | 10 +++++++++-
 macos/Sources/Features/AppleScript/ScriptTab.swift    |  8 ++++++++
 macos/Sources/Features/AppleScript/ScriptWindow.swift |  8 ++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index c3d58e043..d0c8cb9a2 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -29,6 +29,9 @@
     <class name="window" code="Gwnd" plural="windows" description="A Ghostty window containing one or more tabs.">
       <cocoa class="GhosttyScriptWindow"/>
       <property name="id" code="ID  " type="text" access="r" description="Stable ID for this window."/>
+      <property name="name" code="pnam" type="text" access="r" description="The title of the window.">
+        <cocoa key="title"/>
+      </property>
       <property name="selected tab" code="GWsT" type="tab" access="r" description="The selected tab in this window.">
         <cocoa key="selectedTab"/>
       </property>
@@ -43,6 +46,9 @@
     <class name="tab" code="Gtab" plural="tabs" description="A tab within a Ghostty window.">
       <cocoa class="GhosttyScriptTab"/>
       <property name="id" code="ID  " type="text" access="r" description="Stable ID for this tab."/>
+      <property name="name" code="pnam" type="text" access="r" description="The title of the tab.">
+        <cocoa key="title"/>
+      </property>
       <property name="index" code="pidx" type="integer" access="r" description="1-based index of this tab in its window."/>
       <property name="selected" code="GTsl" type="boolean" access="r" description="Whether this tab is selected in its window."/>
       <element type="terminal" access="r">
@@ -53,7 +59,9 @@
     <class name="terminal" code="Gtrm" plural="terminals" description="An individual terminal surface.">
       <cocoa class="GhosttyScriptTerminal"/>
       <property name="id" code="ID  " type="text" access="r" description="Stable ID for this terminal surface."/>
-      <property name="title" code="Gttl" type="text" access="r" description="Current terminal title."/>
+      <property name="name" code="pnam" type="text" access="r" description="Current terminal title.">
+        <cocoa key="title"/>
+      </property>
       <property name="working directory" code="Gwdr" type="text" access="r" description="Current working directory for the terminal process."/>
     </class>
 
diff --git a/macos/Sources/Features/AppleScript/ScriptTab.swift b/macos/Sources/Features/AppleScript/ScriptTab.swift
index 69ce56779..aa643db5a 100644
--- a/macos/Sources/Features/AppleScript/ScriptTab.swift
+++ b/macos/Sources/Features/AppleScript/ScriptTab.swift
@@ -37,6 +37,14 @@ final class ScriptTab: NSObject {
         stableID
     }
 
+    /// Exposed as the AppleScript `title` property.
+    ///
+    /// Returns the title of the tab's window.
+    @objc(title)
+    var title: String {
+        controller?.window?.title ?? ""
+    }
+
     /// Exposed as the AppleScript `index` property.
     ///
     /// Cocoa scripting expects this to be 1-based for user-facing collections.
diff --git a/macos/Sources/Features/AppleScript/ScriptWindow.swift b/macos/Sources/Features/AppleScript/ScriptWindow.swift
index 61c0f7788..f6cfeaa77 100644
--- a/macos/Sources/Features/AppleScript/ScriptWindow.swift
+++ b/macos/Sources/Features/AppleScript/ScriptWindow.swift
@@ -42,6 +42,14 @@ final class ScriptWindow: NSObject {
         stableID
     }
 
+    /// Exposed as the AppleScript `title` property.
+    ///
+    /// Returns the title of the window (from the selected/primary controller's NSWindow).
+    @objc(title)
+    var title: String {
+        selectedController?.window?.title ?? ""
+    }
+
     /// Exposed as the AppleScript `tabs` element.
     ///
     /// Cocoa asks for this collection when a script evaluates `tabs of window ...`

From 959c2f51ac524e6556fe0e8d8b2db9ff090e0dd0 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 6 Mar 2026 08:38:13 -0800
Subject: [PATCH 044/391] macos: add AppleScript new window command

Add a `new window` command to the scripting dictionary and wire it to
`NSApplication` so AppleScript can create Ghostty windows.

The command returns a scripting `window` object for the created window,
with a fallback to a direct wrapper when AppKit window ordering has not
yet refreshed in the current run loop.
---
 macos/Ghostty.sdef                            |  7 +++++
 .../AppleScript/AppDelegate+AppleScript.swift | 26 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index d0c8cb9a2..c39a3c8a1 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -13,6 +13,9 @@
       <responds-to command="perform action">
         <cocoa method="handlePerformActionScriptCommand:"/>
       </responds-to>
+      <responds-to command="new window">
+        <cocoa method="handleNewWindowScriptCommand:"/>
+      </responds-to>
       <responds-to command="quit">
         <cocoa method="handleQuitScriptCommand:"/>
       </responds-to>
@@ -71,6 +74,10 @@
       <result type="boolean" description="True when the action was performed."/>
     </command>
 
+    <command name="new window" code="GhstNWin" description="Create a new Ghostty window.">
+      <result type="window" description="The newly created window."/>
+    </command>
+
     <enumeration name="split direction" code="GSpD" description="Direction for a new split.">
       <enumerator name="right" code="GSrt" description="Split to the right."/>
       <enumerator name="left" code="GSlf" description="Split to the left."/>
diff --git a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
index 519d2805f..cbeda86eb 100644
--- a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
+++ b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
@@ -125,6 +125,32 @@ extension NSApplication {
 
         return NSNumber(value: terminal.perform(action: action))
     }
+
+    /// Handler for the `new window` AppleScript command.
+    ///
+    /// Required selector name from the command in `sdef`:
+    /// `handleNewWindowScriptCommand:`.
+    ///
+    /// Returns the newly created scripting window object.
+    @objc(handleNewWindowScriptCommand:)
+    func handleNewWindowScriptCommand(_ command: NSScriptCommand) -> Any? {
+        guard let appDelegate = delegate as? AppDelegate else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "Ghostty app delegate is unavailable."
+            return nil
+        }
+
+        let controller = TerminalController.newWindow(appDelegate.ghostty)
+        let createdWindowID = ScriptWindow.stableID(primaryController: controller)
+
+        if let scriptWindow = scriptWindows.first(where: { $0.stableID == createdWindowID }) {
+            return scriptWindow
+        }
+
+        // Fall back to wrapping the created controller if AppKit window ordering
+        // has not refreshed yet in the current run loop.
+        return ScriptWindow(primaryController: controller)
+    }
 }
 
 // MARK: - Private Helpers

From a3adeb0166b2dc896045b71f8656b2605648e9c2 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 6 Mar 2026 11:17:08 -0800
Subject: [PATCH 045/391] macos: use value-style AppleScript surface
 configuration records

Add a `surface configuration` record type to the scripting dictionary,
implement `new surface configuration` (with optional copy-from), and allow
`new window` to accept `with configuration`.
---
 macos/Ghostty.sdef                            |  35 +++++
 .../AppleScript/AppDelegate+AppleScript.swift |  33 ++++-
 .../Features/AppleScript/ScriptRecord.swift   |  29 ++++
 .../ScriptSurfaceConfiguration.swift          | 136 ++++++++++++++++++
 4 files changed, 232 insertions(+), 1 deletion(-)
 create mode 100644 macos/Sources/Features/AppleScript/ScriptRecord.swift
 create mode 100644 macos/Sources/Features/AppleScript/ScriptSurfaceConfiguration.swift

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index c39a3c8a1..5b77e29b2 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -16,6 +16,9 @@
       <responds-to command="new window">
         <cocoa method="handleNewWindowScriptCommand:"/>
       </responds-to>
+      <responds-to command="new surface configuration">
+        <cocoa method="handleNewSurfaceConfigurationScriptCommand:"/>
+      </responds-to>
       <responds-to command="quit">
         <cocoa method="handleQuitScriptCommand:"/>
       </responds-to>
@@ -29,6 +32,28 @@
       </element>
     </class>
 
+    <record-type name="surface configuration" code="GScf" description="Reusable settings applied when creating a terminal surface.">
+      <property name="font size" code="GScF" type="real" description="Font size in points.">
+        <cocoa key="fontSize"/>
+      </property>
+      <property name="working directory" code="GScD" type="text" description="Working directory for the terminal process.">
+        <cocoa key="workingDirectory"/>
+      </property>
+      <property name="command" code="GScC" type="text" description="Command to execute instead of the configured shell.">
+        <cocoa key="command"/>
+      </property>
+      <property name="initial input" code="GScI" type="text" description="Input sent to the terminal after launch.">
+        <cocoa key="initialInput"/>
+      </property>
+      <property name="wait after command" code="GScW" type="boolean" description="Keep the terminal open after command exit.">
+        <cocoa key="waitAfterCommand"/>
+      </property>
+      <property name="environment variables" code="GScE" description="Environment variables in KEY=VALUE format.">
+        <type type="text" list="yes"/>
+        <cocoa key="environmentVariables"/>
+      </property>
+    </record-type>
+
     <class name="window" code="Gwnd" plural="windows" description="A Ghostty window containing one or more tabs.">
       <cocoa class="GhosttyScriptWindow"/>
       <property name="id" code="ID  " type="text" access="r" description="Stable ID for this window."/>
@@ -74,7 +99,17 @@
       <result type="boolean" description="True when the action was performed."/>
     </command>
 
+    <command name="new surface configuration" code="GhstNSCf" description="Create a reusable surface configuration object.">
+      <parameter name="from" code="GScS" type="surface configuration" optional="yes" description="Surface configuration to copy.">
+        <cocoa key="configuration"/>
+      </parameter>
+      <result type="surface configuration" description="The newly created surface configuration."/>
+    </command>
+
     <command name="new window" code="GhstNWin" description="Create a new Ghostty window.">
+      <parameter name="with configuration" code="GNwS" type="surface configuration" optional="yes" description="Base surface configuration for the initial terminal.">
+        <cocoa key="configuration"/>
+      </parameter>
       <result type="window" description="The newly created window."/>
     </command>
 
diff --git a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
index cbeda86eb..acfc943db 100644
--- a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
+++ b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
@@ -126,11 +126,28 @@ extension NSApplication {
         return NSNumber(value: terminal.perform(action: action))
     }
 
+    /// Handler for creating a reusable AppleScript surface configuration object.
+    @objc(handleNewSurfaceConfigurationScriptCommand:)
+    func handleNewSurfaceConfigurationScriptCommand(_ command: NSScriptCommand) -> Any? {
+        do {
+            let configuration = try Ghostty.SurfaceConfiguration(
+                scriptRecord: command.evaluatedArguments?["configuration"] as? NSDictionary
+            )
+            return configuration.dictionaryRepresentation
+        } catch {
+            command.scriptErrorNumber = errAECoercionFail
+            command.scriptErrorString = error.localizedDescription
+            return nil
+        }
+    }
+
     /// Handler for the `new window` AppleScript command.
     ///
     /// Required selector name from the command in `sdef`:
     /// `handleNewWindowScriptCommand:`.
     ///
+    /// Accepts an optional reusable surface configuration object.
+    ///
     /// Returns the newly created scripting window object.
     @objc(handleNewWindowScriptCommand:)
     func handleNewWindowScriptCommand(_ command: NSScriptCommand) -> Any? {
@@ -140,7 +157,21 @@ extension NSApplication {
             return nil
         }
 
-        let controller = TerminalController.newWindow(appDelegate.ghostty)
+        let baseConfig: Ghostty.SurfaceConfiguration
+        do {
+            baseConfig = try Ghostty.SurfaceConfiguration(
+                scriptRecord: command.evaluatedArguments?["configuration"] as? NSDictionary
+            )
+        } catch {
+            command.scriptErrorNumber = errAECoercionFail
+            command.scriptErrorString = error.localizedDescription
+            return nil
+        }
+
+        let controller = TerminalController.newWindow(
+            appDelegate.ghostty,
+            withBaseConfig: baseConfig
+        )
         let createdWindowID = ScriptWindow.stableID(primaryController: controller)
 
         if let scriptWindow = scriptWindows.first(where: { $0.stableID == createdWindowID }) {
diff --git a/macos/Sources/Features/AppleScript/ScriptRecord.swift b/macos/Sources/Features/AppleScript/ScriptRecord.swift
new file mode 100644
index 000000000..7c81b8e29
--- /dev/null
+++ b/macos/Sources/Features/AppleScript/ScriptRecord.swift
@@ -0,0 +1,29 @@
+import Cocoa
+
+/// Protocol to more easily implement AppleScript records in Swift.
+protocol ScriptRecord {
+    /// Initialize a default record.
+    init()
+
+    /// Initialize a record from the raw value from AppleScript.
+    init(scriptRecord: NSDictionary?) throws
+
+    /// Encode into the dictionary form for AppleScript.
+    var dictionaryRepresentation: NSDictionary { get }
+}
+
+/// An error that can be thrown by `ScriptRecord.init(scriptRecord:)`. Any localized error
+/// can be thrown but this is a common one.
+enum RecordParseError: LocalizedError {
+    case invalidType(parameter: String, expected: String)
+    case invalidValue(parameter: String, message: String)
+
+    var errorDescription: String? {
+        switch self {
+        case .invalidType(let parameter, let expected):
+            return "\(parameter) must be \(expected)."
+        case .invalidValue(let parameter, let message):
+            return "\(parameter) \(message)."
+        }
+    }
+}
diff --git a/macos/Sources/Features/AppleScript/ScriptSurfaceConfiguration.swift b/macos/Sources/Features/AppleScript/ScriptSurfaceConfiguration.swift
new file mode 100644
index 000000000..89ec85a3b
--- /dev/null
+++ b/macos/Sources/Features/AppleScript/ScriptSurfaceConfiguration.swift
@@ -0,0 +1,136 @@
+import Foundation
+
+/// AppleScript record support for `Ghostty.SurfaceConfiguration`.
+///
+/// This keeps scripting conversion at the data-structure boundary so AppleScript
+/// can pass records by value (`new surface configuration`, assign, copy, mutate)
+/// without introducing an additional wrapper type.
+extension Ghostty.SurfaceConfiguration: ScriptRecord {
+    init(scriptRecord source: NSDictionary?) throws {
+        self.init()
+
+        guard let raw = source as? [String: Any] else {
+            throw RecordParseError.invalidType(parameter: "configuration", expected: "a surface configuration record")
+        }
+
+        if let rawFontSize = raw["fontSize"] {
+            guard let number = rawFontSize as? NSNumber else {
+                throw RecordParseError.invalidType(parameter: "font size", expected: "a number")
+            }
+
+            let value = number.doubleValue
+            guard value.isFinite else {
+                throw RecordParseError.invalidValue(parameter: "font size", message: "must be a finite number")
+            }
+
+            if value < 0 {
+                throw RecordParseError.invalidValue(parameter: "font size", message: "must be a positive number")
+            }
+
+            if value > 0 {
+                fontSize = Float32(value)
+            }
+        }
+
+        if let rawWorkingDirectory = raw["workingDirectory"] {
+            guard let workingDirectory = rawWorkingDirectory as? String else {
+                throw RecordParseError.invalidType(parameter: "working directory", expected: "text")
+            }
+
+            if !workingDirectory.isEmpty {
+                self.workingDirectory = workingDirectory
+            }
+        }
+
+        if let rawCommand = raw["command"] {
+            guard let command = rawCommand as? String else {
+                throw RecordParseError.invalidType(parameter: "command", expected: "text")
+            }
+
+            if !command.isEmpty {
+                self.command = command
+            }
+        }
+
+        if let rawInitialInput = raw["initialInput"] {
+            guard let initialInput = rawInitialInput as? String else {
+                throw RecordParseError.invalidType(parameter: "initial input", expected: "text")
+            }
+
+            if !initialInput.isEmpty {
+                self.initialInput = initialInput
+            }
+        }
+
+        if let rawWaitAfterCommand = raw["waitAfterCommand"] {
+            if let boolValue = rawWaitAfterCommand as? Bool {
+                waitAfterCommand = boolValue
+            } else if let numericValue = rawWaitAfterCommand as? NSNumber {
+                waitAfterCommand = numericValue.boolValue
+            } else {
+                throw RecordParseError.invalidType(parameter: "wait after command", expected: "boolean")
+            }
+        }
+
+        if let assignments = raw["environmentVariables"] as? [String], !assignments.isEmpty {
+            environmentVariables = try Self.parseScriptEnvironmentAssignments(assignments)
+        }
+    }
+
+    var dictionaryRepresentation: NSDictionary {
+        var record: [String: Any] = [
+            "fontSize": 0,
+            "workingDirectory": "",
+            "command": "",
+            "initialInput": "",
+            "waitAfterCommand": false,
+            "environmentVariables": [String](),
+        ]
+
+        if let fontSize {
+            record["fontSize"] = NSNumber(value: fontSize)
+        }
+
+        if let workingDirectory {
+            record["workingDirectory"] = workingDirectory
+        }
+
+        if let command {
+            record["command"] = command
+        }
+
+        if let initialInput {
+            record["initialInput"] = initialInput
+        }
+
+        if waitAfterCommand {
+            record["waitAfterCommand"] = true
+        }
+
+        if !environmentVariables.isEmpty {
+            record["environmentVariables"] = environmentVariables.map { "\($0.key)=\($0.value)" }
+        }
+
+        return record as NSDictionary
+    }
+
+    private static func parseScriptEnvironmentAssignments(_ assignments: [String]) throws -> [String: String] {
+        var result: [String: String] = [:]
+
+        for assignment in assignments {
+            guard let separator = assignment.firstIndex(of: "=") else {
+                throw RecordParseError.invalidValue(
+                    parameter: "environment variables",
+                    message: "expected KEY=VALUE, got \"\(assignment)\""
+                )
+            }
+
+            let key = String(assignment[..<separator])
+            let valueStart = assignment.index(after: separator)
+            let value = String(assignment[valueStart...])
+            result[key] = value
+        }
+
+        return result
+    }
+}

From 459eaa2640444b1b434f5508b807afd8f273e151 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 6 Mar 2026 12:26:44 -0800
Subject: [PATCH 046/391] macos: order AppleScript dictionary definitions

Document the preferred Ghostty.sdef top-level order in AGENTS.md and reorder
Ghostty Suite definitions to classes, records, enums, then commands.
---
 macos/AGENTS.md                         |   5 ++
 macos/Ghostty.sdef                      | 100 ++++++++++++------------
 macos/Ghostty.xcodeproj/project.pbxproj |   2 +
 3 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/macos/AGENTS.md b/macos/AGENTS.md
index f18234b88..22da2a4c2 100644
--- a/macos/AGENTS.md
+++ b/macos/AGENTS.md
@@ -13,6 +13,11 @@
 ## AppleScript
 
 - The AppleScript scripting definition is in `macos/Ghostty.sdef`.
+- In `macos/Ghostty.sdef`, keep top-level definitions in this order:
+  1. Classes
+  2. Records
+  3. Enums
+  4. Commands
 - Test AppleScript support:
   (1) Build with `macos/build.nu`
   (2) Launch and activate the app via osascript using the absolute path
diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index 5b77e29b2..7d0e219ce 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -32,28 +32,6 @@
       </element>
     </class>
 
-    <record-type name="surface configuration" code="GScf" description="Reusable settings applied when creating a terminal surface.">
-      <property name="font size" code="GScF" type="real" description="Font size in points.">
-        <cocoa key="fontSize"/>
-      </property>
-      <property name="working directory" code="GScD" type="text" description="Working directory for the terminal process.">
-        <cocoa key="workingDirectory"/>
-      </property>
-      <property name="command" code="GScC" type="text" description="Command to execute instead of the configured shell.">
-        <cocoa key="command"/>
-      </property>
-      <property name="initial input" code="GScI" type="text" description="Input sent to the terminal after launch.">
-        <cocoa key="initialInput"/>
-      </property>
-      <property name="wait after command" code="GScW" type="boolean" description="Keep the terminal open after command exit.">
-        <cocoa key="waitAfterCommand"/>
-      </property>
-      <property name="environment variables" code="GScE" description="Environment variables in KEY=VALUE format.">
-        <type type="text" list="yes"/>
-        <cocoa key="environmentVariables"/>
-      </property>
-    </record-type>
-
     <class name="window" code="Gwnd" plural="windows" description="A Ghostty window containing one or more tabs.">
       <cocoa class="GhosttyScriptWindow"/>
       <property name="id" code="ID  " type="text" access="r" description="Stable ID for this window."/>
@@ -93,6 +71,56 @@
       <property name="working directory" code="Gwdr" type="text" access="r" description="Current working directory for the terminal process."/>
     </class>
 
+    <record-type name="surface configuration" code="GScf" description="Reusable settings applied when creating a terminal surface.">
+      <property name="font size" code="GScF" type="real" description="Font size in points.">
+        <cocoa key="fontSize"/>
+      </property>
+      <property name="working directory" code="GScD" type="text" description="Working directory for the terminal process.">
+        <cocoa key="workingDirectory"/>
+      </property>
+      <property name="command" code="GScC" type="text" description="Command to execute instead of the configured shell.">
+        <cocoa key="command"/>
+      </property>
+      <property name="initial input" code="GScI" type="text" description="Input sent to the terminal after launch.">
+        <cocoa key="initialInput"/>
+      </property>
+      <property name="wait after command" code="GScW" type="boolean" description="Keep the terminal open after command exit.">
+        <cocoa key="waitAfterCommand"/>
+      </property>
+      <property name="environment variables" code="GScE" description="Environment variables in KEY=VALUE format.">
+        <type type="text" list="yes"/>
+        <cocoa key="environmentVariables"/>
+      </property>
+    </record-type>
+
+    <enumeration name="split direction" code="GSpD" description="Direction for a new split.">
+      <enumerator name="right" code="GSrt" description="Split to the right."/>
+      <enumerator name="left" code="GSlf" description="Split to the left."/>
+      <enumerator name="down" code="GSdn" description="Split downward."/>
+      <enumerator name="up" code="GSup" description="Split upward."/>
+    </enumeration>
+
+    <enumeration name="input action" code="GIAc" description="Whether an input is pressed or released.">
+      <enumerator name="press" code="GIpr" description="Press."/>
+      <enumerator name="release" code="GIrl" description="Release."/>
+    </enumeration>
+
+    <enumeration name="mouse button" code="GMBt" description="A mouse button.">
+      <enumerator name="left button" code="GMlf" description="Left mouse button."/>
+      <enumerator name="right button" code="GMrt" description="Right mouse button."/>
+      <enumerator name="middle button" code="GMmd" description="Middle mouse button."/>
+    </enumeration>
+
+    <enumeration name="scroll momentum" code="GSMo" description="Momentum phase for inertial scrolling.">
+      <enumerator name="none" code="SMno" description="No momentum."/>
+      <enumerator name="began" code="SMbg" description="Momentum began."/>
+      <enumerator name="changed" code="SMch" description="Momentum changed."/>
+      <enumerator name="ended" code="SMen" description="Momentum ended."/>
+      <enumerator name="cancelled" code="SMcn" description="Momentum cancelled."/>
+      <enumerator name="may begin" code="SMmb" description="Momentum may begin."/>
+      <enumerator name="stationary" code="SMst" description="Stationary."/>
+    </enumeration>
+
     <command name="perform action" code="GhstPfAc" description="Perform a Ghostty action string on a terminal.">
       <direct-parameter type="text" description="The Ghostty action string."/>
       <parameter name="on" code="GonT" type="terminal" description="Target terminal."/>
@@ -113,13 +141,6 @@
       <result type="window" description="The newly created window."/>
     </command>
 
-    <enumeration name="split direction" code="GSpD" description="Direction for a new split.">
-      <enumerator name="right" code="GSrt" description="Split to the right."/>
-      <enumerator name="left" code="GSlf" description="Split to the left."/>
-      <enumerator name="down" code="GSdn" description="Split downward."/>
-      <enumerator name="up" code="GSup" description="Split upward."/>
-    </enumeration>
-
     <command name="split" code="GhstSplt" description="Split a terminal in the given direction.">
       <cocoa class="GhosttyScriptSplitCommand"/>
       <parameter name="terminal" code="GSpT" type="terminal" description="The terminal to split.">
@@ -153,11 +174,6 @@
       </parameter>
     </command>
 
-    <enumeration name="input action" code="GIAc" description="Whether an input is pressed or released.">
-      <enumerator name="press" code="GIpr" description="Press."/>
-      <enumerator name="release" code="GIrl" description="Release."/>
-    </enumeration>
-
     <command name="send key" code="GhstSKey" description="Send a keyboard event to a terminal.">
       <cocoa class="GhosttyScriptKeyEventCommand"/>
       <direct-parameter type="text" description="The key name (e.g. &quot;enter&quot;, &quot;a&quot;, &quot;space&quot;)."/>
@@ -172,12 +188,6 @@
       </parameter>
     </command>
 
-    <enumeration name="mouse button" code="GMBt" description="A mouse button.">
-      <enumerator name="left button" code="GMlf" description="Left mouse button."/>
-      <enumerator name="right button" code="GMrt" description="Right mouse button."/>
-      <enumerator name="middle button" code="GMmd" description="Middle mouse button."/>
-    </enumeration>
-
     <command name="send mouse button" code="GhstSMBt" description="Send a mouse button event to a terminal.">
       <cocoa class="GhosttyScriptMouseButtonCommand"/>
       <direct-parameter type="mouse button" description="The mouse button."/>
@@ -208,16 +218,6 @@
       </parameter>
     </command>
 
-    <enumeration name="scroll momentum" code="GSMo" description="Momentum phase for inertial scrolling.">
-      <enumerator name="none" code="SMno" description="No momentum."/>
-      <enumerator name="began" code="SMbg" description="Momentum began."/>
-      <enumerator name="changed" code="SMch" description="Momentum changed."/>
-      <enumerator name="ended" code="SMen" description="Momentum ended."/>
-      <enumerator name="cancelled" code="SMcn" description="Momentum cancelled."/>
-      <enumerator name="may begin" code="SMmb" description="Momentum may begin."/>
-      <enumerator name="stationary" code="SMst" description="Stationary."/>
-    </enumeration>
-
     <command name="send mouse scroll" code="GhstSMSc" description="Send a mouse scroll event to a terminal.">
       <cocoa class="GhosttyScriptMouseScrollCommand"/>
       <parameter name="x" code="GMsX" type="real" description="Horizontal scroll delta.">
diff --git a/macos/Ghostty.xcodeproj/project.pbxproj b/macos/Ghostty.xcodeproj/project.pbxproj
index f667bb76e..0f63d654e 100644
--- a/macos/Ghostty.xcodeproj/project.pbxproj
+++ b/macos/Ghostty.xcodeproj/project.pbxproj
@@ -145,7 +145,9 @@
 				Features/AppleScript/ScriptMouseButtonCommand.swift,
 				Features/AppleScript/ScriptMousePosCommand.swift,
 				Features/AppleScript/ScriptMouseScrollCommand.swift,
+				Features/AppleScript/ScriptRecord.swift,
 				Features/AppleScript/ScriptSplitCommand.swift,
+				Features/AppleScript/ScriptSurfaceConfiguration.swift,
 				Features/AppleScript/ScriptTab.swift,
 				Features/AppleScript/ScriptTerminal.swift,
 				Features/AppleScript/ScriptWindow.swift,

From 4d5de702f2613ea0130ec83eb7af867e51a9d8a0 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 6 Mar 2026 12:33:06 -0800
Subject: [PATCH 047/391] macos: allow split command surface configuration

---
 macos/Ghostty.sdef                            |  3 +++
 .../AppleScript/ScriptSplitCommand.swift      | 20 +++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index 7d0e219ce..c2e60dc80 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -149,6 +149,9 @@
       <parameter name="direction" code="GSpd" type="split direction" description="The direction to split.">
         <cocoa key="direction"/>
       </parameter>
+      <parameter name="with configuration" code="GSpS" type="surface configuration" optional="yes" description="Base surface configuration for the new split terminal.">
+        <cocoa key="configuration"/>
+      </parameter>
       <result type="terminal" description="The newly created terminal."/>
     </command>
 
diff --git a/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift b/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift
index 6e90eda50..e74eed78f 100644
--- a/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift
+++ b/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift
@@ -28,6 +28,19 @@ final class ScriptSplitCommand: NSScriptCommand {
             return nil
         }
 
+        let baseConfig: Ghostty.SurfaceConfiguration
+        do {
+            if let scriptRecord = evaluatedArguments?["configuration"] as? NSDictionary {
+                baseConfig = try Ghostty.SurfaceConfiguration(scriptRecord: scriptRecord)
+            } else {
+                baseConfig = Ghostty.SurfaceConfiguration()
+            }
+        } catch {
+            scriptErrorNumber = errAECoercionFail
+            scriptErrorString = error.localizedDescription
+            return nil
+        }
+
         // Find the window controller that owns this surface.
         guard let controller = surfaceView.window?.windowController as? BaseTerminalController else {
             scriptErrorNumber = errAEEventFailed
@@ -35,7 +48,11 @@ final class ScriptSplitCommand: NSScriptCommand {
             return nil
         }
 
-        guard let newView = controller.newSplit(at: surfaceView, direction: direction.splitDirection) else {
+        guard let newView = controller.newSplit(
+            at: surfaceView,
+            direction: direction.splitDirection,
+            baseConfig: baseConfig
+        ) else {
             scriptErrorNumber = errAEEventFailed
             scriptErrorString = "Failed to create split."
             return nil
@@ -71,4 +88,3 @@ private enum ScriptSplitDirection {
         }
     }
 }
-

From d271c8ccaab0f08ab0092b2f0893c8e0d0e5283d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 6 Mar 2026 12:37:51 -0800
Subject: [PATCH 048/391] macos: add new tab command

---
 macos/Ghostty.sdef                            | 13 ++++
 .../AppleScript/AppDelegate+AppleScript.swift | 74 +++++++++++++++++++
 .../ScriptSurfaceConfiguration.swift          |  4 +
 .../Features/AppleScript/ScriptWindow.swift   |  5 ++
 4 files changed, 96 insertions(+)

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index c2e60dc80..47fae636f 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -16,6 +16,9 @@
       <responds-to command="new window">
         <cocoa method="handleNewWindowScriptCommand:"/>
       </responds-to>
+      <responds-to command="new tab">
+        <cocoa method="handleNewTabScriptCommand:"/>
+      </responds-to>
       <responds-to command="new surface configuration">
         <cocoa method="handleNewSurfaceConfigurationScriptCommand:"/>
       </responds-to>
@@ -141,6 +144,16 @@
       <result type="window" description="The newly created window."/>
     </command>
 
+    <command name="new tab" code="GhstNTab" description="Create a new Ghostty tab.">
+      <parameter name="in" code="GNtW" type="window" optional="yes" description="Target window for the new tab.">
+        <cocoa key="window"/>
+      </parameter>
+      <parameter name="with configuration" code="GNtS" type="surface configuration" optional="yes" description="Base surface configuration for the initial terminal.">
+        <cocoa key="configuration"/>
+      </parameter>
+      <result type="tab" description="The newly created tab."/>
+    </command>
+
     <command name="split" code="GhstSplt" description="Split a terminal in the given direction.">
       <cocoa class="GhosttyScriptSplitCommand"/>
       <parameter name="terminal" code="GSpT" type="terminal" description="The terminal to split.">
diff --git a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
index acfc943db..1071f9f67 100644
--- a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
+++ b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
@@ -182,6 +182,80 @@ extension NSApplication {
         // has not refreshed yet in the current run loop.
         return ScriptWindow(primaryController: controller)
     }
+
+    /// Handler for the `new tab` AppleScript command.
+    ///
+    /// Required selector name from the command in `sdef`:
+    /// `handleNewTabScriptCommand:`.
+    ///
+    /// Accepts an optional target window and optional surface configuration.
+    /// If no window is provided, this mirrors App Intents and uses the
+    /// preferred parent window.
+    ///
+    /// Returns the newly created scripting tab object.
+    @objc(handleNewTabScriptCommand:)
+    func handleNewTabScriptCommand(_ command: NSScriptCommand) -> Any? {
+        guard let appDelegate = delegate as? AppDelegate else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "Ghostty app delegate is unavailable."
+            return nil
+        }
+
+        let baseConfig: Ghostty.SurfaceConfiguration
+        do {
+            if let scriptRecord = command.evaluatedArguments?["configuration"] as? NSDictionary {
+                baseConfig = try Ghostty.SurfaceConfiguration(scriptRecord: scriptRecord)
+            } else {
+                baseConfig = Ghostty.SurfaceConfiguration()
+            }
+        } catch {
+            command.scriptErrorNumber = errAECoercionFail
+            command.scriptErrorString = error.localizedDescription
+            return nil
+        }
+
+        let targetWindow = command.evaluatedArguments?["window"] as? ScriptWindow
+        let parentWindow: NSWindow?
+        if let targetWindow {
+            guard let resolvedWindow = targetWindow.preferredParentWindow else {
+                command.scriptErrorNumber = errAEEventFailed
+                command.scriptErrorString = "Target window is no longer available."
+                return nil
+            }
+
+            parentWindow = resolvedWindow
+        } else {
+            parentWindow = TerminalController.preferredParent?.window
+        }
+
+        guard let createdController = TerminalController.newTab(
+            appDelegate.ghostty,
+            from: parentWindow,
+            withBaseConfig: baseConfig
+        ) else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "Failed to create tab."
+            return nil
+        }
+
+        let createdTabID = ScriptTab.stableID(controller: createdController)
+
+        if let targetWindow,
+           let scriptTab = targetWindow.valueInTabs(uniqueID: createdTabID) {
+            return scriptTab
+        }
+
+        for scriptWindow in scriptWindows {
+            if let scriptTab = scriptWindow.valueInTabs(uniqueID: createdTabID) {
+                return scriptTab
+            }
+        }
+
+        // Fall back to wrapping the created controller if AppKit tab-group
+        // bookkeeping has not fully refreshed in the current run loop.
+        let fallbackWindow = ScriptWindow(primaryController: createdController)
+        return ScriptTab(window: fallbackWindow, controller: createdController)
+    }
 }
 
 // MARK: - Private Helpers
diff --git a/macos/Sources/Features/AppleScript/ScriptSurfaceConfiguration.swift b/macos/Sources/Features/AppleScript/ScriptSurfaceConfiguration.swift
index 89ec85a3b..bec811993 100644
--- a/macos/Sources/Features/AppleScript/ScriptSurfaceConfiguration.swift
+++ b/macos/Sources/Features/AppleScript/ScriptSurfaceConfiguration.swift
@@ -9,6 +9,10 @@ extension Ghostty.SurfaceConfiguration: ScriptRecord {
     init(scriptRecord source: NSDictionary?) throws {
         self.init()
 
+        guard let source else {
+            return
+        }
+
         guard let raw = source as? [String: Any] else {
             throw RecordParseError.invalidType(parameter: "configuration", expected: "a surface configuration record")
         }
diff --git a/macos/Sources/Features/AppleScript/ScriptWindow.swift b/macos/Sources/Features/AppleScript/ScriptWindow.swift
index f6cfeaa77..089ea5e18 100644
--- a/macos/Sources/Features/AppleScript/ScriptWindow.swift
+++ b/macos/Sources/Features/AppleScript/ScriptWindow.swift
@@ -111,6 +111,11 @@ final class ScriptWindow: NSObject {
         selectedController === controller
     }
 
+    /// Best-effort native window to use as a tab parent for AppleScript commands.
+    var preferredParentWindow: NSWindow? {
+        selectedController?.window ?? controllers.first?.window
+    }
+
     /// Resolves a previously generated tab ID back to a live controller.
     private func controller(tabID: String) -> BaseTerminalController? {
         controllers.first(where: { ScriptTab.stableID(controller: $0) == tabID })

From 28b4e2495db53c707d4e6616af136eadd1eba393 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 6 Mar 2026 14:31:03 -0800
Subject: [PATCH 049/391] macos: Add AppleScript commands for window and tab
 control

Add scripting dictionary commands for activating windows, selecting tabs,
closing tabs, and closing windows.

Implement the corresponding Cocoa AppleScript command handlers and expose
minimal ScriptWindow/ScriptTab helpers needed to resolve live targets.

Verified by building Ghostty and running osascript commands against the
absolute Debug app path to exercise all four new commands.
---
 macos/Ghostty.sdef                            | 28 +++++++++
 .../AppleScript/ScriptCloseCommand.swift      | 60 +++++++++++++++++++
 .../AppleScript/ScriptFocusCommand.swift      | 46 ++++++++++++++
 .../Features/AppleScript/ScriptTab.swift      | 10 ++++
 .../Features/AppleScript/ScriptWindow.swift   |  5 ++
 5 files changed, 149 insertions(+)

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index 47fae636f..7cbe898a1 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -182,6 +182,34 @@
       </parameter>
     </command>
 
+    <command name="activate window" code="GhstAcWn" description="Activate a Ghostty window, bringing it to the front.">
+      <cocoa class="GhosttyScriptActivateWindowCommand"/>
+      <parameter name="window" code="GAwW" type="window" description="The window to activate.">
+        <cocoa key="window"/>
+      </parameter>
+    </command>
+
+    <command name="select tab" code="GhstSlTb" description="Select a tab in its window.">
+      <cocoa class="GhosttyScriptSelectTabCommand"/>
+      <parameter name="tab" code="GStT" type="tab" description="The tab to select.">
+        <cocoa key="tab"/>
+      </parameter>
+    </command>
+
+    <command name="close tab" code="GhstClTb" description="Close a tab.">
+      <cocoa class="GhosttyScriptCloseTabCommand"/>
+      <parameter name="tab" code="GCtT" type="tab" description="The tab to close.">
+        <cocoa key="tab"/>
+      </parameter>
+    </command>
+
+    <command name="close window" code="GhstClWn" description="Close a window.">
+      <cocoa class="GhosttyScriptCloseWindowCommand"/>
+      <parameter name="window" code="GCwW" type="window" description="The window to close.">
+        <cocoa key="window"/>
+      </parameter>
+    </command>
+
     <command name="input text" code="GhstInTx" description="Input text to a terminal as if it was pasted.">
       <cocoa class="GhosttyScriptInputTextCommand"/>
       <direct-parameter type="text" description="The text to input."/>
diff --git a/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift b/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift
index e8fdbb0a9..3f240cf6e 100644
--- a/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift
+++ b/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift
@@ -31,3 +31,63 @@ final class ScriptCloseCommand: NSScriptCommand {
         return nil
     }
 }
+
+/// Handler for the `close tab` AppleScript command defined in `Ghostty.sdef`.
+@MainActor
+@objc(GhosttyScriptCloseTabCommand)
+final class ScriptCloseTabCommand: NSScriptCommand {
+    override func performDefaultImplementation() -> Any? {
+        guard let tab = evaluatedArguments?["tab"] as? ScriptTab else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing tab target."
+            return nil
+        }
+
+        guard let controller = tab.parentController else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Tab is no longer available."
+            return nil
+        }
+
+        if let terminalController = controller as? TerminalController {
+            terminalController.closeTabImmediately(registerRedo: false)
+            return nil
+        }
+
+        guard let targetWindow = tab.parentWindow else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Tab window is no longer available."
+            return nil
+        }
+
+        targetWindow.close()
+        return nil
+    }
+}
+
+/// Handler for the `close window` AppleScript command defined in `Ghostty.sdef`.
+@MainActor
+@objc(GhosttyScriptCloseWindowCommand)
+final class ScriptCloseWindowCommand: NSScriptCommand {
+    override func performDefaultImplementation() -> Any? {
+        guard let window = evaluatedArguments?["window"] as? ScriptWindow else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing window target."
+            return nil
+        }
+
+        if let terminalController = window.preferredController as? TerminalController {
+            terminalController.closeWindowImmediately()
+            return nil
+        }
+
+        guard let targetWindow = window.preferredParentWindow else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Window is no longer available."
+            return nil
+        }
+
+        targetWindow.close()
+        return nil
+    }
+}
diff --git a/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift b/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift
index 024aee4de..edda43a45 100644
--- a/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift
+++ b/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift
@@ -31,3 +31,49 @@ final class ScriptFocusCommand: NSScriptCommand {
         return nil
     }
 }
+
+/// Handler for the `activate window` AppleScript command defined in `Ghostty.sdef`.
+@MainActor
+@objc(GhosttyScriptActivateWindowCommand)
+final class ScriptActivateWindowCommand: NSScriptCommand {
+    override func performDefaultImplementation() -> Any? {
+        guard let window = evaluatedArguments?["window"] as? ScriptWindow else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing window target."
+            return nil
+        }
+
+        guard let targetWindow = window.preferredParentWindow else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Window is no longer available."
+            return nil
+        }
+
+        targetWindow.makeKeyAndOrderFront(nil)
+        NSApp.activate(ignoringOtherApps: true)
+        return nil
+    }
+}
+
+/// Handler for the `select tab` AppleScript command defined in `Ghostty.sdef`.
+@MainActor
+@objc(GhosttyScriptSelectTabCommand)
+final class ScriptSelectTabCommand: NSScriptCommand {
+    override func performDefaultImplementation() -> Any? {
+        guard let tab = evaluatedArguments?["tab"] as? ScriptTab else {
+            scriptErrorNumber = errAEParamMissed
+            scriptErrorString = "Missing tab target."
+            return nil
+        }
+
+        guard let targetWindow = tab.parentWindow else {
+            scriptErrorNumber = errAEEventFailed
+            scriptErrorString = "Tab is no longer available."
+            return nil
+        }
+
+        targetWindow.makeKeyAndOrderFront(nil)
+        NSApp.activate(ignoringOtherApps: true)
+        return nil
+    }
+}
diff --git a/macos/Sources/Features/AppleScript/ScriptTab.swift b/macos/Sources/Features/AppleScript/ScriptTab.swift
index aa643db5a..bda694ebc 100644
--- a/macos/Sources/Features/AppleScript/ScriptTab.swift
+++ b/macos/Sources/Features/AppleScript/ScriptTab.swift
@@ -63,6 +63,16 @@ final class ScriptTab: NSObject {
         return window?.tabIsSelected(controller) ?? false
     }
 
+    /// Best-effort native window containing this tab.
+    var parentWindow: NSWindow? {
+        controller?.window
+    }
+
+    /// Live controller backing this tab wrapper.
+    var parentController: BaseTerminalController? {
+        controller
+    }
+
     /// Exposed as the AppleScript `terminals` element on a tab.
     ///
     /// Returns all terminal surfaces (split panes) within this tab.
diff --git a/macos/Sources/Features/AppleScript/ScriptWindow.swift b/macos/Sources/Features/AppleScript/ScriptWindow.swift
index 089ea5e18..97822e973 100644
--- a/macos/Sources/Features/AppleScript/ScriptWindow.swift
+++ b/macos/Sources/Features/AppleScript/ScriptWindow.swift
@@ -116,6 +116,11 @@ final class ScriptWindow: NSObject {
         selectedController?.window ?? controllers.first?.window
     }
 
+    /// Best-effort controller to use for window-scoped AppleScript commands.
+    var preferredController: BaseTerminalController? {
+        selectedController ?? controllers.first
+    }
+
     /// Resolves a previously generated tab ID back to a live controller.
     private func controller(tabID: String) -> BaseTerminalController? {
         controllers.first(where: { ScriptTab.stableID(controller: $0) == tabID })

From 25fa58143ec6d8e6eb200b459838f16376423fdf Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 6 Mar 2026 14:57:31 -0800
Subject: [PATCH 050/391] macos: add macos-applescript config

---
 macos/AGENTS.md                               |  3 ++
 .../AppleScript/AppDelegate+AppleScript.swift | 37 +++++++++++++++++--
 .../AppleScript/ScriptCloseCommand.swift      |  6 +++
 .../AppleScript/ScriptFocusCommand.swift      |  6 +++
 .../AppleScript/ScriptInputTextCommand.swift  |  2 +
 .../AppleScript/ScriptKeyEventCommand.swift   |  2 +
 .../ScriptMouseButtonCommand.swift            |  2 +
 .../AppleScript/ScriptMousePosCommand.swift   |  2 +
 .../ScriptMouseScrollCommand.swift            |  2 +
 .../AppleScript/ScriptSplitCommand.swift      |  2 +
 .../Features/AppleScript/ScriptTab.swift      | 17 +++++++--
 .../Features/AppleScript/ScriptTerminal.swift | 11 ++++--
 .../Features/AppleScript/ScriptWindow.swift   | 31 +++++++++++-----
 macos/Sources/Ghostty/Ghostty.Config.swift    |  8 ++++
 src/config/Config.zig                         | 10 +++++
 15 files changed, 122 insertions(+), 19 deletions(-)

diff --git a/macos/AGENTS.md b/macos/AGENTS.md
index 22da2a4c2..1a0c84c32 100644
--- a/macos/AGENTS.md
+++ b/macos/AGENTS.md
@@ -13,6 +13,9 @@
 ## AppleScript
 
 - The AppleScript scripting definition is in `macos/Ghostty.sdef`.
+- Guard AppleScript entry points and object accessors with the
+  `macos-applescript` configuration (use `NSApp.isAppleScriptEnabled`
+  and `NSApp.validateScript(command:)` where applicable).
 - In `macos/Ghostty.sdef`, keep top-level definitions in this order:
   1. Classes
   2. Records
diff --git a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
index 1071f9f67..647aaba6a 100644
--- a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
+++ b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
@@ -29,6 +29,8 @@ extension NSApplication {
     /// such as `windows`, `window 1`, or `every window whose ...`.
     @objc(scriptWindows)
     var scriptWindows: [ScriptWindow] {
+        guard isAppleScriptEnabled else { return [] }
+
         // AppKit exposes one NSWindow per tab. AppleScript users expect one
         // top-level window object containing multiple tabs, so we dedupe tab
         // siblings into a single ScriptWindow.
@@ -64,7 +66,8 @@ extension NSApplication {
     /// Returning `nil` makes the object specifier fail naturally.
     @objc(valueInScriptWindowsWithUniqueID:)
     func valueInScriptWindows(uniqueID: String) -> ScriptWindow? {
-        scriptWindows.first(where: { $0.stableID == uniqueID })
+        guard isAppleScriptEnabled else { return nil }
+        return scriptWindows.first(where: { $0.stableID == uniqueID })
     }
 }
 
@@ -77,7 +80,8 @@ extension NSApplication {
     /// Required selector name: `terminals`.
     @objc(terminals)
     var terminals: [ScriptTerminal] {
-        allSurfaceViews.map(ScriptTerminal.init)
+        guard isAppleScriptEnabled else { return [] }
+        return allSurfaceViews.map(ScriptTerminal.init)
     }
 
     /// Enables AppleScript unique-ID lookup for terminal references.
@@ -89,7 +93,8 @@ extension NSApplication {
     /// `terminal id "..."` even as windows/tabs change.
     @objc(valueInTerminalsWithUniqueID:)
     func valueInTerminals(uniqueID: String) -> ScriptTerminal? {
-        allSurfaceViews
+        guard isAppleScriptEnabled else { return nil }
+        return allSurfaceViews
             .first(where: { $0.id.uuidString == uniqueID })
             .map(ScriptTerminal.init)
     }
@@ -111,6 +116,8 @@ extension NSApplication {
     /// We return a Bool to match the command's declared result type.
     @objc(handlePerformActionScriptCommand:)
     func handlePerformActionScriptCommand(_ command: NSScriptCommand) -> Any? {
+        guard validateScript(command: command) else { return nil }
+
         guard let action = command.directParameter as? String else {
             command.scriptErrorNumber = errAEParamMissed
             command.scriptErrorString = "Missing action string."
@@ -129,6 +136,8 @@ extension NSApplication {
     /// Handler for creating a reusable AppleScript surface configuration object.
     @objc(handleNewSurfaceConfigurationScriptCommand:)
     func handleNewSurfaceConfigurationScriptCommand(_ command: NSScriptCommand) -> Any? {
+        guard validateScript(command: command) else { return nil }
+
         do {
             let configuration = try Ghostty.SurfaceConfiguration(
                 scriptRecord: command.evaluatedArguments?["configuration"] as? NSDictionary
@@ -151,6 +160,8 @@ extension NSApplication {
     /// Returns the newly created scripting window object.
     @objc(handleNewWindowScriptCommand:)
     func handleNewWindowScriptCommand(_ command: NSScriptCommand) -> Any? {
+        guard validateScript(command: command) else { return nil }
+
         guard let appDelegate = delegate as? AppDelegate else {
             command.scriptErrorNumber = errAEEventFailed
             command.scriptErrorString = "Ghostty app delegate is unavailable."
@@ -195,6 +206,8 @@ extension NSApplication {
     /// Returns the newly created scripting tab object.
     @objc(handleNewTabScriptCommand:)
     func handleNewTabScriptCommand(_ command: NSScriptCommand) -> Any? {
+        guard validateScript(command: command) else { return nil }
+
         guard let appDelegate = delegate as? AppDelegate else {
             command.scriptErrorNumber = errAEEventFailed
             command.scriptErrorString = "Ghostty app delegate is unavailable."
@@ -262,6 +275,24 @@ extension NSApplication {
 
 @MainActor
 extension NSApplication {
+    /// Whether Ghostty should currently accept AppleScript interactions.
+    var isAppleScriptEnabled: Bool {
+        guard let appDelegate = delegate as? AppDelegate else { return true }
+        return appDelegate.ghostty.config.macosAppleScript
+    }
+
+    /// Applies a consistent error when scripting is disabled by configuration.
+    @discardableResult
+    func validateScript(command: NSScriptCommand) -> Bool {
+        guard isAppleScriptEnabled else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "AppleScript is disabled by the macos-applescript configuration."
+            return false
+        }
+
+        return true
+    }
+
     /// Discovers all currently alive terminal surfaces across normal and quick
     /// terminal windows. This powers both terminal enumeration and ID lookup.
     fileprivate var allSurfaceViews: [Ghostty.SurfaceView] {
diff --git a/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift b/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift
index 3f240cf6e..e62d9bb60 100644
--- a/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift
+++ b/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift
@@ -9,6 +9,8 @@ import AppKit
 @objc(GhosttyScriptCloseCommand)
 final class ScriptCloseCommand: NSScriptCommand {
     override func performDefaultImplementation() -> Any? {
+        guard NSApp.validateScript(command: self) else { return nil }
+
         guard let terminal = evaluatedArguments?["terminal"] as? ScriptTerminal else {
             scriptErrorNumber = errAEParamMissed
             scriptErrorString = "Missing terminal target."
@@ -37,6 +39,8 @@ final class ScriptCloseCommand: NSScriptCommand {
 @objc(GhosttyScriptCloseTabCommand)
 final class ScriptCloseTabCommand: NSScriptCommand {
     override func performDefaultImplementation() -> Any? {
+        guard NSApp.validateScript(command: self) else { return nil }
+
         guard let tab = evaluatedArguments?["tab"] as? ScriptTab else {
             scriptErrorNumber = errAEParamMissed
             scriptErrorString = "Missing tab target."
@@ -70,6 +74,8 @@ final class ScriptCloseTabCommand: NSScriptCommand {
 @objc(GhosttyScriptCloseWindowCommand)
 final class ScriptCloseWindowCommand: NSScriptCommand {
     override func performDefaultImplementation() -> Any? {
+        guard NSApp.validateScript(command: self) else { return nil }
+
         guard let window = evaluatedArguments?["window"] as? ScriptWindow else {
             scriptErrorNumber = errAEParamMissed
             scriptErrorString = "Missing window target."
diff --git a/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift b/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift
index edda43a45..61b4ab8c6 100644
--- a/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift
+++ b/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift
@@ -9,6 +9,8 @@ import AppKit
 @objc(GhosttyScriptFocusCommand)
 final class ScriptFocusCommand: NSScriptCommand {
     override func performDefaultImplementation() -> Any? {
+        guard NSApp.validateScript(command: self) else { return nil }
+
         guard let terminal = evaluatedArguments?["terminal"] as? ScriptTerminal else {
             scriptErrorNumber = errAEParamMissed
             scriptErrorString = "Missing terminal target."
@@ -37,6 +39,8 @@ final class ScriptFocusCommand: NSScriptCommand {
 @objc(GhosttyScriptActivateWindowCommand)
 final class ScriptActivateWindowCommand: NSScriptCommand {
     override func performDefaultImplementation() -> Any? {
+        guard NSApp.validateScript(command: self) else { return nil }
+
         guard let window = evaluatedArguments?["window"] as? ScriptWindow else {
             scriptErrorNumber = errAEParamMissed
             scriptErrorString = "Missing window target."
@@ -60,6 +64,8 @@ final class ScriptActivateWindowCommand: NSScriptCommand {
 @objc(GhosttyScriptSelectTabCommand)
 final class ScriptSelectTabCommand: NSScriptCommand {
     override func performDefaultImplementation() -> Any? {
+        guard NSApp.validateScript(command: self) else { return nil }
+
         guard let tab = evaluatedArguments?["tab"] as? ScriptTab else {
             scriptErrorNumber = errAEParamMissed
             scriptErrorString = "Missing tab target."
diff --git a/macos/Sources/Features/AppleScript/ScriptInputTextCommand.swift b/macos/Sources/Features/AppleScript/ScriptInputTextCommand.swift
index 729c20e6c..9662de343 100644
--- a/macos/Sources/Features/AppleScript/ScriptInputTextCommand.swift
+++ b/macos/Sources/Features/AppleScript/ScriptInputTextCommand.swift
@@ -9,6 +9,8 @@ import AppKit
 @objc(GhosttyScriptInputTextCommand)
 final class ScriptInputTextCommand: NSScriptCommand {
     override func performDefaultImplementation() -> Any? {
+        guard NSApp.validateScript(command: self) else { return nil }
+
         guard let text = directParameter as? String else {
             scriptErrorNumber = errAEParamMissed
             scriptErrorString = "Missing text to input."
diff --git a/macos/Sources/Features/AppleScript/ScriptKeyEventCommand.swift b/macos/Sources/Features/AppleScript/ScriptKeyEventCommand.swift
index 8ac5afb9c..0091098c5 100644
--- a/macos/Sources/Features/AppleScript/ScriptKeyEventCommand.swift
+++ b/macos/Sources/Features/AppleScript/ScriptKeyEventCommand.swift
@@ -9,6 +9,8 @@ import AppKit
 @objc(GhosttyScriptKeyEventCommand)
 final class ScriptKeyEventCommand: NSScriptCommand {
     override func performDefaultImplementation() -> Any? {
+        guard NSApp.validateScript(command: self) else { return nil }
+
         guard let keyName = directParameter as? String else {
             scriptErrorNumber = errAEParamMissed
             scriptErrorString = "Missing key name."
diff --git a/macos/Sources/Features/AppleScript/ScriptMouseButtonCommand.swift b/macos/Sources/Features/AppleScript/ScriptMouseButtonCommand.swift
index 2070cb1ee..15fe0fbce 100644
--- a/macos/Sources/Features/AppleScript/ScriptMouseButtonCommand.swift
+++ b/macos/Sources/Features/AppleScript/ScriptMouseButtonCommand.swift
@@ -9,6 +9,8 @@ import AppKit
 @objc(GhosttyScriptMouseButtonCommand)
 final class ScriptMouseButtonCommand: NSScriptCommand {
     override func performDefaultImplementation() -> Any? {
+        guard NSApp.validateScript(command: self) else { return nil }
+
         guard let buttonCode = directParameter as? UInt32,
               let button = ScriptMouseButtonValue(code: buttonCode) else {
             scriptErrorNumber = errAEParamMissed
diff --git a/macos/Sources/Features/AppleScript/ScriptMousePosCommand.swift b/macos/Sources/Features/AppleScript/ScriptMousePosCommand.swift
index 8ee56ec91..a044c3b2d 100644
--- a/macos/Sources/Features/AppleScript/ScriptMousePosCommand.swift
+++ b/macos/Sources/Features/AppleScript/ScriptMousePosCommand.swift
@@ -9,6 +9,8 @@ import AppKit
 @objc(GhosttyScriptMousePosCommand)
 final class ScriptMousePosCommand: NSScriptCommand {
     override func performDefaultImplementation() -> Any? {
+        guard NSApp.validateScript(command: self) else { return nil }
+
         guard let x = evaluatedArguments?["x"] as? Double else {
             scriptErrorNumber = errAEParamMissed
             scriptErrorString = "Missing x position."
diff --git a/macos/Sources/Features/AppleScript/ScriptMouseScrollCommand.swift b/macos/Sources/Features/AppleScript/ScriptMouseScrollCommand.swift
index 6ce24a317..083937eaf 100644
--- a/macos/Sources/Features/AppleScript/ScriptMouseScrollCommand.swift
+++ b/macos/Sources/Features/AppleScript/ScriptMouseScrollCommand.swift
@@ -9,6 +9,8 @@ import AppKit
 @objc(GhosttyScriptMouseScrollCommand)
 final class ScriptMouseScrollCommand: NSScriptCommand {
     override func performDefaultImplementation() -> Any? {
+        guard NSApp.validateScript(command: self) else { return nil }
+
         guard let x = evaluatedArguments?["x"] as? Double else {
             scriptErrorNumber = errAEParamMissed
             scriptErrorString = "Missing x scroll delta."
diff --git a/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift b/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift
index e74eed78f..30f34fc8e 100644
--- a/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift
+++ b/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift
@@ -9,6 +9,8 @@ import AppKit
 @objc(GhosttyScriptSplitCommand)
 final class ScriptSplitCommand: NSScriptCommand {
     override func performDefaultImplementation() -> Any? {
+        guard NSApp.validateScript(command: self) else { return nil }
+
         guard let terminal = evaluatedArguments?["terminal"] as? ScriptTerminal else {
             scriptErrorNumber = errAEParamMissed
             scriptErrorString = "Missing terminal target."
diff --git a/macos/Sources/Features/AppleScript/ScriptTab.swift b/macos/Sources/Features/AppleScript/ScriptTab.swift
index bda694ebc..467fc3d06 100644
--- a/macos/Sources/Features/AppleScript/ScriptTab.swift
+++ b/macos/Sources/Features/AppleScript/ScriptTab.swift
@@ -34,7 +34,8 @@ final class ScriptTab: NSObject {
     /// Exposed as the AppleScript `id` property.
     @objc(id)
     var idValue: String {
-        stableID
+        guard NSApp.isAppleScriptEnabled else { return "" }
+        return stableID
     }
 
     /// Exposed as the AppleScript `title` property.
@@ -42,7 +43,8 @@ final class ScriptTab: NSObject {
     /// Returns the title of the tab's window.
     @objc(title)
     var title: String {
-        controller?.window?.title ?? ""
+        guard NSApp.isAppleScriptEnabled else { return "" }
+        return controller?.window?.title ?? ""
     }
 
     /// Exposed as the AppleScript `index` property.
@@ -50,6 +52,7 @@ final class ScriptTab: NSObject {
     /// Cocoa scripting expects this to be 1-based for user-facing collections.
     @objc(index)
     var index: Int {
+        guard NSApp.isAppleScriptEnabled else { return 0 }
         guard let controller else { return 0 }
         return window?.tabIndex(for: controller) ?? 0
     }
@@ -59,18 +62,21 @@ final class ScriptTab: NSObject {
     /// Powers script conditions such as `if selected of tab 1 then ...`.
     @objc(selected)
     var selected: Bool {
+        guard NSApp.isAppleScriptEnabled else { return false }
         guard let controller else { return false }
         return window?.tabIsSelected(controller) ?? false
     }
 
     /// Best-effort native window containing this tab.
     var parentWindow: NSWindow? {
-        controller?.window
+        guard NSApp.isAppleScriptEnabled else { return nil }
+        return controller?.window
     }
 
     /// Live controller backing this tab wrapper.
     var parentController: BaseTerminalController? {
-        controller
+        guard NSApp.isAppleScriptEnabled else { return nil }
+        return controller
     }
 
     /// Exposed as the AppleScript `terminals` element on a tab.
@@ -78,6 +84,7 @@ final class ScriptTab: NSObject {
     /// Returns all terminal surfaces (split panes) within this tab.
     @objc(terminals)
     var terminals: [ScriptTerminal] {
+        guard NSApp.isAppleScriptEnabled else { return [] }
         guard let controller else { return [] }
         return (controller.surfaceTree.root?.leaves() ?? [])
             .map(ScriptTerminal.init)
@@ -86,6 +93,7 @@ final class ScriptTab: NSObject {
     /// Enables unique-ID lookup for `terminals` references on a tab.
     @objc(valueInTerminalsWithUniqueID:)
     func valueInTerminals(uniqueID: String) -> ScriptTerminal? {
+        guard NSApp.isAppleScriptEnabled else { return nil }
         guard let controller else { return nil }
         return (controller.surfaceTree.root?.leaves() ?? [])
             .first(where: { $0.id.uuidString == uniqueID })
@@ -94,6 +102,7 @@ final class ScriptTab: NSObject {
 
     /// Provides Cocoa scripting with a canonical "path" back to this object.
     override var objectSpecifier: NSScriptObjectSpecifier? {
+        guard NSApp.isAppleScriptEnabled else { return nil }
         guard let window else { return nil }
         guard let windowClassDescription = window.classDescription as? NSScriptClassDescription else {
             return nil
diff --git a/macos/Sources/Features/AppleScript/ScriptTerminal.swift b/macos/Sources/Features/AppleScript/ScriptTerminal.swift
index 1e47aa7b6..e4500c6b9 100644
--- a/macos/Sources/Features/AppleScript/ScriptTerminal.swift
+++ b/macos/Sources/Features/AppleScript/ScriptTerminal.swift
@@ -32,13 +32,15 @@ final class ScriptTerminal: NSObject {
     /// by `NSUniqueIDSpecifier` to re-identify a terminal object in scripts.
     @objc(id)
     var stableID: String {
-        surfaceView?.id.uuidString ?? ""
+        guard NSApp.isAppleScriptEnabled else { return "" }
+        return surfaceView?.id.uuidString ?? ""
     }
 
     /// Exposed as the AppleScript `title` property.
     @objc(title)
     var title: String {
-        surfaceView?.title ?? ""
+        guard NSApp.isAppleScriptEnabled else { return "" }
+        return surfaceView?.title ?? ""
     }
 
     /// Exposed as the AppleScript `working directory` property.
@@ -47,11 +49,13 @@ final class ScriptTerminal: NSObject {
     /// camel-cased selector name `workingDirectory`.
     @objc(workingDirectory)
     var workingDirectory: String {
-        surfaceView?.pwd ?? ""
+        guard NSApp.isAppleScriptEnabled else { return "" }
+        return surfaceView?.pwd ?? ""
     }
 
     /// Used by command handling (`perform action ... on <terminal>`).
     func perform(action: String) -> Bool {
+        guard NSApp.isAppleScriptEnabled else { return false }
         guard let surfaceModel = surfaceView?.surfaceModel else { return false }
         return surfaceModel.perform(action: action)
     }
@@ -62,6 +66,7 @@ final class ScriptTerminal: NSObject {
     /// referenced in follow-up script statements because AppleScript cannot
     /// express where the object came from (`application.terminals[id]`).
     override var objectSpecifier: NSScriptObjectSpecifier? {
+        guard NSApp.isAppleScriptEnabled else { return nil }
         guard let appClassDescription = NSApplication.shared.classDescription as? NSScriptClassDescription else {
             return nil
         }
diff --git a/macos/Sources/Features/AppleScript/ScriptWindow.swift b/macos/Sources/Features/AppleScript/ScriptWindow.swift
index 97822e973..01a603843 100644
--- a/macos/Sources/Features/AppleScript/ScriptWindow.swift
+++ b/macos/Sources/Features/AppleScript/ScriptWindow.swift
@@ -39,7 +39,8 @@ final class ScriptWindow: NSObject {
     /// This is what scripts read with `id of window ...`.
     @objc(id)
     var idValue: String {
-        stableID
+        guard NSApp.isAppleScriptEnabled else { return "" }
+        return stableID
     }
 
     /// Exposed as the AppleScript `title` property.
@@ -47,7 +48,8 @@ final class ScriptWindow: NSObject {
     /// Returns the title of the window (from the selected/primary controller's NSWindow).
     @objc(title)
     var title: String {
-        selectedController?.window?.title ?? ""
+        guard NSApp.isAppleScriptEnabled else { return "" }
+        return selectedController?.window?.title ?? ""
     }
 
     /// Exposed as the AppleScript `tabs` element.
@@ -57,7 +59,8 @@ final class ScriptWindow: NSObject {
     /// so tab additions/removals are reflected immediately.
     @objc(tabs)
     var tabs: [ScriptTab] {
-        controllers.map { ScriptTab(window: self, controller: $0) }
+        guard NSApp.isAppleScriptEnabled else { return [] }
+        return controllers.map { ScriptTab(window: self, controller: $0) }
     }
 
     /// Exposed as the AppleScript `selected tab` property.
@@ -65,6 +68,7 @@ final class ScriptWindow: NSObject {
     /// This powers expressions like `selected tab of window 1`.
     @objc(selectedTab)
     var selectedTab: ScriptTab? {
+        guard NSApp.isAppleScriptEnabled else { return nil }
         guard let selectedController else { return nil }
         return ScriptTab(window: self, controller: selectedController)
     }
@@ -77,6 +81,7 @@ final class ScriptWindow: NSObject {
     /// Cocoa uses this when a script resolves `tab id "..." of window ...`.
     @objc(valueInTabsWithUniqueID:)
     func valueInTabs(uniqueID: String) -> ScriptTab? {
+        guard NSApp.isAppleScriptEnabled else { return nil }
         guard let controller = controller(tabID: uniqueID) else { return nil }
         return ScriptTab(window: self, controller: controller)
     }
@@ -86,7 +91,8 @@ final class ScriptWindow: NSObject {
     /// Returns all terminal surfaces across every tab in this window.
     @objc(terminals)
     var terminals: [ScriptTerminal] {
-        controllers
+        guard NSApp.isAppleScriptEnabled else { return [] }
+        return controllers
             .flatMap { $0.surfaceTree.root?.leaves() ?? [] }
             .map(ScriptTerminal.init)
     }
@@ -94,7 +100,8 @@ final class ScriptWindow: NSObject {
     /// Enables unique-ID lookup for `terminals` references on a window.
     @objc(valueInTerminalsWithUniqueID:)
     func valueInTerminals(uniqueID: String) -> ScriptTerminal? {
-        controllers
+        guard NSApp.isAppleScriptEnabled else { return nil }
+        return controllers
             .flatMap { $0.surfaceTree.root?.leaves() ?? [] }
             .first(where: { $0.id.uuidString == uniqueID })
             .map(ScriptTerminal.init)
@@ -103,22 +110,26 @@ final class ScriptWindow: NSObject {
     /// AppleScript tab indexes are 1-based, so we add one to Swift's 0-based
     /// array index.
     func tabIndex(for controller: BaseTerminalController) -> Int? {
-        controllers.firstIndex(where: { $0 === controller }).map { $0 + 1 }
+        guard NSApp.isAppleScriptEnabled else { return nil }
+        return controllers.firstIndex(where: { $0 === controller }).map { $0 + 1 }
     }
 
     /// Reports whether a given controller maps to this window's selected tab.
     func tabIsSelected(_ controller: BaseTerminalController) -> Bool {
-        selectedController === controller
+        guard NSApp.isAppleScriptEnabled else { return false }
+        return selectedController === controller
     }
 
     /// Best-effort native window to use as a tab parent for AppleScript commands.
     var preferredParentWindow: NSWindow? {
-        selectedController?.window ?? controllers.first?.window
+        guard NSApp.isAppleScriptEnabled else { return nil }
+        return selectedController?.window ?? controllers.first?.window
     }
 
     /// Best-effort controller to use for window-scoped AppleScript commands.
     var preferredController: BaseTerminalController? {
-        selectedController ?? controllers.first
+        guard NSApp.isAppleScriptEnabled else { return nil }
+        return selectedController ?? controllers.first
     }
 
     /// Resolves a previously generated tab ID back to a live controller.
@@ -131,6 +142,7 @@ final class ScriptWindow: NSObject {
     /// We recalculate on every access so AppleScript immediately sees tab-group
     /// changes (new tabs, closed tabs, tab moves) without rebuilding all objects.
     private var controllers: [BaseTerminalController] {
+        guard NSApp.isAppleScriptEnabled else { return [] }
         guard let primaryController else { return [] }
         guard let window = primaryController.window else { return [primaryController] }
 
@@ -168,6 +180,7 @@ final class ScriptWindow: NSObject {
     /// references for later script statements. This specifier encodes:
     /// `application -> scriptWindows[id]`.
     override var objectSpecifier: NSScriptObjectSpecifier? {
+        guard NSApp.isAppleScriptEnabled else { return nil }
         guard let appClassDescription = NSApplication.shared.classDescription as? NSScriptClassDescription else {
             return nil
         }
diff --git a/macos/Sources/Ghostty/Ghostty.Config.swift b/macos/Sources/Ghostty/Ghostty.Config.swift
index 87ae0511f..239f458e3 100644
--- a/macos/Sources/Ghostty/Ghostty.Config.swift
+++ b/macos/Sources/Ghostty/Ghostty.Config.swift
@@ -678,6 +678,14 @@ extension Ghostty {
             return v
         }
 
+        var macosAppleScript: Bool {
+            guard let config = self.config else { return true }
+            var v = false
+            let key = "macos-applescript"
+            _ = ghostty_config_get(config, &v, key, UInt(key.lengthOfBytes(using: .utf8)))
+            return v
+        }
+
         var maximize: Bool {
             guard let config = self.config else { return true }
             var v = false
diff --git a/src/config/Config.zig b/src/config/Config.zig
index ca93c85d6..591c0b049 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -3347,6 +3347,16 @@ keybind: Keybinds = .{},
 /// you may want to disable it.
 @"macos-secure-input-indication": bool = true,
 
+/// If true, Ghostty exposes and handles the built-in AppleScript dictionary
+/// on macOS.
+///
+/// If false, all AppleScript interactions are disabled. This includes
+/// AppleScript commands and AppleScript object lookup for windows, tabs,
+/// and terminals.
+///
+/// The default is true.
+@"macos-applescript": bool = true,
+
 /// Customize the macOS app icon.
 ///
 /// This only affects the icon that appears in the dock, application

From 221a1639af6060b485fd2ef214fa260b7aa7ddb1 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 6 Mar 2026 15:07:04 -0800
Subject: [PATCH 051/391] swiftlint

---
 .../AppleScript/AppDelegate+AppleScript.swift | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
index 647aaba6a..c1fba16e0 100644
--- a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
+++ b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
@@ -1,18 +1,18 @@
 import AppKit
 
-/// Application-level Cocoa scripting hooks for the Ghostty AppleScript dictionary.
-///
-/// Cocoa scripting is mostly convention-based: we do not register handlers in
-/// code, we expose Objective-C selectors with names Cocoa derives from
-/// `Ghostty.sdef`.
-///
-/// In practical terms:
-/// - An `<element>` in `sdef` maps to an ObjC collection accessor.
-/// - Unique-ID element lookup maps to `valueIn...WithUniqueID:`.
-/// - Some `<command>` declarations map to `handle...ScriptCommand:`.
-///
-/// This file implements the selectors Cocoa expects on `NSApplication`, which is
-/// the runtime object behind the `application` class in `Ghostty.sdef`.
+// Application-level Cocoa scripting hooks for the Ghostty AppleScript dictionary.
+//
+// Cocoa scripting is mostly convention-based: we do not register handlers in
+// code, we expose Objective-C selectors with names Cocoa derives from
+// `Ghostty.sdef`.
+//
+// In practical terms:
+// - An `<element>` in `sdef` maps to an ObjC collection accessor.
+// - Unique-ID element lookup maps to `valueIn...WithUniqueID:`.
+// - Some `<command>` declarations map to `handle...ScriptCommand:`.
+//
+// This file implements the selectors Cocoa expects on `NSApplication`, which is
+// the runtime object behind the `application` class in `Ghostty.sdef`.
 
 // MARK: - Windows
 

From 259a41d503ad24eb9af83dd7f50566cf312ef87a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 6 Mar 2026 15:15:30 -0800
Subject: [PATCH 052/391] macos: rename surface config working directory to not
 be ambiguous

---
 macos/Ghostty.sdef                                              | 2 +-
 .../Features/AppleScript/ScriptSurfaceConfiguration.swift       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index 7cbe898a1..95fcea626 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -78,7 +78,7 @@
       <property name="font size" code="GScF" type="real" description="Font size in points.">
         <cocoa key="fontSize"/>
       </property>
-      <property name="working directory" code="GScD" type="text" description="Working directory for the terminal process.">
+      <property name="initial working directory" code="GScD" type="text" description="Initial working directory for the terminal process.">
         <cocoa key="workingDirectory"/>
       </property>
       <property name="command" code="GScC" type="text" description="Command to execute instead of the configured shell.">
diff --git a/macos/Sources/Features/AppleScript/ScriptSurfaceConfiguration.swift b/macos/Sources/Features/AppleScript/ScriptSurfaceConfiguration.swift
index bec811993..dfa60da41 100644
--- a/macos/Sources/Features/AppleScript/ScriptSurfaceConfiguration.swift
+++ b/macos/Sources/Features/AppleScript/ScriptSurfaceConfiguration.swift
@@ -38,7 +38,7 @@ extension Ghostty.SurfaceConfiguration: ScriptRecord {
 
         if let rawWorkingDirectory = raw["workingDirectory"] {
             guard let workingDirectory = rawWorkingDirectory as? String else {
-                throw RecordParseError.invalidType(parameter: "working directory", expected: "text")
+                throw RecordParseError.invalidType(parameter: "initial working directory", expected: "text")
             }
 
             if !workingDirectory.isEmpty {

From adc6794f3b1a1f46048f86e61397bc4736567589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Miguel=20Sarasola?= <alosarjos@gmail.com>
Date: Sun, 15 Feb 2026 12:33:13 +0100
Subject: [PATCH 053/391] Add es_ES.UTF-8 translation

---
 CODEOWNERS              |   1 +
 po/es_ES.po             | 355 ++++++++++++++++++++++++++++++++++++++++
 src/os/i18n_locales.zig |   1 +
 3 files changed, 357 insertions(+)
 create mode 100644 po/es_ES.po

diff --git a/CODEOWNERS b/CODEOWNERS
index f377a73c6..881a23e1a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -169,6 +169,7 @@
 /po/de.po @ghostty-org/de_DE
 /po/es_AR.po @ghostty-org/es_AR
 /po/es_BO.po @ghostty-org/es_BO
+/po/es_ES.po @ghostty-org/es_ES
 /po/fr.po @ghostty-org/fr_FR
 /po/ga.po @ghostty-org/ga_IE
 /po/he.po @ghostty-org/he_IL
diff --git a/po/es_ES.po b/po/es_ES.po
new file mode 100644
index 000000000..364da14c9
--- /dev/null
+++ b/po/es_ES.po
@@ -0,0 +1,355 @@
+# Spanish translations for com.mitchellh.ghostty package
+# Traducciones al español para el paquete com.mitchellh.ghostty.
+# Copyright (C) 2026 "Mitchell Hashimoto, Ghostty contributors"
+# This file is distributed under the same license as the com.mitchellh.ghostty package.
+# José Miguel Sarasola <alosarjos@gmail.com>, 2026.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: com.mitchellh.ghostty\n"
+"Report-Msgid-Bugs-To: m@mitchellh.com\n"
+"POT-Creation-Date: 2026-02-05 10:23+0800\n"
+"PO-Revision-Date: 2026-02-18 10:57+0100\n"
+"Last-Translator: José Miguel Sarasola <alosarjos@gmail.com>\n"
+"Language-Team: \n"
+"Language: es_ES\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: dist/linux/ghostty_nautilus.py:53
+msgid "Open in Ghostty"
+msgstr "Abrir en Ghostty"
+
+#: src/apprt/gtk/ui/1.0/clipboard-confirmation-dialog.blp:12
+#: src/apprt/gtk/ui/1.4/clipboard-confirmation-dialog.blp:12
+#: src/apprt/gtk/class/clipboard_confirmation_dialog.zig:197
+#: src/apprt/gtk/class/clipboard_confirmation_dialog.zig:201
+msgid "Authorize Clipboard Access"
+msgstr "Autorizar acceso al portapapeles"
+
+#: src/apprt/gtk/ui/1.0/clipboard-confirmation-dialog.blp:17
+#: src/apprt/gtk/ui/1.4/clipboard-confirmation-dialog.blp:17
+msgid "Deny"
+msgstr "Denegar"
+
+#: src/apprt/gtk/ui/1.0/clipboard-confirmation-dialog.blp:18
+#: src/apprt/gtk/ui/1.4/clipboard-confirmation-dialog.blp:18
+msgid "Allow"
+msgstr "Permitir"
+
+#: src/apprt/gtk/ui/1.4/clipboard-confirmation-dialog.blp:92
+msgid "Remember choice for this split"
+msgstr "Recordar elección para esta división"
+
+#: src/apprt/gtk/ui/1.4/clipboard-confirmation-dialog.blp:93
+msgid "Reload configuration to show this prompt again"
+msgstr "Recargar configuración para volver a mostrar este aviso"
+
+#: src/apprt/gtk/ui/1.2/close-confirmation-dialog.blp:7
+#: src/apprt/gtk/ui/1.5/title-dialog.blp:8
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/apprt/gtk/ui/1.2/close-confirmation-dialog.blp:8
+#: src/apprt/gtk/ui/1.2/search-overlay.blp:85
+#: src/apprt/gtk/ui/1.3/surface-child-exited.blp:17
+msgid "Close"
+msgstr "Cerrar"
+
+#: src/apprt/gtk/ui/1.2/config-errors-dialog.blp:6
+msgid "Configuration Errors"
+msgstr "Errores en la configuración"
+
+#: src/apprt/gtk/ui/1.2/config-errors-dialog.blp:7
+msgid ""
+"One or more configuration errors were found. Please review the errors below, "
+"and either reload your configuration or ignore these errors."
+msgstr ""
+"Se detectaron uno o más errores de configuración. Por favor, revisa los "
+"errores más abajo y recarga la configuración o ignora estos errores."
+
+#: src/apprt/gtk/ui/1.2/config-errors-dialog.blp:10
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: src/apprt/gtk/ui/1.2/config-errors-dialog.blp:11
+#: src/apprt/gtk/ui/1.2/surface.blp:366 src/apprt/gtk/ui/1.5/window.blp:300
+msgid "Reload Configuration"
+msgstr "Recargar configuración"
+
+#: src/apprt/gtk/ui/1.2/debug-warning.blp:7
+#: src/apprt/gtk/ui/1.3/debug-warning.blp:6
+msgid ""
+"⚠️ You're running a debug build of Ghostty! Performance will be degraded."
+msgstr ""
+"⚠️ ¡Estás ejecutando una versión de depuración de Ghostty! El rendimiento se verá perjudicado."
+
+#: src/apprt/gtk/ui/1.5/inspector-window.blp:5
+msgid "Ghostty: Terminal Inspector"
+msgstr "Ghostty: Inspector de terminal"
+
+#: src/apprt/gtk/ui/1.2/search-overlay.blp:29
+msgid "Find…"
+msgstr "Buscar…"
+
+#: src/apprt/gtk/ui/1.2/search-overlay.blp:64
+msgid "Previous Match"
+msgstr "Resultado previo"
+
+#: src/apprt/gtk/ui/1.2/search-overlay.blp:74
+msgid "Next Match"
+msgstr "Resultado siguiente"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:6
+msgid "Oh, no."
+msgstr "Oh, no."
+
+#: src/apprt/gtk/ui/1.2/surface.blp:7
+msgid "Unable to acquire an OpenGL context for rendering."
+msgstr "No se pudo obtener un contexto de OpenGL para el renderizado."
+
+#: src/apprt/gtk/ui/1.2/surface.blp:97
+msgid ""
+"This terminal is in read-only mode. You can still view, select, and scroll "
+"through the content, but no input events will be sent to the running "
+"application."
+msgstr ""
+"Este terminal está en modo de solo lectura. Puedes ver, seleccionar y hacer "
+"scroll del contenido, pero no se enviarán eventos de entrada a la aplicación "
+"en ejecución."
+
+#: src/apprt/gtk/ui/1.2/surface.blp:107
+msgid "Read-only"
+msgstr "Solo lectura"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:260 src/apprt/gtk/ui/1.5/window.blp:200
+msgid "Copy"
+msgstr "Copiar"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:265 src/apprt/gtk/ui/1.5/window.blp:205
+msgid "Paste"
+msgstr "Pegar"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:270
+msgid "Notify on Next Command Finish"
+msgstr "Notificar al finalizar el siguiente comando"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:277 src/apprt/gtk/ui/1.5/window.blp:273
+msgid "Clear"
+msgstr "Limpiar"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:282 src/apprt/gtk/ui/1.5/window.blp:278
+msgid "Reset"
+msgstr "Reiniciar"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:289 src/apprt/gtk/ui/1.5/window.blp:242
+msgid "Split"
+msgstr "Dividir"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:292 src/apprt/gtk/ui/1.5/window.blp:245
+msgid "Change Title…"
+msgstr "Cambiar título…"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:297 src/apprt/gtk/ui/1.5/window.blp:177
+#: src/apprt/gtk/ui/1.5/window.blp:250
+msgid "Split Up"
+msgstr "Dividir arriba"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:303 src/apprt/gtk/ui/1.5/window.blp:182
+#: src/apprt/gtk/ui/1.5/window.blp:255
+msgid "Split Down"
+msgstr "Dividir abajo"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:309 src/apprt/gtk/ui/1.5/window.blp:187
+#: src/apprt/gtk/ui/1.5/window.blp:260
+msgid "Split Left"
+msgstr "Dividir a la izquierda"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:315 src/apprt/gtk/ui/1.5/window.blp:192
+#: src/apprt/gtk/ui/1.5/window.blp:265
+msgid "Split Right"
+msgstr "Dividir a la derecha"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:322
+msgid "Tab"
+msgstr "Pestaña"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:325 src/apprt/gtk/ui/1.5/window.blp:224
+#: src/apprt/gtk/ui/1.5/window.blp:320
+msgid "Change Tab Title…"
+msgstr "Cambiar título de la pestaña…"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:330 src/apprt/gtk/ui/1.5/window.blp:57
+#: src/apprt/gtk/ui/1.5/window.blp:107 src/apprt/gtk/ui/1.5/window.blp:229
+msgid "New Tab"
+msgstr "Nueva pestaña"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:335 src/apprt/gtk/ui/1.5/window.blp:234
+msgid "Close Tab"
+msgstr "Cerrar pestaña"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:342
+msgid "Window"
+msgstr "Ventana"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:345 src/apprt/gtk/ui/1.5/window.blp:212
+msgid "New Window"
+msgstr "Nueva ventana"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:350 src/apprt/gtk/ui/1.5/window.blp:217
+msgid "Close Window"
+msgstr "Cerrar ventana"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:358
+msgid "Config"
+msgstr "Configuración"
+
+#: src/apprt/gtk/ui/1.2/surface.blp:361 src/apprt/gtk/ui/1.5/window.blp:295
+msgid "Open Configuration"
+msgstr "Abrir configuración"
+
+#: src/apprt/gtk/ui/1.5/title-dialog.blp:5
+msgid "Leave blank to restore the default title."
+msgstr "Dejar en blanco para restaurar el título predeterminado."
+
+#: src/apprt/gtk/ui/1.5/title-dialog.blp:9
+msgid "OK"
+msgstr "Aceptar"
+
+#: src/apprt/gtk/ui/1.5/window.blp:58 src/apprt/gtk/ui/1.5/window.blp:108
+msgid "New Split"
+msgstr "Nueva división"
+
+#: src/apprt/gtk/ui/1.5/window.blp:68 src/apprt/gtk/ui/1.5/window.blp:126
+msgid "View Open Tabs"
+msgstr "Ver pestañas abiertas"
+
+#: src/apprt/gtk/ui/1.5/window.blp:78 src/apprt/gtk/ui/1.5/window.blp:140
+msgid "Main Menu"
+msgstr "Menú principal"
+
+#: src/apprt/gtk/ui/1.5/window.blp:285
+msgid "Command Palette"
+msgstr "Paleta de comandos"
+
+#: src/apprt/gtk/ui/1.5/window.blp:290
+msgid "Terminal Inspector"
+msgstr "Inspector de terminal"
+
+#: src/apprt/gtk/ui/1.5/window.blp:307 src/apprt/gtk/class/window.zig:1727
+msgid "About Ghostty"
+msgstr "Acerca de Ghostty"
+
+#: src/apprt/gtk/ui/1.5/window.blp:312
+msgid "Quit"
+msgstr "Salir"
+
+#: src/apprt/gtk/ui/1.5/command-palette.blp:17
+msgid "Execute a command…"
+msgstr "Ejecutar un comando…"
+
+#: src/apprt/gtk/class/clipboard_confirmation_dialog.zig:198
+msgid ""
+"An application is attempting to write to the clipboard. The current "
+"clipboard contents are shown below."
+msgstr ""
+"Una aplicación está intentando escribir en el portapapeles. El contenido "
+"actual del portapapeles se muestra a continuación."
+
+#: src/apprt/gtk/class/clipboard_confirmation_dialog.zig:202
+msgid ""
+"An application is attempting to read from the clipboard. The current "
+"clipboard contents are shown below."
+msgstr ""
+"Una aplicación está intentando leer desde el portapapeles. El contenido "
+"actual del portapapeles se muestra a continuación."
+
+#: src/apprt/gtk/class/clipboard_confirmation_dialog.zig:205
+msgid "Warning: Potentially Unsafe Paste"
+msgstr "Advertencia: Pegado potencialmente inseguro"
+
+#: src/apprt/gtk/class/clipboard_confirmation_dialog.zig:206
+msgid ""
+"Pasting this text into the terminal may be dangerous as it looks like some "
+"commands may be executed."
+msgstr ""
+"Pegar este texto en el terminal puede ser peligroso ya que parece que "
+"algunos comandos podrían ejecutarse."
+
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:184
+msgid "Quit Ghostty?"
+msgstr "¿Salir de Ghostty?"
+
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:185
+msgid "Close Tab?"
+msgstr "¿Cerrar pestaña?"
+
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:186
+msgid "Close Window?"
+msgstr "¿Cerrar ventana?"
+
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:187
+msgid "Close Split?"
+msgstr "¿Cerrar división?"
+
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:193
+msgid "All terminal sessions will be terminated."
+msgstr "Todas las sesiones del terminal serán finalizadas."
+
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:194
+msgid "All terminal sessions in this tab will be terminated."
+msgstr "Todas las sesiones del terminal en esta pestaña serán finalizadas."
+
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:195
+msgid "All terminal sessions in this window will be terminated."
+msgstr "Todas las sesiones del terminal en esta ventana serán finalizadas."
+
+#: src/apprt/gtk/class/close_confirmation_dialog.zig:196
+msgid "The currently running process in this split will be terminated."
+msgstr "El proceso ejecutándose en esta división será finalizado."
+
+#: src/apprt/gtk/class/surface.zig:1108
+msgid "Command Finished"
+msgstr "Comando finalizado"
+
+#: src/apprt/gtk/class/surface.zig:1109
+msgid "Command Succeeded"
+msgstr "Comando completado"
+
+#: src/apprt/gtk/class/surface.zig:1110
+msgid "Command Failed"
+msgstr "Comando fallido"
+
+#: src/apprt/gtk/class/surface_child_exited.zig:109
+msgid "Command succeeded"
+msgstr "Comando completado"
+
+#: src/apprt/gtk/class/surface_child_exited.zig:113
+msgid "Command failed"
+msgstr "Comando fallido"
+
+#: src/apprt/gtk/class/title_dialog.zig:225
+msgid "Change Terminal Title"
+msgstr "Cambiar el título del terminal"
+
+#: src/apprt/gtk/class/title_dialog.zig:226
+msgid "Change Tab Title"
+msgstr "Cambiar el título de la pestaña"
+
+#: src/apprt/gtk/class/window.zig:1007
+msgid "Reloaded the configuration"
+msgstr "Configuración recargada"
+
+#: src/apprt/gtk/class/window.zig:1566
+msgid "Copied to clipboard"
+msgstr "Copiado al portapapeles"
+
+#: src/apprt/gtk/class/window.zig:1568
+msgid "Cleared clipboard"
+msgstr "Portapapeles vaciado"
+
+#: src/apprt/gtk/class/window.zig:1708
+msgid "Ghostty Developers"
+msgstr "Desarrolladores de Ghostty"
diff --git a/src/os/i18n_locales.zig b/src/os/i18n_locales.zig
index 7a7daf998..7aa162e19 100644
--- a/src/os/i18n_locales.zig
+++ b/src/os/i18n_locales.zig
@@ -43,6 +43,7 @@ pub const locales = [_][:0]const u8{
     "id",
     "es_BO",
     "es_AR",
+    "es_ES",
     "pt_BR",
     "ca",
     "it",

From 4bb602b0e1a251f401e49d490400e4a2b51d0b5a Mon Sep 17 00:00:00 2001
From: 04cb <0x04cb@gmail.com>
Date: Sat, 7 Mar 2026 18:02:59 +0800
Subject: [PATCH 054/391] Fix snap EGL vendor dirs to include host NVIDIA ICD
 paths

---
 snap/local/launcher | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snap/local/launcher b/snap/local/launcher
index 71b92f5bb..6057881b3 100755
--- a/snap/local/launcher
+++ b/snap/local/launcher
@@ -41,7 +41,7 @@ fi
 export LD_LIBRARY_PATH=${SNAP}/usr/lib/${ARCH}:${SNAP}/usr/lib/${ARCH}/vdpau:${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}
 export LIBGL_DRIVERS_PATH=${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}${SNAP}/usr/lib/${ARCH}/dri/
 export LIBVA_DRIVERS_PATH=${LIBVA_DRIVERS_PATH:+$LIBVA_DRIVERS_PATH:}${SNAP}/usr/lib/${ARCH}/dri/
-export __EGL_VENDOR_LIBRARY_DIRS=${__EGL_VENDOR_LIBRARY_DIRS:+$__EGL_VENDOR_LIBRARY_DIRS:}${SNAP}/usr/share/glvnd/egl_vendor.d
+export __EGL_VENDOR_LIBRARY_DIRS=${__EGL_VENDOR_LIBRARY_DIRS:+$__EGL_VENDOR_LIBRARY_DIRS:}/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d:${SNAP}/usr/share/glvnd/egl_vendor.d
 export __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS=${__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS:+$__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS:}${SNAP}/usr/share/egl/egl_external_platform.d
 export DRIRC_CONFIGDIR=${SNAP}/usr/share/drirc.d
 export VK_LAYER_PATH=${VK_LAYER_PATH:+$VK_LAYER_PATH:}${SNAP}/usr/share/vulkan/implicit_layer.d/:${SNAP}/usr/share/vulkan/explicit_layer.d/

From af43af13c363e2819763ede819e3279cf778e993 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Sat, 7 Mar 2026 14:29:14 +0000
Subject: [PATCH 055/391] Update VOUCHED list (#11211)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11209#issuecomment-4016613771)
from @mitchellh.

Vouch: @04cb

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index e246ba137..00e8de5af 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -19,6 +19,7 @@
 # discussion by the author. Maintainers can denounce users by commenting
 # "!denounce" or "!denounce [username]" on a discussion.
 00-kat
+04cb
 aalhendi
 abdurrahmanski
 abudvytis

From 038ebef16cc8cea570f87a95771eb76528935210 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 7 Mar 2026 07:04:17 -0800
Subject: [PATCH 056/391] address some PR feedback

---
 .../AppleScript/AppDelegate+AppleScript.swift | 48 ++++++++++---------
 .../AppleScript/ScriptCloseCommand.swift      | 26 +++++-----
 .../AppleScript/ScriptFocusCommand.swift      | 14 +++---
 .../AppleScript/ScriptSplitCommand.swift      | 18 +++----
 4 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
index c1fba16e0..24309b348 100644
--- a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
+++ b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
@@ -115,7 +115,7 @@ extension NSApplication {
     ///
     /// We return a Bool to match the command's declared result type.
     @objc(handlePerformActionScriptCommand:)
-    func handlePerformActionScriptCommand(_ command: NSScriptCommand) -> Any? {
+    func handlePerformActionScriptCommand(_ command: NSScriptCommand) -> NSNumber? {
         guard validateScript(command: command) else { return nil }
 
         guard let action = command.directParameter as? String else {
@@ -135,7 +135,7 @@ extension NSApplication {
 
     /// Handler for creating a reusable AppleScript surface configuration object.
     @objc(handleNewSurfaceConfigurationScriptCommand:)
-    func handleNewSurfaceConfigurationScriptCommand(_ command: NSScriptCommand) -> Any? {
+    func handleNewSurfaceConfigurationScriptCommand(_ command: NSScriptCommand) -> NSDictionary? {
         guard validateScript(command: command) else { return nil }
 
         do {
@@ -159,7 +159,7 @@ extension NSApplication {
     ///
     /// Returns the newly created scripting window object.
     @objc(handleNewWindowScriptCommand:)
-    func handleNewWindowScriptCommand(_ command: NSScriptCommand) -> Any? {
+    func handleNewWindowScriptCommand(_ command: NSScriptCommand) -> ScriptWindow? {
         guard validateScript(command: command) else { return nil }
 
         guard let appDelegate = delegate as? AppDelegate else {
@@ -168,15 +168,17 @@ extension NSApplication {
             return nil
         }
 
-        let baseConfig: Ghostty.SurfaceConfiguration
-        do {
-            baseConfig = try Ghostty.SurfaceConfiguration(
-                scriptRecord: command.evaluatedArguments?["configuration"] as? NSDictionary
-            )
-        } catch {
-            command.scriptErrorNumber = errAECoercionFail
-            command.scriptErrorString = error.localizedDescription
-            return nil
+        let baseConfig: Ghostty.SurfaceConfiguration?
+        if let scriptRecord = command.evaluatedArguments?["configuration"] as? NSDictionary {
+            do {
+                baseConfig = try Ghostty.SurfaceConfiguration(scriptRecord: scriptRecord)
+            } catch {
+                command.scriptErrorNumber = errAECoercionFail
+                command.scriptErrorString = error.localizedDescription
+                return nil
+            }
+        } else {
+            baseConfig = nil
         }
 
         let controller = TerminalController.newWindow(
@@ -205,7 +207,7 @@ extension NSApplication {
     ///
     /// Returns the newly created scripting tab object.
     @objc(handleNewTabScriptCommand:)
-    func handleNewTabScriptCommand(_ command: NSScriptCommand) -> Any? {
+    func handleNewTabScriptCommand(_ command: NSScriptCommand) -> ScriptTab? {
         guard validateScript(command: command) else { return nil }
 
         guard let appDelegate = delegate as? AppDelegate else {
@@ -214,17 +216,17 @@ extension NSApplication {
             return nil
         }
 
-        let baseConfig: Ghostty.SurfaceConfiguration
-        do {
-            if let scriptRecord = command.evaluatedArguments?["configuration"] as? NSDictionary {
+        let baseConfig: Ghostty.SurfaceConfiguration?
+        if let scriptRecord = command.evaluatedArguments?["configuration"] as? NSDictionary {
+            do {
                 baseConfig = try Ghostty.SurfaceConfiguration(scriptRecord: scriptRecord)
-            } else {
-                baseConfig = Ghostty.SurfaceConfiguration()
+            } catch {
+                command.scriptErrorNumber = errAECoercionFail
+                command.scriptErrorString = error.localizedDescription
+                return nil
             }
-        } catch {
-            command.scriptErrorNumber = errAECoercionFail
-            command.scriptErrorString = error.localizedDescription
-            return nil
+        } else {
+            baseConfig = nil
         }
 
         let targetWindow = command.evaluatedArguments?["window"] as? ScriptWindow
@@ -285,7 +287,7 @@ extension NSApplication {
     @discardableResult
     func validateScript(command: NSScriptCommand) -> Bool {
         guard isAppleScriptEnabled else {
-            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorNumber = errAEEventNotPermitted
             command.scriptErrorString = "AppleScript is disabled by the macos-applescript configuration."
             return false
         }
diff --git a/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift b/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift
index e62d9bb60..b38fb0e62 100644
--- a/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift
+++ b/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift
@@ -34,7 +34,8 @@ final class ScriptCloseCommand: NSScriptCommand {
     }
 }
 
-/// Handler for the `close tab` AppleScript command defined in `Ghostty.sdef`.
+/// Handler for the container-level `close tab` AppleScript command defined in
+/// `Ghostty.sdef`.
 @MainActor
 @objc(GhosttyScriptCloseTabCommand)
 final class ScriptCloseTabCommand: NSScriptCommand {
@@ -47,29 +48,30 @@ final class ScriptCloseTabCommand: NSScriptCommand {
             return nil
         }
 
-        guard let controller = tab.parentController else {
+        guard let tabController = tab.parentController else {
             scriptErrorNumber = errAEEventFailed
             scriptErrorString = "Tab is no longer available."
             return nil
         }
 
-        if let terminalController = controller as? TerminalController {
-            terminalController.closeTabImmediately(registerRedo: false)
+        if let managedTerminalController = tabController as? TerminalController {
+            managedTerminalController.closeTabImmediately(registerRedo: false)
             return nil
         }
 
-        guard let targetWindow = tab.parentWindow else {
+        guard let tabContainerWindow = tab.parentWindow else {
             scriptErrorNumber = errAEEventFailed
-            scriptErrorString = "Tab window is no longer available."
+            scriptErrorString = "Tab container window is no longer available."
             return nil
         }
 
-        targetWindow.close()
+        tabContainerWindow.close()
         return nil
     }
 }
 
-/// Handler for the `close window` AppleScript command defined in `Ghostty.sdef`.
+/// Handler for the container-level `close window` AppleScript command defined in
+/// `Ghostty.sdef`.
 @MainActor
 @objc(GhosttyScriptCloseWindowCommand)
 final class ScriptCloseWindowCommand: NSScriptCommand {
@@ -82,18 +84,18 @@ final class ScriptCloseWindowCommand: NSScriptCommand {
             return nil
         }
 
-        if let terminalController = window.preferredController as? TerminalController {
-            terminalController.closeWindowImmediately()
+        if let managedTerminalController = window.preferredController as? TerminalController {
+            managedTerminalController.closeWindowImmediately()
             return nil
         }
 
-        guard let targetWindow = window.preferredParentWindow else {
+        guard let windowContainer = window.preferredParentWindow else {
             scriptErrorNumber = errAEEventFailed
             scriptErrorString = "Window is no longer available."
             return nil
         }
 
-        targetWindow.close()
+        windowContainer.close()
         return nil
     }
 }
diff --git a/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift b/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift
index 61b4ab8c6..0be3aaf69 100644
--- a/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift
+++ b/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift
@@ -34,7 +34,8 @@ final class ScriptFocusCommand: NSScriptCommand {
     }
 }
 
-/// Handler for the `activate window` AppleScript command defined in `Ghostty.sdef`.
+/// Handler for the container-level `activate window` AppleScript command
+/// defined in `Ghostty.sdef`.
 @MainActor
 @objc(GhosttyScriptActivateWindowCommand)
 final class ScriptActivateWindowCommand: NSScriptCommand {
@@ -47,19 +48,20 @@ final class ScriptActivateWindowCommand: NSScriptCommand {
             return nil
         }
 
-        guard let targetWindow = window.preferredParentWindow else {
+        guard let windowContainer = window.preferredParentWindow else {
             scriptErrorNumber = errAEEventFailed
             scriptErrorString = "Window is no longer available."
             return nil
         }
 
-        targetWindow.makeKeyAndOrderFront(nil)
+        windowContainer.makeKeyAndOrderFront(nil)
         NSApp.activate(ignoringOtherApps: true)
         return nil
     }
 }
 
-/// Handler for the `select tab` AppleScript command defined in `Ghostty.sdef`.
+/// Handler for the container-level `select tab` AppleScript command defined in
+/// `Ghostty.sdef`.
 @MainActor
 @objc(GhosttyScriptSelectTabCommand)
 final class ScriptSelectTabCommand: NSScriptCommand {
@@ -72,13 +74,13 @@ final class ScriptSelectTabCommand: NSScriptCommand {
             return nil
         }
 
-        guard let targetWindow = tab.parentWindow else {
+        guard let tabContainerWindow = tab.parentWindow else {
             scriptErrorNumber = errAEEventFailed
             scriptErrorString = "Tab is no longer available."
             return nil
         }
 
-        targetWindow.makeKeyAndOrderFront(nil)
+        tabContainerWindow.makeKeyAndOrderFront(nil)
         NSApp.activate(ignoringOtherApps: true)
         return nil
     }
diff --git a/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift b/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift
index 30f34fc8e..b3ab0fa73 100644
--- a/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift
+++ b/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift
@@ -30,17 +30,17 @@ final class ScriptSplitCommand: NSScriptCommand {
             return nil
         }
 
-        let baseConfig: Ghostty.SurfaceConfiguration
-        do {
-            if let scriptRecord = evaluatedArguments?["configuration"] as? NSDictionary {
+        let baseConfig: Ghostty.SurfaceConfiguration?
+        if let scriptRecord = evaluatedArguments?["configuration"] as? NSDictionary {
+            do {
                 baseConfig = try Ghostty.SurfaceConfiguration(scriptRecord: scriptRecord)
-            } else {
-                baseConfig = Ghostty.SurfaceConfiguration()
+            } catch {
+                scriptErrorNumber = errAECoercionFail
+                scriptErrorString = error.localizedDescription
+                return nil
             }
-        } catch {
-            scriptErrorNumber = errAECoercionFail
-            scriptErrorString = error.localizedDescription
-            return nil
+        } else {
+            baseConfig = nil
         }
 
         // Find the window controller that owns this surface.

From 210b01ad600f0dceff9ff2be1a16bbf6c9fa7f57 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 7 Mar 2026 07:23:47 -0800
Subject: [PATCH 057/391] macos: use direct parameters for object-targeting
 commands

Change split, focus, close, activate window, select tab, close tab, and
close window commands to accept their target object as a direct parameter
instead of a named parameter. This produces natural AppleScript syntax:

  activate window (window 1)
  close tab (tab 1 of window 1)
  split (terminal 1) direction right

instead of the awkward redundant form:

  activate window window (window 1)
  close tab tab (tab 1 of window 1)
  split terminal (terminal 1) direction right

The implementation moves command logic from NSScriptCommand subclasses
into responds-to handler methods on ScriptTerminal, ScriptWindow, and
ScriptTab, which is the standard Cocoa Scripting pattern for commands
whose direct parameter is an application class.
---
 macos/Ghostty.sdef                            |  56 ++++----
 macos/Ghostty.xcodeproj/project.pbxproj       |   3 -
 .../AppleScript/ScriptCloseCommand.swift      | 101 --------------
 .../AppleScript/ScriptFocusCommand.swift      |  87 ------------
 .../AppleScript/ScriptSplitCommand.swift      |  92 -------------
 .../Features/AppleScript/ScriptTab.swift      |  42 ++++++
 .../Features/AppleScript/ScriptTerminal.swift | 125 ++++++++++++++++++
 .../Features/AppleScript/ScriptWindow.swift   |  36 +++++
 8 files changed, 231 insertions(+), 311 deletions(-)
 delete mode 100644 macos/Sources/Features/AppleScript/ScriptCloseCommand.swift
 delete mode 100644 macos/Sources/Features/AppleScript/ScriptFocusCommand.swift
 delete mode 100644 macos/Sources/Features/AppleScript/ScriptSplitCommand.swift

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index 95fcea626..95497a04a 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -44,6 +44,12 @@
       <property name="selected tab" code="GWsT" type="tab" access="r" description="The selected tab in this window.">
         <cocoa key="selectedTab"/>
       </property>
+      <responds-to command="activate window">
+        <cocoa method="handleActivateWindowCommand:"/>
+      </responds-to>
+      <responds-to command="close window">
+        <cocoa method="handleCloseWindowCommand:"/>
+      </responds-to>
       <element type="tab" access="r">
         <cocoa key="tabs"/>
       </element>
@@ -60,6 +66,12 @@
       </property>
       <property name="index" code="pidx" type="integer" access="r" description="1-based index of this tab in its window."/>
       <property name="selected" code="GTsl" type="boolean" access="r" description="Whether this tab is selected in its window."/>
+      <responds-to command="select tab">
+        <cocoa method="handleSelectTabCommand:"/>
+      </responds-to>
+      <responds-to command="close tab">
+        <cocoa method="handleCloseTabCommand:"/>
+      </responds-to>
       <element type="terminal" access="r">
         <cocoa key="terminals"/>
       </element>
@@ -72,6 +84,15 @@
         <cocoa key="title"/>
       </property>
       <property name="working directory" code="Gwdr" type="text" access="r" description="Current working directory for the terminal process."/>
+      <responds-to command="split">
+        <cocoa method="handleSplitCommand:"/>
+      </responds-to>
+      <responds-to command="focus">
+        <cocoa method="handleFocusCommand:"/>
+      </responds-to>
+      <responds-to command="close">
+        <cocoa method="handleCloseCommand:"/>
+      </responds-to>
     </class>
 
     <record-type name="surface configuration" code="GScf" description="Reusable settings applied when creating a terminal surface.">
@@ -155,10 +176,7 @@
     </command>
 
     <command name="split" code="GhstSplt" description="Split a terminal in the given direction.">
-      <cocoa class="GhosttyScriptSplitCommand"/>
-      <parameter name="terminal" code="GSpT" type="terminal" description="The terminal to split.">
-        <cocoa key="terminal"/>
-      </parameter>
+      <direct-parameter type="specifier" description="The terminal to split."/>
       <parameter name="direction" code="GSpd" type="split direction" description="The direction to split.">
         <cocoa key="direction"/>
       </parameter>
@@ -169,45 +187,27 @@
     </command>
 
     <command name="focus" code="GhstFcus" description="Focus a terminal, bringing its window to the front.">
-      <cocoa class="GhosttyScriptFocusCommand"/>
-      <parameter name="terminal" code="GFcT" type="terminal" description="The terminal to focus.">
-        <cocoa key="terminal"/>
-      </parameter>
+      <direct-parameter type="specifier" description="The terminal to focus."/>
     </command>
 
     <command name="close" code="GhstClos" description="Close a terminal.">
-      <cocoa class="GhosttyScriptCloseCommand"/>
-      <parameter name="terminal" code="GClT" type="terminal" description="The terminal to close.">
-        <cocoa key="terminal"/>
-      </parameter>
+      <direct-parameter type="specifier" description="The terminal to close."/>
     </command>
 
     <command name="activate window" code="GhstAcWn" description="Activate a Ghostty window, bringing it to the front.">
-      <cocoa class="GhosttyScriptActivateWindowCommand"/>
-      <parameter name="window" code="GAwW" type="window" description="The window to activate.">
-        <cocoa key="window"/>
-      </parameter>
+      <direct-parameter type="specifier" description="The window to activate."/>
     </command>
 
     <command name="select tab" code="GhstSlTb" description="Select a tab in its window.">
-      <cocoa class="GhosttyScriptSelectTabCommand"/>
-      <parameter name="tab" code="GStT" type="tab" description="The tab to select.">
-        <cocoa key="tab"/>
-      </parameter>
+      <direct-parameter type="specifier" description="The tab to select."/>
     </command>
 
     <command name="close tab" code="GhstClTb" description="Close a tab.">
-      <cocoa class="GhosttyScriptCloseTabCommand"/>
-      <parameter name="tab" code="GCtT" type="tab" description="The tab to close.">
-        <cocoa key="tab"/>
-      </parameter>
+      <direct-parameter type="specifier" description="The tab to close."/>
     </command>
 
     <command name="close window" code="GhstClWn" description="Close a window.">
-      <cocoa class="GhosttyScriptCloseWindowCommand"/>
-      <parameter name="window" code="GCwW" type="window" description="The window to close.">
-        <cocoa key="window"/>
-      </parameter>
+      <direct-parameter type="specifier" description="The window to close."/>
     </command>
 
     <command name="input text" code="GhstInTx" description="Input text to a terminal as if it was pasted.">
diff --git a/macos/Ghostty.xcodeproj/project.pbxproj b/macos/Ghostty.xcodeproj/project.pbxproj
index 0f63d654e..3758c325d 100644
--- a/macos/Ghostty.xcodeproj/project.pbxproj
+++ b/macos/Ghostty.xcodeproj/project.pbxproj
@@ -138,15 +138,12 @@
 				"Features/App Intents/QuickTerminalIntent.swift",
 				"Features/AppleScript/AppDelegate+AppleScript.swift",
 				"Features/AppleScript/Ghostty.Input.Mods+AppleScript.swift",
-				Features/AppleScript/ScriptCloseCommand.swift,
-				Features/AppleScript/ScriptFocusCommand.swift,
 				Features/AppleScript/ScriptInputTextCommand.swift,
 				Features/AppleScript/ScriptKeyEventCommand.swift,
 				Features/AppleScript/ScriptMouseButtonCommand.swift,
 				Features/AppleScript/ScriptMousePosCommand.swift,
 				Features/AppleScript/ScriptMouseScrollCommand.swift,
 				Features/AppleScript/ScriptRecord.swift,
-				Features/AppleScript/ScriptSplitCommand.swift,
 				Features/AppleScript/ScriptSurfaceConfiguration.swift,
 				Features/AppleScript/ScriptTab.swift,
 				Features/AppleScript/ScriptTerminal.swift,
diff --git a/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift b/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift
deleted file mode 100644
index b38fb0e62..000000000
--- a/macos/Sources/Features/AppleScript/ScriptCloseCommand.swift
+++ /dev/null
@@ -1,101 +0,0 @@
-import AppKit
-
-/// Handler for the `close` AppleScript command defined in `Ghostty.sdef`.
-///
-/// Cocoa scripting instantiates this class because the command's `<cocoa>` element
-/// specifies `class="GhosttyScriptCloseCommand"`. The runtime calls
-/// `performDefaultImplementation()` to execute the command.
-@MainActor
-@objc(GhosttyScriptCloseCommand)
-final class ScriptCloseCommand: NSScriptCommand {
-    override func performDefaultImplementation() -> Any? {
-        guard NSApp.validateScript(command: self) else { return nil }
-
-        guard let terminal = evaluatedArguments?["terminal"] as? ScriptTerminal else {
-            scriptErrorNumber = errAEParamMissed
-            scriptErrorString = "Missing terminal target."
-            return nil
-        }
-
-        guard let surfaceView = terminal.surfaceView else {
-            scriptErrorNumber = errAEEventFailed
-            scriptErrorString = "Terminal surface is no longer available."
-            return nil
-        }
-
-        guard let controller = surfaceView.window?.windowController as? BaseTerminalController else {
-            scriptErrorNumber = errAEEventFailed
-            scriptErrorString = "Terminal is not in a window."
-            return nil
-        }
-
-        controller.closeSurface(surfaceView, withConfirmation: false)
-        return nil
-    }
-}
-
-/// Handler for the container-level `close tab` AppleScript command defined in
-/// `Ghostty.sdef`.
-@MainActor
-@objc(GhosttyScriptCloseTabCommand)
-final class ScriptCloseTabCommand: NSScriptCommand {
-    override func performDefaultImplementation() -> Any? {
-        guard NSApp.validateScript(command: self) else { return nil }
-
-        guard let tab = evaluatedArguments?["tab"] as? ScriptTab else {
-            scriptErrorNumber = errAEParamMissed
-            scriptErrorString = "Missing tab target."
-            return nil
-        }
-
-        guard let tabController = tab.parentController else {
-            scriptErrorNumber = errAEEventFailed
-            scriptErrorString = "Tab is no longer available."
-            return nil
-        }
-
-        if let managedTerminalController = tabController as? TerminalController {
-            managedTerminalController.closeTabImmediately(registerRedo: false)
-            return nil
-        }
-
-        guard let tabContainerWindow = tab.parentWindow else {
-            scriptErrorNumber = errAEEventFailed
-            scriptErrorString = "Tab container window is no longer available."
-            return nil
-        }
-
-        tabContainerWindow.close()
-        return nil
-    }
-}
-
-/// Handler for the container-level `close window` AppleScript command defined in
-/// `Ghostty.sdef`.
-@MainActor
-@objc(GhosttyScriptCloseWindowCommand)
-final class ScriptCloseWindowCommand: NSScriptCommand {
-    override func performDefaultImplementation() -> Any? {
-        guard NSApp.validateScript(command: self) else { return nil }
-
-        guard let window = evaluatedArguments?["window"] as? ScriptWindow else {
-            scriptErrorNumber = errAEParamMissed
-            scriptErrorString = "Missing window target."
-            return nil
-        }
-
-        if let managedTerminalController = window.preferredController as? TerminalController {
-            managedTerminalController.closeWindowImmediately()
-            return nil
-        }
-
-        guard let windowContainer = window.preferredParentWindow else {
-            scriptErrorNumber = errAEEventFailed
-            scriptErrorString = "Window is no longer available."
-            return nil
-        }
-
-        windowContainer.close()
-        return nil
-    }
-}
diff --git a/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift b/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift
deleted file mode 100644
index 0be3aaf69..000000000
--- a/macos/Sources/Features/AppleScript/ScriptFocusCommand.swift
+++ /dev/null
@@ -1,87 +0,0 @@
-import AppKit
-
-/// Handler for the `focus` AppleScript command defined in `Ghostty.sdef`.
-///
-/// Cocoa scripting instantiates this class because the command's `<cocoa>` element
-/// specifies `class="GhosttyScriptFocusCommand"`. The runtime calls
-/// `performDefaultImplementation()` to execute the command.
-@MainActor
-@objc(GhosttyScriptFocusCommand)
-final class ScriptFocusCommand: NSScriptCommand {
-    override func performDefaultImplementation() -> Any? {
-        guard NSApp.validateScript(command: self) else { return nil }
-
-        guard let terminal = evaluatedArguments?["terminal"] as? ScriptTerminal else {
-            scriptErrorNumber = errAEParamMissed
-            scriptErrorString = "Missing terminal target."
-            return nil
-        }
-
-        guard let surfaceView = terminal.surfaceView else {
-            scriptErrorNumber = errAEEventFailed
-            scriptErrorString = "Terminal surface is no longer available."
-            return nil
-        }
-
-        guard let controller = surfaceView.window?.windowController as? BaseTerminalController else {
-            scriptErrorNumber = errAEEventFailed
-            scriptErrorString = "Terminal is not in a window."
-            return nil
-        }
-
-        controller.focusSurface(surfaceView)
-        return nil
-    }
-}
-
-/// Handler for the container-level `activate window` AppleScript command
-/// defined in `Ghostty.sdef`.
-@MainActor
-@objc(GhosttyScriptActivateWindowCommand)
-final class ScriptActivateWindowCommand: NSScriptCommand {
-    override func performDefaultImplementation() -> Any? {
-        guard NSApp.validateScript(command: self) else { return nil }
-
-        guard let window = evaluatedArguments?["window"] as? ScriptWindow else {
-            scriptErrorNumber = errAEParamMissed
-            scriptErrorString = "Missing window target."
-            return nil
-        }
-
-        guard let windowContainer = window.preferredParentWindow else {
-            scriptErrorNumber = errAEEventFailed
-            scriptErrorString = "Window is no longer available."
-            return nil
-        }
-
-        windowContainer.makeKeyAndOrderFront(nil)
-        NSApp.activate(ignoringOtherApps: true)
-        return nil
-    }
-}
-
-/// Handler for the container-level `select tab` AppleScript command defined in
-/// `Ghostty.sdef`.
-@MainActor
-@objc(GhosttyScriptSelectTabCommand)
-final class ScriptSelectTabCommand: NSScriptCommand {
-    override func performDefaultImplementation() -> Any? {
-        guard NSApp.validateScript(command: self) else { return nil }
-
-        guard let tab = evaluatedArguments?["tab"] as? ScriptTab else {
-            scriptErrorNumber = errAEParamMissed
-            scriptErrorString = "Missing tab target."
-            return nil
-        }
-
-        guard let tabContainerWindow = tab.parentWindow else {
-            scriptErrorNumber = errAEEventFailed
-            scriptErrorString = "Tab is no longer available."
-            return nil
-        }
-
-        tabContainerWindow.makeKeyAndOrderFront(nil)
-        NSApp.activate(ignoringOtherApps: true)
-        return nil
-    }
-}
diff --git a/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift b/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift
deleted file mode 100644
index b3ab0fa73..000000000
--- a/macos/Sources/Features/AppleScript/ScriptSplitCommand.swift
+++ /dev/null
@@ -1,92 +0,0 @@
-import AppKit
-
-/// Handler for the `split` AppleScript command defined in `Ghostty.sdef`.
-///
-/// Cocoa scripting instantiates this class because the command's `<cocoa>` element
-/// specifies `class="GhosttyScriptSplitCommand"`. The runtime calls
-/// `performDefaultImplementation()` to execute the command.
-@MainActor
-@objc(GhosttyScriptSplitCommand)
-final class ScriptSplitCommand: NSScriptCommand {
-    override func performDefaultImplementation() -> Any? {
-        guard NSApp.validateScript(command: self) else { return nil }
-
-        guard let terminal = evaluatedArguments?["terminal"] as? ScriptTerminal else {
-            scriptErrorNumber = errAEParamMissed
-            scriptErrorString = "Missing terminal target."
-            return nil
-        }
-
-        guard let surfaceView = terminal.surfaceView else {
-            scriptErrorNumber = errAEEventFailed
-            scriptErrorString = "Terminal surface is no longer available."
-            return nil
-        }
-
-        guard let directionCode = evaluatedArguments?["direction"] as? UInt32,
-              let direction = ScriptSplitDirection(code: directionCode) else {
-            scriptErrorNumber = errAEParamMissed
-            scriptErrorString = "Missing or unknown split direction."
-            return nil
-        }
-
-        let baseConfig: Ghostty.SurfaceConfiguration?
-        if let scriptRecord = evaluatedArguments?["configuration"] as? NSDictionary {
-            do {
-                baseConfig = try Ghostty.SurfaceConfiguration(scriptRecord: scriptRecord)
-            } catch {
-                scriptErrorNumber = errAECoercionFail
-                scriptErrorString = error.localizedDescription
-                return nil
-            }
-        } else {
-            baseConfig = nil
-        }
-
-        // Find the window controller that owns this surface.
-        guard let controller = surfaceView.window?.windowController as? BaseTerminalController else {
-            scriptErrorNumber = errAEEventFailed
-            scriptErrorString = "Terminal is not in a splittable window."
-            return nil
-        }
-
-        guard let newView = controller.newSplit(
-            at: surfaceView,
-            direction: direction.splitDirection,
-            baseConfig: baseConfig
-        ) else {
-            scriptErrorNumber = errAEEventFailed
-            scriptErrorString = "Failed to create split."
-            return nil
-        }
-
-        return ScriptTerminal(surfaceView: newView)
-    }
-}
-
-/// Four-character codes matching the `split direction` enumeration in `Ghostty.sdef`.
-private enum ScriptSplitDirection {
-    case right
-    case left
-    case down
-    case up
-
-    init?(code: UInt32) {
-        switch code {
-        case "GSrt".fourCharCode: self = .right
-        case "GSlf".fourCharCode: self = .left
-        case "GSdn".fourCharCode: self = .down
-        case "GSup".fourCharCode: self = .up
-        default: return nil
-        }
-    }
-
-    var splitDirection: SplitTree<Ghostty.SurfaceView>.NewDirection {
-        switch self {
-        case .right: .right
-        case .left: .left
-        case .down: .down
-        case .up: .up
-        }
-    }
-}
diff --git a/macos/Sources/Features/AppleScript/ScriptTab.swift b/macos/Sources/Features/AppleScript/ScriptTab.swift
index 467fc3d06..8189cd0fa 100644
--- a/macos/Sources/Features/AppleScript/ScriptTab.swift
+++ b/macos/Sources/Features/AppleScript/ScriptTab.swift
@@ -100,6 +100,48 @@ final class ScriptTab: NSObject {
             .map(ScriptTerminal.init)
     }
 
+    /// Handler for `select tab <tab>`.
+    @objc(handleSelectTabCommand:)
+    func handleSelectTab(_ command: NSScriptCommand) -> Any? {
+        guard NSApp.validateScript(command: command) else { return nil }
+
+        guard let tabContainerWindow = parentWindow else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "Tab is no longer available."
+            return nil
+        }
+
+        tabContainerWindow.makeKeyAndOrderFront(nil)
+        NSApp.activate(ignoringOtherApps: true)
+        return nil
+    }
+
+    /// Handler for `close tab <tab>`.
+    @objc(handleCloseTabCommand:)
+    func handleCloseTab(_ command: NSScriptCommand) -> Any? {
+        guard NSApp.validateScript(command: command) else { return nil }
+
+        guard let tabController = parentController else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "Tab is no longer available."
+            return nil
+        }
+
+        if let managedTerminalController = tabController as? TerminalController {
+            managedTerminalController.closeTabImmediately(registerRedo: false)
+            return nil
+        }
+
+        guard let tabContainerWindow = parentWindow else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "Tab container window is no longer available."
+            return nil
+        }
+
+        tabContainerWindow.close()
+        return nil
+    }
+
     /// Provides Cocoa scripting with a canonical "path" back to this object.
     override var objectSpecifier: NSScriptObjectSpecifier? {
         guard NSApp.isAppleScriptEnabled else { return nil }
diff --git a/macos/Sources/Features/AppleScript/ScriptTerminal.swift b/macos/Sources/Features/AppleScript/ScriptTerminal.swift
index e4500c6b9..2cdde382e 100644
--- a/macos/Sources/Features/AppleScript/ScriptTerminal.swift
+++ b/macos/Sources/Features/AppleScript/ScriptTerminal.swift
@@ -60,6 +60,103 @@ final class ScriptTerminal: NSObject {
         return surfaceModel.perform(action: action)
     }
 
+    /// Handler for `split <terminal> direction <dir>`.
+    @objc(handleSplitCommand:)
+    func handleSplit(_ command: NSScriptCommand) -> Any? {
+        guard NSApp.validateScript(command: command) else { return nil }
+
+        guard let surfaceView else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "Terminal surface is no longer available."
+            return nil
+        }
+
+        guard let directionCode = command.evaluatedArguments?["direction"] as? UInt32 else {
+            command.scriptErrorNumber = errAEParamMissed
+            command.scriptErrorString = "Missing or unknown split direction."
+            return nil
+        }
+
+        guard let direction = ScriptSplitDirection(code: directionCode)?.splitDirection else {
+            command.scriptErrorNumber = errAEParamMissed
+            command.scriptErrorString = "Missing or unknown split direction."
+            return nil
+        }
+
+        let baseConfig: Ghostty.SurfaceConfiguration?
+        if let scriptRecord = command.evaluatedArguments?["configuration"] as? NSDictionary {
+            do {
+                baseConfig = try Ghostty.SurfaceConfiguration(scriptRecord: scriptRecord)
+            } catch {
+                command.scriptErrorNumber = errAECoercionFail
+                command.scriptErrorString = error.localizedDescription
+                return nil
+            }
+        } else {
+            baseConfig = nil
+        }
+
+        guard let controller = surfaceView.window?.windowController as? BaseTerminalController else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "Terminal is not in a splittable window."
+            return nil
+        }
+
+        guard let newView = controller.newSplit(
+            at: surfaceView,
+            direction: direction,
+            baseConfig: baseConfig
+        ) else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "Failed to create split."
+            return nil
+        }
+
+        return ScriptTerminal(surfaceView: newView)
+    }
+
+    /// Handler for `focus <terminal>`.
+    @objc(handleFocusCommand:)
+    func handleFocus(_ command: NSScriptCommand) -> Any? {
+        guard NSApp.validateScript(command: command) else { return nil }
+
+        guard let surfaceView else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "Terminal surface is no longer available."
+            return nil
+        }
+
+        guard let controller = surfaceView.window?.windowController as? BaseTerminalController else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "Terminal is not in a window."
+            return nil
+        }
+
+        controller.focusSurface(surfaceView)
+        return nil
+    }
+
+    /// Handler for `close <terminal>`.
+    @objc(handleCloseCommand:)
+    func handleClose(_ command: NSScriptCommand) -> Any? {
+        guard NSApp.validateScript(command: command) else { return nil }
+
+        guard let surfaceView else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "Terminal surface is no longer available."
+            return nil
+        }
+
+        guard let controller = surfaceView.window?.windowController as? BaseTerminalController else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "Terminal is not in a window."
+            return nil
+        }
+
+        controller.closeSurface(surfaceView, withConfirmation: false)
+        return nil
+    }
+
     /// Provides Cocoa scripting with a canonical "path" back to this object.
     ///
     /// Without an object specifier, returned terminal objects can't be reliably
@@ -79,3 +176,31 @@ final class ScriptTerminal: NSObject {
         )
     }
 }
+
+/// Converts four-character codes from the `split direction` enumeration in `Ghostty.sdef`
+/// to `SplitTree.NewDirection` values.
+enum ScriptSplitDirection {
+    case right
+    case left
+    case down
+    case up
+
+    init?(code: UInt32) {
+        switch code {
+        case "GSrt".fourCharCode: self = .right
+        case "GSlf".fourCharCode: self = .left
+        case "GSdn".fourCharCode: self = .down
+        case "GSup".fourCharCode: self = .up
+        default: return nil
+        }
+    }
+
+    var splitDirection: SplitTree<Ghostty.SurfaceView>.NewDirection {
+        switch self {
+        case .right: .right
+        case .left: .left
+        case .down: .down
+        case .up: .up
+        }
+    }
+}
diff --git a/macos/Sources/Features/AppleScript/ScriptWindow.swift b/macos/Sources/Features/AppleScript/ScriptWindow.swift
index 01a603843..c8e4bc8e6 100644
--- a/macos/Sources/Features/AppleScript/ScriptWindow.swift
+++ b/macos/Sources/Features/AppleScript/ScriptWindow.swift
@@ -174,6 +174,42 @@ final class ScriptWindow: NSObject {
         return controllers.first
     }
 
+    /// Handler for `activate window <window>`.
+    @objc(handleActivateWindowCommand:)
+    func handleActivateWindow(_ command: NSScriptCommand) -> Any? {
+        guard NSApp.validateScript(command: command) else { return nil }
+
+        guard let windowContainer = preferredParentWindow else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "Window is no longer available."
+            return nil
+        }
+
+        windowContainer.makeKeyAndOrderFront(nil)
+        NSApp.activate(ignoringOtherApps: true)
+        return nil
+    }
+
+    /// Handler for `close window <window>`.
+    @objc(handleCloseWindowCommand:)
+    func handleCloseWindow(_ command: NSScriptCommand) -> Any? {
+        guard NSApp.validateScript(command: command) else { return nil }
+
+        if let managedTerminalController = preferredController as? TerminalController {
+            managedTerminalController.closeWindowImmediately()
+            return nil
+        }
+
+        guard let windowContainer = preferredParentWindow else {
+            command.scriptErrorNumber = errAEEventFailed
+            command.scriptErrorString = "Window is no longer available."
+            return nil
+        }
+
+        windowContainer.close()
+        return nil
+    }
+
     /// Provides Cocoa scripting with a canonical "path" back to this object.
     ///
     /// Without this, Cocoa can return data but cannot reliably build object

From ed9a6cb6488ff282a5061bbd016d9082d7c3e773 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 7 Mar 2026 07:28:56 -0800
Subject: [PATCH 058/391] macos: implement the quit command

---
 .../Features/AppleScript/AppDelegate+AppleScript.swift | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
index 24309b348..de7b4948c 100644
--- a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
+++ b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
@@ -196,6 +196,16 @@ extension NSApplication {
         return ScriptWindow(primaryController: controller)
     }
 
+    /// Handler for the `quit` AppleScript command.
+    ///
+    /// Required selector name from the command in `sdef`:
+    /// `handleQuitScriptCommand:`.
+    @objc(handleQuitScriptCommand:)
+    func handleQuitScriptCommand(_ command: NSScriptCommand) {
+        guard validateScript(command: command) else { return }
+        terminate(nil)
+    }
+
     /// Handler for the `new tab` AppleScript command.
     ///
     /// Required selector name from the command in `sdef`:

From 059bd54a5d9188d2f7c6fc3a56afc35b934f4ff1 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Sat, 7 Mar 2026 20:19:34 -0500
Subject: [PATCH 059/391] elvish: improve OSC 133 semantic prompt support

Add `aid=$pid` to 133;A and 133;D for nested shell tracking, and fix the
state comparison which was incorrectly using `constantly` (comparing a
string to a function, which always evaluated to true).

OSC 133;B (input start) and 133;P;k=r (right prompt) cannot be reliably
implemented at the script level because Elvish escapes control
characters in prompt function output, and writing directly to /dev/tty
has timing issues because Elvish renders its prompts on a background
thread. Full semantic prompt support requires a native implementation:
https://github.com/elves/elvish/pull/1917

See: #10523
---
 .../elvish/lib/ghostty-integration.elv          | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/shell-integration/elvish/lib/ghostty-integration.elv b/src/shell-integration/elvish/lib/ghostty-integration.elv
index 776aab676..87fd0a902 100644
--- a/src/shell-integration/elvish/lib/ghostty-integration.elv
+++ b/src/shell-integration/elvish/lib/ghostty-integration.elv
@@ -11,15 +11,16 @@
   # List of enabled shell integration features
   var features = [(str:split ',' $E:GHOSTTY_SHELL_FEATURES)]
 
-  # helper used by `mark-*` functions
+  # State tracking for semantic prompt sequences
+  # Values: 'prompt-start', 'pre-exec', 'post-exec'
   fn set-prompt-state {|new| set-env __ghostty_prompt_state $new }
 
   fn mark-prompt-start {
-    if (not-eq prompt-start (constantly $E:__ghostty_prompt_state)) {
-      printf "\e]133;D\a"
+    if (not-eq $E:__ghostty_prompt_state 'prompt-start') {
+      printf "\e]133;D;aid="$pid"\a"
     }
     set-prompt-state 'prompt-start'
-    printf "\e]133;A\a"
+    printf "\e]133;A;aid="$pid"\a"
   }
 
   fn mark-output-start {|_|
@@ -44,9 +45,15 @@
       }
     }
 
-    printf "\e]133;D;"$exit-status"\a"
+    printf "\e]133;D;"$exit-status";aid="$pid"\a"
   }
 
+  # NOTE: OSC 133;B (end of prompt, start of input) cannot be reliably
+  # implemented at the script level in Elvish. The prompt function's output is
+  # escaped, and writing to /dev/tty has timing issues because Elvish renders
+  # its prompts on a background thread. Full semantic prompt support requires a
+  # native implementation: https://github.com/elves/elvish/pull/1917
+
   fn sudo-with-terminfo {|@args|
     var sudoedit = $false
     for arg $args {

From 8635fef7a5dc6185b67982dc94892d6ddb3b9ac0 Mon Sep 17 00:00:00 2001
From: rhodes-b <59537185+rhodes-b@users.noreply.github.com>
Date: Sun, 8 Mar 2026 00:24:46 -0600
Subject: [PATCH 060/391] if search is active dont apply unfocused options

---
 src/apprt/gtk/class/surface.zig | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/apprt/gtk/class/surface.zig b/src/apprt/gtk/class/surface.zig
index 8d9e1bcf0..1db139df2 100644
--- a/src/apprt/gtk/class/surface.zig
+++ b/src/apprt/gtk/class/surface.zig
@@ -822,11 +822,19 @@ pub const Surface = extern struct {
     /// Callback used to determine whether unfocused-split-fill / unfocused-split-opacity
     /// should be applied to the surface
     fn closureShouldUnfocusedSplitBeShown(
-        _: *Self,
+        self: *Self,
         focused: c_int,
         is_split: c_int,
     ) callconv(.c) c_int {
-        return @intFromBool(focused == 0 and is_split != 0);
+        const priv = self.private();
+        var val = gobject.ext.Value.new(bool);
+        defer val.unset();
+        gobject.Object.getProperty(
+            priv.search_overlay.as(gobject.Object),
+            SearchOverlay.properties.active.name,
+            &val,
+        );
+        return @intFromBool(val.getBoolean() == 0 and focused == 0 and is_split != 0);
     }
 
     pub fn toggleFullscreen(self: *Self) void {

From 1a15fc0adba90bddce5c95a04c9ea30254186925 Mon Sep 17 00:00:00 2001
From: halosatrio <63773815+halosatrio@users.noreply.github.com>
Date: Sun, 8 Mar 2026 20:35:19 +0700
Subject: [PATCH 061/391] i18n: update Indonesian translation (id_ID)

---
 po/id.po | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/po/id.po b/po/id.po
index fc573563d..e5660440a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,15 +1,15 @@
 # Indonesian translations for com.mitchellh.ghostty package.
 # Copyright (C) 2025 Mitchell Hashimoto, Ghostty contributors
 # This file is distributed under the same license as the com.mitchellh.ghostty package.
-# Satrio Bayu Aji <halosatrio@gmail.com>, 2025.
-# Mikail Muzakki <mikailmmuzakki@gmail.com>, 2025.
+# Satrio Bayu Aji <halosatrio@gmail.com>, 2026.
+# Mikail Muzakki <mikailmmuzakki@gmail.com>, 2026.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: com.mitchellh.ghostty\n"
 "Report-Msgid-Bugs-To: m@mitchellh.com\n"
 "POT-Creation-Date: 2026-02-17 23:16+0100\n"
-"PO-Revision-Date: 2025-08-01 10:15+0700\n"
+"PO-Revision-Date: 2026-03-08 20:23+0700\n"
 "Last-Translator: Mikail Muzakki <mikailmmuzakki@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
 "Language: id\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: dist/linux/ghostty_nautilus.py:53
 msgid "Open in Ghostty"
-msgstr ""
+msgstr "Buka di Ghostty"
 
 #: src/apprt/gtk/ui/1.0/clipboard-confirmation-dialog.blp:12
 #: src/apprt/gtk/ui/1.4/clipboard-confirmation-dialog.blp:12
@@ -91,23 +91,23 @@ msgstr "Ghostty: Inspektur terminal"
 
 #: src/apprt/gtk/ui/1.2/search-overlay.blp:29
 msgid "Find…"
-msgstr ""
+msgstr "Cari…"
 
 #: src/apprt/gtk/ui/1.2/search-overlay.blp:64
 msgid "Previous Match"
-msgstr ""
+msgstr "Hasil sebelumnya"
 
 #: src/apprt/gtk/ui/1.2/search-overlay.blp:74
 msgid "Next Match"
-msgstr ""
+msgstr "Hasil berikutnya"
 
 #: src/apprt/gtk/ui/1.2/surface.blp:6
 msgid "Oh, no."
-msgstr ""
+msgstr "Oh, tidak."
 
 #: src/apprt/gtk/ui/1.2/surface.blp:7
 msgid "Unable to acquire an OpenGL context for rendering."
-msgstr ""
+msgstr "Tidak dapat memperoleh konteks OpenGL untuk penampilan grafis."
 
 #: src/apprt/gtk/ui/1.2/surface.blp:97
 msgid ""
@@ -115,10 +115,13 @@ msgid ""
 "through the content, but no input events will be sent to the running "
 "application."
 msgstr ""
+"Terminal ini sedang dalam model hanya baca. Anda hanya bisa melihat, memilih, "
+"dan menggulir konten, tetapi peristiwa input tidak akan dikirim ke "
+"aplikasi berjalan."
 
 #: src/apprt/gtk/ui/1.2/surface.blp:107
 msgid "Read-only"
-msgstr ""
+msgstr "Hanya baca"
 
 #: src/apprt/gtk/ui/1.2/surface.blp:260 src/apprt/gtk/ui/1.5/window.blp:200
 msgid "Copy"
@@ -130,7 +133,7 @@ msgstr "Tempel"
 
 #: src/apprt/gtk/ui/1.2/surface.blp:270
 msgid "Notify on Next Command Finish"
-msgstr ""
+msgstr "Beri tahu saat perintah berikutnya selesai"
 
 #: src/apprt/gtk/ui/1.2/surface.blp:277 src/apprt/gtk/ui/1.5/window.blp:273
 msgid "Clear"
@@ -175,7 +178,7 @@ msgstr "Tab"
 #: src/apprt/gtk/ui/1.2/surface.blp:325 src/apprt/gtk/ui/1.5/window.blp:224
 #: src/apprt/gtk/ui/1.5/window.blp:320
 msgid "Change Tab Title…"
-msgstr ""
+msgstr "Ubah judul tab…"
 
 #: src/apprt/gtk/ui/1.2/surface.blp:330 src/apprt/gtk/ui/1.5/window.blp:57
 #: src/apprt/gtk/ui/1.5/window.blp:107 src/apprt/gtk/ui/1.5/window.blp:229
@@ -308,15 +311,15 @@ msgstr "Proses yang sedang berjalan dalam belahan ini akan diakhiri."
 
 #: src/apprt/gtk/class/surface.zig:1108
 msgid "Command Finished"
-msgstr ""
+msgstr "Perintah selesai"
 
 #: src/apprt/gtk/class/surface.zig:1109
 msgid "Command Succeeded"
-msgstr ""
+msgstr "Perintah berhasil"
 
 #: src/apprt/gtk/class/surface.zig:1110
 msgid "Command Failed"
-msgstr ""
+msgstr "Perintah gagal"
 
 #: src/apprt/gtk/class/surface_child_exited.zig:109
 msgid "Command succeeded"
@@ -332,7 +335,7 @@ msgstr "Ubah judul terminal"
 
 #: src/apprt/gtk/class/title_dialog.zig:226
 msgid "Change Tab Title"
-msgstr ""
+msgstr "Ubah judul tab"
 
 #: src/apprt/gtk/class/window.zig:1007
 msgid "Reloaded the configuration"

From aee9361fa3fdd95177823fe1ffa2b8ff19e7e413 Mon Sep 17 00:00:00 2001
From: Dario Griffo <dariogriffo@users.noreply.github.com>
Date: Sun, 8 Mar 2026 13:57:56 +0000
Subject: [PATCH 062/391] Update es_AR.po

Minor updates
---
 po/es_AR.po | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/po/es_AR.po b/po/es_AR.po
index 3182ebf48..05e73a3d4 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -108,7 +108,7 @@ msgstr "Uy, no."
 
 #: src/apprt/gtk/ui/1.2/surface.blp:7
 msgid "Unable to acquire an OpenGL context for rendering."
-msgstr "No se puedo obtener un contexto de OpenGL para el renderizado"
+msgstr "No se puede obtener un contexto de OpenGL para el renderizado"
 
 #: src/apprt/gtk/ui/1.2/surface.blp:97
 msgid ""
@@ -116,7 +116,9 @@ msgid ""
 "through the content, but no input events will be sent to the running "
 "application."
 msgstr ""
-"Esta terminal está en modo solo lectura. Aún puedes ver, seleccionar y "
+"/es_AR.po
+
+Ésta terminal está en modo solo lectura. Aún puedes ver, seleccionar y "
 "desplazarte por el contenido, pero no se enviarán los eventos de entrada a "
 "la aplicación en ejecución."
 

From 2cb8f61bcfafeae1382edd23a1c105ab25c7a8c8 Mon Sep 17 00:00:00 2001
From: Dario Griffo <dariogriffo@users.noreply.github.com>
Date: Sun, 8 Mar 2026 14:03:10 +0000
Subject: [PATCH 063/391] Update es_AR.po

---
 po/es_AR.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/es_AR.po b/po/es_AR.po
index 05e73a3d4..7adaa2754 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -118,7 +118,7 @@ msgid ""
 msgstr ""
 "/es_AR.po
 
-Ésta terminal está en modo solo lectura. Aún puedes ver, seleccionar y "
+Esta terminal está en modo solo lectura. Aún puedes ver, seleccionar y "
 "desplazarte por el contenido, pero no se enviarán los eventos de entrada a "
 "la aplicación en ejecución."
 

From c570d53d45218aae294c52fa81d48220755fe692 Mon Sep 17 00:00:00 2001
From: Dario Griffo <dariogriffo@users.noreply.github.com>
Date: Sun, 8 Mar 2026 14:05:39 +0000
Subject: [PATCH 064/391] Update es_AR.po

---
 po/es_AR.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/po/es_AR.po b/po/es_AR.po
index 7adaa2754..9173e7588 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -116,9 +116,7 @@ msgid ""
 "through the content, but no input events will be sent to the running "
 "application."
 msgstr ""
-"/es_AR.po
-
-Esta terminal está en modo solo lectura. Aún puedes ver, seleccionar y "
+"Esta terminal está en modo solo lectura. Aún puedes ver, seleccionar y "
 "desplazarte por el contenido, pero no se enviarán los eventos de entrada a "
 "la aplicación en ejecución."
 

From eaef1094d92c579fbfc0ce204cc1fc09c41059cf Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Sun, 8 Mar 2026 14:07:03 +0000
Subject: [PATCH 065/391] Update VOUCHED list (#11228)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11227#issuecomment-4019112158)
from @00-kat.

Vouch: @dariogriffo

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 00e8de5af..393ef73e1 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -52,6 +52,7 @@ d-dudas
 daiimus
 damyanbogoev
 danulqua
+dariogriffo
 dervedro
 diaaeddin
 doprz

From df4d9bc0d00a3fc309dc68bdc81254e32816c298 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Sun, 8 Mar 2026 15:22:37 +0100
Subject: [PATCH 066/391] macos: fix quick terminal glassy background

---
 .../Features/QuickTerminal/QuickTerminalController.swift   | 2 ++
 .../Sources/Features/Terminal/TerminalViewContainer.swift  | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/macos/Sources/Features/QuickTerminal/QuickTerminalController.swift b/macos/Sources/Features/QuickTerminal/QuickTerminalController.swift
index eb28942ee..214ff08d3 100644
--- a/macos/Sources/Features/QuickTerminal/QuickTerminalController.swift
+++ b/macos/Sources/Features/QuickTerminal/QuickTerminalController.swift
@@ -625,6 +625,8 @@ class QuickTerminalController: BaseTerminalController {
             window.isOpaque = true
             window.backgroundColor = .windowBackgroundColor
         }
+
+        terminalViewContainer?.ghosttyConfigDidChange(ghostty.config, preferredBackgroundColor: nil)
     }
 
     private func showNoNewTabAlert() {
diff --git a/macos/Sources/Features/Terminal/TerminalViewContainer.swift b/macos/Sources/Features/Terminal/TerminalViewContainer.swift
index 92832efec..bd696a2bf 100644
--- a/macos/Sources/Features/Terminal/TerminalViewContainer.swift
+++ b/macos/Sources/Features/Terminal/TerminalViewContainer.swift
@@ -62,13 +62,6 @@ class TerminalViewContainer: NSView {
         updateGlassEffectTopInsetIfNeeded()
     }
 
-    @objc private func ghosttyConfigDidChange(_ notification: Notification) {
-        guard let config = notification.userInfo?[
-            Notification.Name.GhosttyConfigChangeKey
-        ] as? Ghostty.Config else { return }
-        ghosttyConfigDidChange(config, preferredBackgroundColor: (window as? TerminalWindow)?.preferredBackgroundColor)
-    }
-
     func ghosttyConfigDidChange(_ config: Ghostty.Config, preferredBackgroundColor: NSColor?) {
         let newValue = DerivedConfig(config: config, preferredBackgroundColor: preferredBackgroundColor, cornerRadius: windowCornerRadius)
         guard newValue != derivedConfig else { return }

From 360c369d235e36092ba0ac4319de0e7a8be1eaa7 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Sun, 8 Mar 2026 14:43:13 +0000
Subject: [PATCH 067/391] Update VOUCHED list (#11230)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11125#discussioncomment-16041168)
from @mitchellh.

Vouch: @pauley-unsaturated

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 393ef73e1..979177801 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -122,6 +122,7 @@ nwehg
 oshdubh
 pan93412
 pangoraw
+pauley-unsaturated
 peilingjiang
 peterdavehello
 phush0

From 235dde6844d697e73e974c2311c69abf3a57b0f8 Mon Sep 17 00:00:00 2001
From: Damien Mehala <gh@sunnymail.cc>
Date: Sun, 8 Mar 2026 15:51:09 +0100
Subject: [PATCH 068/391] fix: list-actions outputs without `--docs`

Explicitly flush the buffer once the generation is complete.

Resolves #11221
---
 src/cli/list_actions.zig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cli/list_actions.zig b/src/cli/list_actions.zig
index 682eed251..aaef1195e 100644
--- a/src/cli/list_actions.zig
+++ b/src/cli/list_actions.zig
@@ -46,6 +46,7 @@ pub fn run(alloc: Allocator) !u8 {
         opts.docs,
         std.heap.page_allocator,
     );
+    try stdout_writer.interface.flush();
 
     return 0;
 }

From 686fd34e96409dcf9ab095294f3d073a7ea04b7d Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Sun, 8 Mar 2026 14:59:30 +0000
Subject: [PATCH 069/391] Update VOUCHED list (#11232)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11231#issuecomment-4019204219)
from @mitchellh.

Vouch: @dmehala

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 979177801..06d8ffbf7 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -55,6 +55,7 @@ danulqua
 dariogriffo
 dervedro
 diaaeddin
+dmehala
 doprz
 douglance
 douglas

From 4969b0c56ecf65e0639e978a6bb9e7f076273afe Mon Sep 17 00:00:00 2001
From: Dario Griffo <dariogriffo@users.noreply.github.com>
Date: Sun, 8 Mar 2026 16:19:48 +0000
Subject: [PATCH 070/391] Update es_AR.po

---
 po/es_AR.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/es_AR.po b/po/es_AR.po
index 9173e7588..a5dd60d02 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -108,7 +108,7 @@ msgstr "Uy, no."
 
 #: src/apprt/gtk/ui/1.2/surface.blp:7
 msgid "Unable to acquire an OpenGL context for rendering."
-msgstr "No se puede obtener un contexto de OpenGL para el renderizado"
+msgstr "No se pudo obtener un contexto de OpenGL para el renderizado"
 
 #: src/apprt/gtk/ui/1.2/surface.blp:97
 msgid ""

From a384af5e25228b5b342c717abb5387bd4c3b0b58 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 8 Mar 2026 12:53:59 -0700
Subject: [PATCH 071/391] vt: align SGR C enum tags with parser output

Remove the stale GHOSTTY_SGR_ATTR_RESET_UNDERLINE entry from the C header
and renumber subsequent GhosttySgrAttributeTag values to match
src/terminal/sgr.zig Attribute.Tag ordering.

This fixes misclassified attributes from ghostty_sgr_next for C consumers
that switch on the enum tags from include/ghostty/vt/sgr.h.
---
 include/ghostty/vt/sgr.h | 47 ++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/include/ghostty/vt/sgr.h b/include/ghostty/vt/sgr.h
index 0c1afc309..5aaa368d2 100644
--- a/include/ghostty/vt/sgr.h
+++ b/include/ghostty/vt/sgr.h
@@ -109,30 +109,29 @@ typedef enum {
   GHOSTTY_SGR_ATTR_RESET_ITALIC = 5,
   GHOSTTY_SGR_ATTR_FAINT = 6,
   GHOSTTY_SGR_ATTR_UNDERLINE = 7,
-  GHOSTTY_SGR_ATTR_RESET_UNDERLINE = 8,
-  GHOSTTY_SGR_ATTR_UNDERLINE_COLOR = 9,
-  GHOSTTY_SGR_ATTR_UNDERLINE_COLOR_256 = 10,
-  GHOSTTY_SGR_ATTR_RESET_UNDERLINE_COLOR = 11,
-  GHOSTTY_SGR_ATTR_OVERLINE = 12,
-  GHOSTTY_SGR_ATTR_RESET_OVERLINE = 13,
-  GHOSTTY_SGR_ATTR_BLINK = 14,
-  GHOSTTY_SGR_ATTR_RESET_BLINK = 15,
-  GHOSTTY_SGR_ATTR_INVERSE = 16,
-  GHOSTTY_SGR_ATTR_RESET_INVERSE = 17,
-  GHOSTTY_SGR_ATTR_INVISIBLE = 18,
-  GHOSTTY_SGR_ATTR_RESET_INVISIBLE = 19,
-  GHOSTTY_SGR_ATTR_STRIKETHROUGH = 20,
-  GHOSTTY_SGR_ATTR_RESET_STRIKETHROUGH = 21,
-  GHOSTTY_SGR_ATTR_DIRECT_COLOR_FG = 22,
-  GHOSTTY_SGR_ATTR_DIRECT_COLOR_BG = 23,
-  GHOSTTY_SGR_ATTR_BG_8 = 24,
-  GHOSTTY_SGR_ATTR_FG_8 = 25,
-  GHOSTTY_SGR_ATTR_RESET_FG = 26,
-  GHOSTTY_SGR_ATTR_RESET_BG = 27,
-  GHOSTTY_SGR_ATTR_BRIGHT_BG_8 = 28,
-  GHOSTTY_SGR_ATTR_BRIGHT_FG_8 = 29,
-  GHOSTTY_SGR_ATTR_BG_256 = 30,
-  GHOSTTY_SGR_ATTR_FG_256 = 31,
+  GHOSTTY_SGR_ATTR_UNDERLINE_COLOR = 8,
+  GHOSTTY_SGR_ATTR_UNDERLINE_COLOR_256 = 9,
+  GHOSTTY_SGR_ATTR_RESET_UNDERLINE_COLOR = 10,
+  GHOSTTY_SGR_ATTR_OVERLINE = 11,
+  GHOSTTY_SGR_ATTR_RESET_OVERLINE = 12,
+  GHOSTTY_SGR_ATTR_BLINK = 13,
+  GHOSTTY_SGR_ATTR_RESET_BLINK = 14,
+  GHOSTTY_SGR_ATTR_INVERSE = 15,
+  GHOSTTY_SGR_ATTR_RESET_INVERSE = 16,
+  GHOSTTY_SGR_ATTR_INVISIBLE = 17,
+  GHOSTTY_SGR_ATTR_RESET_INVISIBLE = 18,
+  GHOSTTY_SGR_ATTR_STRIKETHROUGH = 19,
+  GHOSTTY_SGR_ATTR_RESET_STRIKETHROUGH = 20,
+  GHOSTTY_SGR_ATTR_DIRECT_COLOR_FG = 21,
+  GHOSTTY_SGR_ATTR_DIRECT_COLOR_BG = 22,
+  GHOSTTY_SGR_ATTR_BG_8 = 23,
+  GHOSTTY_SGR_ATTR_FG_8 = 24,
+  GHOSTTY_SGR_ATTR_RESET_FG = 25,
+  GHOSTTY_SGR_ATTR_RESET_BG = 26,
+  GHOSTTY_SGR_ATTR_BRIGHT_BG_8 = 27,
+  GHOSTTY_SGR_ATTR_BRIGHT_FG_8 = 28,
+  GHOSTTY_SGR_ATTR_BG_256 = 29,
+  GHOSTTY_SGR_ATTR_FG_256 = 30,
 } GhosttySgrAttributeTag;
 
 /**

From a2ea5b5d7940c97205fba9452517f75213328e03 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Sun, 8 Mar 2026 19:58:06 +0000
Subject: [PATCH 072/391] Update VOUCHED list (#11240)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11207#discussioncomment-16043795)
from @mitchellh.

Vouch: @MOlechowski

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 06d8ffbf7..f4ba14b3e 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -112,6 +112,7 @@ misairuzame
 mischief
 mitchellh
 miupa
+molechowski
 mrmage
 mtak
 natesmyth

From 1d59f5dbcdbe0fc7065a6ed9c46c42d22584add4 Mon Sep 17 00:00:00 2001
From: rhodes-b <59537185+rhodes-b@users.noreply.github.com>
Date: Sun, 8 Mar 2026 15:57:28 -0500
Subject: [PATCH 073/391] pass search active state through blueprint

---
 src/apprt/gtk/class/surface.zig  | 13 +++----------
 src/apprt/gtk/ui/1.2/surface.blp |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/apprt/gtk/class/surface.zig b/src/apprt/gtk/class/surface.zig
index 1db139df2..8ce9ac1d1 100644
--- a/src/apprt/gtk/class/surface.zig
+++ b/src/apprt/gtk/class/surface.zig
@@ -822,19 +822,12 @@ pub const Surface = extern struct {
     /// Callback used to determine whether unfocused-split-fill / unfocused-split-opacity
     /// should be applied to the surface
     fn closureShouldUnfocusedSplitBeShown(
-        self: *Self,
+        _: *Self,
+        search_active: c_int,
         focused: c_int,
         is_split: c_int,
     ) callconv(.c) c_int {
-        const priv = self.private();
-        var val = gobject.ext.Value.new(bool);
-        defer val.unset();
-        gobject.Object.getProperty(
-            priv.search_overlay.as(gobject.Object),
-            SearchOverlay.properties.active.name,
-            &val,
-        );
-        return @intFromBool(val.getBoolean() == 0 and focused == 0 and is_split != 0);
+        return @intFromBool(search_active == 0 and focused == 0 and is_split != 0);
     }
 
     pub fn toggleFullscreen(self: *Self) void {
diff --git a/src/apprt/gtk/ui/1.2/surface.blp b/src/apprt/gtk/ui/1.2/surface.blp
index 55c54531c..794ea1801 100644
--- a/src/apprt/gtk/ui/1.2/surface.blp
+++ b/src/apprt/gtk/ui/1.2/surface.blp
@@ -203,7 +203,7 @@ Overlay terminal_page {
   // Apply unfocused-split-fill and unfocused-split-opacity to current surface
   // this is only applied when a tab has more than one surface
   Revealer {
-    reveal-child: bind $should_unfocused_split_be_shown(template.focused, template.is-split) as <bool>;
+    reveal-child: bind $should_unfocused_split_be_shown(search_overlay.active, template.focused, template.is-split) as <bool>;
     transition-duration: 0;
     // This is all necessary so that the Revealer itself doesn't override
     // any input events from the other overlays. Namely, if you don't have

From ec1ca4c0c903d13a15452c18b1df11b3cabddaf7 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Mon, 9 Mar 2026 00:14:58 +0000
Subject: [PATCH 074/391] Update VOUCHED list (#11247)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11246#discussioncomment-16045992)
from @jcollie.

Vouch: @jmcgover

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index f4ba14b3e..765c9346b 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -80,6 +80,7 @@ jacobsandlund
 jake-stewart
 jcollie
 jguthmiller
+jmcgover
 johnslavik
 josephmart
 jparise

From 233fb12081009fee649295d323c93716655fc671 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 8 Mar 2026 19:53:18 -0700
Subject: [PATCH 075/391] macos: add AppleScript front window and focused
 terminal properties

This adds two new propeties to make it easy to get the frontmost (main)
window and the focused terminal within a tab. We already had a property
to get the selected tab of a tab group.
---
 macos/Ghostty.sdef                                 |  6 ++++++
 .../AppleScript/AppDelegate+AppleScript.swift      | 10 ++++++++++
 macos/Sources/Features/AppleScript/ScriptTab.swift | 14 ++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/macos/Ghostty.sdef b/macos/Ghostty.sdef
index 95497a04a..bdfc501fb 100644
--- a/macos/Ghostty.sdef
+++ b/macos/Ghostty.sdef
@@ -9,6 +9,9 @@
       <property name="frontmost" code="pisf" type="boolean" access="r" description="Is this the active application?">
         <cocoa key="isActive"/>
       </property>
+      <property name="front window" code="GFWn" type="window" access="r" description="The frontmost Ghostty window.">
+        <cocoa key="frontWindow"/>
+      </property>
       <property name="version" code="vers" type="text" access="r" description="The version number of the application."/>
       <responds-to command="perform action">
         <cocoa method="handlePerformActionScriptCommand:"/>
@@ -66,6 +69,9 @@
       </property>
       <property name="index" code="pidx" type="integer" access="r" description="1-based index of this tab in its window."/>
       <property name="selected" code="GTsl" type="boolean" access="r" description="Whether this tab is selected in its window."/>
+      <property name="focused terminal" code="GTfT" type="terminal" access="r" description="The currently focused terminal surface in this tab.">
+        <cocoa key="focusedTerminal"/>
+      </property>
       <responds-to command="select tab">
         <cocoa method="handleSelectTabCommand:"/>
       </responds-to>
diff --git a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
index de7b4948c..983217d60 100644
--- a/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
+++ b/macos/Sources/Features/AppleScript/AppDelegate+AppleScript.swift
@@ -57,6 +57,16 @@ extension NSApplication {
         return result
     }
 
+    /// Exposed as the AppleScript `front window` property.
+    ///
+    /// `scriptWindows` is already ordered front-to-back, so the first item is
+    /// the frontmost logical Ghostty window.
+    @objc(frontWindow)
+    var frontWindow: ScriptWindow? {
+        guard isAppleScriptEnabled else { return nil }
+        return scriptWindows.first
+    }
+
     /// Enables AppleScript unique-ID lookup for window references.
     ///
     /// Required selector name pattern for element key `scriptWindows`:
diff --git a/macos/Sources/Features/AppleScript/ScriptTab.swift b/macos/Sources/Features/AppleScript/ScriptTab.swift
index 8189cd0fa..e5715a4b0 100644
--- a/macos/Sources/Features/AppleScript/ScriptTab.swift
+++ b/macos/Sources/Features/AppleScript/ScriptTab.swift
@@ -67,6 +67,20 @@ final class ScriptTab: NSObject {
         return window?.tabIsSelected(controller) ?? false
     }
 
+    /// Exposed as the AppleScript `focused terminal` property.
+    ///
+    /// Uses the currently focused surface for this tab.
+    @objc(focusedTerminal)
+    var focusedTerminal: ScriptTerminal? {
+        guard NSApp.isAppleScriptEnabled else { return nil }
+        guard let controller else { return nil }
+        guard let surface = controller.focusedSurface,
+              controller.surfaceTree.contains(surface)
+        else { return nil }
+
+        return ScriptTerminal(surfaceView: surface)
+    }
+
     /// Best-effort native window containing this tab.
     var parentWindow: NSWindow? {
         guard NSApp.isAppleScriptEnabled else { return nil }

From fd557e83474e23b42d0f5133df319a79eda66653 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Mon, 9 Mar 2026 08:52:52 -0400
Subject: [PATCH 076/391] bash: only define $__ghostty_ps0 when unset

This fixes an error if the script was sourced a second time:

    bash: __ghostty_ps0: readonly variable

Because this is a non-exported variable, this would only happen if the
script was sourced multiple times in the same bash session.
---
 src/shell-integration/bash/ghostty.bash | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/shell-integration/bash/ghostty.bash b/src/shell-integration/bash/ghostty.bash
index 49d8de450..d74b8d4ce 100644
--- a/src/shell-integration/bash/ghostty.bash
+++ b/src/shell-integration/bash/ghostty.bash
@@ -268,12 +268,15 @@ if (( BASH_VERSINFO[0] > 4 || (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 4) )
 
   # Use function substitution in 5.3+. Otherwise, use command substitution.
   # Any output (including escape sequences) goes to the terminal.
-  if (( BASH_VERSINFO[0] > 5 || (BASH_VERSINFO[0] == 5 && BASH_VERSINFO[1] >= 3) )); then
-    # shellcheck disable=SC2016
-    builtin readonly __ghostty_ps0='${ __ghostty_preexec_hook; }'
-  else
-    # shellcheck disable=SC2016
-    builtin readonly __ghostty_ps0='$(__ghostty_preexec_hook >/dev/tty)'
+  # Only define if not already set (allows re-sourcing).
+  if [[ -z "${__ghostty_ps0+x}" ]]; then
+    if (( BASH_VERSINFO[0] > 5 || (BASH_VERSINFO[0] == 5 && BASH_VERSINFO[1] >= 3) )); then
+      # shellcheck disable=SC2016
+      builtin readonly __ghostty_ps0='${ __ghostty_preexec_hook; }'
+    else
+      # shellcheck disable=SC2016
+      builtin readonly __ghostty_ps0='$(__ghostty_preexec_hook >/dev/tty)'
+    fi
   fi
 
   __ghostty_hook() {

From 0a659af55ff214c781347def6f41d7aaed63b84a Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Mon, 9 Mar 2026 09:16:29 -0400
Subject: [PATCH 077/391] bash: handle existing ; in PROMPT_COMMAND

If an existing PROMPT_COMMAND was a string ending in ; (and maybe some
spaces), we'd add a redundant ;, resulting in a syntax error. Now we
strip any trailing `;[[:space:]]*` characters from the original string
before add ours.
---
 src/shell-integration/bash/ghostty.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/shell-integration/bash/ghostty.bash b/src/shell-integration/bash/ghostty.bash
index 49d8de450..6199b7420 100644
--- a/src/shell-integration/bash/ghostty.bash
+++ b/src/shell-integration/bash/ghostty.bash
@@ -285,19 +285,19 @@ if (( BASH_VERSINFO[0] > 4 || (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 4) )
   }
 
   # Append our hook to PROMPT_COMMAND, preserving its existing type.
+  # shellcheck disable=SC2128,SC2178,SC2179
   if [[ ";${PROMPT_COMMAND[*]:-};" != *";__ghostty_hook;"* ]]; then
     if [[ -z "${PROMPT_COMMAND[*]}" ]]; then
       if (( BASH_VERSINFO[0] > 5 || (BASH_VERSINFO[0] == 5 && BASH_VERSINFO[1] >= 1) )); then
         PROMPT_COMMAND=(__ghostty_hook)
       else
-        # shellcheck disable=SC2178
         PROMPT_COMMAND="__ghostty_hook"
       fi
     elif [[ $(builtin declare -p PROMPT_COMMAND 2>/dev/null) == "declare -a "* ]]; then
       PROMPT_COMMAND+=(__ghostty_hook)
     else
-      # shellcheck disable=SC2179
-      PROMPT_COMMAND+="; __ghostty_hook"
+      [[ "${PROMPT_COMMAND}" =~ \;[[:space:]]*$ ]] || PROMPT_COMMAND+=";"
+      PROMPT_COMMAND+=" __ghostty_hook"
     fi
   fi
 else

From 3ba49a784f4313e301efb68362158e8e338662da Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 9 Mar 2026 07:23:52 -0700
Subject: [PATCH 078/391] terminal: fix grapheme edge-wrap hyperlink integrity
 panic

When a grapheme expands to width 2 at the screen edge, this path can write
spacer_head before printWrap() sets row.wrap. With an active hyperlink,
printCell triggers hyperlink bookkeeping and page integrity checks in that
intermediate state, causing UnwrappedSpacerHead.

Mark row.wrap before writing spacer_head in this grapheme-wrap path to keep
the intermediate state valid.
---
 src/terminal/Terminal.zig | 64 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 61 insertions(+), 3 deletions(-)

diff --git a/src/terminal/Terminal.zig b/src/terminal/Terminal.zig
index 323e4e97a..706f235c7 100644
--- a/src/terminal/Terminal.zig
+++ b/src/terminal/Terminal.zig
@@ -424,13 +424,19 @@ pub fn print(self: *Terminal, c: u21) !void {
                     if (self.screens.active.cursor.x == right_limit - 1) {
                         if (!self.modes.get(.wraparound)) return;
 
-                        const prev_cp = prev.cell.content.codepoint;
+                        // This path can write a spacer_head before printWrap
+                        // which can trigger integrity violations so mark
+                        // the wrap first to keep the intermediary state valid
+                        // if we're wrapping.
+                        const row_wrap = right_limit == self.cols;
+                        if (row_wrap) self.screens.active.cursor.page_row.wrap = true;
 
+                        const prev_cp = prev.cell.content.codepoint;
                         if (prev.cell.hasGrapheme()) {
                             // This is like printCell but without clearing the
                             // grapheme data from the cell, so we can move it
                             // later.
-                            prev.cell.wide = if (right_limit == self.cols) .spacer_head else .narrow;
+                            prev.cell.wide = if (row_wrap) .spacer_head else .narrow;
                             prev.cell.content.codepoint = 0;
 
                             try self.printWrap();
@@ -466,7 +472,7 @@ pub fn print(self: *Terminal, c: u21) !void {
                         } else {
                             self.printCell(
                                 0,
-                                if (right_limit == self.cols) .spacer_head else .narrow,
+                                if (row_wrap) .spacer_head else .narrow,
                             );
                             try self.printWrap();
                             self.printCell(prev_cp, .wide);
@@ -4081,6 +4087,58 @@ test "Terminal: VS16 to make wide character on next line" {
     }
 }
 
+test "Terminal: VS16 to make wide character on next line with hyperlink" {
+    // Regression test for the crash fixed in print's grapheme `.wide` path:
+    // writing a spacer_head at the screen edge before row.wrap was set.
+    var t = try init(testing.allocator, .{ .rows = 5, .cols = 3 });
+    defer t.deinit(testing.allocator);
+
+    // Enable grapheme clustering and activate a hyperlink so printCell
+    // calls cursorSetHyperlink (which runs page integrity checks).
+    t.modes.set(.grapheme_cluster, true);
+    try t.screens.active.startHyperlink("http://example.com", null);
+
+    t.cursorRight(2);
+    try t.print('#');
+    try testing.expectEqual(@as(usize, 2), t.screens.active.cursor.x);
+    try testing.expect(t.screens.active.cursor.pending_wrap);
+
+    // Without the fix, this panicked with UnwrappedSpacerHead.
+    try t.print(0xFE0F); // VS16 to make wide
+
+    try testing.expectEqual(@as(usize, 1), t.screens.active.cursor.y);
+    try testing.expectEqual(@as(usize, 2), t.screens.active.cursor.x);
+    try testing.expect(!t.screens.active.cursor.pending_wrap);
+
+    {
+        // Previous cell turns into spacer_head and remains hyperlinked.
+        const list_cell = t.screens.active.pages.getCell(.{ .screen = .{ .x = 2, .y = 0 } }).?;
+        const cell = list_cell.cell;
+        try testing.expectEqual(@as(u21, 0), cell.content.codepoint);
+        try testing.expectEqual(Cell.Wide.spacer_head, cell.wide);
+        try testing.expect(cell.hyperlink);
+        try testing.expect(list_cell.row.wrap);
+    }
+    {
+        // '#' cell is now wide and still hyperlinked.
+        const list_cell = t.screens.active.pages.getCell(.{ .screen = .{ .x = 0, .y = 1 } }).?;
+        const cell = list_cell.cell;
+        try testing.expectEqual(@as(u21, '#'), cell.content.codepoint);
+        try testing.expect(cell.hasGrapheme());
+        try testing.expectEqualSlices(u21, &.{0xFE0F}, list_cell.node.data.lookupGrapheme(cell).?);
+        try testing.expectEqual(Cell.Wide.wide, cell.wide);
+        try testing.expect(cell.hyperlink);
+    }
+    {
+        // spacer_tail inherits hyperlink as part of the same grapheme cell.
+        const list_cell = t.screens.active.pages.getCell(.{ .screen = .{ .x = 1, .y = 1 } }).?;
+        const cell = list_cell.cell;
+        try testing.expectEqual(@as(u21, 0), cell.content.codepoint);
+        try testing.expectEqual(Cell.Wide.spacer_tail, cell.wide);
+        try testing.expect(cell.hyperlink);
+    }
+}
+
 test "Terminal: VS16 to make wide character with pending wrap" {
     var t = try init(testing.allocator, .{ .rows = 5, .cols = 3 });
     defer t.deinit(testing.allocator);

From 3c93c35869f40bd95db3e729549f05f48a371089 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Mon, 9 Mar 2026 13:28:41 +0100
Subject: [PATCH 079/391] macOS: filter proper intrinsicContentSize when
 opening new window

Fixes #11256
---
 .../Terminal/TerminalController.swift         | 49 ++++++++++++++-----
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index e744e7c38..dac57a69e 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -57,6 +57,9 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
     /// The notification cancellable for focused surface property changes.
     private var surfaceAppearanceCancellables: Set<AnyCancellable> = []
 
+    /// The KVO cancellable for `window.contentView.intrinsicContentSize` changes.
+    private var contentIntrinsicContentSizeCancellable: AnyCancellable?
+
     /// This will be set to the initial frame of the window from the xib on load.
     private var initialFrame: NSRect?
 
@@ -1038,9 +1041,10 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         }
 
         // Initialize our content view to the SwiftUI root
-        window.contentView = TerminalViewContainer {
+        let contentView = TerminalViewContainer {
             TerminalView(ghostty: ghostty, viewModel: self, delegate: self)
         }
+        window.contentView = contentView
 
         // If we have a default size, we want to apply it.
         if let defaultSize {
@@ -1049,17 +1053,21 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
                 // Frames can be applied immediately
                 defaultSize.apply(to: window)
 
-            case .contentIntrinsicSize:
-                // Content intrinsic size requires a short delay so that AppKit
-                // can layout our SwiftUI views.
-                DispatchQueue.main.asyncAfter(deadline: .now() + .microseconds(10_000)) { [weak self, weak window] in
-                    guard let self, let window else { return }
-                    defaultSize.apply(to: window)
-                    if let screen = window.screen ?? NSScreen.main {
-                        let frame = self.adjustForWindowPosition(frame: window.frame, on: screen)
-                        window.setFrameOrigin(frame.origin)
+            case let .contentIntrinsicSize(minSize):
+                // We wait for the first proper content intrinsic size,
+                // after AppKit laid out our SwiftUI views.
+                contentIntrinsicContentSizeCancellable = contentView.publisher(for: \.intrinsicContentSize)
+                    .filter { $0.width >= minSize.width && $0.height >= minSize.height }
+                    .first()
+                    .sink { [weak self, weak window] _ in
+                        guard let self, let window else { return }
+                        defaultSize.apply(to: window)
+                        if let screen = window.screen ?? NSScreen.main {
+                            let frame = self.adjustForWindowPosition(frame: window.frame, on: screen)
+                            window.setFrameOrigin(frame.origin)
+                        }
+                        contentIntrinsicContentSizeCancellable = nil
                     }
-                }
             }
         }
 
@@ -1560,6 +1568,21 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
             self.windowPositionX = config.windowPositionX
             self.windowPositionY = config.windowPositionY
         }
+
+        /// The minimum size a window can be resized to as of macOS 26.3, it should cover most cases.
+        ///
+        /// We use this to filter incorrect intrinsicContentSize values when positioning a new window.
+        fileprivate var minimumWindowSize: CGSize {
+            switch macosTitlebarStyle {
+            case "native", "transparent":
+                CGSize(width: 105 + 1, height: 33 + 1)
+            case "tabs":
+                CGSize(width: 90 + 1, height: 48 + 1)
+            // hidden or others
+            default:
+                CGSize(width: 27 + 1, height: 40 + 1)
+            }
+        }
     }
 }
 
@@ -1607,7 +1630,7 @@ extension TerminalController {
         case frame(NSRect)
 
         /// A content size, set with `window.setContentSize`
-        case contentIntrinsicSize
+        case contentIntrinsicSize(_ minimum: CGSize)
 
         func isChanged(for window: NSWindow) -> Bool {
             switch self {
@@ -1644,7 +1667,7 @@ extension TerminalController {
         } else if focusedSurface?.initialSize != nil {
             // Initial size as requested by the configuration (e.g. `window-width`)
             // takes next priority.
-            return .contentIntrinsicSize
+            return .contentIntrinsicSize(derivedConfig.minimumWindowSize)
         } else if let initialFrame {
             // The initial frame we had when we started otherwise.
             return .frame(initialFrame)

From dd3d72c3de474c10da7e1576e39c7e2e7ad7617f Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 9 Mar 2026 08:33:24 -0700
Subject: [PATCH 080/391] Revert "macOS: filter proper intrinsicContentSize
 when opening new window (#11257)"

This reverts commit 3445c9afdad7d459ba42e0c66e25e0c09dda7eff, reversing
changes made to 1e981f858a4833ae63e7e53f9f0c84c516b4241e.
---
 .../Terminal/TerminalController.swift         | 49 +++++--------------
 1 file changed, 13 insertions(+), 36 deletions(-)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index dac57a69e..e744e7c38 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -57,9 +57,6 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
     /// The notification cancellable for focused surface property changes.
     private var surfaceAppearanceCancellables: Set<AnyCancellable> = []
 
-    /// The KVO cancellable for `window.contentView.intrinsicContentSize` changes.
-    private var contentIntrinsicContentSizeCancellable: AnyCancellable?
-
     /// This will be set to the initial frame of the window from the xib on load.
     private var initialFrame: NSRect?
 
@@ -1041,10 +1038,9 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         }
 
         // Initialize our content view to the SwiftUI root
-        let contentView = TerminalViewContainer {
+        window.contentView = TerminalViewContainer {
             TerminalView(ghostty: ghostty, viewModel: self, delegate: self)
         }
-        window.contentView = contentView
 
         // If we have a default size, we want to apply it.
         if let defaultSize {
@@ -1053,21 +1049,17 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
                 // Frames can be applied immediately
                 defaultSize.apply(to: window)
 
-            case let .contentIntrinsicSize(minSize):
-                // We wait for the first proper content intrinsic size,
-                // after AppKit laid out our SwiftUI views.
-                contentIntrinsicContentSizeCancellable = contentView.publisher(for: \.intrinsicContentSize)
-                    .filter { $0.width >= minSize.width && $0.height >= minSize.height }
-                    .first()
-                    .sink { [weak self, weak window] _ in
-                        guard let self, let window else { return }
-                        defaultSize.apply(to: window)
-                        if let screen = window.screen ?? NSScreen.main {
-                            let frame = self.adjustForWindowPosition(frame: window.frame, on: screen)
-                            window.setFrameOrigin(frame.origin)
-                        }
-                        contentIntrinsicContentSizeCancellable = nil
+            case .contentIntrinsicSize:
+                // Content intrinsic size requires a short delay so that AppKit
+                // can layout our SwiftUI views.
+                DispatchQueue.main.asyncAfter(deadline: .now() + .microseconds(10_000)) { [weak self, weak window] in
+                    guard let self, let window else { return }
+                    defaultSize.apply(to: window)
+                    if let screen = window.screen ?? NSScreen.main {
+                        let frame = self.adjustForWindowPosition(frame: window.frame, on: screen)
+                        window.setFrameOrigin(frame.origin)
                     }
+                }
             }
         }
 
@@ -1568,21 +1560,6 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
             self.windowPositionX = config.windowPositionX
             self.windowPositionY = config.windowPositionY
         }
-
-        /// The minimum size a window can be resized to as of macOS 26.3, it should cover most cases.
-        ///
-        /// We use this to filter incorrect intrinsicContentSize values when positioning a new window.
-        fileprivate var minimumWindowSize: CGSize {
-            switch macosTitlebarStyle {
-            case "native", "transparent":
-                CGSize(width: 105 + 1, height: 33 + 1)
-            case "tabs":
-                CGSize(width: 90 + 1, height: 48 + 1)
-            // hidden or others
-            default:
-                CGSize(width: 27 + 1, height: 40 + 1)
-            }
-        }
     }
 }
 
@@ -1630,7 +1607,7 @@ extension TerminalController {
         case frame(NSRect)
 
         /// A content size, set with `window.setContentSize`
-        case contentIntrinsicSize(_ minimum: CGSize)
+        case contentIntrinsicSize
 
         func isChanged(for window: NSWindow) -> Bool {
             switch self {
@@ -1667,7 +1644,7 @@ extension TerminalController {
         } else if focusedSurface?.initialSize != nil {
             // Initial size as requested by the configuration (e.g. `window-width`)
             // takes next priority.
-            return .contentIntrinsicSize(derivedConfig.minimumWindowSize)
+            return .contentIntrinsicSize
         } else if let initialFrame {
             // The initial frame we had when we started otherwise.
             return .frame(initialFrame)

From a6ee1fb292d2361bd3fca7998d1d86f6509b3272 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 9 Mar 2026 08:42:05 -0700
Subject: [PATCH 081/391] macos: increase window-width/height apply delay from
 10ms to 40ms

Band-aid for #10304

We don't have a robust fix yet but this should help mitigate more
scenarios.
---
 macos/Sources/Features/Terminal/TerminalController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index e744e7c38..7a5bd1d4b 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -1052,7 +1052,7 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
             case .contentIntrinsicSize:
                 // Content intrinsic size requires a short delay so that AppKit
                 // can layout our SwiftUI views.
-                DispatchQueue.main.asyncAfter(deadline: .now() + .microseconds(10_000)) { [weak self, weak window] in
+                DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(40)) { [weak self, weak window] in
                     guard let self, let window else { return }
                     defaultSize.apply(to: window)
                     if let screen = window.screen ?? NSScreen.main {

From 703d11c642a96af9e54b55b04f131bf3888948a9 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 9 Mar 2026 08:47:16 -0700
Subject: [PATCH 082/391] Bump version to 1.3.0

---
 build.zig.zon                                    | 2 +-
 dist/linux/com.mitchellh.ghostty.metainfo.xml.in | 3 +++
 nix/package.nix                                  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.zig.zon b/build.zig.zon
index e7a8747f7..615f13288 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -1,6 +1,6 @@
 .{
     .name = .ghostty,
-    .version = "1.3.0-dev",
+    .version = "1.3.0",
     .paths = .{""},
     .fingerprint = 0x64407a2a0b4147e5,
     .minimum_zig_version = "0.15.2",
diff --git a/dist/linux/com.mitchellh.ghostty.metainfo.xml.in b/dist/linux/com.mitchellh.ghostty.metainfo.xml.in
index 42ccc2754..da1fa626e 100644
--- a/dist/linux/com.mitchellh.ghostty.metainfo.xml.in
+++ b/dist/linux/com.mitchellh.ghostty.metainfo.xml.in
@@ -52,6 +52,9 @@
 
   <releases>
     <!-- TODO: Generate this automatically -->
+    <release version="1.3.0" date="2026-03-09">
+        <url type="details">https://ghostty.org/docs/install/release-notes/1-3-0</url>
+    </release>
     <release version="1.0.1" date="2024-12-31">
         <url type="details">https://ghostty.org/docs/install/release-notes/1-0-1</url>
     </release>
diff --git a/nix/package.nix b/nix/package.nix
index 1efef4164..391c9da05 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -30,7 +30,7 @@
 in
   stdenv.mkDerivation (finalAttrs: {
     pname = "ghostty";
-    version = "1.3.0-dev";
+    version = "1.3.0";
 
     # We limit source like this to try and reduce the amount of rebuilds as possible
     # thus we only provide the source that is needed for the build

From f8a0a45963010e5cb3baa8069dbcc07a60c5d26d Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Mon, 9 Mar 2026 19:20:32 +0000
Subject: [PATCH 083/391] Update VOUCHED list (#11275)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11274#discussioncomment-16057271)
from @jcollie.

Vouch: @seruman

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 765c9346b..c767a0ec5 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -143,6 +143,7 @@ rmunn
 rockorager
 rpfaeffle
 secrus
+seruman
 silveirapf
 slsrepo
 sunshine-syz

From f8f431ba67e32b7fa0d63c54bc736d55cf27532f Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Mon, 9 Mar 2026 16:47:07 -0500
Subject: [PATCH 084/391] docs: update bell-features docs for macOS

PR #11154 didn't fully update the docs regarding `bell-features=audio`
on macOS.
---
 src/config/Config.zig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/config/Config.zig b/src/config/Config.zig
index 591c0b049..527b0d329 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -3047,7 +3047,7 @@ keybind: Keybinds = .{},
 ///
 ///  * `audio`
 ///
-///    Play a custom sound. (GTK only)
+///    Play a custom sound. (Available since 1.3.0 on macOS)
 ///
 ///  * `attention` *(enabled by default)*
 ///
@@ -3089,14 +3089,14 @@ keybind: Keybinds = .{},
 /// directory if this is used as a CLI flag. The path may be prefixed with `~/`
 /// to reference the user's home directory.
 ///
-/// Available since: 1.2.0
+/// Available since: 1.2.0 on GTK, 1.3.0 on macOS.
 @"bell-audio-path": ?Path = null,
 
 /// If `audio` is an enabled bell feature, this is the volume to play the audio
 /// file at (relative to the system volume). This is a floating point number
 /// ranging from 0.0 (silence) to 1.0 (as loud as possible). The default is 0.5.
 ///
-/// Available since: 1.2.0
+/// Available since: 1.2.0 on GTK, 1.3.0 on macOS.
 @"bell-audio-volume": f64 = 0.5,
 
 /// Control the in-app notifications that Ghostty shows.

From 96f9772cd838fa9d562ed369ea6fa8e657f870e3 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Mon, 9 Mar 2026 19:59:21 -0500
Subject: [PATCH 085/391] tests: disable tests that fail if you have locally
 installed fonts

If you have "Noto Sans Tai Tham" and/or "Noto Sans Javanese" installed
locally on Linux, three tests fail. This PR disables those tests until a
more permanent solution can be found.
---
 src/font/shaper/harfbuzz.zig | 295 ++++++++++++++++++-----------------
 1 file changed, 149 insertions(+), 146 deletions(-)

diff --git a/src/font/shaper/harfbuzz.zig b/src/font/shaper/harfbuzz.zig
index b1126dd4e..10e5f99b1 100644
--- a/src/font/shaper/harfbuzz.zig
+++ b/src/font/shaper/harfbuzz.zig
@@ -1079,66 +1079,67 @@ test "shape Devanagari string" {
 }
 
 test "shape Tai Tham vowels (position differs from advance)" {
-    // Note that while this test was necessary for CoreText, the old logic was
-    // working for HarfBuzz. Still we keep it to ensure it has the correct
-    // behavior.
-    const testing = std.testing;
-    const alloc = testing.allocator;
+    return error.SkipZigTest;
+    // // Note that while this test was necessary for CoreText, the old logic was
+    // // working for HarfBuzz. Still we keep it to ensure it has the correct
+    // // behavior.
+    // const testing = std.testing;
+    // const alloc = testing.allocator;
 
-    // We need a font that supports Tai Tham for this to work, if we can't find
-    // Noto Sans Tai Tham, which is a system font on macOS, we just skip the
-    // test.
-    var testdata = testShaperWithDiscoveredFont(
-        alloc,
-        "Noto Sans Tai Tham",
-    ) catch return error.SkipZigTest;
-    defer testdata.deinit();
+    // // We need a font that supports Tai Tham for this to work, if we can't find
+    // // Noto Sans Tai Tham, which is a system font on macOS, we just skip the
+    // // test.
+    // var testdata = testShaperWithDiscoveredFont(
+    //     alloc,
+    //     "Noto Sans Tai Tham",
+    // ) catch return error.SkipZigTest;
+    // defer testdata.deinit();
 
-    var buf: [32]u8 = undefined;
-    var buf_idx: usize = 0;
-    buf_idx += try std.unicode.utf8Encode(0x1a2F, buf[buf_idx..]); // ᨯ
-    buf_idx += try std.unicode.utf8Encode(0x1a70, buf[buf_idx..]); //  ᩰ
+    // var buf: [32]u8 = undefined;
+    // var buf_idx: usize = 0;
+    // buf_idx += try std.unicode.utf8Encode(0x1a2F, buf[buf_idx..]); // ᨯ
+    // buf_idx += try std.unicode.utf8Encode(0x1a70, buf[buf_idx..]); //  ᩰ
 
-    // Make a screen with some data
-    var t = try terminal.Terminal.init(alloc, .{ .cols = 30, .rows = 3 });
-    defer t.deinit(alloc);
+    // // Make a screen with some data
+    // var t = try terminal.Terminal.init(alloc, .{ .cols = 30, .rows = 3 });
+    // defer t.deinit(alloc);
 
-    // Enable grapheme clustering
-    t.modes.set(.grapheme_cluster, true);
+    // // Enable grapheme clustering
+    // t.modes.set(.grapheme_cluster, true);
 
-    var s = t.vtStream();
-    defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    // var s = t.vtStream();
+    // defer s.deinit();
+    // try s.nextSlice(buf[0..buf_idx]);
 
-    var state: terminal.RenderState = .empty;
-    defer state.deinit(alloc);
-    try state.update(alloc, &t);
+    // var state: terminal.RenderState = .empty;
+    // defer state.deinit(alloc);
+    // try state.update(alloc, &t);
 
-    // Get our run iterator
-    var shaper = &testdata.shaper;
-    var it = shaper.runIterator(.{
-        .grid = testdata.grid,
-        .cells = state.row_data.get(0).cells.slice(),
-    });
-    var count: usize = 0;
-    while (try it.next(alloc)) |run| {
-        count += 1;
+    // // Get our run iterator
+    // var shaper = &testdata.shaper;
+    // var it = shaper.runIterator(.{
+    //     .grid = testdata.grid,
+    //     .cells = state.row_data.get(0).cells.slice(),
+    // });
+    // var count: usize = 0;
+    // while (try it.next(alloc)) |run| {
+    //     count += 1;
 
-        const cells = try shaper.shape(run);
-        try testing.expectEqual(@as(usize, 2), cells.len);
-        try testing.expectEqual(@as(u16, 0), cells[0].x);
-        try testing.expectEqual(@as(u16, 0), cells[1].x);
+    //     const cells = try shaper.shape(run);
+    //     try testing.expectEqual(@as(usize, 2), cells.len);
+    //     try testing.expectEqual(@as(u16, 0), cells[0].x);
+    //     try testing.expectEqual(@as(u16, 0), cells[1].x);
 
-        // The first glyph renders in the next cell. We expect the x_offset
-        // to equal the cell width. However, with FreeType the cell_width is
-        // computed from ASCII glyphs, and Noto Sans Tai Tham only has the
-        // space character in ASCII (with a 3px advance), so the cell_width
-        // metric doesn't match the actual Tai Tham glyph positioning.
-        const expected_x_offset: i16 = if (comptime font.options.backend.hasFreetype()) 7 else @intCast(run.grid.metrics.cell_width);
-        try testing.expectEqual(expected_x_offset, cells[0].x_offset);
-        try testing.expectEqual(@as(i16, 0), cells[1].x_offset);
-    }
-    try testing.expectEqual(@as(usize, 1), count);
+    //     // The first glyph renders in the next cell. We expect the x_offset
+    //     // to equal the cell width. However, with FreeType the cell_width is
+    //     // computed from ASCII glyphs, and Noto Sans Tai Tham only has the
+    //     // space character in ASCII (with a 3px advance), so the cell_width
+    //     // metric doesn't match the actual Tai Tham glyph positioning.
+    //     const expected_x_offset: i16 = if (comptime font.options.backend.hasFreetype()) 7 else @intCast(run.grid.metrics.cell_width);
+    //     try testing.expectEqual(expected_x_offset, cells[0].x_offset);
+    //     try testing.expectEqual(@as(i16, 0), cells[1].x_offset);
+    // }
+    // try testing.expectEqual(@as(usize, 1), count);
 }
 
 test "shape Tibetan characters" {
@@ -1195,124 +1196,126 @@ test "shape Tibetan characters" {
 }
 
 test "shape Tai Tham letters (run_offset.y differs from zero)" {
-    const testing = std.testing;
-    const alloc = testing.allocator;
+    return error.SkipZigTest;
+    // const testing = std.testing;
+    // const alloc = testing.allocator;
 
-    // We need a font that supports Tai Tham for this to work, if we can't find
-    // Noto Sans Tai Tham, which is a system font on macOS, we just skip the
-    // test.
-    var testdata = testShaperWithDiscoveredFont(
-        alloc,
-        "Noto Sans Tai Tham",
-    ) catch return error.SkipZigTest;
-    defer testdata.deinit();
+    // // We need a font that supports Tai Tham for this to work, if we can't find
+    // // Noto Sans Tai Tham, which is a system font on macOS, we just skip the
+    // // test.
+    // var testdata = testShaperWithDiscoveredFont(
+    //     alloc,
+    //     "Noto Sans Tai Tham",
+    // ) catch return error.SkipZigTest;
+    // defer testdata.deinit();
 
-    var buf: [32]u8 = undefined;
-    var buf_idx: usize = 0;
+    // var buf: [32]u8 = undefined;
+    // var buf_idx: usize = 0;
 
-    // First grapheme cluster:
-    buf_idx += try std.unicode.utf8Encode(0x1a49, buf[buf_idx..]); // HA
-    buf_idx += try std.unicode.utf8Encode(0x1a60, buf[buf_idx..]); // SAKOT
-    // Second grapheme cluster, combining with the first in a ligature:
-    buf_idx += try std.unicode.utf8Encode(0x1a3f, buf[buf_idx..]); // YA
-    buf_idx += try std.unicode.utf8Encode(0x1a69, buf[buf_idx..]); // U
+    // // First grapheme cluster:
+    // buf_idx += try std.unicode.utf8Encode(0x1a49, buf[buf_idx..]); // HA
+    // buf_idx += try std.unicode.utf8Encode(0x1a60, buf[buf_idx..]); // SAKOT
+    // // Second grapheme cluster, combining with the first in a ligature:
+    // buf_idx += try std.unicode.utf8Encode(0x1a3f, buf[buf_idx..]); // YA
+    // buf_idx += try std.unicode.utf8Encode(0x1a69, buf[buf_idx..]); // U
 
-    // Make a screen with some data
-    var t = try terminal.Terminal.init(alloc, .{ .cols = 30, .rows = 3 });
-    defer t.deinit(alloc);
+    // // Make a screen with some data
+    // var t = try terminal.Terminal.init(alloc, .{ .cols = 30, .rows = 3 });
+    // defer t.deinit(alloc);
 
-    // Enable grapheme clustering
-    t.modes.set(.grapheme_cluster, true);
+    // // Enable grapheme clustering
+    // t.modes.set(.grapheme_cluster, true);
 
-    var s = t.vtStream();
-    defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    // var s = t.vtStream();
+    // defer s.deinit();
+    // try s.nextSlice(buf[0..buf_idx]);
 
-    var state: terminal.RenderState = .empty;
-    defer state.deinit(alloc);
-    try state.update(alloc, &t);
+    // var state: terminal.RenderState = .empty;
+    // defer state.deinit(alloc);
+    // try state.update(alloc, &t);
 
-    // Get our run iterator
-    var shaper = &testdata.shaper;
-    var it = shaper.runIterator(.{
-        .grid = testdata.grid,
-        .cells = state.row_data.get(0).cells.slice(),
-    });
-    var count: usize = 0;
-    while (try it.next(alloc)) |run| {
-        count += 1;
+    // // Get our run iterator
+    // var shaper = &testdata.shaper;
+    // var it = shaper.runIterator(.{
+    //     .grid = testdata.grid,
+    //     .cells = state.row_data.get(0).cells.slice(),
+    // });
+    // var count: usize = 0;
+    // while (try it.next(alloc)) |run| {
+    //     count += 1;
 
-        const cells = try shaper.shape(run);
-        try testing.expectEqual(@as(usize, 3), cells.len);
-        try testing.expectEqual(@as(u16, 0), cells[0].x);
-        try testing.expectEqual(@as(u16, 0), cells[1].x);
-        try testing.expectEqual(@as(u16, 0), cells[2].x); // U from second grapheme
+    //     const cells = try shaper.shape(run);
+    //     try testing.expectEqual(@as(usize, 3), cells.len);
+    //     try testing.expectEqual(@as(u16, 0), cells[0].x);
+    //     try testing.expectEqual(@as(u16, 0), cells[1].x);
+    //     try testing.expectEqual(@as(u16, 0), cells[2].x); // U from second grapheme
 
-        // The U glyph renders at a y below zero
-        try testing.expectEqual(@as(i16, -3), cells[2].y_offset);
-    }
-    try testing.expectEqual(@as(usize, 1), count);
+    //     // The U glyph renders at a y below zero
+    //     try testing.expectEqual(@as(i16, -3), cells[2].y_offset);
+    // }
+    // try testing.expectEqual(@as(usize, 1), count);
 }
 
 test "shape Javanese ligatures" {
-    const testing = std.testing;
-    const alloc = testing.allocator;
+    return error.SkipZigTest;
+    // const testing = std.testing;
+    // const alloc = testing.allocator;
 
-    // We need a font that supports Javanese for this to work, if we can't find
-    // Noto Sans Javanese Regular, which is a system font on macOS, we just
-    // skip the test.
-    var testdata = testShaperWithDiscoveredFont(
-        alloc,
-        "Noto Sans Javanese",
-    ) catch return error.SkipZigTest;
-    defer testdata.deinit();
+    // // We need a font that supports Javanese for this to work, if we can't find
+    // // Noto Sans Javanese Regular, which is a system font on macOS, we just
+    // // skip the test.
+    // var testdata = testShaperWithDiscoveredFont(
+    //     alloc,
+    //     "Noto Sans Javanese",
+    // ) catch return error.SkipZigTest;
+    // defer testdata.deinit();
 
-    var buf: [32]u8 = undefined;
-    var buf_idx: usize = 0;
+    // var buf: [32]u8 = undefined;
+    // var buf_idx: usize = 0;
 
-    // First grapheme cluster:
-    buf_idx += try std.unicode.utf8Encode(0xa9a4, buf[buf_idx..]); // NA
-    buf_idx += try std.unicode.utf8Encode(0xa9c0, buf[buf_idx..]); // PANGKON
-    // Second grapheme cluster, combining with the first in a ligature:
-    buf_idx += try std.unicode.utf8Encode(0xa9b2, buf[buf_idx..]); // HA
-    buf_idx += try std.unicode.utf8Encode(0xa9b8, buf[buf_idx..]); // Vowel sign SUKU
+    // // First grapheme cluster:
+    // buf_idx += try std.unicode.utf8Encode(0xa9a4, buf[buf_idx..]); // NA
+    // buf_idx += try std.unicode.utf8Encode(0xa9c0, buf[buf_idx..]); // PANGKON
+    // // Second grapheme cluster, combining with the first in a ligature:
+    // buf_idx += try std.unicode.utf8Encode(0xa9b2, buf[buf_idx..]); // HA
+    // buf_idx += try std.unicode.utf8Encode(0xa9b8, buf[buf_idx..]); // Vowel sign SUKU
 
-    // Make a screen with some data
-    var t = try terminal.Terminal.init(alloc, .{ .cols = 30, .rows = 3 });
-    defer t.deinit(alloc);
+    // // Make a screen with some data
+    // var t = try terminal.Terminal.init(alloc, .{ .cols = 30, .rows = 3 });
+    // defer t.deinit(alloc);
 
-    // Enable grapheme clustering
-    t.modes.set(.grapheme_cluster, true);
+    // // Enable grapheme clustering
+    // t.modes.set(.grapheme_cluster, true);
 
-    var s = t.vtStream();
-    defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    // var s = t.vtStream();
+    // defer s.deinit();
+    // try s.nextSlice(buf[0..buf_idx]);
 
-    var state: terminal.RenderState = .empty;
-    defer state.deinit(alloc);
-    try state.update(alloc, &t);
+    // var state: terminal.RenderState = .empty;
+    // defer state.deinit(alloc);
+    // try state.update(alloc, &t);
 
-    // Get our run iterator
-    var shaper = &testdata.shaper;
-    var it = shaper.runIterator(.{
-        .grid = testdata.grid,
-        .cells = state.row_data.get(0).cells.slice(),
-    });
-    var count: usize = 0;
-    while (try it.next(alloc)) |run| {
-        count += 1;
+    // // Get our run iterator
+    // var shaper = &testdata.shaper;
+    // var it = shaper.runIterator(.{
+    //     .grid = testdata.grid,
+    //     .cells = state.row_data.get(0).cells.slice(),
+    // });
+    // var count: usize = 0;
+    // while (try it.next(alloc)) |run| {
+    //     count += 1;
 
-        const cells = try shaper.shape(run);
-        const cell_width = run.grid.metrics.cell_width;
-        try testing.expectEqual(@as(usize, 3), cells.len);
-        try testing.expectEqual(@as(u16, 0), cells[0].x);
-        try testing.expectEqual(@as(u16, 0), cells[1].x);
-        try testing.expectEqual(@as(u16, 0), cells[2].x);
+    //     const cells = try shaper.shape(run);
+    //     const cell_width = run.grid.metrics.cell_width;
+    //     try testing.expectEqual(@as(usize, 3), cells.len);
+    //     try testing.expectEqual(@as(u16, 0), cells[0].x);
+    //     try testing.expectEqual(@as(u16, 0), cells[1].x);
+    //     try testing.expectEqual(@as(u16, 0), cells[2].x);
 
-        // The vowel sign SUKU renders with correct x_offset
-        try testing.expect(cells[2].x_offset > 3 * cell_width);
-    }
-    try testing.expectEqual(@as(usize, 1), count);
+    //     // The vowel sign SUKU renders with correct x_offset
+    //     try testing.expect(cells[2].x_offset > 3 * cell_width);
+    // }
+    // try testing.expectEqual(@as(usize, 1), count);
 }
 
 test "shape Chakma vowel sign with ligature (vowel sign renders first)" {

From 327783ff6c86c5843eedaab20c7f394e4396daa4 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Tue, 10 Mar 2026 13:58:50 +0000
Subject: [PATCH 086/391] Update VOUCHED list (#11314)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11287#discussioncomment-16069141)
from @mitchellh.

Vouch: @ocean6954

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index c767a0ec5..95c44c407 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -122,6 +122,7 @@ nicosuave
 nmggithub
 noib3
 nwehg
+ocean6954
 oshdubh
 pan93412
 pangoraw

From c83dea49fd1c4b89eee2956f8638b80122596bdc Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Tue, 10 Mar 2026 14:09:14 +0000
Subject: [PATCH 087/391] Update VOUCHED list (#11318)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11309#discussioncomment-16069391)
from @mitchellh.

Vouch: @dzhlobo

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 95c44c407..a63757b5d 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -60,6 +60,7 @@ doprz
 douglance
 douglas
 drepper
+dzhlobo
 elias8
 ephemera
 eriksremess

From 6c7309196fef805e1d0fbb0ce82944aab8edda7d Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Tue, 10 Mar 2026 14:15:21 +0000
Subject: [PATCH 088/391] Update VOUCHED list (#11321)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11320#issuecomment-4031703556)
from @mitchellh.

Vouch: @chronologos

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index a63757b5d..7ba09148b 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -45,6 +45,7 @@ brentschroeter
 cespare
 charliie-dev
 chernetskyi
+chronologos
 cmwetherell
 craziestowl
 curtismoncoq

From cfedda1a0e9197dfa7463a3a3aeb90ad980ab86f Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Tue, 10 Mar 2026 13:45:44 +0100
Subject: [PATCH 089/391] macOS: add regression tests for intrinsicContentSize
 race (#11256)

Tests that validate intrinsicContentSize returns a correct value when
TerminalController.windowDidLoad() reads it. Currently fail, proving
the race condition where @FocusedValue hasn't propagated
lastFocusedSurface before the 40ms timer fires.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../Terminal/IntrinsicSizeTimingTests.swift   | 467 ++++++++++++++++++
 1 file changed, 467 insertions(+)
 create mode 100644 macos/Tests/Terminal/IntrinsicSizeTimingTests.swift

diff --git a/macos/Tests/Terminal/IntrinsicSizeTimingTests.swift b/macos/Tests/Terminal/IntrinsicSizeTimingTests.swift
new file mode 100644
index 000000000..ef7818661
--- /dev/null
+++ b/macos/Tests/Terminal/IntrinsicSizeTimingTests.swift
@@ -0,0 +1,467 @@
+import AppKit
+import Combine
+import SwiftUI
+import Testing
+@testable import Ghostty
+
+// MARK: - Test helpers
+
+/// Mimics TerminalView's .frame(idealWidth:idealHeight:) pattern where
+/// values come from lastFocusedSurface?.value?.initialSize, which may
+/// be nil before @FocusedValue propagates.
+private struct OptionalIdealSizeView: View {
+    let idealWidth: CGFloat?
+    let idealHeight: CGFloat?
+    let titlebarStyle: String
+
+    var body: some View {
+        VStack(spacing: 0) {
+            Color.clear
+                .frame(idealWidth: idealWidth, idealHeight: idealHeight)
+        }
+        // Matches TerminalView line 108: hidden style extends into titlebar
+        .ignoresSafeArea(.container, edges: titlebarStyle == "hidden" ? .top : [])
+    }
+}
+
+private let minReasonableWidth: CGFloat = 100
+private let minReasonableHeight: CGFloat = 50
+
+/// All macos-titlebar-style values that map to different window nibs.
+private let allTitlebarStyles = ["native", "hidden", "transparent", "tabs"]
+
+/// Window style masks that roughly correspond to each titlebar style.
+/// In real Ghostty these come from different nib files; in tests we
+/// approximate with NSWindow style masks.
+private func styleMask(for titlebarStyle: String) -> NSWindow.StyleMask {
+    switch titlebarStyle {
+    case "hidden":
+        return [.titled, .resizable, .fullSizeContentView]
+    case "transparent", "tabs":
+        return [.titled, .resizable, .fullSizeContentView]
+    default:
+        return [.titled, .resizable]
+    }
+}
+
+// MARK: - Tests
+
+/// Regression tests for Issue #11256: incorrect intrinsicContentSize
+/// race condition in TerminalController.windowDidLoad().
+///
+/// The contentIntrinsicSize branch of DefaultSize reads
+/// intrinsicContentSize after a 40ms delay. But intrinsicContentSize
+/// depends on @FocusedValue propagating lastFocusedSurface, which is
+/// async and may not complete in time — producing a tiny window.
+///
+/// These tests cover the matrix of:
+/// - With/without window-width/window-height (initialSize set vs nil)
+/// - All macos-titlebar-style values (native, hidden, transparent, tabs)
+@Suite(.bug("https://github.com/ghostty-org/ghostty/issues/11256", "Incorrect intrinsicContentSize with native titlebar"))
+struct IntrinsicSizeTimingTests {
+
+    // MARK: - Bug: nil ideal sizes → tiny window
+
+    /// When window-width/height is set, defaultSize returns .contentIntrinsicSize.
+    /// Before @FocusedValue propagates, idealWidth/idealHeight are nil and
+    /// intrinsicContentSize returns a tiny value.
+    @Test(.bug("https://github.com/ghostty-org/ghostty/issues/11256", "intrinsicContentSize too small before @FocusedValue propagates"),
+          arguments: allTitlebarStyles)
+    func intrinsicSizeTooSmallWithNilIdealSize(titlebarStyle: String) async throws {
+        let expectedSize = NSSize(width: 600, height: 400)
+
+        // nil ideal sizes = @FocusedValue hasn't propagated lastFocusedSurface
+        let container = await TerminalViewContainer {
+            OptionalIdealSizeView(idealWidth: nil, idealHeight: nil, titlebarStyle: titlebarStyle)
+        }
+
+        // TODO: Fix #11256 — set initialContentSize on the container so
+        // intrinsicContentSize returns the correct value immediately.
+        // await MainActor.run {
+        //     container.initialContentSize = expectedSize
+        // }
+
+        let window = await NSWindow(
+            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
+            styleMask: styleMask(for: titlebarStyle),
+            backing: .buffered,
+            defer: false
+        )
+
+        await MainActor.run {
+            window.contentView = container
+        }
+
+        let size = await container.intrinsicContentSize
+
+        #expect(
+            size.width >= minReasonableWidth && size.height >= minReasonableHeight,
+            "[\(titlebarStyle)] intrinsicContentSize is too small: \(size). Expected at least \(minReasonableWidth)x\(minReasonableHeight)"
+        )
+
+        await MainActor.run { window.close() }
+    }
+
+    /// Verifies that DefaultSize.contentIntrinsicSize.apply() produces a
+    /// too-small window when intrinsicContentSize is based on nil ideal sizes.
+    @Test(.bug("https://github.com/ghostty-org/ghostty/issues/11256", "apply() sets wrong window size due to racy intrinsicContentSize"),
+          arguments: allTitlebarStyles)
+    func applyProducesWrongSizeWithNilIdealSize(titlebarStyle: String) async throws {
+        let container = await TerminalViewContainer {
+            OptionalIdealSizeView(idealWidth: nil, idealHeight: nil, titlebarStyle: titlebarStyle)
+        }
+
+        // TODO: Fix #11256 — set initialContentSize on the container.
+        // await MainActor.run {
+        //     container.initialContentSize = NSSize(width: 600, height: 400)
+        // }
+
+        let window = await NSWindow(
+            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
+            styleMask: styleMask(for: titlebarStyle),
+            backing: .buffered,
+            defer: false
+        )
+
+        let contentLayoutSize = await MainActor.run {
+            window.contentView = container
+
+            let defaultSize = TerminalController.DefaultSize.contentIntrinsicSize
+            defaultSize.apply(to: window)
+
+            // Use contentLayoutRect — the usable area excluding titlebar
+            return window.contentLayoutRect.size
+        }
+
+        #expect(
+            contentLayoutSize.width >= minReasonableWidth && contentLayoutSize.height >= minReasonableHeight,
+            "[\(titlebarStyle)] Window content layout size is too small after apply: \(contentLayoutSize)"
+        )
+
+        await MainActor.run { window.close() }
+    }
+
+    /// Replicates the exact pattern from TerminalController.windowDidLoad():
+    /// 1. Set window.contentView = container (with nil ideal sizes, simulating
+    ///    @FocusedValue not yet propagated)
+    /// 2. DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(40))
+    /// 3. Inside the callback: defaultSize.apply(to: window)
+    ///
+    /// This is the core race condition: 40ms is not enough for @FocusedValue
+    /// to propagate, so intrinsicContentSize is still tiny when apply() runs.
+    @Test(.bug("https://github.com/ghostty-org/ghostty/issues/11256", "40ms async delay reads intrinsicContentSize before @FocusedValue propagates"),
+          arguments: allTitlebarStyles)
+    func asyncAfterDelayProducesWrongSizeWithNilIdealSize(titlebarStyle: String) async throws {
+        let container = await TerminalViewContainer {
+            OptionalIdealSizeView(idealWidth: nil, idealHeight: nil, titlebarStyle: titlebarStyle)
+        }
+
+        // TODO: Fix #11256 — set initialContentSize on the container so
+        // intrinsicContentSize returns the correct value immediately,
+        // eliminating the need for the async delay.
+        // await MainActor.run {
+        //     container.initialContentSize = NSSize(width: 600, height: 400)
+        // }
+
+        let window = await NSWindow(
+            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
+            styleMask: styleMask(for: titlebarStyle),
+            backing: .buffered,
+            defer: false
+        )
+
+        // Replicate TerminalController.windowDidLoad() exactly:
+        // 1. Set contentView
+        // 2. DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(40))
+        // 3. apply() inside the callback
+        let contentLayoutSize: NSSize = await withCheckedContinuation { continuation in
+            DispatchQueue.main.async {
+                window.contentView = container
+
+                DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(40)) {
+                    let defaultSize = TerminalController.DefaultSize.contentIntrinsicSize
+                    defaultSize.apply(to: window)
+                    continuation.resume(returning: window.contentLayoutRect.size)
+                }
+            }
+        }
+
+        #expect(
+            contentLayoutSize.width >= minReasonableWidth && contentLayoutSize.height >= minReasonableHeight,
+            "[\(titlebarStyle)] After 40ms async delay, content layout size is too small: \(contentLayoutSize)"
+        )
+
+        await MainActor.run { window.close() }
+    }
+
+    /// Verifies that applying synchronously (without the async delay) also
+    /// fails when ideal sizes are nil. This proves the fix must provide a
+    /// fallback value, not just adjust timing.
+    @Test(.bug("https://github.com/ghostty-org/ghostty/issues/11256", "Synchronous apply also fails without fallback"),
+          arguments: allTitlebarStyles)
+    func synchronousApplyAlsoFailsWithNilIdealSize(titlebarStyle: String) async throws {
+        let container = await TerminalViewContainer {
+            OptionalIdealSizeView(idealWidth: nil, idealHeight: nil, titlebarStyle: titlebarStyle)
+        }
+
+        // TODO: Fix #11256 — set initialContentSize on the container.
+        // await MainActor.run {
+        //     container.initialContentSize = NSSize(width: 600, height: 400)
+        // }
+
+        let window = await NSWindow(
+            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
+            styleMask: styleMask(for: titlebarStyle),
+            backing: .buffered,
+            defer: false
+        )
+
+        let contentLayoutSize = await MainActor.run {
+            window.contentView = container
+            // Apply immediately — no async delay at all
+            let defaultSize = TerminalController.DefaultSize.contentIntrinsicSize
+            defaultSize.apply(to: window)
+            return window.contentLayoutRect.size
+        }
+
+        #expect(
+            contentLayoutSize.width >= minReasonableWidth && contentLayoutSize.height >= minReasonableHeight,
+            "[\(titlebarStyle)] Synchronous apply with nil ideal sizes: content layout size too small: \(contentLayoutSize)"
+        )
+
+        await MainActor.run { window.close() }
+    }
+
+    // MARK: - Happy path: ideal sizes available (contentIntrinsicSize path)
+
+    /// When @FocusedValue HAS propagated (ideal sizes are set), intrinsicContentSize
+    /// should be correct for every titlebar style. This is the "happy path" that
+    /// works today when the 40ms delay is sufficient.
+    @Test(arguments: allTitlebarStyles)
+    func intrinsicSizeCorrectWhenIdealSizesAvailable(titlebarStyle: String) async throws {
+        let expectedSize = NSSize(width: 600, height: 400)
+
+        let container = await TerminalViewContainer {
+            OptionalIdealSizeView(
+                idealWidth: expectedSize.width,
+                idealHeight: expectedSize.height,
+                titlebarStyle: titlebarStyle
+            )
+        }
+
+        let window = await NSWindow(
+            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
+            styleMask: styleMask(for: titlebarStyle),
+            backing: .buffered,
+            defer: false
+        )
+
+        await MainActor.run {
+            window.contentView = container
+        }
+
+        // Wait for SwiftUI layout
+        try await Task.sleep(nanoseconds: 100_000_000)
+
+        let size = await container.intrinsicContentSize
+
+        // intrinsicContentSize should be at least the ideal size.
+        // With fullSizeContentView styles it may be slightly larger
+        // due to safe area, but should never be smaller.
+        #expect(
+            size.width >= expectedSize.width && size.height >= expectedSize.height,
+            "[\(titlebarStyle)] intrinsicContentSize (\(size)) should be >= expected \(expectedSize)"
+        )
+
+        await MainActor.run { window.close() }
+    }
+
+    /// Verifies that apply() sets a correctly sized window when ideal sizes
+    /// are available, for each titlebar style.
+    @Test(arguments: allTitlebarStyles)
+    func applyProducesCorrectSizeWhenIdealSizesAvailable(titlebarStyle: String) async throws {
+        let expectedSize = NSSize(width: 600, height: 400)
+
+        let container = await TerminalViewContainer {
+            OptionalIdealSizeView(
+                idealWidth: expectedSize.width,
+                idealHeight: expectedSize.height,
+                titlebarStyle: titlebarStyle
+            )
+        }
+
+        let window = await NSWindow(
+            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
+            styleMask: styleMask(for: titlebarStyle),
+            backing: .buffered,
+            defer: false
+        )
+
+        await MainActor.run {
+            window.contentView = container
+        }
+
+        // Wait for SwiftUI layout before apply
+        try await Task.sleep(nanoseconds: 100_000_000)
+
+        let contentLayoutSize = await MainActor.run {
+            let defaultSize = TerminalController.DefaultSize.contentIntrinsicSize
+            defaultSize.apply(to: window)
+            // contentLayoutRect gives the usable area, excluding titlebar
+            return window.contentLayoutRect.size
+        }
+
+        // The usable content area should be at least the expected size.
+        #expect(
+            contentLayoutSize.width >= expectedSize.width && contentLayoutSize.height >= expectedSize.height,
+            "[\(titlebarStyle)] Content layout size (\(contentLayoutSize)) should be >= expected \(expectedSize) after apply"
+        )
+
+        await MainActor.run { window.close() }
+    }
+
+    /// Same async delay pattern but with ideal sizes available (happy path).
+    /// This should always pass — it validates the delay works when @FocusedValue
+    /// has already propagated.
+    @Test(arguments: allTitlebarStyles)
+    func asyncAfterDelayProducesCorrectSizeWhenIdealSizesAvailable(titlebarStyle: String) async throws {
+        let expectedSize = NSSize(width: 600, height: 400)
+
+        let container = await TerminalViewContainer {
+            OptionalIdealSizeView(
+                idealWidth: expectedSize.width,
+                idealHeight: expectedSize.height,
+                titlebarStyle: titlebarStyle
+            )
+        }
+
+        let window = await NSWindow(
+            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
+            styleMask: styleMask(for: titlebarStyle),
+            backing: .buffered,
+            defer: false
+        )
+
+        // Replicate the exact TerminalController.windowDidLoad() pattern
+        let contentLayoutSize: NSSize = await withCheckedContinuation { continuation in
+            DispatchQueue.main.async {
+                window.contentView = container
+
+                DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(40)) {
+                    let defaultSize = TerminalController.DefaultSize.contentIntrinsicSize
+                    defaultSize.apply(to: window)
+                    continuation.resume(returning: window.contentLayoutRect.size)
+                }
+            }
+        }
+
+        #expect(
+            contentLayoutSize.width >= expectedSize.width && contentLayoutSize.height >= expectedSize.height,
+            "[\(titlebarStyle)] Content layout size (\(contentLayoutSize)) should be >= expected \(expectedSize) after 40ms delay"
+        )
+
+        await MainActor.run { window.close() }
+    }
+
+    // MARK: - Without window-width/window-height (frame path)
+
+    /// Without window-width/height config, defaultSize returns .frame or nil
+    /// (never .contentIntrinsicSize). The window uses its initial frame.
+    /// This should work for all titlebar styles regardless of the bug.
+    @Test(arguments: allTitlebarStyles)
+    func framePathWorksWithoutWindowSize(titlebarStyle: String) async throws {
+        let expectedFrame = NSRect(x: 100, y: 100, width: 800, height: 600)
+
+        let container = await TerminalViewContainer {
+            Color.clear
+        }
+
+        let window = await NSWindow(
+            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
+            styleMask: styleMask(for: titlebarStyle),
+            backing: .buffered,
+            defer: false
+        )
+
+        await MainActor.run {
+            window.contentView = container
+            let defaultSize = TerminalController.DefaultSize.frame(expectedFrame)
+            defaultSize.apply(to: window)
+        }
+
+        let frame = await MainActor.run { window.frame }
+
+        #expect(
+            frame == expectedFrame,
+            "[\(titlebarStyle)] Window frame (\(frame)) should match expected \(expectedFrame)"
+        )
+
+        await MainActor.run { window.close() }
+    }
+
+    // MARK: - isChanged
+
+    /// Verifies isChanged correctly detects mismatch for contentIntrinsicSize
+    /// across titlebar styles when ideal sizes are available.
+    @Test(arguments: allTitlebarStyles)
+    func isChangedDetectsMismatch(titlebarStyle: String) async throws {
+        let expectedSize = NSSize(width: 600, height: 400)
+
+        let container = await TerminalViewContainer {
+            OptionalIdealSizeView(
+                idealWidth: expectedSize.width,
+                idealHeight: expectedSize.height,
+                titlebarStyle: titlebarStyle
+            )
+        }
+
+        let window = await NSWindow(
+            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
+            styleMask: styleMask(for: titlebarStyle),
+            backing: .buffered,
+            defer: false
+        )
+
+        await MainActor.run {
+            window.contentView = container
+        }
+
+        try await Task.sleep(nanoseconds: 100_000_000)
+
+        let defaultSize = TerminalController.DefaultSize.contentIntrinsicSize
+
+        let changedBefore = await MainActor.run { defaultSize.isChanged(for: window) }
+        #expect(changedBefore, "[\(titlebarStyle)] isChanged should return true before apply")
+
+        await MainActor.run { defaultSize.apply(to: window) }
+
+        let changedAfter = await MainActor.run { defaultSize.isChanged(for: window) }
+        #expect(!changedAfter, "[\(titlebarStyle)] isChanged should return false after apply")
+
+        await MainActor.run { window.close() }
+    }
+
+    /// Verifies isChanged for the .frame path.
+    @Test func isChangedForFramePath() async throws {
+        let expectedFrame = NSRect(x: 100, y: 100, width: 800, height: 600)
+
+        let window = await NSWindow(
+            contentRect: NSRect(x: 0, y: 0, width: 400, height: 300),
+            styleMask: [.titled, .resizable],
+            backing: .buffered,
+            defer: false
+        )
+
+        let defaultSize = TerminalController.DefaultSize.frame(expectedFrame)
+
+        let changedBefore = await MainActor.run { defaultSize.isChanged(for: window) }
+        #expect(changedBefore, "isChanged should return true before apply")
+
+        await MainActor.run { defaultSize.apply(to: window) }
+
+        let changedAfter = await MainActor.run { defaultSize.isChanged(for: window) }
+        #expect(!changedAfter, "isChanged should return false after apply")
+
+        await MainActor.run { window.close() }
+    }
+}

From a6cd1b08af240e7be0b07163d78dac5efa6b1752 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Tue, 10 Mar 2026 15:35:49 +0100
Subject: [PATCH 090/391] macOS: fix intrinsicContentSize race in windowDidLoad
 (#11256)

Add initialContentSize fallback on TerminalViewContainer so
intrinsicContentSize returns the correct value immediately,
without waiting for @FocusedValue to propagate. This removes
the need for the DispatchQueue.main.asyncAfter 40ms delay.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../Terminal/TerminalController.swift         | 29 ++++++++--------
 .../Terminal/TerminalViewContainer.swift      | 20 ++++++++---
 .../Terminal/IntrinsicSizeTimingTests.swift   | 33 ++++++++-----------
 3 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index 7a5bd1d4b..0c1bd38ad 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -1038,27 +1038,26 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         }
 
         // Initialize our content view to the SwiftUI root
-        window.contentView = TerminalViewContainer {
+        let container = TerminalViewContainer {
             TerminalView(ghostty: ghostty, viewModel: self, delegate: self)
         }
 
+        // Set the initial content size on the container so that
+        // intrinsicContentSize returns the correct value immediately,
+        // without waiting for @FocusedValue to propagate through the
+        // SwiftUI focus chain.
+        container.initialContentSize = focusedSurface?.initialSize
+
+        window.contentView = container
+
         // If we have a default size, we want to apply it.
         if let defaultSize {
-            switch defaultSize {
-            case .frame:
-                // Frames can be applied immediately
-                defaultSize.apply(to: window)
+            defaultSize.apply(to: window)
 
-            case .contentIntrinsicSize:
-                // Content intrinsic size requires a short delay so that AppKit
-                // can layout our SwiftUI views.
-                DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(40)) { [weak self, weak window] in
-                    guard let self, let window else { return }
-                    defaultSize.apply(to: window)
-                    if let screen = window.screen ?? NSScreen.main {
-                        let frame = self.adjustForWindowPosition(frame: window.frame, on: screen)
-                        window.setFrameOrigin(frame.origin)
-                    }
+            if case .contentIntrinsicSize = defaultSize {
+                if let screen = window.screen ?? NSScreen.main {
+                    let frame = self.adjustForWindowPosition(frame: window.frame, on: screen)
+                    window.setFrameOrigin(frame.origin)
                 }
             }
         }
diff --git a/macos/Sources/Features/Terminal/TerminalViewContainer.swift b/macos/Sources/Features/Terminal/TerminalViewContainer.swift
index bd696a2bf..dd0190c4c 100644
--- a/macos/Sources/Features/Terminal/TerminalViewContainer.swift
+++ b/macos/Sources/Features/Terminal/TerminalViewContainer.swift
@@ -33,11 +33,23 @@ class TerminalViewContainer: NSView {
         fatalError("init(coder:) has not been implemented")
     }
 
-    /// To make ``TerminalController/DefaultSize/contentIntrinsicSize``
-    /// work in ``TerminalController/windowDidLoad()``,
-    /// we override this to provide the correct size.
+    /// The initial content size to use as a fallback before the SwiftUI
+    /// view hierarchy has completed layout (i.e. before @FocusedValue
+    /// propagates `lastFocusedSurface`). Once the hosting view reports
+    /// a valid intrinsic size, this fallback is no longer used.
+    var initialContentSize: NSSize?
+
     override var intrinsicContentSize: NSSize {
-        terminalView.intrinsicContentSize
+        let hostingSize = terminalView.intrinsicContentSize
+        // The hosting view returns a valid size once SwiftUI has laid out
+        // with the correct idealWidth/idealHeight. Before that (when
+        // @FocusedValue hasn't propagated), it returns a tiny default.
+        // Fall back to initialContentSize in that case.
+        if let initialContentSize,
+           hostingSize.width < initialContentSize.width || hostingSize.height < initialContentSize.height {
+            return initialContentSize
+        }
+        return hostingSize
     }
 
     private func setup() {
diff --git a/macos/Tests/Terminal/IntrinsicSizeTimingTests.swift b/macos/Tests/Terminal/IntrinsicSizeTimingTests.swift
index ef7818661..640f2dbdb 100644
--- a/macos/Tests/Terminal/IntrinsicSizeTimingTests.swift
+++ b/macos/Tests/Terminal/IntrinsicSizeTimingTests.swift
@@ -75,11 +75,11 @@ struct IntrinsicSizeTimingTests {
             OptionalIdealSizeView(idealWidth: nil, idealHeight: nil, titlebarStyle: titlebarStyle)
         }
 
-        // TODO: Fix #11256 — set initialContentSize on the container so
-        // intrinsicContentSize returns the correct value immediately.
-        // await MainActor.run {
-        //     container.initialContentSize = expectedSize
-        // }
+        // Set initialContentSize so intrinsicContentSize returns the
+        // correct value immediately, without waiting for @FocusedValue.
+        await MainActor.run {
+            container.initialContentSize = expectedSize
+        }
 
         let window = await NSWindow(
             contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
@@ -111,10 +111,9 @@ struct IntrinsicSizeTimingTests {
             OptionalIdealSizeView(idealWidth: nil, idealHeight: nil, titlebarStyle: titlebarStyle)
         }
 
-        // TODO: Fix #11256 — set initialContentSize on the container.
-        // await MainActor.run {
-        //     container.initialContentSize = NSSize(width: 600, height: 400)
-        // }
+        await MainActor.run {
+            container.initialContentSize = NSSize(width: 600, height: 400)
+        }
 
         let window = await NSWindow(
             contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
@@ -156,12 +155,9 @@ struct IntrinsicSizeTimingTests {
             OptionalIdealSizeView(idealWidth: nil, idealHeight: nil, titlebarStyle: titlebarStyle)
         }
 
-        // TODO: Fix #11256 — set initialContentSize on the container so
-        // intrinsicContentSize returns the correct value immediately,
-        // eliminating the need for the async delay.
-        // await MainActor.run {
-        //     container.initialContentSize = NSSize(width: 600, height: 400)
-        // }
+        await MainActor.run {
+            container.initialContentSize = NSSize(width: 600, height: 400)
+        }
 
         let window = await NSWindow(
             contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
@@ -204,10 +200,9 @@ struct IntrinsicSizeTimingTests {
             OptionalIdealSizeView(idealWidth: nil, idealHeight: nil, titlebarStyle: titlebarStyle)
         }
 
-        // TODO: Fix #11256 — set initialContentSize on the container.
-        // await MainActor.run {
-        //     container.initialContentSize = NSSize(width: 600, height: 400)
-        // }
+        await MainActor.run {
+            container.initialContentSize = NSSize(width: 600, height: 400)
+        }
 
         let window = await NSWindow(
             contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),

From 1592cafa32e99119cee0b074fde3f50070ac3dac Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 10 Mar 2026 08:48:19 -0700
Subject: [PATCH 091/391] Update AGENTS.md

---
 AGENTS.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AGENTS.md b/AGENTS.md
index ff8c289c8..794115c58 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -4,6 +4,7 @@ A file for [guiding coding agents](https://agents.md/).
 
 ## Commands
 
+- Use `nix develop -c` with all commands to ensure the Nix version is used.
 - **Build:** `zig build`
   - If you're on macOS and don't need to build the macOS app, use
     `-Demit-macos-app=false` to skip building the app bundle and speed up
@@ -13,7 +14,7 @@ A file for [guiding coding agents](https://agents.md/).
     test suite is slow to run.
 - **Test filter (Zig)**: `zig build test -Dtest-filter=<test name>`
 - **Formatting (Zig)**: `zig fmt .`
-- **Formatting (Swift)**: `swiftlint lint --fix`
+- **Formatting (Swift)**: `swiftlint lint --strict --fix`
 - **Formatting (other)**: `prettier -w .`
 
 ## Directory Structure

From 7629130fb4f66262684d4b75d549b522d5943f59 Mon Sep 17 00:00:00 2001
From: chronologos <yiyantay@gmail.com>
Date: Tue, 10 Mar 2026 06:58:44 -0700
Subject: [PATCH 092/391] macOS: restore keyboard focus after inline tab title
 edit

After finishing an inline tab title edit (via keybind or double-click),
`TabTitleEditor.finishEditing()` calls `makeFirstResponder(nil)` to
clear focus from the text field, leaving the window itself as first
responder. No code path restores focus to the terminal surface, so all
keyboard input is lost until the user clicks into a pane.

Add a `tabTitleEditorDidFinishEditing` delegate callback that fires
after every edit (commit or cancel). TerminalWindow implements it by
calling `makeFirstResponder(focusedSurface)` to hand focus back to the
terminal.

Fixes https://github.com/ghostty-org/ghostty/discussions/11315

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../Terminal/Window Styles/TerminalWindow.swift  |  9 +++++++++
 macos/Sources/Helpers/TabTitleEditor.swift       | 16 ++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift
index dc744180d..c580b4cb8 100644
--- a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
+++ b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
@@ -835,4 +835,13 @@ extension TerminalWindow: TabTitleEditorDelegate {
         guard let targetController = targetWindow.windowController as? BaseTerminalController else { return }
         targetController.promptTabTitle()
     }
+
+    func tabTitleEditor(_ editor: TabTitleEditor, didFinishEditing targetWindow: NSWindow) {
+        // After inline editing, the first responder is the window itself.
+        // Restore focus to the terminal surface so keyboard input works.
+        guard let controller = windowController as? BaseTerminalController,
+              let focusedSurface = controller.focusedSurface
+        else { return }
+        makeFirstResponder(focusedSurface)
+    }
 }
diff --git a/macos/Sources/Helpers/TabTitleEditor.swift b/macos/Sources/Helpers/TabTitleEditor.swift
index 0a1efae32..570be1bf4 100644
--- a/macos/Sources/Helpers/TabTitleEditor.swift
+++ b/macos/Sources/Helpers/TabTitleEditor.swift
@@ -26,6 +26,12 @@ protocol TabTitleEditorDelegate: AnyObject {
         _ editor: TabTitleEditor,
         performFallbackRenameFor targetWindow: NSWindow
     )
+
+    /// Called after inline editing finishes (whether committed or cancelled).
+    /// Use this to restore focus to the appropriate responder.
+    func tabTitleEditor(
+        _ editor: TabTitleEditor,
+        didFinishEditing targetWindow: NSWindow)
 }
 
 /// Handles inline tab title editing for native AppKit window tabs.
@@ -212,8 +218,14 @@ final class TabTitleEditor: NSObject, NSTextFieldDelegate {
         previousTabState = nil
 
         // Delegate owns title persistence semantics (including empty-title handling).
-        guard commit, let targetWindow else { return }
-        delegate?.tabTitleEditor(self, didCommitTitle: editedTitle, for: targetWindow)
+        guard let targetWindow else { return }
+
+        if commit {
+            delegate?.tabTitleEditor(self, didCommitTitle: editedTitle, for: targetWindow)
+        }
+
+        // Notify delegate that editing is done so it can restore focus.
+        delegate?.tabTitleEditor(self, didFinishEditing: targetWindow)
     }
 
     /// Chooses an editor frame that aligns with the tab title within the tab button.

From de0f2ab22d941e270a4ba259ef2522f71bb84247 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Mon, 9 Mar 2026 15:25:13 +0100
Subject: [PATCH 093/391] macos:  add enum type for macos-titlebar-style

---
 .../Terminal/TerminalController.swift         | 13 ++++----
 .../Features/Terminal/TerminalView.swift      |  2 +-
 .../Window Styles/TerminalWindow.swift        |  6 ++--
 .../TransparentTitlebarTerminalWindow.swift   |  4 +--
 macos/Sources/Ghostty/Ghostty.Config.swift    | 11 +++++--
 .../Terminal/IntrinsicSizeTimingTests.swift   | 32 +++++++++----------
 6 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index 0c1bd38ad..20b51ff36 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -19,10 +19,10 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         }
 
         let nib = switch config.macosTitlebarStyle {
-        case "native": "Terminal"
-        case "hidden": "TerminalHiddenTitlebar"
-        case "transparent": "TerminalTransparentTitlebar"
-        case "tabs":
+        case .native: "Terminal"
+        case .hidden: "TerminalHiddenTitlebar"
+        case .transparent: "TerminalTransparentTitlebar"
+        case .tabs:
 #if compiler(>=6.2)
             if #available(macOS 26.0, *) {
                 "TerminalTabsTitlebarTahoe"
@@ -32,7 +32,6 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
 #else
             "TerminalTabsTitlebarVentura"
 #endif
-        default: defaultValue
         }
 
         return nib
@@ -1537,7 +1536,7 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
     struct DerivedConfig {
         let backgroundColor: Color
         let macosWindowButtons: Ghostty.MacOSWindowButtons
-        let macosTitlebarStyle: String
+        let macosTitlebarStyle: Ghostty.Config.MacOSTitlebarStyle
         let maximize: Bool
         let windowPositionX: Int16?
         let windowPositionY: Int16?
@@ -1545,7 +1544,7 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         init() {
             self.backgroundColor = Color(NSColor.windowBackgroundColor)
             self.macosWindowButtons = .visible
-            self.macosTitlebarStyle = "system"
+            self.macosTitlebarStyle = .default
             self.maximize = false
             self.windowPositionX = nil
             self.windowPositionY = nil
diff --git a/macos/Sources/Features/Terminal/TerminalView.swift b/macos/Sources/Features/Terminal/TerminalView.swift
index 697009579..b6e1c637c 100644
--- a/macos/Sources/Features/Terminal/TerminalView.swift
+++ b/macos/Sources/Features/Terminal/TerminalView.swift
@@ -105,7 +105,7 @@ struct TerminalView<ViewModel: TerminalViewModel>: View {
                                idealHeight: lastFocusedSurface?.value?.initialSize?.height)
                 }
                 // Ignore safe area to extend up in to the titlebar region if we have the "hidden" titlebar style
-                .ignoresSafeArea(.container, edges: ghostty.config.macosTitlebarStyle == "hidden" ? .top : [])
+                .ignoresSafeArea(.container, edges: ghostty.config.macosTitlebarStyle == .hidden ? .top : [])
 
                 if let surfaceView = lastFocusedSurface?.value {
                     TerminalCommandPaletteView(
diff --git a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift
index c580b4cb8..60e96bb4d 100644
--- a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
+++ b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
@@ -588,7 +588,7 @@ class TerminalWindow: NSWindow {
         let backgroundColor: NSColor
         let backgroundOpacity: Double
         let macosWindowButtons: Ghostty.MacOSWindowButtons
-        let macosTitlebarStyle: String
+        let macosTitlebarStyle: Ghostty.Config.MacOSTitlebarStyle
         let windowCornerRadius: CGFloat
 
         init() {
@@ -597,7 +597,7 @@ class TerminalWindow: NSWindow {
             self.backgroundOpacity = 1
             self.macosWindowButtons = .visible
             self.backgroundBlur = .disabled
-            self.macosTitlebarStyle = "transparent"
+            self.macosTitlebarStyle = .default
             self.windowCornerRadius = 16
         }
 
@@ -613,7 +613,7 @@ class TerminalWindow: NSWindow {
             // Native, transparent, and hidden styles use 16pt radius
             // Tabs style uses 20pt radius
             switch config.macosTitlebarStyle {
-            case "tabs":
+            case .tabs:
                 self.windowCornerRadius = 20
             default:
                 self.windowCornerRadius = 16
diff --git a/macos/Sources/Features/Terminal/Window Styles/TransparentTitlebarTerminalWindow.swift b/macos/Sources/Features/Terminal/Window Styles/TransparentTitlebarTerminalWindow.swift
index a547d5286..c0e506c34 100644
--- a/macos/Sources/Features/Terminal/Window Styles/TransparentTitlebarTerminalWindow.swift	
+++ b/macos/Sources/Features/Terminal/Window Styles/TransparentTitlebarTerminalWindow.swift	
@@ -92,8 +92,8 @@ class TransparentTitlebarTerminalWindow: TerminalWindow {
             // For glass background styles, use a transparent titlebar to let the glass effect show through
             // Only apply this for transparent and tabs titlebar styles
             let isGlassStyle = derivedConfig.backgroundBlur.isGlassStyle
-            let isTransparentTitlebar = derivedConfig.macosTitlebarStyle == "transparent" ||
-                                       derivedConfig.macosTitlebarStyle == "tabs"
+            let isTransparentTitlebar = derivedConfig.macosTitlebarStyle == .transparent ||
+            derivedConfig.macosTitlebarStyle == .tabs
 
             titlebarView.layer?.backgroundColor = (isGlassStyle && isTransparentTitlebar)
                 ? NSColor.clear.cgColor
diff --git a/macos/Sources/Ghostty/Ghostty.Config.swift b/macos/Sources/Ghostty/Ghostty.Config.swift
index 239f458e3..4a36583d5 100644
--- a/macos/Sources/Ghostty/Ghostty.Config.swift
+++ b/macos/Sources/Ghostty/Ghostty.Config.swift
@@ -354,14 +354,14 @@ extension Ghostty {
             return MacOSWindowButtons(rawValue: str) ?? defaultValue
         }
 
-        var macosTitlebarStyle: String {
-            let defaultValue = "transparent"
+        var macosTitlebarStyle: MacOSTitlebarStyle {
+            let defaultValue = MacOSTitlebarStyle.transparent
             guard let config = self.config else { return defaultValue }
             var v: UnsafePointer<Int8>?
             let key = "macos-titlebar-style"
             guard ghostty_config_get(config, &v, key, UInt(key.lengthOfBytes(using: .utf8))) else { return defaultValue }
             guard let ptr = v else { return defaultValue }
-            return String(cString: ptr)
+            return MacOSTitlebarStyle(rawValue: String(cString: ptr)) ?? defaultValue
         }
 
         var macosTitlebarProxyIcon: MacOSTitlebarProxyIcon {
@@ -906,4 +906,9 @@ extension Ghostty.Config {
         static let bell = NotifyOnCommandFinishAction(rawValue: 1 << 0)
         static let notify = NotifyOnCommandFinishAction(rawValue: 1 << 1)
     }
+
+    enum MacOSTitlebarStyle: String {
+        static let `default` = MacOSTitlebarStyle.transparent
+        case native, transparent, tabs, hidden
+    }
 }
diff --git a/macos/Tests/Terminal/IntrinsicSizeTimingTests.swift b/macos/Tests/Terminal/IntrinsicSizeTimingTests.swift
index 640f2dbdb..7bce61bdc 100644
--- a/macos/Tests/Terminal/IntrinsicSizeTimingTests.swift
+++ b/macos/Tests/Terminal/IntrinsicSizeTimingTests.swift
@@ -12,7 +12,7 @@ import Testing
 private struct OptionalIdealSizeView: View {
     let idealWidth: CGFloat?
     let idealHeight: CGFloat?
-    let titlebarStyle: String
+    let titlebarStyle: Ghostty.Config.MacOSTitlebarStyle
 
     var body: some View {
         VStack(spacing: 0) {
@@ -20,7 +20,7 @@ private struct OptionalIdealSizeView: View {
                 .frame(idealWidth: idealWidth, idealHeight: idealHeight)
         }
         // Matches TerminalView line 108: hidden style extends into titlebar
-        .ignoresSafeArea(.container, edges: titlebarStyle == "hidden" ? .top : [])
+        .ignoresSafeArea(.container, edges: titlebarStyle == .hidden ? .top : [])
     }
 }
 
@@ -28,18 +28,18 @@ private let minReasonableWidth: CGFloat = 100
 private let minReasonableHeight: CGFloat = 50
 
 /// All macos-titlebar-style values that map to different window nibs.
-private let allTitlebarStyles = ["native", "hidden", "transparent", "tabs"]
+private let allTitlebarStyles: [Ghostty.Config.MacOSTitlebarStyle] = [.native, .hidden, .transparent, .tabs]
 
 /// Window style masks that roughly correspond to each titlebar style.
 /// In real Ghostty these come from different nib files; in tests we
 /// approximate with NSWindow style masks.
-private func styleMask(for titlebarStyle: String) -> NSWindow.StyleMask {
+private func styleMask(for titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) -> NSWindow.StyleMask {
     switch titlebarStyle {
-    case "hidden":
+    case .hidden:
         return [.titled, .resizable, .fullSizeContentView]
-    case "transparent", "tabs":
+    case .transparent, .tabs:
         return [.titled, .resizable, .fullSizeContentView]
-    default:
+    case .native:
         return [.titled, .resizable]
     }
 }
@@ -67,7 +67,7 @@ struct IntrinsicSizeTimingTests {
     /// intrinsicContentSize returns a tiny value.
     @Test(.bug("https://github.com/ghostty-org/ghostty/issues/11256", "intrinsicContentSize too small before @FocusedValue propagates"),
           arguments: allTitlebarStyles)
-    func intrinsicSizeTooSmallWithNilIdealSize(titlebarStyle: String) async throws {
+    func intrinsicSizeTooSmallWithNilIdealSize(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
         let expectedSize = NSSize(width: 600, height: 400)
 
         // nil ideal sizes = @FocusedValue hasn't propagated lastFocusedSurface
@@ -106,7 +106,7 @@ struct IntrinsicSizeTimingTests {
     /// too-small window when intrinsicContentSize is based on nil ideal sizes.
     @Test(.bug("https://github.com/ghostty-org/ghostty/issues/11256", "apply() sets wrong window size due to racy intrinsicContentSize"),
           arguments: allTitlebarStyles)
-    func applyProducesWrongSizeWithNilIdealSize(titlebarStyle: String) async throws {
+    func applyProducesWrongSizeWithNilIdealSize(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
         let container = await TerminalViewContainer {
             OptionalIdealSizeView(idealWidth: nil, idealHeight: nil, titlebarStyle: titlebarStyle)
         }
@@ -150,7 +150,7 @@ struct IntrinsicSizeTimingTests {
     /// to propagate, so intrinsicContentSize is still tiny when apply() runs.
     @Test(.bug("https://github.com/ghostty-org/ghostty/issues/11256", "40ms async delay reads intrinsicContentSize before @FocusedValue propagates"),
           arguments: allTitlebarStyles)
-    func asyncAfterDelayProducesWrongSizeWithNilIdealSize(titlebarStyle: String) async throws {
+    func asyncAfterDelayProducesWrongSizeWithNilIdealSize(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
         let container = await TerminalViewContainer {
             OptionalIdealSizeView(idealWidth: nil, idealHeight: nil, titlebarStyle: titlebarStyle)
         }
@@ -195,7 +195,7 @@ struct IntrinsicSizeTimingTests {
     /// fallback value, not just adjust timing.
     @Test(.bug("https://github.com/ghostty-org/ghostty/issues/11256", "Synchronous apply also fails without fallback"),
           arguments: allTitlebarStyles)
-    func synchronousApplyAlsoFailsWithNilIdealSize(titlebarStyle: String) async throws {
+    func synchronousApplyAlsoFailsWithNilIdealSize(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
         let container = await TerminalViewContainer {
             OptionalIdealSizeView(idealWidth: nil, idealHeight: nil, titlebarStyle: titlebarStyle)
         }
@@ -233,7 +233,7 @@ struct IntrinsicSizeTimingTests {
     /// should be correct for every titlebar style. This is the "happy path" that
     /// works today when the 40ms delay is sufficient.
     @Test(arguments: allTitlebarStyles)
-    func intrinsicSizeCorrectWhenIdealSizesAvailable(titlebarStyle: String) async throws {
+    func intrinsicSizeCorrectWhenIdealSizesAvailable(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
         let expectedSize = NSSize(width: 600, height: 400)
 
         let container = await TerminalViewContainer {
@@ -274,7 +274,7 @@ struct IntrinsicSizeTimingTests {
     /// Verifies that apply() sets a correctly sized window when ideal sizes
     /// are available, for each titlebar style.
     @Test(arguments: allTitlebarStyles)
-    func applyProducesCorrectSizeWhenIdealSizesAvailable(titlebarStyle: String) async throws {
+    func applyProducesCorrectSizeWhenIdealSizesAvailable(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
         let expectedSize = NSSize(width: 600, height: 400)
 
         let container = await TerminalViewContainer {
@@ -319,7 +319,7 @@ struct IntrinsicSizeTimingTests {
     /// This should always pass — it validates the delay works when @FocusedValue
     /// has already propagated.
     @Test(arguments: allTitlebarStyles)
-    func asyncAfterDelayProducesCorrectSizeWhenIdealSizesAvailable(titlebarStyle: String) async throws {
+    func asyncAfterDelayProducesCorrectSizeWhenIdealSizesAvailable(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
         let expectedSize = NSSize(width: 600, height: 400)
 
         let container = await TerminalViewContainer {
@@ -364,7 +364,7 @@ struct IntrinsicSizeTimingTests {
     /// (never .contentIntrinsicSize). The window uses its initial frame.
     /// This should work for all titlebar styles regardless of the bug.
     @Test(arguments: allTitlebarStyles)
-    func framePathWorksWithoutWindowSize(titlebarStyle: String) async throws {
+    func framePathWorksWithoutWindowSize(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
         let expectedFrame = NSRect(x: 100, y: 100, width: 800, height: 600)
 
         let container = await TerminalViewContainer {
@@ -399,7 +399,7 @@ struct IntrinsicSizeTimingTests {
     /// Verifies isChanged correctly detects mismatch for contentIntrinsicSize
     /// across titlebar styles when ideal sizes are available.
     @Test(arguments: allTitlebarStyles)
-    func isChangedDetectsMismatch(titlebarStyle: String) async throws {
+    func isChangedDetectsMismatch(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
         let expectedSize = NSSize(width: 600, height: 400)
 
         let container = await TerminalViewContainer {

From d9039eb85a6f12ff7de205c116d978482c80bdab Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 10 Mar 2026 09:20:22 -0700
Subject: [PATCH 094/391] config: don't double load app support path on macOS

Fixes #11323
---
 src/config/Config.zig | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/config/Config.zig b/src/config/Config.zig
index 527b0d329..413624912 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -4013,10 +4013,28 @@ pub fn loadDefaultFiles(self: *Config, alloc: Allocator) !void {
         const app_support_path = try file_load.preferredAppSupportPath(alloc);
         defer alloc.free(app_support_path);
         const app_support_loaded: bool = loaded: {
-            const legacy_app_support_action = self.loadOptionalFile(alloc, legacy_app_support_path);
-            const app_support_action = self.loadOptionalFile(alloc, app_support_path);
+            const legacy_app_support_action = self.loadOptionalFile(
+                alloc,
+                legacy_app_support_path,
+            );
+
+            // The app support path and legacy may be the same, since we
+            // use the `preferred` call above. If its the same, avoid
+            // a double-load.
+            const app_support_action: OptionalFileAction = if (!std.mem.eql(
+                u8,
+                legacy_app_support_path,
+                app_support_path,
+            )) self.loadOptionalFile(
+                alloc,
+                app_support_path,
+            ) else .not_found;
+
             if (app_support_action != .not_found and legacy_app_support_action != .not_found) {
-                log.warn("both config files `{s}` and `{s}` exist.", .{ legacy_app_support_path, app_support_path });
+                log.warn(
+                    "both config files `{s}` and `{s}` exist.",
+                    .{ legacy_app_support_path, app_support_path },
+                );
                 log.warn("loading them both in that order", .{});
                 break :loaded true;
             }

From 4e24adf7177946af7f3d0e367d94fc8e2dead133 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 10 Mar 2026 09:40:20 -0700
Subject: [PATCH 095/391] ci: skip xcode tests for freetype build

---
 .github/workflows/test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cbd985558..e311089e2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -696,9 +696,11 @@ jobs:
         id: deps
         run: nix build -L .#deps && echo "deps=$(readlink ./result)" >> $GITHUB_OUTPUT
 
+      # We run tests with an empty test filter so it runs all unit tests
+      # but skips Xcode tests
       - name: Test All
         run: |
-          nix develop -c zig build test --system ${{ steps.deps.outputs.deps }} -Drenderer=metal -Dfont-backend=coretext_freetype
+          nix develop -c zig build test --system ${{ steps.deps.outputs.deps }} -Drenderer=metal -Dfont-backend=coretext_freetype -Dtest-filter=""
 
       - name: Build All
         run: |

From 6092c299d55cd24ec72d3d5d2365279645c30ff3 Mon Sep 17 00:00:00 2001
From: Selman Kayrancioglu <selmankayrancioglu@gmail.com>
Date: Mon, 9 Mar 2026 01:00:59 +0300
Subject: [PATCH 096/391] macos: reset mouse state on focus loss to prevent
 phantom drag

Fixes phantom mouse drag/selection when switching splits or apps.
The suppressNextLeftMouseUp flag and core mouse click_state were not
being reset on focus transitions, causing stale state that led to
unexpected drag behavior.

- Reset suppressNextLeftMouseUp in focusDidChange when losing focus
- Defensively reset the flag when processing normal clicks
- Reset core mouse.click_state and left_click_count on focus loss
---
 .../Surface View/SurfaceView_AppKit.swift       | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift b/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift
index 060b7990b..a37feb9a8 100644
--- a/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift	
+++ b/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift	
@@ -438,6 +438,15 @@ extension Ghostty {
             guard let surface = self.surface else { return }
             guard self.focused != focused else { return }
             self.focused = focused
+
+            // If we lost our focus then remove the mouse event suppression so
+            // our mouse release event leaving the surface can properly be
+            // sent to stop things like mouse selection.
+            if !focused {
+                suppressNextLeftMouseUp = false
+            }
+
+            // Notify libghostty
             ghostty_surface_set_focus(surface, focused)
 
             // Update our secure input state if we are a password input
@@ -648,9 +657,15 @@ extension Ghostty {
             let location = convert(event.locationInWindow, from: nil)
             guard hitTest(location) == self else { return event }
 
+            // We always assume that we're resetting our mouse suppression
+            // unless we see the specific scenario below to set it.
+            suppressNextLeftMouseUp = false
+
             // If we're already the first responder then no focus transfer is
             // happening, so the click should continue as normal.
-            guard window.firstResponder !== self else { return event }
+            guard window.firstResponder !== self else {
+                return event
+            }
 
             // If our window/app is already focused, then this click is only
             // being used to transfer split focus. Consume it so it does not

From aaad43c23569e75929d611a13483e96cec6b1060 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 10 Mar 2026 10:04:44 -0700
Subject: [PATCH 097/391] macos: make paste_from_clipboard performable on macos

Fixes #10751
---
 include/ghostty.h                       |  2 +-
 macos/Sources/Ghostty/Ghostty.App.swift | 25 +++++++++++++++----------
 src/apprt/embedded.zig                  | 17 ++++++++++-------
 src/config/Config.zig                   |  5 +++--
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/include/ghostty.h b/include/ghostty.h
index 19a200f10..afd89542f 100644
--- a/include/ghostty.h
+++ b/include/ghostty.h
@@ -968,7 +968,7 @@ typedef struct {
 } ghostty_action_s;
 
 typedef void (*ghostty_runtime_wakeup_cb)(void*);
-typedef void (*ghostty_runtime_read_clipboard_cb)(void*,
+typedef bool (*ghostty_runtime_read_clipboard_cb)(void*,
                                                   ghostty_clipboard_e,
                                                   void*);
 typedef void (*ghostty_runtime_confirm_read_clipboard_cb)(
diff --git a/macos/Sources/Ghostty/Ghostty.App.swift b/macos/Sources/Ghostty/Ghostty.App.swift
index 82b3ad35c..d57c2ea11 100644
--- a/macos/Sources/Ghostty/Ghostty.App.swift
+++ b/macos/Sources/Ghostty/Ghostty.App.swift
@@ -269,7 +269,9 @@ extension Ghostty {
             _ userdata: UnsafeMutableRawPointer?,
             location: ghostty_clipboard_e,
             state: UnsafeMutableRawPointer?
-        ) {}
+        ) -> Bool {
+            return false
+        }
 
         static func confirmReadClipboard(
             _ userdata: UnsafeMutableRawPointer?,
@@ -321,20 +323,23 @@ extension Ghostty {
             ])
         }
 
-        static func readClipboard(_ userdata: UnsafeMutableRawPointer?, location: ghostty_clipboard_e, state: UnsafeMutableRawPointer?) {
-            // If we don't even have a surface, something went terrible wrong so we have
-            // to leak "state".
+        static func readClipboard(
+            _ userdata: UnsafeMutableRawPointer?,
+            location: ghostty_clipboard_e,
+            state: UnsafeMutableRawPointer?
+        ) -> Bool {
             let surfaceView = self.surfaceUserdata(from: userdata)
-            guard let surface = surfaceView.surface else { return }
+            guard let surface = surfaceView.surface else { return false }
 
             // Get our pasteboard
-            guard let pasteboard = NSPasteboard.ghostty(location) else {
-                return completeClipboardRequest(surface, data: "", state: state)
-            }
+            guard let pasteboard = NSPasteboard.ghostty(location) else { return false }
+
+            // Return false if there is no text-like clipboard content so
+            // performable paste bindings can pass through to the terminal.
+            guard let str = pasteboard.getOpinionatedStringContents() else { return false }
 
-            // Get our string
-            let str = pasteboard.getOpinionatedStringContents() ?? ""
             completeClipboardRequest(surface, data: str, state: state)
+            return true
         }
 
         static func confirmReadClipboard(
diff --git a/src/apprt/embedded.zig b/src/apprt/embedded.zig
index 54d5472c6..c629be498 100644
--- a/src/apprt/embedded.zig
+++ b/src/apprt/embedded.zig
@@ -50,10 +50,11 @@ pub const App = struct {
         /// Callback called to handle an action.
         action: *const fn (*App, apprt.Target.C, apprt.Action.C) callconv(.c) bool,
 
-        /// Read the clipboard value. The return value must be preserved
-        /// by the host until the next call. If there is no valid clipboard
-        /// value then this should return null.
-        read_clipboard: *const fn (SurfaceUD, c_int, *apprt.ClipboardRequest) callconv(.c) void,
+        /// Read the clipboard value. Returns true if the clipboard request
+        /// was started and complete_clipboard_request may be called with the
+        /// given state pointer. Returns false if the clipboard request couldn't
+        /// be started (such as when no text is available for a paste request).
+        read_clipboard: *const fn (SurfaceUD, c_int, *apprt.ClipboardRequest) callconv(.c) bool,
 
         /// This may be called after a read clipboard call to request
         /// confirmation that the clipboard value is safe to read. The embedder
@@ -672,14 +673,16 @@ pub const Surface = struct {
         errdefer alloc.destroy(state_ptr);
         state_ptr.* = state;
 
-        self.app.opts.read_clipboard(
+        const started = self.app.opts.read_clipboard(
             self.userdata,
             @intCast(@intFromEnum(clipboard_type)),
             state_ptr,
         );
+        if (!started) {
+            alloc.destroy(state_ptr);
+            return false;
+        }
 
-        // Embedded apprt can't synchronously check clipboard content types,
-        // so we always return true to indicate the request was started.
         return true;
     }
 
diff --git a/src/config/Config.zig b/src/config/Config.zig
index 413624912..e31fbc011 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -6332,10 +6332,11 @@ pub const Keybinds = struct {
                 .{ .copy_to_clipboard = .mixed },
                 .{ .performable = true },
             );
-            try self.set.put(
+            try self.set.putFlags(
                 alloc,
                 .{ .key = .{ .unicode = 'v' }, .mods = mods },
-                .{ .paste_from_clipboard = {} },
+                .paste_from_clipboard,
+                .{ .performable = true },
             );
         }
 

From f8d7876203ad65572cd085ff89afb758252217cb Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Tue, 10 Mar 2026 17:31:32 +0000
Subject: [PATCH 098/391] Update VOUCHED list (#11329)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11313#issuecomment-4033213188)
from @mitchellh.

Vouch: @VaughanAndrews

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 7ba09148b..dfaea1326 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -158,6 +158,7 @@ tristan957
 tweedbeetle
 uhojin
 uzaaft
+vaughanandrews
 vlsi
 yamshta
 zenyr

From 53637ec7b2b91da8e19b79cd755874b3fc2cf0db Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 10 Mar 2026 10:38:43 -0700
Subject: [PATCH 099/391] fix jump_to_prompt forward behavior for multiline
 prompts

Fixes #11330.

When jumping forward from prompt content, skip prompt continuation rows so a
multiline prompt is treated as a single prompt block.
---
 src/terminal/PageList.zig | 70 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 65 insertions(+), 5 deletions(-)

diff --git a/src/terminal/PageList.zig b/src/terminal/PageList.zig
index b6d53beee..6e39428db 100644
--- a/src/terminal/PageList.zig
+++ b/src/terminal/PageList.zig
@@ -2682,11 +2682,22 @@ fn scrollPrompt(self: *PageList, delta: isize) void {
     // delta so that we don't land back on our current viewport.
     const start_pin = start: {
         const tl = self.getTopLeft(.viewport);
-        const adjusted: ?Pin = if (delta > 0)
-            tl.down(1)
-        else
-            tl.up(1);
-        break :start adjusted orelse return;
+
+        // If we're moving up we can just move the viewport up because
+        // promptIterator handles jumpting to the start of prompts.
+        if (delta <= 0) break :start tl.up(1) orelse return;
+
+        // If we're moving down and we're presently at some kind of
+        // prompt, we need to skip all the continuation lines because
+        // promptIterator can't know if we're cutoff or continuing.
+        var adjusted: Pin = tl.down(1) orelse return;
+        if (tl.rowAndCell().row.semantic_prompt != .none) skip: {
+            while (adjusted.rowAndCell().row.semantic_prompt == .prompt_continuation) {
+                adjusted = adjusted.down(1) orelse break :skip;
+            }
+        }
+
+        break :start adjusted;
     };
 
     // Go through prompts delta times
@@ -6866,6 +6877,55 @@ test "Screen: jump back one prompt" {
     }
 }
 
+test "Screen: jump forward prompt skips multiline continuation" {
+    const testing = std.testing;
+    const alloc = testing.allocator;
+
+    var s = try init(alloc, 5, 3, null);
+    defer s.deinit();
+    try s.growRows(7);
+
+    // Multiline prompt on rows 1-3.
+    {
+        const p = s.pin(.{ .screen = .{ .y = 1 } }).?;
+        p.rowAndCell().row.semantic_prompt = .prompt;
+    }
+    {
+        const p = s.pin(.{ .screen = .{ .y = 2 } }).?;
+        p.rowAndCell().row.semantic_prompt = .prompt_continuation;
+    }
+    {
+        const p = s.pin(.{ .screen = .{ .y = 3 } }).?;
+        p.rowAndCell().row.semantic_prompt = .prompt_continuation;
+    }
+
+    // Next prompt after command output.
+    {
+        const p = s.pin(.{ .screen = .{ .y = 6 } }).?;
+        p.rowAndCell().row.semantic_prompt = .prompt;
+    }
+
+    // Starting at the first prompt line should jump to the next prompt,
+    // not to continuation lines.
+    s.scroll(.{ .row = 1 });
+    s.scroll(.{ .delta_prompt = 1 });
+    try testing.expect(s.viewport == .pin);
+    try testing.expectEqual(point.Point{ .screen = .{
+        .x = 0,
+        .y = 6,
+    } }, s.pointFromPin(.screen, s.pin(.{ .viewport = .{} }).?).?);
+
+    // Starting in the middle of continuation lines should also jump to
+    // the next prompt.
+    s.scroll(.{ .row = 2 });
+    s.scroll(.{ .delta_prompt = 1 });
+    try testing.expect(s.viewport == .pin);
+    try testing.expectEqual(point.Point{ .screen = .{
+        .x = 0,
+        .y = 6,
+    } }, s.pointFromPin(.screen, s.pin(.{ .viewport = .{} }).?).?);
+}
+
 test "PageList grow fit in capacity" {
     const testing = std.testing;
     const alloc = testing.allocator;

From 71f81527ad8d3393609d1e9134987653249473d4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 10 Mar 2026 11:08:46 -0700
Subject: [PATCH 100/391] macos: remove IntrinsicSizeTimingTests temporarily

These were too flaky.
---
 .../Terminal/IntrinsicSizeTimingTests.swift   | 462 ------------------
 1 file changed, 462 deletions(-)
 delete mode 100644 macos/Tests/Terminal/IntrinsicSizeTimingTests.swift

diff --git a/macos/Tests/Terminal/IntrinsicSizeTimingTests.swift b/macos/Tests/Terminal/IntrinsicSizeTimingTests.swift
deleted file mode 100644
index 7bce61bdc..000000000
--- a/macos/Tests/Terminal/IntrinsicSizeTimingTests.swift
+++ /dev/null
@@ -1,462 +0,0 @@
-import AppKit
-import Combine
-import SwiftUI
-import Testing
-@testable import Ghostty
-
-// MARK: - Test helpers
-
-/// Mimics TerminalView's .frame(idealWidth:idealHeight:) pattern where
-/// values come from lastFocusedSurface?.value?.initialSize, which may
-/// be nil before @FocusedValue propagates.
-private struct OptionalIdealSizeView: View {
-    let idealWidth: CGFloat?
-    let idealHeight: CGFloat?
-    let titlebarStyle: Ghostty.Config.MacOSTitlebarStyle
-
-    var body: some View {
-        VStack(spacing: 0) {
-            Color.clear
-                .frame(idealWidth: idealWidth, idealHeight: idealHeight)
-        }
-        // Matches TerminalView line 108: hidden style extends into titlebar
-        .ignoresSafeArea(.container, edges: titlebarStyle == .hidden ? .top : [])
-    }
-}
-
-private let minReasonableWidth: CGFloat = 100
-private let minReasonableHeight: CGFloat = 50
-
-/// All macos-titlebar-style values that map to different window nibs.
-private let allTitlebarStyles: [Ghostty.Config.MacOSTitlebarStyle] = [.native, .hidden, .transparent, .tabs]
-
-/// Window style masks that roughly correspond to each titlebar style.
-/// In real Ghostty these come from different nib files; in tests we
-/// approximate with NSWindow style masks.
-private func styleMask(for titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) -> NSWindow.StyleMask {
-    switch titlebarStyle {
-    case .hidden:
-        return [.titled, .resizable, .fullSizeContentView]
-    case .transparent, .tabs:
-        return [.titled, .resizable, .fullSizeContentView]
-    case .native:
-        return [.titled, .resizable]
-    }
-}
-
-// MARK: - Tests
-
-/// Regression tests for Issue #11256: incorrect intrinsicContentSize
-/// race condition in TerminalController.windowDidLoad().
-///
-/// The contentIntrinsicSize branch of DefaultSize reads
-/// intrinsicContentSize after a 40ms delay. But intrinsicContentSize
-/// depends on @FocusedValue propagating lastFocusedSurface, which is
-/// async and may not complete in time — producing a tiny window.
-///
-/// These tests cover the matrix of:
-/// - With/without window-width/window-height (initialSize set vs nil)
-/// - All macos-titlebar-style values (native, hidden, transparent, tabs)
-@Suite(.bug("https://github.com/ghostty-org/ghostty/issues/11256", "Incorrect intrinsicContentSize with native titlebar"))
-struct IntrinsicSizeTimingTests {
-
-    // MARK: - Bug: nil ideal sizes → tiny window
-
-    /// When window-width/height is set, defaultSize returns .contentIntrinsicSize.
-    /// Before @FocusedValue propagates, idealWidth/idealHeight are nil and
-    /// intrinsicContentSize returns a tiny value.
-    @Test(.bug("https://github.com/ghostty-org/ghostty/issues/11256", "intrinsicContentSize too small before @FocusedValue propagates"),
-          arguments: allTitlebarStyles)
-    func intrinsicSizeTooSmallWithNilIdealSize(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
-        let expectedSize = NSSize(width: 600, height: 400)
-
-        // nil ideal sizes = @FocusedValue hasn't propagated lastFocusedSurface
-        let container = await TerminalViewContainer {
-            OptionalIdealSizeView(idealWidth: nil, idealHeight: nil, titlebarStyle: titlebarStyle)
-        }
-
-        // Set initialContentSize so intrinsicContentSize returns the
-        // correct value immediately, without waiting for @FocusedValue.
-        await MainActor.run {
-            container.initialContentSize = expectedSize
-        }
-
-        let window = await NSWindow(
-            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
-            styleMask: styleMask(for: titlebarStyle),
-            backing: .buffered,
-            defer: false
-        )
-
-        await MainActor.run {
-            window.contentView = container
-        }
-
-        let size = await container.intrinsicContentSize
-
-        #expect(
-            size.width >= minReasonableWidth && size.height >= minReasonableHeight,
-            "[\(titlebarStyle)] intrinsicContentSize is too small: \(size). Expected at least \(minReasonableWidth)x\(minReasonableHeight)"
-        )
-
-        await MainActor.run { window.close() }
-    }
-
-    /// Verifies that DefaultSize.contentIntrinsicSize.apply() produces a
-    /// too-small window when intrinsicContentSize is based on nil ideal sizes.
-    @Test(.bug("https://github.com/ghostty-org/ghostty/issues/11256", "apply() sets wrong window size due to racy intrinsicContentSize"),
-          arguments: allTitlebarStyles)
-    func applyProducesWrongSizeWithNilIdealSize(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
-        let container = await TerminalViewContainer {
-            OptionalIdealSizeView(idealWidth: nil, idealHeight: nil, titlebarStyle: titlebarStyle)
-        }
-
-        await MainActor.run {
-            container.initialContentSize = NSSize(width: 600, height: 400)
-        }
-
-        let window = await NSWindow(
-            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
-            styleMask: styleMask(for: titlebarStyle),
-            backing: .buffered,
-            defer: false
-        )
-
-        let contentLayoutSize = await MainActor.run {
-            window.contentView = container
-
-            let defaultSize = TerminalController.DefaultSize.contentIntrinsicSize
-            defaultSize.apply(to: window)
-
-            // Use contentLayoutRect — the usable area excluding titlebar
-            return window.contentLayoutRect.size
-        }
-
-        #expect(
-            contentLayoutSize.width >= minReasonableWidth && contentLayoutSize.height >= minReasonableHeight,
-            "[\(titlebarStyle)] Window content layout size is too small after apply: \(contentLayoutSize)"
-        )
-
-        await MainActor.run { window.close() }
-    }
-
-    /// Replicates the exact pattern from TerminalController.windowDidLoad():
-    /// 1. Set window.contentView = container (with nil ideal sizes, simulating
-    ///    @FocusedValue not yet propagated)
-    /// 2. DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(40))
-    /// 3. Inside the callback: defaultSize.apply(to: window)
-    ///
-    /// This is the core race condition: 40ms is not enough for @FocusedValue
-    /// to propagate, so intrinsicContentSize is still tiny when apply() runs.
-    @Test(.bug("https://github.com/ghostty-org/ghostty/issues/11256", "40ms async delay reads intrinsicContentSize before @FocusedValue propagates"),
-          arguments: allTitlebarStyles)
-    func asyncAfterDelayProducesWrongSizeWithNilIdealSize(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
-        let container = await TerminalViewContainer {
-            OptionalIdealSizeView(idealWidth: nil, idealHeight: nil, titlebarStyle: titlebarStyle)
-        }
-
-        await MainActor.run {
-            container.initialContentSize = NSSize(width: 600, height: 400)
-        }
-
-        let window = await NSWindow(
-            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
-            styleMask: styleMask(for: titlebarStyle),
-            backing: .buffered,
-            defer: false
-        )
-
-        // Replicate TerminalController.windowDidLoad() exactly:
-        // 1. Set contentView
-        // 2. DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(40))
-        // 3. apply() inside the callback
-        let contentLayoutSize: NSSize = await withCheckedContinuation { continuation in
-            DispatchQueue.main.async {
-                window.contentView = container
-
-                DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(40)) {
-                    let defaultSize = TerminalController.DefaultSize.contentIntrinsicSize
-                    defaultSize.apply(to: window)
-                    continuation.resume(returning: window.contentLayoutRect.size)
-                }
-            }
-        }
-
-        #expect(
-            contentLayoutSize.width >= minReasonableWidth && contentLayoutSize.height >= minReasonableHeight,
-            "[\(titlebarStyle)] After 40ms async delay, content layout size is too small: \(contentLayoutSize)"
-        )
-
-        await MainActor.run { window.close() }
-    }
-
-    /// Verifies that applying synchronously (without the async delay) also
-    /// fails when ideal sizes are nil. This proves the fix must provide a
-    /// fallback value, not just adjust timing.
-    @Test(.bug("https://github.com/ghostty-org/ghostty/issues/11256", "Synchronous apply also fails without fallback"),
-          arguments: allTitlebarStyles)
-    func synchronousApplyAlsoFailsWithNilIdealSize(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
-        let container = await TerminalViewContainer {
-            OptionalIdealSizeView(idealWidth: nil, idealHeight: nil, titlebarStyle: titlebarStyle)
-        }
-
-        await MainActor.run {
-            container.initialContentSize = NSSize(width: 600, height: 400)
-        }
-
-        let window = await NSWindow(
-            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
-            styleMask: styleMask(for: titlebarStyle),
-            backing: .buffered,
-            defer: false
-        )
-
-        let contentLayoutSize = await MainActor.run {
-            window.contentView = container
-            // Apply immediately — no async delay at all
-            let defaultSize = TerminalController.DefaultSize.contentIntrinsicSize
-            defaultSize.apply(to: window)
-            return window.contentLayoutRect.size
-        }
-
-        #expect(
-            contentLayoutSize.width >= minReasonableWidth && contentLayoutSize.height >= minReasonableHeight,
-            "[\(titlebarStyle)] Synchronous apply with nil ideal sizes: content layout size too small: \(contentLayoutSize)"
-        )
-
-        await MainActor.run { window.close() }
-    }
-
-    // MARK: - Happy path: ideal sizes available (contentIntrinsicSize path)
-
-    /// When @FocusedValue HAS propagated (ideal sizes are set), intrinsicContentSize
-    /// should be correct for every titlebar style. This is the "happy path" that
-    /// works today when the 40ms delay is sufficient.
-    @Test(arguments: allTitlebarStyles)
-    func intrinsicSizeCorrectWhenIdealSizesAvailable(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
-        let expectedSize = NSSize(width: 600, height: 400)
-
-        let container = await TerminalViewContainer {
-            OptionalIdealSizeView(
-                idealWidth: expectedSize.width,
-                idealHeight: expectedSize.height,
-                titlebarStyle: titlebarStyle
-            )
-        }
-
-        let window = await NSWindow(
-            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
-            styleMask: styleMask(for: titlebarStyle),
-            backing: .buffered,
-            defer: false
-        )
-
-        await MainActor.run {
-            window.contentView = container
-        }
-
-        // Wait for SwiftUI layout
-        try await Task.sleep(nanoseconds: 100_000_000)
-
-        let size = await container.intrinsicContentSize
-
-        // intrinsicContentSize should be at least the ideal size.
-        // With fullSizeContentView styles it may be slightly larger
-        // due to safe area, but should never be smaller.
-        #expect(
-            size.width >= expectedSize.width && size.height >= expectedSize.height,
-            "[\(titlebarStyle)] intrinsicContentSize (\(size)) should be >= expected \(expectedSize)"
-        )
-
-        await MainActor.run { window.close() }
-    }
-
-    /// Verifies that apply() sets a correctly sized window when ideal sizes
-    /// are available, for each titlebar style.
-    @Test(arguments: allTitlebarStyles)
-    func applyProducesCorrectSizeWhenIdealSizesAvailable(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
-        let expectedSize = NSSize(width: 600, height: 400)
-
-        let container = await TerminalViewContainer {
-            OptionalIdealSizeView(
-                idealWidth: expectedSize.width,
-                idealHeight: expectedSize.height,
-                titlebarStyle: titlebarStyle
-            )
-        }
-
-        let window = await NSWindow(
-            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
-            styleMask: styleMask(for: titlebarStyle),
-            backing: .buffered,
-            defer: false
-        )
-
-        await MainActor.run {
-            window.contentView = container
-        }
-
-        // Wait for SwiftUI layout before apply
-        try await Task.sleep(nanoseconds: 100_000_000)
-
-        let contentLayoutSize = await MainActor.run {
-            let defaultSize = TerminalController.DefaultSize.contentIntrinsicSize
-            defaultSize.apply(to: window)
-            // contentLayoutRect gives the usable area, excluding titlebar
-            return window.contentLayoutRect.size
-        }
-
-        // The usable content area should be at least the expected size.
-        #expect(
-            contentLayoutSize.width >= expectedSize.width && contentLayoutSize.height >= expectedSize.height,
-            "[\(titlebarStyle)] Content layout size (\(contentLayoutSize)) should be >= expected \(expectedSize) after apply"
-        )
-
-        await MainActor.run { window.close() }
-    }
-
-    /// Same async delay pattern but with ideal sizes available (happy path).
-    /// This should always pass — it validates the delay works when @FocusedValue
-    /// has already propagated.
-    @Test(arguments: allTitlebarStyles)
-    func asyncAfterDelayProducesCorrectSizeWhenIdealSizesAvailable(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
-        let expectedSize = NSSize(width: 600, height: 400)
-
-        let container = await TerminalViewContainer {
-            OptionalIdealSizeView(
-                idealWidth: expectedSize.width,
-                idealHeight: expectedSize.height,
-                titlebarStyle: titlebarStyle
-            )
-        }
-
-        let window = await NSWindow(
-            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
-            styleMask: styleMask(for: titlebarStyle),
-            backing: .buffered,
-            defer: false
-        )
-
-        // Replicate the exact TerminalController.windowDidLoad() pattern
-        let contentLayoutSize: NSSize = await withCheckedContinuation { continuation in
-            DispatchQueue.main.async {
-                window.contentView = container
-
-                DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(40)) {
-                    let defaultSize = TerminalController.DefaultSize.contentIntrinsicSize
-                    defaultSize.apply(to: window)
-                    continuation.resume(returning: window.contentLayoutRect.size)
-                }
-            }
-        }
-
-        #expect(
-            contentLayoutSize.width >= expectedSize.width && contentLayoutSize.height >= expectedSize.height,
-            "[\(titlebarStyle)] Content layout size (\(contentLayoutSize)) should be >= expected \(expectedSize) after 40ms delay"
-        )
-
-        await MainActor.run { window.close() }
-    }
-
-    // MARK: - Without window-width/window-height (frame path)
-
-    /// Without window-width/height config, defaultSize returns .frame or nil
-    /// (never .contentIntrinsicSize). The window uses its initial frame.
-    /// This should work for all titlebar styles regardless of the bug.
-    @Test(arguments: allTitlebarStyles)
-    func framePathWorksWithoutWindowSize(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
-        let expectedFrame = NSRect(x: 100, y: 100, width: 800, height: 600)
-
-        let container = await TerminalViewContainer {
-            Color.clear
-        }
-
-        let window = await NSWindow(
-            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
-            styleMask: styleMask(for: titlebarStyle),
-            backing: .buffered,
-            defer: false
-        )
-
-        await MainActor.run {
-            window.contentView = container
-            let defaultSize = TerminalController.DefaultSize.frame(expectedFrame)
-            defaultSize.apply(to: window)
-        }
-
-        let frame = await MainActor.run { window.frame }
-
-        #expect(
-            frame == expectedFrame,
-            "[\(titlebarStyle)] Window frame (\(frame)) should match expected \(expectedFrame)"
-        )
-
-        await MainActor.run { window.close() }
-    }
-
-    // MARK: - isChanged
-
-    /// Verifies isChanged correctly detects mismatch for contentIntrinsicSize
-    /// across titlebar styles when ideal sizes are available.
-    @Test(arguments: allTitlebarStyles)
-    func isChangedDetectsMismatch(titlebarStyle: Ghostty.Config.MacOSTitlebarStyle) async throws {
-        let expectedSize = NSSize(width: 600, height: 400)
-
-        let container = await TerminalViewContainer {
-            OptionalIdealSizeView(
-                idealWidth: expectedSize.width,
-                idealHeight: expectedSize.height,
-                titlebarStyle: titlebarStyle
-            )
-        }
-
-        let window = await NSWindow(
-            contentRect: NSRect(x: 0, y: 0, width: 800, height: 600),
-            styleMask: styleMask(for: titlebarStyle),
-            backing: .buffered,
-            defer: false
-        )
-
-        await MainActor.run {
-            window.contentView = container
-        }
-
-        try await Task.sleep(nanoseconds: 100_000_000)
-
-        let defaultSize = TerminalController.DefaultSize.contentIntrinsicSize
-
-        let changedBefore = await MainActor.run { defaultSize.isChanged(for: window) }
-        #expect(changedBefore, "[\(titlebarStyle)] isChanged should return true before apply")
-
-        await MainActor.run { defaultSize.apply(to: window) }
-
-        let changedAfter = await MainActor.run { defaultSize.isChanged(for: window) }
-        #expect(!changedAfter, "[\(titlebarStyle)] isChanged should return false after apply")
-
-        await MainActor.run { window.close() }
-    }
-
-    /// Verifies isChanged for the .frame path.
-    @Test func isChangedForFramePath() async throws {
-        let expectedFrame = NSRect(x: 100, y: 100, width: 800, height: 600)
-
-        let window = await NSWindow(
-            contentRect: NSRect(x: 0, y: 0, width: 400, height: 300),
-            styleMask: [.titled, .resizable],
-            backing: .buffered,
-            defer: false
-        )
-
-        let defaultSize = TerminalController.DefaultSize.frame(expectedFrame)
-
-        let changedBefore = await MainActor.run { defaultSize.isChanged(for: window) }
-        #expect(changedBefore, "isChanged should return true before apply")
-
-        await MainActor.run { defaultSize.apply(to: window) }
-
-        let changedAfter = await MainActor.run { defaultSize.isChanged(for: window) }
-        #expect(!changedAfter, "isChanged should return false after apply")
-
-        await MainActor.run { window.close() }
-    }
-}

From c1313294cd765e41c02e0b8e048fbad1beb5f740 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Tue, 10 Mar 2026 13:29:50 -0500
Subject: [PATCH 101/391] add comments about why tests are disabled

---
 src/font/shaper/harfbuzz.zig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/font/shaper/harfbuzz.zig b/src/font/shaper/harfbuzz.zig
index 10e5f99b1..30e1d0544 100644
--- a/src/font/shaper/harfbuzz.zig
+++ b/src/font/shaper/harfbuzz.zig
@@ -1078,6 +1078,8 @@ test "shape Devanagari string" {
     try testing.expect(try it.next(alloc) == null);
 }
 
+// This test fails on Linux if you have the "Noto Sans Tai Tham" font installed
+// locally. Disabling this test until it can be fixed.
 test "shape Tai Tham vowels (position differs from advance)" {
     return error.SkipZigTest;
     // // Note that while this test was necessary for CoreText, the old logic was
@@ -1195,6 +1197,8 @@ test "shape Tibetan characters" {
     try testing.expectEqual(@as(usize, 1), count);
 }
 
+// This test fails on Linux if you have the "Noto Sans Tai Tham" font installed
+// locally. Disabling this test until it can be fixed.
 test "shape Tai Tham letters (run_offset.y differs from zero)" {
     return error.SkipZigTest;
     // const testing = std.testing;
@@ -1256,6 +1260,8 @@ test "shape Tai Tham letters (run_offset.y differs from zero)" {
     // try testing.expectEqual(@as(usize, 1), count);
 }
 
+// This test fails on Linux if you have the "Noto Sans Javanese" font installed
+// locally. Disabling this test until it can be fixed.
 test "shape Javanese ligatures" {
     return error.SkipZigTest;
     // const testing = std.testing;

From 32934445cfb60e387013f4a7c4293352ac3aae44 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Mon, 9 Mar 2026 15:29:44 +0100
Subject: [PATCH 102/391] macos: add TemporaryConfig for AI to write test cases

---
 macos/Sources/Ghostty/Ghostty.Config.swift |  2 +-
 macos/Tests/Ghostty/ConfigTests.swift      | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 macos/Tests/Ghostty/ConfigTests.swift

diff --git a/macos/Sources/Ghostty/Ghostty.Config.swift b/macos/Sources/Ghostty/Ghostty.Config.swift
index 4a36583d5..668db1f5d 100644
--- a/macos/Sources/Ghostty/Ghostty.Config.swift
+++ b/macos/Sources/Ghostty/Ghostty.Config.swift
@@ -53,7 +53,7 @@ extension Ghostty {
         /// - Parameters:
         ///   - path: An optional preferred config file path. Pass `nil` to load the default configuration files.
         ///   - finalize: Whether to finalize the configuration to populate default values.
-        static private func loadConfig(at path: String?, finalize: Bool) -> ghostty_config_t? {
+        static func loadConfig(at path: String?, finalize: Bool) -> ghostty_config_t? {
             // Initialize the global configuration.
             guard let cfg = ghostty_config_new() else {
                 logger.critical("ghostty_config_new failed")
diff --git a/macos/Tests/Ghostty/ConfigTests.swift b/macos/Tests/Ghostty/ConfigTests.swift
new file mode 100644
index 000000000..2df5c1b73
--- /dev/null
+++ b/macos/Tests/Ghostty/ConfigTests.swift
@@ -0,0 +1,20 @@
+import Testing
+@testable import Ghostty
+
+/// Create a temporary config file and delete it when this is deallocated
+class TemporaryConfig: Ghostty.Config {
+    let temporaryFile: URL
+
+    init(_ configText: String, finalize: Bool = false) throws {
+        let temporaryFile = FileManager.default.temporaryDirectory
+            .appendingPathComponent(UUID().uuidString)
+            .appendingPathExtension("ghostty")
+        try configText.write(to: temporaryFile, atomically: true, encoding: .utf8)
+        self.temporaryFile = temporaryFile
+        super.init(config: Self.loadConfig(at: temporaryFile.path(), finalize: finalize))
+    }
+
+    deinit {
+        try? FileManager.default.removeItem(at: temporaryFile)
+    }
+}

From 90dc4315e2632faeb9771536cf526c46d33fc539 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Mon, 9 Mar 2026 15:31:18 +0100
Subject: [PATCH 103/391] macos: add test cases for Ghostty.Config properties

Test boolean, string, enum, and numeric config properties using
TemporaryConfig to verify defaults and parsed values.

Co-Authored-By: Claude <noreply@anthropic.com>
---
 macos/Tests/Ghostty/ConfigTests.swift | 226 +++++++++++++++++++++++++-
 1 file changed, 225 insertions(+), 1 deletion(-)

diff --git a/macos/Tests/Ghostty/ConfigTests.swift b/macos/Tests/Ghostty/ConfigTests.swift
index 2df5c1b73..b9c9d6a4a 100644
--- a/macos/Tests/Ghostty/ConfigTests.swift
+++ b/macos/Tests/Ghostty/ConfigTests.swift
@@ -1,11 +1,225 @@
 import Testing
 @testable import Ghostty
+@testable import GhosttyKit
+import SwiftUI
+
+@Suite
+struct ConfigTests {
+    // MARK: - Boolean Properties
+
+    @Test func initialWindowDefaultsToTrue() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.initialWindow == true)
+    }
+
+    @Test func initialWindowSetToFalse() throws {
+        let config = try TemporaryConfig("initial-window = false")
+        #expect(config.initialWindow == false)
+    }
+
+    @Test func quitAfterLastWindowClosedDefaultsToFalse() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.shouldQuitAfterLastWindowClosed == false)
+    }
+
+    @Test func quitAfterLastWindowClosedSetToTrue() throws {
+        let config = try TemporaryConfig("quit-after-last-window-closed = true")
+        #expect(config.shouldQuitAfterLastWindowClosed == true)
+    }
+
+    @Test func windowStepResizeDefaultsToFalse() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.windowStepResize == false)
+    }
+
+    @Test func focusFollowsMouseDefaultsToFalse() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.focusFollowsMouse == false)
+    }
+
+    @Test func focusFollowsMouseSetToTrue() throws {
+        let config = try TemporaryConfig("focus-follows-mouse = true")
+        #expect(config.focusFollowsMouse == true)
+    }
+
+    @Test func windowDecorationsDefaultsToTrue() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.windowDecorations == true)
+    }
+
+    @Test func windowDecorationsNone() throws {
+        let config = try TemporaryConfig("window-decoration = none")
+        #expect(config.windowDecorations == false)
+    }
+
+    @Test func macosWindowShadowDefaultsToTrue() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.macosWindowShadow == true)
+    }
+
+    @Test func maximizeDefaultsToFalse() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.maximize == false)
+    }
+
+    @Test func maximizeSetToTrue() throws {
+        let config = try TemporaryConfig("maximize = true")
+        #expect(config.maximize == true)
+    }
+
+    // MARK: - String / Optional String Properties
+
+    @Test func titleDefaultsToNil() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.title == nil)
+    }
+
+    @Test func titleSetToCustomValue() throws {
+        let config = try TemporaryConfig("title = My Terminal")
+        #expect(config.title == "My Terminal")
+    }
+
+    @Test func windowTitleFontFamilyDefaultsToNil() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.windowTitleFontFamily == nil)
+    }
+
+    @Test func windowTitleFontFamilySetToValue() throws {
+        let config = try TemporaryConfig("window-title-font-family = Menlo")
+        #expect(config.windowTitleFontFamily == "Menlo")
+    }
+
+    // MARK: - Enum Properties
+
+    @Test func macosTitlebarStyleDefaultsToTransparent() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.macosTitlebarStyle == .transparent)
+    }
+
+    @Test(arguments: [
+        ("native", Ghostty.Config.MacOSTitlebarStyle.native),
+        ("transparent", Ghostty.Config.MacOSTitlebarStyle.transparent),
+        ("tabs", Ghostty.Config.MacOSTitlebarStyle.tabs),
+        ("hidden", Ghostty.Config.MacOSTitlebarStyle.hidden),
+    ])
+    func macosTitlebarStyleValues(raw: String, expected: Ghostty.Config.MacOSTitlebarStyle) throws {
+        let config = try TemporaryConfig("macos-titlebar-style = \(raw)")
+        #expect(config.macosTitlebarStyle == expected)
+    }
+
+    @Test func resizeOverlayDefaultsToAfterFirst() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.resizeOverlay == .after_first)
+    }
+
+    @Test(arguments: [
+        ("always", Ghostty.Config.ResizeOverlay.always),
+        ("never", Ghostty.Config.ResizeOverlay.never),
+        ("after-first", Ghostty.Config.ResizeOverlay.after_first),
+    ])
+    func resizeOverlayValues(raw: String, expected: Ghostty.Config.ResizeOverlay) throws {
+        let config = try TemporaryConfig("resize-overlay = \(raw)")
+        #expect(config.resizeOverlay == expected)
+    }
+
+    @Test func resizeOverlayPositionDefaultsToCenter() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.resizeOverlayPosition == .center)
+    }
+
+    @Test func macosIconDefaultsToOfficial() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.macosIcon == .official)
+    }
+
+    @Test func macosIconFrameDefaultsToAluminum() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.macosIconFrame == .aluminum)
+    }
+
+    @Test func macosWindowButtonsDefaultsToVisible() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.macosWindowButtons == .visible)
+    }
+
+    @Test func scrollbarDefaultsToSystem() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.scrollbar == .system)
+    }
+
+    @Test func scrollbarSetToNever() throws {
+        let config = try TemporaryConfig("scrollbar = never")
+        #expect(config.scrollbar == .never)
+    }
+
+    // MARK: - Numeric Properties
+
+    @Test func backgroundOpacityDefaultsToOne() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.backgroundOpacity == 1.0)
+    }
+
+    @Test func backgroundOpacitySetToCustom() throws {
+        let config = try TemporaryConfig("background-opacity = 0.5")
+        #expect(config.backgroundOpacity == 0.5)
+    }
+
+    @Test func windowPositionDefaultsToNil() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.windowPositionX == nil)
+        #expect(config.windowPositionY == nil)
+    }
+
+    // MARK: - Config Loading
+
+    @Test func loadedIsTrueForValidConfig() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.loaded == true)
+    }
+
+    @Test func unfinalizedConfigIsLoaded() throws {
+        let config = try TemporaryConfig("", finalize: false)
+        #expect(config.loaded == true)
+    }
+
+    @Test func defaultConfigIsLoaded() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.optionalAutoUpdateChannel != nil) // release or tip
+        let config1 = try TemporaryConfig("", finalize: false)
+        #expect(config1.optionalAutoUpdateChannel == nil)
+    }
+
+    @Test func errorsEmptyForValidConfig() throws {
+        let config = try TemporaryConfig("")
+        #expect(config.errors.isEmpty)
+    }
+
+    @Test func errorsReportedForInvalidConfig() throws {
+        let config = try TemporaryConfig("not-a-real-key = value")
+        #expect(!config.errors.isEmpty)
+    }
+
+    // MARK: - Multiple Config Lines
+
+    @Test func multipleConfigValues() throws {
+        let config = try TemporaryConfig("""
+        initial-window = false
+        quit-after-last-window-closed = true
+        maximize = true
+        focus-follows-mouse = true
+        """)
+        #expect(config.initialWindow == false)
+        #expect(config.shouldQuitAfterLastWindowClosed == true)
+        #expect(config.maximize == true)
+        #expect(config.focusFollowsMouse == true)
+    }
+}
 
 /// Create a temporary config file and delete it when this is deallocated
 class TemporaryConfig: Ghostty.Config {
     let temporaryFile: URL
 
-    init(_ configText: String, finalize: Bool = false) throws {
+    init(_ configText: String, finalize: Bool = true) throws {
         let temporaryFile = FileManager.default.temporaryDirectory
             .appendingPathComponent(UUID().uuidString)
             .appendingPathExtension("ghostty")
@@ -14,6 +228,16 @@ class TemporaryConfig: Ghostty.Config {
         super.init(config: Self.loadConfig(at: temporaryFile.path(), finalize: finalize))
     }
 
+    var optionalAutoUpdateChannel: Ghostty.AutoUpdateChannel? {
+        guard let config = self.config else { return nil }
+        var v: UnsafePointer<Int8>?
+        let key = "auto-update-channel"
+        guard ghostty_config_get(config, &v, key, UInt(key.lengthOfBytes(using: .utf8))) else { return nil }
+        guard let ptr = v else { return nil }
+        let str = String(cString: ptr)
+        return Ghostty.AutoUpdateChannel(rawValue: str)
+    }
+
     deinit {
         try? FileManager.default.removeItem(at: temporaryFile)
     }

From 04d5efc8eb7b5f660bf44c0b63b9366c881e9635 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 10 Mar 2026 14:11:35 -0700
Subject: [PATCH 104/391] config: working-directory expands ~/ prefix

Fixes #11336

Introduce a proper WorkingDirectory tagged union type with home, inherit,
and path variants. The field is now an optional (?WorkingDirectory) where
null represents "use platform default" which is resolved during Config.finalize
to .inherit (CLI) or .home (desktop launcher).
---
 AGENTS.md                       |   1 -
 src/Surface.zig                 |   2 +-
 src/apprt/embedded.zig          |  10 +-
 src/apprt/gtk/class/surface.zig |  12 ++-
 src/apprt/surface.zig           |   2 +-
 src/config.zig                  |   1 +
 src/config/Config.zig           | 181 ++++++++++++++++++++++++++++----
 7 files changed, 182 insertions(+), 27 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 794115c58..3298f2160 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -4,7 +4,6 @@ A file for [guiding coding agents](https://agents.md/).
 
 ## Commands
 
-- Use `nix develop -c` with all commands to ensure the Nix version is used.
 - **Build:** `zig build`
   - If you're on macOS and don't need to build the macOS app, use
     `-Demit-macos-app=false` to skip building the app bundle and speed up
diff --git a/src/Surface.zig b/src/Surface.zig
index a3691b53e..b78812ac4 100644
--- a/src/Surface.zig
+++ b/src/Surface.zig
@@ -639,7 +639,7 @@ pub fn init(
             .shell_integration = config.@"shell-integration",
             .shell_integration_features = config.@"shell-integration-features",
             .cursor_blink = config.@"cursor-style-blink",
-            .working_directory = config.@"working-directory",
+            .working_directory = if (config.@"working-directory") |wd| wd.value() else null,
             .resources_dir = global_state.resources_dir.host(),
             .term = config.term,
             .rt_pre_exec_info = .init(config),
diff --git a/src/apprt/embedded.zig b/src/apprt/embedded.zig
index c629be498..0d5a4f8da 100644
--- a/src/apprt/embedded.zig
+++ b/src/apprt/embedded.zig
@@ -513,7 +513,15 @@ pub const Surface = struct {
                     break :wd;
                 }
 
-                config.@"working-directory" = wd;
+                var wd_val: configpkg.WorkingDirectory = .{ .path = wd };
+                if (wd_val.finalize(config.arenaAlloc())) |_| {
+                    config.@"working-directory" = wd_val;
+                } else |err| {
+                    log.warn(
+                        "error finalizing working directory config dir={s} err={}",
+                        .{ wd_val.path, err },
+                    );
+                }
             }
         }
 
diff --git a/src/apprt/gtk/class/surface.zig b/src/apprt/gtk/class/surface.zig
index 8ce9ac1d1..632b0de47 100644
--- a/src/apprt/gtk/class/surface.zig
+++ b/src/apprt/gtk/class/surface.zig
@@ -3381,12 +3381,20 @@ pub const Surface = extern struct {
             config.command = try c.clone(config._arena.?.allocator());
         }
         if (priv.overrides.working_directory) |wd| {
-            config.@"working-directory" = try config._arena.?.allocator().dupeZ(u8, wd);
+            const config_alloc = config.arenaAlloc();
+            var wd_val: configpkg.WorkingDirectory = .{ .path = try config_alloc.dupe(u8, wd) };
+            try wd_val.finalize(config_alloc);
+            config.@"working-directory" = wd_val;
         }
 
         // Properties that can impact surface init
         if (priv.font_size_request) |size| config.@"font-size" = size.points;
-        if (priv.pwd) |pwd| config.@"working-directory" = pwd;
+        if (priv.pwd) |pwd| {
+            const config_alloc = config.arenaAlloc();
+            var wd_val: configpkg.WorkingDirectory = .{ .path = try config_alloc.dupe(u8, pwd) };
+            try wd_val.finalize(config_alloc);
+            config.@"working-directory" = wd_val;
+        }
 
         // Initialize the surface
         surface.init(
diff --git a/src/apprt/surface.zig b/src/apprt/surface.zig
index 5c25281c8..3cb0016fa 100644
--- a/src/apprt/surface.zig
+++ b/src/apprt/surface.zig
@@ -188,7 +188,7 @@ pub fn newConfig(
     if (prev) |p| {
         if (shouldInheritWorkingDirectory(context, config)) {
             if (try p.pwd(alloc)) |pwd| {
-                copy.@"working-directory" = pwd;
+                copy.@"working-directory" = .{ .path = pwd };
             }
         }
     }
diff --git a/src/config.zig b/src/config.zig
index 0bf61a47f..314fb49ee 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -44,6 +44,7 @@ pub const WindowPaddingColor = Config.WindowPaddingColor;
 pub const BackgroundImagePosition = Config.BackgroundImagePosition;
 pub const BackgroundImageFit = Config.BackgroundImageFit;
 pub const LinkPreviews = Config.LinkPreviews;
+pub const WorkingDirectory = Config.WorkingDirectory;
 
 // Alternate APIs
 pub const CApi = @import("config/CApi.zig");
diff --git a/src/config/Config.zig b/src/config/Config.zig
index e31fbc011..aae6c9e20 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -1526,13 +1526,14 @@ class: ?[:0]const u8 = null,
 /// `open`, then it defaults to `home`. On Linux with GTK, if Ghostty can detect
 /// it was launched from a desktop launcher, then it defaults to `home`.
 ///
-/// The value of this must be an absolute value or one of the special values
-/// below:
+/// The value of this must be an absolute path, a path prefixed with `~/`
+/// (the tilde will be expanded to the user's home directory), or
+/// one of the special values below:
 ///
 ///   * `home` - The home directory of the executing user.
 ///
 ///   * `inherit` - The working directory of the launching process.
-@"working-directory": ?[]const u8 = null,
+@"working-directory": ?WorkingDirectory = null,
 
 /// Key bindings. The format is `trigger=action`. Duplicate triggers will
 /// overwrite previously set values. The list of actions is available in
@@ -4519,23 +4520,18 @@ pub fn finalize(self: *Config) !void {
     }
 
     // The default for the working directory depends on the system.
-    const wd = self.@"working-directory" orelse if (probable_cli)
-        // From the CLI, we want to inherit where we were launched from.
-        "inherit"
+    var wd: WorkingDirectory = self.@"working-directory" orelse if (probable_cli)
+        .inherit
     else
-        // Otherwise we typically just want the home directory because
-        // our pwd is probably a runtime state dir or root or something
-        // (launchers and desktop environments typically do this).
-        "home";
+        .home;
 
     // If we are missing either a command or home directory, we need
     // to look up defaults which is kind of expensive. We only do this
     // on desktop.
-    const wd_home = std.mem.eql(u8, "home", wd);
     if ((comptime !builtin.target.cpu.arch.isWasm()) and
         (comptime !builtin.is_test))
     {
-        if (self.command == null or wd_home) command: {
+        if (self.command == null or wd == .home) command: {
             // First look up the command using the SHELL env var if needed.
             // We don't do this in flatpak because SHELL in Flatpak is always
             // set to /bin/sh.
@@ -4557,7 +4553,7 @@ pub fn finalize(self: *Config) !void {
                     self.command = .{ .shell = copy };
 
                     // If we don't need the working directory, then we can exit now.
-                    if (!wd_home) break :command;
+                    if (wd != .home) break :command;
                 } else |_| {}
             }
 
@@ -4568,10 +4564,12 @@ pub fn finalize(self: *Config) !void {
                         self.command = .{ .shell = "cmd.exe" };
                     }
 
-                    if (wd_home) {
+                    if (wd == .home) {
                         var buf: [std.fs.max_path_bytes]u8 = undefined;
                         if (try internal_os.home(&buf)) |home| {
-                            self.@"working-directory" = try alloc.dupe(u8, home);
+                            wd = .{ .path = try alloc.dupe(u8, home) };
+                        } else {
+                            wd = .inherit;
                         }
                     }
                 },
@@ -4586,10 +4584,12 @@ pub fn finalize(self: *Config) !void {
                         }
                     }
 
-                    if (wd_home) {
+                    if (wd == .home) {
                         if (pw.home) |home| {
                             log.info("default working directory src=passwd value={s}", .{home});
-                            self.@"working-directory" = home;
+                            wd = .{ .path = home };
+                        } else {
+                            wd = .inherit;
                         }
                     }
 
@@ -4600,6 +4600,8 @@ pub fn finalize(self: *Config) !void {
             }
         }
     }
+    try wd.finalize(alloc);
+    self.@"working-directory" = wd;
 
     // Apprt-specific defaults
     switch (build_config.app_runtime) {
@@ -4618,10 +4620,6 @@ pub fn finalize(self: *Config) !void {
         },
     }
 
-    // If we have the special value "inherit" then set it to null which
-    // does the same. In the future we should change to a tagged union.
-    if (std.mem.eql(u8, wd, "inherit")) self.@"working-directory" = null;
-
     // Default our click interval
     if (self.@"click-repeat-interval" == 0 and
         (comptime !builtin.is_test))
@@ -5245,6 +5243,127 @@ pub const LinkPreviews = enum {
     osc8,
 };
 
+/// See working-directory
+pub const WorkingDirectory = union(enum) {
+    const Self = @This();
+
+    /// Resolve to the current user's home directory during config finalize.
+    home,
+
+    /// Inherit the working directory from the launching process.
+    inherit,
+
+    /// Use an explicit working directory path. This may be not be
+    /// expanded until finalize is called.
+    path: []const u8,
+
+    pub fn parseCLI(self: *Self, alloc: Allocator, input_: ?[]const u8) !void {
+        var input = input_ orelse return error.ValueRequired;
+        input = std.mem.trim(u8, input, &std.ascii.whitespace);
+        if (input.len == 0) return error.ValueRequired;
+
+        // Match path.zig behavior for quoted values.
+        if (input.len >= 2 and input[0] == '"' and input[input.len - 1] == '"') {
+            input = input[1 .. input.len - 1];
+        }
+
+        if (std.mem.eql(u8, input, "home")) {
+            self.* = .home;
+            return;
+        }
+
+        if (std.mem.eql(u8, input, "inherit")) {
+            self.* = .inherit;
+            return;
+        }
+
+        self.* = .{ .path = try alloc.dupe(u8, input) };
+    }
+
+    /// Expand tilde paths in .path values.
+    pub fn finalize(self: *Self, alloc: Allocator) Allocator.Error!void {
+        const path = switch (self.*) {
+            .path => |path| path,
+            else => return,
+        };
+
+        if (!std.mem.startsWith(u8, path, "~/")) return;
+
+        var buf: [std.fs.max_path_bytes]u8 = undefined;
+        const expanded = internal_os.expandHome(path, &buf) catch |err| {
+            log.warn(
+                "error expanding home directory for working-directory path={s}: {}",
+                .{ path, err },
+            );
+            return;
+        };
+
+        if (std.mem.eql(u8, expanded, path)) return;
+        self.* = .{ .path = try alloc.dupe(u8, expanded) };
+    }
+
+    pub fn value(self: Self) ?[]const u8 {
+        return switch (self) {
+            .path => |path| path,
+            .home, .inherit => null,
+        };
+    }
+
+    pub fn clone(self: Self, alloc: Allocator) Allocator.Error!Self {
+        return switch (self) {
+            .path => |path| .{ .path = try alloc.dupe(u8, path) },
+            else => self,
+        };
+    }
+
+    pub fn formatEntry(self: Self, formatter: formatterpkg.EntryFormatter) !void {
+        switch (self) {
+            .home, .inherit => try formatter.formatEntry([]const u8, @tagName(self)),
+            .path => |path| try formatter.formatEntry([]const u8, path),
+        }
+    }
+
+    test "WorkingDirectory parseCLI" {
+        const testing = std.testing;
+        var arena = ArenaAllocator.init(testing.allocator);
+        defer arena.deinit();
+        const alloc = arena.allocator();
+
+        var wd: Self = .inherit;
+
+        try wd.parseCLI(alloc, "inherit");
+        try testing.expectEqual(.inherit, wd);
+
+        try wd.parseCLI(alloc, "home");
+        try testing.expectEqual(.home, wd);
+
+        try wd.parseCLI(alloc, "~/projects/ghostty");
+        try testing.expectEqualStrings("~/projects/ghostty", wd.path);
+
+        try wd.parseCLI(alloc, "\"/tmp path\"");
+        try testing.expectEqualStrings("/tmp path", wd.path);
+    }
+
+    test "WorkingDirectory finalize" {
+        const testing = std.testing;
+        var arena = ArenaAllocator.init(testing.allocator);
+        defer arena.deinit();
+        const alloc = arena.allocator();
+
+        {
+            var wd: Self = .{ .path = "~/projects/ghostty" };
+            try wd.finalize(alloc);
+
+            var buf: [std.fs.max_path_bytes]u8 = undefined;
+            const expected = internal_os.expandHome(
+                "~/projects/ghostty",
+                &buf,
+            ) catch "~/projects/ghostty";
+            try testing.expectEqualStrings(expected, wd.value().?);
+        }
+    }
+};
+
 /// Color represents a color using RGB.
 ///
 /// This is a packed struct so that the C API to read color values just
@@ -10309,6 +10428,26 @@ test "clone preserves conditional set" {
     try testing.expect(clone1._conditional_set.contains(.theme));
 }
 
+test "working-directory expands tilde" {
+    const testing = std.testing;
+    const alloc = testing.allocator;
+
+    var cfg = try Config.default(alloc);
+    defer cfg.deinit();
+    var it: TestIterator = .{ .data = &.{
+        "--working-directory=~/projects/ghostty",
+    } };
+    try cfg.loadIter(alloc, &it);
+    try cfg.finalize();
+
+    var buf: [std.fs.max_path_bytes]u8 = undefined;
+    const expected = internal_os.expandHome(
+        "~/projects/ghostty",
+        &buf,
+    ) catch "~/projects/ghostty";
+    try testing.expectEqualStrings(expected, cfg.@"working-directory".?.value().?);
+}
+
 test "changed" {
     const testing = std.testing;
     const alloc = testing.allocator;

From f9862cd4e27daf72e8e983646451a0954a47258b Mon Sep 17 00:00:00 2001
From: Steve Hulet <steve@freshconsulting.com>
Date: Tue, 10 Mar 2026 16:14:18 -0700
Subject: [PATCH 105/391] GTK does support scrollbars

---
 src/config/Config.zig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/config/Config.zig b/src/config/Config.zig
index aae6c9e20..f496a4cf2 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -1398,8 +1398,6 @@ input: RepeatableReadableIO = .{},
 ///   * `never` - Never show a scrollbar. You can still scroll using the mouse,
 ///     keybind actions, etc. but you will not have a visual UI widget showing
 ///     a scrollbar.
-///
-/// This only applies to macOS currently. GTK doesn't yet support scrollbars.
 scrollbar: Scrollbar = .system,
 
 /// Match a regular expression against the terminal text and associate clicking

From 615af975f3365ea85594be7ebbc6ae90cac9558c Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Tue, 10 Mar 2026 23:26:26 +0000
Subject: [PATCH 106/391] Update VOUCHED list (#11344)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11343#discussioncomment-16075282)
from @jcollie.

Vouch: @hulet

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index dfaea1326..90058c813 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -77,6 +77,7 @@ guilhermetk
 hakonhagland
 halosatrio
 hqnna
+hulet
 icodesign
 jacobsandlund
 jake-stewart

From 85bec8033474438182fbb33ded8dfcdcb009ea6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Mar 2026 00:14:04 +0000
Subject: [PATCH 107/391] build(deps): bump cachix/install-nix-action from
 31.10.0 to 31.10.1

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 31.10.0 to 31.10.1.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Changelog](https://github.com/cachix/install-nix-action/blob/master/RELEASE.md)
- [Commits](https://github.com/cachix/install-nix-action/compare/19effe9fe722874e6d46dd7182e4b8b7a43c4a99...1ca7d21a94afc7c957383a2d217460d980de4934)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-version: 31.10.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/nix.yml                 |  2 +-
 .github/workflows/release-tag.yml         |  2 +-
 .github/workflows/release-tip.yml         |  4 +-
 .github/workflows/test.yml                | 52 +++++++++++------------
 .github/workflows/update-colorschemes.yml |  2 +-
 5 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index fe3dd1336..c6535030c 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -47,7 +47,7 @@ jobs:
             /nix
             /zig
       - name: Setup Nix
-        uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+        uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml
index f7d4a7b6e..2a3770a13 100644
--- a/.github/workflows/release-tag.yml
+++ b/.github/workflows/release-tag.yml
@@ -89,7 +89,7 @@ jobs:
             /nix
             /zig
 
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
 
diff --git a/.github/workflows/release-tip.yml b/.github/workflows/release-tip.yml
index a2d8c1078..326b29439 100644
--- a/.github/workflows/release-tip.yml
+++ b/.github/workflows/release-tip.yml
@@ -42,7 +42,7 @@ jobs:
         with:
           path: |
             /nix
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -175,7 +175,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e311089e2..719b5b152 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -156,7 +156,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -199,7 +199,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -232,7 +232,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -266,7 +266,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -310,7 +310,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -387,7 +387,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -433,7 +433,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -462,7 +462,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -495,7 +495,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -541,7 +541,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -801,7 +801,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -843,7 +843,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -891,7 +891,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -926,7 +926,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -1001,7 +1001,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -1032,7 +1032,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -1074,7 +1074,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -1105,7 +1105,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -1135,7 +1135,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -1193,7 +1193,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -1221,7 +1221,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -1249,7 +1249,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -1282,7 +1282,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -1310,7 +1310,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -1347,7 +1347,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
@@ -1409,7 +1409,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
diff --git a/.github/workflows/update-colorschemes.yml b/.github/workflows/update-colorschemes.yml
index 762b3d007..4c159a815 100644
--- a/.github/workflows/update-colorschemes.yml
+++ b/.github/workflows/update-colorschemes.yml
@@ -29,7 +29,7 @@ jobs:
             /zig
 
       - name: Setup Nix
-        uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+        uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16

From 6dd5b856b05fbcb76f415ad18fbdfac600c3abde Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 10 Mar 2026 19:40:52 -0700
Subject: [PATCH 108/391] macos: disable Tahoe one-time codes

This disables all the automatic one-time code inputs in Ghostty.
It'd be really neat to actually dynamically change this (not sure if its
possible with NSTextContext or how often thats cached) but for now we
should just fully disable it.
---
 macos/Ghostty-Info.plist | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/macos/Ghostty-Info.plist b/macos/Ghostty-Info.plist
index 01ccd7b11..7ffe12c39 100644
--- a/macos/Ghostty-Info.plist
+++ b/macos/Ghostty-Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSAutoFillRequiresTextContentTypeForOneTimeCodeOnMac</key>
+	<true/>
 	<key>NSDockTilePlugIn</key>
 	<string>DockTilePlugin.plugin</string>
 	<key>CFBundleDocumentTypes</key>

From ad6d3665c29b7e2db4da7e2a5fe67239d0f3df32 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Wed, 11 Mar 2026 02:23:12 -0500
Subject: [PATCH 109/391] gtk: fix +new-window `--working-directory`
 inferrence.

If the CLI argument `--working-directory` is not used with
`+new-window`, the current working directory that `ghostty +new-window`
is run from will be appended to the list of configuration data sent
to the main Ghostty process. If `-e` _was_ used on the CLI, the
`--working-directory` that was appended will be interpreted as part of
the command to be executed, likely causing it to fail.

Instead, insert `--working-directory` at the beginning of the list of
configuration that it sent to the main Ghostty process.

Fixes #11356
---
 src/cli/new_window.zig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cli/new_window.zig b/src/cli/new_window.zig
index 12acafadf..a89c4ffab 100644
--- a/src/cli/new_window.zig
+++ b/src/cli/new_window.zig
@@ -198,7 +198,8 @@ fn runArgs(
         const cwd: std.fs.Dir = std.fs.cwd();
         var buf: [std.fs.max_path_bytes]u8 = undefined;
         const wd = try cwd.realpath(".", &buf);
-        try opts._arguments.append(alloc, try std.fmt.allocPrintSentinel(alloc, "--working-directory={s}", .{wd}, 0));
+        // This should be inserted at the beginning of the list, just in case `-e` was used.
+        try opts._arguments.insert(alloc, 0, try std.fmt.allocPrintSentinel(alloc, "--working-directory={s}", .{wd}, 0));
     }
 
     var arena = ArenaAllocator.init(alloc_gpa);

From a644fca5c5e74850312f13ed69f9677556abcd27 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Wed, 11 Mar 2026 08:02:29 +0000
Subject: [PATCH 110/391] Update VOUCHED list (#11360)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11358#discussioncomment-16080010)
from @jcollie.

Vouch: @puzza007

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 90058c813..f680a6570 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -138,6 +138,7 @@ pluiedev
 pouwerkerk
 prakhar54-byte
 priyans-hu
+puzza007
 qwerasd205
 reo101
 rgehan

From 82a805296c3b45235571ecfa3b75821d9ca264b5 Mon Sep 17 00:00:00 2001
From: Paul Oliver <puzza007@gmail.com>
Date: Wed, 11 Mar 2026 21:09:03 +1300
Subject: [PATCH 111/391] docs: fix backtick rendering in selection-word-chars
 default value

The default value contains a literal backtick which broke inline code
rendering on the website. Use double backtick delimiters to properly
contain it.
---
 src/config/Config.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/Config.zig b/src/config/Config.zig
index f496a4cf2..676a9554e 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -749,7 +749,7 @@ foreground: Color = .{ .r = 0xFF, .g = 0xFF, .b = 0xFF },
 /// The null character (U+0000) is always treated as a boundary and does not
 /// need to be included in this configuration.
 ///
-/// Default: ` \t'"│`|:;,()[]{}<>$`
+/// Default: `` \t'"│`|:;,()[]{}<>$ ``
 ///
 /// To add or remove specific characters, you can set this to a custom value.
 /// For example, to treat semicolons as part of words:

From 23f3cd5f101fedcff6350648f8ba3993e6c55d90 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Wed, 11 Mar 2026 10:07:54 -0400
Subject: [PATCH 112/391] zsh: improve prompt marking with dynamic themes

Replace the strip-in-preexec / re-add-in-precmd pattern for OSC 133
marks with a save/restore approach. Instead of pattern-matching marks
out of PS1 (which exposes PS1 in intermediate states to other hooks), we
save the original PS1/PS2 before adding marks and then restore them.

This also adds dynamic theme detection: if PS1 changed between cycles
(e.g., a theme rebuilt it), we skip injecting continuation marks into
newlines. This prevents breaking plugins like Pure that use pattern
matching to strip/rebuild the prompt.

Additionally, move _ghostty_precmd to the end of precmd_functions in
_ghostty_deferred_init (instead of substituting in-place) so that the
first prompt is properly marked even when other hooks were appended
after our auto-injection.

There's one scenario that we still don't complete cover:

    precmd_functions+=(_test_overwrite_ps1)
    _test_overwrite_ps1() {
        PS1="test> "
    }

... which results in the first prompt not printing its prompt marks
because _test_overwrite_ps1 becomes the last thing to run, overwriting
our marks, but this will be fixed for subsequent prompts when we move
our handler back to the last index.

Fixes: #11282
---
 src/shell-integration/zsh/ghostty-integration | 80 ++++++++++++-------
 1 file changed, 52 insertions(+), 28 deletions(-)

diff --git a/src/shell-integration/zsh/ghostty-integration b/src/shell-integration/zsh/ghostty-integration
index 7442546f8..dc9bd1605 100644
--- a/src/shell-integration/zsh/ghostty-integration
+++ b/src/shell-integration/zsh/ghostty-integration
@@ -131,32 +131,59 @@ _ghostty_deferred_init() {
                 # SIGCHLD if notify is set. Themes that update prompt
                 # asynchronously from a `zle -F` handler might still remove our
                 # marks. Oh well.
+
+                # Restore PS1/PS2 to their pre-mark state if nothing else has
+                # modified them since we last added marks. This avoids exposing
+                # PS1 with our marks to other hooks (which can break themes like
+                # Pure that use pattern matching to strip/rebuild the prompt).
+                # If PS1 was modified (by a theme, async update, etc.), we
+                # keep the modified version, prioritizing the theme's changes.
+                builtin local ps1_changed=0
+                if [[ -n ${_ghostty_saved_ps1+x} ]]; then
+                    if [[ $PS1 == $_ghostty_marked_ps1 ]]; then
+                        PS1=$_ghostty_saved_ps1
+                        PS2=$_ghostty_saved_ps2
+                    elif [[ $PS1 != $_ghostty_saved_ps1 ]]; then
+                        ps1_changed=1
+                    fi
+                fi
+
+                # Save the clean PS1/PS2 before we add marks.
+                _ghostty_saved_ps1=$PS1
+                _ghostty_saved_ps2=$PS2
+
+                # Add our marks. Since we always start from a clean PS1
+                # (either restored above or freshly set by a theme), we can
+                # unconditionally add mark1 and markB.
                 builtin local mark2=$'%{\e]133;A;k=s\a%}'
                 builtin local markB=$'%{\e]133;B\a%}'
-                # Add marks conditionally to avoid a situation where we have
-                # several marks in place. These conditions can have false
-                # positives and false negatives though.
-                #
-                # - False positive (with prompt_percent): PS1="%(?.$mark1.)"
-                # - False negative (with prompt_subst):   PS1='$mark1'
-                [[ $PS1 == *$mark1* ]] || PS1=${mark1}${PS1}
-                [[ $PS1 == *$markB* ]] || PS1=${PS1}${markB}
+                PS1=${mark1}${PS1}${markB}
+
                 # Handle multiline prompts by marking newline-separated
                 # continuation lines with k=s (mark2). We skip the newline
                 # immediately after mark1 to avoid introducing a double
                 # newline due to OSC 133;A's fresh-line behavior.
-                if [[ $PS1 == ${mark1}$'\n'* ]]; then
-                    builtin local rest=${PS1#${mark1}$'\n'}
-                    if [[ $rest == *$'\n'* ]]; then
-                        PS1=${mark1}$'\n'${rest//$'\n'/$'\n'${mark2}}
+                #
+                # We skip this when PS1 changed because injecting marks into
+                # newlines can break pattern matching in themes that
+                # strip/rebuild the prompt dynamically (e.g., Pure).
+                if (( ! ps1_changed )) && [[ $PS1 == *$'\n'* ]]; then
+                    if [[ $PS1 == ${mark1}$'\n'* ]]; then
+                        builtin local rest=${PS1#${mark1}$'\n'}
+                        if [[ $rest == *$'\n'* ]]; then
+                            PS1=${mark1}$'\n'${rest//$'\n'/$'\n'${mark2}}
+                        fi
+                    else
+                        PS1=${PS1//$'\n'/$'\n'${mark2}}
                     fi
-                elif [[ $PS1 == *$'\n'* ]]; then
-                    PS1=${PS1//$'\n'/$'\n'${mark2}}
                 fi
 
                 # PS2 mark is needed when clearing the prompt on resize
-                [[ $PS2 == *$mark2* ]] || PS2=${mark2}${PS2}
-                [[ $PS2 == *$markB* ]] || PS2=${PS2}${markB}
+                PS2=${mark2}${PS2}${markB}
+
+                # Save the marked PS1 so we can detect modifications
+                # by other hooks in the next cycle.
+                _ghostty_marked_ps1=$PS1
                 (( _ghostty_state = 2 ))
             else
                 # If our precmd hook is not the last, we cannot rely on prompt
@@ -188,17 +215,14 @@ _ghostty_deferred_init() {
     _ghostty_preexec() {
         builtin emulate -L zsh -o no_warn_create_global -o no_aliases
 
-        # This can potentially break user prompt. Oh well. The robustness of
-        # this code can be improved in the case prompt_subst is set because
-        # it'll allow us distinguish (not perfectly but close enough) between
-        # our own prompt, user prompt, and our own prompt with user additions on
-        # top. We cannot force prompt_subst on the user though, so we would
-        # still need this code for the no_prompt_subst case.
-        PS1=${PS1//$'%{\e]133;A;cl=line\a%}'}
-        PS1=${PS1//$'%{\e]133;A;k=s\a%}'}
-        PS1=${PS1//$'%{\e]133;B\a%}'}
-        PS2=${PS2//$'%{\e]133;A;k=s\a%}'}
-        PS2=${PS2//$'%{\e]133;B\a%}'}
+        # Restore the original PS1/PS2 if nothing else has modified them
+        # since our precmd added marks. This ensures other preexec hooks
+        # see a clean PS1 without our marks. If PS1 was modified (e.g.,
+        # by an async theme update), we leave it alone.
+        if [[ -n ${_ghostty_saved_ps1+x} && $PS1 == $_ghostty_marked_ps1 ]]; then
+            PS1=$_ghostty_saved_ps1
+            PS2=$_ghostty_saved_ps2
+        fi
 
         # This will work incorrectly in the presence of a preexec hook that
         # prints. For example, if MichaelAquilina/zsh-you-should-use installs
@@ -419,7 +443,7 @@ _ghostty_deferred_init() {
 
     builtin typeset -ag precmd_functions
     if (( $+functions[_ghostty_precmd] )); then
-        precmd_functions=(${precmd_functions:/_ghostty_deferred_init/_ghostty_precmd})
+        precmd_functions=(${precmd_functions:#_ghostty_deferred_init} _ghostty_precmd)
         _ghostty_precmd
     else
         precmd_functions=(${precmd_functions:#_ghostty_deferred_init})

From 87e496b30ff62a08e6dbdea651d86ea18b50493a Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Wed, 11 Mar 2026 14:17:51 +0000
Subject: [PATCH 113/391] Update VOUCHED list (#11368)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11365#issuecomment-4039534706)
from @mitchellh.

Vouch: @ydah

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index f680a6570..044adc003 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -163,5 +163,6 @@ uzaaft
 vaughanandrews
 vlsi
 yamshta
+ydah
 zenyr
 zeshi09

From c2206542d3bcb1b88eb4196620e553dad0717ca4 Mon Sep 17 00:00:00 2001
From: ydah <t.yudai92@gmail.com>
Date: Wed, 11 Mar 2026 21:33:16 +0900
Subject: [PATCH 114/391] macos: fix tab title rename hit testing and focus
 handling in fullscreen mode

---
 .../Extensions/NSWindow+Extension.swift       | 12 ++++--
 macos/Sources/Helpers/TabTitleEditor.swift    | 43 +++++++++++++++----
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/macos/Sources/Helpers/Extensions/NSWindow+Extension.swift b/macos/Sources/Helpers/Extensions/NSWindow+Extension.swift
index 3c5cbd23a..46758a42d 100644
--- a/macos/Sources/Helpers/Extensions/NSWindow+Extension.swift
+++ b/macos/Sources/Helpers/Extensions/NSWindow+Extension.swift
@@ -85,13 +85,17 @@ extension NSWindow {
 
     /// Returns the visual tab index and matching tab button at the given screen point.
     func tabButtonHit(atScreenPoint screenPoint: NSPoint) -> (index: Int, tabButton: NSView)? {
-        guard let tabBarView else { return nil }
-        let locationInWindow = convertPoint(fromScreen: screenPoint)
-        let locationInTabBar = tabBarView.convert(locationInWindow, from: nil)
+        guard let tabBarView, let tabBarWindow = tabBarView.window else { return nil }
+
+        // In fullscreen, AppKit can host the titlebar and tab bar in a separate
+        // NSToolbarFullScreenWindow. Hit testing has to use that window's base
+        // coordinate space or content clicks can be misinterpreted as tab clicks.
+        let locationInTabBarWindow = tabBarWindow.convertPoint(fromScreen: screenPoint)
+        let locationInTabBar = tabBarView.convert(locationInTabBarWindow, from: nil)
         guard tabBarView.bounds.contains(locationInTabBar) else { return nil }
 
         for (index, tabButton) in tabButtonsInVisualOrder().enumerated() {
-            let locationInTabButton = tabButton.convert(locationInWindow, from: nil)
+            let locationInTabButton = tabButton.convert(locationInTabBarWindow, from: nil)
             if tabButton.bounds.contains(locationInTabButton) {
                 return (index, tabButton)
             }
diff --git a/macos/Sources/Helpers/TabTitleEditor.swift b/macos/Sources/Helpers/TabTitleEditor.swift
index 570be1bf4..4be2c5306 100644
--- a/macos/Sources/Helpers/TabTitleEditor.swift
+++ b/macos/Sources/Helpers/TabTitleEditor.swift
@@ -40,6 +40,8 @@ final class TabTitleEditor: NSObject, NSTextFieldDelegate {
     private weak var hostWindow: NSWindow?
     /// Delegate that provides and commits title data for target tab windows.
     private weak var delegate: TabTitleEditorDelegate?
+    /// Local event monitor so fullscreen titlebar-window clicks can also trigger rename.
+    private var eventMonitor: Any?
 
     /// Active inline editor view, if editing is in progress.
     private weak var inlineTitleEditor: NSTextField?
@@ -52,8 +54,24 @@ final class TabTitleEditor: NSObject, NSTextFieldDelegate {
 
     /// Creates a coordinator bound to a host window and rename delegate.
     init(hostWindow: NSWindow, delegate: TabTitleEditorDelegate) {
+        super.init()
+
         self.hostWindow = hostWindow
         self.delegate = delegate
+
+        // This is needed so that fullscreen clicks can register since they won't
+        // event on the NSWindow. We may want to tighten this up in the future by
+        // only doing this if we're fullscreen.
+        self.eventMonitor = NSEvent.addLocalMonitorForEvents(matching: [.leftMouseDown]) { [weak self] event in
+            guard let self else { return event }
+            return handleMouseDown(event) ? nil : event
+        }
+    }
+
+    deinit {
+        if let eventMonitor {
+            NSEvent.removeMonitor(eventMonitor)
+        }
     }
 
     /// Handles leftMouseDown events from the host window and begins inline edit if possible. If this
@@ -64,8 +82,15 @@ final class TabTitleEditor: NSObject, NSTextFieldDelegate {
         // If we don't have a host window to look up the click, we do nothing.
         guard let hostWindow else { return false }
 
+        // In native fullscreen, AppKit can route titlebar clicks through a detached
+        // NSToolbarFullScreenWindow. Only allow clicks from the host window or its
+        // fullscreen tab bar window so rename handling stays scoped to this tab strip.
+        let sourceWindow = event.window ?? hostWindow
+        guard sourceWindow === hostWindow || sourceWindow === hostWindow.tabBarView?.window
+        else { return false }
+
         // Find the tab window that is being clicked.
-        let locationInScreen = hostWindow.convertPoint(toScreen: event.locationInWindow)
+        let locationInScreen = sourceWindow.convertPoint(toScreen: event.locationInWindow)
         guard let tabIndex = hostWindow.tabIndex(atScreenPoint: locationInScreen),
               let targetWindow = hostWindow.tabbedWindows?[safe: tabIndex],
               delegate?.tabTitleEditor(self, canRenameTabFor: targetWindow) == true
@@ -171,9 +196,11 @@ final class TabTitleEditor: NSObject, NSTextFieldDelegate {
 
         // Focus after insertion so AppKit has created the field editor for this text field.
         DispatchQueue.main.async { [weak hostWindow, weak editor] in
-            guard let hostWindow, let editor else { return }
+            guard let editor else { return }
+            let responderWindow = editor.window ?? hostWindow
+            guard let responderWindow else { return }
             editor.isHidden = false
-            hostWindow.makeFirstResponder(editor)
+            responderWindow.makeFirstResponder(editor)
             if let fieldEditor = editor.currentEditor() as? NSTextView,
                let editorFont = editor.font {
                 fieldEditor.font = editorFont
@@ -204,11 +231,11 @@ final class TabTitleEditor: NSObject, NSTextFieldDelegate {
         inlineTitleTargetWindow = nil
 
         // Make sure the window grabs focus again
-        if let hostWindow {
-            if let currentEditor = editor.currentEditor(), hostWindow.firstResponder === currentEditor {
-                hostWindow.makeFirstResponder(nil)
-            } else if hostWindow.firstResponder === editor {
-                hostWindow.makeFirstResponder(nil)
+        if let responderWindow = editor.window ?? hostWindow {
+            if let currentEditor = editor.currentEditor(), responderWindow.firstResponder === currentEditor {
+                responderWindow.makeFirstResponder(nil)
+            } else if responderWindow.firstResponder === editor {
+                responderWindow.makeFirstResponder(nil)
             }
         }
 

From 26d8bd9e71c27f1f7f31a1079bee3ca79e79b205 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Wed, 11 Mar 2026 10:41:57 -0400
Subject: [PATCH 115/391] bash: fix multiline PS1 with command substitutions

Only replace the \n prompt escape when inserting secondary prompt marks,
not literal newlines ($'\n'). Literal newlines may appear inside $(...)
or `...` command substitutions, and inserting escape sequences there
breaks the shell syntax. For example:

      PS1='$(if [ $? -eq 0 ]; then echo -e "P";
                    else echo -e "F";
                    fi) $ '

The literal newlines between the if/else/fi are part of the shell syntax
inside the command substitution. The previous code replaced all literal
newlines in PS1 with newline + OSC 133 escape sequences, which injected
terminal escapes into the middle of the command substitution and caused
bash to report a syntax error when evaluating it.

The \n prompt escape is PS1-specific and safe to replace globally. This
means prompts using literal newlines for line breaks (rather than \n)
won't get per-line secondary marks, but this is the conventional form
and avoids the need for complex shell parsing.

Fixes: #11267
---
 src/shell-integration/bash/ghostty.bash | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/shell-integration/bash/ghostty.bash b/src/shell-integration/bash/ghostty.bash
index a369e8f75..6e516c730 100644
--- a/src/shell-integration/bash/ghostty.bash
+++ b/src/shell-integration/bash/ghostty.bash
@@ -201,14 +201,16 @@ function __ghostty_precmd() {
     PS1='\[\e]133;A;redraw=last;cl=line;aid='"$BASHPID"'\a\]'$PS1'\[\e]133;B\a\]'
     PS2='\[\e]133;A;k=s\a\]'$PS2'\[\e]133;B\a\]'
 
-    # Bash doesn't redraw the leading lines in a multiline prompt so
-    # we mark the start of each line (after each newline) as a secondary
-    # prompt. This correctly handles multiline prompts by setting the first
-    # to primary and the subsequent lines to secondary.
-    if [[ "${PS1}" == *"\n"* || "${PS1}" == *$'\n'* ]]; then
-      builtin local __ghostty_mark=$'\\[\\e]133;A;k=s\\a\\]'
-      PS1="${PS1//$'\n'/$'\n'$__ghostty_mark}"
-      PS1="${PS1//\\n/\\n$__ghostty_mark}"
+    # Bash doesn't redraw the leading lines in a multiline prompt so we mark
+    # the start of each line (after each newline) as a secondary prompt. This
+    # correctly handles multiline prompts by setting the first to primary and
+    # the subsequent lines to secondary.
+    #
+    # We only replace the \n prompt escape, not literal newlines ($'\n'),
+    # because literal newlines may appear inside $(...) command substitutions
+    # where inserting escape sequences would break shell syntax.
+    if [[ "$PS1" == *"\n"* ]]; then
+      PS1="${PS1//\\n/\\n$'\\[\\e]133;A;k=s\\a\\]'}"
     fi
 
     # Cursor

From f571c806fec71a7de5b5ca0afc35eed92fa3cf9f Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 11 Mar 2026 08:37:51 -0700
Subject: [PATCH 116/391] ci: skip vouched PRs for milestone attachment

---
 .github/workflows/milestone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/milestone.yml b/.github/workflows/milestone.yml
index 33a074159..05d1f83c8 100644
--- a/.github/workflows/milestone.yml
+++ b/.github/workflows/milestone.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: Set Milestone for PR
         uses: hustcer/milestone-action@ebed8d5daafd855a600d7e665c1b130f06d24130 # v3.1
-        if: github.event.pull_request.merged == true
+        if: github.event.pull_request.merged == true && !contains(github.event.pull_request.title, 'VOUCHED') && !startsWith(github.event.pull_request.title, 'ci:')
         with:
           action: bind-pr # `bind-pr` is the default action
           github-token: ${{ secrets.GITHUB_TOKEN }}

From 86c2a2e87faa5996ac856c65718c0765be3fa3d0 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 11 Mar 2026 09:25:08 -0700
Subject: [PATCH 117/391] input: add direct set_surface_title and set_tab_title
 actions

Fixes #11316

This mirrors the `prompt` actions (hence why there is no window action
here) and enables setting titles via keybind actions which importantly
lets this work via command palettes, App Intents, AppleScript, etc.
---
 include/ghostty.h                       |  2 ++
 macos/Sources/Ghostty/Ghostty.App.swift | 30 ++++++++++++++++++++++
 src/Surface.zig                         | 20 +++++++++++++++
 src/apprt/action.zig                    |  4 +++
 src/apprt/gtk/class/application.zig     | 25 ++++++++++++++++++
 src/input/Binding.zig                   | 34 +++++++++++++++++++++++++
 src/input/command.zig                   |  2 ++
 7 files changed, 117 insertions(+)

diff --git a/include/ghostty.h b/include/ghostty.h
index afd89542f..40ff55c9b 100644
--- a/include/ghostty.h
+++ b/include/ghostty.h
@@ -889,6 +889,7 @@ typedef enum {
   GHOSTTY_ACTION_RENDER_INSPECTOR,
   GHOSTTY_ACTION_DESKTOP_NOTIFICATION,
   GHOSTTY_ACTION_SET_TITLE,
+  GHOSTTY_ACTION_SET_TAB_TITLE,
   GHOSTTY_ACTION_PROMPT_TITLE,
   GHOSTTY_ACTION_PWD,
   GHOSTTY_ACTION_MOUSE_SHAPE,
@@ -937,6 +938,7 @@ typedef union {
   ghostty_action_inspector_e inspector;
   ghostty_action_desktop_notification_s desktop_notification;
   ghostty_action_set_title_s set_title;
+  ghostty_action_set_title_s set_tab_title;
   ghostty_action_prompt_title_e prompt_title;
   ghostty_action_pwd_s pwd;
   ghostty_action_mouse_shape_e mouse_shape;
diff --git a/macos/Sources/Ghostty/Ghostty.App.swift b/macos/Sources/Ghostty/Ghostty.App.swift
index d57c2ea11..a341df59a 100644
--- a/macos/Sources/Ghostty/Ghostty.App.swift
+++ b/macos/Sources/Ghostty/Ghostty.App.swift
@@ -539,6 +539,9 @@ extension Ghostty {
             case GHOSTTY_ACTION_SET_TITLE:
                 setTitle(app, target: target, v: action.action.set_title)
 
+            case GHOSTTY_ACTION_SET_TAB_TITLE:
+                return setTabTitle(app, target: target, v: action.action.set_tab_title)
+
             case GHOSTTY_ACTION_PROMPT_TITLE:
                 return promptTitle(app, target: target, v: action.action.prompt_title)
 
@@ -1602,6 +1605,33 @@ extension Ghostty {
             }
         }
 
+        private static func setTabTitle(
+            _ app: ghostty_app_t,
+            target: ghostty_target_s,
+            v: ghostty_action_set_title_s
+        ) -> Bool {
+            switch target.tag {
+            case GHOSTTY_TARGET_APP:
+                Ghostty.logger.warning("set tab title does nothing with an app target")
+                return false
+
+            case GHOSTTY_TARGET_SURFACE:
+                guard let title = String(cString: v.title!, encoding: .utf8) else { return false }
+                let titleOverride = title.isEmpty ? nil : title
+                guard let surface = target.target.surface else { return false }
+                guard let surfaceView = self.surfaceView(from: surface) else { return false }
+                guard let window = surfaceView.window,
+                      let controller = window.windowController as? BaseTerminalController
+                else { return false }
+                controller.titleOverride = titleOverride
+                return true
+
+            default:
+                assertionFailure()
+                return false
+            }
+        }
+
         private static func copyTitleToClipboard(
             _ app: ghostty_app_t,
             target: ghostty_target_s) -> Bool {
diff --git a/src/Surface.zig b/src/Surface.zig
index b78812ac4..4d66622e3 100644
--- a/src/Surface.zig
+++ b/src/Surface.zig
@@ -5482,6 +5482,26 @@ pub fn performBindingAction(self: *Surface, action: input.Binding.Action) !bool
             .tab,
         ),
 
+        .set_surface_title => |v| {
+            const title = try self.alloc.dupeZ(u8, v);
+            defer self.alloc.free(title);
+            return try self.rt_app.performAction(
+                .{ .surface = self },
+                .set_title,
+                .{ .title = title },
+            );
+        },
+
+        .set_tab_title => |v| {
+            const title = try self.alloc.dupeZ(u8, v);
+            defer self.alloc.free(title);
+            return try self.rt_app.performAction(
+                .{ .surface = self },
+                .set_tab_title,
+                .{ .title = title },
+            );
+        },
+
         .clear_screen => {
             // This is a duplicate of some of the logic in termio.clearScreen
             // but we need to do this here so we can know the answer before
diff --git a/src/apprt/action.zig b/src/apprt/action.zig
index 55e80a700..f6865af83 100644
--- a/src/apprt/action.zig
+++ b/src/apprt/action.zig
@@ -201,6 +201,9 @@ pub const Action = union(Key) {
     /// Set the title of the target to the requested value.
     set_title: SetTitle,
 
+    /// Set the tab title override for the target's tab.
+    set_tab_title: SetTitle,
+
     /// Set the title of the target to a prompted value. It is up to
     /// the apprt to prompt. The value specifies whether to prompt for the
     /// surface title or the tab title.
@@ -375,6 +378,7 @@ pub const Action = union(Key) {
         render_inspector,
         desktop_notification,
         set_title,
+        set_tab_title,
         prompt_title,
         pwd,
         mouse_shape,
diff --git a/src/apprt/gtk/class/application.zig b/src/apprt/gtk/class/application.zig
index c3ff51e0f..039e853aa 100644
--- a/src/apprt/gtk/class/application.zig
+++ b/src/apprt/gtk/class/application.zig
@@ -740,6 +740,7 @@ pub const Application = extern struct {
             .scrollbar => Action.scrollbar(target, value),
 
             .set_title => Action.setTitle(target, value),
+            .set_tab_title => return Action.setTabTitle(target, value),
 
             .show_child_exited => return Action.showChildExited(target, value),
 
@@ -2545,6 +2546,30 @@ const Action = struct {
         }
     }
 
+    pub fn setTabTitle(
+        target: apprt.Target,
+        value: apprt.action.SetTitle,
+    ) bool {
+        switch (target) {
+            .app => {
+                log.warn("set_tab_title to app is unexpected", .{});
+                return false;
+            },
+            .surface => |core| {
+                const surface = core.rt_surface.surface;
+                const tab = ext.getAncestor(
+                    Tab,
+                    surface.as(gtk.Widget),
+                ) orelse {
+                    log.warn("surface is not in a tab, ignoring set_tab_title", .{});
+                    return false;
+                };
+                tab.setTitleOverride(if (value.title.len == 0) null else value.title);
+                return true;
+            },
+        }
+    }
+
     pub fn showChildExited(
         target: apprt.Target,
         value: apprt.surface.Message.ChildExited,
diff --git a/src/input/Binding.zig b/src/input/Binding.zig
index 286c8f2ed..62a4e39ac 100644
--- a/src/input/Binding.zig
+++ b/src/input/Binding.zig
@@ -577,6 +577,16 @@ pub const Action = union(enum) {
     /// and persists across focus changes within the tab.
     prompt_tab_title,
 
+    /// Set the title for the current focused surface.
+    ///
+    /// If the title is empty, the surface title is reset to an empty title.
+    set_surface_title: []const u8,
+
+    /// Set the title for the current focused tab.
+    ///
+    /// If the title is empty, the tab title override is cleared.
+    set_tab_title: []const u8,
+
     /// Create a new split in the specified direction.
     ///
     /// Valid arguments:
@@ -1324,6 +1334,8 @@ pub const Action = union(enum) {
             .set_font_size,
             .prompt_surface_title,
             .prompt_tab_title,
+            .set_surface_title,
+            .set_tab_title,
             .clear_screen,
             .select_all,
             .scroll_to_top,
@@ -3292,6 +3304,16 @@ test "parse: action with string" {
         try testing.expect(binding.action == .esc);
         try testing.expectEqualStrings("A", binding.action.esc);
     }
+    {
+        const binding = try parseSingle("a=set_surface_title:surface");
+        try testing.expect(binding.action == .set_surface_title);
+        try testing.expectEqualStrings("surface", binding.action.set_surface_title);
+    }
+    {
+        const binding = try parseSingle("a=set_tab_title:tab");
+        try testing.expect(binding.action == .set_tab_title);
+        try testing.expectEqualStrings("tab", binding.action.set_tab_title);
+    }
 }
 
 test "parse: action with enum" {
@@ -4557,6 +4579,18 @@ test "action: format" {
     try testing.expectEqualStrings("text:\\xf0\\x9f\\x91\\xbb", buf.written());
 }
 
+test "action: format set title" {
+    const testing = std.testing;
+    const alloc = testing.allocator;
+
+    const a: Action = .{ .set_tab_title = "foo bar" };
+
+    var buf: std.Io.Writer.Allocating = .init(alloc);
+    defer buf.deinit();
+    try a.format(&buf.writer);
+    try testing.expectEqualStrings("set_tab_title:foo bar", buf.written());
+}
+
 test "set: appendChain with no parent returns error" {
     const testing = std.testing;
     const alloc = testing.allocator;
diff --git a/src/input/command.zig b/src/input/command.zig
index f50e6840b..ac048eec0 100644
--- a/src/input/command.zig
+++ b/src/input/command.zig
@@ -689,6 +689,8 @@ fn actionCommands(action: Action.Key) []const Command {
         .esc,
         .cursor_key,
         .set_font_size,
+        .set_surface_title,
+        .set_tab_title,
         .search,
         .scroll_to_row,
         .scroll_page_fractional,

From a8d38fe5d807e8cf18f99dcef117355d02048d7c Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Wed, 11 Mar 2026 16:28:08 +0000
Subject: [PATCH 118/391] Update VOUCHED list (#11374)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11372#discussioncomment-16086042)
from @mitchellh.

Vouch: @faukah

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 044adc003..3f52c09a9 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -65,6 +65,7 @@ dzhlobo
 elias8
 ephemera
 eriksremess
+faukah
 filip7
 flou
 francescarpi

From 9503fa0786d3e79a5862361ae59db6d5972b4eae Mon Sep 17 00:00:00 2001
From: faukah <fau@faukah.com>
Date: Wed, 11 Mar 2026 16:49:30 +0100
Subject: [PATCH 119/391] nix: bump zig-overlay version

---
 flake.lock | 32 ++++++--------------------------
 flake.nix  |  2 --
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6f12f66b9..b8e6d9263 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,24 +16,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -70,7 +52,6 @@
     "root": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "zig": "zig",
@@ -78,6 +59,7 @@
       }
     },
     "systems": {
+      "flake": false,
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -97,19 +79,17 @@
         "flake-compat": [
           "flake-compat"
         ],
-        "flake-utils": [
-          "flake-utils"
-        ],
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1763295135,
-        "narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=",
+        "lastModified": 1773145353,
+        "narHash": "sha256-dE8zx8WA54TRmFFQBvA48x/sXGDTP7YaDmY6nNKMAYw=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a",
+        "rev": "8666155d83bf792956a7c40915508e6d4b2b8716",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index e063f2d70..61ca39ab1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,6 @@
     # Gnome 49/Gtk 4.20.
     #
     nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
-    flake-utils.url = "github:numtide/flake-utils";
 
     # Used for shell.nix
     flake-compat = {
@@ -22,7 +21,6 @@
       url = "github:mitchellh/zig-overlay";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
         flake-compat.follows = "flake-compat";
       };
     };

From 0af9938ad2f2fb84d8e00501716933029bc0ba65 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Wed, 11 Mar 2026 16:26:26 +0100
Subject: [PATCH 120/391] macos: add UI test for window position restore across
 titlebar styles

Tests that window position and size are correctly restored after
reopen for all four macos-titlebar-style variants.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../GhosttyWindowPositionUITests.swift        | 158 ++++++++++++++++++
 1 file changed, 158 insertions(+)
 create mode 100644 macos/GhosttyUITests/GhosttyWindowPositionUITests.swift

diff --git a/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift b/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
new file mode 100644
index 000000000..53a0d800a
--- /dev/null
+++ b/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
@@ -0,0 +1,158 @@
+//
+//  GhosttyWindowPositionUITests.swift
+//  GhosttyUITests
+//
+//  Created by Claude on 2026-03-11.
+//
+
+import XCTest
+
+final class GhosttyWindowPositionUITests: GhosttyCustomConfigCase {
+    override static var runsForEachTargetApplicationUIConfiguration: Bool { false }
+
+    // MARK: - Restore round-trip per titlebar style
+
+    @MainActor func testRestoredNative() throws { try runRestoreTest(titlebarStyle: "native") }
+    @MainActor func testRestoredHidden() throws { try runRestoreTest(titlebarStyle: "hidden") }
+    @MainActor func testRestoredTransparent() throws { try runRestoreTest(titlebarStyle: "transparent") }
+    @MainActor func testRestoredTabs() throws { try runRestoreTest(titlebarStyle: "tabs") }
+
+    // MARK: - Config overrides cached position/size
+
+    @MainActor
+    func testConfigOverridesCachedPositionAndSize() async throws {
+        // Launch maximized so the cached frame is fullscreen-sized.
+        try updateConfig(
+            """
+            maximize = true
+            title = "GhosttyWindowPositionUITests"
+            """
+        )
+
+        let app = try ghosttyApplication()
+        app.launch()
+
+        let window = app.windows.firstMatch
+        XCTAssertTrue(window.waitForExistence(timeout: 5), "Window should appear")
+
+        let maximizedFrame = window.frame
+
+        // Now update the config with a small explicit size and position,
+        // reload, and open a new window. It should respect the config, not the cache.
+        try updateConfig(
+            """
+            window-position-x = 50
+            window-position-y = 50
+            window-width = 30
+            window-height = 30
+            title = "GhosttyWindowPositionUITests"
+            """
+        )
+        app.typeKey(",", modifierFlags: [.command, .shift])
+        try await Task.sleep(for: .seconds(0.5))
+        app.typeKey("n", modifierFlags: [.command])
+
+        XCTAssertEqual(app.windows.count, 2, "Should have 2 windows")
+        let newWindow = app.windows.element(boundBy: 0)
+        let newFrame = newWindow.frame
+
+        // The new window should be smaller than the maximized one.
+        XCTAssertLessThan(newFrame.size.width, maximizedFrame.size.width,
+                          "30 columns should be narrower than maximized")
+        XCTAssertLessThan(newFrame.size.height, maximizedFrame.size.height,
+                          "30 rows should be shorter than maximized")
+
+        app.terminate()
+    }
+
+    // MARK: - Size-only config change preserves position
+
+    @MainActor
+    func testSizeOnlyConfigPreservesPosition() async throws {
+        // Launch maximized so the window has a known position (top-left of visible frame).
+        try updateConfig(
+            """
+            maximize = true
+            title = "GhosttyWindowPositionUITests"
+            """
+        )
+
+        let app = try ghosttyApplication()
+        app.launch()
+
+        let window = app.windows.firstMatch
+        XCTAssertTrue(window.waitForExistence(timeout: 5), "Window should appear")
+
+        let initialFrame = window.frame
+
+        // Reload with only size changed, close current window, open new one.
+        // Position should be restored from cache.
+        try updateConfig(
+            """
+            window-width = 30
+            window-height = 30
+            title = "GhosttyWindowPositionUITests"
+            """
+        )
+        app.typeKey(",", modifierFlags: [.command, .shift])
+        try await Task.sleep(for: .seconds(0.5))
+        app.typeKey("w", modifierFlags: [.command])
+        app.typeKey("n", modifierFlags: [.command])
+
+        let newWindow = app.windows.firstMatch
+        XCTAssertTrue(newWindow.waitForExistence(timeout: 5), "New window should appear")
+
+        let newFrame = newWindow.frame
+
+        // Position should be preserved from the cached value.
+        // Compare x and maxY since the window is anchored at the top-left
+        // but AppKit uses bottom-up coordinates (origin.y changes with height).
+        XCTAssertEqual(newFrame.origin.x, initialFrame.origin.x, accuracy: 2,
+                        "x position should not change with size-only config")
+        XCTAssertEqual(newFrame.maxY, initialFrame.maxY, accuracy: 2,
+                        "top edge (maxY) should not change with size-only config")
+
+        app.terminate()
+    }
+
+    // MARK: - Shared round-trip helper
+
+    /// Opens a new window, records its frame, closes it, opens another,
+    /// and verifies the frame is restored consistently.
+    private func runRestoreTest(titlebarStyle: String) throws {
+        try updateConfig(
+            """
+            macos-titlebar-style = \(titlebarStyle)
+            title = "GhosttyWindowPositionUITests"
+            """
+        )
+
+        let app = try ghosttyApplication()
+        app.launch()
+
+        let window = app.windows.firstMatch
+        XCTAssertTrue(window.waitForExistence(timeout: 5), "Window should appear")
+
+        let firstFrame = window.frame
+
+        // Close the window and open a new one — it should restore the same frame.
+        app.typeKey("w", modifierFlags: [.command])
+        app.typeKey("n", modifierFlags: [.command])
+
+        let window2 = app.windows.firstMatch
+        XCTAssertTrue(window2.waitForExistence(timeout: 5), "New window should appear")
+
+        let restoredFrame = window2.frame
+
+        XCTAssertEqual(restoredFrame.origin.x, firstFrame.origin.x, accuracy: 2,
+                        "[\(titlebarStyle)] x position should be restored")
+        XCTAssertEqual(restoredFrame.origin.y, firstFrame.origin.y, accuracy: 2,
+                        "[\(titlebarStyle)] y position should be restored")
+        XCTAssertEqual(restoredFrame.size.width, firstFrame.size.width, accuracy: 2,
+                        "[\(titlebarStyle)] width should be restored")
+        XCTAssertEqual(restoredFrame.size.height, firstFrame.size.height, accuracy: 2,
+                        "[\(titlebarStyle)] height should be restored")
+
+        app.terminate()
+    }
+}

From e8c82ca1af29a8e911f328abe89bcc2650ec1705 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Wed, 11 Mar 2026 17:33:37 +0100
Subject: [PATCH 121/391] macOS: save frame only if the window is visible

---
 .../Features/Terminal/TerminalController.swift       | 12 +++---------
 macos/Sources/Helpers/LastWindowPosition.swift       |  9 ++++++++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index 20b51ff36..352bca475 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -1171,27 +1171,21 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         self.fixTabBar()
 
         // Whenever we move save our last position for the next start.
-        if let window {
-            LastWindowPosition.shared.save(window)
-        }
+        LastWindowPosition.shared.save(window)
     }
 
     override func windowDidResize(_ notification: Notification) {
         super.windowDidResize(notification)
 
         // Whenever we resize save our last position and size for the next start.
-        if let window {
-            LastWindowPosition.shared.save(window)
-        }
+        LastWindowPosition.shared.save(window)
     }
 
     func windowDidBecomeMain(_ notification: Notification) {
         // Whenever we get focused, use that as our last window position for
         // restart. This differs from Terminal.app but matches iTerm2 behavior
         // and I think its sensible.
-        if let window {
-            LastWindowPosition.shared.save(window)
-        }
+        LastWindowPosition.shared.save(window)
 
         // Remember our last main
         Self.lastMain = self
diff --git a/macos/Sources/Helpers/LastWindowPosition.swift b/macos/Sources/Helpers/LastWindowPosition.swift
index 5a9ce1d2c..3395e07f0 100644
--- a/macos/Sources/Helpers/LastWindowPosition.swift
+++ b/macos/Sources/Helpers/LastWindowPosition.swift
@@ -6,10 +6,17 @@ class LastWindowPosition {
 
     private let positionKey = "NSWindowLastPosition"
 
-    func save(_ window: NSWindow) {
+    @discardableResult
+    func save(_ window: NSWindow?) -> Bool {
+        // We should only save the frame if the window is visible.
+        // This avoids overriding the previously saved one
+        // with the wrong one when window decorations change while creating,
+        // e.g. adding a toolbar affects the window's frame.
+        guard let window, window.isVisible else { return false }
         let frame = window.frame
         let rect = [frame.origin.x, frame.origin.y, frame.size.width, frame.size.height]
         UserDefaults.standard.set(rect, forKey: positionKey)
+        return true
     }
 
     func restore(_ window: NSWindow) -> Bool {

From 45d360dc6879a80ca55f6f01ea36d9161732e099 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Wed, 11 Mar 2026 17:35:23 +0100
Subject: [PATCH 122/391] macOS: set the initial window position after window
 is loaded

---
 .../Features/Terminal/TerminalController.swift        | 10 ++++++++++
 .../Terminal/Window Styles/TerminalWindow.swift       | 11 +++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index 352bca475..749e5b472 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -1061,6 +1061,16 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
             }
         }
 
+        // Set the initial window position. This must happen after the window
+        // is fully set up (content view, toolbar, default size) so that
+        // decorations added by subclass awakeFromNib (e.g. toolbar for tabs
+        // style) don't change the frame after the position is restored.
+        if let terminalWindow = window as? TerminalWindow {
+            terminalWindow.setInitialWindowPosition(
+                x: derivedConfig.windowPositionX,
+                y: derivedConfig.windowPositionY,
+            )
+        }
         // Store our initial frame so we can know our default later. This MUST
         // be after the defaultSize call above so that we don't re-apply our frame.
         // Note: we probably want to set this on the first frame change or something
diff --git a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift
index 60e96bb4d..b9dd3b10b 100644
--- a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
+++ b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
@@ -120,11 +120,10 @@ class TerminalWindow: NSWindow {
         // If window decorations are disabled, remove our title
         if !config.windowDecorations { styleMask.remove(.titled) }
 
-        // Set our window positioning to coordinates if config value exists, otherwise
-        // fallback to original centering behavior
-        setInitialWindowPosition(
-            x: config.windowPositionX,
-            y: config.windowPositionY)
+        // NOTE: setInitialWindowPosition is NOT called here because subclass
+        // awakeFromNib may add decorations (e.g. toolbar for tabs style) that
+        // change the frame. It is called from TerminalController.windowDidLoad
+        // after the window is fully set up.
 
         // If our traffic buttons should be hidden, then hide them
         if config.macosWindowButtons == .hidden {
@@ -537,7 +536,7 @@ class TerminalWindow: NSWindow {
         terminalController?.updateColorSchemeForSurfaceTree()
     }
 
-    private func setInitialWindowPosition(x: Int16?, y: Int16?) {
+    func setInitialWindowPosition(x: Int16?, y: Int16?) {
         // If we don't have an X/Y then we try to use the previously saved window pos.
         guard let x = x, let y = y else {
             if !LastWindowPosition.shared.restore(self) {

From 596d502a756ce6454093b5d0782bc17d700804ab Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Wed, 11 Mar 2026 17:37:16 +0100
Subject: [PATCH 123/391] macOS: restore window frame under certain conditions

---
 .../Terminal/TerminalController.swift         |  7 ++++++
 .../Window Styles/TerminalWindow.swift        |  5 +----
 .../Sources/Helpers/LastWindowPosition.swift  | 22 +++++++++++++++----
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index 749e5b472..74b73ea00 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -1071,6 +1071,13 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
                 y: derivedConfig.windowPositionY,
             )
         }
+
+        LastWindowPosition.shared.restore(
+            window,
+            origin: derivedConfig.windowPositionX == nil && derivedConfig.windowPositionY == nil,
+            size: defaultSize == nil,
+        )
+
         // Store our initial frame so we can know our default later. This MUST
         // be after the defaultSize call above so that we don't re-apply our frame.
         // Note: we probably want to set this on the first frame change or something
diff --git a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift
index b9dd3b10b..560f45207 100644
--- a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
+++ b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
@@ -539,10 +539,7 @@ class TerminalWindow: NSWindow {
     func setInitialWindowPosition(x: Int16?, y: Int16?) {
         // If we don't have an X/Y then we try to use the previously saved window pos.
         guard let x = x, let y = y else {
-            if !LastWindowPosition.shared.restore(self) {
-                center()
-            }
-
+            center()
             return
         }
 
diff --git a/macos/Sources/Helpers/LastWindowPosition.swift b/macos/Sources/Helpers/LastWindowPosition.swift
index 3395e07f0..933eba394 100644
--- a/macos/Sources/Helpers/LastWindowPosition.swift
+++ b/macos/Sources/Helpers/LastWindowPosition.swift
@@ -19,7 +19,19 @@ class LastWindowPosition {
         return true
     }
 
-    func restore(_ window: NSWindow) -> Bool {
+    /// Restores a previously saved window frame (or parts of it) onto the given window.
+    ///
+    /// - Parameters:
+    ///   - window: The window whose frame should be updated.
+    ///   - restoreOrigin: Whether to restore the saved position. Pass `false` when the
+    ///     config specifies an explicit `window-position-x`/`window-position-y`.
+    ///   - restoreSize: Whether to restore the saved size. Pass `false` when the config
+    ///     specifies an explicit `window-width`/`window-height`.
+    /// - Returns: `true` if the frame was modified, `false` if there was nothing to restore.
+    @discardableResult
+    func restore(_ window: NSWindow, origin restoreOrigin: Bool = true, size restoreSize: Bool = true) -> Bool {
+        guard restoreOrigin || restoreSize else { return false }
+
         guard let values = UserDefaults.standard.array(forKey: positionKey) as? [Double],
               values.count >= 2 else { return false }
 
@@ -29,14 +41,16 @@ class LastWindowPosition {
         let visibleFrame = screen.visibleFrame
 
         var newFrame = window.frame
-        newFrame.origin = lastPosition
+        if restoreOrigin {
+            newFrame.origin = lastPosition
+        }
 
-        if values.count >= 4 {
+        if restoreSize, values.count >= 4 {
             newFrame.size.width = min(values[2], visibleFrame.width)
             newFrame.size.height = min(values[3], visibleFrame.height)
         }
 
-        if !visibleFrame.contains(newFrame.origin) {
+        if restoreOrigin, !visibleFrame.contains(newFrame.origin) {
             newFrame.origin.x = max(visibleFrame.minX, min(visibleFrame.maxX - newFrame.width, newFrame.origin.x))
             newFrame.origin.y = max(visibleFrame.minY, min(visibleFrame.maxY - newFrame.height, newFrame.origin.y))
         }

From e31615d00bf3811bdba4ae697c80fcb1ede3817a Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Wed, 11 Mar 2026 12:46:14 -0400
Subject: [PATCH 124/391] bash: fix extra newlines with readline vi mode
 indicator

Use OSC 133;P (prompt mark) instead of 133;A (fresh line + prompt mark)
inside PS1 and PS2. Readline redraws the prompt on vi mode switches,
Ctrl-L, and other events, and 133;A's fresh-line behavior would emit a
CR+LF whenever the cursor wasn't at column 0, causing visible extra
newlines.

The one-time 133;A is now emitted via printf in __ghostty_precmd, which
only runs once per prompt cycle via PROMPT_COMMAND. On SIGWINCH, bash
redraws PS1 (firing the 133;P marks) but doesn't re-run PROMPT_COMMAND,
so there's no unwanted fresh-line on resize either. The redraw=last flag
persists from the initial printf.

This is a little less optimal than our previous approach, in terms of
number of prompt marks we emit, but it produces an overall more correct
result, which is the important thing.

Because readline prints its output outside the scope of PS1, those
characters "inherit" the surrounded prompt scope. This is usually fine,
but it can sometimes get out of sync (especially during redraws). This
is inherently a limitation of the fact that it's a separate output
channel, so we just have to accept that can happen.

See: #11267
---
 src/shell-integration/bash/ghostty.bash | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/shell-integration/bash/ghostty.bash b/src/shell-integration/bash/ghostty.bash
index 6e516c730..48c89164b 100644
--- a/src/shell-integration/bash/ghostty.bash
+++ b/src/shell-integration/bash/ghostty.bash
@@ -195,11 +195,11 @@ function __ghostty_precmd() {
     _GHOSTTY_SAVE_PS1="$PS1"
     _GHOSTTY_SAVE_PS2="$PS2"
 
-    # Marks. We need to do fresh line (A) at the beginning of the prompt
-    # since if the cursor is not at the beginning of a line, the terminal
-    # will emit a newline.
-    PS1='\[\e]133;A;redraw=last;cl=line;aid='"$BASHPID"'\a\]'$PS1'\[\e]133;B\a\]'
-    PS2='\[\e]133;A;k=s\a\]'$PS2'\[\e]133;B\a\]'
+    # Use 133;P (not 133;A) inside PS1 to avoid fresh-line behavior on
+    # readline redraws (e.g., vi mode switches, Ctrl-L). The initial
+    # 133;A with fresh-line is emitted once via printf below.
+    PS1='\[\e]133;P;k=i\a\]'$PS1'\[\e]133;B\a\]'
+    PS2='\[\e]133;P;k=s\a\]'$PS2'\[\e]133;B\a\]'
 
     # Bash doesn't redraw the leading lines in a multiline prompt so we mark
     # the start of each line (after each newline) as a secondary prompt. This
@@ -210,7 +210,7 @@ function __ghostty_precmd() {
     # because literal newlines may appear inside $(...) command substitutions
     # where inserting escape sequences would break shell syntax.
     if [[ "$PS1" == *"\n"* ]]; then
-      PS1="${PS1//\\n/\\n$'\\[\\e]133;A;k=s\\a\\]'}"
+      PS1="${PS1//\\n/\\n$'\\[\\e]133;P;k=s\\a\\]'}"
     fi
 
     # Cursor
@@ -233,6 +233,9 @@ function __ghostty_precmd() {
     builtin printf "\e]133;D;%s;aid=%s\a" "$ret" "$BASHPID"
   fi
 
+  # Fresh line and start of prompt.
+  builtin printf "\e]133;A;redraw=last;cl=line;aid=%s\a" "$BASHPID"
+
   # unfortunately bash provides no hooks to detect cwd changes
   # in particular this means cwd reporting will not happen for a
   # command like cd /test && cat. PS0 is evaluated before cd is run.

From 12bc1e786052a31d6f50cdbb0a703b45371a182d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 11 Mar 2026 10:02:09 -0700
Subject: [PATCH 125/391] macos: only show the grab handle in fullscreen if
 there are splits

Fixes #11376
---
 .../Surface View/SurfaceGrabHandle.swift      | 46 ++++++++++++-------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/macos/Sources/Ghostty/Surface View/SurfaceGrabHandle.swift b/macos/Sources/Ghostty/Surface View/SurfaceGrabHandle.swift
index a8555e938..086511bb6 100644
--- a/macos/Sources/Ghostty/Surface View/SurfaceGrabHandle.swift	
+++ b/macos/Sources/Ghostty/Surface View/SurfaceGrabHandle.swift	
@@ -1,37 +1,49 @@
 import SwiftUI
 
 extension Ghostty {
-    /// A grab handle overlay at the top of the surface for dragging the window.
+    /// A grab handle overlay at the top of the surface for dragging a surface.
     struct SurfaceGrabHandle: View {
         @ObservedObject var surfaceView: SurfaceView
 
         @State private var isHovering: Bool = false
         @State private var isDragging: Bool = false
 
+        private var handleVisible: Bool {
+            // Handle should always be visible in non-fullscreen
+            guard let window = surfaceView.window else { return true }
+            guard window.styleMask.contains(.fullScreen) else { return true }
+
+            // If fullscreen, only show the handle if we have splits
+            guard let controller = window.windowController as? BaseTerminalController else { return false }
+            return controller.surfaceTree.isSplit
+        }
+
         private var ellipsisVisible: Bool {
             surfaceView.mouseOverSurface && surfaceView.cursorVisible
         }
 
         var body: some View {
-            ZStack {
-                SurfaceDragSource(
-                    surfaceView: surfaceView,
-                    isDragging: $isDragging,
-                    isHovering: $isHovering
-                )
-                .frame(width: 80, height: 12)
-                .contentShape(Rectangle())
+            if handleVisible {
+                ZStack {
+                    SurfaceDragSource(
+                        surfaceView: surfaceView,
+                        isDragging: $isDragging,
+                        isHovering: $isHovering
+                    )
+                    .frame(width: 80, height: 12)
+                    .contentShape(Rectangle())
 
-                if ellipsisVisible {
-                    Image(systemName: "ellipsis")
-                        .font(.system(size: 10, weight: .semibold))
-                        .foregroundColor(.primary.opacity(isHovering ? 0.8 : 0.3))
-                        .offset(y: -3)
-                        .allowsHitTesting(false)
-                        .transition(.opacity)
+                    if ellipsisVisible {
+                        Image(systemName: "ellipsis")
+                            .font(.system(size: 10, weight: .semibold))
+                            .foregroundColor(.primary.opacity(isHovering ? 0.8 : 0.3))
+                            .offset(y: -3)
+                            .allowsHitTesting(false)
+                            .transition(.opacity)
+                    }
                 }
+                .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
             }
-            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
         }
     }
 }

From fe98f3884d7dd72f0988949ab661beb018a191b4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 11 Mar 2026 10:37:57 -0700
Subject: [PATCH 126/391] macos: only show split grab handle when the mouse is
 near it

Fixes #11379

For this pass, I made it a very simple "within 20%" (height-wise) of the
split handle. There is no horizontal component. I want to find the right
balance between always visible (today mostly) to only visible on direct
hover, because I think it'll be too hard to discover on that far right
side.
---
 .../Surface View/SurfaceGrabHandle.swift      | 36 +++++++++++++++++--
 .../Surface View/SurfaceView_AppKit.swift     | 13 +++++--
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/macos/Sources/Ghostty/Surface View/SurfaceGrabHandle.swift b/macos/Sources/Ghostty/Surface View/SurfaceGrabHandle.swift
index 086511bb6..c5ab84124 100644
--- a/macos/Sources/Ghostty/Surface View/SurfaceGrabHandle.swift	
+++ b/macos/Sources/Ghostty/Surface View/SurfaceGrabHandle.swift	
@@ -3,6 +3,12 @@ import SwiftUI
 extension Ghostty {
     /// A grab handle overlay at the top of the surface for dragging a surface.
     struct SurfaceGrabHandle: View {
+        // Size of the actual drag handle; the hover reveal region is larger.
+        private static let handleSize = CGSize(width: 80, height: 12)
+
+        // Reveal the handle anywhere within the top % of the pane height.
+        private static let hoverHeightFactor: CGFloat = 0.2
+
         @ObservedObject var surfaceView: SurfaceView
 
         @State private var isHovering: Bool = false
@@ -19,7 +25,15 @@ extension Ghostty {
         }
 
         private var ellipsisVisible: Bool {
-            surfaceView.mouseOverSurface && surfaceView.cursorVisible
+            // If the cursor isn't visible, never show the handle
+            guard surfaceView.cursorVisible else { return false }
+            // If we're hovering or actively dragging, always visible
+            if isHovering || isDragging { return true }
+
+            // Require our mouse location to be within the top area of the
+            // surface.
+            guard let mouseLocation = surfaceView.mouseLocationInSurface else { return false }
+            return Self.isInHoverRegion(mouseLocation, in: surfaceView.bounds)
         }
 
         var body: some View {
@@ -30,7 +44,7 @@ extension Ghostty {
                         isDragging: $isDragging,
                         isHovering: $isHovering
                     )
-                    .frame(width: 80, height: 12)
+                    .frame(width: Self.handleSize.width, height: Self.handleSize.height)
                     .contentShape(Rectangle())
 
                     if ellipsisVisible {
@@ -45,5 +59,23 @@ extension Ghostty {
                 .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
             }
         }
+
+        /// The full-width hover band that reveals the drag handle.
+        private static func hoverRect(in bounds: CGRect) -> CGRect {
+            guard !bounds.isEmpty else { return .zero }
+
+            let hoverHeight = min(bounds.height, max(handleSize.height, bounds.height * hoverHeightFactor))
+            return CGRect(
+                x: bounds.minX,
+                y: bounds.maxY - hoverHeight,
+                width: bounds.width,
+                height: hoverHeight
+            )
+        }
+
+        /// Returns true when the pointer is inside the top hover band.
+        private static func isInHoverRegion(_ point: CGPoint, in bounds: CGRect) -> Bool {
+            hoverRect(in: bounds).contains(point)
+        }
     }
 }
diff --git a/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift b/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift
index a37feb9a8..338d20118 100644
--- a/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift	
+++ b/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift	
@@ -119,6 +119,10 @@ extension Ghostty {
         // Whether the mouse is currently over this surface
         @Published private(set) var mouseOverSurface: Bool = false
 
+        // The last known mouse location in the surface's local coordinate space,
+        // used by overlays such as the split drag handle reveal region.
+        @Published private(set) var mouseLocationInSurface: CGPoint?
+
         // Whether the cursor is currently visible (not hidden by typing, etc.)
         @Published private(set) var cursorVisible: Bool = true
 
@@ -952,13 +956,15 @@ extension Ghostty {
             mouseOverSurface = true
             super.mouseEntered(with: event)
 
+            let pos = self.convert(event.locationInWindow, from: nil)
+            mouseLocationInSurface = pos
+
             guard let surfaceModel else { return }
 
             // On mouse enter we need to reset our cursor position. This is
             // super important because we set it to -1/-1 on mouseExit and
             // lots of mouse logic (i.e. whether to send mouse reports) depend
             // on the position being in the viewport if it is.
-            let pos = self.convert(event.locationInWindow, from: nil)
             let mouseEvent = Ghostty.Input.MousePosEvent(
                 x: pos.x,
                 y: frame.height - pos.y,
@@ -969,6 +975,7 @@ extension Ghostty {
 
         override func mouseExited(with event: NSEvent) {
             mouseOverSurface = false
+            mouseLocationInSurface = nil
             guard let surfaceModel else { return }
 
             // If the mouse is being dragged then we don't have to emit
@@ -988,10 +995,12 @@ extension Ghostty {
         }
 
         override func mouseMoved(with event: NSEvent) {
+            let pos = self.convert(event.locationInWindow, from: nil)
+            mouseLocationInSurface = pos
+
             guard let surfaceModel else { return }
 
             // Convert window position to view position. Note (0, 0) is bottom left.
-            let pos = self.convert(event.locationInWindow, from: nil)
             let mouseEvent = Ghostty.Input.MousePosEvent(
                 x: pos.x,
                 y: frame.height - pos.y,

From 0f745b56730ae0eff4de2e40e959d432cbdcb004 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Wed, 11 Mar 2026 19:24:01 +0000
Subject: [PATCH 127/391] Update VOUCHED list (#11389)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11388#discussioncomment-16087905)
from @jcollie.

Vouch: @wyounas

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 3f52c09a9..83de38e55 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -163,6 +163,7 @@ uhojin
 uzaaft
 vaughanandrews
 vlsi
+wyounas
 yamshta
 ydah
 zenyr

From 16ca9527e95ea857a5cc6a30685bfcf58705af08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Mar 2026 00:13:04 +0000
Subject: [PATCH 128/391] build(deps): bump actions/download-artifact from
 8.0.0 to 8.0.1

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 8.0.0 to 8.0.1.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3...3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: 8.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/flatpak.yml     |  2 +-
 .github/workflows/release-tag.yml | 10 +++++-----
 .github/workflows/snap.yml        |  2 +-
 .github/workflows/test.yml        |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 7bb39faf2..d64ab829a 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ${{ matrix.variant.runner }}
     steps:
       - name: Download Source Tarball Artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           run-id: ${{ inputs.source-run-id }}
           artifact-ids: ${{ inputs.source-artifact-id }}
diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml
index 2a3770a13..a742b4d4b 100644
--- a/.github/workflows/release-tag.yml
+++ b/.github/workflows/release-tag.yml
@@ -299,7 +299,7 @@ jobs:
           curl -sL https://sentry.io/get-cli/ | bash
 
       - name: Download macOS Artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: macos
 
@@ -322,7 +322,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Download macOS Artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: macos
 
@@ -370,17 +370,17 @@ jobs:
       GHOSTTY_VERSION: ${{ needs.setup.outputs.version }}
     steps:
       - name: Download macOS Artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: macos
 
       - name: Download Sparkle Artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: sparkle
 
       - name: Download Source Tarball Artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: source-tarball
 
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index bdef91c30..67f291601 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -26,7 +26,7 @@ jobs:
       ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
     steps:
       - name: Download Source Tarball Artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           run-id: ${{ inputs.source-run-id }}
           artifact-ids: ${{ inputs.source-artifact-id }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 719b5b152..d0f01133b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1372,7 +1372,7 @@ jobs:
         uses: namespacelabs/nscloud-setup-buildx-action@f5814dcf37a16cce0624d5bec2ab879654294aa0 # v0.0.22
 
       - name: Download Source Tarball Artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: source-tarball
 

From 84d48d1c6a9d4fb93eccd31cf0a731adbe174d02 Mon Sep 17 00:00:00 2001
From: Michal Olechowski <molechowski@protonmail.com>
Date: Fri, 6 Mar 2026 21:09:04 +0100
Subject: [PATCH 129/391] config: add progress-style option

Add option to disable OSC 9;4 ConEmu progress bars via config.

Fixes #11241
---
 macos/Sources/Ghostty/Ghostty.App.swift    | 9 +++++++++
 macos/Sources/Ghostty/Ghostty.Config.swift | 8 ++++++++
 src/apprt/gtk/class/surface.zig            | 8 ++++++++
 src/config/Config.zig                      | 5 +++++
 4 files changed, 30 insertions(+)

diff --git a/macos/Sources/Ghostty/Ghostty.App.swift b/macos/Sources/Ghostty/Ghostty.App.swift
index 82b3ad35c..38cc27800 100644
--- a/macos/Sources/Ghostty/Ghostty.App.swift
+++ b/macos/Sources/Ghostty/Ghostty.App.swift
@@ -1934,6 +1934,15 @@ extension Ghostty {
             case GHOSTTY_TARGET_SURFACE:
                 guard let surface = target.target.surface else { return }
                 guard let surfaceView = self.surfaceView(from: surface) else { return }
+                guard let config = (NSApplication.shared.delegate as? AppDelegate)?.ghostty.config else { return }
+
+                guard config.progressStyle else {
+                    Ghostty.logger.debug("progress_report action blocked by config")
+                    DispatchQueue.main.async {
+                        surfaceView.progressReport = nil
+                    }
+                    return
+                }
 
                 let progressReport = Ghostty.Action.ProgressReport(c: v)
                 DispatchQueue.main.async {
diff --git a/macos/Sources/Ghostty/Ghostty.Config.swift b/macos/Sources/Ghostty/Ghostty.Config.swift
index 87ae0511f..775e4c946 100644
--- a/macos/Sources/Ghostty/Ghostty.Config.swift
+++ b/macos/Sources/Ghostty/Ghostty.Config.swift
@@ -717,6 +717,14 @@ extension Ghostty {
             let buffer = UnsafeBufferPointer(start: v.commands, count: v.len)
             return buffer.map { Ghostty.Command(cValue: $0) }
         }
+
+        var progressStyle: Bool {
+            guard let config = self.config else { return true }
+            var v = true
+            let key = "progress-style"
+            _ = ghostty_config_get(config, &v, key, UInt(key.lengthOfBytes(using: .utf8)))
+            return v
+        }
     }
 }
 
diff --git a/src/apprt/gtk/class/surface.zig b/src/apprt/gtk/class/surface.zig
index 8d9e1bcf0..5b4a7e183 100644
--- a/src/apprt/gtk/class/surface.zig
+++ b/src/apprt/gtk/class/surface.zig
@@ -1012,6 +1012,14 @@ pub const Surface = extern struct {
             priv.progress_bar_timer = null;
         }
 
+        if (priv.config) |config| {
+            if (!config.get().@"progress-style") {
+                log.debug("progress_report action blocked by config", .{});
+                priv.progress_bar_overlay.as(gtk.Widget).setVisible(@intFromBool(false));
+                return;
+            }
+        }
+
         const progress_bar = priv.progress_bar_overlay;
         switch (value.state) {
             // Remove the progress bar
diff --git a/src/config/Config.zig b/src/config/Config.zig
index ca93c85d6..26b5141f8 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -3636,6 +3636,11 @@ else
 /// notifications using certain escape sequences such as OSC 9 or OSC 777.
 @"desktop-notifications": bool = true,
 
+/// If `true` (default), applications running in the terminal can show
+/// graphical progress bars using the ConEmu OSC 9;4 escape sequence.
+/// If `false`, progress bar sequences are silently ignored.
+@"progress-style": bool = true,
+
 /// Modifies the color used for bold text in the terminal.
 ///
 /// This can be set to a specific color, using the same format as

From 809369505534b40c83560f9cd0cbee8e7ecb7516 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 11 Mar 2026 15:05:17 -0700
Subject: [PATCH 130/391] macos: only run key equivalents for Ghostty-owned
 menu items

Fixes #11396

Track menu items populated from Ghostty keybind actions and only trigger
those from SurfaceView performKeyEquivalent. This avoids app-default
shortcuts such as Hide from pre-empting explicit keybinds.
---
 macos/Sources/App/macOS/AppDelegate.swift     | 378 +++++++++++-------
 .../Surface View/SurfaceView_AppKit.swift     |   3 +-
 2 files changed, 236 insertions(+), 145 deletions(-)

diff --git a/macos/Sources/App/macOS/AppDelegate.swift b/macos/Sources/App/macOS/AppDelegate.swift
index f9e2dc93f..c8538c9d5 100644
--- a/macos/Sources/App/macOS/AppDelegate.swift
+++ b/macos/Sources/App/macOS/AppDelegate.swift
@@ -154,6 +154,13 @@ class AppDelegate: NSObject,
     /// The custom app icon image that is currently in use.
     @Published private(set) var appIcon: NSImage?
 
+    /// Ghostty menu items indexed by their normalized shortcut. This avoids traversing
+    /// the entire menu tree on every key equivalent event.
+    ///
+    /// We store a weak reference so this cache can never be the owner of menu items.
+    /// If multiple items map to the same shortcut, the most recent one wins.
+    private var menuItemsByShortcut: [MenuShortcutKey: Weak<NSMenuItem>] = [:]
+
     override init() {
 #if DEBUG
         ghostty = Ghostty.App(configPath: ProcessInfo.processInfo.environment["GHOSTTY_CONFIG_PATH"])
@@ -516,11 +523,6 @@ class AppDelegate: NSObject,
         return true
     }
 
-    /// This is called for the dock right-click menu.
-    func applicationDockMenu(_ sender: NSApplication) -> NSMenu? {
-        return dockMenu
-    }
-
     /// Setup signal handlers
     private func setupSignals() {
         // Register a signal handler for config reloading. It appears that all
@@ -549,134 +551,6 @@ class AppDelegate: NSObject,
         signals.append(sigusr2)
     }
 
-    /// Setup all the images for our menu items.
-    private func setupMenuImages() {
-        // Note: This COULD Be done all in the xib file, but I find it easier to
-        // modify this stuff as code.
-        self.menuAbout?.setImageIfDesired(systemSymbolName: "info.circle")
-        self.menuCheckForUpdates?.setImageIfDesired(systemSymbolName: "square.and.arrow.down")
-        self.menuOpenConfig?.setImageIfDesired(systemSymbolName: "gear")
-        self.menuReloadConfig?.setImageIfDesired(systemSymbolName: "arrow.trianglehead.2.clockwise.rotate.90")
-        self.menuSecureInput?.setImageIfDesired(systemSymbolName: "lock.display")
-        self.menuNewWindow?.setImageIfDesired(systemSymbolName: "macwindow.badge.plus")
-        self.menuNewTab?.setImageIfDesired(systemSymbolName: "macwindow")
-        self.menuSplitRight?.setImageIfDesired(systemSymbolName: "rectangle.righthalf.inset.filled")
-        self.menuSplitLeft?.setImageIfDesired(systemSymbolName: "rectangle.leadinghalf.inset.filled")
-        self.menuSplitUp?.setImageIfDesired(systemSymbolName: "rectangle.tophalf.inset.filled")
-        self.menuSplitDown?.setImageIfDesired(systemSymbolName: "rectangle.bottomhalf.inset.filled")
-        self.menuClose?.setImageIfDesired(systemSymbolName: "xmark")
-        self.menuPasteSelection?.setImageIfDesired(systemSymbolName: "doc.on.clipboard.fill")
-        self.menuIncreaseFontSize?.setImageIfDesired(systemSymbolName: "textformat.size.larger")
-        self.menuResetFontSize?.setImageIfDesired(systemSymbolName: "textformat.size")
-        self.menuDecreaseFontSize?.setImageIfDesired(systemSymbolName: "textformat.size.smaller")
-        self.menuCommandPalette?.setImageIfDesired(systemSymbolName: "filemenu.and.selection")
-        self.menuQuickTerminal?.setImageIfDesired(systemSymbolName: "apple.terminal")
-        self.menuChangeTabTitle?.setImageIfDesired(systemSymbolName: "pencil.line")
-        self.menuTerminalInspector?.setImageIfDesired(systemSymbolName: "scope")
-        self.menuReadonly?.setImageIfDesired(systemSymbolName: "eye.fill")
-        self.menuSetAsDefaultTerminal?.setImageIfDesired(systemSymbolName: "star.fill")
-        self.menuToggleFullScreen?.setImageIfDesired(systemSymbolName: "square.arrowtriangle.4.outward")
-        self.menuToggleVisibility?.setImageIfDesired(systemSymbolName: "eye")
-        self.menuZoomSplit?.setImageIfDesired(systemSymbolName: "arrow.up.left.and.arrow.down.right")
-        self.menuPreviousSplit?.setImageIfDesired(systemSymbolName: "chevron.backward.2")
-        self.menuNextSplit?.setImageIfDesired(systemSymbolName: "chevron.forward.2")
-        self.menuEqualizeSplits?.setImageIfDesired(systemSymbolName: "inset.filled.topleft.topright.bottomleft.bottomright.rectangle")
-        self.menuSelectSplitLeft?.setImageIfDesired(systemSymbolName: "arrow.left")
-        self.menuSelectSplitRight?.setImageIfDesired(systemSymbolName: "arrow.right")
-        self.menuSelectSplitAbove?.setImageIfDesired(systemSymbolName: "arrow.up")
-        self.menuSelectSplitBelow?.setImageIfDesired(systemSymbolName: "arrow.down")
-        self.menuMoveSplitDividerUp?.setImageIfDesired(systemSymbolName: "arrow.up.to.line")
-        self.menuMoveSplitDividerDown?.setImageIfDesired(systemSymbolName: "arrow.down.to.line")
-        self.menuMoveSplitDividerLeft?.setImageIfDesired(systemSymbolName: "arrow.left.to.line")
-        self.menuMoveSplitDividerRight?.setImageIfDesired(systemSymbolName: "arrow.right.to.line")
-        self.menuFloatOnTop?.setImageIfDesired(systemSymbolName: "square.filled.on.square")
-        self.menuFindParent?.setImageIfDesired(systemSymbolName: "text.page.badge.magnifyingglass")
-    }
-
-    /// Sync all of our menu item keyboard shortcuts with the Ghostty configuration.
-    private func syncMenuShortcuts(_ config: Ghostty.Config) {
-        guard ghostty.readiness == .ready else { return }
-
-        syncMenuShortcut(config, action: "check_for_updates", menuItem: self.menuCheckForUpdates)
-        syncMenuShortcut(config, action: "open_config", menuItem: self.menuOpenConfig)
-        syncMenuShortcut(config, action: "reload_config", menuItem: self.menuReloadConfig)
-        syncMenuShortcut(config, action: "quit", menuItem: self.menuQuit)
-
-        syncMenuShortcut(config, action: "new_window", menuItem: self.menuNewWindow)
-        syncMenuShortcut(config, action: "new_tab", menuItem: self.menuNewTab)
-        syncMenuShortcut(config, action: "close_surface", menuItem: self.menuClose)
-        syncMenuShortcut(config, action: "close_tab", menuItem: self.menuCloseTab)
-        syncMenuShortcut(config, action: "close_window", menuItem: self.menuCloseWindow)
-        syncMenuShortcut(config, action: "close_all_windows", menuItem: self.menuCloseAllWindows)
-        syncMenuShortcut(config, action: "new_split:right", menuItem: self.menuSplitRight)
-        syncMenuShortcut(config, action: "new_split:left", menuItem: self.menuSplitLeft)
-        syncMenuShortcut(config, action: "new_split:down", menuItem: self.menuSplitDown)
-        syncMenuShortcut(config, action: "new_split:up", menuItem: self.menuSplitUp)
-
-        syncMenuShortcut(config, action: "undo", menuItem: self.menuUndo)
-        syncMenuShortcut(config, action: "redo", menuItem: self.menuRedo)
-        syncMenuShortcut(config, action: "copy_to_clipboard", menuItem: self.menuCopy)
-        syncMenuShortcut(config, action: "paste_from_clipboard", menuItem: self.menuPaste)
-        syncMenuShortcut(config, action: "paste_from_selection", menuItem: self.menuPasteSelection)
-        syncMenuShortcut(config, action: "select_all", menuItem: self.menuSelectAll)
-        syncMenuShortcut(config, action: "start_search", menuItem: self.menuFind)
-        syncMenuShortcut(config, action: "search_selection", menuItem: self.menuSelectionForFind)
-        syncMenuShortcut(config, action: "scroll_to_selection", menuItem: self.menuScrollToSelection)
-        syncMenuShortcut(config, action: "search:next", menuItem: self.menuFindNext)
-        syncMenuShortcut(config, action: "search:previous", menuItem: self.menuFindPrevious)
-
-        syncMenuShortcut(config, action: "toggle_split_zoom", menuItem: self.menuZoomSplit)
-        syncMenuShortcut(config, action: "goto_split:previous", menuItem: self.menuPreviousSplit)
-        syncMenuShortcut(config, action: "goto_split:next", menuItem: self.menuNextSplit)
-        syncMenuShortcut(config, action: "goto_split:up", menuItem: self.menuSelectSplitAbove)
-        syncMenuShortcut(config, action: "goto_split:down", menuItem: self.menuSelectSplitBelow)
-        syncMenuShortcut(config, action: "goto_split:left", menuItem: self.menuSelectSplitLeft)
-        syncMenuShortcut(config, action: "goto_split:right", menuItem: self.menuSelectSplitRight)
-        syncMenuShortcut(config, action: "resize_split:up,10", menuItem: self.menuMoveSplitDividerUp)
-        syncMenuShortcut(config, action: "resize_split:down,10", menuItem: self.menuMoveSplitDividerDown)
-        syncMenuShortcut(config, action: "resize_split:right,10", menuItem: self.menuMoveSplitDividerRight)
-        syncMenuShortcut(config, action: "resize_split:left,10", menuItem: self.menuMoveSplitDividerLeft)
-        syncMenuShortcut(config, action: "equalize_splits", menuItem: self.menuEqualizeSplits)
-        syncMenuShortcut(config, action: "reset_window_size", menuItem: self.menuReturnToDefaultSize)
-
-        syncMenuShortcut(config, action: "increase_font_size:1", menuItem: self.menuIncreaseFontSize)
-        syncMenuShortcut(config, action: "decrease_font_size:1", menuItem: self.menuDecreaseFontSize)
-        syncMenuShortcut(config, action: "reset_font_size", menuItem: self.menuResetFontSize)
-        syncMenuShortcut(config, action: "prompt_surface_title", menuItem: self.menuChangeTitle)
-        syncMenuShortcut(config, action: "prompt_tab_title", menuItem: self.menuChangeTabTitle)
-        syncMenuShortcut(config, action: "toggle_quick_terminal", menuItem: self.menuQuickTerminal)
-        syncMenuShortcut(config, action: "toggle_visibility", menuItem: self.menuToggleVisibility)
-        syncMenuShortcut(config, action: "toggle_window_float_on_top", menuItem: self.menuFloatOnTop)
-        syncMenuShortcut(config, action: "inspector:toggle", menuItem: self.menuTerminalInspector)
-        syncMenuShortcut(config, action: "toggle_command_palette", menuItem: self.menuCommandPalette)
-
-        syncMenuShortcut(config, action: "toggle_secure_input", menuItem: self.menuSecureInput)
-
-        // This menu item is NOT synced with the configuration because it disables macOS
-        // global fullscreen keyboard shortcut. The shortcut in the Ghostty config will continue
-        // to work but it won't be reflected in the menu item.
-        //
-        // syncMenuShortcut(config, action: "toggle_fullscreen", menuItem: self.menuToggleFullScreen)
-
-        // Dock menu
-        reloadDockMenu()
-    }
-
-    /// Syncs a single menu shortcut for the given action. The action string is the same
-    /// action string used for the Ghostty configuration.
-    private func syncMenuShortcut(_ config: Ghostty.Config, action: String, menuItem: NSMenuItem?) {
-        guard let menu = menuItem else { return }
-        guard let shortcut = config.keyboardShortcut(for: action) else {
-            // No shortcut, clear the menu item
-            menu.keyEquivalent = ""
-            menu.keyEquivalentModifierMask = []
-            return
-        }
-
-        menu.keyEquivalent = shortcut.key.character.description
-        menu.keyEquivalentModifierMask = .init(swiftUIFlags: shortcut.modifiers)
-    }
-
     // MARK: Notifications and Events
 
     /// This handles events from the NSEvent.addLocalEventMonitor. We use this so we can get
@@ -1038,17 +912,6 @@ class AppDelegate: NSObject,
         return nil
     }
 
-    // MARK: - Dock Menu
-
-    private func reloadDockMenu() {
-        let newWindow = NSMenuItem(title: "New Window", action: #selector(newWindow), keyEquivalent: "")
-        let newTab = NSMenuItem(title: "New Tab", action: #selector(newTab), keyEquivalent: "")
-
-        dockMenu.removeAllItems()
-        dockMenu.addItem(newWindow)
-        dockMenu.addItem(newTab)
-    }
-
     // MARK: - Global State
 
     func setSecureInput(_ mode: Ghostty.SetSecureInput) {
@@ -1211,6 +1074,233 @@ class AppDelegate: NSObject,
     }
 }
 
+// MARK: Menu
+
+extension AppDelegate {
+    /// This is called for the dock right-click menu.
+    func applicationDockMenu(_ sender: NSApplication) -> NSMenu? {
+        return dockMenu
+    }
+
+    private func reloadDockMenu() {
+        let newWindow = NSMenuItem(title: "New Window", action: #selector(newWindow), keyEquivalent: "")
+        let newTab = NSMenuItem(title: "New Tab", action: #selector(newTab), keyEquivalent: "")
+
+        dockMenu.removeAllItems()
+        dockMenu.addItem(newWindow)
+        dockMenu.addItem(newTab)
+    }
+
+    /// Setup all the images for our menu items.
+    private func setupMenuImages() {
+        // Note: This COULD Be done all in the xib file, but I find it easier to
+        // modify this stuff as code.
+        self.menuAbout?.setImageIfDesired(systemSymbolName: "info.circle")
+        self.menuCheckForUpdates?.setImageIfDesired(systemSymbolName: "square.and.arrow.down")
+        self.menuOpenConfig?.setImageIfDesired(systemSymbolName: "gear")
+        self.menuReloadConfig?.setImageIfDesired(systemSymbolName: "arrow.trianglehead.2.clockwise.rotate.90")
+        self.menuSecureInput?.setImageIfDesired(systemSymbolName: "lock.display")
+        self.menuNewWindow?.setImageIfDesired(systemSymbolName: "macwindow.badge.plus")
+        self.menuNewTab?.setImageIfDesired(systemSymbolName: "macwindow")
+        self.menuSplitRight?.setImageIfDesired(systemSymbolName: "rectangle.righthalf.inset.filled")
+        self.menuSplitLeft?.setImageIfDesired(systemSymbolName: "rectangle.leadinghalf.inset.filled")
+        self.menuSplitUp?.setImageIfDesired(systemSymbolName: "rectangle.tophalf.inset.filled")
+        self.menuSplitDown?.setImageIfDesired(systemSymbolName: "rectangle.bottomhalf.inset.filled")
+        self.menuClose?.setImageIfDesired(systemSymbolName: "xmark")
+        self.menuPasteSelection?.setImageIfDesired(systemSymbolName: "doc.on.clipboard.fill")
+        self.menuIncreaseFontSize?.setImageIfDesired(systemSymbolName: "textformat.size.larger")
+        self.menuResetFontSize?.setImageIfDesired(systemSymbolName: "textformat.size")
+        self.menuDecreaseFontSize?.setImageIfDesired(systemSymbolName: "textformat.size.smaller")
+        self.menuCommandPalette?.setImageIfDesired(systemSymbolName: "filemenu.and.selection")
+        self.menuQuickTerminal?.setImageIfDesired(systemSymbolName: "apple.terminal")
+        self.menuChangeTabTitle?.setImageIfDesired(systemSymbolName: "pencil.line")
+        self.menuTerminalInspector?.setImageIfDesired(systemSymbolName: "scope")
+        self.menuReadonly?.setImageIfDesired(systemSymbolName: "eye.fill")
+        self.menuSetAsDefaultTerminal?.setImageIfDesired(systemSymbolName: "star.fill")
+        self.menuToggleFullScreen?.setImageIfDesired(systemSymbolName: "square.arrowtriangle.4.outward")
+        self.menuToggleVisibility?.setImageIfDesired(systemSymbolName: "eye")
+        self.menuZoomSplit?.setImageIfDesired(systemSymbolName: "arrow.up.left.and.arrow.down.right")
+        self.menuPreviousSplit?.setImageIfDesired(systemSymbolName: "chevron.backward.2")
+        self.menuNextSplit?.setImageIfDesired(systemSymbolName: "chevron.forward.2")
+        self.menuEqualizeSplits?.setImageIfDesired(systemSymbolName: "inset.filled.topleft.topright.bottomleft.bottomright.rectangle")
+        self.menuSelectSplitLeft?.setImageIfDesired(systemSymbolName: "arrow.left")
+        self.menuSelectSplitRight?.setImageIfDesired(systemSymbolName: "arrow.right")
+        self.menuSelectSplitAbove?.setImageIfDesired(systemSymbolName: "arrow.up")
+        self.menuSelectSplitBelow?.setImageIfDesired(systemSymbolName: "arrow.down")
+        self.menuMoveSplitDividerUp?.setImageIfDesired(systemSymbolName: "arrow.up.to.line")
+        self.menuMoveSplitDividerDown?.setImageIfDesired(systemSymbolName: "arrow.down.to.line")
+        self.menuMoveSplitDividerLeft?.setImageIfDesired(systemSymbolName: "arrow.left.to.line")
+        self.menuMoveSplitDividerRight?.setImageIfDesired(systemSymbolName: "arrow.right.to.line")
+        self.menuFloatOnTop?.setImageIfDesired(systemSymbolName: "square.filled.on.square")
+        self.menuFindParent?.setImageIfDesired(systemSymbolName: "text.page.badge.magnifyingglass")
+    }
+
+    /// Sync all of our menu item keyboard shortcuts with the Ghostty configuration.
+    private func syncMenuShortcuts(_ config: Ghostty.Config) {
+        guard ghostty.readiness == .ready else { return }
+
+        // Reset our shortcut index since we're about to rebuild all menu bindings.
+        menuItemsByShortcut.removeAll(keepingCapacity: true)
+
+        syncMenuShortcut(config, action: "check_for_updates", menuItem: self.menuCheckForUpdates)
+        syncMenuShortcut(config, action: "open_config", menuItem: self.menuOpenConfig)
+        syncMenuShortcut(config, action: "reload_config", menuItem: self.menuReloadConfig)
+        syncMenuShortcut(config, action: "quit", menuItem: self.menuQuit)
+
+        syncMenuShortcut(config, action: "new_window", menuItem: self.menuNewWindow)
+        syncMenuShortcut(config, action: "new_tab", menuItem: self.menuNewTab)
+        syncMenuShortcut(config, action: "close_surface", menuItem: self.menuClose)
+        syncMenuShortcut(config, action: "close_tab", menuItem: self.menuCloseTab)
+        syncMenuShortcut(config, action: "close_window", menuItem: self.menuCloseWindow)
+        syncMenuShortcut(config, action: "close_all_windows", menuItem: self.menuCloseAllWindows)
+        syncMenuShortcut(config, action: "new_split:right", menuItem: self.menuSplitRight)
+        syncMenuShortcut(config, action: "new_split:left", menuItem: self.menuSplitLeft)
+        syncMenuShortcut(config, action: "new_split:down", menuItem: self.menuSplitDown)
+        syncMenuShortcut(config, action: "new_split:up", menuItem: self.menuSplitUp)
+
+        syncMenuShortcut(config, action: "undo", menuItem: self.menuUndo)
+        syncMenuShortcut(config, action: "redo", menuItem: self.menuRedo)
+        syncMenuShortcut(config, action: "copy_to_clipboard", menuItem: self.menuCopy)
+        syncMenuShortcut(config, action: "paste_from_clipboard", menuItem: self.menuPaste)
+        syncMenuShortcut(config, action: "paste_from_selection", menuItem: self.menuPasteSelection)
+        syncMenuShortcut(config, action: "select_all", menuItem: self.menuSelectAll)
+        syncMenuShortcut(config, action: "start_search", menuItem: self.menuFind)
+        syncMenuShortcut(config, action: "search_selection", menuItem: self.menuSelectionForFind)
+        syncMenuShortcut(config, action: "scroll_to_selection", menuItem: self.menuScrollToSelection)
+        syncMenuShortcut(config, action: "search:next", menuItem: self.menuFindNext)
+        syncMenuShortcut(config, action: "search:previous", menuItem: self.menuFindPrevious)
+
+        syncMenuShortcut(config, action: "toggle_split_zoom", menuItem: self.menuZoomSplit)
+        syncMenuShortcut(config, action: "goto_split:previous", menuItem: self.menuPreviousSplit)
+        syncMenuShortcut(config, action: "goto_split:next", menuItem: self.menuNextSplit)
+        syncMenuShortcut(config, action: "goto_split:up", menuItem: self.menuSelectSplitAbove)
+        syncMenuShortcut(config, action: "goto_split:down", menuItem: self.menuSelectSplitBelow)
+        syncMenuShortcut(config, action: "goto_split:left", menuItem: self.menuSelectSplitLeft)
+        syncMenuShortcut(config, action: "goto_split:right", menuItem: self.menuSelectSplitRight)
+        syncMenuShortcut(config, action: "resize_split:up,10", menuItem: self.menuMoveSplitDividerUp)
+        syncMenuShortcut(config, action: "resize_split:down,10", menuItem: self.menuMoveSplitDividerDown)
+        syncMenuShortcut(config, action: "resize_split:right,10", menuItem: self.menuMoveSplitDividerRight)
+        syncMenuShortcut(config, action: "resize_split:left,10", menuItem: self.menuMoveSplitDividerLeft)
+        syncMenuShortcut(config, action: "equalize_splits", menuItem: self.menuEqualizeSplits)
+        syncMenuShortcut(config, action: "reset_window_size", menuItem: self.menuReturnToDefaultSize)
+
+        syncMenuShortcut(config, action: "increase_font_size:1", menuItem: self.menuIncreaseFontSize)
+        syncMenuShortcut(config, action: "decrease_font_size:1", menuItem: self.menuDecreaseFontSize)
+        syncMenuShortcut(config, action: "reset_font_size", menuItem: self.menuResetFontSize)
+        syncMenuShortcut(config, action: "prompt_surface_title", menuItem: self.menuChangeTitle)
+        syncMenuShortcut(config, action: "prompt_tab_title", menuItem: self.menuChangeTabTitle)
+        syncMenuShortcut(config, action: "toggle_quick_terminal", menuItem: self.menuQuickTerminal)
+        syncMenuShortcut(config, action: "toggle_visibility", menuItem: self.menuToggleVisibility)
+        syncMenuShortcut(config, action: "toggle_window_float_on_top", menuItem: self.menuFloatOnTop)
+        syncMenuShortcut(config, action: "inspector:toggle", menuItem: self.menuTerminalInspector)
+        syncMenuShortcut(config, action: "toggle_command_palette", menuItem: self.menuCommandPalette)
+
+        syncMenuShortcut(config, action: "toggle_secure_input", menuItem: self.menuSecureInput)
+
+        // This menu item is NOT synced with the configuration because it disables macOS
+        // global fullscreen keyboard shortcut. The shortcut in the Ghostty config will continue
+        // to work but it won't be reflected in the menu item.
+        //
+        // syncMenuShortcut(config, action: "toggle_fullscreen", menuItem: self.menuToggleFullScreen)
+
+        // Dock menu
+        reloadDockMenu()
+    }
+
+    /// Syncs a single menu shortcut for the given action. The action string is the same
+    /// action string used for the Ghostty configuration.
+    private func syncMenuShortcut(_ config: Ghostty.Config, action: String, menuItem: NSMenuItem?) {
+        guard let menu = menuItem else { return }
+
+        guard let shortcut = config.keyboardShortcut(for: action) else {
+            // No shortcut, clear the menu item
+            menu.keyEquivalent = ""
+            menu.keyEquivalentModifierMask = []
+            return
+        }
+
+        let keyEquivalent = shortcut.key.character.description
+        let modifierMask = NSEvent.ModifierFlags(swiftUIFlags: shortcut.modifiers)
+        menu.keyEquivalent = keyEquivalent
+        menu.keyEquivalentModifierMask = modifierMask
+
+        // Build a direct lookup for key-equivalent dispatch so we don't need to
+        // linearly walk the full menu hierarchy at event time.
+        guard let key = MenuShortcutKey(
+            keyEquivalent: keyEquivalent,
+            modifiers: modifierMask
+        ) else {
+            return
+        }
+
+        // Later registrations intentionally override earlier ones for the same key.
+        menuItemsByShortcut[key] = .init(menu)
+    }
+
+    /// Attempts to perform a menu key equivalent only for menu items that represent
+    /// Ghostty keybind actions. This is important because it lets our surface dispatch
+    /// bindings through the menu so they flash but also lets our surface override macOS built-ins
+    /// like Cmd+H.
+    func performGhosttyBindingMenuKeyEquivalent(with event: NSEvent) -> Bool {
+        // Convert this event into the same normalized lookup key we use when
+        // syncing menu shortcuts from configuration.
+        guard let key = MenuShortcutKey(event: event) else {
+            return false
+        }
+
+        // If we don't have an entry for this key combo, no Ghostty-owned
+        // menu shortcut exists for this event.
+        guard let weakItem = menuItemsByShortcut[key] else {
+            return false
+        }
+
+        // Weak references can be nil if a menu item was deallocated after sync.
+        guard let item = weakItem.value else {
+            menuItemsByShortcut.removeValue(forKey: key)
+            return false
+        }
+
+        guard let parentMenu = item.menu else {
+            return false
+        }
+
+        // Keep enablement state fresh in case menu validation hasn't run yet.
+        parentMenu.update()
+        guard item.isEnabled else {
+            return false
+        }
+
+        let index = parentMenu.index(of: item)
+        guard index >= 0 else {
+            return false
+        }
+
+        parentMenu.performActionForItem(at: index)
+        return true
+    }
+
+    /// Hashable key for a menu shortcut match, normalized for quick lookup.
+    private struct MenuShortcutKey: Hashable {
+        private static let shortcutModifiers: NSEvent.ModifierFlags = [.shift, .control, .option, .command]
+
+        private let keyEquivalent: String
+        private let modifiersRawValue: UInt
+
+        init?(keyEquivalent: String, modifiers: NSEvent.ModifierFlags) {
+            let normalized = keyEquivalent.lowercased()
+            guard !normalized.isEmpty else { return nil }
+
+            self.keyEquivalent = normalized
+            self.modifiersRawValue = modifiers.intersection(Self.shortcutModifiers).rawValue
+        }
+
+        init?(event: NSEvent) {
+            guard let keyEquivalent = event.charactersIgnoringModifiers else { return nil }
+            self.init(keyEquivalent: keyEquivalent, modifiers: event.modifierFlags)
+        }
+    }
+}
+
 // MARK: Floating Windows
 
 extension AppDelegate {
diff --git a/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift b/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift
index 338d20118..c4f03b117 100644
--- a/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift	
+++ b/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift	
@@ -1265,7 +1265,8 @@ extension Ghostty {
                    keyTables.isEmpty,
                    bindingFlags.isDisjoint(with: [.all, .performable]),
                    bindingFlags.contains(.consumed) {
-                    if let menu = NSApp.mainMenu, menu.performKeyEquivalent(with: event) {
+                    if let appDelegate = NSApp.delegate as? AppDelegate,
+                       appDelegate.performGhosttyBindingMenuKeyEquivalent(with: event) {
                         return true
                     }
                 }

From d6dfaf28feb8e30834f18f987d1b909a3452e9fc Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Thu, 12 Mar 2026 13:11:08 +0100
Subject: [PATCH 131/391] macOS: support injecting temporary defaults when
 testing

---
 .../GhosttyCustomConfigCase.swift             |  5 +++-
 macos/Sources/App/macOS/AppDelegate.swift     | 28 ++++++++++++-------
 .../Window Styles/TerminalWindow.swift        |  2 +-
 .../Surface View/SurfaceView_AppKit.swift     |  2 +-
 .../Extensions/NSScreen+Extension.swift       |  2 +-
 .../Extensions/UserDefaults+Extension.swift   | 15 ++++++++++
 .../Sources/Helpers/LastWindowPosition.swift  |  4 +--
 macos/Sources/Helpers/PermissionRequest.swift |  4 +--
 8 files changed, 44 insertions(+), 18 deletions(-)
 create mode 100644 macos/Sources/Helpers/Extensions/UserDefaults+Extension.swift

diff --git a/macos/GhosttyUITests/GhosttyCustomConfigCase.swift b/macos/GhosttyUITests/GhosttyCustomConfigCase.swift
index 41993247a..ca3f56677 100644
--- a/macos/GhosttyUITests/GhosttyCustomConfigCase.swift
+++ b/macos/GhosttyUITests/GhosttyCustomConfigCase.swift
@@ -27,6 +27,8 @@ class GhosttyCustomConfigCase: XCTestCase {
         true
     }
 
+    static let defaultsSuiteName: String = "GHOSTTY_UI_TESTS"
+
     var configFile: URL?
     override func setUpWithError() throws {
         continueAfterFailure = false
@@ -47,13 +49,14 @@ class GhosttyCustomConfigCase: XCTestCase {
         try newConfig.write(to: configFile!, atomically: true, encoding: .utf8)
     }
 
-    func ghosttyApplication() throws -> XCUIApplication {
+    func ghosttyApplication(defaultsSuite: String = GhosttyCustomConfigCase.defaultsSuiteName) throws -> XCUIApplication {
         let app = XCUIApplication()
         app.launchArguments.append(contentsOf: ["-ApplePersistenceIgnoreState", "YES"])
         guard let configFile else {
             return app
         }
         app.launchEnvironment["GHOSTTY_CONFIG_PATH"] = configFile.path
+        app.launchEnvironment["GHOSTTY_USER_DEFAULTS_SUITE"] = defaultsSuite
         return app
     }
 }
diff --git a/macos/Sources/App/macOS/AppDelegate.swift b/macos/Sources/App/macOS/AppDelegate.swift
index c8538c9d5..b02337e4b 100644
--- a/macos/Sources/App/macOS/AppDelegate.swift
+++ b/macos/Sources/App/macOS/AppDelegate.swift
@@ -175,7 +175,15 @@ class AppDelegate: NSObject,
     // MARK: - NSApplicationDelegate
 
     func applicationWillFinishLaunching(_ notification: Notification) {
-        UserDefaults.standard.register(defaults: [
+        #if DEBUG
+        if
+            let suite = UserDefaults.ghosttySuite,
+            let clear = ProcessInfo.processInfo.environment["GHOSTTY_CLEAR_USER_DEFAULTS"],
+            (clear as NSString).boolValue {
+            UserDefaults.ghostty.removePersistentDomain(forName: suite)
+        }
+        #endif
+        UserDefaults.ghostty.register(defaults: [
             // Disable the automatic full screen menu item because we handle
             // it manually.
             "NSFullScreenMenuItemEverywhere": false,
@@ -194,7 +202,7 @@ class AppDelegate: NSObject,
 
     func applicationDidFinishLaunching(_ notification: Notification) {
         // System settings overrides
-        UserDefaults.standard.register(defaults: [
+        UserDefaults.ghostty.register(defaults: [
             // Disable this so that repeated key events make it through to our terminal views.
             "ApplePressAndHoldEnabled": false,
         ])
@@ -203,7 +211,7 @@ class AppDelegate: NSObject,
         applicationLaunchTime = ProcessInfo.processInfo.systemUptime
 
         // Check if secure input was enabled when we last quit.
-        if UserDefaults.standard.bool(forKey: "SecureInput") != SecureInput.shared.enabled {
+        if UserDefaults.ghostty.bool(forKey: "SecureInput") != SecureInput.shared.enabled {
             toggleSecureInput(self)
         }
 
@@ -747,10 +755,10 @@ class AppDelegate: NSObject,
         // configuration. This is the only way to carefully control whether macOS invokes the
         // state restoration system.
         switch config.windowSaveState {
-        case "never": UserDefaults.standard.setValue(false, forKey: "NSQuitAlwaysKeepsWindows")
-        case "always": UserDefaults.standard.setValue(true, forKey: "NSQuitAlwaysKeepsWindows")
+        case "never": UserDefaults.ghostty.setValue(false, forKey: "NSQuitAlwaysKeepsWindows")
+        case "always": UserDefaults.ghostty.setValue(true, forKey: "NSQuitAlwaysKeepsWindows")
         case "default": fallthrough
-        default: UserDefaults.standard.removeObject(forKey: "NSQuitAlwaysKeepsWindows")
+        default: UserDefaults.ghostty.removeObject(forKey: "NSQuitAlwaysKeepsWindows")
         }
 
         // Sync our auto-update settings. If SUEnableAutomaticChecks (in our Info.plist) is
@@ -835,9 +843,9 @@ class AppDelegate: NSObject,
     private func updateAppIcon(from config: Ghostty.Config) {
         // Since this is called after `DockTilePlugin` has been running,
         // clean it up here to trigger a correct update of the current config.
-        UserDefaults.standard.removeObject(forKey: "CustomGhosttyIcon")
+        UserDefaults.ghostty.removeObject(forKey: "CustomGhosttyIcon")
         DispatchQueue.global().async {
-            UserDefaults.standard.appIcon = AppIcon(config: config)
+            UserDefaults.ghostty.appIcon = AppIcon(config: config)
             DistributedNotificationCenter.default()
                 .postNotificationName(.ghosttyIconDidChange, object: nil, userInfo: nil, deliverImmediately: true)
         }
@@ -927,7 +935,7 @@ class AppDelegate: NSObject,
             input.global.toggle()
         }
         self.menuSecureInput?.state = if input.global { .on } else { .off }
-        UserDefaults.standard.set(input.global, forKey: "SecureInput")
+        UserDefaults.ghostty.set(input.global, forKey: "SecureInput")
     }
 
     // MARK: - IB Actions
@@ -1321,7 +1329,7 @@ extension AppDelegate {
     }
 
     @IBAction func useAsDefault(_ sender: NSMenuItem) {
-        let ud = UserDefaults.standard
+        let ud = UserDefaults.ghostty
         let key = TerminalWindow.defaultLevelKey
         if menuFloatOnTop?.state == .on {
             ud.set(NSWindow.Level.floating, forKey: key)
diff --git a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift
index 560f45207..b9ca1ecc4 100644
--- a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
+++ b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
@@ -171,7 +171,7 @@ class TerminalWindow: NSWindow {
         tab.accessoryView = stackView
 
         // Get our saved level
-        level = UserDefaults.standard.value(forKey: Self.defaultLevelKey) as? NSWindow.Level ?? .normal
+        level = UserDefaults.ghostty.value(forKey: Self.defaultLevelKey) as? NSWindow.Level ?? .normal
     }
 
     // Both of these must be true for windows without decorations to be able to
diff --git a/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift b/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift
index c4f03b117..3129acfba 100644
--- a/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift	
+++ b/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift	
@@ -1070,7 +1070,7 @@ extension Ghostty {
 
             // If the user has force click enabled then we do a quick look. There
             // is no public API for this as far as I can tell.
-            guard UserDefaults.standard.bool(forKey: "com.apple.trackpad.forceClick") else { return }
+            guard UserDefaults.ghostty.bool(forKey: "com.apple.trackpad.forceClick") else { return }
             quickLook(with: event)
         }
 
diff --git a/macos/Sources/Helpers/Extensions/NSScreen+Extension.swift b/macos/Sources/Helpers/Extensions/NSScreen+Extension.swift
index ca338f102..84553ed34 100644
--- a/macos/Sources/Helpers/Extensions/NSScreen+Extension.swift
+++ b/macos/Sources/Helpers/Extensions/NSScreen+Extension.swift
@@ -18,7 +18,7 @@ extension NSScreen {
     // AND present on this screen.
     var hasDock: Bool {
         // If the dock autohides then we don't have a dock ever.
-        if let dockAutohide = UserDefaults.standard.persistentDomain(forName: "com.apple.dock")?["autohide"] as? Bool {
+        if let dockAutohide = UserDefaults.ghostty.persistentDomain(forName: "com.apple.dock")?["autohide"] as? Bool {
             if dockAutohide { return false }
         }
 
diff --git a/macos/Sources/Helpers/Extensions/UserDefaults+Extension.swift b/macos/Sources/Helpers/Extensions/UserDefaults+Extension.swift
new file mode 100644
index 000000000..7cd0e12ed
--- /dev/null
+++ b/macos/Sources/Helpers/Extensions/UserDefaults+Extension.swift
@@ -0,0 +1,15 @@
+import Foundation
+
+extension UserDefaults {
+    static var ghosttySuite: String? {
+        #if DEBUG
+        ProcessInfo.processInfo.environment["GHOSTTY_USER_DEFAULTS_SUITE"]
+        #else
+        nil
+        #endif
+    }
+
+    static var ghostty: UserDefaults {
+        ghosttySuite.flatMap(UserDefaults.init(suiteName:)) ?? .standard
+    }
+}
diff --git a/macos/Sources/Helpers/LastWindowPosition.swift b/macos/Sources/Helpers/LastWindowPosition.swift
index 933eba394..298367c74 100644
--- a/macos/Sources/Helpers/LastWindowPosition.swift
+++ b/macos/Sources/Helpers/LastWindowPosition.swift
@@ -15,7 +15,7 @@ class LastWindowPosition {
         guard let window, window.isVisible else { return false }
         let frame = window.frame
         let rect = [frame.origin.x, frame.origin.y, frame.size.width, frame.size.height]
-        UserDefaults.standard.set(rect, forKey: positionKey)
+        UserDefaults.ghostty.set(rect, forKey: positionKey)
         return true
     }
 
@@ -32,7 +32,7 @@ class LastWindowPosition {
     func restore(_ window: NSWindow, origin restoreOrigin: Bool = true, size restoreSize: Bool = true) -> Bool {
         guard restoreOrigin || restoreSize else { return false }
 
-        guard let values = UserDefaults.standard.array(forKey: positionKey) as? [Double],
+        guard let values = UserDefaults.ghostty.array(forKey: positionKey) as? [Double],
               values.count >= 2 else { return false }
 
         let lastPosition = CGPoint(x: values[0], y: values[1])
diff --git a/macos/Sources/Helpers/PermissionRequest.swift b/macos/Sources/Helpers/PermissionRequest.swift
index 29d1ab6d3..0308a0204 100644
--- a/macos/Sources/Helpers/PermissionRequest.swift
+++ b/macos/Sources/Helpers/PermissionRequest.swift
@@ -126,7 +126,7 @@ class PermissionRequest {
     /// - Parameter key: The UserDefaults key to check
     /// - Returns: The cached decision, or nil if no valid cached decision exists
     private static func getStoredResult(for key: String) -> Bool? {
-        let userDefaults = UserDefaults.standard
+        let userDefaults = UserDefaults.ghostty
         guard let data = userDefaults.data(forKey: key),
               let storedPermission = try? NSKeyedUnarchiver.unarchivedObject(
                 ofClass: StoredPermission.self, from: data) else {
@@ -151,7 +151,7 @@ class PermissionRequest {
         let expiryDate = Date().addingTimeInterval(duration.timeInterval)
         let storedPermission = StoredPermission(result: result, expiry: expiryDate)
         if let data = try? NSKeyedArchiver.archivedData(withRootObject: storedPermission, requiringSecureCoding: true) {
-            let userDefaults = UserDefaults.standard
+            let userDefaults = UserDefaults.ghostty
             userDefaults.set(data, forKey: key)
         }
     }

From c399812036a3161a7c2cf3b7dc63f4240949c607 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Thu, 12 Mar 2026 13:17:18 +0100
Subject: [PATCH 132/391] macOS: add test case for positioning the very first
 window

---
 macos/GhosttyUITests/GhosttyWindowPositionUITests.swift | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift b/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
index 53a0d800a..44918c8b1 100644
--- a/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
+++ b/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
@@ -128,12 +128,19 @@ final class GhosttyWindowPositionUITests: GhosttyCustomConfigCase {
         )
 
         let app = try ghosttyApplication()
+        // Suppress Restoration
+        app.launchArguments += ["-NSQuitAlwaysKeepsWindows", "NO"]
+        // Clean run
+        app.launchEnvironment["GHOSTTY_CLEAR_USER_DEFAULTS"] = "YES"
         app.launch()
 
         let window = app.windows.firstMatch
         XCTAssertTrue(window.waitForExistence(timeout: 5), "Window should appear")
 
         let firstFrame = window.frame
+        let screenFrame = NSScreen.main?.frame ?? .zero
+
+        XCTAssertEqual(firstFrame.midX, screenFrame.midX, accuracy: 5.0, "First window should be centered horizontally")
 
         // Close the window and open a new one — it should restore the same frame.
         app.typeKey("w", modifierFlags: [.command])

From 4f849a15124b64dab955a489b77a80388b595523 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Thu, 12 Mar 2026 13:43:57 +0100
Subject: [PATCH 133/391] macOS: fix window position for the very first window

---
 .../Terminal/TerminalController.swift         | 44 ++++++++++++-------
 .../Window Styles/TerminalWindow.swift        |  9 ++--
 .../Sources/Helpers/LastWindowPosition.swift  |  8 +++-
 3 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index 74b73ea00..f29e19384 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -1061,22 +1061,6 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
             }
         }
 
-        // Set the initial window position. This must happen after the window
-        // is fully set up (content view, toolbar, default size) so that
-        // decorations added by subclass awakeFromNib (e.g. toolbar for tabs
-        // style) don't change the frame after the position is restored.
-        if let terminalWindow = window as? TerminalWindow {
-            terminalWindow.setInitialWindowPosition(
-                x: derivedConfig.windowPositionX,
-                y: derivedConfig.windowPositionY,
-            )
-        }
-
-        LastWindowPosition.shared.restore(
-            window,
-            origin: derivedConfig.windowPositionX == nil && derivedConfig.windowPositionY == nil,
-            size: defaultSize == nil,
-        )
 
         // Store our initial frame so we can know our default later. This MUST
         // be after the defaultSize call above so that we don't re-apply our frame.
@@ -1110,6 +1094,34 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         syncAppearance(.init(config))
     }
 
+    /// Setup correct window frame before showing the window
+    override func showWindow(_ sender: Any?) {
+        guard let terminalWindow = window as? TerminalWindow else { return }
+
+        // Set the initial window position. This must happen after the window
+        // is fully set up (content view, toolbar, default size) so that
+        // decorations added by subclass awakeFromNib (e.g. toolbar for tabs
+        // style) don't change the frame after the position is restored.
+        let originChanged = terminalWindow.setInitialWindowPosition(
+            x: derivedConfig.windowPositionX,
+            y: derivedConfig.windowPositionY,
+        )
+        let restored = LastWindowPosition.shared.restore(
+            terminalWindow,
+            origin: !originChanged,
+            size: defaultSize == nil,
+        )
+
+        // If nothing is changed for the frame,
+        // we should center the window
+        if !originChanged, !restored {
+            // This doesn't work in `windowDidLoad` somehow
+            terminalWindow.center()
+        }
+
+        super.showWindow(sender)
+    }
+
     // Shows the "+" button in the tab bar, responds to that click.
     override func newWindowForTab(_ sender: Any?) {
         // Trigger the ghostty core event logic for a new tab.
diff --git a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift
index b9ca1ecc4..e19d6711f 100644
--- a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
+++ b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
@@ -536,17 +536,15 @@ class TerminalWindow: NSWindow {
         terminalController?.updateColorSchemeForSurfaceTree()
     }
 
-    func setInitialWindowPosition(x: Int16?, y: Int16?) {
+    func setInitialWindowPosition(x: Int16?, y: Int16?) -> Bool {
         // If we don't have an X/Y then we try to use the previously saved window pos.
         guard let x = x, let y = y else {
-            center()
-            return
+            return false
         }
 
         // Prefer the screen our window is being placed on otherwise our primary screen.
         guard let screen = screen ?? NSScreen.screens.first else {
-            center()
-            return
+            return false
         }
 
         // Convert top-left coordinates to bottom-left origin using our utility extension
@@ -562,6 +560,7 @@ class TerminalWindow: NSWindow {
         safeOrigin.y = min(max(safeOrigin.y, vf.minY), vf.maxY - frame.height)
 
         setFrameOrigin(safeOrigin)
+        return true
     }
 
     private func hideWindowButtons() {
diff --git a/macos/Sources/Helpers/LastWindowPosition.swift b/macos/Sources/Helpers/LastWindowPosition.swift
index 298367c74..c7989b6fa 100644
--- a/macos/Sources/Helpers/LastWindowPosition.swift
+++ b/macos/Sources/Helpers/LastWindowPosition.swift
@@ -50,7 +50,13 @@ class LastWindowPosition {
             newFrame.size.height = min(values[3], visibleFrame.height)
         }
 
-        if restoreOrigin, !visibleFrame.contains(newFrame.origin) {
+        // If the new frame is not constrained to the visible screen,
+        // we need to shift it a little bit before AppKit does this for us,
+        // so that we can save the correct size beforehand.
+        // This fixes restoration while running UI tests,
+        // where config is modified without switching apps,
+        // which will not trigger `windowDidBecomeMain`.
+        if restoreOrigin, !visibleFrame.contains(newFrame) {
             newFrame.origin.x = max(visibleFrame.minX, min(visibleFrame.maxX - newFrame.width, newFrame.origin.x))
             newFrame.origin.y = max(visibleFrame.minY, min(visibleFrame.maxY - newFrame.height, newFrame.origin.y))
         }

From 08107d342a1404ea095e48b0ee7fcc5299c2024f Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Thu, 12 Mar 2026 13:44:34 +0100
Subject: [PATCH 134/391] macOS: we don't need initialFrame anymore

---
 .../Features/Terminal/TerminalController.swift      | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index f29e19384..5101651b4 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -56,9 +56,6 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
     /// The notification cancellable for focused surface property changes.
     private var surfaceAppearanceCancellables: Set<AnyCancellable> = []
 
-    /// This will be set to the initial frame of the window from the xib on load.
-    private var initialFrame: NSRect?
-
     init(_ ghostty: Ghostty.App,
          withBaseConfig base: Ghostty.SurfaceConfiguration? = nil,
          withSurfaceTree tree: SplitTree<Ghostty.SurfaceView>? = nil,
@@ -1061,13 +1058,6 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
             }
         }
 
-
-        // Store our initial frame so we can know our default later. This MUST
-        // be after the defaultSize call above so that we don't re-apply our frame.
-        // Note: we probably want to set this on the first frame change or something
-        // so it respects cascade.
-        initialFrame = window.frame
-
         // In various situations, macOS automatically tabs new windows. Ghostty handles
         // its own tabbing so we DONT want this behavior. This detects this scenario and undoes
         // it.
@@ -1666,9 +1656,6 @@ extension TerminalController {
             // Initial size as requested by the configuration (e.g. `window-width`)
             // takes next priority.
             return .contentIntrinsicSize
-        } else if let initialFrame {
-            // The initial frame we had when we started otherwise.
-            return .frame(initialFrame)
         } else {
             return nil
         }

From 77c2acf843e49c9566128fd2381a667077e4f2f8 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Thu, 12 Mar 2026 18:23:52 +0100
Subject: [PATCH 135/391] macOS: add test case for window cascading without
 moving the window

---
 .../GhosttyWindowPositionUITests.swift        | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift b/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
index 44918c8b1..7204472f3 100644
--- a/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
+++ b/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
@@ -10,6 +10,61 @@ import XCTest
 final class GhosttyWindowPositionUITests: GhosttyCustomConfigCase {
     override static var runsForEachTargetApplicationUIConfiguration: Bool { false }
 
+    // MARK: - Cascading
+
+    @MainActor func testWindowCascading() async throws {
+        try updateConfig(
+            """
+            title = "GhosttyWindowPositionUITests"
+            """
+        )
+
+        let app = try ghosttyApplication()
+        // Suppress Restoration
+        app.launchArguments += ["-NSQuitAlwaysKeepsWindows", "NO"]
+        // Clean run
+        app.launchEnvironment["GHOSTTY_CLEAR_USER_DEFAULTS"] = "YES"
+
+        app.launch() // window in the center
+
+//        app.menuBarItems["Window"].firstMatch.click()
+//        app.menuItems["_zoomTopLeft:"].firstMatch.click()
+//
+//        // wait for the animation to finish
+//        try await Task.sleep(for: .seconds(0.5))
+
+        let window = app.windows.firstMatch
+        let windowFrame = window.frame
+//        XCTAssertEqual(windowFrame.minX, 0, "Window should be on the left")
+
+        app.typeKey("n", modifierFlags: [.command])
+
+        let window2 = app.windows.firstMatch
+        XCTAssertTrue(window2.waitForExistence(timeout: 5), "New window should appear")
+        let windowFrame2 = window2.frame
+        XCTAssertNotEqual(windowFrame, windowFrame2, "New window should have moved")
+
+        XCTAssertEqual(windowFrame2.minX, windowFrame.minX + 30, accuracy: 5, "New window should be on the right")
+
+        app.typeKey("n", modifierFlags: [.command])
+
+        let window3 = app.windows.firstMatch
+        XCTAssertTrue(window3.waitForExistence(timeout: 5), "New window should appear")
+        let windowFrame3 = window3.frame
+        XCTAssertNotEqual(windowFrame2, windowFrame3, "New window should have moved")
+
+        XCTAssertEqual(windowFrame3.minX, windowFrame2.minX + 30, accuracy: 5, "New window should be on the right")
+
+        app.typeKey("n", modifierFlags: [.command])
+
+        let window4 = app.windows.firstMatch
+        XCTAssertTrue(window4.waitForExistence(timeout: 5), "New window should appear")
+        let windowFrame4 = window4.frame
+        XCTAssertNotEqual(windowFrame3, windowFrame4, "New window should have moved")
+
+        XCTAssertEqual(windowFrame4.minX, windowFrame3.minX + 30, accuracy: 5, "New window should be on the right")
+    }
+
     // MARK: - Restore round-trip per titlebar style
 
     @MainActor func testRestoredNative() throws { try runRestoreTest(titlebarStyle: "native") }

From ea262cdd34c36ac848ddd417cdf29a4dc93d7fb6 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Thu, 12 Mar 2026 18:25:20 +0100
Subject: [PATCH 136/391] macOS: fix window cascading for 3rd+ window

---
 macos/Sources/Features/Terminal/TerminalController.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index 5101651b4..348bf6d22 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -256,6 +256,8 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         // take effect. Our best theory is there is some next-event-loop-tick logic
         // that Cocoa is doing that we need to be after.
         DispatchQueue.main.async {
+            c.showWindow(self)
+
             // Only cascade if we aren't fullscreen.
             if let window = c.window {
                 if !window.styleMask.contains(.fullScreen) {
@@ -264,8 +266,6 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
                 }
             }
 
-            c.showWindow(self)
-
             // All new_window actions force our app to be active, so that the new
             // window is focused and visible.
             NSApp.activate(ignoringOtherApps: true)

From 5e3866381b321bbc936f5de18e9f2b9622e0af4c Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Thu, 12 Mar 2026 18:25:38 +0100
Subject: [PATCH 137/391] macOS: fix window cascading for the second window

---
 macos/Sources/Features/Terminal/TerminalController.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index 348bf6d22..f06da571c 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -200,7 +200,9 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         if all.count > 1 {
             lastCascadePoint = window.cascadeTopLeft(from: lastCascadePoint)
         } else {
-            lastCascadePoint = window.cascadeTopLeft(from: NSPoint(x: window.frame.minX, y: window.frame.maxY))
+            // We assume the window frame is already correct at this point,
+            // so we pass .zero to let cascade use the current frame position.
+            lastCascadePoint = window.cascadeTopLeft(from: .zero)
         }
     }
 

From d6d6fe4e5800f48846815a6cb2401c495e9ca57c Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Thu, 12 Mar 2026 18:58:37 +0100
Subject: [PATCH 138/391] macOS: update window cascading

Make it smaller and add comparisons between y values
---
 macos/GhosttyUITests/GhosttyWindowPositionUITests.swift | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift b/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
index 7204472f3..d326c5954 100644
--- a/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
+++ b/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
@@ -15,6 +15,8 @@ final class GhosttyWindowPositionUITests: GhosttyCustomConfigCase {
     @MainActor func testWindowCascading() async throws {
         try updateConfig(
             """
+            window-width = 30
+            window-height = 10
             title = "GhosttyWindowPositionUITests"
             """
         )
@@ -46,6 +48,8 @@ final class GhosttyWindowPositionUITests: GhosttyCustomConfigCase {
 
         XCTAssertEqual(windowFrame2.minX, windowFrame.minX + 30, accuracy: 5, "New window should be on the right")
 
+        XCTAssertEqual(windowFrame2.minY, windowFrame.minY + 30, accuracy: 5, "New window should be on the bottom right")
+
         app.typeKey("n", modifierFlags: [.command])
 
         let window3 = app.windows.firstMatch
@@ -55,6 +59,8 @@ final class GhosttyWindowPositionUITests: GhosttyCustomConfigCase {
 
         XCTAssertEqual(windowFrame3.minX, windowFrame2.minX + 30, accuracy: 5, "New window should be on the right")
 
+        XCTAssertEqual(windowFrame3.minY, windowFrame2.minY + 30, accuracy: 5, "New window should be on the bottom right")
+
         app.typeKey("n", modifierFlags: [.command])
 
         let window4 = app.windows.firstMatch
@@ -63,6 +69,8 @@ final class GhosttyWindowPositionUITests: GhosttyCustomConfigCase {
         XCTAssertNotEqual(windowFrame3, windowFrame4, "New window should have moved")
 
         XCTAssertEqual(windowFrame4.minX, windowFrame3.minX + 30, accuracy: 5, "New window should be on the right")
+
+        XCTAssertEqual(windowFrame4.minY, windowFrame3.minY + 30, accuracy: 5, "New window should be on the bottom right")
     }
 
     // MARK: - Restore round-trip per titlebar style

From 3022aa05ea82296adb598d340735f8339f5bf753 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Thu, 12 Mar 2026 19:54:12 +0100
Subject: [PATCH 139/391] macOS: add test cases for drag-split

---
 .../GhosttyWindowPositionUITests.swift        | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift b/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
index d326c5954..99f7b5627 100644
--- a/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
+++ b/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
@@ -73,6 +73,109 @@ final class GhosttyWindowPositionUITests: GhosttyCustomConfigCase {
         XCTAssertEqual(windowFrame4.minY, windowFrame3.minY + 30, accuracy: 5, "New window should be on the bottom right")
     }
 
+    @MainActor func testDragSplitWindowPosition() async throws {
+        try updateConfig(
+            """
+            window-width = 40
+            window-height = 20
+            title = "GhosttyWindowPositionUITests"
+            macos-titlebar-style = hidden
+            """
+        )
+
+        let app = try ghosttyApplication()
+        // Suppress Restoration
+        app.launchArguments += ["-NSQuitAlwaysKeepsWindows", "NO"]
+        // Clean run
+        app.launchEnvironment["GHOSTTY_CLEAR_USER_DEFAULTS"] = "YES"
+
+        app.launch() // window in the center
+
+        let window = app.windows.firstMatch
+        XCTAssertTrue(window.waitForExistence(timeout: 5), "New window should appear")
+
+        // remove fixe size
+        try updateConfig(
+            """
+            title = "GhosttyWindowPositionUITests"
+            macos-titlebar-style = hidden
+            """
+        )
+        app.typeKey(",", modifierFlags: [.command, .shift])
+
+        app.typeKey("d", modifierFlags: [.command])
+
+        let rightSplit = app.groups["Right pane"]
+        let rightFrame = rightSplit.frame
+
+        let sourcePos = rightSplit.coordinate(withNormalizedOffset: .zero)
+            .withOffset(.init(dx: rightFrame.size.width / 2, dy: 3))
+
+        let targetPos = rightSplit.coordinate(withNormalizedOffset: .zero)
+            .withOffset(.init(dx: rightFrame.size.width + 100, dy: 0))
+
+        sourcePos.click(forDuration: 0.2, thenDragTo: targetPos)
+
+        let window2 = app.windows.firstMatch
+        XCTAssertTrue(window2.waitForExistence(timeout: 5), "New window should appear")
+        let windowFrame2 = window2.frame
+
+        try await Task.sleep(for: .seconds(0.5))
+
+        XCTAssertEqual(windowFrame2.minX, rightFrame.maxX + 100, accuracy: 5, "New window should be target position")
+        XCTAssertEqual(windowFrame2.minY, rightFrame.minY, accuracy: 5, "New window should be target position")
+        XCTAssertEqual(windowFrame2.width, rightFrame.width, accuracy: 5, "New window should use size from config")
+         XCTAssertEqual(windowFrame2.height, rightFrame.height, accuracy: 5, "New window should use size from config")
+    }
+
+    @MainActor func testDragSplitWindowPositionWithFixedSize() async throws {
+        try updateConfig(
+            """
+            window-width = 40
+            window-height = 20
+            title = "GhosttyWindowPositionUITests"
+            macos-titlebar-style = hidden
+            """
+        )
+
+        let app = try ghosttyApplication()
+        // Suppress Restoration
+        app.launchArguments += ["-NSQuitAlwaysKeepsWindows", "NO"]
+        // Clean run
+        app.launchEnvironment["GHOSTTY_CLEAR_USER_DEFAULTS"] = "YES"
+
+        app.launch() // window in the center
+
+        let window = app.windows.firstMatch
+        XCTAssertTrue(window.waitForExistence(timeout: 5), "New window should appear")
+        let windowFrame = window.frame
+
+        app.typeKey("d", modifierFlags: [.command])
+
+        let rightSplit = app.groups["Right pane"]
+        let rightFrame = rightSplit.frame
+
+        let sourcePos = rightSplit.coordinate(withNormalizedOffset: .zero)
+            .withOffset(.init(dx: rightFrame.size.width / 2, dy: 3))
+
+        let targetPos = rightSplit.coordinate(withNormalizedOffset: .zero)
+            .withOffset(.init(dx: rightFrame.size.width + 100, dy: 0))
+
+        sourcePos.click(forDuration: 0.2, thenDragTo: targetPos)
+
+        let window2 = app.windows.firstMatch
+        XCTAssertTrue(window2.waitForExistence(timeout: 5), "New window should appear")
+        let windowFrame2 = window2.frame
+
+        try await Task.sleep(for: .seconds(0.5))
+
+        XCTAssertEqual(windowFrame2.minX, rightFrame.maxX + 100, accuracy: 5, "New window should be target position")
+        XCTAssertEqual(windowFrame2.minY, rightFrame.minY, accuracy: 5, "New window should be target position")
+        XCTAssertEqual(windowFrame2.width, windowFrame.width, accuracy: 5, "New window should use size from config")
+        // We're still using right frame, because of the debug banner
+         XCTAssertEqual(windowFrame2.height, rightFrame.height, accuracy: 5, "New window should use size from config")
+    }
+
     // MARK: - Restore round-trip per titlebar style
 
     @MainActor func testRestoredNative() throws { try runRestoreTest(titlebarStyle: "native") }

From 07bc8886822bdc19932efea54e6d01bd230078cc Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Thu, 12 Mar 2026 19:54:41 +0100
Subject: [PATCH 140/391] macOS: fix window position when dragging split into a
 new window

---
 macos/Sources/Features/Terminal/TerminalController.swift | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index f06da571c..7ade0e38d 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -318,8 +318,9 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
 
         // Calculate the target frame based on the tree's view bounds
         let treeSize: CGSize? = tree.root?.viewBounds()
-
+       
         DispatchQueue.main.async {
+            c.showWindow(self)
             if let window = c.window {
                 // If we have a tree size, resize the window's content to match
                 if let treeSize, treeSize.width > 0, treeSize.height > 0 {
@@ -337,8 +338,6 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
                     }
                 }
             }
-
-            c.showWindow(self)
         }
 
         // Setup our undo

From 5c51603b0b82a33c7461384e27ee67edbf3818fd Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Thu, 12 Mar 2026 20:02:23 +0100
Subject: [PATCH 141/391] chore: make ci happy

---
 macos/GhosttyUITests/GhosttyWindowPositionUITests.swift  | 2 +-
 macos/Sources/Features/Terminal/TerminalController.swift | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift b/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
index 99f7b5627..399c2531a 100644
--- a/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
+++ b/macos/GhosttyUITests/GhosttyWindowPositionUITests.swift
@@ -94,7 +94,7 @@ final class GhosttyWindowPositionUITests: GhosttyCustomConfigCase {
         let window = app.windows.firstMatch
         XCTAssertTrue(window.waitForExistence(timeout: 5), "New window should appear")
 
-        // remove fixe size
+        // remove fixed size
         try updateConfig(
             """
             title = "GhosttyWindowPositionUITests"
diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index 7ade0e38d..56b0b40ad 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -318,7 +318,7 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
 
         // Calculate the target frame based on the tree's view bounds
         let treeSize: CGSize? = tree.root?.viewBounds()
-       
+
         DispatchQueue.main.async {
             c.showWindow(self)
             if let window = c.window {

From 64331b8c35e2a39a9296594f9e6b096c54a8b49f Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken@vandine.org>
Date: Thu, 12 Mar 2026 16:27:54 -0400
Subject: [PATCH 142/391] snap: Don't leak LD_LIBRARY_PATH set by the snap
 launcher

---
 src/os/open.zig | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/os/open.zig b/src/os/open.zig
index 28d1c23ee..0cead5552 100644
--- a/src/os/open.zig
+++ b/src/os/open.zig
@@ -1,6 +1,7 @@
 const std = @import("std");
 const builtin = @import("builtin");
 const Allocator = std.mem.Allocator;
+const build_config = @import("../build_config.zig");
 const apprt = @import("../apprt.zig");
 
 const log = std.log.scoped(.@"os-open");
@@ -48,6 +49,17 @@ pub fn open(
     exe.stdout_behavior = .Pipe;
     exe.stderr_behavior = .Pipe;
 
+    // In the snap on Linux the launcher exports LD_LIBRARY_PATH pointing at
+    // the snap's bundled libraries. Leaking this into child process can
+    // can be problematic, so let's drop it from the env
+    var snap_env: std.process.EnvMap = if (comptime build_config.snap) blk: {
+        var env = try std.process.getEnvMap(alloc);
+        env.remove("LD_LIBRARY_PATH");
+        break :blk env;
+    } else undefined;
+    defer if (comptime build_config.snap) snap_env.deinit();
+    if (comptime build_config.snap) exe.env_map = &snap_env;
+
     // Spawn the process on our same thread so we can detect failure
     // quickly.
     try exe.spawn();

From eccf960def6f15dc33abaeff6f9b7ad3894db5dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Mar 2026 00:13:53 +0000
Subject: [PATCH 143/391] build(deps): bump dorny/paths-filter from 3.0.2 to
 4.0.0

Bumps [dorny/paths-filter](https://github.com/dorny/paths-filter) from 3.0.2 to 4.0.0.
- [Release notes](https://github.com/dorny/paths-filter/releases)
- [Changelog](https://github.com/dorny/paths-filter/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dorny/paths-filter/compare/de90cc6fb38fc0963ad72b210f1f284cd68cea36...9d7afb8d214ad99e78fbd4247752c4caed2b6e4c)

---
updated-dependencies:
- dependency-name: dorny/paths-filter
  dependency-version: 4.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d0f01133b..2762427ac 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+      - uses: dorny/paths-filter@9d7afb8d214ad99e78fbd4247752c4caed2b6e4c # v4.0.0
         id: filter_every
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -40,7 +40,7 @@ jobs:
             code:
               - '**'
               - '!.github/VOUCHED.td'
-      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+      - uses: dorny/paths-filter@9d7afb8d214ad99e78fbd4247752c4caed2b6e4c # v4.0.0
         id: filter_any
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

From 6f8ffecb89a4484a2fc587e0217263d28a7612e5 Mon Sep 17 00:00:00 2001
From: rhodes-b <59537185+rhodes-b@users.noreply.github.com>
Date: Thu, 12 Mar 2026 20:21:42 -0500
Subject: [PATCH 144/391] working basic search wrapping

---
 src/terminal/search/screen.zig | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/terminal/search/screen.zig b/src/terminal/search/screen.zig
index 74828d879..c9e0ada7f 100644
--- a/src/terminal/search/screen.zig
+++ b/src/terminal/search/screen.zig
@@ -740,13 +740,9 @@ pub const ScreenSearch = struct {
             return true;
         };
 
-        const next_idx = prev.idx + 1;
         const active_len = self.active_results.items.len;
         const history_len = self.history_results.items.len;
-        if (next_idx >= active_len + history_len) {
-            // No more matches. We don't wrap or reset the match currently.
-            return false;
-        }
+        const next_idx = if (prev.idx + 1 >= active_len + history_len) 0 else prev.idx + 1;
         const hl: FlattenedHighlight = if (next_idx < active_len)
             self.active_results.items[active_len - 1 - next_idx]
         else
@@ -800,14 +796,10 @@ pub const ScreenSearch = struct {
             return true;
         };
 
-        // Can't go below zero
-        if (prev.idx == 0) {
-            // No more matches. We don't wrap or reset the match currently.
-            return false;
-        }
-
-        const next_idx = prev.idx - 1;
         const active_len = self.active_results.items.len;
+        const history_len = self.history_results.items.len;
+        const next_idx = if (prev.idx != 0) prev.idx - 1 else active_len - 1 + history_len;
+
         const hl: FlattenedHighlight = if (next_idx < active_len)
             self.active_results.items[active_len - 1 - next_idx]
         else

From af84fdbea8fbb1f9418f000151f99d880051a3ba Mon Sep 17 00:00:00 2001
From: rhodes-b <59537185+rhodes-b@users.noreply.github.com>
Date: Thu, 12 Mar 2026 20:39:35 -0500
Subject: [PATCH 145/391] fix tests

---
 src/terminal/search/screen.zig | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/terminal/search/screen.zig b/src/terminal/search/screen.zig
index c9e0ada7f..ca2a5a894 100644
--- a/src/terminal/search/screen.zig
+++ b/src/terminal/search/screen.zig
@@ -1075,17 +1075,17 @@ test "select next" {
         } }, t.screens.active.pages.pointFromPin(.screen, sel.end).?);
     }
 
-    // Next match (no wrap)
+    // Next match (wrap)
     _ = try search.select(.next);
     {
         const sel = search.selectedMatch().?.untracked();
         try testing.expectEqual(point.Point{ .screen = .{
             .x = 0,
-            .y = 0,
+            .y = 2,
         } }, t.screens.active.pages.pointFromPin(.screen, sel.start).?);
         try testing.expectEqual(point.Point{ .screen = .{
             .x = 3,
-            .y = 0,
+            .y = 2,
         } }, t.screens.active.pages.pointFromPin(.screen, sel.end).?);
     }
 }
@@ -1270,17 +1270,17 @@ test "select prev" {
         } }, t.screens.active.pages.pointFromPin(.screen, sel.end).?);
     }
 
-    // Prev match (no wrap, stays at newest)
+    // Prev match (wrap)
     _ = try search.select(.prev);
     {
         const sel = search.selectedMatch().?.untracked();
         try testing.expectEqual(point.Point{ .screen = .{
             .x = 0,
-            .y = 2,
+            .y = 0,
         } }, t.screens.active.pages.pointFromPin(.screen, sel.start).?);
         try testing.expectEqual(point.Point{ .screen = .{
             .x = 3,
-            .y = 2,
+            .y = 0,
         } }, t.screens.active.pages.pointFromPin(.screen, sel.end).?);
     }
 }

From 4c4e83784c5b8986d6d0a22c3f1e4fe79a4a3f03 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 13 Mar 2026 08:49:12 -0700
Subject: [PATCH 146/391] macos: new tab applescript command should not
 activate application

Related to #11457
---
 macos/Sources/Features/AppleScript/ScriptTab.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/macos/Sources/Features/AppleScript/ScriptTab.swift b/macos/Sources/Features/AppleScript/ScriptTab.swift
index e5715a4b0..97a5ed1e5 100644
--- a/macos/Sources/Features/AppleScript/ScriptTab.swift
+++ b/macos/Sources/Features/AppleScript/ScriptTab.swift
@@ -126,7 +126,6 @@ final class ScriptTab: NSObject {
         }
 
         tabContainerWindow.makeKeyAndOrderFront(nil)
-        NSApp.activate(ignoringOtherApps: true)
         return nil
     }
 

From 332b2aefc6e72d363aa93ab6ecfc86eeeeb5ed28 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 13 Mar 2026 08:56:24 -0700
Subject: [PATCH 147/391] 1.3.1

---
 build.zig.zon                                    | 2 +-
 dist/linux/com.mitchellh.ghostty.metainfo.xml.in | 3 +++
 nix/package.nix                                  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.zig.zon b/build.zig.zon
index 615f13288..05547bd3b 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -1,6 +1,6 @@
 .{
     .name = .ghostty,
-    .version = "1.3.0",
+    .version = "1.3.1",
     .paths = .{""},
     .fingerprint = 0x64407a2a0b4147e5,
     .minimum_zig_version = "0.15.2",
diff --git a/dist/linux/com.mitchellh.ghostty.metainfo.xml.in b/dist/linux/com.mitchellh.ghostty.metainfo.xml.in
index da1fa626e..4f23c35da 100644
--- a/dist/linux/com.mitchellh.ghostty.metainfo.xml.in
+++ b/dist/linux/com.mitchellh.ghostty.metainfo.xml.in
@@ -52,6 +52,9 @@
 
   <releases>
     <!-- TODO: Generate this automatically -->
+    <release version="1.3.1" date="2026-03-13">
+        <url type="details">https://ghostty.org/docs/install/release-notes/1-3-1</url>
+    </release>
     <release version="1.3.0" date="2026-03-09">
         <url type="details">https://ghostty.org/docs/install/release-notes/1-3-0</url>
     </release>
diff --git a/nix/package.nix b/nix/package.nix
index 391c9da05..f0f4d4519 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -30,7 +30,7 @@
 in
   stdenv.mkDerivation (finalAttrs: {
     pname = "ghostty";
-    version = "1.3.0";
+    version = "1.3.1";
 
     # We limit source like this to try and reduce the amount of rebuilds as possible
     # thus we only provide the source that is needed for the build

From 5fa1a991d0838d7bd08a1130de16b05b99efb445 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 13 Mar 2026 09:22:43 -0700
Subject: [PATCH 148/391] up to 1.3.2-dev

---
 build.zig.zon   | 2 +-
 nix/package.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.zig.zon b/build.zig.zon
index 05547bd3b..7a669a4a1 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -1,6 +1,6 @@
 .{
     .name = .ghostty,
-    .version = "1.3.1",
+    .version = "1.3.2-dev",
     .paths = .{""},
     .fingerprint = 0x64407a2a0b4147e5,
     .minimum_zig_version = "0.15.2",
diff --git a/nix/package.nix b/nix/package.nix
index f0f4d4519..8287b0888 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -30,7 +30,7 @@
 in
   stdenv.mkDerivation (finalAttrs: {
     pname = "ghostty";
-    version = "1.3.1";
+    version = "1.3.2-dev";
 
     # We limit source like this to try and reduce the amount of rebuilds as possible
     # thus we only provide the source that is needed for the build

From 2044e5030ffaadf0361a2f4fca040b77408db0b5 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 13 Mar 2026 13:14:03 -0700
Subject: [PATCH 149/391] terminal: make stream processing infallible

The terminal.Stream next/nextSlice functions can now no longer fail.
All prior failure modes were fully isolated in the handler `vt`
callbacks. As such, vt callbacks are now required to not return an error
and handle their own errors somehow.

Allowing streams to be fallible before was an incorrect design. It
caused problematic scenarios like in `nextSlice` early terminating
processing due to handler errors. This should not be possible.

There is no safe way to bubble up vt errors through the stream because
if nextSlice is called and multiple errors are returned, we can't
coalesce them. We could modify that to return a partial result but its
just more work for stream that is unnecessary. The handler can do all of
this.

This work was discovered due to cleanups to prepare for more C APIs.
Less errors make C APIs easier to implement! And, it helps clean up our
Zig, too.
---
 example/zig-formatter/src/main.zig       |   4 +-
 example/zig-vt-stream/src/main.zig       |  16 +-
 src/benchmark/ScreenClone.zig            |  11 +-
 src/benchmark/TerminalStream.zig         |  11 +-
 src/font/shaper/coretext.zig             |  94 ++--
 src/font/shaper/harfbuzz.zig             |  84 ++--
 src/inspector/widgets/termio.zig         |   4 +-
 src/renderer/cell.zig                    |  24 +-
 src/renderer/link.zig                    |   6 +-
 src/terminal/formatter.zig               | 314 ++++++------
 src/terminal/render.zig                  |  46 +-
 src/terminal/search/Thread.zig           |   2 +-
 src/terminal/search/active.zig           |  10 +-
 src/terminal/search/pagelist.zig         |  44 +-
 src/terminal/search/screen.zig           |  98 ++--
 src/terminal/search/sliding_window.zig   |   4 +-
 src/terminal/search/viewport.zig         |  26 +-
 src/terminal/stream.zig                  | 580 ++++++++++++-----------
 src/terminal/stream_readonly.zig         | 158 +++---
 src/terminal/tmux/viewer.zig             |  15 +-
 src/termio/Termio.zig                    |   6 +-
 src/termio/stream_handler.zig            |  10 +
 test/fuzz-libghostty/src/fuzz_stream.zig |   6 +-
 23 files changed, 791 insertions(+), 782 deletions(-)

diff --git a/example/zig-formatter/src/main.zig b/example/zig-formatter/src/main.zig
index ad101dbf1..df21a2046 100644
--- a/example/zig-formatter/src/main.zig
+++ b/example/zig-formatter/src/main.zig
@@ -23,8 +23,8 @@ pub fn main() !void {
 
         // Replace \n with \r\n
         for (buf[0..n]) |byte| {
-            if (byte == '\n') try stream.next('\r');
-            try stream.next(byte);
+            if (byte == '\n') stream.next('\r');
+            stream.next(byte);
         }
     }
 
diff --git a/example/zig-vt-stream/src/main.zig b/example/zig-vt-stream/src/main.zig
index 8fd438b70..87d8857dd 100644
--- a/example/zig-vt-stream/src/main.zig
+++ b/example/zig-vt-stream/src/main.zig
@@ -14,24 +14,24 @@ pub fn main() !void {
     defer stream.deinit();
 
     // Basic text with newline
-    try stream.nextSlice("Hello, World!\r\n");
+    stream.nextSlice("Hello, World!\r\n");
 
     // ANSI color codes: ESC[1;32m = bold green, ESC[0m = reset
-    try stream.nextSlice("\x1b[1;32mGreen Text\x1b[0m\r\n");
+    stream.nextSlice("\x1b[1;32mGreen Text\x1b[0m\r\n");
 
     // Cursor positioning: ESC[1;1H = move to row 1, column 1
-    try stream.nextSlice("\x1b[1;1HTop-left corner\r\n");
+    stream.nextSlice("\x1b[1;1HTop-left corner\r\n");
 
     // Cursor movement: ESC[5B = move down 5 lines
-    try stream.nextSlice("\x1b[5B");
-    try stream.nextSlice("Moved down!\r\n");
+    stream.nextSlice("\x1b[5B");
+    stream.nextSlice("Moved down!\r\n");
 
     // Erase line: ESC[2K = clear entire line
-    try stream.nextSlice("\x1b[2K");
-    try stream.nextSlice("New content\r\n");
+    stream.nextSlice("\x1b[2K");
+    stream.nextSlice("New content\r\n");
 
     // Multiple lines
-    try stream.nextSlice("Line A\r\nLine B\r\nLine C\r\n");
+    stream.nextSlice("Line A\r\nLine B\r\nLine C\r\n");
 
     // Get the final terminal state as a plain string
     const str = try t.plainString(alloc);
diff --git a/src/benchmark/ScreenClone.zig b/src/benchmark/ScreenClone.zig
index 380379bc3..108eaa0c6 100644
--- a/src/benchmark/ScreenClone.zig
+++ b/src/benchmark/ScreenClone.zig
@@ -94,9 +94,9 @@ fn setup(ptr: *anyopaque) Benchmark.Error!void {
     // Force a style on every single row, which
     var s = self.terminal.vtStream();
     defer s.deinit();
-    s.nextSlice("\x1b[48;2;20;40;60m") catch unreachable;
-    for (0..self.terminal.rows - 1) |_| s.nextSlice("hello\r\n") catch unreachable;
-    s.nextSlice("hello") catch unreachable;
+    s.nextSlice("\x1b[48;2;20;40;60m");
+    for (0..self.terminal.rows - 1) |_| s.nextSlice("hello\r\n");
+    s.nextSlice("hello");
 
     // Setup our terminal state
     const data_f: std.fs.File = (options.dataFile(
@@ -120,10 +120,7 @@ fn setup(ptr: *anyopaque) Benchmark.Error!void {
             return error.BenchmarkFailed;
         };
         if (n == 0) break; // EOF reached
-        stream.nextSlice(buf[0..n]) catch |err| {
-            log.warn("error processing data file chunk err={}", .{err});
-            return error.BenchmarkFailed;
-        };
+        stream.nextSlice(buf[0..n]);
     }
 }
 
diff --git a/src/benchmark/TerminalStream.zig b/src/benchmark/TerminalStream.zig
index 7cf28217f..1cac656e2 100644
--- a/src/benchmark/TerminalStream.zig
+++ b/src/benchmark/TerminalStream.zig
@@ -125,10 +125,7 @@ fn step(ptr: *anyopaque) Benchmark.Error!void {
             return error.BenchmarkFailed;
         };
         if (n == 0) break; // EOF reached
-        self.stream.nextSlice(buf[0..n]) catch |err| {
-            log.warn("error processing data file chunk err={}", .{err});
-            return error.BenchmarkFailed;
-        };
+        self.stream.nextSlice(buf[0..n]);
     }
 }
 
@@ -142,9 +139,11 @@ const Handler = struct {
         self: *Handler,
         comptime action: Stream.Action.Tag,
         value: Stream.Action.Value(action),
-    ) !void {
+    ) void {
         switch (action) {
-            .print => try self.t.print(value.cp),
+            .print => self.t.print(value.cp) catch |err| {
+                log.warn("error processing benchmark print err={}", .{err});
+            },
             else => {},
         }
     }
diff --git a/src/font/shaper/coretext.zig b/src/font/shaper/coretext.zig
index 5a8a6ccbf..ff7c6d9d3 100644
--- a/src/font/shaper/coretext.zig
+++ b/src/font/shaper/coretext.zig
@@ -850,7 +850,7 @@ test "run iterator" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice("ABCD");
+        s.nextSlice("ABCD");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -874,7 +874,7 @@ test "run iterator" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice("ABCD   EFG");
+        s.nextSlice("ABCD   EFG");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -897,7 +897,7 @@ test "run iterator" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice("A😃D");
+        s.nextSlice("A😃D");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -922,7 +922,7 @@ test "run iterator" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice(bad);
+        s.nextSlice(bad);
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -955,8 +955,8 @@ test "run iterator: empty cells with background set" {
         var s = t.vtStream();
         defer s.deinit();
         // Set red background
-        try s.nextSlice("\x1b[48;2;255;0;0m");
-        try s.nextSlice("A");
+        s.nextSlice("\x1b[48;2;255;0;0m");
+        s.nextSlice("A");
 
         // Get our first row
         {
@@ -1014,7 +1014,7 @@ test "shape" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1053,7 +1053,7 @@ test "shape nerd fonts" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1086,7 +1086,7 @@ test "shape inconsolata ligs" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice(">=");
+        s.nextSlice(">=");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -1115,7 +1115,7 @@ test "shape inconsolata ligs" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice("===");
+        s.nextSlice("===");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -1152,7 +1152,7 @@ test "shape monaspace ligs" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice("===");
+        s.nextSlice("===");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -1190,7 +1190,7 @@ test "shape left-replaced lig in last run" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice("!==");
+        s.nextSlice("!==");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -1228,7 +1228,7 @@ test "shape left-replaced lig in early run" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice("!==X");
+        s.nextSlice("!==X");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -1263,7 +1263,7 @@ test "shape U+3C9 with JB Mono" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice("\u{03C9} foo");
+        s.nextSlice("\u{03C9} foo");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -1300,7 +1300,7 @@ test "shape emoji width" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice("👍");
+        s.nextSlice("👍");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -1390,7 +1390,7 @@ test "shape variation selector VS15" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1429,7 +1429,7 @@ test "shape variation selector VS16" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1463,9 +1463,9 @@ test "shape with empty cells in between" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("A");
-    try s.nextSlice("\x1b[5C"); // 5 spaces forward
-    try s.nextSlice("B");
+    s.nextSlice("A");
+    s.nextSlice("\x1b[5C"); // 5 spaces forward
+    s.nextSlice("B");
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1510,7 +1510,7 @@ test "shape Combining characters" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1560,7 +1560,7 @@ test "shape Devanagari string" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("अपार्टमेंट");
+    s.nextSlice("अपार्टमेंट");
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1619,7 +1619,7 @@ test "shape Tai Tham vowels (position differs from advance)" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1680,7 +1680,7 @@ test "shape Tai Tham letters (position.y differs from advance)" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1740,7 +1740,7 @@ test "shape Javanese ligatures" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1803,7 +1803,7 @@ test "shape Chakma vowel sign with ligature (vowel sign renders first)" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1874,7 +1874,7 @@ test "shape Bengali ligatures with out of order vowels" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1929,7 +1929,7 @@ test "shape box glyphs" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1967,7 +1967,7 @@ test "shape selection boundary" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("a1b2c3d4e5");
+    s.nextSlice("a1b2c3d4e5");
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -2072,7 +2072,7 @@ test "shape cursor boundary" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("a1b2c3d4e5");
+    s.nextSlice("a1b2c3d4e5");
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -2209,7 +2209,7 @@ test "shape cursor boundary and colored emoji" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("👍🏼");
+    s.nextSlice("👍🏼");
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -2306,7 +2306,7 @@ test "shape cell attribute change" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice(">=");
+        s.nextSlice(">=");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -2332,9 +2332,9 @@ test "shape cell attribute change" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice(">");
-        try s.nextSlice("\x1b[1m"); // Bold
-        try s.nextSlice("=");
+        s.nextSlice(">");
+        s.nextSlice("\x1b[1m"); // Bold
+        s.nextSlice("=");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -2361,11 +2361,11 @@ test "shape cell attribute change" {
         var s = t.vtStream();
         defer s.deinit();
         // RGB 1, 2, 3
-        try s.nextSlice("\x1b[38;2;1;2;3m");
-        try s.nextSlice(">");
+        s.nextSlice("\x1b[38;2;1;2;3m");
+        s.nextSlice(">");
         // RGB 3, 2, 1
-        try s.nextSlice("\x1b[38;2;3;2;1m");
-        try s.nextSlice("=");
+        s.nextSlice("\x1b[38;2;3;2;1m");
+        s.nextSlice("=");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -2392,11 +2392,11 @@ test "shape cell attribute change" {
         var s = t.vtStream();
         defer s.deinit();
         // RGB 1, 2, 3 bg
-        try s.nextSlice("\x1b[48;2;1;2;3m");
-        try s.nextSlice(">");
+        s.nextSlice("\x1b[48;2;1;2;3m");
+        s.nextSlice(">");
         // RGB 3, 2, 1 bg
-        try s.nextSlice("\x1b[48;2;3;2;1m");
-        try s.nextSlice("=");
+        s.nextSlice("\x1b[48;2;3;2;1m");
+        s.nextSlice("=");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -2423,9 +2423,9 @@ test "shape cell attribute change" {
         var s = t.vtStream();
         defer s.deinit();
         // RGB 1, 2, 3 bg
-        try s.nextSlice("\x1b[48;2;1;2;3m");
-        try s.nextSlice(">");
-        try s.nextSlice("=");
+        s.nextSlice("\x1b[48;2;1;2;3m");
+        s.nextSlice(">");
+        s.nextSlice("=");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -2468,7 +2468,7 @@ test "shape high plane sprite font codepoint" {
     var s = t.vtStream();
     defer s.deinit();
     // U+1FB70: Vertical One Eighth Block-2
-    try s.nextSlice("\u{1FB70}");
+    s.nextSlice("\u{1FB70}");
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
diff --git a/src/font/shaper/harfbuzz.zig b/src/font/shaper/harfbuzz.zig
index 30e1d0544..d17df4b1e 100644
--- a/src/font/shaper/harfbuzz.zig
+++ b/src/font/shaper/harfbuzz.zig
@@ -448,7 +448,7 @@ test "run iterator" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice("ABCD");
+        s.nextSlice("ABCD");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -472,7 +472,7 @@ test "run iterator" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice("ABCD   EFG");
+        s.nextSlice("ABCD   EFG");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -495,7 +495,7 @@ test "run iterator" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice("A😃D");
+        s.nextSlice("A😃D");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -533,7 +533,7 @@ test "run iterator: empty cells with background set" {
         var s = t.vtStream();
         defer s.deinit();
         // Set red background and write A
-        try s.nextSlice("\x1b[48;2;255;0;0mA");
+        s.nextSlice("\x1b[48;2;255;0;0mA");
 
         // Get our first row
         {
@@ -592,7 +592,7 @@ test "shape" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -626,7 +626,7 @@ test "shape inconsolata ligs" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice(">=");
+        s.nextSlice(">=");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -655,7 +655,7 @@ test "shape inconsolata ligs" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice("===");
+        s.nextSlice("===");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -692,7 +692,7 @@ test "shape monaspace ligs" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice("===");
+        s.nextSlice("===");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -732,7 +732,7 @@ test "shape arabic forced LTR" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(@embedFile("testdata/arabic.txt"));
+    s.nextSlice(@embedFile("testdata/arabic.txt"));
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -773,7 +773,7 @@ test "shape emoji width" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice("👍");
+        s.nextSlice("👍");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -870,7 +870,7 @@ test "shape variation selector VS15" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -911,7 +911,7 @@ test "shape variation selector VS16" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -950,9 +950,9 @@ test "shape with empty cells in between" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("A");
-    try s.nextSlice("\x1b[5C");
-    try s.nextSlice("B");
+    s.nextSlice("A");
+    s.nextSlice("\x1b[5C");
+    s.nextSlice("B");
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -997,7 +997,7 @@ test "shape Combining characters" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1048,7 +1048,7 @@ test "shape Devanagari string" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("अपार्टमेंट");
+    s.nextSlice("अपार्टमेंट");
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1111,7 +1111,7 @@ test "shape Tai Tham vowels (position differs from advance)" {
 
     // var s = t.vtStream();
     // defer s.deinit();
-    // try s.nextSlice(buf[0..buf_idx]);
+    // s.nextSlice(buf[0..buf_idx]);
 
     // var state: terminal.RenderState = .empty;
     // defer state.deinit(alloc);
@@ -1170,7 +1170,7 @@ test "shape Tibetan characters" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1232,7 +1232,7 @@ test "shape Tai Tham letters (run_offset.y differs from zero)" {
 
     // var s = t.vtStream();
     // defer s.deinit();
-    // try s.nextSlice(buf[0..buf_idx]);
+    // s.nextSlice(buf[0..buf_idx]);
 
     // var state: terminal.RenderState = .empty;
     // defer state.deinit(alloc);
@@ -1295,7 +1295,7 @@ test "shape Javanese ligatures" {
 
     // var s = t.vtStream();
     // defer s.deinit();
-    // try s.nextSlice(buf[0..buf_idx]);
+    // s.nextSlice(buf[0..buf_idx]);
 
     // var state: terminal.RenderState = .empty;
     // defer state.deinit(alloc);
@@ -1358,7 +1358,7 @@ test "shape Chakma vowel sign with ligature (vowel sign renders first)" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1433,7 +1433,7 @@ test "shape Bengali ligatures with out of order vowels" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1487,7 +1487,7 @@ test "shape box glyphs" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice(buf[0..buf_idx]);
+    s.nextSlice(buf[0..buf_idx]);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1526,7 +1526,7 @@ test "shape selection boundary" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("a1b2c3d4e5");
+    s.nextSlice("a1b2c3d4e5");
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1631,7 +1631,7 @@ test "shape cursor boundary" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("a1b2c3d4e5");
+    s.nextSlice("a1b2c3d4e5");
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1771,7 +1771,7 @@ test "shape cursor boundary and colored emoji" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("👍🏼");
+    s.nextSlice("👍🏼");
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -1868,7 +1868,7 @@ test "shape cell attribute change" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice(">=");
+        s.nextSlice(">=");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -1894,9 +1894,9 @@ test "shape cell attribute change" {
 
         var s = t.vtStream();
         defer s.deinit();
-        try s.nextSlice(">");
-        try s.nextSlice("\x1b[1m");
-        try s.nextSlice("=");
+        s.nextSlice(">");
+        s.nextSlice("\x1b[1m");
+        s.nextSlice("=");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -1923,11 +1923,11 @@ test "shape cell attribute change" {
         var s = t.vtStream();
         defer s.deinit();
         // RGB 1, 2, 3
-        try s.nextSlice("\x1b[38;2;1;2;3m");
-        try s.nextSlice(">");
+        s.nextSlice("\x1b[38;2;1;2;3m");
+        s.nextSlice(">");
         // RGB 3, 2, 1
-        try s.nextSlice("\x1b[38;2;3;2;1m");
-        try s.nextSlice("=");
+        s.nextSlice("\x1b[38;2;3;2;1m");
+        s.nextSlice("=");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -1954,11 +1954,11 @@ test "shape cell attribute change" {
         var s = t.vtStream();
         defer s.deinit();
         // RGB 1, 2, 3 bg
-        try s.nextSlice("\x1b[48;2;1;2;3m");
-        try s.nextSlice(">");
+        s.nextSlice("\x1b[48;2;1;2;3m");
+        s.nextSlice(">");
         // RGB 3, 2, 1 bg
-        try s.nextSlice("\x1b[48;2;3;2;1m");
-        try s.nextSlice("=");
+        s.nextSlice("\x1b[48;2;3;2;1m");
+        s.nextSlice("=");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
@@ -1985,9 +1985,9 @@ test "shape cell attribute change" {
         var s = t.vtStream();
         defer s.deinit();
         // RGB 1, 2, 3 bg
-        try s.nextSlice("\x1b[48;2;1;2;3m");
-        try s.nextSlice(">");
-        try s.nextSlice("=");
+        s.nextSlice("\x1b[48;2;1;2;3m");
+        s.nextSlice(">");
+        s.nextSlice("=");
 
         var state: terminal.RenderState = .empty;
         defer state.deinit(alloc);
diff --git a/src/inspector/widgets/termio.zig b/src/inspector/widgets/termio.zig
index a6c8f6081..b721d9422 100644
--- a/src/inspector/widgets/termio.zig
+++ b/src/inspector/widgets/termio.zig
@@ -54,7 +54,7 @@ pub const Stream = struct {
             .events = &self.events,
         };
         defer self.parser_stream.handler.state = null;
-        try self.parser_stream.nextSlice(data);
+        self.parser_stream.nextSlice(data);
     }
 
     pub fn draw(
@@ -736,7 +736,7 @@ const VTHandler = struct {
         self: *VTHandler,
         comptime action: VTHandler.Stream.Action.Tag,
         value: VTHandler.Stream.Action.Value(action),
-    ) !void {
+    ) void {
         _ = self;
         _ = value;
     }
diff --git a/src/renderer/cell.zig b/src/renderer/cell.zig
index 5ea5b7ab0..196ebb175 100644
--- a/src/renderer/cell.zig
+++ b/src/renderer/cell.zig
@@ -528,7 +528,7 @@ test "Cell constraint widths" {
     // symbol->nothing: 2
     {
         t.fullReset();
-        try s.nextSlice("");
+        s.nextSlice("");
         try state.update(alloc, &t);
         try testing.expectEqual(2, constraintWidth(
             state.row_data.get(0).cells.items(.raw),
@@ -540,7 +540,7 @@ test "Cell constraint widths" {
     // symbol->character: 1
     {
         t.fullReset();
-        try s.nextSlice("z");
+        s.nextSlice("z");
         try state.update(alloc, &t);
         try testing.expectEqual(1, constraintWidth(
             state.row_data.get(0).cells.items(.raw),
@@ -552,7 +552,7 @@ test "Cell constraint widths" {
     // symbol->space: 2
     {
         t.fullReset();
-        try s.nextSlice(" z");
+        s.nextSlice(" z");
         try state.update(alloc, &t);
         try testing.expectEqual(2, constraintWidth(
             state.row_data.get(0).cells.items(.raw),
@@ -563,7 +563,7 @@ test "Cell constraint widths" {
     // symbol->no-break space: 1
     {
         t.fullReset();
-        try s.nextSlice("\u{00a0}z");
+        s.nextSlice("\u{00a0}z");
         try state.update(alloc, &t);
         try testing.expectEqual(1, constraintWidth(
             state.row_data.get(0).cells.items(.raw),
@@ -575,7 +575,7 @@ test "Cell constraint widths" {
     // symbol->end of row: 1
     {
         t.fullReset();
-        try s.nextSlice("   ");
+        s.nextSlice("   ");
         try state.update(alloc, &t);
         try testing.expectEqual(1, constraintWidth(
             state.row_data.get(0).cells.items(.raw),
@@ -587,7 +587,7 @@ test "Cell constraint widths" {
     // character->symbol: 2
     {
         t.fullReset();
-        try s.nextSlice("z");
+        s.nextSlice("z");
         try state.update(alloc, &t);
         try testing.expectEqual(2, constraintWidth(
             state.row_data.get(0).cells.items(.raw),
@@ -599,7 +599,7 @@ test "Cell constraint widths" {
     // symbol->symbol: 1,1
     {
         t.fullReset();
-        try s.nextSlice("");
+        s.nextSlice("");
         try state.update(alloc, &t);
         try testing.expectEqual(1, constraintWidth(
             state.row_data.get(0).cells.items(.raw),
@@ -616,7 +616,7 @@ test "Cell constraint widths" {
     // symbol->space->symbol: 2,2
     {
         t.fullReset();
-        try s.nextSlice(" ");
+        s.nextSlice(" ");
         try state.update(alloc, &t);
         try testing.expectEqual(2, constraintWidth(
             state.row_data.get(0).cells.items(.raw),
@@ -633,7 +633,7 @@ test "Cell constraint widths" {
     // symbol->powerline: 1  (dedicated test because powerline is special-cased in cellpkg)
     {
         t.fullReset();
-        try s.nextSlice("");
+        s.nextSlice("");
         try state.update(alloc, &t);
         try testing.expectEqual(1, constraintWidth(
             state.row_data.get(0).cells.items(.raw),
@@ -645,7 +645,7 @@ test "Cell constraint widths" {
     // powerline->symbol: 2  (dedicated test because powerline is special-cased in cellpkg)
     {
         t.fullReset();
-        try s.nextSlice("");
+        s.nextSlice("");
         try state.update(alloc, &t);
         try testing.expectEqual(2, constraintWidth(
             state.row_data.get(0).cells.items(.raw),
@@ -657,7 +657,7 @@ test "Cell constraint widths" {
     // powerline->nothing: 2  (dedicated test because powerline is special-cased in cellpkg)
     {
         t.fullReset();
-        try s.nextSlice("");
+        s.nextSlice("");
         try state.update(alloc, &t);
         try testing.expectEqual(2, constraintWidth(
             state.row_data.get(0).cells.items(.raw),
@@ -669,7 +669,7 @@ test "Cell constraint widths" {
     // powerline->space: 2  (dedicated test because powerline is special-cased in cellpkg)
     {
         t.fullReset();
-        try s.nextSlice(" z");
+        s.nextSlice(" z");
         try state.update(alloc, &t);
         try testing.expectEqual(2, constraintWidth(
             state.row_data.get(0).cells.items(.raw),
diff --git a/src/renderer/link.zig b/src/renderer/link.zig
index 74df3e596..c5de61574 100644
--- a/src/renderer/link.zig
+++ b/src/renderer/link.zig
@@ -148,7 +148,7 @@ test "renderCellMap" {
     var s = t.vtStream();
     defer s.deinit();
     const str = "1ABCD2EFGH\r\n3IJKL";
-    try s.nextSlice(str);
+    s.nextSlice(str);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -201,7 +201,7 @@ test "renderCellMap hover links" {
     var s = t.vtStream();
     defer s.deinit();
     const str = "1ABCD2EFGH\r\n3IJKL";
-    try s.nextSlice(str);
+    s.nextSlice(str);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
@@ -279,7 +279,7 @@ test "renderCellMap mods no match" {
     var s = t.vtStream();
     defer s.deinit();
     const str = "1ABCD2EFGH\r\n3IJKL";
-    try s.nextSlice(str);
+    s.nextSlice(str);
 
     var state: terminal.RenderState = .empty;
     defer state.deinit(alloc);
diff --git a/src/terminal/formatter.zig b/src/terminal/formatter.zig
index 062e3969a..f3b503d29 100644
--- a/src/terminal/formatter.zig
+++ b/src/terminal/formatter.zig
@@ -1593,7 +1593,7 @@ test "Page plain single line" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello, world");
+    s.nextSlice("hello, world");
 
     // Verify we have only a single page
     const pages = &t.screens.active.pages;
@@ -1640,7 +1640,7 @@ test "Page plain single line soft-wrapped unwrapped" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello!");
+    s.nextSlice("hello!");
 
     // Verify we have only a single page
     const pages = &t.screens.active.pages;
@@ -1710,7 +1710,7 @@ test "Page plain single wide char" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("1A⚡");
+    s.nextSlice("1A⚡");
 
     // Verify we have only a single page
     const pages = &t.screens.active.pages;
@@ -1801,7 +1801,7 @@ test "Page plain single wide char soft-wrapped unwrapped" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("1A⚡");
+    s.nextSlice("1A⚡");
 
     // Verify we have only a single page
     const pages = &t.screens.active.pages;
@@ -1918,7 +1918,7 @@ test "Page plain multiline" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello\r\nworld");
+    s.nextSlice("hello\r\nworld");
 
     // Verify we have only a single page
     const pages = &t.screens.active.pages;
@@ -1969,7 +1969,7 @@ test "Page plain multiline rectangle" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello\r\nworld");
+    s.nextSlice("hello\r\nworld");
 
     // Verify we have only a single page
     const pages = &t.screens.active.pages;
@@ -2023,7 +2023,7 @@ test "Page plain multi blank lines" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello\r\n\r\n\r\nworld");
+    s.nextSlice("hello\r\n\r\n\r\nworld");
 
     // Verify we have only a single page
     const pages = &t.screens.active.pages;
@@ -2076,7 +2076,7 @@ test "Page plain trailing blank lines" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello\r\nworld\r\n\r\n");
+    s.nextSlice("hello\r\nworld\r\n\r\n");
 
     // Verify we have only a single page
     const pages = &t.screens.active.pages;
@@ -2129,7 +2129,7 @@ test "Page plain trailing whitespace" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello   \r\nworld   ");
+    s.nextSlice("hello   \r\nworld   ");
 
     // Verify we have only a single page
     const pages = &t.screens.active.pages;
@@ -2182,7 +2182,7 @@ test "Page plain trailing whitespace no trim" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello   \r\nworld  ");
+    s.nextSlice("hello   \r\nworld  ");
 
     // Verify we have only a single page
     const pages = &t.screens.active.pages;
@@ -2238,7 +2238,7 @@ test "Page plain with prior trailing state rows" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello");
+    s.nextSlice("hello");
 
     const pages = &t.screens.active.pages;
     try testing.expect(pages.pages.first != null);
@@ -2284,7 +2284,7 @@ test "Page plain with prior trailing state cells no wrapped line" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello");
+    s.nextSlice("hello");
 
     const pages = &t.screens.active.pages;
     try testing.expect(pages.pages.first != null);
@@ -2329,7 +2329,7 @@ test "Page plain with prior trailing state cells with wrap continuation" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("world");
+    s.nextSlice("world");
 
     const pages = &t.screens.active.pages;
     try testing.expect(pages.pages.first != null);
@@ -2383,7 +2383,7 @@ test "Page plain soft-wrapped without unwrap" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello world test");
+    s.nextSlice("hello world test");
 
     const pages = &t.screens.active.pages;
     try testing.expect(pages.pages.first != null);
@@ -2432,7 +2432,7 @@ test "Page plain soft-wrapped with unwrap" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello world test");
+    s.nextSlice("hello world test");
 
     const pages = &t.screens.active.pages;
     try testing.expect(pages.pages.first != null);
@@ -2480,7 +2480,7 @@ test "Page plain soft-wrapped 3 lines without unwrap" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello world this is a test");
+    s.nextSlice("hello world this is a test");
 
     const pages = &t.screens.active.pages;
     try testing.expect(pages.pages.first != null);
@@ -2534,7 +2534,7 @@ test "Page plain soft-wrapped 3 lines with unwrap" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello world this is a test");
+    s.nextSlice("hello world this is a test");
 
     const pages = &t.screens.active.pages;
     try testing.expect(pages.pages.first != null);
@@ -2586,7 +2586,7 @@ test "Page plain start_y subset" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello\r\nworld\r\ntest");
+    s.nextSlice("hello\r\nworld\r\ntest");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -2633,7 +2633,7 @@ test "Page plain end_y subset" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello\r\nworld\r\ntest");
+    s.nextSlice("hello\r\nworld\r\ntest");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -2680,7 +2680,7 @@ test "Page plain start_y and end_y range" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello\r\nworld\r\ntest\r\nfoo");
+    s.nextSlice("hello\r\nworld\r\ntest\r\nfoo");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -2728,7 +2728,7 @@ test "Page plain start_y out of bounds" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello");
+    s.nextSlice("hello");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -2766,7 +2766,7 @@ test "Page plain end_y greater than rows" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello");
+    s.nextSlice("hello");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -2809,7 +2809,7 @@ test "Page plain end_y less than start_y" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello");
+    s.nextSlice("hello");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -2848,7 +2848,7 @@ test "Page plain start_x on first row only" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello world");
+    s.nextSlice("hello world");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -2890,7 +2890,7 @@ test "Page plain end_x on last row only" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("first line\r\nsecond line\r\nthird line");
+    s.nextSlice("first line\r\nsecond line\r\nthird line");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -2943,7 +2943,7 @@ test "Page plain start_x and end_x multiline" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello world\r\ntest case\r\nfoo bar");
+    s.nextSlice("hello world\r\ntest case\r\nfoo bar");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -3000,7 +3000,7 @@ test "Page plain start_x out of bounds" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello");
+    s.nextSlice("hello");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -3038,7 +3038,7 @@ test "Page plain end_x greater than cols" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello");
+    s.nextSlice("hello");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -3080,7 +3080,7 @@ test "Page plain end_x less than start_x single row" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello");
+    s.nextSlice("hello");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -3120,7 +3120,7 @@ test "Page plain start_y non-zero ignores trailing state" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello\r\nworld");
+    s.nextSlice("hello\r\nworld");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -3164,7 +3164,7 @@ test "Page plain start_x non-zero ignores trailing state" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello world");
+    s.nextSlice("hello world");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -3208,7 +3208,7 @@ test "Page plain start_y and start_x zero uses trailing state" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello");
+    s.nextSlice("hello");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -3255,7 +3255,7 @@ test "Page plain single line with styling" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello, \x1b[1mworld\x1b[0m");
+    s.nextSlice("hello, \x1b[1mworld\x1b[0m");
 
     // Verify we have only a single page
     const pages = &t.screens.active.pages;
@@ -3301,7 +3301,7 @@ test "Page VT single line plain text" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello");
+    s.nextSlice("hello");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -3340,7 +3340,7 @@ test "Page VT single line with bold" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("\x1b[1mhello\x1b[0m");
+    s.nextSlice("\x1b[1mhello\x1b[0m");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -3386,7 +3386,7 @@ test "Page VT multiple styles" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("\x1b[1mhello \x1b[3mworld\x1b[0m");
+    s.nextSlice("\x1b[1mhello \x1b[3mworld\x1b[0m");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -3421,7 +3421,7 @@ test "Page VT with foreground color" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("\x1b[31mred\x1b[0m");
+    s.nextSlice("\x1b[31mred\x1b[0m");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -3467,7 +3467,7 @@ test "Page VT with background and foreground colors" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello");
+    s.nextSlice("hello");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -3504,7 +3504,7 @@ test "Page VT multi-line with styles" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("\x1b[1mfirst\x1b[0m\r\n\x1b[3msecond\x1b[0m");
+    s.nextSlice("\x1b[1mfirst\x1b[0m\r\n\x1b[3msecond\x1b[0m");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -3541,7 +3541,7 @@ test "Page VT duplicate style not emitted twice" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("\x1b[1mhel\x1b[1mlo\x1b[0m");
+    s.nextSlice("\x1b[1mhel\x1b[1mlo\x1b[0m");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -3576,7 +3576,7 @@ test "PageList plain single line" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello, world");
+    s.nextSlice("hello, world");
 
     var pin_map: std.ArrayList(Pin) = .empty;
     defer pin_map.deinit(alloc);
@@ -3616,18 +3616,18 @@ test "PageList plain spanning two pages" {
     const first_page_rows = pages.pages.first.?.data.capacity.rows;
 
     // Fill the first page almost completely
-    for (0..first_page_rows - 1) |_| try s.nextSlice("\r\n");
-    try s.nextSlice("page one");
+    for (0..first_page_rows - 1) |_| s.nextSlice("\r\n");
+    s.nextSlice("page one");
 
     // Verify we're still on one page
     try testing.expect(pages.pages.first == pages.pages.last);
 
     // Add one more newline to push content to a second page
-    try s.nextSlice("\r\n");
+    s.nextSlice("\r\n");
     try testing.expect(pages.pages.first != pages.pages.last);
 
     // Write content on the second page
-    try s.nextSlice("page two");
+    s.nextSlice("page two");
 
     // Format the entire PageList
     var pin_map: std.ArrayList(Pin) = .empty;
@@ -3689,8 +3689,8 @@ test "PageList soft-wrapped line spanning two pages without unwrap" {
     const first_page_rows = pages.pages.first.?.data.capacity.rows;
 
     // Fill the first page with soft-wrapped content
-    for (0..first_page_rows - 1) |_| try s.nextSlice("\r\n");
-    try s.nextSlice("hello world test");
+    for (0..first_page_rows - 1) |_| s.nextSlice("\r\n");
+    s.nextSlice("hello world test");
 
     // Verify we're on two pages due to wrapping
     try testing.expect(pages.pages.first != pages.pages.last);
@@ -3753,8 +3753,8 @@ test "PageList soft-wrapped line spanning two pages with unwrap" {
     const first_page_rows = pages.pages.first.?.data.capacity.rows;
 
     // Fill the first page with soft-wrapped content
-    for (0..first_page_rows - 1) |_| try s.nextSlice("\r\n");
-    try s.nextSlice("hello world test");
+    for (0..first_page_rows - 1) |_| s.nextSlice("\r\n");
+    s.nextSlice("hello world test");
 
     // Verify we're on two pages due to wrapping
     try testing.expect(pages.pages.first != pages.pages.last);
@@ -3814,18 +3814,18 @@ test "PageList VT spanning two pages" {
     const first_page_rows = pages.pages.first.?.data.capacity.rows;
 
     // Fill the first page almost completely
-    for (0..first_page_rows - 1) |_| try s.nextSlice("\r\n");
-    try s.nextSlice("\x1b[1mpage one");
+    for (0..first_page_rows - 1) |_| s.nextSlice("\r\n");
+    s.nextSlice("\x1b[1mpage one");
 
     // Verify we're still on one page
     try testing.expect(pages.pages.first == pages.pages.last);
 
     // Add one more newline to push content to a second page
-    try s.nextSlice("\r\n");
+    s.nextSlice("\r\n");
     try testing.expect(pages.pages.first != pages.pages.last);
 
     // New content is still styled
-    try s.nextSlice("page two");
+    s.nextSlice("page two");
 
     // Format the entire PageList with VT
     var pin_map: std.ArrayList(Pin) = .empty;
@@ -3870,7 +3870,7 @@ test "PageList plain with x offset on single page" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello world\r\ntest case\r\nfoo bar");
+    s.nextSlice("hello world\r\ntest case\r\nfoo bar");
 
     const pages = &t.screens.active.pages;
     const node = pages.pages.first.?;
@@ -3920,17 +3920,17 @@ test "PageList plain with x offset spanning two pages" {
     const first_page_rows = pages.pages.first.?.data.capacity.rows;
 
     // Fill first page almost completely
-    for (0..first_page_rows - 1) |_| try s.nextSlice("\r\n");
-    try s.nextSlice("hello world");
+    for (0..first_page_rows - 1) |_| s.nextSlice("\r\n");
+    s.nextSlice("hello world");
 
     // Verify we're still on one page
     try testing.expect(pages.pages.first == pages.pages.last);
 
     // Push to second page
-    try s.nextSlice("\r\n");
+    s.nextSlice("\r\n");
     try testing.expect(pages.pages.first != pages.pages.last);
 
-    try s.nextSlice("foo bar test");
+    s.nextSlice("foo bar test");
 
     const first_node = pages.pages.first.?;
     const last_node = pages.pages.last.?;
@@ -3986,7 +3986,7 @@ test "PageList plain with start_x only" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello world");
+    s.nextSlice("hello world");
 
     const pages = &t.screens.active.pages;
     const node = pages.pages.first.?;
@@ -4027,7 +4027,7 @@ test "PageList plain with end_x only" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello world\r\ntest");
+    s.nextSlice("hello world\r\ntest");
 
     const pages = &t.screens.active.pages;
     const node = pages.pages.first.?;
@@ -4080,11 +4080,11 @@ test "PageList plain rectangle basic" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("Lorem ipsum dolor\r\n");
-    try s.nextSlice("sit amet, consectetur\r\n");
-    try s.nextSlice("adipiscing elit, sed do\r\n");
-    try s.nextSlice("eiusmod tempor incididunt\r\n");
-    try s.nextSlice("ut labore et dolore");
+    s.nextSlice("Lorem ipsum dolor\r\n");
+    s.nextSlice("sit amet, consectetur\r\n");
+    s.nextSlice("adipiscing elit, sed do\r\n");
+    s.nextSlice("eiusmod tempor incididunt\r\n");
+    s.nextSlice("ut labore et dolore");
 
     const pages = &t.screens.active.pages;
 
@@ -4120,11 +4120,11 @@ test "PageList plain rectangle with EOL" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("Lorem ipsum dolor\r\n");
-    try s.nextSlice("sit amet, consectetur\r\n");
-    try s.nextSlice("adipiscing elit, sed do\r\n");
-    try s.nextSlice("eiusmod tempor incididunt\r\n");
-    try s.nextSlice("ut labore et dolore");
+    s.nextSlice("Lorem ipsum dolor\r\n");
+    s.nextSlice("sit amet, consectetur\r\n");
+    s.nextSlice("adipiscing elit, sed do\r\n");
+    s.nextSlice("eiusmod tempor incididunt\r\n");
+    s.nextSlice("ut labore et dolore");
 
     const pages = &t.screens.active.pages;
 
@@ -4162,14 +4162,14 @@ test "PageList plain rectangle more complex with breaks" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("Lorem ipsum dolor\r\n");
-    try s.nextSlice("sit amet, consectetur\r\n");
-    try s.nextSlice("adipiscing elit, sed do\r\n");
-    try s.nextSlice("eiusmod tempor incididunt\r\n");
-    try s.nextSlice("ut labore et dolore\r\n");
-    try s.nextSlice("\r\n");
-    try s.nextSlice("magna aliqua. Ut enim\r\n");
-    try s.nextSlice("ad minim veniam, quis");
+    s.nextSlice("Lorem ipsum dolor\r\n");
+    s.nextSlice("sit amet, consectetur\r\n");
+    s.nextSlice("adipiscing elit, sed do\r\n");
+    s.nextSlice("eiusmod tempor incididunt\r\n");
+    s.nextSlice("ut labore et dolore\r\n");
+    s.nextSlice("\r\n");
+    s.nextSlice("magna aliqua. Ut enim\r\n");
+    s.nextSlice("ad minim veniam, quis");
 
     const pages = &t.screens.active.pages;
 
@@ -4208,7 +4208,7 @@ test "TerminalFormatter plain no selection" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello\r\nworld");
+    s.nextSlice("hello\r\nworld");
 
     const formatter: TerminalFormatter = .init(&t, .plain);
 
@@ -4233,10 +4233,10 @@ test "TerminalFormatter vt with palette" {
     defer s.deinit();
 
     // Modify some palette colors using VT sequences
-    try s.nextSlice("\x1b]4;0;rgb:12/34/56\x1b\\");
-    try s.nextSlice("\x1b]4;1;rgb:ab/cd/ef\x1b\\");
-    try s.nextSlice("\x1b]4;255;rgb:ff/00/ff\x1b\\");
-    try s.nextSlice("test");
+    s.nextSlice("\x1b]4;0;rgb:12/34/56\x1b\\");
+    s.nextSlice("\x1b]4;1;rgb:ab/cd/ef\x1b\\");
+    s.nextSlice("\x1b]4;255;rgb:ff/00/ff\x1b\\");
+    s.nextSlice("test");
 
     const formatter: TerminalFormatter = .init(&t, .vt);
 
@@ -4253,7 +4253,7 @@ test "TerminalFormatter vt with palette" {
     var s2 = t2.vtStream();
     defer s2.deinit();
 
-    try s2.nextSlice(output);
+    s2.nextSlice(output);
 
     // Verify the palettes match
     try testing.expectEqual(t.colors.palette.current[0], t2.colors.palette.current[0]);
@@ -4277,7 +4277,7 @@ test "TerminalFormatter with selection" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("line1\r\nline2\r\nline3");
+    s.nextSlice("line1\r\nline2\r\nline3");
 
     var formatter: TerminalFormatter = .init(&t, .plain);
     formatter.content = .{ .selection = .init(
@@ -4306,7 +4306,7 @@ test "TerminalFormatter plain with pin_map" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello, world");
+    s.nextSlice("hello, world");
 
     var pin_map: std.ArrayList(Pin) = .empty;
     defer pin_map.deinit(alloc);
@@ -4343,7 +4343,7 @@ test "TerminalFormatter plain multiline with pin_map" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello\r\nworld");
+    s.nextSlice("hello\r\nworld");
 
     var pin_map: std.ArrayList(Pin) = .empty;
     defer pin_map.deinit(alloc);
@@ -4392,8 +4392,8 @@ test "TerminalFormatter vt with palette and pin_map" {
     defer s.deinit();
 
     // Modify some palette colors using VT sequences
-    try s.nextSlice("\x1b]4;0;rgb:12/34/56\x1b\\");
-    try s.nextSlice("test");
+    s.nextSlice("\x1b]4;0;rgb:12/34/56\x1b\\");
+    s.nextSlice("test");
 
     var pin_map: std.ArrayList(Pin) = .empty;
     defer pin_map.deinit(alloc);
@@ -4428,7 +4428,7 @@ test "TerminalFormatter with selection and pin_map" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("line1\r\nline2\r\nline3");
+    s.nextSlice("line1\r\nline2\r\nline3");
 
     var pin_map: std.ArrayList(Pin) = .empty;
     defer pin_map.deinit(alloc);
@@ -4472,7 +4472,7 @@ test "Screen plain single line" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello, world");
+    s.nextSlice("hello, world");
 
     var pin_map: std.ArrayList(Pin) = .empty;
     defer pin_map.deinit(alloc);
@@ -4509,7 +4509,7 @@ test "Screen plain multiline" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello\r\nworld");
+    s.nextSlice("hello\r\nworld");
 
     var pin_map: std.ArrayList(Pin) = .empty;
     defer pin_map.deinit(alloc);
@@ -4557,7 +4557,7 @@ test "Screen plain with selection" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("line1\r\nline2\r\nline3");
+    s.nextSlice("line1\r\nline2\r\nline3");
 
     var pin_map: std.ArrayList(Pin) = .empty;
     defer pin_map.deinit(alloc);
@@ -4602,7 +4602,7 @@ test "Screen vt with cursor position" {
     defer s.deinit();
 
     // Position cursor at a specific location
-    try s.nextSlice("hello\r\nworld");
+    s.nextSlice("hello\r\nworld");
 
     var pin_map: std.ArrayList(Pin) = .empty;
     defer pin_map.deinit(alloc);
@@ -4624,7 +4624,7 @@ test "Screen vt with cursor position" {
     var s2 = t2.vtStream();
     defer s2.deinit();
 
-    try s2.nextSlice(output);
+    s2.nextSlice(output);
 
     // Verify cursor positions match
     try testing.expectEqual(t.screens.active.cursor.x, t2.screens.active.cursor.x);
@@ -4661,7 +4661,7 @@ test "Screen vt with style" {
     defer s.deinit();
 
     // Set some style attributes
-    try s.nextSlice("\x1b[1;31mhello");
+    s.nextSlice("\x1b[1;31mhello");
 
     var pin_map: std.ArrayList(Pin) = .empty;
     defer pin_map.deinit(alloc);
@@ -4683,7 +4683,7 @@ test "Screen vt with style" {
     var s2 = t2.vtStream();
     defer s2.deinit();
 
-    try s2.nextSlice(output);
+    s2.nextSlice(output);
 
     // Verify styles match
     try testing.expect(t.screens.active.cursor.style.eql(t2.screens.active.cursor.style));
@@ -4713,7 +4713,7 @@ test "Screen vt with hyperlink" {
     defer s.deinit();
 
     // Set a hyperlink
-    try s.nextSlice("\x1b]8;;http://example.com\x1b\\hello");
+    s.nextSlice("\x1b]8;;http://example.com\x1b\\hello");
 
     var pin_map: std.ArrayList(Pin) = .empty;
     defer pin_map.deinit(alloc);
@@ -4735,7 +4735,7 @@ test "Screen vt with hyperlink" {
     var s2 = t2.vtStream();
     defer s2.deinit();
 
-    try s2.nextSlice(output);
+    s2.nextSlice(output);
 
     // Verify hyperlinks match
     const has_link1 = t.screens.active.cursor.hyperlink != null;
@@ -4773,7 +4773,7 @@ test "Screen vt with protection" {
     defer s.deinit();
 
     // Enable protection mode
-    try s.nextSlice("\x1b[1\"qhello");
+    s.nextSlice("\x1b[1\"qhello");
 
     var pin_map: std.ArrayList(Pin) = .empty;
     defer pin_map.deinit(alloc);
@@ -4795,7 +4795,7 @@ test "Screen vt with protection" {
     var s2 = t2.vtStream();
     defer s2.deinit();
 
-    try s2.nextSlice(output);
+    s2.nextSlice(output);
 
     // Verify protection state matches
     try testing.expectEqual(t.screens.active.cursor.protected, t2.screens.active.cursor.protected);
@@ -4825,7 +4825,7 @@ test "Screen vt with kitty keyboard" {
     defer s.deinit();
 
     // Set kitty keyboard flags (disambiguate + report_events = 3)
-    try s.nextSlice("\x1b[=3;1uhello");
+    s.nextSlice("\x1b[=3;1uhello");
 
     var pin_map: std.ArrayList(Pin) = .empty;
     defer pin_map.deinit(alloc);
@@ -4847,7 +4847,7 @@ test "Screen vt with kitty keyboard" {
     var s2 = t2.vtStream();
     defer s2.deinit();
 
-    try s2.nextSlice(output);
+    s2.nextSlice(output);
 
     // Verify kitty keyboard state matches
     const flags1 = t.screens.active.kitty_keyboard.current().int();
@@ -4879,7 +4879,7 @@ test "Screen vt with charsets" {
     defer s.deinit();
 
     // Set G0 to DEC special and shift to G1
-    try s.nextSlice("\x1b(0\x0ehello");
+    s.nextSlice("\x1b(0\x0ehello");
 
     var pin_map: std.ArrayList(Pin) = .empty;
     defer pin_map.deinit(alloc);
@@ -4901,7 +4901,7 @@ test "Screen vt with charsets" {
     var s2 = t2.vtStream();
     defer s2.deinit();
 
-    try s2.nextSlice(output);
+    s2.nextSlice(output);
 
     // Verify charset state matches
     try testing.expectEqual(t.screens.active.charset.gl, t2.screens.active.charset.gl);
@@ -4936,7 +4936,7 @@ test "Terminal vt with scrolling region" {
     defer s.deinit();
 
     // Set scrolling region: top=5, bottom=20
-    try s.nextSlice("\x1b[6;21rhello");
+    s.nextSlice("\x1b[6;21rhello");
 
     var formatter: TerminalFormatter = .init(&t, .vt);
     formatter.extra.scrolling_region = true;
@@ -4954,7 +4954,7 @@ test "Terminal vt with scrolling region" {
     var s2 = t2.vtStream();
     defer s2.deinit();
 
-    try s2.nextSlice(output);
+    s2.nextSlice(output);
 
     // Verify scrolling regions match
     try testing.expectEqual(t.scrolling_region.top, t2.scrolling_region.top);
@@ -4980,10 +4980,10 @@ test "Terminal vt with modes" {
     defer s.deinit();
 
     // Enable some modes that differ from defaults
-    try s.nextSlice("\x1b[?2004h"); // Bracketed paste
-    try s.nextSlice("\x1b[?1000h"); // Mouse event normal
-    try s.nextSlice("\x1b[?7l"); // Disable wraparound (default is true)
-    try s.nextSlice("hello");
+    s.nextSlice("\x1b[?2004h"); // Bracketed paste
+    s.nextSlice("\x1b[?1000h"); // Mouse event normal
+    s.nextSlice("\x1b[?7l"); // Disable wraparound (default is true)
+    s.nextSlice("hello");
 
     var formatter: TerminalFormatter = .init(&t, .vt);
     formatter.extra.modes = true;
@@ -5001,7 +5001,7 @@ test "Terminal vt with modes" {
     var s2 = t2.vtStream();
     defer s2.deinit();
 
-    try s2.nextSlice(output);
+    s2.nextSlice(output);
 
     // Verify modes match
     try testing.expectEqual(t.modes.get(.bracketed_paste), t2.modes.get(.bracketed_paste));
@@ -5026,11 +5026,11 @@ test "Terminal vt with tabstops" {
     defer s.deinit();
 
     // Clear all tabs and set custom tabstops
-    try s.nextSlice("\x1b[3g"); // Clear all tabs
-    try s.nextSlice("\x1b[5G\x1bH"); // Set tab at column 5
-    try s.nextSlice("\x1b[15G\x1bH"); // Set tab at column 15
-    try s.nextSlice("\x1b[30G\x1bH"); // Set tab at column 30
-    try s.nextSlice("hello");
+    s.nextSlice("\x1b[3g"); // Clear all tabs
+    s.nextSlice("\x1b[5G\x1bH"); // Set tab at column 5
+    s.nextSlice("\x1b[15G\x1bH"); // Set tab at column 15
+    s.nextSlice("\x1b[30G\x1bH"); // Set tab at column 30
+    s.nextSlice("hello");
 
     var formatter: TerminalFormatter = .init(&t, .vt);
     formatter.extra.tabstops = true;
@@ -5048,7 +5048,7 @@ test "Terminal vt with tabstops" {
     var s2 = t2.vtStream();
     defer s2.deinit();
 
-    try s2.nextSlice(output);
+    s2.nextSlice(output);
 
     // Verify tabstops match (columns are 0-indexed in the API)
     try testing.expectEqual(t.tabstops.get(4), t2.tabstops.get(4));
@@ -5077,8 +5077,8 @@ test "Terminal vt with keyboard modes" {
     defer s.deinit();
 
     // Set modify other keys mode 2
-    try s.nextSlice("\x1b[>4;2m");
-    try s.nextSlice("hello");
+    s.nextSlice("\x1b[>4;2m");
+    s.nextSlice("hello");
 
     var formatter: TerminalFormatter = .init(&t, .vt);
     formatter.extra.keyboard = true;
@@ -5096,7 +5096,7 @@ test "Terminal vt with keyboard modes" {
     var s2 = t2.vtStream();
     defer s2.deinit();
 
-    try s2.nextSlice(output);
+    s2.nextSlice(output);
 
     // Verify keyboard mode matches
     try testing.expectEqual(t.flags.modify_other_keys_2, t2.flags.modify_other_keys_2);
@@ -5120,7 +5120,7 @@ test "Terminal vt with pwd" {
     defer s.deinit();
 
     // Set pwd using OSC 7
-    try s.nextSlice("\x1b]7;file://host/home/user\x1b\\hello");
+    s.nextSlice("\x1b]7;file://host/home/user\x1b\\hello");
 
     var formatter: TerminalFormatter = .init(&t, .vt);
     formatter.extra.pwd = true;
@@ -5138,7 +5138,7 @@ test "Terminal vt with pwd" {
     var s2 = t2.vtStream();
     defer s2.deinit();
 
-    try s2.nextSlice(output);
+    s2.nextSlice(output);
 
     // Verify pwd matches
     try testing.expectEqualStrings(t.pwd.items, t2.pwd.items);
@@ -5161,7 +5161,7 @@ test "Page html with multiple styles" {
     defer s.deinit();
 
     // Set bold, then italic, then reset
-    try s.nextSlice("\x1b[1mbold\x1b[3mitalic\x1b[0mnormal");
+    s.nextSlice("\x1b[1mbold\x1b[3mitalic\x1b[0mnormal");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5196,7 +5196,7 @@ test "Page html plain text" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello, world");
+    s.nextSlice("hello, world");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5229,7 +5229,7 @@ test "Page html with colors" {
     defer s.deinit();
 
     // Set red foreground, blue background
-    try s.nextSlice("\x1b[31;44mcolored");
+    s.nextSlice("\x1b[31;44mcolored");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5263,10 +5263,10 @@ test "TerminalFormatter html with palette" {
     defer s.deinit();
 
     // Modify some palette colors
-    try s.nextSlice("\x1b]4;0;rgb:12/34/56\x1b\\");
-    try s.nextSlice("\x1b]4;1;rgb:ab/cd/ef\x1b\\");
-    try s.nextSlice("\x1b]4;255;rgb:ff/00/ff\x1b\\");
-    try s.nextSlice("test");
+    s.nextSlice("\x1b]4;0;rgb:12/34/56\x1b\\");
+    s.nextSlice("\x1b]4;1;rgb:ab/cd/ef\x1b\\");
+    s.nextSlice("\x1b]4;255;rgb:ff/00/ff\x1b\\");
+    s.nextSlice("test");
 
     var formatter: TerminalFormatter = .init(&t, .{ .emit = .html });
     formatter.extra.palette = true;
@@ -5299,7 +5299,7 @@ test "Page html with background and foreground colors" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello");
+    s.nextSlice("hello");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5334,7 +5334,7 @@ test "Page html with escaping" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("<tag>&\"'text");
+    s.nextSlice("<tag>&\"'text");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5405,7 +5405,7 @@ test "Page html with unicode as numeric entities" {
     defer s.deinit();
 
     // Box drawing characters that caused issue #9426
-    try s.nextSlice("╰─ ❯");
+    s.nextSlice("╰─ ❯");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5438,7 +5438,7 @@ test "Page html ascii characters unchanged" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello world");
+    s.nextSlice("hello world");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5470,7 +5470,7 @@ test "Page html mixed ascii and unicode" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("test ╰─❯ ok");
+    s.nextSlice("test ╰─❯ ok");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5503,8 +5503,8 @@ test "Page VT with palette option emits RGB" {
     defer s.deinit();
 
     // Set a custom palette color and use it
-    try s.nextSlice("\x1b]4;1;rgb:ab/cd/ef\x1b\\");
-    try s.nextSlice("\x1b[31mred");
+    s.nextSlice("\x1b]4;1;rgb:ab/cd/ef\x1b\\");
+    s.nextSlice("\x1b[31mred");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5547,8 +5547,8 @@ test "Page html with palette option emits RGB" {
     defer s.deinit();
 
     // Set a custom palette color and use it
-    try s.nextSlice("\x1b]4;1;rgb:ab/cd/ef\x1b\\");
-    try s.nextSlice("\x1b[31mred");
+    s.nextSlice("\x1b]4;1;rgb:ab/cd/ef\x1b\\");
+    s.nextSlice("\x1b[31mred");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5601,7 +5601,7 @@ test "Page VT style reset properly closes styles" {
     defer s.deinit();
 
     // Set bold, then reset with SGR 0
-    try s.nextSlice("\x1b[1mbold\x1b[0mnormal");
+    s.nextSlice("\x1b[1mbold\x1b[0mnormal");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5631,7 +5631,7 @@ test "Page codepoint_map single replacement" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello world");
+    s.nextSlice("hello world");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5690,7 +5690,7 @@ test "Page codepoint_map conflicting replacement prefers last" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello");
+    s.nextSlice("hello");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5732,7 +5732,7 @@ test "Page codepoint_map replace with string" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello");
+    s.nextSlice("hello");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5788,7 +5788,7 @@ test "Page codepoint_map range replacement" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("abcdefg");
+    s.nextSlice("abcdefg");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5826,7 +5826,7 @@ test "Page codepoint_map multiple ranges" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello world");
+    s.nextSlice("hello world");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5870,7 +5870,7 @@ test "Page codepoint_map unicode replacement" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello ⚡ world");
+    s.nextSlice("hello ⚡ world");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5935,7 +5935,7 @@ test "Page codepoint_map with styled formats" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("\x1b[31mred text\x1b[0m");
+    s.nextSlice("\x1b[31mred text\x1b[0m");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -5976,7 +5976,7 @@ test "Page codepoint_map empty map" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("hello world");
+    s.nextSlice("hello world");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -6016,9 +6016,9 @@ test "Page VT background color on trailing blank cells" {
     // Simulate a TUI row: "CPU:" with text, then trailing cells with red background
     // to end of line (no text after the colored region).
     // \x1b[41m sets red background, then EL fills rest of row with that bg.
-    try s.nextSlice("CPU:\x1b[41m\x1b[K");
+    s.nextSlice("CPU:\x1b[41m\x1b[K");
     // Reset colors and move to next line with different content
-    try s.nextSlice("\x1b[0m\r\nline2");
+    s.nextSlice("\x1b[0m\r\nline2");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -6065,7 +6065,7 @@ test "Page HTML with hyperlinks" {
     defer s.deinit();
 
     // Start a hyperlink, write some text, end it
-    try s.nextSlice("\x1b]8;;https://example.com\x1b\\link text\x1b]8;;\x1b\\ normal");
+    s.nextSlice("\x1b]8;;https://example.com\x1b\\link text\x1b]8;;\x1b\\ normal");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -6099,8 +6099,8 @@ test "Page HTML with multiple hyperlinks" {
     defer s.deinit();
 
     // Two different hyperlinks
-    try s.nextSlice("\x1b]8;;https://first.com\x1b\\first\x1b]8;;\x1b\\ ");
-    try s.nextSlice("\x1b]8;;https://second.com\x1b\\second\x1b]8;;\x1b\\");
+    s.nextSlice("\x1b]8;;https://first.com\x1b\\first\x1b]8;;\x1b\\ ");
+    s.nextSlice("\x1b]8;;https://second.com\x1b\\second\x1b]8;;\x1b\\");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -6136,7 +6136,7 @@ test "Page HTML with hyperlink escaping" {
     defer s.deinit();
 
     // URL with special characters that need escaping
-    try s.nextSlice("\x1b]8;;https://example.com?a=1&b=2\x1b\\link\x1b]8;;\x1b\\");
+    s.nextSlice("\x1b]8;;https://example.com?a=1&b=2\x1b\\link\x1b]8;;\x1b\\");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -6170,7 +6170,7 @@ test "Page HTML with styled hyperlink" {
     defer s.deinit();
 
     // Bold hyperlink
-    try s.nextSlice("\x1b]8;;https://example.com\x1b\\\x1b[1mbold link\x1b[0m\x1b]8;;\x1b\\");
+    s.nextSlice("\x1b]8;;https://example.com\x1b\\\x1b[1mbold link\x1b[0m\x1b]8;;\x1b\\");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -6205,7 +6205,7 @@ test "Page HTML hyperlink closes style before anchor" {
     defer s.deinit();
 
     // Styled hyperlink followed by plain text
-    try s.nextSlice("\x1b]8;;https://example.com\x1b\\\x1b[1mbold\x1b[0m plain");
+    s.nextSlice("\x1b]8;;https://example.com\x1b\\\x1b[1mbold\x1b[0m plain");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
@@ -6239,7 +6239,7 @@ test "Page HTML hyperlink point map maps closing to previous cell" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("\x1b]8;;https://example.com\x1b\\link\x1b]8;;\x1b\\ normal");
+    s.nextSlice("\x1b]8;;https://example.com\x1b\\link\x1b]8;;\x1b\\ normal");
 
     const pages = &t.screens.active.pages;
     const page = &pages.pages.last.?.data;
diff --git a/src/terminal/render.zig b/src/terminal/render.zig
index 2332866ac..8ce77061d 100644
--- a/src/terminal/render.zig
+++ b/src/terminal/render.zig
@@ -908,7 +908,7 @@ test "basic text" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("ABCD");
+    s.nextSlice("ABCD");
 
     var state: RenderState = .empty;
     defer state.deinit(alloc);
@@ -944,9 +944,9 @@ test "styled text" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("\x1b[1mA"); // Bold
-    try s.nextSlice("\x1b[0;3mB"); // Italic
-    try s.nextSlice("\x1b[0;4mC"); // Underline
+    s.nextSlice("\x1b[1mA"); // Bold
+    s.nextSlice("\x1b[0;3mB"); // Italic
+    s.nextSlice("\x1b[0;4mC"); // Underline
 
     var state: RenderState = .empty;
     defer state.deinit(alloc);
@@ -990,8 +990,8 @@ test "grapheme" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("A");
-    try s.nextSlice("👨‍"); // this has a ZWJ
+    s.nextSlice("A");
+    s.nextSlice("👨‍"); // this has a ZWJ
 
     var state: RenderState = .empty;
     defer state.deinit(alloc);
@@ -1037,7 +1037,7 @@ test "cursor state in viewport" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("A\x1b[H");
+    s.nextSlice("A\x1b[H");
 
     var state: RenderState = .empty;
     defer state.deinit(alloc);
@@ -1052,14 +1052,14 @@ test "cursor state in viewport" {
     try testing.expect(state.cursor.style.default());
 
     // Set a style on the cursor
-    try s.nextSlice("\x1b[1m"); // Bold
+    s.nextSlice("\x1b[1m"); // Bold
     try state.update(alloc, &t);
     try testing.expect(!state.cursor.style.default());
     try testing.expect(state.cursor.style.flags.bold);
-    try s.nextSlice("\x1b[0m"); // Reset style
+    s.nextSlice("\x1b[0m"); // Reset style
 
     // Move cursor to 2,1
-    try s.nextSlice("\x1b[2;3H");
+    s.nextSlice("\x1b[2;3H");
     try state.update(alloc, &t);
     try testing.expectEqual(2, state.cursor.active.x);
     try testing.expectEqual(1, state.cursor.active.y);
@@ -1079,7 +1079,7 @@ test "cursor state out of viewport" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("A\r\nB\r\nC\r\nD\r\n");
+    s.nextSlice("A\r\nB\r\nC\r\nD\r\n");
 
     var state: RenderState = .empty;
     defer state.deinit(alloc);
@@ -1139,7 +1139,7 @@ test "dirty state" {
     }
 
     // Write to first line
-    try s.nextSlice("A");
+    s.nextSlice("A");
     try state.update(alloc, &t);
     try testing.expectEqual(.partial, state.dirty);
     {
@@ -1170,7 +1170,7 @@ test "colors" {
     try state.update(alloc, &t);
 
     // Change cursor color
-    try s.nextSlice("\x1b]12;#FF0000\x07");
+    s.nextSlice("\x1b]12;#FF0000\x07");
     try state.update(alloc, &t);
 
     const c = state.colors.cursor.?;
@@ -1179,7 +1179,7 @@ test "colors" {
     try testing.expectEqual(0, c.b);
 
     // Change palette color 0 to White
-    try s.nextSlice("\x1b]4;0;#FFFFFF\x07");
+    s.nextSlice("\x1b]4;0;#FFFFFF\x07");
     try state.update(alloc, &t);
     const p0 = state.colors.palette[0];
     try testing.expectEqual(0xFF, p0.r);
@@ -1275,7 +1275,7 @@ test "linkCells" {
     defer state.deinit(alloc);
 
     // Create a hyperlink
-    try s.nextSlice("\x1b]8;;http://example.com\x1b\\LINK\x1b]8;;\x1b\\");
+    s.nextSlice("\x1b]8;;http://example.com\x1b\\LINK\x1b]8;;\x1b\\");
     try state.update(alloc, &t);
 
     // Query link at 0,0
@@ -1306,7 +1306,7 @@ test "string" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("AB");
+    s.nextSlice("AB");
 
     var state: RenderState = .empty;
     defer state.deinit(alloc);
@@ -1345,12 +1345,12 @@ test "linkCells with scrollback spanning pages" {
     const first_page_cap = pages.pages.first.?.data.capacity.rows;
 
     // Fill first page
-    for (0..first_page_cap - 1) |_| try s.nextSlice("\r\n");
+    for (0..first_page_cap - 1) |_| s.nextSlice("\r\n");
 
     // Create second page with hyperlink
-    try s.nextSlice("\r\n");
-    try s.nextSlice("\x1b]8;;http://example.com\x1b\\LINK\x1b]8;;\x1b\\");
-    for (0..(tail_rows - 1)) |_| try s.nextSlice("\r\n");
+    s.nextSlice("\r\n");
+    s.nextSlice("\x1b]8;;http://example.com\x1b\\LINK\x1b]8;;\x1b\\");
+    for (0..(tail_rows - 1)) |_| s.nextSlice("\r\n");
 
     var state: RenderState = .empty;
     defer state.deinit(alloc);
@@ -1416,7 +1416,7 @@ test "dirty row resets highlights" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("ABC");
+    s.nextSlice("ABC");
 
     var state: RenderState = .empty;
     defer state.deinit(alloc);
@@ -1451,8 +1451,8 @@ test "dirty row resets highlights" {
     }
 
     // Write to row 0 to make it dirty
-    try s.nextSlice("\x1b[H"); // Move to home
-    try s.nextSlice("X");
+    s.nextSlice("\x1b[H"); // Move to home
+    s.nextSlice("X");
     try state.update(alloc, &t);
 
     // Verify the highlight was reset on the dirty row
diff --git a/src/terminal/search/Thread.zig b/src/terminal/search/Thread.zig
index 3f5377417..fa09af5f0 100644
--- a/src/terminal/search/Thread.zig
+++ b/src/terminal/search/Thread.zig
@@ -853,7 +853,7 @@ test {
 
     var stream = t.vtStream();
     defer stream.deinit();
-    try stream.nextSlice("Hello, world");
+    stream.nextSlice("Hello, world");
 
     var ud: TestUserData = .{};
     defer ud.deinit();
diff --git a/src/terminal/search/active.zig b/src/terminal/search/active.zig
index 236f4c7a6..692a10e12 100644
--- a/src/terminal/search/active.zig
+++ b/src/terminal/search/active.zig
@@ -108,7 +108,7 @@ test "simple search" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
+    s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
 
     var search: ActiveSearch = try .init(alloc, "Fizz");
     defer search.deinit();
@@ -148,15 +148,15 @@ test "clear screen and search" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
+    s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
 
     var search: ActiveSearch = try .init(alloc, "Fizz");
     defer search.deinit();
     _ = try search.update(&t.screens.active.pages);
 
-    try s.nextSlice("\x1b[2J"); // Clear screen
-    try s.nextSlice("\x1b[H"); // Move cursor home
-    try s.nextSlice("Buzz\r\nFizz\r\nBuzz");
+    s.nextSlice("\x1b[2J"); // Clear screen
+    s.nextSlice("\x1b[H"); // Move cursor home
+    s.nextSlice("Buzz\r\nFizz\r\nBuzz");
     _ = try search.update(&t.screens.active.pages);
 
     {
diff --git a/src/terminal/search/pagelist.zig b/src/terminal/search/pagelist.zig
index 4bfd241e7..f76ad4e4b 100644
--- a/src/terminal/search/pagelist.zig
+++ b/src/terminal/search/pagelist.zig
@@ -141,7 +141,7 @@ test "simple search" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
+    s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
 
     var search: PageListSearch = try .init(
         alloc,
@@ -191,14 +191,14 @@ test "feed multiple pages with matches" {
 
     // Fill up first page
     const first_page_rows = t.screens.active.pages.pages.first.?.data.capacity.rows;
-    for (0..first_page_rows - 1) |_| try s.nextSlice("\r\n");
-    try s.nextSlice("Fizz");
+    for (0..first_page_rows - 1) |_| s.nextSlice("\r\n");
+    s.nextSlice("Fizz");
     try testing.expect(t.screens.active.pages.pages.first == t.screens.active.pages.pages.last);
 
     // Create second page
-    try s.nextSlice("\r\n");
+    s.nextSlice("\r\n");
     try testing.expect(t.screens.active.pages.pages.first != t.screens.active.pages.pages.last);
-    try s.nextSlice("Buzz\r\nFizz");
+    s.nextSlice("Buzz\r\nFizz");
 
     var search: PageListSearch = try .init(
         alloc,
@@ -235,13 +235,13 @@ test "feed multiple pages no matches" {
 
     // Fill up first page
     const first_page_rows = t.screens.active.pages.pages.first.?.data.capacity.rows;
-    for (0..first_page_rows - 1) |_| try s.nextSlice("\r\n");
-    try s.nextSlice("Hello");
+    for (0..first_page_rows - 1) |_| s.nextSlice("\r\n");
+    s.nextSlice("Hello");
 
     // Create second page
-    try s.nextSlice("\r\n");
+    s.nextSlice("\r\n");
     try testing.expect(t.screens.active.pages.pages.first != t.screens.active.pages.pages.last);
-    try s.nextSlice("World");
+    s.nextSlice("World");
 
     var search: PageListSearch = try .init(
         alloc,
@@ -275,14 +275,14 @@ test "feed iteratively through multiple matches" {
     const first_page_rows = t.screens.active.pages.pages.first.?.data.capacity.rows;
 
     // Fill first page with a match at the end
-    for (0..first_page_rows - 1) |_| try s.nextSlice("\r\n");
-    try s.nextSlice("Page1Test");
+    for (0..first_page_rows - 1) |_| s.nextSlice("\r\n");
+    s.nextSlice("Page1Test");
     try testing.expect(t.screens.active.pages.pages.first == t.screens.active.pages.pages.last);
 
     // Create second page with a match
-    try s.nextSlice("\r\n");
+    s.nextSlice("\r\n");
     try testing.expect(t.screens.active.pages.pages.first != t.screens.active.pages.pages.last);
-    try s.nextSlice("Page2Test");
+    s.nextSlice("Page2Test");
 
     var search: PageListSearch = try .init(
         alloc,
@@ -316,13 +316,13 @@ test "feed with match spanning page boundary" {
     const first_page_rows = t.screens.active.pages.pages.first.?.data.capacity.rows;
 
     // Fill first page ending with "Te"
-    for (0..first_page_rows - 1) |_| try s.nextSlice("\r\n");
-    for (0..t.screens.active.pages.cols - 2) |_| try s.nextSlice("x");
-    try s.nextSlice("Te");
+    for (0..first_page_rows - 1) |_| s.nextSlice("\r\n");
+    for (0..t.screens.active.pages.cols - 2) |_| s.nextSlice("x");
+    s.nextSlice("Te");
     try testing.expect(t.screens.active.pages.pages.first == t.screens.active.pages.pages.last);
 
     // Second page starts with "st"
-    try s.nextSlice("st");
+    s.nextSlice("st");
     try testing.expect(t.screens.active.pages.pages.first != t.screens.active.pages.pages.last);
 
     var search: PageListSearch = try .init(
@@ -370,15 +370,15 @@ test "feed with match spanning page boundary with newline" {
     const first_page_rows = t.screens.active.pages.pages.first.?.data.capacity.rows;
 
     // Fill first page ending with "Te"
-    for (0..first_page_rows - 1) |_| try s.nextSlice("\r\n");
-    for (0..t.screens.active.pages.cols - 2) |_| try s.nextSlice("x");
-    try s.nextSlice("Te");
+    for (0..first_page_rows - 1) |_| s.nextSlice("\r\n");
+    for (0..t.screens.active.pages.cols - 2) |_| s.nextSlice("x");
+    s.nextSlice("Te");
     try testing.expect(t.screens.active.pages.pages.first == t.screens.active.pages.pages.last);
 
     // Second page starts with "st"
-    try s.nextSlice("\r\n");
+    s.nextSlice("\r\n");
     try testing.expect(t.screens.active.pages.pages.first != t.screens.active.pages.pages.last);
-    try s.nextSlice("st");
+    s.nextSlice("st");
 
     var search: PageListSearch = try .init(
         alloc,
diff --git a/src/terminal/search/screen.zig b/src/terminal/search/screen.zig
index ca2a5a894..e98ecd958 100644
--- a/src/terminal/search/screen.zig
+++ b/src/terminal/search/screen.zig
@@ -827,7 +827,7 @@ test "simple search" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
+    s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
 
     var search: ScreenSearch = try .init(alloc, t.screens.active, "Fizz");
     defer search.deinit();
@@ -877,10 +877,10 @@ test "simple search with history" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("Fizz\r\n");
-    while (list.totalPages() < 3) try s.nextSlice("\r\n");
-    for (0..list.rows) |_| try s.nextSlice("\r\n");
-    try s.nextSlice("hello.");
+    s.nextSlice("Fizz\r\n");
+    while (list.totalPages() < 3) s.nextSlice("\r\n");
+    for (0..list.rows) |_| s.nextSlice("\r\n");
+    s.nextSlice("hello.");
 
     var search: ScreenSearch = try .init(alloc, t.screens.active, "Fizz");
     defer search.deinit();
@@ -917,7 +917,7 @@ test "reload active with history change" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("Fizz\r\n");
+    s.nextSlice("Fizz\r\n");
 
     // Start up our search which will populate our initial active area.
     var search: ScreenSearch = try .init(alloc, t.screens.active, "Fizz");
@@ -930,9 +930,9 @@ test "reload active with history change" {
     }
 
     // Grow into two pages so our history pin will move.
-    while (list.totalPages() < 2) try s.nextSlice("\r\n");
-    for (0..list.rows) |_| try s.nextSlice("\r\n");
-    try s.nextSlice("2Fizz");
+    while (list.totalPages() < 2) s.nextSlice("\r\n");
+    for (0..list.rows) |_| s.nextSlice("\r\n");
+    s.nextSlice("2Fizz");
 
     // Active area changed so reload
     try search.reloadActive();
@@ -969,7 +969,7 @@ test "reload active with history change" {
 
     // Reset the screen which will make our pin garbage.
     t.fullReset();
-    try s.nextSlice("WeFizzing");
+    s.nextSlice("WeFizzing");
     try search.reloadActive();
     try search.searchAll();
 
@@ -998,7 +998,7 @@ test "active change contents" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("Fuzz\r\nBuzz\r\nFizz\r\nBang");
+    s.nextSlice("Fuzz\r\nBuzz\r\nFizz\r\nBang");
 
     var search: ScreenSearch = try .init(alloc, t.screens.active, "Fizz");
     defer search.deinit();
@@ -1006,8 +1006,8 @@ test "active change contents" {
     try testing.expectEqual(1, search.active_results.items.len);
 
     // Erase the screen, move our cursor to the top, and change contents.
-    try s.nextSlice("\x1b[2J\x1b[H"); // Clear screen and move home
-    try s.nextSlice("Bang\r\nFizz\r\nHello!");
+    s.nextSlice("\x1b[2J\x1b[H"); // Clear screen and move home
+    s.nextSlice("Bang\r\nFizz\r\nHello!");
 
     try search.reloadActive();
     try search.searchAll();
@@ -1038,7 +1038,7 @@ test "select next" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
+    s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
 
     var search: ScreenSearch = try .init(alloc, t.screens.active, "Fizz");
     defer search.deinit();
@@ -1097,7 +1097,7 @@ test "select in active changes contents completely" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
+    s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
 
     var search: ScreenSearch = try .init(alloc, t.screens.active, "Fizz");
     defer search.deinit();
@@ -1118,8 +1118,8 @@ test "select in active changes contents completely" {
     }
 
     // Erase the screen, move our cursor to the top, and change contents.
-    try s.nextSlice("\x1b[2J\x1b[H"); // Clear screen and move home
-    try s.nextSlice("Fuzz\r\nFizz\r\nHello!");
+    s.nextSlice("\x1b[2J\x1b[H"); // Clear screen and move home
+    s.nextSlice("Fuzz\r\nFizz\r\nHello!");
 
     try search.reloadActive();
     {
@@ -1136,8 +1136,8 @@ test "select in active changes contents completely" {
     }
 
     // Erase the screen, redraw with same contents.
-    try s.nextSlice("\x1b[2J\x1b[H"); // Clear screen and move home
-    try s.nextSlice("Fuzz\r\nFizz\r\nFizz");
+    s.nextSlice("\x1b[2J\x1b[H"); // Clear screen and move home
+    s.nextSlice("Fuzz\r\nFizz\r\nFizz");
 
     try search.reloadActive();
     {
@@ -1167,10 +1167,10 @@ test "select into history" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("Fizz\r\n");
-    while (list.totalPages() < 3) try s.nextSlice("\r\n");
-    for (0..list.rows) |_| try s.nextSlice("\r\n");
-    try s.nextSlice("hello.");
+    s.nextSlice("Fizz\r\n");
+    while (list.totalPages() < 3) s.nextSlice("\r\n");
+    for (0..list.rows) |_| s.nextSlice("\r\n");
+    s.nextSlice("hello.");
 
     var search: ScreenSearch = try .init(alloc, t.screens.active, "Fizz");
     defer search.deinit();
@@ -1191,8 +1191,8 @@ test "select into history" {
     }
 
     // Erase the screen, redraw with same contents.
-    try s.nextSlice("\x1b[2J\x1b[H"); // Clear screen and move home
-    try s.nextSlice("yo yo");
+    s.nextSlice("\x1b[2J\x1b[H"); // Clear screen and move home
+    s.nextSlice("yo yo");
 
     try search.reloadActive();
     {
@@ -1209,7 +1209,7 @@ test "select into history" {
     }
 
     // Create some new history by adding more lines.
-    try s.nextSlice("\r\nfizz\r\nfizz\r\nfizz"); // Clear screen and move home
+    s.nextSlice("\r\nfizz\r\nfizz\r\nfizz"); // Clear screen and move home
     try search.reloadActive();
     {
         // Our selection should not move since the history is still not
@@ -1233,7 +1233,7 @@ test "select prev" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
+    s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
 
     var search: ScreenSearch = try .init(alloc, t.screens.active, "Fizz");
     defer search.deinit();
@@ -1292,7 +1292,7 @@ test "select prev then next" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
+    s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
 
     var search: ScreenSearch = try .init(alloc, t.screens.active, "Fizz");
     defer search.deinit();
@@ -1342,10 +1342,10 @@ test "select prev with history" {
     var s = t.vtStream();
     defer s.deinit();
 
-    try s.nextSlice("Fizz\r\n");
-    while (list.totalPages() < 3) try s.nextSlice("\r\n");
-    for (0..list.rows) |_| try s.nextSlice("\r\n");
-    try s.nextSlice("Fizz.");
+    s.nextSlice("Fizz\r\n");
+    while (list.totalPages() < 3) s.nextSlice("\r\n");
+    for (0..list.rows) |_| s.nextSlice("\r\n");
+    s.nextSlice("Fizz.");
 
     var search: ScreenSearch = try .init(alloc, t.screens.active, "Fizz");
     defer search.deinit();
@@ -1399,9 +1399,9 @@ test "screen search no scrollback has no history" {
     // no way to test it using public APIs, but at the time of writing
     // this test, CSI 22 J (scroll complete) pushes into scrollback
     // with alt screen.
-    try s.nextSlice("Fizz\r\n");
-    try s.nextSlice("\x1b[22J");
-    try s.nextSlice("hello.");
+    s.nextSlice("Fizz\r\n");
+    s.nextSlice("\x1b[22J");
+    s.nextSlice("hello.");
 
     var search: ScreenSearch = try .init(alloc, t.screens.active, "Fizz");
     defer search.deinit();
@@ -1431,10 +1431,10 @@ test "reloadActive partial history cleanup on appendSlice error" {
 
     // Write multiple "Fizz" matches that will end up in history.
     // We need enough content to push "Fizz" entries into scrollback.
-    try s.nextSlice("Fizz\r\nFizz\r\n");
-    while (list.totalPages() < 3) try s.nextSlice("\r\n");
-    for (0..list.rows) |_| try s.nextSlice("\r\n");
-    try s.nextSlice("Fizz.");
+    s.nextSlice("Fizz\r\nFizz\r\n");
+    while (list.totalPages() < 3) s.nextSlice("\r\n");
+    for (0..list.rows) |_| s.nextSlice("\r\n");
+    s.nextSlice("Fizz.");
 
     // Complete initial search
     var search: ScreenSearch = try .init(alloc, t.screens.active, "Fizz");
@@ -1443,9 +1443,9 @@ test "reloadActive partial history cleanup on appendSlice error" {
 
     // Now trigger reloadActive by adding more content that changes the
     // active/history boundary. First add more "Fizz" entries to history.
-    try s.nextSlice("\r\nFizz\r\nFizz\r\n");
-    while (list.totalPages() < 4) try s.nextSlice("\r\n");
-    for (0..list.rows) |_| try s.nextSlice("\r\n");
+    s.nextSlice("\r\nFizz\r\nFizz\r\n");
+    while (list.totalPages() < 4) s.nextSlice("\r\n");
+    for (0..list.rows) |_| s.nextSlice("\r\n");
 
     // Arm the tripwire to fail at appendSlice (after the loop completes).
     // At this point, there are FlattenedHighlight items in the results list
@@ -1478,10 +1478,10 @@ test "reloadActive partial history cleanup on loop append error" {
 
     // Write multiple "Fizz" matches that will end up in history.
     // We need enough content to push "Fizz" entries into scrollback.
-    try s.nextSlice("Fizz\r\nFizz\r\n");
-    while (list.totalPages() < 3) try s.nextSlice("\r\n");
-    for (0..list.rows) |_| try s.nextSlice("\r\n");
-    try s.nextSlice("Fizz.");
+    s.nextSlice("Fizz\r\nFizz\r\n");
+    while (list.totalPages() < 3) s.nextSlice("\r\n");
+    for (0..list.rows) |_| s.nextSlice("\r\n");
+    s.nextSlice("Fizz.");
 
     // Complete initial search
     var search: ScreenSearch = try .init(alloc, t.screens.active, "Fizz");
@@ -1490,9 +1490,9 @@ test "reloadActive partial history cleanup on loop append error" {
 
     // Now trigger reloadActive by adding more content that changes the
     // active/history boundary. First add more "Fizz" entries to history.
-    try s.nextSlice("\r\nFizz\r\nFizz\r\n");
-    while (list.totalPages() < 4) try s.nextSlice("\r\n");
-    for (0..list.rows) |_| try s.nextSlice("\r\n");
+    s.nextSlice("\r\nFizz\r\nFizz\r\n");
+    while (list.totalPages() < 4) s.nextSlice("\r\n");
+    for (0..list.rows) |_| s.nextSlice("\r\n");
 
     // Arm the tripwire to fail after the first loop append succeeds.
     // This leaves at least one FlattenedHighlight in the results list
diff --git a/src/terminal/search/sliding_window.zig b/src/terminal/search/sliding_window.zig
index c3c29e085..93a606fda 100644
--- a/src/terminal/search/sliding_window.zig
+++ b/src/terminal/search/sliding_window.zig
@@ -1583,7 +1583,7 @@ test "SlidingWindow single append soft wrapped" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("A\r\nxxboo!\r\nC");
+    s.nextSlice("A\r\nxxboo!\r\nC");
 
     // We want to test single-page cases.
     const screen = t.screens.active;
@@ -1620,7 +1620,7 @@ test "SlidingWindow single append reversed soft wrapped" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("A\r\nxxboo!\r\nC");
+    s.nextSlice("A\r\nxxboo!\r\nC");
 
     // We want to test single-page cases.
     const screen = t.screens.active;
diff --git a/src/terminal/search/viewport.zig b/src/terminal/search/viewport.zig
index f5e6c8601..35dd93315 100644
--- a/src/terminal/search/viewport.zig
+++ b/src/terminal/search/viewport.zig
@@ -223,7 +223,7 @@ test "simple search" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
+    s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
 
     var search: ViewportSearch = try .init(alloc, "Fizz");
     defer search.deinit();
@@ -266,15 +266,15 @@ test "clear screen and search" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
+    s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
 
     var search: ViewportSearch = try .init(alloc, "Fizz");
     defer search.deinit();
     try testing.expect(try search.update(&t.screens.active.pages));
 
-    try s.nextSlice("\x1b[2J"); // Clear screen
-    try s.nextSlice("\x1b[H"); // Move cursor home
-    try s.nextSlice("Buzz\r\nFizz\r\nBuzz");
+    s.nextSlice("\x1b[2J"); // Clear screen
+    s.nextSlice("\x1b[H"); // Move cursor home
+    s.nextSlice("Buzz\r\nFizz\r\nBuzz");
     try testing.expect(try search.update(&t.screens.active.pages));
 
     {
@@ -299,7 +299,7 @@ test "clear screen and search dirty tracking" {
 
     var s = t.vtStream();
     defer s.deinit();
-    try s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
+    s.nextSlice("Fizz\r\nBuzz\r\nFizz\r\nBang");
 
     var search: ViewportSearch = try .init(alloc, "Fizz");
     defer search.deinit();
@@ -313,9 +313,9 @@ test "clear screen and search dirty tracking" {
     // Should not update since nothing changed
     try testing.expect(!try search.update(&t.screens.active.pages));
 
-    try s.nextSlice("\x1b[2J"); // Clear screen
-    try s.nextSlice("\x1b[H"); // Move cursor home
-    try s.nextSlice("Buzz\r\nFizz\r\nBuzz");
+    s.nextSlice("\x1b[2J"); // Clear screen
+    s.nextSlice("\x1b[H"); // Move cursor home
+    s.nextSlice("Buzz\r\nFizz\r\nBuzz");
 
     // Should still not update since active area isn't dirty
     try testing.expect(!try search.update(&t.screens.active.pages));
@@ -349,14 +349,14 @@ test "history search, no active area" {
 
     // Fill up first page
     const first_page_rows = t.screens.active.pages.pages.first.?.data.capacity.rows;
-    try s.nextSlice("Fizz\r\n");
-    for (1..first_page_rows - 1) |_| try s.nextSlice("\r\n");
+    s.nextSlice("Fizz\r\n");
+    for (1..first_page_rows - 1) |_| s.nextSlice("\r\n");
     try testing.expect(t.screens.active.pages.pages.first == t.screens.active.pages.pages.last);
 
     // Create second page
-    try s.nextSlice("\r\n");
+    s.nextSlice("\r\n");
     try testing.expect(t.screens.active.pages.pages.first != t.screens.active.pages.pages.last);
-    try s.nextSlice("Buzz\r\nFizz");
+    s.nextSlice("Buzz\r\nFizz");
 
     t.scrollViewport(.top);
 
diff --git a/src/terminal/stream.zig b/src/terminal/stream.zig
index e89c73e66..5f83128a9 100644
--- a/src/terminal/stream.zig
+++ b/src/terminal/stream.zig
@@ -406,7 +406,7 @@ pub const Action = union(Key) {
 /// Returns a type that can process a stream of tty control characters.
 /// This will call the `vt` function on type T with the following signature:
 ///
-///   fn(comptime action: Action.Key, value: Action.Value(action)) !void
+///   fn(comptime action: Action.Key, value: Action.Value(action)) void
 ///
 /// The handler type T can choose to react to whatever actions it cares
 /// about in its pursuit of implementing a terminal emulator or other
@@ -468,11 +468,11 @@ pub fn Stream(comptime Handler: type) type {
         }
 
         /// Process a string of characters.
-        pub inline fn nextSlice(self: *Self, input: []const u8) !void {
+        pub inline fn nextSlice(self: *Self, input: []const u8) void {
             // Disable SIMD optimizations if build requests it or if our
             // manual debug mode is on.
             if (comptime debug or !build_options.simd) {
-                for (input) |c| try self.next(c);
+                for (input) |c| self.next(c);
                 return;
             }
 
@@ -485,13 +485,17 @@ pub fn Stream(comptime Handler: type) type {
             var i: usize = 0;
             while (true) {
                 const len = @min(cp_buf.len, input.len - i);
-                try self.nextSliceCapped(input[i .. i + len], &cp_buf);
+                self.nextSliceCapped(input[i .. i + len], &cp_buf);
                 i += len;
                 if (i >= input.len) break;
             }
         }
 
-        inline fn nextSliceCapped(self: *Self, input: []const u8, cp_buf: []u32) !void {
+        inline fn nextSliceCapped(
+            self: *Self,
+            input: []const u8,
+            cp_buf: []u32,
+        ) void {
             assert(input.len <= cp_buf.len);
 
             var offset: usize = 0;
@@ -500,7 +504,7 @@ pub fn Stream(comptime Handler: type) type {
             // a code sequence, we continue until it's not.
             while (self.utf8decoder.state != 0) {
                 if (offset >= input.len) return;
-                try self.nextUtf8(input[offset]);
+                self.nextUtf8(input[offset]);
                 offset += 1;
             }
             if (offset >= input.len) return;
@@ -508,9 +512,9 @@ pub fn Stream(comptime Handler: type) type {
             // If we're not in the ground state then we process until
             // we are. This can happen if the last chunk of input put us
             // in the middle of a control sequence.
-            offset += try self.consumeUntilGround(input[offset..]);
+            offset += self.consumeUntilGround(input[offset..]);
             if (offset >= input.len) return;
-            offset += try self.consumeAllEscapes(input[offset..]);
+            offset += self.consumeAllEscapes(input[offset..]);
 
             // If we're in the ground state then we can use SIMD to process
             // input until we see an ESC (0x1B), since all other characters
@@ -519,9 +523,9 @@ pub fn Stream(comptime Handler: type) type {
                 const res = simd.vt.utf8DecodeUntilControlSeq(input[offset..], cp_buf);
                 for (cp_buf[0..res.decoded]) |cp| {
                     if (cp <= 0xF) {
-                        try self.execute(@intCast(cp));
+                        self.execute(@intCast(cp));
                     } else {
-                        try self.print(@intCast(cp));
+                        self.print(@intCast(cp));
                     }
                 }
                 // Consume the bytes we just processed.
@@ -534,12 +538,12 @@ pub fn Stream(comptime Handler: type) type {
                 // to the scalar parser.
                 if (input[offset] != 0x1B) {
                     const rem = input[offset..];
-                    for (rem) |c| try self.nextUtf8(c);
+                    for (rem) |c| self.nextUtf8(c);
                     return;
                 }
 
                 // Process control sequences until we run out.
-                offset += try self.consumeAllEscapes(input[offset..]);
+                offset += self.consumeAllEscapes(input[offset..]);
             }
         }
 
@@ -548,13 +552,13 @@ pub fn Stream(comptime Handler: type) type {
         ///
         /// Expects input to start with 0x1B, use consumeUntilGround first
         /// if the stream may be in the middle of an escape sequence.
-        inline fn consumeAllEscapes(self: *Self, input: []const u8) !usize {
+        inline fn consumeAllEscapes(self: *Self, input: []const u8) usize {
             var offset: usize = 0;
             while (input[offset] == 0x1B) {
                 self.parser.state = .escape;
                 self.parser.clear();
                 offset += 1;
-                offset += try self.consumeUntilGround(input[offset..]);
+                offset += self.consumeUntilGround(input[offset..]);
                 if (offset >= input.len) return input.len;
             }
             return offset;
@@ -562,11 +566,11 @@ pub fn Stream(comptime Handler: type) type {
 
         /// Parses escape sequences until the parser reaches the ground state.
         /// Returns the number of bytes consumed from the provided input.
-        inline fn consumeUntilGround(self: *Self, input: []const u8) !usize {
+        inline fn consumeUntilGround(self: *Self, input: []const u8) usize {
             var offset: usize = 0;
             while (self.parser.state != .ground) {
                 if (offset >= input.len) return input.len;
-                try self.nextNonUtf8(input[offset]);
+                self.nextNonUtf8(input[offset]);
                 offset += 1;
             }
             return offset;
@@ -575,27 +579,27 @@ pub fn Stream(comptime Handler: type) type {
         /// Like nextSlice but takes one byte and is necessarily a scalar
         /// operation that can't use SIMD. Prefer nextSlice if you can and
         /// try to get multiple bytes at once.
-        pub inline fn next(self: *Self, c: u8) !void {
+        pub inline fn next(self: *Self, c: u8) void {
             // The scalar path can be responsible for decoding UTF-8.
             if (self.parser.state == .ground) {
-                try self.nextUtf8(c);
+                self.nextUtf8(c);
                 return;
             }
 
-            try self.nextNonUtf8(c);
+            self.nextNonUtf8(c);
         }
 
         /// Process the next byte and print as necessary.
         ///
         /// This assumes we're in the UTF-8 decoding state. If we may not
         /// be in the UTF-8 decoding state call nextSlice or next.
-        inline fn nextUtf8(self: *Self, c: u8) !void {
+        inline fn nextUtf8(self: *Self, c: u8) void {
             assert(self.parser.state == .ground);
 
             const res = self.utf8decoder.next(c);
             const consumed = res[1];
             if (res[0]) |codepoint| {
-                try self.handleCodepoint(codepoint);
+                self.handleCodepoint(codepoint);
             }
             if (!consumed) {
                 // We optimize for the scenario where the text being
@@ -608,7 +612,7 @@ pub fn Stream(comptime Handler: type) type {
                 // to not consume the byte twice in a row.
                 assert(retry[1] == true);
                 if (retry[0]) |codepoint| {
-                    try self.handleCodepoint(codepoint);
+                    self.handleCodepoint(codepoint);
                 }
             }
         }
@@ -617,7 +621,7 @@ pub fn Stream(comptime Handler: type) type {
         ///
         /// This function is abstracted this way to handle the case where
         /// the decoder emits a 0x1B after rejecting an ill-formed sequence.
-        inline fn handleCodepoint(self: *Self, c: u21) !void {
+        inline fn handleCodepoint(self: *Self, c: u21) void {
             // We need to increase the eval branch limit because a lot of
             // tests end up running almost completely at comptime due to
             // a chain of inline functions.
@@ -626,7 +630,7 @@ pub fn Stream(comptime Handler: type) type {
             // C0 control
             if (c <= 0xF) {
                 @branchHint(.unlikely);
-                try self.execute(@intCast(c));
+                self.execute(@intCast(c));
                 return;
             }
             // ESC
@@ -635,14 +639,14 @@ pub fn Stream(comptime Handler: type) type {
                 self.parser.clear();
                 return;
             }
-            try self.print(@intCast(c));
+            self.print(@intCast(c));
         }
 
         /// Process the next character and call any callbacks if necessary.
         ///
         /// This assumes that we're not in the UTF-8 decoding state. If
         /// we may be in the UTF-8 decoding state call nextSlice or next.
-        fn nextNonUtf8(self: *Self, c: u8) !void {
+        fn nextNonUtf8(self: *Self, c: u8) void {
             assert(self.parser.state != .ground);
 
             // Fast path for CSI entry.
@@ -659,7 +663,7 @@ pub fn Stream(comptime Handler: type) type {
                 @branchHint(.likely);
                 switch (c) {
                     // A C0 escape (yes, this is valid):
-                    0x00...0x0F => try self.execute(c),
+                    0x00...0x0F => self.execute(c),
                     // We ignore C0 escapes > 0xF since execute
                     // doesn't have processing for them anyway:
                     0x10...0x17, 0x19, 0x1C...0x1F => {},
@@ -725,32 +729,32 @@ pub fn Stream(comptime Handler: type) type {
                 }
 
                 switch (action) {
-                    .print => |p| try self.print(p),
-                    .execute => |code| try self.execute(code),
-                    .csi_dispatch => |csi_action| try self.csiDispatch(csi_action),
-                    .esc_dispatch => |esc| try self.escDispatch(esc),
-                    .osc_dispatch => |cmd| try self.oscDispatch(cmd),
-                    .dcs_hook => |dcs| try self.handler.vt(.dcs_hook, dcs),
-                    .dcs_put => |code| try self.handler.vt(.dcs_put, code),
-                    .dcs_unhook => try self.handler.vt(.dcs_unhook, {}),
-                    .apc_start => try self.handler.vt(.apc_start, {}),
-                    .apc_put => |code| try self.handler.vt(.apc_put, code),
-                    .apc_end => try self.handler.vt(.apc_end, {}),
+                    .print => |p| self.print(p),
+                    .execute => |code| self.execute(code),
+                    .csi_dispatch => |csi_action| self.csiDispatch(csi_action),
+                    .esc_dispatch => |esc| self.escDispatch(esc),
+                    .osc_dispatch => |cmd| self.oscDispatch(cmd),
+                    .dcs_hook => |dcs| self.handler.vt(.dcs_hook, dcs),
+                    .dcs_put => |code| self.handler.vt(.dcs_put, code),
+                    .dcs_unhook => self.handler.vt(.dcs_unhook, {}),
+                    .apc_start => self.handler.vt(.apc_start, {}),
+                    .apc_put => |code| self.handler.vt(.apc_put, code),
+                    .apc_end => self.handler.vt(.apc_end, {}),
                 }
             }
         }
 
-        pub inline fn print(self: *Self, c: u21) !void {
-            try self.handler.vt(.print, .{ .cp = c });
+        inline fn print(self: *Self, c: u21) void {
+            self.handler.vt(.print, .{ .cp = c });
         }
 
-        pub inline fn execute(self: *Self, c: u8) !void {
+        inline fn execute(self: *Self, c: u8) void {
             // If the character is > 0x7F, it's a C1 (8-bit) control,
             // which is strictly equivalent to `ESC` plus `c - 0x40`.
             if (c > 0x7F) {
                 @branchHint(.unlikely);
                 log.info("executing C1 0x{x} as ESC {c}", .{ c, c - 0x40 });
-                try self.escDispatch(.{
+                self.escDispatch(.{
                     .intermediates = &.{},
                     .final = c - 0x40,
                 });
@@ -763,20 +767,20 @@ pub fn Stream(comptime Handler: type) type {
                 // We ignore SOH/STX: https://github.com/microsoft/terminal/issues/10786
                 .NUL, .SOH, .STX => {},
 
-                .ENQ => try self.handler.vt(.enquiry, {}),
-                .BEL => try self.handler.vt(.bell, {}),
-                .BS => try self.handler.vt(.backspace, {}),
-                .HT => try self.handler.vt(.horizontal_tab, 1),
-                .LF, .VT, .FF => try self.handler.vt(.linefeed, {}),
-                .CR => try self.handler.vt(.carriage_return, {}),
-                .SO => try self.handler.vt(.invoke_charset, .{ .bank = .GL, .charset = .G1, .locking = false }),
-                .SI => try self.handler.vt(.invoke_charset, .{ .bank = .GL, .charset = .G0, .locking = false }),
+                .ENQ => self.handler.vt(.enquiry, {}),
+                .BEL => self.handler.vt(.bell, {}),
+                .BS => self.handler.vt(.backspace, {}),
+                .HT => self.handler.vt(.horizontal_tab, 1),
+                .LF, .VT, .FF => self.handler.vt(.linefeed, {}),
+                .CR => self.handler.vt(.carriage_return, {}),
+                .SO => self.handler.vt(.invoke_charset, .{ .bank = .GL, .charset = .G1, .locking = false }),
+                .SI => self.handler.vt(.invoke_charset, .{ .bank = .GL, .charset = .G0, .locking = false }),
 
                 else => log.warn("invalid C0 character, ignoring: 0x{x}", .{c}),
             }
         }
 
-        inline fn csiDispatch(self: *Self, input: Parser.Action.CSI) !void {
+        inline fn csiDispatch(self: *Self, input: Parser.Action.CSI) void {
             // The branch hints here are based on real world data
             // which indicates that the most common CSI finals are:
             //
@@ -806,7 +810,7 @@ pub fn Stream(comptime Handler: type) type {
                 'A', 'k' => {
                     @branchHint(.likely);
                     switch (input.intermediates.len) {
-                        0 => try self.handler.vt(.cursor_up, .{
+                        0 => self.handler.vt(.cursor_up, .{
                             .value = switch (input.params.len) {
                                 0 => 1,
                                 1 => input.params[0],
@@ -827,7 +831,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // CUD - Cursor Down
                 'B' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.cursor_down, .{
+                    0 => self.handler.vt(.cursor_down, .{
                         .value = switch (input.params.len) {
                             0 => 1,
                             1 => input.params[0],
@@ -849,7 +853,7 @@ pub fn Stream(comptime Handler: type) type {
                 'C' => {
                     @branchHint(.likely);
                     switch (input.intermediates.len) {
-                        0 => try self.handler.vt(.cursor_right, .{
+                        0 => self.handler.vt(.cursor_right, .{
                             .value = switch (input.params.len) {
                                 0 => 1,
                                 1 => input.params[0],
@@ -870,7 +874,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // CUB - Cursor Left
                 'D', 'j' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.cursor_left, .{
+                    0 => self.handler.vt(.cursor_left, .{
                         .value = switch (input.params.len) {
                             0 => 1,
                             1 => input.params[0],
@@ -891,7 +895,7 @@ pub fn Stream(comptime Handler: type) type {
                 // CNL - Cursor Next Line
                 'E' => switch (input.intermediates.len) {
                     0 => {
-                        try self.handler.vt(.cursor_down, .{
+                        self.handler.vt(.cursor_down, .{
                             .value = switch (input.params.len) {
                                 0 => 1,
                                 1 => input.params[0],
@@ -902,7 +906,7 @@ pub fn Stream(comptime Handler: type) type {
                                 },
                             },
                         });
-                        try self.handler.vt(.carriage_return, {});
+                        self.handler.vt(.carriage_return, {});
                     },
 
                     else => log.warn(
@@ -914,7 +918,7 @@ pub fn Stream(comptime Handler: type) type {
                 // CPL - Cursor Previous Line
                 'F' => switch (input.intermediates.len) {
                     0 => {
-                        try self.handler.vt(.cursor_up, .{
+                        self.handler.vt(.cursor_up, .{
                             .value = switch (input.params.len) {
                                 0 => 1,
                                 1 => input.params[0],
@@ -925,7 +929,7 @@ pub fn Stream(comptime Handler: type) type {
                                 },
                             },
                         });
-                        try self.handler.vt(.carriage_return, {});
+                        self.handler.vt(.carriage_return, {});
                     },
 
                     else => log.warn(
@@ -937,7 +941,7 @@ pub fn Stream(comptime Handler: type) type {
                 // HPA - Cursor Horizontal Position Absolute
                 // TODO: test
                 'G', '`' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.cursor_col, .{
+                    0 => self.handler.vt(.cursor_col, .{
                         .value = switch (input.params.len) {
                             0 => 1,
                             1 => input.params[0],
@@ -971,7 +975,7 @@ pub fn Stream(comptime Handler: type) type {
                                     return;
                                 },
                             };
-                            try self.handler.vt(.cursor_pos, pos);
+                            self.handler.vt(.cursor_pos, pos);
                         },
 
                         else => log.warn(
@@ -983,7 +987,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // CHT - Cursor Horizontal Tabulation
                 'I' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.horizontal_tab, switch (input.params.len) {
+                    0 => self.handler.vt(.horizontal_tab, switch (input.params.len) {
                         0 => 1,
                         1 => input.params[0],
                         else => {
@@ -1023,11 +1027,11 @@ pub fn Stream(comptime Handler: type) type {
                     };
 
                     switch (mode) {
-                        .below => try self.handler.vt(.erase_display_below, protected),
-                        .above => try self.handler.vt(.erase_display_above, protected),
-                        .complete => try self.handler.vt(.erase_display_complete, protected),
-                        .scrollback => try self.handler.vt(.erase_display_scrollback, protected),
-                        .scroll_complete => try self.handler.vt(.erase_display_scroll_complete, protected),
+                        .below => self.handler.vt(.erase_display_below, protected),
+                        .above => self.handler.vt(.erase_display_above, protected),
+                        .complete => self.handler.vt(.erase_display_complete, protected),
+                        .scrollback => self.handler.vt(.erase_display_scrollback, protected),
+                        .scroll_complete => self.handler.vt(.erase_display_scroll_complete, protected),
                     }
                 },
 
@@ -1059,10 +1063,10 @@ pub fn Stream(comptime Handler: type) type {
                     };
 
                     switch (mode) {
-                        .right => try self.handler.vt(.erase_line_right, protected),
-                        .left => try self.handler.vt(.erase_line_left, protected),
-                        .complete => try self.handler.vt(.erase_line_complete, protected),
-                        .right_unless_pending_wrap => try self.handler.vt(.erase_line_right_unless_pending_wrap, protected),
+                        .right => self.handler.vt(.erase_line_right, protected),
+                        .left => self.handler.vt(.erase_line_left, protected),
+                        .complete => self.handler.vt(.erase_line_complete, protected),
+                        .right_unless_pending_wrap => self.handler.vt(.erase_line_right_unless_pending_wrap, protected),
                         _ => {
                             @branchHint(.unlikely);
                             log.warn("invalid erase line mode: {}", .{mode});
@@ -1073,7 +1077,7 @@ pub fn Stream(comptime Handler: type) type {
                 // IL - Insert Lines
                 // TODO: test
                 'L' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.insert_lines, switch (input.params.len) {
+                    0 => self.handler.vt(.insert_lines, switch (input.params.len) {
                         0 => 1,
                         1 => input.params[0],
                         else => {
@@ -1091,7 +1095,7 @@ pub fn Stream(comptime Handler: type) type {
                 // DL - Delete Lines
                 // TODO: test
                 'M' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.delete_lines, switch (input.params.len) {
+                    0 => self.handler.vt(.delete_lines, switch (input.params.len) {
                         0 => 1,
                         1 => input.params[0],
                         else => {
@@ -1108,7 +1112,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // Delete Character (DCH)
                 'P' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.delete_chars, switch (input.params.len) {
+                    0 => self.handler.vt(.delete_chars, switch (input.params.len) {
                         0 => 1,
                         1 => input.params[0],
                         else => {
@@ -1126,7 +1130,7 @@ pub fn Stream(comptime Handler: type) type {
                 // Scroll Up (SD)
 
                 'S' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.scroll_up, switch (input.params.len) {
+                    0 => self.handler.vt(.scroll_up, switch (input.params.len) {
                         0 => 1,
                         1 => input.params[0],
                         else => {
@@ -1143,7 +1147,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // Scroll Down (SD)
                 'T' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.scroll_down, switch (input.params.len) {
+                    0 => self.handler.vt(.scroll_down, switch (input.params.len) {
                         0 => 1,
                         1 => input.params[0],
                         else => {
@@ -1164,7 +1168,7 @@ pub fn Stream(comptime Handler: type) type {
                         if (input.params.len == 0 or
                             (input.params.len == 1 and input.params[0] == 0))
                         {
-                            try self.handler.vt(.tab_set, {});
+                            self.handler.vt(.tab_set, {});
                             return;
                         }
 
@@ -1174,9 +1178,9 @@ pub fn Stream(comptime Handler: type) type {
                             1 => switch (input.params[0]) {
                                 0 => unreachable,
 
-                                2 => try self.handler.vt(.tab_clear_current, {}),
+                                2 => self.handler.vt(.tab_clear_current, {}),
 
-                                5 => try self.handler.vt(.tab_clear_all, {}),
+                                5 => self.handler.vt(.tab_clear_all, {}),
 
                                 else => {},
                             },
@@ -1192,7 +1196,7 @@ pub fn Stream(comptime Handler: type) type {
                         input.params.len == 1 and
                         input.params[0] == 5)
                     {
-                        try self.handler.vt(.tab_reset, {});
+                        self.handler.vt(.tab_reset, {});
                     } else log.warn("invalid cursor tabulation control: {f}", .{input}),
 
                     else => log.warn(
@@ -1205,7 +1209,7 @@ pub fn Stream(comptime Handler: type) type {
                 'X' => {
                     @branchHint(.likely);
                     switch (input.intermediates.len) {
-                        0 => try self.handler.vt(.erase_chars, switch (input.params.len) {
+                        0 => self.handler.vt(.erase_chars, switch (input.params.len) {
                             0 => 1,
                             1 => input.params[0],
                             else => {
@@ -1224,7 +1228,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // CHT - Cursor Horizontal Tabulation Back
                 'Z' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.horizontal_tab_back, switch (input.params.len) {
+                    0 => self.handler.vt(.horizontal_tab_back, switch (input.params.len) {
                         0 => 1,
                         1 => input.params[0],
                         else => {
@@ -1241,7 +1245,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // HPR - Cursor Horizontal Position Relative
                 'a' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.cursor_col_relative, .{
+                    0 => self.handler.vt(.cursor_col_relative, .{
                         .value = switch (input.params.len) {
                             0 => 1,
                             1 => input.params[0],
@@ -1260,7 +1264,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // Repeat Previous Char (REP)
                 'b' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.print_repeat, switch (input.params.len) {
+                    0 => self.handler.vt(.print_repeat, switch (input.params.len) {
                         0 => 1,
                         1 => input.params[0],
                         else => {
@@ -1288,7 +1292,7 @@ pub fn Stream(comptime Handler: type) type {
                     };
 
                     if (req) |r| {
-                        try self.handler.vt(.device_attributes, r);
+                        self.handler.vt(.device_attributes, r);
                     } else {
                         log.warn("invalid device attributes command: {f}", .{input});
                         return;
@@ -1297,7 +1301,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // VPA - Cursor Vertical Position Absolute
                 'd' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.cursor_row, .{
+                    0 => self.handler.vt(.cursor_row, .{
                         .value = switch (input.params.len) {
                             0 => 1,
                             1 => input.params[0],
@@ -1316,7 +1320,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // VPR - Cursor Vertical Position Relative
                 'e' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.cursor_row_relative, .{
+                    0 => self.handler.vt(.cursor_row_relative, .{
                         .value = switch (input.params.len) {
                             0 => 1,
                             1 => input.params[0],
@@ -1348,8 +1352,8 @@ pub fn Stream(comptime Handler: type) type {
                             },
                         };
                         switch (mode) {
-                            .current => try self.handler.vt(.tab_clear_current, {}),
-                            .all => try self.handler.vt(.tab_clear_all, {}),
+                            .current => self.handler.vt(.tab_clear_current, {}),
+                            .all => self.handler.vt(.tab_clear_all, {}),
                             _ => log.warn("unknown tab clear mode: {}", .{mode}),
                         }
                     },
@@ -1374,7 +1378,7 @@ pub fn Stream(comptime Handler: type) type {
 
                     for (input.params) |mode_int| {
                         if (modes.modeFromInt(mode_int, ansi_mode)) |mode| {
-                            try self.handler.vt(.set_mode, .{ .mode = mode });
+                            self.handler.vt(.set_mode, .{ .mode = mode });
                         } else {
                             log.warn("unimplemented mode: {}", .{mode_int});
                         }
@@ -1395,7 +1399,7 @@ pub fn Stream(comptime Handler: type) type {
 
                     for (input.params) |mode_int| {
                         if (modes.modeFromInt(mode_int, ansi_mode)) |mode| {
-                            try self.handler.vt(.reset_mode, .{ .mode = mode });
+                            self.handler.vt(.reset_mode, .{ .mode = mode });
                         } else {
                             log.warn("unimplemented mode: {}", .{mode_int});
                         }
@@ -1416,7 +1420,7 @@ pub fn Stream(comptime Handler: type) type {
                             };
                             while (p.next()) |attr| {
                                 // log.info("SGR attribute: {}", .{attr});
-                                try self.handler.vt(.set_attribute, attr);
+                                self.handler.vt(.set_attribute, attr);
                             }
                         },
 
@@ -1424,7 +1428,7 @@ pub fn Stream(comptime Handler: type) type {
                             '>' => blk: {
                                 if (input.params.len == 0) {
                                     // Reset
-                                    try self.handler.vt(.modify_key_format, .legacy);
+                                    self.handler.vt(.modify_key_format, .legacy);
                                     break :blk;
                                 }
 
@@ -1463,7 +1467,7 @@ pub fn Stream(comptime Handler: type) type {
                                     }
                                 }
 
-                                try self.handler.vt(.modify_key_format, format);
+                                self.handler.vt(.modify_key_format, format);
                             },
 
                             else => log.warn(
@@ -1510,7 +1514,7 @@ pub fn Stream(comptime Handler: type) type {
                             return;
                         };
 
-                        try self.handler.vt(.device_status, .{ .request = req });
+                        self.handler.vt(.device_status, .{ .request = req });
                         return;
                     }
 
@@ -1524,7 +1528,7 @@ pub fn Stream(comptime Handler: type) type {
                                 // control what exactly is being disabled. However, we
                                 // only support reverting back to modify other keys in
                                 // numeric except format.
-                                try self.handler.vt(.modify_key_format, .other_keys_numeric_except);
+                                self.handler.vt(.modify_key_format, .other_keys_numeric_except);
                             },
 
                             else => log.warn(
@@ -1566,9 +1570,9 @@ pub fn Stream(comptime Handler: type) type {
                         const mode_raw = input.params[0];
                         const mode = modes.modeFromInt(mode_raw, ansi_mode);
                         if (mode) |m| {
-                            try self.handler.vt(.request_mode, .{ .mode = m });
+                            self.handler.vt(.request_mode, .{ .mode = m });
                         } else {
-                            try self.handler.vt(.request_mode_unknown, .{
+                            self.handler.vt(.request_mode_unknown, .{
                                 .mode = mode_raw,
                                 .ansi = ansi_mode,
                             });
@@ -1606,7 +1610,7 @@ pub fn Stream(comptime Handler: type) type {
                                     return;
                                 },
                             };
-                            try self.handler.vt(.cursor_style, style);
+                            self.handler.vt(.cursor_style, style);
                         },
 
                         // DECSCA
@@ -1627,14 +1631,14 @@ pub fn Stream(comptime Handler: type) type {
                             };
 
                             switch (mode) {
-                                .off => try self.handler.vt(.protected_mode_off, {}),
-                                .iso => try self.handler.vt(.protected_mode_iso, {}),
-                                .dec => try self.handler.vt(.protected_mode_dec, {}),
+                                .off => self.handler.vt(.protected_mode_off, {}),
+                                .iso => self.handler.vt(.protected_mode_iso, {}),
+                                .dec => self.handler.vt(.protected_mode_dec, {}),
                             }
                         },
 
                         // XTVERSION
-                        '>' => try self.handler.vt(.xtversion, {}),
+                        '>' => self.handler.vt(.xtversion, {}),
                         else => {
                             log.warn(
                                 "ignoring unimplemented CSI q with intermediates: {s}",
@@ -1654,9 +1658,9 @@ pub fn Stream(comptime Handler: type) type {
                     switch (input.intermediates.len) {
                         // DECSTBM - Set Top and Bottom Margins
                         0 => switch (input.params.len) {
-                            0 => try self.handler.vt(.top_and_bottom_margin, .{ .top_left = 0, .bottom_right = 0 }),
-                            1 => try self.handler.vt(.top_and_bottom_margin, .{ .top_left = input.params[0], .bottom_right = 0 }),
-                            2 => try self.handler.vt(.top_and_bottom_margin, .{ .top_left = input.params[0], .bottom_right = input.params[1] }),
+                            0 => self.handler.vt(.top_and_bottom_margin, .{ .top_left = 0, .bottom_right = 0 }),
+                            1 => self.handler.vt(.top_and_bottom_margin, .{ .top_left = input.params[0], .bottom_right = 0 }),
+                            2 => self.handler.vt(.top_and_bottom_margin, .{ .top_left = input.params[0], .bottom_right = input.params[1] }),
                             else => {
                                 @branchHint(.unlikely);
                                 log.warn("invalid DECSTBM command: {f}", .{input});
@@ -1668,7 +1672,7 @@ pub fn Stream(comptime Handler: type) type {
                             '?' => {
                                 for (input.params) |mode_int| {
                                     if (modes.modeFromInt(mode_int, false)) |mode| {
-                                        try self.handler.vt(.restore_mode, .{ .mode = mode });
+                                        self.handler.vt(.restore_mode, .{ .mode = mode });
                                     } else {
                                         log.warn(
                                             "unimplemented restore mode: {}",
@@ -1698,9 +1702,9 @@ pub fn Stream(comptime Handler: type) type {
                         // to our handler to do the proper logic. If mode 69
                         // is set, then we should invoke DECSLRM, otherwise
                         // we should invoke SC.
-                        0 => try self.handler.vt(.left_and_right_margin_ambiguous, {}),
-                        1 => try self.handler.vt(.left_and_right_margin, .{ .top_left = input.params[0], .bottom_right = 0 }),
-                        2 => try self.handler.vt(.left_and_right_margin, .{ .top_left = input.params[0], .bottom_right = input.params[1] }),
+                        0 => self.handler.vt(.left_and_right_margin_ambiguous, {}),
+                        1 => self.handler.vt(.left_and_right_margin, .{ .top_left = input.params[0], .bottom_right = 0 }),
+                        2 => self.handler.vt(.left_and_right_margin, .{ .top_left = input.params[0], .bottom_right = input.params[1] }),
                         else => log.warn("invalid DECSLRM command: {f}", .{input}),
                     },
 
@@ -1708,7 +1712,7 @@ pub fn Stream(comptime Handler: type) type {
                         '?' => {
                             for (input.params) |mode_int| {
                                 if (modes.modeFromInt(mode_int, false)) |mode| {
-                                    try self.handler.vt(.save_mode, .{ .mode = mode });
+                                    self.handler.vt(.save_mode, .{ .mode = mode });
                                 } else {
                                     log.warn(
                                         "unimplemented save mode: {}",
@@ -1736,7 +1740,7 @@ pub fn Stream(comptime Handler: type) type {
                                 },
                             };
 
-                            try self.handler.vt(.mouse_shift_capture, capture);
+                            self.handler.vt(.mouse_shift_capture, capture);
                         },
 
                         else => log.warn(
@@ -1758,28 +1762,28 @@ pub fn Stream(comptime Handler: type) type {
                             switch (input.params[0]) {
                                 14 => if (input.params.len == 1) {
                                     // report the text area size in pixels
-                                    try self.handler.vt(.size_report, .csi_14_t);
+                                    self.handler.vt(.size_report, .csi_14_t);
                                 } else log.warn(
                                     "ignoring CSI 14 t with extra parameters: {f}",
                                     .{input},
                                 ),
                                 16 => if (input.params.len == 1) {
                                     // report cell size in pixels
-                                    try self.handler.vt(.size_report, .csi_16_t);
+                                    self.handler.vt(.size_report, .csi_16_t);
                                 } else log.warn(
                                     "ignoring CSI 16 t with extra parameters: {f}",
                                     .{input},
                                 ),
                                 18 => if (input.params.len == 1) {
                                     // report screen size in characters
-                                    try self.handler.vt(.size_report, .csi_18_t);
+                                    self.handler.vt(.size_report, .csi_18_t);
                                 } else log.warn(
                                     "ignoring CSI 18 t with extra parameters: {f}",
                                     .{input},
                                 ),
                                 21 => if (input.params.len == 1) {
                                     // report window title
-                                    try self.handler.vt(.size_report, .csi_21_t);
+                                    self.handler.vt(.size_report, .csi_21_t);
                                 } else log.warn(
                                     "ignoring CSI 21 t with extra parameters: {f}",
                                     .{input},
@@ -1796,8 +1800,8 @@ pub fn Stream(comptime Handler: type) type {
                                     else
                                         0;
                                     switch (number) {
-                                        22 => try self.handler.vt(.title_push, index),
-                                        23 => try self.handler.vt(.title_pop, index),
+                                        22 => self.handler.vt(.title_push, index),
+                                        23 => self.handler.vt(.title_pop, index),
                                         else => @compileError("unreachable"),
                                     }
                                 } else log.warn(
@@ -1821,11 +1825,11 @@ pub fn Stream(comptime Handler: type) type {
                 },
 
                 'u' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.restore_cursor, {}),
+                    0 => self.handler.vt(.restore_cursor, {}),
 
                     // Kitty keyboard protocol
                     1 => switch (input.intermediates[0]) {
-                        '?' => try self.handler.vt(.kitty_keyboard_query, {}),
+                        '?' => self.handler.vt(.kitty_keyboard_query, {}),
 
                         '>' => push: {
                             const flags: u5 = if (input.params.len == 1)
@@ -1836,7 +1840,7 @@ pub fn Stream(comptime Handler: type) type {
                             else
                                 0;
 
-                            try self.handler.vt(.kitty_keyboard_push, .{ .flags = @as(kitty.KeyFlags, @bitCast(flags)) });
+                            self.handler.vt(.kitty_keyboard_push, .{ .flags = @as(kitty.KeyFlags, @bitCast(flags)) });
                         },
 
                         '<' => {
@@ -1845,7 +1849,7 @@ pub fn Stream(comptime Handler: type) type {
                             else
                                 1;
 
-                            try self.handler.vt(.kitty_keyboard_pop, number);
+                            self.handler.vt(.kitty_keyboard_pop, number);
                         },
 
                         '=' => set: {
@@ -1874,9 +1878,9 @@ pub fn Stream(comptime Handler: type) type {
 
                             const kitty_flags: streampkg.Action.KittyKeyboardFlags = .{ .flags = @as(kitty.KeyFlags, @bitCast(flags)) };
                             switch (action_tag) {
-                                .kitty_keyboard_set => try self.handler.vt(.kitty_keyboard_set, kitty_flags),
-                                .kitty_keyboard_set_or => try self.handler.vt(.kitty_keyboard_set_or, kitty_flags),
-                                .kitty_keyboard_set_not => try self.handler.vt(.kitty_keyboard_set_not, kitty_flags),
+                                .kitty_keyboard_set => self.handler.vt(.kitty_keyboard_set, kitty_flags),
+                                .kitty_keyboard_set_or => self.handler.vt(.kitty_keyboard_set_or, kitty_flags),
+                                .kitty_keyboard_set_not => self.handler.vt(.kitty_keyboard_set_not, kitty_flags),
                                 else => unreachable,
                             }
                         },
@@ -1895,7 +1899,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // ICH - Insert Blanks
                 '@' => switch (input.intermediates.len) {
-                    0 => try self.handler.vt(.insert_blanks, switch (input.params.len) {
+                    0 => self.handler.vt(.insert_blanks, switch (input.params.len) {
                         0 => 1,
                         1 => @max(1, input.params[0]),
                         else => {
@@ -1932,14 +1936,14 @@ pub fn Stream(comptime Handler: type) type {
                         },
                     };
 
-                    try self.handler.vt(.active_status_display, display);
+                    self.handler.vt(.active_status_display, display);
                 },
 
                 else => log.warn("unimplemented CSI action: {f}", .{input}),
             }
         }
 
-        inline fn oscDispatch(self: *Self, cmd: osc.Command) !void {
+        inline fn oscDispatch(self: *Self, cmd: osc.Command) void {
             // The branch hints here are based on real world data
             // which indicates that the most common OSC commands are:
             //
@@ -1965,7 +1969,7 @@ pub fn Stream(comptime Handler: type) type {
             switch (cmd) {
                 .semantic_prompt => |sp| {
                     @branchHint(.likely);
-                    try self.handler.vt(.semantic_prompt, sp);
+                    self.handler.vt(.semantic_prompt, sp);
                 },
 
                 .change_window_title => |title| {
@@ -1976,7 +1980,7 @@ pub fn Stream(comptime Handler: type) type {
                         return;
                     }
 
-                    try self.handler.vt(.window_title, .{ .title = title });
+                    self.handler.vt(.window_title, .{ .title = title });
                 },
 
                 .change_window_icon => |icon| {
@@ -1985,7 +1989,7 @@ pub fn Stream(comptime Handler: type) type {
                 },
 
                 .clipboard_contents => |clip| {
-                    try self.handler.vt(.clipboard_contents, .{
+                    self.handler.vt(.clipboard_contents, .{
                         .kind = clip.kind,
                         .data = clip.data,
                     });
@@ -1993,7 +1997,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 .report_pwd => |v| {
                     @branchHint(.likely);
-                    try self.handler.vt(.report_pwd, .{ .url = v.value });
+                    self.handler.vt(.report_pwd, .{ .url = v.value });
                 },
 
                 .mouse_shape => |v| {
@@ -2003,12 +2007,12 @@ pub fn Stream(comptime Handler: type) type {
                         return;
                     };
 
-                    try self.handler.vt(.mouse_shape, shape);
+                    self.handler.vt(.mouse_shape, shape);
                 },
 
                 .color_operation => |v| {
                     @branchHint(.likely);
-                    try self.handler.vt(.color_operation, .{
+                    self.handler.vt(.color_operation, .{
                         .op = v.op,
                         .requests = v.requests,
                         .terminator = v.terminator,
@@ -2016,11 +2020,11 @@ pub fn Stream(comptime Handler: type) type {
                 },
 
                 .kitty_color_protocol => |v| {
-                    try self.handler.vt(.kitty_color_report, v);
+                    self.handler.vt(.kitty_color_report, v);
                 },
 
                 .show_desktop_notification => |v| {
-                    try self.handler.vt(.show_desktop_notification, .{
+                    self.handler.vt(.show_desktop_notification, .{
                         .title = v.title,
                         .body = v.body,
                     });
@@ -2028,7 +2032,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 .hyperlink_start => |v| {
                     @branchHint(.likely);
-                    try self.handler.vt(.start_hyperlink, .{
+                    self.handler.vt(.start_hyperlink, .{
                         .uri = v.uri,
                         .id = v.id,
                     });
@@ -2036,11 +2040,11 @@ pub fn Stream(comptime Handler: type) type {
 
                 .hyperlink_end => {
                     @branchHint(.likely);
-                    try self.handler.vt(.end_hyperlink, {});
+                    self.handler.vt(.end_hyperlink, {});
                 },
 
                 .conemu_progress_report => |v| {
-                    try self.handler.vt(.progress_report, v);
+                    self.handler.vt(.progress_report, v);
                 },
 
                 .conemu_sleep,
@@ -2072,7 +2076,7 @@ pub fn Stream(comptime Handler: type) type {
             self: *Self,
             intermediates: []const u8,
             set: charsets.Charset,
-        ) !void {
+        ) void {
             if (intermediates.len != 1) {
                 log.warn("invalid charset intermediate: {any}", .{intermediates});
                 return;
@@ -2092,7 +2096,7 @@ pub fn Stream(comptime Handler: type) type {
                 },
             };
 
-            try self.handler.vt(.configure_charset, .{
+            self.handler.vt(.configure_charset, .{
                 .slot = slot,
                 .charset = set,
             });
@@ -2101,7 +2105,7 @@ pub fn Stream(comptime Handler: type) type {
         inline fn escDispatch(
             self: *Self,
             action: Parser.Action.ESC,
-        ) !void {
+        ) void {
             // The branch hints here are based on real world data
             // which indicates that the most common ESC finals are:
             //
@@ -2129,19 +2133,19 @@ pub fn Stream(comptime Handler: type) type {
                 // Charsets
                 'B' => {
                     @branchHint(.likely);
-                    try self.configureCharset(action.intermediates, .ascii);
+                    self.configureCharset(action.intermediates, .ascii);
                 },
-                'A' => try self.configureCharset(action.intermediates, .british),
+                'A' => self.configureCharset(action.intermediates, .british),
                 '0' => {
                     @branchHint(.likely);
-                    try self.configureCharset(action.intermediates, .dec_special);
+                    self.configureCharset(action.intermediates, .dec_special);
                 },
 
                 // DECSC - Save Cursor
                 '7' => {
                     @branchHint(.likely);
                     switch (action.intermediates.len) {
-                        0 => try self.handler.vt(.save_cursor, {}),
+                        0 => self.handler.vt(.save_cursor, {}),
                         else => {
                             @branchHint(.unlikely);
                             log.warn("invalid command: {f}", .{action});
@@ -2155,14 +2159,14 @@ pub fn Stream(comptime Handler: type) type {
                     switch (action.intermediates.len) {
                         // DECRC - Restore Cursor
                         0 => {
-                            try self.handler.vt(.restore_cursor, {});
+                            self.handler.vt(.restore_cursor, {});
                             break :blk {};
                         },
 
                         1 => switch (action.intermediates[0]) {
                             // DECALN - Fill Screen with E
                             '#' => {
-                                try self.handler.vt(.decaln, {});
+                                self.handler.vt(.decaln, {});
                                 break :blk {};
                             },
 
@@ -2177,7 +2181,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // IND - Index
                 'D' => switch (action.intermediates.len) {
-                    0 => try self.handler.vt(.index, {}),
+                    0 => self.handler.vt(.index, {}),
                     else => {
                         @branchHint(.unlikely);
                         log.warn("invalid index command: {f}", .{action});
@@ -2187,7 +2191,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // NEL - Next Line
                 'E' => switch (action.intermediates.len) {
-                    0 => try self.handler.vt(.next_line, {}),
+                    0 => self.handler.vt(.next_line, {}),
                     else => {
                         @branchHint(.unlikely);
                         log.warn("invalid next line command: {f}", .{action});
@@ -2197,7 +2201,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // HTS - Horizontal Tab Set
                 'H' => switch (action.intermediates.len) {
-                    0 => try self.handler.vt(.tab_set, {}),
+                    0 => self.handler.vt(.tab_set, {}),
                     else => {
                         @branchHint(.unlikely);
                         log.warn("invalid tab set command: {f}", .{action});
@@ -2209,7 +2213,7 @@ pub fn Stream(comptime Handler: type) type {
                 'M' => {
                     @branchHint(.likely);
                     switch (action.intermediates.len) {
-                        0 => try self.handler.vt(.reverse_index, {}),
+                        0 => self.handler.vt(.reverse_index, {}),
                         else => {
                             @branchHint(.unlikely);
                             log.warn("invalid reverse index command: {f}", .{action});
@@ -2220,7 +2224,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // SS2 - Single Shift 2
                 'N' => switch (action.intermediates.len) {
-                    0 => try self.handler.vt(.invoke_charset, .{
+                    0 => self.handler.vt(.invoke_charset, .{
                         .bank = .GL,
                         .charset = .G2,
                         .locking = true,
@@ -2234,7 +2238,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // SS3 - Single Shift 3
                 'O' => switch (action.intermediates.len) {
-                    0 => try self.handler.vt(.invoke_charset, .{
+                    0 => self.handler.vt(.invoke_charset, .{
                         .bank = .GL,
                         .charset = .G3,
                         .locking = true,
@@ -2248,24 +2252,24 @@ pub fn Stream(comptime Handler: type) type {
 
                 // SPA - Start of Guarded Area
                 'V' => switch (action.intermediates.len) {
-                    0 => try self.handler.vt(.protected_mode_iso, {}),
+                    0 => self.handler.vt(.protected_mode_iso, {}),
                     else => log.warn("unimplemented ESC callback: {f}", .{action}),
                 },
 
                 // EPA - End of Guarded Area
                 'W' => switch (action.intermediates.len) {
-                    0 => try self.handler.vt(.protected_mode_off, {}),
+                    0 => self.handler.vt(.protected_mode_off, {}),
                     else => log.warn("unimplemented ESC callback: {f}", .{action}),
                 },
 
                 // DECID
                 'Z' => if (action.intermediates.len == 0) {
-                    try self.handler.vt(.device_attributes, .primary);
+                    self.handler.vt(.device_attributes, .primary);
                 } else log.warn("unimplemented ESC callback: {f}", .{action}),
 
                 // RIS - Full Reset
                 'c' => switch (action.intermediates.len) {
-                    0 => try self.handler.vt(.full_reset, {}),
+                    0 => self.handler.vt(.full_reset, {}),
                     else => {
                         log.warn("invalid full reset command: {f}", .{action});
                         return;
@@ -2274,7 +2278,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // LS2 - Locking Shift 2
                 'n' => switch (action.intermediates.len) {
-                    0 => try self.handler.vt(.invoke_charset, .{
+                    0 => self.handler.vt(.invoke_charset, .{
                         .bank = .GL,
                         .charset = .G2,
                         .locking = false,
@@ -2288,7 +2292,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // LS3 - Locking Shift 3
                 'o' => switch (action.intermediates.len) {
-                    0 => try self.handler.vt(.invoke_charset, .{
+                    0 => self.handler.vt(.invoke_charset, .{
                         .bank = .GL,
                         .charset = .G3,
                         .locking = false,
@@ -2302,7 +2306,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // LS1R - Locking Shift 1 Right
                 '~' => switch (action.intermediates.len) {
-                    0 => try self.handler.vt(.invoke_charset, .{
+                    0 => self.handler.vt(.invoke_charset, .{
                         .bank = .GR,
                         .charset = .G1,
                         .locking = false,
@@ -2316,7 +2320,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // LS2R - Locking Shift 2 Right
                 '}' => switch (action.intermediates.len) {
-                    0 => try self.handler.vt(.invoke_charset, .{
+                    0 => self.handler.vt(.invoke_charset, .{
                         .bank = .GR,
                         .charset = .G2,
                         .locking = false,
@@ -2330,7 +2334,7 @@ pub fn Stream(comptime Handler: type) type {
 
                 // LS3R - Locking Shift 3 Right
                 '|' => switch (action.intermediates.len) {
-                    0 => try self.handler.vt(.invoke_charset, .{
+                    0 => self.handler.vt(.invoke_charset, .{
                         .bank = .GR,
                         .charset = .G3,
                         .locking = false,
@@ -2346,7 +2350,7 @@ pub fn Stream(comptime Handler: type) type {
                 '=' => {
                     @branchHint(.likely);
                     switch (action.intermediates.len) {
-                        0 => try self.handler.vt(.set_mode, .{ .mode = .keypad_keys }),
+                        0 => self.handler.vt(.set_mode, .{ .mode = .keypad_keys }),
                         else => log.warn("unimplemented setMode: {f}", .{action}),
                     }
                 },
@@ -2355,7 +2359,7 @@ pub fn Stream(comptime Handler: type) type {
                 '>' => {
                     @branchHint(.likely);
                     switch (action.intermediates.len) {
-                        0 => try self.handler.vt(.reset_mode, .{ .mode = .keypad_keys }),
+                        0 => self.handler.vt(.reset_mode, .{ .mode = .keypad_keys }),
                         else => log.warn("unimplemented setMode: {f}", .{action}),
                     }
                 },
@@ -2386,7 +2390,7 @@ test "stream: print" {
             self: *@This(),
             comptime action: Action.Tag,
             value: Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .print => self.c = value.cp,
                 else => {},
@@ -2395,7 +2399,7 @@ test "stream: print" {
     };
 
     var s: Stream(H) = .init(.{});
-    try s.next('x');
+    s.next('x');
     try testing.expectEqual(@as(u21, 'x'), s.handler.c.?);
 }
 
@@ -2407,7 +2411,7 @@ test "simd: print invalid utf-8" {
             self: *@This(),
             comptime action: Action.Tag,
             value: Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .print => self.c = value.cp,
                 else => {},
@@ -2416,7 +2420,7 @@ test "simd: print invalid utf-8" {
     };
 
     var s: Stream(H) = .init(.{});
-    try s.nextSlice(&.{0xFF});
+    s.nextSlice(&.{0xFF});
     try testing.expectEqual(@as(u21, 0xFFFD), s.handler.c.?);
 }
 
@@ -2428,7 +2432,7 @@ test "simd: complete incomplete utf-8" {
             self: *@This(),
             comptime action: Action.Tag,
             value: Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .print => self.c = value.cp,
                 else => {},
@@ -2437,11 +2441,11 @@ test "simd: complete incomplete utf-8" {
     };
 
     var s: Stream(H) = .init(.{});
-    try s.nextSlice(&.{0xE0}); // 3 byte
+    s.nextSlice(&.{0xE0}); // 3 byte
     try testing.expect(s.handler.c == null);
-    try s.nextSlice(&.{0xA0}); // still incomplete
+    s.nextSlice(&.{0xA0}); // still incomplete
     try testing.expect(s.handler.c == null);
-    try s.nextSlice(&.{0x80});
+    s.nextSlice(&.{0x80});
     try testing.expectEqual(@as(u21, 0x800), s.handler.c.?);
 }
 
@@ -2453,7 +2457,7 @@ test "stream: cursor right (CUF)" {
             self: *@This(),
             comptime action: Action.Tag,
             value: Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .cursor_right => self.amount = value.value,
                 else => {},
@@ -2462,18 +2466,18 @@ test "stream: cursor right (CUF)" {
     };
 
     var s: Stream(H) = .init(.{});
-    try s.nextSlice("\x1B[C");
+    s.nextSlice("\x1B[C");
     try testing.expectEqual(@as(u16, 1), s.handler.amount);
 
-    try s.nextSlice("\x1B[5C");
+    s.nextSlice("\x1B[5C");
     try testing.expectEqual(@as(u16, 5), s.handler.amount);
 
     s.handler.amount = 0;
-    try s.nextSlice("\x1B[5;4C");
+    s.nextSlice("\x1B[5;4C");
     try testing.expectEqual(@as(u16, 0), s.handler.amount);
 
     s.handler.amount = 0;
-    try s.nextSlice("\x1b[?3C");
+    s.nextSlice("\x1b[?3C");
     try testing.expectEqual(@as(u16, 0), s.handler.amount);
 }
 
@@ -2485,7 +2489,7 @@ test "stream: dec set mode (SM) and reset mode (RM)" {
             self: *@This(),
             comptime action: Action.Tag,
             value: Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .set_mode => self.mode = value.mode,
                 .reset_mode => self.mode = @as(modes.Mode, @enumFromInt(1)),
@@ -2495,14 +2499,14 @@ test "stream: dec set mode (SM) and reset mode (RM)" {
     };
 
     var s: Stream(H) = .init(.{});
-    try s.nextSlice("\x1B[?6h");
+    s.nextSlice("\x1B[?6h");
     try testing.expectEqual(@as(modes.Mode, .origin), s.handler.mode);
 
-    try s.nextSlice("\x1B[?6l");
+    s.nextSlice("\x1B[?6l");
     try testing.expectEqual(@as(modes.Mode, @enumFromInt(1)), s.handler.mode);
 
     s.handler.mode = @as(modes.Mode, @enumFromInt(1));
-    try s.nextSlice("\x1B[6 h");
+    s.nextSlice("\x1B[6 h");
     try testing.expectEqual(@as(modes.Mode, @enumFromInt(1)), s.handler.mode);
 }
 
@@ -2514,7 +2518,7 @@ test "stream: ansi set mode (SM) and reset mode (RM)" {
             self: *@This(),
             comptime action: Action.Tag,
             value: Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .set_mode => self.mode = value.mode,
                 .reset_mode => self.mode = null,
@@ -2524,14 +2528,14 @@ test "stream: ansi set mode (SM) and reset mode (RM)" {
     };
 
     var s: Stream(H) = .init(.{});
-    try s.nextSlice("\x1B[4h");
+    s.nextSlice("\x1B[4h");
     try testing.expectEqual(@as(modes.Mode, .insert), s.handler.mode.?);
 
-    try s.nextSlice("\x1B[4l");
+    s.nextSlice("\x1B[4l");
     try testing.expect(s.handler.mode == null);
 
     s.handler.mode = null;
-    try s.nextSlice("\x1B[>5h");
+    s.nextSlice("\x1B[>5h");
     try testing.expect(s.handler.mode == null);
 }
 
@@ -2548,17 +2552,17 @@ test "stream: ansi set mode (SM) and reset mode (RM) with unknown value" {
             self: *@This(),
             comptime action: Action.Tag,
             value: Action.Value(action),
-        ) !void {
+        ) void {
             _ = self;
             _ = value;
         }
     };
 
     var s: Stream(H) = .init(.{});
-    try s.nextSlice("\x1B[6h");
+    s.nextSlice("\x1B[6h");
     try testing.expect(s.handler.mode == null);
 
-    try s.nextSlice("\x1B[6l");
+    s.nextSlice("\x1B[6l");
     try testing.expect(s.handler.mode == null);
 }
 
@@ -2571,7 +2575,7 @@ test "stream: restore mode" {
             self: *Self,
             comptime action: Stream(Self).Action.Tag,
             value: Stream(Self).Action.Value(action),
-        ) !void {
+        ) void {
             _ = value;
             switch (action) {
                 .top_and_bottom_margin => self.called = true,
@@ -2581,7 +2585,7 @@ test "stream: restore mode" {
     };
 
     var s: Stream(H) = .init(.{});
-    for ("\x1B[?42r") |c| try s.next(c);
+    for ("\x1B[?42r") |c| s.next(c);
     try testing.expect(!s.handler.called);
 }
 
@@ -2594,7 +2598,7 @@ test "stream: pop kitty keyboard with no params defaults to 1" {
             self: *Self,
             comptime action: streampkg.Action.Tag,
             value: streampkg.Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .kitty_keyboard_pop => self.n = value,
                 else => {},
@@ -2603,7 +2607,7 @@ test "stream: pop kitty keyboard with no params defaults to 1" {
     };
 
     var s: Stream(H) = .init(.{});
-    for ("\x1B[<u") |c| try s.next(c);
+    for ("\x1B[<u") |c| s.next(c);
     try testing.expectEqual(@as(u16, 1), s.handler.n);
 }
 
@@ -2616,7 +2620,7 @@ test "stream: DECSCA" {
             self: *Self,
             comptime action: Stream(Self).Action.Tag,
             value: Stream(Self).Action.Value(action),
-        ) !void {
+        ) void {
             _ = value;
             switch (action) {
                 .protected_mode_off => self.v = .off,
@@ -2629,19 +2633,19 @@ test "stream: DECSCA" {
 
     var s: Stream(H) = .init(.{});
     {
-        for ("\x1B[\"q") |c| try s.next(c);
+        for ("\x1B[\"q") |c| s.next(c);
         try testing.expectEqual(ansi.ProtectedMode.off, s.handler.v.?);
     }
     {
-        for ("\x1B[0\"q") |c| try s.next(c);
+        for ("\x1B[0\"q") |c| s.next(c);
         try testing.expectEqual(ansi.ProtectedMode.off, s.handler.v.?);
     }
     {
-        for ("\x1B[2\"q") |c| try s.next(c);
+        for ("\x1B[2\"q") |c| s.next(c);
         try testing.expectEqual(ansi.ProtectedMode.off, s.handler.v.?);
     }
     {
-        for ("\x1B[1\"q") |c| try s.next(c);
+        for ("\x1B[1\"q") |c| s.next(c);
         try testing.expectEqual(ansi.ProtectedMode.dec, s.handler.v.?);
     }
 }
@@ -2656,7 +2660,7 @@ test "stream: DECED, DECSED" {
             self: *Self,
             comptime action: anytype,
             value: anytype,
-        ) !void {
+        ) void {
             switch (action) {
                 .erase_display_below => {
                     self.mode = .below;
@@ -2685,59 +2689,59 @@ test "stream: DECED, DECSED" {
 
     var s: Stream(H) = .init(.{});
     {
-        for ("\x1B[?J") |c| try s.next(c);
+        for ("\x1B[?J") |c| s.next(c);
         try testing.expectEqual(csi.EraseDisplay.below, s.handler.mode.?);
         try testing.expect(s.handler.protected.?);
     }
     {
-        for ("\x1B[?0J") |c| try s.next(c);
+        for ("\x1B[?0J") |c| s.next(c);
         try testing.expectEqual(csi.EraseDisplay.below, s.handler.mode.?);
         try testing.expect(s.handler.protected.?);
     }
     {
-        for ("\x1B[?1J") |c| try s.next(c);
+        for ("\x1B[?1J") |c| s.next(c);
         try testing.expectEqual(csi.EraseDisplay.above, s.handler.mode.?);
         try testing.expect(s.handler.protected.?);
     }
     {
-        for ("\x1B[?2J") |c| try s.next(c);
+        for ("\x1B[?2J") |c| s.next(c);
         try testing.expectEqual(csi.EraseDisplay.complete, s.handler.mode.?);
         try testing.expect(s.handler.protected.?);
     }
     {
-        for ("\x1B[?3J") |c| try s.next(c);
+        for ("\x1B[?3J") |c| s.next(c);
         try testing.expectEqual(csi.EraseDisplay.scrollback, s.handler.mode.?);
         try testing.expect(s.handler.protected.?);
     }
 
     {
-        for ("\x1B[J") |c| try s.next(c);
+        for ("\x1B[J") |c| s.next(c);
         try testing.expectEqual(csi.EraseDisplay.below, s.handler.mode.?);
         try testing.expect(!s.handler.protected.?);
     }
     {
-        for ("\x1B[0J") |c| try s.next(c);
+        for ("\x1B[0J") |c| s.next(c);
         try testing.expectEqual(csi.EraseDisplay.below, s.handler.mode.?);
         try testing.expect(!s.handler.protected.?);
     }
     {
-        for ("\x1B[1J") |c| try s.next(c);
+        for ("\x1B[1J") |c| s.next(c);
         try testing.expectEqual(csi.EraseDisplay.above, s.handler.mode.?);
         try testing.expect(!s.handler.protected.?);
     }
     {
-        for ("\x1B[2J") |c| try s.next(c);
+        for ("\x1B[2J") |c| s.next(c);
         try testing.expectEqual(csi.EraseDisplay.complete, s.handler.mode.?);
         try testing.expect(!s.handler.protected.?);
     }
     {
-        for ("\x1B[3J") |c| try s.next(c);
+        for ("\x1B[3J") |c| s.next(c);
         try testing.expectEqual(csi.EraseDisplay.scrollback, s.handler.mode.?);
         try testing.expect(!s.handler.protected.?);
     }
     {
         // Invalid and ignored by the handler
-        for ("\x1B[>0J") |c| try s.next(c);
+        for ("\x1B[>0J") |c| s.next(c);
         try testing.expectEqual(csi.EraseDisplay.scrollback, s.handler.mode.?);
         try testing.expect(!s.handler.protected.?);
     }
@@ -2753,7 +2757,7 @@ test "stream: DECEL, DECSEL" {
             self: *Self,
             comptime action: anytype,
             value: anytype,
-        ) !void {
+        ) void {
             switch (action) {
                 .erase_line_right => {
                     self.mode = .right;
@@ -2778,49 +2782,49 @@ test "stream: DECEL, DECSEL" {
 
     var s: Stream(H) = .init(.{});
     {
-        for ("\x1B[?K") |c| try s.next(c);
+        for ("\x1B[?K") |c| s.next(c);
         try testing.expectEqual(csi.EraseLine.right, s.handler.mode.?);
         try testing.expect(s.handler.protected.?);
     }
     {
-        for ("\x1B[?0K") |c| try s.next(c);
+        for ("\x1B[?0K") |c| s.next(c);
         try testing.expectEqual(csi.EraseLine.right, s.handler.mode.?);
         try testing.expect(s.handler.protected.?);
     }
     {
-        for ("\x1B[?1K") |c| try s.next(c);
+        for ("\x1B[?1K") |c| s.next(c);
         try testing.expectEqual(csi.EraseLine.left, s.handler.mode.?);
         try testing.expect(s.handler.protected.?);
     }
     {
-        for ("\x1B[?2K") |c| try s.next(c);
+        for ("\x1B[?2K") |c| s.next(c);
         try testing.expectEqual(csi.EraseLine.complete, s.handler.mode.?);
         try testing.expect(s.handler.protected.?);
     }
 
     {
-        for ("\x1B[K") |c| try s.next(c);
+        for ("\x1B[K") |c| s.next(c);
         try testing.expectEqual(csi.EraseLine.right, s.handler.mode.?);
         try testing.expect(!s.handler.protected.?);
     }
     {
-        for ("\x1B[0K") |c| try s.next(c);
+        for ("\x1B[0K") |c| s.next(c);
         try testing.expectEqual(csi.EraseLine.right, s.handler.mode.?);
         try testing.expect(!s.handler.protected.?);
     }
     {
-        for ("\x1B[1K") |c| try s.next(c);
+        for ("\x1B[1K") |c| s.next(c);
         try testing.expectEqual(csi.EraseLine.left, s.handler.mode.?);
         try testing.expect(!s.handler.protected.?);
     }
     {
-        for ("\x1B[2K") |c| try s.next(c);
+        for ("\x1B[2K") |c| s.next(c);
         try testing.expectEqual(csi.EraseLine.complete, s.handler.mode.?);
         try testing.expect(!s.handler.protected.?);
     }
     {
         // Invalid and ignored by the handler
-        for ("\x1B[<1K") |c| try s.next(c);
+        for ("\x1B[<1K") |c| s.next(c);
         try testing.expectEqual(csi.EraseLine.complete, s.handler.mode.?);
         try testing.expect(!s.handler.protected.?);
     }
@@ -2834,7 +2838,7 @@ test "stream: DECSCUSR" {
             self: *@This(),
             comptime action: Stream(@This()).Action.Tag,
             value: Stream(@This()).Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .cursor_style => self.style = value,
                 else => {},
@@ -2843,14 +2847,14 @@ test "stream: DECSCUSR" {
     };
 
     var s: Stream(H) = .init(.{});
-    try s.nextSlice("\x1B[ q");
+    s.nextSlice("\x1B[ q");
     try testing.expect(s.handler.style.? == .default);
 
-    try s.nextSlice("\x1B[1 q");
+    s.nextSlice("\x1B[1 q");
     try testing.expect(s.handler.style.? == .blinking_block);
 
     // Invalid and ignored by the handler
-    try s.nextSlice("\x1B[?0 q");
+    s.nextSlice("\x1B[?0 q");
     try testing.expect(s.handler.style.? == .blinking_block);
 }
 
@@ -2862,7 +2866,7 @@ test "stream: DECSCUSR without space" {
             self: *@This(),
             comptime action: Stream(@This()).Action.Tag,
             value: Stream(@This()).Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .cursor_style => self.style = value,
                 else => {},
@@ -2871,10 +2875,10 @@ test "stream: DECSCUSR without space" {
     };
 
     var s: Stream(H) = .init(.{});
-    try s.nextSlice("\x1B[q");
+    s.nextSlice("\x1B[q");
     try testing.expect(s.handler.style == null);
 
-    try s.nextSlice("\x1B[1q");
+    s.nextSlice("\x1B[1q");
     try testing.expect(s.handler.style == null);
 }
 
@@ -2886,7 +2890,7 @@ test "stream: XTSHIFTESCAPE" {
             self: *@This(),
             comptime action: streampkg.Action.Tag,
             value: streampkg.Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .mouse_shift_capture => self.escape = value,
                 else => {},
@@ -2895,20 +2899,20 @@ test "stream: XTSHIFTESCAPE" {
     };
 
     var s: Stream(H) = .init(.{});
-    try s.nextSlice("\x1B[>2s");
+    s.nextSlice("\x1B[>2s");
     try testing.expect(s.handler.escape == null);
 
-    try s.nextSlice("\x1B[>s");
+    s.nextSlice("\x1B[>s");
     try testing.expect(s.handler.escape.? == false);
 
-    try s.nextSlice("\x1B[>0s");
+    s.nextSlice("\x1B[>0s");
     try testing.expect(s.handler.escape.? == false);
 
-    try s.nextSlice("\x1B[>1s");
+    s.nextSlice("\x1B[>1s");
     try testing.expect(s.handler.escape.? == true);
 
     // Invalid and ignored by the handler
-    try s.nextSlice("\x1B[1 s");
+    s.nextSlice("\x1B[1 s");
     try testing.expect(s.handler.escape.? == true);
 }
 
@@ -2920,7 +2924,7 @@ test "stream: change window title with invalid utf-8" {
             self: *@This(),
             comptime action: anytype,
             value: anytype,
-        ) !void {
+        ) void {
             _ = value;
             switch (action) {
                 .window_title => self.seen = true,
@@ -2931,13 +2935,13 @@ test "stream: change window title with invalid utf-8" {
 
     {
         var s: Stream(H) = .init(.{});
-        try s.nextSlice("\x1b]2;abc\x1b\\");
+        s.nextSlice("\x1b]2;abc\x1b\\");
         try testing.expect(s.handler.seen);
     }
 
     {
         var s: Stream(H) = .init(.{});
-        try s.nextSlice("\x1b]2;abc\xc0\x1b\\");
+        s.nextSlice("\x1b]2;abc\xc0\x1b\\");
         try testing.expect(!s.handler.seen);
     }
 }
@@ -2951,7 +2955,7 @@ test "stream: insert characters" {
             self: *Self,
             comptime action: anytype,
             value: anytype,
-        ) !void {
+        ) void {
             _ = value;
             switch (action) {
                 .insert_blanks => self.called = true,
@@ -2961,11 +2965,11 @@ test "stream: insert characters" {
     };
 
     var s: Stream(H) = .init(.{});
-    for ("\x1B[42@") |c| try s.next(c);
+    for ("\x1B[42@") |c| s.next(c);
     try testing.expect(s.handler.called);
 
     s.handler.called = false;
-    for ("\x1B[?42@") |c| try s.next(c);
+    for ("\x1B[?42@") |c| s.next(c);
     try testing.expect(!s.handler.called);
 }
 
@@ -2978,7 +2982,7 @@ test "stream: insert characters explicit zero clamps to 1" {
             self: *Self,
             comptime action: anytype,
             value: anytype,
-        ) !void {
+        ) void {
             switch (action) {
                 .insert_blanks => self.value = value,
                 else => {},
@@ -2987,7 +2991,7 @@ test "stream: insert characters explicit zero clamps to 1" {
     };
 
     var s: Stream(H) = .init(.{});
-    for ("\x1B[0@") |c| try s.next(c);
+    for ("\x1B[0@") |c| s.next(c);
     try testing.expectEqual(@as(usize, 1), s.handler.value.?);
 }
 
@@ -3000,7 +3004,7 @@ test "stream: SCOSC" {
             self: *Self,
             comptime action: Stream(Self).Action.Tag,
             value: Stream(Self).Action.Value(action),
-        ) !void {
+        ) void {
             _ = value;
             switch (action) {
                 .left_and_right_margin => @panic("bad"),
@@ -3011,7 +3015,7 @@ test "stream: SCOSC" {
     };
 
     var s: Stream(H) = .init(.{});
-    for ("\x1B[s") |c| try s.next(c);
+    for ("\x1B[s") |c| s.next(c);
     try testing.expect(s.handler.called);
 }
 
@@ -3024,7 +3028,7 @@ test "stream: SCORC" {
             self: *Self,
             comptime action: streampkg.Action.Tag,
             value: streampkg.Action.Value(action),
-        ) !void {
+        ) void {
             _ = value;
             switch (action) {
                 .restore_cursor => self.called = true,
@@ -3034,7 +3038,7 @@ test "stream: SCORC" {
     };
 
     var s: Stream(H) = .init(.{});
-    for ("\x1B[u") |c| try s.next(c);
+    for ("\x1B[u") |c| s.next(c);
     try testing.expect(s.handler.called);
 }
 
@@ -3044,7 +3048,7 @@ test "stream: too many csi params" {
             self: *@This(),
             comptime action: anytype,
             value: anytype,
-        ) !void {
+        ) void {
             _ = self;
             _ = value;
             switch (action) {
@@ -3055,7 +3059,7 @@ test "stream: too many csi params" {
     };
 
     var s: Stream(H) = .init(.{});
-    try s.nextSlice("\x1B[1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1C");
+    s.nextSlice("\x1B[1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1C");
 }
 
 test "stream: csi param too long" {
@@ -3064,7 +3068,7 @@ test "stream: csi param too long" {
             self: *@This(),
             comptime action: anytype,
             value: anytype,
-        ) !void {
+        ) void {
             _ = self;
             _ = action;
             _ = value;
@@ -3072,7 +3076,7 @@ test "stream: csi param too long" {
     };
 
     var s: Stream(H) = .init(.{});
-    try s.nextSlice("\x1B[1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111C");
+    s.nextSlice("\x1B[1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111C");
 }
 
 test "stream: send report with CSI t" {
@@ -3083,7 +3087,7 @@ test "stream: send report with CSI t" {
             self: *@This(),
             comptime action: streampkg.Action.Tag,
             value: streampkg.Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .size_report => self.style = value,
                 else => {},
@@ -3093,16 +3097,16 @@ test "stream: send report with CSI t" {
 
     var s: Stream(H) = .init(.{});
 
-    try s.nextSlice("\x1b[14t");
+    s.nextSlice("\x1b[14t");
     try testing.expectEqual(csi.SizeReportStyle.csi_14_t, s.handler.style);
 
-    try s.nextSlice("\x1b[16t");
+    s.nextSlice("\x1b[16t");
     try testing.expectEqual(csi.SizeReportStyle.csi_16_t, s.handler.style);
 
-    try s.nextSlice("\x1b[18t");
+    s.nextSlice("\x1b[18t");
     try testing.expectEqual(csi.SizeReportStyle.csi_18_t, s.handler.style);
 
-    try s.nextSlice("\x1b[21t");
+    s.nextSlice("\x1b[21t");
     try testing.expectEqual(csi.SizeReportStyle.csi_21_t, s.handler.style);
 }
 
@@ -3118,7 +3122,7 @@ test "stream: invalid CSI t" {
             self: *@This(),
             comptime action: anytype,
             value: anytype,
-        ) !void {
+        ) void {
             _ = self;
             _ = action;
             _ = value;
@@ -3127,7 +3131,7 @@ test "stream: invalid CSI t" {
 
     var s: Stream(H) = .init(.{});
 
-    try s.nextSlice("\x1b[19t");
+    s.nextSlice("\x1b[19t");
     try testing.expectEqual(null, s.handler.style);
 }
 
@@ -3139,7 +3143,7 @@ test "stream: CSI t push title" {
             self: *@This(),
             comptime action: streampkg.Action.Tag,
             value: streampkg.Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .title_push => self.index = value,
                 else => {},
@@ -3149,7 +3153,7 @@ test "stream: CSI t push title" {
 
     var s: Stream(H) = .init(.{});
 
-    try s.nextSlice("\x1b[22;0t");
+    s.nextSlice("\x1b[22;0t");
     try testing.expectEqual(@as(u16, 0), s.handler.index.?);
 }
 
@@ -3161,7 +3165,7 @@ test "stream: CSI t push title with explicit window" {
             self: *@This(),
             comptime action: streampkg.Action.Tag,
             value: streampkg.Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .title_push => self.index = value,
                 else => {},
@@ -3171,7 +3175,7 @@ test "stream: CSI t push title with explicit window" {
 
     var s: Stream(H) = .init(.{});
 
-    try s.nextSlice("\x1b[22;2t");
+    s.nextSlice("\x1b[22;2t");
     try testing.expectEqual(@as(u16, 0), s.handler.index.?);
 }
 
@@ -3183,7 +3187,7 @@ test "stream: CSI t push title with explicit icon" {
             self: *@This(),
             comptime action: streampkg.Action.Tag,
             value: streampkg.Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .title_push => self.index = value,
                 else => {},
@@ -3193,7 +3197,7 @@ test "stream: CSI t push title with explicit icon" {
 
     var s: Stream(H) = .init(.{});
 
-    try s.nextSlice("\x1b[22;1t");
+    s.nextSlice("\x1b[22;1t");
     try testing.expectEqual(null, s.handler.index);
 }
 
@@ -3205,7 +3209,7 @@ test "stream: CSI t push title with index" {
             self: *@This(),
             comptime action: streampkg.Action.Tag,
             value: streampkg.Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .title_push => self.index = value,
                 else => {},
@@ -3215,7 +3219,7 @@ test "stream: CSI t push title with index" {
 
     var s: Stream(H) = .init(.{});
 
-    try s.nextSlice("\x1b[22;0;5t");
+    s.nextSlice("\x1b[22;0;5t");
     try testing.expectEqual(@as(u16, 5), s.handler.index.?);
 }
 
@@ -3227,7 +3231,7 @@ test "stream: CSI t pop title" {
             self: *@This(),
             comptime action: streampkg.Action.Tag,
             value: streampkg.Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .title_pop => self.index = value,
                 else => {},
@@ -3237,7 +3241,7 @@ test "stream: CSI t pop title" {
 
     var s: Stream(H) = .init(.{});
 
-    try s.nextSlice("\x1b[23;0t");
+    s.nextSlice("\x1b[23;0t");
     try testing.expectEqual(@as(u16, 0), s.handler.index.?);
 }
 
@@ -3249,7 +3253,7 @@ test "stream: CSI t pop title with explicit window" {
             self: *@This(),
             comptime action: streampkg.Action.Tag,
             value: streampkg.Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .title_pop => self.index = value,
                 else => {},
@@ -3259,7 +3263,7 @@ test "stream: CSI t pop title with explicit window" {
 
     var s: Stream(H) = .init(.{});
 
-    try s.nextSlice("\x1b[23;2t");
+    s.nextSlice("\x1b[23;2t");
     try testing.expectEqual(@as(u16, 0), s.handler.index.?);
 }
 
@@ -3271,7 +3275,7 @@ test "stream: CSI t pop title with explicit icon" {
             self: *@This(),
             comptime action: streampkg.Action.Tag,
             value: streampkg.Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .title_pop => self.index = value,
                 else => {},
@@ -3281,7 +3285,7 @@ test "stream: CSI t pop title with explicit icon" {
 
     var s: Stream(H) = .init(.{});
 
-    try s.nextSlice("\x1b[23;1t");
+    s.nextSlice("\x1b[23;1t");
     try testing.expectEqual(null, s.handler.index);
 }
 
@@ -3293,7 +3297,7 @@ test "stream: CSI t pop title with index" {
             self: *@This(),
             comptime action: streampkg.Action.Tag,
             value: streampkg.Action.Value(action),
-        ) !void {
+        ) void {
             switch (action) {
                 .title_pop => self.index = value,
                 else => {},
@@ -3303,7 +3307,7 @@ test "stream: CSI t pop title with index" {
 
     var s: Stream(H) = .init(.{});
 
-    try s.nextSlice("\x1b[23;0;5t");
+    s.nextSlice("\x1b[23;0;5t");
     try testing.expectEqual(@as(u16, 5), s.handler.index.?);
 }
 
@@ -3315,7 +3319,7 @@ test "stream CSI W clear tab stops" {
             self: *@This(),
             comptime action: anytype,
             value: anytype,
-        ) !void {
+        ) void {
             _ = value;
             self.action = action;
         }
@@ -3323,10 +3327,10 @@ test "stream CSI W clear tab stops" {
 
     var s: Stream(H) = .init(.{});
 
-    try s.nextSlice("\x1b[2W");
+    s.nextSlice("\x1b[2W");
     try testing.expectEqual(Action.Key.tab_clear_current, s.handler.action.?);
 
-    try s.nextSlice("\x1b[5W");
+    s.nextSlice("\x1b[5W");
     try testing.expectEqual(Action.Key.tab_clear_all, s.handler.action.?);
 }
 
@@ -3338,7 +3342,7 @@ test "stream CSI W tab set" {
             self: *@This(),
             comptime action: anytype,
             value: anytype,
-        ) !void {
+        ) void {
             _ = value;
             self.action = action;
         }
@@ -3346,19 +3350,19 @@ test "stream CSI W tab set" {
 
     var s: Stream(H) = .init(.{});
 
-    try s.nextSlice("\x1b[W");
+    s.nextSlice("\x1b[W");
     try testing.expectEqual(Action.Key.tab_set, s.handler.action.?);
 
     s.handler.action = null;
-    try s.nextSlice("\x1b[0W");
+    s.nextSlice("\x1b[0W");
     try testing.expectEqual(Action.Key.tab_set, s.handler.action.?);
 
     s.handler.action = null;
-    try s.nextSlice("\x1b[>W");
+    s.nextSlice("\x1b[>W");
     try testing.expect(s.handler.action == null);
 
     s.handler.action = null;
-    try s.nextSlice("\x1b[99W");
+    s.nextSlice("\x1b[99W");
     try testing.expect(s.handler.action == null);
 }
 
@@ -3370,7 +3374,7 @@ test "stream CSI ? W reset tab stops" {
             self: *@This(),
             comptime action: anytype,
             value: anytype,
-        ) !void {
+        ) void {
             _ = value;
             self.action = action;
         }
@@ -3378,15 +3382,15 @@ test "stream CSI ? W reset tab stops" {
 
     var s: Stream(H) = .init(.{});
 
-    try s.nextSlice("\x1b[?2W");
+    s.nextSlice("\x1b[?2W");
     try testing.expect(s.handler.action == null);
 
-    try s.nextSlice("\x1b[?5W");
+    s.nextSlice("\x1b[?5W");
     try testing.expectEqual(Action.Key.tab_reset, s.handler.action.?);
 
     // Invalid and ignored by the handler
     s.handler.action = null;
-    try s.nextSlice("\x1b[?1;2;3W");
+    s.nextSlice("\x1b[?1;2;3W");
     try testing.expect(s.handler.action == null);
 }
 
@@ -3399,7 +3403,7 @@ test "stream: SGR with 17+ parameters for underline color" {
             self: *@This(),
             comptime action: anytype,
             value: anytype,
-        ) !void {
+        ) void {
             switch (action) {
                 .set_attribute => {
                     self.attrs = value;
@@ -3414,7 +3418,7 @@ test "stream: SGR with 17+ parameters for underline color" {
 
     // Kakoune-style SGR with underline color as 17th parameter
     // This tests the fix where param 17 was being dropped
-    try s.nextSlice("\x1b[4:3;38;2;51;51;51;48;2;170;170;170;58;2;255;97;136;0m");
+    s.nextSlice("\x1b[4:3;38;2;51;51;51;48;2;170;170;170;58;2;255;97;136;0m");
     try testing.expect(s.handler.called);
 }
 
@@ -3429,7 +3433,7 @@ test "stream: tab clear with overflowing param" {
             self: *@This(),
             comptime action: Action.Tag,
             value: Action.Value(action),
-        ) !void {
+        ) void {
             _ = value;
             switch (action) {
                 .tab_clear_current, .tab_clear_all => self.called = true,
@@ -3441,5 +3445,5 @@ test "stream: tab clear with overflowing param" {
     var s: Stream(H) = .init(.{});
     // This is the exact input from the fuzz crash (minus the mode byte):
     // CSI with a huge numeric param that saturates to 65535, followed by 'g'.
-    try s.nextSlice("\x1b[388888888888888888888888888888888888g\x1b[0m");
+    s.nextSlice("\x1b[388888888888888888888888888888888888g\x1b[0m");
 }
diff --git a/src/terminal/stream_readonly.zig b/src/terminal/stream_readonly.zig
index 5b97bebfa..a3e98c8e0 100644
--- a/src/terminal/stream_readonly.zig
+++ b/src/terminal/stream_readonly.zig
@@ -8,6 +8,8 @@ const osc_color = @import("osc/parsers/color.zig");
 const kitty_color = @import("kitty/color.zig");
 const Terminal = @import("Terminal.zig");
 
+const log = std.log.scoped(.stream_readonly);
+
 /// This is a Stream implementation that processes actions against
 /// a Terminal and updates the Terminal state. It is called "readonly" because
 /// it only processes actions that modify terminal state, while ignoring
@@ -45,6 +47,16 @@ pub const Handler = struct {
         self: *Handler,
         comptime action: Action.Tag,
         value: Action.Value(action),
+    ) void {
+        self.vtFallible(action, value) catch |err| {
+            log.warn("error handling VT action action={} err={}", .{ action, err });
+        };
+    }
+
+    inline fn vtFallible(
+        self: *Handler,
+        comptime action: Action.Tag,
+        value: Action.Value(action),
     ) !void {
         switch (action) {
             .print => try self.terminal.print(value.cp),
@@ -402,7 +414,7 @@ test "basic print" {
     var s: Stream = .initAlloc(testing.allocator, .init(&t));
     defer s.deinit();
 
-    try s.nextSlice("Hello");
+    s.nextSlice("Hello");
     try testing.expectEqual(@as(usize, 5), t.screens.active.cursor.x);
     try testing.expectEqual(@as(usize, 0), t.screens.active.cursor.y);
 
@@ -419,12 +431,12 @@ test "cursor movement" {
     defer s.deinit();
 
     // Move cursor using escape sequences
-    try s.nextSlice("Hello\x1B[1;1H");
+    s.nextSlice("Hello\x1B[1;1H");
     try testing.expectEqual(@as(usize, 0), t.screens.active.cursor.x);
     try testing.expectEqual(@as(usize, 0), t.screens.active.cursor.y);
 
     // Move to position 2,3
-    try s.nextSlice("\x1B[2;3H");
+    s.nextSlice("\x1B[2;3H");
     try testing.expectEqual(@as(usize, 2), t.screens.active.cursor.x);
     try testing.expectEqual(@as(usize, 1), t.screens.active.cursor.y);
 }
@@ -437,13 +449,13 @@ test "erase operations" {
     defer s.deinit();
 
     // Print some text
-    try s.nextSlice("Hello World");
+    s.nextSlice("Hello World");
     try testing.expectEqual(@as(usize, 11), t.screens.active.cursor.x);
     try testing.expectEqual(@as(usize, 0), t.screens.active.cursor.y);
 
     // Move cursor to position 1,6 and erase from cursor to end of line
-    try s.nextSlice("\x1B[1;6H");
-    try s.nextSlice("\x1B[K");
+    s.nextSlice("\x1B[1;6H");
+    s.nextSlice("\x1B[K");
 
     const str = try t.plainString(testing.allocator);
     defer testing.allocator.free(str);
@@ -457,7 +469,7 @@ test "tabs" {
     var s: Stream = .initAlloc(testing.allocator, .init(&t));
     defer s.deinit();
 
-    try s.nextSlice("A\tB");
+    s.nextSlice("A\tB");
     try testing.expectEqual(@as(usize, 9), t.screens.active.cursor.x);
 
     const str = try t.plainString(testing.allocator);
@@ -474,9 +486,9 @@ test "modes" {
 
     // Test wraparound mode
     try testing.expect(t.modes.get(.wraparound));
-    try s.nextSlice("\x1B[?7l"); // Disable wraparound
+    s.nextSlice("\x1B[?7l"); // Disable wraparound
     try testing.expect(!t.modes.get(.wraparound));
-    try s.nextSlice("\x1B[?7h"); // Enable wraparound
+    s.nextSlice("\x1B[?7h"); // Enable wraparound
     try testing.expect(t.modes.get(.wraparound));
 }
 
@@ -488,7 +500,7 @@ test "scrolling regions" {
     defer s.deinit();
 
     // Set scrolling region from line 5 to 20
-    try s.nextSlice("\x1B[5;20r");
+    s.nextSlice("\x1B[5;20r");
     try testing.expectEqual(@as(usize, 4), t.scrolling_region.top);
     try testing.expectEqual(@as(usize, 19), t.scrolling_region.bottom);
     try testing.expectEqual(@as(usize, 0), t.scrolling_region.left);
@@ -503,8 +515,8 @@ test "charsets" {
     defer s.deinit();
 
     // Configure G0 as DEC special graphics
-    try s.nextSlice("\x1B(0");
-    try s.nextSlice("`"); // Should print diamond character
+    s.nextSlice("\x1B(0");
+    s.nextSlice("`"); // Should print diamond character
 
     const str = try t.plainString(testing.allocator);
     defer testing.allocator.free(str);
@@ -519,18 +531,18 @@ test "alt screen" {
     defer s.deinit();
 
     // Write to primary screen
-    try s.nextSlice("Primary");
+    s.nextSlice("Primary");
     try testing.expectEqual(.primary, t.screens.active_key);
 
     // Switch to alt screen
-    try s.nextSlice("\x1B[?1049h");
+    s.nextSlice("\x1B[?1049h");
     try testing.expectEqual(.alternate, t.screens.active_key);
 
     // Write to alt screen
-    try s.nextSlice("Alt");
+    s.nextSlice("Alt");
 
     // Switch back to primary
-    try s.nextSlice("\x1B[?1049l");
+    s.nextSlice("\x1B[?1049l");
     try testing.expectEqual(.primary, t.screens.active_key);
 
     const str = try t.plainString(testing.allocator);
@@ -546,20 +558,20 @@ test "cursor save and restore" {
     defer s.deinit();
 
     // Move cursor to 10,15
-    try s.nextSlice("\x1B[10;15H");
+    s.nextSlice("\x1B[10;15H");
     try testing.expectEqual(@as(usize, 14), t.screens.active.cursor.x);
     try testing.expectEqual(@as(usize, 9), t.screens.active.cursor.y);
 
     // Save cursor
-    try s.nextSlice("\x1B7");
+    s.nextSlice("\x1B7");
 
     // Move cursor elsewhere
-    try s.nextSlice("\x1B[1;1H");
+    s.nextSlice("\x1B[1;1H");
     try testing.expectEqual(@as(usize, 0), t.screens.active.cursor.x);
     try testing.expectEqual(@as(usize, 0), t.screens.active.cursor.y);
 
     // Restore cursor
-    try s.nextSlice("\x1B8");
+    s.nextSlice("\x1B8");
     try testing.expectEqual(@as(usize, 14), t.screens.active.cursor.x);
     try testing.expectEqual(@as(usize, 9), t.screens.active.cursor.y);
 }
@@ -572,7 +584,7 @@ test "attributes" {
     defer s.deinit();
 
     // Set bold and write text
-    try s.nextSlice("\x1B[1mBold\x1B[0m");
+    s.nextSlice("\x1B[1mBold\x1B[0m");
 
     // Verify we can write attributes - just check the string was written
     const str = try t.plainString(testing.allocator);
@@ -588,7 +600,7 @@ test "DECALN screen alignment" {
     defer s.deinit();
 
     // Run DECALN
-    try s.nextSlice("\x1B#8");
+    s.nextSlice("\x1B#8");
 
     // Verify entire screen is filled with 'E'
     const str = try t.plainString(testing.allocator);
@@ -608,13 +620,13 @@ test "full reset" {
     defer s.deinit();
 
     // Make some changes
-    try s.nextSlice("Hello");
-    try s.nextSlice("\x1B[10;20H");
-    try s.nextSlice("\x1B[5;20r"); // Set scroll region
-    try s.nextSlice("\x1B[?7l"); // Disable wraparound
+    s.nextSlice("Hello");
+    s.nextSlice("\x1B[10;20H");
+    s.nextSlice("\x1B[5;20r"); // Set scroll region
+    s.nextSlice("\x1B[?7l"); // Disable wraparound
 
     // Full reset
-    try s.nextSlice("\x1Bc");
+    s.nextSlice("\x1Bc");
 
     // Verify reset state
     try testing.expectEqual(@as(usize, 0), t.screens.active.cursor.x);
@@ -632,12 +644,12 @@ test "ignores query actions" {
     defer s.deinit();
 
     // These should be ignored without error
-    try s.nextSlice("\x1B[c"); // Device attributes
-    try s.nextSlice("\x1B[5n"); // Device status report
-    try s.nextSlice("\x1B[6n"); // Cursor position report
+    s.nextSlice("\x1B[c"); // Device attributes
+    s.nextSlice("\x1B[5n"); // Device status report
+    s.nextSlice("\x1B[6n"); // Cursor position report
 
     // Terminal should still be functional
-    try s.nextSlice("Test");
+    s.nextSlice("Test");
     const str = try t.plainString(testing.allocator);
     defer testing.allocator.free(str);
     try testing.expectEqualStrings("Test", str);
@@ -654,14 +666,14 @@ test "OSC 4 set and reset palette" {
     const default_color_0 = t.colors.palette.original[0];
 
     // Set color 0 to red
-    try s.nextSlice("\x1b]4;0;rgb:ff/00/00\x1b\\");
+    s.nextSlice("\x1b]4;0;rgb:ff/00/00\x1b\\");
     try testing.expectEqual(@as(u8, 0xff), t.colors.palette.current[0].r);
     try testing.expectEqual(@as(u8, 0x00), t.colors.palette.current[0].g);
     try testing.expectEqual(@as(u8, 0x00), t.colors.palette.current[0].b);
     try testing.expect(t.colors.palette.mask.isSet(0));
 
     // Reset color 0
-    try s.nextSlice("\x1b]104;0\x1b\\");
+    s.nextSlice("\x1b]104;0\x1b\\");
     try testing.expectEqual(default_color_0, t.colors.palette.current[0]);
     try testing.expect(!t.colors.palette.mask.isSet(0));
 }
@@ -674,15 +686,15 @@ test "OSC 104 reset all palette colors" {
     defer s.deinit();
 
     // Set multiple colors
-    try s.nextSlice("\x1b]4;0;rgb:ff/00/00\x1b\\");
-    try s.nextSlice("\x1b]4;1;rgb:00/ff/00\x1b\\");
-    try s.nextSlice("\x1b]4;2;rgb:00/00/ff\x1b\\");
+    s.nextSlice("\x1b]4;0;rgb:ff/00/00\x1b\\");
+    s.nextSlice("\x1b]4;1;rgb:00/ff/00\x1b\\");
+    s.nextSlice("\x1b]4;2;rgb:00/00/ff\x1b\\");
     try testing.expect(t.colors.palette.mask.isSet(0));
     try testing.expect(t.colors.palette.mask.isSet(1));
     try testing.expect(t.colors.palette.mask.isSet(2));
 
     // Reset all palette colors
-    try s.nextSlice("\x1b]104\x1b\\");
+    s.nextSlice("\x1b]104\x1b\\");
     try testing.expectEqual(t.colors.palette.original[0], t.colors.palette.current[0]);
     try testing.expectEqual(t.colors.palette.original[1], t.colors.palette.current[1]);
     try testing.expectEqual(t.colors.palette.original[2], t.colors.palette.current[2]);
@@ -702,14 +714,14 @@ test "OSC 10 set and reset foreground color" {
     try testing.expect(t.colors.foreground.get() == null);
 
     // Set foreground to red
-    try s.nextSlice("\x1b]10;rgb:ff/00/00\x1b\\");
+    s.nextSlice("\x1b]10;rgb:ff/00/00\x1b\\");
     const fg = t.colors.foreground.get().?;
     try testing.expectEqual(@as(u8, 0xff), fg.r);
     try testing.expectEqual(@as(u8, 0x00), fg.g);
     try testing.expectEqual(@as(u8, 0x00), fg.b);
 
     // Reset foreground
-    try s.nextSlice("\x1b]110\x1b\\");
+    s.nextSlice("\x1b]110\x1b\\");
     try testing.expect(t.colors.foreground.get() == null);
 }
 
@@ -721,14 +733,14 @@ test "OSC 11 set and reset background color" {
     defer s.deinit();
 
     // Set background to green
-    try s.nextSlice("\x1b]11;rgb:00/ff/00\x1b\\");
+    s.nextSlice("\x1b]11;rgb:00/ff/00\x1b\\");
     const bg = t.colors.background.get().?;
     try testing.expectEqual(@as(u8, 0x00), bg.r);
     try testing.expectEqual(@as(u8, 0xff), bg.g);
     try testing.expectEqual(@as(u8, 0x00), bg.b);
 
     // Reset background
-    try s.nextSlice("\x1b]111\x1b\\");
+    s.nextSlice("\x1b]111\x1b\\");
     try testing.expect(t.colors.background.get() == null);
 }
 
@@ -740,14 +752,14 @@ test "OSC 12 set and reset cursor color" {
     defer s.deinit();
 
     // Set cursor to blue
-    try s.nextSlice("\x1b]12;rgb:00/00/ff\x1b\\");
+    s.nextSlice("\x1b]12;rgb:00/00/ff\x1b\\");
     const cursor = t.colors.cursor.get().?;
     try testing.expectEqual(@as(u8, 0x00), cursor.r);
     try testing.expectEqual(@as(u8, 0x00), cursor.g);
     try testing.expectEqual(@as(u8, 0xff), cursor.b);
 
     // Reset cursor
-    try s.nextSlice("\x1b]112\x1b\\");
+    s.nextSlice("\x1b]112\x1b\\");
     // After reset, cursor might be null (using default)
 }
 
@@ -759,7 +771,7 @@ test "kitty color protocol set palette" {
     defer s.deinit();
 
     // Set palette color 5 to magenta using kitty protocol
-    try s.nextSlice("\x1b]21;5=rgb:ff/00/ff\x1b\\");
+    s.nextSlice("\x1b]21;5=rgb:ff/00/ff\x1b\\");
     try testing.expectEqual(@as(u8, 0xff), t.colors.palette.current[5].r);
     try testing.expectEqual(@as(u8, 0x00), t.colors.palette.current[5].g);
     try testing.expectEqual(@as(u8, 0xff), t.colors.palette.current[5].b);
@@ -776,10 +788,10 @@ test "kitty color protocol reset palette" {
 
     // Set and then reset palette color
     const original = t.colors.palette.original[7];
-    try s.nextSlice("\x1b]21;7=rgb:aa/bb/cc\x1b\\");
+    s.nextSlice("\x1b]21;7=rgb:aa/bb/cc\x1b\\");
     try testing.expect(t.colors.palette.mask.isSet(7));
 
-    try s.nextSlice("\x1b]21;7=\x1b\\");
+    s.nextSlice("\x1b]21;7=\x1b\\");
     try testing.expectEqual(original, t.colors.palette.current[7]);
     try testing.expect(!t.colors.palette.mask.isSet(7));
 }
@@ -792,7 +804,7 @@ test "kitty color protocol set foreground" {
     defer s.deinit();
 
     // Set foreground using kitty protocol
-    try s.nextSlice("\x1b]21;foreground=rgb:12/34/56\x1b\\");
+    s.nextSlice("\x1b]21;foreground=rgb:12/34/56\x1b\\");
     const fg = t.colors.foreground.get().?;
     try testing.expectEqual(@as(u8, 0x12), fg.r);
     try testing.expectEqual(@as(u8, 0x34), fg.g);
@@ -807,7 +819,7 @@ test "kitty color protocol set background" {
     defer s.deinit();
 
     // Set background using kitty protocol
-    try s.nextSlice("\x1b]21;background=rgb:78/9a/bc\x1b\\");
+    s.nextSlice("\x1b]21;background=rgb:78/9a/bc\x1b\\");
     const bg = t.colors.background.get().?;
     try testing.expectEqual(@as(u8, 0x78), bg.r);
     try testing.expectEqual(@as(u8, 0x9a), bg.g);
@@ -822,7 +834,7 @@ test "kitty color protocol set cursor" {
     defer s.deinit();
 
     // Set cursor using kitty protocol
-    try s.nextSlice("\x1b]21;cursor=rgb:de/f0/12\x1b\\");
+    s.nextSlice("\x1b]21;cursor=rgb:de/f0/12\x1b\\");
     const cursor = t.colors.cursor.get().?;
     try testing.expectEqual(@as(u8, 0xde), cursor.r);
     try testing.expectEqual(@as(u8, 0xf0), cursor.g);
@@ -837,10 +849,10 @@ test "kitty color protocol reset foreground" {
     defer s.deinit();
 
     // Set and reset foreground
-    try s.nextSlice("\x1b]21;foreground=rgb:11/22/33\x1b\\");
+    s.nextSlice("\x1b]21;foreground=rgb:11/22/33\x1b\\");
     try testing.expect(t.colors.foreground.get() != null);
 
-    try s.nextSlice("\x1b]21;foreground=\x1b\\");
+    s.nextSlice("\x1b]21;foreground=\x1b\\");
     // After reset, should be unset
     try testing.expect(t.colors.foreground.get() == null);
 }
@@ -856,17 +868,17 @@ test "palette dirty flag set on color change" {
     t.flags.dirty.palette = false;
 
     // Setting palette color should set dirty flag
-    try s.nextSlice("\x1b]4;0;rgb:ff/00/00\x1b\\");
+    s.nextSlice("\x1b]4;0;rgb:ff/00/00\x1b\\");
     try testing.expect(t.flags.dirty.palette);
 
     // Clear and test reset
     t.flags.dirty.palette = false;
-    try s.nextSlice("\x1b]104;0\x1b\\");
+    s.nextSlice("\x1b]104;0\x1b\\");
     try testing.expect(t.flags.dirty.palette);
 
     // Clear and test kitty protocol
     t.flags.dirty.palette = false;
-    try s.nextSlice("\x1b]21;1=rgb:00/ff/00\x1b\\");
+    s.nextSlice("\x1b]21;1=rgb:00/ff/00\x1b\\");
     try testing.expect(t.flags.dirty.palette);
 }
 
@@ -877,8 +889,8 @@ test "semantic prompt fresh line" {
     var s: Stream = .initAlloc(testing.allocator, .init(&t));
     defer s.deinit();
 
-    try s.nextSlice("Hello");
-    try s.nextSlice("\x1b]133;L\x07");
+    s.nextSlice("Hello");
+    s.nextSlice("\x1b]133;L\x07");
     try testing.expectEqual(@as(usize, 0), t.screens.active.cursor.x);
     try testing.expectEqual(@as(usize, 1), t.screens.active.cursor.y);
 }
@@ -891,8 +903,8 @@ test "semantic prompt fresh line new prompt" {
     defer s.deinit();
 
     // Write some text and then send OSC 133;A (fresh_line_new_prompt)
-    try s.nextSlice("Hello");
-    try s.nextSlice("\x1b]133;A\x07");
+    s.nextSlice("Hello");
+    s.nextSlice("\x1b]133;A\x07");
 
     // Should do a fresh line (carriage return + index)
     try testing.expectEqual(@as(usize, 0), t.screens.active.cursor.x);
@@ -902,8 +914,8 @@ test "semantic prompt fresh line new prompt" {
     try testing.expectEqual(.prompt, t.screens.active.cursor.semantic_content);
 
     // Test with redraw option
-    try s.nextSlice("prompt$ ");
-    try s.nextSlice("\x1b]133;A;redraw=1\x07");
+    s.nextSlice("prompt$ ");
+    s.nextSlice("\x1b]133;A;redraw=1\x07");
     try testing.expect(t.flags.shell_redraws_prompt == .true);
 }
 
@@ -915,12 +927,12 @@ test "semantic prompt end of input, then start output" {
     defer s.deinit();
 
     // Write some text and then send OSC 133;A (fresh_line_new_prompt)
-    try s.nextSlice("Hello");
-    try s.nextSlice("\x1b]133;A\x07");
-    try s.nextSlice("prompt$ ");
-    try s.nextSlice("\x1b]133;B\x07");
+    s.nextSlice("Hello");
+    s.nextSlice("\x1b]133;A\x07");
+    s.nextSlice("prompt$ ");
+    s.nextSlice("\x1b]133;B\x07");
     try testing.expectEqual(.input, t.screens.active.cursor.semantic_content);
-    try s.nextSlice("\x1b]133;C\x07");
+    s.nextSlice("\x1b]133;C\x07");
     try testing.expectEqual(.output, t.screens.active.cursor.semantic_content);
 }
 
@@ -932,10 +944,10 @@ test "semantic prompt prompt_start" {
     defer s.deinit();
 
     // Write some text
-    try s.nextSlice("Hello");
+    s.nextSlice("Hello");
 
     // OSC 133;P marks the start of a prompt (without fresh line behavior)
-    try s.nextSlice("\x1b]133;P\x07");
+    s.nextSlice("\x1b]133;P\x07");
     try testing.expectEqual(.prompt, t.screens.active.cursor.semantic_content);
     try testing.expectEqual(@as(usize, 5), t.screens.active.cursor.x);
     try testing.expectEqual(@as(usize, 0), t.screens.active.cursor.y);
@@ -949,8 +961,8 @@ test "semantic prompt new_command" {
     defer s.deinit();
 
     // Write some text
-    try s.nextSlice("Hello");
-    try s.nextSlice("\x1b]133;N\x07");
+    s.nextSlice("Hello");
+    s.nextSlice("\x1b]133;N\x07");
 
     // Should behave like fresh_line_new_prompt - cursor moves to column 0
     // on next line since we had content
@@ -967,7 +979,7 @@ test "semantic prompt new_command at column zero" {
     defer s.deinit();
 
     // OSC 133;N when already at column 0 should stay on same line
-    try s.nextSlice("\x1b]133;N\x07");
+    s.nextSlice("\x1b]133;N\x07");
     try testing.expectEqual(@as(usize, 0), t.screens.active.cursor.x);
     try testing.expectEqual(@as(usize, 0), t.screens.active.cursor.y);
     try testing.expectEqual(.prompt, t.screens.active.cursor.semantic_content);
@@ -981,11 +993,11 @@ test "semantic prompt end_prompt_start_input_terminate_eol clears on linefeed" {
     defer s.deinit();
 
     // Set input terminated by EOL
-    try s.nextSlice("\x1b]133;I\x07");
+    s.nextSlice("\x1b]133;I\x07");
     try testing.expectEqual(.input, t.screens.active.cursor.semantic_content);
 
     // Linefeed should reset semantic content to output
-    try s.nextSlice("\n");
+    s.nextSlice("\n");
     try testing.expectEqual(.output, t.screens.active.cursor.semantic_content);
 }
 
@@ -1002,5 +1014,5 @@ test "stream: CSI W with intermediate but no params" {
     var s: Stream = .initAlloc(testing.allocator, .init(&t));
     defer s.deinit();
 
-    try s.nextSlice("\x1b[?W");
+    s.nextSlice("\x1b[?W");
 }
diff --git a/src/terminal/tmux/viewer.zig b/src/terminal/tmux/viewer.zig
index 62a0f1d00..585c95403 100644
--- a/src/terminal/tmux/viewer.zig
+++ b/src/terminal/tmux/viewer.zig
@@ -1053,10 +1053,7 @@ pub const Viewer = struct {
         // correct but we'll get the active contents soon.
         var stream = t.vtStream();
         defer stream.deinit();
-        stream.nextSlice(content) catch |err| {
-            log.info("failed to process pane history for pane id={}: {}", .{ id, err });
-            return err;
-        };
+        stream.nextSlice(content);
 
         // Populate the active area to be empty since this is only history.
         // We'll fill it with blanks and move the cursor to the top-left.
@@ -1097,10 +1094,7 @@ pub const Viewer = struct {
 
         var stream = t.vtStream();
         defer stream.deinit();
-        stream.nextSlice(content) catch |err| {
-            log.info("failed to process pane visible for pane id={}: {}", .{ id, err });
-            return err;
-        };
+        stream.nextSlice(content);
     }
 
     fn receivedOutput(
@@ -1117,10 +1111,7 @@ pub const Viewer = struct {
 
         var stream = t.vtStream();
         defer stream.deinit();
-        stream.nextSlice(data) catch |err| {
-            log.info("failed to process output for pane id={}: {}", .{ id, err });
-            return err;
-        };
+        stream.nextSlice(data);
     }
 
     fn initLayout(
diff --git a/src/termio/Termio.zig b/src/termio/Termio.zig
index dcd0d8cf7..8d0f5e2c4 100644
--- a/src/termio/Termio.zig
+++ b/src/termio/Termio.zig
@@ -721,12 +721,10 @@ fn processOutputLocked(self: *Termio, buf: []const u8) void {
                 log.err("error recording pty read in inspector err={}", .{err});
             };
 
-            self.terminal_stream.next(byte) catch |err|
-                log.err("error processing terminal data: {}", .{err});
+            self.terminal_stream.next(byte);
         }
     } else {
-        self.terminal_stream.nextSlice(buf) catch |err|
-            log.err("error processing terminal data: {}", .{err});
+        self.terminal_stream.nextSlice(buf);
     }
 
     // If our stream handling caused messages to be sent to the mailbox
diff --git a/src/termio/stream_handler.zig b/src/termio/stream_handler.zig
index 8c1b5b8ab..fd17d299d 100644
--- a/src/termio/stream_handler.zig
+++ b/src/termio/stream_handler.zig
@@ -176,6 +176,16 @@ pub const StreamHandler = struct {
         self: *StreamHandler,
         comptime action: Stream.Action.Tag,
         value: Stream.Action.Value(action),
+    ) void {
+        self.vtFallible(action, value) catch |err| {
+            log.warn("error handling VT action action={} err={}", .{ action, err });
+        };
+    }
+
+    inline fn vtFallible(
+        self: *StreamHandler,
+        comptime action: Stream.Action.Tag,
+        value: Stream.Action.Value(action),
     ) !void {
         // The branch hints here are based on real world data
         // which indicates that the most common actions are:
diff --git a/test/fuzz-libghostty/src/fuzz_stream.zig b/test/fuzz-libghostty/src/fuzz_stream.zig
index 17f63766f..ec47e90fe 100644
--- a/test/fuzz-libghostty/src/fuzz_stream.zig
+++ b/test/fuzz-libghostty/src/fuzz_stream.zig
@@ -43,11 +43,9 @@ pub export fn zig_fuzz_test(
 
     if (mode & 1 == 0) {
         // Slice path — exercises SIMD fast-path if enabled
-        stream.nextSlice(data) catch |err|
-            std.debug.panic("nextSlice: {}", .{err});
+        stream.nextSlice(data);
     } else {
         // Scalar path — exercises byte-at-a-time UTF-8 decoding
-        for (data) |byte| _ = stream.next(byte) catch |err|
-            std.debug.panic("next: {}", .{err});
+        for (data) |byte| stream.next(byte);
     }
 }

From 302e68fd3d9891919a3b6f32f47ee7f954bef848 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 13 Mar 2026 12:57:46 -0700
Subject: [PATCH 150/391] vt: expose ghostty_terminal_new/free

---
 include/ghostty/vt.h          |   2 +
 include/ghostty/vt/terminal.h |  88 ++++++++++++++++++++++++++
 src/lib_vt.zig                |   2 +
 src/terminal/Terminal.zig     |   2 +-
 src/terminal/c/main.zig       |   5 ++
 src/terminal/c/terminal.zig   | 112 ++++++++++++++++++++++++++++++++++
 6 files changed, 210 insertions(+), 1 deletion(-)
 create mode 100644 include/ghostty/vt/terminal.h
 create mode 100644 src/terminal/c/terminal.zig

diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index 4f8fef88e..e07ccefaf 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -28,6 +28,7 @@
  * @section groups_sec API Reference
  *
  * The API is organized into the following groups:
+ * - @ref terminal "Terminal Lifecycle" - Create and destroy terminal instances
  * - @ref key "Key Encoding" - Encode key events into terminal sequences
  * - @ref osc "OSC Parser" - Parse OSC (Operating System Command) sequences
  * - @ref sgr "SGR Parser" - Parse SGR (Select Graphic Rendition) sequences
@@ -74,6 +75,7 @@ extern "C" {
 
 #include <ghostty/vt/result.h>
 #include <ghostty/vt/allocator.h>
+#include <ghostty/vt/terminal.h>
 #include <ghostty/vt/osc.h>
 #include <ghostty/vt/sgr.h>
 #include <ghostty/vt/key.h>
diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
new file mode 100644
index 000000000..f2e68fa96
--- /dev/null
+++ b/include/ghostty/vt/terminal.h
@@ -0,0 +1,88 @@
+/**
+ * @file terminal.h
+ *
+ * Terminal lifecycle management.
+ */
+
+#ifndef GHOSTTY_VT_TERMINAL_H
+#define GHOSTTY_VT_TERMINAL_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include <ghostty/vt/result.h>
+#include <ghostty/vt/allocator.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @defgroup terminal Terminal Lifecycle
+ *
+ * Minimal API for creating and destroying terminal instances.
+ *
+ * This currently only exposes lifecycle operations. Additional terminal
+ * APIs will be added over time.
+ *
+ * @{
+ */
+
+/**
+ * Opaque handle to a terminal instance.
+ *
+ * @ingroup terminal
+ */
+typedef struct GhosttyTerminal* GhosttyTerminal;
+
+/**
+ * Terminal initialization options.
+ *
+ * @ingroup terminal
+ */
+typedef struct {
+  /** Terminal width in cells. Must be greater than zero. */
+  uint16_t cols;
+
+  /** Terminal height in cells. Must be greater than zero. */
+  uint16_t rows;
+
+  /** Maximum number of lines to keep in scrollback history. */
+  size_t max_scrollback;
+
+  // TODO: Consider ABI compatibility implications of this struct.
+  // We may want to artificially pad it significantly to support
+  // future options.
+} GhosttyTerminalOptions;
+
+/**
+ * Create a new terminal instance.
+ *
+ * @param allocator Pointer to allocator, or NULL to use the default allocator
+ * @param terminal Pointer to store the created terminal handle
+ * @param options Terminal initialization options
+ * @return GHOSTTY_SUCCESS on success, or an error code on failure
+ *
+ * @ingroup terminal
+ */
+GhosttyResult ghostty_terminal_new(const GhosttyAllocator* allocator,
+                                   GhosttyTerminal* terminal,
+                                   GhosttyTerminalOptions options);
+
+/**
+ * Free a terminal instance.
+ *
+ * Releases all resources associated with the terminal. After this call,
+ * the terminal handle becomes invalid and must not be used.
+ *
+ * @param terminal The terminal handle to free (may be NULL)
+ *
+ * @ingroup terminal
+ */
+void ghostty_terminal_free(GhosttyTerminal terminal);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GHOSTTY_VT_TERMINAL_H */
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 426660621..9af5d9d70 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -143,6 +143,8 @@ comptime {
         @export(&c.sgr_unknown_partial, .{ .name = "ghostty_sgr_unknown_partial" });
         @export(&c.sgr_attribute_tag, .{ .name = "ghostty_sgr_attribute_tag" });
         @export(&c.sgr_attribute_value, .{ .name = "ghostty_sgr_attribute_value" });
+        @export(&c.terminal_new, .{ .name = "ghostty_terminal_new" });
+        @export(&c.terminal_free, .{ .name = "ghostty_terminal_free" });
 
         // On Wasm we need to export our allocator convenience functions.
         if (builtin.target.cpu.arch.isWasm()) {
diff --git a/src/terminal/Terminal.zig b/src/terminal/Terminal.zig
index 706f235c7..ec08ec72c 100644
--- a/src/terminal/Terminal.zig
+++ b/src/terminal/Terminal.zig
@@ -271,7 +271,7 @@ pub fn vtHandler(self: *Terminal) ReadonlyHandler {
 }
 
 /// The general allocator we should use for this terminal.
-fn gpa(self: *Terminal) Allocator {
+pub fn gpa(self: *Terminal) Allocator {
     return self.screens.active.alloc;
 }
 
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index bc92597f5..e77769e24 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -4,6 +4,7 @@ pub const key_event = @import("key_event.zig");
 pub const key_encode = @import("key_encode.zig");
 pub const paste = @import("paste.zig");
 pub const sgr = @import("sgr.zig");
+pub const terminal = @import("terminal.zig");
 
 // The full C API, unexported.
 pub const osc_new = osc.new;
@@ -52,6 +53,9 @@ pub const key_encoder_encode = key_encode.encode;
 
 pub const paste_is_safe = paste.is_safe;
 
+pub const terminal_new = terminal.new;
+pub const terminal_free = terminal.free;
+
 test {
     _ = color;
     _ = osc;
@@ -59,6 +63,7 @@ test {
     _ = key_encode;
     _ = paste;
     _ = sgr;
+    _ = terminal;
 
     // We want to make sure we run the tests for the C allocator interface.
     _ = @import("../../lib/allocator.zig");
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
new file mode 100644
index 000000000..14d66ca0a
--- /dev/null
+++ b/src/terminal/c/terminal.zig
@@ -0,0 +1,112 @@
+const std = @import("std");
+const testing = std.testing;
+const lib_alloc = @import("../../lib/allocator.zig");
+const CAllocator = lib_alloc.Allocator;
+const ZigTerminal = @import("../Terminal.zig");
+const size = @import("../size.zig");
+const Result = @import("result.zig").Result;
+
+/// C: GhosttyTerminal
+pub const Terminal = ?*ZigTerminal;
+
+/// C: GhosttyTerminalOptions
+pub const Options = extern struct {
+    cols: size.CellCountInt,
+    rows: size.CellCountInt,
+    max_scrollback: usize,
+};
+
+const NewError = error{
+    InvalidValue,
+    OutOfMemory,
+};
+
+pub fn new(
+    alloc_: ?*const CAllocator,
+    result: *Terminal,
+    opts: Options,
+) callconv(.c) Result {
+    result.* = new_(alloc_, opts) catch |err| {
+        result.* = null;
+        return switch (err) {
+            error.InvalidValue => .invalid_value,
+            error.OutOfMemory => .out_of_memory,
+        };
+    };
+
+    return .success;
+}
+
+fn new_(
+    alloc_: ?*const CAllocator,
+    opts: Options,
+) NewError!*ZigTerminal {
+    if (opts.cols == 0 or opts.rows == 0) return error.InvalidValue;
+
+    const alloc = lib_alloc.default(alloc_);
+    const ptr = alloc.create(ZigTerminal) catch
+        return error.OutOfMemory;
+    errdefer alloc.destroy(ptr);
+
+    ptr.* = try .init(alloc, .{
+        .cols = opts.cols,
+        .rows = opts.rows,
+        .max_scrollback = opts.max_scrollback,
+    });
+
+    return ptr;
+}
+
+pub fn free(terminal_: Terminal) callconv(.c) void {
+    const t = terminal_ orelse return;
+
+    const alloc = t.gpa();
+    t.deinit(alloc);
+    alloc.destroy(t);
+}
+
+test "new/free" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+
+    try testing.expect(t != null);
+    free(t);
+}
+
+test "new invalid value" {
+    var t: Terminal = null;
+
+    try testing.expectEqual(Result.invalid_value, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 0,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    try testing.expect(t == null);
+
+    try testing.expectEqual(Result.invalid_value, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 0,
+            .max_scrollback = 10_000,
+        },
+    ));
+    try testing.expect(t == null);
+}
+
+test "free null" {
+    free(null);
+}

From 18fdc15357a2f519d93987d09a2957b9369340cb Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 13 Mar 2026 19:35:41 -0700
Subject: [PATCH 151/391] vt: ghostty_terminal_vt_write

---
 include/ghostty/vt/terminal.h | 26 ++++++++++++++++++++++++++
 src/lib_vt.zig                |  1 +
 src/terminal/c/main.zig       |  1 +
 src/terminal/c/terminal.zig   | 30 ++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index f2e68fa96..e59f4c4b8 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -79,6 +79,32 @@ GhosttyResult ghostty_terminal_new(const GhosttyAllocator* allocator,
  */
 void ghostty_terminal_free(GhosttyTerminal terminal);
 
+/**
+ * Write VT-encoded data to the terminal for processing.
+ *
+ * Feeds raw bytes through the terminal's VT stream parser, updating
+ * terminal state accordingly. Only read-only sequences are processed;
+ * sequences that require output (queries) are ignored.
+ *
+ * In the future, a callback-based API will be added to allow handling
+ * of output or side effect sequences.
+ *
+ * This never fails. Any erroneous input or errors in processing the
+ * input are logged internally but do not cause this function to fail
+ * because this input is assumed to be untrusted and from an external
+ * source; so the primary goal is to keep the terminal state consistent and 
+ * not allow malformed input to corrupt or crash.
+ *
+ * @param terminal The terminal handle
+ * @param data Pointer to the data to write
+ * @param len Length of the data in bytes
+ *
+ * @ingroup terminal
+ */
+void ghostty_terminal_vt_write(GhosttyTerminal terminal,
+                               const uint8_t* data,
+                               size_t len);
+
 /** @} */
 
 #ifdef __cplusplus
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 9af5d9d70..516c9f882 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -145,6 +145,7 @@ comptime {
         @export(&c.sgr_attribute_value, .{ .name = "ghostty_sgr_attribute_value" });
         @export(&c.terminal_new, .{ .name = "ghostty_terminal_new" });
         @export(&c.terminal_free, .{ .name = "ghostty_terminal_free" });
+        @export(&c.terminal_vt_write, .{ .name = "ghostty_terminal_vt_write" });
 
         // On Wasm we need to export our allocator convenience functions.
         if (builtin.target.cpu.arch.isWasm()) {
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index e77769e24..6d908ed6b 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -55,6 +55,7 @@ pub const paste_is_safe = paste.is_safe;
 
 pub const terminal_new = terminal.new;
 pub const terminal_free = terminal.free;
+pub const terminal_vt_write = terminal.vt_write;
 
 test {
     _ = color;
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 14d66ca0a..4b64c7a80 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -57,6 +57,16 @@ fn new_(
     return ptr;
 }
 
+pub fn vt_write(
+    terminal_: Terminal,
+    ptr: [*]const u8,
+    len: usize,
+) callconv(.c) void {
+    const t = terminal_ orelse return;
+    var stream = t.vtStream();
+    stream.nextSlice(ptr[0..len]);
+}
+
 pub fn free(terminal_: Terminal) callconv(.c) void {
     const t = terminal_ orelse return;
 
@@ -110,3 +120,23 @@ test "new invalid value" {
 test "free null" {
     free(null);
 }
+
+test "vt_write" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer free(t);
+
+    vt_write(t, "Hello", 5);
+
+    const str = try t.?.plainString(testing.allocator);
+    defer testing.allocator.free(str);
+    try testing.expectEqualStrings("Hello", str);
+}

From 8b9afe35a706ea230473c81637c3f43f07d736b7 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 13 Mar 2026 19:45:22 -0700
Subject: [PATCH 152/391] vt: ghostty_terminal_scroll_viewport

---
 include/ghostty/vt/terminal.h | 59 ++++++++++++++++++++++++++++-
 src/lib_vt.zig                |  1 +
 src/terminal/Terminal.zig     | 22 ++++++++++-
 src/terminal/c/AGENTS.md      | 10 +++++
 src/terminal/c/main.zig       |  1 +
 src/terminal/c/terminal.zig   | 71 +++++++++++++++++++++++++++++++++++
 6 files changed, 161 insertions(+), 3 deletions(-)
 create mode 100644 src/terminal/c/AGENTS.md

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index e59f4c4b8..70f98f8a5 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -53,6 +53,45 @@ typedef struct {
   // future options.
 } GhosttyTerminalOptions;
 
+/**
+ * Scroll viewport behavior tag.
+ *
+ * @ingroup terminal
+ */
+typedef enum {
+  /** Scroll to the top of the scrollback. */
+  GHOSTTY_SCROLL_VIEWPORT_TOP,
+
+  /** Scroll to the bottom (active area). */
+  GHOSTTY_SCROLL_VIEWPORT_BOTTOM,
+
+  /** Scroll by a delta amount (up is negative). */
+  GHOSTTY_SCROLL_VIEWPORT_DELTA,
+} GhosttyTerminalScrollViewportTag;
+
+/**
+ * Scroll viewport value.
+ *
+ * @ingroup terminal
+ */
+typedef union {
+  /** Scroll delta (only used with GHOSTTY_SCROLL_VIEWPORT_DELTA). Up is negative. */
+  intptr_t delta;
+
+  /** Padding for ABI compatibility. Do not use. */
+  uint64_t _padding[2];
+} GhosttyTerminalScrollViewportValue;
+
+/**
+ * Tagged union for scroll viewport behavior.
+ *
+ * @ingroup terminal
+ */
+typedef struct {
+  GhosttyTerminalScrollViewportTag tag;
+  GhosttyTerminalScrollViewportValue value;
+} GhosttyTerminalScrollViewport;
+
 /**
  * Create a new terminal instance.
  *
@@ -102,8 +141,24 @@ void ghostty_terminal_free(GhosttyTerminal terminal);
  * @ingroup terminal
  */
 void ghostty_terminal_vt_write(GhosttyTerminal terminal,
-                               const uint8_t* data,
-                               size_t len);
+                                const uint8_t* data,
+                                size_t len);
+
+/**
+ * Scroll the terminal viewport.
+ *
+ * Scrolls the terminal's viewport according to the given behavior.
+ * When using GHOSTTY_SCROLL_VIEWPORT_DELTA, set the delta field in
+ * the value union to specify the number of rows to scroll (negative
+ * for up, positive for down). For other behaviors, the value is ignored.
+ *
+ * @param terminal The terminal handle (may be NULL, in which case this is a no-op)
+ * @param behavior The scroll behavior as a tagged union
+ *
+ * @ingroup terminal
+ */
+void ghostty_terminal_scroll_viewport(GhosttyTerminal terminal,
+                                      GhosttyTerminalScrollViewport behavior);
 
 /** @} */
 
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 516c9f882..a4998f1b8 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -146,6 +146,7 @@ comptime {
         @export(&c.terminal_new, .{ .name = "ghostty_terminal_new" });
         @export(&c.terminal_free, .{ .name = "ghostty_terminal_free" });
         @export(&c.terminal_vt_write, .{ .name = "ghostty_terminal_vt_write" });
+        @export(&c.terminal_scroll_viewport, .{ .name = "ghostty_terminal_scroll_viewport" });
 
         // On Wasm we need to export our allocator convenience functions.
         if (builtin.target.cpu.arch.isWasm()) {
diff --git a/src/terminal/Terminal.zig b/src/terminal/Terminal.zig
index ec08ec72c..1ea915c67 100644
--- a/src/terminal/Terminal.zig
+++ b/src/terminal/Terminal.zig
@@ -5,6 +5,7 @@ const Terminal = @This();
 
 const std = @import("std");
 const build_options = @import("terminal_options");
+const lib = @import("../lib/main.zig");
 const assert = @import("../quirks.zig").inlineAssert;
 const testing = std.testing;
 const Allocator = std.mem.Allocator;
@@ -35,6 +36,8 @@ const Page = pagepkg.Page;
 const Cell = pagepkg.Cell;
 const Row = pagepkg.Row;
 
+const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
+
 const log = std.log.scoped(.terminal);
 
 /// Default tabstop interval
@@ -1704,7 +1707,7 @@ pub fn scrollUp(self: *Terminal, count: usize) !void {
 }
 
 /// Options for scrolling the viewport of the terminal grid.
-pub const ScrollViewport = union(enum) {
+pub const ScrollViewport = union(Tag) {
     /// Scroll to the top of the scrollback
     top,
 
@@ -1713,6 +1716,23 @@ pub const ScrollViewport = union(enum) {
 
     /// Scroll by some delta amount, up is negative.
     delta: isize,
+
+    pub const Tag = lib.Enum(lib_target, &.{
+        "top",
+        "bottom",
+        "delta",
+    });
+
+    const c_union = lib.TaggedUnion(
+        lib_target,
+        @This(),
+        // Padding: largest variant is isize (8 bytes on 64-bit).
+        // Use [2]u64 (16 bytes) for future expansion.
+        [2]u64,
+    );
+    pub const C = c_union.C;
+    pub const CValue = c_union.CValue;
+    pub const cval = c_union.cval;
 };
 
 /// Scroll the viewport of the terminal grid.
diff --git a/src/terminal/c/AGENTS.md b/src/terminal/c/AGENTS.md
new file mode 100644
index 000000000..fa922c6ba
--- /dev/null
+++ b/src/terminal/c/AGENTS.md
@@ -0,0 +1,10 @@
+# libghostty-vt C API
+
+- C API must be designed with ABI compatibility in mind
+- Zig tagged unions must be converted to C ABI compatible unions
+  via `lib.TaggedUnion`.
+- Any functions must be updated all the way through from here to
+  `src/terminal/c/main.zig` to `src/lib_vt.zig` and the headers
+  in `include/ghostty/vt.h`.
+- In `include/ghostty/vt.h`, always sort the header contents by:
+  (1) macros, (2) forward declarations, (3) types, (4) functions
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 6d908ed6b..be8da379e 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -56,6 +56,7 @@ pub const paste_is_safe = paste.is_safe;
 pub const terminal_new = terminal.new;
 pub const terminal_free = terminal.free;
 pub const terminal_vt_write = terminal.vt_write;
+pub const terminal_scroll_viewport = terminal.scroll_viewport;
 
 test {
     _ = color;
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 4b64c7a80..cf491597b 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -67,6 +67,21 @@ pub fn vt_write(
     stream.nextSlice(ptr[0..len]);
 }
 
+/// C: GhosttyTerminalScrollViewport
+pub const ScrollViewport = ZigTerminal.ScrollViewport.C;
+
+pub fn scroll_viewport(
+    terminal_: Terminal,
+    behavior: ScrollViewport,
+) callconv(.c) void {
+    const t = terminal_ orelse return;
+    t.scrollViewport(switch (behavior.tag) {
+        .top => .top,
+        .bottom => .bottom,
+        .delta => .{ .delta = behavior.value.delta },
+    });
+}
+
 pub fn free(terminal_: Terminal) callconv(.c) void {
     const t = terminal_ orelse return;
 
@@ -121,6 +136,62 @@ test "free null" {
     free(null);
 }
 
+test "scroll_viewport" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 5,
+            .rows = 2,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer free(t);
+
+    const zt = t.?;
+
+    // Write "hello" on the first line
+    vt_write(t, "hello", 5);
+
+    // Push "hello" into scrollback with 3 newlines (index = ESC D)
+    vt_write(t, "\x1bD\x1bD\x1bD", 6);
+    {
+        // Viewport should be empty now since hello scrolled off
+        const str = try zt.plainString(testing.allocator);
+        defer testing.allocator.free(str);
+        try testing.expectEqualStrings("", str);
+    }
+
+    // Scroll to top: "hello" should be visible again
+    scroll_viewport(t, .{ .tag = .top, .value = undefined });
+    {
+        const str = try zt.plainString(testing.allocator);
+        defer testing.allocator.free(str);
+        try testing.expectEqualStrings("hello", str);
+    }
+
+    // Scroll to bottom: viewport should be empty again
+    scroll_viewport(t, .{ .tag = .bottom, .value = undefined });
+    {
+        const str = try zt.plainString(testing.allocator);
+        defer testing.allocator.free(str);
+        try testing.expectEqualStrings("", str);
+    }
+
+    // Scroll up by delta to bring "hello" back into view
+    scroll_viewport(t, .{ .tag = .delta, .value = .{ .delta = -3 } });
+    {
+        const str = try zt.plainString(testing.allocator);
+        defer testing.allocator.free(str);
+        try testing.expectEqualStrings("hello", str);
+    }
+}
+
+test "scroll_viewport null" {
+    scroll_viewport(null, .{ .tag = .top, .value = undefined });
+}
+
 test "vt_write" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(

From fe6e7fbc6b54c835f9a5229f0b19ee9f96ec5a92 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 13 Mar 2026 19:54:19 -0700
Subject: [PATCH 153/391] vt: ghostty_terminal_resize

---
 include/ghostty/vt/terminal.h | 18 +++++++++++++
 src/lib_vt.zig                |  1 +
 src/terminal/c/main.zig       |  1 +
 src/terminal/c/terminal.zig   | 50 +++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 70f98f8a5..233389498 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -118,6 +118,24 @@ GhosttyResult ghostty_terminal_new(const GhosttyAllocator* allocator,
  */
 void ghostty_terminal_free(GhosttyTerminal terminal);
 
+/**
+ * Resize the terminal to the given dimensions.
+ *
+ * Changes the number of columns and rows in the terminal. The primary
+ * screen will reflow content if wraparound mode is enabled; the alternate
+ * screen does not reflow. If the dimensions are unchanged, this is a no-op.
+ *
+ * @param terminal The terminal handle (NULL returns GHOSTTY_INVALID_VALUE)
+ * @param cols New width in cells (must be greater than zero)
+ * @param rows New height in cells (must be greater than zero)
+ * @return GHOSTTY_SUCCESS on success, or an error code on failure
+ *
+ * @ingroup terminal
+ */
+GhosttyResult ghostty_terminal_resize(GhosttyTerminal terminal,
+                                      uint16_t cols,
+                                      uint16_t rows);
+
 /**
  * Write VT-encoded data to the terminal for processing.
  *
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index a4998f1b8..a76ed8446 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -145,6 +145,7 @@ comptime {
         @export(&c.sgr_attribute_value, .{ .name = "ghostty_sgr_attribute_value" });
         @export(&c.terminal_new, .{ .name = "ghostty_terminal_new" });
         @export(&c.terminal_free, .{ .name = "ghostty_terminal_free" });
+        @export(&c.terminal_resize, .{ .name = "ghostty_terminal_resize" });
         @export(&c.terminal_vt_write, .{ .name = "ghostty_terminal_vt_write" });
         @export(&c.terminal_scroll_viewport, .{ .name = "ghostty_terminal_scroll_viewport" });
 
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index be8da379e..f17b9065e 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -55,6 +55,7 @@ pub const paste_is_safe = paste.is_safe;
 
 pub const terminal_new = terminal.new;
 pub const terminal_free = terminal.free;
+pub const terminal_resize = terminal.resize;
 pub const terminal_vt_write = terminal.vt_write;
 pub const terminal_scroll_viewport = terminal.scroll_viewport;
 
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index cf491597b..ef64e7c0e 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -82,6 +82,17 @@ pub fn scroll_viewport(
     });
 }
 
+pub fn resize(
+    terminal_: Terminal,
+    cols: size.CellCountInt,
+    rows: size.CellCountInt,
+) callconv(.c) Result {
+    const t = terminal_ orelse return .invalid_value;
+    if (cols == 0 or rows == 0) return .invalid_value;
+    t.resize(t.gpa(), cols, rows) catch return .out_of_memory;
+    return .success;
+}
+
 pub fn free(terminal_: Terminal) callconv(.c) void {
     const t = terminal_ orelse return;
 
@@ -192,6 +203,45 @@ test "scroll_viewport null" {
     scroll_viewport(null, .{ .tag = .top, .value = undefined });
 }
 
+test "resize" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer free(t);
+
+    try testing.expectEqual(Result.success, resize(t, 40, 12));
+    try testing.expectEqual(40, t.?.cols);
+    try testing.expectEqual(12, t.?.rows);
+}
+
+test "resize null" {
+    try testing.expectEqual(Result.invalid_value, resize(null, 80, 24));
+}
+
+test "resize invalid value" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer free(t);
+
+    try testing.expectEqual(Result.invalid_value, resize(t, 0, 24));
+    try testing.expectEqual(Result.invalid_value, resize(t, 80, 0));
+}
+
 test "vt_write" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(

From aa3e6e23a227cfe4ba0026d844b54e7a89ea880b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 13 Mar 2026 19:55:42 -0700
Subject: [PATCH 154/391] vt: ghostty_terminal_reset

---
 include/ghostty/vt/terminal.h | 13 +++++++++++++
 src/lib_vt.zig                |  1 +
 src/terminal/c/main.zig       |  1 +
 src/terminal/c/terminal.zig   | 30 ++++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 233389498..6ecb6e62c 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -118,6 +118,19 @@ GhosttyResult ghostty_terminal_new(const GhosttyAllocator* allocator,
  */
 void ghostty_terminal_free(GhosttyTerminal terminal);
 
+/**
+ * Perform a full reset of the terminal (RIS).
+ *
+ * Resets all terminal state back to its initial configuration, including
+ * modes, scrollback, scrolling region, and screen contents. The terminal
+ * dimensions are preserved.
+ *
+ * @param terminal The terminal handle (may be NULL, in which case this is a no-op)
+ *
+ * @ingroup terminal
+ */
+void ghostty_terminal_reset(GhosttyTerminal terminal);
+
 /**
  * Resize the terminal to the given dimensions.
  *
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index a76ed8446..1eddbd886 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -145,6 +145,7 @@ comptime {
         @export(&c.sgr_attribute_value, .{ .name = "ghostty_sgr_attribute_value" });
         @export(&c.terminal_new, .{ .name = "ghostty_terminal_new" });
         @export(&c.terminal_free, .{ .name = "ghostty_terminal_free" });
+        @export(&c.terminal_reset, .{ .name = "ghostty_terminal_reset" });
         @export(&c.terminal_resize, .{ .name = "ghostty_terminal_resize" });
         @export(&c.terminal_vt_write, .{ .name = "ghostty_terminal_vt_write" });
         @export(&c.terminal_scroll_viewport, .{ .name = "ghostty_terminal_scroll_viewport" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index f17b9065e..31e1b40eb 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -55,6 +55,7 @@ pub const paste_is_safe = paste.is_safe;
 
 pub const terminal_new = terminal.new;
 pub const terminal_free = terminal.free;
+pub const terminal_reset = terminal.reset;
 pub const terminal_resize = terminal.resize;
 pub const terminal_vt_write = terminal.vt_write;
 pub const terminal_scroll_viewport = terminal.scroll_viewport;
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index ef64e7c0e..0af791f91 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -93,6 +93,11 @@ pub fn resize(
     return .success;
 }
 
+pub fn reset(terminal_: Terminal) callconv(.c) void {
+    const t = terminal_ orelse return;
+    t.fullReset();
+}
+
 pub fn free(terminal_: Terminal) callconv(.c) void {
     const t = terminal_ orelse return;
 
@@ -203,6 +208,31 @@ test "scroll_viewport null" {
     scroll_viewport(null, .{ .tag = .top, .value = undefined });
 }
 
+test "reset" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer free(t);
+
+    vt_write(t, "Hello", 5);
+    reset(t);
+
+    const str = try t.?.plainString(testing.allocator);
+    defer testing.allocator.free(str);
+    try testing.expectEqualStrings("", str);
+}
+
+test "reset null" {
+    reset(null);
+}
+
 test "resize" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(

From 34acdfcc4eca388d3d4fa1a5ce03525384db8e3e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 13 Mar 2026 19:59:06 -0700
Subject: [PATCH 155/391] vt: update terminal.h docs

---
 include/ghostty/vt.h          |  2 +-
 include/ghostty/vt/terminal.h | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index e07ccefaf..8f7323c31 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -28,7 +28,7 @@
  * @section groups_sec API Reference
  *
  * The API is organized into the following groups:
- * - @ref terminal "Terminal Lifecycle" - Create and destroy terminal instances
+ * - @ref terminal "Terminal" - Complete terminal emulator state and rendering
  * - @ref key "Key Encoding" - Encode key events into terminal sequences
  * - @ref osc "OSC Parser" - Parse OSC (Operating System Command) sequences
  * - @ref sgr "SGR Parser" - Parse SGR (Select Graphic Rendition) sequences
diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 6ecb6e62c..6dc817392 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -1,7 +1,7 @@
 /**
  * @file terminal.h
  *
- * Terminal lifecycle management.
+ * Complete terminal emulator state and rendering.
  */
 
 #ifndef GHOSTTY_VT_TERMINAL_H
@@ -16,12 +16,12 @@
 extern "C" {
 #endif
 
-/** @defgroup terminal Terminal Lifecycle
+/** @defgroup terminal Terminal
  *
- * Minimal API for creating and destroying terminal instances.
+ * Complete terminal emulator state and rendering.
  *
- * This currently only exposes lifecycle operations. Additional terminal
- * APIs will be added over time.
+ * A terminal instance manages the full emulator state including the screen,
+ * scrollback, cursor, styles, modes, and VT stream processing.
  *
  * @{
  */

From 8e6bf829a746be199bd30d4670fe855035562433 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 13 Mar 2026 20:06:32 -0700
Subject: [PATCH 156/391] terminal/osc: don't export context/semantic prompts
 to libvt yet

---
 src/terminal/osc/parsers/context_signal.zig  | 2 ++
 src/terminal/osc/parsers/semantic_prompt.zig | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/terminal/osc/parsers/context_signal.zig b/src/terminal/osc/parsers/context_signal.zig
index ff82af392..c36c76f21 100644
--- a/src/terminal/osc/parsers/context_signal.zig
+++ b/src/terminal/osc/parsers/context_signal.zig
@@ -16,6 +16,8 @@ const max_context_id_len = 64;
 
 /// A single OSC 3008 context signal command.
 pub const Command = struct {
+    pub const C = void;
+
     action: Action,
     /// The context identifier. Must be 1-64 characters in the 32..126 byte range.
     id: []const u8,
diff --git a/src/terminal/osc/parsers/semantic_prompt.zig b/src/terminal/osc/parsers/semantic_prompt.zig
index d3a117515..c60ce4cb5 100644
--- a/src/terminal/osc/parsers/semantic_prompt.zig
+++ b/src/terminal/osc/parsers/semantic_prompt.zig
@@ -14,6 +14,8 @@ const log = std.log.scoped(.osc_semantic_prompt);
 /// all except one do and the spec does also say to ignore unknown
 /// options. So, I think this is a fair interpretation.
 pub const Command = struct {
+    pub const C = void;
+
     action: Action,
     options_unvalidated: []const u8,
 

From 6368b00604e4543088eda552a8aa3f6776500332 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Sat, 14 Mar 2026 13:13:09 +0000
Subject: [PATCH 157/391] Update VOUCHED list (#11488)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11485#discussioncomment-16130186)
from @mitchellh.

Vouch: @jesusvazquez

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 83de38e55..e84780f4c 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -83,6 +83,7 @@ icodesign
 jacobsandlund
 jake-stewart
 jcollie
+jesusvazquez
 jguthmiller
 jmcgover
 johnslavik

From 1844a5f7bafbade1305e95d515eedcb010aae104 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Sat, 14 Mar 2026 15:18:15 +0000
Subject: [PATCH 158/391] Update VOUCHED list (#11492)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11491#issuecomment-4060704311)
from @mitchellh.

Vouch: @devsunb

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index e84780f4c..767593f2c 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -55,6 +55,7 @@ damyanbogoev
 danulqua
 dariogriffo
 dervedro
+devsunb
 diaaeddin
 dmehala
 doprz

From b5fb7ecaaaa2d788093809614d88b6294baaf672 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 14 Mar 2026 13:48:03 -0700
Subject: [PATCH 159/391] vt: wip formatter api

---
 include/ghostty/vt.h           |   1 +
 include/ghostty/vt/formatter.h | 156 +++++++++++++++
 include/ghostty/vt/result.h    |   2 +
 src/lib_vt.zig                 |   3 +
 src/terminal/c/formatter.zig   | 344 +++++++++++++++++++++++++++++++++
 src/terminal/c/main.zig        |   6 +
 src/terminal/c/result.zig      |   1 +
 src/terminal/formatter.zig     |  82 ++++----
 8 files changed, 556 insertions(+), 39 deletions(-)
 create mode 100644 include/ghostty/vt/formatter.h
 create mode 100644 src/terminal/c/formatter.zig

diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index 8f7323c31..378c03453 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -75,6 +75,7 @@ extern "C" {
 
 #include <ghostty/vt/result.h>
 #include <ghostty/vt/allocator.h>
+#include <ghostty/vt/formatter.h>
 #include <ghostty/vt/terminal.h>
 #include <ghostty/vt/osc.h>
 #include <ghostty/vt/sgr.h>
diff --git a/include/ghostty/vt/formatter.h b/include/ghostty/vt/formatter.h
new file mode 100644
index 000000000..24f5212ff
--- /dev/null
+++ b/include/ghostty/vt/formatter.h
@@ -0,0 +1,156 @@
+/**
+ * @file formatter.h
+ *
+ * Format terminal content as plain text, VT sequences, or HTML.
+ */
+
+#ifndef GHOSTTY_VT_FORMATTER_H
+#define GHOSTTY_VT_FORMATTER_H
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <ghostty/vt/allocator.h>
+#include <ghostty/vt/result.h>
+#include <ghostty/vt/terminal.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @defgroup formatter Formatter
+ *
+ * Format terminal content as plain text, VT sequences, or HTML.
+ *
+ * A formatter captures a reference to a terminal and formatting options.
+ * It can be used repeatedly to produce output that reflects the current
+ * terminal state at the time of each format call.
+ *
+ * The terminal must outlive the formatter.
+ *
+ * @{
+ */
+
+/**
+ * Output format.
+ *
+ * @ingroup formatter
+ */
+typedef enum {
+  /** Plain text (no escape sequences). */
+  GHOSTTY_FORMATTER_FORMAT_PLAIN,
+
+  /** VT sequences preserving colors, styles, URLs, etc. */
+  GHOSTTY_FORMATTER_FORMAT_VT,
+
+  /** HTML with inline styles. */
+  GHOSTTY_FORMATTER_FORMAT_HTML,
+} GhosttyFormatterFormat;
+
+/**
+ * Extra terminal state to include in styled output.
+ *
+ * @ingroup formatter
+ */
+typedef enum {
+  /** Emit no extra state. */
+  GHOSTTY_FORMATTER_EXTRA_NONE,
+
+  /** Emit style-relevant state (palette, cursor style, hyperlinks). */
+  GHOSTTY_FORMATTER_EXTRA_STYLES,
+
+  /** Emit all state to reconstruct terminal as closely as possible. */
+  GHOSTTY_FORMATTER_EXTRA_ALL,
+} GhosttyFormatterExtra;
+
+/**
+ * Opaque handle to a formatter instance.
+ *
+ * @ingroup formatter
+ */
+typedef struct GhosttyFormatter* GhosttyFormatter;
+
+/**
+ * Options for creating a terminal formatter.
+ *
+ * @ingroup formatter
+ */
+typedef struct {
+  /** Output format to emit. */
+  GhosttyFormatterFormat emit;
+
+  /** Whether to unwrap soft-wrapped lines. */
+  bool unwrap;
+
+  /** Whether to trim trailing whitespace on non-blank lines. */
+  bool trim;
+
+  /** Extra terminal state to include in styled output. */
+  GhosttyFormatterExtra extra;
+} GhosttyFormatterTerminalOptions;
+
+/**
+ * Create a formatter for a terminal's active screen.
+ *
+ * The terminal must outlive the formatter. The formatter stores a borrowed
+ * reference to the terminal and reads its current state on each format call.
+ *
+ * @param allocator Pointer to allocator, or NULL to use the default allocator
+ * @param formatter Pointer to store the created formatter handle
+ * @param terminal The terminal to format (must not be NULL)
+ * @param options Formatting options
+ * @return GHOSTTY_SUCCESS on success, or an error code on failure
+ *
+ * @ingroup formatter
+ */
+GhosttyResult ghostty_formatter_terminal_new(
+    const GhosttyAllocator* allocator,
+    GhosttyFormatter* formatter,
+    GhosttyTerminal terminal,
+    GhosttyFormatterTerminalOptions options);
+
+/**
+ * Run the formatter and produce output into the caller-provided buffer.
+ *
+ * Each call formats the current terminal state. Pass NULL for buf to
+ * query the required buffer size without writing any output; in that case
+ * out_written receives the required size and the return value is
+ * GHOSTTY_OUT_OF_SPACE.
+ *
+ * If the buffer is too small, returns GHOSTTY_OUT_OF_SPACE and sets
+ * out_written to the required size. The caller can then retry with a
+ * larger buffer.
+ *
+ * @param formatter The formatter handle (must not be NULL)
+ * @param buf Pointer to the output buffer, or NULL to query size
+ * @param buf_len Length of the output buffer in bytes
+ * @param out_written Pointer to receive the number of bytes written,
+ *                    or the required size on failure
+ * @return GHOSTTY_SUCCESS on success, or an error code on failure
+ *
+ * @ingroup formatter
+ */
+GhosttyResult ghostty_formatter_format(GhosttyFormatter formatter,
+                                       uint8_t* buf,
+                                       size_t buf_len,
+                                       size_t* out_written);
+
+/**
+ * Free a formatter instance.
+ *
+ * Releases all resources associated with the formatter. After this call,
+ * the formatter handle becomes invalid.
+ *
+ * @param formatter The formatter handle to free (may be NULL)
+ *
+ * @ingroup formatter
+ */
+void ghostty_formatter_free(GhosttyFormatter formatter);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GHOSTTY_VT_FORMATTER_H */
diff --git a/include/ghostty/vt/result.h b/include/ghostty/vt/result.h
index 65938ee76..6a47d35cc 100644
--- a/include/ghostty/vt/result.h
+++ b/include/ghostty/vt/result.h
@@ -17,6 +17,8 @@ typedef enum {
     GHOSTTY_OUT_OF_MEMORY = -1,
     /** Operation failed due to invalid value */
     GHOSTTY_INVALID_VALUE = -2,
+    /** Operation failed because the provided buffer was too small */
+    GHOSTTY_OUT_OF_SPACE = -3,
 } GhosttyResult;
 
 #endif /* GHOSTTY_VT_RESULT_H */
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 1eddbd886..3e1aa9d8d 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -143,6 +143,9 @@ comptime {
         @export(&c.sgr_unknown_partial, .{ .name = "ghostty_sgr_unknown_partial" });
         @export(&c.sgr_attribute_tag, .{ .name = "ghostty_sgr_attribute_tag" });
         @export(&c.sgr_attribute_value, .{ .name = "ghostty_sgr_attribute_value" });
+        @export(&c.formatter_terminal_new, .{ .name = "ghostty_formatter_terminal_new" });
+        @export(&c.formatter_format, .{ .name = "ghostty_formatter_format" });
+        @export(&c.formatter_free, .{ .name = "ghostty_formatter_free" });
         @export(&c.terminal_new, .{ .name = "ghostty_terminal_new" });
         @export(&c.terminal_free, .{ .name = "ghostty_terminal_free" });
         @export(&c.terminal_reset, .{ .name = "ghostty_terminal_reset" });
diff --git a/src/terminal/c/formatter.zig b/src/terminal/c/formatter.zig
new file mode 100644
index 000000000..8b66f781a
--- /dev/null
+++ b/src/terminal/c/formatter.zig
@@ -0,0 +1,344 @@
+const std = @import("std");
+const testing = std.testing;
+const lib_alloc = @import("../../lib/allocator.zig");
+const CAllocator = lib_alloc.Allocator;
+const terminal_c = @import("terminal.zig");
+const ZigTerminal = @import("../Terminal.zig");
+const formatterpkg = @import("../formatter.zig");
+const Result = @import("result.zig").Result;
+
+/// Wrapper around formatter that tracks the allocator for C API usage.
+const FormatterWrapper = struct {
+    kind: Kind,
+    alloc: std.mem.Allocator,
+
+    const Kind = union(enum) {
+        terminal: formatterpkg.TerminalFormatter,
+    };
+};
+
+/// C: GhosttyFormatter
+pub const Formatter = ?*FormatterWrapper;
+
+/// C: GhosttyFormatterFormat
+pub const Format = formatterpkg.Format;
+
+/// C: GhosttyFormatterExtra
+pub const Extra = enum(c_int) {
+    none = 0,
+    styles = 1,
+    all = 2,
+};
+
+/// C: GhosttyFormatterTerminalOptions
+pub const TerminalOptions = extern struct {
+    emit: Format,
+    unwrap: bool,
+    trim: bool,
+    extra: Extra,
+};
+
+pub fn terminal_new(
+    alloc_: ?*const CAllocator,
+    result: *Formatter,
+    terminal_: terminal_c.Terminal,
+    opts: TerminalOptions,
+) callconv(.c) Result {
+    result.* = terminal_new_(
+        alloc_,
+        terminal_,
+        opts,
+    ) catch |err| {
+        result.* = null;
+        return switch (err) {
+            error.InvalidValue => .invalid_value,
+            error.OutOfMemory => .out_of_memory,
+        };
+    };
+
+    return .success;
+}
+
+fn terminal_new_(
+    alloc_: ?*const CAllocator,
+    terminal_: terminal_c.Terminal,
+    opts: TerminalOptions,
+) error{
+    InvalidValue,
+    OutOfMemory,
+}!*FormatterWrapper {
+    const t = terminal_ orelse return error.InvalidValue;
+
+    const alloc = lib_alloc.default(alloc_);
+    const ptr = alloc.create(FormatterWrapper) catch
+        return error.OutOfMemory;
+    errdefer alloc.destroy(ptr);
+
+    const extra: formatterpkg.TerminalFormatter.Extra = switch (opts.extra) {
+        .none => .none,
+        .styles => .styles,
+        .all => .all,
+    };
+
+    var formatter: formatterpkg.TerminalFormatter = .init(t, .{
+        .emit = opts.emit,
+        .unwrap = opts.unwrap,
+        .trim = opts.trim,
+    });
+    formatter.extra = extra;
+
+    ptr.* = .{
+        .kind = .{ .terminal = formatter },
+        .alloc = alloc,
+    };
+
+    return ptr;
+}
+
+pub fn format(
+    formatter_: Formatter,
+    out_: ?[*]u8,
+    out_len: usize,
+    out_written: *usize,
+) callconv(.c) Result {
+    const wrapper = formatter_ orelse return .invalid_value;
+
+    var writer: std.Io.Writer = .fixed(if (out_) |out|
+        out[0..out_len]
+    else
+        &.{});
+
+    switch (wrapper.kind) {
+        .terminal => |*t| t.format(&writer) catch |err| switch (err) {
+            error.WriteFailed => {
+                // On write failed we always report how much
+                // space we actually needed.
+                var discarding: std.Io.Writer.Discarding = .init(&.{});
+                t.format(&discarding.writer) catch unreachable;
+                out_written.* = @intCast(discarding.count);
+                return .out_of_space;
+            },
+        },
+    }
+
+    out_written.* = writer.end;
+    return .success;
+}
+
+pub fn free(formatter_: Formatter) callconv(.c) void {
+    const wrapper = formatter_ orelse return;
+    const alloc = wrapper.alloc;
+    alloc.destroy(wrapper);
+}
+
+test "terminal_new/free" {
+    var t: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{ .cols = 80, .rows = 24, .max_scrollback = 10_000 },
+    ));
+    defer terminal_c.free(t);
+
+    var f: Formatter = null;
+    try testing.expectEqual(Result.success, terminal_new(
+        &lib_alloc.test_allocator,
+        &f,
+        t,
+        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .none },
+    ));
+    try testing.expect(f != null);
+    free(f);
+}
+
+test "terminal_new invalid_value on null terminal" {
+    var f: Formatter = null;
+    try testing.expectEqual(Result.invalid_value, terminal_new(
+        &lib_alloc.test_allocator,
+        &f,
+        null,
+        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .none },
+    ));
+    try testing.expect(f == null);
+}
+
+test "free null" {
+    free(null);
+}
+
+test "format plain" {
+    var t: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{ .cols = 80, .rows = 24, .max_scrollback = 10_000 },
+    ));
+    defer terminal_c.free(t);
+
+    terminal_c.vt_write(t, "Hello", 5);
+
+    var f: Formatter = null;
+    try testing.expectEqual(Result.success, terminal_new(
+        &lib_alloc.test_allocator,
+        &f,
+        t,
+        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .none },
+    ));
+    defer free(f);
+
+    var buf: [1024]u8 = undefined;
+    var written: usize = 0;
+    try testing.expectEqual(Result.success, format(f, &buf, buf.len, &written));
+    try testing.expectEqualStrings("Hello", buf[0..written]);
+}
+
+test "format reflects terminal changes" {
+    var t: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{ .cols = 80, .rows = 24, .max_scrollback = 10_000 },
+    ));
+    defer terminal_c.free(t);
+
+    terminal_c.vt_write(t, "Hello", 5);
+
+    var f: Formatter = null;
+    try testing.expectEqual(Result.success, terminal_new(
+        &lib_alloc.test_allocator,
+        &f,
+        t,
+        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .none },
+    ));
+    defer free(f);
+
+    var buf: [1024]u8 = undefined;
+    var written: usize = 0;
+    try testing.expectEqual(Result.success, format(f, &buf, buf.len, &written));
+    try testing.expectEqualStrings("Hello", buf[0..written]);
+
+    // Write more data and re-format
+    terminal_c.vt_write(t, "\r\nWorld", 7);
+
+    try testing.expectEqual(Result.success, format(f, &buf, buf.len, &written));
+    try testing.expectEqualStrings("Hello\nWorld", buf[0..written]);
+}
+
+test "format null returns required size" {
+    var t: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{ .cols = 80, .rows = 24, .max_scrollback = 10_000 },
+    ));
+    defer terminal_c.free(t);
+
+    terminal_c.vt_write(t, "Hello", 5);
+
+    var f: Formatter = null;
+    try testing.expectEqual(Result.success, terminal_new(
+        &lib_alloc.test_allocator,
+        &f,
+        t,
+        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .none },
+    ));
+    defer free(f);
+
+    // Pass null buffer to query required size
+    var required: usize = 0;
+    try testing.expectEqual(Result.out_of_space, format(f, null, 0, &required));
+    try testing.expect(required > 0);
+
+    // Now allocate and format
+    var buf: [1024]u8 = undefined;
+    var written: usize = 0;
+    try testing.expectEqual(Result.success, format(f, &buf, buf.len, &written));
+    try testing.expectEqual(required, written);
+}
+
+test "format buffer too small" {
+    var t: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{ .cols = 80, .rows = 24, .max_scrollback = 10_000 },
+    ));
+    defer terminal_c.free(t);
+
+    terminal_c.vt_write(t, "Hello", 5);
+
+    var f: Formatter = null;
+    try testing.expectEqual(Result.success, terminal_new(
+        &lib_alloc.test_allocator,
+        &f,
+        t,
+        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .none },
+    ));
+    defer free(f);
+
+    // Buffer too small
+    var buf: [2]u8 = undefined;
+    var written: usize = 0;
+    try testing.expectEqual(Result.out_of_space, format(f, &buf, buf.len, &written));
+    // written contains the required size
+    try testing.expectEqual(@as(usize, 5), written);
+}
+
+test "format null formatter" {
+    var written: usize = 0;
+    try testing.expectEqual(Result.invalid_value, format(null, null, 0, &written));
+}
+
+test "format vt" {
+    var t: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{ .cols = 80, .rows = 24, .max_scrollback = 10_000 },
+    ));
+    defer terminal_c.free(t);
+
+    terminal_c.vt_write(t, "Test", 4);
+
+    var f: Formatter = null;
+    try testing.expectEqual(Result.success, terminal_new(
+        &lib_alloc.test_allocator,
+        &f,
+        t,
+        .{ .emit = .vt, .unwrap = false, .trim = true, .extra = .styles },
+    ));
+    defer free(f);
+
+    var buf: [65536]u8 = undefined;
+    var written: usize = 0;
+    try testing.expectEqual(Result.success, format(f, &buf, buf.len, &written));
+    try testing.expect(written > 0);
+    try testing.expect(std.mem.indexOf(u8, buf[0..written], "Test") != null);
+}
+
+test "format html" {
+    var t: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{ .cols = 80, .rows = 24, .max_scrollback = 10_000 },
+    ));
+    defer terminal_c.free(t);
+
+    terminal_c.vt_write(t, "Html", 4);
+
+    var f: Formatter = null;
+    try testing.expectEqual(Result.success, terminal_new(
+        &lib_alloc.test_allocator,
+        &f,
+        t,
+        .{ .emit = .html, .unwrap = false, .trim = true, .extra = .none },
+    ));
+    defer free(f);
+
+    var buf: [65536]u8 = undefined;
+    var written: usize = 0;
+    try testing.expectEqual(Result.success, format(f, &buf, buf.len, &written));
+    try testing.expect(written > 0);
+    try testing.expect(std.mem.indexOf(u8, buf[0..written], "Html") != null);
+}
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 31e1b40eb..d2b477f95 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -1,4 +1,5 @@
 pub const color = @import("color.zig");
+pub const formatter = @import("formatter.zig");
 pub const osc = @import("osc.zig");
 pub const key_event = @import("key_event.zig");
 pub const key_encode = @import("key_encode.zig");
@@ -17,6 +18,10 @@ pub const osc_command_data = osc.commandData;
 
 pub const color_rgb_get = color.rgb_get;
 
+pub const formatter_terminal_new = formatter.terminal_new;
+pub const formatter_format = formatter.format;
+pub const formatter_free = formatter.free;
+
 pub const sgr_new = sgr.new;
 pub const sgr_free = sgr.free;
 pub const sgr_reset = sgr.reset;
@@ -62,6 +67,7 @@ pub const terminal_scroll_viewport = terminal.scroll_viewport;
 
 test {
     _ = color;
+    _ = formatter;
     _ = osc;
     _ = key_event;
     _ = key_encode;
diff --git a/src/terminal/c/result.zig b/src/terminal/c/result.zig
index e9b5fc5e6..b76326e46 100644
--- a/src/terminal/c/result.zig
+++ b/src/terminal/c/result.zig
@@ -3,4 +3,5 @@ pub const Result = enum(c_int) {
     success = 0,
     out_of_memory = -1,
     invalid_value = -2,
+    out_of_space = -3,
 };
diff --git a/src/terminal/formatter.zig b/src/terminal/formatter.zig
index f3b503d29..a68f61934 100644
--- a/src/terminal/formatter.zig
+++ b/src/terminal/formatter.zig
@@ -1,5 +1,8 @@
 const std = @import("std");
+const build_options = @import("terminal_options");
 const assert = @import("../quirks.zig").inlineAssert;
+const lib = @import("../lib/main.zig");
+const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
 const Allocator = std.mem.Allocator;
 const color = @import("color.zig");
 const size = @import("size.zig");
@@ -19,46 +22,47 @@ const Selection = @import("Selection.zig");
 const Style = @import("style.zig").Style;
 
 /// Formats available.
-pub const Format = enum {
-    /// Plain text.
-    plain,
+pub const Format = lib.Enum(lib_target, &.{
+    // Plain text.
+    "plain",
 
-    /// Include VT sequences to preserve colors, styles, URLs, etc.
-    /// This is predominantly SGR sequences but may contain others as needed.
-    ///
-    /// Note that for reference colors, like palette indices, this will
-    /// vary based on the formatter and you should see the docs. For example,
-    /// PageFormatter with VT will emit SGR sequences with palette indices,
-    /// not the color itself.
-    ///
-    /// For VT, newlines will be emitted as `\r\n` so that the cursor properly
-    /// moves back to the beginning prior emitting follow-up lines.
-    vt,
+    // Include VT sequences to preserve colors, styles, URLs, etc.
+    // This is predominantly SGR sequences but may contain others as needed.
+    //
+    // Note that for reference colors, like palette indices, this will
+    // vary based on the formatter and you should see the docs. For example,
+    // PageFormatter with VT will emit SGR sequences with palette indices,
+    // not the color itself.
+    //
+    // For VT, newlines will be emitted as `\r\n` so that the cursor properly
+    // moves back to the beginning prior emitting follow-up lines.
+    "vt",
 
-    /// HTML output.
-    ///
-    /// This will emit inline styles for as much styling as possible,
-    /// in the interest of simplicity and ease of editing. This isn't meant
-    /// to build the most beautiful or efficient HTML, but rather to be
-    /// stylistically correct.
-    ///
-    /// For colors, RGB values are emitted as inline CSS (#RRGGBB) while palette
-    /// indices use CSS variables (var(--vt-palette-N)). The palette colors are
-    /// emitted by TerminalFormatter.Extra.palette as a <style> block if you
-    /// want to also include that. But if you only format a screen or lower,
-    /// the formatter doesn't have access to the current palette to render it.
-    ///
-    /// Newlines are emitted as actual '\n' characters. Consumers should use
-    /// CSS white-space: pre or pre-wrap to preserve spacing and alignment.
-    html,
+    // HTML output.
+    //
+    // This will emit inline styles for as much styling as possible,
+    // in the interest of simplicity and ease of editing. This isn't meant
+    // to build the most beautiful or efficient HTML, but rather to be
+    // stylistically correct.
+    //
+    // For colors, RGB values are emitted as inline CSS (#RRGGBB) while palette
+    // indices use CSS variables (var(--vt-palette-N)). The palette colors are
+    // emitted by TerminalFormatter.Extra.palette as a <style> block if you
+    // want to also include that. But if you only format a screen or lower,
+    // the formatter doesn't have access to the current palette to render it.
+    //
+    // Newlines are emitted as actual '\n' characters. Consumers should use
+    // CSS white-space: pre or pre-wrap to preserve spacing and alignment.
+    "html",
+});
 
-    pub fn styled(self: Format) bool {
-        return switch (self) {
-            .plain => false,
-            .html, .vt => true,
-        };
-    }
-};
+/// Returns true if the format emits styled output (not plaintext).
+pub fn formatStyled(fmt: Format) bool {
+    return switch (fmt) {
+        .plain => false,
+        .html, .vt => true,
+    };
+}
 
 pub const CodepointMap = struct {
     /// Unicode codepoint range to replace.
@@ -1130,7 +1134,7 @@ pub const PageFormatter = struct {
                     // If we're emitting styled output (not plaintext) and
                     // the cell has some kind of styling or is not empty
                     // then this isn't blank.
-                    if (self.opts.emit.styled() and
+                    if (formatStyled(self.opts.emit) and
                         (!cell.isEmpty() or cell.hasStyling())) break :blank;
 
                     // Cells with no text are blank
@@ -1186,7 +1190,7 @@ pub const PageFormatter = struct {
                 style: {
                     // If we aren't emitting styled output then we don't
                     // have to worry about styles.
-                    if (!self.opts.emit.styled()) break :style;
+                    if (!formatStyled(self.opts.emit)) break :style;
 
                     // Get our cell style.
                     const cell_style = self.cellStyle(cell);

From 4e494ccd688cd44f92d010cdd6fa46412339f69e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 14 Mar 2026 14:20:23 -0700
Subject: [PATCH 160/391] lib: lib.Struct can convert packed structs to extern
 structs

---
 src/lib/struct.zig | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/lib/struct.zig b/src/lib/struct.zig
index d494da2e6..134f6bebc 100644
--- a/src/lib/struct.zig
+++ b/src/lib/struct.zig
@@ -1,6 +1,17 @@
 const std = @import("std");
+const testing = std.testing;
 const Target = @import("target.zig").Target;
 
+/// Create a struct type that is C ABI compatible from a Zig struct type.
+///
+/// When the target is `.zig`, the original struct type is returned as-is.
+/// When the target is `.c`, the struct is recreated with an `extern` layout,
+/// ensuring a stable, C-compatible memory layout.
+///
+/// This handles packed structs by resolving zero alignments to the natural
+/// alignment of each field's type, since extern structs require explicit
+/// alignment. This means packed struct fields like `bool` will take up
+/// their full size (1 byte) rather than being bit-packed.
 pub fn Struct(
     comptime target: Target,
     comptime Zig: type,
@@ -16,7 +27,7 @@ pub fn Struct(
                     .type = field.type,
                     .default_value_ptr = field.default_value_ptr,
                     .is_comptime = field.is_comptime,
-                    .alignment = field.alignment,
+                    .alignment = if (field.alignment > 0) field.alignment else @alignOf(field.type),
                 };
             }
 
@@ -29,3 +40,20 @@ pub fn Struct(
         },
     };
 }
+
+test "packed struct converts to extern with full-size bools" {
+    const Packed = packed struct {
+        flag1: bool,
+        flag2: bool,
+        value: u8,
+    };
+
+    const C = Struct(.c, Packed);
+    const info = @typeInfo(C).@"struct";
+
+    try testing.expectEqual(.@"extern", info.layout);
+    try testing.expectEqual(@as(usize, 1), @sizeOf(@FieldType(C, "flag1")));
+    try testing.expectEqual(@as(usize, 1), @sizeOf(@FieldType(C, "flag2")));
+    try testing.expectEqual(@as(usize, 1), @sizeOf(@FieldType(C, "value")));
+    try testing.expectEqual(@as(usize, 3), @sizeOf(C));
+}

From 09d3ebd80df2988dd48cc94a4826a226a7c2d269 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 14 Mar 2026 14:26:20 -0700
Subject: [PATCH 161/391] vt: use explicit options structs

---
 include/ghostty/vt/formatter.h | 55 +++++++++++++++++----
 src/terminal/c/formatter.zig   | 88 ++++++++++++++++++++++++++--------
 2 files changed, 114 insertions(+), 29 deletions(-)

diff --git a/include/ghostty/vt/formatter.h b/include/ghostty/vt/formatter.h
index 24f5212ff..39042fff6 100644
--- a/include/ghostty/vt/formatter.h
+++ b/include/ghostty/vt/formatter.h
@@ -47,21 +47,58 @@ typedef enum {
   GHOSTTY_FORMATTER_FORMAT_HTML,
 } GhosttyFormatterFormat;
 
+/**
+ * Extra screen state to include in styled output.
+ *
+ * @ingroup formatter
+ */
+typedef struct {
+  /** Emit cursor position using CUP (CSI H). */
+  bool cursor;
+
+  /** Emit current SGR style state based on the cursor's active style_id. */
+  bool style;
+
+  /** Emit current hyperlink state using OSC 8 sequences. */
+  bool hyperlink;
+
+  /** Emit character protection mode using DECSCA. */
+  bool protection;
+
+  /** Emit Kitty keyboard protocol state using CSI > u and CSI = sequences. */
+  bool kitty_keyboard;
+
+  /** Emit character set designations and invocations. */
+  bool charsets;
+} GhosttyFormatterScreenExtra;
+
 /**
  * Extra terminal state to include in styled output.
  *
  * @ingroup formatter
  */
-typedef enum {
-  /** Emit no extra state. */
-  GHOSTTY_FORMATTER_EXTRA_NONE,
+typedef struct {
+  /** Emit the palette using OSC 4 sequences. */
+  bool palette;
 
-  /** Emit style-relevant state (palette, cursor style, hyperlinks). */
-  GHOSTTY_FORMATTER_EXTRA_STYLES,
+  /** Emit terminal modes that differ from their defaults using CSI h/l. */
+  bool modes;
 
-  /** Emit all state to reconstruct terminal as closely as possible. */
-  GHOSTTY_FORMATTER_EXTRA_ALL,
-} GhosttyFormatterExtra;
+  /** Emit scrolling region state using DECSTBM and DECSLRM sequences. */
+  bool scrolling_region;
+
+  /** Emit tabstop positions by clearing all tabs and setting each one. */
+  bool tabstops;
+
+  /** Emit the present working directory using OSC 7. */
+  bool pwd;
+
+  /** Emit keyboard modes such as ModifyOtherKeys. */
+  bool keyboard;
+
+  /** Screen-level extras. */
+  GhosttyFormatterScreenExtra screen;
+} GhosttyFormatterTerminalExtra;
 
 /**
  * Opaque handle to a formatter instance.
@@ -86,7 +123,7 @@ typedef struct {
   bool trim;
 
   /** Extra terminal state to include in styled output. */
-  GhosttyFormatterExtra extra;
+  GhosttyFormatterTerminalExtra extra;
 } GhosttyFormatterTerminalOptions;
 
 /**
diff --git a/src/terminal/c/formatter.zig b/src/terminal/c/formatter.zig
index 8b66f781a..84b988471 100644
--- a/src/terminal/c/formatter.zig
+++ b/src/terminal/c/formatter.zig
@@ -23,11 +23,35 @@ pub const Formatter = ?*FormatterWrapper;
 /// C: GhosttyFormatterFormat
 pub const Format = formatterpkg.Format;
 
-/// C: GhosttyFormatterExtra
-pub const Extra = enum(c_int) {
-    none = 0,
-    styles = 1,
-    all = 2,
+/// C: GhosttyFormatterScreenOptions
+pub const ScreenOptions = extern struct {
+    /// C: GhosttyFormatterScreenExtra
+    pub const Extra = extern struct {
+        cursor: bool,
+        style: bool,
+        hyperlink: bool,
+        protection: bool,
+        kitty_keyboard: bool,
+        charsets: bool,
+
+        comptime {
+            for (std.meta.fieldNames(formatterpkg.ScreenFormatter.Extra)) |name| {
+                if (!@hasField(Extra, name))
+                    @compileError("ScreenOptions.Extra missing field: " ++ name);
+            }
+        }
+
+        fn toZig(self: Extra) formatterpkg.ScreenFormatter.Extra {
+            return .{
+                .cursor = self.cursor,
+                .style = self.style,
+                .hyperlink = self.hyperlink,
+                .protection = self.protection,
+                .kitty_keyboard = self.kitty_keyboard,
+                .charsets = self.charsets,
+            };
+        }
+    };
 };
 
 /// C: GhosttyFormatterTerminalOptions
@@ -36,6 +60,36 @@ pub const TerminalOptions = extern struct {
     unwrap: bool,
     trim: bool,
     extra: Extra,
+
+    /// C: GhosttyFormatterTerminalExtra
+    pub const Extra = extern struct {
+        palette: bool,
+        modes: bool,
+        scrolling_region: bool,
+        tabstops: bool,
+        pwd: bool,
+        keyboard: bool,
+        screen: ScreenOptions.Extra,
+
+        comptime {
+            for (std.meta.fieldNames(formatterpkg.TerminalFormatter.Extra)) |name| {
+                if (!@hasField(Extra, name))
+                    @compileError("TerminalOptions.Extra missing field: " ++ name);
+            }
+        }
+
+        fn toZig(self: Extra) formatterpkg.TerminalFormatter.Extra {
+            return .{
+                .palette = self.palette,
+                .modes = self.modes,
+                .scrolling_region = self.scrolling_region,
+                .tabstops = self.tabstops,
+                .pwd = self.pwd,
+                .keyboard = self.keyboard,
+                .screen = self.screen.toZig(),
+            };
+        }
+    };
 };
 
 pub fn terminal_new(
@@ -74,18 +128,12 @@ fn terminal_new_(
         return error.OutOfMemory;
     errdefer alloc.destroy(ptr);
 
-    const extra: formatterpkg.TerminalFormatter.Extra = switch (opts.extra) {
-        .none => .none,
-        .styles => .styles,
-        .all => .all,
-    };
-
     var formatter: formatterpkg.TerminalFormatter = .init(t, .{
         .emit = opts.emit,
         .unwrap = opts.unwrap,
         .trim = opts.trim,
     });
-    formatter.extra = extra;
+    formatter.extra = opts.extra.toZig();
 
     ptr.* = .{
         .kind = .{ .terminal = formatter },
@@ -145,7 +193,7 @@ test "terminal_new/free" {
         &lib_alloc.test_allocator,
         &f,
         t,
-        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .none },
+        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .{ .palette = false, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = false, .hyperlink = false, .protection = false, .kitty_keyboard = false, .charsets = false } } },
     ));
     try testing.expect(f != null);
     free(f);
@@ -157,7 +205,7 @@ test "terminal_new invalid_value on null terminal" {
         &lib_alloc.test_allocator,
         &f,
         null,
-        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .none },
+        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .{ .palette = false, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = false, .hyperlink = false, .protection = false, .kitty_keyboard = false, .charsets = false } } },
     ));
     try testing.expect(f == null);
 }
@@ -182,7 +230,7 @@ test "format plain" {
         &lib_alloc.test_allocator,
         &f,
         t,
-        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .none },
+        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .{ .palette = false, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = false, .hyperlink = false, .protection = false, .kitty_keyboard = false, .charsets = false } } },
     ));
     defer free(f);
 
@@ -208,7 +256,7 @@ test "format reflects terminal changes" {
         &lib_alloc.test_allocator,
         &f,
         t,
-        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .none },
+        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .{ .palette = false, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = false, .hyperlink = false, .protection = false, .kitty_keyboard = false, .charsets = false } } },
     ));
     defer free(f);
 
@@ -240,7 +288,7 @@ test "format null returns required size" {
         &lib_alloc.test_allocator,
         &f,
         t,
-        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .none },
+        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .{ .palette = false, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = false, .hyperlink = false, .protection = false, .kitty_keyboard = false, .charsets = false } } },
     ));
     defer free(f);
 
@@ -272,7 +320,7 @@ test "format buffer too small" {
         &lib_alloc.test_allocator,
         &f,
         t,
-        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .none },
+        .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .{ .palette = false, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = false, .hyperlink = false, .protection = false, .kitty_keyboard = false, .charsets = false } } },
     ));
     defer free(f);
 
@@ -305,7 +353,7 @@ test "format vt" {
         &lib_alloc.test_allocator,
         &f,
         t,
-        .{ .emit = .vt, .unwrap = false, .trim = true, .extra = .styles },
+        .{ .emit = .vt, .unwrap = false, .trim = true, .extra = .{ .palette = true, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = true, .hyperlink = true, .protection = false, .kitty_keyboard = false, .charsets = false } } },
     ));
     defer free(f);
 
@@ -332,7 +380,7 @@ test "format html" {
         &lib_alloc.test_allocator,
         &f,
         t,
-        .{ .emit = .html, .unwrap = false, .trim = true, .extra = .none },
+        .{ .emit = .html, .unwrap = false, .trim = true, .extra = .{ .palette = false, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = false, .hyperlink = false, .protection = false, .kitty_keyboard = false, .charsets = false } } },
     ));
     defer free(f);
 

From a2d570b51e059fc9fc572dcb155e81215a9c51bc Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 14 Mar 2026 14:33:52 -0700
Subject: [PATCH 162/391] vt: add sized struct pattern and types.h

Add a size field as the first member of formatter option structs
(TerminalOptions, TerminalOptions.Extra, ScreenOptions.Extra) for ABI
compatibility. This allows adding new fields without breaking callers
compiled against older versions of the struct.

Introduce include/ghostty/vt/types.h as the foundational header
containing GhosttyResult and the GHOSTTY_INIT_SIZED macro for
zero-initializing sized structs. Remove the separate result.h header,
moving its contents into types.h.
---
 include/ghostty/vt.h             |  2 +-
 include/ghostty/vt/formatter.h   | 11 +++++++-
 include/ghostty/vt/key/encoder.h |  2 +-
 include/ghostty/vt/key/event.h   |  2 +-
 include/ghostty/vt/osc.h         |  2 +-
 include/ghostty/vt/result.h      | 24 -----------------
 include/ghostty/vt/sgr.h         |  2 +-
 include/ghostty/vt/terminal.h    |  2 +-
 include/ghostty/vt/types.h       | 45 ++++++++++++++++++++++++++++++++
 src/terminal/c/AGENTS.md         | 12 +++++++++
 src/terminal/c/formatter.zig     |  3 +++
 11 files changed, 76 insertions(+), 31 deletions(-)
 delete mode 100644 include/ghostty/vt/result.h
 create mode 100644 include/ghostty/vt/types.h

diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index 378c03453..26ecf7889 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -73,7 +73,7 @@
 extern "C" {
 #endif
 
-#include <ghostty/vt/result.h>
+#include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
 #include <ghostty/vt/formatter.h>
 #include <ghostty/vt/terminal.h>
diff --git a/include/ghostty/vt/formatter.h b/include/ghostty/vt/formatter.h
index 39042fff6..72f4dff58 100644
--- a/include/ghostty/vt/formatter.h
+++ b/include/ghostty/vt/formatter.h
@@ -11,7 +11,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <ghostty/vt/allocator.h>
-#include <ghostty/vt/result.h>
+#include <ghostty/vt/types.h>
 #include <ghostty/vt/terminal.h>
 
 #ifdef __cplusplus
@@ -53,6 +53,9 @@ typedef enum {
  * @ingroup formatter
  */
 typedef struct {
+  /** Size of this struct in bytes. Must be set to sizeof(GhosttyFormatterScreenExtra). */
+  size_t size;
+
   /** Emit cursor position using CUP (CSI H). */
   bool cursor;
 
@@ -78,6 +81,9 @@ typedef struct {
  * @ingroup formatter
  */
 typedef struct {
+  /** Size of this struct in bytes. Must be set to sizeof(GhosttyFormatterTerminalExtra). */
+  size_t size;
+
   /** Emit the palette using OSC 4 sequences. */
   bool palette;
 
@@ -113,6 +119,9 @@ typedef struct GhosttyFormatter* GhosttyFormatter;
  * @ingroup formatter
  */
 typedef struct {
+  /** Size of this struct in bytes. Must be set to sizeof(GhosttyFormatterTerminalOptions). */
+  size_t size;
+
   /** Output format to emit. */
   GhosttyFormatterFormat emit;
 
diff --git a/include/ghostty/vt/key/encoder.h b/include/ghostty/vt/key/encoder.h
index 766a29427..5e8b6d80b 100644
--- a/include/ghostty/vt/key/encoder.h
+++ b/include/ghostty/vt/key/encoder.h
@@ -9,7 +9,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <ghostty/vt/result.h>
+#include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
 #include <ghostty/vt/key/event.h>
 
diff --git a/include/ghostty/vt/key/event.h b/include/ghostty/vt/key/event.h
index dbd2e9f84..2fe455112 100644
--- a/include/ghostty/vt/key/event.h
+++ b/include/ghostty/vt/key/event.h
@@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <ghostty/vt/result.h>
+#include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
 
 /**
diff --git a/include/ghostty/vt/osc.h b/include/ghostty/vt/osc.h
index f53077ab3..69f7d1e55 100644
--- a/include/ghostty/vt/osc.h
+++ b/include/ghostty/vt/osc.h
@@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <ghostty/vt/result.h>
+#include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
 
 /**
diff --git a/include/ghostty/vt/result.h b/include/ghostty/vt/result.h
deleted file mode 100644
index 6a47d35cc..000000000
--- a/include/ghostty/vt/result.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file result.h
- *
- * Result codes for libghostty-vt operations.
- */
-
-#ifndef GHOSTTY_VT_RESULT_H
-#define GHOSTTY_VT_RESULT_H
-
-/**
- * Result codes for libghostty-vt operations.
- */
-typedef enum {
-    /** Operation completed successfully */
-    GHOSTTY_SUCCESS = 0,
-    /** Operation failed due to failed allocation */
-    GHOSTTY_OUT_OF_MEMORY = -1,
-    /** Operation failed due to invalid value */
-    GHOSTTY_INVALID_VALUE = -2,
-    /** Operation failed because the provided buffer was too small */
-    GHOSTTY_OUT_OF_SPACE = -3,
-} GhosttyResult;
-
-#endif /* GHOSTTY_VT_RESULT_H */
diff --git a/include/ghostty/vt/sgr.h b/include/ghostty/vt/sgr.h
index 5aaa368d2..c81c1c87a 100644
--- a/include/ghostty/vt/sgr.h
+++ b/include/ghostty/vt/sgr.h
@@ -73,7 +73,7 @@
 
 #include <ghostty/vt/allocator.h>
 #include <ghostty/vt/color.h>
-#include <ghostty/vt/result.h>
+#include <ghostty/vt/types.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 6dc817392..7a79cb958 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -9,7 +9,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <ghostty/vt/result.h>
+#include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
 
 #ifdef __cplusplus
diff --git a/include/ghostty/vt/types.h b/include/ghostty/vt/types.h
new file mode 100644
index 000000000..12ace266e
--- /dev/null
+++ b/include/ghostty/vt/types.h
@@ -0,0 +1,45 @@
+/**
+ * @file types.h
+ *
+ * Common types, macros, and utilities for libghostty-vt.
+ */
+
+#ifndef GHOSTTY_VT_TYPES_H
+#define GHOSTTY_VT_TYPES_H
+
+/**
+ * Result codes for libghostty-vt operations.
+ */
+typedef enum {
+    /** Operation completed successfully */
+    GHOSTTY_SUCCESS = 0,
+    /** Operation failed due to failed allocation */
+    GHOSTTY_OUT_OF_MEMORY = -1,
+    /** Operation failed due to invalid value */
+    GHOSTTY_INVALID_VALUE = -2,
+    /** Operation failed because the provided buffer was too small */
+    GHOSTTY_OUT_OF_SPACE = -3,
+} GhosttyResult;
+
+/**
+ * Initialize a sized struct to zero and set its size field.
+ *
+ * Sized structs use a `size` field as the first member for ABI
+ * compatibility. This macro zero-initializes the struct and sets the
+ * size field to `sizeof(type)`, which allows the library to detect
+ * which version of the struct the caller was compiled against.
+ *
+ * @param type The struct type to initialize
+ * @return A zero-initialized struct with the size field set
+ *
+ * Example:
+ * @code
+ * GhosttyFormatterTerminalOptions opts = GHOSTTY_INIT_SIZED(GhosttyFormatterTerminalOptions);
+ * opts.emit = GHOSTTY_FORMATTER_FORMAT_PLAIN;
+ * opts.trim = true;
+ * @endcode
+ */
+#define GHOSTTY_INIT_SIZED(type) \
+  ((type){ .size = sizeof(type) })
+
+#endif /* GHOSTTY_VT_TYPES_H */
diff --git a/src/terminal/c/AGENTS.md b/src/terminal/c/AGENTS.md
index fa922c6ba..63f7fc6cc 100644
--- a/src/terminal/c/AGENTS.md
+++ b/src/terminal/c/AGENTS.md
@@ -8,3 +8,15 @@
   in `include/ghostty/vt.h`.
 - In `include/ghostty/vt.h`, always sort the header contents by:
   (1) macros, (2) forward declarations, (3) types, (4) functions
+
+## ABI Compatibility
+
+- Prefer opaque pointers for long-lived objects, such as
+  `GhosttyTerminal`.
+- Structs:
+  - May contain padding bytes if we're confident we'll never grow
+    beyond a certain size.
+  - May use the "sized struct" pattern: an `extern struct` with
+    `size: usize = @sizeOf(Self)` as the first field. In the C header,
+    callers use `GHOSTTY_INIT_SIZED` from `types.h` to zero-initialize and
+    set the size.
diff --git a/src/terminal/c/formatter.zig b/src/terminal/c/formatter.zig
index 84b988471..a9c0e62ab 100644
--- a/src/terminal/c/formatter.zig
+++ b/src/terminal/c/formatter.zig
@@ -27,6 +27,7 @@ pub const Format = formatterpkg.Format;
 pub const ScreenOptions = extern struct {
     /// C: GhosttyFormatterScreenExtra
     pub const Extra = extern struct {
+        size: usize = @sizeOf(Extra),
         cursor: bool,
         style: bool,
         hyperlink: bool,
@@ -56,6 +57,7 @@ pub const ScreenOptions = extern struct {
 
 /// C: GhosttyFormatterTerminalOptions
 pub const TerminalOptions = extern struct {
+    size: usize = @sizeOf(TerminalOptions),
     emit: Format,
     unwrap: bool,
     trim: bool,
@@ -63,6 +65,7 @@ pub const TerminalOptions = extern struct {
 
     /// C: GhosttyFormatterTerminalExtra
     pub const Extra = extern struct {
+        size: usize = @sizeOf(Extra),
         palette: bool,
         modes: bool,
         scrolling_region: bool,

From 7c12d6e35d9e1cc28f71877559c17b4088f32532 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 14 Mar 2026 14:55:33 -0700
Subject: [PATCH 163/391] agents: skill for writing commit messages

---
 .agents/commands/gh-issue                     | 64 -------------------
 .../skills/writing-commit-messages/SKILL.md   | 62 ++++++++++++++++++
 2 files changed, 62 insertions(+), 64 deletions(-)
 delete mode 100755 .agents/commands/gh-issue
 create mode 100644 .agents/skills/writing-commit-messages/SKILL.md

diff --git a/.agents/commands/gh-issue b/.agents/commands/gh-issue
deleted file mode 100755
index de2f37335..000000000
--- a/.agents/commands/gh-issue
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env nu
-
-# A command to generate an agent prompt to diagnose and formulate 
-# a plan for resolving a GitHub issue.
-#
-# IMPORTANT: This command is prompted to NOT write any code and to ONLY
-# produce a plan. You should still be vigilant when running this but that
-# is the expected behavior.
-# 
-# The `<issue>` parameter can be either an issue number or a full GitHub
-# issue URL.
-def main [
-  issue: any, # Ghostty issue number or URL
-  --repo: string = "ghostty-org/ghostty" # GitHub repository in the format "owner/repo"
-] {
-  # TODO: This whole script doesn't handle errors very well. I actually
-  # don't know Nu well enough to know the proper way to handle it all.
-  
-  let issueData = gh issue view $issue --json author,title,number,body,comments | from json
-  let comments = $issueData.comments | each { |comment|
-    $"
-### Comment by ($comment.author.login)
-($comment.body)
-" | str trim
-  } | str join "\n\n"
-
-  $"
-Deep-dive on this GitHub issue. Find the problem and generate a plan. 
-Do not write code. Explain the problem clearly and propose a comprehensive plan 
-to solve it.
-
-# ($issueData.title) \(($issueData.number)\)
-
-## Description
-($issueData.body)
-
-## Comments
-($comments)
-
-## Your Tasks
-
-You are an experienced software developer tasked with diagnosing issues.
-
-1. Review the issue context and details. 
-2. Examine the relevant parts of the codebase. Analyze the code thoroughly
-   until you have a solid understanding of how it works.
-3. Explain the issue in detail, including the problem and its root cause.
-4. Create a comprehensive plan to solve the issue. The plan should include:
-   - Required code changes
-   - Potential impacts on other parts of the system
-   - Necessary tests to be written or updated
-   - Documentation updates
-   - Performance considerations
-   - Security implications
-   - Backwards compatibility \(if applicable\)
-   - Include the reference link to the source issue and any related discussions
-4. Think deeply about all aspects of the task. Consider edge cases, potential
-   challenges, and best practices for addressing the issue. Review the plan 
-   with the oracle and adjust it based on its feedback.
-
-**ONLY CREATE A PLAN. DO NOT WRITE ANY CODE.** Your task is to create
-a thorough, comprehensive strategy for understanding and resolving the issue.
-" | str trim
-}
diff --git a/.agents/skills/writing-commit-messages/SKILL.md b/.agents/skills/writing-commit-messages/SKILL.md
new file mode 100644
index 000000000..dedadbe5e
--- /dev/null
+++ b/.agents/skills/writing-commit-messages/SKILL.md
@@ -0,0 +1,62 @@
+---
+name: writing-commit-messages
+description: >-
+  Writes Git commit messages. Activates when the user asks to write
+  a commit message, draft a commit message, or similar.
+---
+
+# Writing Commit Messages
+
+Write commit messages that follow commit style guidelines for the project.
+
+## Format
+
+```
+<subsystem>: <summary>
+
+<reference issues/PRs/etc.>
+
+<long form description>
+```
+
+## Rules
+
+### Subject line
+
+- **Subsystem prefix**: Use a short, lowercase identifier for the
+  area of code changed (e.g., `terminal`, `vt`, `lib`, `config`,
+  `font`). Determine this from the file paths in the diff. If
+  changes span the macOS app, use `macos`. For GTK, use `gtk`. For
+  build system, use `build`. Use nested subsystems with `/` when
+  helpful and exclusive (e.g., `terminal/osc`).
+- **Summary**: Lowercase start (not capitalized), imperative mood,
+  no trailing period. Keep it concise—ideally under 60 characters
+  total for the whole subject line.
+
+### References
+
+- If the change relates to a GitHub issue, PR, or discussion, list
+  the relevant numbers on their own lines after the subject, separated
+  by a blank line. E.g. `#1234`
+- If there are no references, omit this section entirely (no blank
+  line).
+
+### Long form description
+
+- Describe **what changed**, **what the previous behavior was**,
+  and **how the new behavior works** at a high level.
+- Use plain prose, not bullet points. Wrap lines at ~72 characters.
+- Focus on the _why_ and _how_ rather than restating the diff.
+- Keep the tone direct and technical without no filler phrases.
+- Don't exceed a handful of paragraphs; less is more.
+
+## Workflow
+
+- If `.jj` is present, use `jj` instead of `git` for all commands.
+- Run a diff to see what changes are present since the last commit.
+- Identify the subsystem from the changed file paths.
+- Identify any referenced issues/PRs from the diff context or
+  branch name.
+- Draft the commit message following the format above.
+- Apply the commit
+- Don't push the commit; leave that to the user.

From 3c8feda118cc4bd51cadc5f4c98e54158716a2c0 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 14 Mar 2026 14:49:31 -0700
Subject: [PATCH 164/391] vt: add format_alloc to C API formatter

Rename the existing format function to format_buf to clarify that it
writes into a caller-provided buffer. Add a new format_alloc variant
that allocates the output buffer internally using the provided
allocator (or the default if NULL). The caller receives the allocated
pointer and length and is responsible for freeing it.

This is useful for consumers that do not know the required buffer size
ahead of time and want to avoid the two-pass query-then-format pattern
needed with format_buf.
---
 include/ghostty/vt/formatter.h | 30 ++++++++++++++++++++----
 src/lib_vt.zig                 |  3 ++-
 src/terminal/c/formatter.zig   | 42 ++++++++++++++++++++++++++--------
 src/terminal/c/main.zig        |  3 ++-
 4 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/include/ghostty/vt/formatter.h b/include/ghostty/vt/formatter.h
index 72f4dff58..7f0519649 100644
--- a/include/ghostty/vt/formatter.h
+++ b/include/ghostty/vt/formatter.h
@@ -176,10 +176,32 @@ GhosttyResult ghostty_formatter_terminal_new(
  *
  * @ingroup formatter
  */
-GhosttyResult ghostty_formatter_format(GhosttyFormatter formatter,
-                                       uint8_t* buf,
-                                       size_t buf_len,
-                                       size_t* out_written);
+GhosttyResult ghostty_formatter_format_buf(GhosttyFormatter formatter,
+                                           uint8_t* buf,
+                                           size_t buf_len,
+                                           size_t* out_written);
+
+/**
+ * Run the formatter and return an allocated buffer with the output.
+ *
+ * Each call formats the current terminal state. The buffer is allocated
+ * using the provided allocator (or the default allocator if NULL).
+ * The caller is responsible for freeing the returned buffer using the
+ * same allocator.
+ *
+ * @param formatter The formatter handle (must not be NULL)
+ * @param allocator Pointer to allocator, or NULL to use the default allocator
+ * @param out_ptr Pointer to receive the allocated buffer
+ * @param out_len Pointer to receive the length of the output in bytes
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_OUT_OF_MEMORY on allocation
+ *         failure
+ *
+ * @ingroup formatter
+ */
+GhosttyResult ghostty_formatter_format_alloc(GhosttyFormatter formatter,
+                                             const GhosttyAllocator* allocator,
+                                             uint8_t** out_ptr,
+                                             size_t* out_len);
 
 /**
  * Free a formatter instance.
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 3e1aa9d8d..42ef1d8f5 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -144,7 +144,8 @@ comptime {
         @export(&c.sgr_attribute_tag, .{ .name = "ghostty_sgr_attribute_tag" });
         @export(&c.sgr_attribute_value, .{ .name = "ghostty_sgr_attribute_value" });
         @export(&c.formatter_terminal_new, .{ .name = "ghostty_formatter_terminal_new" });
-        @export(&c.formatter_format, .{ .name = "ghostty_formatter_format" });
+        @export(&c.formatter_format_buf, .{ .name = "ghostty_formatter_format_buf" });
+        @export(&c.formatter_format_alloc, .{ .name = "ghostty_formatter_format_alloc" });
         @export(&c.formatter_free, .{ .name = "ghostty_formatter_free" });
         @export(&c.terminal_new, .{ .name = "ghostty_terminal_new" });
         @export(&c.terminal_free, .{ .name = "ghostty_terminal_free" });
diff --git a/src/terminal/c/formatter.zig b/src/terminal/c/formatter.zig
index a9c0e62ab..511d371f8 100644
--- a/src/terminal/c/formatter.zig
+++ b/src/terminal/c/formatter.zig
@@ -146,7 +146,7 @@ fn terminal_new_(
     return ptr;
 }
 
-pub fn format(
+pub fn format_buf(
     formatter_: Formatter,
     out_: ?[*]u8,
     out_len: usize,
@@ -176,6 +176,28 @@ pub fn format(
     return .success;
 }
 
+pub fn format_alloc(
+    formatter_: Formatter,
+    alloc_: ?*const CAllocator,
+    out_ptr: *?[*]u8,
+    out_len: *usize,
+) callconv(.c) Result {
+    const wrapper = formatter_ orelse return .invalid_value;
+    const alloc = lib_alloc.default(alloc_);
+
+    var aw: std.Io.Writer.Allocating = .init(alloc);
+    defer aw.deinit();
+
+    switch (wrapper.kind) {
+        .terminal => |*t| t.format(&aw.writer) catch return .out_of_memory,
+    }
+
+    const buf = aw.toOwnedSlice() catch return .out_of_memory;
+    out_ptr.* = buf.ptr;
+    out_len.* = buf.len;
+    return .success;
+}
+
 pub fn free(formatter_: Formatter) callconv(.c) void {
     const wrapper = formatter_ orelse return;
     const alloc = wrapper.alloc;
@@ -239,7 +261,7 @@ test "format plain" {
 
     var buf: [1024]u8 = undefined;
     var written: usize = 0;
-    try testing.expectEqual(Result.success, format(f, &buf, buf.len, &written));
+    try testing.expectEqual(Result.success, format_buf(f, &buf, buf.len, &written));
     try testing.expectEqualStrings("Hello", buf[0..written]);
 }
 
@@ -265,13 +287,13 @@ test "format reflects terminal changes" {
 
     var buf: [1024]u8 = undefined;
     var written: usize = 0;
-    try testing.expectEqual(Result.success, format(f, &buf, buf.len, &written));
+    try testing.expectEqual(Result.success, format_buf(f, &buf, buf.len, &written));
     try testing.expectEqualStrings("Hello", buf[0..written]);
 
     // Write more data and re-format
     terminal_c.vt_write(t, "\r\nWorld", 7);
 
-    try testing.expectEqual(Result.success, format(f, &buf, buf.len, &written));
+    try testing.expectEqual(Result.success, format_buf(f, &buf, buf.len, &written));
     try testing.expectEqualStrings("Hello\nWorld", buf[0..written]);
 }
 
@@ -297,13 +319,13 @@ test "format null returns required size" {
 
     // Pass null buffer to query required size
     var required: usize = 0;
-    try testing.expectEqual(Result.out_of_space, format(f, null, 0, &required));
+    try testing.expectEqual(Result.out_of_space, format_buf(f, null, 0, &required));
     try testing.expect(required > 0);
 
     // Now allocate and format
     var buf: [1024]u8 = undefined;
     var written: usize = 0;
-    try testing.expectEqual(Result.success, format(f, &buf, buf.len, &written));
+    try testing.expectEqual(Result.success, format_buf(f, &buf, buf.len, &written));
     try testing.expectEqual(required, written);
 }
 
@@ -330,14 +352,14 @@ test "format buffer too small" {
     // Buffer too small
     var buf: [2]u8 = undefined;
     var written: usize = 0;
-    try testing.expectEqual(Result.out_of_space, format(f, &buf, buf.len, &written));
+    try testing.expectEqual(Result.out_of_space, format_buf(f, &buf, buf.len, &written));
     // written contains the required size
     try testing.expectEqual(@as(usize, 5), written);
 }
 
 test "format null formatter" {
     var written: usize = 0;
-    try testing.expectEqual(Result.invalid_value, format(null, null, 0, &written));
+    try testing.expectEqual(Result.invalid_value, format_buf(null, null, 0, &written));
 }
 
 test "format vt" {
@@ -362,7 +384,7 @@ test "format vt" {
 
     var buf: [65536]u8 = undefined;
     var written: usize = 0;
-    try testing.expectEqual(Result.success, format(f, &buf, buf.len, &written));
+    try testing.expectEqual(Result.success, format_buf(f, &buf, buf.len, &written));
     try testing.expect(written > 0);
     try testing.expect(std.mem.indexOf(u8, buf[0..written], "Test") != null);
 }
@@ -389,7 +411,7 @@ test "format html" {
 
     var buf: [65536]u8 = undefined;
     var written: usize = 0;
-    try testing.expectEqual(Result.success, format(f, &buf, buf.len, &written));
+    try testing.expectEqual(Result.success, format_buf(f, &buf, buf.len, &written));
     try testing.expect(written > 0);
     try testing.expect(std.mem.indexOf(u8, buf[0..written], "Html") != null);
 }
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index d2b477f95..4e95bb9d4 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -19,7 +19,8 @@ pub const osc_command_data = osc.commandData;
 pub const color_rgb_get = color.rgb_get;
 
 pub const formatter_terminal_new = formatter.terminal_new;
-pub const formatter_format = formatter.format;
+pub const formatter_format_buf = formatter.format_buf;
+pub const formatter_format_alloc = formatter.format_alloc;
 pub const formatter_free = formatter.free;
 
 pub const sgr_new = sgr.new;

From 1e21ac119079bf7bc4d965666ce1f691ce4d84c5 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 14 Mar 2026 15:11:15 -0700
Subject: [PATCH 165/391] example: add c-vt-formatter example

Add an example showing how to use the ghostty-vt terminal and
formatter APIs from C. The example creates a terminal, writes
VT-encoded content with cursor movement and styling sequences,
then formats the screen contents as plain text using the formatter
API.
---
 example/c-vt-formatter/README.md     | 18 ++++++++
 example/c-vt-formatter/build.zig     | 42 +++++++++++++++++++
 example/c-vt-formatter/build.zig.zon | 24 +++++++++++
 example/c-vt-formatter/src/main.c    | 63 ++++++++++++++++++++++++++++
 include/ghostty/vt.h                 |  7 ++++
 include/ghostty/vt/formatter.h       |  4 +-
 6 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 example/c-vt-formatter/README.md
 create mode 100644 example/c-vt-formatter/build.zig
 create mode 100644 example/c-vt-formatter/build.zig.zon
 create mode 100644 example/c-vt-formatter/src/main.c

diff --git a/example/c-vt-formatter/README.md b/example/c-vt-formatter/README.md
new file mode 100644
index 000000000..f416c8dbd
--- /dev/null
+++ b/example/c-vt-formatter/README.md
@@ -0,0 +1,18 @@
+# Example: `ghostty-vt` Terminal Formatter
+
+This contains a simple example of how to use the `ghostty-vt` terminal and
+formatter APIs to create a terminal, write VT-encoded content into it, and
+format the screen contents as plain text.
+
+This uses a `build.zig` and `Zig` to build the C program so that we
+can reuse a lot of our build logic and depend directly on our source
+tree, but Ghostty emits a standard C library that can be used with any
+C tooling.
+
+## Usage
+
+Run the program:
+
+```shell-session
+zig build run
+```
diff --git a/example/c-vt-formatter/build.zig b/example/c-vt-formatter/build.zig
new file mode 100644
index 000000000..637b48f13
--- /dev/null
+++ b/example/c-vt-formatter/build.zig
@@ -0,0 +1,42 @@
+const std = @import("std");
+
+pub fn build(b: *std.Build) void {
+    const target = b.standardTargetOptions(.{});
+    const optimize = b.standardOptimizeOption(.{});
+
+    const run_step = b.step("run", "Run the app");
+
+    const exe_mod = b.createModule(.{
+        .target = target,
+        .optimize = optimize,
+    });
+    exe_mod.addCSourceFiles(.{
+        .root = b.path("src"),
+        .files = &.{"main.c"},
+    });
+
+    // You'll want to use a lazy dependency here so that ghostty is only
+    // downloaded if you actually need it.
+    if (b.lazyDependency("ghostty", .{
+        // Setting simd to false will force a pure static build that
+        // doesn't even require libc, but it has a significant performance
+        // penalty. If your embedding app requires libc anyway, you should
+        // always keep simd enabled.
+        // .simd = false,
+    })) |dep| {
+        exe_mod.linkLibrary(dep.artifact("ghostty-vt"));
+    }
+
+    // Exe
+    const exe = b.addExecutable(.{
+        .name = "c_vt_formatter",
+        .root_module = exe_mod,
+    });
+    b.installArtifact(exe);
+
+    // Run
+    const run_cmd = b.addRunArtifact(exe);
+    run_cmd.step.dependOn(b.getInstallStep());
+    if (b.args) |args| run_cmd.addArgs(args);
+    run_step.dependOn(&run_cmd.step);
+}
diff --git a/example/c-vt-formatter/build.zig.zon b/example/c-vt-formatter/build.zig.zon
new file mode 100644
index 000000000..a14f0aedb
--- /dev/null
+++ b/example/c-vt-formatter/build.zig.zon
@@ -0,0 +1,24 @@
+.{
+    .name = .c_vt_formatter,
+    .version = "0.0.0",
+    .fingerprint = 0x9e3758265677a0c4,
+    .minimum_zig_version = "0.15.1",
+    .dependencies = .{
+        // Ghostty dependency. In reality, you'd probably use a URL-based
+        // dependency like the one showed (and commented out) below this one.
+        // We use a path dependency here for simplicity and to ensure our
+        // examples always test against the source they're bundled with.
+        .ghostty = .{ .path = "../../" },
+
+        // Example of what a URL-based dependency looks like:
+        // .ghostty = .{
+        //     .url = "https://github.com/ghostty-org/ghostty/archive/COMMIT.tar.gz",
+        //     .hash = "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO36s",
+        // },
+    },
+    .paths = .{
+        "build.zig",
+        "build.zig.zon",
+        "src",
+    },
+}
diff --git a/example/c-vt-formatter/src/main.c b/example/c-vt-formatter/src/main.c
new file mode 100644
index 000000000..5d408b172
--- /dev/null
+++ b/example/c-vt-formatter/src/main.c
@@ -0,0 +1,63 @@
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ghostty/vt.h>
+
+int main() {
+  // Create a terminal with a small grid
+  GhosttyTerminal terminal;
+  GhosttyTerminalOptions opts = {
+    .cols = 80,
+    .rows = 24,
+    .max_scrollback = 0,
+  };
+  GhosttyResult result = ghostty_terminal_new(NULL, &terminal, opts);
+  assert(result == GHOSTTY_SUCCESS);
+
+  // Write VT-encoded content into the terminal to exercise various
+  // cursor movement and styling sequences.
+  const char *commands[] = {
+    "Line 1: Hello World!\r\n",           // Simple text on row 1
+    "Line 2: \033[1mBold\033[0m and "     // Bold text on row 2
+      "\033[4mUnderline\033[0m\r\n",
+    "Line 3: placeholder\r\n",            // Will be overwritten below
+    "\033[3;1H",                          // CUP: move cursor back to row 3, col 1
+    "\033[2K",                            // EL:  erase the entire line
+    "Line 3: Overwritten!\r\n",           // Rewrite row 3 with new content
+    "\033[5;10H",                         // CUP: jump to row 5, col 10
+    "Placed at (5,10)",                   // Write at that position
+    "\033[1;72H",                         // CUP: jump to row 1, col 72
+    "RIGHT->",                            // Near the right edge of row 1
+  };
+  for (size_t i = 0; i < sizeof(commands) / sizeof(commands[0]); i++) {
+    ghostty_terminal_vt_write(terminal, (const uint8_t *)commands[i],
+                              strlen(commands[i]));
+  }
+
+  // Create a plain-text formatter for the terminal
+  GhosttyFormatterTerminalOptions fmt_opts = GHOSTTY_INIT_SIZED(GhosttyFormatterTerminalOptions);
+  fmt_opts.emit = GHOSTTY_FORMATTER_FORMAT_PLAIN;
+  fmt_opts.trim = true;
+
+  GhosttyFormatter formatter;
+  result = ghostty_formatter_terminal_new(NULL, &formatter, terminal, fmt_opts);
+  assert(result == GHOSTTY_SUCCESS);
+
+  // Format into an allocated buffer
+  uint8_t *buf = NULL;
+  size_t len = 0;
+  result = ghostty_formatter_format_alloc(formatter, NULL, &buf, &len);
+  assert(result == GHOSTTY_SUCCESS);
+
+  // Print the formatted output
+  printf("Formatted output (%zu bytes):\n", len);
+  fwrite(buf, 1, len, stdout);
+  printf("\n");
+
+  // Clean up
+  free(buf);
+  ghostty_formatter_free(formatter);
+  ghostty_terminal_free(terminal);
+  return 0;
+}
diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index 26ecf7889..42cd73e37 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -43,6 +43,7 @@
  * - @ref c-vt-key-encode/src/main.c - Key encoding example
  * - @ref c-vt-paste/src/main.c - Paste safety check example
  * - @ref c-vt-sgr/src/main.c - SGR parser example
+ * - @ref c-vt-formatter/src/main.c - Terminal formatter example
  *
  */
 
@@ -66,6 +67,12 @@
  * styling sequences and extract text attributes like colors and underline styles.
  */
 
+/** @example c-vt-formatter/src/main.c
+ * This example demonstrates how to use the terminal and formatter APIs to
+ * create a terminal, write VT-encoded content into it, and format the screen
+ * contents as plain text.
+ */
+
 #ifndef GHOSTTY_VT_H
 #define GHOSTTY_VT_H
 
diff --git a/include/ghostty/vt/formatter.h b/include/ghostty/vt/formatter.h
index 7f0519649..4beb5fc77 100644
--- a/include/ghostty/vt/formatter.h
+++ b/include/ghostty/vt/formatter.h
@@ -186,7 +186,9 @@ GhosttyResult ghostty_formatter_format_buf(GhosttyFormatter formatter,
  *
  * Each call formats the current terminal state. The buffer is allocated
  * using the provided allocator (or the default allocator if NULL).
- * The caller is responsible for freeing the returned buffer using the
+ * The caller is responsible for freeing the returned buffer. When using
+ * the default allocator (NULL), the buffer can be freed with `free()`.
+ * When using a custom allocator, the buffer must be freed using the
  * same allocator.
  *
  * @param formatter The formatter handle (must not be NULL)

From 4ad7d03c56de3216f2a82c8790d0c8edb216db07 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 14 Mar 2026 15:19:56 -0700
Subject: [PATCH 166/391] terminal/formatter: safely cast discarding.count to
 usize

The Discarding writer count field is u64, but appendNTimes expects
usize which is u32 on 32-bit targets like arm-linux-androideabi.
Use std.math.cast instead of @intCast to safely handle the
conversion, returning WriteFailed on overflow rather than risking
undefined behavior.
---
 src/terminal/formatter.zig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/terminal/formatter.zig b/src/terminal/formatter.zig
index a68f61934..18e1acf53 100644
--- a/src/terminal/formatter.zig
+++ b/src/terminal/formatter.zig
@@ -293,7 +293,7 @@ pub const TerminalFormatter = struct {
                 m.map.appendNTimes(
                     m.alloc,
                     self.terminal.screens.active.pages.getTopLeft(.screen),
-                    discarding.count,
+                    std.math.cast(usize, discarding.count) orelse return error.WriteFailed,
                 ) catch return error.WriteFailed;
             }
         }
@@ -331,7 +331,7 @@ pub const TerminalFormatter = struct {
                 m.map.appendNTimes(
                     m.alloc,
                     self.terminal.screens.active.pages.getTopLeft(.screen),
-                    discarding.count,
+                    std.math.cast(usize, discarding.count) orelse return error.WriteFailed,
                 ) catch return error.WriteFailed;
             }
         }
@@ -415,7 +415,7 @@ pub const TerminalFormatter = struct {
                             .y = last.y,
                         };
                     } else self.terminal.screens.active.pages.getTopLeft(.screen),
-                    discarding.count,
+                    std.math.cast(usize, discarding.count) orelse return error.WriteFailed,
                 ) catch return error.WriteFailed;
             }
         }

From 647f5adf556e13abcbe4b38c185fb81458aa5711 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 14 Mar 2026 15:29:44 -0700
Subject: [PATCH 167/391] terminal/formatter: safely cast discarding.count to
 usize

The Discarding writer count field is u64, but several call sites
pass it where a usize is expected. On wasm32-freestanding, usize is
32-bit, so this caused compilation errors.

Use std.math.cast instead of a bare @intCast so that overflow is
handled gracefully, returning WriteFailed rather than triggering
safety-checked undefined behavior at runtime.
---
 src/terminal/formatter.zig | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/terminal/formatter.zig b/src/terminal/formatter.zig
index 18e1acf53..4da7248e3 100644
--- a/src/terminal/formatter.zig
+++ b/src/terminal/formatter.zig
@@ -688,7 +688,7 @@ pub const ScreenFormatter = struct {
                         .y = last.y,
                     };
                 } else self.screen.pages.getTopLeft(.screen),
-                discarding.count,
+                std.math.cast(usize, discarding.count) orelse return error.WriteFailed,
             ) catch return error.WriteFailed;
         }
     }
@@ -1234,7 +1234,10 @@ pub const PageFormatter = struct {
                             &discarding.writer,
                             &style,
                         );
-                        for (0..discarding.count) |_| map.map.append(map.alloc, .{
+                        for (0..std.math.cast(
+                            usize,
+                            discarding.count,
+                        ) orelse return error.WriteFailed) |_| map.map.append(map.alloc, .{
                             .x = x,
                             .y = y,
                         }) catch return error.WriteFailed;
@@ -1291,7 +1294,10 @@ pub const PageFormatter = struct {
                             &discarding.writer,
                             uri,
                         );
-                        for (0..discarding.count) |_| map.map.append(map.alloc, .{
+                        for (0..std.math.cast(
+                            usize,
+                            discarding.count,
+                        ) orelse return error.WriteFailed) |_| map.map.append(map.alloc, .{
                             .x = x,
                             .y = y,
                         }) catch return error.WriteFailed;
@@ -1309,7 +1315,10 @@ pub const PageFormatter = struct {
                         if (self.point_map) |*map| {
                             var discarding: std.Io.Writer.Discarding = .init(&.{});
                             try self.writeCell(tag, &discarding.writer, cell);
-                            for (0..discarding.count) |_| map.map.append(map.alloc, .{
+                            for (0..std.math.cast(
+                                usize,
+                                discarding.count,
+                            ) orelse return error.WriteFailed) |_| map.map.append(map.alloc, .{
                                 .x = x,
                                 .y = y,
                             }) catch return error.WriteFailed;

From f730eed213143db6e3082311f54afbf0c87bdd2d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 14 Mar 2026 15:41:57 -0700
Subject: [PATCH 168/391] vt: fix missing formatter docs in doxygen

---
 include/ghostty/vt.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index 42cd73e37..dd5eda989 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -29,6 +29,7 @@
  *
  * The API is organized into the following groups:
  * - @ref terminal "Terminal" - Complete terminal emulator state and rendering
+ * - @ref formatter "Formatter" - Format terminal content as plain text, VT sequences, or HTML
  * - @ref key "Key Encoding" - Encode key events into terminal sequences
  * - @ref osc "OSC Parser" - Parse OSC (Operating System Command) sequences
  * - @ref sgr "SGR Parser" - Parse SGR (Select Graphic Rendition) sequences

From 86d9a04ece47f2309e4882c1ca3334fbba23ba3c Mon Sep 17 00:00:00 2001
From: Jaeseok Lee <devsunb@gmail.com>
Date: Sat, 14 Mar 2026 23:37:14 +0900
Subject: [PATCH 169/391] config: add `equal` option to
 `window-padding-balance`

Change `window-padding-balance` from `bool` to an enum with three
values:

- `false` - no balancing (default, unchanged)
- `true` - balance with vshift that caps top padding and shifts excess
  to bottom (existing behavior, unchanged)
- `equal` - balance whitespace equally on all four sides

This gives users who prefer truly equal padding a way to opt in without
changing the default behavior.
---
 src/Surface.zig       | 12 ++++----
 src/config/Config.zig | 17 ++++++++++-
 src/renderer/size.zig | 68 +++++++++++++++++++++++++++++++++++++------
 3 files changed, 81 insertions(+), 16 deletions(-)

diff --git a/src/Surface.zig b/src/Surface.zig
index 4d66622e3..c948d4408 100644
--- a/src/Surface.zig
+++ b/src/Surface.zig
@@ -324,7 +324,7 @@ const DerivedConfig = struct {
     window_padding_bottom: u32,
     window_padding_left: u32,
     window_padding_right: u32,
-    window_padding_balance: bool,
+    window_padding_balance: configpkg.Config.WindowPaddingBalance,
     window_height: u32,
     window_width: u32,
     title: ?[:0]const u8,
@@ -536,8 +536,8 @@ pub fn init(
             x_dpi,
             y_dpi,
         );
-        if (derived_config.window_padding_balance) {
-            size.balancePadding(explicit);
+        if (derived_config.window_padding_balance != .false) {
+            size.balancePadding(explicit, derived_config.window_padding_balance);
         } else {
             size.padding = explicit;
         }
@@ -2462,11 +2462,11 @@ fn resize(self: *Surface, size: rendererpkg.ScreenSize) !void {
 
 /// Recalculate the balanced padding if needed.
 fn balancePaddingIfNeeded(self: *Surface) void {
-    if (!self.config.window_padding_balance) return;
+    if (self.config.window_padding_balance == .false) return;
     const content_scale = try self.rt_surface.getContentScale();
     const x_dpi = content_scale.x * font.face.default_dpi;
     const y_dpi = content_scale.y * font.face.default_dpi;
-    self.size.balancePadding(self.config.scaledPadding(x_dpi, y_dpi));
+    self.size.balancePadding(self.config.scaledPadding(x_dpi, y_dpi), self.config.window_padding_balance);
 }
 
 /// Called to set the preedit state for character input. Preedit is used
@@ -3576,7 +3576,7 @@ pub fn contentScaleCallback(self: *Surface, content_scale: apprt.ContentScale) !
 
     // Update our padding which is dependent on DPI. We only do this for
     // unbalanced padding since balanced padding is not dependent on DPI.
-    if (!self.config.window_padding_balance) {
+    if (self.config.window_padding_balance == .false) {
         self.size.padding = self.config.scaledPadding(x_dpi, y_dpi);
     }
 
diff --git a/src/config/Config.zig b/src/config/Config.zig
index 278ffd7e2..856aa1df5 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -1963,7 +1963,16 @@ keybind: Keybinds = .{},
 /// apply. The other padding is applied first and may affect how many grid cells
 /// actually exist, and this is applied last in order to balance the padding
 /// given a certain viewport size and grid cell size.
-@"window-padding-balance": bool = false,
+///
+/// Valid values are:
+///
+/// * `false` - No balancing is applied.
+/// * `true` - Balance the padding, but cap the top padding to avoid
+///   excessive space above the first row. Any excess is shifted to the
+///   bottom.
+/// * `equal` - Balance the padding equally on all sides without any
+///   top-padding cap. (Available since: 1.4.0)
+@"window-padding-balance": WindowPaddingBalance = .false,
 
 /// The color of the padding area of the window. Valid values are:
 ///
@@ -5229,6 +5238,12 @@ pub const Fullscreen = enum(c_int) {
     @"non-native-padded-notch",
 };
 
+pub const WindowPaddingBalance = enum {
+    false,
+    true,
+    equal,
+};
+
 pub const WindowPaddingColor = enum {
     background,
     extend,
diff --git a/src/renderer/size.zig b/src/renderer/size.zig
index d8b529c26..e9754d1f3 100644
--- a/src/renderer/size.zig
+++ b/src/renderer/size.zig
@@ -1,5 +1,6 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
+const configpkg = @import("../config.zig");
 const font = @import("../font/main.zig");
 const terminal = @import("../terminal/main.zig");
 
@@ -34,7 +35,11 @@ pub const Size = struct {
     /// Set the padding to be balanced around the grid. The balanced
     /// padding is calculated AFTER the explicit padding is taken
     /// into account.
-    pub fn balancePadding(self: *Size, explicit: Padding) void {
+    pub fn balancePadding(
+        self: *Size,
+        explicit: Padding,
+        mode: configpkg.Config.WindowPaddingBalance,
+    ) void {
         // This ensure grid() does the right thing
         self.padding = explicit;
 
@@ -45,14 +50,20 @@ pub const Size = struct {
             self.cell,
         );
 
-        // The top/bottom padding is interesting. Subjectively, lots of padding
-        // at the top looks bad. So instead of always being equal (like left/right),
-        // we force the top padding to be at most equal to the maximum left padding,
-        // which is the balanced explicit horizontal padding plus half a cell width.
-        const max_padding_left = (explicit.left + explicit.right + self.cell.width) / 2;
-        const vshift = self.padding.top -| max_padding_left;
-        self.padding.top -= vshift;
-        self.padding.bottom += vshift;
+        switch (mode) {
+            .false => unreachable,
+            .equal => {},
+            .true => {
+                // Cap the top padding to avoid excessive space above the
+                // first row. The maximum is the balanced explicit horizontal
+                // padding plus half a cell width. Any excess is shifted to
+                // the bottom.
+                const max_top = (explicit.left + explicit.right + self.cell.width) / 2;
+                const vshift = self.padding.top -| max_top;
+                self.padding.top -= vshift;
+                self.padding.bottom += vshift;
+            },
+        }
     }
 };
 
@@ -302,6 +313,45 @@ pub const Padding = struct {
     }
 };
 
+test "Size.balancePadding equal distributes whitespace equally" {
+    const testing = std.testing;
+
+    // screen=1050x850, cell=10x20, explicit=4 each side
+    // grid: (1050-8)/10=104 cols, (850-8)/20=42 rows
+    // leftover: 1050-1040=10 horizontal, 850-840=10 vertical
+    // balanced: left=right=5, top=bottom=5
+    var size: Size = .{
+        .screen = .{ .width = 1050, .height = 850 },
+        .cell = .{ .width = 10, .height = 20 },
+        .padding = .{},
+    };
+    size.balancePadding(.{ .top = 4, .bottom = 4, .left = 4, .right = 4 }, .equal);
+    try testing.expectEqual(size.padding.left, size.padding.right);
+    try testing.expectEqual(size.padding.top, size.padding.bottom);
+    try testing.expect(size.padding.top > 0);
+}
+
+test "Size.balancePadding true shifts excess top to bottom" {
+    const testing = std.testing;
+
+    // screen=1090x1070, cell=20x40, explicit=0
+    // grid: 1090/20=54 cols, 1070/40=26 rows
+    // leftover: 1090-1080=10, 1070-1040=30
+    // balanced: left=right=5, top=bottom=15
+    // vshift cap: (0+0+20)/2=10, vshift=15-10=5
+    // result: top=10, bottom=20
+    var size: Size = .{
+        .screen = .{ .width = 1090, .height = 1070 },
+        .cell = .{ .width = 20, .height = 40 },
+        .padding = .{},
+    };
+    size.balancePadding(.{}, .true);
+    try testing.expectEqual(size.padding.left, size.padding.right);
+    try testing.expect(size.padding.top < size.padding.bottom);
+    try testing.expectEqual(@as(u32, 10), size.padding.top);
+    try testing.expectEqual(@as(u32, 20), size.padding.bottom);
+}
+
 test "Padding balanced on zero" {
     // On some systems, our screen can be zero-sized for a bit, and we
     // don't want to end up with negative padding.

From 69554f414c1402a69d4648952aa13ad5bf43b673 Mon Sep 17 00:00:00 2001
From: John Mars <john@hellomars.dev>
Date: Sun, 15 Mar 2026 01:50:32 -0400
Subject: [PATCH 170/391] shell-integration: fix ssh-env SetEnv clobbering user
 SSH config

---
 src/shell-integration/bash/ghostty.bash                      | 5 ++---
 src/shell-integration/elvish/lib/ghostty-integration.elv     | 5 ++---
 .../fish/vendor_conf.d/ghostty-shell-integration.fish        | 5 ++---
 src/shell-integration/nushell/vendor/autoload/ghostty.nu     | 4 ++--
 src/shell-integration/zsh/ghostty-integration                | 5 ++---
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/shell-integration/bash/ghostty.bash b/src/shell-integration/bash/ghostty.bash
index 48c89164b..4be662ddf 100644
--- a/src/shell-integration/bash/ghostty.bash
+++ b/src/shell-integration/bash/ghostty.bash
@@ -123,8 +123,7 @@ if [[ "$GHOSTTY_SHELL_FEATURES" == *ssh-* ]]; then
 
     # Configure environment variables for remote session
     if [[ "$GHOSTTY_SHELL_FEATURES" == *ssh-env* ]]; then
-      ssh_opts+=(-o "SetEnv COLORTERM=truecolor")
-      ssh_opts+=(-o "SendEnv TERM_PROGRAM TERM_PROGRAM_VERSION")
+      ssh_opts+=(-o "SendEnv COLORTERM TERM_PROGRAM TERM_PROGRAM_VERSION")
     fi
 
     # Install terminfo on remote host if needed
@@ -180,7 +179,7 @@ if [[ "$GHOSTTY_SHELL_FEATURES" == *ssh-* ]]; then
     fi
 
     # Execute SSH with TERM environment variable
-    TERM="$ssh_term" builtin command ssh "${ssh_opts[@]}" "$@"
+    TERM="$ssh_term" COLORTERM=truecolor builtin command ssh "${ssh_opts[@]}" "$@"
   }
 fi
 
diff --git a/src/shell-integration/elvish/lib/ghostty-integration.elv b/src/shell-integration/elvish/lib/ghostty-integration.elv
index 87fd0a902..31ebf0941 100644
--- a/src/shell-integration/elvish/lib/ghostty-integration.elv
+++ b/src/shell-integration/elvish/lib/ghostty-integration.elv
@@ -83,8 +83,7 @@
     # Configure environment variables for remote session
     if (has-value $features ssh-env) {
       set ssh-opts = (conj $ssh-opts ^
-        -o "SetEnv COLORTERM=truecolor" ^
-        -o "SendEnv TERM_PROGRAM TERM_PROGRAM_VERSION")
+        -o "SendEnv COLORTERM TERM_PROGRAM TERM_PROGRAM_VERSION")
     }
 
     if (has-value $features ssh-terminfo) {
@@ -148,7 +147,7 @@
       }
     }
 
-    with [E:TERM = $ssh-term] {
+    with [E:TERM = $ssh-term E:COLORTERM = truecolor] {
       (external ssh) $@ssh-opts $@args
     }
   }
diff --git a/src/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish b/src/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish
index 3f1f6099e..f8bfe0910 100644
--- a/src/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish
+++ b/src/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish
@@ -129,8 +129,7 @@ function __ghostty_setup --on-event fish_prompt -d "Setup ghostty integration"
 
             # Configure environment variables for remote session
             if contains ssh-env $features
-                set -a ssh_opts -o "SetEnv COLORTERM=truecolor"
-                set -a ssh_opts -o "SendEnv TERM_PROGRAM TERM_PROGRAM_VERSION"
+                set -a ssh_opts -o "SendEnv COLORTERM TERM_PROGRAM TERM_PROGRAM_VERSION"
             end
 
             # Install terminfo on remote host if needed
@@ -198,7 +197,7 @@ function __ghostty_setup --on-event fish_prompt -d "Setup ghostty integration"
             end
 
             # Execute SSH with TERM environment variable
-            TERM="$ssh_term" command ssh $ssh_opts $argv
+            TERM="$ssh_term" COLORTERM=truecolor command ssh $ssh_opts $argv
         end
     end
 
diff --git a/src/shell-integration/nushell/vendor/autoload/ghostty.nu b/src/shell-integration/nushell/vendor/autoload/ghostty.nu
index 78c981ebe..17970f513 100644
--- a/src/shell-integration/nushell/vendor/autoload/ghostty.nu
+++ b/src/shell-integration/nushell/vendor/autoload/ghostty.nu
@@ -12,9 +12,9 @@ export module ghostty {
     # `ssh-env`: use xterm-256color and propagate COLORTERM/TERM_PROGRAM vars
     if (has_feature "ssh-env") {
       $ssh_env.TERM = "xterm-256color"
+      $ssh_env.COLORTERM = "truecolor"
       $ssh_opts = [
-        "-o" "SetEnv COLORTERM=truecolor"
-        "-o" "SendEnv TERM_PROGRAM TERM_PROGRAM_VERSION"
+        "-o" "SendEnv COLORTERM TERM_PROGRAM TERM_PROGRAM_VERSION"
       ]
     }
 
diff --git a/src/shell-integration/zsh/ghostty-integration b/src/shell-integration/zsh/ghostty-integration
index dc9bd1605..c55b2f51d 100644
--- a/src/shell-integration/zsh/ghostty-integration
+++ b/src/shell-integration/zsh/ghostty-integration
@@ -325,8 +325,7 @@ _ghostty_deferred_init() {
 
         # Configure environment variables for remote session
         if [[ "$GHOSTTY_SHELL_FEATURES" == *ssh-env* ]]; then
-          ssh_opts+=(-o "SetEnv COLORTERM=truecolor")
-          ssh_opts+=(-o "SendEnv TERM_PROGRAM TERM_PROGRAM_VERSION")
+          ssh_opts+=(-o "SendEnv COLORTERM TERM_PROGRAM TERM_PROGRAM_VERSION")
         fi
 
         # Install terminfo on remote host if needed
@@ -382,7 +381,7 @@ _ghostty_deferred_init() {
         fi
 
         # Execute SSH with TERM environment variable
-        TERM="$ssh_term" command ssh "${ssh_opts[@]}" "$@"
+        TERM="$ssh_term" COLORTERM=truecolor command ssh "${ssh_opts[@]}" "$@"
       }
     fi
 

From 943d3d2e8906cbd610868c36eccfc3a1360e0fd2 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 15 Mar 2026 07:03:44 -0700
Subject: [PATCH 171/391] vt: add setopt_from_terminal to C API

Expose the key encoder Options.fromTerminal function to the C API as
ghostty_key_encoder_setopt_from_terminal. This lets C callers sync all
terminal-derived encoding options (cursor key application mode, keypad
mode, alt escape prefix, modifyOtherKeys, and Kitty flags) in a single
call instead of setting each option individually.
---
 include/ghostty/vt/key.h         | 36 +++++++++++++++--
 include/ghostty/vt/key/encoder.h | 24 +++++++++++
 include/ghostty/vt/terminal.h    |  3 ++
 src/lib_vt.zig                   |  1 +
 src/terminal/c/key_encode.zig    | 68 ++++++++++++++++++++++++++++++++
 src/terminal/c/main.zig          |  1 +
 6 files changed, 130 insertions(+), 3 deletions(-)

diff --git a/include/ghostty/vt/key.h b/include/ghostty/vt/key.h
index 772b5d43b..e82a7596c 100644
--- a/include/ghostty/vt/key.h
+++ b/include/ghostty/vt/key.h
@@ -15,7 +15,9 @@
  * ## Basic Usage
  *
  * 1. Create an encoder instance with ghostty_key_encoder_new()
- * 2. Configure encoder options with ghostty_key_encoder_setopt().
+ * 2. Configure encoder options with ghostty_key_encoder_setopt()
+ *    or ghostty_key_encoder_setopt_from_terminal() if you have a 
+ *    GhosttyTerminal.
  * 3. For each key event:
  *    - Create a key event with ghostty_key_event_new()
  *    - Set event properties (action, key, modifiers, etc.)
@@ -25,6 +27,9 @@
  *      changing its properties.
  * 4. Free the encoder with ghostty_key_encoder_free() when done
  *
+ * For a complete working example, see example/c-vt-key-encode in the
+ * repository.
+ *
  * ## Example
  *
  * @code{.c}
@@ -66,8 +71,33 @@
  * }
  * @endcode
  *
- * For a complete working example, see example/c-vt-key-encode in the
- * repository.
+ * ## Example: Encoding with Terminal State
+ *
+ * When you have a GhosttyTerminal, you can sync its modes (cursor key
+ * application, Kitty flags, etc.) into the encoder automatically:
+ *
+ * @code{.c}
+ * // Create a terminal and feed it some VT data that changes modes
+ * GhosttyTerminal terminal;
+ * ghostty_terminal_new(NULL, &terminal,
+ *     (GhosttyTerminalOptions){.cols = 80, .rows = 24, .max_scrollback = 0});
+ *
+ * // Application might write data that enables Kitty keyboard protocol, etc.
+ * ghostty_terminal_vt_write(terminal, vt_data, vt_len);
+ *
+ * // Create an encoder and sync its options from the terminal
+ * GhosttyKeyEncoder encoder;
+ * ghostty_key_encoder_new(NULL, &encoder);
+ * ghostty_key_encoder_setopt_from_terminal(encoder, terminal);
+ *
+ * // Encode a key event using the terminal-derived options
+ * char buf[128];
+ * size_t written = 0;
+ * ghostty_key_encoder_encode(encoder, event, buf, sizeof(buf), &written);
+ *
+ * ghostty_key_encoder_free(encoder);
+ * ghostty_terminal_free(terminal);
+ * @endcode
  *
  * @{
  */
diff --git a/include/ghostty/vt/key/encoder.h b/include/ghostty/vt/key/encoder.h
index 5e8b6d80b..3053d73ef 100644
--- a/include/ghostty/vt/key/encoder.h
+++ b/include/ghostty/vt/key/encoder.h
@@ -11,6 +11,7 @@
 #include <stdint.h>
 #include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
+#include <ghostty/vt/terminal.h>
 #include <ghostty/vt/key/event.h>
 
 /**
@@ -140,6 +141,10 @@ void ghostty_key_encoder_free(GhosttyKeyEncoder encoder);
  * protocol selection (Kitty keyboard protocol flags), and platform-specific
  * behaviors (macOS option-as-alt).
  *
+ * If you are using a terminal instance, you can set the key encoding
+ * options based on the active terminal state (e.g. legacy vs Kitty mode
+ * and associated flags) with ghostty_key_encoder_setopt_from_terminal().
+ *
  * A null pointer value does nothing. It does not reset the value to the
  * default. The setopt call will do nothing.
  *
@@ -151,6 +156,25 @@ void ghostty_key_encoder_free(GhosttyKeyEncoder encoder);
  */
 void ghostty_key_encoder_setopt(GhosttyKeyEncoder encoder, GhosttyKeyEncoderOption option, const void *value);
 
+/**
+ * Set encoder options from a terminal's current state.
+ *
+ * Reads the terminal's current modes and flags and applies them to the
+ * encoder's options. This sets cursor key application mode, keypad mode,
+ * alt escape prefix, modifyOtherKeys state, and Kitty keyboard protocol
+ * flags from the terminal state.
+ *
+ * Note that the `macos_option_as_alt` option cannot be determined from
+ * terminal state and is reset to `GHOSTTY_OPTION_AS_ALT_FALSE` by this
+ * call. Use ghostty_key_encoder_setopt() to set it afterward if needed.
+ *
+ * @param encoder The encoder handle, must not be NULL
+ * @param terminal The terminal handle, must not be NULL
+ *
+ * @ingroup key
+ */
+void ghostty_key_encoder_setopt_from_terminal(GhosttyKeyEncoder encoder, GhosttyTerminal terminal);
+
 /**
  * Encode a key event into a terminal escape sequence.
  *
diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 7a79cb958..8c91920a0 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -23,6 +23,9 @@ extern "C" {
  * A terminal instance manages the full emulator state including the screen,
  * scrollback, cursor, styles, modes, and VT stream processing.
  *
+ * Once a terminal session is up and running, you can configure a key encoder
+ * to write keyboard input via ghostty_key_encoder_setopt_from_terminal().
+ *
  * @{
  */
 
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 42ef1d8f5..0fa808b59 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -124,6 +124,7 @@ comptime {
         @export(&c.key_encoder_new, .{ .name = "ghostty_key_encoder_new" });
         @export(&c.key_encoder_free, .{ .name = "ghostty_key_encoder_free" });
         @export(&c.key_encoder_setopt, .{ .name = "ghostty_key_encoder_setopt" });
+        @export(&c.key_encoder_setopt_from_terminal, .{ .name = "ghostty_key_encoder_setopt_from_terminal" });
         @export(&c.key_encoder_encode, .{ .name = "ghostty_key_encoder_encode" });
         @export(&c.osc_new, .{ .name = "ghostty_osc_new" });
         @export(&c.osc_free, .{ .name = "ghostty_osc_free" });
diff --git a/src/terminal/c/key_encode.zig b/src/terminal/c/key_encode.zig
index 063cd8df7..e83c9b221 100644
--- a/src/terminal/c/key_encode.zig
+++ b/src/terminal/c/key_encode.zig
@@ -8,6 +8,7 @@ const KittyFlags = @import("../../terminal/kitty/key.zig").Flags;
 const OptionAsAlt = @import("../../input/config.zig").OptionAsAlt;
 const Result = @import("result.zig").Result;
 const KeyEvent = @import("key_event.zig").Event;
+const Terminal = @import("terminal.zig").Terminal;
 
 const log = std.log.scoped(.key_encode);
 
@@ -115,6 +116,15 @@ fn setoptTyped(
     }
 }
 
+pub fn setopt_from_terminal(
+    encoder_: Encoder,
+    terminal_: Terminal,
+) callconv(.c) void {
+    const wrapper = encoder_ orelse return;
+    const t = terminal_ orelse return;
+    wrapper.opts = .fromTerminal(t);
+}
+
 pub fn encode(
     encoder_: Encoder,
     event_: KeyEvent,
@@ -222,6 +232,64 @@ test "setopt macos option as alt" {
     try testing.expectEqual(OptionAsAlt.true, e.?.opts.macos_option_as_alt);
 }
 
+test "setopt_from_terminal" {
+    const testing = std.testing;
+    const terminal_c = @import("terminal.zig");
+
+    // Create encoder
+    var e: Encoder = undefined;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &e,
+    ));
+    defer free(e);
+
+    // Create terminal
+    var t: Terminal = undefined;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{ .cols = 80, .rows = 24, .max_scrollback = 0 },
+    ));
+    defer terminal_c.free(t);
+
+    // Apply terminal state to encoder
+    setopt_from_terminal(e, t);
+
+    // Options should reflect defaults from a fresh terminal
+    try testing.expect(!e.?.opts.cursor_key_application);
+    try testing.expect(!e.?.opts.alt_esc_prefix);
+    try testing.expectEqual(KittyFlags.disabled, e.?.opts.kitty_flags);
+    try testing.expectEqual(OptionAsAlt.false, e.?.opts.macos_option_as_alt);
+}
+
+test "setopt_from_terminal null" {
+    // Both null should be no-ops
+    setopt_from_terminal(null, null);
+
+    const testing = std.testing;
+
+    // Encoder null with valid terminal
+    const terminal_c = @import("terminal.zig");
+    var t: Terminal = undefined;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{ .cols = 80, .rows = 24, .max_scrollback = 0 },
+    ));
+    defer terminal_c.free(t);
+    setopt_from_terminal(null, t);
+
+    // Valid encoder with null terminal
+    var e: Encoder = undefined;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &e,
+    ));
+    defer free(e);
+    setopt_from_terminal(e, null);
+}
+
 test "encode: kitty ctrl release with ctrl mod set" {
     const testing = std.testing;
 
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 4e95bb9d4..7842866dc 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -55,6 +55,7 @@ pub const key_event_get_unshifted_codepoint = key_event.get_unshifted_codepoint;
 pub const key_encoder_new = key_encode.new;
 pub const key_encoder_free = key_encode.free;
 pub const key_encoder_setopt = key_encode.setopt;
+pub const key_encoder_setopt_from_terminal = key_encode.setopt_from_terminal;
 pub const key_encoder_encode = key_encode.encode;
 
 pub const paste_is_safe = paste.is_safe;

From 0e272bfa10475cf98dc4967aa2b18f0257fafee5 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Sun, 15 Mar 2026 16:06:03 +0000
Subject: [PATCH 172/391] Update VOUCHED list (#11531)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11041#discussioncomment-16143204)
from @mitchellh.

Vouch: @davidsanchez222

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 767593f2c..a0830326d 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -54,6 +54,7 @@ daiimus
 damyanbogoev
 danulqua
 dariogriffo
+davidsanchez222
 dervedro
 devsunb
 diaaeddin

From 33263dbe6fea331b1be1acd4a7420d89f98ae806 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Sun, 15 Mar 2026 16:06:47 +0000
Subject: [PATCH 173/391] Update VOUCHED list (#11532)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11250#discussioncomment-16143210)
from @mitchellh.

Vouch: @PowerUser64

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index a0830326d..b646454ac 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -140,6 +140,7 @@ phush0
 piedrahitac
 pluiedev
 pouwerkerk
+poweruser64
 prakhar54-byte
 priyans-hu
 puzza007

From 57428f33c6af820a30efbb57600c030a4df693f6 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Sun, 15 Mar 2026 16:07:17 +0000
Subject: [PATCH 174/391] Update VOUCHED list (#11533)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11237#discussioncomment-16143212)
from @mitchellh.

Vouch: @cadebrown

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index b646454ac..493d5dd2e 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -42,6 +42,7 @@ bitigchi
 bkircher
 bo2themax
 brentschroeter
+cadebrown
 cespare
 charliie-dev
 chernetskyi

From 6fabf775bba63ae41396057fe0ee9458082e0723 Mon Sep 17 00:00:00 2001
From: Kat <65649991+00-kat@users.noreply.github.com>
Date: Mon, 16 Mar 2026 04:26:34 +1100
Subject: [PATCH 175/391] Lots of duplicate word typos + typo.

---
 src/Surface.zig                         | 4 ++--
 src/apprt/gtk/class/command_palette.zig | 2 +-
 src/apprt/gtk/winproto/x11.zig          | 2 +-
 src/config/url.zig                      | 2 +-
 src/font/nerd_font_codegen.py           | 7 +++----
 src/font/shape.zig                      | 4 ++--
 src/font/shaper/harfbuzz.zig            | 2 +-
 src/font/shaper/web_canvas.zig          | 2 +-
 src/font/sprite/draw/box.zig            | 4 ++--
 src/input/key_encode.zig                | 2 +-
 src/input/keycodes.zig                  | 2 +-
 src/terminal/hash_map.zig               | 4 ++--
 src/terminal/render.zig                 | 2 +-
 src/termio/Options.zig                  | 2 +-
 src/termio/Termio.zig                   | 8 ++++----
 src/termio/stream_handler.zig           | 4 ++--
 16 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/Surface.zig b/src/Surface.zig
index c948d4408..f5a0a77db 100644
--- a/src/Surface.zig
+++ b/src/Surface.zig
@@ -4968,14 +4968,14 @@ fn mouseSelection(
         break :ebs drag_pin.before(click_pin);
     };
 
-    // Whether or not the the click pin cell
+    // Whether or not the click pin cell
     // should be included in the selection.
     const include_click_cell = if (end_before_start)
         click_x_frac >= threshold_point
     else
         click_x_frac < threshold_point;
 
-    // Whether or not the the drag pin cell
+    // Whether or not the drag pin cell
     // should be included in the selection.
     const include_drag_cell = if (end_before_start)
         drag_x_frac < threshold_point
diff --git a/src/apprt/gtk/class/command_palette.zig b/src/apprt/gtk/class/command_palette.zig
index 9c79f2712..6101e82e8 100644
--- a/src/apprt/gtk/class/command_palette.zig
+++ b/src/apprt/gtk/class/command_palette.zig
@@ -353,7 +353,7 @@ pub const CommandPalette = extern struct {
         // Regular command - emit trigger signal
         const action = cmd.getAction() orelse return;
 
-        // Signal that an an action has been selected. Signals are synchronous
+        // Signal that an action has been selected. Signals are synchronous
         // so we shouldn't need to worry about cloning the action.
         signals.trigger.impl.emit(
             self,
diff --git a/src/apprt/gtk/winproto/x11.zig b/src/apprt/gtk/winproto/x11.zig
index 1e73c6139..693b61d72 100644
--- a/src/apprt/gtk/winproto/x11.zig
+++ b/src/apprt/gtk/winproto/x11.zig
@@ -48,7 +48,7 @@ pub const App = struct {
         else
             "ghostty";
 
-        // Set the X11 window class property (WM_CLASS) if are are on an X11
+        // Set the X11 window class property (WM_CLASS) if we are on an X11
         // display.
         //
         // Note that we also set the program name here using g_set_prgname.
diff --git a/src/config/url.zig b/src/config/url.zig
index e7cf8603c..2621898e1 100644
--- a/src/config/url.zig
+++ b/src/config/url.zig
@@ -17,7 +17,7 @@ const oni = @import("oniguruma");
 /// 2. Do not match regexes ending with ), except for ones which contain a (
 ///    without a subsequent )
 ///
-/// Rule 2 means that that we handle the following two cases:
+/// Rule 2 means that we handle the following two cases:
 ///
 ///   "https://en.wikipedia.org/wiki/Rust_(video_game)" (include parens)
 ///   "(https://example.com)" (do not include the parens)
diff --git a/src/font/nerd_font_codegen.py b/src/font/nerd_font_codegen.py
index 8ddc0c113..664555a39 100644
--- a/src/font/nerd_font_codegen.py
+++ b/src/font/nerd_font_codegen.py
@@ -460,10 +460,9 @@ def generate_zig_switch_arms(
                         # scaled and aligned position would span the line height
                         # plus overlap. Thus, we can use any other stretched
                         # glyph with overlap as stand-in to get the vertical
-                        # bounds, such as as 0xE0B0 (powerline left hard
-                        # divider). We don't worry about the horizontal bounds,
-                        # as they by design should not affect the group's
-                        # bounding box.
+                        # bounds, such as 0xE0B0 (powerline left hard divider).
+                        # We don't worry about the horizontal bounds, as they by
+                        # design should not affect the group's bounding box.
                         if (
                             patch_set_name == "Progress Indicators"
                             and cp_original == 0xEDFF
diff --git a/src/font/shape.zig b/src/font/shape.zig
index c96c8df7f..864c0f012 100644
--- a/src/font/shape.zig
+++ b/src/font/shape.zig
@@ -34,8 +34,8 @@ pub const Shaper = switch (options.backend) {
     .web_canvas => web_canvas.Shaper,
 };
 
-/// A cell is a single single within a terminal that should be rendered
-/// for a shaping call. Note all terminal cells may be present; only
+/// A cell is a single glyph within a terminal that should be rendered
+/// for a shaping call. Not all terminal cells may be present; only
 /// cells that have a glyph that needs to be rendered.
 pub const Cell = struct {
     /// The X position of this shaper cell relative to the offset of the
diff --git a/src/font/shaper/harfbuzz.zig b/src/font/shaper/harfbuzz.zig
index d17df4b1e..9c78d9de3 100644
--- a/src/font/shaper/harfbuzz.zig
+++ b/src/font/shaper/harfbuzz.zig
@@ -104,7 +104,7 @@ pub const Shaper = struct {
     }
 
     /// Returns an iterator that returns one text run at a time for the
-    /// given terminal row. Note that text runs are are only valid one at a time
+    /// given terminal row. Note that text runs are only valid one at a time
     /// for a Shaper struct since they share state.
     ///
     /// The selection must be a row-only selection (height = 1). See
diff --git a/src/font/shaper/web_canvas.zig b/src/font/shaper/web_canvas.zig
index 590c1d2a3..d16bd9681 100644
--- a/src/font/shaper/web_canvas.zig
+++ b/src/font/shaper/web_canvas.zig
@@ -58,7 +58,7 @@ pub const Shaper = struct {
     }
 
     /// Returns an iterator that returns one text run at a time for the
-    /// given terminal row. Note that text runs are are only valid one at a time
+    /// given terminal row. Note that text runs are only valid one at a time
     /// for a Shaper struct since they share state.
     pub fn runIterator(
         self: *Shaper,
diff --git a/src/font/sprite/draw/box.zig b/src/font/sprite/draw/box.zig
index cc6e694d4..da3edb51c 100644
--- a/src/font/sprite/draw/box.zig
+++ b/src/font/sprite/draw/box.zig
@@ -845,7 +845,7 @@ fn dashHorizontal(
         }
         hline(canvas, x, x1, y, thick_px);
         // Advance by the width of the dash we drew and the width
-        // of a gap to get the the start of the next dash.
+        // of a gap to get the start of the next dash.
         x = x1 + gap_width;
     }
 }
@@ -923,7 +923,7 @@ fn dashVertical(
         }
         vline(canvas, y, y1, x, thick_px);
         // Advance by the height of the dash we drew and the height
-        // of a gap to get the the start of the next dash.
+        // of a gap to get the start of the next dash.
         y = y1 + gap_height;
     }
 }
diff --git a/src/input/key_encode.zig b/src/input/key_encode.zig
index 0373fb5f9..52bb556e3 100644
--- a/src/input/key_encode.zig
+++ b/src/input/key_encode.zig
@@ -159,7 +159,7 @@ fn kitty(
             switch (event.key) {
                 else => {},
                 inline .enter, .backspace => |tag| {
-                    // See legacy for why we handle this this way.
+                    // See legacy for why we handle this way.
                     if (isControlUtf8(event.utf8)) break :utf8;
                     if (comptime tag == .backspace) return;
                     return try writer.writeAll(event.utf8);
diff --git a/src/input/keycodes.zig b/src/input/keycodes.zig
index 2fa0665ea..9a3ebc923 100644
--- a/src/input/keycodes.zig
+++ b/src/input/keycodes.zig
@@ -40,7 +40,7 @@ pub const Entry = struct {
 };
 
 /// A map from code to key. This isn't meant to be used at runtime
-/// (though it could), so it isn't exported. It it used to build the
+/// (though it could), so it isn't exported. It used to build the
 /// key value for Entry.
 const code_to_key = code_to_key: {
     @setEvalBranchQuota(5000);
diff --git a/src/terminal/hash_map.zig b/src/terminal/hash_map.zig
index 96dfcfdf3..5a38cc179 100644
--- a/src/terminal/hash_map.zig
+++ b/src/terminal/hash_map.zig
@@ -104,8 +104,8 @@ pub fn OffsetHashMap(
     };
 }
 
-/// Fork of stdlib.HashMap as of Zig 0.12 modified to to use offsets
-/// for the key/values pointer. The metadata is still a pointer to limit
+/// Fork of stdlib.HashMap as of Zig 0.12 modified to use offsets for
+/// the key/values pointer. The metadata is still a pointer to limit
 /// the amount of arithmetic required to access it. See the file comment
 /// for full details.
 fn HashMapUnmanaged(
diff --git a/src/terminal/render.zig b/src/terminal/render.zig
index 8ce77061d..967f014ed 100644
--- a/src/terminal/render.zig
+++ b/src/terminal/render.zig
@@ -740,7 +740,7 @@ pub const RenderState = struct {
     /// we can adjust this later.
     ///
     /// NOTE: There is a limitation in that wrapped lines before/after
-    /// the the top/bottom line of the viewport are not included, since
+    /// the top/bottom line of the viewport are not included, since
     /// the render state cuts them off.
     pub fn string(
         self: *const RenderState,
diff --git a/src/termio/Options.zig b/src/termio/Options.zig
index f41709f4a..a6bf8c4d4 100644
--- a/src/termio/Options.zig
+++ b/src/termio/Options.zig
@@ -30,7 +30,7 @@ mailbox: termio.Mailbox,
 /// terminal implementation.)
 renderer_state: *renderer.State,
 
-/// A handle to wake up the renderer. This hints to the renderer that that
+/// A handle to wake up the renderer. This hints to the renderer that
 /// a repaint should happen.
 renderer_wakeup: xev.Async,
 
diff --git a/src/termio/Termio.zig b/src/termio/Termio.zig
index 8d0f5e2c4..4523e9c53 100644
--- a/src/termio/Termio.zig
+++ b/src/termio/Termio.zig
@@ -42,7 +42,7 @@ terminal: terminalpkg.Terminal,
 /// The shared render state
 renderer_state: *renderer.State,
 
-/// A handle to wake up the renderer. This hints to the renderer that that
+/// A handle to wake up the renderer. This hints to the renderer that
 /// a repaint should happen.
 renderer_wakeup: xev.Async,
 
@@ -391,8 +391,8 @@ pub fn threadExit(self: *Termio, data: *ThreadData) void {
     self.backend.threadExit(data);
 }
 
-/// Send a message to the the mailbox. Depending on the mailbox type in
-/// use this may process now or it may just enqueue and process later.
+/// Send a message to the mailbox. Depending on the mailbox type in use
+/// this may process now or it may just enqueue and process later.
 ///
 /// This will also notify the mailbox thread to process the message. If
 /// you're sending a lot of messages, it may be more efficient to use
@@ -609,7 +609,7 @@ pub fn clearScreen(self: *Termio, td: *ThreadData, history: bool) !void {
             // Clear all Kitty graphics state for this screen. This copies
             // Kitty's behavior when Cmd+K deletes all Kitty graphics. I
             // didn't spend time researching whether it only deletes Kitty
-            // graphics that are placed baove the cursor or if it deletes
+            // graphics that are placed above the cursor or if it deletes
             // all of them. We delete all of them for now but if this behavior
             // isn't fully correct we should fix this later.
             self.terminal.screens.active.kitty_images.delete(
diff --git a/src/termio/stream_handler.zig b/src/termio/stream_handler.zig
index fd17d299d..e41daa8be 100644
--- a/src/termio/stream_handler.zig
+++ b/src/termio/stream_handler.zig
@@ -36,7 +36,7 @@ pub const StreamHandler = struct {
     /// The mailbox for notifying the renderer of things.
     renderer_mailbox: *renderer.Thread.Mailbox,
 
-    /// A handle to wake up the renderer. This hints to the renderer that that
+    /// A handle to wake up the renderer. This hints to the renderer that
     /// a repaint should happen.
     renderer_wakeup: xev.Async,
 
@@ -1038,7 +1038,7 @@ pub const StreamHandler = struct {
         self: *StreamHandler,
         shape: terminal.MouseShape,
     ) !void {
-        // Avoid changing the shape it it is already set to avoid excess
+        // Avoid changing the shape if it is already set to avoid excess
         // cross-thread messaging.
         if (self.terminal.mouse_shape == shape) return;
 

From ac5e57ce67d3c6913935aa265617cb4d3f46aba4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 15 Mar 2026 07:43:34 -0700
Subject: [PATCH 176/391] input: extract mouse encoding to a pure, testable
 file

Move mouse event encoding logic from Surface.zig into a new
input/mouse_encode.zig file.

The new file encapsulates event filtering (shouldReport),
button code computation, viewport bounds checking, motion
deduplication, and all five wire formats (X10, UTF-8, SGR,
urxvt, SGR-pixels). This makes the encoding independently
testable and adds unit tests covering each format and edge
case.

Additionally, Surface `mouseReport` can no longer fail, since the only
failure mode is no buffer space which should be impossible. Updated
the signature to remove the error set.
---
 src/Surface.zig            | 260 +++----------
 src/input.zig              |   2 +
 src/input/mouse.zig        |   6 +
 src/input/mouse_encode.zig | 780 +++++++++++++++++++++++++++++++++++++
 src/surface_mouse.zig      |   2 +-
 src/terminal/Terminal.zig  |   6 +-
 6 files changed, 839 insertions(+), 217 deletions(-)
 create mode 100644 src/input/mouse_encode.zig

diff --git a/src/Surface.zig b/src/Surface.zig
index c948d4408..e8d549d80 100644
--- a/src/Surface.zig
+++ b/src/Surface.zig
@@ -3518,7 +3518,7 @@ pub fn scrollCallback(
         if (self.isMouseReporting()) {
             for (0..@abs(y.delta)) |_| {
                 const pos = try self.rt_surface.getCursorPos();
-                try self.mouseReport(switch (y.direction()) {
+                self.mouseReport(switch (y.direction()) {
                     .up_right => .four,
                     .down_left => .five,
                 }, .press, self.mouse.mods, pos);
@@ -3526,7 +3526,7 @@ pub fn scrollCallback(
 
             for (0..@abs(x.delta)) |_| {
                 const pos = try self.rt_surface.getCursorPos();
-                try self.mouseReport(switch (x.direction()) {
+                self.mouseReport(switch (x.direction()) {
                     .up_right => .six,
                     .down_left => .seven,
                 }, .press, self.mouse.mods, pos);
@@ -3585,9 +3585,6 @@ pub fn contentScaleCallback(self: *Surface, content_scale: apprt.ContentScale) !
     try self.resize(self.size.screen);
 }
 
-/// The type of action to report for a mouse event.
-const MouseReportAction = enum { press, release, motion };
-
 /// Returns true if mouse reporting is enabled both in the config and
 /// the terminal state.
 fn isMouseReporting(self: *const Surface) bool {
@@ -3598,228 +3595,65 @@ fn isMouseReporting(self: *const Surface) bool {
 fn mouseReport(
     self: *Surface,
     button: ?input.MouseButton,
-    action: MouseReportAction,
+    action: input.MouseAction,
     mods: input.Mods,
     pos: apprt.CursorPos,
-) !void {
+) void {
     // Mouse reporting must be enabled by both config and terminal state
     assert(self.config.mouse_reporting);
     assert(self.io.terminal.flags.mouse_event != .none);
 
-    // Depending on the event, we may do nothing at all.
-    switch (self.io.terminal.flags.mouse_event) {
-        .none => unreachable, // checked by assert above
+    // Build our encoding options.
+    const encoding_opts: input.mouse_encode.Options = opts: {
+        // Terminal and size state.
+        var opts: input.mouse_encode.Options = .fromTerminal(
+            &self.io.terminal,
+            self.size,
+        );
 
-        // X10 only reports clicks with mouse button 1, 2, 3. We verify
-        // the button later.
-        .x10 => if (action != .press or
-            button == null or
-            !(button.? == .left or
-                button.? == .right or
-                button.? == .middle)) return,
-
-        // Doesn't report motion
-        .normal => if (action == .motion) return,
-
-        // Button must be pressed
-        .button => if (button == null) return,
-
-        // Everything
-        .any => {},
-    }
-
-    // Handle scenarios where the mouse position is outside the viewport.
-    // We always report release events no matter where they happen.
-    if (action != .release) {
-        const pos_out_viewport = pos_out_viewport: {
-            const max_x: f32 = @floatFromInt(self.size.screen.width);
-            const max_y: f32 = @floatFromInt(self.size.screen.height);
-            break :pos_out_viewport pos.x < 0 or pos.y < 0 or
-                pos.x > max_x or pos.y > max_y;
-        };
-        if (pos_out_viewport) outside_viewport: {
-            // If we don't have a motion-tracking event mode, do nothing.
-            if (!self.io.terminal.flags.mouse_event.motion()) return;
-
-            // If any button is pressed, we still do the report. Otherwise,
-            // we do not do the report.
+        // Whether any button is pressed at all.
+        opts.any_button_pressed = pressed: {
             for (self.mouse.click_state) |state| {
-                if (state != .release) break :outside_viewport;
+                if (state != .release) break :pressed true;
             }
 
-            return;
-        }
-    }
+            break :pressed false;
+        };
 
-    // This format reports X/Y
-    const viewport_point = self.posToViewport(pos.x, pos.y);
+        // Keep track of our last reported viewport cell for event
+        // deduplication.
+        opts.last_cell = &self.mouse.event_point;
 
-    // Record our new point. We only want to send a mouse event if the
-    // cell changed, unless we're tracking raw pixels.
-    if (action == .motion and self.io.terminal.flags.mouse_format != .sgr_pixels) {
-        if (self.mouse.event_point) |last_point| {
-            if (last_point.eql(viewport_point)) return;
-        }
-    }
-    self.mouse.event_point = viewport_point;
-
-    // Get the code we'll actually write
-    const button_code: u8 = code: {
-        var acc: u8 = 0;
-
-        // Determine our initial button value
-        if (button == null) {
-            // Null button means motion without a button pressed
-            acc = 3;
-        } else if (action == .release and
-            self.io.terminal.flags.mouse_format != .sgr and
-            self.io.terminal.flags.mouse_format != .sgr_pixels)
-        {
-            // Release is 3. It is NOT 3 in SGR mode because SGR can tell
-            // the application what button was released.
-            acc = 3;
-        } else {
-            acc = switch (button.?) {
-                .left => 0,
-                .middle => 1,
-                .right => 2,
-                .four => 64,
-                .five => 65,
-                .six => 66,
-                .seven => 67,
-                .eight => 128,
-                .nine => 129,
-                else => return, // unsupported
-            };
-        }
-
-        // X10 doesn't have modifiers
-        if (self.io.terminal.flags.mouse_event != .x10) {
-            if (mods.shift) acc += 4;
-            if (mods.alt) acc += 8;
-            if (mods.ctrl) acc += 16;
-        }
-
-        // Motion adds another bit
-        if (action == .motion) acc += 32;
-
-        break :code acc;
+        break :opts opts;
     };
 
-    switch (self.io.terminal.flags.mouse_format) {
-        .x10 => {
-            if (viewport_point.x > 222 or viewport_point.y > 222) {
-                log.info("X10 mouse format can only encode X/Y up to 223", .{});
-                return;
-            }
-
-            // + 1 below is because our x/y is 0-indexed and the protocol wants 1
-            var data: termio.Message.WriteReq.Small.Array = undefined;
-            assert(data.len >= 6);
-            data[0] = '\x1b';
-            data[1] = '[';
-            data[2] = 'M';
-            data[3] = 32 + button_code;
-            data[4] = 32 + @as(u8, @intCast(viewport_point.x)) + 1;
-            data[5] = 32 + @as(u8, @intCast(viewport_point.y)) + 1;
-
-            // Ask our IO thread to write the data
-            self.queueIo(.{ .write_small = .{
-                .data = data,
-                .len = 6,
-            } }, .locked);
+    var data: termio.Message.WriteReq.Small.Array = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    input.mouse_encode.encode(&writer, .{
+        .button = button,
+        .action = action,
+        .mods = mods,
+        .pos = .{
+            .x = pos.x,
+            .y = pos.y,
         },
-
-        .utf8 => {
-            // Maximum of 12 because at most we have 2 fully UTF-8 encoded chars
-            var data: termio.Message.WriteReq.Small.Array = undefined;
-            assert(data.len >= 12);
-            data[0] = '\x1b';
-            data[1] = '[';
-            data[2] = 'M';
-
-            // The button code will always fit in a single u8
-            data[3] = 32 + button_code;
-
-            // UTF-8 encode the x/y
-            var i: usize = 4;
-            i += try std.unicode.utf8Encode(@intCast(32 + viewport_point.x + 1), data[i..]);
-            i += try std.unicode.utf8Encode(@intCast(32 + viewport_point.y + 1), data[i..]);
-
-            // Ask our IO thread to write the data
-            self.queueIo(.{ .write_small = .{
-                .data = data,
-                .len = @intCast(i),
-            } }, .locked);
+    }, encoding_opts) catch |err| switch (err) {
+        error.WriteFailed => {
+            // This should never happen since mouse events should never
+            // be able to overflow the size of our small array. But if it
+            // does, let's log it and return. No need to crash upstreams.
+            // In the future we may want to fall back to allocation.
+            log.warn("failed to encode mouse event err={}", .{err});
+            return;
         },
+    };
+    const written = writer.buffered();
+    if (written.len == 0) return;
 
-        .sgr => {
-            // Final character to send in the CSI
-            const final: u8 = if (action == .release) 'm' else 'M';
-
-            // Response always is at least 4 chars, so this leaves the
-            // remainder for numbers which are very large...
-            var data: termio.Message.WriteReq.Small.Array = undefined;
-            const resp = try std.fmt.bufPrint(&data, "\x1B[<{d};{d};{d}{c}", .{
-                button_code,
-                viewport_point.x + 1,
-                viewport_point.y + 1,
-                final,
-            });
-
-            // Ask our IO thread to write the data
-            self.queueIo(.{ .write_small = .{
-                .data = data,
-                .len = @intCast(resp.len),
-            } }, .locked);
-        },
-
-        .urxvt => {
-            // Response always is at least 4 chars, so this leaves the
-            // remainder for numbers which are very large...
-            var data: termio.Message.WriteReq.Small.Array = undefined;
-            const resp = try std.fmt.bufPrint(&data, "\x1B[{d};{d};{d}M", .{
-                32 + button_code,
-                viewport_point.x + 1,
-                viewport_point.y + 1,
-            });
-
-            // Ask our IO thread to write the data
-            self.queueIo(.{ .write_small = .{
-                .data = data,
-                .len = @intCast(resp.len),
-            } }, .locked);
-        },
-
-        .sgr_pixels => {
-            // Final character to send in the CSI
-            const final: u8 = if (action == .release) 'm' else 'M';
-
-            // The position has to be adjusted to the terminal space.
-            const coord: rendererpkg.Coordinate.Terminal = (rendererpkg.Coordinate{
-                .surface = .{
-                    .x = pos.x,
-                    .y = pos.y,
-                },
-            }).convert(.terminal, self.size).terminal;
-
-            // Response always is at least 4 chars, so this leaves the
-            // remainder for numbers which are very large...
-            var data: termio.Message.WriteReq.Small.Array = undefined;
-            const resp = try std.fmt.bufPrint(&data, "\x1B[<{d};{d};{d}{c}", .{
-                button_code,
-                @as(i32, @intFromFloat(@round(coord.x))),
-                @as(i32, @intFromFloat(@round(coord.y))),
-                final,
-            });
-
-            // Ask our IO thread to write the data
-            self.queueIo(.{ .write_small = .{
-                .data = data,
-                .len = @intCast(resp.len),
-            } }, .locked);
-        },
-    }
+    self.queueIo(.{ .write_small = .{
+        .data = data,
+        .len = @intCast(written.len),
+    } }, .locked);
 }
 
 /// Returns true if the shift modifier is allowed to be captured by modifier
@@ -4003,12 +3837,12 @@ pub fn mouseButtonCallback(
 
             const pos = try self.rt_surface.getCursorPos();
 
-            const report_action: MouseReportAction = switch (action) {
+            const report_action: input.MouseAction = switch (action) {
                 .press => .press,
                 .release => .release,
             };
 
-            try self.mouseReport(
+            self.mouseReport(
                 button,
                 report_action,
                 self.mouse.mods,
@@ -4740,7 +4574,7 @@ pub fn cursorPosCallback(
                 break :button @enumFromInt(i);
         } else null;
 
-        try self.mouseReport(button, .motion, self.mouse.mods, pos);
+        self.mouseReport(button, .motion, self.mouse.mods, pos);
 
         // If we're doing mouse motion tracking, we do not support text
         // selection.
diff --git a/src/input.zig b/src/input.zig
index bad3ac1f3..833e05820 100644
--- a/src/input.zig
+++ b/src/input.zig
@@ -12,6 +12,7 @@ pub const function_keys = @import("input/function_keys.zig");
 pub const keycodes = @import("input/keycodes.zig");
 pub const key_encode = @import("input/key_encode.zig");
 pub const kitty = @import("input/kitty.zig");
+pub const mouse_encode = @import("input/mouse_encode.zig");
 pub const paste = @import("input/paste.zig");
 
 pub const ctrlOrSuper = key.ctrlOrSuper;
@@ -25,6 +26,7 @@ pub const KeyEvent = key.KeyEvent;
 pub const KeyRemapSet = key_mods.RemapSet;
 pub const InspectorMode = Binding.Action.InspectorMode;
 pub const Mods = key_mods.Mods;
+pub const MouseAction = mouse.Action;
 pub const MouseButton = mouse.Button;
 pub const MouseButtonState = mouse.ButtonState;
 pub const MousePressureStage = mouse.PressureStage;
diff --git a/src/input/mouse.zig b/src/input/mouse.zig
index bdf967ed2..8a769557f 100644
--- a/src/input/mouse.zig
+++ b/src/input/mouse.zig
@@ -1,5 +1,11 @@
 const std = @import("std");
 
+/// The type of action associated with a mouse event. This is different
+/// from ButtonState because button state is simply the current state
+/// of a mouse button but an action is something that triggers via
+/// an GUI event and supports more.
+pub const Action = enum { press, release, motion };
+
 /// The state of a mouse button.
 ///
 /// This is backed by a c_int so we can use this as-is for our embedding API.
diff --git a/src/input/mouse_encode.zig b/src/input/mouse_encode.zig
new file mode 100644
index 000000000..2dfe084fb
--- /dev/null
+++ b/src/input/mouse_encode.zig
@@ -0,0 +1,780 @@
+const std = @import("std");
+const testing = std.testing;
+const Terminal = @import("../terminal/Terminal.zig");
+const renderer_size = @import("../renderer/size.zig");
+const point = @import("../terminal/point.zig");
+const key = @import("key.zig");
+const mouse = @import("mouse.zig");
+
+const log = std.log.scoped(.mouse_encode);
+
+/// Options that affect mouse encoding behavior and provide runtime context.
+pub const Options = struct {
+    /// Terminal mouse reporting mode (X10, normal, button, any).
+    event: Terminal.MouseEvent = .none,
+
+    /// Terminal mouse reporting format.
+    format: Terminal.MouseFormat = .x10,
+
+    /// Full renderer size used to convert surface-space pixel positions
+    /// into grid cell coordinates (for most formats) and terminal-space
+    /// pixel coordinates (for SGR-Pixels), as well as to determine
+    /// whether a position falls outside the visible viewport.
+    size: renderer_size.Size,
+
+    /// Whether any mouse button is currently pressed. When a motion
+    /// event occurs outside the viewport, it is only reported if a
+    /// button is held down and the event mode supports motion tracking.
+    /// Without this, out-of-viewport motions are silently dropped.
+    ///
+    /// This should reflect the state of the current event as well, so
+    /// if the encoded event is a button press, this should be true.
+    any_button_pressed: bool = false,
+
+    /// Last reported viewport cell for motion deduplication.
+    /// If null, motion deduplication state is not tracked.
+    last_cell: ?*?point.Coordinate = null,
+
+    /// Initialize from terminal and renderer state. The caller may still
+    /// set any_button_pressed and last_cell on the returned value.
+    pub fn fromTerminal(
+        t: *const Terminal,
+        size: renderer_size.Size,
+    ) Options {
+        return .{
+            .event = t.flags.mouse_event,
+            .format = t.flags.mouse_format,
+            .size = size,
+        };
+    }
+};
+
+/// A normalized mouse event for protocol encoding.
+pub const Event = struct {
+    /// The action of this mouse event.
+    action: mouse.Action = .press,
+
+    /// The button involved in this event. This can be null in the
+    /// case of a motion action with no pressed buttons.
+    button: ?mouse.Button = null,
+
+    /// Keyboard modifiers held during this event.
+    mods: key.Mods = .{},
+
+    /// Mouse position in terminal-space pixels, with (0, 0) at the top-left
+    /// of the terminal. Negative values are allowed and indicate positions
+    /// above or to the left of the terminal. Values larger than the terminal
+    /// size are also allowed and indicate right or below the terminal.
+    pos: Pos = .{},
+
+    /// Mouse position in surface-space pixels.
+    pub const Pos = struct {
+        x: f32 = 0,
+        y: f32 = 0,
+    };
+};
+
+/// Encode the mouse event to the writer according to the options.
+///
+/// Not all events result in output.
+pub fn encode(
+    writer: *std.Io.Writer,
+    event: Event,
+    opts: Options,
+) std.Io.Writer.Error!void {
+    if (!shouldReport(event, opts)) return;
+
+    // Handle scenarios where the mouse position is outside the viewport.
+    // We always report release events no matter where they happen.
+    if (event.action != .release and
+        posOutOfViewport(event.pos, opts.size))
+    {
+        // If we don't have a motion-tracking event mode, do nothing,
+        // because events outside the viewport are never reported in
+        // such cases.
+        if (!opts.event.motion()) return;
+
+        // For motion modes, we only report if a button is currently pressed.
+        // This lets a TUI detect a click over the surface + drag out
+        // of the surface.
+        if (!opts.any_button_pressed) return;
+    }
+
+    const cell = posToCell(event.pos, opts.size);
+
+    // We only send motion events when the cell changed unless
+    // we're tracking raw pixels.
+    if (event.action == .motion and opts.format != .sgr_pixels) {
+        if (opts.last_cell) |last| {
+            if (last.*) |last_cell| {
+                if (last_cell.eql(cell)) return;
+            }
+        }
+    }
+
+    // Update the last reported cell if we are tracking it.
+    if (opts.last_cell) |last| last.* = cell;
+
+    const button_code = buttonCode(event, opts) orelse return;
+    switch (opts.format) {
+        .x10 => {
+            if (cell.x > 222 or cell.y > 222) {
+                log.info("X10 mouse format can only encode X/Y up to 223", .{});
+                return;
+            }
+
+            // + 1 because our x/y are zero-indexed and the protocol uses 1-indexing.
+            try writer.writeAll("\x1B[M");
+            try writer.writeByte(32 + button_code);
+            try writer.writeByte(32 + @as(u8, @intCast(cell.x)) + 1);
+            try writer.writeByte(32 + @as(u8, @intCast(cell.y)) + 1);
+        },
+
+        .utf8 => {
+            try writer.writeAll("\x1B[M");
+
+            // The button code always fits in a single byte.
+            try writer.writeByte(32 + button_code);
+
+            var buf: [4]u8 = undefined;
+            const x_cp: u21 = @intCast(@as(u32, cell.x) + 33);
+            const y_cp: u21 = @intCast(cell.y + 33);
+
+            const x_len = std.unicode.utf8Encode(x_cp, &buf) catch unreachable;
+            try writer.writeAll(buf[0..x_len]);
+
+            const y_len = std.unicode.utf8Encode(y_cp, &buf) catch unreachable;
+            try writer.writeAll(buf[0..y_len]);
+        },
+
+        .sgr => try writer.print("\x1B[<{d};{d};{d}{c}", .{
+            button_code,
+            cell.x + 1,
+            cell.y + 1,
+            @as(u8, if (event.action == .release) 'm' else 'M'),
+        }),
+
+        .urxvt => try writer.print("\x1B[{d};{d};{d}M", .{
+            32 + button_code,
+            cell.x + 1,
+            cell.y + 1,
+        }),
+
+        .sgr_pixels => {
+            const pixels = posToPixels(event.pos, opts.size);
+            try writer.print("\x1B[<{d};{d};{d}{c}", .{
+                button_code,
+                pixels.x,
+                pixels.y,
+                @as(u8, if (event.action == .release) 'm' else 'M'),
+            });
+        },
+    }
+}
+
+/// Returns true if this event should be reported for the given mouse
+/// event mode.
+fn shouldReport(event: Event, opts: Options) bool {
+    return switch (opts.event) {
+        .none => false,
+
+        // X10 only reports button presses of left, middle, and right.
+        .x10 => event.action == .press and
+            event.button != null and
+            (event.button.? == .left or
+                event.button.? == .middle or
+                event.button.? == .right),
+
+        // Normal mode does not report motion.
+        .normal => event.action != .motion,
+
+        // Button mode requires an active button for motion events.
+        .button => event.button != null,
+
+        // Any mode reports everything.
+        .any => true,
+    };
+}
+
+fn buttonCode(event: Event, opts: Options) ?u8 {
+    var acc: u8 = code: {
+        if (event.button == null) {
+            // Null button means motion with no pressed button.
+            break :code 3;
+        }
+
+        if (event.action == .release and
+            opts.format != .sgr and
+            opts.format != .sgr_pixels)
+        {
+            // Legacy releases are always encoded as button 3.
+            break :code 3;
+        }
+
+        break :code switch (event.button.?) {
+            .left => 0,
+            .middle => 1,
+            .right => 2,
+            .four => 64,
+            .five => 65,
+            .six => 66,
+            .seven => 67,
+            .eight => 128,
+            .nine => 129,
+            else => return null,
+        };
+    };
+
+    // X10 does not include modifiers.
+    if (opts.event != .x10) {
+        if (event.mods.shift) acc += 4;
+        if (event.mods.alt) acc += 8;
+        if (event.mods.ctrl) acc += 16;
+    }
+
+    // Motion adds another bit.
+    if (event.action == .motion) acc += 32;
+
+    return acc;
+}
+
+/// Terminal-space pixel position for SGR pixel reporting.
+const PixelPoint = struct {
+    x: i32,
+    y: i32,
+};
+
+/// Returns true if the surface-space pixel position is outside the
+/// visible viewport bounds (negative or beyond screen dimensions).
+fn posOutOfViewport(pos: Event.Pos, size: renderer_size.Size) bool {
+    const max_x: f32 = @floatFromInt(size.screen.width);
+    const max_y: f32 = @floatFromInt(size.screen.height);
+    return pos.x < 0 or pos.y < 0 or pos.x > max_x or pos.y > max_y;
+}
+
+/// Converts a surface-space pixel position to a zero-based grid cell
+/// coordinate (column, row) within the terminal viewport. Out-of-bounds
+/// values are clamped to the valid grid range (0 to columns/rows - 1).
+fn posToCell(pos: Event.Pos, size: renderer_size.Size) point.Coordinate {
+    const coord: renderer_size.Coordinate = .{ .surface = .{
+        .x = @as(f64, @floatCast(pos.x)),
+        .y = @as(f64, @floatCast(pos.y)),
+    } };
+    const grid = coord.convert(.grid, size).grid;
+    return .{ .x = grid.x, .y = grid.y };
+}
+
+/// Converts a surface-space pixel position to terminal-space pixel
+/// coordinates (accounting for padding/scaling) used by SGR-Pixels mode.
+/// Unlike grid conversion, terminal-space coordinates are not clamped
+/// and may be negative or exceed the terminal dimensions.
+fn posToPixels(pos: Event.Pos, size: renderer_size.Size) PixelPoint {
+    const coord: renderer_size.Coordinate.Terminal = (renderer_size.Coordinate{ .surface = .{
+        .x = @as(f64, @floatCast(pos.x)),
+        .y = @as(f64, @floatCast(pos.y)),
+    } }).convert(.terminal, size).terminal;
+
+    return .{
+        .x = @as(i32, @intFromFloat(@round(coord.x))),
+        .y = @as(i32, @intFromFloat(@round(coord.y))),
+    };
+}
+
+fn testSize() renderer_size.Size {
+    return .{
+        .screen = .{ .width = 1_000, .height = 1_000 },
+        .cell = .{ .width = 1, .height = 1 },
+        .padding = .{},
+    };
+}
+
+test "shouldReport: none mode never reports" {
+    const size = testSize();
+    inline for ([_]mouse.Action{ .press, .release, .motion }) |action| {
+        try testing.expect(!shouldReport(.{
+            .button = .left,
+            .action = action,
+        }, .{ .event = .none, .size = size }));
+    }
+}
+
+test "shouldReport: x10 reports only left/middle/right press" {
+    const size = testSize();
+    // Left, middle, right presses should report.
+    inline for ([_]mouse.Button{ .left, .middle, .right }) |btn| {
+        try testing.expect(shouldReport(.{
+            .button = btn,
+            .action = .press,
+        }, .{ .event = .x10, .size = size }));
+    }
+
+    // Release is not reported.
+    try testing.expect(!shouldReport(.{
+        .button = .left,
+        .action = .release,
+    }, .{ .event = .x10, .size = size }));
+
+    // Motion is not reported.
+    try testing.expect(!shouldReport(.{
+        .button = .left,
+        .action = .motion,
+    }, .{ .event = .x10, .size = size }));
+
+    // Other buttons are not reported.
+    try testing.expect(!shouldReport(.{
+        .button = .four,
+        .action = .press,
+    }, .{ .event = .x10, .size = size }));
+
+    // Null button is not reported.
+    try testing.expect(!shouldReport(.{
+        .button = null,
+        .action = .press,
+    }, .{ .event = .x10, .size = size }));
+}
+
+test "shouldReport: normal reports press and release but not motion" {
+    const size = testSize();
+    try testing.expect(shouldReport(.{
+        .button = .left,
+        .action = .press,
+    }, .{ .event = .normal, .size = size }));
+
+    try testing.expect(shouldReport(.{
+        .button = .left,
+        .action = .release,
+    }, .{ .event = .normal, .size = size }));
+
+    try testing.expect(!shouldReport(.{
+        .button = .left,
+        .action = .motion,
+    }, .{ .event = .normal, .size = size }));
+}
+
+test "shouldReport: button mode requires a button" {
+    const size = testSize();
+    // With a button, all actions report.
+    inline for ([_]mouse.Action{ .press, .release, .motion }) |action| {
+        try testing.expect(shouldReport(.{
+            .button = .left,
+            .action = action,
+        }, .{ .event = .button, .size = size }));
+    }
+
+    // Without a button (null), nothing reports.
+    inline for ([_]mouse.Action{ .press, .release, .motion }) |action| {
+        try testing.expect(!shouldReport(.{
+            .button = null,
+            .action = action,
+        }, .{ .event = .button, .size = size }));
+    }
+}
+
+test "shouldReport: any mode reports everything" {
+    const size = testSize();
+    inline for ([_]mouse.Action{ .press, .release, .motion }) |action| {
+        try testing.expect(shouldReport(.{
+            .button = .left,
+            .action = action,
+        }, .{ .event = .any, .size = size }));
+    }
+
+    // Even null button + motion reports.
+    try testing.expect(shouldReport(.{
+        .button = null,
+        .action = .motion,
+    }, .{ .event = .any, .size = size }));
+}
+
+test "x10 press left" {
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = .left,
+        .action = .press,
+        .mods = .{ .shift = true, .alt = true, .ctrl = true },
+        .pos = .{ .x = 0, .y = 0 },
+    }, .{
+        .event = .x10,
+        .format = .x10,
+        .size = testSize(),
+        .last_cell = &last,
+    });
+
+    try testing.expectEqualSlices(u8, &.{
+        0x1B,
+        '[',
+        'M',
+        32,
+        33,
+        33,
+    }, writer.buffered());
+}
+
+test "x10 ignores release" {
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = .left,
+        .action = .release,
+    }, .{
+        .event = .x10,
+        .format = .x10,
+        .size = testSize(),
+        .last_cell = &last,
+    });
+
+    try testing.expectEqual(@as(usize, 0), writer.buffered().len);
+}
+
+test "normal ignores motion" {
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = .left,
+        .action = .motion,
+    }, .{
+        .event = .normal,
+        .format = .sgr,
+        .size = testSize(),
+        .last_cell = &last,
+    });
+
+    try testing.expectEqual(@as(usize, 0), writer.buffered().len);
+}
+
+test "button mode requires button" {
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = null,
+        .action = .motion,
+    }, .{
+        .event = .button,
+        .format = .sgr,
+        .size = testSize(),
+        .last_cell = &last,
+    });
+
+    try testing.expectEqual(@as(usize, 0), writer.buffered().len);
+}
+
+test "sgr release keeps button identity" {
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = .right,
+        .action = .release,
+        .pos = .{ .x = 4, .y = 5 },
+    }, .{
+        .event = .any,
+        .format = .sgr,
+        .size = testSize(),
+        .last_cell = &last,
+    });
+
+    try testing.expectEqualStrings("\x1B[<2;5;6m", writer.buffered());
+}
+
+test "sgr motion with no button" {
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = null,
+        .action = .motion,
+        .pos = .{ .x = 1, .y = 2 },
+    }, .{
+        .event = .any,
+        .format = .sgr,
+        .size = testSize(),
+        .last_cell = &last,
+    });
+
+    try testing.expectEqualStrings("\x1B[<35;2;3M", writer.buffered());
+}
+
+test "urxvt with modifiers" {
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = .left,
+        .action = .press,
+        .mods = .{ .shift = true, .alt = true, .ctrl = true },
+        .pos = .{ .x = 2, .y = 3 },
+    }, .{
+        .event = .any,
+        .format = .urxvt,
+        .size = testSize(),
+        .last_cell = &last,
+    });
+
+    try testing.expectEqualStrings("\x1B[60;3;4M", writer.buffered());
+}
+
+test "utf8 encodes large coordinates" {
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = .left,
+        .action = .press,
+        .pos = .{ .x = 300, .y = 400 },
+    }, .{
+        .event = .any,
+        .format = .utf8,
+        .size = testSize(),
+        .last_cell = &last,
+    });
+
+    const out = writer.buffered();
+    try testing.expectEqualSlices(u8, &.{ 0x1B, '[', 'M', 32 }, out[0..4]);
+
+    const view = try std.unicode.Utf8View.init(out[4..]);
+    var it = view.iterator();
+    try testing.expectEqual(@as(u21, 333), it.nextCodepoint().?);
+    try testing.expectEqual(@as(u21, 433), it.nextCodepoint().?);
+    try testing.expectEqual(@as(?u21, null), it.nextCodepoint());
+}
+
+test "x10 coordinate limit" {
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = .left,
+        .action = .press,
+        .pos = .{ .x = 223, .y = 0 },
+    }, .{
+        .event = .x10,
+        .format = .x10,
+        .size = testSize(),
+        .last_cell = &last,
+    });
+
+    try testing.expectEqual(@as(usize, 0), writer.buffered().len);
+}
+
+test "sgr wheel button mappings" {
+    const Case = struct {
+        button: mouse.Button,
+        code: u8,
+    };
+
+    inline for ([_]Case{
+        .{ .button = .four, .code = 64 },
+        .{ .button = .five, .code = 65 },
+        .{ .button = .six, .code = 66 },
+        .{ .button = .seven, .code = 67 },
+    }) |c| {
+        var data: [32]u8 = undefined;
+        var writer: std.Io.Writer = .fixed(&data);
+        var last: ?point.Coordinate = null;
+        try encode(&writer, .{
+            .button = c.button,
+            .action = .press,
+            .pos = .{ .x = 0, .y = 0 },
+        }, .{
+            .event = .any,
+            .format = .sgr,
+            .size = testSize(),
+            .last_cell = &last,
+        });
+
+        var expected: [32]u8 = undefined;
+        const want = try std.fmt.bufPrint(&expected, "\x1B[<{d};1;1M", .{c.code});
+        try testing.expectEqualStrings(want, writer.buffered());
+    }
+}
+
+test "urxvt release uses legacy button 3 encoding" {
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = .right,
+        .action = .release,
+        .pos = .{ .x = 2, .y = 3 },
+    }, .{
+        .event = .any,
+        .format = .urxvt,
+        .size = testSize(),
+        .last_cell = &last,
+    });
+
+    try testing.expectEqualStrings("\x1B[35;3;4M", writer.buffered());
+}
+
+test "unsupported button is ignored" {
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = .ten,
+        .action = .press,
+        .pos = .{ .x = 1, .y = 1 },
+    }, .{
+        .event = .any,
+        .format = .sgr,
+        .size = testSize(),
+        .last_cell = &last,
+    });
+
+    try testing.expectEqual(@as(usize, 0), writer.buffered().len);
+}
+
+test "sgr pixels uses terminal-space cursor coordinates" {
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = .left,
+        .action = .press,
+        .pos = .{ .x = 10, .y = 20 },
+    }, .{
+        .event = .any,
+        .format = .sgr_pixels,
+        .size = testSize(),
+        .last_cell = &last,
+    });
+
+    try testing.expectEqualStrings("\x1B[<0;10;20M", writer.buffered());
+}
+
+test "sgr pixels release keeps button identity" {
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = .right,
+        .action = .release,
+        .pos = .{ .x = 10, .y = 20 },
+    }, .{
+        .event = .any,
+        .format = .sgr_pixels,
+        .size = testSize(),
+        .last_cell = &last,
+    });
+
+    try testing.expectEqualStrings("\x1B[<2;10;20m", writer.buffered());
+}
+
+test "position exactly at viewport boundary is encoded in final cell" {
+    const size: renderer_size.Size = .{
+        .screen = .{ .width = 10, .height = 10 },
+        .cell = .{ .width = 2, .height = 2 },
+        .padding = .{},
+    };
+
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = .left,
+        .action = .press,
+        .pos = .{ .x = 10, .y = 10 },
+    }, .{
+        .event = .any,
+        .format = .sgr,
+        .size = size,
+        .last_cell = &last,
+    });
+
+    try testing.expectEqualStrings("\x1B[<0;5;5M", writer.buffered());
+}
+
+test "outside viewport motion with no pressed button is ignored" {
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = .left,
+        .action = .motion,
+        .pos = .{ .x = -1, .y = -1 },
+    }, .{
+        .event = .any,
+        .format = .sgr,
+        .size = testSize(),
+        .any_button_pressed = false,
+        .last_cell = &last,
+    });
+
+    try testing.expectEqual(@as(usize, 0), writer.buffered().len);
+}
+
+test "outside viewport motion with pressed button is reported" {
+    var data: [32]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&data);
+    var last: ?point.Coordinate = null;
+    try encode(&writer, .{
+        .button = .left,
+        .action = .motion,
+        .pos = .{ .x = -1, .y = -1 },
+    }, .{
+        .event = .any,
+        .format = .sgr,
+        .size = testSize(),
+        .any_button_pressed = true,
+        .last_cell = &last,
+    });
+
+    try testing.expectEqualStrings("\x1B[<32;1;1M", writer.buffered());
+}
+
+test "motion is deduped by last cell except sgr pixels" {
+    var last: ?point.Coordinate = null;
+
+    {
+        var data: [32]u8 = undefined;
+        var writer: std.Io.Writer = .fixed(&data);
+        try encode(&writer, .{
+            .button = .left,
+            .action = .motion,
+            .pos = .{ .x = 5, .y = 6 },
+        }, .{
+            .event = .any,
+            .format = .sgr,
+            .size = testSize(),
+            .last_cell = &last,
+        });
+        try testing.expect(writer.buffered().len > 0);
+    }
+
+    {
+        var data: [32]u8 = undefined;
+        var writer: std.Io.Writer = .fixed(&data);
+        try encode(&writer, .{
+            .button = .left,
+            .action = .motion,
+            .pos = .{ .x = 5, .y = 6 },
+        }, .{
+            .event = .any,
+            .format = .sgr,
+            .size = testSize(),
+            .last_cell = &last,
+        });
+        try testing.expectEqual(@as(usize, 0), writer.buffered().len);
+    }
+
+    {
+        var data: [32]u8 = undefined;
+        var writer: std.Io.Writer = .fixed(&data);
+        try encode(&writer, .{
+            .button = .left,
+            .action = .motion,
+            .pos = .{ .x = 5, .y = 6 },
+        }, .{
+            .event = .any,
+            .format = .sgr_pixels,
+            .size = testSize(),
+            .last_cell = &last,
+        });
+        try testing.expect(writer.buffered().len > 0);
+    }
+}
diff --git a/src/surface_mouse.zig b/src/surface_mouse.zig
index 691f1b23c..6d3c11394 100644
--- a/src/surface_mouse.zig
+++ b/src/surface_mouse.zig
@@ -16,7 +16,7 @@ const MouseShape = @import("terminal/mouse_shape.zig").MouseShape;
 physical_key: input.Key,
 
 /// The mouse event tracking mode, if any.
-mouse_event: terminal.Terminal.MouseEvents,
+mouse_event: terminal.Terminal.MouseEvent,
 
 /// The current terminal's mouse shape.
 mouse_shape: MouseShape,
diff --git a/src/terminal/Terminal.zig b/src/terminal/Terminal.zig
index 1ea915c67..9e21ba97a 100644
--- a/src/terminal/Terminal.zig
+++ b/src/terminal/Terminal.zig
@@ -96,7 +96,7 @@ flags: packed struct {
     /// set mode in modes. You can't get the right event/format to use
     /// based on modes alone because modes don't show you what order
     /// this was called so we have to track it separately.
-    mouse_event: MouseEvents = .none,
+    mouse_event: MouseEvent = .none,
     mouse_format: MouseFormat = .x10,
 
     /// Set via the XTSHIFTESCAPE sequence. If true (XTSHIFTESCAPE = 1)
@@ -169,7 +169,7 @@ pub const Dirty = packed struct {
 
 /// The event types that can be reported for mouse-related activities.
 /// These are all mutually exclusive (hence in a single enum).
-pub const MouseEvents = enum(u3) {
+pub const MouseEvent = enum(u3) {
     none = 0,
     x10 = 1, // 9
     normal = 2, // 1000
@@ -177,7 +177,7 @@ pub const MouseEvents = enum(u3) {
     any = 4, // 1003
 
     /// Returns true if this event sends motion events.
-    pub fn motion(self: MouseEvents) bool {
+    pub fn motion(self: MouseEvent) bool {
         return self == .button or self == .any;
     }
 };

From a2b2b883e8e74328463c23a6e925b31475b78330 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Sun, 15 Mar 2026 22:47:41 +0000
Subject: [PATCH 177/391] Update VOUCHED list (#11540)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11518#issuecomment-4064084617)
from @jparise.

Vouch: @j0hnm4r5

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 493d5dd2e..c9d1629d7 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -83,6 +83,7 @@ halosatrio
 hqnna
 hulet
 icodesign
+j0hnm4r5
 jacobsandlund
 jake-stewart
 jcollie

From f9f92f2e0f590ece488e06718ccbbeb4bd6fc601 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 15 Mar 2026 15:48:09 -0700
Subject: [PATCH 178/391] terminal: consolidate mouse types into mouse.zig

Move MouseEvent and MouseFormat out of Terminal.zig and MouseShape out
of mouse_shape.zig into a new mouse.zig file. The types are named
without the Mouse prefix inside the module (Event, Format, Shape) and
re-exported with the prefix from terminal/main.zig for external use.

Update all call sites (mouse_encode.zig, surface_mouse.zig, stream.zig)
to import through terminal/main.zig or directly from mouse.zig. Remove
the now-unused mouse_shape.zig.
---
 src/input/mouse_encode.zig                  |  7 ++--
 src/surface_mouse.zig                       |  4 +--
 src/terminal/Terminal.zig                   | 33 +++---------------
 src/terminal/main.zig                       |  5 ++-
 src/terminal/{mouse_shape.zig => mouse.zig} | 37 +++++++++++++++++----
 src/terminal/stream.zig                     |  2 +-
 6 files changed, 46 insertions(+), 42 deletions(-)
 rename src/terminal/{mouse_shape.zig => mouse.zig} (77%)

diff --git a/src/input/mouse_encode.zig b/src/input/mouse_encode.zig
index 2dfe084fb..9dceb0ab3 100644
--- a/src/input/mouse_encode.zig
+++ b/src/input/mouse_encode.zig
@@ -1,6 +1,7 @@
 const std = @import("std");
 const testing = std.testing;
-const Terminal = @import("../terminal/Terminal.zig");
+const terminal = @import("../terminal/main.zig");
+const Terminal = terminal.Terminal;
 const renderer_size = @import("../renderer/size.zig");
 const point = @import("../terminal/point.zig");
 const key = @import("key.zig");
@@ -11,10 +12,10 @@ const log = std.log.scoped(.mouse_encode);
 /// Options that affect mouse encoding behavior and provide runtime context.
 pub const Options = struct {
     /// Terminal mouse reporting mode (X10, normal, button, any).
-    event: Terminal.MouseEvent = .none,
+    event: terminal.MouseEvent = .none,
 
     /// Terminal mouse reporting format.
-    format: Terminal.MouseFormat = .x10,
+    format: terminal.MouseFormat = .x10,
 
     /// Full renderer size used to convert surface-space pixel positions
     /// into grid cell coordinates (for most formats) and terminal-space
diff --git a/src/surface_mouse.zig b/src/surface_mouse.zig
index 6d3c11394..8fa53d240 100644
--- a/src/surface_mouse.zig
+++ b/src/surface_mouse.zig
@@ -9,14 +9,14 @@ const std = @import("std");
 const builtin = @import("builtin");
 const input = @import("input.zig");
 const terminal = @import("terminal/main.zig");
-const MouseShape = @import("terminal/mouse_shape.zig").MouseShape;
+const MouseShape = terminal.MouseShape;
 
 /// For processing key events; the key that was physically pressed on the
 /// keyboard.
 physical_key: input.Key,
 
 /// The mouse event tracking mode, if any.
-mouse_event: terminal.Terminal.MouseEvent,
+mouse_event: terminal.MouseEvent,
 
 /// The current terminal's mouse shape.
 mouse_shape: MouseShape,
diff --git a/src/terminal/Terminal.zig b/src/terminal/Terminal.zig
index 9e21ba97a..636a8f2ee 100644
--- a/src/terminal/Terminal.zig
+++ b/src/terminal/Terminal.zig
@@ -23,7 +23,7 @@ const point = @import("point.zig");
 const sgr = @import("sgr.zig");
 const Tabstops = @import("Tabstops.zig");
 const color = @import("color.zig");
-const mouse_shape_pkg = @import("mouse_shape.zig");
+const mouse = @import("mouse.zig");
 const ReadonlyHandler = @import("stream_readonly.zig").Handler;
 const ReadonlyStream = @import("stream_readonly.zig").Stream;
 
@@ -79,7 +79,7 @@ previous_char: ?u21 = null,
 modes: modespkg.ModeState = .{},
 
 /// The most recently set mouse shape for the terminal.
-mouse_shape: mouse_shape_pkg.MouseShape = .text,
+mouse_shape: mouse.Shape = .text,
 
 /// These are just a packed set of flags we may set on the terminal.
 flags: packed struct {
@@ -96,8 +96,8 @@ flags: packed struct {
     /// set mode in modes. You can't get the right event/format to use
     /// based on modes alone because modes don't show you what order
     /// this was called so we have to track it separately.
-    mouse_event: MouseEvent = .none,
-    mouse_format: MouseFormat = .x10,
+    mouse_event: mouse.Event = .none,
+    mouse_format: mouse.Format = .x10,
 
     /// Set via the XTSHIFTESCAPE sequence. If true (XTSHIFTESCAPE = 1)
     /// then we want to capture the shift key for the mouse protocol
@@ -167,31 +167,6 @@ pub const Dirty = packed struct {
     preedit: bool = false,
 };
 
-/// The event types that can be reported for mouse-related activities.
-/// These are all mutually exclusive (hence in a single enum).
-pub const MouseEvent = enum(u3) {
-    none = 0,
-    x10 = 1, // 9
-    normal = 2, // 1000
-    button = 3, // 1002
-    any = 4, // 1003
-
-    /// Returns true if this event sends motion events.
-    pub fn motion(self: MouseEvent) bool {
-        return self == .button or self == .any;
-    }
-};
-
-/// The format of mouse events when enabled.
-/// These are all mutually exclusive (hence in a single enum).
-pub const MouseFormat = enum(u3) {
-    x10 = 0,
-    utf8 = 1, // 1005
-    sgr = 2, // 1006
-    urxvt = 3, // 1015
-    sgr_pixels = 4, // 1016
-};
-
 /// Scrolling region is the area of the screen designated where scrolling
 /// occurs. When scrolling the screen, only this viewport is scrolled.
 pub const ScrollingRegion = struct {
diff --git a/src/terminal/main.zig b/src/terminal/main.zig
index 06c930014..a87d5ec87 100644
--- a/src/terminal/main.zig
+++ b/src/terminal/main.zig
@@ -31,7 +31,10 @@ pub const Cell = page.Cell;
 pub const Coordinate = point.Coordinate;
 pub const CSI = Parser.Action.CSI;
 pub const DCS = Parser.Action.DCS;
-pub const MouseShape = @import("mouse_shape.zig").MouseShape;
+pub const mouse = @import("mouse.zig");
+pub const MouseEvent = mouse.Event;
+pub const MouseFormat = mouse.Format;
+pub const MouseShape = mouse.Shape;
 pub const Page = page.Page;
 pub const PageList = @import("PageList.zig");
 pub const Parser = @import("Parser.zig");
diff --git a/src/terminal/mouse_shape.zig b/src/terminal/mouse.zig
similarity index 77%
rename from src/terminal/mouse_shape.zig
rename to src/terminal/mouse.zig
index b5c6ac4d1..758369ae9 100644
--- a/src/terminal/mouse_shape.zig
+++ b/src/terminal/mouse.zig
@@ -2,12 +2,37 @@ const std = @import("std");
 const build_options = @import("terminal_options");
 const lib = @import("../lib/main.zig");
 
+/// The event types that can be reported for mouse-related activities.
+/// These are all mutually exclusive (hence in a single enum).
+pub const Event = enum(u3) {
+    none = 0,
+    x10 = 1, // 9
+    normal = 2, // 1000
+    button = 3, // 1002
+    any = 4, // 1003
+
+    /// Returns true if this event sends motion events.
+    pub fn motion(self: Event) bool {
+        return self == .button or self == .any;
+    }
+};
+
+/// The format of mouse events when enabled.
+/// These are all mutually exclusive (hence in a single enum).
+pub const Format = enum(u3) {
+    x10 = 0,
+    utf8 = 1, // 1005
+    sgr = 2, // 1006
+    urxvt = 3, // 1015
+    sgr_pixels = 4, // 1016
+};
+
 /// The possible cursor shapes. Not all app runtimes support these shapes.
 /// The shapes are always based on the W3C supported cursor styles so we
 /// can have a cross platform list.
 //
 // Must be kept in sync with ghostty_cursor_shape_e
-pub const MouseShape = enum(c_int) {
+pub const Shape = enum(c_int) {
     default,
     context_menu,
     help,
@@ -44,7 +69,7 @@ pub const MouseShape = enum(c_int) {
     zoom_out,
 
     /// Build cursor shape from string or null if its unknown.
-    pub fn fromString(v: []const u8) ?MouseShape {
+    pub fn fromString(v: []const u8) ?Shape {
         return string_map.get(v);
     }
 
@@ -57,7 +82,7 @@ pub const MouseShape = enum(c_int) {
 
         break :gtk switch (@import("../build_config.zig").app_runtime) {
             .gtk => @import("gobject").ext.defineEnum(
-                MouseShape,
+                Shape,
                 .{ .name = "GhosttyMouseShape" },
             ),
 
@@ -66,11 +91,11 @@ pub const MouseShape = enum(c_int) {
     };
 
     test "ghostty.h MouseShape" {
-        try lib.checkGhosttyHEnum(MouseShape, "GHOSTTY_MOUSE_SHAPE_");
+        try lib.checkGhosttyHEnum(Shape, "GHOSTTY_MOUSE_SHAPE_");
     }
 };
 
-const string_map = std.StaticStringMap(MouseShape).initComptime(.{
+const string_map = std.StaticStringMap(Shape).initComptime(.{
     // W3C
     .{ "default", .default },
     .{ "context-menu", .context_menu },
@@ -134,7 +159,7 @@ const string_map = std.StaticStringMap(MouseShape).initComptime(.{
 
 test "cursor shape from string" {
     const testing = std.testing;
-    try testing.expectEqual(MouseShape.default, MouseShape.fromString("default").?);
+    try testing.expectEqual(Shape.default, Shape.fromString("default").?);
 }
 
 test {
diff --git a/src/terminal/stream.zig b/src/terminal/stream.zig
index 5f83128a9..f78bcc6f5 100644
--- a/src/terminal/stream.zig
+++ b/src/terminal/stream.zig
@@ -16,7 +16,7 @@ const modes = @import("modes.zig");
 const osc = @import("osc.zig");
 const sgr = @import("sgr.zig");
 const UTF8Decoder = @import("UTF8Decoder.zig");
-const MouseShape = @import("mouse_shape.zig").MouseShape;
+const MouseShape = @import("mouse.zig").Shape;
 
 const log = std.log.scoped(.stream);
 

From ef1560ce50d73632d55d879ce72a9aab006280fa Mon Sep 17 00:00:00 2001
From: Kat <65649991+00-kat@users.noreply.github.com>
Date: Mon, 16 Mar 2026 10:28:46 +1100
Subject: [PATCH 179/391] Add missing plural forms.

mk and zh_* are still missing theirs, but neither gettext's table [1]
nor the documentation it copied from [2] list them.

[1]: https://cgit.git.savannah.gnu.org/cgit/gettext.git/tree/gettext-tools/src/plural-table.c?id=dbf9d71e0c4707ca1b14359256b3dcccecb8e837
[2]: https://www.gnu.org/software/gettext/manual/html_node/Plural-forms.html
---
 po/id.po | 1 +
 po/lt.po | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/po/id.po b/po/id.po
index e5660440a..1549aaf34 100644
--- a/po/id.po
+++ b/po/id.po
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: dist/linux/ghostty_nautilus.py:53
 msgid "Open in Ghostty"
diff --git a/po/lt.po b/po/lt.po
index ba4995ddc..bbcadd8b4 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -15,6 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"(n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: dist/linux/ghostty_nautilus.py:53
 msgid "Open in Ghostty"

From a945115d2f5004df9448df1cfe375bec931b9d79 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2026 00:03:41 +0000
Subject: [PATCH 180/391] Sync CODEOWNERS vouch list (#11542)

Sync CODEOWNERS owners with vouch list.

## Added Users

- @alosarjos
- @anhthang
- @AnmiTaliDev
- @crayxt
- @MicaelJarniac

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index c9d1629d7..4688c4ea0 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -29,8 +29,11 @@ alaasdk
 alanmoyano
 alexfeijoo44
 alexjuca
+alosarjos
 amadeus
 andrejdaskalov
+anhthang
+anmitalidev
 anthonyzhoon
 atomk
 balazs-szucs
@@ -48,6 +51,7 @@ charliie-dev
 chernetskyi
 chronologos
 cmwetherell
+crayxt
 craziestowl
 curtismoncoq
 d-dudas
@@ -114,6 +118,7 @@ markdorison
 markhuot
 marrocco-simone
 matkotiric
+micaeljarniac
 michielvk
 miguelelgallo
 mihi314

From 0fb1519cf2ca8a8e39a29e5a389c1272625a954b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2026 00:17:13 +0000
Subject: [PATCH 181/391] build(deps): bump actions/create-github-app-token
 from 2.2.1 to 3.0.0

Bumps [actions/create-github-app-token](https://github.com/actions/create-github-app-token) from 2.2.1 to 3.0.0.
- [Release notes](https://github.com/actions/create-github-app-token/releases)
- [Commits](https://github.com/actions/create-github-app-token/compare/29824e69f54612133e76f7eaac726eef6c875baf...f8d387b68d61c58ab83c6c016672934102569859)

---
updated-dependencies:
- dependency-name: actions/create-github-app-token
  dependency-version: 3.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/vouch-check-issue.yml          | 2 +-
 .github/workflows/vouch-check-pr.yml             | 2 +-
 .github/workflows/vouch-manage-by-discussion.yml | 2 +-
 .github/workflows/vouch-manage-by-issue.yml      | 2 +-
 .github/workflows/vouch-sync-codeowners.yml      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/vouch-check-issue.yml b/.github/workflows/vouch-check-issue.yml
index 3fa3bb542..d0456b00a 100644
--- a/.github/workflows/vouch-check-issue.yml
+++ b/.github/workflows/vouch-check-issue.yml
@@ -8,7 +8,7 @@ jobs:
   check:
     runs-on: namespace-profile-ghostty-xsm
     steps:
-      - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+      - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
         id: app-token
         with:
           app-id: ${{ secrets.VOUCH_APP_ID }}
diff --git a/.github/workflows/vouch-check-pr.yml b/.github/workflows/vouch-check-pr.yml
index 0efb6208c..0602553ca 100644
--- a/.github/workflows/vouch-check-pr.yml
+++ b/.github/workflows/vouch-check-pr.yml
@@ -8,7 +8,7 @@ jobs:
   check:
     runs-on: namespace-profile-ghostty-xsm
     steps:
-      - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+      - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
         id: app-token
         with:
           app-id: ${{ secrets.VOUCH_APP_ID }}
diff --git a/.github/workflows/vouch-manage-by-discussion.yml b/.github/workflows/vouch-manage-by-discussion.yml
index cf7c092e2..7288c4ab2 100644
--- a/.github/workflows/vouch-manage-by-discussion.yml
+++ b/.github/workflows/vouch-manage-by-discussion.yml
@@ -12,7 +12,7 @@ jobs:
   manage:
     runs-on: namespace-profile-ghostty-xsm
     steps:
-      - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+      - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
         id: app-token
         with:
           app-id: ${{ secrets.VOUCH_APP_ID }}
diff --git a/.github/workflows/vouch-manage-by-issue.yml b/.github/workflows/vouch-manage-by-issue.yml
index 6f85520bd..6f61592ff 100644
--- a/.github/workflows/vouch-manage-by-issue.yml
+++ b/.github/workflows/vouch-manage-by-issue.yml
@@ -12,7 +12,7 @@ jobs:
   manage:
     runs-on: namespace-profile-ghostty-xsm
     steps:
-      - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+      - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
         id: app-token
         with:
           app-id: ${{ secrets.VOUCH_APP_ID }}
diff --git a/.github/workflows/vouch-sync-codeowners.yml b/.github/workflows/vouch-sync-codeowners.yml
index fac06a372..0879c9722 100644
--- a/.github/workflows/vouch-sync-codeowners.yml
+++ b/.github/workflows/vouch-sync-codeowners.yml
@@ -13,7 +13,7 @@ jobs:
   sync:
     runs-on: namespace-profile-ghostty-xsm
     steps:
-      - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+      - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
         id: app-token
         with:
           app-id: ${{ secrets.VOUCH_APP_ID }}

From d08c8e0dbca944e40cc20f07e84a51d518116356 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2026 00:17:20 +0000
Subject: [PATCH 182/391] build(deps): bump softprops/action-gh-release from
 2.5.0 to 2.6.0

Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/a06a81a03ee405af7f2048a818ed3f03bbf83c7b...26e8ad27a09a225049a7075d7ec1caa2df6ff332)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-version: 2.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release-tip.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release-tip.yml b/.github/workflows/release-tip.yml
index 326b29439..f8fa2475d 100644
--- a/.github/workflows/release-tip.yml
+++ b/.github/workflows/release-tip.yml
@@ -195,7 +195,7 @@ jobs:
           nix develop -c minisign -S -m ghostty-source.tar.gz -s minisign.key < minisign.password
 
       - name: Update Release
-        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
+        uses: softprops/action-gh-release@26e8ad27a09a225049a7075d7ec1caa2df6ff332 # v2.6.0
         with:
           name: 'Ghostty Tip ("Nightly")'
           prerelease: true
@@ -378,7 +378,7 @@ jobs:
 
       # Update Release
       - name: Release
-        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
+        uses: softprops/action-gh-release@26e8ad27a09a225049a7075d7ec1caa2df6ff332 # v2.6.0
         with:
           name: 'Ghostty Tip ("Nightly")'
           prerelease: true
@@ -627,7 +627,7 @@ jobs:
 
       # Update Release
       - name: Release
-        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
+        uses: softprops/action-gh-release@26e8ad27a09a225049a7075d7ec1caa2df6ff332 # v2.6.0
         with:
           name: 'Ghostty Tip ("Nightly")'
           prerelease: true
@@ -824,7 +824,7 @@ jobs:
 
       # Update Release
       - name: Release
-        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
+        uses: softprops/action-gh-release@26e8ad27a09a225049a7075d7ec1caa2df6ff332 # v2.6.0
         with:
           name: 'Ghostty Tip ("Nightly")'
           prerelease: true

From 7f81e12dc0197e8d055f1d722f2df4ae61c57081 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2026 00:17:24 +0000
Subject: [PATCH 183/391] build(deps): bump dorny/paths-filter from 4.0.0 to
 4.0.1

Bumps [dorny/paths-filter](https://github.com/dorny/paths-filter) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/dorny/paths-filter/releases)
- [Changelog](https://github.com/dorny/paths-filter/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dorny/paths-filter/compare/9d7afb8d214ad99e78fbd4247752c4caed2b6e4c...fbd0ab8f3e69293af611ebaee6363fc25e6d187d)

---
updated-dependencies:
- dependency-name: dorny/paths-filter
  dependency-version: 4.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2762427ac..501e2979f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: dorny/paths-filter@9d7afb8d214ad99e78fbd4247752c4caed2b6e4c # v4.0.0
+      - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
         id: filter_every
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -40,7 +40,7 @@ jobs:
             code:
               - '**'
               - '!.github/VOUCHED.td'
-      - uses: dorny/paths-filter@9d7afb8d214ad99e78fbd4247752c4caed2b6e4c # v4.0.0
+      - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
         id: filter_any
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

From cef1f19d24d6aff9839dc67ae125c2a358b093de Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Sun, 15 Mar 2026 20:46:58 -0400
Subject: [PATCH 184/391] cli: add +explain-config

This is a new CLI action that prints an option or keybind's help
documentation to stdout.

    ghostty +explain-config font-size
    ghostty +explain-config copy_to_clipboard
    ghostty +explain-config --option=font-size
    ghostty +explain-config --keybind=copy_to_clipboard

The --option and --keybind flags perform a specific lookup. A string
passed as a positional argument attempts to look up the name first as an
option and then as a keybind.

Our vim plugin uses this with &keywordprg, which allows you to look up
the documentation for the config option or keybind under the cursor (K).
---
 src/cli/explain_config.zig | 130 +++++++++++++++++++++++++++++++++++++
 src/cli/ghostty.zig        |   6 ++
 src/extra/vim.zig          |   5 +-
 3 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 src/cli/explain_config.zig

diff --git a/src/cli/explain_config.zig b/src/cli/explain_config.zig
new file mode 100644
index 000000000..115ef6fb8
--- /dev/null
+++ b/src/cli/explain_config.zig
@@ -0,0 +1,130 @@
+const std = @import("std");
+const args = @import("args.zig");
+const Allocator = std.mem.Allocator;
+const Action = @import("ghostty.zig").Action;
+const help_strings = @import("help_strings");
+const Config = @import("../config/Config.zig");
+const ConfigKey = @import("../config/key.zig").Key;
+const KeybindAction = @import("../input/Binding.zig").Action;
+
+pub const Options = struct {
+    /// The config option to explain. For example:
+    ///
+    ///   ghostty +explain-config --option=font-size
+    option: ?[]const u8 = null,
+
+    /// The keybind action to explain. For example:
+    ///
+    ///   ghostty +explain-config --keybind=copy_to_clipboard
+    keybind: ?[]const u8 = null,
+
+    pub fn deinit(self: Options) void {
+        _ = self;
+    }
+
+    /// Enables `-h` and `--help` to work.
+    pub fn help(self: Options) !void {
+        _ = self;
+        return Action.help_error;
+    }
+};
+
+/// The `explain-config` command prints the documentation for a single
+/// Ghostty configuration option or keybind action.
+///
+/// Examples:
+///
+///   ghostty +explain-config font-size
+///   ghostty +explain-config copy_to_clipboard
+///   ghostty +explain-config --option=font-size
+///   ghostty +explain-config --keybind=copy_to_clipboard
+///
+/// Flags:
+///
+///   * `--option`: The name of the configuration option to explain.
+///   * `--keybind`: The name of the keybind action to explain.
+pub fn run(alloc: Allocator) !u8 {
+    var option_name: ?[]const u8 = null;
+    var keybind_name: ?[]const u8 = null;
+    var positional: ?[]const u8 = null;
+    var iter = try args.argsIterator(alloc);
+    defer iter.deinit();
+
+    while (iter.next()) |arg| {
+        if (std.mem.startsWith(u8, arg, "--option=")) {
+            option_name = arg["--option=".len..];
+        } else if (std.mem.startsWith(u8, arg, "--keybind=")) {
+            keybind_name = arg["--keybind=".len..];
+        } else if (std.mem.eql(u8, arg, "--help") or std.mem.eql(u8, arg, "-h")) {
+            return Action.help_error;
+        } else if (!std.mem.startsWith(u8, arg, "-")) {
+            positional = arg;
+        }
+    }
+
+    // Resolve what to look up. Explicit flags go directly to their
+    // respective lookup. A bare positional argument tries config
+    // options first, then keybind actions as a fallback.
+    const name = keybind_name orelse option_name orelse positional orelse {
+        var stderr: std.fs.File = .stderr();
+        var buffer: [4096]u8 = undefined;
+        var stderr_writer = stderr.writer(&buffer);
+        try stderr_writer.interface.writeAll("Usage: ghostty +explain-config <option>\n");
+        try stderr_writer.interface.writeAll("       ghostty +explain-config --option=<option>\n");
+        try stderr_writer.interface.writeAll("       ghostty +explain-config --keybind=<action>\n");
+        try stderr_writer.end();
+        return 1;
+    };
+
+    const text = if (keybind_name != null)
+        explainKeybind(name)
+    else if (option_name != null)
+        explainOption(name)
+    else
+        explainOption(name) orelse explainKeybind(name);
+
+    var stdout: std.fs.File = .stdout();
+    var buffer: [4096]u8 = undefined;
+    var stdout_writer = stdout.writer(&buffer);
+    const writer = &stdout_writer.interface;
+
+    if (text) |t| {
+        try writer.writeAll(t);
+        try writer.writeAll("\n");
+    } else {
+        try writer.writeAll("Unknown: '");
+        try writer.writeAll(name);
+        try writer.writeAll("'.\n");
+        try stdout_writer.end();
+        return 1;
+    }
+
+    try stdout_writer.end();
+    return 0;
+}
+
+fn explainOption(name: []const u8) ?[]const u8 {
+    const key = std.meta.stringToEnum(ConfigKey, name) orelse return null;
+    return switch (key) {
+        inline else => |tag| {
+            const field_name = @tagName(tag);
+            return if (@hasDecl(help_strings.Config, field_name))
+                @field(help_strings.Config, field_name)
+            else
+                null;
+        },
+    };
+}
+
+fn explainKeybind(name: []const u8) ?[]const u8 {
+    const tag = std.meta.stringToEnum(std.meta.Tag(KeybindAction), name) orelse return null;
+    return switch (tag) {
+        inline else => |t| {
+            const field_name = @tagName(t);
+            return if (@hasDecl(help_strings.KeybindAction, field_name))
+                @field(help_strings.KeybindAction, field_name)
+            else
+                null;
+        },
+    };
+}
diff --git a/src/cli/ghostty.zig b/src/cli/ghostty.zig
index f6ac7d93d..3acb90043 100644
--- a/src/cli/ghostty.zig
+++ b/src/cli/ghostty.zig
@@ -14,6 +14,7 @@ const list_actions = @import("list_actions.zig");
 const ssh_cache = @import("ssh_cache.zig");
 const edit_config = @import("edit_config.zig");
 const show_config = @import("show_config.zig");
+const explain_config = @import("explain_config.zig");
 const validate_config = @import("validate_config.zig");
 const crash_report = @import("crash_report.zig");
 const show_face = @import("show_face.zig");
@@ -54,6 +55,9 @@ pub const Action = enum {
     /// Dump the config to stdout
     @"show-config",
 
+    /// Explain a single config option
+    @"explain-config",
+
     // Validate passed config file
     @"validate-config",
 
@@ -142,6 +146,7 @@ pub const Action = enum {
             .@"ssh-cache" => try ssh_cache.run(alloc),
             .@"edit-config" => try edit_config.run(alloc),
             .@"show-config" => try show_config.run(alloc),
+            .@"explain-config" => try explain_config.run(alloc),
             .@"validate-config" => try validate_config.run(alloc),
             .@"crash-report" => try crash_report.run(alloc),
             .@"show-face" => try show_face.run(alloc),
@@ -181,6 +186,7 @@ pub const Action = enum {
                 .@"ssh-cache" => ssh_cache.Options,
                 .@"edit-config" => edit_config.Options,
                 .@"show-config" => show_config.Options,
+                .@"explain-config" => explain_config.Options,
                 .@"validate-config" => validate_config.Options,
                 .@"crash-report" => crash_report.Options,
                 .@"show-face" => show_face.Options,
diff --git a/src/extra/vim.zig b/src/extra/vim.zig
index 062ccd2b6..dbd727133 100644
--- a/src/extra/vim.zig
+++ b/src/extra/vim.zig
@@ -31,7 +31,10 @@ pub const ftplugin =
     \\" Use syntax keywords for completion
     \\setlocal omnifunc=syntaxcomplete#Complete
     \\
-    \\let b:undo_ftplugin = 'setl cms< isk< ofu<'
+    \\" Ask ghostty to explain config keywords
+    \\setlocal keywordprg=ghostty\ +explain-config
+    \\
+    \\let b:undo_ftplugin = 'setl cms< isk< ofu< kp<'
     \\
     \\if !exists('current_compiler')
     \\  compiler ghostty

From 9783f6c79c7934efd590c7c13db6e5720848e028 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Sun, 15 Mar 2026 21:04:35 -0400
Subject: [PATCH 185/391] cli: tests for +explain-config explain functions

---
 src/cli/explain_config.zig | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/cli/explain_config.zig b/src/cli/explain_config.zig
index 115ef6fb8..cf385ca32 100644
--- a/src/cli/explain_config.zig
+++ b/src/cli/explain_config.zig
@@ -128,3 +128,15 @@ fn explainKeybind(name: []const u8) ?[]const u8 {
         },
     };
 }
+
+test "explain" {
+    // Config options
+    try std.testing.expect(explainOption("font-size") != null);
+    try std.testing.expect(explainOption("copy_to_clipboard") == null);
+    try std.testing.expect(explainOption("unknown-option") == null);
+
+    // Keybind actions
+    try std.testing.expect(explainKeybind("copy_to_clipboard") != null);
+    try std.testing.expect(explainKeybind("font-size") == null);
+    try std.testing.expect(explainKeybind("unknown_keybind") == null);
+}

From 37efac99b0c777a89d28503e7cace78cb394b4d2 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 15 Mar 2026 16:32:03 -0700
Subject: [PATCH 186/391] terminal/mouse: convert Event and Format to lib.Enum

Convert the Event and Format enums from fixed-size Zig enums to
lib.Enum so they are C ABI compatible when targeting C. The motion
method on Event becomes a free function eventIsMotion since lib.Enum
types cannot have declarations.
---
 src/input/mouse_encode.zig |  2 +-
 src/terminal/mouse.zig     | 37 +++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/input/mouse_encode.zig b/src/input/mouse_encode.zig
index 9dceb0ab3..0cf431303 100644
--- a/src/input/mouse_encode.zig
+++ b/src/input/mouse_encode.zig
@@ -93,7 +93,7 @@ pub fn encode(
         // If we don't have a motion-tracking event mode, do nothing,
         // because events outside the viewport are never reported in
         // such cases.
-        if (!opts.event.motion()) return;
+        if (!terminal.mouse.eventSendsMotion(opts.event)) return;
 
         // For motion modes, we only report if a button is currently pressed.
         // This lets a TUI detect a click over the surface + drag out
diff --git a/src/terminal/mouse.zig b/src/terminal/mouse.zig
index 758369ae9..e72e166f7 100644
--- a/src/terminal/mouse.zig
+++ b/src/terminal/mouse.zig
@@ -1,31 +1,32 @@
 const std = @import("std");
 const build_options = @import("terminal_options");
 const lib = @import("../lib/main.zig");
+const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
 
 /// The event types that can be reported for mouse-related activities.
 /// These are all mutually exclusive (hence in a single enum).
-pub const Event = enum(u3) {
-    none = 0,
-    x10 = 1, // 9
-    normal = 2, // 1000
-    button = 3, // 1002
-    any = 4, // 1003
+pub const Event = lib.Enum(lib_target, &.{
+    "none",
+    "x10", // 9
+    "normal", // 1000
+    "button", // 1002
+    "any", // 1003
+});
 
-    /// Returns true if this event sends motion events.
-    pub fn motion(self: Event) bool {
-        return self == .button or self == .any;
-    }
-};
+/// Returns true if this event sends motion events.
+pub fn eventSendsMotion(event: Event) bool {
+    return event == .button or event == .any;
+}
 
 /// The format of mouse events when enabled.
 /// These are all mutually exclusive (hence in a single enum).
-pub const Format = enum(u3) {
-    x10 = 0,
-    utf8 = 1, // 1005
-    sgr = 2, // 1006
-    urxvt = 3, // 1015
-    sgr_pixels = 4, // 1016
-};
+pub const Format = lib.Enum(lib_target, &.{
+    "x10",
+    "utf8", // 1005
+    "sgr", // 1006
+    "urxvt", // 1015
+    "sgr_pixels", // 1016
+});
 
 /// The possible cursor shapes. Not all app runtimes support these shapes.
 /// The shapes are always based on the W3C supported cursor styles so we

From 79e023b65eebcf56ee0a17ff3fca2609463b1bc3 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 15 Mar 2026 19:38:09 -0700
Subject: [PATCH 187/391] terminal,renderer: convert structs to extern

Convert Coordinate in terminal/point.zig and CellSize, ScreenSize,
GridSize, and Padding in renderer/size.zig to extern structs. All
fields are already extern-compatible types, so this gives them a
guaranteed C ABI layout with no functional change.
---
 src/input/mouse_encode.zig | 2 +-
 src/renderer/size.zig      | 8 ++++----
 src/terminal/point.zig     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/input/mouse_encode.zig b/src/input/mouse_encode.zig
index 0cf431303..13a8bd462 100644
--- a/src/input/mouse_encode.zig
+++ b/src/input/mouse_encode.zig
@@ -69,7 +69,7 @@ pub const Event = struct {
     pos: Pos = .{},
 
     /// Mouse position in surface-space pixels.
-    pub const Pos = struct {
+    pub const Pos = extern struct {
         x: f32 = 0,
         y: f32 = 0,
     };
diff --git a/src/renderer/size.zig b/src/renderer/size.zig
index e9754d1f3..565e95e2c 100644
--- a/src/renderer/size.zig
+++ b/src/renderer/size.zig
@@ -172,7 +172,7 @@ pub const Coordinate = union(enum) {
 ///
 /// The units for the width and height are in world space. They have to
 /// be normalized for any renderer implementation.
-pub const CellSize = struct {
+pub const CellSize = extern struct {
     width: u32,
     height: u32,
 };
@@ -180,7 +180,7 @@ pub const CellSize = struct {
 /// The dimensions of the screen that the grid is rendered to. This is the
 /// terminal screen, so it is likely a subset of the window size. The dimensions
 /// should be in pixels.
-pub const ScreenSize = struct {
+pub const ScreenSize = extern struct {
     width: u32,
     height: u32,
 
@@ -224,7 +224,7 @@ pub const ScreenSize = struct {
 };
 
 /// The dimensions of the grid itself, in rows/columns units.
-pub const GridSize = struct {
+pub const GridSize = extern struct {
     pub const Unit = terminal.size.CellCountInt;
 
     columns: Unit = 0,
@@ -257,7 +257,7 @@ pub const GridSize = struct {
 };
 
 /// The padding to add to a screen.
-pub const Padding = struct {
+pub const Padding = extern struct {
     top: u32 = 0,
     bottom: u32 = 0,
     right: u32 = 0,
diff --git a/src/terminal/point.zig b/src/terminal/point.zig
index 5a3d4a6f8..c5983fcbc 100644
--- a/src/terminal/point.zig
+++ b/src/terminal/point.zig
@@ -66,7 +66,7 @@ pub const Point = union(Tag) {
     }
 };
 
-pub const Coordinate = struct {
+pub const Coordinate = extern struct {
     /// x can use size.CellCountInt because the number of columns
     /// can't ever be more than a valid number of columns in a Page.
     x: size.CellCountInt = 0,

From 9b35c2bb65ef900c9eab5ab6920d582cb5333035 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 15 Mar 2026 20:02:39 -0700
Subject: [PATCH 188/391] vt: add mouse encoding C API

Expose the internal mouse encoding functionality through the C API,
following the same pattern as the existing key encoding API. This
allows external consumers of libvt to encode mouse events into
terminal escape sequences (X10, UTF-8, SGR, URxvt, SGR-Pixels).

The API is split into two opaque handle types: GhosttyMouseEvent
for building normalized mouse events (action, button, modifiers,
position) and GhosttyMouseEncoder for converting those events into
escape sequences. The encoder is configured via a setopt interface
supporting tracking mode, output format, renderer geometry, button
state, and optional motion deduplication by last cell.

Encoder state can also be bulk-configured from a terminal handle
via ghostty_mouse_encoder_setopt_from_terminal. Failed encodes due
to insufficient buffer space report the required size without
mutating deduplication state.
---
 include/ghostty/vt.h               |   2 +
 include/ghostty/vt/mouse.h         |  35 ++
 include/ghostty/vt/mouse/encoder.h | 211 ++++++++++++
 include/ghostty/vt/mouse/event.h   | 193 +++++++++++
 src/input/mouse.zig                |   2 +-
 src/lib_vt.zig                     |  17 +
 src/terminal/c/main.zig            |  23 ++
 src/terminal/c/mouse_encode.zig    | 529 +++++++++++++++++++++++++++++
 src/terminal/c/mouse_event.zig     | 155 +++++++++
 9 files changed, 1166 insertions(+), 1 deletion(-)
 create mode 100644 include/ghostty/vt/mouse.h
 create mode 100644 include/ghostty/vt/mouse/encoder.h
 create mode 100644 include/ghostty/vt/mouse/event.h
 create mode 100644 src/terminal/c/mouse_encode.zig
 create mode 100644 src/terminal/c/mouse_event.zig

diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index dd5eda989..f3958ccc3 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -31,6 +31,7 @@
  * - @ref terminal "Terminal" - Complete terminal emulator state and rendering
  * - @ref formatter "Formatter" - Format terminal content as plain text, VT sequences, or HTML
  * - @ref key "Key Encoding" - Encode key events into terminal sequences
+ * - @ref mouse "Mouse Encoding" - Encode mouse events into terminal sequences
  * - @ref osc "OSC Parser" - Parse OSC (Operating System Command) sequences
  * - @ref sgr "SGR Parser" - Parse SGR (Select Graphic Rendition) sequences
  * - @ref paste "Paste Utilities" - Validate paste data safety
@@ -88,6 +89,7 @@ extern "C" {
 #include <ghostty/vt/osc.h>
 #include <ghostty/vt/sgr.h>
 #include <ghostty/vt/key.h>
+#include <ghostty/vt/mouse.h>
 #include <ghostty/vt/paste.h>
 #include <ghostty/vt/wasm.h>
 
diff --git a/include/ghostty/vt/mouse.h b/include/ghostty/vt/mouse.h
new file mode 100644
index 000000000..4e44e15b5
--- /dev/null
+++ b/include/ghostty/vt/mouse.h
@@ -0,0 +1,35 @@
+/**
+ * @file mouse.h
+ *
+ * Mouse encoding module - encode mouse events into terminal escape sequences.
+ */
+
+#ifndef GHOSTTY_VT_MOUSE_H
+#define GHOSTTY_VT_MOUSE_H
+
+/** @defgroup mouse Mouse Encoding
+ *
+ * Utilities for encoding mouse events into terminal escape sequences,
+ * supporting X10, UTF-8, SGR, URxvt, and SGR-Pixels mouse protocols.
+ *
+ * ## Basic Usage
+ *
+ * 1. Create an encoder instance with ghostty_mouse_encoder_new().
+ * 2. Configure encoder options with ghostty_mouse_encoder_setopt() or
+ *    ghostty_mouse_encoder_setopt_from_terminal().
+ * 3. For each mouse event:
+ *    - Create a mouse event with ghostty_mouse_event_new().
+ *    - Set event properties (action, button, modifiers, position).
+ *    - Encode with ghostty_mouse_encoder_encode().
+ *    - Free the event with ghostty_mouse_event_free() or reuse it.
+ * 4. Free the encoder with ghostty_mouse_encoder_free() when done.
+ *
+ * @{
+ */
+
+#include <ghostty/vt/mouse/event.h>
+#include <ghostty/vt/mouse/encoder.h>
+
+/** @} */
+
+#endif /* GHOSTTY_VT_MOUSE_H */
diff --git a/include/ghostty/vt/mouse/encoder.h b/include/ghostty/vt/mouse/encoder.h
new file mode 100644
index 000000000..c418ed8ec
--- /dev/null
+++ b/include/ghostty/vt/mouse/encoder.h
@@ -0,0 +1,211 @@
+/**
+ * @file encoder.h
+ *
+ * Mouse event encoding to terminal escape sequences.
+ */
+
+#ifndef GHOSTTY_VT_MOUSE_ENCODER_H
+#define GHOSTTY_VT_MOUSE_ENCODER_H
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <ghostty/vt/allocator.h>
+#include <ghostty/vt/mouse/event.h>
+#include <ghostty/vt/terminal.h>
+#include <ghostty/vt/types.h>
+
+/**
+ * Opaque handle to a mouse encoder instance.
+ *
+ * This handle represents a mouse encoder that converts normalized
+ * mouse events into terminal escape sequences.
+ *
+ * @ingroup mouse
+ */
+typedef struct GhosttyMouseEncoder *GhosttyMouseEncoder;
+
+/**
+ * Mouse tracking mode.
+ *
+ * @ingroup mouse
+ */
+typedef enum {
+  /** Mouse reporting disabled. */
+  GHOSTTY_MOUSE_TRACKING_NONE = 0,
+
+  /** X10 mouse mode. */
+  GHOSTTY_MOUSE_TRACKING_X10 = 1,
+
+  /** Normal mouse mode (button press/release only). */
+  GHOSTTY_MOUSE_TRACKING_NORMAL = 2,
+
+  /** Button-event tracking mode. */
+  GHOSTTY_MOUSE_TRACKING_BUTTON = 3,
+
+  /** Any-event tracking mode. */
+  GHOSTTY_MOUSE_TRACKING_ANY = 4,
+} GhosttyMouseTrackingMode;
+
+/**
+ * Mouse output format.
+ *
+ * @ingroup mouse
+ */
+typedef enum {
+  GHOSTTY_MOUSE_FORMAT_X10 = 0,
+  GHOSTTY_MOUSE_FORMAT_UTF8 = 1,
+  GHOSTTY_MOUSE_FORMAT_SGR = 2,
+  GHOSTTY_MOUSE_FORMAT_URXVT = 3,
+  GHOSTTY_MOUSE_FORMAT_SGR_PIXELS = 4,
+} GhosttyMouseFormat;
+
+/**
+ * Mouse encoder size and geometry context.
+ *
+ * This describes the rendered terminal geometry used to convert
+ * surface-space positions into encoded coordinates.
+ *
+ * @ingroup mouse
+ */
+typedef struct {
+  /** Size of this struct in bytes. Must be set to sizeof(GhosttyMouseEncoderSize). */
+  size_t size;
+
+  /** Full screen width in pixels. */
+  uint32_t screen_width;
+
+  /** Full screen height in pixels. */
+  uint32_t screen_height;
+
+  /** Cell width in pixels. Must be non-zero. */
+  uint32_t cell_width;
+
+  /** Cell height in pixels. Must be non-zero. */
+  uint32_t cell_height;
+
+  /** Top padding in pixels. */
+  uint32_t padding_top;
+
+  /** Bottom padding in pixels. */
+  uint32_t padding_bottom;
+
+  /** Right padding in pixels. */
+  uint32_t padding_right;
+
+  /** Left padding in pixels. */
+  uint32_t padding_left;
+} GhosttyMouseEncoderSize;
+
+/**
+ * Mouse encoder option identifiers.
+ *
+ * These values are used with ghostty_mouse_encoder_setopt() to configure
+ * the behavior of the mouse encoder.
+ *
+ * @ingroup mouse
+ */
+typedef enum {
+  /** Mouse tracking mode (value: GhosttyMouseTrackingMode). */
+  GHOSTTY_MOUSE_ENCODER_OPT_EVENT = 0,
+
+  /** Mouse output format (value: GhosttyMouseFormat). */
+  GHOSTTY_MOUSE_ENCODER_OPT_FORMAT = 1,
+
+  /** Renderer size context (value: GhosttyMouseEncoderSize). */
+  GHOSTTY_MOUSE_ENCODER_OPT_SIZE = 2,
+
+  /** Whether any mouse button is currently pressed (value: bool). */
+  GHOSTTY_MOUSE_ENCODER_OPT_ANY_BUTTON_PRESSED = 3,
+
+  /** Whether to enable motion deduplication by last cell (value: bool). */
+  GHOSTTY_MOUSE_ENCODER_OPT_TRACK_LAST_CELL = 4,
+} GhosttyMouseEncoderOption;
+
+/**
+ * Create a new mouse encoder instance.
+ *
+ * @param allocator Pointer to allocator, or NULL to use the default allocator
+ * @param encoder Pointer to store the created encoder handle
+ * @return GHOSTTY_SUCCESS on success, or an error code on failure
+ *
+ * @ingroup mouse
+ */
+GhosttyResult ghostty_mouse_encoder_new(const GhosttyAllocator *allocator,
+                                        GhosttyMouseEncoder *encoder);
+
+/**
+ * Free a mouse encoder instance.
+ *
+ * @param encoder The encoder handle to free (may be NULL)
+ *
+ * @ingroup mouse
+ */
+void ghostty_mouse_encoder_free(GhosttyMouseEncoder encoder);
+
+/**
+ * Set an option on the mouse encoder.
+ *
+ * A null pointer value does nothing. It does not reset to defaults.
+ *
+ * @param encoder The encoder handle, must not be NULL
+ * @param option The option to set
+ * @param value Pointer to option value (type depends on option)
+ *
+ * @ingroup mouse
+ */
+void ghostty_mouse_encoder_setopt(GhosttyMouseEncoder encoder,
+                                  GhosttyMouseEncoderOption option,
+                                  const void *value);
+
+/**
+ * Set encoder options from a terminal's current state.
+ *
+ * This sets tracking mode and output format from terminal state.
+ * It does not modify size or any-button state.
+ *
+ * @param encoder The encoder handle, must not be NULL
+ * @param terminal The terminal handle, must not be NULL
+ *
+ * @ingroup mouse
+ */
+void ghostty_mouse_encoder_setopt_from_terminal(GhosttyMouseEncoder encoder,
+                                                GhosttyTerminal terminal);
+
+/**
+ * Reset internal encoder state.
+ *
+ * This clears motion deduplication state (last tracked cell).
+ *
+ * @param encoder The encoder handle (may be NULL)
+ *
+ * @ingroup mouse
+ */
+void ghostty_mouse_encoder_reset(GhosttyMouseEncoder encoder);
+
+/**
+ * Encode a mouse event into a terminal escape sequence.
+ *
+ * Not all mouse events produce output. In such cases this returns
+ * GHOSTTY_SUCCESS with out_len set to 0.
+ *
+ * If the output buffer is too small, this returns GHOSTTY_OUT_OF_MEMORY
+ * and out_len contains the required size.
+ *
+ * @param encoder The encoder handle, must not be NULL
+ * @param event The mouse event to encode, must not be NULL
+ * @param out_buf Buffer to write encoded bytes to, or NULL to query required size
+ * @param out_buf_size Size of out_buf in bytes
+ * @param out_len Pointer to store bytes written (or required bytes on failure)
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_OUT_OF_MEMORY if buffer is too small,
+ *         or another error code
+ *
+ * @ingroup mouse
+ */
+GhosttyResult ghostty_mouse_encoder_encode(GhosttyMouseEncoder encoder,
+                                           GhosttyMouseEvent event,
+                                           char *out_buf,
+                                           size_t out_buf_size,
+                                           size_t *out_len);
+
+#endif /* GHOSTTY_VT_MOUSE_ENCODER_H */
diff --git a/include/ghostty/vt/mouse/event.h b/include/ghostty/vt/mouse/event.h
new file mode 100644
index 000000000..44132097c
--- /dev/null
+++ b/include/ghostty/vt/mouse/event.h
@@ -0,0 +1,193 @@
+/**
+ * @file event.h
+ *
+ * Mouse event representation and manipulation.
+ */
+
+#ifndef GHOSTTY_VT_MOUSE_EVENT_H
+#define GHOSTTY_VT_MOUSE_EVENT_H
+
+#include <stdbool.h>
+#include <ghostty/vt/allocator.h>
+#include <ghostty/vt/key/event.h>
+#include <ghostty/vt/types.h>
+
+/**
+ * Opaque handle to a mouse event.
+ *
+ * This handle represents a normalized mouse input event containing
+ * action, button, modifiers, and surface-space position.
+ *
+ * @ingroup mouse
+ */
+typedef struct GhosttyMouseEvent *GhosttyMouseEvent;
+
+/**
+ * Mouse event action type.
+ *
+ * @ingroup mouse
+ */
+typedef enum {
+  /** Mouse button was pressed. */
+  GHOSTTY_MOUSE_ACTION_PRESS = 0,
+
+  /** Mouse button was released. */
+  GHOSTTY_MOUSE_ACTION_RELEASE = 1,
+
+  /** Mouse moved. */
+  GHOSTTY_MOUSE_ACTION_MOTION = 2,
+} GhosttyMouseAction;
+
+/**
+ * Mouse button identity.
+ *
+ * @ingroup mouse
+ */
+typedef enum {
+  GHOSTTY_MOUSE_BUTTON_UNKNOWN = 0,
+  GHOSTTY_MOUSE_BUTTON_LEFT = 1,
+  GHOSTTY_MOUSE_BUTTON_RIGHT = 2,
+  GHOSTTY_MOUSE_BUTTON_MIDDLE = 3,
+  GHOSTTY_MOUSE_BUTTON_FOUR = 4,
+  GHOSTTY_MOUSE_BUTTON_FIVE = 5,
+  GHOSTTY_MOUSE_BUTTON_SIX = 6,
+  GHOSTTY_MOUSE_BUTTON_SEVEN = 7,
+  GHOSTTY_MOUSE_BUTTON_EIGHT = 8,
+  GHOSTTY_MOUSE_BUTTON_NINE = 9,
+  GHOSTTY_MOUSE_BUTTON_TEN = 10,
+  GHOSTTY_MOUSE_BUTTON_ELEVEN = 11,
+} GhosttyMouseButton;
+
+/**
+ * Mouse position in surface-space pixels.
+ *
+ * @ingroup mouse
+ */
+typedef struct {
+  float x;
+  float y;
+} GhosttyMousePosition;
+
+/**
+ * Create a new mouse event instance.
+ *
+ * @param allocator Pointer to allocator, or NULL to use the default allocator
+ * @param event Pointer to store the created event handle
+ * @return GHOSTTY_SUCCESS on success, or an error code on failure
+ *
+ * @ingroup mouse
+ */
+GhosttyResult ghostty_mouse_event_new(const GhosttyAllocator *allocator,
+                                      GhosttyMouseEvent *event);
+
+/**
+ * Free a mouse event instance.
+ *
+ * @param event The mouse event handle to free (may be NULL)
+ *
+ * @ingroup mouse
+ */
+void ghostty_mouse_event_free(GhosttyMouseEvent event);
+
+/**
+ * Set the event action.
+ *
+ * @param event The event handle, must not be NULL
+ * @param action The action to set
+ *
+ * @ingroup mouse
+ */
+void ghostty_mouse_event_set_action(GhosttyMouseEvent event,
+                                    GhosttyMouseAction action);
+
+/**
+ * Get the event action.
+ *
+ * @param event The event handle, must not be NULL
+ * @return The event action
+ *
+ * @ingroup mouse
+ */
+GhosttyMouseAction ghostty_mouse_event_get_action(GhosttyMouseEvent event);
+
+/**
+ * Set the event button.
+ *
+ * This sets a concrete button identity for the event.
+ * To represent "no button" (for motion events), use
+ * ghostty_mouse_event_clear_button().
+ *
+ * @param event The event handle, must not be NULL
+ * @param button The button to set
+ *
+ * @ingroup mouse
+ */
+void ghostty_mouse_event_set_button(GhosttyMouseEvent event,
+                                    GhosttyMouseButton button);
+
+/**
+ * Clear the event button.
+ *
+ * This sets the event button to "none".
+ *
+ * @param event The event handle, must not be NULL
+ *
+ * @ingroup mouse
+ */
+void ghostty_mouse_event_clear_button(GhosttyMouseEvent event);
+
+/**
+ * Get the event button.
+ *
+ * @param event The event handle, must not be NULL
+ * @param out_button Output pointer for the button value (may be NULL)
+ * @return true if a button is set, false if no button is set
+ *
+ * @ingroup mouse
+ */
+bool ghostty_mouse_event_get_button(GhosttyMouseEvent event,
+                                    GhosttyMouseButton *out_button);
+
+/**
+ * Set keyboard modifiers held during the event.
+ *
+ * @param event The event handle, must not be NULL
+ * @param mods Modifier bitmask
+ *
+ * @ingroup mouse
+ */
+void ghostty_mouse_event_set_mods(GhosttyMouseEvent event,
+                                  GhosttyMods mods);
+
+/**
+ * Get keyboard modifiers held during the event.
+ *
+ * @param event The event handle, must not be NULL
+ * @return Modifier bitmask
+ *
+ * @ingroup mouse
+ */
+GhosttyMods ghostty_mouse_event_get_mods(GhosttyMouseEvent event);
+
+/**
+ * Set the event position in surface-space pixels.
+ *
+ * @param event The event handle, must not be NULL
+ * @param position The position to set
+ *
+ * @ingroup mouse
+ */
+void ghostty_mouse_event_set_position(GhosttyMouseEvent event,
+                                      GhosttyMousePosition position);
+
+/**
+ * Get the event position in surface-space pixels.
+ *
+ * @param event The event handle, must not be NULL
+ * @return The current event position
+ *
+ * @ingroup mouse
+ */
+GhosttyMousePosition ghostty_mouse_event_get_position(GhosttyMouseEvent event);
+
+#endif /* GHOSTTY_VT_MOUSE_EVENT_H */
diff --git a/src/input/mouse.zig b/src/input/mouse.zig
index 8a769557f..fad3ed67a 100644
--- a/src/input/mouse.zig
+++ b/src/input/mouse.zig
@@ -4,7 +4,7 @@ const std = @import("std");
 /// from ButtonState because button state is simply the current state
 /// of a mouse button but an action is something that triggers via
 /// an GUI event and supports more.
-pub const Action = enum { press, release, motion };
+pub const Action = enum(c_int) { press, release, motion };
 
 /// The state of a mouse button.
 ///
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 0fa808b59..32fd14dc5 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -126,6 +126,23 @@ comptime {
         @export(&c.key_encoder_setopt, .{ .name = "ghostty_key_encoder_setopt" });
         @export(&c.key_encoder_setopt_from_terminal, .{ .name = "ghostty_key_encoder_setopt_from_terminal" });
         @export(&c.key_encoder_encode, .{ .name = "ghostty_key_encoder_encode" });
+        @export(&c.mouse_event_new, .{ .name = "ghostty_mouse_event_new" });
+        @export(&c.mouse_event_free, .{ .name = "ghostty_mouse_event_free" });
+        @export(&c.mouse_event_set_action, .{ .name = "ghostty_mouse_event_set_action" });
+        @export(&c.mouse_event_get_action, .{ .name = "ghostty_mouse_event_get_action" });
+        @export(&c.mouse_event_set_button, .{ .name = "ghostty_mouse_event_set_button" });
+        @export(&c.mouse_event_clear_button, .{ .name = "ghostty_mouse_event_clear_button" });
+        @export(&c.mouse_event_get_button, .{ .name = "ghostty_mouse_event_get_button" });
+        @export(&c.mouse_event_set_mods, .{ .name = "ghostty_mouse_event_set_mods" });
+        @export(&c.mouse_event_get_mods, .{ .name = "ghostty_mouse_event_get_mods" });
+        @export(&c.mouse_event_set_position, .{ .name = "ghostty_mouse_event_set_position" });
+        @export(&c.mouse_event_get_position, .{ .name = "ghostty_mouse_event_get_position" });
+        @export(&c.mouse_encoder_new, .{ .name = "ghostty_mouse_encoder_new" });
+        @export(&c.mouse_encoder_free, .{ .name = "ghostty_mouse_encoder_free" });
+        @export(&c.mouse_encoder_setopt, .{ .name = "ghostty_mouse_encoder_setopt" });
+        @export(&c.mouse_encoder_setopt_from_terminal, .{ .name = "ghostty_mouse_encoder_setopt_from_terminal" });
+        @export(&c.mouse_encoder_reset, .{ .name = "ghostty_mouse_encoder_reset" });
+        @export(&c.mouse_encoder_encode, .{ .name = "ghostty_mouse_encoder_encode" });
         @export(&c.osc_new, .{ .name = "ghostty_osc_new" });
         @export(&c.osc_free, .{ .name = "ghostty_osc_free" });
         @export(&c.osc_next, .{ .name = "ghostty_osc_next" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 7842866dc..5adc00251 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -3,6 +3,8 @@ pub const formatter = @import("formatter.zig");
 pub const osc = @import("osc.zig");
 pub const key_event = @import("key_event.zig");
 pub const key_encode = @import("key_encode.zig");
+pub const mouse_event = @import("mouse_event.zig");
+pub const mouse_encode = @import("mouse_encode.zig");
 pub const paste = @import("paste.zig");
 pub const sgr = @import("sgr.zig");
 pub const terminal = @import("terminal.zig");
@@ -58,6 +60,25 @@ pub const key_encoder_setopt = key_encode.setopt;
 pub const key_encoder_setopt_from_terminal = key_encode.setopt_from_terminal;
 pub const key_encoder_encode = key_encode.encode;
 
+pub const mouse_event_new = mouse_event.new;
+pub const mouse_event_free = mouse_event.free;
+pub const mouse_event_set_action = mouse_event.set_action;
+pub const mouse_event_get_action = mouse_event.get_action;
+pub const mouse_event_set_button = mouse_event.set_button;
+pub const mouse_event_clear_button = mouse_event.clear_button;
+pub const mouse_event_get_button = mouse_event.get_button;
+pub const mouse_event_set_mods = mouse_event.set_mods;
+pub const mouse_event_get_mods = mouse_event.get_mods;
+pub const mouse_event_set_position = mouse_event.set_position;
+pub const mouse_event_get_position = mouse_event.get_position;
+
+pub const mouse_encoder_new = mouse_encode.new;
+pub const mouse_encoder_free = mouse_encode.free;
+pub const mouse_encoder_setopt = mouse_encode.setopt;
+pub const mouse_encoder_setopt_from_terminal = mouse_encode.setopt_from_terminal;
+pub const mouse_encoder_reset = mouse_encode.reset;
+pub const mouse_encoder_encode = mouse_encode.encode;
+
 pub const paste_is_safe = paste.is_safe;
 
 pub const terminal_new = terminal.new;
@@ -73,6 +94,8 @@ test {
     _ = osc;
     _ = key_event;
     _ = key_encode;
+    _ = mouse_event;
+    _ = mouse_encode;
     _ = paste;
     _ = sgr;
     _ = terminal;
diff --git a/src/terminal/c/mouse_encode.zig b/src/terminal/c/mouse_encode.zig
new file mode 100644
index 000000000..1a19b0511
--- /dev/null
+++ b/src/terminal/c/mouse_encode.zig
@@ -0,0 +1,529 @@
+const std = @import("std");
+const Allocator = std.mem.Allocator;
+const testing = std.testing;
+const lib_alloc = @import("../../lib/allocator.zig");
+const CAllocator = lib_alloc.Allocator;
+const input_mouse_encode = @import("../../input/mouse_encode.zig");
+const renderer_size = @import("../../renderer/size.zig");
+const point = @import("../point.zig");
+const terminal_mouse = @import("../mouse.zig");
+const mouse_event = @import("mouse_event.zig");
+const Result = @import("result.zig").Result;
+const Event = mouse_event.Event;
+const Terminal = @import("terminal.zig").Terminal;
+
+const log = std.log.scoped(.mouse_encode);
+
+/// Wrapper around mouse encoding options that tracks the allocator for C API usage.
+const MouseEncoderWrapper = struct {
+    opts: input_mouse_encode.Options,
+    track_last_cell: bool = false,
+    last_cell: ?point.Coordinate = null,
+    alloc: Allocator,
+};
+
+/// C: GhosttyMouseEncoder
+pub const Encoder = ?*MouseEncoderWrapper;
+
+/// C: GhosttyMouseTrackingMode
+pub const TrackingMode = terminal_mouse.Event;
+
+/// C: GhosttyMouseFormat
+pub const Format = terminal_mouse.Format;
+
+/// C: GhosttyMouseEncoderSize
+pub const Size = extern struct {
+    size: usize = @sizeOf(Size),
+    screen_width: u32,
+    screen_height: u32,
+    cell_width: u32,
+    cell_height: u32,
+    padding_top: u32,
+    padding_bottom: u32,
+    padding_right: u32,
+    padding_left: u32,
+
+    fn toRenderer(self: Size) ?renderer_size.Size {
+        if (self.cell_width == 0 or self.cell_height == 0) return null;
+        return .{
+            .screen = .{
+                .width = self.screen_width,
+                .height = self.screen_height,
+            },
+            .cell = .{
+                .width = self.cell_width,
+                .height = self.cell_height,
+            },
+            .padding = .{
+                .top = self.padding_top,
+                .bottom = self.padding_bottom,
+                .right = self.padding_right,
+                .left = self.padding_left,
+            },
+        };
+    }
+};
+
+/// C: GhosttyMouseEncoderOption
+pub const Option = enum(c_int) {
+    event = 0,
+    format = 1,
+    size = 2,
+    any_button_pressed = 3,
+    track_last_cell = 4,
+
+    /// Input type expected for setting the option.
+    pub fn InType(comptime self: Option) type {
+        return switch (self) {
+            .event => TrackingMode,
+            .format => Format,
+            .size => Size,
+            .any_button_pressed,
+            .track_last_cell,
+            => bool,
+        };
+    }
+};
+
+pub fn new(
+    alloc_: ?*const CAllocator,
+    result: *Encoder,
+) callconv(.c) Result {
+    const alloc = lib_alloc.default(alloc_);
+    const ptr = alloc.create(MouseEncoderWrapper) catch
+        return .out_of_memory;
+    ptr.* = .{
+        .opts = .{ .size = defaultSize() },
+        .alloc = alloc,
+    };
+    result.* = ptr;
+    return .success;
+}
+
+pub fn free(encoder_: Encoder) callconv(.c) void {
+    const wrapper = encoder_ orelse return;
+    const alloc = wrapper.alloc;
+    alloc.destroy(wrapper);
+}
+
+pub fn setopt(
+    encoder_: Encoder,
+    option: Option,
+    value: ?*const anyopaque,
+) callconv(.c) void {
+    if (comptime std.debug.runtime_safety) {
+        _ = std.meta.intToEnum(Option, @intFromEnum(option)) catch {
+            log.warn("setopt invalid option value={d}", .{@intFromEnum(option)});
+            return;
+        };
+    }
+
+    return switch (option) {
+        inline else => |comptime_option| setoptTyped(
+            encoder_,
+            comptime_option,
+            @ptrCast(@alignCast(value orelse return)),
+        ),
+    };
+}
+
+fn setoptTyped(
+    encoder_: Encoder,
+    comptime option: Option,
+    value: *const option.InType(),
+) void {
+    const wrapper = encoder_.?;
+    switch (option) {
+        .event => {
+            if (comptime std.debug.runtime_safety) {
+                _ = std.meta.intToEnum(TrackingMode, @intFromEnum(value.*)) catch {
+                    log.warn("setopt invalid TrackingMode value={d}", .{@intFromEnum(value.*)});
+                    return;
+                };
+            }
+
+            if (wrapper.opts.event != value.*) wrapper.last_cell = null;
+            wrapper.opts.event = value.*;
+        },
+
+        .format => {
+            if (comptime std.debug.runtime_safety) {
+                _ = std.meta.intToEnum(Format, @intFromEnum(value.*)) catch {
+                    log.warn("setopt invalid Format value={d}", .{@intFromEnum(value.*)});
+                    return;
+                };
+            }
+
+            if (wrapper.opts.format != value.*) wrapper.last_cell = null;
+            wrapper.opts.format = value.*;
+        },
+
+        .size => {
+            if (value.size < @sizeOf(Size)) {
+                log.warn("setopt size struct too small size={d} expected>={d}", .{
+                    value.size,
+                    @sizeOf(Size),
+                });
+                return;
+            }
+
+            wrapper.opts.size = value.toRenderer() orelse {
+                log.warn("setopt invalid size values (cell width and height must be non-zero)", .{});
+                return;
+            };
+            wrapper.last_cell = null;
+        },
+
+        .any_button_pressed => wrapper.opts.any_button_pressed = value.*,
+
+        .track_last_cell => {
+            wrapper.track_last_cell = value.*;
+            if (!value.*) wrapper.last_cell = null;
+        },
+    }
+}
+
+pub fn setopt_from_terminal(
+    encoder_: Encoder,
+    terminal_: Terminal,
+) callconv(.c) void {
+    const wrapper = encoder_ orelse return;
+    const t = terminal_ orelse return;
+    wrapper.opts.event = t.flags.mouse_event;
+    wrapper.opts.format = t.flags.mouse_format;
+    wrapper.last_cell = null;
+}
+
+pub fn reset(encoder_: Encoder) callconv(.c) void {
+    const wrapper = encoder_ orelse return;
+    wrapper.last_cell = null;
+}
+
+pub fn encode(
+    encoder_: Encoder,
+    event_: Event,
+    out_: ?[*]u8,
+    out_len: usize,
+    out_written: *usize,
+) callconv(.c) Result {
+    const wrapper = encoder_ orelse return .invalid_value;
+    const event = event_ orelse return .invalid_value;
+
+    const prev_last_cell = wrapper.last_cell;
+
+    var opts = wrapper.opts;
+    opts.last_cell = if (wrapper.track_last_cell) &wrapper.last_cell else null;
+
+    var writer: std.Io.Writer = .fixed(if (out_) |out| out[0..out_len] else &.{});
+    input_mouse_encode.encode(
+        &writer,
+        event.event,
+        opts,
+    ) catch |err| switch (err) {
+        error.WriteFailed => {
+            // Failed writes should not mutate motion dedupe state because no
+            // complete sequence was produced.
+            wrapper.last_cell = prev_last_cell;
+
+            // Use a discarding writer to count how much space we would have needed.
+            var count_last_cell = prev_last_cell;
+            var count_opts = wrapper.opts;
+            count_opts.last_cell = if (wrapper.track_last_cell) &count_last_cell else null;
+
+            var discarding: std.Io.Writer.Discarding = .init(&.{});
+            input_mouse_encode.encode(
+                &discarding.writer,
+                event.event,
+                count_opts,
+            ) catch unreachable;
+
+            // Discarding always uses a u64. If we're on 32-bit systems
+            // we cast down. We should make this safer in the future.
+            out_written.* = @intCast(discarding.count);
+            return .out_of_memory;
+        },
+    };
+
+    out_written.* = writer.end;
+    return .success;
+}
+
+fn defaultSize() renderer_size.Size {
+    return .{
+        .screen = .{ .width = 1, .height = 1 },
+        .cell = .{ .width = 1, .height = 1 },
+        .padding = .{},
+    };
+}
+
+fn testSize() Size {
+    return .{
+        .size = @sizeOf(Size),
+        .screen_width = 1_000,
+        .screen_height = 1_000,
+        .cell_width = 1,
+        .cell_height = 1,
+        .padding_top = 0,
+        .padding_bottom = 0,
+        .padding_right = 0,
+        .padding_left = 0,
+    };
+}
+
+test "alloc" {
+    var e: Encoder = undefined;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &e,
+    ));
+    free(e);
+}
+
+test "setopt" {
+    var e: Encoder = undefined;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &e,
+    ));
+    defer free(e);
+
+    const event_mode: TrackingMode = .any;
+    setopt(e, .event, &event_mode);
+    try testing.expectEqual(TrackingMode.any, e.?.opts.event);
+
+    const format_mode: Format = .sgr;
+    setopt(e, .format, &format_mode);
+    try testing.expectEqual(Format.sgr, e.?.opts.format);
+
+    const size = testSize();
+    setopt(e, .size, &size);
+    try testing.expectEqual(size.screen_width, e.?.opts.size.screen.width);
+    try testing.expectEqual(size.screen_height, e.?.opts.size.screen.height);
+
+    const any_button_pressed = true;
+    setopt(e, .any_button_pressed, &any_button_pressed);
+    try testing.expect(e.?.opts.any_button_pressed);
+
+    const track_last_cell = true;
+    setopt(e, .track_last_cell, &track_last_cell);
+    try testing.expect(e.?.track_last_cell);
+}
+
+test "setopt_from_terminal" {
+    const terminal_c = @import("terminal.zig");
+
+    var e: Encoder = undefined;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &e,
+    ));
+    defer free(e);
+
+    var t: Terminal = undefined;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{ .cols = 80, .rows = 24, .max_scrollback = 0 },
+    ));
+    defer terminal_c.free(t);
+
+    const event_mode: TrackingMode = .any;
+    setopt(e, .event, &event_mode);
+    const format_mode: Format = .sgr;
+    setopt(e, .format, &format_mode);
+
+    setopt_from_terminal(e, t);
+    try testing.expectEqual(TrackingMode.none, e.?.opts.event);
+    try testing.expectEqual(Format.x10, e.?.opts.format);
+}
+
+test "setopt_from_terminal null" {
+    setopt_from_terminal(null, null);
+
+    const terminal_c = @import("terminal.zig");
+    var t: Terminal = undefined;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{ .cols = 80, .rows = 24, .max_scrollback = 0 },
+    ));
+    defer terminal_c.free(t);
+    setopt_from_terminal(null, t);
+
+    var e: Encoder = undefined;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &e,
+    ));
+    defer free(e);
+    setopt_from_terminal(e, null);
+}
+
+test "encode: sgr press left" {
+    var encoder: Encoder = undefined;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &encoder,
+    ));
+    defer free(encoder);
+
+    const event_mode: TrackingMode = .any;
+    setopt(encoder, .event, &event_mode);
+    const format_mode: Format = .sgr;
+    setopt(encoder, .format, &format_mode);
+    const size = testSize();
+    setopt(encoder, .size, &size);
+
+    var event: Event = undefined;
+    try testing.expectEqual(Result.success, mouse_event.new(
+        &lib_alloc.test_allocator,
+        &event,
+    ));
+    defer mouse_event.free(event);
+
+    mouse_event.set_action(event, .press);
+    mouse_event.set_button(event, .left);
+    mouse_event.set_position(event, .{ .x = 0, .y = 0 });
+
+    var required: usize = 0;
+    try testing.expectEqual(Result.out_of_memory, encode(
+        encoder,
+        event,
+        null,
+        0,
+        &required,
+    ));
+    try testing.expectEqual(@as(usize, 9), required);
+
+    var buf: [32]u8 = undefined;
+    var written: usize = 0;
+    try testing.expectEqual(Result.success, encode(
+        encoder,
+        event,
+        &buf,
+        buf.len,
+        &written,
+    ));
+    try testing.expectEqual(required, written);
+    try testing.expectEqualStrings("\x1b[<0;1;1M", buf[0..written]);
+}
+
+test "encode: motion dedupe and reset" {
+    var encoder: Encoder = undefined;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &encoder,
+    ));
+    defer free(encoder);
+
+    const event_mode: TrackingMode = .any;
+    setopt(encoder, .event, &event_mode);
+    const format_mode: Format = .sgr;
+    setopt(encoder, .format, &format_mode);
+    const size = testSize();
+    setopt(encoder, .size, &size);
+    const track_last_cell = true;
+    setopt(encoder, .track_last_cell, &track_last_cell);
+
+    var event: Event = undefined;
+    try testing.expectEqual(Result.success, mouse_event.new(
+        &lib_alloc.test_allocator,
+        &event,
+    ));
+    defer mouse_event.free(event);
+
+    mouse_event.set_action(event, .motion);
+    mouse_event.set_button(event, .left);
+    mouse_event.set_position(event, .{ .x = 5, .y = 6 });
+
+    {
+        var buf: [32]u8 = undefined;
+        var written: usize = 0;
+        try testing.expectEqual(Result.success, encode(
+            encoder,
+            event,
+            &buf,
+            buf.len,
+            &written,
+        ));
+        try testing.expect(written > 0);
+    }
+
+    {
+        var buf: [32]u8 = undefined;
+        var written: usize = 0;
+        try testing.expectEqual(Result.success, encode(
+            encoder,
+            event,
+            &buf,
+            buf.len,
+            &written,
+        ));
+        try testing.expectEqual(@as(usize, 0), written);
+    }
+
+    reset(encoder);
+
+    {
+        var buf: [32]u8 = undefined;
+        var written: usize = 0;
+        try testing.expectEqual(Result.success, encode(
+            encoder,
+            event,
+            &buf,
+            buf.len,
+            &written,
+        ));
+        try testing.expect(written > 0);
+    }
+}
+
+test "encode: querying required size doesn't update dedupe state" {
+    var encoder: Encoder = undefined;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &encoder,
+    ));
+    defer free(encoder);
+
+    const event_mode: TrackingMode = .any;
+    setopt(encoder, .event, &event_mode);
+    const format_mode: Format = .sgr;
+    setopt(encoder, .format, &format_mode);
+    const size = testSize();
+    setopt(encoder, .size, &size);
+    const track_last_cell = true;
+    setopt(encoder, .track_last_cell, &track_last_cell);
+
+    var event: Event = undefined;
+    try testing.expectEqual(Result.success, mouse_event.new(
+        &lib_alloc.test_allocator,
+        &event,
+    ));
+    defer mouse_event.free(event);
+
+    mouse_event.set_action(event, .motion);
+    mouse_event.set_button(event, .left);
+    mouse_event.set_position(event, .{ .x = 5, .y = 6 });
+
+    var required: usize = 0;
+    try testing.expectEqual(Result.out_of_memory, encode(
+        encoder,
+        event,
+        null,
+        0,
+        &required,
+    ));
+    try testing.expect(required > 0);
+
+    var buf: [32]u8 = undefined;
+    var written: usize = 0;
+    try testing.expectEqual(Result.success, encode(
+        encoder,
+        event,
+        &buf,
+        buf.len,
+        &written,
+    ));
+    try testing.expect(written > 0);
+}
diff --git a/src/terminal/c/mouse_event.zig b/src/terminal/c/mouse_event.zig
new file mode 100644
index 000000000..91f4e2126
--- /dev/null
+++ b/src/terminal/c/mouse_event.zig
@@ -0,0 +1,155 @@
+const std = @import("std");
+const Allocator = std.mem.Allocator;
+const testing = std.testing;
+const lib_alloc = @import("../../lib/allocator.zig");
+const CAllocator = lib_alloc.Allocator;
+const key = @import("../../input/key.zig");
+const mouse = @import("../../input/mouse.zig");
+const mouse_encode = @import("../../input/mouse_encode.zig");
+const Result = @import("result.zig").Result;
+
+const log = std.log.scoped(.mouse_event);
+
+/// Wrapper around mouse event that tracks the allocator for C API usage.
+const MouseEventWrapper = struct {
+    event: mouse_encode.Event = .{},
+    alloc: Allocator,
+};
+
+/// C: GhosttyMouseEvent
+pub const Event = ?*MouseEventWrapper;
+
+/// C: GhosttyMouseAction
+pub const Action = mouse.Action;
+
+/// C: GhosttyMouseButton
+pub const Button = mouse.Button;
+
+/// C: GhosttyMousePosition
+pub const Position = mouse_encode.Event.Pos;
+
+/// C: GhosttyMods
+pub const Mods = key.Mods;
+
+pub fn new(
+    alloc_: ?*const CAllocator,
+    result: *Event,
+) callconv(.c) Result {
+    const alloc = lib_alloc.default(alloc_);
+    const ptr = alloc.create(MouseEventWrapper) catch
+        return .out_of_memory;
+    ptr.* = .{ .alloc = alloc };
+    result.* = ptr;
+    return .success;
+}
+
+pub fn free(event_: Event) callconv(.c) void {
+    const wrapper = event_ orelse return;
+    const alloc = wrapper.alloc;
+    alloc.destroy(wrapper);
+}
+
+pub fn set_action(event_: Event, action: Action) callconv(.c) void {
+    if (comptime std.debug.runtime_safety) {
+        _ = std.meta.intToEnum(Action, @intFromEnum(action)) catch {
+            log.warn("set_action invalid action value={d}", .{@intFromEnum(action)});
+            return;
+        };
+    }
+
+    event_.?.event.action = action;
+}
+
+pub fn get_action(event_: Event) callconv(.c) Action {
+    return event_.?.event.action;
+}
+
+pub fn set_button(event_: Event, button: Button) callconv(.c) void {
+    if (comptime std.debug.runtime_safety) {
+        _ = std.meta.intToEnum(Button, @intFromEnum(button)) catch {
+            log.warn("set_button invalid button value={d}", .{@intFromEnum(button)});
+            return;
+        };
+    }
+
+    event_.?.event.button = button;
+}
+
+pub fn clear_button(event_: Event) callconv(.c) void {
+    event_.?.event.button = null;
+}
+
+pub fn get_button(event_: Event, out: ?*Button) callconv(.c) bool {
+    if (event_.?.event.button) |button| {
+        if (out) |ptr| ptr.* = button;
+        return true;
+    }
+
+    return false;
+}
+
+pub fn set_mods(event_: Event, mods: Mods) callconv(.c) void {
+    event_.?.event.mods = mods;
+}
+
+pub fn get_mods(event_: Event) callconv(.c) Mods {
+    return event_.?.event.mods;
+}
+
+pub fn set_position(event_: Event, pos: Position) callconv(.c) void {
+    event_.?.event.pos = pos;
+}
+
+pub fn get_position(event_: Event) callconv(.c) Position {
+    return event_.?.event.pos;
+}
+
+test "alloc" {
+    var e: Event = undefined;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &e,
+    ));
+    free(e);
+}
+
+test "free null" {
+    free(null);
+}
+
+test "set/get" {
+    var e: Event = undefined;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &e,
+    ));
+    defer free(e);
+
+    // Action
+    set_action(e, .motion);
+    try testing.expectEqual(Action.motion, get_action(e));
+
+    // Button
+    set_button(e, .left);
+    var button: Button = .unknown;
+    try testing.expect(get_button(e, &button));
+    try testing.expectEqual(Button.left, button);
+    try testing.expect(get_button(e, null));
+
+    clear_button(e);
+    try testing.expect(!get_button(e, &button));
+
+    // Mods
+    const mods: Mods = .{ .shift = true, .ctrl = true };
+    set_mods(e, mods);
+    const got_mods = get_mods(e);
+    try testing.expect(got_mods.shift);
+    try testing.expect(got_mods.ctrl);
+    try testing.expect(!got_mods.alt);
+
+    // Position
+    set_position(e, .{ .x = 12.5, .y = -4.0 });
+    const pos = get_position(e);
+    try testing.expectEqual(@as(f32, 12.5), pos.x);
+    try testing.expectEqual(@as(f32, -4.0), pos.y);
+}

From 33b05b9876ab8940e7ad2f98d3cf5ede277cf4d9 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 15 Mar 2026 20:12:05 -0700
Subject: [PATCH 189/391] example: add C mouse encoding example

Add a new c-vt-mouse-encode example that demonstrates how to use the
mouse encoder C API. The example creates a mouse encoder configured
with SGR format and normal tracking mode, sets up terminal geometry
for pixel-to-cell coordinate mapping, and encodes a left button press
event into a terminal escape sequence.

Mirrors the structure of the existing c-vt-key-encode example. Also
adds the corresponding @example doxygen reference in vt.h.
---
 example/c-vt-mouse-encode/README.md     | 23 +++++++
 example/c-vt-mouse-encode/build.zig     | 42 +++++++++++++
 example/c-vt-mouse-encode/build.zig.zon | 24 +++++++
 example/c-vt-mouse-encode/src/main.c    | 78 +++++++++++++++++++++++
 include/ghostty/vt.h                    |  6 ++
 include/ghostty/vt/mouse.h              | 84 +++++++++++++++++++++++++
 6 files changed, 257 insertions(+)
 create mode 100644 example/c-vt-mouse-encode/README.md
 create mode 100644 example/c-vt-mouse-encode/build.zig
 create mode 100644 example/c-vt-mouse-encode/build.zig.zon
 create mode 100644 example/c-vt-mouse-encode/src/main.c

diff --git a/example/c-vt-mouse-encode/README.md b/example/c-vt-mouse-encode/README.md
new file mode 100644
index 000000000..754e09805
--- /dev/null
+++ b/example/c-vt-mouse-encode/README.md
@@ -0,0 +1,23 @@
+# Example: `ghostty-vt` C Mouse Encoding
+
+This example demonstrates how to use the `ghostty-vt` C library to encode mouse
+events into terminal escape sequences.
+
+This example specifically shows how to:
+
+1. Create a mouse encoder with the C API
+2. Configure tracking mode and output format (this example uses SGR)
+3. Set terminal geometry for pixel-to-cell coordinate mapping
+4. Create and configure a mouse event
+5. Encode the mouse event into a terminal escape sequence
+
+The example encodes a left button press at pixel position (50, 40) using SGR
+format, producing an escape sequence like `\x1b[<0;6;3M`.
+
+## Usage
+
+Run the program:
+
+```shell-session
+zig build run
+```
diff --git a/example/c-vt-mouse-encode/build.zig b/example/c-vt-mouse-encode/build.zig
new file mode 100644
index 000000000..350d0a89e
--- /dev/null
+++ b/example/c-vt-mouse-encode/build.zig
@@ -0,0 +1,42 @@
+const std = @import("std");
+
+pub fn build(b: *std.Build) void {
+    const target = b.standardTargetOptions(.{});
+    const optimize = b.standardOptimizeOption(.{});
+
+    const run_step = b.step("run", "Run the app");
+
+    const exe_mod = b.createModule(.{
+        .target = target,
+        .optimize = optimize,
+    });
+    exe_mod.addCSourceFiles(.{
+        .root = b.path("src"),
+        .files = &.{"main.c"},
+    });
+
+    // You'll want to use a lazy dependency here so that ghostty is only
+    // downloaded if you actually need it.
+    if (b.lazyDependency("ghostty", .{
+        // Setting simd to false will force a pure static build that
+        // doesn't even require libc, but it has a significant performance
+        // penalty. If your embedding app requires libc anyway, you should
+        // always keep simd enabled.
+        // .simd = false,
+    })) |dep| {
+        exe_mod.linkLibrary(dep.artifact("ghostty-vt"));
+    }
+
+    // Exe
+    const exe = b.addExecutable(.{
+        .name = "c_vt_mouse_encode",
+        .root_module = exe_mod,
+    });
+    b.installArtifact(exe);
+
+    // Run
+    const run_cmd = b.addRunArtifact(exe);
+    run_cmd.step.dependOn(b.getInstallStep());
+    if (b.args) |args| run_cmd.addArgs(args);
+    run_step.dependOn(&run_cmd.step);
+}
diff --git a/example/c-vt-mouse-encode/build.zig.zon b/example/c-vt-mouse-encode/build.zig.zon
new file mode 100644
index 000000000..1ab5da284
--- /dev/null
+++ b/example/c-vt-mouse-encode/build.zig.zon
@@ -0,0 +1,24 @@
+.{
+    .name = .c_vt,
+    .version = "0.0.0",
+    .fingerprint = 0x413a8529a6dd3c51,
+    .minimum_zig_version = "0.15.1",
+    .dependencies = .{
+        // Ghostty dependency. In reality, you'd probably use a URL-based
+        // dependency like the one showed (and commented out) below this one.
+        // We use a path dependency here for simplicity and to ensure our
+        // examples always test against the source they're bundled with.
+        .ghostty = .{ .path = "../../" },
+
+        // Example of what a URL-based dependency looks like:
+        // .ghostty = .{
+        //     .url = "https://github.com/ghostty-org/ghostty/archive/COMMIT.tar.gz",
+        //     .hash = "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO36s",
+        // },
+    },
+    .paths = .{
+        "build.zig",
+        "build.zig.zon",
+        "src",
+    },
+}
diff --git a/example/c-vt-mouse-encode/src/main.c b/example/c-vt-mouse-encode/src/main.c
new file mode 100644
index 000000000..55f867252
--- /dev/null
+++ b/example/c-vt-mouse-encode/src/main.c
@@ -0,0 +1,78 @@
+#include <assert.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <ghostty/vt.h>
+
+int main() {
+  GhosttyMouseEncoder encoder;
+  GhosttyResult result = ghostty_mouse_encoder_new(NULL, &encoder);
+  assert(result == GHOSTTY_SUCCESS);
+
+  // Set tracking mode to normal (button press/release)
+  ghostty_mouse_encoder_setopt(encoder, GHOSTTY_MOUSE_ENCODER_OPT_EVENT,
+                               &(GhosttyMouseTrackingMode){GHOSTTY_MOUSE_TRACKING_NORMAL});
+
+  // Set output format to SGR
+  ghostty_mouse_encoder_setopt(encoder, GHOSTTY_MOUSE_ENCODER_OPT_FORMAT,
+                               &(GhosttyMouseFormat){GHOSTTY_MOUSE_FORMAT_SGR});
+
+  // Set terminal geometry so the encoder can map pixel positions to cells
+  ghostty_mouse_encoder_setopt(encoder, GHOSTTY_MOUSE_ENCODER_OPT_SIZE,
+                               &(GhosttyMouseEncoderSize){
+                                   .size = sizeof(GhosttyMouseEncoderSize),
+                                   .screen_width = 800,
+                                   .screen_height = 600,
+                                   .cell_width = 10,
+                                   .cell_height = 20,
+                                   .padding_top = 0,
+                                   .padding_bottom = 0,
+                                   .padding_right = 0,
+                                   .padding_left = 0,
+                               });
+
+  // Create mouse event: left button press at pixel position (50, 40)
+  GhosttyMouseEvent event;
+  result = ghostty_mouse_event_new(NULL, &event);
+  assert(result == GHOSTTY_SUCCESS);
+  ghostty_mouse_event_set_action(event, GHOSTTY_MOUSE_ACTION_PRESS);
+  ghostty_mouse_event_set_button(event, GHOSTTY_MOUSE_BUTTON_LEFT);
+  ghostty_mouse_event_set_position(event, (GhosttyMousePosition){.x = 50.0f, .y = 40.0f});
+  printf("Encoding event: left button press at (50, 40) in SGR format\n");
+
+  // Optionally, encode with null buffer to get required size. You can
+  // skip this step and provide a sufficiently large buffer directly.
+  // If there isn't enough space, the function will return an out of memory
+  // error.
+  size_t required = 0;
+  result = ghostty_mouse_encoder_encode(encoder, event, NULL, 0, &required);
+  assert(result == GHOSTTY_OUT_OF_MEMORY);
+  printf("Required buffer size: %zu bytes\n", required);
+
+  // Encode the mouse event. We don't use our required size above because
+  // that was just an example; we know 128 bytes is enough.
+  char buf[128];
+  size_t written = 0;
+  result = ghostty_mouse_encoder_encode(encoder, event, buf, sizeof(buf), &written);
+  assert(result == GHOSTTY_SUCCESS);
+  printf("Encoded %zu bytes\n", written);
+
+  // Print the encoded sequence (hex and string)
+  printf("Hex: ");
+  for (size_t i = 0; i < written; i++) printf("%02x ", (unsigned char)buf[i]);
+  printf("\n");
+
+  printf("String: ");
+  for (size_t i = 0; i < written; i++) {
+    if (buf[i] == 0x1b) {
+      printf("\\x1b");
+    } else {
+      printf("%c", buf[i]);
+    }
+  }
+  printf("\n");
+
+  ghostty_mouse_event_free(event);
+  ghostty_mouse_encoder_free(encoder);
+  return 0;
+}
diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index f3958ccc3..9d22b647b 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -43,6 +43,7 @@
  * Complete working examples:
  * - @ref c-vt/src/main.c - OSC parser example
  * - @ref c-vt-key-encode/src/main.c - Key encoding example
+ * - @ref c-vt-mouse-encode/src/main.c - Mouse encoding example
  * - @ref c-vt-paste/src/main.c - Paste safety check example
  * - @ref c-vt-sgr/src/main.c - SGR parser example
  * - @ref c-vt-formatter/src/main.c - Terminal formatter example
@@ -59,6 +60,11 @@
  * into terminal escape sequences using the Kitty keyboard protocol.
  */
 
+/** @example c-vt-mouse-encode/src/main.c
+ * This example demonstrates how to use the mouse encoder to convert mouse events
+ * into terminal escape sequences using the SGR mouse format.
+ */
+
 /** @example c-vt-paste/src/main.c
  * This example demonstrates how to use the paste utilities to check if
  * paste data is safe before sending it to the terminal.
diff --git a/include/ghostty/vt/mouse.h b/include/ghostty/vt/mouse.h
index 4e44e15b5..f5f37ce7b 100644
--- a/include/ghostty/vt/mouse.h
+++ b/include/ghostty/vt/mouse.h
@@ -24,6 +24,90 @@
  *    - Free the event with ghostty_mouse_event_free() or reuse it.
  * 4. Free the encoder with ghostty_mouse_encoder_free() when done.
  *
+ * For a complete working example, see example/c-vt-mouse-encode in the
+ * repository.
+ *
+ * ## Example
+ *
+ * @code{.c}
+ * #include <assert.h>
+ * #include <stdio.h>
+ * #include <ghostty/vt.h>
+ *
+ * int main() {
+ *   // Create encoder
+ *   GhosttyMouseEncoder encoder;
+ *   GhosttyResult result = ghostty_mouse_encoder_new(NULL, &encoder);
+ *   assert(result == GHOSTTY_SUCCESS);
+ *
+ *   // Configure SGR format with normal tracking
+ *   ghostty_mouse_encoder_setopt(encoder, GHOSTTY_MOUSE_ENCODER_OPT_EVENT,
+ *       &(GhosttyMouseTrackingMode){GHOSTTY_MOUSE_TRACKING_NORMAL});
+ *   ghostty_mouse_encoder_setopt(encoder, GHOSTTY_MOUSE_ENCODER_OPT_FORMAT,
+ *       &(GhosttyMouseFormat){GHOSTTY_MOUSE_FORMAT_SGR});
+ *
+ *   // Set terminal geometry for coordinate mapping
+ *   ghostty_mouse_encoder_setopt(encoder, GHOSTTY_MOUSE_ENCODER_OPT_SIZE,
+ *       &(GhosttyMouseEncoderSize){
+ *           .size = sizeof(GhosttyMouseEncoderSize),
+ *           .screen_width = 800, .screen_height = 600,
+ *           .cell_width = 10, .cell_height = 20,
+ *       });
+ *
+ *   // Create and configure a left button press event
+ *   GhosttyMouseEvent event;
+ *   result = ghostty_mouse_event_new(NULL, &event);
+ *   assert(result == GHOSTTY_SUCCESS);
+ *   ghostty_mouse_event_set_action(event, GHOSTTY_MOUSE_ACTION_PRESS);
+ *   ghostty_mouse_event_set_button(event, GHOSTTY_MOUSE_BUTTON_LEFT);
+ *   ghostty_mouse_event_set_position(event,
+ *       (GhosttyMousePosition){.x = 50.0f, .y = 40.0f});
+ *
+ *   // Encode the mouse event
+ *   char buf[128];
+ *   size_t written = 0;
+ *   result = ghostty_mouse_encoder_encode(encoder, event,
+ *       buf, sizeof(buf), &written);
+ *   assert(result == GHOSTTY_SUCCESS);
+ *
+ *   // Use the encoded sequence (e.g., write to terminal)
+ *   fwrite(buf, 1, written, stdout);
+ *
+ *   // Cleanup
+ *   ghostty_mouse_event_free(event);
+ *   ghostty_mouse_encoder_free(encoder);
+ *   return 0;
+ * }
+ * @endcode
+ *
+ * ## Example: Encoding with Terminal State
+ *
+ * When you have a GhosttyTerminal, you can sync its tracking mode and
+ * output format into the encoder automatically:
+ *
+ * @code{.c}
+ * // Create a terminal and feed it some VT data that enables mouse tracking
+ * GhosttyTerminal terminal;
+ * ghostty_terminal_new(NULL, &terminal,
+ *     (GhosttyTerminalOptions){.cols = 80, .rows = 24, .max_scrollback = 0});
+ *
+ * // Application might write data that enables mouse reporting, etc.
+ * ghostty_terminal_vt_write(terminal, vt_data, vt_len);
+ *
+ * // Create an encoder and sync its options from the terminal
+ * GhosttyMouseEncoder encoder;
+ * ghostty_mouse_encoder_new(NULL, &encoder);
+ * ghostty_mouse_encoder_setopt_from_terminal(encoder, terminal);
+ *
+ * // Encode a mouse event using the terminal-derived options
+ * char buf[128];
+ * size_t written = 0;
+ * ghostty_mouse_encoder_encode(encoder, event, buf, sizeof(buf), &written);
+ *
+ * ghostty_mouse_encoder_free(encoder);
+ * ghostty_terminal_free(terminal);
+ * @endcode
+ *
  * @{
  */
 

From de87456a9b662065e7dbdc6433d1ff283bbf13af Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 15 Mar 2026 20:15:51 -0700
Subject: [PATCH 190/391] lib/vt: export mouse encoding API

Export mouse_encode types and functions through the lib_vt public
input API, mirroring the existing key encoding exports. This adds
MouseAction, MouseButton, MouseEncodeOptions, MouseEncodeEvent,
and encodeMouse so that consumers of the Zig module can encode
mouse events without reaching into internal packages.
---
 src/lib_vt.zig | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 32fd14dc5..44ffe7a3e 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -84,6 +84,7 @@ pub const input = struct {
     const paste = @import("input/paste.zig");
     const key = @import("input/key.zig");
     const key_encode = @import("input/key_encode.zig");
+    const mouse_encode = @import("input/mouse_encode.zig");
 
     // Paste-related APIs
     pub const PasteError = paste.Error;
@@ -98,6 +99,13 @@ pub const input = struct {
     pub const KeyMods = key.Mods;
     pub const KeyEncodeOptions = key_encode.Options;
     pub const encodeKey = key_encode.encode;
+
+    // Mouse encoding
+    pub const MouseAction = @import("input/mouse.zig").Action;
+    pub const MouseButton = @import("input/mouse.zig").Button;
+    pub const MouseEncodeOptions = mouse_encode.Options;
+    pub const MouseEncodeEvent = mouse_encode.Event;
+    pub const encodeMouse = mouse_encode.encode;
 };
 
 comptime {

From 44f403bfe1b45fdd1b8be2ea5b3eb6bc4b593aa3 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2026 05:42:48 +0000
Subject: [PATCH 191/391] Update VOUCHED list (#11556)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11536#discussioncomment-16152546)
from @pluiedev.

Vouch: @mvanhorn

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 4688c4ea0..d63020079 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -130,6 +130,7 @@ miupa
 molechowski
 mrmage
 mtak
+mvanhorn
 natesmyth
 neo773
 nicosuave

From 978abdeebc4b346b8e9bc4395234b7bb046dc87f Mon Sep 17 00:00:00 2001
From: Waqas Younas <waqas.younas@gmail.com>
Date: Mon, 16 Mar 2026 12:46:54 +0500
Subject: [PATCH 192/391] Fix tmux control block terminator parsing

---
 src/terminal/tmux/control.zig | 116 ++++++++++++++++++++++++++++++++--
 1 file changed, 112 insertions(+), 4 deletions(-)

diff --git a/src/terminal/tmux/control.zig b/src/terminal/tmux/control.zig
index dbc64b340..f68a748f1 100644
--- a/src/terminal/tmux/control.zig
+++ b/src/terminal/tmux/control.zig
@@ -48,6 +48,11 @@ pub const Parser = struct {
         block,
     };
 
+    const BlockTerminator = enum {
+        end,
+        err,
+    };
+
     pub fn deinit(self: *Parser) void {
         // If we're in a broken state, we already deinited
         // the buffer, so we don't need to do anything.
@@ -116,10 +121,8 @@ pub const Parser = struct {
                 )) |v| v + 1 else 0;
                 const line = written[idx..];
 
-                if (std.mem.startsWith(u8, line, "%end") or
-                    std.mem.startsWith(u8, line, "%error"))
-                {
-                    const err = std.mem.startsWith(u8, line, "%error");
+                if (parseBlockTerminator(line)) |terminator| {
+                    const err = terminator == .err;
                     const output = std.mem.trimRight(u8, written[0..idx], "\r\n");
 
                     // If it is an error then log it.
@@ -144,6 +147,36 @@ pub const Parser = struct {
 
     const ParseError = error{RegexError};
 
+    /// Block payload is raw data, so a line only terminates a block if it
+    /// exactly matches tmux's `%end`/`%error` guard-line shape.
+    fn parseBlockTerminator(line_raw: []const u8) ?BlockTerminator {
+        var line = line_raw;
+        if (line.len > 0 and line[line.len - 1] == '\r') {
+            line = line[0 .. line.len - 1];
+        }
+
+        var fields = std.mem.tokenizeScalar(u8, line, ' ');
+        const cmd = fields.next() orelse return null;
+        const terminator: BlockTerminator = if (std.mem.eql(u8, cmd, "%end"))
+            .end
+        else if (std.mem.eql(u8, cmd, "%error"))
+            .err
+        else
+            return null;
+
+        const time = fields.next() orelse return null;
+        const command_id = fields.next() orelse return null;
+        const flags = fields.next() orelse return null;
+        const extra = fields.next();
+
+        _ = std.fmt.parseInt(usize, time, 10) catch return null;
+        _ = std.fmt.parseInt(usize, command_id, 10) catch return null;
+        _ = std.fmt.parseInt(usize, flags, 10) catch return null;
+        if (extra != null) return null;
+
+        return terminator;
+    }
+
     fn parseNotification(self: *Parser) ParseError!?Notification {
         assert(self.state == .notification);
 
@@ -597,6 +630,81 @@ test "tmux begin/end data" {
     try testing.expectEqualStrings("hello\nworld", n.block_end);
 }
 
+test "tmux block payload may start with %end" {
+    const testing = std.testing;
+    const alloc = testing.allocator;
+
+    var c: Parser = .{ .buffer = .init(alloc) };
+    defer c.deinit();
+    for ("%begin 1 1 1\n") |byte| try testing.expect(try c.put(byte) == null);
+    for ("%end not really\n") |byte| try testing.expect(try c.put(byte) == null);
+    for ("hello\n") |byte| try testing.expect(try c.put(byte) == null);
+    for ("%end 1 1 1") |byte| try testing.expect(try c.put(byte) == null);
+    const n = (try c.put('\n')).?;
+    try testing.expect(n == .block_end);
+    try testing.expectEqualStrings("%end not really\nhello", n.block_end);
+}
+
+test "tmux block payload may start with %error" {
+    const testing = std.testing;
+    const alloc = testing.allocator;
+
+    var c: Parser = .{ .buffer = .init(alloc) };
+    defer c.deinit();
+    for ("%begin 1 1 1\n") |byte| try testing.expect(try c.put(byte) == null);
+    for ("%error not really\n") |byte| try testing.expect(try c.put(byte) == null);
+    for ("hello\n") |byte| try testing.expect(try c.put(byte) == null);
+    for ("%end 1 1 1") |byte| try testing.expect(try c.put(byte) == null);
+    const n = (try c.put('\n')).?;
+    try testing.expect(n == .block_end);
+    try testing.expectEqualStrings("%error not really\nhello", n.block_end);
+}
+
+test "tmux block may terminate with real %error after misleading payload" {
+    const testing = std.testing;
+    const alloc = testing.allocator;
+
+    var c: Parser = .{ .buffer = .init(alloc) };
+    defer c.deinit();
+    for ("%begin 1 1 1\n") |byte| try testing.expect(try c.put(byte) == null);
+    for ("%error not really\n") |byte| try testing.expect(try c.put(byte) == null);
+    for ("hello\n") |byte| try testing.expect(try c.put(byte) == null);
+    for ("%error 1 1 1") |byte| try testing.expect(try c.put(byte) == null);
+    const n = (try c.put('\n')).?;
+    try testing.expect(n == .block_err);
+    try testing.expectEqualStrings("%error not really\nhello", n.block_err);
+}
+
+test "tmux block terminator requires exact token count" {
+    const testing = std.testing;
+    const alloc = testing.allocator;
+
+    var c: Parser = .{ .buffer = .init(alloc) };
+    defer c.deinit();
+    for ("%begin 1 1 1\n") |byte| try testing.expect(try c.put(byte) == null);
+    for ("%end 1 1 1 trailing\n") |byte| try testing.expect(try c.put(byte) == null);
+    for ("hello\n") |byte| try testing.expect(try c.put(byte) == null);
+    for ("%end 1 1 1") |byte| try testing.expect(try c.put(byte) == null);
+    const n = (try c.put('\n')).?;
+    try testing.expect(n == .block_end);
+    try testing.expectEqualStrings("%end 1 1 1 trailing\nhello", n.block_end);
+}
+
+test "tmux block terminator requires numeric metadata" {
+    const testing = std.testing;
+    const alloc = testing.allocator;
+
+    var c: Parser = .{ .buffer = .init(alloc) };
+    defer c.deinit();
+    for ("%begin 1 1 1\n") |byte| try testing.expect(try c.put(byte) == null);
+    for ("%end foo bar baz\n") |byte| try testing.expect(try c.put(byte) == null);
+    for ("hello\n") |byte| try testing.expect(try c.put(byte) == null);
+    for ("%end 1 1 1") |byte| try testing.expect(try c.put(byte) == null);
+    const n = (try c.put('\n')).?;
+    try testing.expect(n == .block_end);
+    try testing.expectEqualStrings("%end foo bar baz\nhello", n.block_end);
+}
+
 test "tmux output" {
     const testing = std.testing;
     const alloc = testing.allocator;

From 3b60ef3b34006fbf20030e17ad268cf3952d4228 Mon Sep 17 00:00:00 2001
From: Kat <65649991+00-kat@users.noreply.github.com>
Date: Mon, 16 Mar 2026 20:37:14 +1100
Subject: [PATCH 193/391] Add missing plural forms (or, the lack thereof) for
 Chinese.

---
 po/zh_CN.po | 1 +
 po/zh_TW.po | 1 +
 2 files changed, 2 insertions(+)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8e7e241fc..4a48df5d7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: dist/linux/ghostty_nautilus.py:53
 msgid "Open in Ghostty"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cacdc8acb..a26103911 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -15,6 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: dist/linux/ghostty_nautilus.py:53
 msgid "Open in Ghostty"

From 2d2d913f808934bcd0298c5cf7d0b3ce1390d8ff Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 16 Mar 2026 09:31:55 -0700
Subject: [PATCH 194/391] ci: skip milestone workflow for bot-authored PRs

The milestone action currently runs for all merged pull_request_target
close events, including PRs opened by bots such as dependabot and
ghostty-vouch. That causes milestone binding to run on automated PRs
that should be ignored.

Gate the update-milestone job so pull request events only run when the
author is not a bot, while still allowing closed-issue events to run.
This preserves existing issue milestone behavior and prevents bot PRs
from triggering the workflow.
---
 .github/workflows/milestone.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/milestone.yml b/.github/workflows/milestone.yml
index 05d1f83c8..34e7652a7 100644
--- a/.github/workflows/milestone.yml
+++ b/.github/workflows/milestone.yml
@@ -11,6 +11,9 @@ on:
 
 jobs:
   update-milestone:
+    # Ignore bot-authored pull requests (dependabot, app bots, etc)
+    # and CI-only PRs.
+    if: github.event_name == 'issues' || (github.event.pull_request.user.type != 'Bot' && !startsWith(github.event.pull_request.title, 'ci:'))
     runs-on: namespace-profile-ghostty-sm
     name: Milestone Update
     steps:

From 8966d37985a22af8529f407686afdfd51c52cdce Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen <hi@pluie.me>
Date: Mon, 16 Mar 2026 14:32:06 +0800
Subject: [PATCH 195/391] gtk/wayland: refactor global handling

The way we originally handled globals gradually escalated into an unholy
mess of ad-hoc helper functions and special-case handlers, which proved
to be hard to scale. Using a type-erased EnumMap like this makes
everything *far* easier to work and reason with, I think.

Also nuked the `xdg_wm_dialog_v1` hack that was necessary to prevent
old versions of gtk4-layer-shell crashing. If by the time of 1.4's
release people are still using those versions, it's on them.
---
 src/apprt/gtk/class/application.zig        |   4 +-
 src/apprt/gtk/winproto.zig                 |   4 +-
 src/apprt/gtk/winproto/noop.zig            |   3 +-
 src/apprt/gtk/winproto/wayland.zig         | 397 ++++-----------------
 src/apprt/gtk/winproto/wayland/Globals.zig | 230 ++++++++++++
 src/apprt/gtk/winproto/x11.zig             |   3 +-
 6 files changed, 304 insertions(+), 337 deletions(-)
 create mode 100644 src/apprt/gtk/winproto/wayland/Globals.zig

diff --git a/src/apprt/gtk/class/application.zig b/src/apprt/gtk/class/application.zig
index 039e853aa..63f1c35d0 100644
--- a/src/apprt/gtk/class/application.zig
+++ b/src/apprt/gtk/class/application.zig
@@ -350,7 +350,7 @@ pub const Application = extern struct {
             log.warn("error initializing windowing protocol err={}", .{err});
             break :wp .{ .none = .{} };
         };
-        errdefer wp.deinit(alloc);
+        errdefer wp.deinit();
         log.debug("windowing protocol={s}", .{@tagName(wp)});
 
         // Create our GTK Application which encapsulates our process.
@@ -431,7 +431,7 @@ pub const Application = extern struct {
         const alloc = self.allocator();
         const priv: *Private = self.private();
         priv.config.unref();
-        priv.winproto.deinit(alloc);
+        priv.winproto.deinit();
         priv.global_shortcuts.unref();
         if (priv.saved_language) |language| alloc.free(language);
         if (gdk.Display.getDefault()) |display| {
diff --git a/src/apprt/gtk/winproto.zig b/src/apprt/gtk/winproto.zig
index 3c1da2b21..6731bfb31 100644
--- a/src/apprt/gtk/winproto.zig
+++ b/src/apprt/gtk/winproto.zig
@@ -46,9 +46,9 @@ pub const App = union(Protocol) {
         return .{ .none = .{} };
     }
 
-    pub fn deinit(self: *App, alloc: Allocator) void {
+    pub fn deinit(self: *App) void {
         switch (self.*) {
-            inline else => |*v| v.deinit(alloc),
+            inline else => |*v| v.deinit(),
         }
     }
 
diff --git a/src/apprt/gtk/winproto/noop.zig b/src/apprt/gtk/winproto/noop.zig
index ed69736f8..0d8cc18ce 100644
--- a/src/apprt/gtk/winproto/noop.zig
+++ b/src/apprt/gtk/winproto/noop.zig
@@ -19,9 +19,8 @@ pub const App = struct {
         return null;
     }
 
-    pub fn deinit(self: *App, alloc: Allocator) void {
+    pub fn deinit(self: *App) void {
         _ = self;
-        _ = alloc;
     }
 
     pub fn eventMods(
diff --git a/src/apprt/gtk/winproto/wayland.zig b/src/apprt/gtk/winproto/wayland.zig
index a4678f4e4..b90e9d115 100644
--- a/src/apprt/gtk/winproto/wayland.zig
+++ b/src/apprt/gtk/winproto/wayland.zig
@@ -7,66 +7,24 @@ const gdk_wayland = @import("gdk_wayland");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 const layer_shell = @import("gtk4-layer-shell");
+
 const wayland = @import("wayland");
-
-const Config = @import("../../../config.zig").Config;
-const input = @import("../../../input.zig");
-const ApprtWindow = @import("../class/window.zig").Window;
-
 const wl = wayland.client.wl;
 const kde = wayland.client.kde;
 const org = wayland.client.org;
 const xdg = wayland.client.xdg;
 
+const Config = @import("../../../config.zig").Config;
+const Globals = @import("wayland/Globals.zig");
+const input = @import("../../../input.zig");
+const ApprtWindow = @import("../class/window.zig").Window;
+
 const log = std.log.scoped(.winproto_wayland);
 
 /// Wayland state that contains application-wide Wayland objects (e.g. wl_display).
 pub const App = struct {
     display: *wl.Display,
-    context: *Context,
-
-    const Context = struct {
-        alloc: Allocator,
-
-        kde_blur_manager: ?*org.KdeKwinBlurManager = null,
-
-        // FIXME: replace with `zxdg_decoration_v1` once GTK merges
-        // https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6398
-        kde_decoration_manager: ?*org.KdeKwinServerDecorationManager = null,
-        kde_decoration_manager_global_name: ?u32 = null,
-
-        kde_slide_manager: ?*org.KdeKwinSlideManager = null,
-
-        kde_output_order: ?*kde.OutputOrderV1 = null,
-        kde_output_order_global_name: ?u32 = null,
-
-        /// Connector name of the primary output (e.g., "DP-1") as reported
-        /// by kde_output_order_v1. The first output in each priority list
-        /// is the primary.
-        primary_output_name: ?[:0]const u8 = null,
-
-        /// Tracks the output order event cycle. Set to true after a `done`
-        /// event so the next `output` event is captured as the new primary.
-        /// Initialized to true so the first event after binding is captured.
-        output_order_done: bool = true,
-
-        default_deco_mode: ?org.KdeKwinServerDecorationManager.Mode = null,
-
-        xdg_activation: ?*xdg.ActivationV1 = null,
-
-        /// Whether the xdg_wm_dialog_v1 protocol is present.
-        ///
-        /// If it is present, gtk4-layer-shell < 1.0.4 may crash when the user
-        /// creates a quick terminal, and we need to ensure this fails
-        /// gracefully if this situation occurs.
-        ///
-        /// FIXME: This is a temporary workaround - we should remove this when
-        /// all of our supported distros drop support for affected old
-        /// gtk4-layer-shell versions.
-        ///
-        /// See https://github.com/wmww/gtk4-layer-shell/issues/50
-        xdg_wm_dialog_present: bool = false,
-    };
+    globals: *Globals,
 
     pub fn init(
         alloc: Allocator,
@@ -86,39 +44,17 @@ pub const App = struct {
             gdk_wayland_display.getWlDisplay() orelse return error.NoWaylandDisplay,
         ));
 
-        // Create our context for our callbacks so we have a stable pointer.
-        // Note: at the time of writing this comment, we don't really need
-        // a stable pointer, but it's too scary that we'd need one in the future
-        // and not have it and corrupt memory or something so let's just do it.
-        const context = try alloc.create(Context);
-        errdefer {
-            if (context.primary_output_name) |name| alloc.free(name);
-            alloc.destroy(context);
-        }
-        context.* = .{ .alloc = alloc };
-
-        // Get our display registry so we can get all the available interfaces
-        // and bind to what we need.
-        const registry = try display.getRegistry();
-        registry.setListener(*Context, registryListener, context);
-        if (display.roundtrip() != .SUCCESS) return error.RoundtripFailed;
-
-        // Do another roundtrip to process events emitted by globals we bound
-        // during registry discovery (e.g. default decoration mode, output
-        // order). Listeners are installed at bind time in registryListener.
-        if (context.kde_decoration_manager != null or context.kde_output_order != null) {
-            if (display.roundtrip() != .SUCCESS) return error.RoundtripFailed;
-        }
+        const globals: *Globals = try .init(alloc, display);
+        errdefer globals.deinit();
 
         return .{
             .display = display,
-            .context = context,
+            .globals = globals,
         };
     }
 
-    pub fn deinit(self: *App, alloc: Allocator) void {
-        if (self.context.primary_output_name) |name| alloc.free(name);
-        alloc.destroy(self.context);
+    pub fn deinit(self: *App) void {
+        self.globals.deinit();
     }
 
     pub fn eventMods(
@@ -130,22 +66,12 @@ pub const App = struct {
     }
 
     pub fn supportsQuickTerminal(self: App) bool {
+        _ = self;
         if (!layer_shell.isSupported()) {
             log.warn("your compositor does not support the wlr-layer-shell protocol; disabling quick terminal", .{});
             return false;
         }
 
-        if (self.context.xdg_wm_dialog_present and
-            layer_shell.getLibraryVersion().order(.{
-                .major = 1,
-                .minor = 0,
-                .patch = 4,
-            }) == .lt)
-        {
-            log.warn("the version of gtk4-layer-shell installed on your system is too old (must be 1.0.4 or newer); disabling quick terminal", .{});
-            return false;
-        }
-
         return true;
     }
 
@@ -154,239 +80,10 @@ pub const App = struct {
         layer_shell.initForWindow(window);
 
         // Set target monitor based on config (null lets compositor decide)
-        const monitor = resolveQuickTerminalMonitor(self.context, apprt_window);
+        const monitor = resolveQuickTerminalMonitor(self.globals, apprt_window);
         defer if (monitor) |v| v.unref();
         layer_shell.setMonitor(window, monitor);
     }
-
-    /// Resolve the quick-terminal-screen config to a specific monitor.
-    /// Returns null to let the compositor decide (used for .mouse mode).
-    /// Caller owns the returned ref and must unref it.
-    fn resolveQuickTerminalMonitor(
-        context: *Context,
-        apprt_window: *ApprtWindow,
-    ) ?*gdk.Monitor {
-        const config = if (apprt_window.getConfig()) |v| v.get() else return null;
-
-        switch (config.@"quick-terminal-screen") {
-            .mouse => return null,
-            .main, .@"macos-menu-bar" => {},
-        }
-
-        const display = apprt_window.as(gtk.Widget).getDisplay();
-        const monitors = display.getMonitors();
-
-        // Try to find the monitor matching the primary output name.
-        if (context.primary_output_name) |stored_name| {
-            var i: u32 = 0;
-            while (monitors.getObject(i)) |item| : (i += 1) {
-                const monitor = gobject.ext.cast(gdk.Monitor, item) orelse {
-                    item.unref();
-                    continue;
-                };
-                if (monitor.getConnector()) |connector_z| {
-                    if (std.mem.orderZ(u8, connector_z, stored_name) == .eq) {
-                        return monitor;
-                    }
-                }
-                monitor.unref();
-            }
-        }
-
-        // Fall back to the first monitor in the list.
-        const first = monitors.getObject(0) orelse return null;
-        return gobject.ext.cast(gdk.Monitor, first) orelse {
-            first.unref();
-            return null;
-        };
-    }
-
-    fn getInterfaceType(comptime field: std.builtin.Type.StructField) ?type {
-        // Globals should be optional pointers
-        const T = switch (@typeInfo(field.type)) {
-            .optional => |o| switch (@typeInfo(o.child)) {
-                .pointer => |v| if (v.size == .one) v.child else return null,
-                else => return null,
-            },
-            else => return null,
-        };
-
-        // Only process Wayland interfaces
-        if (!@hasDecl(T, "interface")) return null;
-        return T;
-    }
-
-    /// Returns the Context field that stores the registry global name for
-    /// protocols that support replacement, or null for simple protocols.
-    fn getGlobalNameField(comptime field_name: []const u8) ?[]const u8 {
-        if (std.mem.eql(u8, field_name, "kde_decoration_manager")) {
-            return "kde_decoration_manager_global_name";
-        }
-        if (std.mem.eql(u8, field_name, "kde_output_order")) {
-            return "kde_output_order_global_name";
-        }
-        return null;
-    }
-
-    /// Reset cached state derived from kde_output_order_v1.
-    fn resetOutputOrderState(context: *Context) void {
-        if (context.primary_output_name) |name| context.alloc.free(name);
-        context.primary_output_name = null;
-        context.output_order_done = true;
-    }
-
-    fn registryListener(
-        registry: *wl.Registry,
-        event: wl.Registry.Event,
-        context: *Context,
-    ) void {
-        const ctx_fields = @typeInfo(Context).@"struct".fields;
-
-        switch (event) {
-            .global => |v| {
-                log.debug("found global {s}", .{v.interface});
-
-                // We don't actually do anything with this other than checking
-                // for its existence, so we process this separately.
-                if (std.mem.orderZ(
-                    u8,
-                    v.interface,
-                    "xdg_wm_dialog_v1",
-                ) == .eq) {
-                    context.xdg_wm_dialog_present = true;
-                    return;
-                }
-
-                inline for (ctx_fields) |field| {
-                    const T = getInterfaceType(field) orelse continue;
-                    if (std.mem.orderZ(u8, v.interface, T.interface.name) == .eq) {
-                        log.debug("matched {}", .{T});
-
-                        const global = registry.bind(
-                            v.name,
-                            T,
-                            T.generated_version,
-                        ) catch |err| {
-                            log.warn(
-                                "error binding interface {s} error={}",
-                                .{ v.interface, err },
-                            );
-                            return;
-                        };
-
-                        // Destroy old binding if this global was re-advertised.
-                        // Bind first so a failed bind preserves the old binding.
-                        if (@field(context, field.name)) |old| {
-                            old.destroy();
-
-                            if (comptime std.mem.eql(u8, field.name, "kde_output_order")) {
-                                resetOutputOrderState(context);
-                            }
-                        }
-
-                        @field(context, field.name) = global;
-                        if (comptime getGlobalNameField(field.name)) |name_field| {
-                            @field(context, name_field) = v.name;
-                        }
-
-                        // Install listeners immediately at bind time. This
-                        // keeps listener setup and object lifetime in one
-                        // place and also supports globals that appear later.
-                        if (comptime std.mem.eql(u8, field.name, "kde_decoration_manager")) {
-                            global.setListener(*Context, decoManagerListener, context);
-                        }
-                        if (comptime std.mem.eql(u8, field.name, "kde_output_order")) {
-                            global.setListener(*Context, outputOrderListener, context);
-                        }
-                        break;
-                    }
-                }
-            },
-
-            // This should be a rare occurrence, but in case a global
-            // is suddenly no longer available, we destroy and unset it
-            // as the protocol mandates.
-            .global_remove => |v| remove: {
-                inline for (ctx_fields) |field| {
-                    if (getInterfaceType(field) == null) continue;
-
-                    const global_name_field = comptime getGlobalNameField(field.name);
-                    if (global_name_field) |name_field| {
-                        if (@field(context, name_field)) |stored_name| {
-                            if (stored_name == v.name) {
-                                if (@field(context, field.name)) |global| global.destroy();
-                                @field(context, field.name) = null;
-                                @field(context, name_field) = null;
-
-                                if (comptime std.mem.eql(u8, field.name, "kde_output_order")) {
-                                    resetOutputOrderState(context);
-                                }
-                                break :remove;
-                            }
-                        }
-                    } else {
-                        if (@field(context, field.name)) |global| {
-                            if (global.getId() == v.name) {
-                                global.destroy();
-                                @field(context, field.name) = null;
-                                break :remove;
-                            }
-                        }
-                    }
-                }
-            },
-        }
-    }
-
-    fn decoManagerListener(
-        _: *org.KdeKwinServerDecorationManager,
-        event: org.KdeKwinServerDecorationManager.Event,
-        context: *Context,
-    ) void {
-        switch (event) {
-            .default_mode => |mode| {
-                context.default_deco_mode = @enumFromInt(mode.mode);
-            },
-        }
-    }
-
-    fn outputOrderListener(
-        _: *kde.OutputOrderV1,
-        event: kde.OutputOrderV1.Event,
-        context: *Context,
-    ) void {
-        switch (event) {
-            .output => |v| {
-                // Only the first output event after a `done` is the new primary.
-                if (!context.output_order_done) return;
-                context.output_order_done = false;
-
-                const name = std.mem.sliceTo(v.output_name, 0);
-                if (context.primary_output_name) |old| context.alloc.free(old);
-
-                if (name.len == 0) {
-                    context.primary_output_name = null;
-                    log.warn("ignoring empty primary output name from kde_output_order_v1", .{});
-                } else {
-                    context.primary_output_name = context.alloc.dupeZ(u8, name) catch |err| {
-                        context.primary_output_name = null;
-                        log.warn("failed to allocate primary output name: {}", .{err});
-                        return;
-                    };
-                    log.debug("primary output: {s}", .{name});
-                }
-            },
-            .done => {
-                if (context.output_order_done) {
-                    // No output arrived since the previous done. Treat this as
-                    // an empty update and drop any stale cached primary.
-                    resetOutputOrderState(context);
-                    return;
-                }
-                context.output_order_done = true;
-            },
-        }
-    }
 };
 
 /// Per-window (wl_surface) state for the Wayland protocol.
@@ -397,7 +94,7 @@ pub const Window = struct {
     surface: *wl.Surface,
 
     /// The context from the app where we can load our Wayland interfaces.
-    app_context: *App.Context,
+    globals: *Globals,
 
     /// A token that, when present, indicates that the window is blurred.
     blur_token: ?*org.KdeKwinBlur = null,
@@ -438,7 +135,7 @@ pub const Window = struct {
         // Get our decoration object so we can control the
         // CSD vs SSD status of this surface.
         const deco: ?*org.KdeKwinServerDecoration = deco: {
-            const mgr = app.context.kde_decoration_manager orelse
+            const mgr = app.globals.get(.kde_decoration_manager) orelse
                 break :deco null;
 
             const deco: *org.KdeKwinServerDecoration = mgr.create(
@@ -464,7 +161,7 @@ pub const Window = struct {
         return .{
             .apprt_window = apprt_window,
             .surface = wl_surface,
-            .app_context = app.context,
+            .globals = app.globals,
             .decoration = deco,
         };
     }
@@ -499,7 +196,7 @@ pub const Window = struct {
             // If we support SSDs, then we should *not* enable CSDs if we prefer SSDs.
             // However, if we do not support SSDs (e.g. GNOME) then we should enable
             // CSDs even if the user prefers SSDs.
-            .Server => if (self.app_context.kde_decoration_manager) |_| false else true,
+            .Server => if (self.globals.get(.kde_decoration_manager)) |_| false else true,
             .None => false,
             else => unreachable,
         };
@@ -511,7 +208,7 @@ pub const Window = struct {
     }
 
     pub fn setUrgent(self: *Window, urgent: bool) !void {
-        const activation = self.app_context.xdg_activation orelse return;
+        const activation = self.globals.get(.xdg_activation) orelse return;
 
         // If there already is a token, destroy and unset it
         if (self.activation_token) |token| token.destroy();
@@ -527,7 +224,7 @@ pub const Window = struct {
 
     /// Update the blur state of the window.
     fn syncBlur(self: *Window) !void {
-        const manager = self.app_context.kde_blur_manager orelse return;
+        const manager = self.globals.get(.kde_blur_manager) orelse return;
         const config = if (self.apprt_window.getConfig()) |v|
             v.get()
         else
@@ -561,7 +258,7 @@ pub const Window = struct {
 
     fn getDecorationMode(self: Window) org.KdeKwinServerDecorationManager.Mode {
         return switch (self.apprt_window.getWindowDecoration()) {
-            .auto => self.app_context.default_deco_mode orelse .Client,
+            .auto => self.globals.state.default_deco_mode orelse .Client,
             .client => .Client,
             .server => .Server,
             .none => .None,
@@ -585,7 +282,7 @@ pub const Window = struct {
 
         // Re-resolve the target monitor on every sync so that config reloads
         // and primary-output changes take effect without recreating the window.
-        const target_monitor = App.resolveQuickTerminalMonitor(self.app_context, self.apprt_window);
+        const target_monitor = resolveQuickTerminalMonitor(self.globals, self.apprt_window);
         defer if (target_monitor) |v| v.unref();
         layer_shell.setMonitor(window, target_monitor);
 
@@ -629,7 +326,7 @@ pub const Window = struct {
         if (self.slide) |slide| slide.release();
 
         self.slide = if (anchored_edge) |anchored| slide: {
-            const mgr = self.app_context.kde_slide_manager orelse break :slide null;
+            const mgr = self.globals.get(.kde_slide_manager) orelse break :slide null;
 
             const slide = mgr.create(self.surface) catch |err| {
                 log.warn("could not create slide object={}", .{err});
@@ -658,8 +355,8 @@ pub const Window = struct {
         const window = apprt_window.as(gtk.Window);
         const config = if (apprt_window.getConfig()) |v| v.get() else return;
 
-        const resolved_monitor = App.resolveQuickTerminalMonitor(
-            apprt_window.winproto().wayland.app_context,
+        const resolved_monitor = resolveQuickTerminalMonitor(
+            apprt_window.winproto().wayland.globals,
             apprt_window,
         );
         defer if (resolved_monitor) |v| v.unref();
@@ -686,7 +383,7 @@ pub const Window = struct {
         event: xdg.ActivationTokenV1.Event,
         self: *Window,
     ) void {
-        const activation = self.app_context.xdg_activation orelse return;
+        const activation = self.globals.get(.xdg_activation) orelse return;
         const current_token = self.activation_token orelse return;
 
         if (token.getId() != current_token.getId()) {
@@ -703,3 +400,45 @@ pub const Window = struct {
         }
     }
 };
+
+/// Resolve the quick-terminal-screen config to a specific monitor.
+/// Returns null to let the compositor decide (used for .mouse mode).
+/// Caller owns the returned ref and must unref it.
+fn resolveQuickTerminalMonitor(
+    globals: *Globals,
+    apprt_window: *ApprtWindow,
+) ?*gdk.Monitor {
+    const config = if (apprt_window.getConfig()) |v| v.get() else return null;
+
+    switch (config.@"quick-terminal-screen") {
+        .mouse => return null,
+        .main, .@"macos-menu-bar" => {},
+    }
+
+    const display = apprt_window.as(gtk.Widget).getDisplay();
+    const monitors = display.getMonitors();
+
+    // Try to find the monitor matching the primary output name.
+    if (globals.state.primary_output_name) |stored_name| {
+        var i: u32 = 0;
+        while (monitors.getObject(i)) |item| : (i += 1) {
+            const monitor = gobject.ext.cast(gdk.Monitor, item) orelse {
+                item.unref();
+                continue;
+            };
+            if (monitor.getConnector()) |connector_z| {
+                if (std.mem.orderZ(u8, connector_z, stored_name) == .eq) {
+                    return monitor;
+                }
+            }
+            monitor.unref();
+        }
+    }
+
+    // Fall back to the first monitor in the list.
+    const first = monitors.getObject(0) orelse return null;
+    return gobject.ext.cast(gdk.Monitor, first) orelse {
+        first.unref();
+        return null;
+    };
+}
diff --git a/src/apprt/gtk/winproto/wayland/Globals.zig b/src/apprt/gtk/winproto/wayland/Globals.zig
new file mode 100644
index 000000000..369d6a473
--- /dev/null
+++ b/src/apprt/gtk/winproto/wayland/Globals.zig
@@ -0,0 +1,230 @@
+const Globals = @This();
+
+const std = @import("std");
+const Allocator = std.mem.Allocator;
+
+const wayland = @import("wayland");
+const wl = wayland.client.wl;
+const kde = wayland.client.kde;
+const org = wayland.client.org;
+const xdg = wayland.client.xdg;
+
+const log = std.log.scoped(.winproto_wayland_globals);
+
+alloc: Allocator,
+state: State,
+map: std.EnumMap(Tag, Binding),
+
+/// Used in the initial roundtrip to determine whether more
+/// roundtrips are required to fetch the initial state.
+needs_roundtrip: bool = false,
+
+const Binding = struct {
+    // All globals can be casted into a wl.Proxy object.
+    proxy: *wl.Proxy,
+    name: u32,
+};
+
+pub const Tag = enum {
+    kde_blur_manager,
+    kde_decoration_manager,
+    kde_slide_manager,
+    kde_output_order,
+    xdg_activation,
+
+    fn Type(comptime self: Tag) type {
+        return switch (self) {
+            .kde_blur_manager => org.KdeKwinBlurManager,
+            .kde_decoration_manager => org.KdeKwinServerDecorationManager,
+            .kde_slide_manager => org.KdeKwinSlideManager,
+            .kde_output_order => kde.OutputOrderV1,
+            .xdg_activation => xdg.ActivationV1,
+        };
+    }
+};
+
+pub const State = struct {
+    /// Connector name of the primary output (e.g., "DP-1") as reported
+    /// by kde_output_order_v1. The first output in each priority list
+    /// is the primary.
+    primary_output_name: ?[:0]const u8 = null,
+
+    /// Tracks the output order event cycle. Set to true after a `done`
+    /// event so the next `output` event is captured as the new primary.
+    /// Initialized to true so the first event after binding is captured.
+    output_order_done: bool = true,
+
+    default_deco_mode: ?org.KdeKwinServerDecorationManager.Mode = null,
+
+    /// Reset cached state derived from kde_output_order_v1.
+    fn resetOutputOrder(self: *State, alloc: Allocator) void {
+        if (self.primary_output_name) |name| alloc.free(name);
+        self.primary_output_name = null;
+        self.output_order_done = true;
+    }
+};
+
+pub fn init(alloc: Allocator, display: *wl.Display) !*Globals {
+    // We need to allocate here since the listener
+    // expects a stable memory address.
+    const self = try alloc.create(Globals);
+    self.* = .{
+        .alloc = alloc,
+        .state = .{},
+        .map = .{},
+    };
+
+    const registry = try display.getRegistry();
+    registry.setListener(*Globals, registryListener, self);
+    if (display.roundtrip() != .SUCCESS) return error.RoundtripFailed;
+
+    // Do another roundtrip to process events emitted by globals we bound
+    // during registry discovery (e.g. default decoration mode, output
+    // order). Listeners are installed at bind time in registryListener.
+    if (self.needs_roundtrip) {
+        if (display.roundtrip() != .SUCCESS) return error.RoundtripFailed;
+    }
+    return self;
+}
+
+pub fn deinit(self: *Globals) void {
+    if (self.state.primary_output_name) |name| self.alloc.free(name);
+    self.alloc.destroy(self);
+}
+
+pub fn get(self: *const Globals, comptime tag: Tag) ?*tag.Type() {
+    const binding = self.map.get(tag) orelse return null;
+    return @ptrCast(binding.proxy);
+}
+
+fn onGlobalAttached(self: *Globals, comptime tag: Tag) void {
+    // Install listeners immediately at bind time. This
+    // keeps listener setup and object lifetime in one
+    // place and also supports globals that appear later.
+    switch (tag) {
+        .kde_decoration_manager => {
+            const v = self.get(tag) orelse return;
+            v.setListener(*Globals, decoManagerListener, self);
+            self.needs_roundtrip = true;
+        },
+        .kde_output_order => {
+            const v = self.get(tag) orelse return;
+            v.setListener(*Globals, outputOrderListener, self);
+            self.needs_roundtrip = true;
+        },
+        else => {},
+    }
+}
+
+fn onGlobalRemoved(self: *Globals, tag: Tag) void {
+    switch (tag) {
+        .kde_output_order => self.state.resetOutputOrder(self.alloc),
+        else => {},
+    }
+}
+
+fn registryListener(
+    registry: *wl.Registry,
+    event: wl.Registry.Event,
+    self: *Globals,
+) void {
+    switch (event) {
+        .global => |v| {
+            log.debug("found global {s}", .{v.interface});
+            inline for (comptime std.meta.tags(Tag)) |tag| {
+                const T = tag.Type();
+                if (std.mem.orderZ(u8, v.interface, T.interface.name) == .eq) {
+                    log.debug("matched {}", .{T});
+
+                    const new_proxy = registry.bind(
+                        v.name,
+                        T,
+                        T.generated_version,
+                    ) catch |err| {
+                        log.warn(
+                            "error binding interface {s} error={}",
+                            .{ v.interface, err },
+                        );
+                        return;
+                    };
+
+                    // If this global was already bound,
+                    // then we also need to destroy the old binding.
+                    if (self.map.get(tag)) |old| {
+                        self.onGlobalRemoved(tag);
+                        old.proxy.destroy();
+                    }
+
+                    self.map.put(tag, .{
+                        .proxy = @ptrCast(new_proxy),
+                        .name = v.name,
+                    });
+                    self.onGlobalAttached(tag);
+                }
+            }
+        },
+
+        // This should be a rare occurrence, but in case a global
+        // is suddenly no longer available, we destroy and unset it
+        // as the protocol mandates.
+        .global_remove => |v| {
+            var it = self.map.iterator();
+            while (it.next()) |kv| {
+                if (kv.value.name != v.name) continue;
+                self.onGlobalRemoved(kv.key);
+                kv.value.proxy.destroy();
+                self.map.remove(kv.key);
+            }
+        },
+    }
+}
+
+fn decoManagerListener(
+    _: *org.KdeKwinServerDecorationManager,
+    event: org.KdeKwinServerDecorationManager.Event,
+    self: *Globals,
+) void {
+    switch (event) {
+        .default_mode => |mode| {
+            self.state.default_deco_mode = @enumFromInt(mode.mode);
+        },
+    }
+}
+
+fn outputOrderListener(
+    _: *kde.OutputOrderV1,
+    event: kde.OutputOrderV1.Event,
+    self: *Globals,
+) void {
+    switch (event) {
+        .output => |v| {
+            // Only the first output event after a `done` is the new primary.
+            if (!self.state.output_order_done) return;
+            self.state.output_order_done = false;
+
+            const name = std.mem.sliceTo(v.output_name, 0);
+            if (self.state.primary_output_name) |old| self.alloc.free(old);
+
+            if (name.len == 0) {
+                self.state.primary_output_name = null;
+                log.warn("ignoring empty primary output name from kde_output_order_v1", .{});
+            } else {
+                self.state.primary_output_name = self.alloc.dupeZ(u8, name) catch |err| {
+                    self.state.primary_output_name = null;
+                    log.warn("failed to allocate primary output name: {}", .{err});
+                    return;
+                };
+                log.debug("primary output: {s}", .{name});
+            }
+        },
+        .done => {
+            if (self.state.output_order_done) {
+                // No output arrived since the previous done. Treat this as
+                // an empty update and drop any stale cached primary.
+                self.state.resetOutputOrder(self.alloc);
+                return;
+            }
+            self.state.output_order_done = true;
+        },
+    }
+}
diff --git a/src/apprt/gtk/winproto/x11.zig b/src/apprt/gtk/winproto/x11.zig
index 1e73c6139..7344de908 100644
--- a/src/apprt/gtk/winproto/x11.zig
+++ b/src/apprt/gtk/winproto/x11.zig
@@ -106,9 +106,8 @@ pub const App = struct {
         };
     }
 
-    pub fn deinit(self: *App, alloc: Allocator) void {
+    pub fn deinit(self: *App) void {
         _ = self;
-        _ = alloc;
     }
 
     /// Checks for an immediate pending XKB state update event, and returns the

From c1326c57f92758065bfc18ffc610be03909d7c5c Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2026 17:25:02 +0000
Subject: [PATCH 196/391] Update VOUCHED list (#11572)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/10478#discussioncomment-16163586)
from @mitchellh.

Denounce: @highimpact-dev

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index d63020079..aee0cfc75 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -84,6 +84,7 @@ gpanders
 guilhermetk
 hakonhagland
 halosatrio
+-highimpact-dev Disrespectful AI user
 hqnna
 hulet
 icodesign

From bed9d92f048835cfcae372361d3c741db8a3ed78 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 16 Mar 2026 14:23:15 -0700
Subject: [PATCH 197/391] vt: expose focus encoding in C and Zig APIs

Add focus event encoding (CSI I / CSI O) to the libghostty-vt public
API, following the same patterns as key and mouse encoding.

The focus Event enum uses lib.Enum for C ABI compatibility. The C API
provides ghostty_focus_encode() which writes into a caller-provided
buffer and returns GHOSTTY_OUT_OF_SPACE with the required size when
the buffer is too small.

Also update key and mouse encoders to return GHOSTTY_OUT_OF_SPACE
instead of GHOSTTY_OUT_OF_MEMORY for buffer-too-small errors,
reserving OUT_OF_MEMORY for actual allocation failures. Update all
corresponding header documentation.
---
 include/ghostty/vt.h               |  8 ++-
 include/ghostty/vt/focus.h         | 94 ++++++++++++++++++++++++++++++
 include/ghostty/vt/key/encoder.h   | 10 ++--
 include/ghostty/vt/mouse/encoder.h |  4 +-
 src/lib_vt.zig                     |  7 +++
 src/terminal/c/focus.zig           | 54 +++++++++++++++++
 src/terminal/c/key_encode.zig      |  4 +-
 src/terminal/c/main.zig            |  4 ++
 src/terminal/c/mouse_encode.zig    |  6 +-
 src/terminal/focus.zig             | 41 +++++++++++++
 src/terminal/main.zig              |  1 +
 src/termio/Termio.zig              |  9 ++-
 12 files changed, 226 insertions(+), 16 deletions(-)
 create mode 100644 include/ghostty/vt/focus.h
 create mode 100644 src/terminal/c/focus.zig
 create mode 100644 src/terminal/focus.zig

diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index 9d22b647b..cc02a2886 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -30,14 +30,17 @@
  * The API is organized into the following groups:
  * - @ref terminal "Terminal" - Complete terminal emulator state and rendering
  * - @ref formatter "Formatter" - Format terminal content as plain text, VT sequences, or HTML
- * - @ref key "Key Encoding" - Encode key events into terminal sequences
- * - @ref mouse "Mouse Encoding" - Encode mouse events into terminal sequences
  * - @ref osc "OSC Parser" - Parse OSC (Operating System Command) sequences
  * - @ref sgr "SGR Parser" - Parse SGR (Select Graphic Rendition) sequences
  * - @ref paste "Paste Utilities" - Validate paste data safety
  * - @ref allocator "Memory Management" - Memory management and custom allocators
  * - @ref wasm "WebAssembly Utilities" - WebAssembly convenience functions
  *
+ * Encoding related APIs:
+ * - @ref focus "Focus Encoding" - Encode focus in/out events into terminal sequences
+ * - @ref key "Key Encoding" - Encode key events into terminal sequences
+ * - @ref mouse "Mouse Encoding" - Encode mouse events into terminal sequences
+ *
  * @section examples_sec Examples
  *
  * Complete working examples:
@@ -90,6 +93,7 @@ extern "C" {
 
 #include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
+#include <ghostty/vt/focus.h>
 #include <ghostty/vt/formatter.h>
 #include <ghostty/vt/terminal.h>
 #include <ghostty/vt/osc.h>
diff --git a/include/ghostty/vt/focus.h b/include/ghostty/vt/focus.h
new file mode 100644
index 000000000..ea3618bc8
--- /dev/null
+++ b/include/ghostty/vt/focus.h
@@ -0,0 +1,94 @@
+/**
+ * @file focus.h
+ *
+ * Focus encoding - encode focus in/out events into terminal escape sequences.
+ */
+
+#ifndef GHOSTTY_VT_FOCUS_H
+#define GHOSTTY_VT_FOCUS_H
+
+/** @defgroup focus Focus Encoding
+ *
+ * Utilities for encoding focus gained/lost events into terminal escape
+ * sequences (CSI I / CSI O) for focus reporting mode (mode 1004).
+ *
+ * ## Basic Usage
+ *
+ * Use ghostty_focus_encode() to encode a focus event into a caller-provided
+ * buffer. If the buffer is too small, the function returns
+ * GHOSTTY_OUT_OF_SPACE and sets the required size in the output parameter.
+ *
+ * ## Example
+ *
+ * @code{.c}
+ * #include <stdio.h>
+ * #include <ghostty/vt.h>
+ *
+ * int main() {
+ *   char buf[8];
+ *   size_t written = 0;
+ *
+ *   GhosttyResult result = ghostty_focus_encode(
+ *       GHOSTTY_FOCUS_GAINED, buf, sizeof(buf), &written);
+ *
+ *   if (result == GHOSTTY_SUCCESS) {
+ *     printf("Encoded %zu bytes: ", written);
+ *     fwrite(buf, 1, written, stdout);
+ *     printf("\n");
+ *   }
+ *
+ *   return 0;
+ * }
+ * @endcode
+ *
+ * @{
+ */
+
+#include <stddef.h>
+#include <ghostty/vt/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Focus event types for focus reporting mode (mode 1004).
+ */
+typedef enum {
+    /** Terminal window gained focus */
+    GHOSTTY_FOCUS_GAINED = 0,
+    /** Terminal window lost focus */
+    GHOSTTY_FOCUS_LOST = 1,
+} GhosttyFocusEvent;
+
+/**
+ * Encode a focus event into a terminal escape sequence.
+ *
+ * Encodes a focus gained (CSI I) or focus lost (CSI O) report into the
+ * provided buffer.
+ *
+ * If the buffer is too small, the function returns GHOSTTY_OUT_OF_SPACE
+ * and writes the required buffer size to @p out_written. The caller can
+ * then retry with a sufficiently sized buffer.
+ *
+ * @param event The focus event to encode
+ * @param buf Output buffer to write the encoded sequence into (may be NULL)
+ * @param buf_len Size of the output buffer in bytes
+ * @param[out] out_written On success, the number of bytes written. On
+ *             GHOSTTY_OUT_OF_SPACE, the required buffer size.
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_OUT_OF_SPACE if the buffer
+ *         is too small
+ */
+GhosttyResult ghostty_focus_encode(
+    GhosttyFocusEvent event,
+    char* buf,
+    size_t buf_len,
+    size_t* out_written);
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @} */
+
+#endif /* GHOSTTY_VT_FOCUS_H */
diff --git a/include/ghostty/vt/key/encoder.h b/include/ghostty/vt/key/encoder.h
index 3053d73ef..9bfeba98d 100644
--- a/include/ghostty/vt/key/encoder.h
+++ b/include/ghostty/vt/key/encoder.h
@@ -185,7 +185,7 @@ void ghostty_key_encoder_setopt_from_terminal(GhosttyKeyEncoder encoder, Ghostty
  * typically don't generate escape sequences. Check the out_len parameter to
  * determine if any data was written.
  *
- * If the output buffer is too small, this function returns GHOSTTY_OUT_OF_MEMORY
+ * If the output buffer is too small, this function returns GHOSTTY_OUT_OF_SPACE
  * and out_len will contain the required buffer size. The caller can then
  * allocate a larger buffer and call the function again.
  *
@@ -194,15 +194,15 @@ void ghostty_key_encoder_setopt_from_terminal(GhosttyKeyEncoder encoder, Ghostty
  * @param out_buf Buffer to write the encoded sequence to
  * @param out_buf_size Size of the output buffer in bytes
  * @param out_len Pointer to store the number of bytes written (may be NULL)
- * @return GHOSTTY_SUCCESS on success, GHOSTTY_OUT_OF_MEMORY if buffer too small, or other error code
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_OUT_OF_SPACE if buffer too small, or other error code
  *
  * ## Example: Calculate required buffer size
  *
  * @code{.c}
- * // Query the required size with a NULL buffer (always returns OUT_OF_MEMORY)
+ * // Query the required size with a NULL buffer (always returns OUT_OF_SPACE)
  * size_t required = 0;
  * GhosttyResult result = ghostty_key_encoder_encode(encoder, event, NULL, 0, &required);
- * assert(result == GHOSTTY_OUT_OF_MEMORY);
+ * assert(result == GHOSTTY_OUT_OF_SPACE);
  * 
  * // Allocate buffer of required size
  * char *buf = malloc(required);
@@ -228,7 +228,7 @@ void ghostty_key_encoder_setopt_from_terminal(GhosttyKeyEncoder encoder, Ghostty
  * if (result == GHOSTTY_SUCCESS) {
  *   // Write the encoded sequence to the terminal
  *   write(pty_fd, buf, written);
- * } else if (result == GHOSTTY_OUT_OF_MEMORY) {
+ * } else if (result == GHOSTTY_OUT_OF_SPACE) {
  *   // Buffer too small, written contains required size
  *   char *dynamic_buf = malloc(written);
  *   result = ghostty_key_encoder_encode(encoder, event, dynamic_buf, written, &written);
diff --git a/include/ghostty/vt/mouse/encoder.h b/include/ghostty/vt/mouse/encoder.h
index c418ed8ec..63fb3e075 100644
--- a/include/ghostty/vt/mouse/encoder.h
+++ b/include/ghostty/vt/mouse/encoder.h
@@ -189,7 +189,7 @@ void ghostty_mouse_encoder_reset(GhosttyMouseEncoder encoder);
  * Not all mouse events produce output. In such cases this returns
  * GHOSTTY_SUCCESS with out_len set to 0.
  *
- * If the output buffer is too small, this returns GHOSTTY_OUT_OF_MEMORY
+ * If the output buffer is too small, this returns GHOSTTY_OUT_OF_SPACE
  * and out_len contains the required size.
  *
  * @param encoder The encoder handle, must not be NULL
@@ -197,7 +197,7 @@ void ghostty_mouse_encoder_reset(GhosttyMouseEncoder encoder);
  * @param out_buf Buffer to write encoded bytes to, or NULL to query required size
  * @param out_buf_size Size of out_buf in bytes
  * @param out_len Pointer to store bytes written (or required bytes on failure)
- * @return GHOSTTY_SUCCESS on success, GHOSTTY_OUT_OF_MEMORY if buffer is too small,
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_OUT_OF_SPACE if buffer is too small,
  *         or another error code
  *
  * @ingroup mouse
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 44ffe7a3e..9d8e94bba 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -81,11 +81,17 @@ pub const input = struct {
     // We have to be careful to only import targeted files within
     // the input package because the full package brings in too many
     // other dependencies.
+    const focus = terminal.focus;
     const paste = @import("input/paste.zig");
     const key = @import("input/key.zig");
     const key_encode = @import("input/key_encode.zig");
     const mouse_encode = @import("input/mouse_encode.zig");
 
+    // Focus-related APIs
+    pub const max_focus_encode_size = focus.max_encode_size;
+    pub const FocusEvent = focus.Event;
+    pub const encodeFocus = focus.encode;
+
     // Paste-related APIs
     pub const PasteError = paste.Error;
     pub const PasteOptions = paste.Options;
@@ -158,6 +164,7 @@ comptime {
         @export(&c.osc_end, .{ .name = "ghostty_osc_end" });
         @export(&c.osc_command_type, .{ .name = "ghostty_osc_command_type" });
         @export(&c.osc_command_data, .{ .name = "ghostty_osc_command_data" });
+        @export(&c.focus_encode, .{ .name = "ghostty_focus_encode" });
         @export(&c.paste_is_safe, .{ .name = "ghostty_paste_is_safe" });
         @export(&c.color_rgb_get, .{ .name = "ghostty_color_rgb_get" });
         @export(&c.sgr_new, .{ .name = "ghostty_sgr_new" });
diff --git a/src/terminal/c/focus.zig b/src/terminal/c/focus.zig
new file mode 100644
index 000000000..05930c8f3
--- /dev/null
+++ b/src/terminal/c/focus.zig
@@ -0,0 +1,54 @@
+const std = @import("std");
+const terminal_focus = @import("../focus.zig");
+const Result = @import("result.zig").Result;
+
+pub fn encode(
+    event: terminal_focus.Event,
+    out_: ?[*]u8,
+    out_len: usize,
+    out_written: *usize,
+) callconv(.c) Result {
+    var writer: std.Io.Writer = .fixed(if (out_) |out| out[0..out_len] else &.{});
+    terminal_focus.encode(&writer, event) catch |err| switch (err) {
+        error.WriteFailed => {
+            var discarding: std.Io.Writer.Discarding = .init(&.{});
+            terminal_focus.encode(&discarding.writer, event) catch unreachable;
+            out_written.* = @intCast(discarding.count);
+            return .out_of_space;
+        },
+    };
+
+    out_written.* = writer.end;
+    return .success;
+}
+
+test "encode focus gained" {
+    var buf: [terminal_focus.max_encode_size]u8 = undefined;
+    var written: usize = 0;
+    const result = encode(.gained, &buf, buf.len, &written);
+    try std.testing.expectEqual(.success, result);
+    try std.testing.expectEqualStrings("\x1B[I", buf[0..written]);
+}
+
+test "encode focus lost" {
+    var buf: [terminal_focus.max_encode_size]u8 = undefined;
+    var written: usize = 0;
+    const result = encode(.lost, &buf, buf.len, &written);
+    try std.testing.expectEqual(.success, result);
+    try std.testing.expectEqualStrings("\x1B[O", buf[0..written]);
+}
+
+test "encode with insufficient buffer" {
+    var buf: [1]u8 = undefined;
+    var written: usize = 0;
+    const result = encode(.gained, &buf, buf.len, &written);
+    try std.testing.expectEqual(.out_of_space, result);
+    try std.testing.expectEqual(terminal_focus.max_encode_size, written);
+}
+
+test "encode with null buffer" {
+    var written: usize = 0;
+    const result = encode(.gained, null, 0, &written);
+    try std.testing.expectEqual(.out_of_space, result);
+    try std.testing.expectEqual(terminal_focus.max_encode_size, written);
+}
diff --git a/src/terminal/c/key_encode.zig b/src/terminal/c/key_encode.zig
index e83c9b221..58405876f 100644
--- a/src/terminal/c/key_encode.zig
+++ b/src/terminal/c/key_encode.zig
@@ -152,7 +152,7 @@ pub fn encode(
             // Discarding always uses a u64. If we're on 32-bit systems
             // we cast down. We should make this safer in the future.
             out_written.* = @intCast(discarding.count);
-            return .out_of_memory;
+            return .out_of_space;
         },
     };
 
@@ -329,7 +329,7 @@ test "encode: kitty ctrl release with ctrl mod set" {
 
     // Encode null should give us the length required
     var required: usize = 0;
-    try testing.expectEqual(Result.out_of_memory, encode(
+    try testing.expectEqual(Result.out_of_space, encode(
         encoder,
         event,
         null,
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 5adc00251..133acbd1f 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -1,4 +1,5 @@
 pub const color = @import("color.zig");
+pub const focus = @import("focus.zig");
 pub const formatter = @import("formatter.zig");
 pub const osc = @import("osc.zig");
 pub const key_event = @import("key_event.zig");
@@ -20,6 +21,8 @@ pub const osc_command_data = osc.commandData;
 
 pub const color_rgb_get = color.rgb_get;
 
+pub const focus_encode = focus.encode;
+
 pub const formatter_terminal_new = formatter.terminal_new;
 pub const formatter_format_buf = formatter.format_buf;
 pub const formatter_format_alloc = formatter.format_alloc;
@@ -90,6 +93,7 @@ pub const terminal_scroll_viewport = terminal.scroll_viewport;
 
 test {
     _ = color;
+    _ = focus;
     _ = formatter;
     _ = osc;
     _ = key_event;
diff --git a/src/terminal/c/mouse_encode.zig b/src/terminal/c/mouse_encode.zig
index 1a19b0511..963e296bd 100644
--- a/src/terminal/c/mouse_encode.zig
+++ b/src/terminal/c/mouse_encode.zig
@@ -240,7 +240,7 @@ pub fn encode(
             // Discarding always uses a u64. If we're on 32-bit systems
             // we cast down. We should make this safer in the future.
             out_written.* = @intCast(discarding.count);
-            return .out_of_memory;
+            return .out_of_space;
         },
     };
 
@@ -386,7 +386,7 @@ test "encode: sgr press left" {
     mouse_event.set_position(event, .{ .x = 0, .y = 0 });
 
     var required: usize = 0;
-    try testing.expectEqual(Result.out_of_memory, encode(
+    try testing.expectEqual(Result.out_of_space, encode(
         encoder,
         event,
         null,
@@ -507,7 +507,7 @@ test "encode: querying required size doesn't update dedupe state" {
     mouse_event.set_position(event, .{ .x = 5, .y = 6 });
 
     var required: usize = 0;
-    try testing.expectEqual(Result.out_of_memory, encode(
+    try testing.expectEqual(Result.out_of_space, encode(
         encoder,
         event,
         null,
diff --git a/src/terminal/focus.zig b/src/terminal/focus.zig
new file mode 100644
index 000000000..563c0871a
--- /dev/null
+++ b/src/terminal/focus.zig
@@ -0,0 +1,41 @@
+const std = @import("std");
+const build_options = @import("terminal_options");
+const lib = @import("../lib/main.zig");
+const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
+
+/// Maximum number of bytes that `encode` will write. Any users of this
+/// should be resilient to this changing, so this is always a specific
+/// value (e.g. we don't add unnecessary padding).
+pub const max_encode_size = 3;
+
+/// A focus event that can be reported to the application running in the
+/// terminal when focus reporting mode (mode 1004) is enabled.
+pub const Event = lib.Enum(lib_target, &.{
+    "gained",
+    "lost",
+});
+
+/// Encode a focus in/out report (CSI I / CSI O).
+pub fn encode(
+    writer: *std.Io.Writer,
+    event: Event,
+) std.Io.Writer.Error!void {
+    try writer.writeAll(switch (event) {
+        .gained => "\x1B[I",
+        .lost => "\x1B[O",
+    });
+}
+
+test "encode focus gained" {
+    var buf: [max_encode_size]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    try encode(&writer, .gained);
+    try std.testing.expectEqualStrings("\x1B[I", writer.buffered());
+}
+
+test "encode focus lost" {
+    var buf: [max_encode_size]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    try encode(&writer, .lost);
+    try std.testing.expectEqualStrings("\x1B[O", writer.buffered());
+}
diff --git a/src/terminal/main.zig b/src/terminal/main.zig
index a87d5ec87..bbdea1542 100644
--- a/src/terminal/main.zig
+++ b/src/terminal/main.zig
@@ -11,6 +11,7 @@ pub const osc = @import("osc.zig");
 pub const point = @import("point.zig");
 pub const color = @import("color.zig");
 pub const device_status = @import("device_status.zig");
+pub const focus = @import("focus.zig");
 pub const formatter = @import("formatter.zig");
 pub const highlight = @import("highlight.zig");
 pub const kitty = @import("kitty.zig");
diff --git a/src/termio/Termio.zig b/src/termio/Termio.zig
index 4523e9c53..73e1c46d5 100644
--- a/src/termio/Termio.zig
+++ b/src/termio/Termio.zig
@@ -664,8 +664,13 @@ pub fn focusGained(self: *Termio, td: *ThreadData, focused: bool) !void {
 
     // If we have focus events enabled, we send the focus event.
     if (focus_event) {
-        const seq = if (focused) "\x1b[I" else "\x1b[O";
-        try self.queueWrite(td, seq, false);
+        var buf: [terminalpkg.focus.max_encode_size]u8 = undefined;
+        var writer: std.Io.Writer = .fixed(&buf);
+        terminalpkg.focus.encode(&writer, if (focused) .gained else .lost) catch |err| {
+            log.err("error encoding focus event err={}", .{err});
+            return;
+        };
+        try self.queueWrite(td, writer.buffered(), false);
     }
 
     // We always notify our backend of focus changes.

From d6b37ba38f9b238b5bf30aebbeae261dd45290cd Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 16 Mar 2026 14:47:50 -0700
Subject: [PATCH 198/391] terminal: extract DECRPM mode report encoding to
 terminal package

This extracts our mode reporting from being hardcoded in termio
to being reusable in the existing `terminal.modes` namespace. The goal
is to expose this via the Zig API libghostty (done) and C API (to do
later).
---
 src/terminal/modes.zig        | 117 ++++++++++++++++++++++++++++++++++
 src/termio/stream_handler.zig |  41 +++++-------
 2 files changed, 132 insertions(+), 26 deletions(-)

diff --git a/src/terminal/modes.zig b/src/terminal/modes.zig
index 13b7c1eac..8d6bd63d9 100644
--- a/src/terminal/modes.zig
+++ b/src/terminal/modes.zig
@@ -76,6 +76,19 @@ pub const ModeState = struct {
         }
     }
 
+    /// Return a DECRPM report for the given mode tag. If the tag does
+    /// not correspond to a known mode, the report state is .not_recognized.
+    pub fn getReport(self: *const ModeState, tag: ModeTag) Report {
+        const mode = modeFromInt(tag.value, tag.ansi) orelse return .{
+            .tag = tag,
+            .state = .not_recognized,
+        };
+        return .{
+            .tag = tag,
+            .state = if (self.get(mode)) .set else .reset,
+        };
+    }
+
     test {
         // We have this here so that we explicitly fail when we change the
         // size of modes. The size of modes is NOT particularly important,
@@ -136,6 +149,10 @@ pub const ModeTag = packed struct(u16) {
     value: u15,
     ansi: bool = false,
 
+    pub fn fromMode(mode: Mode) ModeTag {
+        return @bitCast(@intFromEnum(mode));
+    }
+
     test "order" {
         const t: ModeTag = .{ .value = 1 };
         const int: Backing = @bitCast(t);
@@ -157,6 +174,48 @@ pub fn modeFromInt(v: u16, ansi: bool) ?Mode {
     return null;
 }
 
+/// A DECRPM mode report response.
+pub const Report = struct {
+    tag: ModeTag,
+    state: State,
+
+    pub const max_size = max_size: {
+        // Construct the largest possible report in terms of values.
+        const report: Report = .{
+            .tag = .{
+                .value = std.math.maxInt(u15),
+                .ansi = false,
+            },
+            .state = .permanently_reset,
+        };
+
+        var discarding: std.Io.Writer.Discarding = .init(&.{});
+        report.encode(&discarding.writer) catch unreachable;
+        break :max_size discarding.count;
+    };
+
+    /// The state of a mode as reported in a DECRPM response.
+    pub const State = enum(u8) {
+        not_recognized = 0,
+        set = 1,
+        reset = 2,
+        permanently_set = 3,
+        permanently_reset = 4,
+    };
+
+    /// Encode the DECRPM report sequence.
+    pub fn encode(
+        self: Report,
+        writer: *std.Io.Writer,
+    ) std.Io.Writer.Error!void {
+        try writer.print("\x1B[{s}{};{}$y", .{
+            if (self.tag.ansi) "" else "?",
+            self.tag.value,
+            @intFromEnum(self.state),
+        });
+    }
+};
+
 fn entryForMode(comptime mode: Mode) ModeEntry {
     @setEvalBranchQuota(10_000);
     const name = @tagName(mode);
@@ -259,3 +318,61 @@ test ModeState {
     try testing.expect(state.restore(.cursor_keys));
     try testing.expect(state.get(.cursor_keys));
 }
+
+test "getReport known DEC mode" {
+    var state: ModeState = .{};
+    const report = state.getReport(.{ .value = 1 });
+    try testing.expectEqual(Report.State.reset, report.state);
+    try testing.expectEqual(false, report.tag.ansi);
+    try testing.expectEqual(@as(u15, 1), report.tag.value);
+
+    state.set(.cursor_keys, true);
+    const report2 = state.getReport(.{ .value = 1 });
+    try testing.expectEqual(Report.State.set, report2.state);
+}
+
+test "getReport known ANSI mode" {
+    var state: ModeState = .{};
+    state.set(.insert, true);
+    const report = state.getReport(.{ .value = 4, .ansi = true });
+    try testing.expectEqual(Report.State.set, report.state);
+    try testing.expectEqual(true, report.tag.ansi);
+}
+
+test "getReport unknown mode" {
+    const state: ModeState = .{};
+    const report = state.getReport(.{ .value = 9999 });
+    try testing.expectEqual(Report.State.not_recognized, report.state);
+}
+
+test "Report.encode DEC mode set" {
+    var buf: [Report.max_size]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    const report: Report = .{ .tag = .{ .value = 1, .ansi = false }, .state = .set };
+    try report.encode(&writer);
+    try testing.expectEqualStrings("\x1B[?1;1$y", writer.buffered());
+}
+
+test "Report.encode DEC mode reset" {
+    var buf: [Report.max_size]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    const report: Report = .{ .tag = .{ .value = 1, .ansi = false }, .state = .reset };
+    try report.encode(&writer);
+    try testing.expectEqualStrings("\x1B[?1;2$y", writer.buffered());
+}
+
+test "Report.encode ANSI mode" {
+    var buf: [Report.max_size]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    const report: Report = .{ .tag = .{ .value = 4, .ansi = true }, .state = .set };
+    try report.encode(&writer);
+    try testing.expectEqualStrings("\x1B[4;1$y", writer.buffered());
+}
+
+test "Report.encode not recognized" {
+    var buf: [Report.max_size]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    const report: Report = .{ .tag = .{ .value = 9999, .ansi = false }, .state = .not_recognized };
+    try report.encode(&writer);
+    try testing.expectEqualStrings("\x1B[?9999;0$y", writer.buffered());
+}
diff --git a/src/termio/stream_handler.zig b/src/termio/stream_handler.zig
index e41daa8be..5041d916a 100644
--- a/src/termio/stream_handler.zig
+++ b/src/termio/stream_handler.zig
@@ -610,35 +610,24 @@ pub const StreamHandler = struct {
     }
 
     fn requestMode(self: *StreamHandler, mode: terminal.Mode) !void {
-        const tag: terminal.modes.ModeTag = @bitCast(@intFromEnum(mode));
-        const code: u8 = if (self.terminal.modes.get(mode)) 1 else 2;
-
-        var msg: termio.Message = .{ .write_small = .{} };
-        const resp = try std.fmt.bufPrint(
-            &msg.write_small.data,
-            "\x1B[{s}{};{}$y",
-            .{
-                if (tag.ansi) "" else "?",
-                tag.value,
-                code,
-            },
-        );
-        msg.write_small.len = @intCast(resp.len);
-        self.messageWriter(msg);
+        self.sendModeReport(self.terminal.modes.getReport(.fromMode(mode)));
     }
 
     fn requestModeUnknown(self: *StreamHandler, mode_raw: u16, ansi: bool) !void {
-        var msg: termio.Message = .{ .write_small = .{} };
-        const resp = try std.fmt.bufPrint(
-            &msg.write_small.data,
-            "\x1B[{s}{};0$y",
-            .{
-                if (ansi) "" else "?",
-                mode_raw,
-            },
-        );
-        msg.write_small.len = @intCast(resp.len);
-        self.messageWriter(msg);
+        self.sendModeReport(self.terminal.modes.getReport(.{ .value = @truncate(mode_raw), .ansi = ansi }));
+    }
+
+    fn sendModeReport(self: *StreamHandler, report: terminal.modes.Report) void {
+        var data: termio.Message.WriteReq.Small.Array = undefined;
+        var writer: std.Io.Writer = .fixed(&data);
+        report.encode(&writer) catch |err| {
+            log.err("error encoding mode report err={}", .{err});
+            return;
+        };
+        self.messageWriter(.{ .write_small = .{
+            .data = data,
+            .len = @intCast(writer.buffered().len),
+        } });
     }
 
     pub fn setMode(self: *StreamHandler, mode: terminal.Mode, enabled: bool) !void {

From 25679f3ae736d94a93d4778fbe3aa095633cd5cb Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 16 Mar 2026 15:47:57 -0700
Subject: [PATCH 199/391] vt: add C API header for terminal mode tags

Add modes.h with GhosttyModeTag, a uint16_t typedef matching the
Zig ModeTag packed struct layout (bits 0-14 for the mode value,
bit 15 for the ANSI flag). Three inline helper functions provide
construction and inspection: ghostty_mode_tag_new,
ghostty_mode_tag_value, and ghostty_mode_tag_ansi.
---
 include/ghostty/vt.h       |   1 +
 include/ghostty/vt/modes.h | 108 +++++++++++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 include/ghostty/vt/modes.h

diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index cc02a2886..34a7f2d4b 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -99,6 +99,7 @@ extern "C" {
 #include <ghostty/vt/osc.h>
 #include <ghostty/vt/sgr.h>
 #include <ghostty/vt/key.h>
+#include <ghostty/vt/modes.h>
 #include <ghostty/vt/mouse.h>
 #include <ghostty/vt/paste.h>
 #include <ghostty/vt/wasm.h>
diff --git a/include/ghostty/vt/modes.h b/include/ghostty/vt/modes.h
new file mode 100644
index 000000000..a269f5864
--- /dev/null
+++ b/include/ghostty/vt/modes.h
@@ -0,0 +1,108 @@
+/**
+ * @file modes.h
+ *
+ * Terminal mode tag utilities - pack and unpack ANSI/DEC mode identifiers.
+ */
+
+#ifndef GHOSTTY_VT_MODES_H
+#define GHOSTTY_VT_MODES_H
+
+/** @defgroup modes Mode Utilities
+ *
+ * Utilities for working with terminal mode tags. A mode tag is a compact
+ * 16-bit representation of a terminal mode identifier that encodes both
+ * the numeric mode value (up to 15 bits) and whether the mode is an ANSI
+ * mode or a DEC private mode (?-prefixed).
+ *
+ * The packed layout (least-significant bit first) is:
+ * - Bits 0–14: mode value (u15)
+ * - Bit 15: ANSI flag (0 = DEC private mode, 1 = ANSI mode)
+ *
+ * ## Example
+ *
+ * @code{.c}
+ * #include <stdio.h>
+ * #include <ghostty/vt.h>
+ *
+ * int main() {
+ *   // Create a tag for DEC mode 25 (cursor visible)
+ *   GhosttyModeTag tag = ghostty_mode_tag_new(25, false);
+ *   printf("value=%u ansi=%d packed=0x%04x\n",
+ *       ghostty_mode_tag_value(tag),
+ *       ghostty_mode_tag_ansi(tag),
+ *       tag);
+ *
+ *   // Create a tag for ANSI mode 4 (insert mode)
+ *   GhosttyModeTag ansi_tag = ghostty_mode_tag_new(4, true);
+ *   printf("value=%u ansi=%d packed=0x%04x\n",
+ *       ghostty_mode_tag_value(ansi_tag),
+ *       ghostty_mode_tag_ansi(ansi_tag),
+ *       ansi_tag);
+ *
+ *   return 0;
+ * }
+ * @endcode
+ *
+ * @{
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * A packed 16-bit terminal mode tag.
+ *
+ * Encodes a mode value (bits 0–14) and an ANSI flag (bit 15) into a
+ * single 16-bit integer. Use the inline helper functions to construct
+ * and inspect mode tags rather than manipulating bits directly.
+ */
+typedef uint16_t GhosttyModeTag;
+
+/**
+ * Create a mode tag from a mode value and ANSI flag.
+ *
+ * @param value The numeric mode value (0–32767)
+ * @param ansi true for an ANSI mode, false for a DEC private mode
+ * @return The packed mode tag
+ *
+ * @ingroup modes
+ */
+static inline GhosttyModeTag ghostty_mode_tag_new(uint16_t value, bool ansi) {
+    return (GhosttyModeTag)((value & 0x7FFF) | ((uint16_t)ansi << 15));
+}
+
+/**
+ * Extract the numeric mode value from a mode tag.
+ *
+ * @param tag The mode tag
+ * @return The mode value (0–32767)
+ *
+ * @ingroup modes
+ */
+static inline uint16_t ghostty_mode_tag_value(GhosttyModeTag tag) {
+    return tag & 0x7FFF;
+}
+
+/**
+ * Check whether a mode tag represents an ANSI mode.
+ *
+ * @param tag The mode tag
+ * @return true if this is an ANSI mode, false if it is a DEC private mode
+ *
+ * @ingroup modes
+ */
+static inline bool ghostty_mode_tag_ansi(GhosttyModeTag tag) {
+    return (tag >> 15) != 0;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @} */
+
+#endif /* GHOSTTY_VT_MODES_H */

From 1c03770e2be4700ee60db01750a323005ef5dc8b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 16 Mar 2026 15:57:39 -0700
Subject: [PATCH 200/391] vt: expose terminal modes to C API

Add modes.h with GhosttyModeTag (uint16_t) matching the Zig ModeTag
packed struct layout, along with inline helpers for constructing and
inspecting mode tags. Provide GHOSTTY_MODE_* macros for all 39
built-in modes (4 ANSI, 35 DEC), parenthesized for safety.

Add ghostty_terminal_mode_get and ghostty_terminal_mode_set to
terminal.h, both returning GhosttyResult so that null terminals
and unknown mode tags return GHOSTTY_INVALID_VALUE. The get function
writes its result through a bool out-parameter.

Add a note in the Zig mode entries reminding developers to update
modes.h when adding new modes.
---
 include/ghostty/vt/modes.h    |  52 +++++++++++++++++
 include/ghostty/vt/terminal.h |  39 ++++++++++++-
 src/lib_vt.zig                |   2 +
 src/terminal/c/main.zig       |   2 +
 src/terminal/c/terminal.zig   | 106 ++++++++++++++++++++++++++++++++++
 src/terminal/modes.zig        |   3 +
 6 files changed, 203 insertions(+), 1 deletion(-)

diff --git a/include/ghostty/vt/modes.h b/include/ghostty/vt/modes.h
index a269f5864..b1fcbf097 100644
--- a/include/ghostty/vt/modes.h
+++ b/include/ghostty/vt/modes.h
@@ -53,6 +53,58 @@
 extern "C" {
 #endif
 
+/** @name ANSI Mode Tags
+ * Mode tags for standard ANSI modes.
+ * @{
+ */
+#define GHOSTTY_MODE_KAM              (ghostty_mode_tag_new(2, true))    /**< Keyboard action (disable keyboard) */
+#define GHOSTTY_MODE_INSERT           (ghostty_mode_tag_new(4, true))    /**< Insert mode */
+#define GHOSTTY_MODE_SRM              (ghostty_mode_tag_new(12, true))   /**< Send/receive mode */
+#define GHOSTTY_MODE_LINEFEED         (ghostty_mode_tag_new(20, true))   /**< Linefeed/new line mode */
+/** @} */
+
+/** @name DEC Private Mode Tags
+ * Mode tags for DEC private modes (?-prefixed).
+ * @{
+ */
+#define GHOSTTY_MODE_DECCKM           (ghostty_mode_tag_new(1, false))   /**< Cursor keys */
+#define GHOSTTY_MODE_132_COLUMN       (ghostty_mode_tag_new(3, false))   /**< 132/80 column mode */
+#define GHOSTTY_MODE_SLOW_SCROLL      (ghostty_mode_tag_new(4, false))   /**< Slow scroll */
+#define GHOSTTY_MODE_REVERSE_COLORS   (ghostty_mode_tag_new(5, false))   /**< Reverse video */
+#define GHOSTTY_MODE_ORIGIN           (ghostty_mode_tag_new(6, false))   /**< Origin mode */
+#define GHOSTTY_MODE_WRAPAROUND       (ghostty_mode_tag_new(7, false))   /**< Auto-wrap mode */
+#define GHOSTTY_MODE_AUTOREPEAT       (ghostty_mode_tag_new(8, false))   /**< Auto-repeat keys */
+#define GHOSTTY_MODE_X10_MOUSE        (ghostty_mode_tag_new(9, false))   /**< X10 mouse reporting */
+#define GHOSTTY_MODE_CURSOR_BLINKING  (ghostty_mode_tag_new(12, false))  /**< Cursor blink */
+#define GHOSTTY_MODE_CURSOR_VISIBLE   (ghostty_mode_tag_new(25, false))  /**< Cursor visible (DECTCEM) */
+#define GHOSTTY_MODE_ENABLE_MODE_3    (ghostty_mode_tag_new(40, false))  /**< Allow 132 column mode */
+#define GHOSTTY_MODE_REVERSE_WRAP     (ghostty_mode_tag_new(45, false))  /**< Reverse wrap */
+#define GHOSTTY_MODE_ALT_SCREEN_LEGACY (ghostty_mode_tag_new(47, false)) /**< Alternate screen (legacy) */
+#define GHOSTTY_MODE_KEYPAD_KEYS      (ghostty_mode_tag_new(66, false))  /**< Application keypad */
+#define GHOSTTY_MODE_LEFT_RIGHT_MARGIN (ghostty_mode_tag_new(69, false)) /**< Left/right margin mode */
+#define GHOSTTY_MODE_NORMAL_MOUSE     (ghostty_mode_tag_new(1000, false)) /**< Normal mouse tracking */
+#define GHOSTTY_MODE_BUTTON_MOUSE     (ghostty_mode_tag_new(1002, false)) /**< Button-event mouse tracking */
+#define GHOSTTY_MODE_ANY_MOUSE        (ghostty_mode_tag_new(1003, false)) /**< Any-event mouse tracking */
+#define GHOSTTY_MODE_FOCUS_EVENT      (ghostty_mode_tag_new(1004, false)) /**< Focus in/out events */
+#define GHOSTTY_MODE_UTF8_MOUSE       (ghostty_mode_tag_new(1005, false)) /**< UTF-8 mouse format */
+#define GHOSTTY_MODE_SGR_MOUSE        (ghostty_mode_tag_new(1006, false)) /**< SGR mouse format */
+#define GHOSTTY_MODE_ALT_SCROLL       (ghostty_mode_tag_new(1007, false)) /**< Alternate scroll mode */
+#define GHOSTTY_MODE_URXVT_MOUSE      (ghostty_mode_tag_new(1015, false)) /**< URxvt mouse format */
+#define GHOSTTY_MODE_SGR_PIXELS_MOUSE (ghostty_mode_tag_new(1016, false)) /**< SGR-Pixels mouse format */
+#define GHOSTTY_MODE_NUMLOCK_KEYPAD   (ghostty_mode_tag_new(1035, false)) /**< Ignore keypad with NumLock */
+#define GHOSTTY_MODE_ALT_ESC_PREFIX   (ghostty_mode_tag_new(1036, false)) /**< Alt key sends ESC prefix */
+#define GHOSTTY_MODE_ALT_SENDS_ESC    (ghostty_mode_tag_new(1039, false)) /**< Alt sends escape */
+#define GHOSTTY_MODE_REVERSE_WRAP_EXT (ghostty_mode_tag_new(1045, false)) /**< Extended reverse wrap */
+#define GHOSTTY_MODE_ALT_SCREEN       (ghostty_mode_tag_new(1047, false)) /**< Alternate screen */
+#define GHOSTTY_MODE_SAVE_CURSOR      (ghostty_mode_tag_new(1048, false)) /**< Save cursor (DECSC) */
+#define GHOSTTY_MODE_ALT_SCREEN_SAVE  (ghostty_mode_tag_new(1049, false)) /**< Alt screen + save cursor + clear */
+#define GHOSTTY_MODE_BRACKETED_PASTE  (ghostty_mode_tag_new(2004, false)) /**< Bracketed paste mode */
+#define GHOSTTY_MODE_SYNC_OUTPUT      (ghostty_mode_tag_new(2026, false)) /**< Synchronized output */
+#define GHOSTTY_MODE_GRAPHEME_CLUSTER (ghostty_mode_tag_new(2027, false)) /**< Grapheme cluster mode */
+#define GHOSTTY_MODE_COLOR_SCHEME_REPORT (ghostty_mode_tag_new(2031, false)) /**< Report color scheme */
+#define GHOSTTY_MODE_IN_BAND_RESIZE   (ghostty_mode_tag_new(2048, false)) /**< In-band size reports */
+/** @} */
+
 /**
  * A packed 16-bit terminal mode tag.
  *
diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 8c91920a0..d3dc9cffa 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -7,10 +7,12 @@
 #ifndef GHOSTTY_VT_TERMINAL_H
 #define GHOSTTY_VT_TERMINAL_H
 
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
+#include <ghostty/vt/modes.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -192,7 +194,42 @@ void ghostty_terminal_vt_write(GhosttyTerminal terminal,
  * @ingroup terminal
  */
 void ghostty_terminal_scroll_viewport(GhosttyTerminal terminal,
-                                      GhosttyTerminalScrollViewport behavior);
+                                       GhosttyTerminalScrollViewport behavior);
+
+/**
+ * Get the current value of a terminal mode.
+ *
+ * Returns the value of the mode identified by the given mode tag.
+ *
+ * @param terminal The terminal handle (NULL returns GHOSTTY_INVALID_VALUE)
+ * @param tag The mode tag identifying the mode to query
+ * @param[out] out_value On success, set to true if the mode is set, false
+ *             if it is reset
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if the terminal
+ *         is NULL or the tag does not correspond to a known mode
+ *
+ * @ingroup terminal
+ */
+GhosttyResult ghostty_terminal_mode_get(GhosttyTerminal terminal,
+                                        GhosttyModeTag tag,
+                                        bool* out_value);
+
+/**
+ * Set the value of a terminal mode.
+ *
+ * Sets the mode identified by the given mode tag to the specified value.
+ *
+ * @param terminal The terminal handle (NULL returns GHOSTTY_INVALID_VALUE)
+ * @param tag The mode tag identifying the mode to set
+ * @param value true to set the mode, false to reset it
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if the terminal
+ *         is NULL or the tag does not correspond to a known mode
+ *
+ * @ingroup terminal
+ */
+GhosttyResult ghostty_terminal_mode_set(GhosttyTerminal terminal,
+                                        GhosttyModeTag tag,
+                                        bool value);
 
 /** @} */
 
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 9d8e94bba..0951ae38e 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -186,6 +186,8 @@ comptime {
         @export(&c.terminal_resize, .{ .name = "ghostty_terminal_resize" });
         @export(&c.terminal_vt_write, .{ .name = "ghostty_terminal_vt_write" });
         @export(&c.terminal_scroll_viewport, .{ .name = "ghostty_terminal_scroll_viewport" });
+        @export(&c.terminal_mode_get, .{ .name = "ghostty_terminal_mode_get" });
+        @export(&c.terminal_mode_set, .{ .name = "ghostty_terminal_mode_set" });
 
         // On Wasm we need to export our allocator convenience functions.
         if (builtin.target.cpu.arch.isWasm()) {
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 133acbd1f..1b2ae79a9 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -90,6 +90,8 @@ pub const terminal_reset = terminal.reset;
 pub const terminal_resize = terminal.resize;
 pub const terminal_vt_write = terminal.vt_write;
 pub const terminal_scroll_viewport = terminal.scroll_viewport;
+pub const terminal_mode_get = terminal.mode_get;
+pub const terminal_mode_set = terminal.mode_set;
 
 test {
     _ = color;
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 0af791f91..c3c084c52 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -3,6 +3,7 @@ const testing = std.testing;
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const ZigTerminal = @import("../Terminal.zig");
+const modes = @import("../modes.zig");
 const size = @import("../size.zig");
 const Result = @import("result.zig").Result;
 
@@ -98,6 +99,30 @@ pub fn reset(terminal_: Terminal) callconv(.c) void {
     t.fullReset();
 }
 
+pub fn mode_get(
+    terminal_: Terminal,
+    tag: modes.ModeTag.Backing,
+    out_value: *bool,
+) callconv(.c) Result {
+    const t = terminal_ orelse return .invalid_value;
+    const mode_tag: modes.ModeTag = @bitCast(tag);
+    const mode = modes.modeFromInt(mode_tag.value, mode_tag.ansi) orelse return .invalid_value;
+    out_value.* = t.modes.get(mode);
+    return .success;
+}
+
+pub fn mode_set(
+    terminal_: Terminal,
+    tag: modes.ModeTag.Backing,
+    value: bool,
+) callconv(.c) Result {
+    const t = terminal_ orelse return .invalid_value;
+    const mode_tag: modes.ModeTag = @bitCast(tag);
+    const mode = modes.modeFromInt(mode_tag.value, mode_tag.ansi) orelse return .invalid_value;
+    t.modes.set(mode, value);
+    return .success;
+}
+
 pub fn free(terminal_: Terminal) callconv(.c) void {
     const t = terminal_ orelse return;
 
@@ -272,6 +297,87 @@ test "resize invalid value" {
     try testing.expectEqual(Result.invalid_value, resize(t, 80, 0));
 }
 
+test "mode_get and mode_set" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    var value: bool = undefined;
+
+    // DEC mode 25 (cursor_visible) defaults to true
+    const cursor_visible: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 25, .ansi = false });
+    try testing.expectEqual(Result.success, mode_get(t, cursor_visible, &value));
+    try testing.expect(value);
+
+    // Set it to false
+    try testing.expectEqual(Result.success, mode_set(t, cursor_visible, false));
+    try testing.expectEqual(Result.success, mode_get(t, cursor_visible, &value));
+    try testing.expect(!value);
+
+    // ANSI mode 4 (insert) defaults to false
+    const insert: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 4, .ansi = true });
+    try testing.expectEqual(Result.success, mode_get(t, insert, &value));
+    try testing.expect(!value);
+
+    try testing.expectEqual(Result.success, mode_set(t, insert, true));
+    try testing.expectEqual(Result.success, mode_get(t, insert, &value));
+    try testing.expect(value);
+}
+
+test "mode_get null" {
+    var value: bool = undefined;
+    const tag: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 25, .ansi = false });
+    try testing.expectEqual(Result.invalid_value, mode_get(null, tag, &value));
+}
+
+test "mode_set null" {
+    const tag: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 25, .ansi = false });
+    try testing.expectEqual(Result.invalid_value, mode_set(null, tag, true));
+}
+
+test "mode_get unknown mode" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    var value: bool = undefined;
+    const unknown: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 9999, .ansi = false });
+    try testing.expectEqual(Result.invalid_value, mode_get(t, unknown, &value));
+}
+
+test "mode_set unknown mode" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const unknown: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 9999, .ansi = false });
+    try testing.expectEqual(Result.invalid_value, mode_set(t, unknown, true));
+}
+
 test "vt_write" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
diff --git a/src/terminal/modes.zig b/src/terminal/modes.zig
index 8d6bd63d9..0d8cde5b7 100644
--- a/src/terminal/modes.zig
+++ b/src/terminal/modes.zig
@@ -245,6 +245,9 @@ const ModeEntry = struct {
 /// The full list of available entries. For documentation see how
 /// they're used within Ghostty or google their values. It is not
 /// valuable to redocument them all here.
+///
+/// NOTE: When adding a new mode entry, also add a corresponding
+/// GHOSTTY_MODE_* macro in include/ghostty/vt/modes.h.
 const entries: []const ModeEntry = &.{
     // ANSI
     .{ .name = "disable_keyboard", .value = 2, .ansi = true }, // KAM

From a460743b2ac036577ac46ee9c34946b37b214e67 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 16 Mar 2026 16:09:02 -0700
Subject: [PATCH 201/391] vt: add mode report encoding to C API

Add ghostty_mode_report_encode() which encodes a DECRPM response
sequence into a caller-provided buffer. The function takes a mode
tag, a report state integer, an output buffer, and writes the
appropriate CSI sequence (with ? prefix for DEC private modes).

The Zig-side ReportState is a non-exhaustive c_int enum that uses
std.meta.intToEnum for safe conversion to the internal type,
returning GHOSTTY_INVALID_VALUE on overflow. The C header exposes
a GhosttyModeReportState enum with named constants for the five
standard DECRPM state values.
---
 include/ghostty/vt/modes.h |  79 ++++++++++++++++++++++++++++
 src/lib_vt.zig             |   1 +
 src/terminal/c/main.zig    |   4 ++
 src/terminal/c/modes.zig   | 103 +++++++++++++++++++++++++++++++++++++
 4 files changed, 187 insertions(+)
 create mode 100644 src/terminal/c/modes.zig

diff --git a/include/ghostty/vt/modes.h b/include/ghostty/vt/modes.h
index b1fcbf097..f7b48637c 100644
--- a/include/ghostty/vt/modes.h
+++ b/include/ghostty/vt/modes.h
@@ -43,12 +43,44 @@
  * }
  * @endcode
  *
+ * ## DECRPM Report Encoding
+ *
+ * Use ghostty_mode_report_encode() to encode a DECRPM response into a
+ * caller-provided buffer:
+ *
+ * @code{.c}
+ * #include <stdio.h>
+ * #include <ghostty/vt.h>
+ *
+ * int main() {
+ *   char buf[32];
+ *   size_t written = 0;
+ *
+ *   // Encode a report that DEC mode 25 (cursor visible) is set
+ *   GhosttyResult result = ghostty_mode_report_encode(
+ *       GHOSTTY_MODE_CURSOR_VISIBLE,
+ *       GHOSTTY_MODE_REPORT_SET,
+ *       buf, sizeof(buf), &written);
+ *
+ *   if (result == GHOSTTY_SUCCESS) {
+ *     printf("Encoded %zu bytes: ", written);
+ *     fwrite(buf, 1, written, stdout);
+ *     printf("\n");  // prints: ESC[?25;1$y
+ *   }
+ *
+ *   return 0;
+ * }
+ * @endcode
+ *
  * @{
  */
 
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 
+#include <ghostty/vt/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -151,6 +183,53 @@ static inline bool ghostty_mode_tag_ansi(GhosttyModeTag tag) {
     return (tag >> 15) != 0;
 }
 
+/**
+ * DECRPM report state values.
+ *
+ * These correspond to the Ps2 parameter in a DECRPM response
+ * sequence (CSI ? Ps1 ; Ps2 $ y).
+ */
+typedef enum {
+    /** Mode is not recognized */
+    GHOSTTY_MODE_REPORT_NOT_RECOGNIZED = 0,
+    /** Mode is set (enabled) */
+    GHOSTTY_MODE_REPORT_SET = 1,
+    /** Mode is reset (disabled) */
+    GHOSTTY_MODE_REPORT_RESET = 2,
+    /** Mode is permanently set */
+    GHOSTTY_MODE_REPORT_PERMANENTLY_SET = 3,
+    /** Mode is permanently reset */
+    GHOSTTY_MODE_REPORT_PERMANENTLY_RESET = 4,
+} GhosttyModeReportState;
+
+/**
+ * Encode a DECRPM (DEC Private Mode Report) response sequence.
+ *
+ * Writes a mode report escape sequence into the provided buffer.
+ * The generated sequence has the form:
+ * - DEC private mode: CSI ? Ps1 ; Ps2 $ y
+ * - ANSI mode:        CSI Ps1 ; Ps2 $ y
+ *
+ * If the buffer is too small, the function returns GHOSTTY_OUT_OF_SPACE
+ * and writes the required buffer size to @p out_written. The caller can
+ * then retry with a sufficiently sized buffer.
+ *
+ * @param tag The mode tag identifying the mode to report on
+ * @param state The report state for this mode
+ * @param buf Output buffer to write the encoded sequence into (may be NULL)
+ * @param buf_len Size of the output buffer in bytes
+ * @param[out] out_written On success, the number of bytes written. On
+ *             GHOSTTY_OUT_OF_SPACE, the required buffer size.
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_OUT_OF_SPACE if the buffer
+ *         is too small
+ */
+GhosttyResult ghostty_mode_report_encode(
+    GhosttyModeTag tag,
+    GhosttyModeReportState state,
+    char* buf,
+    size_t buf_len,
+    size_t* out_written);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 0951ae38e..16b47a6be 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -165,6 +165,7 @@ comptime {
         @export(&c.osc_command_type, .{ .name = "ghostty_osc_command_type" });
         @export(&c.osc_command_data, .{ .name = "ghostty_osc_command_data" });
         @export(&c.focus_encode, .{ .name = "ghostty_focus_encode" });
+        @export(&c.mode_report_encode, .{ .name = "ghostty_mode_report_encode" });
         @export(&c.paste_is_safe, .{ .name = "ghostty_paste_is_safe" });
         @export(&c.color_rgb_get, .{ .name = "ghostty_color_rgb_get" });
         @export(&c.sgr_new, .{ .name = "ghostty_sgr_new" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 1b2ae79a9..c8388ef08 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -1,6 +1,7 @@
 pub const color = @import("color.zig");
 pub const focus = @import("focus.zig");
 pub const formatter = @import("formatter.zig");
+pub const modes = @import("modes.zig");
 pub const osc = @import("osc.zig");
 pub const key_event = @import("key_event.zig");
 pub const key_encode = @import("key_encode.zig");
@@ -23,6 +24,8 @@ pub const color_rgb_get = color.rgb_get;
 
 pub const focus_encode = focus.encode;
 
+pub const mode_report_encode = modes.report_encode;
+
 pub const formatter_terminal_new = formatter.terminal_new;
 pub const formatter_format_buf = formatter.format_buf;
 pub const formatter_format_alloc = formatter.format_alloc;
@@ -97,6 +100,7 @@ test {
     _ = color;
     _ = focus;
     _ = formatter;
+    _ = modes;
     _ = osc;
     _ = key_event;
     _ = key_encode;
diff --git a/src/terminal/c/modes.zig b/src/terminal/c/modes.zig
new file mode 100644
index 000000000..d0d5fedf0
--- /dev/null
+++ b/src/terminal/c/modes.zig
@@ -0,0 +1,103 @@
+const std = @import("std");
+const modes = @import("../modes.zig");
+const Result = @import("result.zig").Result;
+
+/// C: GhosttyModeReportState
+pub const ReportState = enum(c_int) {
+    _,
+
+    fn toZig(self: ReportState) ?modes.Report.State {
+        return std.meta.intToEnum(
+            modes.Report.State,
+            @intFromEnum(self),
+        ) catch null;
+    }
+};
+
+pub fn report_encode(
+    tag: modes.ModeTag.Backing,
+    state: ReportState,
+    out_: ?[*]u8,
+    out_len: usize,
+    out_written: *usize,
+) callconv(.c) Result {
+    const mode_tag: modes.ModeTag = @bitCast(tag);
+    const report: modes.Report = .{
+        .tag = mode_tag,
+        .state = state.toZig() orelse return .invalid_value,
+    };
+
+    var writer: std.Io.Writer = .fixed(if (out_) |out| out[0..out_len] else &.{});
+    report.encode(&writer) catch |err| switch (err) {
+        error.WriteFailed => {
+            var discarding: std.Io.Writer.Discarding = .init(&.{});
+            report.encode(&discarding.writer) catch unreachable;
+            out_written.* = @intCast(discarding.count);
+            return .out_of_space;
+        },
+    };
+
+    out_written.* = writer.end;
+    return .success;
+}
+
+test "encode DEC mode set" {
+    var buf: [modes.Report.max_size]u8 = undefined;
+    var written: usize = 0;
+    const tag: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 1, .ansi = false });
+    const result = report_encode(tag, @enumFromInt(1), &buf, buf.len, &written);
+    try std.testing.expectEqual(.success, result);
+    try std.testing.expectEqualStrings("\x1B[?1;1$y", buf[0..written]);
+}
+
+test "encode DEC mode reset" {
+    var buf: [modes.Report.max_size]u8 = undefined;
+    var written: usize = 0;
+    const tag: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 1, .ansi = false });
+    const result = report_encode(tag, @enumFromInt(2), &buf, buf.len, &written);
+    try std.testing.expectEqual(.success, result);
+    try std.testing.expectEqualStrings("\x1B[?1;2$y", buf[0..written]);
+}
+
+test "encode ANSI mode" {
+    var buf: [modes.Report.max_size]u8 = undefined;
+    var written: usize = 0;
+    const tag: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 4, .ansi = true });
+    const result = report_encode(tag, @enumFromInt(1), &buf, buf.len, &written);
+    try std.testing.expectEqual(.success, result);
+    try std.testing.expectEqualStrings("\x1B[4;1$y", buf[0..written]);
+}
+
+test "encode not recognized" {
+    var buf: [modes.Report.max_size]u8 = undefined;
+    var written: usize = 0;
+    const tag: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 9999, .ansi = false });
+    const result = report_encode(tag, @enumFromInt(0), &buf, buf.len, &written);
+    try std.testing.expectEqual(.success, result);
+    try std.testing.expectEqualStrings("\x1B[?9999;0$y", buf[0..written]);
+}
+
+test "encode with insufficient buffer" {
+    var buf: [1]u8 = undefined;
+    var written: usize = 0;
+    const tag: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 1, .ansi = false });
+    const result = report_encode(tag, @enumFromInt(1), &buf, buf.len, &written);
+    try std.testing.expectEqual(.out_of_space, result);
+    try std.testing.expect(written > 1);
+}
+
+test "encode with invalid state" {
+    var buf: [modes.Report.max_size]u8 = undefined;
+    var written: usize = 0;
+    const tag: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 1, .ansi = false });
+    const result = report_encode(tag, @enumFromInt(99), &buf, buf.len, &written);
+    try std.testing.expectEqual(.invalid_value, result);
+}
+
+test "encode with null buffer" {
+    var written: usize = 0;
+    const tag: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 1, .ansi = false });
+    const result = report_encode(tag, @enumFromInt(1), null, 0, &written);
+    try std.testing.expectEqual(.out_of_space, result);
+    try std.testing.expect(written > 0);
+}

From bfaab044684e0209c9996e5b7b6bc77a778b1b89 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 16 Mar 2026 16:15:36 -0700
Subject: [PATCH 202/391] vt: rename mode tag to mode

---
 include/ghostty/vt/modes.h    | 142 +++++++++++++++++-----------------
 include/ghostty/vt/terminal.h |  16 ++--
 2 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/include/ghostty/vt/modes.h b/include/ghostty/vt/modes.h
index f7b48637c..4454b2a50 100644
--- a/include/ghostty/vt/modes.h
+++ b/include/ghostty/vt/modes.h
@@ -1,7 +1,7 @@
 /**
  * @file modes.h
  *
- * Terminal mode tag utilities - pack and unpack ANSI/DEC mode identifiers.
+ * Terminal mode utilities - pack and unpack ANSI/DEC mode identifiers.
  */
 
 #ifndef GHOSTTY_VT_MODES_H
@@ -9,7 +9,7 @@
 
 /** @defgroup modes Mode Utilities
  *
- * Utilities for working with terminal mode tags. A mode tag is a compact
+ * Utilities for working with terminal modes. A mode is a compact
  * 16-bit representation of a terminal mode identifier that encodes both
  * the numeric mode value (up to 15 bits) and whether the mode is an ANSI
  * mode or a DEC private mode (?-prefixed).
@@ -25,18 +25,18 @@
  * #include <ghostty/vt.h>
  *
  * int main() {
- *   // Create a tag for DEC mode 25 (cursor visible)
- *   GhosttyModeTag tag = ghostty_mode_tag_new(25, false);
+ *   // Create a mode for DEC mode 25 (cursor visible)
+ *   GhosttyMode tag = ghostty_mode_new(25, false);
  *   printf("value=%u ansi=%d packed=0x%04x\n",
- *       ghostty_mode_tag_value(tag),
- *       ghostty_mode_tag_ansi(tag),
+ *       ghostty_mode_value(tag),
+ *       ghostty_mode_ansi(tag),
  *       tag);
  *
- *   // Create a tag for ANSI mode 4 (insert mode)
- *   GhosttyModeTag ansi_tag = ghostty_mode_tag_new(4, true);
+ *   // Create a mode for ANSI mode 4 (insert mode)
+ *   GhosttyMode ansi_tag = ghostty_mode_new(4, true);
  *   printf("value=%u ansi=%d packed=0x%04x\n",
- *       ghostty_mode_tag_value(ansi_tag),
- *       ghostty_mode_tag_ansi(ansi_tag),
+ *       ghostty_mode_value(ansi_tag),
+ *       ghostty_mode_ansi(ansi_tag),
  *       ansi_tag);
  *
  *   return 0;
@@ -85,102 +85,102 @@
 extern "C" {
 #endif
 
-/** @name ANSI Mode Tags
- * Mode tags for standard ANSI modes.
+/** @name ANSI Modes
+ * Modes for standard ANSI modes.
  * @{
  */
-#define GHOSTTY_MODE_KAM              (ghostty_mode_tag_new(2, true))    /**< Keyboard action (disable keyboard) */
-#define GHOSTTY_MODE_INSERT           (ghostty_mode_tag_new(4, true))    /**< Insert mode */
-#define GHOSTTY_MODE_SRM              (ghostty_mode_tag_new(12, true))   /**< Send/receive mode */
-#define GHOSTTY_MODE_LINEFEED         (ghostty_mode_tag_new(20, true))   /**< Linefeed/new line mode */
+#define GHOSTTY_MODE_KAM              (ghostty_mode_new(2, true))    /**< Keyboard action (disable keyboard) */
+#define GHOSTTY_MODE_INSERT           (ghostty_mode_new(4, true))    /**< Insert mode */
+#define GHOSTTY_MODE_SRM              (ghostty_mode_new(12, true))   /**< Send/receive mode */
+#define GHOSTTY_MODE_LINEFEED         (ghostty_mode_new(20, true))   /**< Linefeed/new line mode */
 /** @} */
 
-/** @name DEC Private Mode Tags
- * Mode tags for DEC private modes (?-prefixed).
+/** @name DEC Private Modes
+ * Modes for DEC private modes (?-prefixed).
  * @{
  */
-#define GHOSTTY_MODE_DECCKM           (ghostty_mode_tag_new(1, false))   /**< Cursor keys */
-#define GHOSTTY_MODE_132_COLUMN       (ghostty_mode_tag_new(3, false))   /**< 132/80 column mode */
-#define GHOSTTY_MODE_SLOW_SCROLL      (ghostty_mode_tag_new(4, false))   /**< Slow scroll */
-#define GHOSTTY_MODE_REVERSE_COLORS   (ghostty_mode_tag_new(5, false))   /**< Reverse video */
-#define GHOSTTY_MODE_ORIGIN           (ghostty_mode_tag_new(6, false))   /**< Origin mode */
-#define GHOSTTY_MODE_WRAPAROUND       (ghostty_mode_tag_new(7, false))   /**< Auto-wrap mode */
-#define GHOSTTY_MODE_AUTOREPEAT       (ghostty_mode_tag_new(8, false))   /**< Auto-repeat keys */
-#define GHOSTTY_MODE_X10_MOUSE        (ghostty_mode_tag_new(9, false))   /**< X10 mouse reporting */
-#define GHOSTTY_MODE_CURSOR_BLINKING  (ghostty_mode_tag_new(12, false))  /**< Cursor blink */
-#define GHOSTTY_MODE_CURSOR_VISIBLE   (ghostty_mode_tag_new(25, false))  /**< Cursor visible (DECTCEM) */
-#define GHOSTTY_MODE_ENABLE_MODE_3    (ghostty_mode_tag_new(40, false))  /**< Allow 132 column mode */
-#define GHOSTTY_MODE_REVERSE_WRAP     (ghostty_mode_tag_new(45, false))  /**< Reverse wrap */
-#define GHOSTTY_MODE_ALT_SCREEN_LEGACY (ghostty_mode_tag_new(47, false)) /**< Alternate screen (legacy) */
-#define GHOSTTY_MODE_KEYPAD_KEYS      (ghostty_mode_tag_new(66, false))  /**< Application keypad */
-#define GHOSTTY_MODE_LEFT_RIGHT_MARGIN (ghostty_mode_tag_new(69, false)) /**< Left/right margin mode */
-#define GHOSTTY_MODE_NORMAL_MOUSE     (ghostty_mode_tag_new(1000, false)) /**< Normal mouse tracking */
-#define GHOSTTY_MODE_BUTTON_MOUSE     (ghostty_mode_tag_new(1002, false)) /**< Button-event mouse tracking */
-#define GHOSTTY_MODE_ANY_MOUSE        (ghostty_mode_tag_new(1003, false)) /**< Any-event mouse tracking */
-#define GHOSTTY_MODE_FOCUS_EVENT      (ghostty_mode_tag_new(1004, false)) /**< Focus in/out events */
-#define GHOSTTY_MODE_UTF8_MOUSE       (ghostty_mode_tag_new(1005, false)) /**< UTF-8 mouse format */
-#define GHOSTTY_MODE_SGR_MOUSE        (ghostty_mode_tag_new(1006, false)) /**< SGR mouse format */
-#define GHOSTTY_MODE_ALT_SCROLL       (ghostty_mode_tag_new(1007, false)) /**< Alternate scroll mode */
-#define GHOSTTY_MODE_URXVT_MOUSE      (ghostty_mode_tag_new(1015, false)) /**< URxvt mouse format */
-#define GHOSTTY_MODE_SGR_PIXELS_MOUSE (ghostty_mode_tag_new(1016, false)) /**< SGR-Pixels mouse format */
-#define GHOSTTY_MODE_NUMLOCK_KEYPAD   (ghostty_mode_tag_new(1035, false)) /**< Ignore keypad with NumLock */
-#define GHOSTTY_MODE_ALT_ESC_PREFIX   (ghostty_mode_tag_new(1036, false)) /**< Alt key sends ESC prefix */
-#define GHOSTTY_MODE_ALT_SENDS_ESC    (ghostty_mode_tag_new(1039, false)) /**< Alt sends escape */
-#define GHOSTTY_MODE_REVERSE_WRAP_EXT (ghostty_mode_tag_new(1045, false)) /**< Extended reverse wrap */
-#define GHOSTTY_MODE_ALT_SCREEN       (ghostty_mode_tag_new(1047, false)) /**< Alternate screen */
-#define GHOSTTY_MODE_SAVE_CURSOR      (ghostty_mode_tag_new(1048, false)) /**< Save cursor (DECSC) */
-#define GHOSTTY_MODE_ALT_SCREEN_SAVE  (ghostty_mode_tag_new(1049, false)) /**< Alt screen + save cursor + clear */
-#define GHOSTTY_MODE_BRACKETED_PASTE  (ghostty_mode_tag_new(2004, false)) /**< Bracketed paste mode */
-#define GHOSTTY_MODE_SYNC_OUTPUT      (ghostty_mode_tag_new(2026, false)) /**< Synchronized output */
-#define GHOSTTY_MODE_GRAPHEME_CLUSTER (ghostty_mode_tag_new(2027, false)) /**< Grapheme cluster mode */
-#define GHOSTTY_MODE_COLOR_SCHEME_REPORT (ghostty_mode_tag_new(2031, false)) /**< Report color scheme */
-#define GHOSTTY_MODE_IN_BAND_RESIZE   (ghostty_mode_tag_new(2048, false)) /**< In-band size reports */
+#define GHOSTTY_MODE_DECCKM           (ghostty_mode_new(1, false))   /**< Cursor keys */
+#define GHOSTTY_MODE_132_COLUMN       (ghostty_mode_new(3, false))   /**< 132/80 column mode */
+#define GHOSTTY_MODE_SLOW_SCROLL      (ghostty_mode_new(4, false))   /**< Slow scroll */
+#define GHOSTTY_MODE_REVERSE_COLORS   (ghostty_mode_new(5, false))   /**< Reverse video */
+#define GHOSTTY_MODE_ORIGIN           (ghostty_mode_new(6, false))   /**< Origin mode */
+#define GHOSTTY_MODE_WRAPAROUND       (ghostty_mode_new(7, false))   /**< Auto-wrap mode */
+#define GHOSTTY_MODE_AUTOREPEAT       (ghostty_mode_new(8, false))   /**< Auto-repeat keys */
+#define GHOSTTY_MODE_X10_MOUSE        (ghostty_mode_new(9, false))   /**< X10 mouse reporting */
+#define GHOSTTY_MODE_CURSOR_BLINKING  (ghostty_mode_new(12, false))  /**< Cursor blink */
+#define GHOSTTY_MODE_CURSOR_VISIBLE   (ghostty_mode_new(25, false))  /**< Cursor visible (DECTCEM) */
+#define GHOSTTY_MODE_ENABLE_MODE_3    (ghostty_mode_new(40, false))  /**< Allow 132 column mode */
+#define GHOSTTY_MODE_REVERSE_WRAP     (ghostty_mode_new(45, false))  /**< Reverse wrap */
+#define GHOSTTY_MODE_ALT_SCREEN_LEGACY (ghostty_mode_new(47, false)) /**< Alternate screen (legacy) */
+#define GHOSTTY_MODE_KEYPAD_KEYS      (ghostty_mode_new(66, false))  /**< Application keypad */
+#define GHOSTTY_MODE_LEFT_RIGHT_MARGIN (ghostty_mode_new(69, false)) /**< Left/right margin mode */
+#define GHOSTTY_MODE_NORMAL_MOUSE     (ghostty_mode_new(1000, false)) /**< Normal mouse tracking */
+#define GHOSTTY_MODE_BUTTON_MOUSE     (ghostty_mode_new(1002, false)) /**< Button-event mouse tracking */
+#define GHOSTTY_MODE_ANY_MOUSE        (ghostty_mode_new(1003, false)) /**< Any-event mouse tracking */
+#define GHOSTTY_MODE_FOCUS_EVENT      (ghostty_mode_new(1004, false)) /**< Focus in/out events */
+#define GHOSTTY_MODE_UTF8_MOUSE       (ghostty_mode_new(1005, false)) /**< UTF-8 mouse format */
+#define GHOSTTY_MODE_SGR_MOUSE        (ghostty_mode_new(1006, false)) /**< SGR mouse format */
+#define GHOSTTY_MODE_ALT_SCROLL       (ghostty_mode_new(1007, false)) /**< Alternate scroll mode */
+#define GHOSTTY_MODE_URXVT_MOUSE      (ghostty_mode_new(1015, false)) /**< URxvt mouse format */
+#define GHOSTTY_MODE_SGR_PIXELS_MOUSE (ghostty_mode_new(1016, false)) /**< SGR-Pixels mouse format */
+#define GHOSTTY_MODE_NUMLOCK_KEYPAD   (ghostty_mode_new(1035, false)) /**< Ignore keypad with NumLock */
+#define GHOSTTY_MODE_ALT_ESC_PREFIX   (ghostty_mode_new(1036, false)) /**< Alt key sends ESC prefix */
+#define GHOSTTY_MODE_ALT_SENDS_ESC    (ghostty_mode_new(1039, false)) /**< Alt sends escape */
+#define GHOSTTY_MODE_REVERSE_WRAP_EXT (ghostty_mode_new(1045, false)) /**< Extended reverse wrap */
+#define GHOSTTY_MODE_ALT_SCREEN       (ghostty_mode_new(1047, false)) /**< Alternate screen */
+#define GHOSTTY_MODE_SAVE_CURSOR      (ghostty_mode_new(1048, false)) /**< Save cursor (DECSC) */
+#define GHOSTTY_MODE_ALT_SCREEN_SAVE  (ghostty_mode_new(1049, false)) /**< Alt screen + save cursor + clear */
+#define GHOSTTY_MODE_BRACKETED_PASTE  (ghostty_mode_new(2004, false)) /**< Bracketed paste mode */
+#define GHOSTTY_MODE_SYNC_OUTPUT      (ghostty_mode_new(2026, false)) /**< Synchronized output */
+#define GHOSTTY_MODE_GRAPHEME_CLUSTER (ghostty_mode_new(2027, false)) /**< Grapheme cluster mode */
+#define GHOSTTY_MODE_COLOR_SCHEME_REPORT (ghostty_mode_new(2031, false)) /**< Report color scheme */
+#define GHOSTTY_MODE_IN_BAND_RESIZE   (ghostty_mode_new(2048, false)) /**< In-band size reports */
 /** @} */
 
 /**
- * A packed 16-bit terminal mode tag.
+ * A packed 16-bit terminal mode.
  *
  * Encodes a mode value (bits 0–14) and an ANSI flag (bit 15) into a
  * single 16-bit integer. Use the inline helper functions to construct
- * and inspect mode tags rather than manipulating bits directly.
+ * and inspect modes rather than manipulating bits directly.
  */
-typedef uint16_t GhosttyModeTag;
+typedef uint16_t GhosttyMode;
 
 /**
- * Create a mode tag from a mode value and ANSI flag.
+ * Create a mode from a mode value and ANSI flag.
  *
  * @param value The numeric mode value (0–32767)
  * @param ansi true for an ANSI mode, false for a DEC private mode
- * @return The packed mode tag
+ * @return The packed mode
  *
  * @ingroup modes
  */
-static inline GhosttyModeTag ghostty_mode_tag_new(uint16_t value, bool ansi) {
-    return (GhosttyModeTag)((value & 0x7FFF) | ((uint16_t)ansi << 15));
+static inline GhosttyMode ghostty_mode_new(uint16_t value, bool ansi) {
+    return (GhosttyMode)((value & 0x7FFF) | ((uint16_t)ansi << 15));
 }
 
 /**
- * Extract the numeric mode value from a mode tag.
+ * Extract the numeric mode value from a mode.
  *
- * @param tag The mode tag
+ * @param mode The mode
  * @return The mode value (0–32767)
  *
  * @ingroup modes
  */
-static inline uint16_t ghostty_mode_tag_value(GhosttyModeTag tag) {
-    return tag & 0x7FFF;
+static inline uint16_t ghostty_mode_value(GhosttyMode mode) {
+    return mode & 0x7FFF;
 }
 
 /**
- * Check whether a mode tag represents an ANSI mode.
+ * Check whether a mode represents an ANSI mode.
  *
- * @param tag The mode tag
+ * @param mode The mode
  * @return true if this is an ANSI mode, false if it is a DEC private mode
  *
  * @ingroup modes
  */
-static inline bool ghostty_mode_tag_ansi(GhosttyModeTag tag) {
-    return (tag >> 15) != 0;
+static inline bool ghostty_mode_ansi(GhosttyMode mode) {
+    return (mode >> 15) != 0;
 }
 
 /**
@@ -214,7 +214,7 @@ typedef enum {
  * and writes the required buffer size to @p out_written. The caller can
  * then retry with a sufficiently sized buffer.
  *
- * @param tag The mode tag identifying the mode to report on
+ * @param mode The mode identifying the mode to report on
  * @param state The report state for this mode
  * @param buf Output buffer to write the encoded sequence into (may be NULL)
  * @param buf_len Size of the output buffer in bytes
@@ -224,7 +224,7 @@ typedef enum {
  *         is too small
  */
 GhosttyResult ghostty_mode_report_encode(
-    GhosttyModeTag tag,
+    GhosttyMode mode,
     GhosttyModeReportState state,
     char* buf,
     size_t buf_len,
diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index d3dc9cffa..5be6db001 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -199,36 +199,36 @@ void ghostty_terminal_scroll_viewport(GhosttyTerminal terminal,
 /**
  * Get the current value of a terminal mode.
  *
- * Returns the value of the mode identified by the given mode tag.
+ * Returns the value of the mode identified by the given mode.
  *
  * @param terminal The terminal handle (NULL returns GHOSTTY_INVALID_VALUE)
- * @param tag The mode tag identifying the mode to query
+ * @param mode The mode identifying the mode to query
  * @param[out] out_value On success, set to true if the mode is set, false
  *             if it is reset
  * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if the terminal
- *         is NULL or the tag does not correspond to a known mode
+ *         is NULL or the mode does not correspond to a known mode
  *
  * @ingroup terminal
  */
 GhosttyResult ghostty_terminal_mode_get(GhosttyTerminal terminal,
-                                        GhosttyModeTag tag,
+                                        GhosttyMode mode,
                                         bool* out_value);
 
 /**
  * Set the value of a terminal mode.
  *
- * Sets the mode identified by the given mode tag to the specified value.
+ * Sets the mode identified by the given mode to the specified value.
  *
  * @param terminal The terminal handle (NULL returns GHOSTTY_INVALID_VALUE)
- * @param tag The mode tag identifying the mode to set
+ * @param mode The mode identifying the mode to set
  * @param value true to set the mode, false to reset it
  * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if the terminal
- *         is NULL or the tag does not correspond to a known mode
+ *         is NULL or the mode does not correspond to a known mode
  *
  * @ingroup terminal
  */
 GhosttyResult ghostty_terminal_mode_set(GhosttyTerminal terminal,
-                                        GhosttyModeTag tag,
+                                        GhosttyMode mode,
                                         bool value);
 
 /** @} */

From 8a40e37b863aa42ae4f4d6b7d25f242d050e3333 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Mon, 16 Mar 2026 18:26:37 -0500
Subject: [PATCH 203/391] gtk: refactor application id and resource path

---
 src/apprt/gtk/App.zig               | 10 ++--------
 src/apprt/gtk/build/gresource.zig   | 16 +++++++---------
 src/apprt/gtk/build/info.zig        | 18 ++++++++++++++++++
 src/apprt/gtk/class/application.zig |  5 +++--
 4 files changed, 30 insertions(+), 19 deletions(-)
 create mode 100644 src/apprt/gtk/build/info.zig

diff --git a/src/apprt/gtk/App.zig b/src/apprt/gtk/App.zig
index 6c7310339..39c13c19d 100644
--- a/src/apprt/gtk/App.zig
+++ b/src/apprt/gtk/App.zig
@@ -22,16 +22,10 @@ const log = std.log.scoped(.gtk);
 pub const must_draw_from_app_thread = true;
 
 /// GTK application ID
-pub const application_id = switch (builtin.mode) {
-    .Debug, .ReleaseSafe => "com.mitchellh.ghostty-debug",
-    .ReleaseFast, .ReleaseSmall => "com.mitchellh.ghostty",
-};
+pub const application_id = @import("build/info.zig").application_id;
 
 /// GTK object path
-pub const object_path = switch (builtin.mode) {
-    .Debug, .ReleaseSafe => "/com/mitchellh/ghostty_debug",
-    .ReleaseFast, .ReleaseSmall => "/com/mitchellh/ghostty",
-};
+pub const object_path = @import("build/info.zig").object_path;
 
 /// The GObject Application instance
 app: *Application,
diff --git a/src/apprt/gtk/build/gresource.zig b/src/apprt/gtk/build/gresource.zig
index bcece4caa..c50ea8cd5 100644
--- a/src/apprt/gtk/build/gresource.zig
+++ b/src/apprt/gtk/build/gresource.zig
@@ -7,9 +7,7 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 
-/// Prefix/appid for the gresource file.
-pub const prefix = "/com/mitchellh/ghostty";
-pub const app_id = "com.mitchellh.ghostty";
+const build_info = @import("info.zig");
 
 /// The path to the Blueprint files. The folder structure is expected to be
 /// `{version}/{name}.blp` where `version` is the major and minor
@@ -112,7 +110,7 @@ pub fn blueprint(comptime bp: Blueprint) [:0]const u8 {
                 std.mem.eql(u8, candidate.name, bp.name))
             {
                 return std.fmt.comptimePrint("{s}/ui/{d}.{d}/{s}.ui", .{
-                    prefix,
+                    build_info.resource_path,
                     candidate.major,
                     candidate.minor,
                     candidate.name,
@@ -173,7 +171,7 @@ fn genIcons(writer: *std.Io.Writer) !void {
     try writer.print(
         \\  <gresource prefix="{s}/icons">
         \\
-    , .{prefix});
+    , .{build_info.resource_path});
 
     const cwd = std.fs.cwd();
     inline for (icon_sizes) |size| {
@@ -186,7 +184,7 @@ fn genIcons(writer: *std.Io.Writer) !void {
                 \\    <file alias="{s}/apps/{s}.png">{s}</file>
                 \\
             ,
-                .{ alias, app_id, source },
+                .{ alias, build_info.base_application_id, source },
             );
         }
 
@@ -199,7 +197,7 @@ fn genIcons(writer: *std.Io.Writer) !void {
                 \\    <file alias="{s}/apps/{s}.png">{s}</file>
                 \\
             ,
-                .{ alias, app_id, source },
+                .{ alias, build_info.base_application_id, source },
             );
         }
     }
@@ -215,7 +213,7 @@ fn genRoot(writer: *std.Io.Writer) !void {
     try writer.print(
         \\  <gresource prefix="{s}">
         \\
-    , .{prefix});
+    , .{build_info.resource_path});
 
     const cwd = std.fs.cwd();
     inline for (css) |name| {
@@ -249,7 +247,7 @@ fn genUi(
     try writer.print(
         \\  <gresource prefix="{s}/ui">
         \\
-    , .{prefix});
+    , .{build_info.resource_path});
 
     for (files.items) |ui_file| {
         for (blueprints) |bp| {
diff --git a/src/apprt/gtk/build/info.zig b/src/apprt/gtk/build/info.zig
new file mode 100644
index 000000000..fc6478d81
--- /dev/null
+++ b/src/apprt/gtk/build/info.zig
@@ -0,0 +1,18 @@
+const builtin = @import("builtin");
+
+/// Base application ID
+pub const base_application_id = "com.mitchellh.ghostty";
+
+/// GTK application ID
+pub const application_id = switch (builtin.mode) {
+    .Debug, .ReleaseSafe => base_application_id ++ "-debug",
+    .ReleaseFast, .ReleaseSmall => base_application_id,
+};
+
+pub const resource_path = "/com/mitchellh/ghostty";
+
+/// GTK object path
+pub const object_path = switch (builtin.mode) {
+    .Debug, .ReleaseSafe => resource_path ++ "_debug",
+    .ReleaseFast, .ReleaseSmall => resource_path,
+};
diff --git a/src/apprt/gtk/class/application.zig b/src/apprt/gtk/class/application.zig
index 63f1c35d0..544bdd127 100644
--- a/src/apprt/gtk/class/application.zig
+++ b/src/apprt/gtk/class/application.zig
@@ -9,6 +9,7 @@ const gobject = @import("gobject");
 const gtk = @import("gtk");
 
 const build_config = @import("../../../build_config.zig");
+const build_info = @import("../build/info.zig");
 const state = &@import("../../../global.zig").state;
 const i18n = @import("../../../os/main.zig").i18n;
 const apprt = @import("../../../apprt.zig");
@@ -327,7 +328,7 @@ pub const Application = extern struct {
                 }
             }
 
-            break :app_id ApprtApp.application_id;
+            break :app_id build_info.application_id;
         };
 
         const display: *gdk.Display = gdk.Display.getDefault() orelse {
@@ -381,7 +382,7 @@ pub const Application = extern struct {
             // Force the resource path to a known value so it doesn't depend
             // on the app id (which changes between debug/release and can be
             // user-configured) and force it to load in compiled resources.
-            .resource_base_path = "/com/mitchellh/ghostty",
+            .resource_base_path = build_info.resource_path,
         });
 
         // Setup our private state. More setup is done in the init

From 6abed20fc89607134063f38107b210ed1ab31d25 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2026 23:39:24 +0000
Subject: [PATCH 204/391] Update VOUCHED list (#11581)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11557#issuecomment-4071331120)
from @mitchellh.

Unvouch: @mvanhorn

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index aee0cfc75..a60c5f48d 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -131,7 +131,6 @@ miupa
 molechowski
 mrmage
 mtak
-mvanhorn
 natesmyth
 neo773
 nicosuave

From 67dcac02f9b4c40745f374d7f77d71761d21616d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2026 00:12:48 +0000
Subject: [PATCH 205/391] build(deps): bump softprops/action-gh-release from
 2.6.0 to 2.6.1

Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/26e8ad27a09a225049a7075d7ec1caa2df6ff332...153bb8e04406b158c6c84fc1615b65b24149a1fe)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-version: 2.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release-tip.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release-tip.yml b/.github/workflows/release-tip.yml
index f8fa2475d..44b1ca369 100644
--- a/.github/workflows/release-tip.yml
+++ b/.github/workflows/release-tip.yml
@@ -195,7 +195,7 @@ jobs:
           nix develop -c minisign -S -m ghostty-source.tar.gz -s minisign.key < minisign.password
 
       - name: Update Release
-        uses: softprops/action-gh-release@26e8ad27a09a225049a7075d7ec1caa2df6ff332 # v2.6.0
+        uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
         with:
           name: 'Ghostty Tip ("Nightly")'
           prerelease: true
@@ -378,7 +378,7 @@ jobs:
 
       # Update Release
       - name: Release
-        uses: softprops/action-gh-release@26e8ad27a09a225049a7075d7ec1caa2df6ff332 # v2.6.0
+        uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
         with:
           name: 'Ghostty Tip ("Nightly")'
           prerelease: true
@@ -627,7 +627,7 @@ jobs:
 
       # Update Release
       - name: Release
-        uses: softprops/action-gh-release@26e8ad27a09a225049a7075d7ec1caa2df6ff332 # v2.6.0
+        uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
         with:
           name: 'Ghostty Tip ("Nightly")'
           prerelease: true
@@ -824,7 +824,7 @@ jobs:
 
       # Update Release
       - name: Release
-        uses: softprops/action-gh-release@26e8ad27a09a225049a7075d7ec1caa2df6ff332 # v2.6.0
+        uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
         with:
           name: 'Ghostty Tip ("Nightly")'
           prerelease: true

From 79162279d9d8a5fea5a26bbc2abda98e90ec5988 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Mon, 16 Mar 2026 19:53:24 -0500
Subject: [PATCH 206/391] gtk: move audio playback into separate file, enabling
 reuse

---
 src/apprt/gtk/class/surface.zig |  60 +------------------
 src/apprt/gtk/media.zig         | 102 ++++++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+), 57 deletions(-)
 create mode 100644 src/apprt/gtk/media.zig

diff --git a/src/apprt/gtk/class/surface.zig b/src/apprt/gtk/class/surface.zig
index 4b31c43d5..8ff8e55e1 100644
--- a/src/apprt/gtk/class/surface.zig
+++ b/src/apprt/gtk/class/surface.zig
@@ -35,6 +35,7 @@ const TitleDialog = @import("title_dialog.zig").TitleDialog;
 const Window = @import("window.zig").Window;
 const InspectorWindow = @import("inspector_window.zig").InspectorWindow;
 const i18n = @import("../../../os/i18n.zig");
+const media = @import("../media.zig");
 
 const log = std.log.scoped(.gtk_ghostty_surface);
 
@@ -2457,34 +2458,8 @@ pub const Surface = extern struct {
                 1.0,
             );
 
-            assert(std.fs.path.isAbsolute(path));
-            const media_file = gtk.MediaFile.newForFilename(path);
-
-            // If the audio file is marked as required, we'll emit an error if
-            // there was a problem playing it. Otherwise there will be silence.
-            if (required) {
-                _ = gobject.Object.signals.notify.connect(
-                    media_file,
-                    ?*anyopaque,
-                    mediaFileError,
-                    null,
-                    .{ .detail = "error" },
-                );
-            }
-
-            // Watch for the "ended" signal so that we can clean up after
-            // ourselves.
-            _ = gobject.Object.signals.notify.connect(
-                media_file,
-                ?*anyopaque,
-                mediaFileEnded,
-                null,
-                .{ .detail = "ended" },
-            );
-
-            const media_stream = media_file.as(gtk.MediaStream);
-            media_stream.setVolume(volume);
-            media_stream.play();
+            const media_file = media.fromFilename(path) orelse break :audio;
+            media.playMediaFile(media_file, volume, required);
         }
     }
 
@@ -3481,35 +3456,6 @@ pub const Surface = extern struct {
         right.setVisible(0);
     }
 
-    fn mediaFileError(
-        media_file: *gtk.MediaFile,
-        _: *gobject.ParamSpec,
-        _: ?*anyopaque,
-    ) callconv(.c) void {
-        const path = path: {
-            const file = media_file.getFile() orelse break :path null;
-            break :path file.getPath();
-        };
-        defer if (path) |p| glib.free(p);
-
-        const media_stream = media_file.as(gtk.MediaStream);
-        const err = media_stream.getError() orelse return;
-        log.warn("error playing bell from {s}: {s} {d} {s}", .{
-            path orelse "<<unknown>>",
-            glib.quarkToString(err.f_domain),
-            err.f_code,
-            err.f_message orelse "",
-        });
-    }
-
-    fn mediaFileEnded(
-        media_file: *gtk.MediaFile,
-        _: *gobject.ParamSpec,
-        _: ?*anyopaque,
-    ) callconv(.c) void {
-        media_file.unref();
-    }
-
     fn titleDialogSet(
         _: *TitleDialog,
         title_ptr: [*:0]const u8,
diff --git a/src/apprt/gtk/media.zig b/src/apprt/gtk/media.zig
new file mode 100644
index 000000000..1015c933f
--- /dev/null
+++ b/src/apprt/gtk/media.zig
@@ -0,0 +1,102 @@
+const std = @import("std");
+const assert = @import("../../quirks.zig").inlineAssert;
+
+const log = std.log.scoped(.gtk_media);
+
+const gio = @import("gio");
+const glib = @import("glib");
+const gobject = @import("gobject");
+const gtk = @import("gtk");
+
+pub fn fromFilename(path: [:0]const u8) ?*gtk.MediaFile {
+    assert(std.fs.path.isAbsolute(path));
+    std.fs.accessAbsolute(path, .{ .mode = .read_only }) catch |err| {
+        log.warn("unable to access {s}: {t}", .{ path, err });
+        return null;
+    };
+    return gtk.MediaFile.newForFilename(path);
+}
+
+pub fn fromResource(path: [:0]const u8) ?*gtk.MediaFile {
+    assert(std.fs.path.isAbsolute(path));
+    var gerr: ?*glib.Error = null;
+
+    const found = gio.resourcesGetInfo(path, .{}, null, null, &gerr);
+    if (gerr) |err| {
+        defer err.free();
+        log.warn(
+            "failed to find resource {s}: {s} {d} {s}",
+            .{
+                path,
+                glib.quarkToString(err.f_domain),
+                err.f_code,
+                err.f_message orelse "(no message)",
+            },
+        );
+        return null;
+    }
+
+    if (found == 0) {
+        log.warn("failed to find resource {s}", .{path});
+        return null;
+    }
+
+    return gtk.MediaFile.newForResource(path);
+}
+
+pub fn playMediaFile(media_file: *gtk.MediaFile, volume: f64, required: bool) void {
+    // If the audio file is marked as required, we'll emit an error if
+    // there was a problem playing it. Otherwise there will be silence.
+    if (required) {
+        _ = gobject.Object.signals.notify.connect(
+            media_file,
+            ?*anyopaque,
+            mediaFileError,
+            null,
+            .{ .detail = "error" },
+        );
+    }
+
+    // Watch for the "ended" signal so that we can clean up after
+    // ourselves.
+    _ = gobject.Object.signals.notify.connect(
+        media_file,
+        ?*anyopaque,
+        mediaFileEnded,
+        null,
+        .{ .detail = "ended" },
+    );
+
+    const media_stream = media_file.as(gtk.MediaStream);
+    media_stream.setVolume(volume);
+    media_stream.play();
+}
+
+fn mediaFileError(
+    media_file: *gtk.MediaFile,
+    _: *gobject.ParamSpec,
+    _: ?*anyopaque,
+) callconv(.c) void {
+    const path = path: {
+        const file = media_file.getFile() orelse break :path null;
+        break :path file.getPath();
+    };
+    defer if (path) |p| glib.free(p);
+
+    const media_stream = media_file.as(gtk.MediaStream);
+    const err = media_stream.getError() orelse return;
+    log.warn("error playing sound from {s}: {s} {d} {s}", .{
+        path orelse "<<unknown>>",
+        glib.quarkToString(err.f_domain),
+        err.f_code,
+        err.f_message orelse "",
+    });
+}
+
+fn mediaFileEnded(
+    media_file: *gtk.MediaFile,
+    _: *gobject.ParamSpec,
+    _: ?*anyopaque,
+) callconv(.c) void {
+    media_file.unref();
+}

From 9f4e42a52377a77c8e2f3ce5ce7ce26009947917 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2026 03:08:46 +0000
Subject: [PATCH 207/391] Update VOUCHED list (#11587)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11585#discussioncomment-16170774)
from @jcollie.

Vouch: @heaths

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index a60c5f48d..616c44bed 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -84,6 +84,7 @@ gpanders
 guilhermetk
 hakonhagland
 halosatrio
+heaths
 -highimpact-dev Disrespectful AI user
 hqnna
 hulet

From 2d514013d51e9805305b5e93c5bd9eb9ada774a4 Mon Sep 17 00:00:00 2001
From: Yuzu Vita <g311571057@gmail.com>
Date: Tue, 17 Mar 2026 22:18:07 +0800
Subject: [PATCH 208/391] fix "open terminal here" action on Plasma

---
 dist/linux/ghostty_dolphin.desktop | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dist/linux/ghostty_dolphin.desktop b/dist/linux/ghostty_dolphin.desktop
index 5e8351390..9bea38fa4 100755
--- a/dist/linux/ghostty_dolphin.desktop
+++ b/dist/linux/ghostty_dolphin.desktop
@@ -7,5 +7,4 @@ Actions=RunGhosttyDir
 [Desktop Action RunGhosttyDir]
 Name=Open Ghostty Here
 Icon=com.mitchellh.ghostty
-Exec=ghostty --working-directory=%F --gtk-single-instance=false
-
+Exec=ghostty --working-directory=%F +new-window

From 3e0d434e8a52577a1296acd29495924253497894 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Tue, 17 Mar 2026 10:35:04 -0400
Subject: [PATCH 209/391] zsh: use OSC 133;P;k=s for secondary prompts

This is consistent with our bash prompt handling and also lets us
simplify our multiline prompt logic (because it no longer needs to work
around 133;A's fresh-line behavior).
---
 src/shell-integration/zsh/ghostty-integration | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/shell-integration/zsh/ghostty-integration b/src/shell-integration/zsh/ghostty-integration
index c55b2f51d..2232f3202 100644
--- a/src/shell-integration/zsh/ghostty-integration
+++ b/src/shell-integration/zsh/ghostty-integration
@@ -155,27 +155,18 @@ _ghostty_deferred_init() {
                 # Add our marks. Since we always start from a clean PS1
                 # (either restored above or freshly set by a theme), we can
                 # unconditionally add mark1 and markB.
-                builtin local mark2=$'%{\e]133;A;k=s\a%}'
+                builtin local mark2=$'%{\e]133;P;k=s\a%}'
                 builtin local markB=$'%{\e]133;B\a%}'
                 PS1=${mark1}${PS1}${markB}
 
                 # Handle multiline prompts by marking newline-separated
-                # continuation lines with k=s (mark2). We skip the newline
-                # immediately after mark1 to avoid introducing a double
-                # newline due to OSC 133;A's fresh-line behavior.
+                # continuation lines with k=s (mark2).
                 #
                 # We skip this when PS1 changed because injecting marks into
                 # newlines can break pattern matching in themes that
                 # strip/rebuild the prompt dynamically (e.g., Pure).
                 if (( ! ps1_changed )) && [[ $PS1 == *$'\n'* ]]; then
-                    if [[ $PS1 == ${mark1}$'\n'* ]]; then
-                        builtin local rest=${PS1#${mark1}$'\n'}
-                        if [[ $rest == *$'\n'* ]]; then
-                            PS1=${mark1}$'\n'${rest//$'\n'/$'\n'${mark2}}
-                        fi
-                    else
-                        PS1=${PS1//$'\n'/$'\n'${mark2}}
-                    fi
+                    PS1=${PS1//$'\n'/$'\n'${mark2}}
                 fi
 
                 # PS2 mark is needed when clearing the prompt on resize

From 739da492b8f21e8b129434ae2b2f685510d19587 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2026 15:42:06 +0000
Subject: [PATCH 210/391] Update VOUCHED list (#11598)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11537#issuecomment-4075954392)
from @mitchellh.

Unvouch: @cadebrown

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 616c44bed..5b9daa7e6 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -45,7 +45,6 @@ bitigchi
 bkircher
 bo2themax
 brentschroeter
-cadebrown
 cespare
 charliie-dev
 chernetskyi

From 4a88f460c4e505deeca7e4fea4135e958be06c74 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 17 Mar 2026 08:56:48 -0700
Subject: [PATCH 211/391] terminal/tmux: stylistic cleanups

---
 src/terminal/tmux/control.zig | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/terminal/tmux/control.zig b/src/terminal/tmux/control.zig
index f68a748f1..3b94eb16b 100644
--- a/src/terminal/tmux/control.zig
+++ b/src/terminal/tmux/control.zig
@@ -48,11 +48,6 @@ pub const Parser = struct {
         block,
     };
 
-    const BlockTerminator = enum {
-        end,
-        err,
-    };
-
     pub fn deinit(self: *Parser) void {
         // If we're in a broken state, we already deinited
         // the buffer, so we don't need to do anything.
@@ -122,16 +117,22 @@ pub const Parser = struct {
                 const line = written[idx..];
 
                 if (parseBlockTerminator(line)) |terminator| {
-                    const err = terminator == .err;
-                    const output = std.mem.trimRight(u8, written[0..idx], "\r\n");
-
-                    // If it is an error then log it.
-                    if (err) log.warn("tmux control mode error={s}", .{output});
+                    const output = std.mem.trimRight(
+                        u8,
+                        written[0..idx],
+                        "\r\n",
+                    );
 
                     // Important: do not clear buffer since the notification
                     // contains it.
                     self.state = .idle;
-                    return if (err) .{ .block_err = output } else .{ .block_end = output };
+                    switch (terminator) {
+                        .end => return .{ .block_end = output },
+                        .err => {
+                            log.warn("tmux control mode error={s}", .{output});
+                            return .{ .block_err = output };
+                        },
+                    }
                 }
 
                 // Didn't end the block, continue accumulating.
@@ -147,6 +148,8 @@ pub const Parser = struct {
 
     const ParseError = error{RegexError};
 
+    const BlockTerminator = enum { end, err };
+
     /// Block payload is raw data, so a line only terminates a block if it
     /// exactly matches tmux's `%end`/`%error` guard-line shape.
     fn parseBlockTerminator(line_raw: []const u8) ?BlockTerminator {
@@ -169,6 +172,9 @@ pub const Parser = struct {
         const flags = fields.next() orelse return null;
         const extra = fields.next();
 
+        // In the future, we should compare these to the %begin block
+        // because the tmux source guarantees that these always match and
+        // that is a more robust way to match.
         _ = std.fmt.parseInt(usize, time, 10) catch return null;
         _ = std.fmt.parseInt(usize, command_id, 10) catch return null;
         _ = std.fmt.parseInt(usize, flags, 10) catch return null;

From b173b2dfb72e89075b4abc01587f059202692248 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2026 16:46:10 +0000
Subject: [PATCH 212/391] Update VOUCHED list (#11599)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11594#discussioncomment-16180979)
from @jcollie.

Vouch: @heddxh

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 5b9daa7e6..db08a93c4 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -84,6 +84,7 @@ guilhermetk
 hakonhagland
 halosatrio
 heaths
+heddxh heddxh
 -highimpact-dev Disrespectful AI user
 hqnna
 hulet

From 9e2e99c55fb5f2c0709938eb590b62112f3d7446 Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen <hi@pluie.me>
Date: Wed, 18 Mar 2026 02:07:28 +0800
Subject: [PATCH 213/391] gtk/wayland: replace KDE blur with
 ext-background-effect-v1

The venerable KDE blur protocol has been replaced with the compositor-
agnostic ext-background-effect-v1 protocol, to be implemented by Niri and
others. The new protocol is much easier to use overall, though we do need
to calculate the blur region manually like X11.
---
 build.zig.zon                              |  4 +-
 build.zig.zon.json                         |  5 ++
 build.zig.zon.nix                          |  8 ++
 build.zig.zon.txt                          |  1 +
 flatpak/zig-packages.json                  |  6 ++
 src/apprt/gtk/class/window.zig             | 21 +-----
 src/apprt/gtk/winproto/wayland.zig         | 85 +++++++++++++++++-----
 src/apprt/gtk/winproto/wayland/Globals.zig | 26 ++++++-
 src/build/SharedDeps.zig                   |  6 +-
 9 files changed, 116 insertions(+), 46 deletions(-)

diff --git a/build.zig.zon b/build.zig.zon
index 7a669a4a1..b0b66a052 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -91,8 +91,8 @@
             .lazy = true,
         },
         .wayland_protocols = .{
-            .url = "https://deps.files.ghostty.org/wayland-protocols-258d8f88f2c8c25a830c6316f87d23ce1a0f12d9.tar.gz",
-            .hash = "N-V-__8AAKw-DAAaV8bOAAGqA0-oD7o-HNIlPFYKRXSPT03S",
+            .url = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/1.47/wayland-protocols-1.47.tar.gz",
+            .hash = "N-V-__8AAFdWDwA0ktbNUi9pFBHCRN4weXIgIfCrVjfGxqgA",
             .lazy = true,
         },
         .plasma_wayland_protocols = .{
diff --git a/build.zig.zon.json b/build.zig.zon.json
index 4a88e2017..b4e9dc39c 100644
--- a/build.zig.zon.json
+++ b/build.zig.zon.json
@@ -139,6 +139,11 @@
     "url": "https://deps.files.ghostty.org/wayland-protocols-258d8f88f2c8c25a830c6316f87d23ce1a0f12d9.tar.gz",
     "hash": "sha256-XO3K3egbdeYPI+XoO13SuOtO+5+Peb16NH0UiusFMPg="
   },
+  "N-V-__8AAFdWDwA0ktbNUi9pFBHCRN4weXIgIfCrVjfGxqgA": {
+    "name": "wayland_protocols",
+    "url": "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/1.47/wayland-protocols-1.47.tar.gz",
+    "hash": "sha256-3S3xSrX0EDgleq7cxLX7msDuAY8/D5SvkJcCjmDTMiM="
+  },
   "N-V-__8AAAzZywE3s51XfsLbP9eyEw57ae9swYB9aGB6fCMs": {
     "name": "wuffs",
     "url": "https://deps.files.ghostty.org/wuffs-122037b39d577ec2db3fd7b2130e7b69ef6cc1807d68607a7c232c958315d381b5cd.tar.gz",
diff --git a/build.zig.zon.nix b/build.zig.zon.nix
index 53e1b6c02..a3f18c692 100644
--- a/build.zig.zon.nix
+++ b/build.zig.zon.nix
@@ -306,6 +306,14 @@ in
         hash = "sha256-XO3K3egbdeYPI+XoO13SuOtO+5+Peb16NH0UiusFMPg=";
       };
     }
+    {
+      name = "N-V-__8AAFdWDwA0ktbNUi9pFBHCRN4weXIgIfCrVjfGxqgA";
+      path = fetchZigArtifact {
+        name = "wayland_protocols";
+        url = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/1.47/wayland-protocols-1.47.tar.gz";
+        hash = "sha256-3S3xSrX0EDgleq7cxLX7msDuAY8/D5SvkJcCjmDTMiM=";
+      };
+    }
     {
       name = "N-V-__8AAAzZywE3s51XfsLbP9eyEw57ae9swYB9aGB6fCMs";
       path = fetchZigArtifact {
diff --git a/build.zig.zon.txt b/build.zig.zon.txt
index 4ac9e6592..75585dcb8 100644
--- a/build.zig.zon.txt
+++ b/build.zig.zon.txt
@@ -34,3 +34,4 @@ https://deps.files.ghostty.org/zig_wayland-1b5c038ec10da20ed3a15b0b2a6db1c21383e
 https://deps.files.ghostty.org/zlib-1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb.tar.gz
 https://github.com/ivanstepanovftw/zigimg/archive/d7b7ab0ba0899643831ef042bd73289510b39906.tar.gz
 https://github.com/ocornut/imgui/archive/refs/tags/v1.92.5-docking.tar.gz
+https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/1.47/wayland-protocols-1.47.tar.gz
diff --git a/flatpak/zig-packages.json b/flatpak/zig-packages.json
index e58ecd448..b971163b4 100644
--- a/flatpak/zig-packages.json
+++ b/flatpak/zig-packages.json
@@ -167,6 +167,12 @@
     "dest": "vendor/p/N-V-__8AAKw-DAAaV8bOAAGqA0-oD7o-HNIlPFYKRXSPT03S",
     "sha256": "5cedcadde81b75e60f23e5e83b5dd2b8eb4efb9f8f79bd7a347d148aeb0530f8"
   },
+  {
+    "type": "archive",
+    "url": "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/1.47/wayland-protocols-1.47.tar.gz",
+    "dest": "vendor/p/N-V-__8AAFdWDwA0ktbNUi9pFBHCRN4weXIgIfCrVjfGxqgA",
+    "sha256": "dd2df14ab5f41038257aaedcc4b5fb9ac0ee018f3f0f94af9097028e60d33223"
+  },
   {
     "type": "archive",
     "url": "https://deps.files.ghostty.org/wuffs-122037b39d577ec2db3fd7b2130e7b69ef6cc1807d68607a7c232c958315d381b5cd.tar.gz",
diff --git a/src/apprt/gtk/class/window.zig b/src/apprt/gtk/class/window.zig
index c01cad618..8cef7b765 100644
--- a/src/apprt/gtk/class/window.zig
+++ b/src/apprt/gtk/class/window.zig
@@ -1071,21 +1071,6 @@ pub const Window = extern struct {
         self.syncAppearance();
     }
 
-    fn propGdkSurfaceHeight(
-        _: *gdk.Surface,
-        _: *gobject.ParamSpec,
-        self: *Self,
-    ) callconv(.c) void {
-        // X11 needs to fix blurring on resize, but winproto implementations
-        // could do anything.
-        self.private().winproto.resizeEvent() catch |err| {
-            log.warn(
-                "winproto resize event failed error={}",
-                .{err},
-            );
-        };
-    }
-
     fn propIsActive(
         _: *gtk.Window,
         _: *gobject.ParamSpec,
@@ -1111,7 +1096,7 @@ pub const Window = extern struct {
         };
     }
 
-    fn propGdkSurfaceWidth(
+    fn propGdkSurfaceDims(
         _: *gdk.Surface,
         _: *gobject.ParamSpec,
         self: *Self,
@@ -1282,14 +1267,14 @@ pub const Window = extern struct {
             _ = gobject.Object.signals.notify.connect(
                 gdk_surface,
                 *Self,
-                propGdkSurfaceWidth,
+                propGdkSurfaceDims,
                 self,
                 .{ .detail = "width" },
             );
             _ = gobject.Object.signals.notify.connect(
                 gdk_surface,
                 *Self,
-                propGdkSurfaceHeight,
+                propGdkSurfaceDims,
                 self,
                 .{ .detail = "height" },
             );
diff --git a/src/apprt/gtk/winproto/wayland.zig b/src/apprt/gtk/winproto/wayland.zig
index b90e9d115..b7207e545 100644
--- a/src/apprt/gtk/winproto/wayland.zig
+++ b/src/apprt/gtk/winproto/wayland.zig
@@ -10,6 +10,7 @@ const layer_shell = @import("gtk4-layer-shell");
 
 const wayland = @import("wayland");
 const wl = wayland.client.wl;
+const ext = wayland.client.ext;
 const kde = wayland.client.kde;
 const org = wayland.client.org;
 const xdg = wayland.client.xdg;
@@ -96,8 +97,8 @@ pub const Window = struct {
     /// The context from the app where we can load our Wayland interfaces.
     globals: *Globals,
 
-    /// A token that, when present, indicates that the window is blurred.
-    blur_token: ?*org.KdeKwinBlur = null,
+    /// Object that controls background effects like background blur.
+    bg_effect: ?*ext.BackgroundEffectSurfaceV1 = null,
 
     /// Object that controls the decoration mode (client/server/auto)
     /// of the window.
@@ -148,6 +149,20 @@ pub const Window = struct {
             break :deco deco;
         };
 
+        const bg_effect: ?*ext.BackgroundEffectSurfaceV1 = bg: {
+            const mgr = app.globals.get(.ext_background_effect) orelse
+                break :bg null;
+
+            const bg_effect: *ext.BackgroundEffectSurfaceV1 = mgr.getBackgroundEffect(
+                wl_surface,
+            ) catch |err| {
+                log.warn("could not create background effect object={}", .{err});
+                break :bg null;
+            };
+
+            break :bg bg_effect;
+        };
+
         if (apprt_window.isQuickTerminal()) {
             _ = gdk.Surface.signals.enter_monitor.connect(
                 gdk_surface,
@@ -163,17 +178,22 @@ pub const Window = struct {
             .surface = wl_surface,
             .globals = app.globals,
             .decoration = deco,
+            .bg_effect = bg_effect,
         };
     }
 
     pub fn deinit(self: Window, alloc: Allocator) void {
         _ = alloc;
-        if (self.blur_token) |blur| blur.release();
+        if (self.bg_effect) |bg| bg.destroy();
         if (self.decoration) |deco| deco.release();
         if (self.slide) |slide| slide.release();
     }
 
-    pub fn resizeEvent(_: *Window) !void {}
+    pub fn resizeEvent(self: *Window) !void {
+        self.syncBlur() catch |err| {
+            log.err("failed to sync blur={}", .{err});
+        };
+    }
 
     pub fn syncAppearance(self: *Window) !void {
         self.syncBlur() catch |err| {
@@ -224,28 +244,53 @@ pub const Window = struct {
 
     /// Update the blur state of the window.
     fn syncBlur(self: *Window) !void {
-        const manager = self.globals.get(.kde_blur_manager) orelse return;
+        const compositor = self.globals.get(.compositor) orelse return;
+        const bg = self.bg_effect orelse return;
+        if (!self.globals.state.bg_effect_capabilities.blur) return;
+
         const config = if (self.apprt_window.getConfig()) |v|
             v.get()
         else
             return;
         const blur = config.@"background-blur";
 
-        if (self.blur_token) |tok| {
-            // Only release token when transitioning from blurred -> not blurred
-            if (!blur.enabled()) {
-                manager.unset(self.surface);
-                tok.release();
-                self.blur_token = null;
-            }
-        } else {
-            // Only acquire token when transitioning from not blurred -> blurred
-            if (blur.enabled()) {
-                const tok = try manager.create(self.surface);
-                tok.commit();
-                self.blur_token = tok;
-            }
-        }
+        const region = region: {
+            if (!blur.enabled()) break :region null;
+
+            // NOTE(pluiedev): CSDs are a f--king mistake.
+            // Please, GNOME, stop this nonsense of making a window ~30% bigger
+            // internally than how they really are just for your shadows and
+            // rounded corners and all that fluff. Please. I beg of you.
+
+            const native = self.apprt_window.as(gtk.Native);
+            const surface = native.getSurface() orelse break :region null;
+            const region = try compositor.createRegion();
+
+            var x: f64 = 0;
+            var y: f64 = 0;
+            native.getSurfaceTransform(&x, &y);
+            // Slightly inset the blur region
+            x += 1;
+            y += 1;
+
+            var width: f64 = @floatFromInt(surface.getWidth());
+            var height: f64 = @floatFromInt(surface.getHeight());
+            width -= x * 2;
+            height -= y * 2;
+            if (width <= 0 or height <= 0) break :region null;
+
+            // FIXME: Add rounded corners
+            region.add(
+                @intFromFloat(x),
+                @intFromFloat(y),
+                @intFromFloat(width),
+                @intFromFloat(height),
+            );
+            break :region region;
+        };
+        errdefer if (region) |r| r.destroy();
+
+        bg.setBlurRegion(region);
     }
 
     fn syncDecoration(self: *Window) !void {
diff --git a/src/apprt/gtk/winproto/wayland/Globals.zig b/src/apprt/gtk/winproto/wayland/Globals.zig
index 369d6a473..83052cbeb 100644
--- a/src/apprt/gtk/winproto/wayland/Globals.zig
+++ b/src/apprt/gtk/winproto/wayland/Globals.zig
@@ -5,6 +5,7 @@ const Allocator = std.mem.Allocator;
 
 const wayland = @import("wayland");
 const wl = wayland.client.wl;
+const ext = wayland.client.ext;
 const kde = wayland.client.kde;
 const org = wayland.client.org;
 const xdg = wayland.client.xdg;
@@ -26,7 +27,8 @@ const Binding = struct {
 };
 
 pub const Tag = enum {
-    kde_blur_manager,
+    compositor,
+    ext_background_effect,
     kde_decoration_manager,
     kde_slide_manager,
     kde_output_order,
@@ -34,7 +36,8 @@ pub const Tag = enum {
 
     fn Type(comptime self: Tag) type {
         return switch (self) {
-            .kde_blur_manager => org.KdeKwinBlurManager,
+            .compositor => wl.Compositor,
+            .ext_background_effect => ext.BackgroundEffectManagerV1,
             .kde_decoration_manager => org.KdeKwinServerDecorationManager,
             .kde_slide_manager => org.KdeKwinSlideManager,
             .kde_output_order => kde.OutputOrderV1,
@@ -56,6 +59,8 @@ pub const State = struct {
 
     default_deco_mode: ?org.KdeKwinServerDecorationManager.Mode = null,
 
+    bg_effect_capabilities: ext.BackgroundEffectManagerV1.Capability = .{},
+
     /// Reset cached state derived from kde_output_order_v1.
     fn resetOutputOrder(self: *State, alloc: Allocator) void {
         if (self.primary_output_name) |name| alloc.free(name);
@@ -102,6 +107,11 @@ fn onGlobalAttached(self: *Globals, comptime tag: Tag) void {
     // keeps listener setup and object lifetime in one
     // place and also supports globals that appear later.
     switch (tag) {
+        .ext_background_effect => {
+            const v = self.get(tag) orelse return;
+            v.setListener(*Globals, bgEffectListener, self);
+            self.needs_roundtrip = true;
+        },
         .kde_decoration_manager => {
             const v = self.get(tag) orelse return;
             v.setListener(*Globals, decoManagerListener, self);
@@ -179,6 +189,18 @@ fn registryListener(
     }
 }
 
+fn bgEffectListener(
+    _: *ext.BackgroundEffectManagerV1,
+    event: ext.BackgroundEffectManagerV1.Event,
+    self: *Globals,
+) void {
+    switch (event) {
+        .capabilities => |cap| {
+            self.state.bg_effect_capabilities = cap.flags;
+        },
+    }
+}
+
 fn decoManagerListener(
     _: *org.KdeKwinServerDecorationManager,
     event: org.KdeKwinServerDecorationManager.Event,
diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig
index 4b1ea936d..9dc4162ae 100644
--- a/src/build/SharedDeps.zig
+++ b/src/build/SharedDeps.zig
@@ -626,9 +626,6 @@ fn addGtkNg(
             .wayland_protocols = wayland_protocols_dep.path(""),
         });
 
-        scanner.addCustomProtocol(
-            plasma_wayland_protocols_dep.path("src/protocols/blur.xml"),
-        );
         // FIXME: replace with `zxdg_decoration_v1` once GTK merges https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6398
         scanner.addCustomProtocol(
             plasma_wayland_protocols_dep.path("src/protocols/server-decoration.xml"),
@@ -640,13 +637,14 @@ fn addGtkNg(
             plasma_wayland_protocols_dep.path("src/protocols/kde-output-order-v1.xml"),
         );
         scanner.addSystemProtocol("staging/xdg-activation/xdg-activation-v1.xml");
+        scanner.addSystemProtocol("staging/ext-background-effect/ext-background-effect-v1.xml");
 
         scanner.generate("wl_compositor", 1);
-        scanner.generate("org_kde_kwin_blur_manager", 1);
         scanner.generate("org_kde_kwin_server_decoration_manager", 1);
         scanner.generate("org_kde_kwin_slide_manager", 1);
         scanner.generate("kde_output_order_v1", 1);
         scanner.generate("xdg_activation_v1", 1);
+        scanner.generate("ext_background_effect_manager_v1", 1);
 
         step.root_module.addImport("wayland", b.createModule(.{
             .root_source_file = scanner.result,

From 5abf21c1e229266749fcc711b2b7a07e366a4542 Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen <hi@pluie.me>
Date: Wed, 18 Mar 2026 02:27:53 +0800
Subject: [PATCH 214/391] gtk/wayland: complete blur region calculation

It took me a while and with lots of trial and error to arrive here,
but the end result looks pretty good.
---
 src/apprt/gtk/winproto/BlurRegion.zig | 185 ++++++++++++++++++++++++++
 src/apprt/gtk/winproto/wayland.zig    |  63 +++++----
 2 files changed, 215 insertions(+), 33 deletions(-)
 create mode 100644 src/apprt/gtk/winproto/BlurRegion.zig

diff --git a/src/apprt/gtk/winproto/BlurRegion.zig b/src/apprt/gtk/winproto/BlurRegion.zig
new file mode 100644
index 000000000..e7d8ff7a5
--- /dev/null
+++ b/src/apprt/gtk/winproto/BlurRegion.zig
@@ -0,0 +1,185 @@
+const BlurRegion = @This();
+const std = @import("std");
+const Allocator = std.mem.Allocator;
+
+const gobject = @import("gobject");
+const gdk = @import("gdk");
+const gtk = @import("gtk");
+
+const Window = @import("../winproto.zig").Window;
+const ApprtWindow = @import("../class/window.zig").Window;
+
+slices: std.ArrayList(Slice),
+
+/// A rectangular slice of the blur region.
+// Marked `extern` since we want to be able to use this in X11 directly.
+pub const Slice = extern struct {
+    x: Pos,
+    y: Pos,
+    width: Pos,
+    height: Pos,
+};
+
+// X11 compatibility. Ideally this should just be an `i32` like Wayland,
+// but XLib sucks
+const Pos = c_long;
+
+pub const empty: BlurRegion = .{
+    .slices = .empty,
+};
+
+pub fn deinit(self: *BlurRegion, alloc: Allocator) void {
+    self.slices.deinit(alloc);
+    self.slices = .empty;
+}
+
+// Calculate the blur regions for a window.
+//
+// Since we have rounded corners by default, we need to carve out the
+// pixels on each corner to avoid the "korners bug".
+// (cf. https://github.com/cutefishos/fishui/blob/41d4ba194063a3c7fff4675619b57e6ac0504f06/src/platforms/linux/blurhelper/windowblur.cpp#L134)
+pub fn calcForWindow(
+    alloc: Allocator,
+    window: *ApprtWindow,
+    csd: bool,
+    to_device_coordinates: bool,
+) Allocator.Error!BlurRegion {
+    const native = window.as(gtk.Native);
+    const surface = native.getSurface() orelse return .empty;
+
+    var slices: std.ArrayList(Slice) = .empty;
+    errdefer slices.deinit(alloc);
+
+    // Calculate the primary blur region
+    // (the one that covers most of the screen).
+    // It's easier to do this inside a vector since we have to scale
+    // everything by the scale factor anyways.
+
+    // NOTE(pluiedev): CSDs are a f--king mistake.
+    // Please, GNOME, stop this nonsense of making a window ~30% bigger
+    // internally than how they really are just for your shadows and
+    // rounded corners and all that fluff. Please. I beg of you.
+    const x: Pos, const y: Pos = off: {
+        var x: f64 = 0;
+        var y: f64 = 0;
+        native.getSurfaceTransform(&x, &y);
+        // Slightly inset the corners
+        x += 1;
+        y += 1;
+        break :off .{ @intFromFloat(x), @intFromFloat(y) };
+    };
+
+    var width = @as(Pos, surface.getWidth());
+    var height = @as(Pos, surface.getHeight());
+
+    // Trim off the offsets. Be careful not to get negative.
+    width -= x * 2;
+    height -= y * 2;
+    if (width <= 0 or height <= 0) return .empty;
+
+    // Empirically determined.
+    const are_corners_rounded = rounded: {
+        // This cast should always succeed as all of our windows
+        // should be toplevel. If this fails, something very strange
+        // is going on.
+        const toplevel = gobject.ext.cast(
+            gdk.Toplevel,
+            surface,
+        ) orelse break :rounded false;
+
+        const state = toplevel.getState();
+        if (state.fullscreen or state.maximized or state.tiled)
+            break :rounded false;
+
+        break :rounded csd;
+    };
+
+    const new_slices = try approxRoundedRect(
+        alloc,
+        x,
+        y,
+        width,
+        height,
+        // See https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/css-variables.html#window-radius
+        if (are_corners_rounded) 15 else 0,
+    );
+
+    if (to_device_coordinates) {
+        // Transform surface coordinates to device coordinates.
+        const sf = surface.getScaleFactor();
+        for (new_slices.items) |*s| {
+            s.x *= sf;
+            s.y *= sf;
+            s.width *= sf;
+            s.height *= sf;
+        }
+    }
+
+    return .{ .slices = new_slices };
+}
+
+/// Whether two sets of blur regions are equal.
+pub fn eql(self: BlurRegion, other: BlurRegion) bool {
+    if (self.slices.items.len != other.slices.items.len) return false;
+    for (self.slices.items, other.slices.items) |this, that| {
+        if (!std.meta.eql(this, that)) return false;
+    }
+    return true;
+}
+
+/// Approximate a rounded rectangle with many smaller rectangles.
+fn approxRoundedRect(
+    alloc: Allocator,
+    x: Pos,
+    y: Pos,
+    width: Pos,
+    height: Pos,
+    radius: Pos,
+) Allocator.Error!std.ArrayList(Slice) {
+    const r_f: f32 = @floatFromInt(radius);
+
+    var slices: std.ArrayList(Slice) = .empty;
+    errdefer slices.deinit(alloc);
+
+    // Add the central rectangle
+    try slices.append(alloc, .{
+        .x = x,
+        .y = y + radius,
+        .width = width,
+        .height = height - 2 * radius,
+    });
+
+    // Add the corner rows. This is honestly quite cursed.
+    var row: Pos = 0;
+    while (row < radius) : (row += 1) {
+        // y distance from this row to the center corner circle
+        const dy = @as(f32, @floatFromInt(radius - row)) - 0.5;
+
+        // x distance - as given by the definition of a circle
+        const dx = @sqrt(r_f * r_f - dy * dy);
+
+        // How much each row should be offset, rounded to an integer
+        const row_x: Pos = @intFromFloat(r_f - @round(dx + 0.5));
+
+        // Remove the offset from both ends
+        const row_w = width - 2 * row_x;
+
+        // Top slice
+        try slices.append(alloc, .{
+            .x = x + row_x,
+            .y = y + row,
+            .width = row_w,
+            .height = 1,
+        });
+
+        // Bottom slice
+        try slices.append(alloc, .{
+            .x = x + row_x,
+            .y = y + height - 1 - row,
+            .width = row_w,
+            .height = 1,
+        });
+    }
+
+    return slices;
+}
diff --git a/src/apprt/gtk/winproto/wayland.zig b/src/apprt/gtk/winproto/wayland.zig
index b7207e545..ac4a3ea50 100644
--- a/src/apprt/gtk/winproto/wayland.zig
+++ b/src/apprt/gtk/winproto/wayland.zig
@@ -19,6 +19,7 @@ const Config = @import("../../../config.zig").Config;
 const Globals = @import("wayland/Globals.zig");
 const input = @import("../../../input.zig");
 const ApprtWindow = @import("../class/window.zig").Window;
+const BlurRegion = @import("BlurRegion.zig");
 
 const log = std.log.scoped(.winproto_wayland);
 
@@ -112,6 +113,8 @@ pub const Window = struct {
     /// requesting attention from the user.
     activation_token: ?*xdg.ActivationTokenV1 = null,
 
+    blur_region: BlurRegion = .empty,
+
     pub fn init(
         alloc: Allocator,
         app: *App,
@@ -254,43 +257,37 @@ pub const Window = struct {
             return;
         const blur = config.@"background-blur";
 
-        const region = region: {
-            if (!blur.enabled()) break :region null;
+        if (!blur.enabled()) {
+            self.blur_region.deinit(self.globals.alloc);
+            bg.setBlurRegion(null);
+            return;
+        }
 
-            // NOTE(pluiedev): CSDs are a f--king mistake.
-            // Please, GNOME, stop this nonsense of making a window ~30% bigger
-            // internally than how they really are just for your shadows and
-            // rounded corners and all that fluff. Please. I beg of you.
+        var region: BlurRegion = try .calcForWindow(
+            self.globals.alloc,
+            self.apprt_window,
+            self.clientSideDecorationEnabled(),
+            false,
+        );
+        errdefer region.deinit(self.globals.alloc);
 
-            const native = self.apprt_window.as(gtk.Native);
-            const surface = native.getSurface() orelse break :region null;
-            const region = try compositor.createRegion();
+        if (region.eql(self.blur_region)) {
+            // Region didn't change. Don't do anything.
+            region.deinit(self.globals.alloc);
+            return;
+        }
 
-            var x: f64 = 0;
-            var y: f64 = 0;
-            native.getSurfaceTransform(&x, &y);
-            // Slightly inset the blur region
-            x += 1;
-            y += 1;
+        const wl_region = try compositor.createRegion();
+        errdefer if (wl_region) |r| r.destroy();
+        for (region.slices.items) |s| wl_region.add(
+            @intCast(s.x),
+            @intCast(s.y),
+            @intCast(s.width),
+            @intCast(s.height),
+        );
 
-            var width: f64 = @floatFromInt(surface.getWidth());
-            var height: f64 = @floatFromInt(surface.getHeight());
-            width -= x * 2;
-            height -= y * 2;
-            if (width <= 0 or height <= 0) break :region null;
-
-            // FIXME: Add rounded corners
-            region.add(
-                @intFromFloat(x),
-                @intFromFloat(y),
-                @intFromFloat(width),
-                @intFromFloat(height),
-            );
-            break :region region;
-        };
-        errdefer if (region) |r| r.destroy();
-
-        bg.setBlurRegion(region);
+        bg.setBlurRegion(wl_region);
+        self.blur_region = region;
     }
 
     fn syncDecoration(self: *Window) !void {

From 80ab5d92eab280296bab23067d257b87d1244fab Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen <hi@pluie.me>
Date: Wed, 18 Mar 2026 02:27:53 +0800
Subject: [PATCH 215/391] gtk/x11: use BlurRegion

---
 src/apprt/gtk/winproto/x11.zig | 84 +++++++++++-----------------------
 1 file changed, 26 insertions(+), 58 deletions(-)

diff --git a/src/apprt/gtk/winproto/x11.zig b/src/apprt/gtk/winproto/x11.zig
index 675434fd1..92ecf2700 100644
--- a/src/apprt/gtk/winproto/x11.zig
+++ b/src/apprt/gtk/winproto/x11.zig
@@ -19,6 +19,7 @@ pub const c = @cImport({
 const input = @import("../../../input.zig");
 const Config = @import("../../../config.zig").Config;
 const ApprtWindow = @import("../class/window.zig").Window;
+const BlurRegion = @import("BlurRegion.zig");
 
 const log = std.log.scoped(.gtk_x11);
 
@@ -169,13 +170,13 @@ pub const Window = struct {
     app: *App,
     apprt_window: *ApprtWindow,
     x11_surface: *gdk_x11.X11Surface,
+    alloc: Allocator,
 
-    blur_region: Region = .{},
+    blur_region: BlurRegion = .empty,
 
     // Cache last applied values to avoid redundant X11 property updates.
     // Redundant property updates seem to cause some visual glitches
     // with some window managers: https://github.com/ghostty-org/ghostty/pull/8075
-    last_applied_blur_region: ?Region = null,
     last_applied_decoration_hints: ?MotifWMHints = null,
 
     pub fn init(
@@ -183,8 +184,6 @@ pub const Window = struct {
         app: *App,
         apprt_window: *ApprtWindow,
     ) !Window {
-        _ = alloc;
-
         const surface = apprt_window.as(gtk.Native).getSurface() orelse
             return error.NotX11Surface;
 
@@ -195,6 +194,7 @@ pub const Window = struct {
 
         return .{
             .app = app,
+            .alloc = alloc,
             .apprt_window = apprt_window,
             .x11_surface = x11_surface,
         };
@@ -213,26 +213,6 @@ pub const Window = struct {
     pub fn syncAppearance(self: *Window) !void {
         // The user could have toggled between CSDs and SSDs,
         // therefore we need to recalculate the blur region offset.
-        self.blur_region = blur: {
-            // NOTE(pluiedev): CSDs are a f--king mistake.
-            // Please, GNOME, stop this nonsense of making a window ~30% bigger
-            // internally than how they really are just for your shadows and
-            // rounded corners and all that fluff. Please. I beg of you.
-            var x: f64 = 0;
-            var y: f64 = 0;
-
-            self.apprt_window.as(gtk.Native).getSurfaceTransform(&x, &y);
-
-            // Transform surface coordinates to device coordinates.
-            const scale: f64 = @floatFromInt(self.apprt_window.as(gtk.Widget).getScaleFactor());
-            x *= scale;
-            y *= scale;
-
-            break :blur .{
-                .x = @intFromFloat(x),
-                .y = @intFromFloat(y),
-            };
-        };
         self.syncBlur() catch |err| {
             log.err("failed to synchronize blur={}", .{err});
         };
@@ -249,36 +229,29 @@ pub const Window = struct {
     }
 
     fn syncBlur(self: *Window) !void {
-        // FIXME: This doesn't currently factor in rounded corners on Adwaita,
-        // which means that the blur region will grow slightly outside of the
-        // window borders. Unfortunately, actually calculating the rounded
-        // region can be quite complex without having access to existing APIs
-        // (cf. https://github.com/cutefishos/fishui/blob/41d4ba194063a3c7fff4675619b57e6ac0504f06/src/platforms/linux/blurhelper/windowblur.cpp#L134)
-        // and I think it's not really noticeable enough to justify the effort.
-        // (Wayland also has this visual artifact anyway...)
-
-        const gtk_widget = self.apprt_window.as(gtk.Widget);
         const config = if (self.apprt_window.getConfig()) |v| v.get() else return;
 
         // When blur is disabled, remove the property if it was previously set
         const blur = config.@"background-blur";
         if (!blur.enabled()) {
-            if (self.last_applied_blur_region != null) {
-                try self.deleteProperty(self.app.atoms.kde_blur);
-                self.last_applied_blur_region = null;
-            }
-
+            self.blur_region.deinit(self.alloc);
+            self.blur_region = .empty;
+            try self.deleteProperty(self.app.atoms.kde_blur);
             return;
         }
 
-        // Transform surface coordinates to device coordinates.
-        const scale = gtk_widget.getScaleFactor();
-        self.blur_region.width = gtk_widget.getWidth() * scale;
-        self.blur_region.height = gtk_widget.getHeight() * scale;
+        var region: BlurRegion = try .calcForWindow(
+            self.alloc,
+            self.apprt_window,
+            self.clientSideDecorationEnabled(),
+            true,
+        );
+        errdefer region.deinit(self.alloc);
 
         // Only update X11 properties when the blur region actually changes
-        if (self.last_applied_blur_region) |last| {
-            if (std.meta.eql(self.blur_region, last)) return;
+        if (region.eql(self.blur_region)) {
+            region.deinit(self.alloc);
+            return;
         }
 
         log.debug("set blur={}, window xid={}, region={}", .{
@@ -288,14 +261,14 @@ pub const Window = struct {
         });
 
         try self.changeProperty(
-            Region,
+            BlurRegion.Slice,
             self.app.atoms.kde_blur,
             c.XA_CARDINAL,
             ._32,
             .{ .mode = .replace },
-            &self.blur_region,
+            self.blur_region.slices.items,
         );
-        self.last_applied_blur_region = self.blur_region;
+        self.blur_region = region;
     }
 
     fn syncDecorations(self: *Window) !void {
@@ -335,7 +308,7 @@ pub const Window = struct {
             self.app.atoms.motif_wm_hints,
             ._32,
             .{ .mode = .replace },
-            &hints,
+            &.{hints},
         );
         self.last_applied_decoration_hints = hints;
     }
@@ -410,9 +383,11 @@ pub const Window = struct {
         options: struct {
             mode: PropertyChangeMode,
         },
-        value: *T,
+        values: []const T,
     ) X11Error!void {
-        const data: format.bufferType() = @ptrCast(value);
+        const data: format.bufferType() = @ptrCast(@constCast(values));
+        // The number of "words" that each element `T` occupies.
+        const words_per_elem = @divExact(@sizeOf(T), @sizeOf(format.elemType()));
 
         const status = c.XChangeProperty(
             @ptrCast(@alignCast(self.app.display)),
@@ -422,7 +397,7 @@ pub const Window = struct {
             @intFromEnum(format),
             @intFromEnum(options.mode),
             data,
-            @divExact(@sizeOf(T), @sizeOf(format.elemType())),
+            @intCast(words_per_elem * values.len),
         );
 
         // For some godforsaken reason Xlib alternates between
@@ -498,13 +473,6 @@ const PropertyFormat = enum(c_int) {
     }
 };
 
-const Region = extern struct {
-    x: c_long = 0,
-    y: c_long = 0,
-    width: c_long = 0,
-    height: c_long = 0,
-};
-
 // See Xm/MwmUtil.h, packaged with the Motif Window Manager
 const MotifWMHints = extern struct {
     flags: packed struct(c_ulong) {

From 27fd1c7788a3ebdf347b54c5bc9c1c329f175397 Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen <hi@pluie.me>
Date: Wed, 18 Mar 2026 03:19:22 +0800
Subject: [PATCH 216/391] gtk/winproto: fix memleak & other tweaks

---
 src/apprt/gtk/class/window.zig        |  2 +-
 src/apprt/gtk/winproto.zig            |  4 +-
 src/apprt/gtk/winproto/BlurRegion.zig |  8 ++--
 src/apprt/gtk/winproto/noop.zig       |  3 +-
 src/apprt/gtk/winproto/wayland.zig    |  6 +--
 src/apprt/gtk/winproto/x11.zig        | 66 ++++++++++++++-------------
 6 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/src/apprt/gtk/class/window.zig b/src/apprt/gtk/class/window.zig
index 8cef7b765..bf2a2fe7c 100644
--- a/src/apprt/gtk/class/window.zig
+++ b/src/apprt/gtk/class/window.zig
@@ -1235,7 +1235,7 @@ pub const Window = extern struct {
     fn finalize(self: *Self) callconv(.c) void {
         const priv = self.private();
         priv.tab_bindings.unref();
-        priv.winproto.deinit(Application.default().allocator());
+        priv.winproto.deinit();
 
         gobject.Object.virtual_methods.finalize.call(
             Class.parent,
diff --git a/src/apprt/gtk/winproto.zig b/src/apprt/gtk/winproto.zig
index 6731bfb31..d409d6c26 100644
--- a/src/apprt/gtk/winproto.zig
+++ b/src/apprt/gtk/winproto.zig
@@ -117,9 +117,9 @@ pub const Window = union(Protocol) {
         };
     }
 
-    pub fn deinit(self: *Window, alloc: Allocator) void {
+    pub fn deinit(self: *Window) void {
         switch (self.*) {
-            inline else => |*v| v.deinit(alloc),
+            inline else => |*v| v.deinit(),
         }
     }
 
diff --git a/src/apprt/gtk/winproto/BlurRegion.zig b/src/apprt/gtk/winproto/BlurRegion.zig
index e7d8ff7a5..f3041dae0 100644
--- a/src/apprt/gtk/winproto/BlurRegion.zig
+++ b/src/apprt/gtk/winproto/BlurRegion.zig
@@ -63,9 +63,11 @@ pub fn calcForWindow(
         var x: f64 = 0;
         var y: f64 = 0;
         native.getSurfaceTransform(&x, &y);
-        // Slightly inset the corners
-        x += 1;
-        y += 1;
+        // Slightly inset the corners if we're using CSDs
+        if (csd) {
+            x += 1;
+            y += 1;
+        }
         break :off .{ @intFromFloat(x), @intFromFloat(y) };
     };
 
diff --git a/src/apprt/gtk/winproto/noop.zig b/src/apprt/gtk/winproto/noop.zig
index 0d8cc18ce..950ee0f37 100644
--- a/src/apprt/gtk/winproto/noop.zig
+++ b/src/apprt/gtk/winproto/noop.zig
@@ -46,9 +46,8 @@ pub const Window = struct {
         return .{};
     }
 
-    pub fn deinit(self: Window, alloc: Allocator) void {
+    pub fn deinit(self: *Window) void {
         _ = self;
-        _ = alloc;
     }
 
     pub fn updateConfigEvent(
diff --git a/src/apprt/gtk/winproto/wayland.zig b/src/apprt/gtk/winproto/wayland.zig
index ac4a3ea50..12c7fb8a2 100644
--- a/src/apprt/gtk/winproto/wayland.zig
+++ b/src/apprt/gtk/winproto/wayland.zig
@@ -185,8 +185,8 @@ pub const Window = struct {
         };
     }
 
-    pub fn deinit(self: Window, alloc: Allocator) void {
-        _ = alloc;
+    pub fn deinit(self: *Window) void {
+        self.blur_region.deinit(self.globals.alloc);
         if (self.bg_effect) |bg| bg.destroy();
         if (self.decoration) |deco| deco.release();
         if (self.slide) |slide| slide.release();
@@ -203,7 +203,7 @@ pub const Window = struct {
             log.err("failed to sync blur={}", .{err});
         };
         self.syncDecoration() catch |err| {
-            log.err("failed to sync blur={}", .{err});
+            log.err("failed to sync decoration={}", .{err});
         };
 
         if (self.apprt_window.isQuickTerminal()) {
diff --git a/src/apprt/gtk/winproto/x11.zig b/src/apprt/gtk/winproto/x11.zig
index 92ecf2700..8109959da 100644
--- a/src/apprt/gtk/winproto/x11.zig
+++ b/src/apprt/gtk/winproto/x11.zig
@@ -200,24 +200,25 @@ pub const Window = struct {
         };
     }
 
-    pub fn deinit(self: Window, alloc: Allocator) void {
-        _ = self;
-        _ = alloc;
+    pub fn deinit(self: *Window) void {
+        self.blur_region.deinit(self.alloc);
     }
 
     pub fn resizeEvent(self: *Window) !void {
         // The blur region must update with window resizes
-        try self.syncBlur();
+        self.syncBlur() catch |err| {
+            log.err("failed to sync blur={}", .{err});
+        };
     }
 
     pub fn syncAppearance(self: *Window) !void {
         // The user could have toggled between CSDs and SSDs,
         // therefore we need to recalculate the blur region offset.
         self.syncBlur() catch |err| {
-            log.err("failed to synchronize blur={}", .{err});
+            log.err("failed to sync blur={}", .{err});
         };
         self.syncDecorations() catch |err| {
-            log.err("failed to synchronize decorations={}", .{err});
+            log.err("failed to sync decorations={}", .{err});
         };
     }
 
@@ -233,19 +234,16 @@ pub const Window = struct {
 
         // When blur is disabled, remove the property if it was previously set
         const blur = config.@"background-blur";
-        if (!blur.enabled()) {
-            self.blur_region.deinit(self.alloc);
-            self.blur_region = .empty;
-            try self.deleteProperty(self.app.atoms.kde_blur);
-            return;
-        }
 
-        var region: BlurRegion = try .calcForWindow(
-            self.alloc,
-            self.apprt_window,
-            self.clientSideDecorationEnabled(),
-            true,
-        );
+        var region: BlurRegion = if (blur.enabled())
+            try .calcForWindow(
+                self.alloc,
+                self.apprt_window,
+                self.clientSideDecorationEnabled(),
+                true,
+            )
+        else
+            .empty;
         errdefer region.deinit(self.alloc);
 
         // Only update X11 properties when the blur region actually changes
@@ -254,20 +252,26 @@ pub const Window = struct {
             return;
         }
 
-        log.debug("set blur={}, window xid={}, region={}", .{
-            blur,
-            self.x11_surface.getXid(),
-            self.blur_region,
-        });
+        if (region.slices.items.len > 0) {
+            log.debug("set blur={}, window xid={}, region={}", .{
+                blur,
+                self.x11_surface.getXid(),
+                region,
+            });
 
-        try self.changeProperty(
-            BlurRegion.Slice,
-            self.app.atoms.kde_blur,
-            c.XA_CARDINAL,
-            ._32,
-            .{ .mode = .replace },
-            self.blur_region.slices.items,
-        );
+            try self.changeProperty(
+                BlurRegion.Slice,
+                self.app.atoms.kde_blur,
+                c.XA_CARDINAL,
+                ._32,
+                .{ .mode = .replace },
+                region.slices.items,
+            );
+        } else {
+            try self.deleteProperty(self.app.atoms.kde_blur);
+        }
+
+        self.blur_region.deinit(self.alloc);
         self.blur_region = region;
     }
 

From 45ccc69a4984af7dcda08ec34920b6a78031fee1 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2026 21:05:51 +0000
Subject: [PATCH 217/391] Update VOUCHED list (#11605)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11603#discussioncomment-16184007)
from @jcollie.

Vouch: @philocalyst

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index db08a93c4..7029e4dd6 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -145,6 +145,7 @@ pangoraw
 pauley-unsaturated
 peilingjiang
 peterdavehello
+philocalyst
 phush0
 piedrahitac
 pluiedev

From a1d7ad92434a6c1c5b5a2b436a15e0573790b6cc Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 17 Mar 2026 14:33:01 -0700
Subject: [PATCH 218/391] terminal: extract size report encoder

Size report escape sequences were previously formatted inline in
Termio.sizeReportLocked, and termio.Message carried a duplicate enum for
report styles. That made the encoding logic harder to reuse and kept
the style type scoped to termio.

Move the encoding into terminal.size_report and export it through
terminal.main. The encoder now takes renderer.Size directly and derives
grid and pixel dimensions from one source of truth. termio.Message now
aliases terminal.size_report.Style, and Termio writes reports via the
shared encoder.
---
 src/renderer/size.zig        |   5 +-
 src/terminal/main.zig        |   1 +
 src/terminal/size_report.zig | 162 +++++++++++++++++++++++++++++++++++
 src/termio/Termio.zig        |  50 +++--------
 src/termio/message.zig       |   9 +-
 5 files changed, 180 insertions(+), 47 deletions(-)
 create mode 100644 src/terminal/size_report.zig

diff --git a/src/renderer/size.zig b/src/renderer/size.zig
index 565e95e2c..7a022cdb4 100644
--- a/src/renderer/size.zig
+++ b/src/renderer/size.zig
@@ -1,8 +1,7 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const configpkg = @import("../config.zig");
-const font = @import("../font/main.zig");
-const terminal = @import("../terminal/main.zig");
+const terminal_size = @import("../terminal/size.zig");
 
 const log = std.log.scoped(.renderer_size);
 
@@ -225,7 +224,7 @@ pub const ScreenSize = extern struct {
 
 /// The dimensions of the grid itself, in rows/columns units.
 pub const GridSize = extern struct {
-    pub const Unit = terminal.size.CellCountInt;
+    pub const Unit = terminal_size.CellCountInt;
 
     columns: Unit = 0,
     rows: Unit = 0,
diff --git a/src/terminal/main.zig b/src/terminal/main.zig
index bbdea1542..17cc3a81d 100644
--- a/src/terminal/main.zig
+++ b/src/terminal/main.zig
@@ -21,6 +21,7 @@ pub const parse_table = @import("parse_table.zig");
 pub const search = @import("search.zig");
 pub const sgr = @import("sgr.zig");
 pub const size = @import("size.zig");
+pub const size_report = @import("size_report.zig");
 pub const tmux = if (options.tmux_control_mode) @import("tmux.zig") else struct {};
 pub const x11_color = @import("x11_color.zig");
 
diff --git a/src/terminal/size_report.zig b/src/terminal/size_report.zig
new file mode 100644
index 000000000..97fa8d277
--- /dev/null
+++ b/src/terminal/size_report.zig
@@ -0,0 +1,162 @@
+const std = @import("std");
+const CellCountInt = @import("size.zig").CellCountInt;
+
+/// Output formats for terminal size reports written to the PTY.
+pub const Style = enum {
+    /// In-band size reports (mode 2048)
+    mode_2048,
+
+    /// XTWINOPS: report text area size in pixels
+    csi_14_t,
+
+    /// XTWINOPS: report cell size in pixels
+    csi_16_t,
+
+    /// XTWINOPS: report text area size in characters
+    csi_18_t,
+};
+
+/// Runtime size values used to encode terminal size reports.
+pub const Size = struct {
+    /// Terminal row count in cells.
+    rows: CellCountInt,
+
+    /// Terminal column count in cells.
+    columns: CellCountInt,
+
+    /// Width of a single terminal cell in pixels.
+    cell_width: u32,
+
+    /// Height of a single terminal cell in pixels.
+    cell_height: u32,
+
+    pub fn widthPixels(self: Size) u64 {
+        return @as(u64, self.columns) * @as(u64, self.cell_width);
+    }
+
+    pub fn heightPixels(self: Size) u64 {
+        return @as(u64, self.rows) * @as(u64, self.cell_height);
+    }
+};
+
+/// Encode a terminal size report sequence.
+pub fn encode(
+    writer: *std.Io.Writer,
+    style: Style,
+    size: Size,
+) std.Io.Writer.Error!void {
+    switch (style) {
+        .mode_2048 => try writer.print(
+            "\x1B[48;{};{};{};{}t",
+            .{
+                size.rows,
+                size.columns,
+                size.heightPixels(),
+                size.widthPixels(),
+            },
+        ),
+
+        .csi_14_t => try writer.print(
+            "\x1b[4;{};{}t",
+            .{
+                size.heightPixels(),
+                size.widthPixels(),
+            },
+        ),
+
+        .csi_16_t => try writer.print(
+            "\x1b[6;{};{}t",
+            .{
+                size.cell_height,
+                size.cell_width,
+            },
+        ),
+
+        .csi_18_t => try writer.print(
+            "\x1b[8;{};{}t",
+            .{
+                size.rows,
+                size.columns,
+            },
+        ),
+    }
+}
+
+fn testSize() Size {
+    return .{
+        .rows = 24,
+        .columns = 80,
+        .cell_width = 9,
+        .cell_height = 18,
+    };
+}
+
+test "encode mode 2048" {
+    var buf: [64]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    try encode(&writer, .mode_2048, testSize());
+
+    try std.testing.expectEqualStrings("\x1B[48;24;80;432;720t", writer.buffered());
+}
+
+test "encode csi 14 t" {
+    var buf: [64]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    try encode(&writer, .csi_14_t, testSize());
+
+    try std.testing.expectEqualStrings("\x1b[4;432;720t", writer.buffered());
+}
+
+test "encode csi 16 t" {
+    var buf: [64]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    try encode(&writer, .csi_16_t, testSize());
+
+    try std.testing.expectEqualStrings("\x1b[6;18;9t", writer.buffered());
+}
+
+test "encode csi 18 t" {
+    var buf: [64]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    try encode(&writer, .csi_18_t, testSize());
+
+    try std.testing.expectEqualStrings("\x1b[8;24;80t", writer.buffered());
+}
+
+test "encode max values for all fields" {
+    const max_size: Size = .{
+        .rows = std.math.maxInt(@FieldType(Size, "rows")),
+        .columns = std.math.maxInt(@FieldType(Size, "columns")),
+        .cell_width = std.math.maxInt(@FieldType(Size, "cell_width")),
+        .cell_height = std.math.maxInt(@FieldType(Size, "cell_height")),
+    };
+
+    const Case = struct {
+        style: Style,
+        expected: []const u8,
+    };
+
+    inline for ([_]Case{
+        .{
+            .style = .mode_2048,
+            .expected = "\x1B[48;65535;65535;281470681677825;281470681677825t",
+        },
+        .{
+            .style = .csi_14_t,
+            .expected = "\x1b[4;281470681677825;281470681677825t",
+        },
+        .{
+            .style = .csi_16_t,
+            .expected = "\x1b[6;4294967295;4294967295t",
+        },
+        .{
+            .style = .csi_18_t,
+            .expected = "\x1b[8;65535;65535t",
+        },
+    }) |case| {
+        var buf: [128]u8 = undefined;
+        var writer: std.Io.Writer = .fixed(&buf);
+        try encode(&writer, case.style, max_size);
+        try std.testing.expectEqualStrings(case.expected, writer.buffered());
+    }
+}
diff --git a/src/termio/Termio.zig b/src/termio/Termio.zig
index 73e1c46d5..4a99e8221 100644
--- a/src/termio/Termio.zig
+++ b/src/termio/Termio.zig
@@ -526,48 +526,24 @@ pub fn sizeReport(self: *Termio, td: *ThreadData, style: termio.Message.SizeRepo
 
 fn sizeReportLocked(self: *Termio, td: *ThreadData, style: termio.Message.SizeReport) !void {
     const grid_size = self.size.grid();
+    const report_size: terminalpkg.size_report.Size = .{
+        .rows = grid_size.rows,
+        .columns = grid_size.columns,
+        .cell_width = self.size.cell.width,
+        .cell_height = self.size.cell.height,
+    };
 
     // 1024 bytes should be enough for size report since report
     // in columns and pixels.
     var buf: [1024]u8 = undefined;
-    const message = switch (style) {
-        .mode_2048 => try std.fmt.bufPrint(
-            &buf,
-            "\x1B[48;{};{};{};{}t",
-            .{
-                grid_size.rows,
-                grid_size.columns,
-                grid_size.rows * self.size.cell.height,
-                grid_size.columns * self.size.cell.width,
-            },
-        ),
-        .csi_14_t => try std.fmt.bufPrint(
-            &buf,
-            "\x1b[4;{};{}t",
-            .{
-                grid_size.rows * self.size.cell.height,
-                grid_size.columns * self.size.cell.width,
-            },
-        ),
-        .csi_16_t => try std.fmt.bufPrint(
-            &buf,
-            "\x1b[6;{};{}t",
-            .{
-                self.size.cell.height,
-                self.size.cell.width,
-            },
-        ),
-        .csi_18_t => try std.fmt.bufPrint(
-            &buf,
-            "\x1b[8;{};{}t",
-            .{
-                grid_size.rows,
-                grid_size.columns,
-            },
-        ),
-    };
+    var writer: std.Io.Writer = .fixed(&buf);
+    try terminalpkg.size_report.encode(
+        &writer,
+        style,
+        report_size,
+    );
 
-    try self.queueWrite(td, message, false);
+    try self.queueWrite(td, writer.buffered(), false);
 }
 
 /// Reset the synchronized output mode. This is usually called by timer
diff --git a/src/termio/message.zig b/src/termio/message.zig
index d7a59bf5e..4ee7f245e 100644
--- a/src/termio/message.zig
+++ b/src/termio/message.zig
@@ -93,13 +93,8 @@ pub const Message = union(enum) {
         };
     }
 
-    /// The types of size reports that we support
-    pub const SizeReport = enum {
-        mode_2048,
-        csi_14_t,
-        csi_16_t,
-        csi_18_t,
-    };
+    /// The types of size reports that we support.
+    pub const SizeReport = terminal.size_report.Style;
 };
 
 test {

From 7bf89740dd86c28f40c2d5ab9cd001cbf41b864a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 17 Mar 2026 16:28:21 -0700
Subject: [PATCH 219/391] vt: expose size_report encoding in the C API

Add ghostty_size_report_encode() to libghostty-vt, following the
same pattern as focus encoding: a single stateless function that
writes a terminal size report escape sequence into a caller-provided
buffer.

The size_report.zig Style enum and Size struct now use lib.Enum and
lib.Struct so the types are automatically C-compatible when building
with c_abi, eliminating the need for duplicate type definitions in
the C wrapper. The C wrapper in c/size_report.zig re-exports these
types directly and provides the callconv(.c) encode entry point.

Supports mode 2048 in-band reports and XTWINOPS responses (CSI 14 t,
CSI 16 t, CSI 18 t).
---
 include/ghostty/vt.h             |   1 +
 include/ghostty/vt/size_report.h | 126 +++++++++++++++++++++++++++++++
 src/lib_vt.zig                   |   2 +
 src/terminal/c/main.zig          |   4 +
 src/terminal/c/size_report.zig   |  81 ++++++++++++++++++++
 src/terminal/size_report.zig     |  50 ++++++------
 6 files changed, 239 insertions(+), 25 deletions(-)
 create mode 100644 include/ghostty/vt/size_report.h
 create mode 100644 src/terminal/c/size_report.zig

diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index 34a7f2d4b..5b670f80a 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -102,6 +102,7 @@ extern "C" {
 #include <ghostty/vt/modes.h>
 #include <ghostty/vt/mouse.h>
 #include <ghostty/vt/paste.h>
+#include <ghostty/vt/size_report.h>
 #include <ghostty/vt/wasm.h>
 
 #ifdef __cplusplus
diff --git a/include/ghostty/vt/size_report.h b/include/ghostty/vt/size_report.h
new file mode 100644
index 000000000..4622b5bcf
--- /dev/null
+++ b/include/ghostty/vt/size_report.h
@@ -0,0 +1,126 @@
+/**
+ * @file size_report.h
+ *
+ * Size report encoding - encode terminal size reports into escape sequences.
+ */
+
+#ifndef GHOSTTY_VT_SIZE_REPORT_H
+#define GHOSTTY_VT_SIZE_REPORT_H
+
+/** @defgroup size_report Size Report Encoding
+ *
+ * Utilities for encoding terminal size reports into escape sequences,
+ * supporting in-band size reports (mode 2048) and XTWINOPS responses
+ * (CSI 14 t, CSI 16 t, CSI 18 t).
+ *
+ * ## Basic Usage
+ *
+ * Use ghostty_size_report_encode() to encode a size report into a
+ * caller-provided buffer. If the buffer is too small, the function
+ * returns GHOSTTY_OUT_OF_SPACE and sets the required size in the
+ * output parameter.
+ *
+ * ## Example
+ *
+ * @code{.c}
+ * #include <stdio.h>
+ * #include <ghostty/vt.h>
+ *
+ * int main() {
+ *   GhosttySizeReportSize size = {
+ *     .rows = 24,
+ *     .columns = 80,
+ *     .cell_width = 9,
+ *     .cell_height = 18,
+ *   };
+ *
+ *   char buf[64];
+ *   size_t written = 0;
+ *
+ *   GhosttyResult result = ghostty_size_report_encode(
+ *       GHOSTTY_SIZE_REPORT_MODE_2048, size, buf, sizeof(buf), &written);
+ *
+ *   if (result == GHOSTTY_SUCCESS) {
+ *     printf("Encoded %zu bytes: ", written);
+ *     fwrite(buf, 1, written, stdout);
+ *     printf("\n");
+ *   }
+ *
+ *   return 0;
+ * }
+ * @endcode
+ *
+ * @{
+ */
+
+#include <stddef.h>
+#include <stdint.h>
+#include <ghostty/vt/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Size report style.
+ *
+ * Determines the output format for the terminal size report.
+ */
+typedef enum {
+    /** In-band size report (mode 2048): ESC [ 48 ; rows ; cols ; height ; width t */
+    GHOSTTY_SIZE_REPORT_MODE_2048 = 0,
+    /** XTWINOPS text area size in pixels: ESC [ 4 ; height ; width t */
+    GHOSTTY_SIZE_REPORT_CSI_14_T = 1,
+    /** XTWINOPS cell size in pixels: ESC [ 6 ; height ; width t */
+    GHOSTTY_SIZE_REPORT_CSI_16_T = 2,
+    /** XTWINOPS text area size in characters: ESC [ 8 ; rows ; cols t */
+    GHOSTTY_SIZE_REPORT_CSI_18_T = 3,
+} GhosttySizeReportStyle;
+
+/**
+ * Terminal size information for encoding size reports.
+ */
+typedef struct {
+    /** Terminal row count in cells. */
+    uint16_t rows;
+    /** Terminal column count in cells. */
+    uint16_t columns;
+    /** Width of a single terminal cell in pixels. */
+    uint32_t cell_width;
+    /** Height of a single terminal cell in pixels. */
+    uint32_t cell_height;
+} GhosttySizeReportSize;
+
+/**
+ * Encode a terminal size report into an escape sequence.
+ *
+ * Encodes a size report in the format specified by @p style into the
+ * provided buffer.
+ *
+ * If the buffer is too small, the function returns GHOSTTY_OUT_OF_SPACE
+ * and writes the required buffer size to @p out_written. The caller can
+ * then retry with a sufficiently sized buffer.
+ *
+ * @param style The size report format to encode
+ * @param size Terminal size information
+ * @param buf Output buffer to write the encoded sequence into (may be NULL)
+ * @param buf_len Size of the output buffer in bytes
+ * @param[out] out_written On success, the number of bytes written. On
+ *             GHOSTTY_OUT_OF_SPACE, the required buffer size.
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_OUT_OF_SPACE if the buffer
+ *         is too small
+ */
+GhosttyResult ghostty_size_report_encode(
+    GhosttySizeReportStyle style,
+    GhosttySizeReportSize size,
+    char* buf,
+    size_t buf_len,
+    size_t* out_written);
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @} */
+
+#endif /* GHOSTTY_VT_SIZE_REPORT_H */
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 16b47a6be..aabd78592 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -53,6 +53,7 @@ pub const RenderState = terminal.RenderState;
 pub const Screen = terminal.Screen;
 pub const ScreenSet = terminal.ScreenSet;
 pub const Selection = terminal.Selection;
+pub const size_report = terminal.size_report;
 pub const SizeReportStyle = terminal.SizeReportStyle;
 pub const StringMap = terminal.StringMap;
 pub const Style = terminal.Style;
@@ -167,6 +168,7 @@ comptime {
         @export(&c.focus_encode, .{ .name = "ghostty_focus_encode" });
         @export(&c.mode_report_encode, .{ .name = "ghostty_mode_report_encode" });
         @export(&c.paste_is_safe, .{ .name = "ghostty_paste_is_safe" });
+        @export(&c.size_report_encode, .{ .name = "ghostty_size_report_encode" });
         @export(&c.color_rgb_get, .{ .name = "ghostty_color_rgb_get" });
         @export(&c.sgr_new, .{ .name = "ghostty_sgr_new" });
         @export(&c.sgr_free, .{ .name = "ghostty_sgr_free" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index c8388ef08..72fa74345 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -9,6 +9,7 @@ pub const mouse_event = @import("mouse_event.zig");
 pub const mouse_encode = @import("mouse_encode.zig");
 pub const paste = @import("paste.zig");
 pub const sgr = @import("sgr.zig");
+pub const size_report = @import("size_report.zig");
 pub const terminal = @import("terminal.zig");
 
 // The full C API, unexported.
@@ -87,6 +88,8 @@ pub const mouse_encoder_encode = mouse_encode.encode;
 
 pub const paste_is_safe = paste.is_safe;
 
+pub const size_report_encode = size_report.encode;
+
 pub const terminal_new = terminal.new;
 pub const terminal_free = terminal.free;
 pub const terminal_reset = terminal.reset;
@@ -108,6 +111,7 @@ test {
     _ = mouse_encode;
     _ = paste;
     _ = sgr;
+    _ = size_report;
     _ = terminal;
 
     // We want to make sure we run the tests for the C allocator interface.
diff --git a/src/terminal/c/size_report.zig b/src/terminal/c/size_report.zig
new file mode 100644
index 000000000..dac909a5c
--- /dev/null
+++ b/src/terminal/c/size_report.zig
@@ -0,0 +1,81 @@
+const std = @import("std");
+const terminal_size_report = @import("../size_report.zig");
+const Result = @import("result.zig").Result;
+
+/// C: GhosttySizeReportStyle
+pub const Style = terminal_size_report.Style;
+
+/// C: GhosttySizeReportSize
+pub const Size = terminal_size_report.Size;
+
+pub fn encode(
+    style: Style,
+    size: Size,
+    out_: ?[*]u8,
+    out_len: usize,
+    out_written: *usize,
+) callconv(.c) Result {
+    var writer: std.Io.Writer = .fixed(if (out_) |out| out[0..out_len] else &.{});
+    terminal_size_report.encode(&writer, style, size) catch |err| switch (err) {
+        error.WriteFailed => {
+            var discarding: std.Io.Writer.Discarding = .init(&.{});
+            terminal_size_report.encode(&discarding.writer, style, size) catch unreachable;
+            out_written.* = @intCast(discarding.count);
+            return .out_of_space;
+        },
+    };
+
+    out_written.* = writer.end;
+    return .success;
+}
+
+test "encode mode 2048" {
+    var buf: [64]u8 = undefined;
+    var written: usize = 0;
+    const result = encode(.mode_2048, .{
+        .rows = 24,
+        .columns = 80,
+        .cell_width = 9,
+        .cell_height = 18,
+    }, &buf, buf.len, &written);
+    try std.testing.expectEqual(.success, result);
+    try std.testing.expectEqualStrings("\x1B[48;24;80;432;720t", buf[0..written]);
+}
+
+test "encode csi 14 t" {
+    var buf: [64]u8 = undefined;
+    var written: usize = 0;
+    const result = encode(.csi_14_t, .{
+        .rows = 24,
+        .columns = 80,
+        .cell_width = 9,
+        .cell_height = 18,
+    }, &buf, buf.len, &written);
+    try std.testing.expectEqual(.success, result);
+    try std.testing.expectEqualStrings("\x1b[4;432;720t", buf[0..written]);
+}
+
+test "encode with insufficient buffer" {
+    var buf: [1]u8 = undefined;
+    var written: usize = 0;
+    const result = encode(.csi_18_t, .{
+        .rows = 24,
+        .columns = 80,
+        .cell_width = 9,
+        .cell_height = 18,
+    }, &buf, buf.len, &written);
+    try std.testing.expectEqual(.out_of_space, result);
+    try std.testing.expect(written > 1);
+}
+
+test "encode with null buffer" {
+    var written: usize = 0;
+    const result = encode(.csi_18_t, .{
+        .rows = 24,
+        .columns = 80,
+        .cell_width = 9,
+        .cell_height = 18,
+    }, null, 0, &written);
+    try std.testing.expectEqual(.out_of_space, result);
+    try std.testing.expect(written > 0);
+}
diff --git a/src/terminal/size_report.zig b/src/terminal/size_report.zig
index 97fa8d277..d8089f96e 100644
--- a/src/terminal/size_report.zig
+++ b/src/terminal/size_report.zig
@@ -1,23 +1,23 @@
 const std = @import("std");
+const build_options = @import("terminal_options");
+const lib = @import("../lib/main.zig");
+const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
 const CellCountInt = @import("size.zig").CellCountInt;
 
 /// Output formats for terminal size reports written to the PTY.
-pub const Style = enum {
-    /// In-band size reports (mode 2048)
-    mode_2048,
-
-    /// XTWINOPS: report text area size in pixels
-    csi_14_t,
-
-    /// XTWINOPS: report cell size in pixels
-    csi_16_t,
-
-    /// XTWINOPS: report text area size in characters
-    csi_18_t,
-};
+pub const Style = lib.Enum(lib_target, &.{
+    // In-band size reports (mode 2048)
+    "mode_2048",
+    // XTWINOPS: report text area size in pixels
+    "csi_14_t",
+    // XTWINOPS: report cell size in pixels
+    "csi_16_t",
+    // XTWINOPS: report text area size in characters
+    "csi_18_t",
+});
 
 /// Runtime size values used to encode terminal size reports.
-pub const Size = struct {
+pub const Size = lib.Struct(lib_target, struct {
     /// Terminal row count in cells.
     rows: CellCountInt,
 
@@ -29,15 +29,15 @@ pub const Size = struct {
 
     /// Height of a single terminal cell in pixels.
     cell_height: u32,
+});
 
-    pub fn widthPixels(self: Size) u64 {
-        return @as(u64, self.columns) * @as(u64, self.cell_width);
-    }
+fn widthPixels(s: Size) u64 {
+    return @as(u64, s.columns) * @as(u64, s.cell_width);
+}
 
-    pub fn heightPixels(self: Size) u64 {
-        return @as(u64, self.rows) * @as(u64, self.cell_height);
-    }
-};
+fn heightPixels(s: Size) u64 {
+    return @as(u64, s.rows) * @as(u64, s.cell_height);
+}
 
 /// Encode a terminal size report sequence.
 pub fn encode(
@@ -51,16 +51,16 @@ pub fn encode(
             .{
                 size.rows,
                 size.columns,
-                size.heightPixels(),
-                size.widthPixels(),
+                heightPixels(size),
+                widthPixels(size),
             },
         ),
 
         .csi_14_t => try writer.print(
             "\x1b[4;{};{}t",
             .{
-                size.heightPixels(),
-                size.widthPixels(),
+                heightPixels(size),
+                widthPixels(size),
             },
         ),
 

From e01046af158cef2e324ae153e73381d544ed3cc6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 17 Mar 2026 16:47:56 -0700
Subject: [PATCH 220/391] docs: extract focus encoding example into standalone
 project

Extract the inline code example from focus.h into a standalone
buildable example at example/c-vt-encode-focus. The header now
uses a Doxygen @snippet tag to include the code from the example
source file, so the documentation stays in sync with code that
is verified to compile and run.
---
 example/c-vt-encode-focus/README.md     | 17 ++++++++++
 example/c-vt-encode-focus/build.zig     | 42 +++++++++++++++++++++++++
 example/c-vt-encode-focus/build.zig.zon | 24 ++++++++++++++
 example/c-vt-encode-focus/src/main.c    | 20 ++++++++++++
 include/ghostty/vt/focus.h              | 21 +------------
 5 files changed, 104 insertions(+), 20 deletions(-)
 create mode 100644 example/c-vt-encode-focus/README.md
 create mode 100644 example/c-vt-encode-focus/build.zig
 create mode 100644 example/c-vt-encode-focus/build.zig.zon
 create mode 100644 example/c-vt-encode-focus/src/main.c

diff --git a/example/c-vt-encode-focus/README.md b/example/c-vt-encode-focus/README.md
new file mode 100644
index 000000000..f433e8808
--- /dev/null
+++ b/example/c-vt-encode-focus/README.md
@@ -0,0 +1,17 @@
+# Example: `ghostty-vt` Encode Focus
+
+This contains a simple example of how to use the `ghostty-vt` focus
+encoding API to encode focus gained/lost events into escape sequences.
+
+This uses a `build.zig` and `Zig` to build the C program so that we
+can reuse a lot of our build logic and depend directly on our source
+tree, but Ghostty emits a standard C library that can be used with any
+C tooling.
+
+## Usage
+
+Run the program:
+
+```shell-session
+zig build run
+```
diff --git a/example/c-vt-encode-focus/build.zig b/example/c-vt-encode-focus/build.zig
new file mode 100644
index 000000000..2904371fb
--- /dev/null
+++ b/example/c-vt-encode-focus/build.zig
@@ -0,0 +1,42 @@
+const std = @import("std");
+
+pub fn build(b: *std.Build) void {
+    const target = b.standardTargetOptions(.{});
+    const optimize = b.standardOptimizeOption(.{});
+
+    const run_step = b.step("run", "Run the app");
+
+    const exe_mod = b.createModule(.{
+        .target = target,
+        .optimize = optimize,
+    });
+    exe_mod.addCSourceFiles(.{
+        .root = b.path("src"),
+        .files = &.{"main.c"},
+    });
+
+    // You'll want to use a lazy dependency here so that ghostty is only
+    // downloaded if you actually need it.
+    if (b.lazyDependency("ghostty", .{
+        // Setting simd to false will force a pure static build that
+        // doesn't even require libc, but it has a significant performance
+        // penalty. If your embedding app requires libc anyway, you should
+        // always keep simd enabled.
+        // .simd = false,
+    })) |dep| {
+        exe_mod.linkLibrary(dep.artifact("ghostty-vt"));
+    }
+
+    // Exe
+    const exe = b.addExecutable(.{
+        .name = "c_vt_encode_focus",
+        .root_module = exe_mod,
+    });
+    b.installArtifact(exe);
+
+    // Run
+    const run_cmd = b.addRunArtifact(exe);
+    run_cmd.step.dependOn(b.getInstallStep());
+    if (b.args) |args| run_cmd.addArgs(args);
+    run_step.dependOn(&run_cmd.step);
+}
diff --git a/example/c-vt-encode-focus/build.zig.zon b/example/c-vt-encode-focus/build.zig.zon
new file mode 100644
index 000000000..0da20475c
--- /dev/null
+++ b/example/c-vt-encode-focus/build.zig.zon
@@ -0,0 +1,24 @@
+.{
+    .name = .c_vt_encode_focus,
+    .version = "0.0.0",
+    .fingerprint = 0x89f01fd829fcc550,
+    .minimum_zig_version = "0.15.1",
+    .dependencies = .{
+        // Ghostty dependency. In reality, you'd probably use a URL-based
+        // dependency like the one showed (and commented out) below this one.
+        // We use a path dependency here for simplicity and to ensure our
+        // examples always test against the source they're bundled with.
+        .ghostty = .{ .path = "../../" },
+
+        // Example of what a URL-based dependency looks like:
+        // .ghostty = .{
+        //     .url = "https://github.com/ghostty-org/ghostty/archive/COMMIT.tar.gz",
+        //     .hash = "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO36s",
+        // },
+    },
+    .paths = .{
+        "build.zig",
+        "build.zig.zon",
+        "src",
+    },
+}
diff --git a/example/c-vt-encode-focus/src/main.c b/example/c-vt-encode-focus/src/main.c
new file mode 100644
index 000000000..15854792f
--- /dev/null
+++ b/example/c-vt-encode-focus/src/main.c
@@ -0,0 +1,20 @@
+#include <stdio.h>
+#include <ghostty/vt.h>
+
+//! [focus-encode]
+int main() {
+  char buf[8];
+  size_t written = 0;
+
+  GhosttyResult result = ghostty_focus_encode(
+      GHOSTTY_FOCUS_GAINED, buf, sizeof(buf), &written);
+
+  if (result == GHOSTTY_SUCCESS) {
+    printf("Encoded %zu bytes: ", written);
+    fwrite(buf, 1, written, stdout);
+    printf("\n");
+  }
+
+  return 0;
+}
+//! [focus-encode]
diff --git a/include/ghostty/vt/focus.h b/include/ghostty/vt/focus.h
index ea3618bc8..e29fe6a66 100644
--- a/include/ghostty/vt/focus.h
+++ b/include/ghostty/vt/focus.h
@@ -20,26 +20,7 @@
  *
  * ## Example
  *
- * @code{.c}
- * #include <stdio.h>
- * #include <ghostty/vt.h>
- *
- * int main() {
- *   char buf[8];
- *   size_t written = 0;
- *
- *   GhosttyResult result = ghostty_focus_encode(
- *       GHOSTTY_FOCUS_GAINED, buf, sizeof(buf), &written);
- *
- *   if (result == GHOSTTY_SUCCESS) {
- *     printf("Encoded %zu bytes: ", written);
- *     fwrite(buf, 1, written, stdout);
- *     printf("\n");
- *   }
- *
- *   return 0;
- * }
- * @endcode
+ * @snippet c-vt-encode-focus/src/main.c focus-encode
  *
  * @{
  */

From bb3b3ba6150b55c251e05fd205a1da5b8c34ec5f Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 17 Mar 2026 16:51:03 -0700
Subject: [PATCH 221/391] ci: dynamically discover example directories for
 build-examples

Replace the hardcoded matrix list in the build-examples job with a
dynamic list-examples job that discovers all subdirectories under
example/ at runtime. This uses ls/jq to produce a JSON array and
fromJSON() to feed it into the matrix, so new examples are picked
up automatically without updating the workflow.
---
 .github/workflows/test.yml | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 501e2979f..872e41352 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -167,23 +167,30 @@ jobs:
       - name: Build Benchmarks
         run: nix develop -c zig build -Demit-bench
 
+  list-examples:
+    if: github.repository == 'ghostty-org/ghostty' && needs.skip.outputs.skip != 'true'
+    needs: skip
+    runs-on: namespace-profile-ghostty-xsm
+    outputs:
+      dirs: ${{ steps.list.outputs.dirs }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - id: list
+        name: List example directories
+        run: |
+          dirs=$(ls -d example/*/ | xargs -n1 basename | jq -R -s -c 'split("\n") | map(select(. != ""))')
+          echo "$dirs" | jq .
+          echo "dirs=$dirs" >> "$GITHUB_OUTPUT"
+
   build-examples:
     strategy:
       fail-fast: false
       matrix:
-        dir:
-          [
-            c-vt,
-            c-vt-key-encode,
-            c-vt-paste,
-            c-vt-sgr,
-            zig-formatter,
-            zig-vt,
-            zig-vt-stream,
-          ]
+        dir: ${{ fromJSON(needs.list-examples.outputs.dirs) }}
     name: Example ${{ matrix.dir }}
-    runs-on: namespace-profile-ghostty-sm
-    needs: test
+    runs-on: namespace-profile-ghostty-xsm
+    needs: [test, list-examples]
     env:
       ZIG_LOCAL_CACHE_DIR: /zig/local-cache
       ZIG_GLOBAL_CACHE_DIR: /zig/global-cache

From 15b8976d643de69df2168aa99320557e6b95bc02 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 17 Mar 2026 17:00:51 -0700
Subject: [PATCH 222/391] docs: extract inline code examples into standalone
 projects

Extract inline @code blocks from vt headers (size_report.h, modes.h,
sgr.h, paste.h, mouse.h, key.h) into standalone buildable examples
under example/. Each header now uses Doxygen @snippet tags to include
code from the example source files, keeping documentation in sync
with code that is verified to compile and run.

New example projects: c-vt-size-report and c-vt-modes. Existing
examples (c-vt-sgr, c-vt-paste, c-vt-mouse-encode, c-vt-key-encode)
gain snippet markers so their code can be referenced from the headers.
Conceptual snippets in key.h, mouse.h, and key/encoder.h that show
terminal-state usage patterns remain inline since they cannot be
compiled standalone.
---
 example/c-vt-key-encode/src/main.c     | 45 +++++------------
 example/c-vt-modes/README.md           | 18 +++++++
 example/c-vt-modes/build.zig           | 42 ++++++++++++++++
 example/c-vt-modes/build.zig.zon       | 24 +++++++++
 example/c-vt-modes/src/main.c          | 45 +++++++++++++++++
 example/c-vt-mouse-encode/src/main.c   | 68 ++++++++------------------
 example/c-vt-paste/src/main.c          | 21 +++++---
 example/c-vt-sgr/src/main.c            | 43 ++++++++++++++--
 example/c-vt-size-report/README.md     | 17 +++++++
 example/c-vt-size-report/build.zig     | 42 ++++++++++++++++
 example/c-vt-size-report/build.zig.zon | 24 +++++++++
 example/c-vt-size-report/src/main.c    | 27 ++++++++++
 include/ghostty/vt/key.h               | 39 +--------------
 include/ghostty/vt/modes.h             | 47 +-----------------
 include/ghostty/vt/mouse.h             | 51 +------------------
 include/ghostty/vt/paste.h             | 21 +-------
 include/ghostty/vt/sgr.h               | 37 +-------------
 include/ghostty/vt/size_report.h       | 28 +----------
 18 files changed, 331 insertions(+), 308 deletions(-)
 create mode 100644 example/c-vt-modes/README.md
 create mode 100644 example/c-vt-modes/build.zig
 create mode 100644 example/c-vt-modes/build.zig.zon
 create mode 100644 example/c-vt-modes/src/main.c
 create mode 100644 example/c-vt-size-report/README.md
 create mode 100644 example/c-vt-size-report/build.zig
 create mode 100644 example/c-vt-size-report/build.zig.zon
 create mode 100644 example/c-vt-size-report/src/main.c

diff --git a/example/c-vt-key-encode/src/main.c b/example/c-vt-key-encode/src/main.c
index 82444f99d..99b782022 100644
--- a/example/c-vt-key-encode/src/main.c
+++ b/example/c-vt-key-encode/src/main.c
@@ -4,56 +4,37 @@
 #include <string.h>
 #include <ghostty/vt.h>
 
+//! [key-encode]
 int main() {
+  // Create encoder
   GhosttyKeyEncoder encoder;
   GhosttyResult result = ghostty_key_encoder_new(NULL, &encoder);
   assert(result == GHOSTTY_SUCCESS);
 
-  // Set kitty flags with all features enabled
-  ghostty_key_encoder_setopt(encoder, GHOSTTY_KEY_ENCODER_OPT_KITTY_FLAGS, &(uint8_t){GHOSTTY_KITTY_KEY_ALL});
+  // Enable Kitty keyboard protocol with all features
+  ghostty_key_encoder_setopt(encoder, GHOSTTY_KEY_ENCODER_OPT_KITTY_FLAGS,
+                             &(uint8_t){GHOSTTY_KITTY_KEY_ALL});
 
-  // Create key event
+  // Create and configure key event for Ctrl+C press
   GhosttyKeyEvent event;
   result = ghostty_key_event_new(NULL, &event);
   assert(result == GHOSTTY_SUCCESS);
-  ghostty_key_event_set_action(event, GHOSTTY_KEY_ACTION_RELEASE);
-  ghostty_key_event_set_key(event, GHOSTTY_KEY_CONTROL_LEFT);
+  ghostty_key_event_set_action(event, GHOSTTY_KEY_ACTION_PRESS);
+  ghostty_key_event_set_key(event, GHOSTTY_KEY_C);
   ghostty_key_event_set_mods(event, GHOSTTY_MODS_CTRL);
-  printf("Encoding event: left ctrl release with all Kitty flags enabled\n");
 
-  // Optionally, encode with null buffer to get required size. You can
-  // skip this step and provide a sufficiently large buffer directly.
-  // If there isn't enoug hspace, the function will return an out of memory
-  // error.
-  size_t required = 0;
-  result = ghostty_key_encoder_encode(encoder, event, NULL, 0, &required);
-  assert(result == GHOSTTY_OUT_OF_MEMORY);
-  printf("Required buffer size: %zu bytes\n", required);
-
-  // Encode the key event. We don't use our required size above because
-  // that was just an example; we know 128 bytes is enough.
+  // Encode the key event
   char buf[128];
   size_t written = 0;
   result = ghostty_key_encoder_encode(encoder, event, buf, sizeof(buf), &written);
   assert(result == GHOSTTY_SUCCESS);
-  printf("Encoded %zu bytes\n", written);
 
-  // Print the encoded sequence (hex and string)
-  printf("Hex: ");
-  for (size_t i = 0; i < written; i++) printf("%02x ", (unsigned char)buf[i]);
-  printf("\n");
-
-  printf("String: ");
-  for (size_t i = 0; i < written; i++) {
-    if (buf[i] == 0x1b) {
-      printf("\\x1b");
-    } else {
-      printf("%c", buf[i]);
-    }
-  }
-  printf("\n");
+  // Use the encoded sequence (e.g., write to terminal)
+  fwrite(buf, 1, written, stdout);
 
+  // Cleanup
   ghostty_key_event_free(event);
   ghostty_key_encoder_free(encoder);
   return 0;
 }
+//! [key-encode]
diff --git a/example/c-vt-modes/README.md b/example/c-vt-modes/README.md
new file mode 100644
index 000000000..bd43c1799
--- /dev/null
+++ b/example/c-vt-modes/README.md
@@ -0,0 +1,18 @@
+# Example: `ghostty-vt` Mode Utilities
+
+This contains a simple example of how to use the `ghostty-vt` mode
+utilities to pack and unpack terminal mode identifiers and encode
+DECRPM responses.
+
+This uses a `build.zig` and `Zig` to build the C program so that we
+can reuse a lot of our build logic and depend directly on our source
+tree, but Ghostty emits a standard C library that can be used with any
+C tooling.
+
+## Usage
+
+Run the program:
+
+```shell-session
+zig build run
+```
diff --git a/example/c-vt-modes/build.zig b/example/c-vt-modes/build.zig
new file mode 100644
index 000000000..1a4b3f8d8
--- /dev/null
+++ b/example/c-vt-modes/build.zig
@@ -0,0 +1,42 @@
+const std = @import("std");
+
+pub fn build(b: *std.Build) void {
+    const target = b.standardTargetOptions(.{});
+    const optimize = b.standardOptimizeOption(.{});
+
+    const run_step = b.step("run", "Run the app");
+
+    const exe_mod = b.createModule(.{
+        .target = target,
+        .optimize = optimize,
+    });
+    exe_mod.addCSourceFiles(.{
+        .root = b.path("src"),
+        .files = &.{"main.c"},
+    });
+
+    // You'll want to use a lazy dependency here so that ghostty is only
+    // downloaded if you actually need it.
+    if (b.lazyDependency("ghostty", .{
+        // Setting simd to false will force a pure static build that
+        // doesn't even require libc, but it has a significant performance
+        // penalty. If your embedding app requires libc anyway, you should
+        // always keep simd enabled.
+        // .simd = false,
+    })) |dep| {
+        exe_mod.linkLibrary(dep.artifact("ghostty-vt"));
+    }
+
+    // Exe
+    const exe = b.addExecutable(.{
+        .name = "c_vt_modes",
+        .root_module = exe_mod,
+    });
+    b.installArtifact(exe);
+
+    // Run
+    const run_cmd = b.addRunArtifact(exe);
+    run_cmd.step.dependOn(b.getInstallStep());
+    if (b.args) |args| run_cmd.addArgs(args);
+    run_step.dependOn(&run_cmd.step);
+}
diff --git a/example/c-vt-modes/build.zig.zon b/example/c-vt-modes/build.zig.zon
new file mode 100644
index 000000000..bdfeefdca
--- /dev/null
+++ b/example/c-vt-modes/build.zig.zon
@@ -0,0 +1,24 @@
+.{
+    .name = .c_vt_modes,
+    .version = "0.0.0",
+    .fingerprint = 0x67ce079ebc70a02a,
+    .minimum_zig_version = "0.15.1",
+    .dependencies = .{
+        // Ghostty dependency. In reality, you'd probably use a URL-based
+        // dependency like the one showed (and commented out) below this one.
+        // We use a path dependency here for simplicity and to ensure our
+        // examples always test against the source they're bundled with.
+        .ghostty = .{ .path = "../../" },
+
+        // Example of what a URL-based dependency looks like:
+        // .ghostty = .{
+        //     .url = "https://github.com/ghostty-org/ghostty/archive/COMMIT.tar.gz",
+        //     .hash = "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO36s",
+        // },
+    },
+    .paths = .{
+        "build.zig",
+        "build.zig.zon",
+        "src",
+    },
+}
diff --git a/example/c-vt-modes/src/main.c b/example/c-vt-modes/src/main.c
new file mode 100644
index 000000000..e957c9777
--- /dev/null
+++ b/example/c-vt-modes/src/main.c
@@ -0,0 +1,45 @@
+#include <stdio.h>
+#include <ghostty/vt.h>
+
+//! [modes-pack-unpack]
+void modes_example() {
+  // Create a mode for DEC mode 25 (cursor visible)
+  GhosttyMode tag = ghostty_mode_new(25, false);
+  printf("value=%u ansi=%d packed=0x%04x\n",
+      ghostty_mode_value(tag),
+      ghostty_mode_ansi(tag),
+      tag);
+
+  // Create a mode for ANSI mode 4 (insert mode)
+  GhosttyMode ansi_tag = ghostty_mode_new(4, true);
+  printf("value=%u ansi=%d packed=0x%04x\n",
+      ghostty_mode_value(ansi_tag),
+      ghostty_mode_ansi(ansi_tag),
+      ansi_tag);
+}
+//! [modes-pack-unpack]
+
+//! [modes-decrpm]
+void decrpm_example() {
+  char buf[32];
+  size_t written = 0;
+
+  // Encode a report that DEC mode 25 (cursor visible) is set
+  GhosttyResult result = ghostty_mode_report_encode(
+      GHOSTTY_MODE_CURSOR_VISIBLE,
+      GHOSTTY_MODE_REPORT_SET,
+      buf, sizeof(buf), &written);
+
+  if (result == GHOSTTY_SUCCESS) {
+    printf("Encoded %zu bytes: ", written);
+    fwrite(buf, 1, written, stdout);
+    printf("\n");  // prints: ESC[?25;1$y
+  }
+}
+//! [modes-decrpm]
+
+int main() {
+  modes_example();
+  decrpm_example();
+  return 0;
+}
diff --git a/example/c-vt-mouse-encode/src/main.c b/example/c-vt-mouse-encode/src/main.c
index 55f867252..d75ed9c54 100644
--- a/example/c-vt-mouse-encode/src/main.c
+++ b/example/c-vt-mouse-encode/src/main.c
@@ -4,75 +4,49 @@
 #include <string.h>
 #include <ghostty/vt.h>
 
+//! [mouse-encode]
 int main() {
+  // Create encoder
   GhosttyMouseEncoder encoder;
   GhosttyResult result = ghostty_mouse_encoder_new(NULL, &encoder);
   assert(result == GHOSTTY_SUCCESS);
 
-  // Set tracking mode to normal (button press/release)
+  // Configure SGR format with normal tracking
   ghostty_mouse_encoder_setopt(encoder, GHOSTTY_MOUSE_ENCODER_OPT_EVENT,
-                               &(GhosttyMouseTrackingMode){GHOSTTY_MOUSE_TRACKING_NORMAL});
-
-  // Set output format to SGR
+      &(GhosttyMouseTrackingMode){GHOSTTY_MOUSE_TRACKING_NORMAL});
   ghostty_mouse_encoder_setopt(encoder, GHOSTTY_MOUSE_ENCODER_OPT_FORMAT,
-                               &(GhosttyMouseFormat){GHOSTTY_MOUSE_FORMAT_SGR});
+      &(GhosttyMouseFormat){GHOSTTY_MOUSE_FORMAT_SGR});
 
-  // Set terminal geometry so the encoder can map pixel positions to cells
+  // Set terminal geometry for coordinate mapping
   ghostty_mouse_encoder_setopt(encoder, GHOSTTY_MOUSE_ENCODER_OPT_SIZE,
-                               &(GhosttyMouseEncoderSize){
-                                   .size = sizeof(GhosttyMouseEncoderSize),
-                                   .screen_width = 800,
-                                   .screen_height = 600,
-                                   .cell_width = 10,
-                                   .cell_height = 20,
-                                   .padding_top = 0,
-                                   .padding_bottom = 0,
-                                   .padding_right = 0,
-                                   .padding_left = 0,
-                               });
+      &(GhosttyMouseEncoderSize){
+          .size = sizeof(GhosttyMouseEncoderSize),
+          .screen_width = 800, .screen_height = 600,
+          .cell_width = 10, .cell_height = 20,
+      });
 
-  // Create mouse event: left button press at pixel position (50, 40)
+  // Create and configure a left button press event
   GhosttyMouseEvent event;
   result = ghostty_mouse_event_new(NULL, &event);
   assert(result == GHOSTTY_SUCCESS);
   ghostty_mouse_event_set_action(event, GHOSTTY_MOUSE_ACTION_PRESS);
   ghostty_mouse_event_set_button(event, GHOSTTY_MOUSE_BUTTON_LEFT);
-  ghostty_mouse_event_set_position(event, (GhosttyMousePosition){.x = 50.0f, .y = 40.0f});
-  printf("Encoding event: left button press at (50, 40) in SGR format\n");
+  ghostty_mouse_event_set_position(event,
+      (GhosttyMousePosition){.x = 50.0f, .y = 40.0f});
 
-  // Optionally, encode with null buffer to get required size. You can
-  // skip this step and provide a sufficiently large buffer directly.
-  // If there isn't enough space, the function will return an out of memory
-  // error.
-  size_t required = 0;
-  result = ghostty_mouse_encoder_encode(encoder, event, NULL, 0, &required);
-  assert(result == GHOSTTY_OUT_OF_MEMORY);
-  printf("Required buffer size: %zu bytes\n", required);
-
-  // Encode the mouse event. We don't use our required size above because
-  // that was just an example; we know 128 bytes is enough.
+  // Encode the mouse event
   char buf[128];
   size_t written = 0;
-  result = ghostty_mouse_encoder_encode(encoder, event, buf, sizeof(buf), &written);
+  result = ghostty_mouse_encoder_encode(encoder, event,
+      buf, sizeof(buf), &written);
   assert(result == GHOSTTY_SUCCESS);
-  printf("Encoded %zu bytes\n", written);
 
-  // Print the encoded sequence (hex and string)
-  printf("Hex: ");
-  for (size_t i = 0; i < written; i++) printf("%02x ", (unsigned char)buf[i]);
-  printf("\n");
-
-  printf("String: ");
-  for (size_t i = 0; i < written; i++) {
-    if (buf[i] == 0x1b) {
-      printf("\\x1b");
-    } else {
-      printf("%c", buf[i]);
-    }
-  }
-  printf("\n");
+  // Use the encoded sequence (e.g., write to terminal)
+  fwrite(buf, 1, written, stdout);
 
+  // Cleanup
   ghostty_mouse_event_free(event);
   ghostty_mouse_encoder_free(encoder);
   return 0;
 }
+//! [mouse-encode]
diff --git a/example/c-vt-paste/src/main.c b/example/c-vt-paste/src/main.c
index 153861ca9..bb9e8e2a5 100644
--- a/example/c-vt-paste/src/main.c
+++ b/example/c-vt-paste/src/main.c
@@ -2,18 +2,23 @@
 #include <string.h>
 #include <ghostty/vt.h>
 
-int main() {
-  // Test safe paste data
-  const char *safe_data = "hello world";
+//! [paste-safety]
+void basic_example() {
+  const char* safe_data = "hello world";
+  const char* unsafe_data = "rm -rf /\n";
+
   if (ghostty_paste_is_safe(safe_data, strlen(safe_data))) {
-    printf("'%s' is safe to paste\n", safe_data);
+    printf("Safe to paste\n");
   }
 
-  // Test unsafe paste data with newline
-  const char *unsafe_newline = "rm -rf /\n";
-  if (!ghostty_paste_is_safe(unsafe_newline, strlen(unsafe_newline))) {
-    printf("'%s' is UNSAFE - contains newline\n", unsafe_newline);
+  if (!ghostty_paste_is_safe(unsafe_data, strlen(unsafe_data))) {
+    printf("Unsafe! Contains newline\n");
   }
+}
+//! [paste-safety]
+
+int main() {
+  basic_example();
 
   // Test unsafe paste data with bracketed paste end sequence
   const char *unsafe_escape = "evil\x1b[201~code";
diff --git a/example/c-vt-sgr/src/main.c b/example/c-vt-sgr/src/main.c
index 21a529726..e213c0c93 100644
--- a/example/c-vt-sgr/src/main.c
+++ b/example/c-vt-sgr/src/main.c
@@ -2,12 +2,43 @@
 #include <stdio.h>
 #include <ghostty/vt.h>
 
-int main() {
+//! [sgr-basic]
+void basic_example() {
   // Create parser
   GhosttySgrParser parser;
   GhosttyResult result = ghostty_sgr_new(NULL, &parser);
   assert(result == GHOSTTY_SUCCESS);
 
+  // Parse "bold, red foreground" sequence: ESC[1;31m
+  uint16_t params[] = {1, 31};
+  result = ghostty_sgr_set_params(parser, params, NULL, 2);
+  assert(result == GHOSTTY_SUCCESS);
+
+  // Iterate through attributes
+  GhosttySgrAttribute attr;
+  while (ghostty_sgr_next(parser, &attr)) {
+    switch (attr.tag) {
+      case GHOSTTY_SGR_ATTR_BOLD:
+        printf("Bold enabled\n");
+        break;
+      case GHOSTTY_SGR_ATTR_FG_8:
+        printf("Foreground color: %d\n", attr.value.fg_8);
+        break;
+      default:
+        break;
+    }
+  }
+
+  // Cleanup
+  ghostty_sgr_free(parser);
+}
+//! [sgr-basic]
+
+void advanced_example() {
+  GhosttySgrParser parser;
+  GhosttyResult result = ghostty_sgr_new(NULL, &parser);
+  assert(result == GHOSTTY_SUCCESS);
+
   // Parse a complex SGR sequence from Kakoune
   // This corresponds to the escape sequence:
   // ESC[4:3;38;2;51;51;51;48;2;170;170;170;58;2;255;97;136m
@@ -26,10 +57,9 @@ int main() {
   result = ghostty_sgr_set_params(parser, params, separators, sizeof(params) / sizeof(params[0]));
   assert(result == GHOSTTY_SUCCESS);
 
-  printf("Parsing Kakoune SGR sequence:\n");
+  printf("\nParsing Kakoune SGR sequence:\n");
   printf("ESC[4:3;38;2;51;51;51;48;2;170;170;170;58;2;255;97;136m\n\n");
 
-  // Iterate through attributes
   GhosttySgrAttribute attr;
   int count = 0;
   while (ghostty_sgr_next(parser, &attr)) {
@@ -124,8 +154,11 @@ int main() {
   }
 
   printf("\nTotal attributes parsed: %d\n", count);
-
-  // Cleanup
   ghostty_sgr_free(parser);
+}
+
+int main() {
+  basic_example();
+  advanced_example();
   return 0;
 }
diff --git a/example/c-vt-size-report/README.md b/example/c-vt-size-report/README.md
new file mode 100644
index 000000000..0e6ef2c85
--- /dev/null
+++ b/example/c-vt-size-report/README.md
@@ -0,0 +1,17 @@
+# Example: `ghostty-vt` Size Report Encoding
+
+This contains a simple example of how to use the `ghostty-vt` size report
+encoding API to encode terminal size reports into escape sequences.
+
+This uses a `build.zig` and `Zig` to build the C program so that we
+can reuse a lot of our build logic and depend directly on our source
+tree, but Ghostty emits a standard C library that can be used with any
+C tooling.
+
+## Usage
+
+Run the program:
+
+```shell-session
+zig build run
+```
diff --git a/example/c-vt-size-report/build.zig b/example/c-vt-size-report/build.zig
new file mode 100644
index 000000000..fbd0f5e23
--- /dev/null
+++ b/example/c-vt-size-report/build.zig
@@ -0,0 +1,42 @@
+const std = @import("std");
+
+pub fn build(b: *std.Build) void {
+    const target = b.standardTargetOptions(.{});
+    const optimize = b.standardOptimizeOption(.{});
+
+    const run_step = b.step("run", "Run the app");
+
+    const exe_mod = b.createModule(.{
+        .target = target,
+        .optimize = optimize,
+    });
+    exe_mod.addCSourceFiles(.{
+        .root = b.path("src"),
+        .files = &.{"main.c"},
+    });
+
+    // You'll want to use a lazy dependency here so that ghostty is only
+    // downloaded if you actually need it.
+    if (b.lazyDependency("ghostty", .{
+        // Setting simd to false will force a pure static build that
+        // doesn't even require libc, but it has a significant performance
+        // penalty. If your embedding app requires libc anyway, you should
+        // always keep simd enabled.
+        // .simd = false,
+    })) |dep| {
+        exe_mod.linkLibrary(dep.artifact("ghostty-vt"));
+    }
+
+    // Exe
+    const exe = b.addExecutable(.{
+        .name = "c_vt_size_report",
+        .root_module = exe_mod,
+    });
+    b.installArtifact(exe);
+
+    // Run
+    const run_cmd = b.addRunArtifact(exe);
+    run_cmd.step.dependOn(b.getInstallStep());
+    if (b.args) |args| run_cmd.addArgs(args);
+    run_step.dependOn(&run_cmd.step);
+}
diff --git a/example/c-vt-size-report/build.zig.zon b/example/c-vt-size-report/build.zig.zon
new file mode 100644
index 000000000..71d10d343
--- /dev/null
+++ b/example/c-vt-size-report/build.zig.zon
@@ -0,0 +1,24 @@
+.{
+    .name = .c_vt_size_report,
+    .version = "0.0.0",
+    .fingerprint = 0x17e8cdb658fab232,
+    .minimum_zig_version = "0.15.1",
+    .dependencies = .{
+        // Ghostty dependency. In reality, you'd probably use a URL-based
+        // dependency like the one showed (and commented out) below this one.
+        // We use a path dependency here for simplicity and to ensure our
+        // examples always test against the source they're bundled with.
+        .ghostty = .{ .path = "../../" },
+
+        // Example of what a URL-based dependency looks like:
+        // .ghostty = .{
+        //     .url = "https://github.com/ghostty-org/ghostty/archive/COMMIT.tar.gz",
+        //     .hash = "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO36s",
+        // },
+    },
+    .paths = .{
+        "build.zig",
+        "build.zig.zon",
+        "src",
+    },
+}
diff --git a/example/c-vt-size-report/src/main.c b/example/c-vt-size-report/src/main.c
new file mode 100644
index 000000000..99e9c10dc
--- /dev/null
+++ b/example/c-vt-size-report/src/main.c
@@ -0,0 +1,27 @@
+#include <stdio.h>
+#include <ghostty/vt.h>
+
+//! [size-report-encode]
+int main() {
+  GhosttySizeReportSize size = {
+    .rows = 24,
+    .columns = 80,
+    .cell_width = 9,
+    .cell_height = 18,
+  };
+
+  char buf[64];
+  size_t written = 0;
+
+  GhosttyResult result = ghostty_size_report_encode(
+      GHOSTTY_SIZE_REPORT_MODE_2048, size, buf, sizeof(buf), &written);
+
+  if (result == GHOSTTY_SUCCESS) {
+    printf("Encoded %zu bytes: ", written);
+    fwrite(buf, 1, written, stdout);
+    printf("\n");
+  }
+
+  return 0;
+}
+//! [size-report-encode]
diff --git a/include/ghostty/vt/key.h b/include/ghostty/vt/key.h
index e82a7596c..305cffe87 100644
--- a/include/ghostty/vt/key.h
+++ b/include/ghostty/vt/key.h
@@ -32,44 +32,7 @@
  *
  * ## Example
  *
- * @code{.c}
- * #include <assert.h>
- * #include <stdio.h>
- * #include <ghostty/vt.h>
- * 
- * int main() {
- *   // Create encoder
- *   GhosttyKeyEncoder encoder;
- *   GhosttyResult result = ghostty_key_encoder_new(NULL, &encoder);
- *   assert(result == GHOSTTY_SUCCESS);
- * 
- *   // Enable Kitty keyboard protocol with all features
- *   ghostty_key_encoder_setopt(encoder, GHOSTTY_KEY_ENCODER_OPT_KITTY_FLAGS, 
- *                              &(uint8_t){GHOSTTY_KITTY_KEY_ALL});
- * 
- *   // Create and configure key event for Ctrl+C press
- *   GhosttyKeyEvent event;
- *   result = ghostty_key_event_new(NULL, &event);
- *   assert(result == GHOSTTY_SUCCESS);
- *   ghostty_key_event_set_action(event, GHOSTTY_KEY_ACTION_PRESS);
- *   ghostty_key_event_set_key(event, GHOSTTY_KEY_C);
- *   ghostty_key_event_set_mods(event, GHOSTTY_MODS_CTRL);
- * 
- *   // Encode the key event
- *   char buf[128];
- *   size_t written = 0;
- *   result = ghostty_key_encoder_encode(encoder, event, buf, sizeof(buf), &written);
- *   assert(result == GHOSTTY_SUCCESS);
- * 
- *   // Use the encoded sequence (e.g., write to terminal)
- *   fwrite(buf, 1, written, stdout);
- * 
- *   // Cleanup
- *   ghostty_key_event_free(event);
- *   ghostty_key_encoder_free(encoder);
- *   return 0;
- * }
- * @endcode
+ * @snippet c-vt-key-encode/src/main.c key-encode
  *
  * ## Example: Encoding with Terminal State
  *
diff --git a/include/ghostty/vt/modes.h b/include/ghostty/vt/modes.h
index 4454b2a50..53e148dd7 100644
--- a/include/ghostty/vt/modes.h
+++ b/include/ghostty/vt/modes.h
@@ -20,57 +20,14 @@
  *
  * ## Example
  *
- * @code{.c}
- * #include <stdio.h>
- * #include <ghostty/vt.h>
- *
- * int main() {
- *   // Create a mode for DEC mode 25 (cursor visible)
- *   GhosttyMode tag = ghostty_mode_new(25, false);
- *   printf("value=%u ansi=%d packed=0x%04x\n",
- *       ghostty_mode_value(tag),
- *       ghostty_mode_ansi(tag),
- *       tag);
- *
- *   // Create a mode for ANSI mode 4 (insert mode)
- *   GhosttyMode ansi_tag = ghostty_mode_new(4, true);
- *   printf("value=%u ansi=%d packed=0x%04x\n",
- *       ghostty_mode_value(ansi_tag),
- *       ghostty_mode_ansi(ansi_tag),
- *       ansi_tag);
- *
- *   return 0;
- * }
- * @endcode
+ * @snippet c-vt-modes/src/main.c modes-pack-unpack
  *
  * ## DECRPM Report Encoding
  *
  * Use ghostty_mode_report_encode() to encode a DECRPM response into a
  * caller-provided buffer:
  *
- * @code{.c}
- * #include <stdio.h>
- * #include <ghostty/vt.h>
- *
- * int main() {
- *   char buf[32];
- *   size_t written = 0;
- *
- *   // Encode a report that DEC mode 25 (cursor visible) is set
- *   GhosttyResult result = ghostty_mode_report_encode(
- *       GHOSTTY_MODE_CURSOR_VISIBLE,
- *       GHOSTTY_MODE_REPORT_SET,
- *       buf, sizeof(buf), &written);
- *
- *   if (result == GHOSTTY_SUCCESS) {
- *     printf("Encoded %zu bytes: ", written);
- *     fwrite(buf, 1, written, stdout);
- *     printf("\n");  // prints: ESC[?25;1$y
- *   }
- *
- *   return 0;
- * }
- * @endcode
+ * @snippet c-vt-modes/src/main.c modes-decrpm
  *
  * @{
  */
diff --git a/include/ghostty/vt/mouse.h b/include/ghostty/vt/mouse.h
index f5f37ce7b..c4489d3e4 100644
--- a/include/ghostty/vt/mouse.h
+++ b/include/ghostty/vt/mouse.h
@@ -29,56 +29,7 @@
  *
  * ## Example
  *
- * @code{.c}
- * #include <assert.h>
- * #include <stdio.h>
- * #include <ghostty/vt.h>
- *
- * int main() {
- *   // Create encoder
- *   GhosttyMouseEncoder encoder;
- *   GhosttyResult result = ghostty_mouse_encoder_new(NULL, &encoder);
- *   assert(result == GHOSTTY_SUCCESS);
- *
- *   // Configure SGR format with normal tracking
- *   ghostty_mouse_encoder_setopt(encoder, GHOSTTY_MOUSE_ENCODER_OPT_EVENT,
- *       &(GhosttyMouseTrackingMode){GHOSTTY_MOUSE_TRACKING_NORMAL});
- *   ghostty_mouse_encoder_setopt(encoder, GHOSTTY_MOUSE_ENCODER_OPT_FORMAT,
- *       &(GhosttyMouseFormat){GHOSTTY_MOUSE_FORMAT_SGR});
- *
- *   // Set terminal geometry for coordinate mapping
- *   ghostty_mouse_encoder_setopt(encoder, GHOSTTY_MOUSE_ENCODER_OPT_SIZE,
- *       &(GhosttyMouseEncoderSize){
- *           .size = sizeof(GhosttyMouseEncoderSize),
- *           .screen_width = 800, .screen_height = 600,
- *           .cell_width = 10, .cell_height = 20,
- *       });
- *
- *   // Create and configure a left button press event
- *   GhosttyMouseEvent event;
- *   result = ghostty_mouse_event_new(NULL, &event);
- *   assert(result == GHOSTTY_SUCCESS);
- *   ghostty_mouse_event_set_action(event, GHOSTTY_MOUSE_ACTION_PRESS);
- *   ghostty_mouse_event_set_button(event, GHOSTTY_MOUSE_BUTTON_LEFT);
- *   ghostty_mouse_event_set_position(event,
- *       (GhosttyMousePosition){.x = 50.0f, .y = 40.0f});
- *
- *   // Encode the mouse event
- *   char buf[128];
- *   size_t written = 0;
- *   result = ghostty_mouse_encoder_encode(encoder, event,
- *       buf, sizeof(buf), &written);
- *   assert(result == GHOSTTY_SUCCESS);
- *
- *   // Use the encoded sequence (e.g., write to terminal)
- *   fwrite(buf, 1, written, stdout);
- *
- *   // Cleanup
- *   ghostty_mouse_event_free(event);
- *   ghostty_mouse_encoder_free(encoder);
- *   return 0;
- * }
- * @endcode
+ * @snippet c-vt-mouse-encode/src/main.c mouse-encode
  *
  * ## Example: Encoding with Terminal State
  *
diff --git a/include/ghostty/vt/paste.h b/include/ghostty/vt/paste.h
index d90f303d4..b7212c801 100644
--- a/include/ghostty/vt/paste.h
+++ b/include/ghostty/vt/paste.h
@@ -18,26 +18,7 @@
  *
  * ## Example
  *
- * @code{.c}
- * #include <stdio.h>
- * #include <string.h>
- * #include <ghostty/vt.h>
- * 
- * int main() {
- *   const char* safe_data = "hello world";
- *   const char* unsafe_data = "rm -rf /\n";
- * 
- *   if (ghostty_paste_is_safe(safe_data, strlen(safe_data))) {
- *     printf("Safe to paste\n");
- *   }
- * 
- *   if (!ghostty_paste_is_safe(unsafe_data, strlen(unsafe_data))) {
- *     printf("Unsafe! Contains newline\n");
- *   }
- * 
- *   return 0;
- * }
- * @endcode
+ * @snippet c-vt-paste/src/main.c paste-safety
  *
  * @{
  */
diff --git a/include/ghostty/vt/sgr.h b/include/ghostty/vt/sgr.h
index c81c1c87a..3b190a6b8 100644
--- a/include/ghostty/vt/sgr.h
+++ b/include/ghostty/vt/sgr.h
@@ -31,42 +31,7 @@
  *
  * ## Example
  *
- * @code{.c}
- * #include <assert.h>
- * #include <stdio.h>
- * #include <ghostty/vt.h>
- *
- * int main() {
- *   // Create parser
- *   GhosttySgrParser parser;
- *   GhosttyResult result = ghostty_sgr_new(NULL, &parser);
- *   assert(result == GHOSTTY_SUCCESS);
- *
- *   // Parse "bold, red foreground" sequence: ESC[1;31m
- *   uint16_t params[] = {1, 31};
- *   result = ghostty_sgr_set_params(parser, params, NULL, 2);
- *   assert(result == GHOSTTY_SUCCESS);
- *
- *   // Iterate through attributes
- *   GhosttySgrAttribute attr;
- *   while (ghostty_sgr_next(parser, &attr)) {
- *     switch (attr.tag) {
- *       case GHOSTTY_SGR_ATTR_BOLD:
- *         printf("Bold enabled\n");
- *         break;
- *       case GHOSTTY_SGR_ATTR_FG_8:
- *         printf("Foreground color: %d\n", attr.value.fg_8);
- *         break;
- *       default:
- *         break;
- *     }
- *   }
- *
- *   // Cleanup
- *   ghostty_sgr_free(parser);
- *   return 0;
- * }
- * @endcode
+ * @snippet c-vt-sgr/src/main.c sgr-basic
  *
  * @{
  */
diff --git a/include/ghostty/vt/size_report.h b/include/ghostty/vt/size_report.h
index 4622b5bcf..b2eb08995 100644
--- a/include/ghostty/vt/size_report.h
+++ b/include/ghostty/vt/size_report.h
@@ -22,33 +22,7 @@
  *
  * ## Example
  *
- * @code{.c}
- * #include <stdio.h>
- * #include <ghostty/vt.h>
- *
- * int main() {
- *   GhosttySizeReportSize size = {
- *     .rows = 24,
- *     .columns = 80,
- *     .cell_width = 9,
- *     .cell_height = 18,
- *   };
- *
- *   char buf[64];
- *   size_t written = 0;
- *
- *   GhosttyResult result = ghostty_size_report_encode(
- *       GHOSTTY_SIZE_REPORT_MODE_2048, size, buf, sizeof(buf), &written);
- *
- *   if (result == GHOSTTY_SUCCESS) {
- *     printf("Encoded %zu bytes: ", written);
- *     fwrite(buf, 1, written, stdout);
- *     printf("\n");
- *   }
- *
- *   return 0;
- * }
- * @endcode
+ * @snippet c-vt-size-report/src/main.c size-report-encode
  *
  * @{
  */

From ceef8065b02a8cf007e7a6ed3f6e71965fa20ad6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 17 Mar 2026 17:05:40 -0700
Subject: [PATCH 223/391] ci: filter build-examples to directories with
 build.zig.zon

The dynamic example directory discovery added in bb3b3ba included
all subdirectories under example/, but some (wasm-key-encode,
wasm-sgr) are pure HTML examples with no build.zig.zon. Running
zig build in those directories falls back to the root build.zig
and attempts a full GTK binary build, which fails on CI.

Filter the listing to only include directories that contain a
build.zig.zon file so non-Zig examples are excluded from the
build matrix.
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 872e41352..9e2388d88 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -179,7 +179,7 @@ jobs:
       - id: list
         name: List example directories
         run: |
-          dirs=$(ls -d example/*/ | xargs -n1 basename | jq -R -s -c 'split("\n") | map(select(. != ""))')
+          dirs=$(ls example/*/build.zig.zon 2>/dev/null | xargs -n1 dirname | xargs -n1 basename | jq -R -s -c 'split("\n") | map(select(. != ""))')
           echo "$dirs" | jq .
           echo "dirs=$dirs" >> "$GITHUB_OUTPUT"
 

From f037f41f78fd96a98b4f612f40e117f80af6ca31 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 17 Mar 2026 17:11:00 -0700
Subject: [PATCH 224/391] Add example AGENTS file

---
 example/AGENTS.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 example/AGENTS.md

diff --git a/example/AGENTS.md b/example/AGENTS.md
new file mode 100644
index 000000000..280b97e18
--- /dev/null
+++ b/example/AGENTS.md
@@ -0,0 +1,39 @@
+# Example Libghostty Projects
+
+Each example is a standalone project with its own `build.zig`,
+`build.zig.zon`, `README.md`, and `src/main.c` (or `.zig`). Examples are
+auto-discovered by CI via `example/*/build.zig.zon`, so no workflow file
+edits are needed when adding a new example.
+
+## Adding a New Example
+
+1. Copy an existing example directory (e.g., `c-vt-encode-focus/`) as a
+   starting point.
+2. Update `build.zig.zon`: change `.name`, generate a **new unique**
+   `.fingerprint` value (a random `u64` hex literal), and keep
+   `.minimum_zig_version` matching the others.
+3. Update `build.zig`: change the executable `.name` to match the directory.
+4. Write a `README.md` following the existing format.
+
+## Doxygen Snippet Tags
+
+Example source files use Doxygen `@snippet` tags so the corresponding
+header in `include/ghostty/vt/` can reference them. Wrap the relevant
+code with `//! [snippet-name]` markers:
+
+```c
+//! [my-snippet]
+int main() { ... }
+//! [my-snippet]
+```
+
+The header then uses `@snippet <dir>/src/main.c my-snippet` instead of
+inline `@code` blocks. Never duplicate example code inline in the
+headers — always use `@snippet`. When modifying example code, keep the
+snippet markers in sync with the headers in `include/ghostty/vt/`.
+
+## Conventions
+
+- Executable names use underscores: `c_vt_encode_focus` (not hyphens).
+- All C examples link `ghostty-vt` via `lazyDependency("ghostty", ...)`.
+- `build.zig` files follow a common template — keep them consistent.

From 383a7e14a7e4043dbfbd45aaa19781bba442952b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 17 Mar 2026 17:37:13 -0700
Subject: [PATCH 225/391] example: add README

---
 example/README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 example/README.md

diff --git a/example/README.md b/example/README.md
new file mode 100644
index 000000000..25e41aeeb
--- /dev/null
+++ b/example/README.md
@@ -0,0 +1,17 @@
+# Examples
+
+Standalone projects demonstrating the Ghostty library APIs.
+The directories starting with `c-` use the C API and the directories
+starting with `zig-` use the Zig API.
+
+Every example can be built and run using `zig build` and `zig build run`
+from within the respective example directory.
+Even the C API examples use the Zig build system (not the language) to
+build the project.
+
+## Running an Example
+
+```shell-session
+cd example/<dir>
+zig build run
+```

From 996ce03f0b9e9407c0164e4a3c4f341ed91cc817 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 17 Mar 2026 17:39:25 -0700
Subject: [PATCH 226/391] example: rename some examples

---
 example/{c-vt-key-encode => c-vt-encode-key}/README.md    | 0
 example/{c-vt-key-encode => c-vt-encode-key}/build.zig    | 2 +-
 .../{c-vt-key-encode => c-vt-encode-key}/build.zig.zon    | 0
 example/{c-vt-key-encode => c-vt-encode-key}/src/main.c   | 0
 .../{c-vt-mouse-encode => c-vt-encode-mouse}/README.md    | 0
 .../{c-vt-mouse-encode => c-vt-encode-mouse}/build.zig    | 2 +-
 .../build.zig.zon                                         | 0
 .../{c-vt-mouse-encode => c-vt-encode-mouse}/src/main.c   | 0
 include/ghostty/vt.h                                      | 8 ++++----
 include/ghostty/vt/key.h                                  | 4 ++--
 include/ghostty/vt/mouse.h                                | 4 ++--
 11 files changed, 10 insertions(+), 10 deletions(-)
 rename example/{c-vt-key-encode => c-vt-encode-key}/README.md (100%)
 rename example/{c-vt-key-encode => c-vt-encode-key}/build.zig (97%)
 rename example/{c-vt-key-encode => c-vt-encode-key}/build.zig.zon (100%)
 rename example/{c-vt-key-encode => c-vt-encode-key}/src/main.c (100%)
 rename example/{c-vt-mouse-encode => c-vt-encode-mouse}/README.md (100%)
 rename example/{c-vt-mouse-encode => c-vt-encode-mouse}/build.zig (97%)
 rename example/{c-vt-mouse-encode => c-vt-encode-mouse}/build.zig.zon (100%)
 rename example/{c-vt-mouse-encode => c-vt-encode-mouse}/src/main.c (100%)

diff --git a/example/c-vt-key-encode/README.md b/example/c-vt-encode-key/README.md
similarity index 100%
rename from example/c-vt-key-encode/README.md
rename to example/c-vt-encode-key/README.md
diff --git a/example/c-vt-key-encode/build.zig b/example/c-vt-encode-key/build.zig
similarity index 97%
rename from example/c-vt-key-encode/build.zig
rename to example/c-vt-encode-key/build.zig
index b4b759744..de878a7ad 100644
--- a/example/c-vt-key-encode/build.zig
+++ b/example/c-vt-encode-key/build.zig
@@ -29,7 +29,7 @@ pub fn build(b: *std.Build) void {
 
     // Exe
     const exe = b.addExecutable(.{
-        .name = "c_vt_key_encode",
+        .name = "c_vt_encode_key",
         .root_module = exe_mod,
     });
     b.installArtifact(exe);
diff --git a/example/c-vt-key-encode/build.zig.zon b/example/c-vt-encode-key/build.zig.zon
similarity index 100%
rename from example/c-vt-key-encode/build.zig.zon
rename to example/c-vt-encode-key/build.zig.zon
diff --git a/example/c-vt-key-encode/src/main.c b/example/c-vt-encode-key/src/main.c
similarity index 100%
rename from example/c-vt-key-encode/src/main.c
rename to example/c-vt-encode-key/src/main.c
diff --git a/example/c-vt-mouse-encode/README.md b/example/c-vt-encode-mouse/README.md
similarity index 100%
rename from example/c-vt-mouse-encode/README.md
rename to example/c-vt-encode-mouse/README.md
diff --git a/example/c-vt-mouse-encode/build.zig b/example/c-vt-encode-mouse/build.zig
similarity index 97%
rename from example/c-vt-mouse-encode/build.zig
rename to example/c-vt-encode-mouse/build.zig
index 350d0a89e..4fdb353c0 100644
--- a/example/c-vt-mouse-encode/build.zig
+++ b/example/c-vt-encode-mouse/build.zig
@@ -29,7 +29,7 @@ pub fn build(b: *std.Build) void {
 
     // Exe
     const exe = b.addExecutable(.{
-        .name = "c_vt_mouse_encode",
+        .name = "c_vt_encode_mouse",
         .root_module = exe_mod,
     });
     b.installArtifact(exe);
diff --git a/example/c-vt-mouse-encode/build.zig.zon b/example/c-vt-encode-mouse/build.zig.zon
similarity index 100%
rename from example/c-vt-mouse-encode/build.zig.zon
rename to example/c-vt-encode-mouse/build.zig.zon
diff --git a/example/c-vt-mouse-encode/src/main.c b/example/c-vt-encode-mouse/src/main.c
similarity index 100%
rename from example/c-vt-mouse-encode/src/main.c
rename to example/c-vt-encode-mouse/src/main.c
diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index 5b670f80a..c6ab35fa3 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -45,8 +45,8 @@
  *
  * Complete working examples:
  * - @ref c-vt/src/main.c - OSC parser example
- * - @ref c-vt-key-encode/src/main.c - Key encoding example
- * - @ref c-vt-mouse-encode/src/main.c - Mouse encoding example
+ * - @ref c-vt-encode-key/src/main.c - Key encoding example
+ * - @ref c-vt-encode-mouse/src/main.c - Mouse encoding example
  * - @ref c-vt-paste/src/main.c - Paste safety check example
  * - @ref c-vt-sgr/src/main.c - SGR parser example
  * - @ref c-vt-formatter/src/main.c - Terminal formatter example
@@ -58,12 +58,12 @@
  * extract command information, and retrieve command-specific data like window titles.
  */
 
-/** @example c-vt-key-encode/src/main.c
+/** @example c-vt-encode-key/src/main.c
  * This example demonstrates how to use the key encoder to convert key events
  * into terminal escape sequences using the Kitty keyboard protocol.
  */
 
-/** @example c-vt-mouse-encode/src/main.c
+/** @example c-vt-encode-mouse/src/main.c
  * This example demonstrates how to use the mouse encoder to convert mouse events
  * into terminal escape sequences using the SGR mouse format.
  */
diff --git a/include/ghostty/vt/key.h b/include/ghostty/vt/key.h
index 305cffe87..61b954753 100644
--- a/include/ghostty/vt/key.h
+++ b/include/ghostty/vt/key.h
@@ -27,12 +27,12 @@
  *      changing its properties.
  * 4. Free the encoder with ghostty_key_encoder_free() when done
  *
- * For a complete working example, see example/c-vt-key-encode in the
+ * For a complete working example, see example/c-vt-encode-key in the
  * repository.
  *
  * ## Example
  *
- * @snippet c-vt-key-encode/src/main.c key-encode
+ * @snippet c-vt-encode-key/src/main.c key-encode
  *
  * ## Example: Encoding with Terminal State
  *
diff --git a/include/ghostty/vt/mouse.h b/include/ghostty/vt/mouse.h
index c4489d3e4..4ba5f52e3 100644
--- a/include/ghostty/vt/mouse.h
+++ b/include/ghostty/vt/mouse.h
@@ -24,12 +24,12 @@
  *    - Free the event with ghostty_mouse_event_free() or reuse it.
  * 4. Free the encoder with ghostty_mouse_encoder_free() when done.
  *
- * For a complete working example, see example/c-vt-mouse-encode in the
+ * For a complete working example, see example/c-vt-encode-mouse in the
  * repository.
  *
  * ## Example
  *
- * @snippet c-vt-mouse-encode/src/main.c mouse-encode
+ * @snippet c-vt-encode-mouse/src/main.c mouse-encode
  *
  * ## Example: Encoding with Terminal State
  *

From 4b1e48b71e7e7b0317651a8c3173defff9ffffaa Mon Sep 17 00:00:00 2001
From: Yuzu Vita <g311571057@gmail.com>
Date: Wed, 18 Mar 2026 13:40:28 +0800
Subject: [PATCH 227/391] swap arguments

---
 dist/linux/ghostty_dolphin.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/linux/ghostty_dolphin.desktop b/dist/linux/ghostty_dolphin.desktop
index 9bea38fa4..b9ac7fd26 100755
--- a/dist/linux/ghostty_dolphin.desktop
+++ b/dist/linux/ghostty_dolphin.desktop
@@ -7,4 +7,4 @@ Actions=RunGhosttyDir
 [Desktop Action RunGhosttyDir]
 Name=Open Ghostty Here
 Icon=com.mitchellh.ghostty
-Exec=ghostty --working-directory=%F +new-window
+Exec=ghostty +new-window --working-directory=%F

From 1f3a3b41f785d10906678394d13c180657d35210 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Wed, 18 Mar 2026 09:53:29 -0400
Subject: [PATCH 228/391] bash: handle PROMPT_COMMAND ending in a newline
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We need to handle on more case: when an existing PROMPT_COMMAND ends in
a newline, we don't want to append a ; because that already counts as a
command separator.

We now handle all of these PROMPT_COMMAND cases:

- Ends with ; — no ; added
- Ends with \n or other whitespace — no ; added
- Ends with a command name — ; added as separator

See: #11245
---
 src/shell-integration/bash/ghostty.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shell-integration/bash/ghostty.bash b/src/shell-integration/bash/ghostty.bash
index 4be662ddf..667d7c86b 100644
--- a/src/shell-integration/bash/ghostty.bash
+++ b/src/shell-integration/bash/ghostty.bash
@@ -303,7 +303,7 @@ if (( BASH_VERSINFO[0] > 4 || (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 4) )
     elif [[ $(builtin declare -p PROMPT_COMMAND 2>/dev/null) == "declare -a "* ]]; then
       PROMPT_COMMAND+=(__ghostty_hook)
     else
-      [[ "${PROMPT_COMMAND}" =~ \;[[:space:]]*$ ]] || PROMPT_COMMAND+=";"
+      [[ "${PROMPT_COMMAND}" =~ (\;[[:space:]]*|$'\n')$ ]] || PROMPT_COMMAND+=";"
       PROMPT_COMMAND+=" __ghostty_hook"
     fi
   fi

From a74f43760edce5a4b51d73c44cc39066cb24539e Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2026 14:11:47 +0000
Subject: [PATCH 229/391] Update VOUCHED list (#11623)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11622#issuecomment-4082875090)
from @00-kat.

Vouch: @EkaterinePapava

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 7029e4dd6..37786b485 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -68,6 +68,7 @@ douglance
 douglas
 drepper
 dzhlobo
+ekaterinepapava
 elias8
 ephemera
 eriksremess

From c08a21180aa98ee813bc97bf04e1d0c31ec2f65d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Mar 2026 00:13:01 +0000
Subject: [PATCH 230/391] build(deps): bump cachix/cachix-action from 16 to 17

Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 16 to 17.
- [Release notes](https://github.com/cachix/cachix-action/releases)
- [Commits](https://github.com/cachix/cachix-action/compare/3ba601ff5bbb07c7220846facfa2cd81eeee15a1...1eb2ef646ac0255473d23a5907ad7b04ce94065c)

---
updated-dependencies:
- dependency-name: cachix/cachix-action
  dependency-version: '17'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/nix.yml                 |  2 +-
 .github/workflows/release-tag.yml         |  4 +-
 .github/workflows/release-tip.yml         | 10 ++--
 .github/workflows/test.yml                | 62 +++++++++++------------
 .github/workflows/update-colorschemes.yml |  2 +-
 5 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index c6535030c..16553d8a2 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -50,7 +50,7 @@ jobs:
         uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml
index a742b4d4b..ee62ef00a 100644
--- a/.github/workflows/release-tag.yml
+++ b/.github/workflows/release-tag.yml
@@ -93,7 +93,7 @@ jobs:
         with:
           nix_path: nixpkgs=channel:nixos-unstable
 
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -147,7 +147,7 @@ jobs:
       - uses: DeterminateSystems/nix-installer-action@main
         with:
           determinate: true
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
diff --git a/.github/workflows/release-tip.yml b/.github/workflows/release-tip.yml
index 44b1ca369..3cb415c9e 100644
--- a/.github/workflows/release-tip.yml
+++ b/.github/workflows/release-tip.yml
@@ -45,7 +45,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -178,7 +178,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -245,7 +245,7 @@ jobs:
       - uses: DeterminateSystems/nix-installer-action@main
         with:
           determinate: true
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -501,7 +501,7 @@ jobs:
       - uses: DeterminateSystems/nix-installer-action@main
         with:
           determinate: true
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -698,7 +698,7 @@ jobs:
       - uses: DeterminateSystems/nix-installer-action@main
         with:
           determinate: true
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9e2388d88..835bc417e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -159,7 +159,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -209,7 +209,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -242,7 +242,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -276,7 +276,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -320,7 +320,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -357,7 +357,7 @@ jobs:
       - uses: DeterminateSystems/nix-installer-action@main
         with:
           determinate: true
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -397,7 +397,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -443,7 +443,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -472,7 +472,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -505,7 +505,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -551,7 +551,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -628,7 +628,7 @@ jobs:
       - uses: DeterminateSystems/nix-installer-action@main
         with:
           determinate: true
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -688,7 +688,7 @@ jobs:
       - uses: DeterminateSystems/nix-installer-action@main
         with:
           determinate: true
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -811,7 +811,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -853,7 +853,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -901,7 +901,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -936,7 +936,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -967,7 +967,7 @@ jobs:
       - uses: DeterminateSystems/nix-installer-action@main
         with:
           determinate: true
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -1011,7 +1011,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -1042,7 +1042,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -1084,7 +1084,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -1115,7 +1115,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -1145,7 +1145,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -1174,7 +1174,7 @@ jobs:
       - uses: DeterminateSystems/nix-installer-action@main
         with:
           determinate: true
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -1203,7 +1203,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -1231,7 +1231,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -1259,7 +1259,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -1292,7 +1292,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -1320,7 +1320,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -1357,7 +1357,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -1419,7 +1419,7 @@ jobs:
       - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
diff --git a/.github/workflows/update-colorschemes.yml b/.github/workflows/update-colorschemes.yml
index 4c159a815..ee934d41a 100644
--- a/.github/workflows/update-colorschemes.yml
+++ b/.github/workflows/update-colorschemes.yml
@@ -32,7 +32,7 @@ jobs:
         uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

From c9729fbd269d72a20eb4a53846dd3cd7ae1dfc4a Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Thu, 19 Mar 2026 07:58:13 -0400
Subject: [PATCH 231/391] ci: use local git commands for path-filter action

Passing a `token` value causes this action to use the GitHub REST API,
which is subject to rate limits. We can chew through that allowance
quickly (1,000 requests/hour) given that we run two of these actions per
workflow run.

`token` defaults to the workflow's token, but by setting it explicitly
to an empty string, the action will instead use `git diff` to determine
the modified paths. This works fine for our case because we're already
running the checkout action, so we have an up-to-date repository view.

This also has the advantage of working around the 300 files GitHub REST
API limit for listing changed files.

Ref: https://github.com/dorny/paths-filter
---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9e2388d88..0997080d1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -34,7 +34,7 @@ jobs:
       - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
         id: filter_every
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ""
           predicate-quantifier: "every"
           filters: |
             code:
@@ -43,7 +43,7 @@ jobs:
       - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
         id: filter_any
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ""
           filters: |
             macos:
               - '.swiftlint.yml'

From b1ad24e24f3c04d854ed2c516fd0b947cf800420 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Wed, 18 Mar 2026 15:09:09 -0400
Subject: [PATCH 232/391] bash: emit 133;P (instead of 133;A) under ble.sh

ble.sh performs its own cursor positioning so we get multiple newlines
with 133;A's fresh-line behavior. ble.sh is a large enough project to
justify this additional, unambiguous conditional.

See: akinomyoga/ble.sh#684
See: wezterm/wezterm#5072
---
 src/shell-integration/bash/ghostty.bash | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/shell-integration/bash/ghostty.bash b/src/shell-integration/bash/ghostty.bash
index 667d7c86b..ec421daab 100644
--- a/src/shell-integration/bash/ghostty.bash
+++ b/src/shell-integration/bash/ghostty.bash
@@ -232,8 +232,16 @@ function __ghostty_precmd() {
     builtin printf "\e]133;D;%s;aid=%s\a" "$ret" "$BASHPID"
   fi
 
-  # Fresh line and start of prompt.
-  builtin printf "\e]133;A;redraw=last;cl=line;aid=%s\a" "$BASHPID"
+  # Fresh line and start of prompt. When ble.sh is active, emit 133;P instead
+  # of 133;A because ble.sh maintains its own cursor position tracking. 133;A's
+  # cursor movement (CR+LF when not at column 0) is invisible to ble.sh and
+  # desyncs its position state, causing display artifacts like duplicate
+  # prompts. See: https://github.com/akinomyoga/ble.sh/issues/684
+  if [[ -n "${BLE_VERSION-}" ]]; then
+    builtin printf "\e]133;P;k=i\a"
+  else
+    builtin printf "\e]133;A;redraw=last;cl=line;aid=%s\a" "$BASHPID"
+  fi
 
   # unfortunately bash provides no hooks to detect cwd changes
   # in particular this means cwd reporting will not happen for a

From 50113ab67860893969bbfe568261a293d91bf92f Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Thu, 19 Mar 2026 18:50:32 +0100
Subject: [PATCH 233/391] macOS: add mouse state tests for #11276

It will fail on 4e24adf71 and success after #11276
---
 .../GhosttyMouseStateTests.swift              | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 macos/GhosttyUITests/GhosttyMouseStateTests.swift

diff --git a/macos/GhosttyUITests/GhosttyMouseStateTests.swift b/macos/GhosttyUITests/GhosttyMouseStateTests.swift
new file mode 100644
index 000000000..9bb270b8e
--- /dev/null
+++ b/macos/GhosttyUITests/GhosttyMouseStateTests.swift
@@ -0,0 +1,53 @@
+//
+//  GhosttyMouseStateTests.swift
+//  Ghostty
+//
+//  Created by Lukas on 19.03.2026.
+//
+
+import XCTest
+
+final class GhosttyMouseStateTests: GhosttyCustomConfigCase {
+    override static var runsForEachTargetApplicationUIConfiguration: Bool { false }
+
+    // https://github.com/ghostty-org/ghostty/pull/11276
+    @MainActor func testSelectionFocusChange() async throws {
+        let app = XCUIApplication()
+        app.activate()
+        // Write dummy text to a temp file, cat it into the terminal, then clean up
+        let lines = (1...200).map { "Line \($0): The quick brown fox jumps over the lazy dog. Lorem ipsum dolor sit amet, consectetur adipiscing elit." }
+        let text = lines.joined(separator: "\n") + "\n"
+        let tmpFile = NSTemporaryDirectory() + "ghostty_test_dummy.txt"
+        try text.write(toFile: tmpFile, atomically: true, encoding: .utf8)
+        defer { try? FileManager.default.removeItem(atPath: tmpFile) }
+
+        app.typeText("cat \(tmpFile)\r")
+        app.menuItems["Command Palette"].firstMatch.click()
+
+        let finder = XCUIApplication(bundleIdentifier: "com.apple.finder")
+        finder.activate()
+
+        app.activate()
+
+        app.buttons
+            .containing(NSPredicate(format: "label CONTAINS[c] 'Clear Screen'"))
+            .firstMatch
+            .click()
+        let surface = app.groups["Terminal pane"]
+        surface
+            .coordinate(withNormalizedOffset: .zero)
+            .withOffset(.init(dx: 20, dy: 10))
+            .click()
+
+        surface
+            .coordinate(withNormalizedOffset: .zero)
+            .withOffset(.init(dx: 20, dy: surface.frame.height * 0.5))
+            .hover()
+
+        NSPasteboard.general.clearContents()
+        app.typeKey("c", modifierFlags: .command)
+
+        XCTAssertEqual(NSPasteboard.general.string(forType: .string), nil, "Moving mouse shouldn't select any texts")
+    }
+}
+

From ac3893d0b9c91b3d3b023556e30783fabaf3f082 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Thu, 19 Mar 2026 19:08:12 +0100
Subject: [PATCH 234/391] macOS: Add command palette tests

---
 .../GhosttyCommandPaletteTests.swift          | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 macos/GhosttyUITests/GhosttyCommandPaletteTests.swift

diff --git a/macos/GhosttyUITests/GhosttyCommandPaletteTests.swift b/macos/GhosttyUITests/GhosttyCommandPaletteTests.swift
new file mode 100644
index 000000000..428682b4f
--- /dev/null
+++ b/macos/GhosttyUITests/GhosttyCommandPaletteTests.swift
@@ -0,0 +1,81 @@
+//
+//  GhosttyCommandPaletteTests.swift
+//  Ghostty
+//
+//  Created by Lukas on 19.03.2026.
+//
+
+import XCTest
+
+final class GhosttyCommandPaletteTests: GhosttyCustomConfigCase {
+    override static var runsForEachTargetApplicationUIConfiguration: Bool { false }
+    @MainActor func testDismissingCommandPalette() async throws {
+        let app = try ghosttyApplication()
+        app.activate()
+
+        XCTAssertTrue(app.windows.firstMatch.waitForExistence(timeout: 5), "New window should appear")
+
+        app.menuItems["Command Palette"].firstMatch.click()
+
+        let clearScreenButton = app.buttons
+            .containing(NSPredicate(format: "label CONTAINS[c] 'Clear Screen'"))
+            .firstMatch
+
+        XCTAssertTrue(clearScreenButton.waitForExistence(timeout: 5), "Command Palette should appear")
+
+        clearScreenButton.coordinate(withNormalizedOffset: .zero)
+            .withOffset(.init(dx: -30, dy: 0))
+            .click()
+
+        XCTAssertTrue(clearScreenButton.waitForNonExistence(timeout: 5), "Command Palette should disappear after clicking outside")
+
+        app.typeKey("p", modifierFlags: [.command, .shift])
+
+        XCTAssertTrue(clearScreenButton.waitForExistence(timeout: 5), "Command Palette should appear")
+
+        app.typeKey(.escape, modifierFlags: [])
+
+        XCTAssertTrue(clearScreenButton.waitForNonExistence(timeout: 5), "Command Palette should disappear after typing escape")
+
+        app.typeKey("p", modifierFlags: [.command, .shift])
+
+        XCTAssertTrue(clearScreenButton.waitForExistence(timeout: 5), "Command Palette should appear")
+
+        app.typeKey(.enter, modifierFlags: [])
+
+        XCTAssertTrue(clearScreenButton.waitForNonExistence(timeout: 5), "Command Palette should disappear after submitting query")
+
+        app.typeKey("p", modifierFlags: [.command, .shift])
+
+        XCTAssertTrue(clearScreenButton.waitForExistence(timeout: 5), "Command Palette should appear")
+
+        app.typeText("Clear Screen")
+        app.typeKey(.enter, modifierFlags: [])
+
+        XCTAssertTrue(clearScreenButton.waitForNonExistence(timeout: 5), "Command Palette should disappear after selecting a command by keyboard")
+
+        app.typeKey("p", modifierFlags: [.command, .shift])
+        app.typeKey(.delete, modifierFlags: [])
+
+        XCTAssertTrue(clearScreenButton.waitForExistence(timeout: 5), "Command Palette should appear")
+        clearScreenButton.click()
+
+        XCTAssertTrue(clearScreenButton.waitForNonExistence(timeout: 5), "Command Palette should disappear after selecting a command by mouse")
+    }
+
+    @MainActor func testSelectCommandWithMouse() async throws {
+        let app = try ghosttyApplication()
+        app.activate()
+
+        XCTAssertTrue(app.windows.firstMatch.waitForExistence(timeout: 5), "New window should appear")
+
+        app.menuItems["Command Palette"].firstMatch.click()
+
+        app.buttons
+            .containing(NSPredicate(format: "label CONTAINS[c] 'Close All Windows'"))
+            .firstMatch.click()
+
+        XCTAssertTrue(app.windows.firstMatch.waitForNonExistence(timeout: 2), "All windows should be closed")
+    }
+}
+

From d80d84862e3b10bf97cfcda67b241152db2fe4e8 Mon Sep 17 00:00:00 2001
From: Lukas <134181853+bo2themax@users.noreply.github.com>
Date: Thu, 19 Mar 2026 19:16:13 +0100
Subject: [PATCH 235/391] macOS: fix mouse not working correctly in
 CommandPaletteView (#11658)

---
 .../Sources/Ghostty/Surface View/SurfaceView_AppKit.swift | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift b/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift
index 3129acfba..2289a3bdd 100644
--- a/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift	
+++ b/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift	
@@ -652,6 +652,14 @@ extension Ghostty {
         }
 
         private func localEventLeftMouseDown(_ event: NSEvent) -> NSEvent? {
+            let isCommandPaletteVisible = (event.window?.windowController as? BaseTerminalController)?
+                .commandPaletteIsShowing == true
+            guard !isCommandPaletteVisible else {
+                // We don't want to process events that
+                // are supposed to be handled by CommandPaletteView
+                return event
+            }
+
             // We only want to process events that are on this window.
             guard let window,
                   event.window != nil,

From f168b3c098eae1db30811173ac7cc5d5ac4da3c2 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 19 Mar 2026 11:33:26 -0700
Subject: [PATCH 236/391] vt: add ghostty_terminal_get for reading terminal
 state

Add a typed data query API to the terminal C interface, following
the same OutType pattern used by the OSC command data API. The new
ghostty_terminal_get function takes a GhosttyTerminalData tag and
an output pointer, returning GhosttyResult.

Currently exposes cols, rows, cursor x/y position, and cursor
pending wrap state. The GhosttyTerminalData enum is placed with the
other types in the header (before functions) per the ordering
convention.
---
 include/ghostty/vt/terminal.h | 137 +++++++++++++++++++++-
 src/lib_vt.zig                |   1 +
 src/terminal/ScreenSet.zig    |  12 +-
 src/terminal/c/main.zig       |   1 +
 src/terminal/c/terminal.zig   | 211 ++++++++++++++++++++++++++++++++++
 5 files changed, 356 insertions(+), 6 deletions(-)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 5be6db001..88fac14ef 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -97,6 +97,119 @@ typedef struct {
   GhosttyTerminalScrollViewportValue value;
 } GhosttyTerminalScrollViewport;
 
+/**
+ * Terminal screen identifier.
+ *
+ * Identifies which screen buffer is active in the terminal.
+ *
+ * @ingroup terminal
+ */
+typedef enum {
+  /** The primary (normal) screen. */
+  GHOSTTY_TERMINAL_SCREEN_PRIMARY = 0,
+
+  /** The alternate screen. */
+  GHOSTTY_TERMINAL_SCREEN_ALTERNATE = 1,
+} GhosttyTerminalScreen;
+
+/**
+ * Scrollbar state for the terminal viewport.
+ *
+ * Represents the scrollable area dimensions needed to render a scrollbar.
+ *
+ * @ingroup terminal
+ */
+typedef struct {
+  /** Total size of the scrollable area in rows. */
+  uint64_t total;
+
+  /** Offset into the total area that the viewport is at. */
+  uint64_t offset;
+
+  /** Length of the visible area in rows. */
+  uint64_t len;
+} GhosttyTerminalScrollbar;
+
+/**
+ * Terminal data types.
+ *
+ * These values specify what type of data to extract from a terminal
+ * using `ghostty_terminal_get`.
+ *
+ * @ingroup terminal
+ */
+typedef enum {
+  /** Invalid data type. Never results in any data extraction. */
+  GHOSTTY_TERMINAL_DATA_INVALID = 0,
+
+  /**
+   * Terminal width in cells.
+   *
+   * Output type: uint16_t *
+   */
+  GHOSTTY_TERMINAL_DATA_COLS = 1,
+
+  /**
+   * Terminal height in cells.
+   *
+   * Output type: uint16_t *
+   */
+  GHOSTTY_TERMINAL_DATA_ROWS = 2,
+
+  /**
+   * Cursor column position (0-indexed).
+   *
+   * Output type: uint16_t *
+   */
+  GHOSTTY_TERMINAL_DATA_CURSOR_X = 3,
+
+  /**
+   * Cursor row position within the active area (0-indexed).
+   *
+   * Output type: uint16_t *
+   */
+  GHOSTTY_TERMINAL_DATA_CURSOR_Y = 4,
+
+  /**
+   * Whether the cursor has a pending wrap (next print will soft-wrap).
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_TERMINAL_DATA_CURSOR_PENDING_WRAP = 5,
+
+  /**
+   * The currently active screen.
+   *
+   * Output type: GhosttyTerminalScreen *
+   */
+  GHOSTTY_TERMINAL_DATA_ACTIVE_SCREEN = 6,
+
+  /**
+   * Whether the cursor is visible (DEC mode 25).
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_TERMINAL_DATA_CURSOR_VISIBLE = 7,
+
+  /**
+   * Current Kitty keyboard protocol flags.
+   *
+   * Output type: GhosttyKittyKeyFlags * (uint8_t *)
+   */
+  GHOSTTY_TERMINAL_DATA_KITTY_KEYBOARD_FLAGS = 8,
+
+  /**
+   * Scrollbar state for the terminal viewport.
+   *
+   * This may be expensive to calculate depending on where the viewport
+   * is (arbitrary pins are expensive). The caller should take care to only
+   * call this as needed and not too frequently.
+   *
+   * Output type: GhosttyTerminalScrollbar *
+   */
+  GHOSTTY_TERMINAL_DATA_SCROLLBAR = 9,
+} GhosttyTerminalData;
+
 /**
  * Create a new terminal instance.
  *
@@ -228,8 +341,28 @@ GhosttyResult ghostty_terminal_mode_get(GhosttyTerminal terminal,
  * @ingroup terminal
  */
 GhosttyResult ghostty_terminal_mode_set(GhosttyTerminal terminal,
-                                        GhosttyMode mode,
-                                        bool value);
+                                         GhosttyMode mode,
+                                         bool value);
+
+/**
+ * Get data from a terminal instance.
+ *
+ * Extracts typed data from the given terminal based on the specified
+ * data type. The output pointer must be of the appropriate type for the
+ * requested data kind. Valid data types and output types are documented
+ * in the `GhosttyTerminalData` enum.
+ *
+ * @param terminal The terminal handle (may be NULL)
+ * @param data The type of data to extract
+ * @param out Pointer to store the extracted data (type depends on data parameter)
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if the terminal
+ *         is NULL or the data type is invalid
+ *
+ * @ingroup terminal
+ */
+GhosttyResult ghostty_terminal_get(GhosttyTerminal terminal,
+                                   GhosttyTerminalData data,
+                                   void *out);
 
 /** @} */
 
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index aabd78592..d6416d97a 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -191,6 +191,7 @@ comptime {
         @export(&c.terminal_scroll_viewport, .{ .name = "ghostty_terminal_scroll_viewport" });
         @export(&c.terminal_mode_get, .{ .name = "ghostty_terminal_mode_get" });
         @export(&c.terminal_mode_set, .{ .name = "ghostty_terminal_mode_set" });
+        @export(&c.terminal_get, .{ .name = "ghostty_terminal_get" });
 
         // On Wasm we need to export our allocator convenience functions.
         if (builtin.target.cpu.arch.isWasm()) {
diff --git a/src/terminal/ScreenSet.zig b/src/terminal/ScreenSet.zig
index cbaa03f47..6fe866f70 100644
--- a/src/terminal/ScreenSet.zig
+++ b/src/terminal/ScreenSet.zig
@@ -9,15 +9,19 @@ const ScreenSet = @This();
 
 const std = @import("std");
 const assert = @import("../quirks.zig").inlineAssert;
+const build_options = @import("terminal_options");
+const lib = @import("../lib/main.zig");
 const testing = std.testing;
 const Allocator = std.mem.Allocator;
 const Screen = @import("Screen.zig");
 
+const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
+
 /// The possible keys for screens in the screen set.
-pub const Key = enum(u1) {
-    primary,
-    alternate,
-};
+pub const Key = lib.Enum(lib_target, &.{
+    "primary",
+    "alternate",
+});
 
 /// The key value of the currently active screen. Useful for simple
 /// comparisons, e.g. "is this screen the primary screen".
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 72fa74345..d591dcb89 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -98,6 +98,7 @@ pub const terminal_vt_write = terminal.vt_write;
 pub const terminal_scroll_viewport = terminal.scroll_viewport;
 pub const terminal_mode_get = terminal.mode_get;
 pub const terminal_mode_set = terminal.mode_set;
+pub const terminal_get = terminal.get;
 
 test {
     _ = color;
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index c3c084c52..3c771f16e 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -3,10 +3,15 @@ const testing = std.testing;
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const ZigTerminal = @import("../Terminal.zig");
+const ScreenSet = @import("../ScreenSet.zig");
+const PageList = @import("../PageList.zig");
+const kitty = @import("../kitty/key.zig");
 const modes = @import("../modes.zig");
 const size = @import("../size.zig");
 const Result = @import("result.zig").Result;
 
+const log = std.log.scoped(.terminal_c);
+
 /// C: GhosttyTerminal
 pub const Terminal = ?*ZigTerminal;
 
@@ -123,6 +128,81 @@ pub fn mode_set(
     return .success;
 }
 
+/// C: GhosttyTerminalScreen
+pub const TerminalScreen = ScreenSet.Key;
+
+/// C: GhosttyTerminalScrollbar
+pub const TerminalScrollbar = PageList.Scrollbar.C;
+
+/// C: GhosttyTerminalData
+pub const TerminalData = enum(c_int) {
+    invalid = 0,
+    cols = 1,
+    rows = 2,
+    cursor_x = 3,
+    cursor_y = 4,
+    cursor_pending_wrap = 5,
+    active_screen = 6,
+    cursor_visible = 7,
+    kitty_keyboard_flags = 8,
+    scrollbar = 9,
+
+    /// Output type expected for querying the data of the given kind.
+    pub fn OutType(comptime self: TerminalData) type {
+        return switch (self) {
+            .invalid => void,
+            .cols, .rows, .cursor_x, .cursor_y => size.CellCountInt,
+            .cursor_pending_wrap, .cursor_visible => bool,
+            .active_screen => TerminalScreen,
+            .kitty_keyboard_flags => u8,
+            .scrollbar => TerminalScrollbar,
+        };
+    }
+};
+
+pub fn get(
+    terminal_: Terminal,
+    data: TerminalData,
+    out: ?*anyopaque,
+) callconv(.c) Result {
+    if (comptime std.debug.runtime_safety) {
+        _ = std.meta.intToEnum(TerminalData, @intFromEnum(data)) catch {
+            log.warn("terminal_get invalid data value={d}", .{@intFromEnum(data)});
+            return .invalid_value;
+        };
+    }
+
+    return switch (data) {
+        inline else => |comptime_data| getTyped(
+            terminal_,
+            comptime_data,
+            @ptrCast(@alignCast(out)),
+        ),
+    };
+}
+
+fn getTyped(
+    terminal_: Terminal,
+    comptime data: TerminalData,
+    out: *data.OutType(),
+) Result {
+    const t = terminal_ orelse return .invalid_value;
+    switch (data) {
+        .invalid => return .invalid_value,
+        .cols => out.* = t.cols,
+        .rows => out.* = t.rows,
+        .cursor_x => out.* = t.screens.active.cursor.x,
+        .cursor_y => out.* = t.screens.active.cursor.y,
+        .cursor_pending_wrap => out.* = t.screens.active.cursor.pending_wrap,
+        .active_screen => out.* = t.screens.active_key,
+        .cursor_visible => out.* = t.modes.get(.cursor_visible),
+        .kitty_keyboard_flags => out.* = @as(u8, t.screens.active.kitty_keyboard.current().int()),
+        .scrollbar => out.* = t.screens.active.pages.scrollbar().cval(),
+    }
+
+    return .success;
+}
+
 pub fn free(terminal_: Terminal) callconv(.c) void {
     const t = terminal_ orelse return;
 
@@ -397,3 +477,134 @@ test "vt_write" {
     defer testing.allocator.free(str);
     try testing.expectEqualStrings("Hello", str);
 }
+
+test "get cols and rows" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    var cols: size.CellCountInt = undefined;
+    var rows: size.CellCountInt = undefined;
+    try testing.expectEqual(Result.success, get(t, .cols, @ptrCast(&cols)));
+    try testing.expectEqual(Result.success, get(t, .rows, @ptrCast(&rows)));
+    try testing.expectEqual(80, cols);
+    try testing.expectEqual(24, rows);
+}
+
+test "get cursor position" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    vt_write(t, "Hello", 5);
+
+    var x: size.CellCountInt = undefined;
+    var y: size.CellCountInt = undefined;
+    try testing.expectEqual(Result.success, get(t, .cursor_x, @ptrCast(&x)));
+    try testing.expectEqual(Result.success, get(t, .cursor_y, @ptrCast(&y)));
+    try testing.expectEqual(5, x);
+    try testing.expectEqual(0, y);
+}
+
+test "get null" {
+    var cols: size.CellCountInt = undefined;
+    try testing.expectEqual(Result.invalid_value, get(null, .cols, @ptrCast(&cols)));
+}
+
+test "get cursor_visible" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    var visible: bool = undefined;
+    try testing.expectEqual(Result.success, get(t, .cursor_visible, @ptrCast(&visible)));
+    try testing.expect(visible);
+
+    // DEC mode 25 controls cursor visibility
+    const cursor_visible_mode: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 25, .ansi = false });
+    try testing.expectEqual(Result.success, mode_set(t, cursor_visible_mode, false));
+    try testing.expectEqual(Result.success, get(t, .cursor_visible, @ptrCast(&visible)));
+    try testing.expect(!visible);
+}
+
+test "get active_screen" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    var screen: TerminalScreen = undefined;
+    try testing.expectEqual(Result.success, get(t, .active_screen, @ptrCast(&screen)));
+    try testing.expectEqual(.primary, screen);
+}
+
+test "get kitty_keyboard_flags" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    var flags: u8 = undefined;
+    try testing.expectEqual(Result.success, get(t, .kitty_keyboard_flags, @ptrCast(&flags)));
+    try testing.expectEqual(0, flags);
+
+    // Push kitty flags via VT sequence: CSI > 3 u (push disambiguate | report_events)
+    vt_write(t, "\x1b[>3u", 5);
+
+    try testing.expectEqual(Result.success, get(t, .kitty_keyboard_flags, @ptrCast(&flags)));
+    try testing.expectEqual(3, flags);
+}
+
+test "get invalid" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    try testing.expectEqual(Result.invalid_value, get(t, .invalid, null));
+}

From 7f36e8bd43bdc52aa3398125ce8c42e5211adceb Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 19 Mar 2026 11:52:34 -0700
Subject: [PATCH 237/391] vt: add style C API

Expose the terminal Style struct to the C API as GhosttyStyle, a
sized struct with foreground, background, and underline colors
(as tagged unions) plus boolean text decoration flags.

Add ghostty_style_default() to obtain the default style and
ghostty_style_is_default() to check whether a style has all
default values. Wire both through c/style.zig, main.zig, and
lib_vt.zig with the corresponding header in vt/style.h.
---
 include/ghostty/vt.h       |   1 +
 include/ghostty/vt/style.h | 128 +++++++++++++++++++++++++++++++++++
 src/lib_vt.zig             |   2 +
 src/terminal/c/main.zig    |   5 ++
 src/terminal/c/style.zig   | 133 +++++++++++++++++++++++++++++++++++++
 5 files changed, 269 insertions(+)
 create mode 100644 include/ghostty/vt/style.h
 create mode 100644 src/terminal/c/style.zig

diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index c6ab35fa3..effafd0f0 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -98,6 +98,7 @@ extern "C" {
 #include <ghostty/vt/terminal.h>
 #include <ghostty/vt/osc.h>
 #include <ghostty/vt/sgr.h>
+#include <ghostty/vt/style.h>
 #include <ghostty/vt/key.h>
 #include <ghostty/vt/modes.h>
 #include <ghostty/vt/mouse.h>
diff --git a/include/ghostty/vt/style.h b/include/ghostty/vt/style.h
new file mode 100644
index 000000000..5c326ae19
--- /dev/null
+++ b/include/ghostty/vt/style.h
@@ -0,0 +1,128 @@
+/**
+ * @file style.h
+ *
+ * Terminal cell style types.
+ */
+
+#ifndef GHOSTTY_VT_STYLE_H
+#define GHOSTTY_VT_STYLE_H
+
+#include <ghostty/vt/color.h>
+#include <ghostty/vt/types.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @defgroup style Style
+ *
+ * Terminal cell style attributes.
+ *
+ * A style describes the visual attributes of a terminal cell, including
+ * foreground, background, and underline colors, as well as flags for
+ * bold, italic, underline, and other text decorations.
+ *
+ * @{
+ */
+
+/**
+ * Style color tags.
+ *
+ * These values identify the type of color in a style color.
+ * Use the tag to determine which field in the color value union to access.
+ *
+ * @ingroup style
+ */
+typedef enum {
+  GHOSTTY_STYLE_COLOR_NONE = 0,
+  GHOSTTY_STYLE_COLOR_PALETTE = 1,
+  GHOSTTY_STYLE_COLOR_RGB = 2,
+} GhosttyStyleColorTag;
+
+/**
+ * Style color value union.
+ *
+ * Use the tag to determine which field is active.
+ *
+ * @ingroup style
+ */
+typedef union {
+  GhosttyColorPaletteIndex palette;
+  GhosttyColorRgb rgb;
+  uint32_t _padding;
+} GhosttyStyleColorValue;
+
+/**
+ * Style color (tagged union).
+ *
+ * A color used in a style attribute. Can be unset (none), a palette
+ * index, or a direct RGB value.
+ *
+ * @ingroup style
+ */
+typedef struct {
+  GhosttyStyleColorTag tag;
+  GhosttyStyleColorValue value;
+} GhosttyStyleColor;
+
+/**
+ * Terminal cell style.
+ *
+ * Describes the complete visual style for a terminal cell, including
+ * foreground, background, and underline colors, as well as text
+ * decoration flags. The underline field uses the same values as
+ * GhosttySgrUnderline.
+ *
+ * This is a sized struct. Use GHOSTTY_INIT_SIZED() to initialize it.
+ *
+ * @ingroup style
+ */
+typedef struct {
+  size_t size;
+  GhosttyStyleColor fg_color;
+  GhosttyStyleColor bg_color;
+  GhosttyStyleColor underline_color;
+  bool bold;
+  bool italic;
+  bool faint;
+  bool blink;
+  bool inverse;
+  bool invisible;
+  bool strikethrough;
+  bool overline;
+  int underline; /**< One of GHOSTTY_SGR_UNDERLINE_* values */
+} GhosttyStyle;
+
+/**
+ * Get the default style.
+ *
+ * Initializes the style to the default values (no colors, no flags).
+ *
+ * @param style Pointer to the style to initialize
+ *
+ * @ingroup style
+ */
+void ghostty_style_default(GhosttyStyle* style);
+
+/**
+ * Check if a style is the default style.
+ *
+ * Returns true if all colors are unset and all flags are off.
+ *
+ * @param style Pointer to the style to check
+ * @return true if the style is the default style
+ *
+ * @ingroup style
+ */
+bool ghostty_style_is_default(const GhosttyStyle* style);
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @} */
+
+#endif /* GHOSTTY_VT_STYLE_H */
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index d6416d97a..bf59d646b 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -169,6 +169,8 @@ comptime {
         @export(&c.mode_report_encode, .{ .name = "ghostty_mode_report_encode" });
         @export(&c.paste_is_safe, .{ .name = "ghostty_paste_is_safe" });
         @export(&c.size_report_encode, .{ .name = "ghostty_size_report_encode" });
+        @export(&c.style_default, .{ .name = "ghostty_style_default" });
+        @export(&c.style_is_default, .{ .name = "ghostty_style_is_default" });
         @export(&c.color_rgb_get, .{ .name = "ghostty_color_rgb_get" });
         @export(&c.sgr_new, .{ .name = "ghostty_sgr_new" });
         @export(&c.sgr_free, .{ .name = "ghostty_sgr_free" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index d591dcb89..b195b4d4c 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -10,6 +10,7 @@ pub const mouse_encode = @import("mouse_encode.zig");
 pub const paste = @import("paste.zig");
 pub const sgr = @import("sgr.zig");
 pub const size_report = @import("size_report.zig");
+pub const style = @import("style.zig");
 pub const terminal = @import("terminal.zig");
 
 // The full C API, unexported.
@@ -90,6 +91,9 @@ pub const paste_is_safe = paste.is_safe;
 
 pub const size_report_encode = size_report.encode;
 
+pub const style_default = style.default_style;
+pub const style_is_default = style.style_is_default;
+
 pub const terminal_new = terminal.new;
 pub const terminal_free = terminal.free;
 pub const terminal_reset = terminal.reset;
@@ -113,6 +117,7 @@ test {
     _ = paste;
     _ = sgr;
     _ = size_report;
+    _ = style;
     _ = terminal;
 
     // We want to make sure we run the tests for the C allocator interface.
diff --git a/src/terminal/c/style.zig b/src/terminal/c/style.zig
new file mode 100644
index 000000000..01f079ccc
--- /dev/null
+++ b/src/terminal/c/style.zig
@@ -0,0 +1,133 @@
+const std = @import("std");
+const assert = std.debug.assert;
+const testing = std.testing;
+const style = @import("../style.zig");
+const color = @import("../color.zig");
+const sgr = @import("../sgr.zig");
+
+/// C: GhosttyStyleColorTag
+pub const ColorTag = enum(c_int) {
+    none = 0,
+    palette = 1,
+    rgb = 2,
+};
+
+/// C: GhosttyStyleColorValue
+pub const ColorValue = extern union {
+    palette: u8,
+    rgb: color.RGB.C,
+    _padding: u32,
+};
+
+/// C: GhosttyStyleColor
+pub const Color = extern struct {
+    tag: ColorTag,
+    value: ColorValue,
+};
+
+/// C: GhosttyStyle
+pub const Style = extern struct {
+    size: usize = @sizeOf(Style),
+    fg_color: Color,
+    bg_color: Color,
+    underline_color: Color,
+    bold: bool,
+    italic: bool,
+    faint: bool,
+    blink: bool,
+    inverse: bool,
+    invisible: bool,
+    strikethrough: bool,
+    overline: bool,
+    underline: c_int,
+};
+
+fn convertColor(c: style.Style.Color) Color {
+    return switch (c) {
+        .none => .{
+            .tag = .none,
+            .value = .{ ._padding = 0 },
+        },
+        .palette => |idx| .{
+            .tag = .palette,
+            .value = .{ .palette = idx },
+        },
+        .rgb => |rgb| .{
+            .tag = .rgb,
+            .value = .{ .rgb = rgb.cval() },
+        },
+    };
+}
+
+pub fn convertStyle(s: style.Style) Style {
+    return .{
+        .fg_color = convertColor(s.fg_color),
+        .bg_color = convertColor(s.bg_color),
+        .underline_color = convertColor(s.underline_color),
+        .bold = s.flags.bold,
+        .italic = s.flags.italic,
+        .faint = s.flags.faint,
+        .blink = s.flags.blink,
+        .inverse = s.flags.inverse,
+        .invisible = s.flags.invisible,
+        .strikethrough = s.flags.strikethrough,
+        .overline = s.flags.overline,
+        .underline = @intFromEnum(s.flags.underline),
+    };
+}
+
+/// Returns the default style.
+pub fn default_style(result: *Style) callconv(.c) void {
+    result.* = convertStyle(.{});
+    assert(result.size == @sizeOf(Style));
+}
+
+/// Returns true if the style is the default style.
+pub fn style_is_default(s: *const Style) callconv(.c) bool {
+    assert(s.size == @sizeOf(Style));
+    return s.fg_color.tag == .none and
+        s.bg_color.tag == .none and
+        s.underline_color.tag == .none and
+        s.bold == false and
+        s.italic == false and
+        s.faint == false and
+        s.blink == false and
+        s.inverse == false and
+        s.invisible == false and
+        s.strikethrough == false and
+        s.overline == false and
+        s.underline == 0;
+}
+
+test "default style" {
+    var s: Style = undefined;
+    default_style(&s);
+    try testing.expect(style_is_default(&s));
+    try testing.expectEqual(ColorTag.none, s.fg_color.tag);
+    try testing.expectEqual(ColorTag.none, s.bg_color.tag);
+    try testing.expectEqual(ColorTag.none, s.underline_color.tag);
+    try testing.expect(!s.bold);
+    try testing.expect(!s.italic);
+    try testing.expectEqual(@as(c_int, 0), s.underline);
+}
+
+test "convert style with colors" {
+    const zig_style: style.Style = .{
+        .fg_color = .{ .palette = 42 },
+        .bg_color = .{ .rgb = .{ .r = 255, .g = 128, .b = 64 } },
+        .underline_color = .none,
+        .flags = .{ .bold = true, .underline = .curly },
+    };
+
+    const c_style = convertStyle(zig_style);
+    try testing.expectEqual(ColorTag.palette, c_style.fg_color.tag);
+    try testing.expectEqual(@as(u8, 42), c_style.fg_color.value.palette);
+    try testing.expectEqual(ColorTag.rgb, c_style.bg_color.tag);
+    try testing.expectEqual(@as(u8, 255), c_style.bg_color.value.rgb.r);
+    try testing.expectEqual(@as(u8, 128), c_style.bg_color.value.rgb.g);
+    try testing.expectEqual(@as(u8, 64), c_style.bg_color.value.rgb.b);
+    try testing.expectEqual(ColorTag.none, c_style.underline_color.tag);
+    try testing.expect(c_style.bold);
+    try testing.expectEqual(@as(c_int, 3), c_style.underline);
+    try testing.expect(!style_is_default(&c_style));
+}

From d62f6df1d5370b6ec7a5de80dd15718a424e727e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 19 Mar 2026 12:04:56 -0700
Subject: [PATCH 238/391] vt: expose cursor_style via terminal_get

Add cursor_style to TerminalData, returning the current SGR style
of the cursor (the style applied to newly printed characters) as a
GhosttyStyle.

Refactor the C style conversion helpers: replace the standalone
convertStyle and convertColor functions with fromStyle and fromColor
initializers on the Style and Color extern structs respectively.
---
 include/ghostty/vt/terminal.h | 10 +++++
 src/terminal/c/style.zig      | 72 +++++++++++++++++------------------
 src/terminal/c/terminal.zig   |  4 ++
 3 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 88fac14ef..8ebd4e7dd 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -13,6 +13,7 @@
 #include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
 #include <ghostty/vt/modes.h>
+#include <ghostty/vt/style.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -208,6 +209,15 @@ typedef enum {
    * Output type: GhosttyTerminalScrollbar *
    */
   GHOSTTY_TERMINAL_DATA_SCROLLBAR = 9,
+
+  /**
+   * The current SGR style of the cursor.
+   *
+   * This is the style that will be applied to newly printed characters.
+   *
+   * Output type: GhosttyStyle *
+   */
+  GHOSTTY_TERMINAL_DATA_CURSOR_STYLE = 10,
 } GhosttyTerminalData;
 
 /**
diff --git a/src/terminal/c/style.zig b/src/terminal/c/style.zig
index 01f079ccc..5538c42cc 100644
--- a/src/terminal/c/style.zig
+++ b/src/terminal/c/style.zig
@@ -23,6 +23,23 @@ pub const ColorValue = extern union {
 pub const Color = extern struct {
     tag: ColorTag,
     value: ColorValue,
+
+    pub fn fromColor(c: style.Style.Color) Color {
+        return switch (c) {
+            .none => .{
+                .tag = .none,
+                .value = .{ ._padding = 0 },
+            },
+            .palette => |idx| .{
+                .tag = .palette,
+                .value = .{ .palette = idx },
+            },
+            .rgb => |rgb| .{
+                .tag = .rgb,
+                .value = .{ .rgb = rgb.cval() },
+            },
+        };
+    }
 };
 
 /// C: GhosttyStyle
@@ -40,45 +57,28 @@ pub const Style = extern struct {
     strikethrough: bool,
     overline: bool,
     underline: c_int,
+
+    pub fn fromStyle(s: style.Style) Style {
+        return .{
+            .fg_color = .fromColor(s.fg_color),
+            .bg_color = .fromColor(s.bg_color),
+            .underline_color = .fromColor(s.underline_color),
+            .bold = s.flags.bold,
+            .italic = s.flags.italic,
+            .faint = s.flags.faint,
+            .blink = s.flags.blink,
+            .inverse = s.flags.inverse,
+            .invisible = s.flags.invisible,
+            .strikethrough = s.flags.strikethrough,
+            .overline = s.flags.overline,
+            .underline = @intFromEnum(s.flags.underline),
+        };
+    }
 };
 
-fn convertColor(c: style.Style.Color) Color {
-    return switch (c) {
-        .none => .{
-            .tag = .none,
-            .value = .{ ._padding = 0 },
-        },
-        .palette => |idx| .{
-            .tag = .palette,
-            .value = .{ .palette = idx },
-        },
-        .rgb => |rgb| .{
-            .tag = .rgb,
-            .value = .{ .rgb = rgb.cval() },
-        },
-    };
-}
-
-pub fn convertStyle(s: style.Style) Style {
-    return .{
-        .fg_color = convertColor(s.fg_color),
-        .bg_color = convertColor(s.bg_color),
-        .underline_color = convertColor(s.underline_color),
-        .bold = s.flags.bold,
-        .italic = s.flags.italic,
-        .faint = s.flags.faint,
-        .blink = s.flags.blink,
-        .inverse = s.flags.inverse,
-        .invisible = s.flags.invisible,
-        .strikethrough = s.flags.strikethrough,
-        .overline = s.flags.overline,
-        .underline = @intFromEnum(s.flags.underline),
-    };
-}
-
 /// Returns the default style.
 pub fn default_style(result: *Style) callconv(.c) void {
-    result.* = convertStyle(.{});
+    result.* = .fromStyle(.{});
     assert(result.size == @sizeOf(Style));
 }
 
@@ -119,7 +119,7 @@ test "convert style with colors" {
         .flags = .{ .bold = true, .underline = .curly },
     };
 
-    const c_style = convertStyle(zig_style);
+    const c_style: Style = .fromStyle(zig_style);
     try testing.expectEqual(ColorTag.palette, c_style.fg_color.tag);
     try testing.expectEqual(@as(u8, 42), c_style.fg_color.value.palette);
     try testing.expectEqual(ColorTag.rgb, c_style.bg_color.tag);
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 3c771f16e..1d31d5ae2 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -8,6 +8,7 @@ const PageList = @import("../PageList.zig");
 const kitty = @import("../kitty/key.zig");
 const modes = @import("../modes.zig");
 const size = @import("../size.zig");
+const style_c = @import("style.zig");
 const Result = @import("result.zig").Result;
 
 const log = std.log.scoped(.terminal_c);
@@ -146,6 +147,7 @@ pub const TerminalData = enum(c_int) {
     cursor_visible = 7,
     kitty_keyboard_flags = 8,
     scrollbar = 9,
+    cursor_style = 10,
 
     /// Output type expected for querying the data of the given kind.
     pub fn OutType(comptime self: TerminalData) type {
@@ -156,6 +158,7 @@ pub const TerminalData = enum(c_int) {
             .active_screen => TerminalScreen,
             .kitty_keyboard_flags => u8,
             .scrollbar => TerminalScrollbar,
+            .cursor_style => style_c.Style,
         };
     }
 };
@@ -198,6 +201,7 @@ fn getTyped(
         .cursor_visible => out.* = t.modes.get(.cursor_visible),
         .kitty_keyboard_flags => out.* = @as(u8, t.screens.active.kitty_keyboard.current().int()),
         .scrollbar => out.* = t.screens.active.pages.scrollbar().cval(),
+        .cursor_style => out.* = .fromStyle(t.screens.active.cursor.style),
     }
 
     return .success;

From d827225573b673bc5c1756f2d14971638a472d53 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 19 Mar 2026 12:24:28 -0700
Subject: [PATCH 239/391] vt: expand padding for color union to 64-bit to allow
 for a pointer

---
 include/ghostty/vt/style.h | 2 +-
 src/terminal/c/style.zig   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/ghostty/vt/style.h b/include/ghostty/vt/style.h
index 5c326ae19..603f88d01 100644
--- a/include/ghostty/vt/style.h
+++ b/include/ghostty/vt/style.h
@@ -52,7 +52,7 @@ typedef enum {
 typedef union {
   GhosttyColorPaletteIndex palette;
   GhosttyColorRgb rgb;
-  uint32_t _padding;
+  uint64_t _padding;
 } GhosttyStyleColorValue;
 
 /**
diff --git a/src/terminal/c/style.zig b/src/terminal/c/style.zig
index 5538c42cc..99f591c10 100644
--- a/src/terminal/c/style.zig
+++ b/src/terminal/c/style.zig
@@ -16,7 +16,7 @@ pub const ColorTag = enum(c_int) {
 pub const ColorValue = extern union {
     palette: u8,
     rgb: color.RGB.C,
-    _padding: u32,
+    _padding: u64,
 };
 
 /// C: GhosttyStyleColor

From 5c8b9f3f434abee1e70f454ec00301010ea01edf Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 19 Mar 2026 13:10:31 -0700
Subject: [PATCH 240/391] vt: add GhosttyCell and GhosttyRow C API with data
 getters

Add opaque GhosttyCell (uint64_t) and GhosttyRow (uint64_t) types that
bitcast to the internal packed Cell and Row structs from page.zig. Each
type has a corresponding data enum and getter function following the
same pattern as ghostty_terminal_get.

ghostty_cell_get supports extracting codepoint, content tag, wide
property, has_text, has_styling, style_id, has_hyperlink, protected,
and semantic_content. ghostty_row_get supports wrap, wrap_continuation,
grapheme, styled, hyperlink, semantic_prompt, kitty_virtual_placeholder,
and dirty.

The cell and row types and functions live in a new screen.h header,
separate from terminal.h, with terminal.h including screen.h for
convenience.
---
 include/ghostty/vt.h          |   1 +
 include/ghostty/vt/screen.h   | 323 ++++++++++++++++++++++++++++++++++
 include/ghostty/vt/terminal.h |   1 +
 src/lib_vt.zig                |   2 +
 src/terminal/c/cell.zig       | 158 +++++++++++++++++
 src/terminal/c/main.zig       |   8 +
 src/terminal/c/row.zig        | 130 ++++++++++++++
 7 files changed, 623 insertions(+)
 create mode 100644 include/ghostty/vt/screen.h
 create mode 100644 src/terminal/c/cell.zig
 create mode 100644 src/terminal/c/row.zig

diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index effafd0f0..de690577d 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -103,6 +103,7 @@ extern "C" {
 #include <ghostty/vt/modes.h>
 #include <ghostty/vt/mouse.h>
 #include <ghostty/vt/paste.h>
+#include <ghostty/vt/screen.h>
 #include <ghostty/vt/size_report.h>
 #include <ghostty/vt/wasm.h>
 
diff --git a/include/ghostty/vt/screen.h b/include/ghostty/vt/screen.h
new file mode 100644
index 000000000..64207ce13
--- /dev/null
+++ b/include/ghostty/vt/screen.h
@@ -0,0 +1,323 @@
+/**
+ * @file screen.h
+ *
+ * Terminal screen cell and row types.
+ */
+
+#ifndef GHOSTTY_VT_SCREEN_H
+#define GHOSTTY_VT_SCREEN_H
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <ghostty/vt/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @defgroup screen Screen
+ *
+ * Terminal screen cell and row types.
+ *
+ * These types represent the contents of a terminal screen. A GhosttyCell
+ * is a single grid cell and a GhosttyRow is a single row. Both are opaque
+ * values whose fields are accessed via ghostty_cell_get() and
+ * ghostty_row_get() respectively.
+ *
+ * @{
+ */
+
+/**
+ * Opaque cell value.
+ *
+ * Represents a single terminal cell. The internal layout is opaque and
+ * must be queried via ghostty_cell_get(). Obtain cell values from
+ * terminal query APIs.
+ *
+ * @ingroup screen
+ */
+typedef uint64_t GhosttyCell;
+
+/**
+ * Opaque row value.
+ *
+ * Represents a single terminal row. The internal layout is opaque and
+ * must be queried via ghostty_row_get(). Obtain row values from
+ * terminal query APIs.
+ *
+ * @ingroup screen
+ */
+typedef uint64_t GhosttyRow;
+
+/**
+ * Cell content tag.
+ *
+ * Describes what kind of content a cell holds.
+ *
+ * @ingroup screen
+ */
+typedef enum {
+  /** A single codepoint (may be zero for empty). */
+  GHOSTTY_CELL_CONTENT_CODEPOINT = 0,
+
+  /** A codepoint that is part of a multi-codepoint grapheme cluster. */
+  GHOSTTY_CELL_CONTENT_CODEPOINT_GRAPHEME = 1,
+
+  /** No text; background color from palette. */
+  GHOSTTY_CELL_CONTENT_BG_COLOR_PALETTE = 2,
+
+  /** No text; background color as RGB. */
+  GHOSTTY_CELL_CONTENT_BG_COLOR_RGB = 3,
+} GhosttyCellContentTag;
+
+/**
+ * Cell wide property.
+ *
+ * Describes the width behavior of a cell.
+ *
+ * @ingroup screen
+ */
+typedef enum {
+  /** Not a wide character, cell width 1. */
+  GHOSTTY_CELL_WIDE_NARROW = 0,
+
+  /** Wide character, cell width 2. */
+  GHOSTTY_CELL_WIDE_WIDE = 1,
+
+  /** Spacer after wide character. Do not render. */
+  GHOSTTY_CELL_WIDE_SPACER_TAIL = 2,
+
+  /** Spacer at end of soft-wrapped line for a wide character. */
+  GHOSTTY_CELL_WIDE_SPACER_HEAD = 3,
+} GhosttyCellWide;
+
+/**
+ * Semantic content type of a cell.
+ *
+ * Set by semantic prompt sequences (OSC 133) to distinguish between
+ * command output, user input, and shell prompt text.
+ *
+ * @ingroup screen
+ */
+typedef enum {
+  /** Regular output content, such as command output. */
+  GHOSTTY_CELL_SEMANTIC_OUTPUT = 0,
+
+  /** Content that is part of user input. */
+  GHOSTTY_CELL_SEMANTIC_INPUT = 1,
+
+  /** Content that is part of a shell prompt. */
+  GHOSTTY_CELL_SEMANTIC_PROMPT = 2,
+} GhosttyCellSemanticContent;
+
+/**
+ * Cell data types.
+ *
+ * These values specify what type of data to extract from a cell
+ * using `ghostty_cell_get`.
+ *
+ * @ingroup screen
+ */
+typedef enum {
+  /** Invalid data type. Never results in any data extraction. */
+  GHOSTTY_CELL_DATA_INVALID = 0,
+
+  /**
+   * The codepoint of the cell (0 if empty or bg-color-only).
+   *
+   * Output type: uint32_t *
+   */
+  GHOSTTY_CELL_DATA_CODEPOINT = 1,
+
+  /**
+   * The content tag describing what kind of content is in the cell.
+   *
+   * Output type: GhosttyCellContentTag *
+   */
+  GHOSTTY_CELL_DATA_CONTENT_TAG = 2,
+
+  /**
+   * The wide property of the cell.
+   *
+   * Output type: GhosttyCellWide *
+   */
+  GHOSTTY_CELL_DATA_WIDE = 3,
+
+  /**
+   * Whether the cell has text to render.
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_CELL_DATA_HAS_TEXT = 4,
+
+  /**
+   * Whether the cell has non-default styling.
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_CELL_DATA_HAS_STYLING = 5,
+
+  /**
+   * The style ID for the cell (for use with style lookups).
+   *
+   * Output type: uint16_t *
+   */
+  GHOSTTY_CELL_DATA_STYLE_ID = 6,
+
+  /**
+   * Whether the cell has a hyperlink.
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_CELL_DATA_HAS_HYPERLINK = 7,
+
+  /**
+   * Whether the cell is protected.
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_CELL_DATA_PROTECTED = 8,
+
+  /**
+   * The semantic content type of the cell (from OSC 133).
+   *
+   * Output type: GhosttyCellSemanticContent *
+   */
+  GHOSTTY_CELL_DATA_SEMANTIC_CONTENT = 9,
+} GhosttyCellData;
+
+/**
+ * Row semantic prompt state.
+ *
+ * Indicates whether any cells in a row are part of a shell prompt,
+ * as reported by OSC 133 sequences.
+ *
+ * @ingroup screen
+ */
+typedef enum {
+  /** No prompt cells in this row. */
+  GHOSTTY_ROW_SEMANTIC_NONE = 0,
+
+  /** Prompt cells exist and this is a primary prompt line. */
+  GHOSTTY_ROW_SEMANTIC_PROMPT = 1,
+
+  /** Prompt cells exist and this is a continuation line. */
+  GHOSTTY_ROW_SEMANTIC_PROMPT_CONTINUATION = 2,
+} GhosttyRowSemanticPrompt;
+
+/**
+ * Row data types.
+ *
+ * These values specify what type of data to extract from a row
+ * using `ghostty_row_get`.
+ *
+ * @ingroup screen
+ */
+typedef enum {
+  /** Invalid data type. Never results in any data extraction. */
+  GHOSTTY_ROW_DATA_INVALID = 0,
+
+  /**
+   * Whether this row is soft-wrapped.
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_ROW_DATA_WRAP = 1,
+
+  /**
+   * Whether this row is a continuation of a soft-wrapped row.
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_ROW_DATA_WRAP_CONTINUATION = 2,
+
+  /**
+   * Whether any cells in this row have grapheme clusters.
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_ROW_DATA_GRAPHEME = 3,
+
+  /**
+   * Whether any cells in this row have styling (may have false positives).
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_ROW_DATA_STYLED = 4,
+
+  /**
+   * Whether any cells in this row have hyperlinks (may have false positives).
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_ROW_DATA_HYPERLINK = 5,
+
+  /**
+   * The semantic prompt state of this row.
+   *
+   * Output type: GhosttyRowSemanticPrompt *
+   */
+  GHOSTTY_ROW_DATA_SEMANTIC_PROMPT = 6,
+
+  /**
+   * Whether this row contains a Kitty virtual placeholder.
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_ROW_DATA_KITTY_VIRTUAL_PLACEHOLDER = 7,
+
+  /**
+   * Whether this row is dirty and requires a redraw.
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_ROW_DATA_DIRTY = 8,
+} GhosttyRowData;
+
+/**
+ * Get data from a cell.
+ *
+ * Extracts typed data from the given cell based on the specified
+ * data type. The output pointer must be of the appropriate type for the
+ * requested data kind. Valid data types and output types are documented
+ * in the `GhosttyCellData` enum.
+ *
+ * @param cell The cell value
+ * @param data The type of data to extract
+ * @param out Pointer to store the extracted data (type depends on data parameter)
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if the
+ *         data type is invalid
+ *
+ * @ingroup screen
+ */
+GhosttyResult ghostty_cell_get(GhosttyCell cell,
+                               GhosttyCellData data,
+                               void *out);
+
+/**
+ * Get data from a row.
+ *
+ * Extracts typed data from the given row based on the specified
+ * data type. The output pointer must be of the appropriate type for the
+ * requested data kind. Valid data types and output types are documented
+ * in the `GhosttyRowData` enum.
+ *
+ * @param row The row value
+ * @param data The type of data to extract
+ * @param out Pointer to store the extracted data (type depends on data parameter)
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if the
+ *         data type is invalid
+ *
+ * @ingroup screen
+ */
+GhosttyResult ghostty_row_get(GhosttyRow row,
+                              GhosttyRowData data,
+                              void *out);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GHOSTTY_VT_SCREEN_H */
diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 8ebd4e7dd..d0b14977f 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -13,6 +13,7 @@
 #include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
 #include <ghostty/vt/modes.h>
+#include <ghostty/vt/screen.h>
 #include <ghostty/vt/style.h>
 
 #ifdef __cplusplus
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index bf59d646b..5494019c4 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -171,6 +171,8 @@ comptime {
         @export(&c.size_report_encode, .{ .name = "ghostty_size_report_encode" });
         @export(&c.style_default, .{ .name = "ghostty_style_default" });
         @export(&c.style_is_default, .{ .name = "ghostty_style_is_default" });
+        @export(&c.cell_get, .{ .name = "ghostty_cell_get" });
+        @export(&c.row_get, .{ .name = "ghostty_row_get" });
         @export(&c.color_rgb_get, .{ .name = "ghostty_color_rgb_get" });
         @export(&c.sgr_new, .{ .name = "ghostty_sgr_new" });
         @export(&c.sgr_free, .{ .name = "ghostty_sgr_free" });
diff --git a/src/terminal/c/cell.zig b/src/terminal/c/cell.zig
new file mode 100644
index 000000000..493d89082
--- /dev/null
+++ b/src/terminal/c/cell.zig
@@ -0,0 +1,158 @@
+const std = @import("std");
+const testing = std.testing;
+const page = @import("../page.zig");
+const Cell = page.Cell;
+const style_c = @import("style.zig");
+const Result = @import("result.zig").Result;
+
+/// C: GhosttyCell
+pub const CCell = u64;
+
+/// C: GhosttyCellContentTag
+pub const ContentTag = enum(c_int) {
+    codepoint = 0,
+    codepoint_grapheme = 1,
+    bg_color_palette = 2,
+    bg_color_rgb = 3,
+};
+
+/// C: GhosttyCellWide
+pub const Wide = enum(c_int) {
+    narrow = 0,
+    wide = 1,
+    spacer_tail = 2,
+    spacer_head = 3,
+};
+
+/// C: GhosttyCellSemanticContent
+pub const SemanticContent = enum(c_int) {
+    output = 0,
+    input = 1,
+    prompt = 2,
+};
+
+/// C: GhosttyCellData
+pub const CellData = enum(c_int) {
+    invalid = 0,
+
+    /// The codepoint of the cell (0 if empty or bg-color-only).
+    /// Output type: uint32_t * (stored as u21, zero-extended)
+    codepoint = 1,
+
+    /// The content tag describing what kind of content is in the cell.
+    /// Output type: GhosttyCellContentTag *
+    content_tag = 2,
+
+    /// The wide property of the cell.
+    /// Output type: GhosttyCellWide *
+    wide = 3,
+
+    /// Whether the cell has text to render.
+    /// Output type: bool *
+    has_text = 4,
+
+    /// Whether the cell has styling (non-default style).
+    /// Output type: bool *
+    has_styling = 5,
+
+    /// The style ID for the cell (for use with style lookups).
+    /// Output type: uint16_t *
+    style_id = 6,
+
+    /// Whether the cell has a hyperlink.
+    /// Output type: bool *
+    has_hyperlink = 7,
+
+    /// Whether the cell is protected.
+    /// Output type: bool *
+    protected = 8,
+
+    /// The semantic content type of the cell (from OSC 133).
+    /// Output type: GhosttyCellSemanticContent *
+    semantic_content = 9,
+
+    /// Output type expected for querying the data of the given kind.
+    pub fn OutType(comptime self: CellData) type {
+        return switch (self) {
+            .invalid => void,
+            .codepoint => u32,
+            .content_tag => ContentTag,
+            .wide => Wide,
+            .has_text, .has_styling, .has_hyperlink, .protected => bool,
+            .style_id => u16,
+            .semantic_content => SemanticContent,
+        };
+    }
+};
+
+pub fn get(
+    cell_: CCell,
+    data: CellData,
+    out: ?*anyopaque,
+) callconv(.c) Result {
+    if (comptime std.debug.runtime_safety) {
+        _ = std.meta.intToEnum(CellData, @intFromEnum(data)) catch {
+            return .invalid_value;
+        };
+    }
+
+    return switch (data) {
+        inline else => |comptime_data| getTyped(
+            cell_,
+            comptime_data,
+            @ptrCast(@alignCast(out)),
+        ),
+    };
+}
+
+fn getTyped(
+    cell_: CCell,
+    comptime data: CellData,
+    out: *data.OutType(),
+) Result {
+    const cell: Cell = @bitCast(cell_);
+    switch (data) {
+        .invalid => return .invalid_value,
+        .codepoint => out.* = @intCast(cell.codepoint()),
+        .content_tag => out.* = @enumFromInt(@intFromEnum(cell.content_tag)),
+        .wide => out.* = @enumFromInt(@intFromEnum(cell.wide)),
+        .has_text => out.* = cell.hasText(),
+        .has_styling => out.* = cell.hasStyling(),
+        .style_id => out.* = cell.style_id,
+        .has_hyperlink => out.* = cell.hyperlink,
+        .protected => out.* = cell.protected,
+        .semantic_content => out.* = @enumFromInt(@intFromEnum(cell.semantic_content)),
+    }
+
+    return .success;
+}
+
+test "get codepoint" {
+    const cell: CCell = @bitCast(Cell.init('A'));
+    var cp: u32 = 0;
+    try testing.expectEqual(Result.success, get(cell, .codepoint, @ptrCast(&cp)));
+    try testing.expectEqual(@as(u32, 'A'), cp);
+}
+
+test "get has_text" {
+    const cell: CCell = @bitCast(Cell.init('A'));
+    var has: bool = false;
+    try testing.expectEqual(Result.success, get(cell, .has_text, @ptrCast(&has)));
+    try testing.expect(has);
+}
+
+test "get empty cell" {
+    const cell: CCell = @bitCast(Cell.init(0));
+    var has: bool = true;
+    try testing.expectEqual(Result.success, get(cell, .has_text, @ptrCast(&has)));
+    try testing.expect(!has);
+}
+
+test "get wide" {
+    var zig_cell = Cell.init('A');
+    zig_cell.wide = .wide;
+    const cell: CCell = @bitCast(zig_cell);
+    var w: Wide = .narrow;
+    try testing.expectEqual(Result.success, get(cell, .wide, @ptrCast(&w)));
+    try testing.expectEqual(Wide.wide, w);
+}
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index b195b4d4c..584f04f43 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -1,3 +1,4 @@
+pub const cell = @import("cell.zig");
 pub const color = @import("color.zig");
 pub const focus = @import("focus.zig");
 pub const formatter = @import("formatter.zig");
@@ -8,6 +9,7 @@ pub const key_encode = @import("key_encode.zig");
 pub const mouse_event = @import("mouse_event.zig");
 pub const mouse_encode = @import("mouse_encode.zig");
 pub const paste = @import("paste.zig");
+pub const row = @import("row.zig");
 pub const sgr = @import("sgr.zig");
 pub const size_report = @import("size_report.zig");
 pub const style = @import("style.zig");
@@ -91,6 +93,10 @@ pub const paste_is_safe = paste.is_safe;
 
 pub const size_report_encode = size_report.encode;
 
+pub const cell_get = cell.get;
+
+pub const row_get = row.get;
+
 pub const style_default = style.default_style;
 pub const style_is_default = style.style_is_default;
 
@@ -105,7 +111,9 @@ pub const terminal_mode_set = terminal.mode_set;
 pub const terminal_get = terminal.get;
 
 test {
+    _ = cell;
     _ = color;
+    _ = row;
     _ = focus;
     _ = formatter;
     _ = modes;
diff --git a/src/terminal/c/row.zig b/src/terminal/c/row.zig
new file mode 100644
index 000000000..b67c98b3c
--- /dev/null
+++ b/src/terminal/c/row.zig
@@ -0,0 +1,130 @@
+const std = @import("std");
+const testing = std.testing;
+const page = @import("../page.zig");
+const Row = page.Row;
+const Result = @import("result.zig").Result;
+
+/// C: GhosttyRow
+pub const CRow = u64;
+
+/// C: GhosttyRowSemanticPrompt
+pub const SemanticPrompt = enum(c_int) {
+    none = 0,
+    prompt = 1,
+    prompt_continuation = 2,
+};
+
+/// C: GhosttyRowData
+pub const RowData = enum(c_int) {
+    invalid = 0,
+
+    /// Whether this row is soft-wrapped.
+    /// Output type: bool *
+    wrap = 1,
+
+    /// Whether this row is a continuation of a soft-wrapped row.
+    /// Output type: bool *
+    wrap_continuation = 2,
+
+    /// Whether any cells in this row have grapheme clusters.
+    /// Output type: bool *
+    grapheme = 3,
+
+    /// Whether any cells in this row have styling (may have false positives).
+    /// Output type: bool *
+    styled = 4,
+
+    /// Whether any cells in this row have hyperlinks (may have false positives).
+    /// Output type: bool *
+    hyperlink = 5,
+
+    /// The semantic prompt state of this row.
+    /// Output type: GhosttyRowSemanticPrompt *
+    semantic_prompt = 6,
+
+    /// Whether this row contains a Kitty virtual placeholder.
+    /// Output type: bool *
+    kitty_virtual_placeholder = 7,
+
+    /// Whether this row is dirty and requires a redraw.
+    /// Output type: bool *
+    dirty = 8,
+
+    /// Output type expected for querying the data of the given kind.
+    pub fn OutType(comptime self: RowData) type {
+        return switch (self) {
+            .invalid => void,
+            .wrap, .wrap_continuation, .grapheme, .styled, .hyperlink => bool,
+            .kitty_virtual_placeholder, .dirty => bool,
+            .semantic_prompt => SemanticPrompt,
+        };
+    }
+};
+
+pub fn get(
+    row_: CRow,
+    data: RowData,
+    out: ?*anyopaque,
+) callconv(.c) Result {
+    if (comptime std.debug.runtime_safety) {
+        _ = std.meta.intToEnum(RowData, @intFromEnum(data)) catch {
+            return .invalid_value;
+        };
+    }
+
+    return switch (data) {
+        inline else => |comptime_data| getTyped(
+            row_,
+            comptime_data,
+            @ptrCast(@alignCast(out)),
+        ),
+    };
+}
+
+fn getTyped(
+    row_: CRow,
+    comptime data: RowData,
+    out: *data.OutType(),
+) Result {
+    const row: Row = @bitCast(row_);
+    switch (data) {
+        .invalid => return .invalid_value,
+        .wrap => out.* = row.wrap,
+        .wrap_continuation => out.* = row.wrap_continuation,
+        .grapheme => out.* = row.grapheme,
+        .styled => out.* = row.styled,
+        .hyperlink => out.* = row.hyperlink,
+        .semantic_prompt => out.* = @enumFromInt(@intFromEnum(row.semantic_prompt)),
+        .kitty_virtual_placeholder => out.* = row.kitty_virtual_placeholder,
+        .dirty => out.* = row.dirty,
+    }
+
+    return .success;
+}
+
+test "get wrap" {
+    var zig_row: Row = @bitCast(@as(u64, 0));
+    zig_row.wrap = true;
+    const row: CRow = @bitCast(zig_row);
+    var wrap: bool = false;
+    try testing.expectEqual(Result.success, get(row, .wrap, @ptrCast(&wrap)));
+    try testing.expect(wrap);
+}
+
+test "get semantic_prompt" {
+    var zig_row: Row = @bitCast(@as(u64, 0));
+    zig_row.semantic_prompt = .prompt;
+    const row: CRow = @bitCast(zig_row);
+    var sp: SemanticPrompt = .none;
+    try testing.expectEqual(Result.success, get(row, .semantic_prompt, @ptrCast(&sp)));
+    try testing.expectEqual(SemanticPrompt.prompt, sp);
+}
+
+test "get dirty" {
+    var zig_row: Row = @bitCast(@as(u64, 0));
+    zig_row.dirty = true;
+    const row: CRow = @bitCast(zig_row);
+    var dirty: bool = false;
+    try testing.expectEqual(Result.success, get(row, .dirty, @ptrCast(&dirty)));
+    try testing.expect(dirty);
+}

From 057f227145fcce8d92678c16591d936f54f202b8 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 19 Mar 2026 13:59:48 -0700
Subject: [PATCH 241/391] terminal: convert Point to lib.Enum/lib.TaggedUnion
 with C header

---
 include/ghostty/vt/point.h | 88 ++++++++++++++++++++++++++++++++++++++
 src/terminal/point.zig     | 87 +++++++++++++++++++++----------------
 2 files changed, 139 insertions(+), 36 deletions(-)
 create mode 100644 include/ghostty/vt/point.h

diff --git a/include/ghostty/vt/point.h b/include/ghostty/vt/point.h
new file mode 100644
index 000000000..f152a5c46
--- /dev/null
+++ b/include/ghostty/vt/point.h
@@ -0,0 +1,88 @@
+/**
+ * @file point.h
+ *
+ * Terminal point types for referencing locations in the terminal grid.
+ */
+
+#ifndef GHOSTTY_VT_POINT_H
+#define GHOSTTY_VT_POINT_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @defgroup point Point
+ *
+ * Types for referencing x/y positions in the terminal grid under
+ * different coordinate systems (active area, viewport, full screen,
+ * scrollback history).
+ *
+ * @{
+ */
+
+/**
+ * A coordinate in the terminal grid.
+ *
+ * @ingroup point
+ */
+typedef struct {
+  /** Column (0-indexed). */
+  uint16_t x;
+
+  /** Row (0-indexed). May exceed page size for screen/history tags. */
+  uint32_t y;
+} GhosttyPointCoordinate;
+
+/**
+ * Point reference tag.
+ *
+ * Determines which coordinate system a point uses.
+ *
+ * @ingroup point
+ */
+typedef enum {
+  /** Active area where the cursor can move. */
+  GHOSTTY_POINT_TAG_ACTIVE = 0,
+
+  /** Visible viewport (changes when scrolled). */
+  GHOSTTY_POINT_TAG_VIEWPORT = 1,
+
+  /** Full screen including scrollback. */
+  GHOSTTY_POINT_TAG_SCREEN = 2,
+
+  /** Scrollback history only (before active area). */
+  GHOSTTY_POINT_TAG_HISTORY = 3,
+} GhosttyPointTag;
+
+/**
+ * Point value union.
+ *
+ * @ingroup point
+ */
+typedef union {
+  /** Coordinate (used for all tag variants). */
+  GhosttyPointCoordinate coordinate;
+
+  /** Padding for ABI compatibility. Do not use. */
+  uint64_t _padding[2];
+} GhosttyPointValue;
+
+/**
+ * Tagged union for a point in the terminal grid.
+ *
+ * @ingroup point
+ */
+typedef struct {
+  GhosttyPointTag tag;
+  GhosttyPointValue value;
+} GhosttyPoint;
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GHOSTTY_VT_POINT_H */
diff --git a/src/terminal/point.zig b/src/terminal/point.zig
index c5983fcbc..db834732c 100644
--- a/src/terminal/point.zig
+++ b/src/terminal/point.zig
@@ -1,52 +1,56 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
+const build_options = @import("terminal_options");
+const lib = @import("../lib/main.zig");
 const size = @import("size.zig");
 
+const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
+
 /// The possible reference locations for a point. When someone says "(42, 80)"
 /// in the context of a terminal, that could mean multiple things: it is in the
 /// current visible viewport? the current active area of the screen where the
 /// cursor is? the entire scrollback history? etc.
 ///
 /// This tag is used to differentiate those cases.
-pub const Tag = enum {
-    /// Top-left is part of the active area where a running program can
-    /// jump the cursor and make changes. The active area is the "editable"
-    /// part of the screen.
-    ///
-    /// The bottom-right of the active tag differs from all other tags
-    /// because it includes the full height (rows) of the screen, including
-    /// rows that may not be written yet. This is required because the active
-    /// area is fully "addressable" by the running program (see below) whereas
-    /// the other tags are used primarily for reading/modifying past-written
-    /// data so they can't address unwritten rows.
-    ///
-    /// Note for those less familiar with terminal functionality: there
-    /// are escape sequences to move the cursor to any position on
-    /// the screen, but it is limited to the size of the viewport and
-    /// the bottommost part of the screen. Terminal programs can't --
-    /// with sequences at the time of writing this comment -- modify
-    /// anything in the scrollback, visible viewport (if it differs
-    /// from the active area), etc.
-    active,
+pub const Tag = lib.Enum(lib_target, &.{
+    // Top-left is part of the active area where a running program can
+    // jump the cursor and make changes. The active area is the "editable"
+    // part of the screen.
+    //
+    // The bottom-right of the active tag differs from all other tags
+    // because it includes the full height (rows) of the screen, including
+    // rows that may not be written yet. This is required because the active
+    // area is fully "addressable" by the running program (see below) whereas
+    // the other tags are used primarily for reading/modifying past-written
+    // data so they can't address unwritten rows.
+    //
+    // Note for those less familiar with terminal functionality: there
+    // are escape sequences to move the cursor to any position on
+    // the screen, but it is limited to the size of the viewport and
+    // the bottommost part of the screen. Terminal programs can't --
+    // with sequences at the time of writing this comment -- modify
+    // anything in the scrollback, visible viewport (if it differs
+    // from the active area), etc.
+    "active",
 
-    /// Top-left is the visible viewport. This means that if the user
-    /// has scrolled in any direction, top-left changes. The bottom-right
-    /// is the last written row from the top-left.
-    viewport,
+    // Top-left is the visible viewport. This means that if the user
+    // has scrolled in any direction, top-left changes. The bottom-right
+    // is the last written row from the top-left.
+    "viewport",
 
-    /// Top-left is the furthest back in the scrollback history
-    /// supported by the screen and the bottom-right is the bottom-right
-    /// of the last written row. Note this last point is important: the
-    /// bottom right is NOT necessarily the same as "active" because
-    /// "active" always allows referencing the full rows tall of the
-    /// screen whereas "screen" only contains written rows.
-    screen,
+    // Top-left is the furthest back in the scrollback history
+    // supported by the screen and the bottom-right is the bottom-right
+    // of the last written row. Note this last point is important: the
+    // bottom right is NOT necessarily the same as "active" because
+    // "active" always allows referencing the full rows tall of the
+    // screen whereas "screen" only contains written rows.
+    "screen",
 
-    /// The top-left is the same as "screen" but the bottom-right is
-    /// the line just before the top of "active". This contains only
-    /// the scrollback history.
-    history,
-};
+    // The top-left is the same as "screen" but the bottom-right is
+    // the line just before the top of "active". This contains only
+    // the scrollback history.
+    "history",
+});
 
 /// An x/y point in the terminal for some definition of location (tag).
 pub const Point = union(Tag) {
@@ -64,6 +68,17 @@ pub const Point = union(Tag) {
             => |v| v,
         };
     }
+
+    const c_union = lib.TaggedUnion(
+        lib_target,
+        @This(),
+        // Padding: largest variant is Coordinate (u16 + u32 = 6 bytes).
+        // Use [2]u64 (16 bytes) for future expansion.
+        [2]u64,
+    );
+    pub const C = c_union.C;
+    pub const CValue = c_union.CValue;
+    pub const cval = c_union.cval;
 };
 
 pub const Coordinate = extern struct {

From 0400de28b40bc47b0fcd0f5a78a908413cb86be6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 19 Mar 2026 14:07:12 -0700
Subject: [PATCH 242/391] vt: add ghostty_terminal_cell for point-based cell
 lookup

Add a new C API function ghostty_terminal_cell that retrieves the
opaque cell and row values at a given point in the terminal grid.
The point is a tagged union supporting active, viewport, screen, and
history coordinate systems.
---
 include/ghostty/vt/terminal.h | 36 +++++++++++++++-
 src/lib_vt.zig                |  1 +
 src/terminal/c/main.zig       |  1 +
 src/terminal/c/terminal.zig   | 81 +++++++++++++++++++++++++++++++++++
 4 files changed, 117 insertions(+), 2 deletions(-)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index d0b14977f..65a6d5389 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -14,6 +14,7 @@
 #include <ghostty/vt/allocator.h>
 #include <ghostty/vt/modes.h>
 #include <ghostty/vt/screen.h>
+#include <ghostty/vt/point.h>
 #include <ghostty/vt/style.h>
 
 #ifdef __cplusplus
@@ -372,8 +373,39 @@ GhosttyResult ghostty_terminal_mode_set(GhosttyTerminal terminal,
  * @ingroup terminal
  */
 GhosttyResult ghostty_terminal_get(GhosttyTerminal terminal,
-                                   GhosttyTerminalData data,
-                                   void *out);
+                                    GhosttyTerminalData data,
+                                    void *out);
+
+/**
+ * Get the cell and row at a given point in the terminal.
+ *
+ * Looks up the cell at the specified point in the terminal grid. On success,
+ * the output parameters are set to the opaque cell and row values, which can
+ * be queried further with ghostty_cell_get() and ghostty_row_get().
+ *
+ * Lookups using the `active` and `viewport` tags are fast. The `screen`
+ * and `history` tags may require traversing the full scrollback page list
+ * to resolve the y coordinate, so they can be expensive for large
+ * scrollback buffers.
+ *
+ * This function isn't meant to be used as the core of render loop. It
+ * isn't built to sustain the framerates needed for rendering large screens.
+ * Use the render state API for that. This API is instead meant for less
+ * strictly performance-sensitive use cases.
+ *
+ * @param terminal The terminal handle (NULL returns GHOSTTY_INVALID_VALUE)
+ * @param point The point specifying which cell to look up
+ * @param[out] out_cell On success, set to the cell at the given point (may be NULL)
+ * @param[out] out_row On success, set to the row containing the cell (may be NULL)
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if the terminal
+ *         is NULL or the point is out of bounds
+ *
+ * @ingroup terminal
+ */
+GhosttyResult ghostty_terminal_cell(GhosttyTerminal terminal,
+                                     GhosttyPoint point,
+                                     GhosttyCell *out_cell,
+                                     GhosttyRow *out_row);
 
 /** @} */
 
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 5494019c4..d82a3f3de 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -196,6 +196,7 @@ comptime {
         @export(&c.terminal_mode_get, .{ .name = "ghostty_terminal_mode_get" });
         @export(&c.terminal_mode_set, .{ .name = "ghostty_terminal_mode_set" });
         @export(&c.terminal_get, .{ .name = "ghostty_terminal_get" });
+        @export(&c.terminal_cell, .{ .name = "ghostty_terminal_cell" });
 
         // On Wasm we need to export our allocator convenience functions.
         if (builtin.target.cpu.arch.isWasm()) {
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 584f04f43..b1b2c92ef 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -109,6 +109,7 @@ pub const terminal_scroll_viewport = terminal.scroll_viewport;
 pub const terminal_mode_get = terminal.mode_get;
 pub const terminal_mode_set = terminal.mode_set;
 pub const terminal_get = terminal.get;
+pub const terminal_cell = terminal.cell;
 
 test {
     _ = cell;
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 1d31d5ae2..fe3a5e149 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -7,7 +7,10 @@ const ScreenSet = @import("../ScreenSet.zig");
 const PageList = @import("../PageList.zig");
 const kitty = @import("../kitty/key.zig");
 const modes = @import("../modes.zig");
+const point = @import("../point.zig");
 const size = @import("../size.zig");
+const cell_c = @import("cell.zig");
+const row_c = @import("row.zig");
 const style_c = @import("style.zig");
 const Result = @import("result.zig").Result;
 
@@ -207,6 +210,26 @@ fn getTyped(
     return .success;
 }
 
+pub fn cell(
+    terminal_: Terminal,
+    pt: point.Point.C,
+    out_cell: ?*cell_c.CCell,
+    out_row: ?*row_c.CRow,
+) callconv(.c) Result {
+    const t = terminal_ orelse return .invalid_value;
+    const zig_pt: point.Point = switch (pt.tag) {
+        .active => .{ .active = pt.value.active },
+        .viewport => .{ .viewport = pt.value.viewport },
+        .screen => .{ .screen = pt.value.screen },
+        .history => .{ .history = pt.value.history },
+    };
+    const result = t.screens.active.pages.getCell(zig_pt) orelse
+        return .invalid_value;
+    if (out_cell) |p| p.* = @bitCast(result.cell.*);
+    if (out_row) |p| p.* = @bitCast(result.row.*);
+    return .success;
+}
+
 pub fn free(terminal_: Terminal) callconv(.c) void {
     const t = terminal_ orelse return;
 
@@ -612,3 +635,61 @@ test "get invalid" {
 
     try testing.expectEqual(Result.invalid_value, get(t, .invalid, null));
 }
+
+test "cell" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    vt_write(t, "Hello", 5);
+
+    var out_cell: cell_c.CCell = undefined;
+    var out_row: row_c.CRow = undefined;
+    try testing.expectEqual(Result.success, cell(t, .{
+        .tag = .active,
+        .value = .{ .active = .{ .x = 0, .y = 0 } },
+    }, &out_cell, &out_row));
+
+    // Verify the cell contains 'H'
+    var cp: u32 = 0;
+    try testing.expectEqual(Result.success, cell_c.get(out_cell, .codepoint, @ptrCast(&cp)));
+    try testing.expectEqual(@as(u32, 'H'), cp);
+}
+
+test "cell null terminal" {
+    var out_cell: cell_c.CCell = undefined;
+    var out_row: row_c.CRow = undefined;
+    try testing.expectEqual(Result.invalid_value, cell(null, .{
+        .tag = .active,
+        .value = .{ .active = .{ .x = 0, .y = 0 } },
+    }, &out_cell, &out_row));
+}
+
+test "cell out of bounds" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    var out_cell: cell_c.CCell = undefined;
+    var out_row: row_c.CRow = undefined;
+    try testing.expectEqual(Result.invalid_value, cell(t, .{
+        .tag = .active,
+        .value = .{ .active = .{ .x = 100, .y = 0 } },
+    }, &out_cell, &out_row));
+}

From 10e69384d7e6a59253dda2cc00482210f6e63ee7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2026 00:12:29 +0000
Subject: [PATCH 243/391] build(deps): bump namespacelabs/nscloud-setup from
 0.0.11 to 0.0.12

Bumps [namespacelabs/nscloud-setup](https://github.com/namespacelabs/nscloud-setup) from 0.0.11 to 0.0.12.
- [Release notes](https://github.com/namespacelabs/nscloud-setup/releases)
- [Commits](https://github.com/namespacelabs/nscloud-setup/compare/f378676225212387f1283f4da878712af2c4cd60...df198f982fcecfb8264bea3f1274b56a61b6dfdc)

---
updated-dependencies:
- dependency-name: namespacelabs/nscloud-setup
  dependency-version: 0.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 806ade97c..65e617a1d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1373,7 +1373,7 @@ jobs:
     needs: [test, build-dist]
     steps:
       - name: Install and configure Namespace CLI
-        uses: namespacelabs/nscloud-setup@f378676225212387f1283f4da878712af2c4cd60 # v0.0.11
+        uses: namespacelabs/nscloud-setup@df198f982fcecfb8264bea3f1274b56a61b6dfdc # v0.0.12
 
       - name: Configure Namespace powered Buildx
         uses: namespacelabs/nscloud-setup-buildx-action@f5814dcf37a16cce0624d5bec2ab879654294aa0 # v0.0.22

From 7c14aecd3fb96cbc6c9c2035ebe830a38f1693e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2026 00:12:37 +0000
Subject: [PATCH 244/391] build(deps): bump
 namespacelabs/nscloud-setup-buildx-action

Bumps [namespacelabs/nscloud-setup-buildx-action](https://github.com/namespacelabs/nscloud-setup-buildx-action) from 0.0.22 to 0.0.23.
- [Release notes](https://github.com/namespacelabs/nscloud-setup-buildx-action/releases)
- [Commits](https://github.com/namespacelabs/nscloud-setup-buildx-action/compare/f5814dcf37a16cce0624d5bec2ab879654294aa0...d059ed7184f0bc7c8b27e8810cea153d02bcc6dd)

---
updated-dependencies:
- dependency-name: namespacelabs/nscloud-setup-buildx-action
  dependency-version: 0.0.23
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 806ade97c..f77edd237 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1376,7 +1376,7 @@ jobs:
         uses: namespacelabs/nscloud-setup@f378676225212387f1283f4da878712af2c4cd60 # v0.0.11
 
       - name: Configure Namespace powered Buildx
-        uses: namespacelabs/nscloud-setup-buildx-action@f5814dcf37a16cce0624d5bec2ab879654294aa0 # v0.0.22
+        uses: namespacelabs/nscloud-setup-buildx-action@d059ed7184f0bc7c8b27e8810cea153d02bcc6dd # v0.0.23
 
       - name: Download Source Tarball Artifacts
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1

From 2a952b4dfeac0acda22e67779dabdc415757a0a7 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Thu, 19 Mar 2026 20:59:16 -0400
Subject: [PATCH 245/391] bash: move __ghostty_preexec_hook into __ghostty_hook

We previously used a readonly variable (__ghostty_ps0) to define the
best __ghostty_preexec_hook expansion for the current bash version.

This works pretty well, but it had the downside of managing another
variable (#11258).

We can instead simplify this a bit by moving this into __ghostty_hook. I
didn't take that approach originally because I wanted to avoid the bash
version check on each command, but slightly loosening our guard check to
just look for "__ghostty_preexec_hook" (rather than the full expansion
expression) means we can bury the bash version check to the cold path.

One small gap here is that we may not update PS0 to the correct syntax
if we start switching between significantly different bash versions in
interactive subshells, but that seems like a pretty rare case to handle
given the benefits of this approach.
---
 src/shell-integration/bash/ghostty.bash | 26 +++++++++++--------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/shell-integration/bash/ghostty.bash b/src/shell-integration/bash/ghostty.bash
index ec421daab..2372b1cd6 100644
--- a/src/shell-integration/bash/ghostty.bash
+++ b/src/shell-integration/bash/ghostty.bash
@@ -278,24 +278,20 @@ if (( BASH_VERSINFO[0] > 4 || (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 4) )
     [[ -n "$cmd" ]] && __ghostty_preexec "$cmd"
   }
 
-  # Use function substitution in 5.3+. Otherwise, use command substitution.
-  # Any output (including escape sequences) goes to the terminal.
-  # Only define if not already set (allows re-sourcing).
-  if [[ -z "${__ghostty_ps0+x}" ]]; then
-    if (( BASH_VERSINFO[0] > 5 || (BASH_VERSINFO[0] == 5 && BASH_VERSINFO[1] >= 3) )); then
-      # shellcheck disable=SC2016
-      builtin readonly __ghostty_ps0='${ __ghostty_preexec_hook; }'
-    else
-      # shellcheck disable=SC2016
-      builtin readonly __ghostty_ps0='$(__ghostty_preexec_hook >/dev/tty)'
-    fi
-  fi
-
   __ghostty_hook() {
     builtin local ret=$?
     __ghostty_precmd "$ret"
-    if [[ "$PS0" != *"$__ghostty_ps0"* ]]; then
-      PS0=$PS0"${__ghostty_ps0}"
+
+    # Append preexec hook to PS0 if not already present.
+    # Use function substitution in 5.3+, otherwise command substitution.
+    if [[ "$PS0" != *"__ghostty_preexec_hook"* ]]; then
+      if (( BASH_VERSINFO[0] > 5 || (BASH_VERSINFO[0] == 5 && BASH_VERSINFO[1] >= 3) )); then
+        # shellcheck disable=SC2016
+        PS0+='${ __ghostty_preexec_hook; }'
+      else
+        # shellcheck disable=SC2016
+        PS0+='$(__ghostty_preexec_hook >/dev/tty)'
+      fi
     fi
   }
 

From df8813bf1b0a0526ee5da340b4398f85f0852c52 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 19 Mar 2026 15:35:06 -0700
Subject: [PATCH 246/391] vt: replace ghostty_terminal_cell with GhosttyGridRef
 API

---
 include/ghostty/vt.h          |  1 +
 include/ghostty/vt/grid_ref.h | 86 +++++++++++++++++++++++++++++++++++
 include/ghostty/vt/terminal.h | 20 ++++----
 src/lib_vt.zig                |  4 +-
 src/terminal/c/grid_ref.zig   | 76 +++++++++++++++++++++++++++++++
 src/terminal/c/main.zig       |  7 ++-
 src/terminal/c/terminal.zig   | 43 +++++++++---------
 7 files changed, 203 insertions(+), 34 deletions(-)
 create mode 100644 include/ghostty/vt/grid_ref.h
 create mode 100644 src/terminal/c/grid_ref.zig

diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index de690577d..8a53c4bd0 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -96,6 +96,7 @@ extern "C" {
 #include <ghostty/vt/focus.h>
 #include <ghostty/vt/formatter.h>
 #include <ghostty/vt/terminal.h>
+#include <ghostty/vt/grid_ref.h>
 #include <ghostty/vt/osc.h>
 #include <ghostty/vt/sgr.h>
 #include <ghostty/vt/style.h>
diff --git a/include/ghostty/vt/grid_ref.h b/include/ghostty/vt/grid_ref.h
new file mode 100644
index 000000000..51260e35f
--- /dev/null
+++ b/include/ghostty/vt/grid_ref.h
@@ -0,0 +1,86 @@
+/**
+ * @file grid_ref.h
+ *
+ * Terminal grid reference type for referencing a resolved position in the
+ * terminal grid.
+ */
+
+#ifndef GHOSTTY_VT_GRID_REF_H
+#define GHOSTTY_VT_GRID_REF_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include <ghostty/vt/types.h>
+#include <ghostty/vt/screen.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @defgroup grid_ref Grid Reference
+ *
+ * A grid reference is a resolved reference to a specific cell position in the
+ * terminal's internal page structure. Obtain a grid reference from
+ * ghostty_terminal_grid_ref(), then extract the cell or row via
+ * ghostty_grid_ref_cell() and ghostty_grid_ref_row().
+ *
+ * A grid reference is only valid until the next update to the terminal
+ * instance. There is no guarantee that a grid reference will remain
+ * valid after ANY operation, even if a seemingly unrelated part of
+ * the grid is changed, so any information related to the grid reference
+ * should be read and cached immediately after obtaining the grid reference.
+ *
+ * This API is not meant to be used as the core of render loop. It isn't 
+ * built to sustain the framerates needed for rendering large screens. 
+ * Use the render state API for that. 
+ *
+ * @{
+ */
+
+/**
+ * A resolved reference to a terminal cell position.
+ *
+ * This is a sized struct. Use GHOSTTY_INIT_SIZED() to initialize it.
+ *
+ * @ingroup grid_ref
+ */
+typedef struct {
+  size_t size;
+  void *node;
+  uint16_t x;
+  uint16_t y;
+} GhosttyGridRef;
+
+/**
+ * Get the cell from a grid reference.
+ *
+ * @param ref Pointer to the grid reference
+ * @param[out] out_cell On success, set to the cell at the ref's position (may be NULL)
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if the ref's
+ *         node is NULL
+ *
+ * @ingroup grid_ref
+ */
+GhosttyResult ghostty_grid_ref_cell(const GhosttyGridRef *ref,
+                                    GhosttyCell *out_cell);
+
+/**
+ * Get the row from a grid reference.
+ *
+ * @param ref Pointer to the grid reference
+ * @param[out] out_row On success, set to the row at the ref's position (may be NULL)
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if the ref's
+ *         node is NULL
+ *
+ * @ingroup grid_ref
+ */
+GhosttyResult ghostty_grid_ref_row(const GhosttyGridRef *ref,
+                                   GhosttyRow *out_row);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GHOSTTY_VT_GRID_REF_H */
diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 65a6d5389..042d3ba93 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -13,6 +13,7 @@
 #include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
 #include <ghostty/vt/modes.h>
+#include <ghostty/vt/grid_ref.h>
 #include <ghostty/vt/screen.h>
 #include <ghostty/vt/point.h>
 #include <ghostty/vt/style.h>
@@ -377,11 +378,12 @@ GhosttyResult ghostty_terminal_get(GhosttyTerminal terminal,
                                     void *out);
 
 /**
- * Get the cell and row at a given point in the terminal.
+ * Resolve a point in the terminal grid to a grid reference.
  *
- * Looks up the cell at the specified point in the terminal grid. On success,
- * the output parameters are set to the opaque cell and row values, which can
- * be queried further with ghostty_cell_get() and ghostty_row_get().
+ * Resolves the given point (which can be in active, viewport, screen,
+ * or history coordinates) to a grid reference for that location. Use
+ * ghostty_grid_ref_cell() and ghostty_grid_ref_row() to extract the cell
+ * and row.
  *
  * Lookups using the `active` and `viewport` tags are fast. The `screen`
  * and `history` tags may require traversing the full scrollback page list
@@ -395,17 +397,15 @@ GhosttyResult ghostty_terminal_get(GhosttyTerminal terminal,
  *
  * @param terminal The terminal handle (NULL returns GHOSTTY_INVALID_VALUE)
  * @param point The point specifying which cell to look up
- * @param[out] out_cell On success, set to the cell at the given point (may be NULL)
- * @param[out] out_row On success, set to the row containing the cell (may be NULL)
+ * @param[out] out_ref On success, set to the grid reference at the given point (may be NULL)
  * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if the terminal
  *         is NULL or the point is out of bounds
  *
  * @ingroup terminal
  */
-GhosttyResult ghostty_terminal_cell(GhosttyTerminal terminal,
-                                     GhosttyPoint point,
-                                     GhosttyCell *out_cell,
-                                     GhosttyRow *out_row);
+GhosttyResult ghostty_terminal_grid_ref(GhosttyTerminal terminal,
+                                        GhosttyPoint point,
+                                        GhosttyGridRef *out_ref);
 
 /** @} */
 
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index d82a3f3de..1b17eed99 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -196,7 +196,9 @@ comptime {
         @export(&c.terminal_mode_get, .{ .name = "ghostty_terminal_mode_get" });
         @export(&c.terminal_mode_set, .{ .name = "ghostty_terminal_mode_set" });
         @export(&c.terminal_get, .{ .name = "ghostty_terminal_get" });
-        @export(&c.terminal_cell, .{ .name = "ghostty_terminal_cell" });
+        @export(&c.terminal_grid_ref, .{ .name = "ghostty_terminal_grid_ref" });
+        @export(&c.grid_ref_cell, .{ .name = "ghostty_grid_ref_cell" });
+        @export(&c.grid_ref_row, .{ .name = "ghostty_grid_ref_row" });
 
         // On Wasm we need to export our allocator convenience functions.
         if (builtin.target.cpu.arch.isWasm()) {
diff --git a/src/terminal/c/grid_ref.zig b/src/terminal/c/grid_ref.zig
new file mode 100644
index 000000000..592ee135f
--- /dev/null
+++ b/src/terminal/c/grid_ref.zig
@@ -0,0 +1,76 @@
+const std = @import("std");
+const testing = std.testing;
+const page = @import("../page.zig");
+const PageList = @import("../PageList.zig");
+const size = @import("../size.zig");
+const cell_c = @import("cell.zig");
+const row_c = @import("row.zig");
+const Result = @import("result.zig").Result;
+
+/// C: GhosttyGridRef
+///
+/// A sized struct that holds a reference to a position in the terminal grid.
+/// The ref points to a specific cell position within the terminal's
+/// internal page structure.
+pub const CGridRef = extern struct {
+    size: usize = @sizeOf(CGridRef),
+    node: ?*PageList.List.Node = null,
+    x: size.CellCountInt = 0,
+    y: size.CellCountInt = 0,
+
+    pub fn fromPin(pin: PageList.Pin) CGridRef {
+        return .{
+            .node = pin.node,
+            .x = pin.x,
+            .y = pin.y,
+        };
+    }
+
+    fn toPin(self: CGridRef) ?PageList.Pin {
+        return .{
+            .node = self.node orelse return null,
+            .x = self.x,
+            .y = self.y,
+        };
+    }
+};
+
+pub fn grid_ref_cell(
+    ref: *const CGridRef,
+    out: ?*cell_c.CCell,
+) callconv(.c) Result {
+    const p = ref.toPin() orelse return .invalid_value;
+    if (out) |o| o.* = @bitCast(p.rowAndCell().cell.*);
+    return .success;
+}
+
+pub fn grid_ref_row(
+    ref: *const CGridRef,
+    out: ?*row_c.CRow,
+) callconv(.c) Result {
+    const p = ref.toPin() orelse return .invalid_value;
+    if (out) |o| o.* = @bitCast(p.rowAndCell().row.*);
+    return .success;
+}
+
+test "grid_ref_cell null node" {
+    const ref = CGridRef{};
+    var out: cell_c.CCell = undefined;
+    try testing.expectEqual(Result.invalid_value, grid_ref_cell(&ref, &out));
+}
+
+test "grid_ref_row null node" {
+    const ref = CGridRef{};
+    var out: row_c.CRow = undefined;
+    try testing.expectEqual(Result.invalid_value, grid_ref_row(&ref, &out));
+}
+
+test "grid_ref_cell null out" {
+    const ref = CGridRef{};
+    try testing.expectEqual(Result.invalid_value, grid_ref_cell(&ref, null));
+}
+
+test "grid_ref_row null out" {
+    const ref = CGridRef{};
+    try testing.expectEqual(Result.invalid_value, grid_ref_row(&ref, null));
+}
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index b1b2c92ef..962e616cc 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -109,11 +109,16 @@ pub const terminal_scroll_viewport = terminal.scroll_viewport;
 pub const terminal_mode_get = terminal.mode_get;
 pub const terminal_mode_set = terminal.mode_set;
 pub const terminal_get = terminal.get;
-pub const terminal_cell = terminal.cell;
+pub const terminal_grid_ref = terminal.grid_ref;
+
+const grid_ref = @import("grid_ref.zig");
+pub const grid_ref_cell = grid_ref.grid_ref_cell;
+pub const grid_ref_row = grid_ref.grid_ref_row;
 
 test {
     _ = cell;
     _ = color;
+    _ = grid_ref;
     _ = row;
     _ = focus;
     _ = formatter;
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index fe3a5e149..ad560dc1a 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -11,6 +11,7 @@ const point = @import("../point.zig");
 const size = @import("../size.zig");
 const cell_c = @import("cell.zig");
 const row_c = @import("row.zig");
+const grid_ref_c = @import("grid_ref.zig");
 const style_c = @import("style.zig");
 const Result = @import("result.zig").Result;
 
@@ -210,11 +211,10 @@ fn getTyped(
     return .success;
 }
 
-pub fn cell(
+pub fn grid_ref(
     terminal_: Terminal,
     pt: point.Point.C,
-    out_cell: ?*cell_c.CCell,
-    out_row: ?*row_c.CRow,
+    out_ref: ?*grid_ref_c.CGridRef,
 ) callconv(.c) Result {
     const t = terminal_ orelse return .invalid_value;
     const zig_pt: point.Point = switch (pt.tag) {
@@ -223,10 +223,9 @@ pub fn cell(
         .screen => .{ .screen = pt.value.screen },
         .history => .{ .history = pt.value.history },
     };
-    const result = t.screens.active.pages.getCell(zig_pt) orelse
+    const p = t.screens.active.pages.pin(zig_pt) orelse
         return .invalid_value;
-    if (out_cell) |p| p.* = @bitCast(result.cell.*);
-    if (out_row) |p| p.* = @bitCast(result.row.*);
+    if (out_ref) |out| out.* = grid_ref_c.CGridRef.fromPin(p);
     return .success;
 }
 
@@ -636,7 +635,7 @@ test "get invalid" {
     try testing.expectEqual(Result.invalid_value, get(t, .invalid, null));
 }
 
-test "cell" {
+test "grid_ref" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
         &lib_alloc.test_allocator,
@@ -651,29 +650,30 @@ test "cell" {
 
     vt_write(t, "Hello", 5);
 
-    var out_cell: cell_c.CCell = undefined;
-    var out_row: row_c.CRow = undefined;
-    try testing.expectEqual(Result.success, cell(t, .{
+    var out_ref: grid_ref_c.CGridRef = .{};
+    try testing.expectEqual(Result.success, grid_ref(t, .{
         .tag = .active,
         .value = .{ .active = .{ .x = 0, .y = 0 } },
-    }, &out_cell, &out_row));
+    }, &out_ref));
+
+    // Extract cell from grid ref and verify it contains 'H'
+    var out_cell: cell_c.CCell = undefined;
+    try testing.expectEqual(Result.success, grid_ref_c.grid_ref_cell(&out_ref, &out_cell));
 
-    // Verify the cell contains 'H'
     var cp: u32 = 0;
     try testing.expectEqual(Result.success, cell_c.get(out_cell, .codepoint, @ptrCast(&cp)));
     try testing.expectEqual(@as(u32, 'H'), cp);
 }
 
-test "cell null terminal" {
-    var out_cell: cell_c.CCell = undefined;
-    var out_row: row_c.CRow = undefined;
-    try testing.expectEqual(Result.invalid_value, cell(null, .{
+test "grid_ref null terminal" {
+    var out_ref: grid_ref_c.CGridRef = .{};
+    try testing.expectEqual(Result.invalid_value, grid_ref(null, .{
         .tag = .active,
         .value = .{ .active = .{ .x = 0, .y = 0 } },
-    }, &out_cell, &out_row));
+    }, &out_ref));
 }
 
-test "cell out of bounds" {
+test "grid_ref out of bounds" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
         &lib_alloc.test_allocator,
@@ -686,10 +686,9 @@ test "cell out of bounds" {
     ));
     defer free(t);
 
-    var out_cell: cell_c.CCell = undefined;
-    var out_row: row_c.CRow = undefined;
-    try testing.expectEqual(Result.invalid_value, cell(t, .{
+    var out_ref: grid_ref_c.CGridRef = .{};
+    try testing.expectEqual(Result.invalid_value, grid_ref(t, .{
         .tag = .active,
         .value = .{ .active = .{ .x = 100, .y = 0 } },
-    }, &out_cell, &out_row));
+    }, &out_ref));
 }

From 549824842dd72b2e77caf0d443a3b3951480c764 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 19 Mar 2026 19:45:19 -0700
Subject: [PATCH 247/391] vt: add style and grapheme accessors

Add ghostty_grid_ref_style and ghostty_grid_ref_graphemes to the grid
ref C API, allowing callers to extract the full style and grapheme
cluster directly from a grid reference without manually resolving
the page internals.
---
 include/ghostty/vt/grid_ref.h | 41 ++++++++++++++++++
 include/ghostty/vt/style.h    | 10 +++++
 src/lib_vt.zig                |  2 +
 src/terminal/c/grid_ref.zig   | 79 +++++++++++++++++++++++++++++++++++
 src/terminal/c/main.zig       |  2 +
 5 files changed, 134 insertions(+)

diff --git a/include/ghostty/vt/grid_ref.h b/include/ghostty/vt/grid_ref.h
index 51260e35f..0b196dce5 100644
--- a/include/ghostty/vt/grid_ref.h
+++ b/include/ghostty/vt/grid_ref.h
@@ -12,6 +12,7 @@
 #include <stdint.h>
 #include <ghostty/vt/types.h>
 #include <ghostty/vt/screen.h>
+#include <ghostty/vt/style.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -77,6 +78,46 @@ GhosttyResult ghostty_grid_ref_cell(const GhosttyGridRef *ref,
 GhosttyResult ghostty_grid_ref_row(const GhosttyGridRef *ref,
                                    GhosttyRow *out_row);
 
+/**
+ * Get the grapheme cluster codepoints for the cell at the grid reference's
+ * position.
+ *
+ * Writes the full grapheme cluster (the cell's primary codepoint followed by
+ * any combining codepoints) into the provided buffer. If the cell has no text,
+ * out_len is set to 0 and GHOSTTY_SUCCESS is returned.
+ *
+ * If the buffer is too small (or NULL), the function returns
+ * GHOSTTY_OUT_OF_SPACE and writes the required number of codepoints to
+ * out_len. The caller can then retry with a sufficiently sized buffer.
+ *
+ * @param ref Pointer to the grid reference
+ * @param buf Output buffer of uint32_t codepoints (may be NULL)
+ * @param buf_len Number of uint32_t elements in the buffer
+ * @param[out] out_len On success, the number of codepoints written. On
+ *             GHOSTTY_OUT_OF_SPACE, the required buffer size in codepoints.
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if the ref's
+ *         node is NULL, GHOSTTY_OUT_OF_SPACE if the buffer is too small
+ *
+ * @ingroup grid_ref
+ */
+GhosttyResult ghostty_grid_ref_graphemes(const GhosttyGridRef *ref,
+                                         uint32_t *buf,
+                                         size_t buf_len,
+                                         size_t *out_len);
+
+/**
+ * Get the style of the cell at the grid reference's position.
+ *
+ * @param ref Pointer to the grid reference
+ * @param[out] out_style On success, set to the cell's style (may be NULL)
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if the ref's
+ *         node is NULL
+ *
+ * @ingroup grid_ref
+ */
+GhosttyResult ghostty_grid_ref_style(const GhosttyGridRef *ref,
+                                     GhosttyStyle *out_style);
+
 /** @} */
 
 #ifdef __cplusplus
diff --git a/include/ghostty/vt/style.h b/include/ghostty/vt/style.h
index 603f88d01..ac5cd2ad6 100644
--- a/include/ghostty/vt/style.h
+++ b/include/ghostty/vt/style.h
@@ -28,6 +28,16 @@ extern "C" {
  * @{
  */
 
+/**
+ * Style identifier type.
+ *
+ * Used to look up the full style from a grid reference.
+ * Obtain this from a cell via GHOSTTY_CELL_DATA_STYLE_ID.
+ *
+ * @ingroup style
+ */
+typedef uint16_t GhosttyStyleId;
+
 /**
  * Style color tags.
  *
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 1b17eed99..d6cfe49ea 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -199,6 +199,8 @@ comptime {
         @export(&c.terminal_grid_ref, .{ .name = "ghostty_terminal_grid_ref" });
         @export(&c.grid_ref_cell, .{ .name = "ghostty_grid_ref_cell" });
         @export(&c.grid_ref_row, .{ .name = "ghostty_grid_ref_row" });
+        @export(&c.grid_ref_graphemes, .{ .name = "ghostty_grid_ref_graphemes" });
+        @export(&c.grid_ref_style, .{ .name = "ghostty_grid_ref_style" });
 
         // On Wasm we need to export our allocator convenience functions.
         if (builtin.target.cpu.arch.isWasm()) {
diff --git a/src/terminal/c/grid_ref.zig b/src/terminal/c/grid_ref.zig
index 592ee135f..d6afb0c45 100644
--- a/src/terminal/c/grid_ref.zig
+++ b/src/terminal/c/grid_ref.zig
@@ -3,8 +3,10 @@ const testing = std.testing;
 const page = @import("../page.zig");
 const PageList = @import("../PageList.zig");
 const size = @import("../size.zig");
+const stylepkg = @import("../style.zig");
 const cell_c = @import("cell.zig");
 const row_c = @import("row.zig");
+const style_c = @import("style.zig");
 const Result = @import("result.zig").Result;
 
 /// C: GhosttyGridRef
@@ -53,6 +55,58 @@ pub fn grid_ref_row(
     return .success;
 }
 
+pub fn grid_ref_graphemes(
+    ref: *const CGridRef,
+    out_buf: ?[*]u32,
+    buf_len: usize,
+    out_len: *usize,
+) callconv(.c) Result {
+    const p = ref.toPin() orelse return .invalid_value;
+    const cell = p.rowAndCell().cell;
+
+    if (!cell.hasText()) {
+        out_len.* = 0;
+        return .success;
+    }
+
+    const cp = cell.codepoint();
+    const extra = if (cell.hasGrapheme()) p.grapheme(cell) else null;
+    const total = 1 + if (extra) |e| e.len else 0;
+
+    if (out_buf == null or buf_len < total) {
+        out_len.* = total;
+        return .out_of_space;
+    }
+
+    const buf = out_buf.?[0..buf_len];
+    buf[0] = cp;
+    if (extra) |e| for (e, 1..) |c, i| {
+        buf[i] = c;
+    };
+
+    out_len.* = total;
+    return .success;
+}
+
+pub fn grid_ref_style(
+    ref: *const CGridRef,
+    out: ?*style_c.Style,
+) callconv(.c) Result {
+    const p = ref.toPin() orelse return .invalid_value;
+    if (out) |o| {
+        const cell = p.rowAndCell().cell;
+        if (cell.style_id == stylepkg.default_id) {
+            o.* = .fromStyle(.{});
+        } else {
+            o.* = .fromStyle(p.node.data.styles.get(
+                p.node.data.memory,
+                cell.style_id,
+            ).*);
+        }
+    }
+    return .success;
+}
+
 test "grid_ref_cell null node" {
     const ref = CGridRef{};
     var out: cell_c.CCell = undefined;
@@ -74,3 +128,28 @@ test "grid_ref_row null out" {
     const ref = CGridRef{};
     try testing.expectEqual(Result.invalid_value, grid_ref_row(&ref, null));
 }
+
+test "grid_ref_graphemes null node" {
+    const ref = CGridRef{};
+    var len: usize = undefined;
+    try testing.expectEqual(Result.invalid_value, grid_ref_graphemes(&ref, null, 0, &len));
+}
+
+test "grid_ref_graphemes null buf returns out_of_space" {
+    const ref = CGridRef{};
+    var len: usize = undefined;
+    // With null node this returns invalid_value before checking the buffer,
+    // so we can only test null node here. Full buffer tests require a real page.
+    try testing.expectEqual(Result.invalid_value, grid_ref_graphemes(&ref, null, 0, &len));
+}
+
+test "grid_ref_style null node" {
+    const ref = CGridRef{};
+    var out: style_c.Style = undefined;
+    try testing.expectEqual(Result.invalid_value, grid_ref_style(&ref, &out));
+}
+
+test "grid_ref_style null out" {
+    const ref = CGridRef{};
+    try testing.expectEqual(Result.invalid_value, grid_ref_style(&ref, null));
+}
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 962e616cc..8964610df 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -114,6 +114,8 @@ pub const terminal_grid_ref = terminal.grid_ref;
 const grid_ref = @import("grid_ref.zig");
 pub const grid_ref_cell = grid_ref.grid_ref_cell;
 pub const grid_ref_row = grid_ref.grid_ref_row;
+pub const grid_ref_graphemes = grid_ref.grid_ref_graphemes;
+pub const grid_ref_style = grid_ref.grid_ref_style;
 
 test {
     _ = cell;

From 1f89ce91d97065f04c196b84c391c7212bd50de0 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2026 02:51:06 +0000
Subject: [PATCH 248/391] Update VOUCHED list (#11675)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11671#discussioncomment-16218675)
from @jcollie.

Vouch: @unphased

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 37786b485..0aed869a0 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -175,6 +175,7 @@ trag1c
 tristan957
 tweedbeetle
 uhojin
+unphased
 uzaaft
 vaughanandrews
 vlsi

From 93c597ce6bb36179065d93a465d6ee679f7472f7 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 19 Mar 2026 19:53:52 -0700
Subject: [PATCH 249/391] example: add grid reference traversal example

Add a c-vt-grid-ref example that demonstrates the terminal and grid
reference APIs end-to-end. The example creates a small 10x3 terminal,
writes text with mixed styles via VT sequences, then iterates over
every cell in the active area using ghostty_terminal_grid_ref. For
each cell it extracts the codepoint, and for each row it inspects
the wrap flag and the style bold attribute.

The grid_ref.h defgroup gains a @snippet reference to the new example,
and vt.h gets the corresponding @example entry and @ref listing.
---
 example/c-vt-grid-traverse/README.md     | 19 ++++++
 example/c-vt-grid-traverse/build.zig     | 42 ++++++++++++
 example/c-vt-grid-traverse/build.zig.zon | 24 +++++++
 example/c-vt-grid-traverse/src/main.c    | 85 ++++++++++++++++++++++++
 include/ghostty/vt.h                     |  6 ++
 include/ghostty/vt/grid_ref.h            |  4 ++
 6 files changed, 180 insertions(+)
 create mode 100644 example/c-vt-grid-traverse/README.md
 create mode 100644 example/c-vt-grid-traverse/build.zig
 create mode 100644 example/c-vt-grid-traverse/build.zig.zon
 create mode 100644 example/c-vt-grid-traverse/src/main.c

diff --git a/example/c-vt-grid-traverse/README.md b/example/c-vt-grid-traverse/README.md
new file mode 100644
index 000000000..f9a15851a
--- /dev/null
+++ b/example/c-vt-grid-traverse/README.md
@@ -0,0 +1,19 @@
+# Example: `ghostty-vt` Grid Traversal
+
+This contains a simple example of how to use the `ghostty-vt` terminal and
+grid reference APIs to create a terminal, write content into it, and then
+traverse the entire grid cell-by-cell using grid refs to inspect codepoints,
+row state, and styles.
+
+This uses a `build.zig` and `Zig` to build the C program so that we
+can reuse a lot of our build logic and depend directly on our source
+tree, but Ghostty emits a standard C library that can be used with any
+C tooling.
+
+## Usage
+
+Run the program:
+
+```shell-session
+zig build run
+```
diff --git a/example/c-vt-grid-traverse/build.zig b/example/c-vt-grid-traverse/build.zig
new file mode 100644
index 000000000..caf174028
--- /dev/null
+++ b/example/c-vt-grid-traverse/build.zig
@@ -0,0 +1,42 @@
+const std = @import("std");
+
+pub fn build(b: *std.Build) void {
+    const target = b.standardTargetOptions(.{});
+    const optimize = b.standardOptimizeOption(.{});
+
+    const run_step = b.step("run", "Run the app");
+
+    const exe_mod = b.createModule(.{
+        .target = target,
+        .optimize = optimize,
+    });
+    exe_mod.addCSourceFiles(.{
+        .root = b.path("src"),
+        .files = &.{"main.c"},
+    });
+
+    // You'll want to use a lazy dependency here so that ghostty is only
+    // downloaded if you actually need it.
+    if (b.lazyDependency("ghostty", .{
+        // Setting simd to false will force a pure static build that
+        // doesn't even require libc, but it has a significant performance
+        // penalty. If your embedding app requires libc anyway, you should
+        // always keep simd enabled.
+        // .simd = false,
+    })) |dep| {
+        exe_mod.linkLibrary(dep.artifact("ghostty-vt"));
+    }
+
+    // Exe
+    const exe = b.addExecutable(.{
+        .name = "c_vt_grid_traverse",
+        .root_module = exe_mod,
+    });
+    b.installArtifact(exe);
+
+    // Run
+    const run_cmd = b.addRunArtifact(exe);
+    run_cmd.step.dependOn(b.getInstallStep());
+    if (b.args) |args| run_cmd.addArgs(args);
+    run_step.dependOn(&run_cmd.step);
+}
diff --git a/example/c-vt-grid-traverse/build.zig.zon b/example/c-vt-grid-traverse/build.zig.zon
new file mode 100644
index 000000000..21b6cea18
--- /dev/null
+++ b/example/c-vt-grid-traverse/build.zig.zon
@@ -0,0 +1,24 @@
+.{
+    .name = .c_vt_grid_traverse,
+    .version = "0.0.0",
+    .fingerprint = 0xf694dd12db9be040,
+    .minimum_zig_version = "0.15.1",
+    .dependencies = .{
+        // Ghostty dependency. In reality, you'd probably use a URL-based
+        // dependency like the one showed (and commented out) below this one.
+        // We use a path dependency here for simplicity and to ensure our
+        // examples always test against the source they're bundled with.
+        .ghostty = .{ .path = "../../" },
+
+        // Example of what a URL-based dependency looks like:
+        // .ghostty = .{
+        //     .url = "https://github.com/ghostty-org/ghostty/archive/COMMIT.tar.gz",
+        //     .hash = "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO36s",
+        // },
+    },
+    .paths = .{
+        "build.zig",
+        "build.zig.zon",
+        "src",
+    },
+}
diff --git a/example/c-vt-grid-traverse/src/main.c b/example/c-vt-grid-traverse/src/main.c
new file mode 100644
index 000000000..f07169eb6
--- /dev/null
+++ b/example/c-vt-grid-traverse/src/main.c
@@ -0,0 +1,85 @@
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <ghostty/vt.h>
+
+//! [grid-ref-traverse]
+int main() {
+  // Create a small terminal
+  GhosttyTerminal terminal;
+  GhosttyTerminalOptions opts = {
+    .cols = 10,
+    .rows = 3,
+    .max_scrollback = 0,
+  };
+  GhosttyResult result = ghostty_terminal_new(NULL, &terminal, opts);
+  assert(result == GHOSTTY_SUCCESS);
+
+  // Write some content so the grid has interesting data
+  const char *text = "Hello!\r\n"    // Row 0: H e l l o !
+                     "World\r\n"     // Row 1: W o r l d
+                     "\033[1mBold";   // Row 2: B o l d (bold style)
+  ghostty_terminal_vt_write(
+      terminal, (const uint8_t *)text, strlen(text));
+
+  // Get terminal dimensions
+  uint16_t cols, rows;
+  ghostty_terminal_get(terminal, GHOSTTY_TERMINAL_DATA_COLS, &cols);
+  ghostty_terminal_get(terminal, GHOSTTY_TERMINAL_DATA_ROWS, &rows);
+
+  // Traverse the entire grid using grid refs
+  for (uint16_t row = 0; row < rows; row++) {
+    printf("Row %u: ", row);
+    for (uint16_t col = 0; col < cols; col++) {
+      // Resolve the point to a grid reference
+      GhosttyGridRef ref = GHOSTTY_INIT_SIZED(GhosttyGridRef);
+      GhosttyPoint pt = {
+        .tag = GHOSTTY_POINT_TAG_ACTIVE,
+        .value = { .coordinate = { .x = col, .y = row } },
+      };
+      result = ghostty_terminal_grid_ref(terminal, pt, &ref);
+      assert(result == GHOSTTY_SUCCESS);
+
+      // Read the cell from the grid ref
+      GhosttyCell cell;
+      result = ghostty_grid_ref_cell(&ref, &cell);
+      assert(result == GHOSTTY_SUCCESS);
+
+      // Check if the cell has text
+      bool has_text = false;
+      ghostty_cell_get(cell, GHOSTTY_CELL_DATA_HAS_TEXT, &has_text);
+
+      if (has_text) {
+        uint32_t codepoint = 0;
+        ghostty_cell_get(cell, GHOSTTY_CELL_DATA_CODEPOINT, &codepoint);
+        printf("%c", (char)codepoint);
+      } else {
+        printf(".");
+      }
+    }
+
+    // Also inspect the row for wrap state
+    GhosttyGridRef ref = GHOSTTY_INIT_SIZED(GhosttyGridRef);
+    GhosttyPoint pt = {
+      .tag = GHOSTTY_POINT_TAG_ACTIVE,
+      .value = { .coordinate = { .x = 0, .y = row } },
+    };
+    ghostty_terminal_grid_ref(terminal, pt, &ref);
+
+    GhosttyRow grid_row;
+    ghostty_grid_ref_row(&ref, &grid_row);
+
+    bool wrap = false;
+    ghostty_row_get(grid_row, GHOSTTY_ROW_DATA_WRAP, &wrap);
+    printf(" (wrap=%s", wrap ? "true" : "false");
+
+    // Check the style of the first cell with text
+    GhosttyStyle style = GHOSTTY_INIT_SIZED(GhosttyStyle);
+    ghostty_grid_ref_style(&ref, &style);
+    printf(", bold=%s)\n", style.bold ? "true" : "false");
+  }
+
+  ghostty_terminal_free(terminal);
+  return 0;
+}
+//! [grid-ref-traverse]
diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index 8a53c4bd0..a3d0ec57d 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -50,6 +50,7 @@
  * - @ref c-vt-paste/src/main.c - Paste safety check example
  * - @ref c-vt-sgr/src/main.c - SGR parser example
  * - @ref c-vt-formatter/src/main.c - Terminal formatter example
+ * - @ref c-vt-grid-traverse/src/main.c - Grid traversal example using grid refs
  *
  */
 
@@ -84,6 +85,11 @@
  * contents as plain text.
  */
 
+/** @example c-vt-grid-traverse/src/main.c
+ * This example demonstrates how to traverse the entire terminal grid using
+ * grid refs to inspect cell codepoints, row wrap state, and cell styles.
+ */
+
 #ifndef GHOSTTY_VT_H
 #define GHOSTTY_VT_H
 
diff --git a/include/ghostty/vt/grid_ref.h b/include/ghostty/vt/grid_ref.h
index 0b196dce5..29ecda7b5 100644
--- a/include/ghostty/vt/grid_ref.h
+++ b/include/ghostty/vt/grid_ref.h
@@ -35,6 +35,10 @@ extern "C" {
  * built to sustain the framerates needed for rendering large screens. 
  * Use the render state API for that. 
  *
+ * ## Example
+ *
+ * @snippet c-vt-grid-traverse/src/main.c grid-ref-traverse
+ *
  * @{
  */
 

From 89ae0ea6ef089389aec0011e53c9b00e380c4e65 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Wed, 18 Mar 2026 16:36:18 -0500
Subject: [PATCH 250/391] core: add function to get process info from the
 surface

This adds a function to the core surface to get process information
about the process(es) running in the terminal. Currently supported is
the PID of the foreground process and the name of the slave PTY.

If there is an error retrieving the information, or the platform does
not support retieving that information `null` is returned.

This will be useful in exposing the foreground PID and slave PTY name to
AppleScript or other APIs.
---
 src/Surface.zig          |  25 ++++++
 src/build/SharedDeps.zig |  29 +++++++
 src/pty.zig              | 174 ++++++++++++++++++++++++++++++++-------
 src/pty/freebsd.c        |   4 +
 src/pty/linux.c          |   5 ++
 src/pty/macos.c          |  17 ++++
 src/termio/Exec.zig      |  51 ++++++++++++
 src/termio/Termio.zig    |  25 ++++++
 src/termio/backend.zig   |  27 ++++++
 9 files changed, 327 insertions(+), 30 deletions(-)
 create mode 100644 src/pty/freebsd.c
 create mode 100644 src/pty/linux.c
 create mode 100644 src/pty/macos.c

diff --git a/src/Surface.zig b/src/Surface.zig
index ebc2a2f43..8c6064d8c 100644
--- a/src/Surface.zig
+++ b/src/Surface.zig
@@ -6342,6 +6342,31 @@ fn testMouseSelectionIsNull(
     );
 }
 
+pub const ProcessInfo = enum {
+    /// The PID of the process that currently controls the PTY.
+    foreground_pid,
+    /// Gets the name of the slave PTY. Returned name points to an internal
+    /// buffer so it should not be modified or freed.
+    tty_name,
+
+    pub fn Type(comptime info: ProcessInfo) type {
+        return switch (info) {
+            .foreground_pid => u64,
+            .tty_name => [:0]const u8,
+        };
+    }
+};
+
+/// Get information about the process(es) running within the surface. Returns
+/// `null` if there was an error getting the information or the information is
+/// not available on a particular platform.
+pub fn getProcessInfo(self: *Surface, comptime info: ProcessInfo) ?ProcessInfo.Type(info) {
+    return switch (info) {
+        .foreground_pid => self.io.getProcessInfo(.foreground_pid),
+        .tty_name => self.io.getProcessInfo(.tty_name),
+    };
+}
+
 test "Surface: selection logic" {
     // We disable format to make these easier to
     // read by pairing sets of coordinates per line.
diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig
index 4b1ea936d..f14006951 100644
--- a/src/build/SharedDeps.zig
+++ b/src/build/SharedDeps.zig
@@ -135,6 +135,35 @@ pub fn add(
     // Every exe needs the terminal options
     self.config.terminalOptions().add(b, step.root_module);
 
+    // C imports needed to manage/create PTYs
+    switch (target.result.os.tag) {
+        .freebsd => {
+            const c = b.addTranslateC(.{
+                .root_source_file = b.path("src/pty/freebsd.c"),
+                .target = target,
+                .optimize = optimize,
+            });
+            step.root_module.addImport("pty-c", c.createModule());
+        },
+        .linux => {
+            const c = b.addTranslateC(.{
+                .root_source_file = b.path("src/pty/linux.c"),
+                .target = target,
+                .optimize = optimize,
+            });
+            step.root_module.addImport("pty-c", c.createModule());
+        },
+        .macos => {
+            const c = b.addTranslateC(.{
+                .root_source_file = b.path("src/pty/macos.c"),
+                .target = target,
+                .optimize = optimize,
+            });
+            step.root_module.addImport("pty-c", c.createModule());
+        },
+        else => {},
+    }
+
     // Freetype. We always include this even if our font backend doesn't
     // use it because Dear Imgui uses Freetype.
     _ = b.systemIntegrationOption("freetype", .{}); // Shows it in help
diff --git a/src/pty.zig b/src/pty.zig
index 1ab88d40f..21f2ba3cc 100644
--- a/src/pty.zig
+++ b/src/pty.zig
@@ -2,6 +2,7 @@ const std = @import("std");
 const builtin = @import("builtin");
 const windows = @import("os/main.zig").windows;
 const posix = std.posix;
+const assert = @import("quirks.zig").inlineAssert;
 
 const log = std.log.scoped(.pty);
 
@@ -78,36 +79,39 @@ const NullPty = struct {
     pub fn childPreExec(self: Pty) ChildPreExecError!void {
         _ = self;
     }
+
+    pub const ProcessInfo = enum {
+        /// The PID of the process that controls the PTY.
+        foreground_pid,
+        /// Gets the name of the slave PTY. Returned name points to an internal buffer
+        /// so it should not be modified or freed.
+        tty_name,
+
+        pub fn Type(comptime info: ProcessInfo) type {
+            return switch (info) {
+                .foreground_pid => u64,
+                .tty_name => [:0]const u8,
+            };
+        }
+    };
+
+    /// Get information about the process(es) attached to the PTY. Returns
+    /// `null` if there was an error getting the information or the information
+    /// is not available on a particular platform.
+    pub fn getProcessInfo(_: *Pty, comptime info: ProcessInfo) ?ProcessInfo.Type(info) {
+        return null;
+    }
 };
 
-/// Linux PTY creation and management. This is just a thin layer on top
-/// of Linux syscalls. The caller is responsible for detail-oriented handling
+/// Posix PTY creation and management. This is just a thin layer on top
+/// of Posix syscalls. The caller is responsible for detail-oriented handling
 /// of the returned file handles.
 const PosixPty = struct {
     pub const Error = OpenError || GetModeError || GetSizeError || SetSizeError || ChildPreExecError;
 
     pub const Fd = posix.fd_t;
 
-    // https://github.com/ziglang/zig/issues/13277
-    // Once above is fixed, use `c.TIOCSCTTY`
-    const TIOCSCTTY = if (builtin.os.tag == .macos) 536900705 else c.TIOCSCTTY;
-    const TIOCSWINSZ = if (builtin.os.tag == .macos) 2148037735 else c.TIOCSWINSZ;
-    const TIOCGWINSZ = if (builtin.os.tag == .macos) 1074295912 else c.TIOCGWINSZ;
-    extern "c" fn setsid() std.c.pid_t;
-    const c = switch (builtin.os.tag) {
-        .macos => @cImport({
-            @cInclude("sys/ioctl.h"); // ioctl and constants
-            @cInclude("util.h"); // openpty()
-        }),
-        .freebsd => @cImport({
-            @cInclude("termios.h"); // ioctl and constants
-            @cInclude("libutil.h"); // openpty()
-        }),
-        else => @cImport({
-            @cInclude("sys/ioctl.h"); // ioctl and constants
-            @cInclude("pty.h");
-        }),
-    };
+    const c = @import("pty-c");
 
     /// The file descriptors for the master and slave side of the pty.
     /// The slave side is never closed automatically by this struct
@@ -116,6 +120,14 @@ const PosixPty = struct {
     master: Fd,
     slave: Fd,
 
+    /// Buffer for storage of slave tty name so that we don't have to recompute
+    /// it every time we need it.
+    tty_name_buf: [std.fs.max_path_bytes:0]u8 = undefined,
+    /// The name of slave tty. If `null` it has not yet been computed or
+    /// may not be available. Should not be accessed directly, but through
+    /// `self.getProcessInfo(.tty_name)`
+    tty_name: ?[:0]const u8 = null,
+
     pub const OpenError = error{OpenptyFailed};
 
     /// Open a new PTY with the given initial size.
@@ -141,15 +153,15 @@ const PosixPty = struct {
         // Set CLOEXEC on the master fd, only the slave fd should be inherited
         // by the child process (shell/command).
         cloexec: {
-            const flags = std.posix.fcntl(master_fd, std.posix.F.GETFD, 0) catch |err| {
+            const flags = posix.fcntl(master_fd, posix.F.GETFD, 0) catch |err| {
                 log.warn("error getting flags for master fd err={}", .{err});
                 break :cloexec;
             };
 
-            _ = std.posix.fcntl(
+            _ = posix.fcntl(
                 master_fd,
-                std.posix.F.SETFD,
-                flags | std.posix.FD_CLOEXEC,
+                posix.F.SETFD,
+                flags | posix.FD_CLOEXEC,
             ) catch |err| {
                 log.warn("error setting CLOEXEC on master fd err={}", .{err});
                 break :cloexec;
@@ -168,6 +180,8 @@ const PosixPty = struct {
         return .{
             .master = master_fd,
             .slave = slave_fd,
+            .tty_name_buf = undefined,
+            .tty_name = null,
         };
     }
 
@@ -194,7 +208,7 @@ const PosixPty = struct {
     /// Return the size of the pty.
     pub fn getSize(self: Pty) GetSizeError!winsize {
         var ws: winsize = undefined;
-        if (c.ioctl(self.master, TIOCGWINSZ, @intFromPtr(&ws)) < 0)
+        if (c.ioctl(self.master, c.TIOCGWINSZ, @intFromPtr(&ws)) < 0)
             return error.IoctlFailed;
 
         return ws;
@@ -204,7 +218,7 @@ const PosixPty = struct {
 
     /// Set the size of the pty.
     pub fn setSize(self: *Pty, size: winsize) SetSizeError!void {
-        if (c.ioctl(self.master, TIOCSWINSZ, @intFromPtr(&size)) < 0)
+        if (c.ioctl(self.master, c.TIOCSWINSZ, @intFromPtr(&size)) < 0)
             return error.IoctlFailed;
     }
 
@@ -234,10 +248,10 @@ const PosixPty = struct {
         posix.sigaction(posix.SIG.QUIT, &sa, null);
 
         // Create a new process group
-        if (setsid() < 0) return error.ProcessGroupFailed;
+        if (c.setsid() < 0) return error.ProcessGroupFailed;
 
         // Set controlling terminal
-        switch (posix.errno(c.ioctl(self.slave, TIOCSCTTY, @as(c_ulong, 0)))) {
+        switch (posix.errno(c.ioctl(self.slave, c.TIOCSCTTY, @as(c_ulong, 0)))) {
             .SUCCESS => {},
             else => |err| {
                 log.err("error setting controlling terminal errno={}", .{err});
@@ -249,6 +263,77 @@ const PosixPty = struct {
         posix.close(self.slave);
         posix.close(self.master);
     }
+
+    pub const ProcessInfo = enum {
+        /// The PID of the process that currently controls the PTY.
+        foreground_pid,
+        /// Gets the name of the slave PTY. Returned name points to an internal buffer
+        /// so it should not be modified or freed.
+        tty_name,
+
+        pub fn Type(comptime info: ProcessInfo) type {
+            return switch (info) {
+                .foreground_pid => u64,
+                .tty_name => [:0]const u8,
+            };
+        }
+    };
+
+    /// Get information about the process(es) attached to the PTY. Returns
+    /// `null` if there was an error getting the information or the information
+    /// is not available on a particular platform.
+    pub fn getProcessInfo(self: *PosixPty, comptime info: ProcessInfo) ?ProcessInfo.Type(info) {
+        return switch (info) {
+            .foreground_pid => {
+                switch (builtin.os.tag) {
+                    .linux => {
+                        const linux = std.os.linux;
+                        var pgrp: i32 = undefined;
+                        const rc = linux.tcgetpgrp(self.master, &pgrp);
+                        switch (linux.E.init(rc)) {
+                            .SUCCESS => return @intCast(pgrp),
+                            else => return null,
+                        }
+                    },
+                    else => {
+                        const rc = c.tcgetpgrp(self.master);
+                        if (rc < 0) return null;
+                        return @intCast(rc);
+                    },
+                }
+            },
+            .tty_name => {
+                if (self.tty_name) |tty_name| return tty_name;
+
+                switch (builtin.os.tag) {
+                    .macos => {
+                        // The macOS TIOCPTYGNAME ioctl does not allow us to
+                        // specify the length of the buffer passed to it, but
+                        // expects it to be at least 128 bytes long.
+                        assert(self.tty_name_buf.len >= 128);
+                        switch (posix.errno(c.ioctl(self.master, c.TIOCPTYGNAME, @intFromPtr(&self.tty_name_buf)))) {
+                            .SUCCESS => {
+                                const tty_name: [:0]const u8 = std.mem.sliceTo(&self.tty_name_buf, 0);
+                                self.tty_name = tty_name;
+                                return tty_name;
+                            },
+                            else => |err| {
+                                log.err("error getting name of slave PTY errno={t}", .{err});
+                                return null;
+                            },
+                        }
+                    },
+                    .linux => {
+                        if (c.ptsname_r(self.master, &self.tty_name_buf, self.tty_name_buf.len) != 0) return null;
+                        const tty_name: [:0]const u8 = std.mem.sliceTo(&self.tty_name_buf, 0);
+                        self.tty_name = tty_name;
+                        return tty_name;
+                    },
+                    else => return null,
+                }
+            },
+        };
+    }
 };
 
 /// Windows PTY creation and management.
@@ -398,6 +483,28 @@ const WindowsPty = struct {
         if (result != windows.S_OK) return error.ResizeFailed;
         self.size = size;
     }
+
+    pub const ProcessInfo = enum {
+        /// The PID of the process that currently controls the PTY.
+        foreground_pid,
+        /// Gets the name of the slave PTY. Returned name points to an internal
+        /// buffer so it should not be modified or freed.
+        tty_name,
+
+        pub fn Type(comptime info: ProcessInfo) type {
+            return switch (info) {
+                .foreground_pid => u64,
+                .tty_name => []const u8,
+            };
+        }
+    };
+
+    /// Get information about the process(es) attached to the PTY. Returns
+    /// `null` if there was an error getting the information or the information
+    /// is not available on a particular platform.
+    pub fn getProcessInfo(_: *WindowsPty, comptime info: ProcessInfo) ?ProcessInfo.Type(info) {
+        return null;
+    }
 };
 
 test {
@@ -419,4 +526,11 @@ test {
     ws.ws_row *= 2;
     try pty.setSize(ws);
     try testing.expectEqual(ws, try pty.getSize());
+
+    switch (builtin.os.tag) {
+        .freebsd => try testing.expect(std.mem.startsWith(u8, pty.getProcessInfo(.tty_name).?, "/dev/")),
+        .linux => try testing.expect(std.mem.startsWith(u8, pty.getProcessInfo(.tty_name).?, "/dev/pts/")),
+        .macos => try testing.expect(std.mem.startsWith(u8, pty.getProcessInfo(.tty_name).?, "/dev/")),
+        else => try testing.expect(pty.getProcessInfo(.tty_name) == null),
+    }
 }
diff --git a/src/pty/freebsd.c b/src/pty/freebsd.c
new file mode 100644
index 000000000..fbca41852
--- /dev/null
+++ b/src/pty/freebsd.c
@@ -0,0 +1,4 @@
+#include <termios.h> // ioctl and constants
+#include <libutil.h> // openpty
+#include <stdlib.h> // ptsname_r
+#include <unistd.h> // tcgetpgrp
diff --git a/src/pty/linux.c b/src/pty/linux.c
new file mode 100644
index 000000000..2625c62dc
--- /dev/null
+++ b/src/pty/linux.c
@@ -0,0 +1,5 @@
+#define _GNU_SOURCE // ptsname_r
+#include <pty.h> // openpty
+#include <stdlib.h> // ptsname_r
+#include <sys/ioctl.h> // ioctl and constants
+#include <unistd.h> // tcgetpgrp, setsid
diff --git a/src/pty/macos.c b/src/pty/macos.c
new file mode 100644
index 000000000..b0125df69
--- /dev/null
+++ b/src/pty/macos.c
@@ -0,0 +1,17 @@
+#include <sys/ioctl.h> // ioctl and constants
+#include <sys/ttycom.h>  // ioctl and constants for TIOCPTYGNAME
+#include <sys/types.h>
+#include <unistd.h> // tcgetpgrp
+#include <util.h> // openpty
+
+#ifndef TIOCSCTTY
+#define TIOCSCTTY 536900705
+#endif
+
+#ifndef TIOCSWINSZ
+#define TIOCSWINSZ 2148037735
+#endif
+
+#ifndef TIOCGWINSZ
+#define TIOCGWINSZ 1074295912
+#endif
diff --git a/src/termio/Exec.zig b/src/termio/Exec.zig
index af4df3fef..15a892620 100644
--- a/src/termio/Exec.zig
+++ b/src/termio/Exec.zig
@@ -1226,6 +1226,32 @@ const Subprocess = struct {
     fn killCommandFlatpak(command: *FlatpakHostCommand) !void {
         try command.signal(c.SIGHUP, true);
     }
+
+    pub const ProcessInfo = enum {
+        /// The PID of the process that currently controls the PTY.
+        foreground_pid,
+        /// Gets the name of the slave PTY. Returned name points to an internal
+        /// buffer so it should not be modified or freed.
+        tty_name,
+
+        pub fn Type(comptime info: Subprocess.ProcessInfo) type {
+            return switch (info) {
+                .foreground_pid => u64,
+                .tty_name => [:0]const u8,
+            };
+        }
+    };
+
+    /// Get information about the process(es) running within the subprocess.
+    /// Returns `null` if there was an error getting the information or the
+    /// information is not available on a particular platform.
+    pub fn getProcessInfo(self: *Subprocess, comptime info: Subprocess.ProcessInfo) ?Subprocess.ProcessInfo.Type(info) {
+        const pty = &(self.pty orelse return null);
+        return switch (info) {
+            .foreground_pid => pty.getProcessInfo(.foreground_pid),
+            .tty_name => pty.getProcessInfo(.tty_name),
+        };
+    }
 };
 
 /// The read thread sits in a loop doing the following pseudo code:
@@ -1580,6 +1606,31 @@ fn execCommand(
     };
 }
 
+pub const ProcessInfo = enum {
+    /// The PID of the process that currently controls the PTY.
+    foreground_pid,
+    /// Gets the name of the slave PTY. Returned name points to an internal
+    /// buffer so it should not be modified or freed.
+    tty_name,
+
+    pub fn Type(comptime info: ProcessInfo) type {
+        return switch (info) {
+            .foreground_pid => u64,
+            .tty_name => [:0]const u8,
+        };
+    }
+};
+
+/// Get information about the process(es) running within the backend. Returns
+/// `null` if there was an error getting the information or the information is
+/// not available on a particular platform.
+pub fn getProcessInfo(self: *Exec, comptime info: ProcessInfo) ?ProcessInfo.Type(info) {
+    return switch (info) {
+        .foreground_pid => self.subprocess.getProcessInfo(.foreground_pid),
+        .tty_name => self.subprocess.getProcessInfo(.tty_name),
+    };
+}
+
 test "execCommand darwin: shell command" {
     if (comptime !builtin.os.tag.isDarwin()) return error.SkipZigTest;
 
diff --git a/src/termio/Termio.zig b/src/termio/Termio.zig
index 4a99e8221..aab275605 100644
--- a/src/termio/Termio.zig
+++ b/src/termio/Termio.zig
@@ -764,3 +764,28 @@ pub const ThreadData = struct {
         self.* = undefined;
     }
 };
+
+pub const ProcessInfo = enum {
+    /// The PID of the process that currently controls the PTY.
+    foreground_pid,
+    /// Gets the name of the slave PTY. Returned name points to an internal
+    /// buffer so it should not be modified or freed.
+    tty_name,
+
+    pub fn Type(comptime info: ProcessInfo) type {
+        return switch (info) {
+            .foreground_pid => u64,
+            .tty_name => [:0]const u8,
+        };
+    }
+};
+
+/// Get information about the process(es) attached to the backend. Returns
+/// `null` if there was an error getting the information or the information is
+/// not available on a particular platform.
+pub fn getProcessInfo(self: *Termio, comptime info: ProcessInfo) ?ProcessInfo.Type(info) {
+    return switch (info) {
+        .foreground_pid => self.backend.getProcessInfo(.foreground_pid),
+        .tty_name => self.backend.getProcessInfo(.tty_name),
+    };
+}
diff --git a/src/termio/backend.zig b/src/termio/backend.zig
index ae0e2004f..ef8ac22e6 100644
--- a/src/termio/backend.zig
+++ b/src/termio/backend.zig
@@ -100,6 +100,33 @@ pub const Backend = union(Kind) {
             ),
         }
     }
+
+    pub const ProcessInfo = enum {
+        /// The PID of the process that currently controls the PTY.
+        foreground_pid,
+        /// Gets the name of the slave PTY. Returned name points to an internal
+        /// buffer so it should not be modified or freed.
+        tty_name,
+
+        pub fn Type(comptime info: ProcessInfo) type {
+            return switch (info) {
+                .foreground_pid => u64,
+                .tty_name => [:0]const u8,
+            };
+        }
+    };
+
+    /// Get information about the process(es) attached to the backend. Returns
+    /// `null` if there was an error getting the information or the information
+    /// is not available on a particular platform.
+    pub fn getProcessInfo(self: *Backend, comptime info: ProcessInfo) ?ProcessInfo.Type(info) {
+        return switch (self.*) {
+            .exec => |*exec| switch (info) {
+                .foreground_pid => exec.getProcessInfo(.foreground_pid),
+                .tty_name => exec.getProcessInfo(.tty_name),
+            },
+        };
+    }
 };
 
 /// Termio thread data. See termio.ThreadData for docs.

From 64de418f38f8739ba2259b5e8cc6ba51a74cdc30 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Thu, 19 Mar 2026 00:06:59 -0500
Subject: [PATCH 251/391] core: add macos system include path

---
 src/build/SharedDeps.zig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig
index f14006951..f1c874240 100644
--- a/src/build/SharedDeps.zig
+++ b/src/build/SharedDeps.zig
@@ -159,6 +159,12 @@ pub fn add(
                 .target = target,
                 .optimize = optimize,
             });
+            const libc = try std.zig.LibCInstallation.findNative(.{
+                .allocator = b.allocator,
+                .target = target,
+                .verbose = false,
+            });
+            c.addSystemIncludePath(.{ .cwd_relative = libc.sys_include_dir.? });
             step.root_module.addImport("pty-c", c.createModule());
         },
         else => {},

From 264a1a7cddee96b978c40ba538af3444d7a6c550 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Thu, 19 Mar 2026 00:10:12 -0500
Subject: [PATCH 252/391] core: fix target for macos libc search

---
 src/build/SharedDeps.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig
index f1c874240..463308ffe 100644
--- a/src/build/SharedDeps.zig
+++ b/src/build/SharedDeps.zig
@@ -161,7 +161,7 @@ pub fn add(
             });
             const libc = try std.zig.LibCInstallation.findNative(.{
                 .allocator = b.allocator,
-                .target = target,
+                .target = &target.result,
                 .verbose = false,
             });
             c.addSystemIncludePath(.{ .cwd_relative = libc.sys_include_dir.? });

From 2ea6029c7adc08f245ef243a77915ec40c7566b4 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Thu, 19 Mar 2026 11:41:14 -0500
Subject: [PATCH 253/391] core: address getProcessInfo feedback

* consolidate *.c files into a single file
* consolidate ProcessInfo enums into a single enum
---
 src/Surface.zig          | 21 ++------------
 src/build/SharedDeps.zig | 41 ++++++++++++---------------
 src/pty.c                | 34 +++++++++++++++++++++++
 src/pty.zig              | 60 ++++++++++------------------------------
 src/pty/freebsd.c        |  4 ---
 src/pty/linux.c          |  5 ----
 src/pty/macos.c          | 17 ------------
 src/termio/Exec.zig      | 43 +++-------------------------
 src/termio/Termio.zig    | 21 ++------------
 src/termio/backend.zig   | 21 ++------------
 10 files changed, 76 insertions(+), 191 deletions(-)
 create mode 100644 src/pty.c
 delete mode 100644 src/pty/freebsd.c
 delete mode 100644 src/pty/linux.c
 delete mode 100644 src/pty/macos.c

diff --git a/src/Surface.zig b/src/Surface.zig
index 8c6064d8c..c8055cfee 100644
--- a/src/Surface.zig
+++ b/src/Surface.zig
@@ -36,6 +36,7 @@ const App = @import("App.zig");
 const internal_os = @import("os/main.zig");
 const inspectorpkg = @import("inspector/main.zig");
 const SurfaceMouse = @import("surface_mouse.zig");
+const ProcessInfo = @import("pty.zig").ProcessInfo;
 
 const log = std.log.scoped(.surface);
 
@@ -6342,29 +6343,11 @@ fn testMouseSelectionIsNull(
     );
 }
 
-pub const ProcessInfo = enum {
-    /// The PID of the process that currently controls the PTY.
-    foreground_pid,
-    /// Gets the name of the slave PTY. Returned name points to an internal
-    /// buffer so it should not be modified or freed.
-    tty_name,
-
-    pub fn Type(comptime info: ProcessInfo) type {
-        return switch (info) {
-            .foreground_pid => u64,
-            .tty_name => [:0]const u8,
-        };
-    }
-};
-
 /// Get information about the process(es) running within the surface. Returns
 /// `null` if there was an error getting the information or the information is
 /// not available on a particular platform.
 pub fn getProcessInfo(self: *Surface, comptime info: ProcessInfo) ?ProcessInfo.Type(info) {
-    return switch (info) {
-        .foreground_pid => self.io.getProcessInfo(.foreground_pid),
-        .tty_name => self.io.getProcessInfo(.tty_name),
-    };
+    return self.io.getProcessInfo(info);
 }
 
 test "Surface: selection logic" {
diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig
index 463308ffe..1b24c7429 100644
--- a/src/build/SharedDeps.zig
+++ b/src/build/SharedDeps.zig
@@ -137,34 +137,27 @@ pub fn add(
 
     // C imports needed to manage/create PTYs
     switch (target.result.os.tag) {
-        .freebsd => {
+        .freebsd,
+        .linux,
+        .macos,
+        => {
             const c = b.addTranslateC(.{
-                .root_source_file = b.path("src/pty/freebsd.c"),
+                .root_source_file = b.path("src/pty.c"),
                 .target = target,
                 .optimize = optimize,
             });
-            step.root_module.addImport("pty-c", c.createModule());
-        },
-        .linux => {
-            const c = b.addTranslateC(.{
-                .root_source_file = b.path("src/pty/linux.c"),
-                .target = target,
-                .optimize = optimize,
-            });
-            step.root_module.addImport("pty-c", c.createModule());
-        },
-        .macos => {
-            const c = b.addTranslateC(.{
-                .root_source_file = b.path("src/pty/macos.c"),
-                .target = target,
-                .optimize = optimize,
-            });
-            const libc = try std.zig.LibCInstallation.findNative(.{
-                .allocator = b.allocator,
-                .target = &target.result,
-                .verbose = false,
-            });
-            c.addSystemIncludePath(.{ .cwd_relative = libc.sys_include_dir.? });
+            c.defineCMacro("ZIG_TARGET", @tagName(target.result.os.tag));
+            switch (target.result.os.tag) {
+                .macos => {
+                    const libc = try std.zig.LibCInstallation.findNative(.{
+                        .allocator = b.allocator,
+                        .target = &target.result,
+                        .verbose = false,
+                    });
+                    c.addSystemIncludePath(.{ .cwd_relative = libc.sys_include_dir.? });
+                },
+                else => {},
+            }
             step.root_module.addImport("pty-c", c.createModule());
         },
         else => {},
diff --git a/src/pty.c b/src/pty.c
new file mode 100644
index 000000000..f4f25ad5e
--- /dev/null
+++ b/src/pty.c
@@ -0,0 +1,34 @@
+#if ZIG_TARGET == freebsd
+  #include <termios.h> // ioctl and constants
+  #include <libutil.h> // openpty
+  #include <stdlib.h> // ptsname_r
+  #include <unistd.h> // tcgetpgrp
+#endif
+
+#if ZIG_TARGET == linux
+  #define _GNU_SOURCE // ptsname_r
+  #include <pty.h> // openpty
+  #include <stdlib.h> // ptsname_r
+  #include <sys/ioctl.h> // ioctl and constants
+  #include <unistd.h> // tcgetpgrp, setsid
+#endif
+
+#if ZIG_TARGET == macos
+  #include <sys/ioctl.h> // ioctl and constants
+  #include <sys/ttycom.h>  // ioctl and constants for TIOCPTYGNAME
+  #include <sys/types.h>
+  #include <unistd.h> // tcgetpgrp
+  #include <util.h> // openpty
+
+  #ifndef tiocsctty
+  #define tiocsctty 536900705
+  #endif
+
+  #ifndef tiocswinsz
+  #define tiocswinsz 2148037735
+  #endif
+
+  #ifndef tiocgwinsz
+  #define tiocgwinsz 1074295912
+  #endif
+#endif
diff --git a/src/pty.zig b/src/pty.zig
index 21f2ba3cc..40277a8ba 100644
--- a/src/pty.zig
+++ b/src/pty.zig
@@ -36,6 +36,21 @@ pub const Mode = packed struct {
     echo: bool = true,
 };
 
+pub const ProcessInfo = enum {
+    /// The PID of the process that controls the PTY.
+    foreground_pid,
+    /// Gets the name of the slave PTY. Returned name points to an internal buffer
+    /// so it should not be modified or freed.
+    tty_name,
+
+    pub fn Type(comptime info: ProcessInfo) type {
+        return switch (info) {
+            .foreground_pid => u64,
+            .tty_name => [:0]const u8,
+        };
+    }
+};
+
 // A pty implementation that does nothing.
 //
 // TODO: This should be removed. This is only temporary until we have
@@ -80,21 +95,6 @@ const NullPty = struct {
         _ = self;
     }
 
-    pub const ProcessInfo = enum {
-        /// The PID of the process that controls the PTY.
-        foreground_pid,
-        /// Gets the name of the slave PTY. Returned name points to an internal buffer
-        /// so it should not be modified or freed.
-        tty_name,
-
-        pub fn Type(comptime info: ProcessInfo) type {
-            return switch (info) {
-                .foreground_pid => u64,
-                .tty_name => [:0]const u8,
-            };
-        }
-    };
-
     /// Get information about the process(es) attached to the PTY. Returns
     /// `null` if there was an error getting the information or the information
     /// is not available on a particular platform.
@@ -264,21 +264,6 @@ const PosixPty = struct {
         posix.close(self.master);
     }
 
-    pub const ProcessInfo = enum {
-        /// The PID of the process that currently controls the PTY.
-        foreground_pid,
-        /// Gets the name of the slave PTY. Returned name points to an internal buffer
-        /// so it should not be modified or freed.
-        tty_name,
-
-        pub fn Type(comptime info: ProcessInfo) type {
-            return switch (info) {
-                .foreground_pid => u64,
-                .tty_name => [:0]const u8,
-            };
-        }
-    };
-
     /// Get information about the process(es) attached to the PTY. Returns
     /// `null` if there was an error getting the information or the information
     /// is not available on a particular platform.
@@ -484,21 +469,6 @@ const WindowsPty = struct {
         self.size = size;
     }
 
-    pub const ProcessInfo = enum {
-        /// The PID of the process that currently controls the PTY.
-        foreground_pid,
-        /// Gets the name of the slave PTY. Returned name points to an internal
-        /// buffer so it should not be modified or freed.
-        tty_name,
-
-        pub fn Type(comptime info: ProcessInfo) type {
-            return switch (info) {
-                .foreground_pid => u64,
-                .tty_name => []const u8,
-            };
-        }
-    };
-
     /// Get information about the process(es) attached to the PTY. Returns
     /// `null` if there was an error getting the information or the information
     /// is not available on a particular platform.
diff --git a/src/pty/freebsd.c b/src/pty/freebsd.c
deleted file mode 100644
index fbca41852..000000000
--- a/src/pty/freebsd.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <termios.h> // ioctl and constants
-#include <libutil.h> // openpty
-#include <stdlib.h> // ptsname_r
-#include <unistd.h> // tcgetpgrp
diff --git a/src/pty/linux.c b/src/pty/linux.c
deleted file mode 100644
index 2625c62dc..000000000
--- a/src/pty/linux.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define _GNU_SOURCE // ptsname_r
-#include <pty.h> // openpty
-#include <stdlib.h> // ptsname_r
-#include <sys/ioctl.h> // ioctl and constants
-#include <unistd.h> // tcgetpgrp, setsid
diff --git a/src/pty/macos.c b/src/pty/macos.c
deleted file mode 100644
index b0125df69..000000000
--- a/src/pty/macos.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <sys/ioctl.h> // ioctl and constants
-#include <sys/ttycom.h>  // ioctl and constants for TIOCPTYGNAME
-#include <sys/types.h>
-#include <unistd.h> // tcgetpgrp
-#include <util.h> // openpty
-
-#ifndef TIOCSCTTY
-#define TIOCSCTTY 536900705
-#endif
-
-#ifndef TIOCSWINSZ
-#define TIOCSWINSZ 2148037735
-#endif
-
-#ifndef TIOCGWINSZ
-#define TIOCGWINSZ 1074295912
-#endif
diff --git a/src/termio/Exec.zig b/src/termio/Exec.zig
index 15a892620..0f35b5787 100644
--- a/src/termio/Exec.zig
+++ b/src/termio/Exec.zig
@@ -27,6 +27,7 @@ const Pty = ptypkg.Pty;
 const EnvMap = std.process.EnvMap;
 const PasswdEntry = internal_os.passwd.Entry;
 const windows = internal_os.windows;
+const ProcessInfo = @import("../pty.zig").ProcessInfo;
 
 const log = std.log.scoped(.io_exec);
 
@@ -1227,30 +1228,12 @@ const Subprocess = struct {
         try command.signal(c.SIGHUP, true);
     }
 
-    pub const ProcessInfo = enum {
-        /// The PID of the process that currently controls the PTY.
-        foreground_pid,
-        /// Gets the name of the slave PTY. Returned name points to an internal
-        /// buffer so it should not be modified or freed.
-        tty_name,
-
-        pub fn Type(comptime info: Subprocess.ProcessInfo) type {
-            return switch (info) {
-                .foreground_pid => u64,
-                .tty_name => [:0]const u8,
-            };
-        }
-    };
-
     /// Get information about the process(es) running within the subprocess.
     /// Returns `null` if there was an error getting the information or the
     /// information is not available on a particular platform.
-    pub fn getProcessInfo(self: *Subprocess, comptime info: Subprocess.ProcessInfo) ?Subprocess.ProcessInfo.Type(info) {
+    pub fn getProcessInfo(self: *Subprocess, comptime info: ProcessInfo) ?ProcessInfo.Type(info) {
         const pty = &(self.pty orelse return null);
-        return switch (info) {
-            .foreground_pid => pty.getProcessInfo(.foreground_pid),
-            .tty_name => pty.getProcessInfo(.tty_name),
-        };
+        return pty.getProcessInfo(info);
     }
 };
 
@@ -1606,29 +1589,11 @@ fn execCommand(
     };
 }
 
-pub const ProcessInfo = enum {
-    /// The PID of the process that currently controls the PTY.
-    foreground_pid,
-    /// Gets the name of the slave PTY. Returned name points to an internal
-    /// buffer so it should not be modified or freed.
-    tty_name,
-
-    pub fn Type(comptime info: ProcessInfo) type {
-        return switch (info) {
-            .foreground_pid => u64,
-            .tty_name => [:0]const u8,
-        };
-    }
-};
-
 /// Get information about the process(es) running within the backend. Returns
 /// `null` if there was an error getting the information or the information is
 /// not available on a particular platform.
 pub fn getProcessInfo(self: *Exec, comptime info: ProcessInfo) ?ProcessInfo.Type(info) {
-    return switch (info) {
-        .foreground_pid => self.subprocess.getProcessInfo(.foreground_pid),
-        .tty_name => self.subprocess.getProcessInfo(.tty_name),
-    };
+    return self.subprocess.getProcessInfo(info);
 }
 
 test "execCommand darwin: shell command" {
diff --git a/src/termio/Termio.zig b/src/termio/Termio.zig
index aab275605..f05379077 100644
--- a/src/termio/Termio.zig
+++ b/src/termio/Termio.zig
@@ -19,6 +19,7 @@ const apprt = @import("../apprt.zig");
 const internal_os = @import("../os/main.zig");
 const windows = internal_os.windows;
 const configpkg = @import("../config.zig");
+const ProcessInfo = @import("../pty.zig").ProcessInfo;
 
 const log = std.log.scoped(.io_exec);
 
@@ -765,27 +766,9 @@ pub const ThreadData = struct {
     }
 };
 
-pub const ProcessInfo = enum {
-    /// The PID of the process that currently controls the PTY.
-    foreground_pid,
-    /// Gets the name of the slave PTY. Returned name points to an internal
-    /// buffer so it should not be modified or freed.
-    tty_name,
-
-    pub fn Type(comptime info: ProcessInfo) type {
-        return switch (info) {
-            .foreground_pid => u64,
-            .tty_name => [:0]const u8,
-        };
-    }
-};
-
 /// Get information about the process(es) attached to the backend. Returns
 /// `null` if there was an error getting the information or the information is
 /// not available on a particular platform.
 pub fn getProcessInfo(self: *Termio, comptime info: ProcessInfo) ?ProcessInfo.Type(info) {
-    return switch (info) {
-        .foreground_pid => self.backend.getProcessInfo(.foreground_pid),
-        .tty_name => self.backend.getProcessInfo(.tty_name),
-    };
+    return self.backend.getProcessInfo(info);
 }
diff --git a/src/termio/backend.zig b/src/termio/backend.zig
index ef8ac22e6..c29009acb 100644
--- a/src/termio/backend.zig
+++ b/src/termio/backend.zig
@@ -4,6 +4,7 @@ const posix = std.posix;
 const renderer = @import("../renderer.zig");
 const terminal = @import("../terminal/main.zig");
 const termio = @import("../termio.zig");
+const ProcessInfo = @import("../pty.zig").ProcessInfo;
 
 // The preallocation size for the write request pool. This should be big
 // enough to satisfy most write requests. It must be a power of 2.
@@ -101,30 +102,12 @@ pub const Backend = union(Kind) {
         }
     }
 
-    pub const ProcessInfo = enum {
-        /// The PID of the process that currently controls the PTY.
-        foreground_pid,
-        /// Gets the name of the slave PTY. Returned name points to an internal
-        /// buffer so it should not be modified or freed.
-        tty_name,
-
-        pub fn Type(comptime info: ProcessInfo) type {
-            return switch (info) {
-                .foreground_pid => u64,
-                .tty_name => [:0]const u8,
-            };
-        }
-    };
-
     /// Get information about the process(es) attached to the backend. Returns
     /// `null` if there was an error getting the information or the information
     /// is not available on a particular platform.
     pub fn getProcessInfo(self: *Backend, comptime info: ProcessInfo) ?ProcessInfo.Type(info) {
         return switch (self.*) {
-            .exec => |*exec| switch (info) {
-                .foreground_pid => exec.getProcessInfo(.foreground_pid),
-                .tty_name => exec.getProcessInfo(.tty_name),
-            },
+            .exec => |*exec| exec.getProcessInfo(info),
         };
     }
 };

From b0789af583c9aac555bdc384041d02123dbbd2e7 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Thu, 19 Mar 2026 22:00:24 -0500
Subject: [PATCH 254/391] core: fix c macro comparisons

---
 src/build/SharedDeps.zig | 22 +++++++++++++++++++++-
 src/pty.c                |  6 +++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig
index 1b24c7429..581b0b64e 100644
--- a/src/build/SharedDeps.zig
+++ b/src/build/SharedDeps.zig
@@ -146,7 +146,27 @@ pub fn add(
                 .target = target,
                 .optimize = optimize,
             });
-            c.defineCMacro("ZIG_TARGET", @tagName(target.result.os.tag));
+            inline for (@typeInfo(std.Target.Os.Tag).@"enum".fields) |field| {
+                c.defineCMacro(
+                    b.fmt(
+                        "ZIG_TARGET_{s}",
+                        .{try std.ascii.allocUpperString(b.allocator, field.name)},
+                    ),
+                    b.fmt("{d}", .{field.value}),
+                );
+            }
+            c.defineCMacro(
+                "ZIG_TARGET",
+                b.fmt(
+                    "ZIG_TARGET_{s}",
+                    .{
+                        try std.ascii.allocUpperString(
+                            b.allocator,
+                            @tagName(target.result.os.tag),
+                        ),
+                    },
+                ),
+            );
             switch (target.result.os.tag) {
                 .macos => {
                     const libc = try std.zig.LibCInstallation.findNative(.{
diff --git a/src/pty.c b/src/pty.c
index f4f25ad5e..4708d0b4e 100644
--- a/src/pty.c
+++ b/src/pty.c
@@ -1,11 +1,11 @@
-#if ZIG_TARGET == freebsd
+#if ZIG_TARGET == ZIG_TARGET_FREEBSD
   #include <termios.h> // ioctl and constants
   #include <libutil.h> // openpty
   #include <stdlib.h> // ptsname_r
   #include <unistd.h> // tcgetpgrp
 #endif
 
-#if ZIG_TARGET == linux
+#if ZIG_TARGET == ZIG_TARGET_LINUX
   #define _GNU_SOURCE // ptsname_r
   #include <pty.h> // openpty
   #include <stdlib.h> // ptsname_r
@@ -13,7 +13,7 @@
   #include <unistd.h> // tcgetpgrp, setsid
 #endif
 
-#if ZIG_TARGET == macos
+#if ZIG_TARGET == ZIG_TARGET_MACOS
   #include <sys/ioctl.h> // ioctl and constants
   #include <sys/ttycom.h>  // ioctl and constants for TIOCPTYGNAME
   #include <sys/types.h>

From a0d738697e37046b77f3a391b39340a86235a4c0 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 18 Mar 2026 09:15:52 -0700
Subject: [PATCH 255/391] vt: add c render state api and example

Introduce the first public C render-state surface for libghostty-vt.
Before this change, the render-state path was only available in Zig,
so C embedders had no direct way to create and update that cache.

Add an opaque GhosttyRenderState type with new, update, and free
entry points, then wire those symbols through the C API bridge and
library exports. Keep the surface intentionally minimal for now so
ownership and update behavior are established before adding read
accessors.
---
 example/c-vt-render/README.md     |  17 +++++
 example/c-vt-render/build.zig     |  42 ++++++++++++
 example/c-vt-render/build.zig.zon |  24 +++++++
 example/c-vt-render/src/main.c    |  45 +++++++++++++
 include/ghostty/vt.h              |   2 +
 include/ghostty/vt/render.h       | 100 ++++++++++++++++++++++++++++
 src/lib_vt.zig                    |   3 +
 src/terminal/c/main.zig           |   6 ++
 src/terminal/c/render.zig         | 107 ++++++++++++++++++++++++++++++
 9 files changed, 346 insertions(+)
 create mode 100644 example/c-vt-render/README.md
 create mode 100644 example/c-vt-render/build.zig
 create mode 100644 example/c-vt-render/build.zig.zon
 create mode 100644 example/c-vt-render/src/main.c
 create mode 100644 include/ghostty/vt/render.h
 create mode 100644 src/terminal/c/render.zig

diff --git a/example/c-vt-render/README.md b/example/c-vt-render/README.md
new file mode 100644
index 000000000..deb4db388
--- /dev/null
+++ b/example/c-vt-render/README.md
@@ -0,0 +1,17 @@
+# Example: `ghostty-vt` Render State
+
+This contains a simple example of how to use the `ghostty-vt` render-state API
+to create a render state, update it from terminal content, and clean it up.
+
+This uses a `build.zig` and `Zig` to build the C program so that we
+can reuse a lot of our build logic and depend directly on our source
+tree, but Ghostty emits a standard C library that can be used with any
+C tooling.
+
+## Usage
+
+Run the program:
+
+```shell-session
+zig build run
+```
diff --git a/example/c-vt-render/build.zig b/example/c-vt-render/build.zig
new file mode 100644
index 000000000..15e3e5405
--- /dev/null
+++ b/example/c-vt-render/build.zig
@@ -0,0 +1,42 @@
+const std = @import("std");
+
+pub fn build(b: *std.Build) void {
+    const target = b.standardTargetOptions(.{});
+    const optimize = b.standardOptimizeOption(.{});
+
+    const run_step = b.step("run", "Run the app");
+
+    const exe_mod = b.createModule(.{
+        .target = target,
+        .optimize = optimize,
+    });
+    exe_mod.addCSourceFiles(.{
+        .root = b.path("src"),
+        .files = &.{"main.c"},
+    });
+
+    // You'll want to use a lazy dependency here so that ghostty is only
+    // downloaded if you actually need it.
+    if (b.lazyDependency("ghostty", .{
+        // Setting simd to false will force a pure static build that
+        // doesn't even require libc, but it has a significant performance
+        // penalty. If your embedding app requires libc anyway, you should
+        // always keep simd enabled.
+        // .simd = false,
+    })) |dep| {
+        exe_mod.linkLibrary(dep.artifact("ghostty-vt"));
+    }
+
+    // Exe
+    const exe = b.addExecutable(.{
+        .name = "c_vt_render",
+        .root_module = exe_mod,
+    });
+    b.installArtifact(exe);
+
+    // Run
+    const run_cmd = b.addRunArtifact(exe);
+    run_cmd.step.dependOn(b.getInstallStep());
+    if (b.args) |args| run_cmd.addArgs(args);
+    run_step.dependOn(&run_cmd.step);
+}
diff --git a/example/c-vt-render/build.zig.zon b/example/c-vt-render/build.zig.zon
new file mode 100644
index 000000000..3919970f9
--- /dev/null
+++ b/example/c-vt-render/build.zig.zon
@@ -0,0 +1,24 @@
+.{
+    .name = .c_vt_render,
+    .version = "0.0.0",
+    .fingerprint = 0xb10e18b2fab773c9,
+    .minimum_zig_version = "0.15.1",
+    .dependencies = .{
+        // Ghostty dependency. In reality, you'd probably use a URL-based
+        // dependency like the one showed (and commented out) below this one.
+        // We use a path dependency here for simplicity and to ensure our
+        // examples always test against the source they're bundled with.
+        .ghostty = .{ .path = "../../" },
+
+        // Example of what a URL-based dependency looks like:
+        // .ghostty = .{
+        //     .url = "https://github.com/ghostty-org/ghostty/archive/COMMIT.tar.gz",
+        //     .hash = "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO36s",
+        // },
+    },
+    .paths = .{
+        "build.zig",
+        "build.zig.zon",
+        "src",
+    },
+}
diff --git a/example/c-vt-render/src/main.c b/example/c-vt-render/src/main.c
new file mode 100644
index 000000000..b5c22edf5
--- /dev/null
+++ b/example/c-vt-render/src/main.c
@@ -0,0 +1,45 @@
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <ghostty/vt.h>
+
+//! [render-state-update]
+int main(void) {
+  GhosttyResult result;
+
+  GhosttyTerminal terminal = NULL;
+  GhosttyTerminalOptions terminal_opts = {
+      .cols = 80,
+      .rows = 24,
+      .max_scrollback = 10000,
+  };
+  result = ghostty_terminal_new(NULL, &terminal, terminal_opts);
+  assert(result == GHOSTTY_SUCCESS);
+
+  GhosttyRenderState render_state = NULL;
+  result = ghostty_render_state_new(NULL, &render_state);
+  assert(result == GHOSTTY_SUCCESS);
+
+  const char* first_frame = "first frame\r\n";
+  ghostty_terminal_vt_write(
+      terminal,
+      (const uint8_t*)first_frame,
+      strlen(first_frame));
+  result = ghostty_render_state_update(render_state, terminal);
+  assert(result == GHOSTTY_SUCCESS);
+
+  const char* second_frame = "second frame\r\n";
+  ghostty_terminal_vt_write(
+      terminal,
+      (const uint8_t*)second_frame,
+      strlen(second_frame));
+  result = ghostty_render_state_update(render_state, terminal);
+  assert(result == GHOSTTY_SUCCESS);
+
+  printf("Render state was updated successfully.\n");
+
+  ghostty_render_state_free(render_state);
+  ghostty_terminal_free(terminal);
+  return 0;
+}
+//! [render-state-update]
diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index a3d0ec57d..912d6e217 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -29,6 +29,7 @@
  *
  * The API is organized into the following groups:
  * - @ref terminal "Terminal" - Complete terminal emulator state and rendering
+ * - @ref render "Render State" - Incremental render state updates for custom renderers
  * - @ref formatter "Formatter" - Format terminal content as plain text, VT sequences, or HTML
  * - @ref osc "OSC Parser" - Parse OSC (Operating System Command) sequences
  * - @ref sgr "SGR Parser" - Parse SGR (Select Graphic Rendition) sequences
@@ -101,6 +102,7 @@ extern "C" {
 #include <ghostty/vt/allocator.h>
 #include <ghostty/vt/focus.h>
 #include <ghostty/vt/formatter.h>
+#include <ghostty/vt/render.h>
 #include <ghostty/vt/terminal.h>
 #include <ghostty/vt/grid_ref.h>
 #include <ghostty/vt/osc.h>
diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
new file mode 100644
index 000000000..898994a65
--- /dev/null
+++ b/include/ghostty/vt/render.h
@@ -0,0 +1,100 @@
+/**
+ * @file render.h
+ *
+ * Render state for creating high performance renderers.
+ */
+
+#ifndef GHOSTTY_VT_RENDER_H
+#define GHOSTTY_VT_RENDER_H
+
+#include <ghostty/vt/allocator.h>
+#include <ghostty/vt/terminal.h>
+#include <ghostty/vt/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @defgroup render Render State
+ *
+ * Represents the state required to render a visible screen (a viewport)
+ * of a terminal instance. This is stateful and optimized for repeated
+ * updates from a single terminal instance and only updating dirty regions
+ * of the screen.
+ *
+ * The key design principle of this API is that it only needs read/write
+ * access to the terminal instance during the update call. This allows
+ * the render state to minimally impact terminal IO performance and also
+ * allows the renderer to be safely multi-threaded (as long as a lock is 
+ * held during the update call to ensure exclusive access to the terminal 
+ * instance).
+ *
+ * The basic usage of this API is:
+ *
+ *   1. Create an empty render state
+ *   2. Update it from a terminal instance whenever you need.
+ *   3. Read from the render state to get the data needed to draw your frame.
+ *
+ * ## Example
+ *
+ * @snippet c-vt-render/src/main.c render-state-update
+ *
+ * @{
+ */
+
+/**
+ * Opaque handle to a render state instance.
+ *
+ * @ingroup render
+ */
+typedef struct GhosttyRenderState* GhosttyRenderState;
+
+/**
+ * Create a new render state instance.
+ *
+ * @param allocator Pointer to allocator, or NULL to use the default allocator
+ * @param state Pointer to store the created render state handle
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_OUT_OF_MEMORY on allocation
+ * failure
+ *
+ * @ingroup render
+ */
+GhosttyResult ghostty_render_state_new(const GhosttyAllocator* allocator,
+                                       GhosttyRenderState* state);
+
+/**
+ * Update a render state instance from a terminal.
+ *
+ * This consumes terminal/screen dirty state in the same way as the internal
+ * render state update path.
+ *
+ * @param state The render state handle (NULL returns GHOSTTY_INVALID_VALUE)
+ * @param terminal The terminal handle to read from (NULL returns GHOSTTY_INVALID_VALUE)
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if `state` or
+ * `terminal` is NULL, GHOSTTY_OUT_OF_MEMORY if updating the state requires
+ * allocation and that allocation fails
+ *
+ * @ingroup render
+ */
+GhosttyResult ghostty_render_state_update(GhosttyRenderState state,
+                                          GhosttyTerminal terminal);
+
+/**
+ * Free a render state instance.
+ *
+ * Releases all resources associated with the render state. After this call,
+ * the render state handle becomes invalid.
+ *
+ * @param state The render state handle to free (may be NULL)
+ *
+ * @ingroup render
+ */
+void ghostty_render_state_free(GhosttyRenderState state);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GHOSTTY_VT_RENDER_H */
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index d6cfe49ea..8abad5fcf 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -187,6 +187,9 @@ comptime {
         @export(&c.formatter_format_buf, .{ .name = "ghostty_formatter_format_buf" });
         @export(&c.formatter_format_alloc, .{ .name = "ghostty_formatter_format_alloc" });
         @export(&c.formatter_free, .{ .name = "ghostty_formatter_free" });
+        @export(&c.render_state_new, .{ .name = "ghostty_render_state_new" });
+        @export(&c.render_state_update, .{ .name = "ghostty_render_state_update" });
+        @export(&c.render_state_free, .{ .name = "ghostty_render_state_free" });
         @export(&c.terminal_new, .{ .name = "ghostty_terminal_new" });
         @export(&c.terminal_free, .{ .name = "ghostty_terminal_free" });
         @export(&c.terminal_reset, .{ .name = "ghostty_terminal_reset" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 8964610df..f909260a8 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -4,6 +4,7 @@ pub const focus = @import("focus.zig");
 pub const formatter = @import("formatter.zig");
 pub const modes = @import("modes.zig");
 pub const osc = @import("osc.zig");
+pub const render = @import("render.zig");
 pub const key_event = @import("key_event.zig");
 pub const key_encode = @import("key_encode.zig");
 pub const mouse_event = @import("mouse_event.zig");
@@ -35,6 +36,10 @@ pub const formatter_format_buf = formatter.format_buf;
 pub const formatter_format_alloc = formatter.format_alloc;
 pub const formatter_free = formatter.free;
 
+pub const render_state_new = render.new;
+pub const render_state_free = render.free;
+pub const render_state_update = render.update;
+
 pub const sgr_new = sgr.new;
 pub const sgr_free = sgr.free;
 pub const sgr_reset = sgr.reset;
@@ -126,6 +131,7 @@ test {
     _ = formatter;
     _ = modes;
     _ = osc;
+    _ = render;
     _ = key_event;
     _ = key_encode;
     _ = mouse_event;
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
new file mode 100644
index 000000000..76d884032
--- /dev/null
+++ b/src/terminal/c/render.zig
@@ -0,0 +1,107 @@
+const std = @import("std");
+const testing = std.testing;
+const lib_alloc = @import("../../lib/allocator.zig");
+const CAllocator = lib_alloc.Allocator;
+const terminal_c = @import("terminal.zig");
+const renderpkg = @import("../render.zig");
+const Result = @import("result.zig").Result;
+
+const RenderStateWrapper = struct {
+    alloc: std.mem.Allocator,
+    state: renderpkg.RenderState = .empty,
+};
+
+/// C: GhosttyRenderState
+pub const RenderState = ?*RenderStateWrapper;
+
+pub fn new(
+    alloc_: ?*const CAllocator,
+    result: *RenderState,
+) callconv(.c) Result {
+    result.* = new_(alloc_) catch |err| {
+        result.* = null;
+        return switch (err) {
+            error.OutOfMemory => .out_of_memory,
+        };
+    };
+
+    return .success;
+}
+
+fn new_(alloc_: ?*const CAllocator) error{OutOfMemory}!*RenderStateWrapper {
+    const alloc = lib_alloc.default(alloc_);
+    const ptr = alloc.create(RenderStateWrapper) catch
+        return error.OutOfMemory;
+    ptr.* = .{ .alloc = alloc };
+    return ptr;
+}
+
+pub fn update(
+    state_: RenderState,
+    terminal_: terminal_c.Terminal,
+) callconv(.c) Result {
+    const state = state_ orelse return .invalid_value;
+    const t = terminal_ orelse return .invalid_value;
+
+    state.state.update(state.alloc, t) catch return .out_of_memory;
+    return .success;
+}
+
+pub fn free(state_: RenderState) callconv(.c) void {
+    const state = state_ orelse return;
+    const alloc = state.alloc;
+    state.state.deinit(alloc);
+    alloc.destroy(state);
+}
+
+test "render: new/free" {
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    try testing.expect(state != null);
+    free(state);
+}
+
+test "render: free null" {
+    free(null);
+}
+
+test "render: update invalid value" {
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.invalid_value, update(null, null));
+    try testing.expectEqual(Result.invalid_value, update(state, null));
+}
+
+test "render: update" {
+    var terminal: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &terminal,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer terminal_c.free(terminal);
+
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.success, update(state, terminal));
+
+    terminal_c.vt_write(terminal, "hello", 5);
+    try testing.expectEqual(Result.success, update(state, terminal));
+}

From 2876fb7a555708e8ac6884e4c4d5e251e5ab026a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 18 Mar 2026 09:54:03 -0700
Subject: [PATCH 256/391] vt: expose dirty state in C API

Switch RenderState.Dirty to lib.Enum so it uses C-compatible enum
backing when building the C ABI target. Add GhosttyRenderStateDirty and
new ghostty_render_state_dirty_get/set declarations to the render header,
then wire both functions through src/terminal/c/main.zig and the lib_vt
export table.
---
 include/ghostty/vt/render.h | 44 +++++++++++++++++++++
 src/lib_vt.zig              |  2 +
 src/terminal/c/main.zig     |  2 +
 src/terminal/c/render.zig   | 77 +++++++++++++++++++++++++++++++++++++
 src/terminal/render.zig     | 27 +++++++------
 5 files changed, 140 insertions(+), 12 deletions(-)

diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
index 898994a65..705194c70 100644
--- a/include/ghostty/vt/render.h
+++ b/include/ghostty/vt/render.h
@@ -49,6 +49,22 @@ extern "C" {
  */
 typedef struct GhosttyRenderState* GhosttyRenderState;
 
+/**
+ * Dirty state of a render state after update.
+ *
+ * @ingroup render
+ */
+typedef enum {
+  /** Not dirty at all; rendering can be skipped. */
+  GHOSTTY_RENDER_STATE_DIRTY_FALSE = 0,
+
+  /** Some rows changed; renderer can redraw incrementally. */
+  GHOSTTY_RENDER_STATE_DIRTY_PARTIAL = 1,
+
+  /** Global state changed; renderer should redraw everything. */
+  GHOSTTY_RENDER_STATE_DIRTY_FULL = 2,
+} GhosttyRenderStateDirty;
+
 /**
  * Create a new render state instance.
  *
@@ -79,6 +95,34 @@ GhosttyResult ghostty_render_state_new(const GhosttyAllocator* allocator,
 GhosttyResult ghostty_render_state_update(GhosttyRenderState state,
                                           GhosttyTerminal terminal);
 
+/**
+ * Get the current dirty state of a render state.
+ *
+ * @param state The render state handle (NULL returns GHOSTTY_INVALID_VALUE)
+ * @param[out] out_dirty On success, receives the current dirty state
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if `state` is
+ *         NULL
+ *
+ * @ingroup render
+ */
+GhosttyResult ghostty_render_state_dirty_get(GhosttyRenderState state,
+                                             GhosttyRenderStateDirty* out_dirty);
+
+/**
+ * Set the dirty state of a render state.
+ *
+ * This can be used by callers to clear dirty state after handling updates.
+ *
+ * @param state The render state handle (NULL returns GHOSTTY_INVALID_VALUE)
+ * @param dirty The dirty state to set
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if `state` is
+ *         NULL or `dirty` is not a recognized enum value
+ *
+ * @ingroup render
+ */
+GhosttyResult ghostty_render_state_dirty_set(GhosttyRenderState state,
+                                             GhosttyRenderStateDirty dirty);
+
 /**
  * Free a render state instance.
  *
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 8abad5fcf..f132189c8 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -189,6 +189,8 @@ comptime {
         @export(&c.formatter_free, .{ .name = "ghostty_formatter_free" });
         @export(&c.render_state_new, .{ .name = "ghostty_render_state_new" });
         @export(&c.render_state_update, .{ .name = "ghostty_render_state_update" });
+        @export(&c.render_state_dirty_get, .{ .name = "ghostty_render_state_dirty_get" });
+        @export(&c.render_state_dirty_set, .{ .name = "ghostty_render_state_dirty_set" });
         @export(&c.render_state_free, .{ .name = "ghostty_render_state_free" });
         @export(&c.terminal_new, .{ .name = "ghostty_terminal_new" });
         @export(&c.terminal_free, .{ .name = "ghostty_terminal_free" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index f909260a8..ebac8bd73 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -39,6 +39,8 @@ pub const formatter_free = formatter.free;
 pub const render_state_new = render.new;
 pub const render_state_free = render.free;
 pub const render_state_update = render.update;
+pub const render_state_dirty_get = render.dirty_get;
+pub const render_state_dirty_set = render.dirty_set;
 
 pub const sgr_new = sgr.new;
 pub const sgr_free = sgr.free;
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index 76d884032..c1198caea 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -14,6 +14,9 @@ const RenderStateWrapper = struct {
 /// C: GhosttyRenderState
 pub const RenderState = ?*RenderStateWrapper;
 
+/// C: GhosttyRenderStateDirty
+pub const Dirty = renderpkg.RenderState.Dirty;
+
 pub fn new(
     alloc_: ?*const CAllocator,
     result: *RenderState,
@@ -47,6 +50,26 @@ pub fn update(
     return .success;
 }
 
+pub fn dirty_get(
+    state_: RenderState,
+    out_dirty: *Dirty,
+) callconv(.c) Result {
+    const state = state_ orelse return .invalid_value;
+    out_dirty.* = state.state.dirty;
+    return .success;
+}
+
+pub fn dirty_set(
+    state_: RenderState,
+    dirty_: c_int,
+) callconv(.c) Result {
+    const state = state_ orelse return .invalid_value;
+    const dirty = std.meta.intToEnum(Dirty, dirty_) catch
+        return .invalid_value;
+    state.state.dirty = dirty;
+    return .success;
+}
+
 pub fn free(state_: RenderState) callconv(.c) void {
     const state = state_ orelse return;
     const alloc = state.alloc;
@@ -80,6 +103,60 @@ test "render: update invalid value" {
     try testing.expectEqual(Result.invalid_value, update(state, null));
 }
 
+test "render: dirty get/set invalid value" {
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    var dirty: Dirty = .false;
+    try testing.expectEqual(Result.invalid_value, dirty_get(null, &dirty));
+    try testing.expectEqual(Result.invalid_value, dirty_set(
+        null,
+        @intFromEnum(Dirty.full),
+    ));
+}
+
+test "render: dirty get/set" {
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    var dirty: Dirty = undefined;
+    try testing.expectEqual(Result.success, dirty_get(state, &dirty));
+    try testing.expectEqual(Dirty.false, dirty);
+
+    try testing.expectEqual(Result.success, dirty_set(
+        state,
+        @intFromEnum(Dirty.partial),
+    ));
+    try testing.expectEqual(Result.success, dirty_get(state, &dirty));
+    try testing.expectEqual(Dirty.partial, dirty);
+
+    try testing.expectEqual(Result.success, dirty_set(
+        state,
+        @intFromEnum(Dirty.full),
+    ));
+    try testing.expectEqual(Result.success, dirty_get(state, &dirty));
+    try testing.expectEqual(Dirty.full, dirty);
+}
+
+test "render: dirty set invalid enum value" {
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.invalid_value, dirty_set(state, 99));
+}
+
 test "render: update" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
diff --git a/src/terminal/render.zig b/src/terminal/render.zig
index 967f014ed..1c664a5b9 100644
--- a/src/terminal/render.zig
+++ b/src/terminal/render.zig
@@ -1,8 +1,11 @@
 const std = @import("std");
+const build_options = @import("terminal_options");
 const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const ArenaAllocator = std.heap.ArenaAllocator;
 const fastmem = @import("../fastmem.zig");
+const lib = @import("../lib/main.zig");
+const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
 const color = @import("color.zig");
 const cursor = @import("cursor.zig");
 const highlight = @import("highlight.zig");
@@ -222,20 +225,20 @@ pub const RenderState = struct {
         style: Style,
     };
 
-    // Dirty state
-    pub const Dirty = enum {
-        /// Not dirty at all. Can skip rendering if prior state was
-        /// already rendered.
-        false,
+    // Dirty state.
+    pub const Dirty = lib.Enum(lib_target, &.{
+        // Not dirty at all. Can skip rendering if prior state was
+        // already rendered.
+        "false",
 
-        /// Partially dirty. Some rows changed but not all. None of the
-        /// global state changed such as colors.
-        partial,
+        // Some rows changed but not all. None of the global state
+        // changed such as colors.
+        "partial",
 
-        /// Fully dirty. Global state changed or dimensions changed. All rows
-        /// should be redrawn.
-        full,
-    };
+        // Global state changed or dimensions changed. All rows should
+        // be redrawn.
+        "full",
+    });
 
     const SelectionCache = struct {
         selection: Selection,

From b830a0ee1d2d14f559a08191aa46ecb0ea1b524e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 18 Mar 2026 12:22:32 -0700
Subject: [PATCH 257/391] vt: add size getter for render state

Add ghostty_render_state_size_get() to return cols and rows from the
current render state using out pointers. The C wrapper validates null
inputs, the symbol is wired through the C API export layers, and tests
cover success and invalid-value paths.
---
 include/ghostty/vt/render.h | 18 +++++++++++++
 src/lib_vt.zig              |  1 +
 src/terminal/c/main.zig     |  1 +
 src/terminal/c/render.zig   | 52 +++++++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+)

diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
index 705194c70..684da696f 100644
--- a/include/ghostty/vt/render.h
+++ b/include/ghostty/vt/render.h
@@ -95,6 +95,24 @@ GhosttyResult ghostty_render_state_new(const GhosttyAllocator* allocator,
 GhosttyResult ghostty_render_state_update(GhosttyRenderState state,
                                           GhosttyTerminal terminal);
 
+/**
+ * Get the current viewport size from a render state.
+ *
+ * The returned values are the render-state dimensions in cells. These
+ * match the active viewport size from the most recent successful update.
+ *
+ * @param state The render state handle (NULL returns GHOSTTY_INVALID_VALUE)
+ * @param[out] out_cols On success, receives the viewport width in cells
+ * @param[out] out_rows On success, receives the viewport height in cells
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if `state`,
+ *         `out_cols`, or `out_rows` is NULL
+ *
+ * @ingroup render
+ */
+GhosttyResult ghostty_render_state_size_get(GhosttyRenderState state,
+                                            uint16_t* out_cols,
+                                            uint16_t* out_rows);
+
 /**
  * Get the current dirty state of a render state.
  *
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index f132189c8..250635d4b 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -189,6 +189,7 @@ comptime {
         @export(&c.formatter_free, .{ .name = "ghostty_formatter_free" });
         @export(&c.render_state_new, .{ .name = "ghostty_render_state_new" });
         @export(&c.render_state_update, .{ .name = "ghostty_render_state_update" });
+        @export(&c.render_state_size_get, .{ .name = "ghostty_render_state_size_get" });
         @export(&c.render_state_dirty_get, .{ .name = "ghostty_render_state_dirty_get" });
         @export(&c.render_state_dirty_set, .{ .name = "ghostty_render_state_dirty_set" });
         @export(&c.render_state_free, .{ .name = "ghostty_render_state_free" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index ebac8bd73..c1999ccea 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -39,6 +39,7 @@ pub const formatter_free = formatter.free;
 pub const render_state_new = render.new;
 pub const render_state_free = render.free;
 pub const render_state_update = render.update;
+pub const render_state_size_get = render.size_get;
 pub const render_state_dirty_get = render.dirty_get;
 pub const render_state_dirty_set = render.dirty_set;
 
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index c1198caea..9104b4ac7 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -2,6 +2,7 @@ const std = @import("std");
 const testing = std.testing;
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
+const size = @import("../size.zig");
 const terminal_c = @import("terminal.zig");
 const renderpkg = @import("../render.zig");
 const Result = @import("result.zig").Result;
@@ -50,6 +51,20 @@ pub fn update(
     return .success;
 }
 
+pub fn size_get(
+    state_: RenderState,
+    out_cols_: ?*size.CellCountInt,
+    out_rows_: ?*size.CellCountInt,
+) callconv(.c) Result {
+    const state = state_ orelse return .invalid_value;
+    const out_cols = out_cols_ orelse return .invalid_value;
+    const out_rows = out_rows_ orelse return .invalid_value;
+
+    out_cols.* = state.state.cols;
+    out_rows.* = state.state.rows;
+    return .success;
+}
+
 pub fn dirty_get(
     state_: RenderState,
     out_dirty: *Dirty,
@@ -103,6 +118,33 @@ test "render: update invalid value" {
     try testing.expectEqual(Result.invalid_value, update(state, null));
 }
 
+test "render: size get invalid value" {
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    var cols: size.CellCountInt = 0;
+    var rows: size.CellCountInt = 0;
+    try testing.expectEqual(Result.invalid_value, size_get(
+        null,
+        &cols,
+        &rows,
+    ));
+    try testing.expectEqual(Result.invalid_value, size_get(
+        state,
+        null,
+        &rows,
+    ));
+    try testing.expectEqual(Result.invalid_value, size_get(
+        state,
+        &cols,
+        null,
+    ));
+}
+
 test "render: dirty get/set invalid value" {
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
@@ -181,4 +223,14 @@ test "render: update" {
 
     terminal_c.vt_write(terminal, "hello", 5);
     try testing.expectEqual(Result.success, update(state, terminal));
+
+    var cols: size.CellCountInt = 0;
+    var rows: size.CellCountInt = 0;
+    try testing.expectEqual(Result.success, size_get(
+        state,
+        &cols,
+        &rows,
+    ));
+    try testing.expectEqual(@as(size.CellCountInt, 80), cols);
+    try testing.expectEqual(@as(size.CellCountInt, 24), rows);
 }

From b35f8ed16eeeb401045e139d8c658214aefd3248 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 18 Mar 2026 19:57:29 -0700
Subject: [PATCH 258/391] vt: expose render state colors in C API

Add a C-facing GhosttyRenderStateColors sized struct and a
ghostty_render_state_colors_get accessor so renderers can read
background, foreground, cursor color state, and palette data directly
from the render state.
---
 include/ghostty/vt.h        |   1 +
 include/ghostty/vt/render.h |  58 +++++++++++++
 src/lib/main.zig            |   4 +-
 src/lib/struct.zig          |  46 ++++++++++
 src/lib_vt.zig              |   1 +
 src/terminal/c/main.zig     |   1 +
 src/terminal/c/render.zig   | 169 ++++++++++++++++++++++++++++++++++++
 7 files changed, 279 insertions(+), 1 deletion(-)

diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index 912d6e217..5059a0bef 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -100,6 +100,7 @@ extern "C" {
 
 #include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
+#include <ghostty/vt/color.h>
 #include <ghostty/vt/focus.h>
 #include <ghostty/vt/formatter.h>
 #include <ghostty/vt/render.h>
diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
index 684da696f..79edfa689 100644
--- a/include/ghostty/vt/render.h
+++ b/include/ghostty/vt/render.h
@@ -8,6 +8,7 @@
 #define GHOSTTY_VT_RENDER_H
 
 #include <ghostty/vt/allocator.h>
+#include <ghostty/vt/color.h>
 #include <ghostty/vt/terminal.h>
 #include <ghostty/vt/types.h>
 
@@ -65,6 +66,45 @@ typedef enum {
   GHOSTTY_RENDER_STATE_DIRTY_FULL = 2,
 } GhosttyRenderStateDirty;
 
+/**
+ * Render-state color information.
+ *
+ * This struct uses the sized-struct ABI pattern. Initialize with
+ * GHOSTTY_INIT_SIZED(GhosttyRenderStateColors) before calling
+ * ghostty_render_state_colors_get().
+ *
+ * Example:
+ * @code
+ * GhosttyRenderStateColors colors = GHOSTTY_INIT_SIZED(GhosttyRenderStateColors);
+ * GhosttyResult result = ghostty_render_state_colors_get(state, &colors);
+ * @endcode
+ *
+ * @ingroup render
+ */
+typedef struct {
+  /** Size of this struct in bytes. Must be set to sizeof(GhosttyRenderStateColors). */
+  size_t size;
+
+  /** The default/current background color for the render state. */
+  GhosttyColorRgb background;
+
+  /** The default/current foreground color for the render state. */
+  GhosttyColorRgb foreground;
+
+  /** The cursor color when explicitly set by terminal state. */
+  GhosttyColorRgb cursor;
+
+  /** 
+   * True when cursor contains a valid explicit cursor color value. 
+   * If this is false, the cursor color should be ignored; it will 
+   * contain undefined data.
+   * */
+  bool cursor_has_value;
+
+  /** The active 256-color palette for this render state. */
+  GhosttyColorRgb palette[256];
+} GhosttyRenderStateColors;
+
 /**
  * Create a new render state instance.
  *
@@ -113,6 +153,24 @@ GhosttyResult ghostty_render_state_size_get(GhosttyRenderState state,
                                             uint16_t* out_cols,
                                             uint16_t* out_rows);
 
+/**
+ * Get the current color information from a render state.
+ *
+ * This writes as many fields as fit in the caller-provided sized struct.
+ * `out_colors->size` must be set by the caller (typically via
+ * GHOSTTY_INIT_SIZED(GhosttyRenderStateColors)).
+ *
+ * @param state The render state handle (NULL returns GHOSTTY_INVALID_VALUE)
+ * @param[out] out_colors Sized output struct to receive render-state colors
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if `state` or
+ *         `out_colors` is NULL, or if `out_colors->size` is smaller than
+ *         `sizeof(size_t)`
+ *
+ * @ingroup render
+ */
+GhosttyResult ghostty_render_state_colors_get(GhosttyRenderState state,
+                                              GhosttyRenderStateColors* out_colors);
+
 /**
  * Get the current dirty state of a render state.
  *
diff --git a/src/lib/main.zig b/src/lib/main.zig
index 89c6f6c47..05ebe9bd7 100644
--- a/src/lib/main.zig
+++ b/src/lib/main.zig
@@ -1,5 +1,6 @@
 const std = @import("std");
 const enumpkg = @import("enum.zig");
+const structpkg = @import("struct.zig");
 const types = @import("types.zig");
 const unionpkg = @import("union.zig");
 
@@ -7,7 +8,8 @@ pub const allocator = @import("allocator.zig");
 pub const Enum = enumpkg.Enum;
 pub const checkGhosttyHEnum = enumpkg.checkGhosttyHEnum;
 pub const String = types.String;
-pub const Struct = @import("struct.zig").Struct;
+pub const Struct = structpkg.Struct;
+pub const structSizedFieldFits = structpkg.sizedFieldFits;
 pub const Target = @import("target.zig").Target;
 pub const TaggedUnion = unionpkg.TaggedUnion;
 pub const cutPrefix = @import("string.zig").cutPrefix;
diff --git a/src/lib/struct.zig b/src/lib/struct.zig
index 134f6bebc..bbf07ece3 100644
--- a/src/lib/struct.zig
+++ b/src/lib/struct.zig
@@ -41,6 +41,52 @@ pub fn Struct(
     };
 }
 
+/// Returns true if a struct of type `T` with size `size` can set
+/// field `field` (if it fits within the size). This is used for ABI
+/// compatibility for structs that have an explicit size field.
+pub fn sizedFieldFits(
+    comptime T: type,
+    size: usize,
+    comptime field: []const u8,
+) bool {
+    const offset = @offsetOf(T, field);
+    const field_size = @sizeOf(@FieldType(T, field));
+    return size >= offset + field_size;
+}
+
+test "sizedFieldFits boundary checks" {
+    const Sized = extern struct {
+        size: usize,
+        a: u8,
+        b: u32,
+    };
+
+    const size_required = @offsetOf(Sized, "size") + @sizeOf(@FieldType(Sized, "size"));
+    const a_required = @offsetOf(Sized, "a") + @sizeOf(@FieldType(Sized, "a"));
+    const b_required = @offsetOf(Sized, "b") + @sizeOf(@FieldType(Sized, "b"));
+
+    try testing.expect(sizedFieldFits(Sized, size_required, "size"));
+    try testing.expect(!sizedFieldFits(Sized, size_required - 1, "size"));
+
+    try testing.expect(sizedFieldFits(Sized, a_required, "a"));
+    try testing.expect(!sizedFieldFits(Sized, a_required - 1, "a"));
+
+    try testing.expect(sizedFieldFits(Sized, b_required, "b"));
+    try testing.expect(!sizedFieldFits(Sized, b_required - 1, "b"));
+}
+
+test "sizedFieldFits respects alignment padding" {
+    const Sized = extern struct {
+        size: usize,
+        a: u8,
+        b: u32,
+    };
+
+    const up_to_padding = @offsetOf(Sized, "b");
+    try testing.expect(sizedFieldFits(Sized, up_to_padding, "a"));
+    try testing.expect(!sizedFieldFits(Sized, up_to_padding, "b"));
+}
+
 test "packed struct converts to extern with full-size bools" {
     const Packed = packed struct {
         flag1: bool,
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 250635d4b..b0ed9d489 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -190,6 +190,7 @@ comptime {
         @export(&c.render_state_new, .{ .name = "ghostty_render_state_new" });
         @export(&c.render_state_update, .{ .name = "ghostty_render_state_update" });
         @export(&c.render_state_size_get, .{ .name = "ghostty_render_state_size_get" });
+        @export(&c.render_state_colors_get, .{ .name = "ghostty_render_state_colors_get" });
         @export(&c.render_state_dirty_get, .{ .name = "ghostty_render_state_dirty_get" });
         @export(&c.render_state_dirty_set, .{ .name = "ghostty_render_state_dirty_set" });
         @export(&c.render_state_free, .{ .name = "ghostty_render_state_free" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index c1999ccea..a5dffe233 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -40,6 +40,7 @@ pub const render_state_new = render.new;
 pub const render_state_free = render.free;
 pub const render_state_update = render.update;
 pub const render_state_size_get = render.size_get;
+pub const render_state_colors_get = render.colors_get;
 pub const render_state_dirty_get = render.dirty_get;
 pub const render_state_dirty_set = render.dirty_set;
 
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index 9104b4ac7..739d14a7f 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -1,7 +1,9 @@
 const std = @import("std");
 const testing = std.testing;
+const lib = @import("../../lib/main.zig");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
+const colorpkg = @import("../color.zig");
 const size = @import("../size.zig");
 const terminal_c = @import("terminal.zig");
 const renderpkg = @import("../render.zig");
@@ -18,6 +20,16 @@ pub const RenderState = ?*RenderStateWrapper;
 /// C: GhosttyRenderStateDirty
 pub const Dirty = renderpkg.RenderState.Dirty;
 
+/// C: GhosttyRenderStateColors
+pub const Colors = extern struct {
+    size: usize = @sizeOf(Colors),
+    background: colorpkg.RGB.C,
+    foreground: colorpkg.RGB.C,
+    cursor: colorpkg.RGB.C,
+    cursor_has_value: bool,
+    palette: [256]colorpkg.RGB.C,
+};
+
 pub fn new(
     alloc_: ?*const CAllocator,
     result: *RenderState,
@@ -65,6 +77,68 @@ pub fn size_get(
     return .success;
 }
 
+pub fn colors_get(
+    state_: RenderState,
+    out_colors_: ?*Colors,
+) callconv(.c) Result {
+    const state = state_ orelse return .invalid_value;
+    const out_colors = out_colors_ orelse return .invalid_value;
+    const out_size = out_colors.size;
+    if (out_size < @sizeOf(usize)) return .invalid_value;
+
+    const colors = state.state.colors;
+    if (lib.structSizedFieldFits(
+        Colors,
+        out_size,
+        "background",
+    )) {
+        out_colors.background = colors.background.cval();
+    }
+
+    if (lib.structSizedFieldFits(
+        Colors,
+        out_size,
+        "foreground",
+    )) {
+        out_colors.foreground = colors.foreground.cval();
+    }
+
+    if (colors.cursor) |cursor| {
+        if (lib.structSizedFieldFits(
+            Colors,
+            out_size,
+            "cursor",
+        )) {
+            out_colors.cursor = cursor.cval();
+        }
+    }
+
+    if (lib.structSizedFieldFits(
+        Colors,
+        out_size,
+        "cursor_has_value",
+    )) {
+        out_colors.cursor_has_value = colors.cursor != null;
+    }
+
+    if (lib.structSizedFieldFits(
+        Colors,
+        out_size,
+        "palette",
+    )) {
+        const palette_offset = @offsetOf(Colors, "palette");
+        if (out_size > palette_offset) {
+            const available = out_size - palette_offset;
+            const max_entries = @min(colors.palette.len, available / @sizeOf(colorpkg.RGB.C));
+            for (0..max_entries) |i| {
+                out_colors.palette[i] = colors.palette[i].cval();
+            }
+        }
+    }
+
+    return .success;
+}
+
 pub fn dirty_get(
     state_: RenderState,
     out_dirty: *Dirty,
@@ -145,6 +219,24 @@ test "render: size get invalid value" {
     ));
 }
 
+test "render: colors get invalid value" {
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    var colors: Colors = std.mem.zeroes(Colors);
+    colors.size = @sizeOf(Colors);
+
+    try testing.expectEqual(Result.invalid_value, colors_get(null, &colors));
+    try testing.expectEqual(Result.invalid_value, colors_get(state, null));
+
+    colors.size = @sizeOf(usize) - 1;
+    try testing.expectEqual(Result.invalid_value, colors_get(state, &colors));
+}
+
 test "render: dirty get/set invalid value" {
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
@@ -234,3 +326,80 @@ test "render: update" {
     try testing.expectEqual(@as(size.CellCountInt, 80), cols);
     try testing.expectEqual(@as(size.CellCountInt, 24), rows);
 }
+
+test "render: colors get" {
+    var terminal: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &terminal,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer terminal_c.free(terminal);
+
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.success, update(state, terminal));
+
+    var colors: Colors = std.mem.zeroes(Colors);
+    colors.size = @sizeOf(Colors);
+    try testing.expectEqual(Result.success, colors_get(state, &colors));
+
+    const state_colors = &state.?.state.colors;
+    try testing.expectEqual(state_colors.background.cval(), colors.background);
+    try testing.expectEqual(state_colors.foreground.cval(), colors.foreground);
+
+    if (state_colors.cursor) |cursor| {
+        try testing.expect(colors.cursor_has_value);
+        try testing.expectEqual(cursor.cval(), colors.cursor);
+    } else {
+        try testing.expect(!colors.cursor_has_value);
+    }
+
+    for (state_colors.palette, colors.palette) |expected, actual| {
+        try testing.expectEqual(expected.cval(), actual);
+    }
+}
+
+test "render: colors get supports truncated sized struct" {
+    var terminal: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &terminal,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer terminal_c.free(terminal);
+
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.success, update(state, terminal));
+
+    var colors: Colors = std.mem.zeroes(Colors);
+    const sentinel: colorpkg.RGB.C = .{ .r = 0xAA, .g = 0xBB, .b = 0xCC };
+    for (&colors.palette) |*entry| entry.* = sentinel;
+
+    colors.size = @offsetOf(Colors, "palette") + @sizeOf(colorpkg.RGB.C) * 2;
+    try testing.expectEqual(Result.success, colors_get(state, &colors));
+
+    const state_colors = &state.?.state.colors;
+    try testing.expectEqual(state_colors.palette[0].cval(), colors.palette[0]);
+    try testing.expectEqual(state_colors.palette[1].cval(), colors.palette[1]);
+    try testing.expectEqual(sentinel, colors.palette[2]);
+}

From ad0e47ebac90e4b1b1d4a816c3c7be4ae744688b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 19 Mar 2026 09:28:26 -0700
Subject: [PATCH 259/391] vt: cover c row iterator new/free

Add a C ABI row-iterator handle for render state with
ghostty_render_state_row_iterator_new and
ghostty_render_state_row_iterator_free, and wire them through
src/terminal/c/main.zig, src/lib_vt.zig, and
include/ghostty/vt/render.h. The header now documents only the
currently exported iterator API.
---
 include/ghostty/vt/render.h |  37 +++++++++++
 src/lib_vt.zig              |   2 +
 src/terminal/c/main.zig     |   2 +
 src/terminal/c/render.zig   | 129 ++++++++++++++++++++++++++++++++++++
 4 files changed, 170 insertions(+)

diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
index 79edfa689..b2cad5e6d 100644
--- a/include/ghostty/vt/render.h
+++ b/include/ghostty/vt/render.h
@@ -7,6 +7,9 @@
 #ifndef GHOSTTY_VT_RENDER_H
 #define GHOSTTY_VT_RENDER_H
 
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <ghostty/vt/allocator.h>
 #include <ghostty/vt/color.h>
 #include <ghostty/vt/terminal.h>
@@ -50,6 +53,13 @@ extern "C" {
  */
 typedef struct GhosttyRenderState* GhosttyRenderState;
 
+/**
+ * Opaque handle to a render-state row iterator.
+ *
+ * @ingroup render
+ */
+typedef struct GhosttyRenderStateRowIterator* GhosttyRenderStateRowIterator;
+
 /**
  * Dirty state of a render state after update.
  *
@@ -199,6 +209,33 @@ GhosttyResult ghostty_render_state_dirty_get(GhosttyRenderState state,
 GhosttyResult ghostty_render_state_dirty_set(GhosttyRenderState state,
                                              GhosttyRenderStateDirty dirty);
 
+/**
+ * Create a row iterator for a render state.
+ *
+ * The iterator borrows from `state`; `state` must outlive the iterator.
+ *
+ * @param allocator Pointer to allocator, or NULL to use the default allocator
+ * @param state The render state handle to iterate (NULL returns GHOSTTY_INVALID_VALUE)
+ * @param[out] out_iterator On success, receives the created iterator handle
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if `state` is
+ *         NULL, GHOSTTY_OUT_OF_MEMORY on allocation failure
+ *
+ * @ingroup render
+ */
+GhosttyResult ghostty_render_state_row_iterator_new(
+    const GhosttyAllocator* allocator,
+    GhosttyRenderState state,
+    GhosttyRenderStateRowIterator* out_iterator);
+
+/**
+ * Free a render-state row iterator.
+ *
+ * @param iterator The iterator handle to free (may be NULL)
+ *
+ * @ingroup render
+ */
+void ghostty_render_state_row_iterator_free(GhosttyRenderStateRowIterator iterator);
+
 /**
  * Free a render state instance.
  *
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index b0ed9d489..cfd5f1ca0 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -193,6 +193,8 @@ comptime {
         @export(&c.render_state_colors_get, .{ .name = "ghostty_render_state_colors_get" });
         @export(&c.render_state_dirty_get, .{ .name = "ghostty_render_state_dirty_get" });
         @export(&c.render_state_dirty_set, .{ .name = "ghostty_render_state_dirty_set" });
+        @export(&c.render_state_row_iterator_new, .{ .name = "ghostty_render_state_row_iterator_new" });
+        @export(&c.render_state_row_iterator_free, .{ .name = "ghostty_render_state_row_iterator_free" });
         @export(&c.render_state_free, .{ .name = "ghostty_render_state_free" });
         @export(&c.terminal_new, .{ .name = "ghostty_terminal_new" });
         @export(&c.terminal_free, .{ .name = "ghostty_terminal_free" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index a5dffe233..b852fba07 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -43,6 +43,8 @@ pub const render_state_size_get = render.size_get;
 pub const render_state_colors_get = render.colors_get;
 pub const render_state_dirty_get = render.dirty_get;
 pub const render_state_dirty_set = render.dirty_set;
+pub const render_state_row_iterator_new = render.row_iterator_new;
+pub const render_state_row_iterator_free = render.row_iterator_free;
 
 pub const sgr_new = sgr.new;
 pub const sgr_free = sgr.free;
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index 739d14a7f..97a30a867 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -1,9 +1,11 @@
 const std = @import("std");
 const testing = std.testing;
+const Allocator = std.mem.Allocator;
 const lib = @import("../../lib/main.zig");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const colorpkg = @import("../color.zig");
+const page = @import("../page.zig");
 const size = @import("../size.zig");
 const terminal_c = @import("terminal.zig");
 const renderpkg = @import("../render.zig");
@@ -14,9 +16,24 @@ const RenderStateWrapper = struct {
     state: renderpkg.RenderState = .empty,
 };
 
+const RowIteratorWrapper = struct {
+    alloc: std.mem.Allocator,
+
+    /// The current index (also y value) into the row list.
+    y: size.CellCountInt,
+
+    /// These are the raw pointers into the render state data.
+    raws: []const page.Row,
+    cells: []const std.MultiArrayList(renderpkg.RenderState.Cell),
+    dirty: []const bool,
+};
+
 /// C: GhosttyRenderState
 pub const RenderState = ?*RenderStateWrapper;
 
+/// C: GhosttyRenderStateRowIterator
+pub const RowIterator = ?*RowIteratorWrapper;
+
 /// C: GhosttyRenderStateDirty
 pub const Dirty = renderpkg.RenderState.Dirty;
 
@@ -159,6 +176,53 @@ pub fn dirty_set(
     return .success;
 }
 
+pub fn row_iterator_new(
+    alloc_: ?*const CAllocator,
+    state_: RenderState,
+    out_iterator_: ?*RowIterator,
+) callconv(.c) Result {
+    const state = state_ orelse return .invalid_value;
+    const out_iterator = out_iterator_ orelse return .invalid_value;
+    const alloc = lib_alloc.default(alloc_);
+
+    out_iterator.* = row_iterator_new_(
+        alloc,
+        state,
+    ) catch |err| {
+        out_iterator.* = null;
+        switch (err) {
+            error.OutOfMemory => return .out_of_memory,
+        }
+    };
+
+    return .success;
+}
+
+fn row_iterator_new_(
+    alloc: Allocator,
+    state: *RenderStateWrapper,
+) !*RowIteratorWrapper {
+    const it = try alloc.create(RowIteratorWrapper);
+    errdefer alloc.destroy(it);
+
+    const row_data = state.state.row_data.slice();
+    it.* = .{
+        .alloc = alloc,
+        .y = 0,
+        .raws = row_data.items(.raw),
+        .cells = row_data.items(.cells),
+        .dirty = row_data.items(.dirty),
+    };
+
+    return it;
+}
+
+pub fn row_iterator_free(iterator_: RowIterator) callconv(.c) void {
+    const iterator = iterator_ orelse return;
+    const alloc = iterator.alloc;
+    alloc.destroy(iterator);
+}
+
 pub fn free(state_: RenderState) callconv(.c) void {
     const state = state_ orelse return;
     const alloc = state.alloc;
@@ -291,6 +355,71 @@ test "render: dirty set invalid enum value" {
     try testing.expectEqual(Result.invalid_value, dirty_set(state, 99));
 }
 
+test "render: row iterator new invalid value" {
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    var iterator: RowIterator = null;
+    try testing.expectEqual(Result.invalid_value, row_iterator_new(
+        &lib_alloc.test_allocator,
+        null,
+        &iterator,
+    ));
+    try testing.expectEqual(Result.invalid_value, row_iterator_new(
+        &lib_alloc.test_allocator,
+        state,
+        null,
+    ));
+}
+
+test "render: row iterator new/free" {
+    var terminal: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &terminal,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer terminal_c.free(terminal);
+
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.success, update(state, terminal));
+
+    var iterator: RowIterator = null;
+    try testing.expectEqual(Result.success, row_iterator_new(
+        &lib_alloc.test_allocator,
+        state,
+        &iterator,
+    ));
+    defer row_iterator_free(iterator);
+
+    try testing.expect(iterator != null);
+    const iterator_ptr = iterator.?;
+    const row_data = state.?.state.row_data.slice();
+
+    try testing.expectEqual(@as(size.CellCountInt, 0), iterator_ptr.y);
+    try testing.expectEqual(row_data.items(.raw).len, iterator_ptr.raws.len);
+    try testing.expectEqual(row_data.items(.cells).len, iterator_ptr.cells.len);
+    try testing.expectEqual(row_data.items(.dirty).len, iterator_ptr.dirty.len);
+}
+
+test "render: row iterator free null" {
+    row_iterator_free(null);
+}
+
 test "render: update" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(

From f610d7e00fed12d00c2731781ddabe9f4ef9e39a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 19 Mar 2026 10:06:19 -0700
Subject: [PATCH 260/391] vt: add render_row_iterator_next

---
 include/ghostty/vt/render.h | 14 +++++++
 src/lib_vt.zig              |  1 +
 src/terminal/c/main.zig     |  1 +
 src/terminal/c/render.zig   | 77 +++++++++++++++++++++++++++++++++----
 4 files changed, 85 insertions(+), 8 deletions(-)

diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
index b2cad5e6d..62bfb9b66 100644
--- a/include/ghostty/vt/render.h
+++ b/include/ghostty/vt/render.h
@@ -227,6 +227,20 @@ GhosttyResult ghostty_render_state_row_iterator_new(
     GhosttyRenderState state,
     GhosttyRenderStateRowIterator* out_iterator);
 
+/**
+ * Move a render-state row iterator to the next row.
+ *
+ * Returns true if the iterator moved successfully and row data is
+ * available to read at the new position.
+ *
+ * @param iterator The iterator handle to advance (may be NULL)
+ * @return true if advanced to the next row, false if `iterator` is
+ *         NULL or if the iterator has reached the end
+ *
+ * @ingroup render
+ */
+bool ghostty_render_state_row_iterator_next(GhosttyRenderStateRowIterator iterator);
+
 /**
  * Free a render-state row iterator.
  *
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index cfd5f1ca0..825fa2f11 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -194,6 +194,7 @@ comptime {
         @export(&c.render_state_dirty_get, .{ .name = "ghostty_render_state_dirty_get" });
         @export(&c.render_state_dirty_set, .{ .name = "ghostty_render_state_dirty_set" });
         @export(&c.render_state_row_iterator_new, .{ .name = "ghostty_render_state_row_iterator_new" });
+        @export(&c.render_state_row_iterator_next, .{ .name = "ghostty_render_state_row_iterator_next" });
         @export(&c.render_state_row_iterator_free, .{ .name = "ghostty_render_state_row_iterator_free" });
         @export(&c.render_state_free, .{ .name = "ghostty_render_state_free" });
         @export(&c.terminal_new, .{ .name = "ghostty_terminal_new" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index b852fba07..52ed87522 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -44,6 +44,7 @@ pub const render_state_colors_get = render.colors_get;
 pub const render_state_dirty_get = render.dirty_get;
 pub const render_state_dirty_set = render.dirty_set;
 pub const render_state_row_iterator_new = render.row_iterator_new;
+pub const render_state_row_iterator_next = render.row_iterator_next;
 pub const render_state_row_iterator_free = render.row_iterator_free;
 
 pub const sgr_new = sgr.new;
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index 97a30a867..0b1169326 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -20,7 +20,7 @@ const RowIteratorWrapper = struct {
     alloc: std.mem.Allocator,
 
     /// The current index (also y value) into the row list.
-    y: size.CellCountInt,
+    y: ?size.CellCountInt,
 
     /// These are the raw pointers into the render state data.
     raws: []const page.Row,
@@ -69,6 +69,13 @@ fn new_(alloc_: ?*const CAllocator) error{OutOfMemory}!*RenderStateWrapper {
     return ptr;
 }
 
+pub fn free(state_: RenderState) callconv(.c) void {
+    const state = state_ orelse return;
+    const alloc = state.alloc;
+    state.state.deinit(alloc);
+    alloc.destroy(state);
+}
+
 pub fn update(
     state_: RenderState,
     terminal_: terminal_c.Terminal,
@@ -208,7 +215,7 @@ fn row_iterator_new_(
     const row_data = state.state.row_data.slice();
     it.* = .{
         .alloc = alloc,
-        .y = 0,
+        .y = null,
         .raws = row_data.items(.raw),
         .cells = row_data.items(.cells),
         .dirty = row_data.items(.dirty),
@@ -223,11 +230,12 @@ pub fn row_iterator_free(iterator_: RowIterator) callconv(.c) void {
     alloc.destroy(iterator);
 }
 
-pub fn free(state_: RenderState) callconv(.c) void {
-    const state = state_ orelse return;
-    const alloc = state.alloc;
-    state.state.deinit(alloc);
-    alloc.destroy(state);
+pub fn row_iterator_next(iterator_: RowIterator) callconv(.c) bool {
+    const it = iterator_ orelse return false;
+    const next_y: size.CellCountInt = if (it.y) |y| y + 1 else 0;
+    if (next_y >= it.raws.len) return false;
+    it.y = next_y;
+    return true;
 }
 
 test "render: new/free" {
@@ -410,7 +418,7 @@ test "render: row iterator new/free" {
     const iterator_ptr = iterator.?;
     const row_data = state.?.state.row_data.slice();
 
-    try testing.expectEqual(@as(size.CellCountInt, 0), iterator_ptr.y);
+    try testing.expectEqual(@as(?size.CellCountInt, null), iterator_ptr.y);
     try testing.expectEqual(row_data.items(.raw).len, iterator_ptr.raws.len);
     try testing.expectEqual(row_data.items(.cells).len, iterator_ptr.cells.len);
     try testing.expectEqual(row_data.items(.dirty).len, iterator_ptr.dirty.len);
@@ -420,6 +428,59 @@ test "render: row iterator free null" {
     row_iterator_free(null);
 }
 
+test "render: row iterator next null" {
+    try testing.expect(!row_iterator_next(null));
+}
+
+test "render: row iterator next" {
+    var terminal: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &terminal,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer terminal_c.free(terminal);
+
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.success, update(state, terminal));
+
+    var iterator: RowIterator = null;
+    try testing.expectEqual(Result.success, row_iterator_new(
+        &lib_alloc.test_allocator,
+        state,
+        &iterator,
+    ));
+    defer row_iterator_free(iterator);
+
+    const rows = state.?.state.rows;
+    if (rows == 0) {
+        try testing.expect(!row_iterator_next(iterator));
+        return;
+    }
+
+    try testing.expect(row_iterator_next(iterator));
+    try testing.expectEqual(@as(?size.CellCountInt, 0), iterator.?.y);
+
+    var i: size.CellCountInt = 1;
+    while (i < rows) : (i += 1) {
+        try testing.expect(row_iterator_next(iterator));
+        try testing.expectEqual(@as(?size.CellCountInt, i), iterator.?.y);
+    }
+
+    try testing.expect(!row_iterator_next(iterator));
+    try testing.expectEqual(@as(?size.CellCountInt, rows - 1), iterator.?.y);
+}
+
 test "render: update" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(

From 2147b9d65c6f5b04ef784c4c624709ff5c401dba Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 19 Mar 2026 10:17:37 -0700
Subject: [PATCH 261/391] vt: row dirty tracking

---
 include/ghostty/vt/render.h |  68 ++++++++++++++--
 src/lib_vt.zig              |   2 +
 src/terminal/c/main.zig     |   2 +
 src/terminal/c/render.zig   | 149 +++++++++++++++++++++++++++++++++++-
 4 files changed, 210 insertions(+), 11 deletions(-)

diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
index 62bfb9b66..da9849332 100644
--- a/include/ghostty/vt/render.h
+++ b/include/ghostty/vt/render.h
@@ -39,6 +39,25 @@ extern "C" {
  *   2. Update it from a terminal instance whenever you need.
  *   3. Read from the render state to get the data needed to draw your frame.
  *
+ * ## Dirty Tracking
+ *
+ * Dirty tracking is a key feature of the render state that allows renderers
+ * to efficiently determine what parts of the screen have changed and only 
+ * redraw changed regions.
+ *
+ * The render state API keeps track of dirty state at two independent layers:
+ * a global dirty state that indicates whether the entire frame is clean, 
+ * partially dirty, or fully dirty, and a per-row dirty state that allows 
+ * tracking which rows in a partially dirty frame have changed. 
+ *
+ * The user of the render state API is expected to unset both of these.
+ * The `update` call does not unset dirty state, it only updates it.
+ *
+ * An extremely important detail: setting one dirty state doesn't unset
+ * the other. For example, setting the global dirty state to false does not
+ * reset the row-level dirty flags. So, the caller of the render state API must
+ * be careful to manage both layers of dirty state correctly. 
+ *
  * ## Example
  *
  * @snippet c-vt-render/src/main.c render-state-update
@@ -128,6 +147,18 @@ typedef struct {
 GhosttyResult ghostty_render_state_new(const GhosttyAllocator* allocator,
                                        GhosttyRenderState* state);
 
+/**
+ * Free a render state instance.
+ *
+ * Releases all resources associated with the render state. After this call,
+ * the render state handle becomes invalid.
+ *
+ * @param state The render state handle to free (may be NULL)
+ *
+ * @ingroup render
+ */
+void ghostty_render_state_free(GhosttyRenderState state);
+
 /**
  * Update a render state instance from a terminal.
  *
@@ -227,6 +258,15 @@ GhosttyResult ghostty_render_state_row_iterator_new(
     GhosttyRenderState state,
     GhosttyRenderStateRowIterator* out_iterator);
 
+/**
+ * Free a render-state row iterator.
+ *
+ * @param iterator The iterator handle to free (may be NULL)
+ *
+ * @ingroup render
+ */
+void ghostty_render_state_row_iterator_free(GhosttyRenderStateRowIterator iterator);
+
 /**
  * Move a render-state row iterator to the next row.
  *
@@ -242,25 +282,37 @@ GhosttyResult ghostty_render_state_row_iterator_new(
 bool ghostty_render_state_row_iterator_next(GhosttyRenderStateRowIterator iterator);
 
 /**
- * Free a render-state row iterator.
+ * Get the dirty state of the current row in a render-state row iterator.
  *
- * @param iterator The iterator handle to free (may be NULL)
+ * This reads the dirty flag at the iterator's current row position.
+ * Call ghostty_render_state_row_iterator_next() at least once before
+ * calling this function.
+ *
+ * @param iterator The iterator handle to query (may be NULL)
+ * @return true if the current row is dirty, false if the row is clean,
+ *         `iterator` is NULL, or the iterator is not positioned on a row
  *
  * @ingroup render
  */
-void ghostty_render_state_row_iterator_free(GhosttyRenderStateRowIterator iterator);
+bool ghostty_render_state_row_dirty_get(GhosttyRenderStateRowIterator iterator);
 
 /**
- * Free a render state instance.
+ * Set the dirty state of the current row in a render-state row iterator.
  *
- * Releases all resources associated with the render state. After this call,
- * the render state handle becomes invalid.
+ * This writes the dirty flag at the iterator's current row position.
+ * Call ghostty_render_state_row_iterator_next() at least once before
+ * calling this function.
  *
- * @param state The render state handle to free (may be NULL)
+ * @param iterator The iterator handle to update (may be NULL)
+ * @param dirty The dirty state to set for the current row
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if
+ *         `iterator` is NULL or the iterator is not positioned on a row
  *
  * @ingroup render
  */
-void ghostty_render_state_free(GhosttyRenderState state);
+GhosttyResult ghostty_render_state_row_dirty_set(
+    GhosttyRenderStateRowIterator iterator,
+    bool dirty);
 
 /** @} */
 
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 825fa2f11..9d983a6c6 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -195,6 +195,8 @@ comptime {
         @export(&c.render_state_dirty_set, .{ .name = "ghostty_render_state_dirty_set" });
         @export(&c.render_state_row_iterator_new, .{ .name = "ghostty_render_state_row_iterator_new" });
         @export(&c.render_state_row_iterator_next, .{ .name = "ghostty_render_state_row_iterator_next" });
+        @export(&c.render_state_row_dirty_get, .{ .name = "ghostty_render_state_row_dirty_get" });
+        @export(&c.render_state_row_dirty_set, .{ .name = "ghostty_render_state_row_dirty_set" });
         @export(&c.render_state_row_iterator_free, .{ .name = "ghostty_render_state_row_iterator_free" });
         @export(&c.render_state_free, .{ .name = "ghostty_render_state_free" });
         @export(&c.terminal_new, .{ .name = "ghostty_terminal_new" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 52ed87522..7e1b653d9 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -45,6 +45,8 @@ pub const render_state_dirty_get = render.dirty_get;
 pub const render_state_dirty_set = render.dirty_set;
 pub const render_state_row_iterator_new = render.row_iterator_new;
 pub const render_state_row_iterator_next = render.row_iterator_next;
+pub const render_state_row_dirty_get = render.row_dirty_get;
+pub const render_state_row_dirty_set = render.row_dirty_set;
 pub const render_state_row_iterator_free = render.row_iterator_free;
 
 pub const sgr_new = sgr.new;
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index 0b1169326..186c168c3 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -7,6 +7,7 @@ const CAllocator = lib_alloc.Allocator;
 const colorpkg = @import("../color.zig");
 const page = @import("../page.zig");
 const size = @import("../size.zig");
+const Style = @import("../style.zig").Style;
 const terminal_c = @import("terminal.zig");
 const renderpkg = @import("../render.zig");
 const Result = @import("result.zig").Result;
@@ -24,8 +25,8 @@ const RowIteratorWrapper = struct {
 
     /// These are the raw pointers into the render state data.
     raws: []const page.Row,
-    cells: []const std.MultiArrayList(renderpkg.RenderState.Cell),
-    dirty: []const bool,
+    cells: []const std.MultiArrayList(renderpkg.RenderState.Cell).Slice,
+    dirty: []bool,
 };
 
 /// C: GhosttyRenderState
@@ -217,7 +218,7 @@ fn row_iterator_new_(
         .alloc = alloc,
         .y = null,
         .raws = row_data.items(.raw),
-        .cells = row_data.items(.cells),
+        .cells = row_data.items(.cells).slice(),
         .dirty = row_data.items(.dirty),
     };
 
@@ -238,6 +239,22 @@ pub fn row_iterator_next(iterator_: RowIterator) callconv(.c) bool {
     return true;
 }
 
+pub fn row_dirty_get(iterator_: RowIterator) callconv(.c) bool {
+    const it = iterator_ orelse return false;
+    const y = it.y orelse return false;
+    return it.dirty[y];
+}
+
+pub fn row_dirty_set(
+    iterator_: RowIterator,
+    dirty: bool,
+) callconv(.c) Result {
+    const it = iterator_ orelse return .invalid_value;
+    const y = it.y orelse return .invalid_value;
+    it.dirty[y] = dirty;
+    return .success;
+}
+
 test "render: new/free" {
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
@@ -432,6 +449,132 @@ test "render: row iterator next null" {
     try testing.expect(!row_iterator_next(null));
 }
 
+test "render: row iterator dirty get null" {
+    try testing.expect(!row_dirty_get(null));
+}
+
+test "render: row iterator dirty set invalid value" {
+    try testing.expectEqual(Result.invalid_value, row_dirty_set(null, false));
+
+    var terminal: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &terminal,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer terminal_c.free(terminal);
+
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.success, update(state, terminal));
+
+    var iterator: RowIterator = null;
+    try testing.expectEqual(Result.success, row_iterator_new(
+        &lib_alloc.test_allocator,
+        state,
+        &iterator,
+    ));
+    defer row_iterator_free(iterator);
+
+    try testing.expectEqual(Result.invalid_value, row_dirty_set(iterator, false));
+}
+
+test "render: row iterator dirty get before iteration" {
+    var terminal: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &terminal,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer terminal_c.free(terminal);
+
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.success, update(state, terminal));
+
+    var iterator: RowIterator = null;
+    try testing.expectEqual(Result.success, row_iterator_new(
+        &lib_alloc.test_allocator,
+        state,
+        &iterator,
+    ));
+    defer row_iterator_free(iterator);
+
+    try testing.expect(!row_dirty_get(iterator));
+}
+
+test "render: row iterator dirty get" {
+    var terminal: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &terminal,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer terminal_c.free(terminal);
+
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.success, update(state, terminal));
+
+    // Dirty the first row so the iterator has at least one dirty row to observe.
+    terminal_c.vt_write(terminal, "hello", 5);
+    try testing.expectEqual(Result.success, update(state, terminal));
+
+    // Create an iterator and verify it is dirty.
+    var it: RowIterator = null;
+    try testing.expectEqual(Result.success, row_iterator_new(
+        &lib_alloc.test_allocator,
+        state,
+        &it,
+    ));
+    defer row_iterator_free(it);
+
+    try testing.expect(row_iterator_next(it));
+    try testing.expect(row_dirty_get(it));
+
+    // Clear dirty on this row.
+    try testing.expectEqual(Result.success, row_dirty_set(it, false));
+
+    // It should not be dirty anymore.
+    var it2: RowIterator = null;
+    try testing.expectEqual(Result.success, row_iterator_new(
+        &lib_alloc.test_allocator,
+        state,
+        &it2,
+    ));
+    defer row_iterator_free(it2);
+
+    try testing.expect(row_iterator_next(it2));
+    try testing.expect(!row_dirty_get(it2));
+}
+
 test "render: row iterator next" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(

From 900afa7b80e68dde673761e58bebf4b494eaae87 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 19 Mar 2026 11:26:48 -0700
Subject: [PATCH 262/391] fix types

---
 src/terminal/c/render.zig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index 186c168c3..480bf886b 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -25,7 +25,7 @@ const RowIteratorWrapper = struct {
 
     /// These are the raw pointers into the render state data.
     raws: []const page.Row,
-    cells: []const std.MultiArrayList(renderpkg.RenderState.Cell).Slice,
+    cells: []const std.MultiArrayList(renderpkg.RenderState.Cell),
     dirty: []bool,
 };
 
@@ -218,7 +218,7 @@ fn row_iterator_new_(
         .alloc = alloc,
         .y = null,
         .raws = row_data.items(.raw),
-        .cells = row_data.items(.cells).slice(),
+        .cells = row_data.items(.cells),
         .dirty = row_data.items(.dirty),
     };
 

From 220d6fd43d1199b160fca3f95a62b4a8c295b4d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Qui=C3=B1ones?= <lpaandres2020@gmail.com>
Date: Fri, 20 Mar 2026 04:11:25 -0500
Subject: [PATCH 263/391] nix: add systems input and fix zig follows

---
 flake.lock | 5 ++++-
 flake.nix  | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/flake.lock b/flake.lock
index b8e6d9263..f3a4814bb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -54,6 +54,7 @@
         "flake-compat": "flake-compat",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
+        "systems": "systems",
         "zig": "zig",
         "zon2nix": "zon2nix"
       }
@@ -82,7 +83,9 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems"
+        "systems": [
+          "systems"
+        ]
       },
       "locked": {
         "lastModified": 1773145353,
diff --git a/flake.nix b/flake.nix
index 61ca39ab1..fec675cf0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,11 +17,17 @@
       flake = false;
     };
 
+    systems = {
+      url = "github:nix-systems/default";
+      flake = false;
+    };
+
     zig = {
       url = "github:mitchellh/zig-overlay";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-compat.follows = "flake-compat";
+        systems.follows = "systems";
       };
     };
 

From 4b9324f48a3499ec2329ce2e39ab58d368d871e8 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Fri, 20 Mar 2026 09:36:39 -0400
Subject: [PATCH 264/391] bash: suppress __ghostty_hook errors in inherited
 PROMPT_COMMAND

When some tools spawn subshells, PROMPT_COMMAND may be inherited as an
environment variable while the __ghostty_hook function is not (bash
doesn't export functions by default). This causes "command not found"
errors on every prompt in the subshell.

Add 2>/dev/null to the __ghostty_hook entry in PROMPT_COMMAND so that it
silently no-ops in subshells where the function isn't defined. This also
silences any errors from inside __ghostty_hook itself, but those are all
terminal escape sequences and non-actionable.

See: #11245
---
 src/shell-integration/bash/ghostty.bash | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/shell-integration/bash/ghostty.bash b/src/shell-integration/bash/ghostty.bash
index 2372b1cd6..7eaf1397b 100644
--- a/src/shell-integration/bash/ghostty.bash
+++ b/src/shell-integration/bash/ghostty.bash
@@ -296,19 +296,25 @@ if (( BASH_VERSINFO[0] > 4 || (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 4) )
   }
 
   # Append our hook to PROMPT_COMMAND, preserving its existing type.
+  #
+  # The 2>/dev/null suppresses "command not found" in subshells that inherit
+  # PROMPT_COMMAND without the function definition. This also silences any
+  # errors from inside __ghostty_hook itself, but those are all terminal escape
+  # sequences and non-actionable.
+  #
   # shellcheck disable=SC2128,SC2178,SC2179
-  if [[ ";${PROMPT_COMMAND[*]:-};" != *";__ghostty_hook;"* ]]; then
+  if [[ ";${PROMPT_COMMAND[*]:-};" != *";__ghostty_hook 2>/dev/null;"* ]]; then
     if [[ -z "${PROMPT_COMMAND[*]}" ]]; then
       if (( BASH_VERSINFO[0] > 5 || (BASH_VERSINFO[0] == 5 && BASH_VERSINFO[1] >= 1) )); then
-        PROMPT_COMMAND=(__ghostty_hook)
+        PROMPT_COMMAND=("__ghostty_hook 2>/dev/null")
       else
-        PROMPT_COMMAND="__ghostty_hook"
+        PROMPT_COMMAND="__ghostty_hook 2>/dev/null"
       fi
     elif [[ $(builtin declare -p PROMPT_COMMAND 2>/dev/null) == "declare -a "* ]]; then
-      PROMPT_COMMAND+=(__ghostty_hook)
+      PROMPT_COMMAND+=("__ghostty_hook 2>/dev/null")
     else
       [[ "${PROMPT_COMMAND}" =~ (\;[[:space:]]*|$'\n')$ ]] || PROMPT_COMMAND+=";"
-      PROMPT_COMMAND+=" __ghostty_hook"
+      PROMPT_COMMAND+="__ghostty_hook 2>/dev/null"
     fi
   fi
 else

From ff0ee364bb04bdd554a81c80c43027a1f4f20edf Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2026 13:49:07 +0000
Subject: [PATCH 265/391] Update VOUCHED list (#11691)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11686#issuecomment-4098087863)
from @mitchellh.

Vouch: @luisnquin

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 0aed869a0..fa079c21c 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -114,6 +114,7 @@ laxystem
 liby
 linustalacko
 lonsagisawa
+luisnquin
 mac0ne
 mahnokropotkinvich
 marijagjorgjieva

From 459583a6c396f04d303d24dd635bc947b9204e90 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 20 Mar 2026 06:58:28 -0700
Subject: [PATCH 266/391] vt: use get/set pattern for render state data access

Replace the individual ghostty_render_state_size_get,
ghostty_render_state_dirty_get, and ghostty_render_state_dirty_set
functions with generic ghostty_render_state_get and
ghostty_render_state_set functions that use enum-dispatched data
kinds and option kinds, following the same InType/OutType pattern
used by the terminal and mouse encoder C APIs.
---
 include/ghostty/vt/render.h |  96 ++++++++++-------
 src/lib_vt.zig              |   5 +-
 src/terminal/c/main.zig     |   5 +-
 src/terminal/c/render.zig   | 199 ++++++++++++++++++++++--------------
 4 files changed, 183 insertions(+), 122 deletions(-)

diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
index da9849332..d49b552f2 100644
--- a/include/ghostty/vt/render.h
+++ b/include/ghostty/vt/render.h
@@ -95,6 +95,35 @@ typedef enum {
   GHOSTTY_RENDER_STATE_DIRTY_FULL = 2,
 } GhosttyRenderStateDirty;
 
+/**
+ * Queryable data kinds for ghostty_render_state_get().
+ *
+ * @ingroup render
+ */
+typedef enum {
+  /** Invalid / sentinel value. */
+  GHOSTTY_RENDER_STATE_DATA_INVALID = 0,
+
+  /** Viewport width in cells (uint16_t). */
+  GHOSTTY_RENDER_STATE_DATA_COLS = 1,
+
+  /** Viewport height in cells (uint16_t). */
+  GHOSTTY_RENDER_STATE_DATA_ROWS = 2,
+
+  /** Current dirty state (GhosttyRenderStateDirty). */
+  GHOSTTY_RENDER_STATE_DATA_DIRTY = 3,
+} GhosttyRenderStateData;
+
+/**
+ * Settable options for ghostty_render_state_set().
+ *
+ * @ingroup render
+ */
+typedef enum {
+  /** Set dirty state (GhosttyRenderStateDirty). */
+  GHOSTTY_RENDER_STATE_OPTION_DIRTY = 0,
+} GhosttyRenderStateOption;
+
 /**
  * Render-state color information.
  *
@@ -177,22 +206,41 @@ GhosttyResult ghostty_render_state_update(GhosttyRenderState state,
                                           GhosttyTerminal terminal);
 
 /**
- * Get the current viewport size from a render state.
+ * Get a value from a render state.
  *
- * The returned values are the render-state dimensions in cells. These
- * match the active viewport size from the most recent successful update.
+ * The `out` pointer must point to a value of the type corresponding to the
+ * requested data kind (see GhosttyRenderStateData).
  *
  * @param state The render state handle (NULL returns GHOSTTY_INVALID_VALUE)
- * @param[out] out_cols On success, receives the viewport width in cells
- * @param[out] out_rows On success, receives the viewport height in cells
- * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if `state`,
- *         `out_cols`, or `out_rows` is NULL
+ * @param data The data kind to query
+ * @param[out] out Pointer to receive the queried value
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if `state` is
+ *         NULL or `data` is not a recognized enum value
  *
  * @ingroup render
  */
-GhosttyResult ghostty_render_state_size_get(GhosttyRenderState state,
-                                            uint16_t* out_cols,
-                                            uint16_t* out_rows);
+GhosttyResult ghostty_render_state_get(GhosttyRenderState state,
+                                       GhosttyRenderStateData data,
+                                       void* out);
+
+/**
+ * Set an option on a render state.
+ *
+ * The `value` pointer must point to a value of the type corresponding to the
+ * requested option kind (see GhosttyRenderStateOption).
+ *
+ * @param state The render state handle (NULL returns GHOSTTY_INVALID_VALUE)
+ * @param option The option to set
+ * @param[in] value Pointer to the value to set (NULL returns
+ *            GHOSTTY_INVALID_VALUE)
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if `state` or
+ *         `value` is NULL
+ *
+ * @ingroup render
+ */
+GhosttyResult ghostty_render_state_set(GhosttyRenderState state,
+                                       GhosttyRenderStateOption option,
+                                       const void* value);
 
 /**
  * Get the current color information from a render state.
@@ -212,34 +260,6 @@ GhosttyResult ghostty_render_state_size_get(GhosttyRenderState state,
 GhosttyResult ghostty_render_state_colors_get(GhosttyRenderState state,
                                               GhosttyRenderStateColors* out_colors);
 
-/**
- * Get the current dirty state of a render state.
- *
- * @param state The render state handle (NULL returns GHOSTTY_INVALID_VALUE)
- * @param[out] out_dirty On success, receives the current dirty state
- * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if `state` is
- *         NULL
- *
- * @ingroup render
- */
-GhosttyResult ghostty_render_state_dirty_get(GhosttyRenderState state,
-                                             GhosttyRenderStateDirty* out_dirty);
-
-/**
- * Set the dirty state of a render state.
- *
- * This can be used by callers to clear dirty state after handling updates.
- *
- * @param state The render state handle (NULL returns GHOSTTY_INVALID_VALUE)
- * @param dirty The dirty state to set
- * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if `state` is
- *         NULL or `dirty` is not a recognized enum value
- *
- * @ingroup render
- */
-GhosttyResult ghostty_render_state_dirty_set(GhosttyRenderState state,
-                                             GhosttyRenderStateDirty dirty);
-
 /**
  * Create a row iterator for a render state.
  *
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 9d983a6c6..e9887968e 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -189,10 +189,9 @@ comptime {
         @export(&c.formatter_free, .{ .name = "ghostty_formatter_free" });
         @export(&c.render_state_new, .{ .name = "ghostty_render_state_new" });
         @export(&c.render_state_update, .{ .name = "ghostty_render_state_update" });
-        @export(&c.render_state_size_get, .{ .name = "ghostty_render_state_size_get" });
+        @export(&c.render_state_get, .{ .name = "ghostty_render_state_get" });
+        @export(&c.render_state_set, .{ .name = "ghostty_render_state_set" });
         @export(&c.render_state_colors_get, .{ .name = "ghostty_render_state_colors_get" });
-        @export(&c.render_state_dirty_get, .{ .name = "ghostty_render_state_dirty_get" });
-        @export(&c.render_state_dirty_set, .{ .name = "ghostty_render_state_dirty_set" });
         @export(&c.render_state_row_iterator_new, .{ .name = "ghostty_render_state_row_iterator_new" });
         @export(&c.render_state_row_iterator_next, .{ .name = "ghostty_render_state_row_iterator_next" });
         @export(&c.render_state_row_dirty_get, .{ .name = "ghostty_render_state_row_dirty_get" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 7e1b653d9..2f6792921 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -39,10 +39,9 @@ pub const formatter_free = formatter.free;
 pub const render_state_new = render.new;
 pub const render_state_free = render.free;
 pub const render_state_update = render.update;
-pub const render_state_size_get = render.size_get;
+pub const render_state_get = render.get;
+pub const render_state_set = render.set;
 pub const render_state_colors_get = render.colors_get;
-pub const render_state_dirty_get = render.dirty_get;
-pub const render_state_dirty_set = render.dirty_set;
 pub const render_state_row_iterator_new = render.row_iterator_new;
 pub const render_state_row_iterator_next = render.row_iterator_next;
 pub const render_state_row_dirty_get = render.row_dirty_get;
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index 480bf886b..a8a0308d9 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -12,6 +12,8 @@ const terminal_c = @import("terminal.zig");
 const renderpkg = @import("../render.zig");
 const Result = @import("result.zig").Result;
 
+const log = std.log.scoped(.render_state_c);
+
 const RenderStateWrapper = struct {
     alloc: std.mem.Allocator,
     state: renderpkg.RenderState = .empty,
@@ -38,6 +40,35 @@ pub const RowIterator = ?*RowIteratorWrapper;
 /// C: GhosttyRenderStateDirty
 pub const Dirty = renderpkg.RenderState.Dirty;
 
+/// C: GhosttyRenderStateData
+pub const Data = enum(c_int) {
+    invalid = 0,
+    cols = 1,
+    rows = 2,
+    dirty = 3,
+
+    /// Output type expected for querying the data of the given kind.
+    pub fn OutType(comptime self: Data) type {
+        return switch (self) {
+            .invalid => void,
+            .cols, .rows => size.CellCountInt,
+            .dirty => Dirty,
+        };
+    }
+};
+
+/// C: GhosttyRenderStateOption
+pub const SetOption = enum(c_int) {
+    dirty = 0,
+
+    /// Input type expected for setting the option.
+    pub fn InType(comptime self: SetOption) type {
+        return switch (self) {
+            .dirty => Dirty,
+        };
+    }
+};
+
 /// C: GhosttyRenderStateColors
 pub const Colors = extern struct {
     size: usize = @sizeOf(Colors),
@@ -88,17 +119,74 @@ pub fn update(
     return .success;
 }
 
-pub fn size_get(
+pub fn get(
     state_: RenderState,
-    out_cols_: ?*size.CellCountInt,
-    out_rows_: ?*size.CellCountInt,
+    data: Data,
+    out: ?*anyopaque,
 ) callconv(.c) Result {
-    const state = state_ orelse return .invalid_value;
-    const out_cols = out_cols_ orelse return .invalid_value;
-    const out_rows = out_rows_ orelse return .invalid_value;
+    if (comptime std.debug.runtime_safety) {
+        _ = std.meta.intToEnum(Data, @intFromEnum(data)) catch {
+            log.warn("render_state_get invalid data value={d}", .{@intFromEnum(data)});
+            return .invalid_value;
+        };
+    }
+
+    return switch (data) {
+        inline else => |comptime_data| getTyped(
+            state_,
+            comptime_data,
+            @ptrCast(@alignCast(out)),
+        ),
+    };
+}
+
+fn getTyped(
+    state_: RenderState,
+    comptime data: Data,
+    out: *data.OutType(),
+) Result {
+    const state = state_ orelse return .invalid_value;
+    switch (data) {
+        .invalid => return .invalid_value,
+        .cols => out.* = state.state.cols,
+        .rows => out.* = state.state.rows,
+        .dirty => out.* = state.state.dirty,
+    }
+
+    return .success;
+}
+
+pub fn set(
+    state_: RenderState,
+    option: SetOption,
+    value: ?*const anyopaque,
+) callconv(.c) Result {
+    if (comptime std.debug.runtime_safety) {
+        _ = std.meta.intToEnum(SetOption, @intFromEnum(option)) catch {
+            log.warn("render_state_set invalid option value={d}", .{@intFromEnum(option)});
+            return .invalid_value;
+        };
+    }
+
+    return switch (option) {
+        inline else => |comptime_option| setTyped(
+            state_,
+            comptime_option,
+            @ptrCast(@alignCast(value orelse return .invalid_value)),
+        ),
+    };
+}
+
+fn setTyped(
+    state_: RenderState,
+    comptime option: SetOption,
+    value: *const option.InType(),
+) Result {
+    const state = state_ orelse return .invalid_value;
+    switch (option) {
+        .dirty => state.state.dirty = value.*,
+    }
 
-    out_cols.* = state.state.cols;
-    out_rows.* = state.state.rows;
     return .success;
 }
 
@@ -164,25 +252,7 @@ pub fn colors_get(
     return .success;
 }
 
-pub fn dirty_get(
-    state_: RenderState,
-    out_dirty: *Dirty,
-) callconv(.c) Result {
-    const state = state_ orelse return .invalid_value;
-    out_dirty.* = state.state.dirty;
-    return .success;
-}
 
-pub fn dirty_set(
-    state_: RenderState,
-    dirty_: c_int,
-) callconv(.c) Result {
-    const state = state_ orelse return .invalid_value;
-    const dirty = std.meta.intToEnum(Dirty, dirty_) catch
-        return .invalid_value;
-    state.state.dirty = dirty;
-    return .success;
-}
 
 pub fn row_iterator_new(
     alloc_: ?*const CAllocator,
@@ -281,7 +351,12 @@ test "render: update invalid value" {
     try testing.expectEqual(Result.invalid_value, update(state, null));
 }
 
-test "render: size get invalid value" {
+test "render: get invalid value" {
+    var cols: size.CellCountInt = 0;
+    try testing.expectEqual(Result.invalid_value, get(null, .cols, @ptrCast(&cols)));
+}
+
+test "render: get invalid data" {
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
         &lib_alloc.test_allocator,
@@ -289,23 +364,7 @@ test "render: size get invalid value" {
     ));
     defer free(state);
 
-    var cols: size.CellCountInt = 0;
-    var rows: size.CellCountInt = 0;
-    try testing.expectEqual(Result.invalid_value, size_get(
-        null,
-        &cols,
-        &rows,
-    ));
-    try testing.expectEqual(Result.invalid_value, size_get(
-        state,
-        null,
-        &rows,
-    ));
-    try testing.expectEqual(Result.invalid_value, size_get(
-        state,
-        &cols,
-        null,
-    ));
+    try testing.expectEqual(Result.invalid_value, get(state, .invalid, null));
 }
 
 test "render: colors get invalid value" {
@@ -326,23 +385,14 @@ test "render: colors get invalid value" {
     try testing.expectEqual(Result.invalid_value, colors_get(state, &colors));
 }
 
-test "render: dirty get/set invalid value" {
-    var state: RenderState = null;
-    try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
-        &state,
-    ));
-    defer free(state);
-
+test "render: get/set dirty invalid value" {
     var dirty: Dirty = .false;
-    try testing.expectEqual(Result.invalid_value, dirty_get(null, &dirty));
-    try testing.expectEqual(Result.invalid_value, dirty_set(
-        null,
-        @intFromEnum(Dirty.full),
-    ));
+    try testing.expectEqual(Result.invalid_value, get(null, .dirty, @ptrCast(&dirty)));
+    const dirty_full: Dirty = .full;
+    try testing.expectEqual(Result.invalid_value, set(null, .dirty, @ptrCast(&dirty_full)));
 }
 
-test "render: dirty get/set" {
+test "render: get/set dirty" {
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
         &lib_alloc.test_allocator,
@@ -351,25 +401,21 @@ test "render: dirty get/set" {
     defer free(state);
 
     var dirty: Dirty = undefined;
-    try testing.expectEqual(Result.success, dirty_get(state, &dirty));
+    try testing.expectEqual(Result.success, get(state, .dirty, @ptrCast(&dirty)));
     try testing.expectEqual(Dirty.false, dirty);
 
-    try testing.expectEqual(Result.success, dirty_set(
-        state,
-        @intFromEnum(Dirty.partial),
-    ));
-    try testing.expectEqual(Result.success, dirty_get(state, &dirty));
+    const dirty_partial: Dirty = .partial;
+    try testing.expectEqual(Result.success, set(state, .dirty, @ptrCast(&dirty_partial)));
+    try testing.expectEqual(Result.success, get(state, .dirty, @ptrCast(&dirty)));
     try testing.expectEqual(Dirty.partial, dirty);
 
-    try testing.expectEqual(Result.success, dirty_set(
-        state,
-        @intFromEnum(Dirty.full),
-    ));
-    try testing.expectEqual(Result.success, dirty_get(state, &dirty));
+    const dirty_full: Dirty = .full;
+    try testing.expectEqual(Result.success, set(state, .dirty, @ptrCast(&dirty_full)));
+    try testing.expectEqual(Result.success, get(state, .dirty, @ptrCast(&dirty)));
     try testing.expectEqual(Dirty.full, dirty);
 }
 
-test "render: dirty set invalid enum value" {
+test "render: set null value" {
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
         &lib_alloc.test_allocator,
@@ -377,7 +423,7 @@ test "render: dirty set invalid enum value" {
     ));
     defer free(state);
 
-    try testing.expectEqual(Result.invalid_value, dirty_set(state, 99));
+    try testing.expectEqual(Result.invalid_value, set(state, .dirty, null));
 }
 
 test "render: row iterator new invalid value" {
@@ -650,14 +696,11 @@ test "render: update" {
     try testing.expectEqual(Result.success, update(state, terminal));
 
     var cols: size.CellCountInt = 0;
-    var rows: size.CellCountInt = 0;
-    try testing.expectEqual(Result.success, size_get(
-        state,
-        &cols,
-        &rows,
-    ));
+    var rows_val: size.CellCountInt = 0;
+    try testing.expectEqual(Result.success, get(state, .cols, @ptrCast(&cols)));
+    try testing.expectEqual(Result.success, get(state, .rows, @ptrCast(&rows_val)));
     try testing.expectEqual(@as(size.CellCountInt, 80), cols);
-    try testing.expectEqual(@as(size.CellCountInt, 24), rows);
+    try testing.expectEqual(@as(size.CellCountInt, 24), rows_val);
 }
 
 test "render: colors get" {

From 33e81ffb7546dbe79bab074e3982ef5d74be4bb4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 20 Mar 2026 07:03:43 -0700
Subject: [PATCH 267/391] vt: use get/set pattern for row iterator data access

Replace ghostty_render_state_row_dirty_get and
ghostty_render_state_row_dirty_set with generic
ghostty_render_state_row_get and ghostty_render_state_row_set
functions using enum-dispatched data/option kinds.
---
 include/ghostty/vt/render.h |  78 ++++++++++++-----
 src/lib_vt.zig              |   4 +-
 src/terminal/c/main.zig     |   4 +-
 src/terminal/c/render.zig   | 169 +++++++++++++++++++++++++++++++-----
 src/terminal/c/row.zig      |   2 +-
 src/terminal/page.zig       |   8 ++
 6 files changed, 219 insertions(+), 46 deletions(-)

diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
index d49b552f2..1738198ce 100644
--- a/include/ghostty/vt/render.h
+++ b/include/ghostty/vt/render.h
@@ -124,6 +124,32 @@ typedef enum {
   GHOSTTY_RENDER_STATE_OPTION_DIRTY = 0,
 } GhosttyRenderStateOption;
 
+/**
+ * Queryable data kinds for ghostty_render_state_row_get().
+ *
+ * @ingroup render
+ */
+typedef enum {
+  /** Invalid / sentinel value. */
+  GHOSTTY_RENDER_STATE_ROW_DATA_INVALID = 0,
+
+  /** Whether the current row is dirty (bool). */
+  GHOSTTY_RENDER_STATE_ROW_DATA_DIRTY = 1,
+
+  /** The raw row value (GhosttyRow). */
+  GHOSTTY_RENDER_STATE_ROW_DATA_RAW = 2,
+} GhosttyRenderStateRowData;
+
+/**
+ * Settable options for ghostty_render_state_row_set().
+ *
+ * @ingroup render
+ */
+typedef enum {
+  /** Set dirty state for the current row (bool). */
+  GHOSTTY_RENDER_STATE_ROW_OPTION_DIRTY = 0,
+} GhosttyRenderStateRowOption;
+
 /**
  * Render-state color information.
  *
@@ -302,37 +328,47 @@ void ghostty_render_state_row_iterator_free(GhosttyRenderStateRowIterator iterat
 bool ghostty_render_state_row_iterator_next(GhosttyRenderStateRowIterator iterator);
 
 /**
- * Get the dirty state of the current row in a render-state row iterator.
+ * Get a value from the current row in a render-state row iterator.
  *
- * This reads the dirty flag at the iterator's current row position.
+ * The `out` pointer must point to a value of the type corresponding to the
+ * requested data kind (see GhosttyRenderStateRowData).
  * Call ghostty_render_state_row_iterator_next() at least once before
  * calling this function.
  *
- * @param iterator The iterator handle to query (may be NULL)
- * @return true if the current row is dirty, false if the row is clean,
- *         `iterator` is NULL, or the iterator is not positioned on a row
- *
- * @ingroup render
- */
-bool ghostty_render_state_row_dirty_get(GhosttyRenderStateRowIterator iterator);
-
-/**
- * Set the dirty state of the current row in a render-state row iterator.
- *
- * This writes the dirty flag at the iterator's current row position.
- * Call ghostty_render_state_row_iterator_next() at least once before
- * calling this function.
- *
- * @param iterator The iterator handle to update (may be NULL)
- * @param dirty The dirty state to set for the current row
+ * @param iterator The iterator handle to query (NULL returns GHOSTTY_INVALID_VALUE)
+ * @param data The data kind to query
+ * @param[out] out Pointer to receive the queried value
  * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if
  *         `iterator` is NULL or the iterator is not positioned on a row
  *
  * @ingroup render
  */
-GhosttyResult ghostty_render_state_row_dirty_set(
+GhosttyResult ghostty_render_state_row_get(
     GhosttyRenderStateRowIterator iterator,
-    bool dirty);
+    GhosttyRenderStateRowData data,
+    void* out);
+
+/**
+ * Set an option on the current row in a render-state row iterator.
+ *
+ * The `value` pointer must point to a value of the type corresponding to the
+ * requested option kind (see GhosttyRenderStateRowOption).
+ * Call ghostty_render_state_row_iterator_next() at least once before
+ * calling this function.
+ *
+ * @param iterator The iterator handle to update (NULL returns GHOSTTY_INVALID_VALUE)
+ * @param option The option to set
+ * @param[in] value Pointer to the value to set (NULL returns
+ *            GHOSTTY_INVALID_VALUE)
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if
+ *         `iterator` is NULL or the iterator is not positioned on a row
+ *
+ * @ingroup render
+ */
+GhosttyResult ghostty_render_state_row_set(
+    GhosttyRenderStateRowIterator iterator,
+    GhosttyRenderStateRowOption option,
+    const void* value);
 
 /** @} */
 
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index e9887968e..3eb2dbec7 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -194,8 +194,8 @@ comptime {
         @export(&c.render_state_colors_get, .{ .name = "ghostty_render_state_colors_get" });
         @export(&c.render_state_row_iterator_new, .{ .name = "ghostty_render_state_row_iterator_new" });
         @export(&c.render_state_row_iterator_next, .{ .name = "ghostty_render_state_row_iterator_next" });
-        @export(&c.render_state_row_dirty_get, .{ .name = "ghostty_render_state_row_dirty_get" });
-        @export(&c.render_state_row_dirty_set, .{ .name = "ghostty_render_state_row_dirty_set" });
+        @export(&c.render_state_row_get, .{ .name = "ghostty_render_state_row_get" });
+        @export(&c.render_state_row_set, .{ .name = "ghostty_render_state_row_set" });
         @export(&c.render_state_row_iterator_free, .{ .name = "ghostty_render_state_row_iterator_free" });
         @export(&c.render_state_free, .{ .name = "ghostty_render_state_free" });
         @export(&c.terminal_new, .{ .name = "ghostty_terminal_new" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 2f6792921..d1771928f 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -44,8 +44,8 @@ pub const render_state_set = render.set;
 pub const render_state_colors_get = render.colors_get;
 pub const render_state_row_iterator_new = render.row_iterator_new;
 pub const render_state_row_iterator_next = render.row_iterator_next;
-pub const render_state_row_dirty_get = render.row_dirty_get;
-pub const render_state_row_dirty_set = render.row_dirty_set;
+pub const render_state_row_get = render.row_get;
+pub const render_state_row_set = render.row_set;
 pub const render_state_row_iterator_free = render.row_iterator_free;
 
 pub const sgr_new = sgr.new;
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index a8a0308d9..740fcaa09 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -11,6 +11,7 @@ const Style = @import("../style.zig").Style;
 const terminal_c = @import("terminal.zig");
 const renderpkg = @import("../render.zig");
 const Result = @import("result.zig").Result;
+const row = @import("row.zig");
 
 const log = std.log.scoped(.render_state_c);
 
@@ -309,19 +310,103 @@ pub fn row_iterator_next(iterator_: RowIterator) callconv(.c) bool {
     return true;
 }
 
-pub fn row_dirty_get(iterator_: RowIterator) callconv(.c) bool {
-    const it = iterator_ orelse return false;
-    const y = it.y orelse return false;
-    return it.dirty[y];
+/// C: GhosttyRenderStateRowData
+pub const RowData = enum(c_int) {
+    invalid = 0,
+    dirty = 1,
+    raw = 2,
+
+    /// Output type expected for querying the data of the given kind.
+    pub fn OutType(comptime self: RowData) type {
+        return switch (self) {
+            .invalid => void,
+            .dirty => bool,
+            .raw => row.CRow,
+        };
+    }
+};
+
+/// C: GhosttyRenderStateRowOption
+pub const RowOption = enum(c_int) {
+    dirty = 0,
+
+    /// Input type expected for setting the option.
+    pub fn InType(comptime self: RowOption) type {
+        return switch (self) {
+            .dirty => bool,
+        };
+    }
+};
+
+pub fn row_get(
+    iterator_: RowIterator,
+    data: RowData,
+    out: ?*anyopaque,
+) callconv(.c) Result {
+    if (comptime std.debug.runtime_safety) {
+        _ = std.meta.intToEnum(RowData, @intFromEnum(data)) catch {
+            log.warn("render_state_row_get invalid data value={d}", .{@intFromEnum(data)});
+            return .invalid_value;
+        };
+    }
+
+    return switch (data) {
+        inline else => |comptime_data| rowGetTyped(
+            iterator_,
+            comptime_data,
+            @ptrCast(@alignCast(out)),
+        ),
+    };
 }
 
-pub fn row_dirty_set(
+fn rowGetTyped(
     iterator_: RowIterator,
-    dirty: bool,
-) callconv(.c) Result {
+    comptime data: RowData,
+    out: *data.OutType(),
+) Result {
     const it = iterator_ orelse return .invalid_value;
     const y = it.y orelse return .invalid_value;
-    it.dirty[y] = dirty;
+    switch (data) {
+        .invalid => return .invalid_value,
+        .dirty => out.* = it.dirty[y],
+        .raw => out.* = it.raws[y].cval(),
+    }
+
+    return .success;
+}
+
+pub fn row_set(
+    iterator_: RowIterator,
+    option: RowOption,
+    value: ?*const anyopaque,
+) callconv(.c) Result {
+    if (comptime std.debug.runtime_safety) {
+        _ = std.meta.intToEnum(RowOption, @intFromEnum(option)) catch {
+            log.warn("render_state_row_set invalid option value={d}", .{@intFromEnum(option)});
+            return .invalid_value;
+        };
+    }
+
+    return switch (option) {
+        inline else => |comptime_option| rowSetTyped(
+            iterator_,
+            comptime_option,
+            @ptrCast(@alignCast(value orelse return .invalid_value)),
+        ),
+    };
+}
+
+fn rowSetTyped(
+    iterator_: RowIterator,
+    comptime option: RowOption,
+    value: *const option.InType(),
+) Result {
+    const it = iterator_ orelse return .invalid_value;
+    const y = it.y orelse return .invalid_value;
+    switch (option) {
+        .dirty => it.dirty[y] = value.*,
+    }
+
     return .success;
 }
 
@@ -495,13 +580,12 @@ test "render: row iterator next null" {
     try testing.expect(!row_iterator_next(null));
 }
 
-test "render: row iterator dirty get null" {
-    try testing.expect(!row_dirty_get(null));
+test "render: row get null" {
+    var dirty: bool = undefined;
+    try testing.expectEqual(Result.invalid_value, row_get(null, .dirty, @ptrCast(&dirty)));
 }
 
-test "render: row iterator dirty set invalid value" {
-    try testing.expectEqual(Result.invalid_value, row_dirty_set(null, false));
-
+test "render: row get invalid data" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
         &lib_alloc.test_allocator,
@@ -531,10 +615,16 @@ test "render: row iterator dirty set invalid value" {
     ));
     defer row_iterator_free(iterator);
 
-    try testing.expectEqual(Result.invalid_value, row_dirty_set(iterator, false));
+    try testing.expect(row_iterator_next(iterator));
+    try testing.expectEqual(Result.invalid_value, row_get(iterator, .invalid, null));
 }
 
-test "render: row iterator dirty get before iteration" {
+test "render: row set null" {
+    const dirty = false;
+    try testing.expectEqual(Result.invalid_value, row_set(null, .dirty, @ptrCast(&dirty)));
+}
+
+test "render: row set before iteration" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
         &lib_alloc.test_allocator,
@@ -564,10 +654,45 @@ test "render: row iterator dirty get before iteration" {
     ));
     defer row_iterator_free(iterator);
 
-    try testing.expect(!row_dirty_get(iterator));
+    const dirty = false;
+    try testing.expectEqual(Result.invalid_value, row_set(iterator, .dirty, @ptrCast(&dirty)));
 }
 
-test "render: row iterator dirty get" {
+test "render: row get before iteration" {
+    var terminal: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &terminal,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer terminal_c.free(terminal);
+
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.success, update(state, terminal));
+
+    var iterator: RowIterator = null;
+    try testing.expectEqual(Result.success, row_iterator_new(
+        &lib_alloc.test_allocator,
+        state,
+        &iterator,
+    ));
+    defer row_iterator_free(iterator);
+
+    var dirty: bool = undefined;
+    try testing.expectEqual(Result.invalid_value, row_get(iterator, .dirty, @ptrCast(&dirty)));
+}
+
+test "render: row get/set dirty" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
         &lib_alloc.test_allocator,
@@ -603,10 +728,13 @@ test "render: row iterator dirty get" {
     defer row_iterator_free(it);
 
     try testing.expect(row_iterator_next(it));
-    try testing.expect(row_dirty_get(it));
+    var dirty: bool = undefined;
+    try testing.expectEqual(Result.success, row_get(it, .dirty, @ptrCast(&dirty)));
+    try testing.expect(dirty);
 
     // Clear dirty on this row.
-    try testing.expectEqual(Result.success, row_dirty_set(it, false));
+    const dirty_false = false;
+    try testing.expectEqual(Result.success, row_set(it, .dirty, @ptrCast(&dirty_false)));
 
     // It should not be dirty anymore.
     var it2: RowIterator = null;
@@ -618,7 +746,8 @@ test "render: row iterator dirty get" {
     defer row_iterator_free(it2);
 
     try testing.expect(row_iterator_next(it2));
-    try testing.expect(!row_dirty_get(it2));
+    try testing.expectEqual(Result.success, row_get(it2, .dirty, @ptrCast(&dirty)));
+    try testing.expect(!dirty);
 }
 
 test "render: row iterator next" {
diff --git a/src/terminal/c/row.zig b/src/terminal/c/row.zig
index b67c98b3c..6614d922e 100644
--- a/src/terminal/c/row.zig
+++ b/src/terminal/c/row.zig
@@ -5,7 +5,7 @@ const Row = page.Row;
 const Result = @import("result.zig").Result;
 
 /// C: GhosttyRow
-pub const CRow = u64;
+pub const CRow = Row.C;
 
 /// C: GhosttyRowSemanticPrompt
 pub const SemanticPrompt = enum(c_int) {
diff --git a/src/terminal/page.zig b/src/terminal/page.zig
index 3e7ca9ac3..d013d1590 100644
--- a/src/terminal/page.zig
+++ b/src/terminal/page.zig
@@ -1947,6 +1947,14 @@ pub const Row = packed struct(u64) {
         prompt_continuation = 2,
     };
 
+    /// C ABI type.
+    pub const C = u64;
+
+    /// Returns this row as a C ABI value.
+    pub fn cval(self: Row) C {
+        return @bitCast(self);
+    }
+
     /// Returns true if this row has any managed memory outside of the
     /// row structure (graphemes, styles, etc.)
     pub inline fn managedMemory(self: Row) bool {

From 46ece224ba4e7a4e3243a27a29d7aafaf1273436 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2026 14:23:05 +0000
Subject: [PATCH 268/391] Update VOUCHED list (#11694)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11420#discussioncomment-16227199)
from @mitchellh.

Vouch: @hlcfan

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index fa079c21c..589265794 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -87,6 +87,7 @@ halosatrio
 heaths
 heddxh heddxh
 -highimpact-dev Disrespectful AI user
+hlcfan
 hqnna
 hulet
 icodesign

From 75b49051a3bb2cd8da564e0a72ef8b0abacf8dc2 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 20 Mar 2026 07:21:36 -0700
Subject: [PATCH 269/391] vt: add GhosttyRenderStateRowCells opaque type

Add a new opaque RowCells type that wraps per-row cell data
(raw cells, graphemes, styles) for the C API. The caller
allocates a RowCells handle via row_cells_new, then populates
it by passing it to row_get with the new .cells data kind.
This queries the current row from the iterator and slices the
underlying MultiArrayList into the RowCellsWrapper fields.

The new type and functions are wired through main.zig,
lib_vt.zig, and the render.h C header.
---
 include/ghostty/vt/render.h | 41 +++++++++++++++++++++++++++++
 src/lib_vt.zig              |  2 ++
 src/terminal/c/main.zig     |  2 ++
 src/terminal/c/render.zig   | 52 +++++++++++++++++++++++++++++++++++--
 4 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
index 1738198ce..23f11525d 100644
--- a/include/ghostty/vt/render.h
+++ b/include/ghostty/vt/render.h
@@ -79,6 +79,13 @@ typedef struct GhosttyRenderState* GhosttyRenderState;
  */
 typedef struct GhosttyRenderStateRowIterator* GhosttyRenderStateRowIterator;
 
+/**
+ * Opaque handle to render-state row cells.
+ *
+ * @ingroup render
+ */
+typedef struct GhosttyRenderStateRowCells* GhosttyRenderStateRowCells;
+
 /**
  * Dirty state of a render state after update.
  *
@@ -138,6 +145,10 @@ typedef enum {
 
   /** The raw row value (GhosttyRow). */
   GHOSTTY_RENDER_STATE_ROW_DATA_RAW = 2,
+
+  /** Populate a pre-allocated GhosttyRenderStateRowCells with cell data for
+   *  the current row (GhosttyRenderStateRowCells). */
+  GHOSTTY_RENDER_STATE_ROW_DATA_CELLS = 3,
 } GhosttyRenderStateRowData;
 
 /**
@@ -370,6 +381,36 @@ GhosttyResult ghostty_render_state_row_set(
     GhosttyRenderStateRowOption option,
     const void* value);
 
+/**
+ * Create a new row cells instance.
+ *
+ * All fields except the allocator are left undefined until populated
+ * via ghostty_render_state_row_get() with
+ * GHOSTTY_RENDER_STATE_ROW_DATA_CELLS.
+ *
+ * You can reuse this value repeatedly with ghostty_render_state_row_get() to 
+ * avoid allocating a new cells container for every row.
+ *
+ * @param allocator Pointer to allocator, or NULL to use the default allocator
+ * @param[out] out_cells On success, receives the created row cells handle
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_OUT_OF_MEMORY on allocation
+ *         failure
+ *
+ * @ingroup render
+ */
+GhosttyResult ghostty_render_state_row_cells_new(
+    const GhosttyAllocator* allocator,
+    GhosttyRenderStateRowCells* out_cells);
+
+/**
+ * Free a row cells instance.
+ *
+ * @param cells The row cells handle to free (may be NULL)
+ *
+ * @ingroup render
+ */
+void ghostty_render_state_row_cells_free(GhosttyRenderStateRowCells cells);
+
 /** @} */
 
 #ifdef __cplusplus
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 3eb2dbec7..c6f019f76 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -197,6 +197,8 @@ comptime {
         @export(&c.render_state_row_get, .{ .name = "ghostty_render_state_row_get" });
         @export(&c.render_state_row_set, .{ .name = "ghostty_render_state_row_set" });
         @export(&c.render_state_row_iterator_free, .{ .name = "ghostty_render_state_row_iterator_free" });
+        @export(&c.render_state_row_cells_new, .{ .name = "ghostty_render_state_row_cells_new" });
+        @export(&c.render_state_row_cells_free, .{ .name = "ghostty_render_state_row_cells_free" });
         @export(&c.render_state_free, .{ .name = "ghostty_render_state_free" });
         @export(&c.terminal_new, .{ .name = "ghostty_terminal_new" });
         @export(&c.terminal_free, .{ .name = "ghostty_terminal_free" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index d1771928f..ba456e13d 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -47,6 +47,8 @@ pub const render_state_row_iterator_next = render.row_iterator_next;
 pub const render_state_row_get = render.row_get;
 pub const render_state_row_set = render.row_set;
 pub const render_state_row_iterator_free = render.row_iterator_free;
+pub const render_state_row_cells_new = render.row_cells_new;
+pub const render_state_row_cells_free = render.row_cells_free;
 
 pub const sgr_new = sgr.new;
 pub const sgr_free = sgr.free;
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index 740fcaa09..a2ecb1292 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -32,12 +32,23 @@ const RowIteratorWrapper = struct {
     dirty: []bool,
 };
 
+const RowCellsWrapper = struct {
+    alloc: std.mem.Allocator,
+    x: ?size.CellCountInt,
+    raws: []const page.Cell,
+    graphemes: []const []const u21,
+    styles: []const Style,
+};
+
 /// C: GhosttyRenderState
 pub const RenderState = ?*RenderStateWrapper;
 
 /// C: GhosttyRenderStateRowIterator
 pub const RowIterator = ?*RowIteratorWrapper;
 
+/// C: GhosttyRenderStateRowCells
+pub const RowCells = ?*RowCellsWrapper;
+
 /// C: GhosttyRenderStateDirty
 pub const Dirty = renderpkg.RenderState.Dirty;
 
@@ -253,8 +264,6 @@ pub fn colors_get(
     return .success;
 }
 
-
-
 pub fn row_iterator_new(
     alloc_: ?*const CAllocator,
     state_: RenderState,
@@ -310,11 +319,38 @@ pub fn row_iterator_next(iterator_: RowIterator) callconv(.c) bool {
     return true;
 }
 
+pub fn row_cells_new(
+    alloc_: ?*const CAllocator,
+    result: *RowCells,
+) callconv(.c) Result {
+    const alloc = lib_alloc.default(alloc_);
+    const ptr = alloc.create(RowCellsWrapper) catch {
+        result.* = null;
+        return .out_of_memory;
+    };
+    ptr.* = .{
+        .alloc = alloc,
+        .x = undefined,
+        .raws = undefined,
+        .graphemes = undefined,
+        .styles = undefined,
+    };
+    result.* = ptr;
+    return .success;
+}
+
+pub fn row_cells_free(cells_: RowCells) callconv(.c) void {
+    const cells = cells_ orelse return;
+    const alloc = cells.alloc;
+    alloc.destroy(cells);
+}
+
 /// C: GhosttyRenderStateRowData
 pub const RowData = enum(c_int) {
     invalid = 0,
     dirty = 1,
     raw = 2,
+    cells = 3,
 
     /// Output type expected for querying the data of the given kind.
     pub fn OutType(comptime self: RowData) type {
@@ -322,6 +358,7 @@ pub const RowData = enum(c_int) {
             .invalid => void,
             .dirty => bool,
             .raw => row.CRow,
+            .cells => RowCells,
         };
     }
 };
@@ -370,6 +407,17 @@ fn rowGetTyped(
         .invalid => return .invalid_value,
         .dirty => out.* = it.dirty[y],
         .raw => out.* = it.raws[y].cval(),
+        .cells => {
+            const cells = out.* orelse return .invalid_value;
+            const cell_data = it.cells[y].slice();
+            cells.* = .{
+                .alloc = cells.alloc,
+                .x = null,
+                .raws = cell_data.items(.raw),
+                .graphemes = cell_data.items(.grapheme),
+                .styles = cell_data.items(.style),
+            };
+        },
     }
 
     return .success;

From ecd1d0d1e1a6337af31400c50bd9767f16636823 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 20 Mar 2026 07:29:21 -0700
Subject: [PATCH 270/391] vt: decouple row iterator allocation from population

Change row_iterator_new to only allocate with undefined fields,
matching the pattern used by row_cells_new. The iterator is now
populated via the render state get API with a new .row_iterator
data kind, which slices the row data and resets y to null.

This separates the lifetime of the opaque handle from the render
state it iterates, letting callers allocate once and re-populate
from different states without reallocating.
---
 include/ghostty/vt/render.h | 23 ++++++---
 src/terminal/c/render.zig   | 93 ++++++++++++++++---------------------
 2 files changed, 55 insertions(+), 61 deletions(-)

diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
index 23f11525d..4081a9d15 100644
--- a/include/ghostty/vt/render.h
+++ b/include/ghostty/vt/render.h
@@ -119,6 +119,13 @@ typedef enum {
 
   /** Current dirty state (GhosttyRenderStateDirty). */
   GHOSTTY_RENDER_STATE_DATA_DIRTY = 3,
+
+  /** Populate a pre-allocated GhosttyRenderStateRowIterator with row data
+   *  from the render state (GhosttyRenderStateRowIterator). Row data is
+   *  only valid as long as the underlying render state is not updated.
+   *  It is unsafe to use row data after updating the render state.
+   *  */
+  GHOSTTY_RENDER_STATE_DATA_ROW_ITERATOR = 4,
 } GhosttyRenderStateData;
 
 /**
@@ -147,7 +154,9 @@ typedef enum {
   GHOSTTY_RENDER_STATE_ROW_DATA_RAW = 2,
 
   /** Populate a pre-allocated GhosttyRenderStateRowCells with cell data for
-   *  the current row (GhosttyRenderStateRowCells). */
+   *  the current row (GhosttyRenderStateRowCells). Cell data is only 
+   *  valid as long as the underlying render state is not updated. 
+   *  It is unsafe to use cell data after updating the render state. */
   GHOSTTY_RENDER_STATE_ROW_DATA_CELLS = 3,
 } GhosttyRenderStateRowData;
 
@@ -298,21 +307,21 @@ GhosttyResult ghostty_render_state_colors_get(GhosttyRenderState state,
                                               GhosttyRenderStateColors* out_colors);
 
 /**
- * Create a row iterator for a render state.
+ * Create a new row iterator instance.
  *
- * The iterator borrows from `state`; `state` must outlive the iterator.
+ * All fields except the allocator are left undefined until populated
+ * via ghostty_render_state_get() with
+ * GHOSTTY_RENDER_STATE_DATA_ROW_ITERATOR.
  *
  * @param allocator Pointer to allocator, or NULL to use the default allocator
- * @param state The render state handle to iterate (NULL returns GHOSTTY_INVALID_VALUE)
  * @param[out] out_iterator On success, receives the created iterator handle
- * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if `state` is
- *         NULL, GHOSTTY_OUT_OF_MEMORY on allocation failure
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_OUT_OF_MEMORY on allocation
+ *         failure
  *
  * @ingroup render
  */
 GhosttyResult ghostty_render_state_row_iterator_new(
     const GhosttyAllocator* allocator,
-    GhosttyRenderState state,
     GhosttyRenderStateRowIterator* out_iterator);
 
 /**
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index a2ecb1292..f39cb6188 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -58,6 +58,7 @@ pub const Data = enum(c_int) {
     cols = 1,
     rows = 2,
     dirty = 3,
+    row_iterator = 4,
 
     /// Output type expected for querying the data of the given kind.
     pub fn OutType(comptime self: Data) type {
@@ -65,6 +66,7 @@ pub const Data = enum(c_int) {
             .invalid => void,
             .cols, .rows => size.CellCountInt,
             .dirty => Dirty,
+            .row_iterator => RowIterator,
         };
     }
 };
@@ -163,6 +165,17 @@ fn getTyped(
         .cols => out.* = state.state.cols,
         .rows => out.* = state.state.rows,
         .dirty => out.* = state.state.dirty,
+        .row_iterator => {
+            const it = out.* orelse return .invalid_value;
+            const row_data = state.state.row_data.slice();
+            it.* = .{
+                .alloc = it.alloc,
+                .y = null,
+                .raws = row_data.items(.raw),
+                .cells = row_data.items(.cells),
+                .dirty = row_data.items(.dirty),
+            };
+        },
     }
 
     return .success;
@@ -266,43 +279,22 @@ pub fn colors_get(
 
 pub fn row_iterator_new(
     alloc_: ?*const CAllocator,
-    state_: RenderState,
-    out_iterator_: ?*RowIterator,
+    result: *RowIterator,
 ) callconv(.c) Result {
-    const state = state_ orelse return .invalid_value;
-    const out_iterator = out_iterator_ orelse return .invalid_value;
     const alloc = lib_alloc.default(alloc_);
-
-    out_iterator.* = row_iterator_new_(
-        alloc,
-        state,
-    ) catch |err| {
-        out_iterator.* = null;
-        switch (err) {
-            error.OutOfMemory => return .out_of_memory,
-        }
+    const ptr = alloc.create(RowIteratorWrapper) catch {
+        result.* = null;
+        return .out_of_memory;
     };
-
-    return .success;
-}
-
-fn row_iterator_new_(
-    alloc: Allocator,
-    state: *RenderStateWrapper,
-) !*RowIteratorWrapper {
-    const it = try alloc.create(RowIteratorWrapper);
-    errdefer alloc.destroy(it);
-
-    const row_data = state.state.row_data.slice();
-    it.* = .{
+    ptr.* = .{
         .alloc = alloc,
-        .y = null,
-        .raws = row_data.items(.raw),
-        .cells = row_data.items(.cells),
-        .dirty = row_data.items(.dirty),
+        .y = undefined,
+        .raws = undefined,
+        .cells = undefined,
+        .dirty = undefined,
     };
-
-    return it;
+    result.* = ptr;
+    return .success;
 }
 
 pub fn row_iterator_free(iterator_: RowIterator) callconv(.c) void {
@@ -559,25 +551,15 @@ test "render: set null value" {
     try testing.expectEqual(Result.invalid_value, set(state, .dirty, null));
 }
 
-test "render: row iterator new invalid value" {
-    var state: RenderState = null;
-    try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
-        &state,
-    ));
-    defer free(state);
-
+test "render: row iterator get invalid value" {
     var iterator: RowIterator = null;
-    try testing.expectEqual(Result.invalid_value, row_iterator_new(
+    try testing.expectEqual(Result.success, row_iterator_new(
         &lib_alloc.test_allocator,
-        null,
         &iterator,
     ));
-    try testing.expectEqual(Result.invalid_value, row_iterator_new(
-        &lib_alloc.test_allocator,
-        state,
-        null,
-    ));
+    defer row_iterator_free(iterator);
+
+    try testing.expectEqual(Result.invalid_value, get(null, .row_iterator, @ptrCast(&iterator)));
 }
 
 test "render: row iterator new/free" {
@@ -605,12 +587,14 @@ test "render: row iterator new/free" {
     var iterator: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
         &lib_alloc.test_allocator,
-        state,
         &iterator,
     ));
     defer row_iterator_free(iterator);
 
     try testing.expect(iterator != null);
+
+    try testing.expectEqual(Result.success, get(state, .row_iterator, @ptrCast(&iterator)));
+
     const iterator_ptr = iterator.?;
     const row_data = state.?.state.row_data.slice();
 
@@ -658,11 +642,11 @@ test "render: row get invalid data" {
     var iterator: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
         &lib_alloc.test_allocator,
-        state,
         &iterator,
     ));
     defer row_iterator_free(iterator);
 
+    try testing.expectEqual(Result.success, get(state, .row_iterator, @ptrCast(&iterator)));
     try testing.expect(row_iterator_next(iterator));
     try testing.expectEqual(Result.invalid_value, row_get(iterator, .invalid, null));
 }
@@ -697,11 +681,11 @@ test "render: row set before iteration" {
     var iterator: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
         &lib_alloc.test_allocator,
-        state,
         &iterator,
     ));
     defer row_iterator_free(iterator);
 
+    try testing.expectEqual(Result.success, get(state, .row_iterator, @ptrCast(&iterator)));
     const dirty = false;
     try testing.expectEqual(Result.invalid_value, row_set(iterator, .dirty, @ptrCast(&dirty)));
 }
@@ -731,11 +715,11 @@ test "render: row get before iteration" {
     var iterator: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
         &lib_alloc.test_allocator,
-        state,
         &iterator,
     ));
     defer row_iterator_free(iterator);
 
+    try testing.expectEqual(Result.success, get(state, .row_iterator, @ptrCast(&iterator)));
     var dirty: bool = undefined;
     try testing.expectEqual(Result.invalid_value, row_get(iterator, .dirty, @ptrCast(&dirty)));
 }
@@ -770,11 +754,11 @@ test "render: row get/set dirty" {
     var it: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
         &lib_alloc.test_allocator,
-        state,
         &it,
     ));
     defer row_iterator_free(it);
 
+    try testing.expectEqual(Result.success, get(state, .row_iterator, @ptrCast(&it)));
     try testing.expect(row_iterator_next(it));
     var dirty: bool = undefined;
     try testing.expectEqual(Result.success, row_get(it, .dirty, @ptrCast(&dirty)));
@@ -788,11 +772,11 @@ test "render: row get/set dirty" {
     var it2: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
         &lib_alloc.test_allocator,
-        state,
         &it2,
     ));
     defer row_iterator_free(it2);
 
+    try testing.expectEqual(Result.success, get(state, .row_iterator, @ptrCast(&it2)));
     try testing.expect(row_iterator_next(it2));
     try testing.expectEqual(Result.success, row_get(it2, .dirty, @ptrCast(&dirty)));
     try testing.expect(!dirty);
@@ -823,11 +807,12 @@ test "render: row iterator next" {
     var iterator: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
         &lib_alloc.test_allocator,
-        state,
         &iterator,
     ));
     defer row_iterator_free(iterator);
 
+    try testing.expectEqual(Result.success, get(state, .row_iterator, @ptrCast(&iterator)));
+
     const rows = state.?.state.rows;
     if (rows == 0) {
         try testing.expect(!row_iterator_next(iterator));

From d5ce05fd37d8f9c94025e71cfd0b7c9ec290a5ce Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Fri, 20 Mar 2026 10:37:42 -0500
Subject: [PATCH 271/391] core: simplify pty.c macro usage

---
 src/build/SharedDeps.zig | 63 ++++++++++++----------------------------
 src/pty.c                | 16 ++++++----
 2 files changed, 29 insertions(+), 50 deletions(-)

diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig
index 581b0b64e..cb0b609d5 100644
--- a/src/build/SharedDeps.zig
+++ b/src/build/SharedDeps.zig
@@ -136,51 +136,24 @@ pub fn add(
     self.config.terminalOptions().add(b, step.root_module);
 
     // C imports needed to manage/create PTYs
-    switch (target.result.os.tag) {
-        .freebsd,
-        .linux,
-        .macos,
-        => {
-            const c = b.addTranslateC(.{
-                .root_source_file = b.path("src/pty.c"),
-                .target = target,
-                .optimize = optimize,
-            });
-            inline for (@typeInfo(std.Target.Os.Tag).@"enum".fields) |field| {
-                c.defineCMacro(
-                    b.fmt(
-                        "ZIG_TARGET_{s}",
-                        .{try std.ascii.allocUpperString(b.allocator, field.name)},
-                    ),
-                    b.fmt("{d}", .{field.value}),
-                );
-            }
-            c.defineCMacro(
-                "ZIG_TARGET",
-                b.fmt(
-                    "ZIG_TARGET_{s}",
-                    .{
-                        try std.ascii.allocUpperString(
-                            b.allocator,
-                            @tagName(target.result.os.tag),
-                        ),
-                    },
-                ),
-            );
-            switch (target.result.os.tag) {
-                .macos => {
-                    const libc = try std.zig.LibCInstallation.findNative(.{
-                        .allocator = b.allocator,
-                        .target = &target.result,
-                        .verbose = false,
-                    });
-                    c.addSystemIncludePath(.{ .cwd_relative = libc.sys_include_dir.? });
-                },
-                else => {},
-            }
-            step.root_module.addImport("pty-c", c.createModule());
-        },
-        else => {},
+    {
+        const c = b.addTranslateC(.{
+            .root_source_file = b.path("src/pty.c"),
+            .target = target,
+            .optimize = optimize,
+        });
+        switch (target.result.os.tag) {
+            .macos => {
+                const libc = try std.zig.LibCInstallation.findNative(.{
+                    .allocator = b.allocator,
+                    .target = &target.result,
+                    .verbose = false,
+                });
+                c.addSystemIncludePath(.{ .cwd_relative = libc.sys_include_dir.? });
+            },
+            else => {},
+        }
+        step.root_module.addImport("pty-c", c.createModule());
     }
 
     // Freetype. We always include this even if our font backend doesn't
diff --git a/src/pty.c b/src/pty.c
index 4708d0b4e..fe50d2b4b 100644
--- a/src/pty.c
+++ b/src/pty.c
@@ -1,19 +1,20 @@
-#if ZIG_TARGET == ZIG_TARGET_FREEBSD
+#if defined(__FreeBSD__)
+
   #include <termios.h> // ioctl and constants
   #include <libutil.h> // openpty
   #include <stdlib.h> // ptsname_r
   #include <unistd.h> // tcgetpgrp
-#endif
 
-#if ZIG_TARGET == ZIG_TARGET_LINUX
+#elif defined(__linux__)
+
   #define _GNU_SOURCE // ptsname_r
   #include <pty.h> // openpty
   #include <stdlib.h> // ptsname_r
   #include <sys/ioctl.h> // ioctl and constants
   #include <unistd.h> // tcgetpgrp, setsid
-#endif
 
-#if ZIG_TARGET == ZIG_TARGET_MACOS
+#elif defined(__APPLE__)
+
   #include <sys/ioctl.h> // ioctl and constants
   #include <sys/ttycom.h>  // ioctl and constants for TIOCPTYGNAME
   #include <sys/types.h>
@@ -31,4 +32,9 @@
   #ifndef tiocgwinsz
   #define tiocgwinsz 1074295912
   #endif
+
+#else
+
+  #error "unsupported platform"
+
 #endif

From 6ae17a02af8e831c6a798acdcdd81d6c82f2bea8 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 20 Mar 2026 08:47:16 -0700
Subject: [PATCH 272/391] vt: add cell-level iteration and data access to
 render state row cells

Add next, select, and get functions to the render state row cells
API, mirroring the row iterator pattern. row_cells_next advances to
the next cell sequentially, row_cells_select jumps to a specific
column index with bounds validation, and row_cells_get queries data
for the current cell position.

The get function supports querying raw cell values (GhosttyCell),
resolved styles (GhosttyStyle), grapheme codepoint counts, and
writing grapheme codepoints into a caller-provided buffer.

Also add Cell.C and Cell.cval() to page.zig, matching the existing
Row.C/Row.cval() pattern, so the render state can convert cells to
the C ABI type without a raw bitCast.
---
 include/ghostty/vt/render.h | 78 +++++++++++++++++++++++++++++++
 src/lib_vt.zig              |  3 ++
 src/terminal/c/main.zig     |  3 ++
 src/terminal/c/render.zig   | 92 +++++++++++++++++++++++++++++++++++++
 src/terminal/page.zig       |  8 ++++
 5 files changed, 184 insertions(+)

diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
index 4081a9d15..e268c54eb 100644
--- a/include/ghostty/vt/render.h
+++ b/include/ghostty/vt/render.h
@@ -411,6 +411,84 @@ GhosttyResult ghostty_render_state_row_cells_new(
     const GhosttyAllocator* allocator,
     GhosttyRenderStateRowCells* out_cells);
 
+/**
+ * Queryable data kinds for ghostty_render_state_row_cells_get().
+ *
+ * @ingroup render
+ */
+typedef enum {
+  /** Invalid / sentinel value. */
+  GHOSTTY_RENDER_STATE_ROW_CELLS_DATA_INVALID = 0,
+
+  /** The raw cell value (GhosttyCell). */
+  GHOSTTY_RENDER_STATE_ROW_CELLS_DATA_RAW = 1,
+
+  /** The style for the current cell (GhosttyStyle). */
+  GHOSTTY_RENDER_STATE_ROW_CELLS_DATA_STYLE = 2,
+
+  /** The total number of grapheme codepoints including the base codepoint
+   *  (uint32_t). Returns 0 if the cell has no text. */
+  GHOSTTY_RENDER_STATE_ROW_CELLS_DATA_GRAPHEMES_LEN = 3,
+
+  /** Write grapheme codepoints into a caller-provided buffer (uint32_t*).
+   *  The buffer must be at least graphemes_len elements. The base codepoint
+   *  is written first, followed by any extra codepoints. */
+  GHOSTTY_RENDER_STATE_ROW_CELLS_DATA_GRAPHEMES_BUF = 4,
+} GhosttyRenderStateRowCellsData;
+
+/**
+ * Move a render-state row cells iterator to the next cell.
+ *
+ * Returns true if the iterator moved successfully and cell data is
+ * available to read at the new position.
+ *
+ * @param cells The row cells handle to advance (may be NULL)
+ * @return true if advanced to the next cell, false if `cells` is
+ *         NULL or if the iterator has reached the end
+ *
+ * @ingroup render
+ */
+bool ghostty_render_state_row_cells_next(GhosttyRenderStateRowCells cells);
+
+/**
+ * Move a render-state row cells iterator to a specific column.
+ *
+ * Positions the iterator at the given x (column) index so that
+ * subsequent reads return data for that cell.
+ *
+ * @param cells The row cells handle to reposition (NULL returns
+ *        GHOSTTY_INVALID_VALUE)
+ * @param x The zero-based column index to select
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if `cells`
+ *         is NULL or `x` is out of range
+ *
+ * @ingroup render
+ */
+GhosttyResult ghostty_render_state_row_cells_select(
+    GhosttyRenderStateRowCells cells, uint16_t x);
+
+/**
+ * Get a value from the current cell in a render-state row cells iterator.
+ *
+ * The `out` pointer must point to a value of the type corresponding to the
+ * requested data kind (see GhosttyRenderStateRowCellsData).
+ * Call ghostty_render_state_row_cells_next() or
+ * ghostty_render_state_row_cells_select() at least once before
+ * calling this function.
+ *
+ * @param cells The row cells handle to query (NULL returns GHOSTTY_INVALID_VALUE)
+ * @param data The data kind to query
+ * @param[out] out Pointer to receive the queried value
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if
+ *         `cells` is NULL or the iterator is not positioned on a cell
+ *
+ * @ingroup render
+ */
+GhosttyResult ghostty_render_state_row_cells_get(
+    GhosttyRenderStateRowCells cells,
+    GhosttyRenderStateRowCellsData data,
+    void* out);
+
 /**
  * Free a row cells instance.
  *
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index c6f019f76..6b6d0ad77 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -198,6 +198,9 @@ comptime {
         @export(&c.render_state_row_set, .{ .name = "ghostty_render_state_row_set" });
         @export(&c.render_state_row_iterator_free, .{ .name = "ghostty_render_state_row_iterator_free" });
         @export(&c.render_state_row_cells_new, .{ .name = "ghostty_render_state_row_cells_new" });
+        @export(&c.render_state_row_cells_next, .{ .name = "ghostty_render_state_row_cells_next" });
+        @export(&c.render_state_row_cells_select, .{ .name = "ghostty_render_state_row_cells_select" });
+        @export(&c.render_state_row_cells_get, .{ .name = "ghostty_render_state_row_cells_get" });
         @export(&c.render_state_row_cells_free, .{ .name = "ghostty_render_state_row_cells_free" });
         @export(&c.render_state_free, .{ .name = "ghostty_render_state_free" });
         @export(&c.terminal_new, .{ .name = "ghostty_terminal_new" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index ba456e13d..d58a81378 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -48,6 +48,9 @@ pub const render_state_row_get = render.row_get;
 pub const render_state_row_set = render.row_set;
 pub const render_state_row_iterator_free = render.row_iterator_free;
 pub const render_state_row_cells_new = render.row_cells_new;
+pub const render_state_row_cells_next = render.row_cells_next;
+pub const render_state_row_cells_select = render.row_cells_select;
+pub const render_state_row_cells_get = render.row_cells_get;
 pub const render_state_row_cells_free = render.row_cells_free;
 
 pub const sgr_new = sgr.new;
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index f39cb6188..f097eba28 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -12,6 +12,7 @@ const terminal_c = @import("terminal.zig");
 const renderpkg = @import("../render.zig");
 const Result = @import("result.zig").Result;
 const row = @import("row.zig");
+const style_c = @import("style.zig");
 
 const log = std.log.scoped(.render_state_c);
 
@@ -331,12 +332,103 @@ pub fn row_cells_new(
     return .success;
 }
 
+pub fn row_cells_next(cells_: RowCells) callconv(.c) bool {
+    const cells = cells_ orelse return false;
+    const next_x: size.CellCountInt = if (cells.x) |x| x + 1 else 0;
+    if (next_x >= cells.raws.len) return false;
+    cells.x = next_x;
+    return true;
+}
+
+pub fn row_cells_select(cells_: RowCells, x: size.CellCountInt) callconv(.c) Result {
+    const cells = cells_ orelse return .invalid_value;
+    if (x >= cells.raws.len) return .invalid_value;
+    cells.x = x;
+    return .success;
+}
+
 pub fn row_cells_free(cells_: RowCells) callconv(.c) void {
     const cells = cells_ orelse return;
     const alloc = cells.alloc;
     alloc.destroy(cells);
 }
 
+/// C: GhosttyRenderStateRowCellsData
+pub const RowCellsData = enum(c_int) {
+    invalid = 0,
+    raw = 1,
+    style = 2,
+    graphemes_len = 3,
+    graphemes_buf = 4,
+
+    /// Output type expected for querying the data of the given kind.
+    pub fn OutType(comptime self: RowCellsData) type {
+        return switch (self) {
+            .invalid => void,
+            .raw => page.Cell.C,
+            .style => style_c.Style,
+            .graphemes_len => u32,
+            .graphemes_buf => [*]u32,
+        };
+    }
+};
+
+pub fn row_cells_get(
+    cells_: RowCells,
+    data: RowCellsData,
+    out: ?*anyopaque,
+) callconv(.c) Result {
+    if (comptime std.debug.runtime_safety) {
+        _ = std.meta.intToEnum(RowCellsData, @intFromEnum(data)) catch {
+            log.warn("render_state_row_cells_get invalid data value={d}", .{@intFromEnum(data)});
+            return .invalid_value;
+        };
+    }
+
+    return switch (data) {
+        inline else => |comptime_data| rowCellsGetTyped(
+            cells_,
+            comptime_data,
+            @ptrCast(@alignCast(out)),
+        ),
+    };
+}
+
+fn rowCellsGetTyped(
+    cells_: RowCells,
+    comptime data: RowCellsData,
+    out: *data.OutType(),
+) Result {
+    const cells = cells_ orelse return .invalid_value;
+    const x = cells.x orelse return .invalid_value;
+    const cell = cells.raws[x];
+    switch (data) {
+        .invalid => return .invalid_value,
+        .raw => out.* = cell.cval(),
+        .style => out.* = style_c.Style.fromStyle(cells.styles[x]),
+        .graphemes_len => {
+            if (!cell.hasText()) {
+                out.* = 0;
+                return .success;
+            }
+            const extra = if (cell.hasGrapheme()) cells.graphemes[x] else &[_]u21{};
+            out.* = @intCast(1 + extra.len);
+        },
+        .graphemes_buf => {
+            if (!cell.hasText()) return .success;
+            const extra = if (cell.hasGrapheme()) cells.graphemes[x] else &[_]u21{};
+            const total = 1 + extra.len;
+            const out_slice = out.*[0..total];
+            out_slice[0] = cell.codepoint();
+            for (extra, 1..) |cp, i| {
+                out_slice[i] = cp;
+            }
+        },
+    }
+
+    return .success;
+}
+
 /// C: GhosttyRenderStateRowData
 pub const RowData = enum(c_int) {
     invalid = 0,
diff --git a/src/terminal/page.zig b/src/terminal/page.zig
index d013d1590..6364b823e 100644
--- a/src/terminal/page.zig
+++ b/src/terminal/page.zig
@@ -2059,6 +2059,14 @@ pub const Cell = packed struct(u64) {
         prompt = 2,
     };
 
+    /// C ABI type.
+    pub const C = u64;
+
+    /// Returns this cell as a C ABI value.
+    pub fn cval(self: Cell) C {
+        return @bitCast(self);
+    }
+
     /// Helper to make a cell that just has a codepoint.
     pub fn init(cp: u21) Cell {
         // We have to use this bitCast here to ensure that our memory is

From 60ea2d76d46b6333357cece7e14a8ad841f6521a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 20 Mar 2026 08:57:16 -0700
Subject: [PATCH 273/391] vt: add color data getters to render state

Add individual color data kinds to GhosttyRenderStateData so callers
can query background, foreground, cursor color, cursor-color presence,
and the full 256-color palette through ghostty_render_state_get()
without using the sized-struct colors API.

COLOR_CURSOR returns GHOSTTY_INVALID_VALUE when no explicit cursor
color is set; callers can check COLOR_CURSOR_HAS_VALUE first.
---
 include/ghostty/vt/render.h | 17 +++++++++++++++++
 src/terminal/c/render.zig   | 20 ++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
index e268c54eb..3823d56f5 100644
--- a/include/ghostty/vt/render.h
+++ b/include/ghostty/vt/render.h
@@ -126,6 +126,23 @@ typedef enum {
    *  It is unsafe to use row data after updating the render state.
    *  */
   GHOSTTY_RENDER_STATE_DATA_ROW_ITERATOR = 4,
+
+  /** Default/current background color (GhosttyColorRgb). */
+  GHOSTTY_RENDER_STATE_DATA_COLOR_BACKGROUND = 5,
+
+  /** Default/current foreground color (GhosttyColorRgb). */
+  GHOSTTY_RENDER_STATE_DATA_COLOR_FOREGROUND = 6,
+
+  /** Cursor color when explicitly set by terminal state (GhosttyColorRgb).
+   *  Returns GHOSTTY_INVALID_VALUE if no explicit cursor color is set;
+   *  use COLOR_CURSOR_HAS_VALUE to check first. */
+  GHOSTTY_RENDER_STATE_DATA_COLOR_CURSOR = 7,
+
+  /** Whether an explicit cursor color is set (bool). */
+  GHOSTTY_RENDER_STATE_DATA_COLOR_CURSOR_HAS_VALUE = 8,
+
+  /** The active 256-color palette (GhosttyColorRgb[256]). */
+  GHOSTTY_RENDER_STATE_DATA_COLOR_PALETTE = 9,
 } GhosttyRenderStateData;
 
 /**
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index f097eba28..75a02b114 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -60,6 +60,11 @@ pub const Data = enum(c_int) {
     rows = 2,
     dirty = 3,
     row_iterator = 4,
+    color_background = 5,
+    color_foreground = 6,
+    color_cursor = 7,
+    color_cursor_has_value = 8,
+    color_palette = 9,
 
     /// Output type expected for querying the data of the given kind.
     pub fn OutType(comptime self: Data) type {
@@ -68,6 +73,9 @@ pub const Data = enum(c_int) {
             .cols, .rows => size.CellCountInt,
             .dirty => Dirty,
             .row_iterator => RowIterator,
+            .color_background, .color_foreground, .color_cursor => colorpkg.RGB.C,
+            .color_cursor_has_value => bool,
+            .color_palette => [256]colorpkg.RGB.C,
         };
     }
 };
@@ -177,6 +185,18 @@ fn getTyped(
                 .dirty = row_data.items(.dirty),
             };
         },
+        .color_background => out.* = state.state.colors.background.cval(),
+        .color_foreground => out.* = state.state.colors.foreground.cval(),
+        .color_cursor => {
+            const cursor = state.state.colors.cursor orelse return .invalid_value;
+            out.* = cursor.cval();
+        },
+        .color_cursor_has_value => out.* = state.state.colors.cursor != null,
+        .color_palette => {
+            for (&out.*, state.state.colors.palette) |*dst, src| {
+                dst.* = src.cval();
+            }
+        },
     }
 
     return .success;

From d9df4154dbe6a21e43c96cc1537b3724a0c784ba Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 20 Mar 2026 09:04:08 -0700
Subject: [PATCH 274/391] vt: add cursor field data getters to render state API

Expose the cursor fields from RenderState.Cursor through the C API
via new GhosttyRenderStateData enum values. This adds getters for
visual style, visibility, blink state, password input detection,
and viewport position (x, y, wide tail).

A new GhosttyRenderStateCursorVisualStyle enum maps the Zig
cursor.Style values (bar, block, underline, block_hollow) to
stable C integer constants. Viewport position getters return
GHOSTTY_INVALID_VALUE when the cursor is not visible within
the viewport.
---
 include/ghostty/vt/render.h | 47 +++++++++++++++++++++++++++++++++++++
 src/terminal/c/render.zig   | 47 +++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)

diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
index 3823d56f5..bf79cdd7e 100644
--- a/include/ghostty/vt/render.h
+++ b/include/ghostty/vt/render.h
@@ -102,6 +102,25 @@ typedef enum {
   GHOSTTY_RENDER_STATE_DIRTY_FULL = 2,
 } GhosttyRenderStateDirty;
 
+/**
+ * Visual style of the cursor.
+ *
+ * @ingroup render
+ */
+typedef enum {
+  /** Bar cursor (DECSCUSR 5, 6). */
+  GHOSTTY_RENDER_STATE_CURSOR_VISUAL_STYLE_BAR = 0,
+
+  /** Block cursor (DECSCUSR 1, 2). */
+  GHOSTTY_RENDER_STATE_CURSOR_VISUAL_STYLE_BLOCK = 1,
+
+  /** Underline cursor (DECSCUSR 3, 4). */
+  GHOSTTY_RENDER_STATE_CURSOR_VISUAL_STYLE_UNDERLINE = 2,
+
+  /** Hollow block cursor. */
+  GHOSTTY_RENDER_STATE_CURSOR_VISUAL_STYLE_BLOCK_HOLLOW = 3,
+} GhosttyRenderStateCursorVisualStyle;
+
 /**
  * Queryable data kinds for ghostty_render_state_get().
  *
@@ -143,6 +162,34 @@ typedef enum {
 
   /** The active 256-color palette (GhosttyColorRgb[256]). */
   GHOSTTY_RENDER_STATE_DATA_COLOR_PALETTE = 9,
+
+  /** The visual style of the cursor (GhosttyRenderStateCursorVisualStyle). */
+  GHOSTTY_RENDER_STATE_DATA_CURSOR_VISUAL_STYLE = 10,
+
+  /** Whether the cursor is visible based on terminal modes (bool). */
+  GHOSTTY_RENDER_STATE_DATA_CURSOR_VISIBLE = 11,
+
+  /** Whether the cursor should blink based on terminal modes (bool). */
+  GHOSTTY_RENDER_STATE_DATA_CURSOR_BLINKING = 12,
+
+  /** Whether the cursor is at a password input field (bool). */
+  GHOSTTY_RENDER_STATE_DATA_CURSOR_PASSWORD_INPUT = 13,
+
+  /** Whether the cursor is visible within the viewport (bool).
+   *  If false, the cursor viewport position values are undefined. */
+  GHOSTTY_RENDER_STATE_DATA_CURSOR_VIEWPORT_HAS_VALUE = 14,
+
+  /** Cursor viewport x position in cells (uint16_t).
+   *  Only valid when CURSOR_VIEWPORT_HAS_VALUE is true. */
+  GHOSTTY_RENDER_STATE_DATA_CURSOR_VIEWPORT_X = 15,
+
+  /** Cursor viewport y position in cells (uint16_t).
+   *  Only valid when CURSOR_VIEWPORT_HAS_VALUE is true. */
+  GHOSTTY_RENDER_STATE_DATA_CURSOR_VIEWPORT_Y = 16,
+
+  /** Whether the cursor is on the tail of a wide character (bool).
+   *  Only valid when CURSOR_VIEWPORT_HAS_VALUE is true. */
+  GHOSTTY_RENDER_STATE_DATA_CURSOR_VIEWPORT_WIDE_TAIL = 17,
 } GhosttyRenderStateData;
 
 /**
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index 75a02b114..3feb4c9fb 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -5,6 +5,7 @@ const lib = @import("../../lib/main.zig");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const colorpkg = @import("../color.zig");
+const cursorpkg = @import("../cursor.zig");
 const page = @import("../page.zig");
 const size = @import("../size.zig");
 const Style = @import("../style.zig").Style;
@@ -53,6 +54,23 @@ pub const RowCells = ?*RowCellsWrapper;
 /// C: GhosttyRenderStateDirty
 pub const Dirty = renderpkg.RenderState.Dirty;
 
+/// C: GhosttyRenderStateCursorVisualStyle
+pub const CursorVisualStyle = enum(c_int) {
+    bar = 0,
+    block = 1,
+    underline = 2,
+    block_hollow = 3,
+
+    pub fn fromCursorStyle(s: cursorpkg.Style) CursorVisualStyle {
+        return switch (s) {
+            .bar => .bar,
+            .block => .block,
+            .underline => .underline,
+            .block_hollow => .block_hollow,
+        };
+    }
+};
+
 /// C: GhosttyRenderStateData
 pub const Data = enum(c_int) {
     invalid = 0,
@@ -65,6 +83,14 @@ pub const Data = enum(c_int) {
     color_cursor = 7,
     color_cursor_has_value = 8,
     color_palette = 9,
+    cursor_visual_style = 10,
+    cursor_visible = 11,
+    cursor_blinking = 12,
+    cursor_password_input = 13,
+    cursor_viewport_has_value = 14,
+    cursor_viewport_x = 15,
+    cursor_viewport_y = 16,
+    cursor_viewport_wide_tail = 17,
 
     /// Output type expected for querying the data of the given kind.
     pub fn OutType(comptime self: Data) type {
@@ -76,6 +102,10 @@ pub const Data = enum(c_int) {
             .color_background, .color_foreground, .color_cursor => colorpkg.RGB.C,
             .color_cursor_has_value => bool,
             .color_palette => [256]colorpkg.RGB.C,
+            .cursor_visual_style => CursorVisualStyle,
+            .cursor_visible, .cursor_blinking, .cursor_password_input => bool,
+            .cursor_viewport_has_value, .cursor_viewport_wide_tail => bool,
+            .cursor_viewport_x, .cursor_viewport_y => size.CellCountInt,
         };
     }
 };
@@ -197,6 +227,23 @@ fn getTyped(
                 dst.* = src.cval();
             }
         },
+        .cursor_visual_style => out.* = CursorVisualStyle.fromCursorStyle(state.state.cursor.visual_style),
+        .cursor_visible => out.* = state.state.cursor.visible,
+        .cursor_blinking => out.* = state.state.cursor.blinking,
+        .cursor_password_input => out.* = state.state.cursor.password_input,
+        .cursor_viewport_has_value => out.* = state.state.cursor.viewport != null,
+        .cursor_viewport_x => {
+            const vp = state.state.cursor.viewport orelse return .invalid_value;
+            out.* = vp.x;
+        },
+        .cursor_viewport_y => {
+            const vp = state.state.cursor.viewport orelse return .invalid_value;
+            out.* = vp.y;
+        },
+        .cursor_viewport_wide_tail => {
+            const vp = state.state.cursor.viewport orelse return .invalid_value;
+            out.* = vp.wide_tail;
+        },
     }
 
     return .success;

From e7a18ea5b358afe2490fe61ef7cbd3321825f2f1 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 20 Mar 2026 09:14:19 -0700
Subject: [PATCH 275/391] vt: fix render state cell style and graphemes_buf
 APIs

The GRAPHEMES_BUF data kind previously required a double pointer
(pointer to a uint32_t*) because the OutType was [*]u32, making the
typed out parameter *[*]u32. Change OutType to u32 so that callers
pass a plain uint32_t* buffer directly, which is the natural C
calling convention. The implementation casts the out pointer to
[*]u32 internally to write into the buffer.

The STYLE data kind read directly from the render state style array
without checking whether the cell actually had non-default styling.
The style data is undefined for unstyled cells, so this caused a
panic on a corrupt enum value when the caller read the style of an
unstyled cell. Now check cell.hasStyling() first and return the
default style for unstyled cells.

Expand the c-vt-render example to exercise dirty tracking, color
retrieval, cursor state, row/cell iteration with style resolution,
and dirty state reset. Break the example into six doxygen snippet
regions and reference them from render.h.
---
 example/c-vt-render/README.md  |   6 +-
 example/c-vt-render/src/main.c | 219 ++++++++++++++++++++++++++++++---
 include/ghostty/vt/render.h    |  18 ++-
 src/terminal/c/render.zig      |  14 ++-
 4 files changed, 233 insertions(+), 24 deletions(-)

diff --git a/example/c-vt-render/README.md b/example/c-vt-render/README.md
index deb4db388..3725ed46f 100644
--- a/example/c-vt-render/README.md
+++ b/example/c-vt-render/README.md
@@ -1,7 +1,9 @@
 # Example: `ghostty-vt` Render State
 
-This contains a simple example of how to use the `ghostty-vt` render-state API
-to create a render state, update it from terminal content, and clean it up.
+This contains an example of how to use the `ghostty-vt` render-state API
+to create a render state, update it from terminal content, iterate rows
+and cells, read styles and colors, inspect cursor state, and manage dirty
+tracking.
 
 This uses a `build.zig` and `Zig` to build the C program so that we
 can reuse a lot of our build logic and depend directly on our source
diff --git a/example/c-vt-render/src/main.c b/example/c-vt-render/src/main.c
index b5c22edf5..0714d4160 100644
--- a/example/c-vt-render/src/main.c
+++ b/example/c-vt-render/src/main.c
@@ -1,16 +1,34 @@
 #include <assert.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <ghostty/vt.h>
 
-//! [render-state-update]
+/// Helper: resolve a style color to an RGB value using the palette.
+static GhosttyColorRgb resolve_color(GhosttyStyleColor color,
+                                     const GhosttyRenderStateColors* colors,
+                                     GhosttyColorRgb fallback) {
+  switch (color.tag) {
+    case GHOSTTY_STYLE_COLOR_RGB:
+      return color.value.rgb;
+    case GHOSTTY_STYLE_COLOR_PALETTE:
+      return colors->palette[color.value.palette];
+    default:
+      return fallback;
+  }
+}
+
 int main(void) {
   GhosttyResult result;
 
+  //! [render-state-update]
+  // Create a terminal and render state, then update the render state
+  // from the terminal. The render state captures a snapshot of everything
+  // needed to draw a frame.
   GhosttyTerminal terminal = NULL;
   GhosttyTerminalOptions terminal_opts = {
-      .cols = 80,
-      .rows = 24,
+      .cols = 40,
+      .rows = 5,
       .max_scrollback = 10000,
   };
   result = ghostty_terminal_new(NULL, &terminal, terminal_opts);
@@ -20,26 +38,197 @@ int main(void) {
   result = ghostty_render_state_new(NULL, &render_state);
   assert(result == GHOSTTY_SUCCESS);
 
-  const char* first_frame = "first frame\r\n";
+  // Feed some styled content into the terminal.
+  const char* content =
+      "Hello, \033[1;32mworld\033[0m!\r\n"     // bold green "world"
+      "\033[4munderlined\033[0m text\r\n"       // underlined text
+      "\033[38;2;255;128;0morange\033[0m\r\n";  // 24-bit orange fg
   ghostty_terminal_vt_write(
-      terminal,
-      (const uint8_t*)first_frame,
-      strlen(first_frame));
+      terminal, (const uint8_t*)content, strlen(content));
+
   result = ghostty_render_state_update(render_state, terminal);
   assert(result == GHOSTTY_SUCCESS);
+  //! [render-state-update]
 
-  const char* second_frame = "second frame\r\n";
-  ghostty_terminal_vt_write(
-      terminal,
-      (const uint8_t*)second_frame,
-      strlen(second_frame));
-  result = ghostty_render_state_update(render_state, terminal);
+  //! [render-dirty-check]
+  // Check the global dirty state to decide how much work the renderer
+  // needs to do. After rendering, reset it to false.
+  GhosttyRenderStateDirty dirty;
+  result = ghostty_render_state_get(
+      render_state, GHOSTTY_RENDER_STATE_DATA_DIRTY, &dirty);
   assert(result == GHOSTTY_SUCCESS);
 
-  printf("Render state was updated successfully.\n");
+  switch (dirty) {
+    case GHOSTTY_RENDER_STATE_DIRTY_FALSE:
+      printf("Frame is clean, nothing to draw.\n");
+      break;
+    case GHOSTTY_RENDER_STATE_DIRTY_PARTIAL:
+      printf("Partial redraw needed.\n");
+      break;
+    case GHOSTTY_RENDER_STATE_DIRTY_FULL:
+      printf("Full redraw needed.\n");
+      break;
+  }
+  //! [render-dirty-check]
 
+  //! [render-colors]
+  // Retrieve colors (background, foreground, palette) from the render
+  // state. These are needed to resolve palette-indexed cell colors.
+  GhosttyRenderStateColors colors =
+      GHOSTTY_INIT_SIZED(GhosttyRenderStateColors);
+  result = ghostty_render_state_colors_get(render_state, &colors);
+  assert(result == GHOSTTY_SUCCESS);
+
+  printf("Background: #%02x%02x%02x\n",
+         colors.background.r, colors.background.g, colors.background.b);
+  printf("Foreground: #%02x%02x%02x\n",
+         colors.foreground.r, colors.foreground.g, colors.foreground.b);
+  //! [render-colors]
+
+  //! [render-cursor]
+  // Read cursor position and visual style from the render state.
+  bool cursor_visible = false;
+  ghostty_render_state_get(
+      render_state, GHOSTTY_RENDER_STATE_DATA_CURSOR_VISIBLE,
+      &cursor_visible);
+
+  bool cursor_in_viewport = false;
+  ghostty_render_state_get(
+      render_state, GHOSTTY_RENDER_STATE_DATA_CURSOR_VIEWPORT_HAS_VALUE,
+      &cursor_in_viewport);
+
+  if (cursor_visible && cursor_in_viewport) {
+    uint16_t cx, cy;
+    ghostty_render_state_get(
+        render_state, GHOSTTY_RENDER_STATE_DATA_CURSOR_VIEWPORT_X, &cx);
+    ghostty_render_state_get(
+        render_state, GHOSTTY_RENDER_STATE_DATA_CURSOR_VIEWPORT_Y, &cy);
+
+    GhosttyRenderStateCursorVisualStyle style;
+    ghostty_render_state_get(
+        render_state, GHOSTTY_RENDER_STATE_DATA_CURSOR_VISUAL_STYLE,
+        &style);
+
+    const char* style_name = "unknown";
+    switch (style) {
+      case GHOSTTY_RENDER_STATE_CURSOR_VISUAL_STYLE_BAR:
+        style_name = "bar";
+        break;
+      case GHOSTTY_RENDER_STATE_CURSOR_VISUAL_STYLE_BLOCK:
+        style_name = "block";
+        break;
+      case GHOSTTY_RENDER_STATE_CURSOR_VISUAL_STYLE_UNDERLINE:
+        style_name = "underline";
+        break;
+      case GHOSTTY_RENDER_STATE_CURSOR_VISUAL_STYLE_BLOCK_HOLLOW:
+        style_name = "hollow";
+        break;
+    }
+    printf("Cursor at (%u, %u), style: %s\n", cx, cy, style_name);
+  }
+  //! [render-cursor]
+
+  //! [render-row-iterate]
+  // Iterate rows via the row iterator. For each dirty row, iterate its
+  // cells, read codepoints/graphemes and styles, and emit ANSI-colored
+  // output as a simple "renderer".
+  GhosttyRenderStateRowIterator row_iter = NULL;
+  result = ghostty_render_state_row_iterator_new(NULL, &row_iter);
+  assert(result == GHOSTTY_SUCCESS);
+
+  result = ghostty_render_state_get(
+      render_state, GHOSTTY_RENDER_STATE_DATA_ROW_ITERATOR, &row_iter);
+  assert(result == GHOSTTY_SUCCESS);
+
+  GhosttyRenderStateRowCells cells = NULL;
+  result = ghostty_render_state_row_cells_new(NULL, &cells);
+  assert(result == GHOSTTY_SUCCESS);
+
+  int row_index = 0;
+  while (ghostty_render_state_row_iterator_next(row_iter)) {
+    // Check per-row dirty state; a real renderer would skip clean rows.
+    bool row_dirty = false;
+    ghostty_render_state_row_get(
+        row_iter, GHOSTTY_RENDER_STATE_ROW_DATA_DIRTY, &row_dirty);
+
+    printf("Row %2d [%s]: ", row_index,
+           row_dirty ? "dirty" : "clean");
+
+    // Get cells for this row (reuses the same cells handle).
+    result = ghostty_render_state_row_get(
+        row_iter, GHOSTTY_RENDER_STATE_ROW_DATA_CELLS, &cells);
+    assert(result == GHOSTTY_SUCCESS);
+
+    while (ghostty_render_state_row_cells_next(cells)) {
+      // Get the grapheme length; 0 means the cell is empty.
+      uint32_t grapheme_len = 0;
+      ghostty_render_state_row_cells_get(
+          cells, GHOSTTY_RENDER_STATE_ROW_CELLS_DATA_GRAPHEMES_LEN,
+          &grapheme_len);
+
+      if (grapheme_len == 0) {
+        putchar(' ');
+        continue;
+      }
+
+      // Read the style for this cell. Returns the default style for
+      // cells that have no explicit styling.
+      GhosttyStyle style = GHOSTTY_INIT_SIZED(GhosttyStyle);
+      ghostty_render_state_row_cells_get(
+          cells, GHOSTTY_RENDER_STATE_ROW_CELLS_DATA_STYLE, &style);
+
+      // Resolve foreground color for this cell.
+      GhosttyColorRgb fg =
+          resolve_color(style.fg_color, &colors, colors.foreground);
+
+      // Emit ANSI true-color escape for the foreground.
+      printf("\033[38;2;%u;%u;%um", fg.r, fg.g, fg.b);
+      if (style.bold) printf("\033[1m");
+      if (style.underline) printf("\033[4m");
+
+      // Read grapheme codepoints into a buffer and print them.
+      // The buffer must be at least grapheme_len elements.
+      uint32_t codepoints[16];
+      uint32_t len = grapheme_len < 16 ? grapheme_len : 16;
+      ghostty_render_state_row_cells_get(
+          cells, GHOSTTY_RENDER_STATE_ROW_CELLS_DATA_GRAPHEMES_BUF,
+          codepoints);
+
+      for (uint32_t i = 0; i < len; i++) {
+        // Simple ASCII print; a real renderer would handle UTF-8.
+        if (codepoints[i] < 128)
+          putchar((char)codepoints[i]);
+        else
+          printf("U+%04X", codepoints[i]);
+      }
+
+      printf("\033[0m");  // Reset style after each cell.
+    }
+
+    printf("\n");
+
+    // Clear per-row dirty flag after "rendering" it.
+    bool clean = false;
+    ghostty_render_state_row_set(
+        row_iter, GHOSTTY_RENDER_STATE_ROW_OPTION_DIRTY, &clean);
+
+    row_index++;
+  }
+  //! [render-row-iterate]
+
+  //! [render-dirty-reset]
+  // After finishing the frame, reset the global dirty state so the next
+  // update can report changes accurately.
+  GhosttyRenderStateDirty clean_state = GHOSTTY_RENDER_STATE_DIRTY_FALSE;
+  result = ghostty_render_state_set(
+      render_state, GHOSTTY_RENDER_STATE_OPTION_DIRTY, &clean_state);
+  assert(result == GHOSTTY_SUCCESS);
+  //! [render-dirty-reset]
+
+  // Cleanup
+  ghostty_render_state_row_cells_free(cells);
+  ghostty_render_state_row_iterator_free(row_iter);
   ghostty_render_state_free(render_state);
   ghostty_terminal_free(terminal);
   return 0;
 }
-//! [render-state-update]
diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
index bf79cdd7e..d8f6400a9 100644
--- a/include/ghostty/vt/render.h
+++ b/include/ghostty/vt/render.h
@@ -58,10 +58,26 @@ extern "C" {
  * reset the row-level dirty flags. So, the caller of the render state API must
  * be careful to manage both layers of dirty state correctly. 
  *
- * ## Example
+ * ## Examples
  *
+ * ### Creating and updating render state
  * @snippet c-vt-render/src/main.c render-state-update
  *
+ * ### Checking dirty state
+ * @snippet c-vt-render/src/main.c render-dirty-check
+ *
+ * ### Reading colors
+ * @snippet c-vt-render/src/main.c render-colors
+ *
+ * ### Reading cursor state
+ * @snippet c-vt-render/src/main.c render-cursor
+ *
+ * ### Iterating rows and cells
+ * @snippet c-vt-render/src/main.c render-row-iterate
+ *
+ * ### Resetting dirty state after rendering
+ * @snippet c-vt-render/src/main.c render-dirty-reset
+ *
  * @{
  */
 
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index 3feb4c9fb..b7f2fca0a 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -435,7 +435,7 @@ pub const RowCellsData = enum(c_int) {
             .raw => page.Cell.C,
             .style => style_c.Style,
             .graphemes_len => u32,
-            .graphemes_buf => [*]u32,
+            .graphemes_buf => u32,
         };
     }
 };
@@ -472,7 +472,10 @@ fn rowCellsGetTyped(
     switch (data) {
         .invalid => return .invalid_value,
         .raw => out.* = cell.cval(),
-        .style => out.* = style_c.Style.fromStyle(cells.styles[x]),
+        .style => out.* = if (cell.hasStyling())
+            style_c.Style.fromStyle(cells.styles[x])
+        else
+            style_c.Style.fromStyle(.{}),
         .graphemes_len => {
             if (!cell.hasText()) {
                 out.* = 0;
@@ -484,11 +487,10 @@ fn rowCellsGetTyped(
         .graphemes_buf => {
             if (!cell.hasText()) return .success;
             const extra = if (cell.hasGrapheme()) cells.graphemes[x] else &[_]u21{};
-            const total = 1 + extra.len;
-            const out_slice = out.*[0..total];
-            out_slice[0] = cell.codepoint();
+            const buf: [*]u32 = @ptrCast(out);
+            buf[0] = cell.codepoint();
             for (extra, 1..) |cp, i| {
-                out_slice[i] = cp;
+                buf[i] = cp;
             }
         },
     }

From 542d6aa14d2f9a4d522f3ca614dbcc6264191740 Mon Sep 17 00:00:00 2001
From: Jonathan Marler <johnnymarler@gmail.com>
Date: Fri, 20 Mar 2026 10:27:40 -0600
Subject: [PATCH 276/391] windows: avoid fontconfig and ensure build compiles

---
 .github/workflows/test.yml | 4 ++++
 src/font/backend.zig       | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fbbfa8714..21728b809 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -744,6 +744,10 @@ jobs:
           Write-Host "Zig installed."
           .\zig\zig.exe version
 
+      - name: Compile build
+        shell: pwsh
+        run: .\zig\zig.exe build --help
+
       - name: Generate build testing script
         shell: pwsh
         run: |
diff --git a/src/font/backend.zig b/src/font/backend.zig
index 37b3189b6..d24edec79 100644
--- a/src/font/backend.zig
+++ b/src/font/backend.zig
@@ -40,6 +40,14 @@ pub const Backend = enum {
             };
         }
 
+        if (target.os.tag == .windows) {
+            // Avoid fontconfig on Windows because its libxml2 dependency
+            // may not unpack due to symlinks. Use plain freetype for now
+            // which means no font discovery. Full solution would likely use
+            // DirectWrite which has its own discovery API.
+            return .freetype;
+        }
+
         // macOS also supports "coretext_freetype" but there is no scenario
         // that is the default. It is only used by people who want to
         // self-compile Ghostty and prefer the freetype aesthetic.

From e680cf9f358ce37a4e91d6025f567dff3e4c1f19 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2026 16:42:32 +0000
Subject: [PATCH 277/391] Update VOUCHED list (#11699)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11698#issuecomment-4099492496)
from @mitchellh.

Vouch: @marler8997

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 589265794..7e4187bfb 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -121,6 +121,7 @@ mahnokropotkinvich
 marijagjorgjieva
 markdorison
 markhuot
+marler8997
 marrocco-simone
 matkotiric
 micaeljarniac

From 7b9e49a47fbacd2c776aab47470f1b769a6de58f Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Fri, 20 Mar 2026 12:10:47 -0500
Subject: [PATCH 278/391] core: build pty.c only on certain platforms (avoids
 building os iOS)

---
 src/build/SharedDeps.zig | 42 +++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig
index cb0b609d5..fe3fb1b2f 100644
--- a/src/build/SharedDeps.zig
+++ b/src/build/SharedDeps.zig
@@ -136,24 +136,30 @@ pub fn add(
     self.config.terminalOptions().add(b, step.root_module);
 
     // C imports needed to manage/create PTYs
-    {
-        const c = b.addTranslateC(.{
-            .root_source_file = b.path("src/pty.c"),
-            .target = target,
-            .optimize = optimize,
-        });
-        switch (target.result.os.tag) {
-            .macos => {
-                const libc = try std.zig.LibCInstallation.findNative(.{
-                    .allocator = b.allocator,
-                    .target = &target.result,
-                    .verbose = false,
-                });
-                c.addSystemIncludePath(.{ .cwd_relative = libc.sys_include_dir.? });
-            },
-            else => {},
-        }
-        step.root_module.addImport("pty-c", c.createModule());
+    switch (target.result.os.tag) {
+        .freebsd,
+        .linux,
+        .macos,
+        => {
+            const c = b.addTranslateC(.{
+                .root_source_file = b.path("src/pty.c"),
+                .target = target,
+                .optimize = optimize,
+            });
+            switch (target.result.os.tag) {
+                .macos => {
+                    const libc = try std.zig.LibCInstallation.findNative(.{
+                        .allocator = b.allocator,
+                        .target = &target.result,
+                        .verbose = false,
+                    });
+                    c.addSystemIncludePath(.{ .cwd_relative = libc.sys_include_dir.? });
+                },
+                else => {},
+            }
+            step.root_module.addImport("pty-c", c.createModule());
+        },
+        else => {},
     }
 
     // Freetype. We always include this even if our font backend doesn't

From 3dee62f9046e0fcbc9841ccfe4a96d7f78fd90c4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 20 Mar 2026 10:21:31 -0700
Subject: [PATCH 279/391] build: add CMake support for libghostty-vt

Add a top-level CMakeLists.txt that wraps `zig build lib-vt` so that
CMake-based downstream projects can consume libghostty-vt without
needing to interact with the Zig build system directly. A custom
command triggers the zig build during `cmake --build`, and the
resulting shared library is exposed as an IMPORTED target.

Downstream projects can pull in the library via FetchContent, which
fetches the source and builds it as part of their own CMake build, or
via find_package after a manual install step. The package config
template in dist/cmake/ sets up the ghostty-vt::ghostty-vt target
with proper include paths and macOS rpath handling.

A c-vt-cmake example demonstrates the FetchContent workflow, creating
a terminal, writing VT sequences, and formatting the output as plain
text. CI is updated to auto-discover and build CMake-based examples
alongside the existing Zig-based ones.
---
 .github/workflows/test.yml            |  56 +++++++--
 .gitignore                            |   3 +
 CMakeLists.txt                        | 160 ++++++++++++++++++++++++++
 dist/cmake/README.md                  |  67 +++++++++++
 dist/cmake/ghostty-vt-config.cmake.in |  33 ++++++
 example/.gitignore                    |   1 +
 example/c-vt-cmake/CMakeLists.txt     |  12 ++
 example/c-vt-cmake/README.md          |  21 ++++
 example/c-vt-cmake/src/main.c         |  52 +++++++++
 nix/devShell.nix                      |   2 +
 10 files changed, 400 insertions(+), 7 deletions(-)
 create mode 100644 CMakeLists.txt
 create mode 100644 dist/cmake/README.md
 create mode 100644 dist/cmake/ghostty-vt-config.cmake.in
 create mode 100644 example/c-vt-cmake/CMakeLists.txt
 create mode 100644 example/c-vt-cmake/README.md
 create mode 100644 example/c-vt-cmake/src/main.c

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fbbfa8714..824953756 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -85,7 +85,8 @@ jobs:
       - skip
       - build-bench
       - build-dist
-      - build-examples
+      - build-examples-zig
+      - build-examples-cmake
       - build-flatpak
       - build-libghostty-vt
       - build-libghostty-vt-android
@@ -172,22 +173,26 @@ jobs:
     needs: skip
     runs-on: namespace-profile-ghostty-xsm
     outputs:
-      dirs: ${{ steps.list.outputs.dirs }}
+      zig: ${{ steps.list.outputs.zig }}
+      cmake: ${{ steps.list.outputs.cmake }}
     steps:
       - name: Checkout code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - id: list
         name: List example directories
         run: |
-          dirs=$(ls example/*/build.zig.zon 2>/dev/null | xargs -n1 dirname | xargs -n1 basename | jq -R -s -c 'split("\n") | map(select(. != ""))')
-          echo "$dirs" | jq .
-          echo "dirs=$dirs" >> "$GITHUB_OUTPUT"
+          zig=$(ls example/*/build.zig.zon 2>/dev/null | xargs -n1 dirname | xargs -n1 basename | jq -R -s -c 'split("\n") | map(select(. != ""))')
+          echo "$zig" | jq .
+          echo "zig=$zig" >> "$GITHUB_OUTPUT"
+          cmake=$(ls example/*/CMakeLists.txt 2>/dev/null | xargs -n1 dirname | xargs -n1 basename | jq -R -s -c 'split("\n") | map(select(. != ""))')
+          echo "$cmake" | jq .
+          echo "cmake=$cmake" >> "$GITHUB_OUTPUT"
 
-  build-examples:
+  build-examples-zig:
     strategy:
       fail-fast: false
       matrix:
-        dir: ${{ fromJSON(needs.list-examples.outputs.dirs) }}
+        dir: ${{ fromJSON(needs.list-examples.outputs.zig) }}
     name: Example ${{ matrix.dir }}
     runs-on: namespace-profile-ghostty-xsm
     needs: [test, list-examples]
@@ -219,6 +224,43 @@ jobs:
           cd example/${{ matrix.dir }}
           nix develop -c zig build
 
+  build-examples-cmake:
+    strategy:
+      fail-fast: false
+      matrix:
+        dir: ${{ fromJSON(needs.list-examples.outputs.cmake) }}
+    name: Example ${{ matrix.dir }}
+    runs-on: namespace-profile-ghostty-xsm
+    needs: [test, list-examples]
+    env:
+      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
+      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Setup Cache
+        uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9 # v1.4.2
+        with:
+          path: |
+            /nix
+            /zig
+
+      # Install Nix and use that to run our tests so our environment matches exactly.
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
+        with:
+          name: ghostty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
+      - name: Build Example
+        run: |
+          cd example/${{ matrix.dir }}
+          nix develop -c cmake -B build -DFETCHCONTENT_SOURCE_DIR_GHOSTTY=${{ github.workspace }}
+          nix develop -c cmake --build build
+
   build-flatpak:
     strategy:
       fail-fast: false
diff --git a/.gitignore b/.gitignore
index 74f3f85eb..699ac9a5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,9 @@
 zig-cache/
 .zig-cache/
 zig-out/
+build-cmake/
+CMakeCache.txt
+CMakeFiles/
 /build.zig.zon.bak
 /result*
 /.nixos-test-history
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000000000..4198bca36
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,160 @@
+# CMake wrapper for libghostty-vt
+#
+# This file delegates to `zig build lib-vt` to produce the shared library,
+# headers, and pkg-config file. It exists so that CMake-based projects can
+# consume libghostty-vt without interacting with the Zig build system
+# directly. However, downstream users do still require `zig` on the PATH.
+# Please consult the Ghostty docs for the required Zig version:
+#
+# https://ghostty.org/docs/install/build
+#
+# Building within the Ghostty repo
+# ---------------------------------
+#
+#   cmake -B build
+#   cmake --build build
+#   cmake --install build --prefix /usr/local
+#
+# Pass extra flags to the Zig build with GHOSTTY_ZIG_BUILD_FLAGS:
+#
+#   cmake -B build -DGHOSTTY_ZIG_BUILD_FLAGS="-Demit-macos-app=false"
+#
+# Integrating into a downstream CMake project
+# ---------------------------------------------
+#
+# Option 1 — FetchContent (recommended, no manual install step):
+#
+#   include(FetchContent)
+#   FetchContent_Declare(ghostty
+#       GIT_REPOSITORY https://github.com/ghostty-org/ghostty.git
+#       GIT_TAG main
+#   )
+#   FetchContent_MakeAvailable(ghostty)
+#
+#   target_link_libraries(myapp PRIVATE ghostty-vt)
+#
+# To use a local checkout instead of fetching:
+#
+#   cmake -B build -DFETCHCONTENT_SOURCE_DIR_GHOSTTY=/path/to/ghostty
+#
+# Option 2 — find_package (after installing to a prefix):
+#
+#   find_package(ghostty-vt REQUIRED)
+#   target_link_libraries(myapp PRIVATE ghostty-vt::ghostty-vt)
+#
+# See dist/cmake/README.md for more details and example/c-vt-cmake/ for a
+# complete working example.
+
+cmake_minimum_required(VERSION 3.19)
+project(ghostty-vt VERSION 0.1.0 LANGUAGES C)
+
+# --- Options ----------------------------------------------------------------
+
+set(GHOSTTY_ZIG_BUILD_FLAGS "" CACHE STRING "Additional flags to pass to zig build")
+
+# --- Find Zig ----------------------------------------------------------------
+
+find_program(ZIG_EXECUTABLE zig REQUIRED)
+message(STATUS "Found zig: ${ZIG_EXECUTABLE}")
+
+# --- Build via zig build -----------------------------------------------------
+
+# The zig build installs into zig-out/ relative to the source tree.
+set(ZIG_OUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zig-out")
+
+# The library file that zig build produces.
+if(APPLE)
+    set(GHOSTTY_VT_LIBNAME "${CMAKE_SHARED_LIBRARY_PREFIX}ghostty-vt${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    set(GHOSTTY_VT_SONAME "${CMAKE_SHARED_LIBRARY_PREFIX}ghostty-vt.0${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    set(GHOSTTY_VT_REALNAME "${CMAKE_SHARED_LIBRARY_PREFIX}ghostty-vt.0.1.0${CMAKE_SHARED_LIBRARY_SUFFIX}")
+elseif(WIN32)
+    set(GHOSTTY_VT_LIBNAME "ghostty-vt.dll")
+    set(GHOSTTY_VT_REALNAME "ghostty-vt.dll")
+else()
+    set(GHOSTTY_VT_LIBNAME "${CMAKE_SHARED_LIBRARY_PREFIX}ghostty-vt${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    set(GHOSTTY_VT_SONAME "${CMAKE_SHARED_LIBRARY_PREFIX}ghostty-vt${CMAKE_SHARED_LIBRARY_SUFFIX}.0")
+    set(GHOSTTY_VT_REALNAME "${CMAKE_SHARED_LIBRARY_PREFIX}ghostty-vt${CMAKE_SHARED_LIBRARY_SUFFIX}.0.1.0")
+endif()
+
+set(GHOSTTY_VT_LIBRARY "${ZIG_OUT_DIR}/lib/${GHOSTTY_VT_REALNAME}")
+
+# Ensure the output directories exist so CMake doesn't reject the
+# INTERFACE_INCLUDE_DIRECTORIES before the zig build has run.
+file(MAKE_DIRECTORY "${ZIG_OUT_DIR}/include")
+
+# Custom command: run zig build lib-vt
+add_custom_command(
+    OUTPUT "${GHOSTTY_VT_LIBRARY}"
+    COMMAND "${ZIG_EXECUTABLE}" build lib-vt ${GHOSTTY_ZIG_BUILD_FLAGS}
+    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    COMMENT "Building libghostty-vt via zig build..."
+    USES_TERMINAL
+)
+
+add_custom_target(zig_build_lib_vt ALL DEPENDS "${GHOSTTY_VT_LIBRARY}")
+
+# --- IMPORTED library target --------------------------------------------------
+
+add_library(ghostty-vt SHARED IMPORTED GLOBAL)
+set_target_properties(ghostty-vt PROPERTIES
+    IMPORTED_LOCATION "${GHOSTTY_VT_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${ZIG_OUT_DIR}/include"
+)
+if(APPLE)
+    set_target_properties(ghostty-vt PROPERTIES
+        IMPORTED_SONAME "@rpath/${GHOSTTY_VT_SONAME}"
+    )
+elseif(NOT WIN32)
+    set_target_properties(ghostty-vt PROPERTIES
+        IMPORTED_SONAME "${GHOSTTY_VT_SONAME}"
+    )
+endif()
+
+add_dependencies(ghostty-vt zig_build_lib_vt)
+
+# --- Install ------------------------------------------------------------------
+
+include(GNUInstallDirs)
+
+# Install the library
+install(FILES "${GHOSTTY_VT_LIBRARY}" TYPE LIB)
+if(NOT WIN32)
+    # Install symlinks
+    install(CODE "
+        execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink
+            \"${GHOSTTY_VT_REALNAME}\"
+            \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${GHOSTTY_VT_SONAME}\")
+        execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink
+            \"${GHOSTTY_VT_SONAME}\"
+            \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${GHOSTTY_VT_LIBNAME}\")
+    ")
+endif()
+
+# Install headers
+install(DIRECTORY "${ZIG_OUT_DIR}/include/ghostty" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+
+# --- CMake package config for find_package() ----------------------------------
+
+include(CMakePackageConfigHelpers)
+
+# Generate the config file
+configure_package_config_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/dist/cmake/ghostty-vt-config.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/ghostty-vt-config.cmake"
+    INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ghostty-vt"
+)
+
+# Generate the version file
+write_basic_package_version_file(
+    "${CMAKE_CURRENT_BINARY_DIR}/ghostty-vt-config-version.cmake"
+    VERSION "${PROJECT_VERSION}"
+    COMPATIBILITY SameMajorVersion
+)
+
+# Install the config files
+install(
+    FILES
+        "${CMAKE_CURRENT_BINARY_DIR}/ghostty-vt-config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/ghostty-vt-config-version.cmake"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ghostty-vt"
+)
diff --git a/dist/cmake/README.md b/dist/cmake/README.md
new file mode 100644
index 000000000..a57d435c8
--- /dev/null
+++ b/dist/cmake/README.md
@@ -0,0 +1,67 @@
+# CMake Support for libghostty-vt
+
+The top-level `CMakeLists.txt` wraps the Zig build system so that CMake
+projects can consume libghostty-vt without invoking `zig build` manually.
+Running `cmake --build` triggers `zig build lib-vt` automatically.
+
+This means downstream projects do require a working Zig compiler on
+`PATH` to build, but don't need to know any Zig-specific details.
+
+## Using FetchContent (recommended)
+
+Add the following to your project's `CMakeLists.txt`:
+
+```cmake
+include(FetchContent)
+FetchContent_Declare(ghostty
+    GIT_REPOSITORY https://github.com/ghostty-org/ghostty.git
+    GIT_TAG main
+)
+FetchContent_MakeAvailable(ghostty)
+
+add_executable(myapp main.c)
+target_link_libraries(myapp PRIVATE ghostty-vt)
+```
+
+This fetches the Ghostty source, builds libghostty-vt via Zig during your
+CMake build, and links it into your target. Headers are added to the
+include path automatically.
+
+### Using a local checkout
+
+If you already have the Ghostty source checked out, skip the download by
+pointing CMake at it:
+
+```shell-session
+cmake -B build -DFETCHCONTENT_SOURCE_DIR_GHOSTTY=/path/to/ghostty
+cmake --build build
+```
+
+## Using find_package (install-based)
+
+Build and install libghostty-vt first:
+
+```shell-session
+cd /path/to/ghostty
+cmake -B build
+cmake --build build
+cmake --install build --prefix /usr/local
+```
+
+Then in your project:
+
+```cmake
+find_package(ghostty-vt REQUIRED)
+
+add_executable(myapp main.c)
+target_link_libraries(myapp PRIVATE ghostty-vt::ghostty-vt)
+```
+
+## Files
+
+- `ghostty-vt-config.cmake.in` — template for the CMake package config
+  file installed alongside the library, enabling `find_package()` support.
+
+## Example
+
+See `example/c-vt-cmake/` for a complete working example.
diff --git a/dist/cmake/ghostty-vt-config.cmake.in b/dist/cmake/ghostty-vt-config.cmake.in
new file mode 100644
index 000000000..d67f99c0b
--- /dev/null
+++ b/dist/cmake/ghostty-vt-config.cmake.in
@@ -0,0 +1,33 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
+if(NOT TARGET ghostty-vt::ghostty-vt)
+    add_library(ghostty-vt::ghostty-vt SHARED IMPORTED)
+
+    set(_ghostty_vt_libdir "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_LIBDIR@")
+
+    set_target_properties(ghostty-vt::ghostty-vt PROPERTIES
+        IMPORTED_LOCATION "${_ghostty_vt_libdir}/@GHOSTTY_VT_REALNAME@"
+        INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@"
+    )
+
+    if(APPLE)
+        set_target_properties(ghostty-vt::ghostty-vt PROPERTIES
+            IMPORTED_SONAME "@rpath/@GHOSTTY_VT_SONAME@"
+            INTERFACE_LINK_DIRECTORIES "${_ghostty_vt_libdir}"
+        )
+        # Ensure consumers can find the @rpath dylib at runtime
+        set_property(TARGET ghostty-vt::ghostty-vt APPEND PROPERTY
+            INTERFACE_LINK_OPTIONS "LINKER:-rpath,${_ghostty_vt_libdir}"
+        )
+    elseif(NOT WIN32)
+        set_target_properties(ghostty-vt::ghostty-vt PROPERTIES
+            IMPORTED_SONAME "@GHOSTTY_VT_SONAME@"
+        )
+    endif()
+
+    unset(_ghostty_vt_libdir)
+endif()
+
+check_required_components(ghostty-vt)
diff --git a/example/.gitignore b/example/.gitignore
index 3fa248f4c..6f372bc4d 100644
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -2,3 +2,4 @@
 dist/
 node_modules/
 example.wasm*
+build/
diff --git a/example/c-vt-cmake/CMakeLists.txt b/example/c-vt-cmake/CMakeLists.txt
new file mode 100644
index 000000000..ff6e35bc1
--- /dev/null
+++ b/example/c-vt-cmake/CMakeLists.txt
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.19)
+project(c-vt-cmake LANGUAGES C)
+
+include(FetchContent)
+FetchContent_Declare(ghostty
+    GIT_REPOSITORY https://github.com/ghostty-org/ghostty.git
+    GIT_TAG main
+)
+FetchContent_MakeAvailable(ghostty)
+
+add_executable(c_vt_cmake src/main.c)
+target_link_libraries(c_vt_cmake PRIVATE ghostty-vt)
diff --git a/example/c-vt-cmake/README.md b/example/c-vt-cmake/README.md
new file mode 100644
index 000000000..d76ca946d
--- /dev/null
+++ b/example/c-vt-cmake/README.md
@@ -0,0 +1,21 @@
+# c-vt-cmake
+
+Demonstrates consuming libghostty-vt from a CMake project using
+`FetchContent`. Creates a terminal, writes VT sequences into it, and
+formats the screen contents as plain text.
+
+## Building
+
+```shell-session
+cd example/c-vt-cmake
+cmake -B build
+cmake --build build
+./build/c_vt_cmake
+```
+
+To build against a local checkout instead of fetching from GitHub:
+
+```shell-session
+cmake -B build -DFETCHCONTENT_SOURCE_DIR_GHOSTTY=../..
+cmake --build build
+```
diff --git a/example/c-vt-cmake/src/main.c b/example/c-vt-cmake/src/main.c
new file mode 100644
index 000000000..389be5936
--- /dev/null
+++ b/example/c-vt-cmake/src/main.c
@@ -0,0 +1,52 @@
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ghostty/vt.h>
+
+int main() {
+  // Create a terminal with a small grid
+  GhosttyTerminal terminal;
+  GhosttyTerminalOptions opts = {
+    .cols = 80,
+    .rows = 24,
+    .max_scrollback = 0,
+  };
+  GhosttyResult result = ghostty_terminal_new(NULL, &terminal, opts);
+  assert(result == GHOSTTY_SUCCESS);
+
+  // Write some VT-encoded content into the terminal
+  const char *commands[] = {
+    "Hello from a \033[1mCMake\033[0m-built program!\r\n",
+    "Line 2: \033[4munderlined\033[0m text\r\n",
+    "Line 3: \033[31mred\033[0m \033[32mgreen\033[0m \033[34mblue\033[0m\r\n",
+  };
+  for (size_t i = 0; i < sizeof(commands) / sizeof(commands[0]); i++) {
+    ghostty_terminal_vt_write(terminal, (const uint8_t *)commands[i],
+                              strlen(commands[i]));
+  }
+
+  // Format the terminal contents as plain text
+  GhosttyFormatterTerminalOptions fmt_opts =
+      GHOSTTY_INIT_SIZED(GhosttyFormatterTerminalOptions);
+  fmt_opts.emit = GHOSTTY_FORMATTER_FORMAT_PLAIN;
+  fmt_opts.trim = true;
+
+  GhosttyFormatter formatter;
+  result = ghostty_formatter_terminal_new(NULL, &formatter, terminal, fmt_opts);
+  assert(result == GHOSTTY_SUCCESS);
+
+  uint8_t *buf = NULL;
+  size_t len = 0;
+  result = ghostty_formatter_format_alloc(formatter, NULL, &buf, &len);
+  assert(result == GHOSTTY_SUCCESS);
+
+  printf("Plain text (%zu bytes):\n", len);
+  fwrite(buf, 1, len, stdout);
+  printf("\n");
+
+  free(buf);
+  ghostty_formatter_free(formatter);
+  ghostty_terminal_free(terminal);
+  return 0;
+}
diff --git a/nix/devShell.nix b/nix/devShell.nix
index c78c9081b..df08fc204 100644
--- a/nix/devShell.nix
+++ b/nix/devShell.nix
@@ -8,6 +8,7 @@
   appstream,
   flatpak-builder,
   gdb,
+  cmake,
   #, glxinfo # unused
   ncurses,
   nodejs,
@@ -91,6 +92,7 @@ in
     packages =
       [
         # For builds
+        cmake
         doxygen
         jq
         llvmPackages_latest.llvm

From fa84b8709c7e42be1588da97c9cf957e1be66a98 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 20 Mar 2026 12:16:46 -0700
Subject: [PATCH 280/391] ci: add build-cmake job to test cmake build of
 libghostty-vt

Add a new CI job that builds the root CMakeLists.txt to ensure the
cmake wrapper for libghostty-vt works.

This isn't the recommend way to build libghostty-vt, but its how
downstream CMake projects would consume it so we gotta keep it
working.
---
 .github/workflows/test.yml | 39 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e0e13b508..5f1a74e1a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -87,6 +87,7 @@ jobs:
       - build-dist
       - build-examples-zig
       - build-examples-cmake
+      - build-cmake
       - build-flatpak
       - build-libghostty-vt
       - build-libghostty-vt-android
@@ -261,6 +262,44 @@ jobs:
           nix develop -c cmake -B build -DFETCHCONTENT_SOURCE_DIR_GHOSTTY=${{ github.workspace }}
           nix develop -c cmake --build build
 
+  build-cmake:
+    runs-on: namespace-profile-ghostty-sm
+    needs: test
+    env:
+      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
+      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Setup Cache
+        uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9 # v1.4.2
+        with:
+          path: |
+            /nix
+            /zig
+
+      # Install Nix and use that to run our tests so our environment matches exactly.
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
+        with:
+          name: ghostty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
+      - name: Build
+        run: |
+          nix develop -c cmake -B build
+          nix develop -c cmake --build build
+
+      - name: Verify artifacts
+        run: |
+          test -f zig-out/lib/libghostty-vt.so.0.1.0
+          test -d zig-out/include/ghostty
+          ls -la zig-out/lib/
+          ls -la zig-out/include/ghostty/
+
   build-flatpak:
     strategy:
       fail-fast: false

From 0e0db1074b3d4e4c6470215ea5226c636cbaafa4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 20 Mar 2026 14:41:33 -0700
Subject: [PATCH 281/391] build: set zig optimize flag for CMake release builds

Map CMake release build types (Release, MinSizeRel, RelWithDebInfo)
to -Doptimize=ReleaseFast so that zig build automatically produces
optimized builds when CMake is configured for a release variant.
Debug builds remain unaffected, letting Zig use its default Debug
optimization level.
---
 CMakeLists.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4198bca36..cb7290465 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,15 @@ project(ghostty-vt VERSION 0.1.0 LANGUAGES C)
 
 set(GHOSTTY_ZIG_BUILD_FLAGS "" CACHE STRING "Additional flags to pass to zig build")
 
+# Map CMake build types to Zig optimization levels.
+if(CMAKE_BUILD_TYPE)
+    string(TOUPPER "${CMAKE_BUILD_TYPE}" _bt)
+    if(_bt STREQUAL "RELEASE" OR _bt STREQUAL "MINSIZEREL" OR _bt STREQUAL "RELWITHDEBINFO")
+        list(APPEND GHOSTTY_ZIG_BUILD_FLAGS "-Doptimize=ReleaseFast")
+    endif()
+    unset(_bt)
+endif()
+
 # --- Find Zig ----------------------------------------------------------------
 
 find_program(ZIG_EXECUTABLE zig REQUIRED)

From b66120d37d3001b3901f62d869266ba9dba0f60d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 20 Mar 2026 21:13:43 -0700
Subject: [PATCH 282/391] vt: add color_palette and color_rgb cell data types

Add two new CellData variants to extract background color values
directly from cells. color_palette (10) returns the palette index
as a GhosttyColorPaletteIndex and color_rgb (11) returns the RGB
components as a GhosttyColorRgb. Both reuse the existing color
types from color.h rather than introducing new ones.

These are only valid when the cell content_tag is
bg_color_palette or bg_color_rgb respectively; querying them
with a mismatched tag reads from the wrong union member.
---
 include/ghostty/vt/screen.h | 17 +++++++++++++++++
 src/terminal/c/cell.zig     | 18 ++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/include/ghostty/vt/screen.h b/include/ghostty/vt/screen.h
index 64207ce13..f1f9dd1ca 100644
--- a/include/ghostty/vt/screen.h
+++ b/include/ghostty/vt/screen.h
@@ -9,6 +9,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include <ghostty/vt/color.h>
 #include <ghostty/vt/types.h>
 
 #ifdef __cplusplus
@@ -184,6 +185,22 @@ typedef enum {
    * Output type: GhosttyCellSemanticContent *
    */
   GHOSTTY_CELL_DATA_SEMANTIC_CONTENT = 9,
+
+  /**
+   * The palette index for the cell's background color.
+   * Only valid when content_tag is GHOSTTY_CELL_CONTENT_BG_COLOR_PALETTE.
+   *
+   * Output type: GhosttyColorPaletteIndex *
+   */
+  GHOSTTY_CELL_DATA_COLOR_PALETTE = 10,
+
+  /**
+   * The RGB value for the cell's background color.
+   * Only valid when content_tag is GHOSTTY_CELL_CONTENT_BG_COLOR_RGB.
+   *
+   * Output type: GhosttyColorRgb *
+   */
+  GHOSTTY_CELL_DATA_COLOR_RGB = 11,
 } GhosttyCellData;
 
 /**
diff --git a/src/terminal/c/cell.zig b/src/terminal/c/cell.zig
index 493d89082..2ff9b35f9 100644
--- a/src/terminal/c/cell.zig
+++ b/src/terminal/c/cell.zig
@@ -2,6 +2,7 @@ const std = @import("std");
 const testing = std.testing;
 const page = @import("../page.zig");
 const Cell = page.Cell;
+const color = @import("../color.zig");
 const style_c = @import("style.zig");
 const Result = @import("result.zig").Result;
 
@@ -71,6 +72,16 @@ pub const CellData = enum(c_int) {
     /// Output type: GhosttyCellSemanticContent *
     semantic_content = 9,
 
+    /// The palette index for the cell's background color.
+    /// Only valid when content_tag is bg_color_palette.
+    /// Output type: GhosttyColorPaletteIndex *
+    color_palette = 10,
+
+    /// The RGB value for the cell's background color.
+    /// Only valid when content_tag is bg_color_rgb.
+    /// Output type: GhosttyColorRgb *
+    color_rgb = 11,
+
     /// Output type expected for querying the data of the given kind.
     pub fn OutType(comptime self: CellData) type {
         return switch (self) {
@@ -81,6 +92,8 @@ pub const CellData = enum(c_int) {
             .has_text, .has_styling, .has_hyperlink, .protected => bool,
             .style_id => u16,
             .semantic_content => SemanticContent,
+            .color_palette => u8,
+            .color_rgb => color.RGB.C,
         };
     }
 };
@@ -122,6 +135,11 @@ fn getTyped(
         .has_hyperlink => out.* = cell.hyperlink,
         .protected => out.* = cell.protected,
         .semantic_content => out.* = @enumFromInt(@intFromEnum(cell.semantic_content)),
+        .color_palette => out.* = cell.content.color_palette,
+        .color_rgb => {
+            const rgb = cell.content.color_rgb;
+            out.* = .{ .r = rgb.r, .g = rgb.g, .b = rgb.b };
+        },
     }
 
     return .success;

From 3fc04fd4ae9bab243e6023acdf024abf78270e88 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 20 Mar 2026 20:59:27 -0700
Subject: [PATCH 283/391] build: replace lib-vt step with -Demit-lib-vt option

Remove the dedicated `zig build lib-vt` step and replace it with a
`-Demit-lib-vt` build option. This fixes two problems:

1. We can default XCFramework, app, etc. steps to false if emit-lib-vt
   is true, so that the lib-vt build doesn't pull in unrelated
   artifacts. **Most importantly, lib-vt alone can be build without
   full Xcode installations.**

2. We can build lib-vt as part of a bundle with other artifacts if we
   really want.
---
 .github/workflows/test.yml        |  8 +++----
 CMakeLists.txt                    |  6 ++---
 build.zig                         | 39 +++++++++++++------------------
 dist/cmake/README.md              |  2 +-
 example/wasm-key-encode/README.md |  2 +-
 example/wasm-sgr/README.md        |  2 +-
 src/build/Config.zig              | 17 ++++++++++----
 src/build/GhosttyExe.zig          |  5 ++--
 src/build/SharedDeps.zig          |  2 +-
 9 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5f1a74e1a..f59a5bd67 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -408,11 +408,11 @@ jobs:
 
       - name: Build
         run: |
-          nix develop -c zig build lib-vt \
+          nix develop -c zig build -Demit-lib-vt \
             -Dtarget=${{ matrix.target }} \
             -Dsimd=false
 
-  # lib-vt requires macOS runner for macOS/iOS builds becauase it requires the `apple_sdk` path
+  # lib-vt requires macOS runner for macOS/iOS builds because it requires the `apple_sdk` path
   build-libghostty-vt-macos:
     strategy:
       matrix:
@@ -448,7 +448,7 @@ jobs:
 
       - name: Build
         run: |
-          nix develop -c zig build lib-vt \
+          nix develop -c zig build -Demit-lib-vt \
             -Dtarget=${{ matrix.target }}
 
   # lib-vt requires the Android NDK for Android builds
@@ -494,7 +494,7 @@ jobs:
 
       - name: Build
         run: |
-          nix develop -c zig build lib-vt \
+          nix develop -c zig build -Demit-lib-vt \
             -Dtarget=${{ matrix.target }}
         env:
           ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb7290465..87925751e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # CMake wrapper for libghostty-vt
 #
-# This file delegates to `zig build lib-vt` to produce the shared library,
+# This file delegates to `zig build -Demit-lib-vt` to produce the shared library,
 # headers, and pkg-config file. It exists so that CMake-based projects can
 # consume libghostty-vt without interacting with the Zig build system
 # directly. However, downstream users do still require `zig` on the PATH.
@@ -91,10 +91,10 @@ set(GHOSTTY_VT_LIBRARY "${ZIG_OUT_DIR}/lib/${GHOSTTY_VT_REALNAME}")
 # INTERFACE_INCLUDE_DIRECTORIES before the zig build has run.
 file(MAKE_DIRECTORY "${ZIG_OUT_DIR}/include")
 
-# Custom command: run zig build lib-vt
+# Custom command: run zig build -Demit-lib-vt
 add_custom_command(
     OUTPUT "${GHOSTTY_VT_LIBRARY}"
-    COMMAND "${ZIG_EXECUTABLE}" build lib-vt ${GHOSTTY_ZIG_BUILD_FLAGS}
+    COMMAND "${ZIG_EXECUTABLE}" build -Demit-lib-vt ${GHOSTTY_ZIG_BUILD_FLAGS}
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     COMMENT "Building libghostty-vt via zig build..."
     USES_TERMINAL
diff --git a/build.zig b/build.zig
index f9d861b19..037b46d71 100644
--- a/build.zig
+++ b/build.zig
@@ -35,7 +35,6 @@ pub fn build(b: *std.Build) !void {
 
     // All our steps which we'll hook up later. The steps are shown
     // up here just so that they are more self-documenting.
-    const libvt_step = b.step("lib-vt", "Build libghostty-vt");
     const run_step = b.step("run", "Run the app");
     const run_valgrind_step = b.step(
         "run-valgrind",
@@ -91,16 +90,6 @@ pub fn build(b: *std.Build) !void {
         check_step.dependOn(dist.install_step);
     }
 
-    // libghostty (internal, big)
-    const libghostty_shared = try buildpkg.GhosttyLib.initShared(
-        b,
-        &deps,
-    );
-    const libghostty_static = try buildpkg.GhosttyLib.initStatic(
-        b,
-        &deps,
-    );
-
     // libghostty-vt
     const libghostty_vt_shared = shared: {
         if (config.target.result.cpu.arch.isWasm()) {
@@ -115,7 +104,6 @@ pub fn build(b: *std.Build) !void {
             &mod,
         );
     };
-    libghostty_vt_shared.install(libvt_step);
     libghostty_vt_shared.install(b.getInstallStep());
 
     // Helpgen
@@ -128,26 +116,29 @@ pub fn build(b: *std.Build) !void {
             resources.install();
             if (i18n) |v| v.install();
         }
-    } else {
-        // Libghostty
+    } else if (!config.emit_lib_vt) {
+        // The macOS Ghostty Library
         //
-        // Note: libghostty is not stable for general purpose use. It is used
-        // heavily by Ghostty on macOS but it isn't built to be reusable yet.
-        // As such, these build steps are lacking. For example, the Darwin
-        // build only produces an xcframework.
+        // This is NOT libghostty (even though its named that for historical
+        // reasons). It is just the glue between Ghostty GUI on macOS and
+        // the full Ghostty GUI core.
+        const lib_shared = try buildpkg.GhosttyLib.initShared(b, &deps);
+        const lib_static = try buildpkg.GhosttyLib.initStatic(b, &deps);
 
         // We shouldn't have this guard but we don't currently
         // build on macOS this way ironically so we need to fix that.
         if (!config.target.result.os.tag.isDarwin()) {
-            libghostty_shared.installHeader(); // Only need one header
-            libghostty_shared.install("libghostty.so");
-            libghostty_static.install("libghostty.a");
+            lib_shared.installHeader(); // Only need one header
+            lib_shared.install("libghostty.so");
+            lib_static.install("libghostty.a");
         }
     }
 
     // macOS only artifacts. These will error if they're initialized for
     // other targets.
-    if (config.target.result.os.tag.isDarwin()) {
+    if (config.target.result.os.tag.isDarwin() and
+        (config.emit_xcframework or config.emit_macos_app))
+    {
         // Ghostty xcframework
         const xcframework = try buildpkg.GhosttyXCFramework.init(
             b,
@@ -202,7 +193,9 @@ pub fn build(b: *std.Build) !void {
 
         // On macOS we can run the macOS app. For "run" we always force
         // a native-only build so that we can run as quickly as possible.
-        if (config.target.result.os.tag.isDarwin()) {
+        if (config.target.result.os.tag.isDarwin() and
+            (config.emit_xcframework or config.emit_macos_app))
+        {
             const xcframework_native = try buildpkg.GhosttyXCFramework.init(
                 b,
                 &deps,
diff --git a/dist/cmake/README.md b/dist/cmake/README.md
index a57d435c8..ed8b86453 100644
--- a/dist/cmake/README.md
+++ b/dist/cmake/README.md
@@ -2,7 +2,7 @@
 
 The top-level `CMakeLists.txt` wraps the Zig build system so that CMake
 projects can consume libghostty-vt without invoking `zig build` manually.
-Running `cmake --build` triggers `zig build lib-vt` automatically.
+Running `cmake --build` triggers `zig build -Demit-lib-vt` automatically.
 
 This means downstream projects do require a working Zig compiler on
 `PATH` to build, but don't need to know any Zig-specific details.
diff --git a/example/wasm-key-encode/README.md b/example/wasm-key-encode/README.md
index ccd906cf7..e52844991 100644
--- a/example/wasm-key-encode/README.md
+++ b/example/wasm-key-encode/README.md
@@ -8,7 +8,7 @@ to encode key events into terminal escape sequences.
 First, build the WebAssembly module:
 
 ```bash
-zig build lib-vt -Dtarget=wasm32-freestanding -Doptimize=ReleaseSmall
+zig build -Demit-lib-vt -Dtarget=wasm32-freestanding -Doptimize=ReleaseSmall
 ```
 
 This will create `zig-out/bin/ghostty-vt.wasm`.
diff --git a/example/wasm-sgr/README.md b/example/wasm-sgr/README.md
index a107c910d..465d6fdbb 100644
--- a/example/wasm-sgr/README.md
+++ b/example/wasm-sgr/README.md
@@ -9,7 +9,7 @@ styling attributes.
 First, build the WebAssembly module:
 
 ```bash
-zig build lib-vt -Dtarget=wasm32-freestanding -Doptimize=ReleaseSmall
+zig build -Demit-lib-vt -Dtarget=wasm32-freestanding -Doptimize=ReleaseSmall
 ```
 
 This will create `zig-out/bin/ghostty-vt.wasm`.
diff --git a/src/build/Config.zig b/src/build/Config.zig
index 3a8a4e0c7..5789e9f92 100644
--- a/src/build/Config.zig
+++ b/src/build/Config.zig
@@ -51,6 +51,7 @@ emit_bench: bool = false,
 emit_docs: bool = false,
 emit_exe: bool = false,
 emit_helpgen: bool = false,
+emit_lib_vt: bool = false,
 emit_macos_app: bool = false,
 emit_terminfo: bool = false,
 emit_termcap: bool = false,
@@ -314,11 +315,17 @@ pub fn init(b: *std.Build, appVersion: []const u8) !Config {
     //---------------------------------------------------------------
     // Artifacts to Emit
 
+    config.emit_lib_vt = b.option(
+        bool,
+        "emit-lib-vt",
+        "Set defaults for a libghostty-vt-only build (disables xcframework, macOS app, and docs).",
+    ) orelse false;
+
     config.emit_exe = b.option(
         bool,
         "emit-exe",
         "Build and install main executables with 'build'",
-    ) orelse true;
+    ) orelse !config.emit_lib_vt;
 
     config.emit_test_exe = b.option(
         bool,
@@ -352,7 +359,8 @@ pub fn init(b: *std.Build, appVersion: []const u8) !Config {
         // If we are emitting any other artifacts then we default to false.
         if (config.emit_bench or
             config.emit_test_exe or
-            config.emit_helpgen) break :emit_docs false;
+            config.emit_helpgen or
+            config.emit_lib_vt) break :emit_docs false;
 
         // We always emit docs in system package mode.
         if (system_package) break :emit_docs true;
@@ -401,7 +409,8 @@ pub fn init(b: *std.Build, appVersion: []const u8) !Config {
         bool,
         "emit-xcframework",
         "Build and install the xcframework for the macOS library.",
-    ) orelse builtin.target.os.tag.isDarwin() and
+    ) orelse !config.emit_lib_vt and
+        builtin.target.os.tag.isDarwin() and
         target.result.os.tag == .macos and
         config.app_runtime == .none and
         (!config.emit_bench and
@@ -412,7 +421,7 @@ pub fn init(b: *std.Build, appVersion: []const u8) !Config {
         bool,
         "emit-macos-app",
         "Build and install the macOS app bundle.",
-    ) orelse config.emit_xcframework;
+    ) orelse !config.emit_lib_vt and config.emit_xcframework;
 
     //---------------------------------------------------------------
     // System Packages
diff --git a/src/build/GhosttyExe.zig b/src/build/GhosttyExe.zig
index 3e63b6026..caa564bf0 100644
--- a/src/build/GhosttyExe.zig
+++ b/src/build/GhosttyExe.zig
@@ -29,8 +29,9 @@ pub fn init(b: *std.Build, cfg: *const Config, deps: *const SharedDeps) !Ghostty
     // Set PIE if requested
     if (cfg.pie) exe.pie = true;
 
-    // Add the shared dependencies
-    _ = try deps.add(exe);
+    // Add the shared dependencies. When building only lib-vt we skip
+    // heavy deps so cross-compilation doesn't pull in GTK, etc.
+    if (!cfg.emit_lib_vt) _ = try deps.add(exe);
 
     // Check for possible issues
     try checkNixShell(exe, cfg);
diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig
index 2a1445626..bc6fb19aa 100644
--- a/src/build/SharedDeps.zig
+++ b/src/build/SharedDeps.zig
@@ -121,7 +121,7 @@ pub fn add(
     // We don't support cross-compiling to Darwin but due to the way
     // lazy dependencies work with Zig, we call this function. So we just
     // bail. The build will fail but the build would've failed anyways.
-    // And this lets other non-platform-specific targets like `lib-vt`
+    // And this lets other non-platform-specific targets like `-Demit-lib-vt`
     // cross-compile properly.
     if (!builtin.target.os.tag.isDarwin() and
         self.config.target.result.os.tag.isDarwin())

From c3b7fd8477ebbff36a379c6cc782f76cf3a5441f Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 21 Mar 2026 07:18:50 -0700
Subject: [PATCH 284/391] vt: add ghostty_build_info API for querying build
 configuration

Add a new C API function ghostty_build_info() that exposes compile-time
build options to library consumers. This allows callers to query whether
SIMD, Kitty graphics protocol, and tmux control mode support were
enabled at build time.
---
 example/c-vt-build-info/README.md     | 17 ++++++
 example/c-vt-build-info/build.zig     | 42 +++++++++++++
 example/c-vt-build-info/build.zig.zon | 24 ++++++++
 example/c-vt-build-info/src/main.c    | 23 +++++++
 include/ghostty/vt.h                  |  8 +++
 include/ghostty/vt/build_info.h       | 86 +++++++++++++++++++++++++++
 src/lib_vt.zig                        |  1 +
 src/terminal/c/build_info.zig         | 79 ++++++++++++++++++++++++
 src/terminal/c/main.zig               |  4 ++
 9 files changed, 284 insertions(+)
 create mode 100644 example/c-vt-build-info/README.md
 create mode 100644 example/c-vt-build-info/build.zig
 create mode 100644 example/c-vt-build-info/build.zig.zon
 create mode 100644 example/c-vt-build-info/src/main.c
 create mode 100644 include/ghostty/vt/build_info.h
 create mode 100644 src/terminal/c/build_info.zig

diff --git a/example/c-vt-build-info/README.md b/example/c-vt-build-info/README.md
new file mode 100644
index 000000000..08fc1cb3c
--- /dev/null
+++ b/example/c-vt-build-info/README.md
@@ -0,0 +1,17 @@
+# Example: `ghostty-vt` Build Info
+
+This contains a simple example of how to use the `ghostty-vt` build info
+API to query compile-time build configuration.
+
+This uses a `build.zig` and `Zig` to build the C program so that we
+can reuse a lot of our build logic and depend directly on our source
+tree, but Ghostty emits a standard C library that can be used with any
+C tooling.
+
+## Usage
+
+Run the program:
+
+```shell-session
+zig build run
+```
diff --git a/example/c-vt-build-info/build.zig b/example/c-vt-build-info/build.zig
new file mode 100644
index 000000000..2cd3d307a
--- /dev/null
+++ b/example/c-vt-build-info/build.zig
@@ -0,0 +1,42 @@
+const std = @import("std");
+
+pub fn build(b: *std.Build) void {
+    const target = b.standardTargetOptions(.{});
+    const optimize = b.standardOptimizeOption(.{});
+
+    const run_step = b.step("run", "Run the app");
+
+    const exe_mod = b.createModule(.{
+        .target = target,
+        .optimize = optimize,
+    });
+    exe_mod.addCSourceFiles(.{
+        .root = b.path("src"),
+        .files = &.{"main.c"},
+    });
+
+    // You'll want to use a lazy dependency here so that ghostty is only
+    // downloaded if you actually need it.
+    if (b.lazyDependency("ghostty", .{
+        // Setting simd to false will force a pure static build that
+        // doesn't even require libc, but it has a significant performance
+        // penalty. If your embedding app requires libc anyway, you should
+        // always keep simd enabled.
+        // .simd = false,
+    })) |dep| {
+        exe_mod.linkLibrary(dep.artifact("ghostty-vt"));
+    }
+
+    // Exe
+    const exe = b.addExecutable(.{
+        .name = "c_vt_build_info",
+        .root_module = exe_mod,
+    });
+    b.installArtifact(exe);
+
+    // Run
+    const run_cmd = b.addRunArtifact(exe);
+    run_cmd.step.dependOn(b.getInstallStep());
+    if (b.args) |args| run_cmd.addArgs(args);
+    run_step.dependOn(&run_cmd.step);
+}
diff --git a/example/c-vt-build-info/build.zig.zon b/example/c-vt-build-info/build.zig.zon
new file mode 100644
index 000000000..14966615a
--- /dev/null
+++ b/example/c-vt-build-info/build.zig.zon
@@ -0,0 +1,24 @@
+.{
+    .name = .c_vt_build_info,
+    .version = "0.0.0",
+    .fingerprint = 0xc6b57ed4f83fb16,
+    .minimum_zig_version = "0.15.1",
+    .dependencies = .{
+        // Ghostty dependency. In reality, you'd probably use a URL-based
+        // dependency like the one showed (and commented out) below this one.
+        // We use a path dependency here for simplicity and to ensure our
+        // examples always test against the source they're bundled with.
+        .ghostty = .{ .path = "../../" },
+
+        // Example of what a URL-based dependency looks like:
+        // .ghostty = .{
+        //     .url = "https://github.com/ghostty-org/ghostty/archive/COMMIT.tar.gz",
+        //     .hash = "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO36s",
+        // },
+    },
+    .paths = .{
+        "build.zig",
+        "build.zig.zon",
+        "src",
+    },
+}
diff --git a/example/c-vt-build-info/src/main.c b/example/c-vt-build-info/src/main.c
new file mode 100644
index 000000000..11de240c6
--- /dev/null
+++ b/example/c-vt-build-info/src/main.c
@@ -0,0 +1,23 @@
+#include <stdio.h>
+#include <ghostty/vt.h>
+
+//! [build-info-query]
+void query_build_info() {
+  bool simd = false;
+  bool kitty_graphics = false;
+  bool tmux_control_mode = false;
+
+  ghostty_build_info(GHOSTTY_BUILD_INFO_SIMD, &simd);
+  ghostty_build_info(GHOSTTY_BUILD_INFO_KITTY_GRAPHICS, &kitty_graphics);
+  ghostty_build_info(GHOSTTY_BUILD_INFO_TMUX_CONTROL_MODE, &tmux_control_mode);
+
+  printf("SIMD: %s\n", simd ? "enabled" : "disabled");
+  printf("Kitty graphics: %s\n", kitty_graphics ? "enabled" : "disabled");
+  printf("Tmux control mode: %s\n", tmux_control_mode ? "enabled" : "disabled");
+}
+//! [build-info-query]
+
+int main() {
+  query_build_info();
+  return 0;
+}
diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index 5059a0bef..55ceb430d 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -34,6 +34,7 @@
  * - @ref osc "OSC Parser" - Parse OSC (Operating System Command) sequences
  * - @ref sgr "SGR Parser" - Parse SGR (Select Graphic Rendition) sequences
  * - @ref paste "Paste Utilities" - Validate paste data safety
+ * - @ref build_info "Build Info" - Query compile-time build configuration
  * - @ref allocator "Memory Management" - Memory management and custom allocators
  * - @ref wasm "WebAssembly Utilities" - WebAssembly convenience functions
  *
@@ -45,6 +46,7 @@
  * @section examples_sec Examples
  *
  * Complete working examples:
+ * - @ref c-vt-build-info/src/main.c - Build info query example
  * - @ref c-vt/src/main.c - OSC parser example
  * - @ref c-vt-encode-key/src/main.c - Key encoding example
  * - @ref c-vt-encode-mouse/src/main.c - Mouse encoding example
@@ -55,6 +57,11 @@
  *
  */
 
+/** @example c-vt-build-info/src/main.c
+ * This example demonstrates how to query compile-time build configuration
+ * such as SIMD support, Kitty graphics, and tmux control mode availability.
+ */
+
 /** @example c-vt/src/main.c
  * This example demonstrates how to use the OSC parser to parse an OSC sequence,
  * extract command information, and retrieve command-specific data like window titles.
@@ -100,6 +107,7 @@ extern "C" {
 
 #include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
+#include <ghostty/vt/build_info.h>
 #include <ghostty/vt/color.h>
 #include <ghostty/vt/focus.h>
 #include <ghostty/vt/formatter.h>
diff --git a/include/ghostty/vt/build_info.h b/include/ghostty/vt/build_info.h
new file mode 100644
index 000000000..3737de875
--- /dev/null
+++ b/include/ghostty/vt/build_info.h
@@ -0,0 +1,86 @@
+/**
+ * @file build_info.h
+ *
+ * Build info - query compile-time build configuration of libghostty-vt.
+ */
+
+#ifndef GHOSTTY_VT_BUILD_INFO_H
+#define GHOSTTY_VT_BUILD_INFO_H
+
+/** @defgroup build_info Build Info
+ *
+ * Query compile-time build configuration of libghostty-vt.
+ *
+ * These values reflect the options the library was built with and are
+ * constant for the lifetime of the process.
+ *
+ * ## Basic Usage
+ *
+ * Use ghostty_build_info() to query individual build options:
+ *
+ * @snippet c-vt-build-info/src/main.c build-info-query
+ *
+ * @{
+ */
+
+#include <stdbool.h>
+
+#include <ghostty/vt/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Build info data types that can be queried.
+ *
+ * Each variant documents the expected output pointer type.
+ */
+typedef enum {
+  /** Invalid data type. Never results in any data extraction. */
+  GHOSTTY_BUILD_INFO_INVALID = 0,
+
+  /**
+   * Whether SIMD-accelerated code paths are enabled.
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_BUILD_INFO_SIMD = 1,
+
+  /**
+   * Whether Kitty graphics protocol support is available.
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_BUILD_INFO_KITTY_GRAPHICS = 2,
+
+  /**
+   * Whether tmux control mode support is available.
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_BUILD_INFO_TMUX_CONTROL_MODE = 3,
+} GhosttyBuildInfo;
+
+/**
+ * Query a compile-time build configuration value.
+ *
+ * The caller must pass a pointer to the correct output type for the
+ * requested data (see GhosttyBuildInfo variants for types).
+ *
+ * @param data The build info field to query
+ * @param out Pointer to store the result (type depends on data parameter)
+ * @return GHOSTTY_SUCCESS on success, GHOSTTY_INVALID_VALUE if the
+ *         data type is invalid
+ *
+ * @ingroup build_info
+ */
+GhosttyResult ghostty_build_info(GhosttyBuildInfo data, void *out);
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @} */
+
+#endif /* GHOSTTY_VT_BUILD_INFO_H */
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 6b6d0ad77..7a75bb92a 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -217,6 +217,7 @@ comptime {
         @export(&c.grid_ref_row, .{ .name = "ghostty_grid_ref_row" });
         @export(&c.grid_ref_graphemes, .{ .name = "ghostty_grid_ref_graphemes" });
         @export(&c.grid_ref_style, .{ .name = "ghostty_grid_ref_style" });
+        @export(&c.build_info, .{ .name = "ghostty_build_info" });
 
         // On Wasm we need to export our allocator convenience functions.
         if (builtin.target.cpu.arch.isWasm()) {
diff --git a/src/terminal/c/build_info.zig b/src/terminal/c/build_info.zig
new file mode 100644
index 000000000..ed67e371f
--- /dev/null
+++ b/src/terminal/c/build_info.zig
@@ -0,0 +1,79 @@
+const std = @import("std");
+const build_options = @import("terminal_options");
+const Result = @import("result.zig").Result;
+
+const log = std.log.scoped(.build_info_c);
+
+/// C: GhosttyBuildInfo
+pub const BuildInfo = enum(c_int) {
+    invalid = 0,
+    simd = 1,
+    kitty_graphics = 2,
+    tmux_control_mode = 3,
+
+    /// Output type expected for querying the data of the given kind.
+    pub fn OutType(comptime self: BuildInfo) type {
+        return switch (self) {
+            .invalid => void,
+            .simd, .kitty_graphics, .tmux_control_mode => bool,
+        };
+    }
+};
+
+pub fn get(
+    data: BuildInfo,
+    out: ?*anyopaque,
+) callconv(.c) Result {
+    if (comptime std.debug.runtime_safety) {
+        _ = std.meta.intToEnum(BuildInfo, @intFromEnum(data)) catch {
+            log.warn("build_info invalid data value={d}", .{@intFromEnum(data)});
+            return .invalid_value;
+        };
+    }
+
+    return switch (data) {
+        inline else => |comptime_data| getTyped(
+            comptime_data,
+            @ptrCast(@alignCast(out)),
+        ),
+    };
+}
+
+fn getTyped(
+    comptime data: BuildInfo,
+    out: *data.OutType(),
+) Result {
+    switch (data) {
+        .invalid => return .invalid_value,
+        .simd => out.* = build_options.simd,
+        .kitty_graphics => out.* = build_options.kitty_graphics,
+        .tmux_control_mode => out.* = build_options.tmux_control_mode,
+    }
+
+    return .success;
+}
+
+test "get simd" {
+    const testing = std.testing;
+    var value: bool = undefined;
+    try testing.expectEqual(Result.success, get(.simd, @ptrCast(&value)));
+    try testing.expectEqual(build_options.simd, value);
+}
+
+test "get kitty_graphics" {
+    const testing = std.testing;
+    var value: bool = undefined;
+    try testing.expectEqual(Result.success, get(.kitty_graphics, @ptrCast(&value)));
+    try testing.expectEqual(build_options.kitty_graphics, value);
+}
+
+test "get tmux_control_mode" {
+    const testing = std.testing;
+    var value: bool = undefined;
+    try testing.expectEqual(Result.success, get(.tmux_control_mode, @ptrCast(&value)));
+    try testing.expectEqual(build_options.tmux_control_mode, value);
+}
+
+test "get invalid" {
+    try std.testing.expectEqual(Result.invalid_value, get(.invalid, null));
+}
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index d58a81378..11e14f8c7 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -1,3 +1,4 @@
+const buildpkg = @import("build_info.zig");
 pub const cell = @import("cell.zig");
 pub const color = @import("color.zig");
 pub const focus = @import("focus.zig");
@@ -17,6 +18,8 @@ pub const style = @import("style.zig");
 pub const terminal = @import("terminal.zig");
 
 // The full C API, unexported.
+pub const build_info = buildpkg.get;
+
 pub const osc_new = osc.new;
 pub const osc_free = osc.free;
 pub const osc_reset = osc.reset;
@@ -136,6 +139,7 @@ pub const grid_ref_graphemes = grid_ref.grid_ref_graphemes;
 pub const grid_ref_style = grid_ref.grid_ref_style;
 
 test {
+    _ = buildpkg;
     _ = cell;
     _ = color;
     _ = grid_ref;

From 155bd3a58e6d18d01162614a1ac237f9b74e4a61 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 21 Mar 2026 07:31:33 -0700
Subject: [PATCH 285/391] vt: expose optimize mode in build info API

Add GHOSTTY_BUILD_INFO_OPTIMIZE to query the Zig optimization mode
(debug, release safe/small/fast) the library was compiled with. This
reads directly from builtin.mode at comptime so it requires no build
system plumbing.
---
 include/ghostty/vt/build_info.h | 17 +++++++++++++++++
 src/terminal/c/build_info.zig   | 29 +++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/include/ghostty/vt/build_info.h b/include/ghostty/vt/build_info.h
index 3737de875..8908a278c 100644
--- a/include/ghostty/vt/build_info.h
+++ b/include/ghostty/vt/build_info.h
@@ -31,6 +31,16 @@
 extern "C" {
 #endif
 
+/**
+ * Build optimization mode.
+ */
+typedef enum {
+  GHOSTTY_OPTIMIZE_DEBUG = 0,
+  GHOSTTY_OPTIMIZE_RELEASE_SAFE = 1,
+  GHOSTTY_OPTIMIZE_RELEASE_SMALL = 2,
+  GHOSTTY_OPTIMIZE_RELEASE_FAST = 3,
+} GhosttyOptimizeMode;
+
 /**
  * Build info data types that can be queried.
  *
@@ -60,6 +70,13 @@ typedef enum {
    * Output type: bool *
    */
   GHOSTTY_BUILD_INFO_TMUX_CONTROL_MODE = 3,
+
+  /**
+   * The optimization mode the library was built with.
+   *
+   * Output type: GhosttyOptimizeMode *
+   */
+  GHOSTTY_BUILD_INFO_OPTIMIZE = 4,
 } GhosttyBuildInfo;
 
 /**
diff --git a/src/terminal/c/build_info.zig b/src/terminal/c/build_info.zig
index ed67e371f..d65a3b562 100644
--- a/src/terminal/c/build_info.zig
+++ b/src/terminal/c/build_info.zig
@@ -1,21 +1,32 @@
 const std = @import("std");
+const builtin = @import("builtin");
 const build_options = @import("terminal_options");
 const Result = @import("result.zig").Result;
 
 const log = std.log.scoped(.build_info_c);
 
+/// C: GhosttyOptimizeMode
+pub const OptimizeMode = enum(c_int) {
+    debug = 0,
+    release_safe = 1,
+    release_small = 2,
+    release_fast = 3,
+};
+
 /// C: GhosttyBuildInfo
 pub const BuildInfo = enum(c_int) {
     invalid = 0,
     simd = 1,
     kitty_graphics = 2,
     tmux_control_mode = 3,
+    optimize = 4,
 
     /// Output type expected for querying the data of the given kind.
     pub fn OutType(comptime self: BuildInfo) type {
         return switch (self) {
             .invalid => void,
             .simd, .kitty_graphics, .tmux_control_mode => bool,
+            .optimize => OptimizeMode,
         };
     }
 };
@@ -48,6 +59,12 @@ fn getTyped(
         .simd => out.* = build_options.simd,
         .kitty_graphics => out.* = build_options.kitty_graphics,
         .tmux_control_mode => out.* = build_options.tmux_control_mode,
+        .optimize => out.* = switch (builtin.mode) {
+            .Debug => .debug,
+            .ReleaseSafe => .release_safe,
+            .ReleaseSmall => .release_small,
+            .ReleaseFast => .release_fast,
+        },
     }
 
     return .success;
@@ -74,6 +91,18 @@ test "get tmux_control_mode" {
     try testing.expectEqual(build_options.tmux_control_mode, value);
 }
 
+test "get optimize" {
+    const testing = std.testing;
+    var value: OptimizeMode = undefined;
+    try testing.expectEqual(Result.success, get(.optimize, @ptrCast(&value)));
+    try testing.expectEqual(switch (builtin.mode) {
+        .Debug => .debug,
+        .ReleaseSafe => .release_safe,
+        .ReleaseSmall => .release_small,
+        .ReleaseFast => .release_fast,
+    }, value);
+}
+
 test "get invalid" {
     try std.testing.expectEqual(Result.invalid_value, get(.invalid, null));
 }

From 918840cf1d1d617d1c8bb63f738a56ca7c6f165d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 21 Mar 2026 11:14:58 -0700
Subject: [PATCH 286/391] vt: persist VT stream state across vt_write calls

Previously, every call to vt_write created a fresh ReadonlyStream with
new Parser and UTF8Decoder state. This meant escape sequences split
across write boundaries (e.g. ESC in one write, [27m in the next)
would lose parser state, causing the second write to start in ground
state and print the CSI parameters as literal text.

The C API now stores a persistent ReadonlyStream in the TerminalWrapper
struct, which is created when the Terminal is initialized. The vt_write
function feeds bytes through this stored stream, allowing it to maintain
parser state across calls. This change ensures that escape sequences
split across write boundaries are correctly parsed and rendered.
---
 src/terminal/Terminal.zig       |  5 ++
 src/terminal/c/formatter.zig    |  2 +-
 src/terminal/c/key_encode.zig   |  3 +-
 src/terminal/c/mouse_encode.zig |  3 +-
 src/terminal/c/render.zig       |  3 +-
 src/terminal/c/terminal.zig     | 87 ++++++++++++++++++++++++---------
 6 files changed, 77 insertions(+), 26 deletions(-)

diff --git a/src/terminal/Terminal.zig b/src/terminal/Terminal.zig
index 636a8f2ee..a0ebe8a07 100644
--- a/src/terminal/Terminal.zig
+++ b/src/terminal/Terminal.zig
@@ -239,6 +239,11 @@ pub fn deinit(self: *Terminal, alloc: Allocator) void {
 /// terminal state. The streams will only process read-only data that
 /// modifies terminal state. Sequences that query or otherwise require
 /// output will be ignored.
+///
+/// Important: this creates a new stream each time with fresh parser state.
+/// If you need to persist parser state across multiple writes (e.g.
+/// for handling escape sequences split across write boundaries), you
+/// must store and reuse the returned stream.
 pub fn vtStream(self: *Terminal) ReadonlyStream {
     return .initAlloc(self.gpa(), self.vtHandler());
 }
diff --git a/src/terminal/c/formatter.zig b/src/terminal/c/formatter.zig
index 511d371f8..a768287ad 100644
--- a/src/terminal/c/formatter.zig
+++ b/src/terminal/c/formatter.zig
@@ -124,7 +124,7 @@ fn terminal_new_(
     InvalidValue,
     OutOfMemory,
 }!*FormatterWrapper {
-    const t = terminal_ orelse return error.InvalidValue;
+    const t: *ZigTerminal = (terminal_ orelse return error.InvalidValue).terminal;
 
     const alloc = lib_alloc.default(alloc_);
     const ptr = alloc.create(FormatterWrapper) catch
diff --git a/src/terminal/c/key_encode.zig b/src/terminal/c/key_encode.zig
index 58405876f..2cdb765af 100644
--- a/src/terminal/c/key_encode.zig
+++ b/src/terminal/c/key_encode.zig
@@ -9,6 +9,7 @@ const OptionAsAlt = @import("../../input/config.zig").OptionAsAlt;
 const Result = @import("result.zig").Result;
 const KeyEvent = @import("key_event.zig").Event;
 const Terminal = @import("terminal.zig").Terminal;
+const ZigTerminal = @import("../Terminal.zig");
 
 const log = std.log.scoped(.key_encode);
 
@@ -121,7 +122,7 @@ pub fn setopt_from_terminal(
     terminal_: Terminal,
 ) callconv(.c) void {
     const wrapper = encoder_ orelse return;
-    const t = terminal_ orelse return;
+    const t: *ZigTerminal = (terminal_ orelse return).terminal;
     wrapper.opts = .fromTerminal(t);
 }
 
diff --git a/src/terminal/c/mouse_encode.zig b/src/terminal/c/mouse_encode.zig
index 963e296bd..224b64837 100644
--- a/src/terminal/c/mouse_encode.zig
+++ b/src/terminal/c/mouse_encode.zig
@@ -11,6 +11,7 @@ const mouse_event = @import("mouse_event.zig");
 const Result = @import("result.zig").Result;
 const Event = mouse_event.Event;
 const Terminal = @import("terminal.zig").Terminal;
+const ZigTerminal = @import("../Terminal.zig");
 
 const log = std.log.scoped(.mouse_encode);
 
@@ -188,7 +189,7 @@ pub fn setopt_from_terminal(
     terminal_: Terminal,
 ) callconv(.c) void {
     const wrapper = encoder_ orelse return;
-    const t = terminal_ orelse return;
+    const t: *ZigTerminal = (terminal_ orelse return).terminal;
     wrapper.opts.event = t.flags.mouse_event;
     wrapper.opts.format = t.flags.mouse_format;
     wrapper.last_cell = null;
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index b7f2fca0a..0daf6abbe 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -10,6 +10,7 @@ const page = @import("../page.zig");
 const size = @import("../size.zig");
 const Style = @import("../style.zig").Style;
 const terminal_c = @import("terminal.zig");
+const ZigTerminal = @import("../Terminal.zig");
 const renderpkg = @import("../render.zig");
 const Result = @import("result.zig").Result;
 const row = @import("row.zig");
@@ -166,7 +167,7 @@ pub fn update(
     terminal_: terminal_c.Terminal,
 ) callconv(.c) Result {
     const state = state_ orelse return .invalid_value;
-    const t = terminal_ orelse return .invalid_value;
+    const t: *ZigTerminal = (terminal_ orelse return .invalid_value).terminal;
 
     state.state.update(state.alloc, t) catch return .out_of_memory;
     return .success;
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index ad560dc1a..2a2fe0ae6 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -3,6 +3,7 @@ const testing = std.testing;
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const ZigTerminal = @import("../Terminal.zig");
+const ReadonlyStream = @import("../stream_readonly.zig").Stream;
 const ScreenSet = @import("../ScreenSet.zig");
 const PageList = @import("../PageList.zig");
 const kitty = @import("../kitty/key.zig");
@@ -17,8 +18,16 @@ const Result = @import("result.zig").Result;
 
 const log = std.log.scoped(.terminal_c);
 
+/// Wrapper around ZigTerminal that tracks additional state for C API usage,
+/// such as the persistent VT stream needed to handle escape sequences split
+/// across multiple vt_write calls.
+const TerminalWrapper = struct {
+    terminal: *ZigTerminal,
+    stream: ReadonlyStream,
+};
+
 /// C: GhosttyTerminal
-pub const Terminal = ?*ZigTerminal;
+pub const Terminal = ?*TerminalWrapper;
 
 /// C: GhosttyTerminalOptions
 pub const Options = extern struct {
@@ -51,21 +60,28 @@ pub fn new(
 fn new_(
     alloc_: ?*const CAllocator,
     opts: Options,
-) NewError!*ZigTerminal {
+) NewError!*TerminalWrapper {
     if (opts.cols == 0 or opts.rows == 0) return error.InvalidValue;
 
     const alloc = lib_alloc.default(alloc_);
-    const ptr = alloc.create(ZigTerminal) catch
+    const t = alloc.create(ZigTerminal) catch
         return error.OutOfMemory;
-    errdefer alloc.destroy(ptr);
+    errdefer alloc.destroy(t);
 
-    ptr.* = try .init(alloc, .{
+    t.* = try .init(alloc, .{
         .cols = opts.cols,
         .rows = opts.rows,
         .max_scrollback = opts.max_scrollback,
     });
 
-    return ptr;
+    const wrapper = alloc.create(TerminalWrapper) catch
+        return error.OutOfMemory;
+    wrapper.* = .{
+        .terminal = t,
+        .stream = t.vtStream(),
+    };
+
+    return wrapper;
 }
 
 pub fn vt_write(
@@ -73,9 +89,8 @@ pub fn vt_write(
     ptr: [*]const u8,
     len: usize,
 ) callconv(.c) void {
-    const t = terminal_ orelse return;
-    var stream = t.vtStream();
-    stream.nextSlice(ptr[0..len]);
+    const wrapper = terminal_ orelse return;
+    wrapper.stream.nextSlice(ptr[0..len]);
 }
 
 /// C: GhosttyTerminalScrollViewport
@@ -85,7 +100,7 @@ pub fn scroll_viewport(
     terminal_: Terminal,
     behavior: ScrollViewport,
 ) callconv(.c) void {
-    const t = terminal_ orelse return;
+    const t: *ZigTerminal = (terminal_ orelse return).terminal;
     t.scrollViewport(switch (behavior.tag) {
         .top => .top,
         .bottom => .bottom,
@@ -98,14 +113,14 @@ pub fn resize(
     cols: size.CellCountInt,
     rows: size.CellCountInt,
 ) callconv(.c) Result {
-    const t = terminal_ orelse return .invalid_value;
+    const t: *ZigTerminal = (terminal_ orelse return .invalid_value).terminal;
     if (cols == 0 or rows == 0) return .invalid_value;
     t.resize(t.gpa(), cols, rows) catch return .out_of_memory;
     return .success;
 }
 
 pub fn reset(terminal_: Terminal) callconv(.c) void {
-    const t = terminal_ orelse return;
+    const t: *ZigTerminal = (terminal_ orelse return).terminal;
     t.fullReset();
 }
 
@@ -114,7 +129,7 @@ pub fn mode_get(
     tag: modes.ModeTag.Backing,
     out_value: *bool,
 ) callconv(.c) Result {
-    const t = terminal_ orelse return .invalid_value;
+    const t: *ZigTerminal = (terminal_ orelse return .invalid_value).terminal;
     const mode_tag: modes.ModeTag = @bitCast(tag);
     const mode = modes.modeFromInt(mode_tag.value, mode_tag.ansi) orelse return .invalid_value;
     out_value.* = t.modes.get(mode);
@@ -126,7 +141,7 @@ pub fn mode_set(
     tag: modes.ModeTag.Backing,
     value: bool,
 ) callconv(.c) Result {
-    const t = terminal_ orelse return .invalid_value;
+    const t: *ZigTerminal = (terminal_ orelse return .invalid_value).terminal;
     const mode_tag: modes.ModeTag = @bitCast(tag);
     const mode = modes.modeFromInt(mode_tag.value, mode_tag.ansi) orelse return .invalid_value;
     t.modes.set(mode, value);
@@ -193,7 +208,7 @@ fn getTyped(
     comptime data: TerminalData,
     out: *data.OutType(),
 ) Result {
-    const t = terminal_ orelse return .invalid_value;
+    const t: *ZigTerminal = (terminal_ orelse return .invalid_value).terminal;
     switch (data) {
         .invalid => return .invalid_value,
         .cols => out.* = t.cols,
@@ -216,7 +231,7 @@ pub fn grid_ref(
     pt: point.Point.C,
     out_ref: ?*grid_ref_c.CGridRef,
 ) callconv(.c) Result {
-    const t = terminal_ orelse return .invalid_value;
+    const t: *ZigTerminal = (terminal_ orelse return .invalid_value).terminal;
     const zig_pt: point.Point = switch (pt.tag) {
         .active => .{ .active = pt.value.active },
         .viewport => .{ .viewport = pt.value.viewport },
@@ -230,11 +245,14 @@ pub fn grid_ref(
 }
 
 pub fn free(terminal_: Terminal) callconv(.c) void {
-    const t = terminal_ orelse return;
+    const wrapper = terminal_ orelse return;
+    const t = wrapper.terminal;
 
+    wrapper.stream.deinit();
     const alloc = t.gpa();
     t.deinit(alloc);
     alloc.destroy(t);
+    alloc.destroy(wrapper);
 }
 
 test "new/free" {
@@ -296,7 +314,7 @@ test "scroll_viewport" {
     ));
     defer free(t);
 
-    const zt = t.?;
+    const zt = t.?.terminal;
 
     // Write "hello" on the first line
     vt_write(t, "hello", 5);
@@ -355,7 +373,7 @@ test "reset" {
     vt_write(t, "Hello", 5);
     reset(t);
 
-    const str = try t.?.plainString(testing.allocator);
+    const str = try t.?.terminal.plainString(testing.allocator);
     defer testing.allocator.free(str);
     try testing.expectEqualStrings("", str);
 }
@@ -378,8 +396,8 @@ test "resize" {
     defer free(t);
 
     try testing.expectEqual(Result.success, resize(t, 40, 12));
-    try testing.expectEqual(40, t.?.cols);
-    try testing.expectEqual(12, t.?.rows);
+    try testing.expectEqual(40, t.?.terminal.cols);
+    try testing.expectEqual(12, t.?.terminal.rows);
 }
 
 test "resize null" {
@@ -499,11 +517,36 @@ test "vt_write" {
 
     vt_write(t, "Hello", 5);
 
-    const str = try t.?.plainString(testing.allocator);
+    const str = try t.?.terminal.plainString(testing.allocator);
     defer testing.allocator.free(str);
     try testing.expectEqualStrings("Hello", str);
 }
 
+test "vt_write split escape sequence" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer free(t);
+
+    // Write "Hello" in bold by splitting the CSI bold sequence across two writes.
+    // ESC [ 1 m  = bold on, ESC [ 0 m = reset
+    // Split ESC from the rest of the CSI sequence.
+    vt_write(t, "Hello \x1b", 7);
+    vt_write(t, "[1mBold\x1b[0m", 10);
+
+    const str = try t.?.terminal.plainString(testing.allocator);
+    defer testing.allocator.free(str);
+    // If the escape sequence leaked, we'd see "[1mBold" as literal text.
+    try testing.expectEqualStrings("Hello Bold", str);
+}
+
 test "get cols and rows" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(

From 1438a2fe4bea11e31d36f106e6191f2796595121 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Sat, 21 Mar 2026 20:57:07 +0000
Subject: [PATCH 287/391] Update VOUCHED list (#11731)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11729#issuecomment-4104386360)
from @mitchellh.

Vouch: @turbolent

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 7e4187bfb..eaeaa84c8 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -176,6 +176,7 @@ ticclick
 tnagatomi
 trag1c
 tristan957
+turbolent
 tweedbeetle
 uhojin
 unphased

From 8d6be5a3dd7e7a88670deb953b03532b22106758 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 21 Mar 2026 14:33:09 -0700
Subject: [PATCH 288/391] build: add static library target for libghostty-vt

Refactor GhosttyLibVt to support both shared and static library
builds via a shared initLib helper that accepts a LinkMode. The
shared and static entry points (initShared, initStatic) delegate
to this common path.

For static builds, compiler_rt and ubsan_rt are bundled to avoid
undefined symbol errors. Debug symbols (dsymutil) are skipped for
static libs since they are not linked. The install artifact uses
a "-static" suffix internally but installs as "libghostty-vt.a"
via a new installLib method. Wasm is excluded from static builds
since it has no meaningful static vs shared distinction.
---
 build.zig                         | 23 ++++++++++++++
 example/c-vt-static/README.md     | 18 +++++++++++
 example/c-vt-static/build.zig     | 44 ++++++++++++++++++++++++++
 example/c-vt-static/build.zig.zon | 24 ++++++++++++++
 example/c-vt-static/src/main.c    | 36 +++++++++++++++++++++
 src/build/Config.zig              | 13 ++++++--
 src/build/GhosttyLibVt.zig        | 52 +++++++++++++++++++++++++++----
 7 files changed, 201 insertions(+), 9 deletions(-)
 create mode 100644 example/c-vt-static/README.md
 create mode 100644 example/c-vt-static/build.zig
 create mode 100644 example/c-vt-static/build.zig.zon
 create mode 100644 example/c-vt-static/src/main.c

diff --git a/build.zig b/build.zig
index 037b46d71..e267fe79a 100644
--- a/build.zig
+++ b/build.zig
@@ -106,6 +106,29 @@ pub fn build(b: *std.Build) !void {
     };
     libghostty_vt_shared.install(b.getInstallStep());
 
+    // libghostty-vt static lib. We don't build this for wasm since wasm has
+    // no concept of static vs shared and we put the wasm binary up in
+    // our shared handling.
+    if (!config.target.result.cpu.arch.isWasm()) {
+        const libghostty_vt_static = try buildpkg.GhosttyLibVt.initStatic(
+            b,
+            &mod,
+        );
+
+        if (config.is_dep) {
+            // If we're a dependency, we need to install everything as-is
+            // so that dep.artifact("ghostty-vt-static") works.
+            libghostty_vt_static.install(b.getInstallStep());
+        } else {
+            // If we're not a dependency, we rename the static lib to
+            // be idiomatic.
+            b.getInstallStep().dependOn(&b.addInstallLibFile(
+                libghostty_vt_static.output,
+                "libghostty-vt.a",
+            ).step);
+        }
+    }
+
     // Helpgen
     if (config.emit_helpgen) deps.help_strings.install();
 
diff --git a/example/c-vt-static/README.md b/example/c-vt-static/README.md
new file mode 100644
index 000000000..52da4ddb0
--- /dev/null
+++ b/example/c-vt-static/README.md
@@ -0,0 +1,18 @@
+# Example: `ghostty-vt` Static Linking
+
+This contains a simple example of how to statically link the `ghostty-vt`
+C library with a C program using the `ghostty-vt-static` artifact. It is
+otherwise identical to the `c-vt` example.
+
+This uses a `build.zig` and `Zig` to build the C program so that we
+can reuse a lot of our build logic and depend directly on our source
+tree, but Ghostty emits a standard C library that can be used with any
+C tooling.
+
+## Usage
+
+Run the program:
+
+```shell-session
+zig build run
+```
diff --git a/example/c-vt-static/build.zig b/example/c-vt-static/build.zig
new file mode 100644
index 000000000..0e53d69c5
--- /dev/null
+++ b/example/c-vt-static/build.zig
@@ -0,0 +1,44 @@
+const std = @import("std");
+
+pub fn build(b: *std.Build) void {
+    const target = b.standardTargetOptions(.{});
+    const optimize = b.standardOptimizeOption(.{});
+
+    const run_step = b.step("run", "Run the app");
+
+    const exe_mod = b.createModule(.{
+        .target = target,
+        .optimize = optimize,
+    });
+    exe_mod.addCSourceFiles(.{
+        .root = b.path("src"),
+        .files = &.{"main.c"},
+    });
+
+    // You'll want to use a lazy dependency here so that ghostty is only
+    // downloaded if you actually need it.
+    if (b.lazyDependency("ghostty", .{
+        // Setting simd to false will force a pure static build that
+        // doesn't even require libc, but it has a significant performance
+        // penalty. If your embedding app requires libc anyway, you should
+        // always keep simd enabled.
+        // .simd = false,
+    })) |dep| {
+        // Use "ghostty-vt-static" for static linking instead of
+        // "ghostty-vt" which provides a shared library.
+        exe_mod.linkLibrary(dep.artifact("ghostty-vt-static"));
+    }
+
+    // Exe
+    const exe = b.addExecutable(.{
+        .name = "c_vt_static",
+        .root_module = exe_mod,
+    });
+    b.installArtifact(exe);
+
+    // Run
+    const run_cmd = b.addRunArtifact(exe);
+    run_cmd.step.dependOn(b.getInstallStep());
+    if (b.args) |args| run_cmd.addArgs(args);
+    run_step.dependOn(&run_cmd.step);
+}
diff --git a/example/c-vt-static/build.zig.zon b/example/c-vt-static/build.zig.zon
new file mode 100644
index 000000000..413bf66fb
--- /dev/null
+++ b/example/c-vt-static/build.zig.zon
@@ -0,0 +1,24 @@
+.{
+    .name = .c_vt_static,
+    .version = "0.0.0",
+    .fingerprint = 0xa592a9fdd5d87ed2,
+    .minimum_zig_version = "0.15.1",
+    .dependencies = .{
+        // Ghostty dependency. In reality, you'd probably use a URL-based
+        // dependency like the one showed (and commented out) below this one.
+        // We use a path dependency here for simplicity and to ensure our
+        // examples always test against the source they're bundled with.
+        .ghostty = .{ .path = "../../" },
+
+        // Example of what a URL-based dependency looks like:
+        // .ghostty = .{
+        //     .url = "https://github.com/ghostty-org/ghostty/archive/COMMIT.tar.gz",
+        //     .hash = "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO36s",
+        // },
+    },
+    .paths = .{
+        "build.zig",
+        "build.zig.zon",
+        "src",
+    },
+}
diff --git a/example/c-vt-static/src/main.c b/example/c-vt-static/src/main.c
new file mode 100644
index 000000000..b1297d7a7
--- /dev/null
+++ b/example/c-vt-static/src/main.c
@@ -0,0 +1,36 @@
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <ghostty/vt.h>
+
+int main() {
+  GhosttyOscParser parser;
+  if (ghostty_osc_new(NULL, &parser) != GHOSTTY_SUCCESS) {
+    return 1;
+  }
+  
+  // Setup change window title command to change the title to "hello"
+  ghostty_osc_next(parser, '0');
+  ghostty_osc_next(parser, ';');
+  const char *title = "hello";
+  for (size_t i = 0; i < strlen(title); i++) {
+    ghostty_osc_next(parser, title[i]);
+  }
+  
+  // End parsing and get command
+  GhosttyOscCommand command = ghostty_osc_end(parser, 0);
+  
+  // Get and print command type
+  GhosttyOscCommandType type = ghostty_osc_command_type(command);
+  printf("Command type: %d\n", type);
+  
+  // Extract and print the title
+  if (ghostty_osc_command_data(command, GHOSTTY_OSC_DATA_CHANGE_WINDOW_TITLE_STR, &title)) {
+    printf("Extracted title: %s\n", title);
+  } else {
+    printf("Failed to extract title\n");
+  }
+  
+  ghostty_osc_free(parser);
+  return 0;
+}
diff --git a/src/build/Config.zig b/src/build/Config.zig
index 5789e9f92..53d3c737b 100644
--- a/src/build/Config.zig
+++ b/src/build/Config.zig
@@ -61,6 +61,10 @@ emit_xcframework: bool = false,
 emit_webdata: bool = false,
 emit_unicode_table_gen: bool = false,
 
+/// True when Ghostty is being built as a dependency of another project
+/// rather than as the root project.
+is_dep: bool = false,
+
 /// Environmental properties
 env: std.process.EnvMap,
 
@@ -88,6 +92,10 @@ pub fn init(b: *std.Build, appVersion: []const u8) !Config {
         break :target result;
     };
 
+    // Detect if Ghostty is a dependency of another project.
+    // dep_prefix is non-empty when this build is running as a dependency.
+    const is_dep = b.dep_prefix.len > 0;
+
     // This is set to true when we're building a system package. For now
     // this is trivially detected using the "system_package_mode" bool
     // but we may want to make this more sophisticated in the future.
@@ -110,6 +118,7 @@ pub fn init(b: *std.Build, appVersion: []const u8) !Config {
         .optimize = optimize,
         .target = target,
         .wasm_target = wasm_target,
+        .is_dep = is_dep,
         .env = env,
     };
 
@@ -221,9 +230,7 @@ pub fn init(b: *std.Build, appVersion: []const u8) !Config {
         const app_version = try std.SemanticVersion.parse(appVersion);
 
         // Is ghostty a dependency? If so, skip git detection.
-        // @src().file won't resolve from b.build_root unless ghostty
-        // is the project being built.
-        b.build_root.handle.access(@src().file, .{}) catch break :version .{
+        if (is_dep) break :version .{
             .major = app_version.major,
             .minor = app_version.minor,
             .patch = app_version.patch,
diff --git a/src/build/GhosttyLibVt.zig b/src/build/GhosttyLibVt.zig
index 6d44c62b6..ba3881496 100644
--- a/src/build/GhosttyLibVt.zig
+++ b/src/build/GhosttyLibVt.zig
@@ -12,11 +12,22 @@ step: *std.Build.Step,
 /// The artifact result
 artifact: *std.Build.Step.InstallArtifact,
 
+/// The kind of library
+kind: Kind,
+
 /// The final library file
 output: std.Build.LazyPath,
 dsym: ?std.Build.LazyPath,
 pkg_config: ?std.Build.LazyPath,
 
+/// The kind of library being built. This is similar to LinkMode but
+/// also includes wasm which is an executable, not a library.
+const Kind = enum {
+    wasm,
+    shared,
+    static,
+};
+
 pub fn initWasm(
     b: *std.Build,
     zig: *const GhosttyZig,
@@ -39,20 +50,40 @@ pub fn initWasm(
     return .{
         .step = &exe.step,
         .artifact = b.addInstallArtifact(exe, .{}),
+        .kind = .wasm,
         .output = exe.getEmittedBin(),
         .dsym = null,
         .pkg_config = null,
     };
 }
 
+pub fn initStatic(
+    b: *std.Build,
+    zig: *const GhosttyZig,
+) !GhosttyLibVt {
+    return initLib(b, zig, .static);
+}
+
 pub fn initShared(
     b: *std.Build,
     zig: *const GhosttyZig,
 ) !GhosttyLibVt {
+    return initLib(b, zig, .dynamic);
+}
+
+fn initLib(
+    b: *std.Build,
+    zig: *const GhosttyZig,
+    linkage: std.builtin.LinkMode,
+) !GhosttyLibVt {
+    const kind: Kind = switch (linkage) {
+        .static => .static,
+        .dynamic => .shared,
+    };
     const target = zig.vt.resolved_target.?;
     const lib = b.addLibrary(.{
-        .name = "ghostty-vt",
-        .linkage = .dynamic,
+        .name = if (kind == .static) "ghostty-vt-static" else "ghostty-vt",
+        .linkage = linkage,
         .root_module = zig.vt_c,
         .version = std.SemanticVersion{ .major = 0, .minor = 1, .patch = 0 },
     });
@@ -62,6 +93,15 @@ pub fn initShared(
         .{ .include_extensions = &.{".h"} },
     );
 
+    if (kind == .static) {
+        // These must be bundled since we're compiling into a static lib.
+        // Otherwise, you get undefined symbol errors. This could cause
+        // problems if you're linking multiple static Zig libraries but
+        // we'll cross that bridge when we get to it.
+        lib.bundle_compiler_rt = true;
+        lib.bundle_ubsan_rt = true;
+    }
+
     if (lib.rootModuleTarget().abi.isAndroid()) {
         // Support 16kb page sizes, required for Android 15+.
         lib.link_z_max_page_size = 16384; // 16kb
@@ -82,11 +122,10 @@ pub fn initShared(
         if (builtin.os.tag.isDarwin()) try @import("apple_sdk").addPaths(b, lib);
     }
 
-    // Get our debug symbols
+    // Get our debug symbols (only for shared libs; static libs aren't linked)
     const dsymutil: ?std.Build.LazyPath = dsymutil: {
-        if (!target.result.os.tag.isDarwin()) {
-            break :dsymutil null;
-        }
+        if (kind != .shared) break :dsymutil null;
+        if (!target.result.os.tag.isDarwin()) break :dsymutil null;
 
         const dsymutil = RunStep.create(b, "dsymutil");
         dsymutil.addArgs(&.{"dsymutil"});
@@ -116,6 +155,7 @@ pub fn initShared(
     return .{
         .step = &lib.step,
         .artifact = b.addInstallArtifact(lib, .{}),
+        .kind = kind,
         .output = lib.getEmittedBin(),
         .dsym = dsymutil,
         .pkg_config = pc,

From 555bf7e92292b40b3d5b6b450bf8b92c99fd174c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 21 Mar 2026 15:05:23 -0700
Subject: [PATCH 289/391] build: add cmake static library support

Expose both shared and static libraries as separate CMake imported
targets (ghostty-vt and ghostty-vt-static) rather than toggling
between them with BUILD_SHARED_LIBS. The zig build already produces
both in a single invocation, so both are always available.

The find_package config template is updated to export both targets
as ghostty-vt::ghostty-vt and ghostty-vt::ghostty-vt-static.

Add a c-vt-cmake-static example that demonstrates linking the static
library via FetchContent with -Dsimd=false to avoid C++ runtime
dependencies.
---
 CMakeLists.txt                           | 53 ++++++++++++++++++------
 dist/cmake/ghostty-vt-config.cmake.in    | 24 +++++++++--
 example/c-vt-cmake-static/CMakeLists.txt | 13 ++++++
 example/c-vt-cmake-static/README.md      | 21 ++++++++++
 example/c-vt-cmake-static/src/main.c     | 52 +++++++++++++++++++++++
 5 files changed, 147 insertions(+), 16 deletions(-)
 create mode 100644 example/c-vt-cmake-static/CMakeLists.txt
 create mode 100644 example/c-vt-cmake-static/README.md
 create mode 100644 example/c-vt-cmake-static/src/main.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87925751e..cfa2677fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,8 @@
 #   )
 #   FetchContent_MakeAvailable(ghostty)
 #
-#   target_link_libraries(myapp PRIVATE ghostty-vt)
+#   target_link_libraries(myapp PRIVATE ghostty-vt)        # shared
+#   target_link_libraries(myapp PRIVATE ghostty-vt-static) # static
 #
 # To use a local checkout instead of fetching:
 #
@@ -40,7 +41,8 @@
 # Option 2 — find_package (after installing to a prefix):
 #
 #   find_package(ghostty-vt REQUIRED)
-#   target_link_libraries(myapp PRIVATE ghostty-vt::ghostty-vt)
+#   target_link_libraries(myapp PRIVATE ghostty-vt::ghostty-vt)        # shared
+#   target_link_libraries(myapp PRIVATE ghostty-vt::ghostty-vt-static) # static
 #
 # See dist/cmake/README.md for more details and example/c-vt-cmake/ for a
 # complete working example.
@@ -71,7 +73,7 @@ message(STATUS "Found zig: ${ZIG_EXECUTABLE}")
 # The zig build installs into zig-out/ relative to the source tree.
 set(ZIG_OUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zig-out")
 
-# The library file that zig build produces.
+# Shared library names (zig build produces both shared and static).
 if(APPLE)
     set(GHOSTTY_VT_LIBNAME "${CMAKE_SHARED_LIBRARY_PREFIX}ghostty-vt${CMAKE_SHARED_LIBRARY_SUFFIX}")
     set(GHOSTTY_VT_SONAME "${CMAKE_SHARED_LIBRARY_PREFIX}ghostty-vt.0${CMAKE_SHARED_LIBRARY_SUFFIX}")
@@ -85,28 +87,35 @@ else()
     set(GHOSTTY_VT_REALNAME "${CMAKE_SHARED_LIBRARY_PREFIX}ghostty-vt${CMAKE_SHARED_LIBRARY_SUFFIX}.0.1.0")
 endif()
 
-set(GHOSTTY_VT_LIBRARY "${ZIG_OUT_DIR}/lib/${GHOSTTY_VT_REALNAME}")
+set(GHOSTTY_VT_SHARED_LIBRARY "${ZIG_OUT_DIR}/lib/${GHOSTTY_VT_REALNAME}")
+
+# Static library name.
+set(GHOSTTY_VT_STATIC_REALNAME "${CMAKE_STATIC_LIBRARY_PREFIX}ghostty-vt${CMAKE_STATIC_LIBRARY_SUFFIX}")
+set(GHOSTTY_VT_STATIC_LIBRARY "${ZIG_OUT_DIR}/lib/${GHOSTTY_VT_STATIC_REALNAME}")
 
 # Ensure the output directories exist so CMake doesn't reject the
 # INTERFACE_INCLUDE_DIRECTORIES before the zig build has run.
 file(MAKE_DIRECTORY "${ZIG_OUT_DIR}/include")
 
-# Custom command: run zig build -Demit-lib-vt
+# Custom command: run zig build -Demit-lib-vt (produces both shared and static)
 add_custom_command(
-    OUTPUT "${GHOSTTY_VT_LIBRARY}"
+    OUTPUT "${GHOSTTY_VT_SHARED_LIBRARY}" "${GHOSTTY_VT_STATIC_LIBRARY}"
     COMMAND "${ZIG_EXECUTABLE}" build -Demit-lib-vt ${GHOSTTY_ZIG_BUILD_FLAGS}
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     COMMENT "Building libghostty-vt via zig build..."
     USES_TERMINAL
 )
 
-add_custom_target(zig_build_lib_vt ALL DEPENDS "${GHOSTTY_VT_LIBRARY}")
+add_custom_target(zig_build_lib_vt ALL
+    DEPENDS "${GHOSTTY_VT_SHARED_LIBRARY}" "${GHOSTTY_VT_STATIC_LIBRARY}"
+)
 
-# --- IMPORTED library target --------------------------------------------------
+# --- IMPORTED library targets ------------------------------------------------
 
+# Shared
 add_library(ghostty-vt SHARED IMPORTED GLOBAL)
 set_target_properties(ghostty-vt PROPERTIES
-    IMPORTED_LOCATION "${GHOSTTY_VT_LIBRARY}"
+    IMPORTED_LOCATION "${GHOSTTY_VT_SHARED_LIBRARY}"
     INTERFACE_INCLUDE_DIRECTORIES "${ZIG_OUT_DIR}/include"
 )
 if(APPLE)
@@ -118,15 +127,32 @@ elseif(NOT WIN32)
         IMPORTED_SONAME "${GHOSTTY_VT_SONAME}"
     )
 endif()
-
 add_dependencies(ghostty-vt zig_build_lib_vt)
 
+# Static
+#
+# When linking the static library, consumers must also link its transitive
+# dependencies. By default (with SIMD enabled), these are:
+#   - libc
+#   - libc++ (or libstdc++ on Linux)
+#   - highway
+#   - simdutf
+#
+# Building with -Dsimd=false removes the C++ / highway / simdutf
+# dependencies, leaving only libc.
+add_library(ghostty-vt-static STATIC IMPORTED GLOBAL)
+set_target_properties(ghostty-vt-static PROPERTIES
+    IMPORTED_LOCATION "${GHOSTTY_VT_STATIC_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${ZIG_OUT_DIR}/include"
+)
+add_dependencies(ghostty-vt-static zig_build_lib_vt)
+
 # --- Install ------------------------------------------------------------------
 
 include(GNUInstallDirs)
 
-# Install the library
-install(FILES "${GHOSTTY_VT_LIBRARY}" TYPE LIB)
+# Install shared library
+install(FILES "${GHOSTTY_VT_SHARED_LIBRARY}" TYPE LIB)
 if(NOT WIN32)
     # Install symlinks
     install(CODE "
@@ -139,6 +165,9 @@ if(NOT WIN32)
     ")
 endif()
 
+# Install static library
+install(FILES "${GHOSTTY_VT_STATIC_LIBRARY}" TYPE LIB)
+
 # Install headers
 install(DIRECTORY "${ZIG_OUT_DIR}/include/ghostty" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 
diff --git a/dist/cmake/ghostty-vt-config.cmake.in b/dist/cmake/ghostty-vt-config.cmake.in
index d67f99c0b..9e1d65f6c 100644
--- a/dist/cmake/ghostty-vt-config.cmake.in
+++ b/dist/cmake/ghostty-vt-config.cmake.in
@@ -2,11 +2,12 @@
 
 include(CMakeFindDependencyMacro)
 
+set(_ghostty_vt_libdir "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_LIBDIR@")
+
+# Shared library target
 if(NOT TARGET ghostty-vt::ghostty-vt)
     add_library(ghostty-vt::ghostty-vt SHARED IMPORTED)
 
-    set(_ghostty_vt_libdir "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_LIBDIR@")
-
     set_target_properties(ghostty-vt::ghostty-vt PROPERTIES
         IMPORTED_LOCATION "${_ghostty_vt_libdir}/@GHOSTTY_VT_REALNAME@"
         INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@"
@@ -26,8 +27,23 @@ if(NOT TARGET ghostty-vt::ghostty-vt)
             IMPORTED_SONAME "@GHOSTTY_VT_SONAME@"
         )
     endif()
-
-    unset(_ghostty_vt_libdir)
 endif()
 
+# Static library target
+#
+# Consumers must link transitive dependencies themselves. By default (with
+# SIMD enabled): libc, libc++ (or libstdc++ on Linux), highway, and
+# simdutf. Building with -Dsimd=false removes the C++ / highway / simdutf
+# dependencies.
+if(NOT TARGET ghostty-vt::ghostty-vt-static)
+    add_library(ghostty-vt::ghostty-vt-static STATIC IMPORTED)
+
+    set_target_properties(ghostty-vt::ghostty-vt-static PROPERTIES
+        IMPORTED_LOCATION "${_ghostty_vt_libdir}/@GHOSTTY_VT_STATIC_REALNAME@"
+        INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@"
+    )
+endif()
+
+unset(_ghostty_vt_libdir)
+
 check_required_components(ghostty-vt)
diff --git a/example/c-vt-cmake-static/CMakeLists.txt b/example/c-vt-cmake-static/CMakeLists.txt
new file mode 100644
index 000000000..bb4b1ac35
--- /dev/null
+++ b/example/c-vt-cmake-static/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.19)
+project(c-vt-cmake-static LANGUAGES C)
+
+include(FetchContent)
+FetchContent_Declare(ghostty
+    GIT_REPOSITORY https://github.com/ghostty-org/ghostty.git
+    GIT_TAG main
+)
+set(GHOSTTY_ZIG_BUILD_FLAGS "-Dsimd=false" CACHE STRING "" FORCE)
+FetchContent_MakeAvailable(ghostty)
+
+add_executable(c_vt_cmake_static src/main.c)
+target_link_libraries(c_vt_cmake_static PRIVATE ghostty-vt-static)
diff --git a/example/c-vt-cmake-static/README.md b/example/c-vt-cmake-static/README.md
new file mode 100644
index 000000000..6aa503e04
--- /dev/null
+++ b/example/c-vt-cmake-static/README.md
@@ -0,0 +1,21 @@
+# c-vt-cmake-static
+
+Demonstrates consuming libghostty-vt as a **static** library from a CMake
+project using `FetchContent`. Creates a terminal, writes VT sequences into
+it, and formats the screen contents as plain text.
+
+## Building
+
+```shell-session
+cd example/c-vt-cmake-static
+cmake -B build
+cmake --build build
+./build/c_vt_cmake_static
+```
+
+To build against a local checkout instead of fetching from GitHub:
+
+```shell-session
+cmake -B build -DFETCHCONTENT_SOURCE_DIR_GHOSTTY=../..
+cmake --build build
+```
diff --git a/example/c-vt-cmake-static/src/main.c b/example/c-vt-cmake-static/src/main.c
new file mode 100644
index 000000000..4821e727e
--- /dev/null
+++ b/example/c-vt-cmake-static/src/main.c
@@ -0,0 +1,52 @@
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ghostty/vt.h>
+
+int main() {
+  // Create a terminal with a small grid
+  GhosttyTerminal terminal;
+  GhosttyTerminalOptions opts = {
+    .cols = 80,
+    .rows = 24,
+    .max_scrollback = 0,
+  };
+  GhosttyResult result = ghostty_terminal_new(NULL, &terminal, opts);
+  assert(result == GHOSTTY_SUCCESS);
+
+  // Write some VT-encoded content into the terminal
+  const char *commands[] = {
+    "Hello from a \033[1mCMake\033[0m-built program (static)!\r\n",
+    "Line 2: \033[4munderlined\033[0m text\r\n",
+    "Line 3: \033[31mred\033[0m \033[32mgreen\033[0m \033[34mblue\033[0m\r\n",
+  };
+  for (size_t i = 0; i < sizeof(commands) / sizeof(commands[0]); i++) {
+    ghostty_terminal_vt_write(terminal, (const uint8_t *)commands[i],
+                              strlen(commands[i]));
+  }
+
+  // Format the terminal contents as plain text
+  GhosttyFormatterTerminalOptions fmt_opts =
+      GHOSTTY_INIT_SIZED(GhosttyFormatterTerminalOptions);
+  fmt_opts.emit = GHOSTTY_FORMATTER_FORMAT_PLAIN;
+  fmt_opts.trim = true;
+
+  GhosttyFormatter formatter;
+  result = ghostty_formatter_terminal_new(NULL, &formatter, terminal, fmt_opts);
+  assert(result == GHOSTTY_SUCCESS);
+
+  uint8_t *buf = NULL;
+  size_t len = 0;
+  result = ghostty_formatter_format_alloc(formatter, NULL, &buf, &len);
+  assert(result == GHOSTTY_SUCCESS);
+
+  printf("Plain text (%zu bytes):\n", len);
+  fwrite(buf, 1, len, stdout);
+  printf("\n");
+
+  free(buf);
+  ghostty_formatter_free(formatter);
+  ghostty_terminal_free(terminal);
+  return 0;
+}

From 5fd36ea69e1d69f0ae15424d736a30df7b07fc81 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 21 Mar 2026 15:15:11 -0700
Subject: [PATCH 290/391] build: enable PIC for static libghostty-vt

The static library was built without position-independent code,
which caused linker errors when consumers tried to link it into
PIE executables (the default on most Linux distributions). The
linker would fail with "relocation R_X86_64_32 against symbol
cannot be used when making a PIE object."

Enable PIC on the static library root module so it can be linked
into both PIE and non-PIE executables.
---
 src/build/GhosttyLibVt.zig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/build/GhosttyLibVt.zig b/src/build/GhosttyLibVt.zig
index ba3881496..1f5f72b84 100644
--- a/src/build/GhosttyLibVt.zig
+++ b/src/build/GhosttyLibVt.zig
@@ -100,6 +100,10 @@ fn initLib(
         // we'll cross that bridge when we get to it.
         lib.bundle_compiler_rt = true;
         lib.bundle_ubsan_rt = true;
+
+        // Enable PIC so the static library can be linked into PIE
+        // executables, which is the default on most Linux distributions.
+        lib.root_module.pic = true;
     }
 
     if (lib.rootModuleTarget().abi.isAndroid()) {

From 47bfde328658ede90f2d1a98e0d7bc8fb99fda12 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 21 Mar 2026 20:09:29 -0700
Subject: [PATCH 291/391] libghostty: expose mouse_tracking terminal data
 option

#11706

Add a new GHOSTTY_TERMINAL_DATA_MOUSE_TRACKING option to the
ghostty_terminal_get API. This returns true if any mouse tracking
mode is active (X10, normal, button, or any-event), replacing the
need for consumers to loop over four separate mode queries.
---
 include/ghostty/vt/terminal.h | 10 ++++++
 src/terminal/c/terminal.zig   | 57 ++++++++++++++++++++++++++++++++++-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 042d3ba93..b8e929684 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -221,6 +221,16 @@ typedef enum {
    * Output type: GhosttyStyle *
    */
   GHOSTTY_TERMINAL_DATA_CURSOR_STYLE = 10,
+
+  /**
+   * Whether any mouse tracking mode is active.
+   *
+   * Returns true if any of the mouse tracking modes (X10, normal, button,
+   * or any-event) are enabled.
+   *
+   * Output type: bool *
+   */
+  GHOSTTY_TERMINAL_DATA_MOUSE_TRACKING = 11,
 } GhosttyTerminalData;
 
 /**
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 2a2fe0ae6..97b76985d 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -167,13 +167,14 @@ pub const TerminalData = enum(c_int) {
     kitty_keyboard_flags = 8,
     scrollbar = 9,
     cursor_style = 10,
+    mouse_tracking = 11,
 
     /// Output type expected for querying the data of the given kind.
     pub fn OutType(comptime self: TerminalData) type {
         return switch (self) {
             .invalid => void,
             .cols, .rows, .cursor_x, .cursor_y => size.CellCountInt,
-            .cursor_pending_wrap, .cursor_visible => bool,
+            .cursor_pending_wrap, .cursor_visible, .mouse_tracking => bool,
             .active_screen => TerminalScreen,
             .kitty_keyboard_flags => u8,
             .scrollbar => TerminalScrollbar,
@@ -221,6 +222,10 @@ fn getTyped(
         .kitty_keyboard_flags => out.* = @as(u8, t.screens.active.kitty_keyboard.current().int()),
         .scrollbar => out.* = t.screens.active.pages.scrollbar().cval(),
         .cursor_style => out.* = .fromStyle(t.screens.active.cursor.style),
+        .mouse_tracking => out.* = t.modes.get(.mouse_event_x10) or
+            t.modes.get(.mouse_event_normal) or
+            t.modes.get(.mouse_event_button) or
+            t.modes.get(.mouse_event_any),
     }
 
     return .success;
@@ -662,6 +667,56 @@ test "get kitty_keyboard_flags" {
     try testing.expectEqual(3, flags);
 }
 
+test "get mouse_tracking" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    var tracking: bool = undefined;
+    try testing.expectEqual(Result.success, get(t, .mouse_tracking, @ptrCast(&tracking)));
+    try testing.expect(!tracking);
+
+    // Enable X10 mouse (DEC mode 9)
+    const x10_mode: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 9, .ansi = false });
+    try testing.expectEqual(Result.success, mode_set(t, x10_mode, true));
+    try testing.expectEqual(Result.success, get(t, .mouse_tracking, @ptrCast(&tracking)));
+    try testing.expect(tracking);
+
+    // Disable X10, enable normal mouse (DEC mode 1000)
+    try testing.expectEqual(Result.success, mode_set(t, x10_mode, false));
+    const normal_mode: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 1000, .ansi = false });
+    try testing.expectEqual(Result.success, mode_set(t, normal_mode, true));
+    try testing.expectEqual(Result.success, get(t, .mouse_tracking, @ptrCast(&tracking)));
+    try testing.expect(tracking);
+
+    // Disable normal, enable button mouse (DEC mode 1002)
+    try testing.expectEqual(Result.success, mode_set(t, normal_mode, false));
+    const button_mode: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 1002, .ansi = false });
+    try testing.expectEqual(Result.success, mode_set(t, button_mode, true));
+    try testing.expectEqual(Result.success, get(t, .mouse_tracking, @ptrCast(&tracking)));
+    try testing.expect(tracking);
+
+    // Disable button, enable any mouse (DEC mode 1003)
+    try testing.expectEqual(Result.success, mode_set(t, button_mode, false));
+    const any_mode: modes.ModeTag.Backing = @bitCast(modes.ModeTag{ .value = 1003, .ansi = false });
+    try testing.expectEqual(Result.success, mode_set(t, any_mode, true));
+    try testing.expectEqual(Result.success, get(t, .mouse_tracking, @ptrCast(&tracking)));
+    try testing.expect(tracking);
+
+    // Disable all - should be false again
+    try testing.expectEqual(Result.success, mode_set(t, any_mode, false));
+    try testing.expectEqual(Result.success, get(t, .mouse_tracking, @ptrCast(&tracking)));
+    try testing.expect(!tracking);
+}
+
 test "get invalid" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(

From 32c97a019f3f30d379436ec1a636c3d1d0472fbd Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 21 Mar 2026 20:23:49 -0700
Subject: [PATCH 292/391] terminal: default render state foreground to white

Fixes #11704

The RenderState empty initializer set both background and foreground
to the default RGB value of black (0, 0, 0), making text unreadable
when a caller has not explicitly configured terminal colors via
DynamicRGB. This is the common case for libghostty consumers.

Default the foreground to white so that the initial render state
provides readable white-on-black text out of the box.

Long term we also need to expose setting the default colors for a
Terminal instance but this is a workable fix in the mean time.
---
 src/terminal/render.zig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/terminal/render.zig b/src/terminal/render.zig
index 1c664a5b9..09e0c6b93 100644
--- a/src/terminal/render.zig
+++ b/src/terminal/render.zig
@@ -98,8 +98,8 @@ pub const RenderState = struct {
         .rows = 0,
         .cols = 0,
         .colors = .{
-            .background = .{},
-            .foreground = .{},
+            .background = .{ .r = 0, .g = 0, .b = 0 },
+            .foreground = .{ .r = 0xff, .g = 0xff, .b = 0xff },
             .cursor = null,
             .palette = color.default,
         },

From 8bd3a493be648aa7df12e45c531a7f30cffa6eb1 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 21 Mar 2026 20:16:35 -0700
Subject: [PATCH 293/391] libghostty: add resolved bg_color and fg_color to
 cells API

Fixes #11705

Add bg_color and fg_color options to GhosttyRenderStateRowCellsData
that resolve the final RGB color for a cell, flattening the multiple
possible sources. For background, this handles content-tag bg_color_rgb,
content-tag bg_color_palette (looked up in the palette), and the
style bg_color. For foreground, this resolves palette indices through
the palette; bold color handling is not applied and is left to the
caller.

Both return GHOSTTY_INVALID_VALUE when no explicit color is set, in
which case the caller should fall back to whatever default color it
wants (e.g. the terminal background/foreground).
---
 include/ghostty/vt/render.h |  16 ++
 src/config/Config.zig       |   9 ++
 src/renderer/generic.zig    |   4 +-
 src/terminal/c/render.zig   | 283 ++++++++++++++++++++++++++++++++++++
 src/terminal/style.zig      |  14 +-
 5 files changed, 320 insertions(+), 6 deletions(-)

diff --git a/include/ghostty/vt/render.h b/include/ghostty/vt/render.h
index d8f6400a9..0a300dde0 100644
--- a/include/ghostty/vt/render.h
+++ b/include/ghostty/vt/render.h
@@ -514,6 +514,22 @@ typedef enum {
    *  The buffer must be at least graphemes_len elements. The base codepoint
    *  is written first, followed by any extra codepoints. */
   GHOSTTY_RENDER_STATE_ROW_CELLS_DATA_GRAPHEMES_BUF = 4,
+
+  /** The resolved background color of the cell (GhosttyColorRgb).
+   *  Flattens the three possible sources: content-tag bg_color_rgb,
+   *  content-tag bg_color_palette (looked up in the palette), or the
+   *  style's bg_color. Returns GHOSTTY_INVALID_VALUE if the cell has
+   *  no background color, in which case the caller should use whatever
+   *  default background color it wants (e.g. the terminal background). */
+  GHOSTTY_RENDER_STATE_ROW_CELLS_DATA_BG_COLOR = 5,
+
+  /** The resolved foreground color of the cell (GhosttyColorRgb).
+   *  Resolves palette indices through the palette. Bold color handling
+   *  is not applied; the caller should handle bold styling separately.
+   *  Returns GHOSTTY_INVALID_VALUE if the cell has no explicit foreground
+   *  color, in which case the caller should use whatever default foreground
+   *  color it wants (e.g. the terminal foreground). */
+  GHOSTTY_RENDER_STATE_ROW_CELLS_DATA_FG_COLOR = 6,
 } GhosttyRenderStateRowCellsData;
 
 /**
diff --git a/src/config/Config.zig b/src/config/Config.zig
index 675dbcde3..d32740783 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -48,6 +48,7 @@ const string = @import("string.zig");
 const terminal = struct {
     const CursorStyle = @import("../terminal/cursor.zig").Style;
     const color = @import("../terminal/color.zig");
+    const style = @import("../terminal/style.zig");
     const x11_color = @import("../terminal/x11_color.zig");
 };
 
@@ -5597,6 +5598,14 @@ pub const BoldColor = union(enum) {
     color: Color,
     bright,
 
+    /// Convert to the terminal-native BoldColor type.
+    pub fn toTerminal(self: BoldColor) terminal.style.Style.BoldColor {
+        return switch (self) {
+            .color => |col| .{ .color = col.toTerminalRGB() },
+            .bright => .bright,
+        };
+    }
+
     pub fn parseCLI(input_: ?[]const u8) !BoldColor {
         const input = input_ orelse return error.ValueRequired;
         if (std.mem.eql(u8, input, "bright")) return .bright;
diff --git a/src/renderer/generic.zig b/src/renderer/generic.zig
index ff632f64a..0f4a294bc 100644
--- a/src/renderer/generic.zig
+++ b/src/renderer/generic.zig
@@ -554,7 +554,7 @@ pub fn Renderer(comptime GraphicsAPI: type) type {
             search_foreground: configpkg.Config.TerminalColor,
             search_selected_background: configpkg.Config.TerminalColor,
             search_selected_foreground: configpkg.Config.TerminalColor,
-            bold_color: ?configpkg.BoldColor,
+            bold_color: ?terminal.Style.BoldColor,
             faint_opacity: u8,
             min_contrast: f32,
             padding_color: configpkg.WindowPaddingColor,
@@ -619,7 +619,7 @@ pub fn Renderer(comptime GraphicsAPI: type) type {
 
                     .background = config.background.toTerminalRGB(),
                     .foreground = config.foreground.toTerminalRGB(),
-                    .bold_color = config.@"bold-color",
+                    .bold_color = if (config.@"bold-color") |b| b.toTerminal() else null,
                     .faint_opacity = @intFromFloat(@ceil(config.@"faint-opacity" * 255)),
 
                     .min_contrast = @floatCast(config.@"minimum-contrast"),
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index 0daf6abbe..f8a107979 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -33,6 +33,10 @@ const RowIteratorWrapper = struct {
     raws: []const page.Row,
     cells: []const std.MultiArrayList(renderpkg.RenderState.Cell),
     dirty: []bool,
+
+    /// The color palette from the render state, needed to resolve
+    /// palette-indexed background colors on cells.
+    palette: *const colorpkg.Palette,
 };
 
 const RowCellsWrapper = struct {
@@ -41,6 +45,9 @@ const RowCellsWrapper = struct {
     raws: []const page.Cell,
     graphemes: []const []const u21,
     styles: []const Style,
+
+    /// The color palette, needed to resolve palette-indexed background colors.
+    palette: *const colorpkg.Palette,
 };
 
 /// C: GhosttyRenderState
@@ -214,6 +221,7 @@ fn getTyped(
                 .raws = row_data.items(.raw),
                 .cells = row_data.items(.cells),
                 .dirty = row_data.items(.dirty),
+                .palette = &state.state.colors.palette,
             };
         },
         .color_background => out.* = state.state.colors.background.cval(),
@@ -361,6 +369,7 @@ pub fn row_iterator_new(
         .raws = undefined,
         .cells = undefined,
         .dirty = undefined,
+        .palette = undefined,
     };
     result.* = ptr;
     return .success;
@@ -395,6 +404,7 @@ pub fn row_cells_new(
         .raws = undefined,
         .graphemes = undefined,
         .styles = undefined,
+        .palette = undefined,
     };
     result.* = ptr;
     return .success;
@@ -428,6 +438,8 @@ pub const RowCellsData = enum(c_int) {
     style = 2,
     graphemes_len = 3,
     graphemes_buf = 4,
+    bg_color = 5,
+    fg_color = 6,
 
     /// Output type expected for querying the data of the given kind.
     pub fn OutType(comptime self: RowCellsData) type {
@@ -437,6 +449,7 @@ pub const RowCellsData = enum(c_int) {
             .style => style_c.Style,
             .graphemes_len => u32,
             .graphemes_buf => u32,
+            .bg_color, .fg_color => colorpkg.RGB.C,
         };
     }
 };
@@ -494,6 +507,17 @@ fn rowCellsGetTyped(
                 buf[i] = cp;
             }
         },
+        .bg_color => {
+            const s: Style = if (cell.hasStyling()) cells.styles[x] else .{};
+            const bg = s.bg(&cell, cells.palette) orelse return .invalid_value;
+            out.* = bg.cval();
+        },
+        .fg_color => {
+            const s: Style = if (cell.hasStyling()) cells.styles[x] else .{};
+            if (s.fg_color == .none) return .invalid_value;
+            const fg = s.fg(.{ .default = .{}, .palette = cells.palette });
+            out.* = fg.cval();
+        },
     }
 
     return .success;
@@ -570,6 +594,7 @@ fn rowGetTyped(
                 .raws = cell_data.items(.raw),
                 .graphemes = cell_data.items(.grapheme),
                 .styles = cell_data.items(.style),
+                .palette = it.palette,
             };
         },
     }
@@ -1069,6 +1094,264 @@ test "render: colors get" {
     }
 }
 
+test "render: row cells bg_color no background" {
+    var terminal: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &terminal,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer terminal_c.free(terminal);
+
+    // Write plain text (no background color set).
+    terminal_c.vt_write(terminal, "hello", 5);
+
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.success, update(state, terminal));
+
+    var it: RowIterator = null;
+    try testing.expectEqual(Result.success, row_iterator_new(
+        &lib_alloc.test_allocator,
+        &it,
+    ));
+    defer row_iterator_free(it);
+
+    try testing.expectEqual(Result.success, get(state, .row_iterator, @ptrCast(&it)));
+    try testing.expect(row_iterator_next(it));
+
+    var cells: RowCells = null;
+    try testing.expectEqual(Result.success, row_cells_new(
+        &lib_alloc.test_allocator,
+        &cells,
+    ));
+    defer row_cells_free(cells);
+
+    try testing.expectEqual(Result.success, row_get(it, .cells, @ptrCast(&cells)));
+    try testing.expect(row_cells_next(cells));
+
+    // No background set, should return invalid_value.
+    var bg: colorpkg.RGB.C = undefined;
+    try testing.expectEqual(Result.invalid_value, row_cells_get(cells, .bg_color, @ptrCast(&bg)));
+}
+
+test "render: row cells bg_color from style" {
+    var terminal: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &terminal,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer terminal_c.free(terminal);
+
+    // Set an RGB background via SGR 48;2;R;G;B and write text.
+    terminal_c.vt_write(terminal, "\x1b[48;2;10;20;30mA", 18);
+
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.success, update(state, terminal));
+
+    var it: RowIterator = null;
+    try testing.expectEqual(Result.success, row_iterator_new(
+        &lib_alloc.test_allocator,
+        &it,
+    ));
+    defer row_iterator_free(it);
+
+    try testing.expectEqual(Result.success, get(state, .row_iterator, @ptrCast(&it)));
+    try testing.expect(row_iterator_next(it));
+
+    var cells: RowCells = null;
+    try testing.expectEqual(Result.success, row_cells_new(
+        &lib_alloc.test_allocator,
+        &cells,
+    ));
+    defer row_cells_free(cells);
+
+    try testing.expectEqual(Result.success, row_get(it, .cells, @ptrCast(&cells)));
+    try testing.expect(row_cells_next(cells));
+
+    var bg: colorpkg.RGB.C = undefined;
+    try testing.expectEqual(Result.success, row_cells_get(cells, .bg_color, @ptrCast(&bg)));
+    try testing.expectEqual(@as(u8, 10), bg.r);
+    try testing.expectEqual(@as(u8, 20), bg.g);
+    try testing.expectEqual(@as(u8, 30), bg.b);
+}
+
+test "render: row cells bg_color from content tag" {
+    var terminal: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &terminal,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer terminal_c.free(terminal);
+
+    // Set an RGB background and then erase the line. The erased cells
+    // should carry the background color via the content tag (bg_color_rgb)
+    // rather than through the style.
+    terminal_c.vt_write(terminal, "\x1b[48;2;10;20;30m\x1b[2K", 21);
+
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.success, update(state, terminal));
+
+    var it: RowIterator = null;
+    try testing.expectEqual(Result.success, row_iterator_new(
+        &lib_alloc.test_allocator,
+        &it,
+    ));
+    defer row_iterator_free(it);
+
+    try testing.expectEqual(Result.success, get(state, .row_iterator, @ptrCast(&it)));
+    try testing.expect(row_iterator_next(it));
+
+    var cells: RowCells = null;
+    try testing.expectEqual(Result.success, row_cells_new(
+        &lib_alloc.test_allocator,
+        &cells,
+    ));
+    defer row_cells_free(cells);
+
+    try testing.expectEqual(Result.success, row_get(it, .cells, @ptrCast(&cells)));
+    try testing.expect(row_cells_next(cells));
+
+    var bg: colorpkg.RGB.C = undefined;
+    try testing.expectEqual(Result.success, row_cells_get(cells, .bg_color, @ptrCast(&bg)));
+    try testing.expectEqual(@as(u8, 10), bg.r);
+    try testing.expectEqual(@as(u8, 20), bg.g);
+    try testing.expectEqual(@as(u8, 30), bg.b);
+}
+
+test "render: row cells fg_color no foreground" {
+    var terminal: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &terminal,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer terminal_c.free(terminal);
+
+    // Write plain text (no foreground color set).
+    terminal_c.vt_write(terminal, "hello", 5);
+
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.success, update(state, terminal));
+
+    var it: RowIterator = null;
+    try testing.expectEqual(Result.success, row_iterator_new(
+        &lib_alloc.test_allocator,
+        &it,
+    ));
+    defer row_iterator_free(it);
+
+    try testing.expectEqual(Result.success, get(state, .row_iterator, @ptrCast(&it)));
+    try testing.expect(row_iterator_next(it));
+
+    var cells: RowCells = null;
+    try testing.expectEqual(Result.success, row_cells_new(
+        &lib_alloc.test_allocator,
+        &cells,
+    ));
+    defer row_cells_free(cells);
+
+    try testing.expectEqual(Result.success, row_get(it, .cells, @ptrCast(&cells)));
+    try testing.expect(row_cells_next(cells));
+
+    // No foreground set, should return invalid_value.
+    var fg: colorpkg.RGB.C = undefined;
+    try testing.expectEqual(Result.invalid_value, row_cells_get(cells, .fg_color, @ptrCast(&fg)));
+}
+
+test "render: row cells fg_color from style" {
+    var terminal: terminal_c.Terminal = null;
+    try testing.expectEqual(Result.success, terminal_c.new(
+        &lib_alloc.test_allocator,
+        &terminal,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer terminal_c.free(terminal);
+
+    // Set an RGB foreground via SGR 38;2;R;G;B and write text.
+    terminal_c.vt_write(terminal, "\x1b[38;2;10;20;30mA", 18);
+
+    var state: RenderState = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &state,
+    ));
+    defer free(state);
+
+    try testing.expectEqual(Result.success, update(state, terminal));
+
+    var it: RowIterator = null;
+    try testing.expectEqual(Result.success, row_iterator_new(
+        &lib_alloc.test_allocator,
+        &it,
+    ));
+    defer row_iterator_free(it);
+
+    try testing.expectEqual(Result.success, get(state, .row_iterator, @ptrCast(&it)));
+    try testing.expect(row_iterator_next(it));
+
+    var cells: RowCells = null;
+    try testing.expectEqual(Result.success, row_cells_new(
+        &lib_alloc.test_allocator,
+        &cells,
+    ));
+    defer row_cells_free(cells);
+
+    try testing.expectEqual(Result.success, row_get(it, .cells, @ptrCast(&cells)));
+    try testing.expect(row_cells_next(cells));
+
+    var fg: colorpkg.RGB.C = undefined;
+    try testing.expectEqual(Result.success, row_cells_get(cells, .fg_color, @ptrCast(&fg)));
+    try testing.expectEqual(@as(u8, 10), fg.r);
+    try testing.expectEqual(@as(u8, 20), fg.g);
+    try testing.expectEqual(@as(u8, 30), fg.b);
+}
+
 test "render: colors get supports truncated sized struct" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
diff --git a/src/terminal/style.zig b/src/terminal/style.zig
index 7908beefa..ae9488af8 100644
--- a/src/terminal/style.zig
+++ b/src/terminal/style.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 const assert = @import("../quirks.zig").inlineAssert;
-const configpkg = @import("../config.zig");
 const color = @import("color.zig");
 const sgr = @import("sgr.zig");
 const page = @import("page.zig");
@@ -126,6 +125,13 @@ pub const Style = struct {
         };
     }
 
+    /// The color to use for bold text. This avoids a dependency on the
+    /// config module by using terminal-native color types.
+    pub const BoldColor = union(enum) {
+        color: color.RGB,
+        bright,
+    };
+
     pub const Fg = struct {
         /// The default color to use if the style doesn't specify a
         /// foreground color and no configuration options override
@@ -137,7 +143,7 @@ pub const Style = struct {
         palette: *const color.Palette,
 
         /// If specified, the color to use for bold text.
-        bold: ?configpkg.BoldColor = null,
+        bold: ?BoldColor = null,
     };
 
     /// Returns the fg color for a cell with this style given the palette
@@ -155,7 +161,7 @@ pub const Style = struct {
                 if (self.flags.bold) {
                     if (opts.bold) |bold| switch (bold) {
                         .bright => {},
-                        .color => |v| break :default v.toTerminalRGB(),
+                        .color => |v| break :default v,
                     };
                 }
 
@@ -178,7 +184,7 @@ pub const Style = struct {
             .rgb => |rgb| rgb: {
                 if (self.flags.bold and rgb.eql(opts.default)) {
                     if (opts.bold) |bold| switch (bold) {
-                        .color => |v| break :rgb v.toTerminalRGB(),
+                        .color => |v| break :rgb v,
                         .bright => {},
                     };
                 }

From 8a788a350e105398b1c32df74a4a962e3d723032 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Sun, 22 Mar 2026 08:20:46 +0000
Subject: [PATCH 294/391] Update VOUCHED list (#11741)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11737#discussioncomment-16252675)
from @pluiedev.

Denounce: @kody-w

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index eaeaa84c8..5d43c4224 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -108,6 +108,7 @@ khipp
 kirwiisp
 kjvdven
 kloneets
+-kody-w
 koranir
 kristina8888
 kristofersoler

From 1f2a3b8a830aad15a72fec41e386fa4db4ab6804 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 07:28:52 -0700
Subject: [PATCH 295/391] update README

The README hasn't been updated in years basically!

This updates the README to make libghostty a first class citizen of the
project and to update our roadmap and goals for the project to more
accurately reflect our current state and future plans.
---
 README.md | 143 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 83 insertions(+), 60 deletions(-)

diff --git a/README.md b/README.md
index 961968097..293f5a6e2 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,8 @@
   <p align="center">
     Fast, native, feature-rich terminal emulator pushing modern features.
     <br />
+    A native GUI or embeddable library via <code>libghostty</code>.
+    <br />
     <a href="#about">About</a>
     ·
     <a href="https://ghostty.org/download">Download</a>
@@ -26,20 +28,13 @@ fast, feature-rich, and native. While there are many excellent terminal
 emulators available, they all force you to choose between speed,
 features, or native UIs. Ghostty provides all three.
 
-In all categories, I am not trying to claim that Ghostty is the
-best (i.e. the fastest, most feature-rich, or most native). But
-Ghostty is competitive in all three categories and Ghostty
-doesn't make you choose between them.
-
-Ghostty also intends to push the boundaries of what is possible with a
-terminal emulator by exposing modern, opt-in features that enable CLI tool
-developers to build more feature rich, interactive applications.
-
-While aiming for this ambitious goal, our first step is to make Ghostty
-one of the best fully standards compliant terminal emulator, remaining
-compatible with all existing shells and software while supporting all of
-the latest terminal innovations in the ecosystem. You can use Ghostty
-as a drop-in replacement for your existing terminal emulator.
+**`libghostty`** is a cross-platform, zero-dependency C and Zig library
+for building terminal emulators or utilizing terminal functionality
+(such as style parsing). Anyone can use `libghostty` to build a terminal
+emulator or embed a terminal into their own applications. See
+[Ghostling](https://github.com/ghostty-org/ghostling) for a minimal complete project
+example or the [`examples` directory](https://github.com/ghostty-org/ghostty/tree/main/example)
+for smaller examples of using `libghostty` in C and Zig.
 
 For more details, see [About Ghostty](https://ghostty.org/docs/about).
 
@@ -61,30 +56,37 @@ to get involved with Ghostty's development as well should also read the
 
 ## Roadmap and Status
 
+Ghostty is stable and in use by millions of people and machines daily.
+
 The high-level ambitious plan for the project, in order:
 
-|  #  | Step                                                      | Status |
-| :-: | --------------------------------------------------------- | :----: |
-|  1  | Standards-compliant terminal emulation                    |   ✅   |
-|  2  | Competitive performance                                   |   ✅   |
-|  3  | Basic customizability -- fonts, bg colors, etc.           |   ✅   |
-|  4  | Richer windowing features -- multi-window, tabbing, panes |   ✅   |
-|  5  | Native Platform Experiences (i.e. Mac Preference Panel)   |   ⚠️   |
-|  6  | Cross-platform `libghostty` for Embeddable Terminals      |   ⚠️   |
-|  7  | Windows Terminals (including PowerShell, Cmd, WSL)        |   ❌   |
-|  N  | Fancy features (to be expanded upon later)                |   ❌   |
+|  #  | Step                                                    | Status |
+| :-: | ------------------------------------------------------- | :----: |
+|  1  | Standards-compliant terminal emulation                  |   ✅   |
+|  2  | Competitive performance                                 |   ✅   |
+|  3  | Rich windowing features -- multi-window, tabbing, panes |   ✅   |
+|  4  | Native Platform Experiences                             |   ✅   |
+|  5  | Cross-platform `libghostty` for Embeddable Terminals    |   ✅   |
+|  6  | Ghostty-only Terminal Control Sequences                 |   ❌   |
 
 Additional details for each step in the big roadmap below:
 
 #### Standards-Compliant Terminal Emulation
 
-Ghostty implements enough control sequences to be used by hundreds of
-testers daily for over the past year. Further, we've done a
-[comprehensive xterm audit](https://github.com/ghostty-org/ghostty/issues/632)
+Ghostty implements all of the regularly used control sequences and
+can run every mainstream terminal program without issue. For legacy sequences,
+we've done a [comprehensive xterm audit](https://github.com/ghostty-org/ghostty/issues/632)
 comparing Ghostty's behavior to xterm and building a set of conformance
 test cases.
 
-We believe Ghostty is one of the most compliant terminal emulators available.
+In addition to legacy sequences (what you'd call real "terminal" emulation),
+Ghostty also supports more modern sequences than almost any other terminal
+emulator. These features include things like the Kitty graphics protocol,
+Kitty image protocol, clipboard sequences, synchronized rendering,
+light/dark mode notifications, and many, many more.
+
+We believe Ghostty is one of the most compliant and feature-rich terminal
+emulators available.
 
 Terminal behavior is partially a de jure standard
 (i.e. [ECMA-48](https://ecma-international.org/publications-and-standards/standards/ecma-48/))
@@ -96,33 +98,30 @@ views as a "standard."
 
 #### Competitive Performance
 
-We need better benchmarks to continuously verify this, but Ghostty is
-generally in the same performance category as the other highest performing
-terminal emulators.
+Ghostty is generally in the same performance category as the other highest
+performing terminal emulators.
 
-For rendering, we have a multi-renderer architecture that uses OpenGL on
-Linux and Metal on macOS. As far as I'm aware, we're the only terminal
-emulator other than iTerm that uses Metal directly. And we're the only
-terminal emulator that has a Metal renderer that supports ligatures (iTerm
-uses a CPU renderer if ligatures are enabled). We can maintain around 60fps
-under heavy load and much more generally -- though the terminal is
-usually rendering much lower due to little screen changes.
+"The same performance category" means that Ghostty is much faster than
+traditional or "slow" terminals and is within an unnoticeable margin of the
+well-known "fast" terminals. For example, Ghostty and Alacritty are usually within
+a few percentage points of each other on various benchmarks, but are both
+something like 100x faster than Terminal.app and iTerm. However, Ghostty
+is much more feature rich than Alacritty and has a much more native app
+experience.
 
-For IO, we have a dedicated IO thread that maintains very little jitter
-under heavy IO load (i.e. `cat <big file>.txt`). On benchmarks for IO,
-we're usually within a small margin of other fast terminal emulators.
-For example, reading a dump of plain text is 4x faster compared to iTerm and
-Kitty, and 2x faster than Terminal.app. Alacritty is very fast but we're still
-around the same speed (give or take) and our app experience is much more
-feature rich.
+This performance is achieved through high-level architectural decisions and
+low-level optimizations. At a high-level, Ghostty has a multi-threaded
+architecture with a dedicated read thread, write thread, and render thread
+per terminal. Our renderer uses OpenGL on Linux and Metal on macOS.
+Our read thread has a heavily optimized terminal parser that leverages
+CPU-specific SIMD instructions. Etc.
 
-> [!NOTE]
-> Despite being _very fast_, there is a lot of room for improvement here.
-
-#### Richer Windowing Features
+#### Rich Windowing Features
 
 The Mac and Linux (build with GTK) apps support multi-window, tabbing, and
-splits.
+splits with additional features such as tab renaming, coloring, etc. These
+features allow for a higher degree of organization and customization than
+single-window terminals.
 
 #### Native Platform Experiences
 
@@ -133,10 +132,15 @@ in Zig but we do a lot of platform-native things:
 - The macOS app is a true SwiftUI-based application with all the things you
   would expect such as real windowing, menu bars, a settings GUI, etc.
 - macOS uses a true Metal renderer with CoreText for font discovery.
+- macOS supports AppleScript, Apple Shortcuts (AppIntents), etc.
 - The Linux app is built with GTK.
+- The Linux app integrates deeply with systemd if available for things
+  like always-on, new windows in a single instance, cgroup isolation, etc.
 
-There are more improvements to be made. The macOS settings window is still
-a work-in-progress. Similar improvements will follow with Linux.
+Our goal with Ghostty is for users of whatever platform they run Ghostty
+on to think that Ghostty was built for their platform first and maybe even
+exclusively. We want Ghostty to feel like a native app on every platform,
+for the best definition of "native" on each platform.
 
 #### Cross-platform `libghostty` for Embeddable Terminals
 
@@ -151,15 +155,34 @@ terminal state. This is covered in more detail in this
 [blog post](https://mitchellh.com/writing/libghostty-is-coming).
 
 `libghostty-vt` is already available and usable today for Zig and C and
-is compatible for macOS, Linux, Windows, and WebAssembly. At the time of
-writing this, the API isn't stable yet and we haven't tagged an official
-release, but the core logic is well proven (since Ghostty uses it) and
-we're working hard on it now.
+is compatible for macOS, Linux, Windows, and WebAssembly. The functionality
+is extremely stable (since its been proven in Ghostty GUI for a long time),
+but the API signatures are still in flux.
 
-The ultimate goal is not hypothetical! The macOS app is a `libghostty` consumer.
-The macOS app is a native Swift app developed in Xcode and `main()` is
-within Swift. The Swift app links to `libghostty` and uses the C API to
-render terminals.
+`libghostty` is already heavily in use. See [`examples`](https://github.com/ghostty-org/ghostty/tree/main/example)
+for small examples of using `libghostty` in C and Zig or the
+[Ghostling](https://github.com/ghostty-org/ghostling) project for a
+complete example. See [awesome-libghostty](https://github.com/Uzaaft/awesome-libghostty)
+for a list of projects and resources related to `libghostty`.
+
+We haven't tagged libghostty with a version yet and we're still working
+on a better docs experience, but our [Doxygen website](https://libghostty.tip.ghostty.org/)
+is a good resource for the C API.
+
+#### Ghostty-only Terminal Control Sequences
+
+We want and believe that terminal applications can and should be able
+to do so much more. We've worked hard to support a wide variety of modern
+sequences created by other terminal emulators towards this end, but we also
+want to fill the gaps by creating our own sequences.
+
+We've been hesitant to do this up until now because we don't want to create
+more fragmentation in the terminal ecosystem by creating sequences that only
+work in Ghostty. But, we do want to balance that with the desire to push the
+terminal forward with stagnant standards and the slow pace of change in the
+terminal ecosystem.
+
+We haven't done any of this yet.
 
 ## Crash Reports
 

From 855a6b01fcb52a85434d13d4c554f8b551248541 Mon Sep 17 00:00:00 2001
From: Timon de Groot <tdegroot96@gmail.com>
Date: Sun, 22 Mar 2026 18:17:09 +0100
Subject: [PATCH 296/391] gtk: Open urls with openuri portal

---
 src/apprt/gtk/class/application.zig |  48 ++-
 src/apprt/gtk/portal.zig            |  75 +++++
 src/apprt/gtk/portal/OpenURI.zig    | 465 ++++++++++++++++++++++++++++
 3 files changed, 579 insertions(+), 9 deletions(-)
 create mode 100644 src/apprt/gtk/portal.zig
 create mode 100644 src/apprt/gtk/portal/OpenURI.zig

diff --git a/src/apprt/gtk/class/application.zig b/src/apprt/gtk/class/application.zig
index 544bdd127..5ada4eb02 100644
--- a/src/apprt/gtk/class/application.zig
+++ b/src/apprt/gtk/class/application.zig
@@ -41,6 +41,7 @@ const Tab = @import("tab.zig").Tab;
 const CloseConfirmationDialog = @import("close_confirmation_dialog.zig").CloseConfirmationDialog;
 const ConfigErrorsDialog = @import("config_errors_dialog.zig").ConfigErrorsDialog;
 const GlobalShortcuts = @import("global_shortcuts.zig").GlobalShortcuts;
+const OpenURI = @import("../portal.zig").OpenURI;
 
 const log = std.log.scoped(.gtk_ghostty_application);
 
@@ -215,6 +216,8 @@ pub const Application = extern struct {
         /// not exist in Ghostty's environment variable.
         saved_language: ?[:0]const u8 = null,
 
+        open_uri: OpenURI = undefined,
+
         pub var offset: c_int = 0;
     };
 
@@ -398,6 +401,7 @@ pub const Application = extern struct {
             .custom_css_providers = .empty,
             .global_shortcuts = gobject.ext.newInstance(GlobalShortcuts, .{}),
             .saved_language = saved_language,
+            .open_uri = .init(rt_app),
         };
 
         // Signals
@@ -433,6 +437,7 @@ pub const Application = extern struct {
         const priv: *Private = self.private();
         priv.config.unref();
         priv.winproto.deinit();
+        priv.open_uri.deinit();
         priv.global_shortcuts.unref();
         if (priv.saved_language) |language| alloc.free(language);
         if (gdk.Display.getDefault()) |display| {
@@ -806,6 +811,11 @@ pub const Application = extern struct {
         return &self.private().winproto;
     }
 
+    /// Returns the open URI portal implementation.
+    pub fn open_uri(self: *Self) *OpenURI {
+        return &self.private().open_uri;
+    }
+
     /// This will get called when there are no more open surfaces.
     fn startQuitTimer(self: *Self) void {
         const priv = self.private();
@@ -1289,6 +1299,11 @@ pub const Application = extern struct {
         // Set ourselves as the default application.
         gio.Application.setDefault(self.as(gio.Application));
 
+        // The D-Bus connection is only valid after GApplication startup.
+        self.open_uri().setDbusConnection(
+            self.as(gio.Application).getDbusConnection(),
+        );
+
         // Setup our event loop
         self.startupXev();
 
@@ -1873,6 +1888,17 @@ pub const Application = extern struct {
             gobject.Object.virtual_methods.finalize.implement(class, &finalize);
         }
     };
+
+    pub fn openUrlFallback(self: *Application, kind: apprt.action.OpenUrl.Kind, url: []const u8) void {
+        // Fallback to the minimal cross-platform way of opening a URL.
+        // This is always a safe fallback and enables for example Windows
+        // to open URLs (GTK on Windows via WSL is a thing).
+        internal_os.open(
+            self.allocator(),
+            kind,
+            url,
+        ) catch |err| log.warn("unable to open url: {}", .{err});
+    }
 };
 
 /// All apprt action handlers
@@ -2317,16 +2343,20 @@ const Action = struct {
         self: *Application,
         value: apprt.action.OpenUrl,
     ) void {
-        // TODO: use https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.OpenURI.html
+        if (std.mem.startsWith(u8, value.url, "/")) {
+            self.openUrlFallback(value.kind, value.url);
+            return;
+        }
+        if (std.mem.startsWith(u8, value.url, "file://")) {
+            self.openUrlFallback(value.kind, value.url);
+            return;
+        }
 
-        // Fallback to the minimal cross-platform way of opening a URL.
-        // This is always a safe fallback and enables for example Windows
-        // to open URLs (GTK on Windows via WSL is a thing).
-        internal_os.open(
-            self.allocator(),
-            value.kind,
-            value.url,
-        ) catch |err| log.warn("unable to open url: {}", .{err});
+        self.open_uri().start(value) catch |err| {
+            log.err("unable to open uri err={}", .{err});
+            self.openUrlFallback(value.kind, value.url);
+            return;
+        };
     }
 
     pub fn pwd(
diff --git a/src/apprt/gtk/portal.zig b/src/apprt/gtk/portal.zig
new file mode 100644
index 000000000..e3d03ec95
--- /dev/null
+++ b/src/apprt/gtk/portal.zig
@@ -0,0 +1,75 @@
+const std = @import("std");
+
+const gio = @import("gio");
+
+const Allocator = std.mem.Allocator;
+
+pub const OpenURI = @import("portal/OpenURI.zig");
+
+/// Generate a token suitable for use in requests to the XDG Desktop Portal
+pub fn generateToken() usize {
+    return std.crypto.random.int(usize);
+}
+
+/// Get the XDG portal request path for the current Ghostty instance.
+///
+/// If this sounds like nonsense, see `request` for an explanation as to
+/// why we need to do this.
+pub fn getRequestPath(alloc: Allocator, dbus: *gio.DBusConnection, token: usize) (Allocator.Error || std.fmt.BufPrintError || error{NoDBusUniqueName})![:0]const u8 {
+    // See https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.Request.html
+    // for the syntax XDG portals expect.
+
+    // Get the unique name from D-Bus and strip the leading `:`
+    const unique_name = try alloc.dupe(u8, std.mem.span(
+        dbus.getUniqueName() orelse {
+            return error.NoDBusUniqueName;
+        },
+    )[1..]);
+    defer alloc.free(unique_name);
+
+    return buildRequestPath(alloc, unique_name, token);
+}
+
+/// Build the XDG portal request path for given unique name and token.
+fn buildRequestPath(alloc: Allocator, unique_name: []u8, token: usize) (Allocator.Error || std.fmt.BufPrintError)![:0]const u8 {
+    var token_buf: [16]u8 = undefined;
+    const token_string = try std.fmt.bufPrint(&token_buf, "{x:0>16}", .{token});
+
+    // Sanitize the unique name by replacing every `.` with `_`. In effect, this
+    // will turn a unique name like `1.192` into `1_192`.
+    std.mem.replaceScalar(u8, unique_name, '.', '_');
+
+    const object_path = try std.mem.joinZ(
+        alloc,
+        "/",
+        &.{
+            "/org/freedesktop/portal/desktop/request",
+            unique_name,
+            token_string,
+        },
+    );
+
+    return object_path;
+}
+
+/// Try and parse the token out of a request path.
+pub fn parseRequestPath(request_path: []const u8) ?usize {
+    const index = std.mem.lastIndexOfScalar(u8, request_path, '/') orelse return null;
+    const token = request_path[index + 1 ..];
+    return std.fmt.parseUnsigned(usize, token, 16) catch return null;
+}
+
+test "buildRequestPath" {
+    const testing = std.testing;
+
+    const path = try buildRequestPath(testing.allocator, "1_42", 0x75af01a79c6fea34);
+    try testing.expectEqualStrings("/org/freedesktop/portal/desktop/request/1_42/75af01a79c6fea34", path);
+}
+
+test "parseRequestPath" {
+    const testing = std.testing;
+
+    try testing.expectEqual(0x75af01a79c6fea34, parseRequestPath("/org/freedesktop/portal/desktop/request/1_42/75af01a79c6fea34").?);
+    try testing.expectEqual(null, parseRequestPath("/org/freedesktop/portal/desktop/request/1_42/75af01a79c6fGa34"));
+    try testing.expectEqual(null, parseRequestPath("75af01a79c6fea34"));
+}
diff --git a/src/apprt/gtk/portal/OpenURI.zig b/src/apprt/gtk/portal/OpenURI.zig
new file mode 100644
index 000000000..985583741
--- /dev/null
+++ b/src/apprt/gtk/portal/OpenURI.zig
@@ -0,0 +1,465 @@
+//! Use DBus to call the XDG Desktop Portal to open an URI.
+//! See: https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.OpenURI.html#org-freedesktop-portal-openuri-openuri
+const OpenURI = @This();
+
+const std = @import("std");
+const Allocator = std.mem.Allocator;
+const assert = std.debug.assert;
+
+const gio = @import("gio");
+const glib = @import("glib");
+const gobject = @import("gobject");
+
+const App = @import("../App.zig");
+const portal = @import("../portal.zig");
+const apprt = @import("../../../apprt.zig");
+
+const log = std.log.scoped(.openuri);
+
+/// The GTK app that we "belong" to.
+app: *App,
+
+/// Connection to the D-Bus session bus that we'll use for all of our messaging.
+dbus: ?*gio.DBusConnection = null,
+
+/// Mutex to protect modification of the entries map or the cleanup timer.
+mutex: std.Thread.Mutex = .{},
+
+/// Map to store data about any in-flight calls to the portal.
+entries: std.AutoArrayHashMapUnmanaged(usize, *Entry) = .empty,
+
+/// Used to manage a timer to clean up any orphan entries in the map.
+cleanup_timer: ?c_uint = null,
+
+/// Data about any in-flight calls to the portal.
+pub const Entry = struct {
+    /// When the request started.
+    start: std.time.Instant,
+    /// A token used by the portal to identify requests and responses. The
+    /// actual format of the token does not really matter as long as it can be
+    /// used as part of a D-Bus object path. `usize` was chosen since it's easy
+    /// to hash and to generate random tokens.
+    token: usize,
+    /// The "kind" of URI. Unused here, but we may need to pass it on to the
+    /// fallback URL opener if the D-Bus method fails.
+    kind: apprt.action.OpenUrl.Kind,
+    /// A copy of the URI that we are opening. We need our own copy since the
+    /// method calls are asynchronous and the original may have been freed by
+    /// the time we need it.
+    uri: [:0]const u8,
+    /// Used to manage a scription to a D-Bus signal, which is how the XDG
+    /// Portal reports results of the method call.
+    subscription: ?c_uint = null,
+
+    pub fn deinit(self: *const Entry, alloc: Allocator) void {
+        alloc.free(self.uri);
+    }
+};
+
+pub const Errors = error{
+    /// Could not get a D-Bus connection
+    DBusConnectionRequired,
+    /// The D-Bus connection did not have a unique name. This _should_ be
+    /// impossible, but is handled for safety's sake.
+    NoDBusUniqueName,
+    /// The system was unable to give us the time.
+    TimerUnavailable,
+};
+
+pub fn init(app: *App) OpenURI {
+    return .{
+        .app = app,
+    };
+}
+
+pub fn setDbusConnection(self: *OpenURI, dbus: ?*gio.DBusConnection) void {
+    self.dbus = dbus;
+}
+
+pub fn deinit(self: *OpenURI) void {
+    const alloc = self.app.app.allocator();
+
+    self.mutex.lock();
+    defer self.mutex.unlock();
+
+    self.stopCleanupTimer();
+
+    for (self.entries.entries.items(.value)) |entry| {
+        entry.deinit(alloc);
+        alloc.destroy(entry);
+    }
+
+    self.entries.deinit(alloc);
+}
+
+/// Send the D-Bus method call to the XDG Desktop portal. The result of the
+/// method call will be reported asynchronously.
+pub fn start(self: *OpenURI, value: apprt.action.OpenUrl) (Allocator.Error || std.fmt.BufPrintError || Errors)!void {
+    const alloc = self.app.app.allocator();
+    const dbus = self.dbus orelse return error.DBusConnectionRequired;
+
+    const token = portal.generateToken();
+
+    self.mutex.lock();
+    defer self.mutex.unlock();
+
+    // Create an entry that is used to track the results of the D-Bus method
+    // call.
+    const entry = entry: {
+        const entry = try alloc.create(Entry);
+        errdefer alloc.destroy(entry);
+        entry.* = .{
+            .start = std.time.Instant.now() catch return error.TimerUnavailable,
+            .token = token,
+            .kind = value.kind,
+            .uri = try alloc.dupeZ(u8, value.url),
+        };
+        errdefer entry.deinit(alloc);
+        try self.entries.putNoClobber(alloc, token, entry);
+        break :entry entry;
+    };
+
+    errdefer {
+        _ = self.entries.swapRemove(token);
+        entry.deinit(alloc);
+        alloc.destroy(entry);
+    }
+
+    self.startCleanupTimer();
+
+    try self.subscribeToResponse(entry, dbus);
+    errdefer self.unsubscribeFromResponse(entry);
+
+    try self.sendRequest(entry, dbus);
+}
+
+/// Subscribe to the D-Bus signal that will contain the results of our method
+/// call to the portal. This must be called with the mutex locked.
+fn subscribeToResponse(
+    self: *OpenURI,
+    entry: *Entry,
+    dbus: *gio.DBusConnection,
+) (Allocator.Error || std.fmt.BufPrintError || Errors)!void {
+    assert(!self.mutex.tryLock());
+
+    const alloc = self.app.app.allocator();
+
+    if (entry.subscription != null) return;
+
+    const request_path = try portal.getRequestPath(alloc, dbus, entry.token);
+    defer alloc.free(request_path);
+
+    entry.subscription = dbus.signalSubscribe(
+        null,
+        "org.freedesktop.portal.Request",
+        "Response",
+        request_path,
+        null,
+        .{},
+        responseReceived,
+        self,
+        null,
+    );
+}
+
+/// Unsubscribe to the D-Bus signal that contains the result of the method call.
+/// This will prevent a response from being processed multiple times. This must
+/// be called when the mutex is locked.
+fn unsubscribeFromResponse(self: *OpenURI, entry: *Entry) void {
+    assert(!self.mutex.tryLock());
+
+    // Unsubscribe from the response signal
+    if (entry.subscription) |subscription| {
+        const dbus = self.dbus orelse {
+            entry.subscription = null;
+            log.warn("unable to unsubscribe open uri response without dbus connection", .{});
+            return;
+        };
+        dbus.signalUnsubscribe(subscription);
+        entry.subscription = null;
+    }
+}
+
+/// Send the D-Bus method call to the portal. The mutex must be locked when this
+/// is called.
+fn sendRequest(
+    self: *OpenURI,
+    entry: *Entry,
+    dbus: *gio.DBusConnection,
+) Allocator.Error!void {
+    assert(!self.mutex.tryLock());
+
+    const alloc = self.app.app.allocator();
+
+    const payload = payload: {
+        const builder_type = glib.VariantType.new("(ssa{sv})");
+        defer builder_type.free();
+
+        // Initialize our builder to build up our parameters
+        var builder: glib.VariantBuilder = undefined;
+        builder.init(builder_type);
+        errdefer builder.clear();
+
+        // parent window - empty string means we have no window
+        builder.add("s", "");
+
+        // URI to open
+        builder.add("s", entry.uri.ptr);
+
+        // Options
+        {
+            const options = glib.VariantType.new("a{sv}");
+            defer options.free();
+
+            builder.open(options);
+            defer builder.close();
+
+            {
+                const option = glib.VariantType.new("{sv}");
+                defer option.free();
+
+                builder.open(option);
+                defer builder.close();
+
+                builder.add("s", "handle_token");
+
+                const token = try std.fmt.allocPrintSentinel(alloc, "{x:0<16}", .{entry.token}, 0);
+                defer alloc.free(token);
+
+                const handle_token = glib.Variant.newString(token.ptr);
+                builder.add("v", handle_token);
+            }
+            {
+                const option = glib.VariantType.new("{sv}");
+                defer option.free();
+
+                builder.open(option);
+                defer builder.close();
+
+                builder.add("s", "writable");
+
+                const writable = glib.Variant.newBoolean(@intFromBool(false));
+                builder.add("v", writable);
+            }
+            {
+                const option = glib.VariantType.new("{sv}");
+                defer option.free();
+
+                builder.open(option);
+                defer builder.close();
+
+                builder.add("s", "ask");
+
+                const ask = glib.Variant.newBoolean(@intFromBool(false));
+                builder.add("v", ask);
+            }
+        }
+
+        break :payload builder.end();
+    };
+
+    // We're expecting an object path back from the method call.
+    const reply_type = glib.VariantType.new("(o)");
+    defer reply_type.free();
+
+    dbus.call(
+        "org.freedesktop.portal.Desktop",
+        "/org/freedesktop/portal/desktop",
+        "org.freedesktop.portal.OpenURI",
+        "OpenURI",
+        payload,
+        reply_type,
+        .{},
+        -1,
+        null,
+        requestCallback,
+        self,
+    );
+}
+
+/// Process the result of the original method call. Receiving this result does
+/// not indicate that the that the method call succeeded but it may contain an
+/// error message that is useful to log for debugging purposes.
+fn requestCallback(
+    _: ?*gobject.Object,
+    result: *gio.AsyncResult,
+    ud: ?*anyopaque,
+) callconv(.c) void {
+    const self: *OpenURI = @ptrCast(@alignCast(ud orelse return));
+    const dbus = self.dbus orelse {
+        log.err("Open URI request finished without a D-Bus connection", .{});
+        return;
+    };
+
+    var err_: ?*glib.Error = null;
+    defer if (err_) |err| err.free();
+
+    const reply_ = dbus.callFinish(result, &err_);
+
+    if (err_) |err| {
+        log.err("Open URI request failed={s} ({})", .{
+            err.f_message orelse "(unknown)",
+            err.f_code,
+        });
+        return;
+    }
+
+    const reply = reply_ orelse {
+        log.err("D-Bus method call returned a null value!", .{});
+        return;
+    };
+    defer reply.unref();
+
+    const reply_type = glib.VariantType.new("(o)");
+    defer reply_type.free();
+
+    if (reply.isOfType(reply_type) == 0) {
+        log.warn("Reply from D-Bus method call does not contain an object path!", .{});
+        return;
+    }
+
+    var object_path_: ?[*:0]const u8 = null;
+    reply.get("(o)", &object_path_);
+
+    const object_path = object_path_ orelse {
+        log.err("D-Bus method call did not return an object path", .{});
+        return;
+    };
+
+    const token = portal.parseRequestPath(std.mem.span(object_path)) orelse {
+        log.warn("Unable to parse token from the object path {s}", .{object_path});
+        return;
+    };
+
+    // Check to see if the request path returned matches a token that we sent.
+    self.mutex.lock();
+    defer self.mutex.unlock();
+
+    if (!self.entries.contains(token)) {
+        log.warn("Token {x:0<16} not found in the map!", .{token});
+    }
+}
+
+/// Handle the response signal from the portal. This should contain the actual
+/// results of the method call (success or failure).
+fn responseReceived(
+    _: *gio.DBusConnection,
+    _: ?[*:0]const u8,
+    object_path: [*:0]const u8,
+    _: [*:0]const u8,
+    _: [*:0]const u8,
+    params: *glib.Variant,
+    ud: ?*anyopaque,
+) callconv(.c) void {
+    const self: *OpenURI = @ptrCast(@alignCast(ud orelse {
+        log.err("OpenURI response received with null userdata", .{});
+        return;
+    }));
+
+    const alloc = self.app.app.allocator();
+
+    const token = portal.parseRequestPath(std.mem.span(object_path)) orelse {
+        log.warn("invalid object path: {s}", .{std.mem.span(object_path)});
+        return;
+    };
+
+    self.mutex.lock();
+    defer self.mutex.unlock();
+
+    const entry = (self.entries.fetchSwapRemove(token) orelse {
+        log.warn("no entry for token {x:0<16}", .{token});
+        return;
+    }).value;
+
+    defer {
+        entry.deinit(alloc);
+        alloc.destroy(entry);
+    }
+
+    self.unsubscribeFromResponse(entry);
+
+    var response: u32 = 0;
+    var results: ?*glib.Variant = null;
+    params.get("(u@a{sv})", &response, &results);
+
+    switch (response) {
+        0 => {
+            log.debug("open uri successful", .{});
+        },
+        1 => {
+            log.debug("open uri request was cancelled by the user", .{});
+        },
+        2 => {
+            log.warn("open uri request ended unexpectedly", .{});
+            self.app.app.openUrlFallback(entry.kind, entry.uri);
+        },
+        else => {
+            log.err("unrecognized response code={}", .{response});
+            self.app.app.openUrlFallback(entry.kind, entry.uri);
+        },
+    }
+}
+
+/// Wait this number of seconds and then clean up any orphaned entries.
+const cleanup_timeout = 30;
+
+/// If there is an active cleanup timer, cancel it. This must be called with the
+/// mutex locked
+fn stopCleanupTimer(self: *OpenURI) void {
+    assert(!self.mutex.tryLock());
+
+    if (self.cleanup_timer) |timer| {
+        if (glib.Source.remove(timer) == 0) {
+            log.warn("unable to remove cleanup timer source={d}", .{timer});
+        }
+        self.cleanup_timer = null;
+    }
+}
+
+/// Start a timer to clean up any entries that have not received a timely
+/// response. If there is already a timer it will be stopped and replaced with a
+/// new one. This must be called with the mutex locked.
+fn startCleanupTimer(self: *OpenURI) void {
+    assert(!self.mutex.tryLock());
+
+    self.stopCleanupTimer();
+    self.cleanup_timer = glib.timeoutAddSeconds(cleanup_timeout + 1, cleanup, self);
+}
+
+/// The cleanup timer is used to free up any entries that may have failed
+/// to get a response in a timely manner.
+fn cleanup(ud: ?*anyopaque) callconv(.c) c_int {
+    const self: *OpenURI = @ptrCast(@alignCast(ud orelse {
+        log.warn("cleanup called with null userdata", .{});
+        return @intFromBool(glib.SOURCE_REMOVE);
+    }));
+
+    const alloc = self.app.app.allocator();
+
+    self.mutex.lock();
+    defer self.mutex.unlock();
+
+    self.cleanup_timer = null;
+
+    const now = std.time.Instant.now() catch {
+        // `now()` should never fail, but if it does, don't crash, just return.
+        // This might cause a small memory leak in rare circumstances but it
+        // should get cleaned up the next time a URL is clicked.
+        return @intFromBool(glib.SOURCE_REMOVE);
+    };
+
+    loop: while (true) {
+        for (self.entries.entries.items(.value)) |entry| {
+            if (now.since(entry.start) > cleanup_timeout * std.time.ns_per_s) {
+                self.unsubscribeFromResponse(entry);
+                _ = self.entries.swapRemove(entry.token);
+                entry.deinit(alloc);
+                alloc.destroy(entry);
+                continue :loop;
+            }
+        }
+        break :loop;
+    }
+
+    return @intFromBool(glib.SOURCE_REMOVE);
+}

From 37d297c03c5494de34d37d77439f73cb0d953137 Mon Sep 17 00:00:00 2001
From: Timon de Groot <tdegroot96@gmail.com>
Date: Sun, 22 Mar 2026 21:09:38 +0100
Subject: [PATCH 297/391] gtk/portal: General improvements

- Token is formatted without allocation
- Reusable function for formatToken
- Tests in portal.zig are actuall included now
---
 src/apprt/gtk.zig        |  1 +
 src/apprt/gtk/portal.zig | 76 ++++++++++++++++++++++++++++------------
 2 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/src/apprt/gtk.zig b/src/apprt/gtk.zig
index 36a9290fb..eb33c4e4d 100644
--- a/src/apprt/gtk.zig
+++ b/src/apprt/gtk.zig
@@ -13,4 +13,5 @@ test {
     @import("std").testing.refAllDecls(@This());
     _ = @import("gtk/ext.zig");
     _ = @import("gtk/key.zig");
+    _ = @import("gtk/portal.zig");
 }
diff --git a/src/apprt/gtk/portal.zig b/src/apprt/gtk/portal.zig
index e3d03ec95..3e51042d6 100644
--- a/src/apprt/gtk/portal.zig
+++ b/src/apprt/gtk/portal.zig
@@ -5,39 +5,39 @@ const gio = @import("gio");
 const Allocator = std.mem.Allocator;
 
 pub const OpenURI = @import("portal/OpenURI.zig");
+pub const token_hex_len = @sizeOf(usize) * 2;
+pub const TokenBuffer = [token_hex_len + 1]u8;
+const token_format = std.fmt.comptimePrint("{{x:0>{}}}", .{token_hex_len});
 
 /// Generate a token suitable for use in requests to the XDG Desktop Portal
 pub fn generateToken() usize {
     return std.crypto.random.int(usize);
 }
 
+/// Format a request token consistently for use in portal object paths and payloads.
+pub fn formatToken(buf: *TokenBuffer, token: usize) [:0]const u8 {
+    return std.fmt.bufPrintZ(buf, token_format, .{token}) catch unreachable;
+}
+
 /// Get the XDG portal request path for the current Ghostty instance.
 ///
-/// If this sounds like nonsense, see `request` for an explanation as to
-/// why we need to do this.
-pub fn getRequestPath(alloc: Allocator, dbus: *gio.DBusConnection, token: usize) (Allocator.Error || std.fmt.BufPrintError || error{NoDBusUniqueName})![:0]const u8 {
-    // See https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.Request.html
-    // for the syntax XDG portals expect.
-
+/// See https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.Request.html
+/// for the protocol of the Request interface.
+pub fn getRequestPath(alloc: Allocator, dbus: *gio.DBusConnection, token: usize) (Allocator.Error || error{NoDBusUniqueName})![:0]const u8 {
     // Get the unique name from D-Bus and strip the leading `:`
-    const unique_name = try alloc.dupe(u8, std.mem.span(
+    const unique_name = std.mem.span(
         dbus.getUniqueName() orelse {
             return error.NoDBusUniqueName;
         },
-    )[1..]);
-    defer alloc.free(unique_name);
+    )[1..];
 
     return buildRequestPath(alloc, unique_name, token);
 }
 
 /// Build the XDG portal request path for given unique name and token.
-fn buildRequestPath(alloc: Allocator, unique_name: []u8, token: usize) (Allocator.Error || std.fmt.BufPrintError)![:0]const u8 {
-    var token_buf: [16]u8 = undefined;
-    const token_string = try std.fmt.bufPrint(&token_buf, "{x:0>16}", .{token});
-
-    // Sanitize the unique name by replacing every `.` with `_`. In effect, this
-    // will turn a unique name like `1.192` into `1_192`.
-    std.mem.replaceScalar(u8, unique_name, '.', '_');
+fn buildRequestPath(alloc: Allocator, unique_name: []const u8, token: usize) Allocator.Error![:0]const u8 {
+    var token_buf: TokenBuffer = undefined;
+    const token_string = formatToken(&token_buf, token);
 
     const object_path = try std.mem.joinZ(
         alloc,
@@ -49,27 +49,57 @@ fn buildRequestPath(alloc: Allocator, unique_name: []u8, token: usize) (Allocato
         },
     );
 
+    // Sanitize the unique name by replacing every `.` with `_`. In effect, this
+    // will turn a unique name like `1.192` into `1_192`.
+    // This sounds arbitrary, but it's part of the Request protocol.
+    _ = std.mem.replaceScalar(u8, object_path, '.', '_');
+
     return object_path;
 }
 
 /// Try and parse the token out of a request path.
-pub fn parseRequestPath(request_path: []const u8) ?usize {
+pub fn parseRequestPathToken(request_path: []const u8) ?usize {
     const index = std.mem.lastIndexOfScalar(u8, request_path, '/') orelse return null;
     const token = request_path[index + 1 ..];
     return std.fmt.parseUnsigned(usize, token, 16) catch return null;
 }
 
+test "formatToken pads to fixed width" {
+    const testing = std.testing;
+
+    var token_buf: TokenBuffer = undefined;
+    const token = formatToken(&token_buf, 0x42);
+
+    try testing.expectEqual(@as(usize, token_hex_len), token.len);
+    try testing.expectEqualStrings("0000000000000042", token);
+}
+
 test "buildRequestPath" {
     const testing = std.testing;
 
-    const path = try buildRequestPath(testing.allocator, "1_42", 0x75af01a79c6fea34);
-    try testing.expectEqualStrings("/org/freedesktop/portal/desktop/request/1_42/75af01a79c6fea34", path);
+    const path = try buildRequestPath(testing.allocator, "1.42", 0x75af01a79c6fea34);
+    try testing.expectEqualStrings(
+        "/org/freedesktop/portal/desktop/request/1_42/75af01a79c6fea34",
+        path,
+    );
+    testing.allocator.free(path);
 }
 
-test "parseRequestPath" {
+test "buildRequestPath pads token" {
+    const testing = std.testing;
+    const path = try buildRequestPath(testing.allocator, "1.42", 0x42);
+
+    try testing.expectEqualStrings(
+        "/org/freedesktop/portal/desktop/request/1_42/0000000000000042",
+        path,
+    );
+    testing.allocator.free(path);
+}
+
+test "parseRequestPathToken" {
     const testing = std.testing;
 
-    try testing.expectEqual(0x75af01a79c6fea34, parseRequestPath("/org/freedesktop/portal/desktop/request/1_42/75af01a79c6fea34").?);
-    try testing.expectEqual(null, parseRequestPath("/org/freedesktop/portal/desktop/request/1_42/75af01a79c6fGa34"));
-    try testing.expectEqual(null, parseRequestPath("75af01a79c6fea34"));
+    try testing.expectEqual(0x75af01a79c6fea34, parseRequestPathToken("/org/freedesktop/portal/desktop/request/1_42/75af01a79c6fea34").?);
+    try testing.expectEqual(null, parseRequestPathToken("/org/freedesktop/portal/desktop/request/1_42/75af01a79c6fGa34"));
+    try testing.expectEqual(null, parseRequestPathToken("75af01a79c6fea34"));
 }

From 919e586c516442b899f1f925f4aa37a100dee833 Mon Sep 17 00:00:00 2001
From: Timon de Groot <tdegroot96@gmail.com>
Date: Sun, 22 Mar 2026 21:10:46 +0100
Subject: [PATCH 298/391] gtk/portal: Improve OpenURI lifecycle

---
 src/apprt/gtk/portal/OpenURI.zig | 196 +++++++++++++++++++++++--------
 1 file changed, 148 insertions(+), 48 deletions(-)

diff --git a/src/apprt/gtk/portal/OpenURI.zig b/src/apprt/gtk/portal/OpenURI.zig
index 985583741..97aa013e5 100644
--- a/src/apprt/gtk/portal/OpenURI.zig
+++ b/src/apprt/gtk/portal/OpenURI.zig
@@ -31,6 +31,50 @@ entries: std.AutoArrayHashMapUnmanaged(usize, *Entry) = .empty,
 /// Used to manage a timer to clean up any orphan entries in the map.
 cleanup_timer: ?c_uint = null,
 
+/// Set to false during shutdown so callbacks stop touching internal state.
+alive: bool = true,
+
+const RequestData = struct {
+    open_uri: *OpenURI,
+    token: usize,
+    kind: apprt.action.OpenUrl.Kind,
+    uri: [:0]const u8,
+    request_path: [:0]const u8,
+
+    pub fn init(
+        alloc: Allocator,
+        open_uri: *OpenURI,
+        token: usize,
+        kind: apprt.action.OpenUrl.Kind,
+        uri: []const u8,
+        request_path: []const u8,
+    ) Allocator.Error!*RequestData {
+        const uri_copy = try alloc.dupeZ(u8, uri);
+        errdefer alloc.free(uri_copy);
+
+        const request_path_copy = try alloc.dupeZ(u8, request_path);
+        errdefer alloc.free(request_path_copy);
+
+        const data = try alloc.create(RequestData);
+        errdefer alloc.destroy(data);
+
+        data.* = .{
+            .open_uri = open_uri,
+            .token = token,
+            .kind = kind,
+            .uri = uri_copy,
+            .request_path = request_path_copy,
+        };
+
+        return data;
+    }
+
+    pub fn deinit(self: *const RequestData, alloc: Allocator) void {
+        alloc.free(self.uri);
+        alloc.free(self.request_path);
+    }
+};
+
 /// Data about any in-flight calls to the portal.
 pub const Entry = struct {
     /// When the request started.
@@ -47,7 +91,7 @@ pub const Entry = struct {
     /// method calls are asynchronous and the original may have been freed by
     /// the time we need it.
     uri: [:0]const u8,
-    /// Used to manage a scription to a D-Bus signal, which is how the XDG
+    /// Used to manage a subscription to a D-Bus signal, which is how the XDG
     /// Portal reports results of the method call.
     subscription: ?c_uint = null,
 
@@ -82,23 +126,36 @@ pub fn deinit(self: *OpenURI) void {
     self.mutex.lock();
     defer self.mutex.unlock();
 
+    if (!self.alive) return;
+    self.alive = false;
+
     self.stopCleanupTimer();
 
     for (self.entries.entries.items(.value)) |entry| {
-        entry.deinit(alloc);
-        alloc.destroy(entry);
+        self.unsubscribeFromResponse(entry);
+        destroyEntry(alloc, entry);
     }
 
     self.entries.deinit(alloc);
+    self.entries = .empty;
+    self.dbus = null;
 }
 
 /// Send the D-Bus method call to the XDG Desktop portal. The result of the
 /// method call will be reported asynchronously.
-pub fn start(self: *OpenURI, value: apprt.action.OpenUrl) (Allocator.Error || std.fmt.BufPrintError || Errors)!void {
+pub fn start(self: *OpenURI, value: apprt.action.OpenUrl) (Allocator.Error || Errors)!void {
     const alloc = self.app.app.allocator();
     const dbus = self.dbus orelse return error.DBusConnectionRequired;
 
     const token = portal.generateToken();
+    const request_path = try portal.getRequestPath(alloc, dbus, token);
+    defer alloc.free(request_path);
+
+    const request = try RequestData.init(alloc, self, token, value.kind, value.url, request_path);
+    errdefer {
+        request.deinit(alloc);
+        alloc.destroy(request);
+    }
 
     self.mutex.lock();
     defer self.mutex.unlock();
@@ -121,16 +178,12 @@ pub fn start(self: *OpenURI, value: apprt.action.OpenUrl) (Allocator.Error || st
 
     errdefer {
         _ = self.entries.swapRemove(token);
-        entry.deinit(alloc);
-        alloc.destroy(entry);
+        destroyEntry(alloc, entry);
     }
 
     self.startCleanupTimer();
-
-    try self.subscribeToResponse(entry, dbus);
-    errdefer self.unsubscribeFromResponse(entry);
-
-    try self.sendRequest(entry, dbus);
+    self.subscribeToResponse(entry, dbus, request_path.ptr);
+    self.sendRequest(entry, dbus, request);
 }
 
 /// Subscribe to the D-Bus signal that will contain the results of our method
@@ -139,16 +192,12 @@ fn subscribeToResponse(
     self: *OpenURI,
     entry: *Entry,
     dbus: *gio.DBusConnection,
-) (Allocator.Error || std.fmt.BufPrintError || Errors)!void {
+    request_path: [*:0]const u8,
+) void {
     assert(!self.mutex.tryLock());
 
-    const alloc = self.app.app.allocator();
-
     if (entry.subscription != null) return;
 
-    const request_path = try portal.getRequestPath(alloc, dbus, entry.token);
-    defer alloc.free(request_path);
-
     entry.subscription = dbus.signalSubscribe(
         null,
         "org.freedesktop.portal.Request",
@@ -180,17 +229,40 @@ fn unsubscribeFromResponse(self: *OpenURI, entry: *Entry) void {
     }
 }
 
+fn destroyEntry(alloc: Allocator, entry: *Entry) void {
+    entry.deinit(alloc);
+    alloc.destroy(entry);
+}
+
+fn failRequest(self: *OpenURI, token: usize) ?*Entry {
+    self.mutex.lock();
+    defer self.mutex.unlock();
+
+    if (!self.alive) return null;
+
+    const entry = (self.entries.fetchSwapRemove(token) orelse return null).value;
+    self.unsubscribeFromResponse(entry);
+    return entry;
+}
+
+fn failRequestAndFallback(self: *OpenURI, request: *const RequestData) void {
+    const alloc = self.app.app.allocator();
+    const entry = self.failRequest(request.token) orelse return;
+    defer destroyEntry(alloc, entry);
+
+    self.app.app.openUrlFallback(request.kind, request.uri);
+}
+
 /// Send the D-Bus method call to the portal. The mutex must be locked when this
 /// is called.
 fn sendRequest(
     self: *OpenURI,
     entry: *Entry,
     dbus: *gio.DBusConnection,
-) Allocator.Error!void {
+    request: *RequestData,
+) void {
     assert(!self.mutex.tryLock());
 
-    const alloc = self.app.app.allocator();
-
     const payload = payload: {
         const builder_type = glib.VariantType.new("(ssa{sv})");
         defer builder_type.free();
@@ -198,7 +270,6 @@ fn sendRequest(
         // Initialize our builder to build up our parameters
         var builder: glib.VariantBuilder = undefined;
         builder.init(builder_type);
-        errdefer builder.clear();
 
         // parent window - empty string means we have no window
         builder.add("s", "");
@@ -223,8 +294,8 @@ fn sendRequest(
 
                 builder.add("s", "handle_token");
 
-                const token = try std.fmt.allocPrintSentinel(alloc, "{x:0<16}", .{entry.token}, 0);
-                defer alloc.free(token);
+                var token_buf: portal.TokenBuffer = undefined;
+                const token = portal.formatToken(&token_buf, entry.token);
 
                 const handle_token = glib.Variant.newString(token.ptr);
                 builder.add("v", handle_token);
@@ -273,7 +344,7 @@ fn sendRequest(
         -1,
         null,
         requestCallback,
-        self,
+        request,
     );
 }
 
@@ -281,13 +352,25 @@ fn sendRequest(
 /// not indicate that the that the method call succeeded but it may contain an
 /// error message that is useful to log for debugging purposes.
 fn requestCallback(
-    _: ?*gobject.Object,
+    source: ?*gobject.Object,
     result: *gio.AsyncResult,
     ud: ?*anyopaque,
 ) callconv(.c) void {
-    const self: *OpenURI = @ptrCast(@alignCast(ud orelse return));
-    const dbus = self.dbus orelse {
-        log.err("Open URI request finished without a D-Bus connection", .{});
+    const request: *RequestData = @ptrCast(@alignCast(ud orelse return));
+    const self = request.open_uri;
+    const alloc = self.app.app.allocator();
+    defer {
+        request.deinit(alloc);
+        alloc.destroy(request);
+    }
+
+    const dbus = gobject.ext.cast(gio.DBusConnection, source orelse {
+        log.err("Open URI request finished without a D-Bus source object", .{});
+        self.failRequestAndFallback(request);
+        return;
+    }) orelse {
+        log.err("Open URI request finished with an unexpected source object", .{});
+        self.failRequestAndFallback(request);
         return;
     };
 
@@ -301,11 +384,13 @@ fn requestCallback(
             err.f_message orelse "(unknown)",
             err.f_code,
         });
+        self.failRequestAndFallback(request);
         return;
     }
 
     const reply = reply_ orelse {
         log.err("D-Bus method call returned a null value!", .{});
+        self.failRequestAndFallback(request);
         return;
     };
     defer reply.unref();
@@ -315,29 +400,42 @@ fn requestCallback(
 
     if (reply.isOfType(reply_type) == 0) {
         log.warn("Reply from D-Bus method call does not contain an object path!", .{});
+        self.failRequestAndFallback(request);
         return;
     }
 
-    var object_path_: ?[*:0]const u8 = null;
-    reply.get("(o)", &object_path_);
+    var object_path: [*:0]const u8 = undefined;
+    reply.get("(&o)", &object_path);
 
-    const object_path = object_path_ orelse {
-        log.err("D-Bus method call did not return an object path", .{});
-        return;
-    };
-
-    const token = portal.parseRequestPath(std.mem.span(object_path)) orelse {
+    const token = portal.parseRequestPathToken(std.mem.span(object_path)) orelse {
         log.warn("Unable to parse token from the object path {s}", .{object_path});
+        self.failRequestAndFallback(request);
         return;
     };
 
-    // Check to see if the request path returned matches a token that we sent.
+    if (token != request.token) {
+        log.warn("Open URI request returned mismatched token expected={x} actual={x}", .{
+            request.token,
+            token,
+        });
+        self.failRequestAndFallback(request);
+        return;
+    }
+
     self.mutex.lock();
     defer self.mutex.unlock();
 
-    if (!self.entries.contains(token)) {
-        log.warn("Token {x:0<16} not found in the map!", .{token});
-    }
+    if (!self.alive) return;
+
+    const entry = self.entries.get(token) orelse return;
+    if (std.mem.eql(u8, request.request_path, std.mem.span(object_path))) return;
+
+    log.debug("updating open uri request path old={s} new={s}", .{
+        request.request_path,
+        object_path,
+    });
+    self.unsubscribeFromResponse(entry);
+    self.subscribeToResponse(entry, dbus, object_path);
 }
 
 /// Handle the response signal from the portal. This should contain the actual
@@ -358,7 +456,7 @@ fn responseReceived(
 
     const alloc = self.app.app.allocator();
 
-    const token = portal.parseRequestPath(std.mem.span(object_path)) orelse {
+    const token = portal.parseRequestPathToken(std.mem.span(object_path)) orelse {
         log.warn("invalid object path: {s}", .{std.mem.span(object_path)});
         return;
     };
@@ -366,20 +464,20 @@ fn responseReceived(
     self.mutex.lock();
     defer self.mutex.unlock();
 
+    if (!self.alive) return;
+
     const entry = (self.entries.fetchSwapRemove(token) orelse {
-        log.warn("no entry for token {x:0<16}", .{token});
+        log.warn("no entry for token {x}", .{token});
         return;
     }).value;
 
-    defer {
-        entry.deinit(alloc);
-        alloc.destroy(entry);
-    }
+    defer destroyEntry(alloc, entry);
 
     self.unsubscribeFromResponse(entry);
 
     var response: u32 = 0;
     var results: ?*glib.Variant = null;
+    defer if (results) |variant| variant.unref();
     params.get("(u@a{sv})", &response, &results);
 
     switch (response) {
@@ -440,6 +538,7 @@ fn cleanup(ud: ?*anyopaque) callconv(.c) c_int {
     defer self.mutex.unlock();
 
     self.cleanup_timer = null;
+    if (!self.alive) return @intFromBool(glib.SOURCE_REMOVE);
 
     const now = std.time.Instant.now() catch {
         // `now()` should never fail, but if it does, don't crash, just return.
@@ -451,10 +550,11 @@ fn cleanup(ud: ?*anyopaque) callconv(.c) c_int {
     loop: while (true) {
         for (self.entries.entries.items(.value)) |entry| {
             if (now.since(entry.start) > cleanup_timeout * std.time.ns_per_s) {
+                log.warn("open uri request timed out token={x}", .{entry.token});
                 self.unsubscribeFromResponse(entry);
                 _ = self.entries.swapRemove(entry.token);
-                entry.deinit(alloc);
-                alloc.destroy(entry);
+                self.app.app.openUrlFallback(entry.kind, entry.uri);
+                destroyEntry(alloc, entry);
                 continue :loop;
             }
         }

From 1d54a94cedd4405584d2dcdde948262a33110018 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Sun, 22 Mar 2026 20:28:50 +0000
Subject: [PATCH 299/391] Update VOUCHED list (#11755)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11754#issuecomment-4106929553)
from @mitchellh.

Vouch: @tdgroot

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 5d43c4224..bf35d8984 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -172,6 +172,7 @@ seruman
 silveirapf
 slsrepo
 sunshine-syz
+tdgroot
 tdslot
 ticclick
 tnagatomi

From 8bc75907b541673deba24d3075fa0818c8f7b633 Mon Sep 17 00:00:00 2001
From: Timon de Groot <tdegroot96@gmail.com>
Date: Mon, 23 Mar 2026 07:29:36 +0100
Subject: [PATCH 300/391] gtk: Fix casing for openUri

---
 src/apprt/gtk/class/application.zig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/apprt/gtk/class/application.zig b/src/apprt/gtk/class/application.zig
index 5ada4eb02..fa9b71eb7 100644
--- a/src/apprt/gtk/class/application.zig
+++ b/src/apprt/gtk/class/application.zig
@@ -812,7 +812,7 @@ pub const Application = extern struct {
     }
 
     /// Returns the open URI portal implementation.
-    pub fn open_uri(self: *Self) *OpenURI {
+    pub fn openUri(self: *Self) *OpenURI {
         return &self.private().open_uri;
     }
 
@@ -1300,7 +1300,7 @@ pub const Application = extern struct {
         gio.Application.setDefault(self.as(gio.Application));
 
         // The D-Bus connection is only valid after GApplication startup.
-        self.open_uri().setDbusConnection(
+        self.openUri().setDbusConnection(
             self.as(gio.Application).getDbusConnection(),
         );
 
@@ -2352,7 +2352,7 @@ const Action = struct {
             return;
         }
 
-        self.open_uri().start(value) catch |err| {
+        self.openUri().start(value) catch |err| {
             log.err("unable to open uri err={}", .{err});
             self.openUrlFallback(value.kind, value.url);
             return;

From f6cf978b32c4c1f947aeb779694e8e48a008ae32 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2026 14:24:45 +0000
Subject: [PATCH 301/391] Update VOUCHED list (#11773)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11771#issuecomment-4111016256)
from @jcollie.

Vouch: @deblasis

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index bf35d8984..0fe1b327b 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -59,6 +59,7 @@ damyanbogoev
 danulqua
 dariogriffo
 davidsanchez222
+deblasis
 dervedro
 devsunb
 diaaeddin

From f0d59c22b201d79ccc8fe2a326b5a2f2dbcb37b3 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2026 14:41:18 +0000
Subject: [PATCH 302/391] Update VOUCHED list (#11775)

Triggered by
[comment](https://github.com/ghostty-org/ghostty/issues/11768#issuecomment-4111147332)
from @jcollie.

Vouch: @lynicis

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 0fe1b327b..ba1cf590b 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -118,6 +118,7 @@ liby
 linustalacko
 lonsagisawa
 luisnquin
+lynicis
 mac0ne
 mahnokropotkinvich
 marijagjorgjieva

From d67f65e38c8362c066dbfc70f2425808833e7049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20M=C3=BCller?= <bastian@turbolent.com>
Date: Sun, 22 Mar 2026 16:07:11 -0700
Subject: [PATCH 303/391] also build static libghostty-vt for wasm

---
 build.zig | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/build.zig b/build.zig
index e267fe79a..b34719545 100644
--- a/build.zig
+++ b/build.zig
@@ -106,27 +106,23 @@ pub fn build(b: *std.Build) !void {
     };
     libghostty_vt_shared.install(b.getInstallStep());
 
-    // libghostty-vt static lib. We don't build this for wasm since wasm has
-    // no concept of static vs shared and we put the wasm binary up in
-    // our shared handling.
-    if (!config.target.result.cpu.arch.isWasm()) {
-        const libghostty_vt_static = try buildpkg.GhosttyLibVt.initStatic(
-            b,
-            &mod,
-        );
+    // libghostty-vt static lib
+    const libghostty_vt_static = try buildpkg.GhosttyLibVt.initStatic(
+        b,
+        &mod,
+    );
 
-        if (config.is_dep) {
-            // If we're a dependency, we need to install everything as-is
-            // so that dep.artifact("ghostty-vt-static") works.
-            libghostty_vt_static.install(b.getInstallStep());
-        } else {
-            // If we're not a dependency, we rename the static lib to
-            // be idiomatic.
-            b.getInstallStep().dependOn(&b.addInstallLibFile(
-                libghostty_vt_static.output,
-                "libghostty-vt.a",
-            ).step);
-        }
+    if (config.is_dep) {
+        // If we're a dependency, we need to install everything as-is
+        // so that dep.artifact("ghostty-vt-static") works.
+        libghostty_vt_static.install(b.getInstallStep());
+    } else {
+        // If we're not a dependency, we rename the static lib to
+        // be idiomatic.
+        b.getInstallStep().dependOn(&b.addInstallLibFile(
+            libghostty_vt_static.output,
+            "libghostty-vt.a",
+        ).step);
     }
 
     // Helpgen

From 04b5dc733243d85f0bbaa3aea25d65a19649cd64 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 08:58:56 -0700
Subject: [PATCH 304/391] terminal: guard ghostty.h checks on building the app

---
 src/lib/enum.zig       |  5 ++++-
 src/lib_vt.zig         | 10 +++++-----
 src/terminal/mouse.zig |  1 +
 src/terminal/osc.zig   |  1 +
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/lib/enum.zig b/src/lib/enum.zig
index bdec2ab88..f40a40b54 100644
--- a/src/lib/enum.zig
+++ b/src/lib/enum.zig
@@ -95,7 +95,10 @@ test "abi by removing a key" {
 /// Verify that for every key in enum T, there is a matching declaration in
 /// `ghostty.h` with the correct value. This should only ever be called inside a `test`
 /// because the `ghostty.h` module is only available then.
-pub fn checkGhosttyHEnum(comptime T: type, comptime prefix: []const u8) !void {
+pub fn checkGhosttyHEnum(
+    comptime T: type,
+    comptime prefix: []const u8,
+) !void {
     const info = @typeInfo(T);
 
     try std.testing.expect(info == .@"enum");
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 7a75bb92a..01cea6bcd 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -260,9 +260,9 @@ pub const std_options: std.Options = options: {
 
 test {
     _ = terminal;
-    _ = @import("lib/main.zig");
-    @import("std").testing.refAllDecls(input);
-    if (comptime terminal.options.c_abi) {
-        _ = terminal.c_api;
-    }
+    // _ = @import("lib/main.zig");
+    // @import("std").testing.refAllDecls(input);
+    // if (comptime terminal.options.c_abi) {
+    //     _ = terminal.c_api;
+    // }
 }
diff --git a/src/terminal/mouse.zig b/src/terminal/mouse.zig
index e72e166f7..5286ab856 100644
--- a/src/terminal/mouse.zig
+++ b/src/terminal/mouse.zig
@@ -92,6 +92,7 @@ pub const Shape = enum(c_int) {
     };
 
     test "ghostty.h MouseShape" {
+        if (comptime build_options.artifact == .lib) return error.SkipZigTest;
         try lib.checkGhosttyHEnum(Shape, "GHOSTTY_MOUSE_SHAPE_");
     }
 };
diff --git a/src/terminal/osc.zig b/src/terminal/osc.zig
index 0086e48bc..920ce3f7e 100644
--- a/src/terminal/osc.zig
+++ b/src/terminal/osc.zig
@@ -205,6 +205,7 @@ pub const Command = union(Key) {
             pause,
 
             test "ghostty.h Command.ProgressReport.State" {
+                if (comptime build_options.artifact == .lib) return error.SkipZigTest;
                 try lib.checkGhosttyHEnum(State, "GHOSTTY_PROGRESS_STATE_");
             }
         };

From 7253668ec20b0a79e41930ec4ba9e189d605cc7e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 09:11:18 -0700
Subject: [PATCH 305/391] config: move file formatter to dedicated file to
 prevent import bloat

---
 src/config.zig                |   3 +-
 src/config/formatter.zig      | 103 +------------------------------
 src/config/formatter_file.zig | 110 ++++++++++++++++++++++++++++++++++
 src/input/key.zig             |   1 -
 4 files changed, 113 insertions(+), 104 deletions(-)
 create mode 100644 src/config/formatter_file.zig

diff --git a/src/config.zig b/src/config.zig
index 314fb49ee..289b6a811 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -2,6 +2,7 @@ const builtin = @import("builtin");
 
 const file_load = @import("config/file_load.zig");
 const formatter = @import("config/formatter.zig");
+const formatter_file = @import("config/formatter_file.zig");
 pub const Config = @import("config/Config.zig");
 pub const conditional = @import("config/conditional.zig");
 pub const io = @import("config/io.zig");
@@ -10,7 +11,7 @@ pub const edit = @import("config/edit.zig");
 pub const url = @import("config/url.zig");
 
 pub const ConditionalState = conditional.State;
-pub const FileFormatter = formatter.FileFormatter;
+pub const FileFormatter = formatter_file.FileFormatter;
 pub const entryFormatter = formatter.entryFormatter;
 pub const formatEntry = formatter.formatEntry;
 pub const preferredDefaultFilePath = file_load.preferredDefaultFilePath;
diff --git a/src/config/formatter.zig b/src/config/formatter.zig
index dcf99167d..00d946f88 100644
--- a/src/config/formatter.zig
+++ b/src/config/formatter.zig
@@ -1,8 +1,7 @@
 const formatter = @This();
+
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const help_strings = @import("help_strings");
-const Config = @import("Config.zig");
 const Key = @import("key.zig").Key;
 
 /// Returns a single entry formatter for the given field name and writer.
@@ -125,106 +124,6 @@ pub fn formatEntry(
     @compileError("missing case for type");
 }
 
-/// FileFormatter is a formatter implementation that outputs the
-/// config in a file-like format. This uses more generous whitespace,
-/// can include comments, etc.
-pub const FileFormatter = struct {
-    alloc: Allocator,
-    config: *const Config,
-
-    /// Include comments for documentation of each key
-    docs: bool = false,
-
-    /// Only include changed values from the default.
-    changed: bool = false,
-
-    /// Implements std.fmt so it can be used directly with std.fmt.
-    pub fn format(
-        self: FileFormatter,
-        writer: *std.Io.Writer,
-    ) std.Io.Writer.Error!void {
-        @setEvalBranchQuota(10_000);
-
-        // If we're change-tracking then we need the default config to
-        // compare against.
-        var default: ?Config = if (self.changed)
-            Config.default(self.alloc) catch return error.WriteFailed
-        else
-            null;
-        defer if (default) |*v| v.deinit();
-
-        inline for (@typeInfo(Config).@"struct".fields) |field| {
-            if (field.name[0] == '_') continue;
-
-            const value = @field(self.config, field.name);
-            const do_format = if (default) |d| format: {
-                const key = @field(Key, field.name);
-                break :format d.changed(self.config, key);
-            } else true;
-
-            if (do_format) {
-                const do_docs = self.docs and @hasDecl(help_strings.Config, field.name);
-                if (do_docs) {
-                    const help = @field(help_strings.Config, field.name);
-                    var lines = std.mem.splitScalar(u8, help, '\n');
-                    while (lines.next()) |line| {
-                        try writer.print("# {s}\n", .{line});
-                    }
-                }
-
-                formatEntry(
-                    field.type,
-                    field.name,
-                    value,
-                    writer,
-                ) catch return error.WriteFailed;
-
-                if (do_docs) try writer.print("\n", .{});
-            }
-        }
-    }
-};
-
-test "format default config" {
-    const testing = std.testing;
-    const alloc = testing.allocator;
-    var cfg = try Config.default(alloc);
-    defer cfg.deinit();
-
-    var buf: std.Io.Writer.Allocating = .init(alloc);
-    defer buf.deinit();
-
-    // We just make sure this works without errors. We aren't asserting output.
-    const fmt: FileFormatter = .{
-        .alloc = alloc,
-        .config = &cfg,
-    };
-    try fmt.format(&buf.writer);
-
-    //std.log.warn("{s}", .{buf.written()});
-}
-
-test "format default config changed" {
-    const testing = std.testing;
-    const alloc = testing.allocator;
-    var cfg = try Config.default(alloc);
-    defer cfg.deinit();
-    cfg.@"font-size" = 42;
-
-    var buf: std.Io.Writer.Allocating = .init(alloc);
-    defer buf.deinit();
-
-    // We just make sure this works without errors. We aren't asserting output.
-    const fmt: FileFormatter = .{
-        .alloc = alloc,
-        .config = &cfg,
-        .changed = true,
-    };
-    try fmt.format(&buf.writer);
-
-    //std.log.warn("{s}", .{buf.written()});
-}
-
 test "formatEntry bool" {
     const testing = std.testing;
 
diff --git a/src/config/formatter_file.zig b/src/config/formatter_file.zig
new file mode 100644
index 000000000..4bc44c0e5
--- /dev/null
+++ b/src/config/formatter_file.zig
@@ -0,0 +1,110 @@
+const std = @import("std");
+const Allocator = std.mem.Allocator;
+const Config = @import("Config.zig");
+const Key = @import("key.zig").Key;
+const help_strings = @import("help_strings");
+const formatter = @import("formatter.zig");
+
+// IMPORTANT: This is in a seperate file from formatter.zig because it
+// puts a build-time dependency on Config.zig which brings in too much
+// into libghostty-vt tests which reference some formattable types.
+
+/// FileFormatter is a formatter implementation that outputs the
+/// config in a file-like format. This uses more generous whitespace,
+/// can include comments, etc.
+pub const FileFormatter = struct {
+    alloc: Allocator,
+    config: *const Config,
+
+    /// Include comments for documentation of each key
+    docs: bool = false,
+
+    /// Only include changed values from the default.
+    changed: bool = false,
+
+    /// Implements std.fmt so it can be used directly with std.fmt.
+    pub fn format(
+        self: FileFormatter,
+        writer: *std.Io.Writer,
+    ) std.Io.Writer.Error!void {
+        @setEvalBranchQuota(10_000);
+
+        // If we're change-tracking then we need the default config to
+        // compare against.
+        var default: ?Config = if (self.changed)
+            Config.default(self.alloc) catch return error.WriteFailed
+        else
+            null;
+        defer if (default) |*v| v.deinit();
+
+        inline for (@typeInfo(Config).@"struct".fields) |field| {
+            if (field.name[0] == '_') continue;
+
+            const value = @field(self.config, field.name);
+            const do_format = if (default) |d| format: {
+                const key = @field(Key, field.name);
+                break :format d.changed(self.config, key);
+            } else true;
+
+            if (do_format) {
+                const do_docs = self.docs and @hasDecl(help_strings.Config, field.name);
+                if (do_docs) {
+                    const help = @field(help_strings.Config, field.name);
+                    var lines = std.mem.splitScalar(u8, help, '\n');
+                    while (lines.next()) |line| {
+                        try writer.print("# {s}\n", .{line});
+                    }
+                }
+
+                formatter.formatEntry(
+                    field.type,
+                    field.name,
+                    value,
+                    writer,
+                ) catch return error.WriteFailed;
+
+                if (do_docs) try writer.print("\n", .{});
+            }
+        }
+    }
+};
+
+test "format default config" {
+    const testing = std.testing;
+    const alloc = testing.allocator;
+    var cfg = try Config.default(alloc);
+    defer cfg.deinit();
+
+    var buf: std.Io.Writer.Allocating = .init(alloc);
+    defer buf.deinit();
+
+    // We just make sure this works without errors. We aren't asserting output.
+    const fmt: FileFormatter = .{
+        .alloc = alloc,
+        .config = &cfg,
+    };
+    try fmt.format(&buf.writer);
+
+    //std.log.warn("{s}", .{buf.written()});
+}
+
+test "format default config changed" {
+    const testing = std.testing;
+    const alloc = testing.allocator;
+    var cfg = try Config.default(alloc);
+    defer cfg.deinit();
+    cfg.@"font-size" = 42;
+
+    var buf: std.Io.Writer.Allocating = .init(alloc);
+    defer buf.deinit();
+
+    // We just make sure this works without errors. We aren't asserting output.
+    const fmt: FileFormatter = .{
+        .alloc = alloc,
+        .config = &cfg,
+        .changed = true,
+    };
+    try fmt.format(&buf.writer);
+
+    //std.log.warn("{s}", .{buf.written()});
+}
diff --git a/src/input/key.zig b/src/input/key.zig
index a929a0323..9c04f01e0 100644
--- a/src/input/key.zig
+++ b/src/input/key.zig
@@ -2,7 +2,6 @@ const std = @import("std");
 const builtin = @import("builtin");
 const Allocator = std.mem.Allocator;
 const cimgui = @import("dcimgui");
-const OptionAsAlt = @import("config.zig").OptionAsAlt;
 
 pub const Mods = @import("key_mods.zig").Mods;
 

From f60587ffcc15886ee0dd2f24764da4e69f83a9d2 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 09:14:26 -0700
Subject: [PATCH 306/391] renderer/size: move PaddingBalance enum out of Config

Previously WindowPaddingBalance was defined inside Config.zig, which
meant tests for renderer sizing had to pull in the full config
dependency. Move the enum into renderer/size.zig as PaddingBalance
and re-export it from Config so the public API is unchanged. This
lets size.zig tests run without depending on Config.
---
 src/config/Config.zig |  7 +------
 src/renderer/size.zig | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/config/Config.zig b/src/config/Config.zig
index d32740783..facbdb21d 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -39,6 +39,7 @@ pub const Path = @import("path.zig").Path;
 pub const RepeatablePath = @import("path.zig").RepeatablePath;
 const ClipboardCodepointMap = @import("ClipboardCodepointMap.zig");
 const KeyRemapSet = @import("../input/key_mods.zig").RemapSet;
+pub const WindowPaddingBalance = @import("../renderer/size.zig").PaddingBalance;
 const string = @import("string.zig");
 
 // We do this instead of importing all of terminal/main.zig to
@@ -5245,12 +5246,6 @@ pub const Fullscreen = enum(c_int) {
     @"non-native-padded-notch",
 };
 
-pub const WindowPaddingBalance = enum {
-    false,
-    true,
-    equal,
-};
-
 pub const WindowPaddingColor = enum {
     background,
     extend,
diff --git a/src/renderer/size.zig b/src/renderer/size.zig
index 7a022cdb4..6cf05f58a 100644
--- a/src/renderer/size.zig
+++ b/src/renderer/size.zig
@@ -1,10 +1,22 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const configpkg = @import("../config.zig");
 const terminal_size = @import("../terminal/size.zig");
 
 const log = std.log.scoped(.renderer_size);
 
+/// Controls how extra whitespace around the terminal grid is distributed.
+pub const PaddingBalance = enum {
+    /// No balancing; padding is applied as specified explicitly.
+    false,
+    /// Balances padding but caps the top padding so the first row doesn't
+    /// drift too far from the top of the window. Excess vertical space is
+    /// shifted to the bottom.
+    true,
+    /// Distributes leftover space equally on all sides so the grid is
+    /// centered within the screen.
+    equal,
+};
+
 /// All relevant sizes for a rendered terminal. These are all the sizes that
 /// any functionality should need to know about the terminal in order to
 /// convert between any coordinate systems.
@@ -37,7 +49,7 @@ pub const Size = struct {
     pub fn balancePadding(
         self: *Size,
         explicit: Padding,
-        mode: configpkg.Config.WindowPaddingBalance,
+        mode: PaddingBalance,
     ) void {
         // This ensure grid() does the right thing
         self.padding = explicit;

From 51f878417fede56716a3931b8a55fa4b0cbe15aa Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 09:15:32 -0700
Subject: [PATCH 307/391] reenable tests

---
 src/lib_vt.zig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 01cea6bcd..7a75bb92a 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -260,9 +260,9 @@ pub const std_options: std.Options = options: {
 
 test {
     _ = terminal;
-    // _ = @import("lib/main.zig");
-    // @import("std").testing.refAllDecls(input);
-    // if (comptime terminal.options.c_abi) {
-    //     _ = terminal.c_api;
-    // }
+    _ = @import("lib/main.zig");
+    @import("std").testing.refAllDecls(input);
+    if (comptime terminal.options.c_abi) {
+        _ = terminal.c_api;
+    }
 }

From 409f05c92750e94c376b0c42ae7c70b2d9fbd62c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 09:17:34 -0700
Subject: [PATCH 308/391] typos

---
 src/config/formatter_file.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/formatter_file.zig b/src/config/formatter_file.zig
index 4bc44c0e5..37beb7b54 100644
--- a/src/config/formatter_file.zig
+++ b/src/config/formatter_file.zig
@@ -5,7 +5,7 @@ const Key = @import("key.zig").Key;
 const help_strings = @import("help_strings");
 const formatter = @import("formatter.zig");
 
-// IMPORTANT: This is in a seperate file from formatter.zig because it
+// IMPORTANT: This is in a separate file from formatter.zig because it
 // puts a build-time dependency on Config.zig which brings in too much
 // into libghostty-vt tests which reference some formattable types.
 

From 58283528c79de8f9d17bc5f4e280e43835696c67 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 09:19:32 -0700
Subject: [PATCH 309/391] vt: handle invalid enum before pointer cast in
 getters

The inline else switch in each C API getter expands the .invalid
case, which has OutType void. When called with .invalid and a null
out pointer, the @ptrCast(@alignCast(out)) panics before getTyped
can return early.

Handle .invalid explicitly in the outer switch of every getter to
short-circuit before the pointer cast. This affects build_info,
cell, row, terminal, osc, and render (three getters).
---
 src/terminal/c/build_info.zig | 1 +
 src/terminal/c/cell.zig       | 1 +
 src/terminal/c/osc.zig        | 1 +
 src/terminal/c/render.zig     | 3 +++
 src/terminal/c/row.zig        | 1 +
 src/terminal/c/terminal.zig   | 1 +
 6 files changed, 8 insertions(+)

diff --git a/src/terminal/c/build_info.zig b/src/terminal/c/build_info.zig
index d65a3b562..312d94fec 100644
--- a/src/terminal/c/build_info.zig
+++ b/src/terminal/c/build_info.zig
@@ -43,6 +43,7 @@ pub fn get(
     }
 
     return switch (data) {
+        .invalid => .invalid_value,
         inline else => |comptime_data| getTyped(
             comptime_data,
             @ptrCast(@alignCast(out)),
diff --git a/src/terminal/c/cell.zig b/src/terminal/c/cell.zig
index 2ff9b35f9..171867048 100644
--- a/src/terminal/c/cell.zig
+++ b/src/terminal/c/cell.zig
@@ -110,6 +110,7 @@ pub fn get(
     }
 
     return switch (data) {
+        .invalid => .invalid_value,
         inline else => |comptime_data| getTyped(
             cell_,
             comptime_data,
diff --git a/src/terminal/c/osc.zig b/src/terminal/c/osc.zig
index c4cdaad3b..648e448fd 100644
--- a/src/terminal/c/osc.zig
+++ b/src/terminal/c/osc.zig
@@ -76,6 +76,7 @@ pub fn commandData(
     }
 
     return switch (data) {
+        .invalid => false,
         inline else => |comptime_data| commandDataTyped(
             command_,
             comptime_data,
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index f8a107979..398fe4ece 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -193,6 +193,7 @@ pub fn get(
     }
 
     return switch (data) {
+        .invalid => .invalid_value,
         inline else => |comptime_data| getTyped(
             state_,
             comptime_data,
@@ -467,6 +468,7 @@ pub fn row_cells_get(
     }
 
     return switch (data) {
+        .invalid => .invalid_value,
         inline else => |comptime_data| rowCellsGetTyped(
             cells_,
             comptime_data,
@@ -566,6 +568,7 @@ pub fn row_get(
     }
 
     return switch (data) {
+        .invalid => .invalid_value,
         inline else => |comptime_data| rowGetTyped(
             iterator_,
             comptime_data,
diff --git a/src/terminal/c/row.zig b/src/terminal/c/row.zig
index 6614d922e..7b765b56a 100644
--- a/src/terminal/c/row.zig
+++ b/src/terminal/c/row.zig
@@ -73,6 +73,7 @@ pub fn get(
     }
 
     return switch (data) {
+        .invalid => .invalid_value,
         inline else => |comptime_data| getTyped(
             row_,
             comptime_data,
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 97b76985d..2dd56a519 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -196,6 +196,7 @@ pub fn get(
     }
 
     return switch (data) {
+        .invalid => .invalid_value,
         inline else => |comptime_data| getTyped(
             terminal_,
             comptime_data,

From f92bb7419692bfce765aa6571ec1d72ac5095a2c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 09:21:33 -0700
Subject: [PATCH 310/391] ci: add test-lib-vt job

Add a new CI job that runs `zig build test-lib-vt` to test the
lib-vt build step. The job mirrors the existing test job structure
with the same nix/cachix setup and skip conditions. It is also
added to the required checks list.
---
 .github/workflows/test.yml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f59a5bd67..b49fd3b4b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -105,6 +105,7 @@ jobs:
       - test-sentry-linux
       - test-i18n
       - test-fuzz-libghostty
+      - test-lib-vt
       - test-macos
       - pinact
       - prettier
@@ -911,6 +912,36 @@ jobs:
       - name: Test System Build
         run: nix develop -c zig build --system ${ZIG_GLOBAL_CACHE_DIR}/p
 
+  test-lib-vt:
+    if: github.repository == 'ghostty-org/ghostty' && needs.skip.outputs.skip != 'true'
+    needs: skip
+    runs-on: namespace-profile-ghostty-md
+    env:
+      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
+      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Setup Cache
+        uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9 # v1.4.2
+        with:
+          path: |
+            /nix
+            /zig
+
+      # Install Nix and use that to run our tests so our environment matches exactly.
+      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
+        with:
+          name: ghostty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
+      - name: Test
+        run: nix develop -c zig build test-lib-vt
+
   test-gtk:
     strategy:
       fail-fast: false

From 3c8d0a9c25493091b82bed88f2c6c7c171a51c11 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 09:23:11 -0700
Subject: [PATCH 311/391] vt: fix test failures in render and key_encode

The colors_get function used structSizedFieldFits to guard the
palette copy, which required the entire palette array to fit in the
provided size. This prevented partial palette writes when the caller
passed a truncated sized struct, since the guard failed even though
the inner code already handled partial copies correctly. Remove the
outer guard so the existing partial-copy logic applies.

The setopt_from_terminal test expected alt_esc_prefix to be false on
a fresh terminal, but the mode definition in modes.zig sets its
default to true. Update the test expectation to match.
---
 src/terminal/c/key_encode.zig | 2 +-
 src/terminal/c/render.zig     | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/terminal/c/key_encode.zig b/src/terminal/c/key_encode.zig
index 2cdb765af..616a438d9 100644
--- a/src/terminal/c/key_encode.zig
+++ b/src/terminal/c/key_encode.zig
@@ -259,7 +259,7 @@ test "setopt_from_terminal" {
 
     // Options should reflect defaults from a fresh terminal
     try testing.expect(!e.?.opts.cursor_key_application);
-    try testing.expect(!e.?.opts.alt_esc_prefix);
+    try testing.expect(e.?.opts.alt_esc_prefix);
     try testing.expectEqual(KittyFlags.disabled, e.?.opts.kitty_flags);
     try testing.expectEqual(OptionAsAlt.false, e.?.opts.macos_option_as_alt);
 }
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index 398fe4ece..020dbc202 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -337,11 +337,7 @@ pub fn colors_get(
         out_colors.cursor_has_value = colors.cursor != null;
     }
 
-    if (lib.structSizedFieldFits(
-        Colors,
-        out_size,
-        "palette",
-    )) {
+    {
         const palette_offset = @offsetOf(Colors, "palette");
         if (out_size > palette_offset) {
             const available = out_size - palette_offset;

From aa969df6794ed5018342920b20c65c5f74c6fb7a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 08:45:28 -0700
Subject: [PATCH 312/391] ci: clean up Windows build job

Rename build-windows to build-libghostty-vt-windows to reflect that
it only builds and tests libghostty-vt for now, and move it next to
the other build-libghostty-vt jobs.

Replace the manual PowerShell zig download/install with mlugg/setup-zig,
which auto-detects the version from build.zig.zon and handles caching.
Upgrade the runner from windows-2022 to windows-2025. Remove the
generated-script-to-swallow-errors pattern in favor of direct zig
build commands.
---
 .github/workflows/test.yml | 94 ++++++++------------------------------
 1 file changed, 20 insertions(+), 74 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b49fd3b4b..05d788e5e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -92,13 +92,13 @@ jobs:
       - build-libghostty-vt
       - build-libghostty-vt-android
       - build-libghostty-vt-macos
+      - build-libghostty-vt-windows
       - build-linux
       - build-linux-libghostty
       - build-nix
       - build-macos
       - build-macos-freetype
       - build-snap
-      - build-windows
       - test
       - test-simd
       - test-gtk
@@ -500,6 +500,25 @@ jobs:
         env:
           ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
 
+  build-libghostty-vt-windows:
+    runs-on: windows-2025
+    continue-on-error: true
+    timeout-minutes: 45
+    needs: test
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Setup Zig
+        uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2.2.1
+
+      # TODO: Work towards passing the full test suite on Windows.
+      - name: Test libghostty-vt
+        run: zig build test-lib-vt
+
+      - name: Build libghostty-vt
+        run: zig build -Demit-lib-vt
+
   build-linux:
     strategy:
       fail-fast: false
@@ -795,79 +814,6 @@ jobs:
         run: |
           nix develop -c zig build --system ${{ steps.deps.outputs.deps }} -Demit-macos-app=false -Drenderer=metal -Dfont-backend=coretext_freetype
 
-  build-windows:
-    runs-on: windows-2022
-    # this will not stop other jobs from running
-    continue-on-error: true
-    timeout-minutes: 45
-    needs: test
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      # This could be from a script if we wanted to but inlining here for now
-      # in one place.
-      # Using powershell so that we do not need to install WSL components. Also,
-      # WSLv1 is only installed on Github runners.
-      - name: Install zig
-        shell: pwsh
-        run: |
-          # Get the zig version from build.zig.zon so that it only needs to be updated
-          $fileContent = Get-Content -Path "build.zig.zon" -Raw
-          $pattern = 'minimum_zig_version\s*=\s*"([^"]+)"'
-          $zigVersion = [regex]::Match($fileContent, $pattern).Groups[1].Value
-          $version = "zig-x86_64-windows-$zigVersion"
-          Write-Output $version
-          $uri = "https://ziglang.org/download/$zigVersion/$version.zip"
-          Invoke-WebRequest -Uri "$uri" -OutFile ".\zig-windows.zip"
-          Expand-Archive -Path ".\zig-windows.zip" -DestinationPath ".\" -Force
-          Remove-Item -Path ".\zig-windows.zip"
-          Rename-Item -Path ".\$version" -NewName ".\zig"
-          Write-Host "Zig installed."
-          .\zig\zig.exe version
-
-      - name: Compile build
-        shell: pwsh
-        run: .\zig\zig.exe build --help
-
-      - name: Generate build testing script
-        shell: pwsh
-        run: |
-          # Generate a script so that we can swallow the errors
-          $scriptContent = @"
-          .\zig\zig.exe build test 2>&1 | Out-File -FilePath "build.log" -Append
-          exit 0
-          "@
-          $scriptPath = "zigbuild.ps1"
-          # Write the script content to a file
-          $scriptContent | Set-Content -Path $scriptPath
-          Write-Host "Script generated at: $scriptPath"
-
-      - name: Test Windows
-        shell: pwsh
-        run: .\zigbuild.ps1 -ErrorAction SilentlyContinue
-
-      - name: Generate build script
-        shell: pwsh
-        run: |
-          # Generate a script so that we can swallow the errors
-          $scriptContent = @"
-          .\zig\zig.exe build 2>&1 | Out-File -FilePath "build.log" -Append
-          exit 0
-          "@
-          $scriptPath = "zigbuild.ps1"
-          # Write the script content to a file
-          $scriptContent | Set-Content -Path $scriptPath
-          Write-Host "Script generated at: $scriptPath"
-
-      - name: Build Windows
-        shell: pwsh
-        run: .\zigbuild.ps1 -ErrorAction SilentlyContinue
-
-      - name: Dump logs
-        shell: pwsh
-        run: Get-Content -Path ".\build.log"
-
   test:
     if: github.repository == 'ghostty-org/ghostty' && needs.skip.outputs.skip != 'true'
     needs: skip

From d568ce9cc838d97a5e323054e72f19e47c6cc0a9 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 09:58:20 -0700
Subject: [PATCH 313/391] terminal: support VirtualAlloc for page allocation on
 windows

Extract the platform-specific page backing memory allocation into
AllocPosix and AllocWindows structs behind a PageAlloc comptime
switch. Previously, POSIX mmap calls were inlined at each call
site. This adds a Windows VirtualAlloc implementation and routes
all allocation through PageAlloc.alloc/free, making the backing
memory strategy consistent and easier to extend.
---
 src/terminal/page.zig | 85 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 63 insertions(+), 22 deletions(-)

diff --git a/src/terminal/page.zig b/src/terminal/page.zig
index 6364b823e..0942e260c 100644
--- a/src/terminal/page.zig
+++ b/src/terminal/page.zig
@@ -6,6 +6,7 @@ const ArenaAllocator = std.heap.ArenaAllocator;
 const assert = @import("../quirks.zig").inlineAssert;
 const testing = std.testing;
 const posix = std.posix;
+const windows = std.os.windows;
 const fastmem = @import("../fastmem.zig");
 const color = @import("color.zig");
 const hyperlink = @import("hyperlink.zig");
@@ -26,6 +27,60 @@ const alignBackward = std.mem.alignBackward;
 
 const log = std.log.scoped(.page);
 
+/// Page-aligned allocator used for terminal page backing memory. Pages
+/// require page-aligned, zeroed memory obtained directly from the OS
+/// (not the Zig allocator) because the allocation fast-path is
+/// performance-critical and the OS guarantees zeroed pages.
+const PageAlloc = switch (builtin.os.tag) {
+    .windows => AllocWindows,
+    else => AllocPosix,
+};
+
+/// Allocate page-aligned, zeroed backing memory using mmap with
+/// MAP_PRIVATE | MAP_ANONYMOUS which guarantees zeroed pages.
+const AllocPosix = struct {
+    pub fn alloc(n: usize) ![]align(std.heap.page_size_min) u8 {
+        return try posix.mmap(
+            null,
+            n,
+            posix.PROT.READ | posix.PROT.WRITE,
+            .{ .TYPE = .PRIVATE, .ANONYMOUS = true },
+            -1,
+            0,
+        );
+    }
+
+    pub fn free(mem: []align(std.heap.page_size_min) u8) void {
+        posix.munmap(mem);
+    }
+};
+
+/// Allocate page-aligned, zeroed backing memory using VirtualAlloc with
+/// MEM_COMMIT | MEM_RESERVE which guarantees zeroed pages.
+const AllocWindows = struct {
+    pub fn alloc(n: usize) error{OutOfMemory}![]align(std.heap.page_size_min) u8 {
+        const addr = windows.VirtualAlloc(
+            null,
+            n,
+            windows.MEM_COMMIT | windows.MEM_RESERVE,
+            windows.PAGE_READWRITE,
+        ) catch return error.OutOfMemory;
+
+        return @as(
+            [*]align(std.heap.page_size_min) u8,
+            @ptrCast(@alignCast(addr)),
+        )[0..n];
+    }
+
+    pub fn free(mem: []align(std.heap.page_size_min) u8) void {
+        windows.VirtualFree(
+            @ptrCast(@alignCast(mem.ptr)),
+            0,
+            windows.MEM_RELEASE,
+        );
+    }
+};
+
 /// The allocator to use for multi-codepoint grapheme data. We use
 /// a chunk size of 4 codepoints. It'd be best to set this empirically
 /// but it is currently set based on vibes. My thinking around 4 codepoints
@@ -167,20 +222,13 @@ pub const Page = struct {
     pub inline fn init(cap: Capacity) !Page {
         const l = layout(cap);
 
-        // We use mmap directly to avoid Zig allocator overhead
-        // (small but meaningful for this path) and because a private
-        // anonymous mmap is guaranteed on Linux and macOS to be zeroed,
+        // We allocate page-aligned zeroed memory directly to avoid Zig
+        // allocator overhead (small but meaningful for this path). Both
+        // mmap (POSIX) and VirtualAlloc (Windows) guarantee zeroed pages,
         // which is a critical property for us.
         assert(l.total_size % std.heap.page_size_min == 0);
-        const backing = try posix.mmap(
-            null,
-            l.total_size,
-            posix.PROT.READ | posix.PROT.WRITE,
-            .{ .TYPE = .PRIVATE, .ANONYMOUS = true },
-            -1,
-            0,
-        );
-        errdefer posix.munmap(backing);
+        const backing = try PageAlloc.alloc(l.total_size);
+        errdefer PageAlloc.free(backing);
 
         const buf = OffsetBuf.init(backing);
         return initBuf(buf, l);
@@ -245,7 +293,7 @@ pub const Page = struct {
     /// this if you allocated the backing memory yourself (i.e. you used
     /// initBuf).
     pub inline fn deinit(self: *Page) void {
-        posix.munmap(self.memory);
+        PageAlloc.free(self.memory);
         self.* = undefined;
     }
 
@@ -578,15 +626,8 @@ pub const Page = struct {
     /// using the page allocator. If you want to manage memory manually,
     /// use cloneBuf.
     pub inline fn clone(self: *const Page) !Page {
-        const backing = try posix.mmap(
-            null,
-            self.memory.len,
-            posix.PROT.READ | posix.PROT.WRITE,
-            .{ .TYPE = .PRIVATE, .ANONYMOUS = true },
-            -1,
-            0,
-        );
-        errdefer posix.munmap(backing);
+        const backing = try PageAlloc.alloc(self.memory.len);
+        errdefer PageAlloc.free(backing);
         return self.cloneBuf(backing);
     }
 

From e95fdd2f21bda187c3a521417243d7280110f6a1 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 10:15:01 -0700
Subject: [PATCH 314/391] terminal: handle CRLF line endings in rgb.txt parsing

The X11 color map parser in x11_color.zig uses @embedFile to load
rgb.txt at comptime, then splits on \n. On Windows, git may check
out rgb.txt with CRLF line endings, leaving a trailing \r on each
line. This caused color names to be stored as e.g. "white\r" instead
of "white", so all X11 color lookups failed at runtime.

Strip trailing \r from each line before parsing. Also mark rgb.txt
as -text in .gitattributes to prevent line ending conversion in
future checkouts.
---
 .gitattributes             |  1 +
 src/terminal/x11_color.zig | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 9158b3979..2e976e5f9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,3 +12,4 @@ src/font/nerd_font_attributes.zig linguist-generated=true
 src/font/nerd_font_codepoint_tables.py linguist-generated=true
 src/font/res/** linguist-vendored
 src/terminal/res/** linguist-vendored
+src/terminal/res/rgb.txt -text
diff --git a/src/terminal/x11_color.zig b/src/terminal/x11_color.zig
index 95dcb76db..97f3a7ce4 100644
--- a/src/terminal/x11_color.zig
+++ b/src/terminal/x11_color.zig
@@ -25,12 +25,18 @@ fn colorMap() ColorMap {
     // of our unit tests will catch it.
     var iter = std.mem.splitScalar(u8, data, '\n');
     var i: usize = 0;
-    while (iter.next()) |line| {
+    while (iter.next()) |raw_line| {
+        // Trim \r so this works with both LF and CRLF line endings,
+        // since git may convert rgb.txt to CRLF on Windows checkouts.
+        const line = if (raw_line.len > 0 and raw_line[raw_line.len - 1] == '\r')
+            raw_line[0 .. raw_line.len - 1]
+        else
+            raw_line;
         if (line.len == 0) continue;
         const r = try std.fmt.parseInt(u8, std.mem.trim(u8, line[0..3], " "), 10);
         const g = try std.fmt.parseInt(u8, std.mem.trim(u8, line[4..7], " "), 10);
         const b = try std.fmt.parseInt(u8, std.mem.trim(u8, line[8..11], " "), 10);
-        const name = std.mem.trim(u8, line[12..], " \t\n");
+        const name = std.mem.trim(u8, line[12..], " \t");
         kvs[i] = .{ name, .{ .r = r, .g = g, .b = b } };
         i += 1;
     }

From 5a46e61bee58e9170f00b3c1404f6ca78aabcf82 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 13:34:09 -0700
Subject: [PATCH 315/391] cmake: fix Windows build support

On Windows, shared libraries (DLLs) require an import library (.lib)
for linking, and the DLL itself is placed in bin/ rather than lib/ by
the Zig build. The CMake wrapper was missing IMPORTED_IMPLIB on the
shared imported target, causing link failures, and assumed the shared
library was always in lib/.

Add GHOSTTY_VT_IMPLIB for the import library name, set IMPORTED_IMPLIB
on the ghostty-vt target, and fix the shared library path to use bin/
on Windows. Install the DLL and PDB to bin/ and the import library to
lib/ following standard Windows conventions. Apply the same fixes to
ghostty-vt-config.cmake.in for the find_package path.
---
 .github/workflows/test.yml            | 25 +++++++++++++++++++++++++
 CMakeLists.txt                        | 21 +++++++++++++++++----
 dist/cmake/ghostty-vt-config.cmake.in | 15 +++++++++++++--
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 05d788e5e..deca513c8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -87,6 +87,7 @@ jobs:
       - build-dist
       - build-examples-zig
       - build-examples-cmake
+      - build-examples-cmake-windows
       - build-cmake
       - build-flatpak
       - build-libghostty-vt
@@ -263,6 +264,30 @@ jobs:
           nix develop -c cmake -B build -DFETCHCONTENT_SOURCE_DIR_GHOSTTY=${{ github.workspace }}
           nix develop -c cmake --build build
 
+  build-examples-cmake-windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        dir: ${{ fromJSON(needs.list-examples.outputs.cmake) }}
+    name: Example ${{ matrix.dir }} (Windows)
+    runs-on: windows-2025
+    continue-on-error: true
+    timeout-minutes: 45
+    needs: [test, list-examples]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Install zig
+        uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2.2.1
+
+      - name: Build Example
+        shell: pwsh
+        run: |
+          cd example/${{ matrix.dir }}
+          cmake -B build -DFETCHCONTENT_SOURCE_DIR_GHOSTTY=${{ github.workspace }}
+          cmake --build build
+
   build-cmake:
     runs-on: namespace-profile-ghostty-sm
     needs: test
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfa2677fe..27864a88d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,13 +81,18 @@ if(APPLE)
 elseif(WIN32)
     set(GHOSTTY_VT_LIBNAME "ghostty-vt.dll")
     set(GHOSTTY_VT_REALNAME "ghostty-vt.dll")
+    set(GHOSTTY_VT_IMPLIB "ghostty-vt.lib")
 else()
     set(GHOSTTY_VT_LIBNAME "${CMAKE_SHARED_LIBRARY_PREFIX}ghostty-vt${CMAKE_SHARED_LIBRARY_SUFFIX}")
     set(GHOSTTY_VT_SONAME "${CMAKE_SHARED_LIBRARY_PREFIX}ghostty-vt${CMAKE_SHARED_LIBRARY_SUFFIX}.0")
     set(GHOSTTY_VT_REALNAME "${CMAKE_SHARED_LIBRARY_PREFIX}ghostty-vt${CMAKE_SHARED_LIBRARY_SUFFIX}.0.1.0")
 endif()
 
-set(GHOSTTY_VT_SHARED_LIBRARY "${ZIG_OUT_DIR}/lib/${GHOSTTY_VT_REALNAME}")
+if(WIN32)
+    set(GHOSTTY_VT_SHARED_LIBRARY "${ZIG_OUT_DIR}/bin/${GHOSTTY_VT_REALNAME}")
+else()
+    set(GHOSTTY_VT_SHARED_LIBRARY "${ZIG_OUT_DIR}/lib/${GHOSTTY_VT_REALNAME}")
+endif()
 
 # Static library name.
 set(GHOSTTY_VT_STATIC_REALNAME "${CMAKE_STATIC_LIBRARY_PREFIX}ghostty-vt${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -122,7 +127,11 @@ if(APPLE)
     set_target_properties(ghostty-vt PROPERTIES
         IMPORTED_SONAME "@rpath/${GHOSTTY_VT_SONAME}"
     )
-elseif(NOT WIN32)
+elseif(WIN32)
+    set_target_properties(ghostty-vt PROPERTIES
+        IMPORTED_IMPLIB "${ZIG_OUT_DIR}/lib/${GHOSTTY_VT_IMPLIB}"
+    )
+else()
     set_target_properties(ghostty-vt PROPERTIES
         IMPORTED_SONAME "${GHOSTTY_VT_SONAME}"
     )
@@ -152,8 +161,12 @@ add_dependencies(ghostty-vt-static zig_build_lib_vt)
 include(GNUInstallDirs)
 
 # Install shared library
-install(FILES "${GHOSTTY_VT_SHARED_LIBRARY}" TYPE LIB)
-if(NOT WIN32)
+if(WIN32)
+    # On Windows, install the DLL and PDB to bin/ and the import library to lib/
+    install(FILES "${GHOSTTY_VT_SHARED_LIBRARY}" "${ZIG_OUT_DIR}/bin/ghostty-vt.pdb" TYPE BIN)
+    install(FILES "${ZIG_OUT_DIR}/lib/${GHOSTTY_VT_IMPLIB}" TYPE LIB)
+else()
+    install(FILES "${GHOSTTY_VT_SHARED_LIBRARY}" TYPE LIB)
     # Install symlinks
     install(CODE "
         execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink
diff --git a/dist/cmake/ghostty-vt-config.cmake.in b/dist/cmake/ghostty-vt-config.cmake.in
index 9e1d65f6c..4d97a525c 100644
--- a/dist/cmake/ghostty-vt-config.cmake.in
+++ b/dist/cmake/ghostty-vt-config.cmake.in
@@ -8,10 +8,17 @@ set(_ghostty_vt_libdir "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_LIBDIR@")
 if(NOT TARGET ghostty-vt::ghostty-vt)
     add_library(ghostty-vt::ghostty-vt SHARED IMPORTED)
 
+    if(WIN32)
+        set(_ghostty_vt_shared_location "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_BINDIR@/@GHOSTTY_VT_REALNAME@")
+    else()
+        set(_ghostty_vt_shared_location "${_ghostty_vt_libdir}/@GHOSTTY_VT_REALNAME@")
+    endif()
+
     set_target_properties(ghostty-vt::ghostty-vt PROPERTIES
-        IMPORTED_LOCATION "${_ghostty_vt_libdir}/@GHOSTTY_VT_REALNAME@"
+        IMPORTED_LOCATION "${_ghostty_vt_shared_location}"
         INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@"
     )
+    unset(_ghostty_vt_shared_location)
 
     if(APPLE)
         set_target_properties(ghostty-vt::ghostty-vt PROPERTIES
@@ -22,7 +29,11 @@ if(NOT TARGET ghostty-vt::ghostty-vt)
         set_property(TARGET ghostty-vt::ghostty-vt APPEND PROPERTY
             INTERFACE_LINK_OPTIONS "LINKER:-rpath,${_ghostty_vt_libdir}"
         )
-    elseif(NOT WIN32)
+    elseif(WIN32)
+        set_target_properties(ghostty-vt::ghostty-vt PROPERTIES
+            IMPORTED_IMPLIB "${_ghostty_vt_libdir}/@GHOSTTY_VT_IMPLIB@"
+        )
+    else()
         set_target_properties(ghostty-vt::ghostty-vt PROPERTIES
             IMPORTED_SONAME "@GHOSTTY_VT_SONAME@"
         )

From f4998c6abbce862448d68fb2b4c3b17ba16d7b16 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 13:55:38 -0700
Subject: [PATCH 316/391] build: fix Windows build failures in helpgen and
 framegen

Use writerStreaming() instead of writer() for stdout in helpgen and
main_build_data. The positional writer calls setEndPos/ftruncate in
end(), which fails on Windows when stdout is redirected via
captureStdOut() because ftruncate maps INVALID_PARAMETER to
FileTooBig. Streaming mode skips truncation entirely since stdout
is inherently a sequential stream.

Replace scandir with opendir/readdir plus qsort in framegen since
scandir is a POSIX extension not available on Windows.
---
 src/build/framegen/main.c | 39 +++++++++++++++++++++++++++++++--------
 src/helpgen.zig           |  2 +-
 src/main_build_data.zig   |  2 +-
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/build/framegen/main.c b/src/build/framegen/main.c
index 647768006..2139b15dd 100644
--- a/src/build/framegen/main.c
+++ b/src/build/framegen/main.c
@@ -8,15 +8,16 @@
 
 #define SEPARATOR '\x01'
 #define CHUNK_SIZE 16384
+#define MAX_FRAMES 1024
+#define PATH_SEP '/'
 
-static int filter_frames(const struct dirent *entry) {
-    const char *name = entry->d_name;
+static int is_frame_file(const char *name) {
     size_t len = strlen(name);
     return len > 4 && strcmp(name + len - 4, ".txt") == 0;
 }
 
-static int compare_frames(const struct dirent **a, const struct dirent **b) {
-    return strcmp((*a)->d_name, (*b)->d_name);
+static int compare_names(const void *a, const void *b) {
+    return strcmp(*(const char **)a, *(const char **)b);
 }
 
 static char *read_file(const char *path, size_t *out_size) {
@@ -54,25 +55,47 @@ int main(int argc, char **argv) {
     const char *frames_dir = argv[1];
     const char *output_file = argv[2];
 
-    struct dirent **namelist;
-    int n = scandir(frames_dir, &namelist, filter_frames, compare_frames);
-    if (n < 0) {
+    // Use opendir/readdir instead of scandir for Windows compatibility
+    DIR *dir = opendir(frames_dir);
+    if (!dir) {
         fprintf(stderr, "Failed to scan directory %s: %s\n", frames_dir, strerror(errno));
         return 1;
     }
 
+    char *names[MAX_FRAMES];
+    int n = 0;
+    struct dirent *entry;
+    while ((entry = readdir(dir)) != NULL) {
+        if (!is_frame_file(entry->d_name)) continue;
+        if (n >= MAX_FRAMES) {
+            fprintf(stderr, "Too many frame files (max %d)\n", MAX_FRAMES);
+            closedir(dir);
+            return 1;
+        }
+        names[n] = strdup(entry->d_name);
+        if (!names[n]) {
+            fprintf(stderr, "Failed to allocate memory\n");
+            closedir(dir);
+            return 1;
+        }
+        n++;
+    }
+    closedir(dir);
+
     if (n == 0) {
         fprintf(stderr, "No frame files found in %s\n", frames_dir);
         return 1;
     }
 
+    qsort(names, n, sizeof(char *), compare_names);
+
     size_t total_size = 0;
     char **frame_contents = calloc(n, sizeof(char*));
     size_t *frame_sizes = calloc(n, sizeof(size_t));
 
     for (int i = 0; i < n; i++) {
         char path[4096];
-        snprintf(path, sizeof(path), "%s/%s", frames_dir, namelist[i]->d_name);
+        snprintf(path, sizeof(path), "%s%c%s", frames_dir, PATH_SEP, names[i]);
         
         frame_contents[i] = read_file(path, &frame_sizes[i]);
         if (!frame_contents[i]) {
diff --git a/src/helpgen.zig b/src/helpgen.zig
index fe30db10c..49b5f4439 100644
--- a/src/helpgen.zig
+++ b/src/helpgen.zig
@@ -12,7 +12,7 @@ pub fn main() !void {
     const alloc = gpa.allocator();
 
     var buf: [4096]u8 = undefined;
-    var stdout = std.fs.File.stdout().writer(&buf);
+    var stdout = std.fs.File.stdout().writerStreaming(&buf);
     const writer = &stdout.interface;
     try writer.writeAll(
         \\// THIS FILE IS AUTO GENERATED
diff --git a/src/main_build_data.zig b/src/main_build_data.zig
index 9dd1da395..4e55f449d 100644
--- a/src/main_build_data.zig
+++ b/src/main_build_data.zig
@@ -34,7 +34,7 @@ pub fn main() !void {
 
     // Our output always goes to stdout.
     var buffer: [1024]u8 = undefined;
-    var stdout_writer = std.fs.File.stdout().writer(&buffer);
+    var stdout_writer = std.fs.File.stdout().writerStreaming(&buffer);
     const writer = &stdout_writer.interface;
     switch (action) {
         .bash => try writer.writeAll(@import("extra/bash.zig").completions),

From 48cf3f36cde2c28ba2f321636bf8612873bd274a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 13:57:42 -0700
Subject: [PATCH 317/391] ci: run Windows CMake examples after building

Add a "Run Example" step to the build-examples-cmake-windows job
so that each CMake example is executed after it is built, verifying
the resulting binaries actually work. The executable name is derived
from the matrix directory name by replacing hyphens with underscores,
matching the project convention.
---
 .github/workflows/test.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index deca513c8..d1cba5f87 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -288,6 +288,14 @@ jobs:
           cmake -B build -DFETCHCONTENT_SOURCE_DIR_GHOSTTY=${{ github.workspace }}
           cmake --build build
 
+      - name: Run Example
+        shell: pwsh
+        run: |
+          $name = "${{ matrix.dir }}" -replace '-','_'
+          $exe = "example/${{ matrix.dir }}/build/Debug/${name}.exe"
+          if (!(Test-Path $exe)) { $exe = "example/${{ matrix.dir }}/build/${name}.exe" }
+          & $exe
+
   build-cmake:
     runs-on: namespace-profile-ghostty-sm
     needs: test

From 0fdddd5bc2efe1cd8952ac4e248c84ff91c95cdf Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 14:10:12 -0700
Subject: [PATCH 318/391] Revert "build: fix Windows build failures in helpgen
 and framegen"

This reverts commit 704511465b8b04d6839fbaaf3323d9349693f04a.
---
 src/build/framegen/main.c | 39 ++++++++-------------------------------
 src/helpgen.zig           |  2 +-
 src/main_build_data.zig   |  2 +-
 3 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/src/build/framegen/main.c b/src/build/framegen/main.c
index 2139b15dd..647768006 100644
--- a/src/build/framegen/main.c
+++ b/src/build/framegen/main.c
@@ -8,16 +8,15 @@
 
 #define SEPARATOR '\x01'
 #define CHUNK_SIZE 16384
-#define MAX_FRAMES 1024
-#define PATH_SEP '/'
 
-static int is_frame_file(const char *name) {
+static int filter_frames(const struct dirent *entry) {
+    const char *name = entry->d_name;
     size_t len = strlen(name);
     return len > 4 && strcmp(name + len - 4, ".txt") == 0;
 }
 
-static int compare_names(const void *a, const void *b) {
-    return strcmp(*(const char **)a, *(const char **)b);
+static int compare_frames(const struct dirent **a, const struct dirent **b) {
+    return strcmp((*a)->d_name, (*b)->d_name);
 }
 
 static char *read_file(const char *path, size_t *out_size) {
@@ -55,47 +54,25 @@ int main(int argc, char **argv) {
     const char *frames_dir = argv[1];
     const char *output_file = argv[2];
 
-    // Use opendir/readdir instead of scandir for Windows compatibility
-    DIR *dir = opendir(frames_dir);
-    if (!dir) {
+    struct dirent **namelist;
+    int n = scandir(frames_dir, &namelist, filter_frames, compare_frames);
+    if (n < 0) {
         fprintf(stderr, "Failed to scan directory %s: %s\n", frames_dir, strerror(errno));
         return 1;
     }
 
-    char *names[MAX_FRAMES];
-    int n = 0;
-    struct dirent *entry;
-    while ((entry = readdir(dir)) != NULL) {
-        if (!is_frame_file(entry->d_name)) continue;
-        if (n >= MAX_FRAMES) {
-            fprintf(stderr, "Too many frame files (max %d)\n", MAX_FRAMES);
-            closedir(dir);
-            return 1;
-        }
-        names[n] = strdup(entry->d_name);
-        if (!names[n]) {
-            fprintf(stderr, "Failed to allocate memory\n");
-            closedir(dir);
-            return 1;
-        }
-        n++;
-    }
-    closedir(dir);
-
     if (n == 0) {
         fprintf(stderr, "No frame files found in %s\n", frames_dir);
         return 1;
     }
 
-    qsort(names, n, sizeof(char *), compare_names);
-
     size_t total_size = 0;
     char **frame_contents = calloc(n, sizeof(char*));
     size_t *frame_sizes = calloc(n, sizeof(size_t));
 
     for (int i = 0; i < n; i++) {
         char path[4096];
-        snprintf(path, sizeof(path), "%s%c%s", frames_dir, PATH_SEP, names[i]);
+        snprintf(path, sizeof(path), "%s/%s", frames_dir, namelist[i]->d_name);
         
         frame_contents[i] = read_file(path, &frame_sizes[i]);
         if (!frame_contents[i]) {
diff --git a/src/helpgen.zig b/src/helpgen.zig
index 49b5f4439..fe30db10c 100644
--- a/src/helpgen.zig
+++ b/src/helpgen.zig
@@ -12,7 +12,7 @@ pub fn main() !void {
     const alloc = gpa.allocator();
 
     var buf: [4096]u8 = undefined;
-    var stdout = std.fs.File.stdout().writerStreaming(&buf);
+    var stdout = std.fs.File.stdout().writer(&buf);
     const writer = &stdout.interface;
     try writer.writeAll(
         \\// THIS FILE IS AUTO GENERATED
diff --git a/src/main_build_data.zig b/src/main_build_data.zig
index 4e55f449d..9dd1da395 100644
--- a/src/main_build_data.zig
+++ b/src/main_build_data.zig
@@ -34,7 +34,7 @@ pub fn main() !void {
 
     // Our output always goes to stdout.
     var buffer: [1024]u8 = undefined;
-    var stdout_writer = std.fs.File.stdout().writerStreaming(&buffer);
+    var stdout_writer = std.fs.File.stdout().writer(&buffer);
     const writer = &stdout_writer.interface;
     switch (action) {
         .bash => try writer.writeAll(@import("extra/bash.zig").completions),

From 2afadfc104ee4b0385afe19e9560da8afb58e7f1 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 14:18:28 -0700
Subject: [PATCH 320/391] build: fix Windows cmake example failures

The cmake examples were failing at runtime on Windows CI for two
reasons.

The static library was installed as "libghostty-vt.a" on all
platforms, but on Windows the DLL import library is also placed in
zig-out/lib/ as "ghostty-vt.lib". The CMakeLists.txt expected the
platform-native name "ghostty-vt.lib" for the static lib, so it
picked up the tiny DLL import lib instead, silently producing a
dynamically-linked executable. That executable then failed at
runtime because the DLL was not on PATH.

Fix this by installing the static library as "ghostty-vt-static.lib"
on Windows to avoid the name collision, and updating CMakeLists.txt
to match. For the shared (DLL) example, add zig-out/bin to PATH in
the CI run step so the DLL can be found at runtime.
---
 .github/workflows/test.yml |  1 +
 CMakeLists.txt             |  8 +++++++-
 build.zig                  | 10 +++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d1cba5f87..26a7a73ce 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -294,6 +294,7 @@ jobs:
           $name = "${{ matrix.dir }}" -replace '-','_'
           $exe = "example/${{ matrix.dir }}/build/Debug/${name}.exe"
           if (!(Test-Path $exe)) { $exe = "example/${{ matrix.dir }}/build/${name}.exe" }
+          $env:PATH = "${{ github.workspace }}/zig-out/bin;$env:PATH"
           & $exe
 
   build-cmake:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27864a88d..bf17d955f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,7 +95,13 @@ else()
 endif()
 
 # Static library name.
-set(GHOSTTY_VT_STATIC_REALNAME "${CMAKE_STATIC_LIBRARY_PREFIX}ghostty-vt${CMAKE_STATIC_LIBRARY_SUFFIX}")
+# On Windows, the static lib is named "ghostty-vt-static.lib" to avoid
+# colliding with the DLL import library "ghostty-vt.lib".
+if(WIN32)
+    set(GHOSTTY_VT_STATIC_REALNAME "ghostty-vt-static.lib")
+else()
+    set(GHOSTTY_VT_STATIC_REALNAME "libghostty-vt.a")
+endif()
 set(GHOSTTY_VT_STATIC_LIBRARY "${ZIG_OUT_DIR}/lib/${GHOSTTY_VT_STATIC_REALNAME}")
 
 # Ensure the output directories exist so CMake doesn't reject the
diff --git a/build.zig b/build.zig
index b34719545..1f3d0c196 100644
--- a/build.zig
+++ b/build.zig
@@ -111,17 +111,21 @@ pub fn build(b: *std.Build) !void {
         b,
         &mod,
     );
-
     if (config.is_dep) {
         // If we're a dependency, we need to install everything as-is
         // so that dep.artifact("ghostty-vt-static") works.
         libghostty_vt_static.install(b.getInstallStep());
     } else {
         // If we're not a dependency, we rename the static lib to
-        // be idiomatic.
+        // be idiomatic. On Windows, we use a distinct name to avoid
+        // colliding with the DLL import library (ghostty-vt.lib).
+        const static_lib_name = if (config.target.result.os.tag == .windows)
+            "ghostty-vt-static.lib"
+        else
+            "libghostty-vt.a";
         b.getInstallStep().dependOn(&b.addInstallLibFile(
             libghostty_vt_static.output,
-            "libghostty-vt.a",
+            static_lib_name,
         ).step);
     }
 

From 31285e1ac34d8a2dcd46ec682fba767d05ebd21e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 10:42:05 -0700
Subject: [PATCH 321/391] build: disable bundled compiler_rt and ubsan_rt for
 MSVC targets

Zig's bundled compiler_rt and ubsan_rt produce object files with
ELF-style linker directives (/exclude-symbols) and COMDAT sections
that are incompatible with the MSVC linker, causing LNK1143 and
LNK4229 errors when linking the static library.

MSVC provides its own compiler runtime so bundling Zig's versions
is unnecessary. Skip bundling both runtimes when the target ABI is
MSVC.
---
 src/build/GhosttyLibVt.zig | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/build/GhosttyLibVt.zig b/src/build/GhosttyLibVt.zig
index 1f5f72b84..a574bbf0c 100644
--- a/src/build/GhosttyLibVt.zig
+++ b/src/build/GhosttyLibVt.zig
@@ -94,12 +94,19 @@ fn initLib(
     );
 
     if (kind == .static) {
+        const is_msvc_abi = target.result.abi == .msvc;
+
         // These must be bundled since we're compiling into a static lib.
         // Otherwise, you get undefined symbol errors. This could cause
         // problems if you're linking multiple static Zig libraries but
         // we'll cross that bridge when we get to it.
-        lib.bundle_compiler_rt = true;
-        lib.bundle_ubsan_rt = true;
+        //
+        // On MSVC targets, the MSVC runtime provides these, and Zig's
+        // bundled versions produce object files with ELF-style linker
+        // directives (e.g. /exclude-symbols) and COMDAT sections that
+        // are incompatible with the MSVC linker (LNK1143, LNK4229).
+        lib.bundle_compiler_rt = !is_msvc_abi;
+        lib.bundle_ubsan_rt = !is_msvc_abi;
 
         // Enable PIC so the static library can be linked into PIE
         // executables, which is the default on most Linux distributions.

From 1ce057f0535f3a0a57cb5c9ed34d3b7fecfb967c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 10:52:21 -0700
Subject: [PATCH 322/391] build: disable ubsan and bundled runtimes for MSVC
 targets

Zig's ubsan instrumentation emits ELF-style /exclude-symbols linker
directives into the compiled object files, causing LNK4229 warnings
with the MSVC linker. The bundled compiler_rt also produces COMDAT
sections that are incompatible with MSVC, causing fatal LNK1143.

Disable sanitize_c entirely on the root module for MSVC targets and
skip bundling both compiler_rt and ubsan_rt since MSVC provides its
own runtime.
---
 src/build/GhosttyLibVt.zig | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/build/GhosttyLibVt.zig b/src/build/GhosttyLibVt.zig
index a574bbf0c..cc27557d3 100644
--- a/src/build/GhosttyLibVt.zig
+++ b/src/build/GhosttyLibVt.zig
@@ -94,25 +94,28 @@ fn initLib(
     );
 
     if (kind == .static) {
-        const is_msvc_abi = target.result.abi == .msvc;
-
         // These must be bundled since we're compiling into a static lib.
         // Otherwise, you get undefined symbol errors. This could cause
         // problems if you're linking multiple static Zig libraries but
         // we'll cross that bridge when we get to it.
-        //
-        // On MSVC targets, the MSVC runtime provides these, and Zig's
-        // bundled versions produce object files with ELF-style linker
-        // directives (e.g. /exclude-symbols) and COMDAT sections that
-        // are incompatible with the MSVC linker (LNK1143, LNK4229).
-        lib.bundle_compiler_rt = !is_msvc_abi;
-        lib.bundle_ubsan_rt = !is_msvc_abi;
+        lib.bundle_compiler_rt = true;
+        lib.bundle_ubsan_rt = true;
 
         // Enable PIC so the static library can be linked into PIE
         // executables, which is the default on most Linux distributions.
         lib.root_module.pic = true;
     }
 
+    if (target.result.os.tag == .windows) {
+        // Zig's ubsan emits /exclude-symbols linker directives and
+        // its compiler_rt produces COMDAT sections that are
+        // incompatible with the MSVC linker (LNK1143, LNK4229).
+        // Skip bundling these runtimes on Windows since consumers
+        // link against the MSVC runtime.
+        lib.bundle_compiler_rt = false;
+        lib.bundle_ubsan_rt = false;
+    }
+
     if (lib.rootModuleTarget().abi.isAndroid()) {
         // Support 16kb page sizes, required for Android 15+.
         lib.link_z_max_page_size = 16384; // 16kb

From 69f82ec7511950eef3d5f52c738d5da6bcac9b0c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 11:12:19 -0700
Subject: [PATCH 323/391] build: disable bundled ubsan runtime on Windows

Zig's ubsan runtime emits /exclude-symbols linker directives that
are incompatible with the MSVC linker, causing LNK4229 warnings and
LNK1143 errors. Disable bundling ubsan_rt on Windows while keeping
compiler_rt which provides essential symbols like memcpy, memset,
memmove, and ___chkstk_ms.

The previous check used target.result.abi == .msvc which never
matched because Zig defaults to the gnu ABI on Windows.
---
 src/build/GhosttyLibVt.zig | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/build/GhosttyLibVt.zig b/src/build/GhosttyLibVt.zig
index cc27557d3..408f1ebc8 100644
--- a/src/build/GhosttyLibVt.zig
+++ b/src/build/GhosttyLibVt.zig
@@ -107,12 +107,8 @@ fn initLib(
     }
 
     if (target.result.os.tag == .windows) {
-        // Zig's ubsan emits /exclude-symbols linker directives and
-        // its compiler_rt produces COMDAT sections that are
-        // incompatible with the MSVC linker (LNK1143, LNK4229).
-        // Skip bundling these runtimes on Windows since consumers
-        // link against the MSVC runtime.
-        lib.bundle_compiler_rt = false;
+        // Zig's ubsan emits /exclude-symbols linker directives that
+        // are incompatible with the MSVC linker (LNK4229).
         lib.bundle_ubsan_rt = false;
     }
 

From 2c89bef860efbd5518375edcce6f1f210a923c59 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 11:20:20 -0700
Subject: [PATCH 324/391] build: skip bundled compiler_rt and ubsan_rt in
 Windows static lib

Zig's compiler_rt produces COFF objects with invalid COMDAT
sections that the MSVC linker rejects (LNK1143), and its ubsan_rt
emits /exclude-symbols directives that MSVC does not understand
(LNK4229). Skip bundling both in the static library on Windows
since the MSVC CRT provides the needed builtins (memcpy, memset,
etc.). The shared library continues to bundle compiler_rt as it
needs to be self-contained.
---
 src/build/GhosttyLibVt.zig | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/build/GhosttyLibVt.zig b/src/build/GhosttyLibVt.zig
index 408f1ebc8..fcc93e4c7 100644
--- a/src/build/GhosttyLibVt.zig
+++ b/src/build/GhosttyLibVt.zig
@@ -94,12 +94,20 @@ fn initLib(
     );
 
     if (kind == .static) {
+        const is_windows = target.result.os.tag == .windows;
+
         // These must be bundled since we're compiling into a static lib.
         // Otherwise, you get undefined symbol errors. This could cause
         // problems if you're linking multiple static Zig libraries but
         // we'll cross that bridge when we get to it.
-        lib.bundle_compiler_rt = true;
-        lib.bundle_ubsan_rt = true;
+        //
+        // On Windows, Zig's compiler_rt produces COFF objects with
+        // invalid COMDAT sections (LNK1143) and its ubsan_rt emits
+        // /exclude-symbols directives the MSVC linker rejects
+        // (LNK4229). Both are skipped since the MSVC CRT provides
+        // the needed builtins (memcpy, memset, etc.).
+        lib.bundle_compiler_rt = !is_windows;
+        lib.bundle_ubsan_rt = !is_windows;
 
         // Enable PIC so the static library can be linked into PIE
         // executables, which is the default on most Linux distributions.

From 909e733120672e643645605f8bfc2759a1cb4df2 Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Mon, 23 Mar 2026 19:30:14 +0100
Subject: [PATCH 325/391] windows: handle backslash paths in config value
 parsing

CommaSplitter treats backslash as an escape character, which breaks
Windows paths like C:\Users\foo since \U is not a valid escape. On
Windows, treat backslash as a literal character outside of quoted
strings. Inside quotes, escape sequences still work as before.

The platform behavior is controlled by a single comptime constant
(escape_outside_quotes) so the logic lives in one place. Escape-specific
tests are skipped on Windows with SkipZigTest, and Windows-specific
tests are added separately.

Also fix Theme.parseCLI to not mistake the colon in a Windows drive
letter (C:\...) for a light/dark theme pair separator.

Note: other places in the config parsing also use colon as a delimiter
without accounting for Windows drive letters (command.zig prefix
parsing, keybind parsing). Those are tracked separately.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/cli/CommaSplitter.zig | 63 +++++++++++++++++++++++++++++++++++++--
 src/config/Config.zig     |  9 +++++-
 2 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/src/cli/CommaSplitter.zig b/src/cli/CommaSplitter.zig
index 3168c1ffa..d5093992d 100644
--- a/src/cli/CommaSplitter.zig
+++ b/src/cli/CommaSplitter.zig
@@ -13,8 +13,18 @@
 //!
 //! Quotes and escapes are not stripped or decoded, that must be handled as a
 //! separate step!
+//!
+//! On Windows, backslash is only treated as an escape character inside quoted
+//! strings. Outside quotes, backslash is a literal character (path separator).
 const CommaSplitter = @This();
 
+const builtin = @import("builtin");
+
+/// Whether backslash acts as an escape character outside quoted strings.
+/// On Windows, backslash is the path separator so it is always literal
+/// outside quotes.
+const escape_outside_quotes = builtin.os.tag != .windows;
+
 pub const Error = error{
     UnclosedQuote,
     UnfinishedEscape,
@@ -77,8 +87,11 @@ pub fn next(self: *CommaSplitter) Error!?[]const u8 {
                 },
                 '\\' => {
                     self.index += 1;
-                    last = .normal;
-                    continue :loop .escape;
+                    if (comptime escape_outside_quotes) {
+                        last = .normal;
+                        continue :loop .escape;
+                    }
+                    continue :loop .normal;
                 },
                 else => {
                     self.index += 1;
@@ -273,6 +286,7 @@ test "splitter 8" {
 }
 
 test "splitter 9" {
+    if (comptime !escape_outside_quotes) return error.SkipZigTest;
     const std = @import("std");
     const testing = std.testing;
 
@@ -281,6 +295,7 @@ test "splitter 9" {
 }
 
 test "splitter 10" {
+    if (comptime !escape_outside_quotes) return error.SkipZigTest;
     const std = @import("std");
     const testing = std.testing;
 
@@ -289,6 +304,7 @@ test "splitter 10" {
 }
 
 test "splitter 11" {
+    if (comptime !escape_outside_quotes) return error.SkipZigTest;
     const std = @import("std");
     const testing = std.testing;
 
@@ -297,6 +313,7 @@ test "splitter 11" {
 }
 
 test "splitter 12" {
+    if (comptime !escape_outside_quotes) return error.SkipZigTest;
     const std = @import("std");
     const testing = std.testing;
 
@@ -305,6 +322,7 @@ test "splitter 12" {
 }
 
 test "splitter 13" {
+    if (comptime !escape_outside_quotes) return error.SkipZigTest;
     const std = @import("std");
     const testing = std.testing;
 
@@ -313,6 +331,7 @@ test "splitter 13" {
 }
 
 test "splitter 14" {
+    if (comptime !escape_outside_quotes) return error.SkipZigTest;
     const std = @import("std");
     const testing = std.testing;
 
@@ -330,6 +349,7 @@ test "splitter 15" {
 }
 
 test "splitter 16" {
+    if (comptime !escape_outside_quotes) return error.SkipZigTest;
     const std = @import("std");
     const testing = std.testing;
 
@@ -338,6 +358,7 @@ test "splitter 16" {
 }
 
 test "splitter 17" {
+    if (comptime !escape_outside_quotes) return error.SkipZigTest;
     const std = @import("std");
     const testing = std.testing;
 
@@ -346,6 +367,7 @@ test "splitter 17" {
 }
 
 test "splitter 18" {
+    if (comptime !escape_outside_quotes) return error.SkipZigTest;
     const std = @import("std");
     const testing = std.testing;
 
@@ -415,6 +437,7 @@ test "splitter 24" {
 }
 
 test "splitter 25" {
+    if (comptime !escape_outside_quotes) return error.SkipZigTest;
     const std = @import("std");
     const testing = std.testing;
 
@@ -422,3 +445,39 @@ test "splitter 25" {
     try testing.expectEqualStrings("a", (try s.next()).?);
     try testing.expectError(error.IllegalEscape, s.next());
 }
+
+// Windows-specific tests: backslash is literal outside quotes.
+
+test "splitter: windows paths" {
+    if (comptime escape_outside_quotes) return error.SkipZigTest;
+    const std = @import("std");
+    const testing = std.testing;
+
+    var s: CommaSplitter = .init("light:C:\\Users\\foo\\theme,dark:C:\\Users\\bar\\theme");
+    try testing.expectEqualStrings("light:C:\\Users\\foo\\theme", (try s.next()).?);
+    try testing.expectEqualStrings("dark:C:\\Users\\bar\\theme", (try s.next()).?);
+    try testing.expect(null == try s.next());
+}
+
+test "splitter: backslash literal outside quotes on windows" {
+    if (comptime escape_outside_quotes) return error.SkipZigTest;
+    const std = @import("std");
+    const testing = std.testing;
+
+    // Backslash followed by characters that would be escapes on Unix
+    // are treated as literal on Windows outside quotes.
+    var s: CommaSplitter = .init("\\n\\r\\t");
+    try testing.expectEqualStrings("\\n\\r\\t", (try s.next()).?);
+    try testing.expect(null == try s.next());
+}
+
+test "splitter: backslash still escapes inside quotes on windows" {
+    if (comptime escape_outside_quotes) return error.SkipZigTest;
+    const std = @import("std");
+    const testing = std.testing;
+
+    // Inside quotes, backslash escapes work on all platforms.
+    var s: CommaSplitter = .init("\"hello\\nworld\"");
+    try testing.expectEqualStrings("\"hello\\nworld\"", (try s.next()).?);
+    try testing.expect(null == try s.next());
+}
diff --git a/src/config/Config.zig b/src/config/Config.zig
index facbdb21d..13f78eea6 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -9810,9 +9810,16 @@ pub const Theme = struct {
         // we're parsing a light/dark mode theme pair. Note that "=" isn't
         // actually valid for setting a light/dark mode pair but I anticipate
         // it'll be a common typo.
+        //
+        // On Windows, a colon at index 1 is a drive letter (e.g. C:\...)
+        // and should not trigger light/dark pair parsing.
+        const has_colon = if (comptime builtin.os.tag == .windows)
+            if (std.mem.indexOf(u8, input, ":")) |idx| idx != 1 else false
+        else
+            std.mem.indexOf(u8, input, ":") != null;
         if (std.mem.indexOf(u8, input, ",") != null or
             std.mem.indexOf(u8, input, "=") != null or
-            std.mem.indexOf(u8, input, ":") != null)
+            has_colon)
         {
             self.* = try cli.args.parseAutoStruct(
                 Theme,

From 01401ef6756c0876b775e0bcdd06064abc68697e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 11:31:41 -0700
Subject: [PATCH 326/391] build: fix Windows static lib linking with MSVC

Three issues when linking the static library with the MSVC linker:

Use the LLVM backend on Windows to produce valid COFF objects.
The self-hosted backend generates compiler_rt objects with invalid
COMDAT sections that the MSVC linker rejects (LNK1143).

Disable bundling ubsan_rt on Windows. Zig's ubsan runtime emits
/exclude-symbols linker directives that MSVC does not understand
(LNK4229).

Add ntdll and kernel32 as transitive link dependencies for the
static library on Windows. The Zig standard library uses NT API
functions (NtClose, NtCreateSection, etc.) that consumers must
link.
---
 CMakeLists.txt                        |  8 ++++++++
 dist/cmake/ghostty-vt-config.cmake.in |  5 +++++
 src/build/GhosttyLibVt.zig            | 17 +++++++----------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf17d955f..cae5bdba7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,6 +160,14 @@ set_target_properties(ghostty-vt-static PROPERTIES
     IMPORTED_LOCATION "${GHOSTTY_VT_STATIC_LIBRARY}"
     INTERFACE_INCLUDE_DIRECTORIES "${ZIG_OUT_DIR}/include"
 )
+if(WIN32)
+    # On Windows, the Zig standard library uses NT API functions
+    # (NtClose, NtCreateSection, etc.) and kernel32 functions that
+    # consumers must link when using the static library.
+    set_target_properties(ghostty-vt-static PROPERTIES
+        INTERFACE_LINK_LIBRARIES "ntdll;kernel32"
+    )
+endif()
 add_dependencies(ghostty-vt-static zig_build_lib_vt)
 
 # --- Install ------------------------------------------------------------------
diff --git a/dist/cmake/ghostty-vt-config.cmake.in b/dist/cmake/ghostty-vt-config.cmake.in
index 4d97a525c..8e1d75729 100644
--- a/dist/cmake/ghostty-vt-config.cmake.in
+++ b/dist/cmake/ghostty-vt-config.cmake.in
@@ -53,6 +53,11 @@ if(NOT TARGET ghostty-vt::ghostty-vt-static)
         IMPORTED_LOCATION "${_ghostty_vt_libdir}/@GHOSTTY_VT_STATIC_REALNAME@"
         INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@"
     )
+    if(WIN32)
+        set_target_properties(ghostty-vt::ghostty-vt-static PROPERTIES
+            INTERFACE_LINK_LIBRARIES "ntdll;kernel32"
+        )
+    endif()
 endif()
 
 unset(_ghostty_vt_libdir)
diff --git a/src/build/GhosttyLibVt.zig b/src/build/GhosttyLibVt.zig
index fcc93e4c7..59e7a46e3 100644
--- a/src/build/GhosttyLibVt.zig
+++ b/src/build/GhosttyLibVt.zig
@@ -94,20 +94,12 @@ fn initLib(
     );
 
     if (kind == .static) {
-        const is_windows = target.result.os.tag == .windows;
-
         // These must be bundled since we're compiling into a static lib.
         // Otherwise, you get undefined symbol errors. This could cause
         // problems if you're linking multiple static Zig libraries but
         // we'll cross that bridge when we get to it.
-        //
-        // On Windows, Zig's compiler_rt produces COFF objects with
-        // invalid COMDAT sections (LNK1143) and its ubsan_rt emits
-        // /exclude-symbols directives the MSVC linker rejects
-        // (LNK4229). Both are skipped since the MSVC CRT provides
-        // the needed builtins (memcpy, memset, etc.).
-        lib.bundle_compiler_rt = !is_windows;
-        lib.bundle_ubsan_rt = !is_windows;
+        lib.bundle_compiler_rt = true;
+        lib.bundle_ubsan_rt = true;
 
         // Enable PIC so the static library can be linked into PIE
         // executables, which is the default on most Linux distributions.
@@ -118,6 +110,11 @@ fn initLib(
         // Zig's ubsan emits /exclude-symbols linker directives that
         // are incompatible with the MSVC linker (LNK4229).
         lib.bundle_ubsan_rt = false;
+
+        // The self-hosted backend produces COFF objects with invalid
+        // COMDAT sections in compiler_rt that the MSVC linker rejects
+        // (LNK1143). Use the LLVM backend to produce valid objects.
+        lib.use_llvm = true;
     }
 
     if (lib.rootModuleTarget().abi.isAndroid()) {

From 1eed35dddccbcb3a47ffddf999df43ecd1f217ea Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 11:41:45 -0700
Subject: [PATCH 327/391] build: default to MSVC ABI on Windows

Zig defaults to the GNU ABI on Windows, which produces COFF objects
with invalid COMDAT sections in compiler_rt that the MSVC linker
rejects (LNK1143), and uses GNU conventions like ___chkstk_ms that
are unavailable in the MSVC CRT.

Default to the MSVC ABI when no explicit ABI is requested, following
the same pattern as the existing macOS target override. This ensures
compiler_rt produces valid COFF and the generated code uses
MSVC-compatible symbols. Users can still explicitly request the GNU
ABI via -Dtarget.

Also disable bundling ubsan_rt on Windows (its /exclude-symbols
directives are MSVC-incompatible) and add ntdll and kernel32 as
transitive link dependencies for the static library.
---
 src/build/Config.zig       | 13 +++++++++++++
 src/build/GhosttyLibVt.zig |  5 -----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/build/Config.zig b/src/build/Config.zig
index 53d3c737b..eaaeaac90 100644
--- a/src/build/Config.zig
+++ b/src/build/Config.zig
@@ -83,6 +83,19 @@ pub fn init(b: *std.Build, appVersion: []const u8) !Config {
             result = genericMacOSTarget(b, result.query.cpu_arch);
         }
 
+        // On Windows, default to the MSVC ABI so that produced COFF
+        // objects (including compiler_rt) are compatible with the MSVC
+        // linker. Zig defaults to the GNU ABI which produces objects
+        // with invalid COMDAT sections that MSVC rejects (LNK1143).
+        // Only override when no explicit ABI was requested.
+        if (result.result.os.tag == .windows and
+            result.query.abi == null)
+        {
+            var query = result.query;
+            query.abi = .msvc;
+            result = b.resolveTargetQuery(query);
+        }
+
         // If we have no minimum OS version, we set the default based on
         // our tag. Not all tags have a minimum so this may be null.
         if (result.query.os_version_min == null) {
diff --git a/src/build/GhosttyLibVt.zig b/src/build/GhosttyLibVt.zig
index 59e7a46e3..408f1ebc8 100644
--- a/src/build/GhosttyLibVt.zig
+++ b/src/build/GhosttyLibVt.zig
@@ -110,11 +110,6 @@ fn initLib(
         // Zig's ubsan emits /exclude-symbols linker directives that
         // are incompatible with the MSVC linker (LNK4229).
         lib.bundle_ubsan_rt = false;
-
-        // The self-hosted backend produces COFF objects with invalid
-        // COMDAT sections in compiler_rt that the MSVC linker rejects
-        // (LNK1143). Use the LLVM backend to produce valid objects.
-        lib.use_llvm = true;
     }
 
     if (lib.rootModuleTarget().abi.isAndroid()) {

From afa8f059e5faeb6198ca64edb89762fb821df9e5 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 11:56:31 -0700
Subject: [PATCH 328/391] build: skip linkLibCpp on MSVC targets

Zig's bundled libc++/libc++abi conflicts with the MSVC C++ runtime
headers (vcruntime_typeinfo.h, vcruntime_exception.h, etc.) when
targeting native-native-msvc. This caused compilation failures in
the SIMD C++ code due to -nostdinc++ suppressing MSVC headers and
libc++ types clashing with MSVC runtime types.

Skip linkLibCpp() for MSVC targets across all packages (highway,
simdutf, utfcpp) and the main build (SharedDeps, GhosttyZig) since
MSVC provides its own C++ standard library natively. Also add
missing <iterator> and <cstddef> includes that were previously
pulled in transitively through libc++ headers but are not
guaranteed by MSVC's headers.
---
 pkg/highway/build.zig        | 6 +++++-
 pkg/simdutf/build.zig        | 6 +++++-
 pkg/utfcpp/build.zig         | 6 +++++-
 src/build/GhosttyZig.zig     | 4 +++-
 src/build/SharedDeps.zig     | 8 ++++++--
 src/simd/codepoint_width.cpp | 1 +
 src/simd/index_of.h          | 2 ++
 7 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/pkg/highway/build.zig b/pkg/highway/build.zig
index b6e188b13..0cc816992 100644
--- a/pkg/highway/build.zig
+++ b/pkg/highway/build.zig
@@ -20,7 +20,11 @@ pub fn build(b: *std.Build) !void {
         }),
         .linkage = .static,
     });
-    lib.linkLibCpp();
+    // On MSVC, the C++ standard library is provided by the MSVC runtime
+    // and linking Zig's bundled libc++ would conflict with it.
+    if (target.result.abi != .msvc) {
+        lib.linkLibCpp();
+    }
     if (upstream_) |upstream| {
         lib.addIncludePath(upstream.path(""));
         module.addIncludePath(upstream.path(""));
diff --git a/pkg/simdutf/build.zig b/pkg/simdutf/build.zig
index 8dcd141c1..6a9445bfe 100644
--- a/pkg/simdutf/build.zig
+++ b/pkg/simdutf/build.zig
@@ -12,7 +12,11 @@ pub fn build(b: *std.Build) !void {
         }),
         .linkage = .static,
     });
-    lib.linkLibCpp();
+    // On MSVC, the C++ standard library is provided by the MSVC runtime
+    // and linking Zig's bundled libc++ would conflict with it.
+    if (target.result.abi != .msvc) {
+        lib.linkLibCpp();
+    }
     lib.addIncludePath(b.path("vendor"));
 
     if (target.result.os.tag.isDarwin()) {
diff --git a/pkg/utfcpp/build.zig b/pkg/utfcpp/build.zig
index 08efb4ac8..27b0ebaa2 100644
--- a/pkg/utfcpp/build.zig
+++ b/pkg/utfcpp/build.zig
@@ -12,7 +12,11 @@ pub fn build(b: *std.Build) !void {
         }),
         .linkage = .static,
     });
-    lib.linkLibCpp();
+    // On MSVC, the C++ standard library is provided by the MSVC runtime
+    // and linking Zig's bundled libc++ would conflict with it.
+    if (target.result.abi != .msvc) {
+        lib.linkLibCpp();
+    }
 
     if (target.result.os.tag.isDarwin()) {
         const apple_sdk = @import("apple_sdk");
diff --git a/src/build/GhosttyZig.zig b/src/build/GhosttyZig.zig
index e63120e74..3a40e521e 100644
--- a/src/build/GhosttyZig.zig
+++ b/src/build/GhosttyZig.zig
@@ -64,8 +64,10 @@ fn initVt(
         .optimize = cfg.optimize,
 
         // SIMD require libc/libcpp (both) but otherwise we don't care.
+        // On MSVC, the C++ standard library is provided by the MSVC runtime
+        // and linking libc++ would conflict with it.
         .link_libc = if (cfg.simd) true else null,
-        .link_libcpp = if (cfg.simd) true else null,
+        .link_libcpp = if (cfg.simd and cfg.target.result.abi != .msvc) true else null,
     });
     vt.addOptions("build_options", general_options);
     vt_options.add(b, vt);
diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig
index bc6fb19aa..475bf626f 100644
--- a/src/build/SharedDeps.zig
+++ b/src/build/SharedDeps.zig
@@ -399,8 +399,12 @@ pub fn add(
         step.addIncludePath(b.path("src/apprt/gtk"));
     }
 
-    // libcpp is required for various dependencies
-    step.linkLibCpp();
+    // libcpp is required for various dependencies. On MSVC, the C++
+    // standard library is provided by the MSVC runtime and linking
+    // libc++ would conflict with it.
+    if (step.rootModuleTarget().abi != .msvc) {
+        step.linkLibCpp();
+    }
 
     // We always require the system SDK so that our system headers are available.
     // This makes things like `os/log.h` available for cross-compiling.
diff --git a/src/simd/codepoint_width.cpp b/src/simd/codepoint_width.cpp
index 4eb7da66d..294922c65 100644
--- a/src/simd/codepoint_width.cpp
+++ b/src/simd/codepoint_width.cpp
@@ -6,6 +6,7 @@
 #include <hwy/print-inl.h>
 
 #include <cassert>
+#include <iterator>
 
 HWY_BEFORE_NAMESPACE();
 namespace ghostty {
diff --git a/src/simd/index_of.h b/src/simd/index_of.h
index 8c214d9d0..531af9f8f 100644
--- a/src/simd/index_of.h
+++ b/src/simd/index_of.h
@@ -6,6 +6,8 @@
 #endif
 
 #include <hwy/highway.h>
+
+#include <cstddef>
 #include <optional>
 
 HWY_BEFORE_NAMESPACE();

From 5ef2da8127501083abdeb623df45674b7439ea45 Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Mon, 23 Mar 2026 13:03:25 +0100
Subject: [PATCH 329/391] windows: fix XDG-related test failures on Windows

Make the "cache directory paths" test cross-platform by using
std.fs.path.join for expected values and a platform-appropriate
mock home path, since the function under test uses native path
separators.

Skip the two shell integration XDG_DATA_DIRS tests on Windows.
These tests use hardcoded Unix path separators (:) and Unix default
paths (/usr/local/share:/usr/share) which are not applicable on
Windows where the path delimiter is ; and XDG_DATA_DIRS is not a
standard concept.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/os/xdg.zig                   | 10 +++++++---
 src/termio/shell_integration.zig |  4 ++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/os/xdg.zig b/src/os/xdg.zig
index a813b0a98..f2a495af4 100644
--- a/src/os/xdg.zig
+++ b/src/os/xdg.zig
@@ -132,7 +132,7 @@ test {
 test "cache directory paths" {
     const testing = std.testing;
     const alloc = testing.allocator;
-    const mock_home = "/Users/test";
+    const mock_home = if (builtin.os.tag == .windows) "C:\\Users\\test" else "/Users/test";
 
     // Test when XDG_CACHE_HOME is not set
     {
@@ -140,7 +140,9 @@ test "cache directory paths" {
         {
             const cache_path = try cache(alloc, .{ .home = mock_home });
             defer alloc.free(cache_path);
-            try testing.expectEqualStrings("/Users/test/.cache", cache_path);
+            const expected = try std.fs.path.join(alloc, &.{ mock_home, ".cache" });
+            defer alloc.free(expected);
+            try testing.expectEqualStrings(expected, cache_path);
         }
 
         // Test with subdir
@@ -150,7 +152,9 @@ test "cache directory paths" {
                 .subdir = "ghostty",
             });
             defer alloc.free(cache_path);
-            try testing.expectEqualStrings("/Users/test/.cache/ghostty", cache_path);
+            const expected = try std.fs.path.join(alloc, &.{ mock_home, ".cache", "ghostty" });
+            defer alloc.free(expected);
+            try testing.expectEqualStrings(expected, cache_path);
         }
     }
 }
diff --git a/src/termio/shell_integration.zig b/src/termio/shell_integration.zig
index e5b9eab10..2dd09ee29 100644
--- a/src/termio/shell_integration.zig
+++ b/src/termio/shell_integration.zig
@@ -670,6 +670,8 @@ fn setupXdgDataDirs(
 }
 
 test "xdg: empty XDG_DATA_DIRS" {
+    if (builtin.os.tag == .windows) return error.SkipZigTest;
+
     const testing = std.testing;
 
     var arena = ArenaAllocator.init(testing.allocator);
@@ -696,6 +698,8 @@ test "xdg: empty XDG_DATA_DIRS" {
 }
 
 test "xdg: existing XDG_DATA_DIRS" {
+    if (builtin.os.tag == .windows) return error.SkipZigTest;
+
     const testing = std.testing;
 
     var arena = ArenaAllocator.init(testing.allocator);

From 3d581eb92eade74bce9becdda50c0bf2877df366 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 12:05:57 -0700
Subject: [PATCH 330/391] build: use linkLibC instead of linkLibCpp on MSVC
 targets

When compiling C++ files, Zig unconditionally passes -nostdinc++ and,
if link_libcpp is set, adds its bundled libc++/libc++abi include paths
as replacements (see Compilation.zig). On MSVC targets this conflicts
with the MSVC C++ runtime headers (vcruntime_typeinfo.h,
vcruntime_exception.h, etc.), causing compilation failures in SIMD
C++ code.

The fix is to use linkLibC instead of linkLibCpp on MSVC. Zig always
passes -nostdinc to strip default search paths, but LibCDirs.detect
re-adds the MSVC SDK include directories, which contain both C and
C++ standard library headers. This gives us proper access to MSVC's
own <optional>, <iterator>, <cstddef>, etc. without the libc++
conflicts.

For the package builds (highway, simdutf, utfcpp) this means
switching from linkLibCpp to linkLibC on MSVC. For SharedDeps and
GhosttyZig, linkLibC is already called separately, so we just skip
linkLibCpp.
---
 pkg/highway/build.zig    | 8 ++++++--
 pkg/simdutf/build.zig    | 8 ++++++--
 pkg/utfcpp/build.zig     | 8 ++++++--
 src/build/GhosttyZig.zig | 6 ++++--
 src/build/SharedDeps.zig | 9 ++++++---
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/pkg/highway/build.zig b/pkg/highway/build.zig
index 0cc816992..49656b93e 100644
--- a/pkg/highway/build.zig
+++ b/pkg/highway/build.zig
@@ -20,8 +20,12 @@ pub fn build(b: *std.Build) !void {
         }),
         .linkage = .static,
     });
-    // On MSVC, the C++ standard library is provided by the MSVC runtime
-    // and linking Zig's bundled libc++ would conflict with it.
+    lib.linkLibC();
+    // On MSVC, we must not use linkLibCpp because Zig unconditionally
+    // passes -nostdinc++ and then adds its bundled libc++/libc++abi
+    // include paths, which conflict with MSVC's own C++ runtime headers.
+    // The MSVC SDK include directories (added via linkLibC) contain
+    // both C and C++ headers, so linkLibCpp is not needed.
     if (target.result.abi != .msvc) {
         lib.linkLibCpp();
     }
diff --git a/pkg/simdutf/build.zig b/pkg/simdutf/build.zig
index 6a9445bfe..e132507a1 100644
--- a/pkg/simdutf/build.zig
+++ b/pkg/simdutf/build.zig
@@ -12,8 +12,12 @@ pub fn build(b: *std.Build) !void {
         }),
         .linkage = .static,
     });
-    // On MSVC, the C++ standard library is provided by the MSVC runtime
-    // and linking Zig's bundled libc++ would conflict with it.
+    lib.linkLibC();
+    // On MSVC, we must not use linkLibCpp because Zig unconditionally
+    // passes -nostdinc++ and then adds its bundled libc++/libc++abi
+    // include paths, which conflict with MSVC's own C++ runtime headers.
+    // The MSVC SDK include directories (added via linkLibC) contain
+    // both C and C++ headers, so linkLibCpp is not needed.
     if (target.result.abi != .msvc) {
         lib.linkLibCpp();
     }
diff --git a/pkg/utfcpp/build.zig b/pkg/utfcpp/build.zig
index 27b0ebaa2..15c652c14 100644
--- a/pkg/utfcpp/build.zig
+++ b/pkg/utfcpp/build.zig
@@ -12,8 +12,12 @@ pub fn build(b: *std.Build) !void {
         }),
         .linkage = .static,
     });
-    // On MSVC, the C++ standard library is provided by the MSVC runtime
-    // and linking Zig's bundled libc++ would conflict with it.
+    lib.linkLibC();
+    // On MSVC, we must not use linkLibCpp because Zig unconditionally
+    // passes -nostdinc++ and then adds its bundled libc++/libc++abi
+    // include paths, which conflict with MSVC's own C++ runtime headers.
+    // The MSVC SDK include directories (added via linkLibC) contain
+    // both C and C++ headers, so linkLibCpp is not needed.
     if (target.result.abi != .msvc) {
         lib.linkLibCpp();
     }
diff --git a/src/build/GhosttyZig.zig b/src/build/GhosttyZig.zig
index 3a40e521e..aabc00d46 100644
--- a/src/build/GhosttyZig.zig
+++ b/src/build/GhosttyZig.zig
@@ -64,8 +64,10 @@ fn initVt(
         .optimize = cfg.optimize,
 
         // SIMD require libc/libcpp (both) but otherwise we don't care.
-        // On MSVC, the C++ standard library is provided by the MSVC runtime
-        // and linking libc++ would conflict with it.
+        // On MSVC, we must not use linkLibCpp because Zig passes
+        // -nostdinc++ and adds its bundled libc++/libc++abi headers
+        // which conflict with MSVC's C++ runtime. The MSVC SDK dirs
+        // added via link_libc contain both C and C++ headers.
         .link_libc = if (cfg.simd) true else null,
         .link_libcpp = if (cfg.simd and cfg.target.result.abi != .msvc) true else null,
     });
diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig
index 475bf626f..72e88f757 100644
--- a/src/build/SharedDeps.zig
+++ b/src/build/SharedDeps.zig
@@ -399,9 +399,12 @@ pub fn add(
         step.addIncludePath(b.path("src/apprt/gtk"));
     }
 
-    // libcpp is required for various dependencies. On MSVC, the C++
-    // standard library is provided by the MSVC runtime and linking
-    // libc++ would conflict with it.
+    // libcpp is required for various dependencies. On MSVC, we must
+    // not use linkLibCpp because Zig unconditionally passes -nostdinc++
+    // and then adds its bundled libc++/libc++abi include paths, which
+    // conflict with MSVC's own C++ runtime headers. The MSVC SDK
+    // include directories (already added via linkLibC above) contain
+    // both C and C++ headers, so linkLibCpp is not needed.
     if (step.rootModuleTarget().abi != .msvc) {
         step.linkLibCpp();
     }

From b4c529a82722cb6f9425de531888ff3424be4732 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 12:21:54 -0700
Subject: [PATCH 331/391] build: add -std=c++17 for SIMD C++ files on MSVC

The SIMD C++ files use C++17 features (std::optional, std::size).
With Zig's bundled libc++ these are available implicitly, but MSVC
headers guard C++17 features behind the standard version
(_HAS_CXX17). Without an explicit -std=c++17 flag, clang defaults
to a lower standard and the MSVC <optional> header does not define
std::optional.
---
 src/build/SharedDeps.zig | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig
index 72e88f757..573c68b74 100644
--- a/src/build/SharedDeps.zig
+++ b/src/build/SharedDeps.zig
@@ -790,12 +790,27 @@ pub fn addSimd(
         const HWY_AVX3_DL: c_int = 1 << 7;
         const HWY_AVX3: c_int = 1 << 8;
 
+        var flags: std.ArrayListUnmanaged([]const u8) = .empty;
+
         // Zig 0.13 bug: https://github.com/ziglang/zig/issues/20414
         // To workaround this we just disable AVX512 support completely.
         // The performance difference between AVX2 and AVX512 is not
         // significant for our use case and AVX512 is very rare on consumer
         // hardware anyways.
         const HWY_DISABLED_TARGETS: c_int = HWY_AVX10_2 | HWY_AVX3_SPR | HWY_AVX3_ZEN4 | HWY_AVX3_DL | HWY_AVX3;
+        if (target.result.cpu.arch == .x86_64) try flags.append(
+            b.allocator,
+            b.fmt("-DHWY_DISABLED_TARGETS={}", .{HWY_DISABLED_TARGETS}),
+        );
+
+        // MSVC requires explicit std specification otherwise these
+        // are guarded, at least on Windows 2025. Doing it unconditionally
+        // doesn't cause any issues on other platforms and ensures we get
+        // C++17 support on MSVC.
+        try flags.append(
+            b.allocator,
+            "-std=c++17",
+        );
 
         m.addCSourceFiles(.{
             .files = &.{
@@ -804,9 +819,7 @@ pub fn addSimd(
                 "src/simd/index_of.cpp",
                 "src/simd/vt.cpp",
             },
-            .flags = if (target.result.cpu.arch == .x86_64) &.{
-                b.fmt("-DHWY_DISABLED_TARGETS={}", .{HWY_DISABLED_TARGETS}),
-            } else &.{},
+            .flags = flags.items,
         });
     }
 }

From f2773d42c1c4cc8750bfe6298397f2aa4a93340d Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Mon, 23 Mar 2026 13:31:35 +0100
Subject: [PATCH 332/391] windows: skip expandHomeUnix test on Windows

expandHomeUnix is a Unix-internal function that is never called on
Windows. The public expandHome function returns the path unchanged
on Windows since ~/ is not a standard Windows idiom. The test calls
expandHomeUnix directly, which invokes home() and expects Unix-style
forward-slash separators.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/os/homedir.zig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/os/homedir.zig b/src/os/homedir.zig
index 14a4558cc..9e0420f4a 100644
--- a/src/os/homedir.zig
+++ b/src/os/homedir.zig
@@ -149,6 +149,8 @@ fn expandHomeUnix(path: []const u8, buf: []u8) ExpandError![]const u8 {
 }
 
 test "expandHomeUnix" {
+    if (builtin.os.tag == .windows) return error.SkipZigTest;
+
     const testing = std.testing;
     const allocator = testing.allocator;
     var buf: [std.fs.max_path_bytes]u8 = undefined;

From 63260ec7221741fb0c0a0e2f1018da094b116af9 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 12:31:17 -0700
Subject: [PATCH 333/391] build: disable ubsan for SIMD C++ files on MSVC

The SIMD C++ files reference __ubsan_handle_* symbols when compiled
in debug mode, but we do not link or bundle the ubsan runtime on
MSVC. This matches what the highway and simdutf packages already do
in their own build files.
---
 src/build/SharedDeps.zig | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig
index 573c68b74..e01adb1fa 100644
--- a/src/build/SharedDeps.zig
+++ b/src/build/SharedDeps.zig
@@ -812,6 +812,14 @@ pub fn addSimd(
             "-std=c++17",
         );
 
+        // Disable ubsan for MSVC to avoid undefined references to
+        // __ubsan_handle_* symbols that require a runtime we don't link
+        // and bundle. Hopefully we can fix this one day since ubsan is nice!
+        if (target.result.abi == .msvc) try flags.appendSlice(b.allocator, &.{
+            "-fno-sanitize=undefined",
+            "-fno-sanitize-trap=undefined",
+        });
+
         m.addCSourceFiles(.{
             .files = &.{
                 "src/simd/base64.cpp",

From b723f2a4377a196eaa594e42bc0a7ba0ad1ba09c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 12:33:54 -0700
Subject: [PATCH 334/391] ci: remove run step from Windows cmake examples

The "Run Example" step in the build-examples-cmake-windows job
hangs, so remove it entirely. The build step is still run so
compilation is verified, but the examples are no longer executed
on Windows.
---
 .github/workflows/test.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 26a7a73ce..deca513c8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -288,15 +288,6 @@ jobs:
           cmake -B build -DFETCHCONTENT_SOURCE_DIR_GHOSTTY=${{ github.workspace }}
           cmake --build build
 
-      - name: Run Example
-        shell: pwsh
-        run: |
-          $name = "${{ matrix.dir }}" -replace '-','_'
-          $exe = "example/${{ matrix.dir }}/build/Debug/${name}.exe"
-          if (!(Test-Path $exe)) { $exe = "example/${{ matrix.dir }}/build/${name}.exe" }
-          $env:PATH = "${{ github.workspace }}/zig-out/bin;$env:PATH"
-          & $exe
-
   build-cmake:
     runs-on: namespace-profile-ghostty-sm
     needs: test

From c1e616c6cda402c6823d97dba89dde690808f2b7 Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Mon, 23 Mar 2026 16:54:05 +0100
Subject: [PATCH 335/391] libghostty: add ghostty_free for cross-runtime memory
 safety

On Windows, Zig's built-in libc and MSVC's CRT maintain separate
heaps, so calling free() on memory allocated by the library causes
undefined behavior. Add ghostty_free() that frees through the same
allocator that performed the allocation, making it safe on all
platforms.

Update format_alloc docs and all examples to use ghostty_free()
instead of free().

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 example/c-vt-cmake-static/src/main.c |  2 +-
 example/c-vt-cmake/src/main.c        |  2 +-
 example/c-vt-formatter/src/main.c    |  2 +-
 include/ghostty/vt/allocator.h       | 25 +++++++++++++++++++++++++
 include/ghostty/vt/formatter.h       |  7 +++----
 src/lib_vt.zig                       |  1 +
 src/terminal/c/main.zig              | 18 ++++++++++++++++++
 7 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/example/c-vt-cmake-static/src/main.c b/example/c-vt-cmake-static/src/main.c
index 4821e727e..233bd34d1 100644
--- a/example/c-vt-cmake-static/src/main.c
+++ b/example/c-vt-cmake-static/src/main.c
@@ -45,7 +45,7 @@ int main() {
   fwrite(buf, 1, len, stdout);
   printf("\n");
 
-  free(buf);
+  ghostty_free(NULL, buf, len);
   ghostty_formatter_free(formatter);
   ghostty_terminal_free(terminal);
   return 0;
diff --git a/example/c-vt-cmake/src/main.c b/example/c-vt-cmake/src/main.c
index 389be5936..992586451 100644
--- a/example/c-vt-cmake/src/main.c
+++ b/example/c-vt-cmake/src/main.c
@@ -45,7 +45,7 @@ int main() {
   fwrite(buf, 1, len, stdout);
   printf("\n");
 
-  free(buf);
+  ghostty_free(NULL, buf, len);
   ghostty_formatter_free(formatter);
   ghostty_terminal_free(terminal);
   return 0;
diff --git a/example/c-vt-formatter/src/main.c b/example/c-vt-formatter/src/main.c
index 5d408b172..56f9d1220 100644
--- a/example/c-vt-formatter/src/main.c
+++ b/example/c-vt-formatter/src/main.c
@@ -56,7 +56,7 @@ int main() {
   printf("\n");
 
   // Clean up
-  free(buf);
+  ghostty_free(NULL, buf, len);
   ghostty_formatter_free(formatter);
   ghostty_terminal_free(terminal);
   return 0;
diff --git a/include/ghostty/vt/allocator.h b/include/ghostty/vt/allocator.h
index 4cebe91bb..f1406cf79 100644
--- a/include/ghostty/vt/allocator.h
+++ b/include/ghostty/vt/allocator.h
@@ -191,6 +191,31 @@ typedef struct GhosttyAllocator {
     const GhosttyAllocatorVtable *vtable;
 } GhosttyAllocator;
 
+/**
+ * Free memory that was allocated by a libghostty-vt function.
+ *
+ * Use this to free buffers returned by functions such as
+ * ghostty_formatter_format_alloc(). Pass the same allocator that was
+ * used for the allocation, or NULL if the default allocator was used.
+ *
+ * On platforms where the library's internal allocator differs from the
+ * consumer's C runtime (e.g. Windows, where Zig's libc and MSVC's CRT
+ * maintain separate heaps), calling the standard C free() on memory
+ * allocated by the library causes undefined behavior. This function
+ * guarantees the correct allocator is used regardless of platform.
+ *
+ * It is safe to pass a NULL pointer; the call is a no-op in that case.
+ *
+ * @param allocator Pointer to the allocator that was used to allocate the
+ *   memory, or NULL if the default allocator was used
+ * @param ptr Pointer to the memory to free (may be NULL)
+ * @param len Length of the allocation in bytes (must match the original
+ *   allocation size)
+ *
+ * @ingroup allocator
+ */
+void ghostty_free(const GhosttyAllocator* allocator, uint8_t* ptr, size_t len);
+
 /** @} */
 
 #endif /* GHOSTTY_VT_ALLOCATOR_H */
diff --git a/include/ghostty/vt/formatter.h b/include/ghostty/vt/formatter.h
index 4beb5fc77..5a9bb524b 100644
--- a/include/ghostty/vt/formatter.h
+++ b/include/ghostty/vt/formatter.h
@@ -186,10 +186,9 @@ GhosttyResult ghostty_formatter_format_buf(GhosttyFormatter formatter,
  *
  * Each call formats the current terminal state. The buffer is allocated
  * using the provided allocator (or the default allocator if NULL).
- * The caller is responsible for freeing the returned buffer. When using
- * the default allocator (NULL), the buffer can be freed with `free()`.
- * When using a custom allocator, the buffer must be freed using the
- * same allocator.
+ * The caller is responsible for freeing the returned buffer with
+ * ghostty_free(), passing the same allocator (or NULL for the default)
+ * that was used for the allocation.
  *
  * @param formatter The formatter handle (must not be NULL)
  * @param allocator Pointer to allocator, or NULL to use the default allocator
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 7a75bb92a..2816befae 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -218,6 +218,7 @@ comptime {
         @export(&c.grid_ref_graphemes, .{ .name = "ghostty_grid_ref_graphemes" });
         @export(&c.grid_ref_style, .{ .name = "ghostty_grid_ref_style" });
         @export(&c.build_info, .{ .name = "ghostty_build_info" });
+        @export(&c.free_alloc, .{ .name = "ghostty_free" });
 
         // On Wasm we need to export our allocator convenience functions.
         if (builtin.target.cpu.arch.isWasm()) {
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 11e14f8c7..b1a87e452 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -1,3 +1,6 @@
+const lib_alloc = @import("../../lib/allocator.zig");
+const CAllocator = lib_alloc.Allocator;
+
 const buildpkg = @import("build_info.zig");
 pub const cell = @import("cell.zig");
 pub const color = @import("color.zig");
@@ -112,6 +115,21 @@ pub const mouse_encoder_encode = mouse_encode.encode;
 
 pub const paste_is_safe = paste.is_safe;
 
+/// Free memory that was allocated by a libghostty-vt function.
+///
+/// This must be used to free buffers returned by functions like
+/// `format_alloc`. Pass the same allocator (or NULL for the default)
+/// that was used for the allocation.
+pub fn free_alloc(
+    alloc_: ?*const CAllocator,
+    ptr: ?[*]u8,
+    len: usize,
+) callconv(.c) void {
+    const mem = ptr orelse return;
+    const alloc = lib_alloc.default(alloc_);
+    alloc.free(mem[0..len]);
+}
+
 pub const size_report_encode = size_report.encode;
 
 pub const cell_get = cell.get;

From 07272ae88f4e15608383f0cc786586ec84d66e41 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 19:54:34 -0700
Subject: [PATCH 336/391] stream: add bell effect callback support

Add an Effects struct to the readonly stream Handler that allows
callers to provide optional callbacks for side effects like bell.
Previously, the bell action was silently ignored along with other
query/response actions. Now it is handled separately and dispatched
through the effects callback if one is provided.

Add a test that verifies bell with a null callback (default readonly
behavior) does not crash, and that a provided callback is invoked
the correct number of times.
---
 src/terminal/stream_readonly.zig | 71 +++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/src/terminal/stream_readonly.zig b/src/terminal/stream_readonly.zig
index a3e98c8e0..d072418d1 100644
--- a/src/terminal/stream_readonly.zig
+++ b/src/terminal/stream_readonly.zig
@@ -31,6 +31,24 @@ pub const Handler = struct {
     /// The terminal state to modify.
     terminal: *Terminal,
 
+    /// Callbacks for certain effects that handlers may have. These
+    /// may or may not fully replace internal handling of certain effects,
+    /// but they allow for the handler to trigger or query external
+    /// effects.
+    effects: Effects = .readonly,
+
+    pub const Effects = struct {
+        /// Called when the bell is rung (BEL).
+        bell: ?*const fn (*Handler) void,
+
+        /// No effects means that the stream effectively becomes readonly
+        /// that only affects pure terminal state and ignores all side
+        /// effects beyond that.
+        pub const readonly: Effects = .{
+            .bell = null,
+        };
+    };
+
     pub fn init(terminal: *Terminal) Handler {
         return .{
             .terminal = terminal,
@@ -170,6 +188,9 @@ pub const Handler = struct {
             .color_operation => try self.colorOperation(value.op, &value.requests),
             .kitty_color_report => try self.kittyColorOperation(value),
 
+            // Effect-based handlers
+            .bell => self.bell(),
+
             // No supported DCS commands have any terminal-modifying effects,
             // but they may in the future. For now we just ignore it.
             .dcs_hook,
@@ -185,7 +206,6 @@ pub const Handler = struct {
             => {},
 
             // Have no terminal-modifying effect
-            .bell,
             .enquiry,
             .request_mode,
             .request_mode_unknown,
@@ -205,6 +225,11 @@ pub const Handler = struct {
         }
     }
 
+    inline fn bell(self: *Handler) void {
+        const func = self.effects.bell orelse return;
+        func(self);
+    }
+
     inline fn horizontalTab(self: *Handler, count: u16) void {
         for (0..count) |_| {
             const x = self.terminal.screens.active.cursor.x;
@@ -1001,6 +1026,50 @@ test "semantic prompt end_prompt_start_input_terminate_eol clears on linefeed" {
     try testing.expectEqual(.output, t.screens.active.cursor.semantic_content);
 }
 
+test "bell effect callback" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    // Test bell with null callback (default readonly effects) doesn't crash
+    {
+        var s: Stream = .initAlloc(testing.allocator, .init(&t));
+        defer s.deinit();
+
+        s.nextSlice("\x07");
+
+        // Terminal should still be functional after bell
+        s.nextSlice("AfterBell");
+        const str = try t.plainString(testing.allocator);
+        defer testing.allocator.free(str);
+        try testing.expectEqualStrings("AfterBell", str);
+    }
+
+    t.fullReset();
+
+    // Test bell with a callback
+    {
+        const S = struct {
+            var bell_count: usize = 0;
+            fn bell(_: *Handler) void {
+                bell_count += 1;
+            }
+        };
+        S.bell_count = 0;
+
+        var handler: Handler = .init(&t);
+        handler.effects.bell = &S.bell;
+
+        var s: Stream = .initAlloc(testing.allocator, handler);
+        defer s.deinit();
+
+        s.nextSlice("\x07");
+        try testing.expectEqual(@as(usize, 1), S.bell_count);
+
+        s.nextSlice("\x07\x07");
+        try testing.expectEqual(@as(usize, 3), S.bell_count);
+    }
+}
+
 test "stream: CSI W with intermediate but no params" {
     // Regression test from AFL++ crash. CSI ? W without
     // parameters caused an out-of-bounds access on input.params[0].

From 67d8d86efd8d180df43b35978648c59f2cabd477 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 20:12:09 -0700
Subject: [PATCH 337/391] terminal: rename ReadonlyStream to TerminalStream

Rename stream_readonly.zig to stream_terminal.zig and its exported
types from ReadonlyStream/ReadonlyHandler to TerminalStream. The
"readonly" name is now wrong since the handler now supports
settable effects callbacks. The new name better reflects that this
is a stream handler for updating terminal state.
---
 src/lib_vt.zig                                |  3 +--
 src/terminal/Terminal.zig                     | 16 +++++++++-----
 src/terminal/c/terminal.zig                   | 17 +++++++++-----
 src/terminal/main.zig                         |  5 ++---
 src/terminal/stream.zig                       |  3 ++-
 ...tream_readonly.zig => stream_terminal.zig} | 22 +++++++------------
 6 files changed, 35 insertions(+), 31 deletions(-)
 rename src/terminal/{stream_readonly.zig => stream_terminal.zig} (97%)

diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 7a75bb92a..ea140c76c 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -58,10 +58,9 @@ pub const SizeReportStyle = terminal.SizeReportStyle;
 pub const StringMap = terminal.StringMap;
 pub const Style = terminal.Style;
 pub const Terminal = terminal.Terminal;
+pub const TerminalStream = terminal.TerminalStream;
 pub const Stream = terminal.Stream;
 pub const StreamAction = terminal.StreamAction;
-pub const ReadonlyStream = terminal.ReadonlyStream;
-pub const ReadonlyHandler = terminal.ReadonlyHandler;
 pub const Cursor = Screen.Cursor;
 pub const CursorStyle = Screen.CursorStyle;
 pub const CursorStyleReq = terminal.CursorStyle;
diff --git a/src/terminal/Terminal.zig b/src/terminal/Terminal.zig
index a0ebe8a07..323c82a2c 100644
--- a/src/terminal/Terminal.zig
+++ b/src/terminal/Terminal.zig
@@ -24,8 +24,7 @@ const sgr = @import("sgr.zig");
 const Tabstops = @import("Tabstops.zig");
 const color = @import("color.zig");
 const mouse = @import("mouse.zig");
-const ReadonlyHandler = @import("stream_readonly.zig").Handler;
-const ReadonlyStream = @import("stream_readonly.zig").Stream;
+const Stream = @import("stream_terminal.zig").Stream;
 
 const size = @import("size.zig");
 const pagepkg = @import("page.zig");
@@ -237,19 +236,24 @@ pub fn deinit(self: *Terminal, alloc: Allocator) void {
 
 /// Return a terminal.Stream that can process VT streams and update this
 /// terminal state. The streams will only process read-only data that
-/// modifies terminal state. Sequences that query or otherwise require
-/// output will be ignored.
+/// modifies terminal state.
+///
+/// Sequences that query or otherwise require output will be ignored.
+/// If you want to handle side effects, use `vtHandler` and set the
+/// effects field yourself, then initialize a stream.
+///
+/// This must be deinitialized by the caller.
 ///
 /// Important: this creates a new stream each time with fresh parser state.
 /// If you need to persist parser state across multiple writes (e.g.
 /// for handling escape sequences split across write boundaries), you
 /// must store and reuse the returned stream.
-pub fn vtStream(self: *Terminal) ReadonlyStream {
+pub fn vtStream(self: *Terminal) Stream {
     return .initAlloc(self.gpa(), self.vtHandler());
 }
 
 /// This is the handler-side only for vtStream.
-pub fn vtHandler(self: *Terminal) ReadonlyHandler {
+pub fn vtHandler(self: *Terminal) Stream.Handler {
     return .init(self);
 }
 
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 2dd56a519..bebcf4ea1 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -3,7 +3,7 @@ const testing = std.testing;
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const ZigTerminal = @import("../Terminal.zig");
-const ReadonlyStream = @import("../stream_readonly.zig").Stream;
+const Stream = @import("../stream_terminal.zig").Stream;
 const ScreenSet = @import("../ScreenSet.zig");
 const PageList = @import("../PageList.zig");
 const kitty = @import("../kitty/key.zig");
@@ -23,7 +23,7 @@ const log = std.log.scoped(.terminal_c);
 /// across multiple vt_write calls.
 const TerminalWrapper = struct {
     terminal: *ZigTerminal,
-    stream: ReadonlyStream,
+    stream: Stream,
 };
 
 /// C: GhosttyTerminal
@@ -68,17 +68,24 @@ fn new_(
         return error.OutOfMemory;
     errdefer alloc.destroy(t);
 
+    const wrapper = alloc.create(TerminalWrapper) catch
+        return error.OutOfMemory;
+    errdefer alloc.destroy(wrapper);
+
+    // Setup our terminal
     t.* = try .init(alloc, .{
         .cols = opts.cols,
         .rows = opts.rows,
         .max_scrollback = opts.max_scrollback,
     });
+    errdefer t.deinit(alloc);
+
+    // Setup our stream
+    const handler: Stream.Handler = t.vtHandler();
 
-    const wrapper = alloc.create(TerminalWrapper) catch
-        return error.OutOfMemory;
     wrapper.* = .{
         .terminal = t,
-        .stream = t.vtStream(),
+        .stream = .initAlloc(alloc, handler),
     };
 
     return wrapper;
diff --git a/src/terminal/main.zig b/src/terminal/main.zig
index 17cc3a81d..e58c828b8 100644
--- a/src/terminal/main.zig
+++ b/src/terminal/main.zig
@@ -3,7 +3,7 @@ const stream = @import("stream.zig");
 const ansi = @import("ansi.zig");
 const csi = @import("csi.zig");
 const render = @import("render.zig");
-const stream_readonly = @import("stream_readonly.zig");
+const stream_terminal = @import("stream_terminal.zig");
 const style = @import("style.zig");
 pub const apc = @import("apc.zig");
 pub const dcs = @import("dcs.zig");
@@ -42,8 +42,6 @@ pub const PageList = @import("PageList.zig");
 pub const Parser = @import("Parser.zig");
 pub const Pin = PageList.Pin;
 pub const Point = point.Point;
-pub const ReadonlyHandler = stream_readonly.Handler;
-pub const ReadonlyStream = stream_readonly.Stream;
 pub const RenderState = render.RenderState;
 pub const Screen = @import("Screen.zig");
 pub const ScreenSet = @import("ScreenSet.zig");
@@ -53,6 +51,7 @@ pub const SizeReportStyle = csi.SizeReportStyle;
 pub const StringMap = @import("StringMap.zig");
 pub const Style = style.Style;
 pub const Terminal = @import("Terminal.zig");
+pub const TerminalStream = stream_terminal.Stream;
 pub const Stream = stream.Stream;
 pub const StreamAction = stream.Action;
 pub const Cursor = Screen.Cursor;
diff --git a/src/terminal/stream.zig b/src/terminal/stream.zig
index f78bcc6f5..c582635b1 100644
--- a/src/terminal/stream.zig
+++ b/src/terminal/stream.zig
@@ -419,11 +419,12 @@ pub const Action = union(Key) {
 /// e.g. you don't need to pay a conditional branching cost on every single
 /// action because the Zig compiler codegens separate code paths for every
 /// single action at comptime.
-pub fn Stream(comptime Handler: type) type {
+pub fn Stream(comptime H: type) type {
     return struct {
         const Self = @This();
 
         pub const Action = streampkg.Action;
+        pub const Handler = H;
 
         const T = switch (@typeInfo(Handler)) {
             .pointer => |p| p.child,
diff --git a/src/terminal/stream_readonly.zig b/src/terminal/stream_terminal.zig
similarity index 97%
rename from src/terminal/stream_readonly.zig
rename to src/terminal/stream_terminal.zig
index d072418d1..23a244fc9 100644
--- a/src/terminal/stream_readonly.zig
+++ b/src/terminal/stream_terminal.zig
@@ -8,25 +8,19 @@ const osc_color = @import("osc/parsers/color.zig");
 const kitty_color = @import("kitty/color.zig");
 const Terminal = @import("Terminal.zig");
 
-const log = std.log.scoped(.stream_readonly);
+const log = std.log.scoped(.stream_terminal);
 
 /// This is a Stream implementation that processes actions against
-/// a Terminal and updates the Terminal state. It is called "readonly" because
-/// it only processes actions that modify terminal state, while ignoring
-/// any actions that require a response (like queries).
-///
-/// If you're implementing a terminal emulator that only needs to render
-/// output and doesn't need to respond (since it maybe isn't running the
-/// actual program), this is the stream type to use. For example, this is
-/// ideal for replay tooling, CI logs, PaaS builder output, etc.
+/// a Terminal and updates the Terminal state.
 pub const Stream = stream.Stream(Handler);
 
-/// See Stream, which is just the stream wrapper around this.
+/// A stream handler that updates terminal state. By default, it is
+/// readonly in the sense that it only updates terminal state and ignores
+/// all other sequences that require a response or otherwise have side
+/// effects (e.g. clipboards).
 ///
-/// This isn't attached directly to Terminal because there is additional
-/// state and options we plan to add in the future, such as APC/DCS which
-/// don't make sense to me to add to the Terminal directly. Instead, you
-/// can call `vtHandler` on Terminal to initialize this handler.
+/// You can manually set various effects callbacks in the `effects` field
+/// to implement certain effects such as bells, titles, clipboard, etc.
 pub const Handler = struct {
     /// The terminal state to modify.
     terminal: *Terminal,

From e24cc1b53bb8012d83fdb4e55fbedf6602611596 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 20:18:47 -0700
Subject: [PATCH 338/391] terminal: add write_pty effect and implement DECRQM

Add a generic write_pty effect callback to the stream terminal
handler, allowing callers to receive pty response data. Use it to
implement request_mode and request_mode_unknown (DECRQM), which
encode the mode state as a DECRPM response and write it back
through the callback. Previously these were silently ignored.

The write_pty data is stack-allocated and only valid for the
duration of the call.
---
 src/terminal/stream_terminal.zig | 88 +++++++++++++++++++++++++++++++-
 1 file changed, 86 insertions(+), 2 deletions(-)

diff --git a/src/terminal/stream_terminal.zig b/src/terminal/stream_terminal.zig
index 23a244fc9..a4961f27b 100644
--- a/src/terminal/stream_terminal.zig
+++ b/src/terminal/stream_terminal.zig
@@ -35,11 +35,17 @@ pub const Handler = struct {
         /// Called when the bell is rung (BEL).
         bell: ?*const fn (*Handler) void,
 
+        /// Called when the terminal needs to write data back to the pty,
+        /// e.g. in response to a DECRQM query. The data is only valid
+        /// during the lifetime of the call.
+        write_pty: ?*const fn (*Handler, [:0]const u8) void,
+
         /// No effects means that the stream effectively becomes readonly
         /// that only affects pure terminal state and ignores all side
         /// effects beyond that.
         pub const readonly: Effects = .{
             .bell = null,
+            .write_pty = null,
         };
     };
 
@@ -184,6 +190,8 @@ pub const Handler = struct {
 
             // Effect-based handlers
             .bell => self.bell(),
+            .request_mode => self.requestMode(value.mode),
+            .request_mode_unknown => self.requestModeUnknown(value.mode, value.ansi),
 
             // No supported DCS commands have any terminal-modifying effects,
             // but they may in the future. For now we just ignore it.
@@ -201,8 +209,6 @@ pub const Handler = struct {
 
             // Have no terminal-modifying effect
             .enquiry,
-            .request_mode,
-            .request_mode_unknown,
             .size_report,
             .xtversion,
             .device_attributes,
@@ -224,6 +230,36 @@ pub const Handler = struct {
         func(self);
     }
 
+    inline fn writePty(self: *Handler, data: [:0]const u8) void {
+        const func = self.effects.write_pty orelse return;
+        func(self, data);
+    }
+
+    fn requestMode(self: *Handler, mode: modes.Mode) void {
+        const report = self.terminal.modes.getReport(.fromMode(mode));
+        self.sendModeReport(report);
+    }
+
+    fn requestModeUnknown(self: *Handler, mode_raw: u16, ansi: bool) void {
+        const report = self.terminal.modes.getReport(.{
+            .value = @truncate(mode_raw),
+            .ansi = ansi,
+        });
+        self.sendModeReport(report);
+    }
+
+    fn sendModeReport(self: *Handler, report: modes.Report) void {
+        var buf: [modes.Report.max_size + 1]u8 = undefined;
+        var writer: std.Io.Writer = .fixed(&buf);
+        report.encode(&writer) catch |err| {
+            log.warn("error encoding mode report err={}", .{err});
+            return;
+        };
+        const len = writer.buffered().len;
+        buf[len] = 0;
+        self.writePty(buf[0..len :0]);
+    }
+
     inline fn horizontalTab(self: *Handler, count: u16) void {
         for (0..count) |_| {
             const x = self.terminal.screens.active.cursor.x;
@@ -1064,6 +1100,54 @@ test "bell effect callback" {
     }
 }
 
+test "request mode DECRQM with write_pty callback" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    // Without callback, DECRQM should not crash
+    {
+        var s: Stream = .initAlloc(testing.allocator, .init(&t));
+        defer s.deinit();
+
+        // DECRQM for mode 7 (wraparound) — should be silently ignored
+        s.nextSlice("\x1B[?7$p");
+    }
+
+    t.fullReset();
+
+    // With callback, DECRQM should produce a response
+    {
+        const S = struct {
+            var last_response: ?[:0]const u8 = null;
+            fn writePty(_: *Handler, data: [:0]const u8) void {
+                if (last_response) |old| testing.allocator.free(old);
+                last_response = testing.allocator.dupeZ(u8, data) catch @panic("OOM");
+            }
+        };
+        S.last_response = null;
+        defer if (S.last_response) |old| testing.allocator.free(old);
+
+        var handler: Handler = .init(&t);
+        handler.effects.write_pty = &S.writePty;
+
+        var s: Stream = .initAlloc(testing.allocator, handler);
+        defer s.deinit();
+
+        // Wraparound mode (7) is set by default
+        s.nextSlice("\x1B[?7$p");
+        try testing.expectEqualStrings("\x1B[?7;1$y", S.last_response.?);
+
+        // Disable wraparound and query again
+        s.nextSlice("\x1B[?7l");
+        s.nextSlice("\x1B[?7$p");
+        try testing.expectEqualStrings("\x1B[?7;2$y", S.last_response.?);
+
+        // Query an unknown mode
+        s.nextSlice("\x1B[?9999$p");
+        try testing.expectEqualStrings("\x1B[?9999;0$y", S.last_response.?);
+    }
+}
+
 test "stream: CSI W with intermediate but no params" {
     // Regression test from AFL++ crash. CSI ? W without
     // parameters caused an out-of-bounds access on input.params[0].

From 6366ce9a220e6a445d0632c3b75e9b336b3d424e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 20:26:46 -0700
Subject: [PATCH 339/391] terminal: add set_window_title effect to stream
 handler

Previously the window_title action was silently ignored in the
readonly stream handler. Add a set_window_title callback to the
Effects struct so callers can be notified when a window title is
set via OSC 2. Follows the same pattern as bell and write_pty
where the callback is optional and defaults to null in readonly
mode.
---
 src/terminal/stream_terminal.zig | 80 +++++++++++++++++++++++++++++++-
 1 file changed, 79 insertions(+), 1 deletion(-)

diff --git a/src/terminal/stream_terminal.zig b/src/terminal/stream_terminal.zig
index a4961f27b..bec775fb2 100644
--- a/src/terminal/stream_terminal.zig
+++ b/src/terminal/stream_terminal.zig
@@ -40,12 +40,16 @@ pub const Handler = struct {
         /// during the lifetime of the call.
         write_pty: ?*const fn (*Handler, [:0]const u8) void,
 
+        /// Called when the window title is set via OSC 2.
+        set_window_title: ?*const fn (*Handler, []const u8) void,
+
         /// No effects means that the stream effectively becomes readonly
         /// that only affects pure terminal state and ignores all side
         /// effects beyond that.
         pub const readonly: Effects = .{
             .bell = null,
             .write_pty = null,
+            .set_window_title = null,
         };
     };
 
@@ -190,6 +194,7 @@ pub const Handler = struct {
 
             // Effect-based handlers
             .bell => self.bell(),
+            .window_title => self.setWindowTitle(value.title),
             .request_mode => self.requestMode(value.mode),
             .request_mode_unknown => self.requestModeUnknown(value.mode, value.ansi),
 
@@ -214,7 +219,6 @@ pub const Handler = struct {
             .device_attributes,
             .device_status,
             .kitty_keyboard_query,
-            .window_title,
             .report_pwd,
             .show_desktop_notification,
             .progress_report,
@@ -235,6 +239,11 @@ pub const Handler = struct {
         func(self, data);
     }
 
+    inline fn setWindowTitle(self: *Handler, title: []const u8) void {
+        const func = self.effects.set_window_title orelse return;
+        func(self, title);
+    }
+
     fn requestMode(self: *Handler, mode: modes.Mode) void {
         const report = self.terminal.modes.getReport(.fromMode(mode));
         self.sendModeReport(report);
@@ -1163,3 +1172,72 @@ test "stream: CSI W with intermediate but no params" {
 
     s.nextSlice("\x1b[?W");
 }
+
+test "window_title effect is called" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var last_title: ?[]const u8 = null;
+        fn setWindowTitle(handler: *Handler, title: []const u8) void {
+            _ = handler;
+            if (last_title) |old| testing.allocator.free(old);
+            last_title = testing.allocator.dupe(u8, title) catch null;
+        }
+    };
+    S.last_title = null;
+    defer if (S.last_title) |t2| testing.allocator.free(t2);
+
+    var handler: Handler = .init(&t);
+    handler.effects.set_window_title = &S.setWindowTitle;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // Set window title via OSC 2
+    s.nextSlice("\x1b]2;Hello World\x1b\\");
+    try testing.expectEqualStrings("Hello World", S.last_title.?);
+}
+
+test "window_title effect not called without callback" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    var s: Stream = .initAlloc(testing.allocator, .init(&t));
+    defer s.deinit();
+
+    // Should not crash when no callback is set
+    s.nextSlice("\x1b]2;Hello World\x1b\\");
+
+    // Terminal should still be functional
+    s.nextSlice("Test");
+    const str = try t.plainString(testing.allocator);
+    defer testing.allocator.free(str);
+    try testing.expectEqualStrings("Test", str);
+}
+
+test "window_title effect with empty title" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var last_title: ?[]const u8 = null;
+        fn setWindowTitle(handler: *Handler, title: []const u8) void {
+            _ = handler;
+            if (last_title) |old| testing.allocator.free(old);
+            last_title = testing.allocator.dupe(u8, title) catch null;
+        }
+    };
+    S.last_title = null;
+    defer if (S.last_title) |t2| testing.allocator.free(t2);
+
+    var handler: Handler = .init(&t);
+    handler.effects.set_window_title = &S.setWindowTitle;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // Set empty window title
+    s.nextSlice("\x1b]2;\x1b\\");
+    try testing.expectEqualStrings("", S.last_title.?);
+}

From 08a44d7e696428737e2330fb275f94ea18f41b4b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 20:33:16 -0700
Subject: [PATCH 340/391] terminal: store title set by escape sequences

Add a title field to Terminal, mirroring the existing pwd field.
The title is set via setTitle/getTitle and tracks the most recent
value written by OSC 0/2 sequences. The stream handler now persists
the title in terminal state in addition to forwarding it to the
surface. The field is cleared on full reset.
---
 src/terminal/Terminal.zig     | 19 +++++++++++++++++++
 src/termio/stream_handler.zig |  6 ++++++
 2 files changed, 25 insertions(+)

diff --git a/src/terminal/Terminal.zig b/src/terminal/Terminal.zig
index 323c82a2c..a49e01b5d 100644
--- a/src/terminal/Terminal.zig
+++ b/src/terminal/Terminal.zig
@@ -67,6 +67,9 @@ scrolling_region: ScrollingRegion,
 /// The last reported pwd, if any.
 pwd: std.ArrayList(u8),
 
+/// The title of the terminal as set by escape sequences (e.g. OSC 0/2).
+title: std.ArrayList(u8),
+
 /// The color state for this terminal.
 colors: Colors,
 
@@ -219,6 +222,7 @@ pub fn init(
             .right = cols - 1,
         },
         .pwd = .empty,
+        .title = .empty,
         .colors = opts.colors,
         .modes = .{
             .values = opts.default_modes,
@@ -231,6 +235,7 @@ pub fn deinit(self: *Terminal, alloc: Allocator) void {
     self.tabstops.deinit(alloc);
     self.screens.deinit(alloc);
     self.pwd.deinit(alloc);
+    self.title.deinit(alloc);
     self.* = undefined;
 }
 
@@ -2881,6 +2886,19 @@ pub fn getPwd(self: *const Terminal) ?[]const u8 {
     return self.pwd.items;
 }
 
+/// Set the title for the terminal, as set by escape sequences (e.g. OSC 0/2).
+pub fn setTitle(self: *Terminal, t: []const u8) !void {
+    self.title.clearRetainingCapacity();
+    try self.title.appendSlice(self.gpa(), t);
+}
+
+/// Returns the title for the terminal, if any. The memory is owned by the
+/// Terminal and is not copied. It is safe until a reset or setTitle.
+pub fn getTitle(self: *const Terminal) ?[]const u8 {
+    if (self.title.items.len == 0) return null;
+    return self.title.items;
+}
+
 /// Switch to the given screen type (alternate or primary).
 ///
 /// This does NOT handle behaviors such as clearing the screen,
@@ -3090,6 +3108,7 @@ pub fn fullReset(self: *Terminal) void {
     self.tabstops.reset(TABSTOP_INTERVAL);
     self.previous_char = null;
     self.pwd.clearRetainingCapacity();
+    self.title.clearRetainingCapacity();
     self.status_display = .main;
     self.scrolling_region = .{
         .top = 0,
diff --git a/src/termio/stream_handler.zig b/src/termio/stream_handler.zig
index 5041d916a..7bd888c73 100644
--- a/src/termio/stream_handler.zig
+++ b/src/termio/stream_handler.zig
@@ -999,6 +999,12 @@ pub const StreamHandler = struct {
             return;
         }
 
+        // Set the title on the terminal state. We ignore any errors since
+        // we can continue to operate just fine without it.
+        self.terminal.setTitle(title) catch |err| {
+            log.warn("error setting title in terminal state: {e}", .{err});
+        };
+
         @memcpy(buf[0..title.len], title);
         buf[title.len] = 0;
 

From 22c7edf3f8d17a189504323dc1a6267e43281c9b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 20:35:35 -0700
Subject: [PATCH 341/391] terminal: rename set_window_title effect to
 title_changed

The effect callback no longer receives the title string directly.
Instead, the handler stores the title in terminal state via setTitle
before invoking the callback, so consumers query it through
handler.terminal.getTitle(). This removes the redundant parameter
and keeps the effect signature consistent with the new terminal
title field. Tests now verify terminal state directly rather than
tracking the title through the callback.
---
 src/terminal/stream_terminal.zig | 66 ++++++++++++++++++++------------
 src/termio/stream_handler.zig    |  2 +-
 2 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/src/terminal/stream_terminal.zig b/src/terminal/stream_terminal.zig
index bec775fb2..ef75a2b7c 100644
--- a/src/terminal/stream_terminal.zig
+++ b/src/terminal/stream_terminal.zig
@@ -40,8 +40,10 @@ pub const Handler = struct {
         /// during the lifetime of the call.
         write_pty: ?*const fn (*Handler, [:0]const u8) void,
 
-        /// Called when the window title is set via OSC 2.
-        set_window_title: ?*const fn (*Handler, []const u8) void,
+        /// Called when the terminal title changes via escape sequences
+        /// (e.g. OSC 0/2). The new title can be queried via
+        /// handler.terminal.getTitle().
+        title_changed: ?*const fn (*Handler) void,
 
         /// No effects means that the stream effectively becomes readonly
         /// that only affects pure terminal state and ignores all side
@@ -49,7 +51,7 @@ pub const Handler = struct {
         pub const readonly: Effects = .{
             .bell = null,
             .write_pty = null,
-            .set_window_title = null,
+            .title_changed = null,
         };
     };
 
@@ -194,7 +196,7 @@ pub const Handler = struct {
 
             // Effect-based handlers
             .bell => self.bell(),
-            .window_title => self.setWindowTitle(value.title),
+            .window_title => self.windowTitle(value.title),
             .request_mode => self.requestMode(value.mode),
             .request_mode_unknown => self.requestModeUnknown(value.mode, value.ansi),
 
@@ -239,9 +241,24 @@ pub const Handler = struct {
         func(self, data);
     }
 
-    inline fn setWindowTitle(self: *Handler, title: []const u8) void {
-        const func = self.effects.set_window_title orelse return;
-        func(self, title);
+    inline fn windowTitle(self: *Handler, title_raw: []const u8) void {
+        // Prevent DoS attacks by limiting title length.
+        const max_title_len = 1024;
+        const title = if (title_raw.len > max_title_len) title: {
+            log.warn("title length {d} exceeds max length {d}, truncating", .{
+                title_raw.len,
+                max_title_len,
+            });
+            break :title title_raw[0..max_title_len];
+        } else title_raw;
+
+        self.terminal.setTitle(title) catch |err| {
+            log.warn("error setting title err={}", .{err});
+            return;
+        };
+
+        const func = self.effects.title_changed orelse return;
+        func(self);
     }
 
     fn requestMode(self: *Handler, mode: modes.Mode) void {
@@ -1178,25 +1195,23 @@ test "window_title effect is called" {
     defer t.deinit(testing.allocator);
 
     const S = struct {
-        var last_title: ?[]const u8 = null;
-        fn setWindowTitle(handler: *Handler, title: []const u8) void {
-            _ = handler;
-            if (last_title) |old| testing.allocator.free(old);
-            last_title = testing.allocator.dupe(u8, title) catch null;
+        var title_changed_count: usize = 0;
+        fn titleChanged(_: *Handler) void {
+            title_changed_count += 1;
         }
     };
-    S.last_title = null;
-    defer if (S.last_title) |t2| testing.allocator.free(t2);
+    S.title_changed_count = 0;
 
     var handler: Handler = .init(&t);
-    handler.effects.set_window_title = &S.setWindowTitle;
+    handler.effects.title_changed = &S.titleChanged;
 
     var s: Stream = .initAlloc(testing.allocator, handler);
     defer s.deinit();
 
     // Set window title via OSC 2
     s.nextSlice("\x1b]2;Hello World\x1b\\");
-    try testing.expectEqualStrings("Hello World", S.last_title.?);
+    try testing.expectEqualStrings("Hello World", t.getTitle().?);
+    try testing.expectEqual(@as(usize, 1), S.title_changed_count);
 }
 
 test "window_title effect not called without callback" {
@@ -1209,6 +1224,9 @@ test "window_title effect not called without callback" {
     // Should not crash when no callback is set
     s.nextSlice("\x1b]2;Hello World\x1b\\");
 
+    // Title should still be set on terminal state
+    try testing.expectEqualStrings("Hello World", t.getTitle().?);
+
     // Terminal should still be functional
     s.nextSlice("Test");
     const str = try t.plainString(testing.allocator);
@@ -1221,23 +1239,21 @@ test "window_title effect with empty title" {
     defer t.deinit(testing.allocator);
 
     const S = struct {
-        var last_title: ?[]const u8 = null;
-        fn setWindowTitle(handler: *Handler, title: []const u8) void {
-            _ = handler;
-            if (last_title) |old| testing.allocator.free(old);
-            last_title = testing.allocator.dupe(u8, title) catch null;
+        var title_changed_count: usize = 0;
+        fn titleChanged(_: *Handler) void {
+            title_changed_count += 1;
         }
     };
-    S.last_title = null;
-    defer if (S.last_title) |t2| testing.allocator.free(t2);
+    S.title_changed_count = 0;
 
     var handler: Handler = .init(&t);
-    handler.effects.set_window_title = &S.setWindowTitle;
+    handler.effects.title_changed = &S.titleChanged;
 
     var s: Stream = .initAlloc(testing.allocator, handler);
     defer s.deinit();
 
     // Set empty window title
     s.nextSlice("\x1b]2;\x1b\\");
-    try testing.expectEqualStrings("", S.last_title.?);
+    try testing.expect(t.getTitle() == null);
+    try testing.expectEqual(@as(usize, 1), S.title_changed_count);
 }
diff --git a/src/termio/stream_handler.zig b/src/termio/stream_handler.zig
index 7bd888c73..fb3a6b3ff 100644
--- a/src/termio/stream_handler.zig
+++ b/src/termio/stream_handler.zig
@@ -1002,7 +1002,7 @@ pub const StreamHandler = struct {
         // Set the title on the terminal state. We ignore any errors since
         // we can continue to operate just fine without it.
         self.terminal.setTitle(title) catch |err| {
-            log.warn("error setting title in terminal state: {e}", .{err});
+            log.warn("error setting title in terminal state: {}", .{err});
         };
 
         @memcpy(buf[0..title.len], title);

From 134516310d3b73d828c67de1eb107d0b754e111a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 20:42:35 -0700
Subject: [PATCH 342/391] terminal: implement kitty_keyboard_query in
 stream_terminal

Previously kitty_keyboard_query was listed as a no-op in the
readonly stream handler. This implements it using the write_pty
effect callback so that the current kitty keyboard flags are
reported back via the pty, matching the behavior in the full
stream handler.
---
 src/terminal/stream_terminal.zig | 54 +++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 8 deletions(-)

diff --git a/src/terminal/stream_terminal.zig b/src/terminal/stream_terminal.zig
index ef75a2b7c..dba3e0f71 100644
--- a/src/terminal/stream_terminal.zig
+++ b/src/terminal/stream_terminal.zig
@@ -196,9 +196,10 @@ pub const Handler = struct {
 
             // Effect-based handlers
             .bell => self.bell(),
-            .window_title => self.windowTitle(value.title),
+            .kitty_keyboard_query => self.queryKittyKeyboard(),
             .request_mode => self.requestMode(value.mode),
             .request_mode_unknown => self.requestModeUnknown(value.mode, value.ansi),
+            .window_title => self.windowTitle(value.title),
 
             // No supported DCS commands have any terminal-modifying effects,
             // but they may in the future. For now we just ignore it.
@@ -220,7 +221,6 @@ pub const Handler = struct {
             .xtversion,
             .device_attributes,
             .device_status,
-            .kitty_keyboard_query,
             .report_pwd,
             .show_desktop_notification,
             .progress_report,
@@ -231,17 +231,17 @@ pub const Handler = struct {
         }
     }
 
-    inline fn bell(self: *Handler) void {
-        const func = self.effects.bell orelse return;
-        func(self);
-    }
-
     inline fn writePty(self: *Handler, data: [:0]const u8) void {
         const func = self.effects.write_pty orelse return;
         func(self, data);
     }
 
-    inline fn windowTitle(self: *Handler, title_raw: []const u8) void {
+    fn bell(self: *Handler) void {
+        const func = self.effects.bell orelse return;
+        func(self);
+    }
+
+    fn windowTitle(self: *Handler, title_raw: []const u8) void {
         // Prevent DoS attacks by limiting title length.
         const max_title_len = 1024;
         const title = if (title_raw.len > max_title_len) title: {
@@ -286,6 +286,15 @@ pub const Handler = struct {
         self.writePty(buf[0..len :0]);
     }
 
+    fn queryKittyKeyboard(self: *Handler) void {
+        // Max response is "\x1b[?31u\x00" (7 bytes): the flags are a u5 (max 31).
+        var buf: [32]u8 = undefined;
+        const resp = std.fmt.bufPrintZ(&buf, "\x1b[?{}u", .{
+            self.terminal.screens.active.kitty_keyboard.current().int(),
+        }) catch return;
+        self.writePty(resp);
+    }
+
     inline fn horizontalTab(self: *Handler, count: u16) void {
         for (0..count) |_| {
             const x = self.terminal.screens.active.cursor.x;
@@ -1257,3 +1266,32 @@ test "window_title effect with empty title" {
     try testing.expect(t.getTitle() == null);
     try testing.expectEqual(@as(usize, 1), S.title_changed_count);
 }
+
+test "kitty_keyboard_query" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[:0]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            written = data;
+        }
+    };
+    S.written = null;
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // Default kitty keyboard flags should be 0
+    s.nextSlice("\x1b[?u");
+    try testing.expectEqualStrings("\x1b[?0u", S.written.?);
+
+    // Push kitty keyboard mode with flags and query again
+    S.written = null;
+    s.nextSlice("\x1b[>1u"); // push with disambiguate flag
+    s.nextSlice("\x1b[?u");
+    try testing.expectEqualStrings("\x1b[?1u", S.written.?);
+}

From 26c81b4b0e2f7e0c70ac7face8f33cff5f68c7f1 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 20:48:08 -0700
Subject: [PATCH 343/391] terminal: add xtversion effect to stream_terminal

Add an xtversion callback to the Effects struct so that
stream_terminal can respond to XTVERSION queries. The callback
returns the version string to embed in the DCS response. If the
callback is unset or returns an empty string, the response defaults
to "libghostty". The response is formatted and written back via the
existing write_pty effect.
---
 src/terminal/stream_terminal.zig | 96 +++++++++++++++++++++++++++++++-
 1 file changed, 95 insertions(+), 1 deletion(-)

diff --git a/src/terminal/stream_terminal.zig b/src/terminal/stream_terminal.zig
index dba3e0f71..63150c3cb 100644
--- a/src/terminal/stream_terminal.zig
+++ b/src/terminal/stream_terminal.zig
@@ -45,6 +45,12 @@ pub const Handler = struct {
         /// handler.terminal.getTitle().
         title_changed: ?*const fn (*Handler) void,
 
+        /// Called in response to an XTVERSION query. Returns the version
+        /// string to report (e.g. "ghostty 1.2.3"). The returned memory
+        /// must be valid for the lifetime of the call. The maximum length
+        /// is 256 bytes; longer strings will be silently ignored.
+        xtversion: ?*const fn (*Handler) []const u8,
+
         /// No effects means that the stream effectively becomes readonly
         /// that only affects pure terminal state and ignores all side
         /// effects beyond that.
@@ -52,6 +58,7 @@ pub const Handler = struct {
             .bell = null,
             .write_pty = null,
             .title_changed = null,
+            .xtversion = null,
         };
     };
 
@@ -200,6 +207,7 @@ pub const Handler = struct {
             .request_mode => self.requestMode(value.mode),
             .request_mode_unknown => self.requestModeUnknown(value.mode, value.ansi),
             .window_title => self.windowTitle(value.title),
+            .xtversion => self.reportXtversion(),
 
             // No supported DCS commands have any terminal-modifying effects,
             // but they may in the future. For now we just ignore it.
@@ -218,7 +226,6 @@ pub const Handler = struct {
             // Have no terminal-modifying effect
             .enquiry,
             .size_report,
-            .xtversion,
             .device_attributes,
             .device_status,
             .report_pwd,
@@ -241,6 +248,17 @@ pub const Handler = struct {
         func(self);
     }
 
+    fn reportXtversion(self: *Handler) void {
+        const version = if (self.effects.xtversion) |func| func(self) else "";
+        var buf: [288]u8 = undefined;
+        const resp = std.fmt.bufPrintZ(
+            &buf,
+            "\x1BP>|{s}\x1B\\",
+            .{if (version.len > 0) version else "libghostty"},
+        ) catch return;
+        self.writePty(resp);
+    }
+
     fn windowTitle(self: *Handler, title_raw: []const u8) void {
         // Prevent DoS attacks by limiting title length.
         const max_title_len = 1024;
@@ -1295,3 +1313,79 @@ test "kitty_keyboard_query" {
     s.nextSlice("\x1b[?u");
     try testing.expectEqualStrings("\x1b[?1u", S.written.?);
 }
+
+test "xtversion default" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[:0]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            written = data;
+        }
+    };
+    S.written = null;
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // Without xtversion effect set, should report "libghostty"
+    s.nextSlice("\x1b[>0q");
+    try testing.expectEqualStrings("\x1bP>|libghostty\x1b\\", S.written.?);
+}
+
+test "xtversion with effect" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[:0]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            written = data;
+        }
+        fn xtversion(_: *Handler) []const u8 {
+            return "ghostty 1.2.3";
+        }
+    };
+    S.written = null;
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+    handler.effects.xtversion = &S.xtversion;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    s.nextSlice("\x1b[>0q");
+    try testing.expectEqualStrings("\x1bP>|ghostty 1.2.3\x1b\\", S.written.?);
+}
+
+test "xtversion with empty string effect" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[:0]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            written = data;
+        }
+        fn xtversion(_: *Handler) []const u8 {
+            return "";
+        }
+    };
+    S.written = null;
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+    handler.effects.xtversion = &S.xtversion;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // Empty string from effect should fall back to "libghostty"
+    s.nextSlice("\x1b[>0q");
+    try testing.expectEqualStrings("\x1bP>|libghostty\x1b\\", S.written.?);
+}

From 6083e9f80bc06de4b734e736cf07ed6f0575953a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 20:55:02 -0700
Subject: [PATCH 344/391] terminal: expose size_report via stream_terminal
 effects

Add a `size` callback to the stream_terminal Effects struct that
returns a size_report.Size geometry snapshot for XTWINOPS size
queries (CSI 14/16/18 t). The handler owns all protocol encoding
using the existing size_report.encode, keeping VT knowledge out
of effect consumers. This follows the same pattern as the xtversion
effect: the callback supplies data, the handler formats the reply
and calls write_pty.

CSI 21 t (title report) is handled internally from terminal state
since the title is already available via terminal.getTitle() and
does not require an external callback.
---
 src/terminal/stream_terminal.zig | 189 ++++++++++++++++++++++++++++++-
 1 file changed, 188 insertions(+), 1 deletion(-)

diff --git a/src/terminal/stream_terminal.zig b/src/terminal/stream_terminal.zig
index 63150c3cb..addd6bf83 100644
--- a/src/terminal/stream_terminal.zig
+++ b/src/terminal/stream_terminal.zig
@@ -1,11 +1,13 @@
 const std = @import("std");
 const testing = std.testing;
+const csi = @import("csi.zig");
 const stream = @import("stream.zig");
 const Action = stream.Action;
 const Screen = @import("Screen.zig");
 const modes = @import("modes.zig");
 const osc_color = @import("osc/parsers/color.zig");
 const kitty_color = @import("kitty/color.zig");
+const size_report = @import("size_report.zig");
 const Terminal = @import("Terminal.zig");
 
 const log = std.log.scoped(.stream_terminal);
@@ -51,6 +53,11 @@ pub const Handler = struct {
         /// is 256 bytes; longer strings will be silently ignored.
         xtversion: ?*const fn (*Handler) []const u8,
 
+        /// Called in response to XTWINOPS size queries (CSI 14/16/18 t).
+        /// Returns the current terminal geometry used for encoding.
+        /// Return null to silently ignore the query.
+        size: ?*const fn (*Handler) ?size_report.Size,
+
         /// No effects means that the stream effectively becomes readonly
         /// that only affects pure terminal state and ignores all side
         /// effects beyond that.
@@ -59,6 +66,7 @@ pub const Handler = struct {
             .write_pty = null,
             .title_changed = null,
             .xtversion = null,
+            .size = null,
         };
     };
 
@@ -206,6 +214,7 @@ pub const Handler = struct {
             .kitty_keyboard_query => self.queryKittyKeyboard(),
             .request_mode => self.requestMode(value.mode),
             .request_mode_unknown => self.requestModeUnknown(value.mode, value.ansi),
+            .size_report => self.reportSize(value),
             .window_title => self.windowTitle(value.title),
             .xtversion => self.reportXtversion(),
 
@@ -225,7 +234,6 @@ pub const Handler = struct {
 
             // Have no terminal-modifying effect
             .enquiry,
-            .size_report,
             .device_attributes,
             .device_status,
             .report_pwd,
@@ -259,6 +267,51 @@ pub const Handler = struct {
         self.writePty(resp);
     }
 
+    fn reportSize(self: *Handler, style: csi.SizeReportStyle) void {
+        // Almost all size reports will fit in 256 bytes so try that
+        // on the stack before falling back to a heap allocation.
+        var stack = std.heap.stackFallback(
+            256,
+            self.terminal.gpa(),
+        );
+        const alloc = stack.get();
+
+        // Allocating writing to accumulate the response.
+        var aw: std.Io.Writer.Allocating = .init(alloc);
+        defer aw.deinit();
+
+        // Build the response.
+        switch (style) {
+            .csi_21_t => {
+                const title = self.terminal.getTitle() orelse "";
+                aw.writer.print("\x1b]l{s}\x1b\\", .{title}) catch return;
+            },
+
+            .csi_14_t, .csi_16_t, .csi_18_t => {
+                const get_size = self.effects.size orelse return;
+                const s = get_size(self) orelse return;
+                const report_style: size_report.Style = switch (style) {
+                    .csi_14_t => .csi_14_t,
+                    .csi_16_t => .csi_16_t,
+                    .csi_18_t => .csi_18_t,
+                    .csi_21_t => unreachable,
+                };
+                size_report.encode(
+                    &aw.writer,
+                    report_style,
+                    s,
+                ) catch |err| {
+                    log.warn("error encoding size report err={}", .{err});
+                    return;
+                };
+            },
+        }
+
+        const resp = aw.toOwnedSliceSentinel(0) catch return;
+        defer alloc.free(resp);
+        self.writePty(resp);
+    }
+
     fn windowTitle(self: *Handler, title_raw: []const u8) void {
         // Prevent DoS attacks by limiting title length.
         const max_title_len = 1024;
@@ -1389,3 +1442,137 @@ test "xtversion with empty string effect" {
     s.nextSlice("\x1b[>0q");
     try testing.expectEqualStrings("\x1bP>|libghostty\x1b\\", S.written.?);
 }
+
+test "size report csi_14_t with effect" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+        fn getSize(_: *Handler) ?size_report.Size {
+            return .{ .rows = 24, .columns = 80, .cell_width = 9, .cell_height = 18 };
+        }
+    };
+    S.written = null;
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+    handler.effects.size = &S.getSize;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // CSI 14 t - report text area size in pixels
+    s.nextSlice("\x1b[14t");
+    defer testing.allocator.free(S.written.?);
+    try testing.expectEqualStrings("\x1b[4;432;720t", S.written.?);
+}
+
+test "size report csi_16_t with effect" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+        fn getSize(_: *Handler) ?size_report.Size {
+            return .{ .rows = 24, .columns = 80, .cell_width = 9, .cell_height = 18 };
+        }
+    };
+    S.written = null;
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+    handler.effects.size = &S.getSize;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // CSI 16 t - report cell size in pixels
+    s.nextSlice("\x1b[16t");
+    defer testing.allocator.free(S.written.?);
+    try testing.expectEqualStrings("\x1b[6;18;9t", S.written.?);
+}
+
+test "size report csi_18_t with effect" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+        fn getSize(_: *Handler) ?size_report.Size {
+            return .{ .rows = 24, .columns = 80, .cell_width = 9, .cell_height = 18 };
+        }
+    };
+    S.written = null;
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+    handler.effects.size = &S.getSize;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // CSI 18 t - report text area size in characters
+    s.nextSlice("\x1b[18t");
+    defer testing.allocator.free(S.written.?);
+    try testing.expectEqualStrings("\x1b[8;24;80t", S.written.?);
+}
+
+test "size report no effect callback" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+    };
+    S.written = null;
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // Without size effect, size reports should be silently ignored
+    s.nextSlice("\x1b[14t");
+    try testing.expect(S.written == null);
+}
+
+test "size report csi_21_t title" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+    };
+    S.written = null;
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // Set a title first
+    s.nextSlice("\x1b]2;My Title\x1b\\");
+
+    // CSI 21 t - report title (no size effect needed)
+    s.nextSlice("\x1b[21t");
+    defer testing.allocator.free(S.written.?);
+    try testing.expectEqualStrings("\x1b]lMy Title\x1b\\", S.written.?);
+}

From b9669e10c40a0f3390f5d573656f25ba5e154716 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 22 Mar 2026 21:16:33 -0700
Subject: [PATCH 345/391] fuzz: update stream fuzzer to use TerminalStream

ReadonlyStream was removed from the public API. Update the stream
fuzzer to use TerminalStream, which is the type now returned by
Terminal.vtStream().
---
 test/fuzz-libghostty/src/fuzz_stream.zig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/fuzz-libghostty/src/fuzz_stream.zig b/test/fuzz-libghostty/src/fuzz_stream.zig
index ec47e90fe..75c6fd425 100644
--- a/test/fuzz-libghostty/src/fuzz_stream.zig
+++ b/test/fuzz-libghostty/src/fuzz_stream.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const ghostty_vt = @import("ghostty-vt");
 const mem = @import("mem.zig");
 const Terminal = ghostty_vt.Terminal;
-const ReadonlyStream = ghostty_vt.ReadonlyStream;
+const TerminalStream = ghostty_vt.TerminalStream;
 
 /// Use a single global allocator for simplicity and to avoid heap
 /// allocation overhead in the fuzzer. The allocator is backed by a fixed
@@ -33,7 +33,7 @@ pub export fn zig_fuzz_test(
     }) catch return;
     defer t.deinit(alloc);
 
-    var stream: ReadonlyStream = t.vtStream();
+    var stream: TerminalStream = t.vtStream();
     defer stream.deinit();
 
     // Use the first byte to decide between the scalar and slice paths

From 165e03669ce53263b1763e42e9beaf39b0911fd6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 14:23:44 -0700
Subject: [PATCH 346/391] terminal: port enquiry to Effects

Previously the ENQ (0x05) action was ignored in stream_terminal,
listed in the no-op group alongside other unhandled queries. The
real implementation in termio/stream_handler writes a configurable
response string back to the pty.

Add an enquiry callback to Effects following the same query-style
pattern as xtversion: the callback returns the raw response bytes
and the handler owns writing them to the pty via writePty. When no
callback is set (readonly mode), ENQ is silently ignored. Empty
responses are also ignored. The response is capped at 256 bytes
using a stack buffer with sentinel conversion for writePty.
---
 src/terminal/stream_terminal.zig | 99 +++++++++++++++++++++++++++++++-
 1 file changed, 97 insertions(+), 2 deletions(-)

diff --git a/src/terminal/stream_terminal.zig b/src/terminal/stream_terminal.zig
index addd6bf83..8dbb3f2ae 100644
--- a/src/terminal/stream_terminal.zig
+++ b/src/terminal/stream_terminal.zig
@@ -39,7 +39,8 @@ pub const Handler = struct {
 
         /// Called when the terminal needs to write data back to the pty,
         /// e.g. in response to a DECRQM query. The data is only valid
-        /// during the lifetime of the call.
+        /// during the lifetime of the call so callers must copy it
+        /// if it needs to be stored or used after the call returns.
         write_pty: ?*const fn (*Handler, [:0]const u8) void,
 
         /// Called when the terminal title changes via escape sequences
@@ -58,6 +59,11 @@ pub const Handler = struct {
         /// Return null to silently ignore the query.
         size: ?*const fn (*Handler) ?size_report.Size,
 
+        /// Called in response to ENQ (0x05). Returns the raw response
+        /// bytes to write back to the pty. The returned memory must be
+        /// valid for the lifetime of the call.
+        enquiry: ?*const fn (*Handler) []const u8,
+
         /// No effects means that the stream effectively becomes readonly
         /// that only affects pure terminal state and ignores all side
         /// effects beyond that.
@@ -67,6 +73,7 @@ pub const Handler = struct {
             .title_changed = null,
             .xtversion = null,
             .size = null,
+            .enquiry = null,
         };
     };
 
@@ -217,6 +224,7 @@ pub const Handler = struct {
             .size_report => self.reportSize(value),
             .window_title => self.windowTitle(value.title),
             .xtversion => self.reportXtversion(),
+            .enquiry => self.reportEnquiry(),
 
             // No supported DCS commands have any terminal-modifying effects,
             // but they may in the future. For now we just ignore it.
@@ -233,7 +241,6 @@ pub const Handler = struct {
             => {},
 
             // Have no terminal-modifying effect
-            .enquiry,
             .device_attributes,
             .device_status,
             .report_pwd,
@@ -256,6 +263,17 @@ pub const Handler = struct {
         func(self);
     }
 
+    fn reportEnquiry(self: *Handler) void {
+        const func = self.effects.enquiry orelse return;
+        const response = func(self);
+        if (response.len == 0) return;
+        var buf: [256]u8 = undefined;
+        if (response.len >= buf.len) return;
+        @memcpy(buf[0..response.len], response);
+        buf[response.len] = 0;
+        self.writePty(buf[0..response.len :0]);
+    }
+
     fn reportXtversion(self: *Handler) void {
         const version = if (self.effects.xtversion) |func| func(self) else "";
         var buf: [288]u8 = undefined;
@@ -1576,3 +1594,80 @@ test "size report csi_21_t title" {
     defer testing.allocator.free(S.written.?);
     try testing.expectEqualStrings("\x1b]lMy Title\x1b\\", S.written.?);
 }
+
+test "enquiry no effect" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+    };
+    S.written = null;
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // ENQ without enquiry effect should not write anything
+    s.nextSlice("\x05");
+    try testing.expect(S.written == null);
+}
+
+test "enquiry with effect" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+        fn enquiry(_: *Handler) []const u8 {
+            return "ghostty";
+        }
+    };
+    S.written = null;
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+    handler.effects.enquiry = &S.enquiry;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    s.nextSlice("\x05");
+    defer testing.allocator.free(S.written.?);
+    try testing.expectEqualStrings("ghostty", S.written.?);
+}
+
+test "enquiry with empty response" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+        fn enquiry(_: *Handler) []const u8 {
+            return "";
+        }
+    };
+    S.written = null;
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+    handler.effects.enquiry = &S.enquiry;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // Empty enquiry response should not write anything
+    s.nextSlice("\x05");
+    try testing.expect(S.written == null);
+}

From 2e7aa047af3692ff6c6fa003f078d772c6db697d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 14:31:12 -0700
Subject: [PATCH 347/391] terminal: port device_status to stream_terminal
 Effects

Previously device_status was in the ignored "no terminal-modifying
effect" group in stream_terminal.zig. This ports it to use the
Effects pattern, handling all three DSR request types.

Operating status and cursor position are handled entirely within
stream_terminal since they only need terminal state and write_pty.
Cursor position respects origin mode and scrolling region offsets.

Color scheme adds a new color_scheme effect callback that returns
a ColorScheme enum (light/dark). The handler encodes the response
internally, keeping protocol knowledge in the terminal layer. A
new ColorScheme type is added to device_status.zig so the terminal
layer does not depend on apprt.
---
 src/terminal/device_status.zig   |   6 +
 src/terminal/stream_terminal.zig | 261 +++++++++++++++++++++++++++++--
 2 files changed, 252 insertions(+), 15 deletions(-)

diff --git a/src/terminal/device_status.zig b/src/terminal/device_status.zig
index 1be7bf719..3d0106e42 100644
--- a/src/terminal/device_status.zig
+++ b/src/terminal/device_status.zig
@@ -1,5 +1,11 @@
 const std = @import("std");
 
+/// The color scheme reported in response to a CSI ? 996 n query.
+pub const ColorScheme = enum {
+    light,
+    dark,
+};
+
 /// An enum(u16) of the available device status requests.
 pub const Request = dsr_enum: {
     const EnumField = std.builtin.Type.EnumField;
diff --git a/src/terminal/stream_terminal.zig b/src/terminal/stream_terminal.zig
index 8dbb3f2ae..ad721e24e 100644
--- a/src/terminal/stream_terminal.zig
+++ b/src/terminal/stream_terminal.zig
@@ -1,6 +1,7 @@
 const std = @import("std");
 const testing = std.testing;
 const csi = @import("csi.zig");
+const device_status = @import("device_status.zig");
 const stream = @import("stream.zig");
 const Action = stream.Action;
 const Screen = @import("Screen.zig");
@@ -34,15 +35,30 @@ pub const Handler = struct {
     effects: Effects = .readonly,
 
     pub const Effects = struct {
-        /// Called when the bell is rung (BEL).
-        bell: ?*const fn (*Handler) void,
-
         /// Called when the terminal needs to write data back to the pty,
         /// e.g. in response to a DECRQM query. The data is only valid
         /// during the lifetime of the call so callers must copy it
         /// if it needs to be stored or used after the call returns.
         write_pty: ?*const fn (*Handler, [:0]const u8) void,
 
+        /// Called when the bell is rung (BEL).
+        bell: ?*const fn (*Handler) void,
+
+        /// Called in response to a color scheme DSR query (CSI ? 996 n).
+        /// Returns the current color scheme. Return null to silently
+        /// ignore the query.
+        color_scheme: ?*const fn (*Handler) ?device_status.ColorScheme,
+
+        /// Called in response to ENQ (0x05). Returns the raw response
+        /// bytes to write back to the pty. The returned memory must be
+        /// valid for the lifetime of the call.
+        enquiry: ?*const fn (*Handler) []const u8,
+
+        /// Called in response to XTWINOPS size queries (CSI 14/16/18 t).
+        /// Returns the current terminal geometry used for encoding.
+        /// Return null to silently ignore the query.
+        size: ?*const fn (*Handler) ?size_report.Size,
+
         /// Called when the terminal title changes via escape sequences
         /// (e.g. OSC 0/2). The new title can be queried via
         /// handler.terminal.getTitle().
@@ -54,16 +70,6 @@ pub const Handler = struct {
         /// is 256 bytes; longer strings will be silently ignored.
         xtversion: ?*const fn (*Handler) []const u8,
 
-        /// Called in response to XTWINOPS size queries (CSI 14/16/18 t).
-        /// Returns the current terminal geometry used for encoding.
-        /// Return null to silently ignore the query.
-        size: ?*const fn (*Handler) ?size_report.Size,
-
-        /// Called in response to ENQ (0x05). Returns the raw response
-        /// bytes to write back to the pty. The returned memory must be
-        /// valid for the lifetime of the call.
-        enquiry: ?*const fn (*Handler) []const u8,
-
         /// No effects means that the stream effectively becomes readonly
         /// that only affects pure terminal state and ignores all side
         /// effects beyond that.
@@ -74,6 +80,7 @@ pub const Handler = struct {
             .xtversion = null,
             .size = null,
             .enquiry = null,
+            .color_scheme = null,
         };
     };
 
@@ -218,13 +225,14 @@ pub const Handler = struct {
 
             // Effect-based handlers
             .bell => self.bell(),
+            .device_status => self.deviceStatus(value.request),
+            .enquiry => self.reportEnquiry(),
             .kitty_keyboard_query => self.queryKittyKeyboard(),
             .request_mode => self.requestMode(value.mode),
             .request_mode_unknown => self.requestModeUnknown(value.mode, value.ansi),
             .size_report => self.reportSize(value),
             .window_title => self.windowTitle(value.title),
             .xtversion => self.reportXtversion(),
-            .enquiry => self.reportEnquiry(),
 
             // No supported DCS commands have any terminal-modifying effects,
             // but they may in the future. For now we just ignore it.
@@ -242,7 +250,6 @@ pub const Handler = struct {
 
             // Have no terminal-modifying effect
             .device_attributes,
-            .device_status,
             .report_pwd,
             .show_desktop_notification,
             .progress_report,
@@ -263,6 +270,41 @@ pub const Handler = struct {
         func(self);
     }
 
+    fn deviceStatus(self: *Handler, req: device_status.Request) void {
+        switch (req) {
+            .operating_status => self.writePty("\x1B[0n"),
+
+            .cursor_position => {
+                const pos: struct {
+                    x: usize,
+                    y: usize,
+                } = if (self.terminal.modes.get(.origin)) .{
+                    .x = self.terminal.screens.active.cursor.x -| self.terminal.scrolling_region.left,
+                    .y = self.terminal.screens.active.cursor.y -| self.terminal.scrolling_region.top,
+                } else .{
+                    .x = self.terminal.screens.active.cursor.x,
+                    .y = self.terminal.screens.active.cursor.y,
+                };
+
+                var buf: [64]u8 = undefined;
+                const resp = std.fmt.bufPrintZ(&buf, "\x1B[{};{}R", .{
+                    pos.y + 1,
+                    pos.x + 1,
+                }) catch return;
+                self.writePty(resp);
+            },
+
+            .color_scheme => {
+                const func = self.effects.color_scheme orelse return;
+                const scheme = func(self) orelse return;
+                self.writePty(switch (scheme) {
+                    .dark => "\x1B[?997;1n",
+                    .light => "\x1B[?997;2n",
+                });
+            },
+        }
+    }
+
     fn reportEnquiry(self: *Handler) void {
         const func = self.effects.enquiry orelse return;
         const response = func(self);
@@ -1671,3 +1713,192 @@ test "enquiry with empty response" {
     s.nextSlice("\x05");
     try testing.expect(S.written == null);
 }
+
+test "device status: operating status" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            if (written) |old| testing.allocator.free(old);
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+    };
+    S.written = null;
+    defer if (S.written) |old| testing.allocator.free(old);
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // CSI 5 n — operating status report
+    s.nextSlice("\x1B[5n");
+    try testing.expectEqualStrings("\x1B[0n", S.written.?);
+}
+
+test "device status: cursor position" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            if (written) |old| testing.allocator.free(old);
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+    };
+    S.written = null;
+    defer if (S.written) |old| testing.allocator.free(old);
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // Default position is 0,0 — reported as 1,1
+    s.nextSlice("\x1B[6n");
+    try testing.expectEqualStrings("\x1B[1;1R", S.written.?);
+
+    // Move cursor to row 5, col 10
+    s.nextSlice("\x1B[5;10H");
+    s.nextSlice("\x1B[6n");
+    try testing.expectEqualStrings("\x1B[5;10R", S.written.?);
+}
+
+test "device status: cursor position with origin mode" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            if (written) |old| testing.allocator.free(old);
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+    };
+    S.written = null;
+    defer if (S.written) |old| testing.allocator.free(old);
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // Set scroll region rows 5-20
+    s.nextSlice("\x1B[5;20r");
+    // Enable origin mode
+    s.nextSlice("\x1B[?6h");
+    // Move to row 3, col 5 within the region
+    s.nextSlice("\x1B[3;5H");
+    // Query cursor position
+    s.nextSlice("\x1B[6n");
+    // Should report position relative to the scroll region
+    try testing.expectEqualStrings("\x1B[3;5R", S.written.?);
+}
+
+test "device status: color scheme dark" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            if (written) |old| testing.allocator.free(old);
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+        fn colorScheme(_: *Handler) ?device_status.ColorScheme {
+            return .dark;
+        }
+    };
+    S.written = null;
+    defer if (S.written) |old| testing.allocator.free(old);
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+    handler.effects.color_scheme = &S.colorScheme;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // CSI ? 996 n — color scheme query
+    s.nextSlice("\x1B[?996n");
+    try testing.expectEqualStrings("\x1B[?997;1n", S.written.?);
+}
+
+test "device status: color scheme light" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            if (written) |old| testing.allocator.free(old);
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+        fn colorScheme(_: *Handler) ?device_status.ColorScheme {
+            return .light;
+        }
+    };
+    S.written = null;
+    defer if (S.written) |old| testing.allocator.free(old);
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+    handler.effects.color_scheme = &S.colorScheme;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // CSI ? 996 n — color scheme query
+    s.nextSlice("\x1B[?996n");
+    try testing.expectEqualStrings("\x1B[?997;2n", S.written.?);
+}
+
+test "device status: color scheme without callback" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            if (written) |old| testing.allocator.free(old);
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+    };
+    S.written = null;
+    defer if (S.written) |old| testing.allocator.free(old);
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    // Without color_scheme effect, query should be silently ignored
+    s.nextSlice("\x1B[?996n");
+    try testing.expect(S.written == null);
+}
+
+test "device status: readonly ignores all" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    var s: Stream = .initAlloc(testing.allocator, .init(&t));
+    defer s.deinit();
+
+    // All device status queries should be silently ignored without effects
+    s.nextSlice("\x1B[5n");
+    s.nextSlice("\x1B[6n");
+    s.nextSlice("\x1B[?996n");
+
+    // Terminal should still be functional
+    s.nextSlice("Test");
+    const str = try t.plainString(testing.allocator);
+    defer testing.allocator.free(str);
+    try testing.expectEqualStrings("Test", str);
+}

From b31dcf9a4cc0e00652d8fa62c4abb0364ad0263a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 14:35:22 -0700
Subject: [PATCH 348/391] terminal: add device_attributes module

Introduce a dedicated device_attributes.zig module that consolidates
all device attribute types and encoding logic. This moves
DeviceAttributeReq out of ansi.zig and adds structured response
types for DA1 (primary), DA2 (secondary), and DA3 (tertiary) with
self-encoding methods.

Primary DA uses a ConformanceLevel enum covering VT100-series
per-model values and VT200+ conformance levels, plus a Feature
enum with all known xterm DA1 attribute codes (132-col, printer,
sixel, color, clipboard, etc.) as a simple slice. Secondary DA
uses a DeviceType enum matching the xterm decTerminalID values.
Tertiary DA encodes the DECRPTUI unit ID as a u32 formatted to
8 hex digits.

This is preparatory work for exposing device attributes through
the stream_terminal Effects callback system.
---
 src/terminal/ansi.zig              |  10 --
 src/terminal/device_attributes.zig | 216 +++++++++++++++++++++++++++++
 src/terminal/main.zig              |   3 +-
 src/terminal/stream.zig            |   5 +-
 4 files changed, 221 insertions(+), 13 deletions(-)
 create mode 100644 src/terminal/device_attributes.zig

diff --git a/src/terminal/ansi.zig b/src/terminal/ansi.zig
index c9cd53666..86b00c801 100644
--- a/src/terminal/ansi.zig
+++ b/src/terminal/ansi.zig
@@ -52,16 +52,6 @@ pub const RenditionAspect = enum(u16) {
     _,
 };
 
-/// The device attribute request type (ESC [ c).
-pub const DeviceAttributeReq = lib.Enum(
-    lib_target,
-    &.{
-        "primary", // Blank
-        "secondary", // >
-        "tertiary", // =
-    },
-);
-
 /// Possible cursor styles (ESC [ q)
 pub const CursorStyle = lib.Enum(
     lib_target,
diff --git a/src/terminal/device_attributes.zig b/src/terminal/device_attributes.zig
new file mode 100644
index 000000000..b7844b60d
--- /dev/null
+++ b/src/terminal/device_attributes.zig
@@ -0,0 +1,216 @@
+const std = @import("std");
+const testing = std.testing;
+const build_options = @import("terminal_options");
+const lib = @import("../lib/main.zig");
+const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
+
+/// The device attribute request type (CSI c).
+pub const Req = lib.Enum(lib_target, &.{
+    "primary", // Blank
+    "secondary", // >
+    "tertiary", // =
+});
+
+/// Response data for all device attribute queries.
+pub const Response = struct {
+    /// Reply to CSI c (DA1).
+    primary: Primary = .{},
+
+    /// Reply to CSI > c (DA2).
+    secondary: Secondary = .{},
+
+    /// Reply to CSI = c (DA3).
+    tertiary: Tertiary = .{},
+};
+
+/// Primary device attributes (DA1).
+///
+/// Response format: CSI ? Pp ; Ps... c
+/// where Pp is the conformance level and Ps are feature flags.
+pub const Primary = struct {
+    /// Conformance level sent as the first parameter.
+    conformance_level: ConformanceLevel = .vt220,
+
+    /// Optional feature attributes.
+    features: []const Feature = &.{.ansi_color},
+
+    /// DA1 feature attribute codes.
+    pub const Feature = enum(u16) {
+        columns_132 = 1,
+        printer = 2,
+        regis = 3,
+        sixel = 4,
+        selective_erase = 6,
+        user_defined_keys = 8,
+        national_replacement = 9,
+        technical_characters = 15,
+        locator = 16,
+        terminal_state = 17,
+        windowing = 18,
+        horizontal_scrolling = 21,
+        ansi_color = 22,
+        rectangular_editing = 28,
+        ansi_text_locator = 29,
+        clipboard = 52,
+        _,
+    };
+
+    /// Encode the primary DA response into the writer.
+    pub fn encode(self: Primary, writer: *std.Io.Writer) std.Io.Writer.Error!void {
+        try writer.print("\x1b[?{}", .{@intFromEnum(self.conformance_level)});
+        for (self.features) |feature| try writer.print(";{}", .{@intFromEnum(feature)});
+        try writer.writeAll("c");
+    }
+};
+
+/// Secondary device attributes (DA2).
+///
+/// Response format: CSI > Pp ; Pv ; Pc c
+pub const Secondary = struct {
+    /// Terminal type identifier (Pp parameter from secondary DA response).
+    device_type: DeviceType = .vt220,
+
+    /// Firmware/patch version number.
+    firmware_version: u16 = 0,
+
+    /// ROM cartridge registration number. Always 0 for emulators.
+    rom_cartridge: u16 = 0,
+
+    /// Encode the secondary DA response into the writer.
+    pub fn encode(self: Secondary, writer: *std.Io.Writer) std.Io.Writer.Error!void {
+        try writer.print("\x1b[>{};{};{}c", .{
+            @intFromEnum(self.device_type),
+            self.firmware_version,
+            self.rom_cartridge,
+        });
+    }
+};
+
+/// Tertiary device attributes (DA3).
+///
+/// Response format: DCS ! | D...D ST
+/// where D...D is the unit ID as hex digits (DECRPTUI).
+pub const Tertiary = struct {
+    /// Unit ID (DECRPTUI). Encoded as 8 uppercase hex digits.
+    /// Meaningless for emulators nowadays. The actual DEC manuals
+    /// appear to split this into two 16-bit fields but since there
+    /// is no practical usage I know if I'm simplifying this.
+    unit_id: u32 = 0,
+
+    /// Encode the tertiary DA response into the writer.
+    pub fn encode(
+        self: Tertiary,
+        writer: *std.Io.Writer,
+    ) std.Io.Writer.Error!void {
+        try writer.print(
+            "\x1bP!|{X:0>8}\x1b\\",
+            .{self.unit_id},
+        );
+    }
+};
+
+/// Conformance level reported as the first parameter (Pp) in the
+/// primary device attributes (DA1) response.
+pub const ConformanceLevel = enum(u16) {
+    // VT100-series have per-model values.
+    vt100 = 1,
+    vt132 = 4,
+    vt102 = 6,
+    vt131 = 7,
+    vt125 = 12,
+
+    // VT200+ use 60 + decTerminalID/100.
+    /// Level 2 conformance (VT200 series, e.g. VT220, VT240).
+    level_2 = 62,
+    /// Level 3 conformance (VT300 series, e.g. VT320, VT340).
+    level_3 = 63,
+    /// Level 4 conformance (VT400 series, e.g. VT420).
+    level_4 = 64,
+    /// Level 5 conformance (VT500 series, e.g. VT510, VT520, VT525).
+    level_5 = 65,
+
+    _,
+
+    pub const vt101 = ConformanceLevel.vt100;
+    pub const vt220 = ConformanceLevel.level_2;
+    pub const vt240 = ConformanceLevel.level_2;
+    pub const vt320 = ConformanceLevel.level_3;
+    pub const vt340 = ConformanceLevel.level_3;
+    pub const vt420 = ConformanceLevel.level_4;
+    pub const vt510 = ConformanceLevel.level_5;
+    pub const vt520 = ConformanceLevel.level_5;
+    pub const vt525 = ConformanceLevel.level_5;
+};
+
+/// Terminal type identifier reported as the Pp parameter in the
+/// secondary device attributes (DA2) response. Values correspond
+/// to the decTerminalID resource in xterm.
+pub const DeviceType = enum(u16) {
+    vt100 = 0,
+    vt220 = 1,
+    vt240 = 2,
+    vt330 = 18,
+    vt340 = 19,
+    vt320 = 24,
+    vt382 = 32,
+    vt420 = 41,
+    vt510 = 61,
+    vt520 = 64,
+    vt525 = 65,
+    _,
+};
+
+test "primary default" {
+    var buf: [64]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    try (Primary{}).encode(&writer);
+    try testing.expectEqualStrings("\x1b[?62;22c", writer.buffered());
+}
+
+test "primary with clipboard" {
+    var buf: [64]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    try (Primary{ .features = &.{ .ansi_color, .clipboard } }).encode(&writer);
+    try testing.expectEqualStrings("\x1b[?62;22;52c", writer.buffered());
+}
+
+test "primary with multiple features" {
+    var buf: [64]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    try (Primary{
+        .conformance_level = .vt420,
+        .features = &.{ .columns_132, .selective_erase, .ansi_color },
+    }).encode(&writer);
+    try testing.expectEqualStrings("\x1b[?64;1;6;22c", writer.buffered());
+}
+
+test "primary no features" {
+    var buf: [64]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    try (Primary{
+        .conformance_level = .vt100,
+        .features = &.{},
+    }).encode(&writer);
+    try testing.expectEqualStrings("\x1b[?1c", writer.buffered());
+}
+
+test "secondary default" {
+    var buf: [64]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    try (Secondary{}).encode(&writer);
+    try testing.expectEqualStrings("\x1b[>1;10;0c", writer.buffered());
+}
+
+test "tertiary default" {
+    var buf: [64]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    try (Tertiary{}).encode(&writer);
+    try testing.expectEqualStrings("\x1bP!|00000000\x1b\\", writer.buffered());
+}
+
+test "tertiary custom unit id" {
+    var buf: [64]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    try (Tertiary{ .unit_id = 0xAABBCCDD }).encode(&writer);
+    try testing.expectEqualStrings("\x1bP!|AABBCCDD\x1b\\", writer.buffered());
+}
diff --git a/src/terminal/main.zig b/src/terminal/main.zig
index e58c828b8..9f5b65e34 100644
--- a/src/terminal/main.zig
+++ b/src/terminal/main.zig
@@ -10,6 +10,7 @@ pub const dcs = @import("dcs.zig");
 pub const osc = @import("osc.zig");
 pub const point = @import("point.zig");
 pub const color = @import("color.zig");
+pub const device_attributes = @import("device_attributes.zig");
 pub const device_status = @import("device_status.zig");
 pub const focus = @import("focus.zig");
 pub const formatter = @import("formatter.zig");
@@ -57,7 +58,7 @@ pub const StreamAction = stream.Action;
 pub const Cursor = Screen.Cursor;
 pub const CursorStyle = Screen.CursorStyle;
 pub const CursorStyleReq = ansi.CursorStyle;
-pub const DeviceAttributeReq = ansi.DeviceAttributeReq;
+pub const DeviceAttributeReq = device_attributes.Req;
 pub const Mode = modes.Mode;
 pub const ModePacked = modes.ModePacked;
 pub const ModifyKeyFormat = ansi.ModifyKeyFormat;
diff --git a/src/terminal/stream.zig b/src/terminal/stream.zig
index c582635b1..04410e94c 100644
--- a/src/terminal/stream.zig
+++ b/src/terminal/stream.zig
@@ -9,6 +9,7 @@ const lib = @import("../lib/main.zig");
 const Parser = @import("Parser.zig");
 const ansi = @import("ansi.zig");
 const charsets = @import("charsets.zig");
+const device_attributes = @import("device_attributes.zig");
 const device_status = @import("device_status.zig");
 const csi = @import("csi.zig");
 const kitty = @import("kitty.zig");
@@ -97,7 +98,7 @@ pub const Action = union(Key) {
     title_push: u16,
     title_pop: u16,
     xtversion,
-    device_attributes: ansi.DeviceAttributeReq,
+    device_attributes: device_attributes.Req,
     device_status: DeviceStatus,
     kitty_keyboard_query,
     kitty_keyboard_push: KittyKeyboardFlags,
@@ -1282,7 +1283,7 @@ pub fn Stream(comptime H: type) type {
 
                 // c - Device Attributes (DA1)
                 'c' => {
-                    const req: ?ansi.DeviceAttributeReq = switch (input.intermediates.len) {
+                    const req: ?device_attributes.Req = switch (input.intermediates.len) {
                         0 => .primary,
                         1 => switch (input.intermediates[0]) {
                             '>' => .secondary,

From ba3f9bb400d2dd95ae99017f3f3ed8756a3eaf91 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 14:54:53 -0700
Subject: [PATCH 349/391] terminal: port device_attributes to stream_terminal
 Effects

Add a device_attributes effect callback to the stream_terminal
Handler. The callback returns a device_attributes.Attributes
struct which the handler encodes and writes back to the pty.

Add Attributes.encode which dispatches to the correct sub-type
encoder based on the request type (primary, secondary, tertiary).

In readonly mode the callback is null so all DA queries are
silently ignored, matching the previous behavior where
device_attributes was in the ignored actions list.

Tests cover all three DA types with default attributes, custom
attributes, and readonly mode.
---
 src/terminal/device_attributes.zig |  15 ++-
 src/terminal/stream_terminal.zig   | 179 ++++++++++++++++++++++++++++-
 2 files changed, 187 insertions(+), 7 deletions(-)

diff --git a/src/terminal/device_attributes.zig b/src/terminal/device_attributes.zig
index b7844b60d..2bfdbdf96 100644
--- a/src/terminal/device_attributes.zig
+++ b/src/terminal/device_attributes.zig
@@ -12,7 +12,7 @@ pub const Req = lib.Enum(lib_target, &.{
 });
 
 /// Response data for all device attribute queries.
-pub const Response = struct {
+pub const Attributes = struct {
     /// Reply to CSI c (DA1).
     primary: Primary = .{},
 
@@ -21,6 +21,19 @@ pub const Response = struct {
 
     /// Reply to CSI = c (DA3).
     tertiary: Tertiary = .{},
+
+    /// Encode the response for the given request type into the writer.
+    pub fn encode(
+        self: Attributes,
+        req: Req,
+        writer: *std.Io.Writer,
+    ) std.Io.Writer.Error!void {
+        switch (req) {
+            .primary => try self.primary.encode(writer),
+            .secondary => try self.secondary.encode(writer),
+            .tertiary => try self.tertiary.encode(writer),
+        }
+    }
 };
 
 /// Primary device attributes (DA1).
diff --git a/src/terminal/stream_terminal.zig b/src/terminal/stream_terminal.zig
index ad721e24e..8e0f91110 100644
--- a/src/terminal/stream_terminal.zig
+++ b/src/terminal/stream_terminal.zig
@@ -1,6 +1,7 @@
 const std = @import("std");
 const testing = std.testing;
 const csi = @import("csi.zig");
+const device_attributes = @import("device_attributes.zig");
 const device_status = @import("device_status.zig");
 const stream = @import("stream.zig");
 const Action = stream.Action;
@@ -49,6 +50,11 @@ pub const Handler = struct {
         /// ignore the query.
         color_scheme: ?*const fn (*Handler) ?device_status.ColorScheme,
 
+        /// Called in response to a device attributes query (CSI c,
+        /// CSI > c, CSI = c). Returns the response to encode and
+        /// write back to the pty.
+        device_attributes: ?*const fn (*Handler) device_attributes.Attributes,
+
         /// Called in response to ENQ (0x05). Returns the raw response
         /// bytes to write back to the pty. The returned memory must be
         /// valid for the lifetime of the call.
@@ -75,12 +81,13 @@ pub const Handler = struct {
         /// effects beyond that.
         pub const readonly: Effects = .{
             .bell = null,
-            .write_pty = null,
-            .title_changed = null,
-            .xtversion = null,
-            .size = null,
-            .enquiry = null,
             .color_scheme = null,
+            .device_attributes = null,
+            .enquiry = null,
+            .size = null,
+            .title_changed = null,
+            .write_pty = null,
+            .xtversion = null,
         };
     };
 
@@ -225,6 +232,7 @@ pub const Handler = struct {
 
             // Effect-based handlers
             .bell => self.bell(),
+            .device_attributes => self.reportDeviceAttributes(value),
             .device_status => self.deviceStatus(value.request),
             .enquiry => self.reportEnquiry(),
             .kitty_keyboard_query => self.queryKittyKeyboard(),
@@ -249,7 +257,6 @@ pub const Handler = struct {
             => {},
 
             // Have no terminal-modifying effect
-            .device_attributes,
             .report_pwd,
             .show_desktop_notification,
             .progress_report,
@@ -270,6 +277,23 @@ pub const Handler = struct {
         func(self);
     }
 
+    fn reportDeviceAttributes(self: *Handler, req: device_attributes.Req) void {
+        const func = self.effects.device_attributes orelse return;
+        const attrs = func(self);
+
+        var stack = std.heap.stackFallback(128, self.terminal.gpa());
+        const alloc = stack.get();
+
+        var aw: std.Io.Writer.Allocating = .init(alloc);
+        defer aw.deinit();
+
+        attrs.encode(req, &aw.writer) catch return;
+
+        const written = aw.toOwnedSliceSentinel(0) catch return;
+        defer alloc.free(written);
+        self.writePty(written);
+    }
+
     fn deviceStatus(self: *Handler, req: device_status.Request) void {
         switch (req) {
             .operating_status => self.writePty("\x1B[0n"),
@@ -1902,3 +1926,146 @@ test "device status: readonly ignores all" {
     defer testing.allocator.free(str);
     try testing.expectEqualStrings("Test", str);
 }
+
+test "device attributes: primary DA" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            if (written) |old| testing.allocator.free(old);
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+        fn da(_: *Handler) device_attributes.Attributes {
+            return .{};
+        }
+    };
+    S.written = null;
+    defer if (S.written) |old| testing.allocator.free(old);
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+    handler.effects.device_attributes = &S.da;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    s.nextSlice("\x1B[c");
+    try testing.expectEqualStrings("\x1b[?62;22c", S.written.?);
+}
+
+test "device attributes: secondary DA" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            if (written) |old| testing.allocator.free(old);
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+        fn da(_: *Handler) device_attributes.Attributes {
+            return .{};
+        }
+    };
+    S.written = null;
+    defer if (S.written) |old| testing.allocator.free(old);
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+    handler.effects.device_attributes = &S.da;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    s.nextSlice("\x1B[>c");
+    try testing.expectEqualStrings("\x1b[>1;0;0c", S.written.?);
+}
+
+test "device attributes: tertiary DA" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            if (written) |old| testing.allocator.free(old);
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+        fn da(_: *Handler) device_attributes.Attributes {
+            return .{};
+        }
+    };
+    S.written = null;
+    defer if (S.written) |old| testing.allocator.free(old);
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+    handler.effects.device_attributes = &S.da;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    s.nextSlice("\x1B[=c");
+    try testing.expectEqualStrings("\x1bP!|00000000\x1b\\", S.written.?);
+}
+
+test "device attributes: readonly ignores" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    var s: Stream = .initAlloc(testing.allocator, .init(&t));
+    defer s.deinit();
+
+    // All DA queries should be silently ignored without effects
+    s.nextSlice("\x1B[c");
+    s.nextSlice("\x1B[>c");
+    s.nextSlice("\x1B[=c");
+
+    // Terminal should still be functional
+    s.nextSlice("Test");
+    const str = try t.plainString(testing.allocator);
+    defer testing.allocator.free(str);
+    try testing.expectEqualStrings("Test", str);
+}
+
+test "device attributes: custom response" {
+    var t: Terminal = try .init(testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer t.deinit(testing.allocator);
+
+    const S = struct {
+        var written: ?[]const u8 = null;
+        fn writePty(_: *Handler, data: [:0]const u8) void {
+            if (written) |old| testing.allocator.free(old);
+            written = testing.allocator.dupe(u8, data) catch @panic("OOM");
+        }
+        fn da(_: *Handler) device_attributes.Attributes {
+            return .{
+                .primary = .{
+                    .conformance_level = .vt420,
+                    .features = &.{ .ansi_color, .clipboard },
+                },
+                .secondary = .{
+                    .device_type = .vt420,
+                    .firmware_version = 100,
+                },
+            };
+        }
+    };
+    S.written = null;
+    defer if (S.written) |old| testing.allocator.free(old);
+
+    var handler: Handler = .init(&t);
+    handler.effects.write_pty = &S.writePty;
+    handler.effects.device_attributes = &S.da;
+
+    var s: Stream = .initAlloc(testing.allocator, handler);
+    defer s.deinit();
+
+    s.nextSlice("\x1B[c");
+    try testing.expectEqualStrings("\x1b[?64;22;52c", S.written.?);
+
+    s.nextSlice("\x1B[>c");
+    try testing.expectEqualStrings("\x1b[>41;100;0c", S.written.?);
+}

From 701d1d55d23ae199785b56db05c92d74f157a2f3 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 15:01:26 -0700
Subject: [PATCH 350/391] terminal: fix secondary DA test to match default
 firmware version

The default firmware_version for Secondary device attributes is 0,
but the test expected a value of 10. Update the test expectation to
match the actual default.
---
 src/terminal/device_attributes.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/terminal/device_attributes.zig b/src/terminal/device_attributes.zig
index 2bfdbdf96..3b99459d3 100644
--- a/src/terminal/device_attributes.zig
+++ b/src/terminal/device_attributes.zig
@@ -211,7 +211,7 @@ test "secondary default" {
     var buf: [64]u8 = undefined;
     var writer: std.Io.Writer = .fixed(&buf);
     try (Secondary{}).encode(&writer);
-    try testing.expectEqualStrings("\x1b[>1;10;0c", writer.buffered());
+    try testing.expectEqualStrings("\x1b[>1;0;0c", writer.buffered());
 }
 
 test "tertiary default" {

From 7039f566bb5db987707a9a4fd8637575b595ffaa Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 16:08:25 -0700
Subject: [PATCH 351/391] vt: move free_alloc to dedicated allocator.zig

Extract the inline free_alloc function from main.zig into a new
allocator.zig module in the C API layer. The function is renamed
to alloc_free in main.zig (and free in allocator.zig) for
consistency with the other C API naming conventions. Add tests
for null pointer, allocated memory, and null allocator fallback.
---
 src/lib_vt.zig               |  2 +-
 src/terminal/c/allocator.zig | 36 ++++++++++++++++++++++++++++++++++++
 src/terminal/c/main.zig      | 17 +++--------------
 3 files changed, 40 insertions(+), 15 deletions(-)
 create mode 100644 src/terminal/c/allocator.zig

diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 2816befae..0452d5e31 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -218,7 +218,7 @@ comptime {
         @export(&c.grid_ref_graphemes, .{ .name = "ghostty_grid_ref_graphemes" });
         @export(&c.grid_ref_style, .{ .name = "ghostty_grid_ref_style" });
         @export(&c.build_info, .{ .name = "ghostty_build_info" });
-        @export(&c.free_alloc, .{ .name = "ghostty_free" });
+        @export(&c.alloc_free, .{ .name = "ghostty_free" });
 
         // On Wasm we need to export our allocator convenience functions.
         if (builtin.target.cpu.arch.isWasm()) {
diff --git a/src/terminal/c/allocator.zig b/src/terminal/c/allocator.zig
new file mode 100644
index 000000000..b16cf5d25
--- /dev/null
+++ b/src/terminal/c/allocator.zig
@@ -0,0 +1,36 @@
+const std = @import("std");
+const testing = std.testing;
+const lib_alloc = @import("../../lib/allocator.zig");
+const CAllocator = lib_alloc.Allocator;
+
+/// Free memory that was allocated by a libghostty-vt function.
+///
+/// This must be used to free buffers returned by functions like
+/// `format_alloc`. Pass the same allocator (or NULL for the default)
+/// that was used for the allocation.
+pub fn free(
+    alloc_: ?*const CAllocator,
+    ptr: ?[*]u8,
+    len: usize,
+) callconv(.c) void {
+    const mem = ptr orelse return;
+    const alloc = lib_alloc.default(alloc_);
+    alloc.free(mem[0..len]);
+}
+
+test "free null pointer" {
+    free(&lib_alloc.test_allocator, null, 0);
+}
+
+test "free allocated memory" {
+    const alloc = lib_alloc.default(&lib_alloc.test_allocator);
+    const mem = try alloc.alloc(u8, 16);
+    free(&lib_alloc.test_allocator, mem.ptr, mem.len);
+}
+
+test "free with null allocator" {
+    // null allocator falls back to the default (test allocator in tests)
+    const alloc = lib_alloc.default(null);
+    const mem = try alloc.alloc(u8, 8);
+    free(null, mem.ptr, mem.len);
+}
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index b1a87e452..8e6674049 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -2,6 +2,7 @@ const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 
 const buildpkg = @import("build_info.zig");
+pub const allocator = @import("allocator.zig");
 pub const cell = @import("cell.zig");
 pub const color = @import("color.zig");
 pub const focus = @import("focus.zig");
@@ -115,20 +116,7 @@ pub const mouse_encoder_encode = mouse_encode.encode;
 
 pub const paste_is_safe = paste.is_safe;
 
-/// Free memory that was allocated by a libghostty-vt function.
-///
-/// This must be used to free buffers returned by functions like
-/// `format_alloc`. Pass the same allocator (or NULL for the default)
-/// that was used for the allocation.
-pub fn free_alloc(
-    alloc_: ?*const CAllocator,
-    ptr: ?[*]u8,
-    len: usize,
-) callconv(.c) void {
-    const mem = ptr orelse return;
-    const alloc = lib_alloc.default(alloc_);
-    alloc.free(mem[0..len]);
-}
+pub const alloc_free = allocator.free;
 
 pub const size_report_encode = size_report.encode;
 
@@ -157,6 +145,7 @@ pub const grid_ref_graphemes = grid_ref.grid_ref_graphemes;
 pub const grid_ref_style = grid_ref.grid_ref_style;
 
 test {
+    _ = allocator;
     _ = buildpkg;
     _ = cell;
     _ = color;

From b819ce0e20c14d649613c8fb39705b5893960b9c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Mon, 23 Mar 2026 16:11:16 -0700
Subject: [PATCH 352/391] vt: add ghostty_alloc for buffer allocation

Add a ghostty_alloc function that pairs with the existing
ghostty_free, giving embedders a symmetric malloc/free-style
API for buffer allocation through the libghostty allocator
interface. Returns NULL on allocation failure.
---
 include/ghostty/vt/allocator.h | 33 ++++++++++++++++++++++++++
 src/lib_vt.zig                 |  1 +
 src/terminal/c/allocator.zig   | 43 +++++++++++++++++++++++++++++-----
 src/terminal/c/main.zig        |  1 +
 4 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/include/ghostty/vt/allocator.h b/include/ghostty/vt/allocator.h
index f1406cf79..ed2d36794 100644
--- a/include/ghostty/vt/allocator.h
+++ b/include/ghostty/vt/allocator.h
@@ -44,6 +44,24 @@
  * 2. Create a GhosttyAllocator struct with your vtable and context
  * 3. Pass the allocator to functions that accept one
  *
+ * ## Alloc/Free Helpers
+ *
+ * ghostty_alloc() and ghostty_free() provide a simple malloc/free-style
+ * interface for allocating and freeing byte buffers through the library's
+ * allocator. These are useful when:
+ *
+ * - You need to allocate a buffer to pass into a libghostty-vt function
+ *   (e.g. preparing input data for ghostty_terminal_vt_write()).
+ * - You need to free a buffer returned by a libghostty-vt function
+ *   (e.g. the output of ghostty_formatter_format_alloc()).
+ * - You are on a platform where the library's internal allocator differs
+ *   from the consumer's C runtime (e.g. Windows, where Zig's libc and
+ *   MSVC's CRT maintain separate heaps), so calling the standard C
+ *   free() on library-allocated memory would be undefined behavior.
+ *
+ * Always use the same allocator (or NULL) for both the allocation and
+ * the corresponding free.
+ *
  * @{
  */
 
@@ -191,6 +209,21 @@ typedef struct GhosttyAllocator {
     const GhosttyAllocatorVtable *vtable;
 } GhosttyAllocator;
 
+/**
+ * Allocate a buffer of `len` bytes.
+ *
+ * Uses the provided allocator, or the default allocator if NULL is passed.
+ * The returned buffer must be freed with ghostty_free() using the same
+ * allocator.
+ *
+ * @param allocator Pointer to the allocator to use, or NULL for the default
+ * @param len Number of bytes to allocate
+ * @return Pointer to the allocated buffer, or NULL if allocation failed
+ *
+ * @ingroup allocator
+ */
+uint8_t* ghostty_alloc(const GhosttyAllocator* allocator, size_t len);
+
 /**
  * Free memory that was allocated by a libghostty-vt function.
  *
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 0452d5e31..8ccd6bf96 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -218,6 +218,7 @@ comptime {
         @export(&c.grid_ref_graphemes, .{ .name = "ghostty_grid_ref_graphemes" });
         @export(&c.grid_ref_style, .{ .name = "ghostty_grid_ref_style" });
         @export(&c.build_info, .{ .name = "ghostty_build_info" });
+        @export(&c.alloc_alloc, .{ .name = "ghostty_alloc" });
         @export(&c.alloc_free, .{ .name = "ghostty_free" });
 
         // On Wasm we need to export our allocator convenience functions.
diff --git a/src/terminal/c/allocator.zig b/src/terminal/c/allocator.zig
index b16cf5d25..f16c7237f 100644
--- a/src/terminal/c/allocator.zig
+++ b/src/terminal/c/allocator.zig
@@ -3,6 +3,20 @@ const testing = std.testing;
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 
+/// Allocate a buffer of `len` bytes using the given allocator
+/// (or the default allocator if NULL).
+///
+/// Returns a pointer to the allocated buffer, or NULL if the
+/// allocation failed.
+pub fn alloc(
+    alloc_: ?*const CAllocator,
+    len: usize,
+) callconv(.c) ?[*]u8 {
+    const allocator = lib_alloc.default(alloc_);
+    const buf = allocator.alloc(u8, len) catch return null;
+    return buf.ptr;
+}
+
 /// Free memory that was allocated by a libghostty-vt function.
 ///
 /// This must be used to free buffers returned by functions like
@@ -14,8 +28,25 @@ pub fn free(
     len: usize,
 ) callconv(.c) void {
     const mem = ptr orelse return;
-    const alloc = lib_alloc.default(alloc_);
-    alloc.free(mem[0..len]);
+    const allocator = lib_alloc.default(alloc_);
+    allocator.free(mem[0..len]);
+}
+
+test "alloc returns non-null" {
+    const ptr = alloc(&lib_alloc.test_allocator, 16);
+    try testing.expect(ptr != null);
+    free(&lib_alloc.test_allocator, ptr, 16);
+}
+
+test "alloc with null allocator" {
+    const ptr = alloc(null, 8);
+    try testing.expect(ptr != null);
+    free(null, ptr, 8);
+}
+
+test "alloc zero length" {
+    const ptr = alloc(&lib_alloc.test_allocator, 0);
+    defer free(&lib_alloc.test_allocator, ptr, 0);
 }
 
 test "free null pointer" {
@@ -23,14 +54,14 @@ test "free null pointer" {
 }
 
 test "free allocated memory" {
-    const alloc = lib_alloc.default(&lib_alloc.test_allocator);
-    const mem = try alloc.alloc(u8, 16);
+    const allocator = lib_alloc.default(&lib_alloc.test_allocator);
+    const mem = try allocator.alloc(u8, 16);
     free(&lib_alloc.test_allocator, mem.ptr, mem.len);
 }
 
 test "free with null allocator" {
     // null allocator falls back to the default (test allocator in tests)
-    const alloc = lib_alloc.default(null);
-    const mem = try alloc.alloc(u8, 8);
+    const allocator = lib_alloc.default(null);
+    const mem = try allocator.alloc(u8, 8);
     free(null, mem.ptr, mem.len);
 }
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 8e6674049..7597228d1 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -116,6 +116,7 @@ pub const mouse_encoder_encode = mouse_encode.encode;
 
 pub const paste_is_safe = paste.is_safe;
 
+pub const alloc_alloc = allocator.alloc;
 pub const alloc_free = allocator.free;
 
 pub const size_report_encode = size_report.encode;

From 147596d5608e3274e4b77fcdc201560f46fdb7c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Mar 2026 00:12:58 +0000
Subject: [PATCH 353/391] build(deps): bump cachix/install-nix-action from
 31.10.1 to 31.10.2

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 31.10.1 to 31.10.2.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Changelog](https://github.com/cachix/install-nix-action/blob/master/RELEASE.md)
- [Commits](https://github.com/cachix/install-nix-action/compare/1ca7d21a94afc7c957383a2d217460d980de4934...51f3067b56fe8ae331890c77d4e454f6d60615ff)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-version: 31.10.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/nix.yml                 |  2 +-
 .github/workflows/release-tag.yml         |  2 +-
 .github/workflows/release-tip.yml         |  4 +-
 .github/workflows/test.yml                | 58 +++++++++++------------
 .github/workflows/update-colorschemes.yml |  2 +-
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 16553d8a2..e2aa913aa 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -47,7 +47,7 @@ jobs:
             /nix
             /zig
       - name: Setup Nix
-        uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+        uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml
index ee62ef00a..3e1c0f15e 100644
--- a/.github/workflows/release-tag.yml
+++ b/.github/workflows/release-tag.yml
@@ -89,7 +89,7 @@ jobs:
             /nix
             /zig
 
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
 
diff --git a/.github/workflows/release-tip.yml b/.github/workflows/release-tip.yml
index 3cb415c9e..218c10244 100644
--- a/.github/workflows/release-tip.yml
+++ b/.github/workflows/release-tip.yml
@@ -42,7 +42,7 @@ jobs:
         with:
           path: |
             /nix
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -175,7 +175,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index deca513c8..5081d32de 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -160,7 +160,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -214,7 +214,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -250,7 +250,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -306,7 +306,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -346,7 +346,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -380,7 +380,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -424,7 +424,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -501,7 +501,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -566,7 +566,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -595,7 +595,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -628,7 +628,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -674,7 +674,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -865,7 +865,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -902,7 +902,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -937,7 +937,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -985,7 +985,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -1020,7 +1020,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -1095,7 +1095,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -1126,7 +1126,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -1168,7 +1168,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -1199,7 +1199,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -1229,7 +1229,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -1287,7 +1287,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -1315,7 +1315,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -1343,7 +1343,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -1376,7 +1376,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -1404,7 +1404,7 @@ jobs:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -1441,7 +1441,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
@@ -1503,7 +1503,7 @@ jobs:
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+      - uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
diff --git a/.github/workflows/update-colorschemes.yml b/.github/workflows/update-colorschemes.yml
index ee934d41a..3c2ebd4a1 100644
--- a/.github/workflows/update-colorschemes.yml
+++ b/.github/workflows/update-colorschemes.yml
@@ -29,7 +29,7 @@ jobs:
             /zig
 
       - name: Setup Nix
-        uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
+        uses: cachix/install-nix-action@51f3067b56fe8ae331890c77d4e454f6d60615ff # v31.10.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17

From 846599b97ef17a99cab699927b480e75aa36c5ac Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Tue, 24 Mar 2026 01:20:46 +0000
Subject: [PATCH 354/391] Update VOUCHED list (#11791)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11460#discussioncomment-16285158)
from @00-kat.

Vouch: @viruslobster

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index ba1cf590b..f8414bfdc 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -186,6 +186,7 @@ uhojin
 unphased
 uzaaft
 vaughanandrews
+viruslobster
 vlsi
 wyounas
 yamshta

From 7d31d9b57f7064f74cd8a098189d2f9248ef4dd5 Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Tue, 24 Mar 2026 04:23:24 +0100
Subject: [PATCH 355/391] cmake: add import library to custom command OUTPUT

Ninja requires all produced files to be listed as explicit outputs of
custom commands. The zig build produces a .lib import library alongside
the DLL, but it was not listed in the OUTPUT directive. This causes
Ninja to fail with "missing and no known rule to make it" when
IMPORTED_IMPLIB references the .lib file.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cae5bdba7..c596dad00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,7 +110,7 @@ file(MAKE_DIRECTORY "${ZIG_OUT_DIR}/include")
 
 # Custom command: run zig build -Demit-lib-vt (produces both shared and static)
 add_custom_command(
-    OUTPUT "${GHOSTTY_VT_SHARED_LIBRARY}" "${GHOSTTY_VT_STATIC_LIBRARY}"
+    OUTPUT "${GHOSTTY_VT_SHARED_LIBRARY}" "${GHOSTTY_VT_STATIC_LIBRARY}" "${ZIG_OUT_DIR}/lib/${GHOSTTY_VT_IMPLIB}"
     COMMAND "${ZIG_EXECUTABLE}" build -Demit-lib-vt ${GHOSTTY_ZIG_BUILD_FLAGS}
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     COMMENT "Building libghostty-vt via zig build..."

From c5092b09ded689983b674d3d285e4796bf86f677 Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Tue, 24 Mar 2026 06:10:30 +0100
Subject: [PATCH 356/391] ci: remove continue-on-error from Windows CI jobs

Windows tests and builds are now passing reliably. Remove the
continue-on-error safety net so failures are visible immediately.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .github/workflows/test.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5081d32de..3d9082642 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -271,7 +271,6 @@ jobs:
         dir: ${{ fromJSON(needs.list-examples.outputs.cmake) }}
     name: Example ${{ matrix.dir }} (Windows)
     runs-on: windows-2025
-    continue-on-error: true
     timeout-minutes: 45
     needs: [test, list-examples]
     steps:
@@ -527,7 +526,6 @@ jobs:
 
   build-libghostty-vt-windows:
     runs-on: windows-2025
-    continue-on-error: true
     timeout-minutes: 45
     needs: test
     steps:
@@ -537,7 +535,6 @@ jobs:
       - name: Setup Zig
         uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2.2.1
 
-      # TODO: Work towards passing the full test suite on Windows.
       - name: Test libghostty-vt
         run: zig build test-lib-vt
 

From 4df71bcad75a6177b33bea33287982efadef69e8 Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Tue, 24 Mar 2026 08:02:50 +0100
Subject: [PATCH 357/391] build: fix zlib compilation on Windows with MSVC

Gate Z_HAVE_UNISTD_H behind a non-Windows check since unistd.h does
not exist on Windows. Add _CRT_SECURE_NO_DEPRECATE and
_CRT_NONSTDC_NO_DEPRECATE for MSVC to suppress deprecation errors
for standard C functions that zlib uses.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 pkg/zlib/build.zig | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/zlib/build.zig b/pkg/zlib/build.zig
index 246ab1bcb..6bde60ec7 100644
--- a/pkg/zlib/build.zig
+++ b/pkg/zlib/build.zig
@@ -32,8 +32,16 @@ pub fn build(b: *std.Build) !void {
             "-DHAVE_SYS_TYPES_H",
             "-DHAVE_STDINT_H",
             "-DHAVE_STDDEF_H",
-            "-DZ_HAVE_UNISTD_H",
         });
+        if (target.result.os.tag != .windows) {
+            try flags.append(b.allocator, "-DZ_HAVE_UNISTD_H");
+        }
+        if (target.result.abi == .msvc) {
+            try flags.appendSlice(b.allocator, &.{
+                "-D_CRT_SECURE_NO_DEPRECATE",
+                "-D_CRT_NONSTDC_NO_DEPRECATE",
+            });
+        }
         lib.addCSourceFiles(.{
             .root = upstream.path(""),
             .files = srcs,

From 014873e539a6183f82617234fe57ba3983a764ef Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Tue, 24 Mar 2026 08:03:53 +0100
Subject: [PATCH 358/391] build: fix oniguruma compilation on Windows with MSVC

Conditionally disable POSIX-only header defines (alloca.h, sys/times.h,
sys/time.h, unistd.h) on Windows since they do not exist with MSVC.
Enable USE_CRNL_AS_LINE_TERMINATOR on Windows for correct line endings.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 pkg/oniguruma/build.zig | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkg/oniguruma/build.zig b/pkg/oniguruma/build.zig
index ea39b4814..efc013b43 100644
--- a/pkg/oniguruma/build.zig
+++ b/pkg/oniguruma/build.zig
@@ -68,6 +68,7 @@ fn buildLib(b: *std.Build, module: *std.Build.Module, options: anytype) !*std.Bu
         .linkage = .static,
     });
     const t = target.result;
+    const is_windows = t.os.tag == .windows;
     lib.linkLibC();
 
     if (target.result.os.tag.isDarwin()) {
@@ -86,13 +87,13 @@ fn buildLib(b: *std.Build, module: *std.Build.Module, options: anytype) !*std.Bu
             .PACKAGE_VERSION = "6.9.9",
             .VERSION = "6.9.9",
             .HAVE_ALLOCA = true,
-            .HAVE_ALLOCA_H = true,
-            .USE_CRNL_AS_LINE_TERMINATOR = false,
+            .HAVE_ALLOCA_H = !is_windows,
+            .USE_CRNL_AS_LINE_TERMINATOR = is_windows,
             .HAVE_STDINT_H = true,
-            .HAVE_SYS_TIMES_H = true,
-            .HAVE_SYS_TIME_H = true,
+            .HAVE_SYS_TIMES_H = !is_windows,
+            .HAVE_SYS_TIME_H = !is_windows,
             .HAVE_SYS_TYPES_H = true,
-            .HAVE_UNISTD_H = true,
+            .HAVE_UNISTD_H = !is_windows,
             .HAVE_INTTYPES_H = true,
             .SIZEOF_INT = t.cTypeByteSize(.int),
             .SIZEOF_LONG = t.cTypeByteSize(.long),

From 74c6ffe78e4b98e58600f22f37a8433f44b53876 Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Tue, 24 Mar 2026 08:05:40 +0100
Subject: [PATCH 359/391] build: fix glslang compilation on Windows with MSVC

Apply the same MSVC fixes used for simdutf and highway: conditionally
skip linkLibCpp on MSVC since Zig's bundled libc++ headers conflict
with MSVC's own C++ runtime, and add -std=c++17 for C++17 features
like std::variant and inline variables that glslang requires.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 pkg/glslang/build.zig | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkg/glslang/build.zig b/pkg/glslang/build.zig
index c41e05217..1dc82a6e3 100644
--- a/pkg/glslang/build.zig
+++ b/pkg/glslang/build.zig
@@ -51,7 +51,14 @@ fn buildGlslang(
         .linkage = .static,
     });
     lib.linkLibC();
-    lib.linkLibCpp();
+    // On MSVC, we must not use linkLibCpp because Zig unconditionally
+    // passes -nostdinc++ and then adds its bundled libc++/libc++abi
+    // include paths, which conflict with MSVC's own C++ runtime headers.
+    // The MSVC SDK include directories (added via linkLibC) contain
+    // both C and C++ headers, so linkLibCpp is not needed.
+    if (target.result.abi != .msvc) {
+        lib.linkLibCpp();
+    }
     if (upstream_) |upstream| lib.addIncludePath(upstream.path(""));
     lib.addIncludePath(b.path("override"));
     if (target.result.os.tag.isDarwin()) {
@@ -65,6 +72,10 @@ fn buildGlslang(
         "-fno-sanitize=undefined",
         "-fno-sanitize-trap=undefined",
     });
+    // MSVC requires explicit std specification otherwise C++17 features
+    // like std::variant, std::filesystem, and inline variables are
+    // guarded behind _HAS_CXX17.
+    try flags.append(b.allocator, "-std=c++17");
 
     if (target.result.os.tag == .freebsd or target.result.abi == .musl) {
         try flags.append(b.allocator, "-fPIC");

From f9d3b1aafb4131ab8f9d9a362832ec428bf1cabc Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Tue, 24 Mar 2026 08:07:31 +0100
Subject: [PATCH 360/391] build: fix Windows build failures in helpgen and
 framegen

Use writerStreaming() instead of writer() for stdout in helpgen and
main_build_data. The positional writer calls setEndPos/ftruncate in
end(), which fails on Windows because ftruncate on pipes maps
INVALID_PARAMETER to FileTooBig.

Replace scandir with opendir/readdir plus qsort in framegen since
scandir is a POSIX extension not available on Windows.

This was previously applied and reverted upstream (f4998c6ab, 0fdddd5bc)
as collateral from an unrelated example-execution hang that has since
been resolved.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/build/framegen/main.c | 39 +++++++++++++++++++++++++++++++--------
 src/helpgen.zig           |  2 +-
 src/main_build_data.zig   |  2 +-
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/build/framegen/main.c b/src/build/framegen/main.c
index 647768006..2139b15dd 100644
--- a/src/build/framegen/main.c
+++ b/src/build/framegen/main.c
@@ -8,15 +8,16 @@
 
 #define SEPARATOR '\x01'
 #define CHUNK_SIZE 16384
+#define MAX_FRAMES 1024
+#define PATH_SEP '/'
 
-static int filter_frames(const struct dirent *entry) {
-    const char *name = entry->d_name;
+static int is_frame_file(const char *name) {
     size_t len = strlen(name);
     return len > 4 && strcmp(name + len - 4, ".txt") == 0;
 }
 
-static int compare_frames(const struct dirent **a, const struct dirent **b) {
-    return strcmp((*a)->d_name, (*b)->d_name);
+static int compare_names(const void *a, const void *b) {
+    return strcmp(*(const char **)a, *(const char **)b);
 }
 
 static char *read_file(const char *path, size_t *out_size) {
@@ -54,25 +55,47 @@ int main(int argc, char **argv) {
     const char *frames_dir = argv[1];
     const char *output_file = argv[2];
 
-    struct dirent **namelist;
-    int n = scandir(frames_dir, &namelist, filter_frames, compare_frames);
-    if (n < 0) {
+    // Use opendir/readdir instead of scandir for Windows compatibility
+    DIR *dir = opendir(frames_dir);
+    if (!dir) {
         fprintf(stderr, "Failed to scan directory %s: %s\n", frames_dir, strerror(errno));
         return 1;
     }
 
+    char *names[MAX_FRAMES];
+    int n = 0;
+    struct dirent *entry;
+    while ((entry = readdir(dir)) != NULL) {
+        if (!is_frame_file(entry->d_name)) continue;
+        if (n >= MAX_FRAMES) {
+            fprintf(stderr, "Too many frame files (max %d)\n", MAX_FRAMES);
+            closedir(dir);
+            return 1;
+        }
+        names[n] = strdup(entry->d_name);
+        if (!names[n]) {
+            fprintf(stderr, "Failed to allocate memory\n");
+            closedir(dir);
+            return 1;
+        }
+        n++;
+    }
+    closedir(dir);
+
     if (n == 0) {
         fprintf(stderr, "No frame files found in %s\n", frames_dir);
         return 1;
     }
 
+    qsort(names, n, sizeof(char *), compare_names);
+
     size_t total_size = 0;
     char **frame_contents = calloc(n, sizeof(char*));
     size_t *frame_sizes = calloc(n, sizeof(size_t));
 
     for (int i = 0; i < n; i++) {
         char path[4096];
-        snprintf(path, sizeof(path), "%s/%s", frames_dir, namelist[i]->d_name);
+        snprintf(path, sizeof(path), "%s%c%s", frames_dir, PATH_SEP, names[i]);
         
         frame_contents[i] = read_file(path, &frame_sizes[i]);
         if (!frame_contents[i]) {
diff --git a/src/helpgen.zig b/src/helpgen.zig
index fe30db10c..49b5f4439 100644
--- a/src/helpgen.zig
+++ b/src/helpgen.zig
@@ -12,7 +12,7 @@ pub fn main() !void {
     const alloc = gpa.allocator();
 
     var buf: [4096]u8 = undefined;
-    var stdout = std.fs.File.stdout().writer(&buf);
+    var stdout = std.fs.File.stdout().writerStreaming(&buf);
     const writer = &stdout.interface;
     try writer.writeAll(
         \\// THIS FILE IS AUTO GENERATED
diff --git a/src/main_build_data.zig b/src/main_build_data.zig
index 9dd1da395..4e55f449d 100644
--- a/src/main_build_data.zig
+++ b/src/main_build_data.zig
@@ -34,7 +34,7 @@ pub fn main() !void {
 
     // Our output always goes to stdout.
     var buffer: [1024]u8 = undefined;
-    var stdout_writer = std.fs.File.stdout().writer(&buffer);
+    var stdout_writer = std.fs.File.stdout().writerStreaming(&buffer);
     const writer = &stdout_writer.interface;
     switch (action) {
         .bash => try writer.writeAll(@import("extra/bash.zig").completions),

From d5aef6e845ed72584aba3a129268d40a9694b568 Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Tue, 24 Mar 2026 08:08:29 +0100
Subject: [PATCH 361/391] build: fix freetype compilation on Windows with MSVC

Gate HAVE_UNISTD_H and HAVE_FCNTL_H behind a non-Windows check since
these headers do not exist with MSVC. Freetype includes zlib headers
which conditionally include unistd.h based on this define.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 pkg/freetype/build.zig | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg/freetype/build.zig b/pkg/freetype/build.zig
index ecb22cb6c..b85310a5b 100644
--- a/pkg/freetype/build.zig
+++ b/pkg/freetype/build.zig
@@ -84,11 +84,14 @@ fn buildLib(b: *std.Build, module: *std.Build.Module, options: anytype) !*std.Bu
 
         "-DFT_CONFIG_OPTION_SYSTEM_ZLIB=1",
 
-        "-DHAVE_UNISTD_H",
-        "-DHAVE_FCNTL_H",
-
         "-fno-sanitize=undefined",
     });
+    if (target.result.os.tag != .windows) {
+        try flags.appendSlice(b.allocator, &.{
+            "-DHAVE_UNISTD_H",
+            "-DHAVE_FCNTL_H",
+        });
+    }
 
     if (target.result.os.tag == .freebsd or target.result.abi == .musl) {
         try flags.append(b.allocator, "-fPIC");

From a35f84db32e88b93bcff19317365ee93f75839d1 Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Tue, 24 Mar 2026 16:35:49 +0100
Subject: [PATCH 362/391] build: define ssize_t for MSVC in ghostty.h

MSVC's <sys/types.h> does not define ssize_t (it is a POSIX type).
This causes the translate-c build step to fail when translating
ghostty.h on Windows. Use SSIZE_T from <BaseTsd.h> which is the
Windows SDK equivalent.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 include/ghostty.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/ghostty.h b/include/ghostty.h
index 40ff55c9b..3c4002abc 100644
--- a/include/ghostty.h
+++ b/include/ghostty.h
@@ -17,6 +17,11 @@ extern "C" {
 #include <stdint.h>
 #include <sys/types.h>
 
+#ifdef _MSC_VER
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 //-------------------------------------------------------------------
 // Macros
 

From deeda4618691525e977886135aa4ff18b7f81caa Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Tue, 24 Mar 2026 17:03:33 +0100
Subject: [PATCH 363/391] build: skip linkLibCpp on MSVC for dcimgui,
 spirv-cross, harfbuzz

Zig unconditionally passes -nostdinc++ and adds its bundled
libc++/libc++abi include paths, which conflict with MSVC's own C++
runtime headers. The MSVC SDK directories (added via linkLibC)
already contain both C and C++ headers, so linkLibCpp is not needed.

This is the same fix already applied upstream to highway, simdutf,
utfcpp, glslang, SharedDeps, and GhosttyZig.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 pkg/dcimgui/build.zig     | 9 ++++++++-
 pkg/harfbuzz/build.zig    | 9 ++++++++-
 pkg/spirv-cross/build.zig | 9 ++++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkg/dcimgui/build.zig b/pkg/dcimgui/build.zig
index 2a1389834..01a5879d6 100644
--- a/pkg/dcimgui/build.zig
+++ b/pkg/dcimgui/build.zig
@@ -26,7 +26,14 @@ pub fn build(b: *std.Build) !void {
         .linkage = .static,
     });
     lib.linkLibC();
-    lib.linkLibCpp();
+    // On MSVC, we must not use linkLibCpp because Zig unconditionally
+    // passes -nostdinc++ and then adds its bundled libc++/libc++abi
+    // include paths, which conflict with MSVC's own C++ runtime headers.
+    // The MSVC SDK include directories (added via linkLibC) contain
+    // both C and C++ headers, so linkLibCpp is not needed.
+    if (target.result.abi != .msvc) {
+        lib.linkLibCpp();
+    }
     b.installArtifact(lib);
 
     // Zig module
diff --git a/pkg/harfbuzz/build.zig b/pkg/harfbuzz/build.zig
index 8696c0203..6d8f3be70 100644
--- a/pkg/harfbuzz/build.zig
+++ b/pkg/harfbuzz/build.zig
@@ -103,7 +103,14 @@ fn buildLib(b: *std.Build, module: *std.Build.Module, options: anytype) !*std.Bu
         .linkage = .static,
     });
     lib.linkLibC();
-    lib.linkLibCpp();
+    // On MSVC, we must not use linkLibCpp because Zig unconditionally
+    // passes -nostdinc++ and then adds its bundled libc++/libc++abi
+    // include paths, which conflict with MSVC's own C++ runtime headers.
+    // The MSVC SDK include directories (added via linkLibC) contain
+    // both C and C++ headers, so linkLibCpp is not needed.
+    if (target.result.abi != .msvc) {
+        lib.linkLibCpp();
+    }
 
     if (target.result.os.tag.isDarwin()) {
         try apple_sdk.addPaths(b, lib);
diff --git a/pkg/spirv-cross/build.zig b/pkg/spirv-cross/build.zig
index f85e74adf..72ce61eb6 100644
--- a/pkg/spirv-cross/build.zig
+++ b/pkg/spirv-cross/build.zig
@@ -58,7 +58,14 @@ fn buildSpirvCross(
         .linkage = .static,
     });
     lib.linkLibC();
-    lib.linkLibCpp();
+    // On MSVC, we must not use linkLibCpp because Zig unconditionally
+    // passes -nostdinc++ and then adds its bundled libc++/libc++abi
+    // include paths, which conflict with MSVC's own C++ runtime headers.
+    // The MSVC SDK include directories (added via linkLibC) contain
+    // both C and C++ headers, so linkLibCpp is not needed.
+    if (target.result.abi != .msvc) {
+        lib.linkLibCpp();
+    }
     if (target.result.os.tag.isDarwin()) {
         const apple_sdk = @import("apple_sdk");
         try apple_sdk.addPaths(b, lib);

From ce99300513dff19fade309ca4881fc45517424f7 Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Tue, 24 Mar 2026 17:12:18 +0100
Subject: [PATCH 364/391] build: fix freetype C enum signedness for MSVC

MSVC translates C enums as signed int, while GCC/Clang uses unsigned
int. The freetype Zig bindings hardcode c_uint for enum backing types,
causing type mismatches when compiling with MSVC target.

Fix by adding @intCast at call sites where enum values are passed to
C functions, and @bitCast for the glyph format tag extraction where
bit-shift operations require unsigned integers.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 pkg/freetype/face.zig      |  4 ++--
 src/font/face/freetype.zig | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkg/freetype/face.zig b/pkg/freetype/face.zig
index d4f74b7ee..cd949e357 100644
--- a/pkg/freetype/face.zig
+++ b/pkg/freetype/face.zig
@@ -52,7 +52,7 @@ pub const Face = struct {
 
     /// Select a given charmap by its encoding tag (as listed in freetype.h).
     pub fn selectCharmap(self: Face, encoding: Encoding) Error!void {
-        return intToError(c.FT_Select_Charmap(self.handle, @intFromEnum(encoding)));
+        return intToError(c.FT_Select_Charmap(self.handle, @intCast(@intFromEnum(encoding))));
     }
 
     /// Call FT_Request_Size to request the nominal size (in points).
@@ -99,7 +99,7 @@ pub const Face = struct {
     pub fn renderGlyph(self: Face, render_mode: RenderMode) Error!void {
         return intToError(c.FT_Render_Glyph(
             self.handle.*.glyph,
-            @intFromEnum(render_mode),
+            @intCast(@intFromEnum(render_mode)),
         ));
     }
 
diff --git a/src/font/face/freetype.zig b/src/font/face/freetype.zig
index 827753254..528f72d52 100644
--- a/src/font/face/freetype.zig
+++ b/src/font/face/freetype.zig
@@ -679,13 +679,16 @@ pub const Face = struct {
             else => |f| {
                 // Glyph formats are tags, so we can
                 // output a semi-readable error here.
+                // Use @bitCast to u32 because MSVC translates C enums
+                // as signed int, while GCC/Clang uses unsigned int.
+                const tag: u32 = @bitCast(f);
                 log.err(
                     "Can't render glyph with unsupported glyph format \"{s}\"",
                     .{[4]u8{
-                        @truncate(f >> 24),
-                        @truncate(f >> 16),
-                        @truncate(f >> 8),
-                        @truncate(f >> 0),
+                        @truncate(tag >> 24),
+                        @truncate(tag >> 16),
+                        @truncate(tag >> 8),
+                        @truncate(tag >> 0),
                     }},
                 );
                 return error.UnsupportedGlyphFormat;

From 68378a0bb8a6e84e568838bfe5b1f92941c2ef50 Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Tue, 24 Mar 2026 18:04:50 +0100
Subject: [PATCH 365/391] build: increase comptime branch quota for ghostty.h
 enum checks

The MSVC translate-c output includes Windows SDK declarations,
bringing the total to ~2173 declarations (vs ~1502 on Linux/Mac).
The nested inline for in checkGhosttyHEnum (enum fields x declarations)
exceeds the 1M comptime branch quota for larger enums like MouseShape
(34 variants). Increase to 10M to accommodate.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/lib/enum.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/enum.zig b/src/lib/enum.zig
index f40a40b54..bd410371c 100644
--- a/src/lib/enum.zig
+++ b/src/lib/enum.zig
@@ -105,7 +105,7 @@ pub fn checkGhosttyHEnum(
     try std.testing.expect(info.@"enum".tag_type == c_int);
     try std.testing.expect(info.@"enum".is_exhaustive == true);
 
-    @setEvalBranchQuota(1000000);
+    @setEvalBranchQuota(10_000_000);
 
     const c = @import("ghostty.h");
 

From b91cc867a815f1d26bd5b34d17b70b64abff88d1 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 06:50:58 -0700
Subject: [PATCH 366/391] vt: add ghostty_terminal_set for configuring effects
 callbacks

Add a typed option setter ghostty_terminal_set() following the
existing setopt pattern used by the key encoder and render state
APIs. This is the first step toward exposing stream_terminal
Handler.Effects through the C API.

The initial implementation includes a write_pty callback and a
shared userdata pointer. The write_pty callback is invoked
synchronously during ghostty_terminal_vt_write() when the terminal
needs to send a response back to the pty, such as DECRQM mode
reports or device status responses.

Trampolines are always installed at terminal creation time and
no-op when no C callback is set, so callers can configure
callbacks at any point without reinitializing the stream. The C
callback state is grouped into an internal Effects struct on the
TerminalWrapper to simplify adding more callbacks in the future.
---
 include/ghostty/vt/terminal.h | 77 ++++++++++++++++++++++++++++++++---
 src/lib_vt.zig                |  1 +
 src/terminal/c/main.zig       |  1 +
 src/terminal/c/terminal.zig   | 74 ++++++++++++++++++++++++++++++++-
 4 files changed, 146 insertions(+), 7 deletions(-)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index b8e929684..064ee81dd 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -134,6 +134,52 @@ typedef struct {
   uint64_t len;
 } GhosttyTerminalScrollbar;
 
+/**
+ * Callback function type for write_pty.
+ *
+ * Called when the terminal needs to write data back to the pty, for
+ * example in response to a device status report or mode query. The
+ * data is only valid for the duration of the call; callers must copy
+ * it if it needs to persist.
+ *
+ * @param terminal The terminal handle
+ * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
+ * @param data Pointer to the response bytes
+ * @param len Length of the response in bytes
+ *
+ * @ingroup terminal
+ */
+typedef void (*GhosttyTerminalWritePtyFn)(GhosttyTerminal terminal,
+                                          void* userdata,
+                                          const uint8_t* data,
+                                          size_t len);
+
+/**
+ * Terminal option identifiers.
+ *
+ * These values are used with ghostty_terminal_set() to configure
+ * terminal callbacks and associated state.
+ *
+ * @ingroup terminal
+ */
+typedef enum {
+  /**
+   * Opaque userdata pointer passed to all callbacks.
+   *
+   * Input type: void**
+   */
+  GHOSTTY_TERMINAL_OPT_USERDATA = 0,
+
+  /**
+   * Callback invoked when the terminal needs to write data back
+   * to the pty (e.g. in response to a DECRQM query or device
+   * status report). Set to NULL to ignore such sequences.
+   *
+   * Input type: GhosttyTerminalWritePtyFn*
+   */
+  GHOSTTY_TERMINAL_OPT_WRITE_PTY = 1,
+} GhosttyTerminalOption;
+
 /**
  * Terminal data types.
  *
@@ -290,15 +336,36 @@ GhosttyResult ghostty_terminal_resize(GhosttyTerminal terminal,
                                       uint16_t cols,
                                       uint16_t rows);
 
+/**
+ * Set an option on the terminal.
+ *
+ * Configures terminal callbacks and associated state such as the
+ * write_pty callback and userdata pointer. A NULL value pointer
+ * clears the option to its default (NULL/disabled).
+ *
+ * Callbacks are invoked synchronously during ghostty_terminal_vt_write().
+ * Callbacks must not call ghostty_terminal_vt_write() on the same
+ * terminal (no reentrancy).
+ *
+ * @param terminal The terminal handle (may be NULL, in which case this is a no-op)
+ * @param option The option to set
+ * @param value Pointer to the value to set (type depends on the option),
+ *              or NULL to clear the option
+ *
+ * @ingroup terminal
+ */
+void ghostty_terminal_set(GhosttyTerminal terminal,
+                           GhosttyTerminalOption option,
+                           const void* value);
+
 /**
  * Write VT-encoded data to the terminal for processing.
  *
  * Feeds raw bytes through the terminal's VT stream parser, updating
- * terminal state accordingly. Only read-only sequences are processed;
- * sequences that require output (queries) are ignored.
- *
- * In the future, a callback-based API will be added to allow handling
- * of output or side effect sequences.
+ * terminal state accordingly. By default, sequences that require output
+ * (queries, device status reports) are silently ignored. Use
+ * ghostty_terminal_set() with GHOSTTY_TERMINAL_OPT_WRITE_PTY to install
+ * a callback that receives response data.
  *
  * This never fails. Any erroneous input or errors in processing the
  * input are logged internally but do not cause this function to fail
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 81375ec8a..0a749be87 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -206,6 +206,7 @@ comptime {
         @export(&c.terminal_free, .{ .name = "ghostty_terminal_free" });
         @export(&c.terminal_reset, .{ .name = "ghostty_terminal_reset" });
         @export(&c.terminal_resize, .{ .name = "ghostty_terminal_resize" });
+        @export(&c.terminal_set, .{ .name = "ghostty_terminal_set" });
         @export(&c.terminal_vt_write, .{ .name = "ghostty_terminal_vt_write" });
         @export(&c.terminal_scroll_viewport, .{ .name = "ghostty_terminal_scroll_viewport" });
         @export(&c.terminal_mode_get, .{ .name = "ghostty_terminal_mode_get" });
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index 7597228d1..d854ac60e 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -132,6 +132,7 @@ pub const terminal_new = terminal.new;
 pub const terminal_free = terminal.free;
 pub const terminal_reset = terminal.reset;
 pub const terminal_resize = terminal.resize;
+pub const terminal_set = terminal.set;
 pub const terminal_vt_write = terminal.vt_write;
 pub const terminal_scroll_viewport = terminal.scroll_viewport;
 pub const terminal_mode_get = terminal.mode_get;
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index bebcf4ea1..70997cc08 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -16,14 +16,35 @@ const grid_ref_c = @import("grid_ref.zig");
 const style_c = @import("style.zig");
 const Result = @import("result.zig").Result;
 
+const Handler = @import("../stream_terminal.zig").Handler;
+
 const log = std.log.scoped(.terminal_c);
 
+/// C function pointer type for the write_pty callback.
+pub const CWritePtyFn = *const fn (Terminal, ?*anyopaque, [*]const u8, usize) callconv(.c) void;
+
 /// Wrapper around ZigTerminal that tracks additional state for C API usage,
 /// such as the persistent VT stream needed to handle escape sequences split
 /// across multiple vt_write calls.
 const TerminalWrapper = struct {
     terminal: *ZigTerminal,
     stream: Stream,
+    effects: Effects = .{},
+};
+
+/// C callback state for terminal effects. Trampolines are always
+/// installed on the stream handler; they check these fields and
+/// no-op when the corresponding callback is null.
+const Effects = struct {
+    userdata: ?*anyopaque = null,
+    write_pty: ?CWritePtyFn = null,
+
+    fn writePtyTrampoline(handler: *Handler, data: [:0]const u8) void {
+        const stream_ptr: *Stream = @fieldParentPtr("handler", handler);
+        const wrapper: *TerminalWrapper = @fieldParentPtr("stream", stream_ptr);
+        const func = wrapper.effects.write_pty orelse return;
+        func(@ptrCast(wrapper), wrapper.effects.userdata, data.ptr, data.len);
+    }
 };
 
 /// C: GhosttyTerminal
@@ -80,8 +101,10 @@ fn new_(
     });
     errdefer t.deinit(alloc);
 
-    // Setup our stream
-    const handler: Stream.Handler = t.vtHandler();
+    // Setup our stream with trampolines always installed so that
+    // setting C callbacks at any time takes effect immediately.
+    var handler: Stream.Handler = t.vtHandler();
+    handler.effects.write_pty = &Effects.writePtyTrampoline;
 
     wrapper.* = .{
         .terminal = t,
@@ -100,6 +123,53 @@ pub fn vt_write(
     wrapper.stream.nextSlice(ptr[0..len]);
 }
 
+/// C: GhosttyTerminalOption
+pub const Option = enum(c_int) {
+    userdata = 0,
+    write_pty = 1,
+
+    /// Input type expected for setting the option.
+    pub fn InType(comptime self: Option) type {
+        return switch (self) {
+            .userdata => ?*anyopaque,
+            .write_pty => ?CWritePtyFn,
+        };
+    }
+};
+
+pub fn set(
+    terminal_: Terminal,
+    option: Option,
+    value: ?*const anyopaque,
+) callconv(.c) void {
+    if (comptime std.debug.runtime_safety) {
+        _ = std.meta.intToEnum(Option, @intFromEnum(option)) catch {
+            log.warn("terminal_set invalid option value={d}", .{@intFromEnum(option)});
+            return;
+        };
+    }
+
+    return switch (option) {
+        inline else => |comptime_option| setTyped(
+            terminal_,
+            comptime_option,
+            @ptrCast(@alignCast(value)),
+        ),
+    };
+}
+
+fn setTyped(
+    terminal_: Terminal,
+    comptime option: Option,
+    value: ?*const option.InType(),
+) void {
+    const wrapper = terminal_ orelse return;
+    switch (option) {
+        .userdata => wrapper.effects.userdata = if (value) |v| v.* else null,
+        .write_pty => wrapper.effects.write_pty = if (value) |v| v.* else null,
+    }
+}
+
 /// C: GhosttyTerminalScrollViewport
 pub const ScrollViewport = ZigTerminal.ScrollViewport.C;
 

From b49e9f37ff71cc007dafa592c5d7385d70a2dab1 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 06:56:51 -0700
Subject: [PATCH 367/391] vt: add bell effect callback and move types into
 Effects

Add GHOSTTY_TERMINAL_OPT_BELL so C consumers can receive bell
notifications during VT processing. The bell trampoline follows
the same pattern as write_pty.

Move the C function pointer typedefs (WritePtyFn, BellFn) into
the Effects struct namespace to keep callback types co-located
with their storage and trampolines.
---
 include/ghostty/vt/terminal.h | 21 +++++++++++++++++++++
 src/terminal/c/terminal.zig   | 25 ++++++++++++++++++++-----
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 064ee81dd..c7990336b 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -154,6 +154,19 @@ typedef void (*GhosttyTerminalWritePtyFn)(GhosttyTerminal terminal,
                                           const uint8_t* data,
                                           size_t len);
 
+/**
+ * Callback function type for bell.
+ *
+ * Called when the terminal receives a BEL character (0x07).
+ *
+ * @param terminal The terminal handle
+ * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
+ *
+ * @ingroup terminal
+ */
+typedef void (*GhosttyTerminalBellFn)(GhosttyTerminal terminal,
+                                      void* userdata);
+
 /**
  * Terminal option identifiers.
  *
@@ -178,6 +191,14 @@ typedef enum {
    * Input type: GhosttyTerminalWritePtyFn*
    */
   GHOSTTY_TERMINAL_OPT_WRITE_PTY = 1,
+
+  /**
+   * Callback invoked when the terminal receives a BEL character
+   * (0x07). Set to NULL to ignore bell events.
+   *
+   * Input type: GhosttyTerminalBellFn*
+   */
+  GHOSTTY_TERMINAL_OPT_BELL = 2,
 } GhosttyTerminalOption;
 
 /**
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 70997cc08..10e5a2960 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -20,9 +20,6 @@ const Handler = @import("../stream_terminal.zig").Handler;
 
 const log = std.log.scoped(.terminal_c);
 
-/// C function pointer type for the write_pty callback.
-pub const CWritePtyFn = *const fn (Terminal, ?*anyopaque, [*]const u8, usize) callconv(.c) void;
-
 /// Wrapper around ZigTerminal that tracks additional state for C API usage,
 /// such as the persistent VT stream needed to handle escape sequences split
 /// across multiple vt_write calls.
@@ -37,7 +34,14 @@ const TerminalWrapper = struct {
 /// no-op when the corresponding callback is null.
 const Effects = struct {
     userdata: ?*anyopaque = null,
-    write_pty: ?CWritePtyFn = null,
+    write_pty: ?WritePtyFn = null,
+    bell: ?BellFn = null,
+
+    /// C function pointer type for the write_pty callback.
+    pub const WritePtyFn = *const fn (Terminal, ?*anyopaque, [*]const u8, usize) callconv(.c) void;
+
+    /// C function pointer type for the bell callback.
+    pub const BellFn = *const fn (Terminal, ?*anyopaque) callconv(.c) void;
 
     fn writePtyTrampoline(handler: *Handler, data: [:0]const u8) void {
         const stream_ptr: *Stream = @fieldParentPtr("handler", handler);
@@ -45,6 +49,13 @@ const Effects = struct {
         const func = wrapper.effects.write_pty orelse return;
         func(@ptrCast(wrapper), wrapper.effects.userdata, data.ptr, data.len);
     }
+
+    fn bellTrampoline(handler: *Handler) void {
+        const stream_ptr: *Stream = @fieldParentPtr("handler", handler);
+        const wrapper: *TerminalWrapper = @fieldParentPtr("stream", stream_ptr);
+        const func = wrapper.effects.bell orelse return;
+        func(@ptrCast(wrapper), wrapper.effects.userdata);
+    }
 };
 
 /// C: GhosttyTerminal
@@ -105,6 +116,7 @@ fn new_(
     // setting C callbacks at any time takes effect immediately.
     var handler: Stream.Handler = t.vtHandler();
     handler.effects.write_pty = &Effects.writePtyTrampoline;
+    handler.effects.bell = &Effects.bellTrampoline;
 
     wrapper.* = .{
         .terminal = t,
@@ -127,12 +139,14 @@ pub fn vt_write(
 pub const Option = enum(c_int) {
     userdata = 0,
     write_pty = 1,
+    bell = 2,
 
     /// Input type expected for setting the option.
     pub fn InType(comptime self: Option) type {
         return switch (self) {
             .userdata => ?*anyopaque,
-            .write_pty => ?CWritePtyFn,
+            .write_pty => ?Effects.WritePtyFn,
+            .bell => ?Effects.BellFn,
         };
     }
 };
@@ -167,6 +181,7 @@ fn setTyped(
     switch (option) {
         .userdata => wrapper.effects.userdata = if (value) |v| v.* else null,
         .write_pty => wrapper.effects.write_pty = if (value) |v| v.* else null,
+        .bell => wrapper.effects.bell = if (value) |v| v.* else null,
     }
 }
 

From c13a9bb49ced768d7da3f6aff2e6d31fbed4641e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 06:58:17 -0700
Subject: [PATCH 368/391] vt: add tests for write_pty and bell effect callbacks

Test that the write_pty callback receives correct DECRQM response
data and userdata, that queries are silently ignored without a
callback, and that setting null clears the callback. Test that
the bell callback fires on single and multiple BEL characters
with correct userdata, and that BEL without a callback is safe.
---
 src/terminal/c/terminal.zig | 151 ++++++++++++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)

diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 10e5a2960..7a214d5b7 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -864,6 +864,157 @@ test "grid_ref null terminal" {
     }, &out_ref));
 }
 
+test "set write_pty callback" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const S = struct {
+        var last_data: ?[]u8 = null;
+        var last_userdata: ?*anyopaque = null;
+
+        fn deinit() void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = null;
+            last_userdata = null;
+        }
+
+        fn writePty(_: Terminal, ud: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
+            last_userdata = ud;
+        }
+    };
+    defer S.deinit();
+
+    // Set userdata and write_pty callback
+    var sentinel: u8 = 42;
+    const ud: ?*anyopaque = @ptrCast(&sentinel);
+    set(t, .userdata, @ptrCast(&ud));
+    const cb: ?Effects.WritePtyFn = &S.writePty;
+    set(t, .write_pty, @ptrCast(&cb));
+
+    // DECRQM for wraparound mode (mode 7, set by default) should trigger write_pty
+    vt_write(t, "\x1B[?7$p", 6);
+    try testing.expect(S.last_data != null);
+    try testing.expectEqualStrings("\x1B[?7;1$y", S.last_data.?);
+    try testing.expectEqual(@as(?*anyopaque, @ptrCast(&sentinel)), S.last_userdata);
+}
+
+test "set write_pty without callback ignores queries" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    // Without setting a callback, DECRQM should be silently ignored (no crash)
+    vt_write(t, "\x1B[?7$p", 6);
+}
+
+test "set write_pty null clears callback" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const S = struct {
+        var called: bool = false;
+        fn writePty(_: Terminal, _: ?*anyopaque, _: [*]const u8, _: usize) callconv(.c) void {
+            called = true;
+        }
+    };
+    S.called = false;
+
+    // Set then clear the callback
+    const cb: ?Effects.WritePtyFn = &S.writePty;
+    set(t, .write_pty, @ptrCast(&cb));
+    set(t, .write_pty, null);
+
+    vt_write(t, "\x1B[?7$p", 6);
+    try testing.expect(!S.called);
+}
+
+test "set bell callback" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const S = struct {
+        var bell_count: usize = 0;
+        var last_userdata: ?*anyopaque = null;
+
+        fn bell(_: Terminal, ud: ?*anyopaque) callconv(.c) void {
+            bell_count += 1;
+            last_userdata = ud;
+        }
+    };
+    S.bell_count = 0;
+    S.last_userdata = null;
+
+    // Set userdata and bell callback
+    var sentinel: u8 = 99;
+    const ud: ?*anyopaque = @ptrCast(&sentinel);
+    set(t, .userdata, @ptrCast(&ud));
+    const cb: ?Effects.BellFn = &S.bell;
+    set(t, .bell, @ptrCast(&cb));
+
+    // Single BEL
+    vt_write(t, "\x07", 1);
+    try testing.expectEqual(@as(usize, 1), S.bell_count);
+    try testing.expectEqual(@as(?*anyopaque, @ptrCast(&sentinel)), S.last_userdata);
+
+    // Multiple BELs
+    vt_write(t, "\x07\x07", 2);
+    try testing.expectEqual(@as(usize, 3), S.bell_count);
+}
+
+test "bell without callback is silent" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    // BEL without a callback should not crash
+    vt_write(t, "\x07", 1);
+}
+
 test "grid_ref out of bounds" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(

From f9c34b40f067cb40d63ce78aac00ead3ec77fabb Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 07:03:29 -0700
Subject: [PATCH 369/391] vt: add enquiry and xtversion effect callbacks

Add GHOSTTY_TERMINAL_OPT_ENQUIRY and GHOSTTY_TERMINAL_OPT_XTVERSION
so C consumers can respond to ENQ (0x05) and XTVERSION (CSI > q)
queries. Both callbacks return a GhosttyString rather than using
out-pointers.

Introduce GhosttyString in types.h as a borrowed byte string
(ptr + len) backed by lib.String on the Zig side. This will be
reusable for future callbacks that need to return string data.

Without an xtversion callback the trampoline returns an empty
string, which causes the handler to report the default
"libghostty" version. Without an enquiry callback no response
is sent.
---
 include/ghostty/vt/terminal.h |  50 ++++++++++
 include/ghostty/vt/types.h    |  17 ++++
 src/terminal/c/terminal.zig   | 183 ++++++++++++++++++++++++++++++++++
 3 files changed, 250 insertions(+)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index c7990336b..32956d6a3 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -167,6 +167,40 @@ typedef void (*GhosttyTerminalWritePtyFn)(GhosttyTerminal terminal,
 typedef void (*GhosttyTerminalBellFn)(GhosttyTerminal terminal,
                                       void* userdata);
 
+/**
+ * Callback function type for enquiry (ENQ, 0x05).
+ *
+ * Called when the terminal receives an ENQ character. Return the
+ * response bytes as a GhosttyString. The memory must remain valid
+ * until the callback returns. Return a zero-length string to send
+ * no response.
+ *
+ * @param terminal The terminal handle
+ * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
+ * @return The response bytes to write back to the pty
+ *
+ * @ingroup terminal
+ */
+typedef GhosttyString (*GhosttyTerminalEnquiryFn)(GhosttyTerminal terminal,
+                                                   void* userdata);
+
+/**
+ * Callback function type for XTVERSION.
+ *
+ * Called when the terminal receives an XTVERSION query (CSI > q).
+ * Return the version string (e.g. "myterm 1.0") as a GhosttyString.
+ * The memory must remain valid until the callback returns. Return a
+ * zero-length string to report the default "libghostty" version.
+ *
+ * @param terminal The terminal handle
+ * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
+ * @return The version string to report
+ *
+ * @ingroup terminal
+ */
+typedef GhosttyString (*GhosttyTerminalXtversionFn)(GhosttyTerminal terminal,
+                                                     void* userdata);
+
 /**
  * Terminal option identifiers.
  *
@@ -199,6 +233,22 @@ typedef enum {
    * Input type: GhosttyTerminalBellFn*
    */
   GHOSTTY_TERMINAL_OPT_BELL = 2,
+
+  /**
+   * Callback invoked when the terminal receives an ENQ character
+   * (0x05). Set to NULL to send no response.
+   *
+   * Input type: GhosttyTerminalEnquiryFn*
+   */
+  GHOSTTY_TERMINAL_OPT_ENQUIRY = 3,
+
+  /**
+   * Callback invoked when the terminal receives an XTVERSION query
+   * (CSI > q). Set to NULL to report the default "libghostty" string.
+   *
+   * Input type: GhosttyTerminalXtversionFn*
+   */
+  GHOSTTY_TERMINAL_OPT_XTVERSION = 4,
 } GhosttyTerminalOption;
 
 /**
diff --git a/include/ghostty/vt/types.h b/include/ghostty/vt/types.h
index 12ace266e..b5b0fa651 100644
--- a/include/ghostty/vt/types.h
+++ b/include/ghostty/vt/types.h
@@ -7,6 +7,9 @@
 #ifndef GHOSTTY_VT_TYPES_H
 #define GHOSTTY_VT_TYPES_H
 
+#include <stddef.h>
+#include <stdint.h>
+
 /**
  * Result codes for libghostty-vt operations.
  */
@@ -21,6 +24,20 @@ typedef enum {
     GHOSTTY_OUT_OF_SPACE = -3,
 } GhosttyResult;
 
+/**
+ * A borrowed byte string (pointer + length).
+ *
+ * The memory is not owned by this struct. The pointer is only valid
+ * for the lifetime documented by the API that produces or consumes it.
+ */
+typedef struct {
+  /** Pointer to the string bytes. */
+  const uint8_t* ptr;
+
+  /** Length of the string in bytes. */
+  size_t len;
+} GhosttyString;
+
 /**
  * Initialize a sized struct to zero and set its size field.
  *
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 7a214d5b7..0dc0b0d6e 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -1,5 +1,6 @@
 const std = @import("std");
 const testing = std.testing;
+const lib = @import("../../lib/main.zig");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const ZigTerminal = @import("../Terminal.zig");
@@ -36,6 +37,8 @@ const Effects = struct {
     userdata: ?*anyopaque = null,
     write_pty: ?WritePtyFn = null,
     bell: ?BellFn = null,
+    enquiry: ?EnquiryFn = null,
+    xtversion: ?XtversionFn = null,
 
     /// C function pointer type for the write_pty callback.
     pub const WritePtyFn = *const fn (Terminal, ?*anyopaque, [*]const u8, usize) callconv(.c) void;
@@ -43,6 +46,17 @@ const Effects = struct {
     /// C function pointer type for the bell callback.
     pub const BellFn = *const fn (Terminal, ?*anyopaque) callconv(.c) void;
 
+    /// C function pointer type for the enquiry callback.
+    /// Returns the response bytes. The memory must remain valid
+    /// until the callback returns.
+    pub const EnquiryFn = *const fn (Terminal, ?*anyopaque) callconv(.c) lib.String;
+
+    /// C function pointer type for the xtversion callback.
+    /// Returns the version string (e.g. "ghostty 1.2.3"). The memory
+    /// must remain valid until the callback returns. An empty string
+    /// (len=0) causes the default "libghostty" to be reported.
+    pub const XtversionFn = *const fn (Terminal, ?*anyopaque) callconv(.c) lib.String;
+
     fn writePtyTrampoline(handler: *Handler, data: [:0]const u8) void {
         const stream_ptr: *Stream = @fieldParentPtr("handler", handler);
         const wrapper: *TerminalWrapper = @fieldParentPtr("stream", stream_ptr);
@@ -56,6 +70,24 @@ const Effects = struct {
         const func = wrapper.effects.bell orelse return;
         func(@ptrCast(wrapper), wrapper.effects.userdata);
     }
+
+    fn enquiryTrampoline(handler: *Handler) []const u8 {
+        const stream_ptr: *Stream = @fieldParentPtr("handler", handler);
+        const wrapper: *TerminalWrapper = @fieldParentPtr("stream", stream_ptr);
+        const func = wrapper.effects.enquiry orelse return "";
+        const result = func(@ptrCast(wrapper), wrapper.effects.userdata);
+        if (result.len == 0) return "";
+        return result.ptr[0..result.len];
+    }
+
+    fn xtversionTrampoline(handler: *Handler) []const u8 {
+        const stream_ptr: *Stream = @fieldParentPtr("handler", handler);
+        const wrapper: *TerminalWrapper = @fieldParentPtr("stream", stream_ptr);
+        const func = wrapper.effects.xtversion orelse return "";
+        const result = func(@ptrCast(wrapper), wrapper.effects.userdata);
+        if (result.len == 0) return "";
+        return result.ptr[0..result.len];
+    }
 };
 
 /// C: GhosttyTerminal
@@ -117,6 +149,8 @@ fn new_(
     var handler: Stream.Handler = t.vtHandler();
     handler.effects.write_pty = &Effects.writePtyTrampoline;
     handler.effects.bell = &Effects.bellTrampoline;
+    handler.effects.enquiry = &Effects.enquiryTrampoline;
+    handler.effects.xtversion = &Effects.xtversionTrampoline;
 
     wrapper.* = .{
         .terminal = t,
@@ -140,6 +174,8 @@ pub const Option = enum(c_int) {
     userdata = 0,
     write_pty = 1,
     bell = 2,
+    enquiry = 3,
+    xtversion = 4,
 
     /// Input type expected for setting the option.
     pub fn InType(comptime self: Option) type {
@@ -147,6 +183,8 @@ pub const Option = enum(c_int) {
             .userdata => ?*anyopaque,
             .write_pty => ?Effects.WritePtyFn,
             .bell => ?Effects.BellFn,
+            .enquiry => ?Effects.EnquiryFn,
+            .xtversion => ?Effects.XtversionFn,
         };
     }
 };
@@ -182,6 +220,8 @@ fn setTyped(
         .userdata => wrapper.effects.userdata = if (value) |v| v.* else null,
         .write_pty => wrapper.effects.write_pty = if (value) |v| v.* else null,
         .bell => wrapper.effects.bell = if (value) |v| v.* else null,
+        .enquiry => wrapper.effects.enquiry = if (value) |v| v.* else null,
+        .xtversion => wrapper.effects.xtversion = if (value) |v| v.* else null,
     }
 }
 
@@ -1015,6 +1055,149 @@ test "bell without callback is silent" {
     vt_write(t, "\x07", 1);
 }
 
+test "set enquiry callback" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const S = struct {
+        var last_data: ?[]u8 = null;
+
+        fn deinit() void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = null;
+        }
+
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
+        }
+
+        const response = "OK";
+        fn enquiry(_: Terminal, _: ?*anyopaque) callconv(.c) lib.String {
+            return .{ .ptr = response, .len = response.len };
+        }
+    };
+    defer S.deinit();
+
+    const write_cb: ?Effects.WritePtyFn = &S.writePty;
+    set(t, .write_pty, @ptrCast(&write_cb));
+    const enq_cb: ?Effects.EnquiryFn = &S.enquiry;
+    set(t, .enquiry, @ptrCast(&enq_cb));
+
+    // ENQ (0x05) should trigger the enquiry callback and write response via write_pty
+    vt_write(t, "\x05", 1);
+    try testing.expect(S.last_data != null);
+    try testing.expectEqualStrings("OK", S.last_data.?);
+}
+
+test "enquiry without callback is silent" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    // ENQ without a callback should not crash
+    vt_write(t, "\x05", 1);
+}
+
+test "set xtversion callback" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const S = struct {
+        var last_data: ?[]u8 = null;
+
+        fn deinit() void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = null;
+        }
+
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
+        }
+
+        const version = "myterm 1.0";
+        fn xtversion(_: Terminal, _: ?*anyopaque) callconv(.c) lib.String {
+            return .{ .ptr = version, .len = version.len };
+        }
+    };
+    defer S.deinit();
+
+    const write_cb: ?Effects.WritePtyFn = &S.writePty;
+    set(t, .write_pty, @ptrCast(&write_cb));
+    const xtv_cb: ?Effects.XtversionFn = &S.xtversion;
+    set(t, .xtversion, @ptrCast(&xtv_cb));
+
+    // XTVERSION: CSI > q
+    vt_write(t, "\x1B[>q", 4);
+    try testing.expect(S.last_data != null);
+    // Response should be DCS >| version ST
+    try testing.expectEqualStrings("\x1BP>|myterm 1.0\x1B\\", S.last_data.?);
+}
+
+test "xtversion without callback reports default" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const S = struct {
+        var last_data: ?[]u8 = null;
+
+        fn deinit() void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = null;
+        }
+
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
+        }
+    };
+    defer S.deinit();
+
+    // Set write_pty but not xtversion — should get default "libghostty"
+    const write_cb: ?Effects.WritePtyFn = &S.writePty;
+    set(t, .write_pty, @ptrCast(&write_cb));
+
+    vt_write(t, "\x1B[>q", 4);
+    try testing.expect(S.last_data != null);
+    try testing.expectEqualStrings("\x1BP>|libghostty\x1B\\", S.last_data.?);
+}
+
 test "grid_ref out of bounds" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(

From 6f18d44ed69a5194a74ab72b6d86aaaf545f1dd6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 07:06:09 -0700
Subject: [PATCH 370/391] vt: add title_changed effect callback

Add GHOSTTY_TERMINAL_OPT_TITLE_CHANGED so C consumers are notified
when the terminal title changes via OSC 0 or OSC 2 sequences. The
callback has the same fire-and-forget shape as bell.
---
 include/ghostty/vt/terminal.h | 24 ++++++++++++
 src/terminal/c/terminal.zig   | 73 +++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 32956d6a3..42141172d 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -201,6 +201,21 @@ typedef GhosttyString (*GhosttyTerminalEnquiryFn)(GhosttyTerminal terminal,
 typedef GhosttyString (*GhosttyTerminalXtversionFn)(GhosttyTerminal terminal,
                                                      void* userdata);
 
+/**
+ * Callback function type for title_changed.
+ *
+ * Called when the terminal title changes via escape sequences
+ * (e.g. OSC 0 or OSC 2). The new title can be queried from the
+ * terminal after the callback returns.
+ *
+ * @param terminal The terminal handle
+ * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
+ *
+ * @ingroup terminal
+ */
+typedef void (*GhosttyTerminalTitleChangedFn)(GhosttyTerminal terminal,
+                                              void* userdata);
+
 /**
  * Terminal option identifiers.
  *
@@ -249,6 +264,15 @@ typedef enum {
    * Input type: GhosttyTerminalXtversionFn*
    */
   GHOSTTY_TERMINAL_OPT_XTVERSION = 4,
+
+  /**
+   * Callback invoked when the terminal title changes via escape
+   * sequences (e.g. OSC 0 or OSC 2). Set to NULL to ignore title
+   * change events.
+   *
+   * Input type: GhosttyTerminalTitleChangedFn*
+   */
+  GHOSTTY_TERMINAL_OPT_TITLE_CHANGED = 5,
 } GhosttyTerminalOption;
 
 /**
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 0dc0b0d6e..7e457e1e4 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -39,6 +39,7 @@ const Effects = struct {
     bell: ?BellFn = null,
     enquiry: ?EnquiryFn = null,
     xtversion: ?XtversionFn = null,
+    title_changed: ?TitleChangedFn = null,
 
     /// C function pointer type for the write_pty callback.
     pub const WritePtyFn = *const fn (Terminal, ?*anyopaque, [*]const u8, usize) callconv(.c) void;
@@ -57,6 +58,9 @@ const Effects = struct {
     /// (len=0) causes the default "libghostty" to be reported.
     pub const XtversionFn = *const fn (Terminal, ?*anyopaque) callconv(.c) lib.String;
 
+    /// C function pointer type for the title_changed callback.
+    pub const TitleChangedFn = *const fn (Terminal, ?*anyopaque) callconv(.c) void;
+
     fn writePtyTrampoline(handler: *Handler, data: [:0]const u8) void {
         const stream_ptr: *Stream = @fieldParentPtr("handler", handler);
         const wrapper: *TerminalWrapper = @fieldParentPtr("stream", stream_ptr);
@@ -88,6 +92,13 @@ const Effects = struct {
         if (result.len == 0) return "";
         return result.ptr[0..result.len];
     }
+
+    fn titleChangedTrampoline(handler: *Handler) void {
+        const stream_ptr: *Stream = @fieldParentPtr("handler", handler);
+        const wrapper: *TerminalWrapper = @fieldParentPtr("stream", stream_ptr);
+        const func = wrapper.effects.title_changed orelse return;
+        func(@ptrCast(wrapper), wrapper.effects.userdata);
+    }
 };
 
 /// C: GhosttyTerminal
@@ -151,6 +162,7 @@ fn new_(
     handler.effects.bell = &Effects.bellTrampoline;
     handler.effects.enquiry = &Effects.enquiryTrampoline;
     handler.effects.xtversion = &Effects.xtversionTrampoline;
+    handler.effects.title_changed = &Effects.titleChangedTrampoline;
 
     wrapper.* = .{
         .terminal = t,
@@ -176,6 +188,7 @@ pub const Option = enum(c_int) {
     bell = 2,
     enquiry = 3,
     xtversion = 4,
+    title_changed = 5,
 
     /// Input type expected for setting the option.
     pub fn InType(comptime self: Option) type {
@@ -185,6 +198,7 @@ pub const Option = enum(c_int) {
             .bell => ?Effects.BellFn,
             .enquiry => ?Effects.EnquiryFn,
             .xtversion => ?Effects.XtversionFn,
+            .title_changed => ?Effects.TitleChangedFn,
         };
     }
 };
@@ -222,6 +236,7 @@ fn setTyped(
         .bell => wrapper.effects.bell = if (value) |v| v.* else null,
         .enquiry => wrapper.effects.enquiry = if (value) |v| v.* else null,
         .xtversion => wrapper.effects.xtversion = if (value) |v| v.* else null,
+        .title_changed => wrapper.effects.title_changed = if (value) |v| v.* else null,
     }
 }
 
@@ -1198,6 +1213,64 @@ test "xtversion without callback reports default" {
     try testing.expectEqualStrings("\x1BP>|libghostty\x1B\\", S.last_data.?);
 }
 
+test "set title_changed callback" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const S = struct {
+        var title_count: usize = 0;
+        var last_userdata: ?*anyopaque = null;
+
+        fn titleChanged(_: Terminal, ud: ?*anyopaque) callconv(.c) void {
+            title_count += 1;
+            last_userdata = ud;
+        }
+    };
+    S.title_count = 0;
+    S.last_userdata = null;
+
+    var sentinel: u8 = 77;
+    const ud: ?*anyopaque = @ptrCast(&sentinel);
+    set(t, .userdata, @ptrCast(&ud));
+    const cb: ?Effects.TitleChangedFn = &S.titleChanged;
+    set(t, .title_changed, @ptrCast(&cb));
+
+    // OSC 2 ; title ST — set window title
+    vt_write(t, "\x1B]2;Hello\x1B\\", 10);
+    try testing.expectEqual(@as(usize, 1), S.title_count);
+    try testing.expectEqual(@as(?*anyopaque, @ptrCast(&sentinel)), S.last_userdata);
+
+    // Another title change
+    vt_write(t, "\x1B]2;World\x1B\\", 10);
+    try testing.expectEqual(@as(usize, 2), S.title_count);
+}
+
+test "title_changed without callback is silent" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    // OSC 2 without a callback should not crash
+    vt_write(t, "\x1B]2;Hello\x1B\\", 10);
+}
+
 test "grid_ref out of bounds" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(

From 424e9b57cabb1e6040167df561e03335cb2714df Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 07:09:50 -0700
Subject: [PATCH 371/391] vt: add size effect callback for XTWINOPS queries

Add GHOSTTY_TERMINAL_OPT_SIZE so C consumers can respond to
XTWINOPS size queries (CSI 14/16/18 t). The callback receives a
GhosttySizeReportSize out-pointer and returns true if the size is
available, or false to silently ignore the query. The trampoline
converts the bool + out-pointer pattern to the optional that the
Zig handler expects.
---
 include/ghostty/vt/terminal.h | 27 +++++++++++
 src/terminal/c/terminal.zig   | 86 +++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 42141172d..c4d7f19e5 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -13,6 +13,7 @@
 #include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
 #include <ghostty/vt/modes.h>
+#include <ghostty/vt/size_report.h>
 #include <ghostty/vt/grid_ref.h>
 #include <ghostty/vt/screen.h>
 #include <ghostty/vt/point.h>
@@ -216,6 +217,24 @@ typedef GhosttyString (*GhosttyTerminalXtversionFn)(GhosttyTerminal terminal,
 typedef void (*GhosttyTerminalTitleChangedFn)(GhosttyTerminal terminal,
                                               void* userdata);
 
+/**
+ * Callback function type for size queries (XTWINOPS).
+ *
+ * Called in response to XTWINOPS size queries (CSI 14/16/18 t).
+ * Return true and fill *out_size with the current terminal geometry,
+ * or return false to silently ignore the query.
+ *
+ * @param terminal The terminal handle
+ * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
+ * @param[out] out_size Pointer to store the terminal size information
+ * @return true if size was filled, false to ignore the query
+ *
+ * @ingroup terminal
+ */
+typedef bool (*GhosttyTerminalSizeFn)(GhosttyTerminal terminal,
+                                      void* userdata,
+                                      GhosttySizeReportSize* out_size);
+
 /**
  * Terminal option identifiers.
  *
@@ -273,6 +292,14 @@ typedef enum {
    * Input type: GhosttyTerminalTitleChangedFn*
    */
   GHOSTTY_TERMINAL_OPT_TITLE_CHANGED = 5,
+
+  /**
+   * Callback invoked in response to XTWINOPS size queries
+   * (CSI 14/16/18 t). Set to NULL to silently ignore size queries.
+   *
+   * Input type: GhosttyTerminalSizeFn*
+   */
+  GHOSTTY_TERMINAL_OPT_SIZE = 6,
 } GhosttyTerminalOption;
 
 /**
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 7e457e1e4..ccbf1daf1 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -11,6 +11,7 @@ const kitty = @import("../kitty/key.zig");
 const modes = @import("../modes.zig");
 const point = @import("../point.zig");
 const size = @import("../size.zig");
+const size_report = @import("../size_report.zig");
 const cell_c = @import("cell.zig");
 const row_c = @import("row.zig");
 const grid_ref_c = @import("grid_ref.zig");
@@ -40,6 +41,7 @@ const Effects = struct {
     enquiry: ?EnquiryFn = null,
     xtversion: ?XtversionFn = null,
     title_changed: ?TitleChangedFn = null,
+    size_cb: ?SizeFn = null,
 
     /// C function pointer type for the write_pty callback.
     pub const WritePtyFn = *const fn (Terminal, ?*anyopaque, [*]const u8, usize) callconv(.c) void;
@@ -61,6 +63,11 @@ const Effects = struct {
     /// C function pointer type for the title_changed callback.
     pub const TitleChangedFn = *const fn (Terminal, ?*anyopaque) callconv(.c) void;
 
+    /// C function pointer type for the size callback.
+    /// Returns true and fills out_size if size is available,
+    /// or returns false to silently ignore the query.
+    pub const SizeFn = *const fn (Terminal, ?*anyopaque, *size_report.Size) callconv(.c) bool;
+
     fn writePtyTrampoline(handler: *Handler, data: [:0]const u8) void {
         const stream_ptr: *Stream = @fieldParentPtr("handler", handler);
         const wrapper: *TerminalWrapper = @fieldParentPtr("stream", stream_ptr);
@@ -99,6 +106,15 @@ const Effects = struct {
         const func = wrapper.effects.title_changed orelse return;
         func(@ptrCast(wrapper), wrapper.effects.userdata);
     }
+
+    fn sizeTrampoline(handler: *Handler) ?size_report.Size {
+        const stream_ptr: *Stream = @fieldParentPtr("handler", handler);
+        const wrapper: *TerminalWrapper = @fieldParentPtr("stream", stream_ptr);
+        const func = wrapper.effects.size_cb orelse return null;
+        var s: size_report.Size = undefined;
+        if (func(@ptrCast(wrapper), wrapper.effects.userdata, &s)) return s;
+        return null;
+    }
 };
 
 /// C: GhosttyTerminal
@@ -163,6 +179,7 @@ fn new_(
     handler.effects.enquiry = &Effects.enquiryTrampoline;
     handler.effects.xtversion = &Effects.xtversionTrampoline;
     handler.effects.title_changed = &Effects.titleChangedTrampoline;
+    handler.effects.size = &Effects.sizeTrampoline;
 
     wrapper.* = .{
         .terminal = t,
@@ -189,6 +206,7 @@ pub const Option = enum(c_int) {
     enquiry = 3,
     xtversion = 4,
     title_changed = 5,
+    size_cb = 6,
 
     /// Input type expected for setting the option.
     pub fn InType(comptime self: Option) type {
@@ -199,6 +217,7 @@ pub const Option = enum(c_int) {
             .enquiry => ?Effects.EnquiryFn,
             .xtversion => ?Effects.XtversionFn,
             .title_changed => ?Effects.TitleChangedFn,
+            .size_cb => ?Effects.SizeFn,
         };
     }
 };
@@ -237,6 +256,7 @@ fn setTyped(
         .enquiry => wrapper.effects.enquiry = if (value) |v| v.* else null,
         .xtversion => wrapper.effects.xtversion = if (value) |v| v.* else null,
         .title_changed => wrapper.effects.title_changed = if (value) |v| v.* else null,
+        .size_cb => wrapper.effects.size_cb = if (value) |v| v.* else null,
     }
 }
 
@@ -1271,6 +1291,72 @@ test "title_changed without callback is silent" {
     vt_write(t, "\x1B]2;Hello\x1B\\", 10);
 }
 
+test "set size callback" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const S = struct {
+        var last_data: ?[]u8 = null;
+
+        fn deinit() void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = null;
+        }
+
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
+        }
+
+        fn sizeCb(_: Terminal, _: ?*anyopaque, out_size: *size_report.Size) callconv(.c) bool {
+            out_size.* = .{
+                .rows = 24,
+                .columns = 80,
+                .cell_width = 8,
+                .cell_height = 16,
+            };
+            return true;
+        }
+    };
+    defer S.deinit();
+
+    const write_cb: ?Effects.WritePtyFn = &S.writePty;
+    set(t, .write_pty, @ptrCast(&write_cb));
+    const size_cb_fn: ?Effects.SizeFn = &S.sizeCb;
+    set(t, .size_cb, @ptrCast(&size_cb_fn));
+
+    // CSI 18 t — report text area size in characters
+    vt_write(t, "\x1B[18t", 5);
+    try testing.expect(S.last_data != null);
+    try testing.expectEqualStrings("\x1b[8;24;80t", S.last_data.?);
+}
+
+test "size without callback is silent" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    // CSI 18 t without a size callback should not crash
+    vt_write(t, "\x1B[18t", 5);
+}
+
 test "grid_ref out of bounds" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(

From 02d48c360b5c9e837844bac4ad3fdf6c8fa69b5c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 07:20:31 -0700
Subject: [PATCH 372/391] vt: expose color_scheme effect callback

Change device_status.ColorScheme from a plain Zig enum to
lib.Enum so it uses c_int backing when targeting the C ABI.

Add a color_scheme callback to the C terminal effects, following
the bool + out-pointer pattern used by the size callback. The
trampoline converts between the C calling convention and the
internal stream handler color_scheme effect, returning null when
no callback is set.

Add device_status.h header with GhosttyColorScheme enum and wire
it through terminal.h as GHOSTTY_TERMINAL_OPT_COLOR_SCHEME (= 7)
with GhosttyTerminalColorSchemeFn.
---
 include/ghostty/vt.h               |  1 +
 include/ghostty/vt/device_status.h | 28 ++++++++++++++++++++++++++++
 include/ghostty/vt/terminal.h      | 29 +++++++++++++++++++++++++++++
 src/terminal/c/terminal.zig        | 20 ++++++++++++++++++++
 src/terminal/device_status.zig     | 11 +++++++----
 5 files changed, 85 insertions(+), 4 deletions(-)
 create mode 100644 include/ghostty/vt/device_status.h

diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index 55ceb430d..536f27111 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -109,6 +109,7 @@ extern "C" {
 #include <ghostty/vt/allocator.h>
 #include <ghostty/vt/build_info.h>
 #include <ghostty/vt/color.h>
+#include <ghostty/vt/device_status.h>
 #include <ghostty/vt/focus.h>
 #include <ghostty/vt/formatter.h>
 #include <ghostty/vt/render.h>
diff --git a/include/ghostty/vt/device_status.h b/include/ghostty/vt/device_status.h
new file mode 100644
index 000000000..d34b9ec6d
--- /dev/null
+++ b/include/ghostty/vt/device_status.h
@@ -0,0 +1,28 @@
+/**
+ * @file device_status.h
+ *
+ * Device status types used by the terminal.
+ */
+
+#ifndef GHOSTTY_VT_DEVICE_STATUS_H
+#define GHOSTTY_VT_DEVICE_STATUS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Color scheme reported in response to a CSI ? 996 n query.
+ *
+ * @ingroup terminal
+ */
+typedef enum {
+    GHOSTTY_COLOR_SCHEME_LIGHT = 0,
+    GHOSTTY_COLOR_SCHEME_DARK = 1,
+} GhosttyColorScheme;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GHOSTTY_VT_DEVICE_STATUS_H */
diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index c4d7f19e5..a4a921dfe 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -12,6 +12,7 @@
 #include <stdint.h>
 #include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
+#include <ghostty/vt/device_status.h>
 #include <ghostty/vt/modes.h>
 #include <ghostty/vt/size_report.h>
 #include <ghostty/vt/grid_ref.h>
@@ -217,6 +218,24 @@ typedef GhosttyString (*GhosttyTerminalXtversionFn)(GhosttyTerminal terminal,
 typedef void (*GhosttyTerminalTitleChangedFn)(GhosttyTerminal terminal,
                                               void* userdata);
 
+/**
+ * Callback function type for color scheme queries (CSI ? 996 n).
+ *
+ * Called when the terminal receives a color scheme device status report
+ * query. Return true and fill *out_scheme with the current color scheme,
+ * or return false to silently ignore the query.
+ *
+ * @param terminal The terminal handle
+ * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
+ * @param[out] out_scheme Pointer to store the current color scheme
+ * @return true if the color scheme was filled, false to ignore the query
+ *
+ * @ingroup terminal
+ */
+typedef bool (*GhosttyTerminalColorSchemeFn)(GhosttyTerminal terminal,
+                                             void* userdata,
+                                             GhosttyColorScheme* out_scheme);
+
 /**
  * Callback function type for size queries (XTWINOPS).
  *
@@ -300,6 +319,16 @@ typedef enum {
    * Input type: GhosttyTerminalSizeFn*
    */
   GHOSTTY_TERMINAL_OPT_SIZE = 6,
+
+  /**
+   * Callback invoked in response to a color scheme device status
+   * report query (CSI ? 996 n). Return true and fill the out pointer
+   * to report the current scheme, or return false to silently ignore.
+   * Set to NULL to ignore color scheme queries.
+   *
+   * Input type: GhosttyTerminalColorSchemeFn*
+   */
+  GHOSTTY_TERMINAL_OPT_COLOR_SCHEME = 7,
 } GhosttyTerminalOption;
 
 /**
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index ccbf1daf1..4378091a3 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -11,6 +11,7 @@ const kitty = @import("../kitty/key.zig");
 const modes = @import("../modes.zig");
 const point = @import("../point.zig");
 const size = @import("../size.zig");
+const device_status = @import("../device_status.zig");
 const size_report = @import("../size_report.zig");
 const cell_c = @import("cell.zig");
 const row_c = @import("row.zig");
@@ -38,6 +39,7 @@ const Effects = struct {
     userdata: ?*anyopaque = null,
     write_pty: ?WritePtyFn = null,
     bell: ?BellFn = null,
+    color_scheme: ?ColorSchemeFn = null,
     enquiry: ?EnquiryFn = null,
     xtversion: ?XtversionFn = null,
     title_changed: ?TitleChangedFn = null,
@@ -49,6 +51,11 @@ const Effects = struct {
     /// C function pointer type for the bell callback.
     pub const BellFn = *const fn (Terminal, ?*anyopaque) callconv(.c) void;
 
+    /// C function pointer type for the color_scheme callback.
+    /// Returns true and fills out_scheme if a color scheme is available,
+    /// or returns false to silently ignore the query.
+    pub const ColorSchemeFn = *const fn (Terminal, ?*anyopaque, *device_status.ColorScheme) callconv(.c) bool;
+
     /// C function pointer type for the enquiry callback.
     /// Returns the response bytes. The memory must remain valid
     /// until the callback returns.
@@ -82,6 +89,15 @@ const Effects = struct {
         func(@ptrCast(wrapper), wrapper.effects.userdata);
     }
 
+    fn colorSchemeTrampoline(handler: *Handler) ?device_status.ColorScheme {
+        const stream_ptr: *Stream = @fieldParentPtr("handler", handler);
+        const wrapper: *TerminalWrapper = @fieldParentPtr("stream", stream_ptr);
+        const func = wrapper.effects.color_scheme orelse return null;
+        var scheme: device_status.ColorScheme = undefined;
+        if (func(@ptrCast(wrapper), wrapper.effects.userdata, &scheme)) return scheme;
+        return null;
+    }
+
     fn enquiryTrampoline(handler: *Handler) []const u8 {
         const stream_ptr: *Stream = @fieldParentPtr("handler", handler);
         const wrapper: *TerminalWrapper = @fieldParentPtr("stream", stream_ptr);
@@ -176,6 +192,7 @@ fn new_(
     var handler: Stream.Handler = t.vtHandler();
     handler.effects.write_pty = &Effects.writePtyTrampoline;
     handler.effects.bell = &Effects.bellTrampoline;
+    handler.effects.color_scheme = &Effects.colorSchemeTrampoline;
     handler.effects.enquiry = &Effects.enquiryTrampoline;
     handler.effects.xtversion = &Effects.xtversionTrampoline;
     handler.effects.title_changed = &Effects.titleChangedTrampoline;
@@ -207,6 +224,7 @@ pub const Option = enum(c_int) {
     xtversion = 4,
     title_changed = 5,
     size_cb = 6,
+    color_scheme = 7,
 
     /// Input type expected for setting the option.
     pub fn InType(comptime self: Option) type {
@@ -214,6 +232,7 @@ pub const Option = enum(c_int) {
             .userdata => ?*anyopaque,
             .write_pty => ?Effects.WritePtyFn,
             .bell => ?Effects.BellFn,
+            .color_scheme => ?Effects.ColorSchemeFn,
             .enquiry => ?Effects.EnquiryFn,
             .xtversion => ?Effects.XtversionFn,
             .title_changed => ?Effects.TitleChangedFn,
@@ -253,6 +272,7 @@ fn setTyped(
         .userdata => wrapper.effects.userdata = if (value) |v| v.* else null,
         .write_pty => wrapper.effects.write_pty = if (value) |v| v.* else null,
         .bell => wrapper.effects.bell = if (value) |v| v.* else null,
+        .color_scheme => wrapper.effects.color_scheme = if (value) |v| v.* else null,
         .enquiry => wrapper.effects.enquiry = if (value) |v| v.* else null,
         .xtversion => wrapper.effects.xtversion = if (value) |v| v.* else null,
         .title_changed => wrapper.effects.title_changed = if (value) |v| v.* else null,
diff --git a/src/terminal/device_status.zig b/src/terminal/device_status.zig
index 3d0106e42..61dd569f3 100644
--- a/src/terminal/device_status.zig
+++ b/src/terminal/device_status.zig
@@ -1,10 +1,13 @@
 const std = @import("std");
+const build_options = @import("terminal_options");
+const lib = @import("../lib/main.zig");
+const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
 
 /// The color scheme reported in response to a CSI ? 996 n query.
-pub const ColorScheme = enum {
-    light,
-    dark,
-};
+pub const ColorScheme = lib.Enum(lib_target, &.{
+    "light",
+    "dark",
+});
 
 /// An enum(u16) of the available device status requests.
 pub const Request = dsr_enum: {

From b8fcb57923ae3a5d39630650a05217f3536c87f8 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 11:17:55 -0700
Subject: [PATCH 373/391] vt: expose device_attributes effect in the C API

Rename device_status.h to device.h and add C-compatible structs for
device attributes (DA1/DA2/DA3) responses. The new header includes
defines for all known conformance levels, DA1 feature codes, and DA2
device type identifiers.

Add a GhosttyTerminalDeviceAttributesFn callback that C consumers can
set via GHOSTTY_TERMINAL_OPT_DEVICE_ATTRIBUTES. The callback follows
the existing bool + out-pointer pattern used by color_scheme and size
callbacks. When the callback is unset or returns false, the trampoline
returns a default VT220 response (conformance level 62, ANSI color).

The DA1 primary features use a fixed [64]uint16_t inline array with a
num_features count rather than a pointer, so the entire struct is
value-typed and can be safely copied without lifetime concerns.
---
 include/ghostty/vt.h               |   2 +-
 include/ghostty/vt/device.h        | 150 ++++++++++++++
 include/ghostty/vt/device_status.h |  28 ---
 include/ghostty/vt/terminal.h      |  33 ++-
 src/terminal/c/terminal.zig        | 315 +++++++++++++++++++++++++++++
 5 files changed, 498 insertions(+), 30 deletions(-)
 create mode 100644 include/ghostty/vt/device.h
 delete mode 100644 include/ghostty/vt/device_status.h

diff --git a/include/ghostty/vt.h b/include/ghostty/vt.h
index 536f27111..2a52f4b08 100644
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -109,7 +109,7 @@ extern "C" {
 #include <ghostty/vt/allocator.h>
 #include <ghostty/vt/build_info.h>
 #include <ghostty/vt/color.h>
-#include <ghostty/vt/device_status.h>
+#include <ghostty/vt/device.h>
 #include <ghostty/vt/focus.h>
 #include <ghostty/vt/formatter.h>
 #include <ghostty/vt/render.h>
diff --git a/include/ghostty/vt/device.h b/include/ghostty/vt/device.h
new file mode 100644
index 000000000..fdf6bca7d
--- /dev/null
+++ b/include/ghostty/vt/device.h
@@ -0,0 +1,150 @@
+/**
+ * @file device.h
+ *
+ * Device types used by the terminal for device status and device attribute
+ * queries.
+ */
+
+#ifndef GHOSTTY_VT_DEVICE_H
+#define GHOSTTY_VT_DEVICE_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+/* DA1 conformance levels (Pp parameter). */
+#define GHOSTTY_DA_CONFORMANCE_VT100  1
+#define GHOSTTY_DA_CONFORMANCE_VT101  1
+#define GHOSTTY_DA_CONFORMANCE_VT102  6
+#define GHOSTTY_DA_CONFORMANCE_VT125  12
+#define GHOSTTY_DA_CONFORMANCE_VT131  7
+#define GHOSTTY_DA_CONFORMANCE_VT132  4
+#define GHOSTTY_DA_CONFORMANCE_VT220  62
+#define GHOSTTY_DA_CONFORMANCE_VT240  62
+#define GHOSTTY_DA_CONFORMANCE_VT320  63
+#define GHOSTTY_DA_CONFORMANCE_VT340  63
+#define GHOSTTY_DA_CONFORMANCE_VT420  64
+#define GHOSTTY_DA_CONFORMANCE_VT510  65
+#define GHOSTTY_DA_CONFORMANCE_VT520  65
+#define GHOSTTY_DA_CONFORMANCE_VT525  65
+#define GHOSTTY_DA_CONFORMANCE_LEVEL_2  62
+#define GHOSTTY_DA_CONFORMANCE_LEVEL_3  63
+#define GHOSTTY_DA_CONFORMANCE_LEVEL_4  64
+#define GHOSTTY_DA_CONFORMANCE_LEVEL_5  65
+
+/* DA1 feature codes (Ps parameters). */
+#define GHOSTTY_DA_FEATURE_COLUMNS_132         1
+#define GHOSTTY_DA_FEATURE_PRINTER             2
+#define GHOSTTY_DA_FEATURE_REGIS               3
+#define GHOSTTY_DA_FEATURE_SIXEL               4
+#define GHOSTTY_DA_FEATURE_SELECTIVE_ERASE     6
+#define GHOSTTY_DA_FEATURE_USER_DEFINED_KEYS   8
+#define GHOSTTY_DA_FEATURE_NATIONAL_REPLACEMENT 9
+#define GHOSTTY_DA_FEATURE_TECHNICAL_CHARACTERS 15
+#define GHOSTTY_DA_FEATURE_LOCATOR             16
+#define GHOSTTY_DA_FEATURE_TERMINAL_STATE      17
+#define GHOSTTY_DA_FEATURE_WINDOWING           18
+#define GHOSTTY_DA_FEATURE_HORIZONTAL_SCROLLING 21
+#define GHOSTTY_DA_FEATURE_ANSI_COLOR          22
+#define GHOSTTY_DA_FEATURE_RECTANGULAR_EDITING 28
+#define GHOSTTY_DA_FEATURE_ANSI_TEXT_LOCATOR   29
+#define GHOSTTY_DA_FEATURE_CLIPBOARD           52
+
+/* DA2 device type identifiers (Pp parameter). */
+#define GHOSTTY_DA_DEVICE_TYPE_VT100  0
+#define GHOSTTY_DA_DEVICE_TYPE_VT220  1
+#define GHOSTTY_DA_DEVICE_TYPE_VT240  2
+#define GHOSTTY_DA_DEVICE_TYPE_VT330  18
+#define GHOSTTY_DA_DEVICE_TYPE_VT340  19
+#define GHOSTTY_DA_DEVICE_TYPE_VT320  24
+#define GHOSTTY_DA_DEVICE_TYPE_VT382  32
+#define GHOSTTY_DA_DEVICE_TYPE_VT420  41
+#define GHOSTTY_DA_DEVICE_TYPE_VT510  61
+#define GHOSTTY_DA_DEVICE_TYPE_VT520  64
+#define GHOSTTY_DA_DEVICE_TYPE_VT525  65
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Color scheme reported in response to a CSI ? 996 n query.
+ *
+ * @ingroup terminal
+ */
+typedef enum {
+    GHOSTTY_COLOR_SCHEME_LIGHT = 0,
+    GHOSTTY_COLOR_SCHEME_DARK = 1,
+} GhosttyColorScheme;
+
+/**
+ * Primary device attributes (DA1) response data.
+ *
+ * Returned as part of GhosttyDeviceAttributes in response to a CSI c query.
+ * The conformance_level is the Pp parameter and features contains the Ps
+ * feature codes.
+ *
+ * @ingroup terminal
+ */
+typedef struct {
+    /** Conformance level (Pp parameter). E.g. 62 for VT220. */
+    uint16_t conformance_level;
+
+    /** DA1 feature codes. Only the first num_features entries are valid. */
+    uint16_t features[64];
+
+    /** Number of valid entries in the features array. */
+    size_t num_features;
+} GhosttyDeviceAttributesPrimary;
+
+/**
+ * Secondary device attributes (DA2) response data.
+ *
+ * Returned as part of GhosttyDeviceAttributes in response to a CSI > c query.
+ * Response format: CSI > Pp ; Pv ; Pc c
+ *
+ * @ingroup terminal
+ */
+typedef struct {
+    /** Terminal type identifier (Pp). E.g. 1 for VT220. */
+    uint16_t device_type;
+
+    /** Firmware/patch version number (Pv). */
+    uint16_t firmware_version;
+
+    /** ROM cartridge registration number (Pc). Always 0 for emulators. */
+    uint16_t rom_cartridge;
+} GhosttyDeviceAttributesSecondary;
+
+/**
+ * Tertiary device attributes (DA3) response data.
+ *
+ * Returned as part of GhosttyDeviceAttributes in response to a CSI = c query.
+ * Response format: DCS ! | D...D ST (DECRPTUI).
+ *
+ * @ingroup terminal
+ */
+typedef struct {
+    /** Unit ID encoded as 8 uppercase hex digits in the response. */
+    uint32_t unit_id;
+} GhosttyDeviceAttributesTertiary;
+
+/**
+ * Device attributes response data for all three DA levels.
+ *
+ * Filled by the device_attributes callback in response to CSI c,
+ * CSI > c, or CSI = c queries. The terminal uses whichever sub-struct
+ * matches the request type.
+ *
+ * @ingroup terminal
+ */
+typedef struct {
+    GhosttyDeviceAttributesPrimary primary;
+    GhosttyDeviceAttributesSecondary secondary;
+    GhosttyDeviceAttributesTertiary tertiary;
+} GhosttyDeviceAttributes;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GHOSTTY_VT_DEVICE_H */
diff --git a/include/ghostty/vt/device_status.h b/include/ghostty/vt/device_status.h
deleted file mode 100644
index d34b9ec6d..000000000
--- a/include/ghostty/vt/device_status.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @file device_status.h
- *
- * Device status types used by the terminal.
- */
-
-#ifndef GHOSTTY_VT_DEVICE_STATUS_H
-#define GHOSTTY_VT_DEVICE_STATUS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Color scheme reported in response to a CSI ? 996 n query.
- *
- * @ingroup terminal
- */
-typedef enum {
-    GHOSTTY_COLOR_SCHEME_LIGHT = 0,
-    GHOSTTY_COLOR_SCHEME_DARK = 1,
-} GhosttyColorScheme;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* GHOSTTY_VT_DEVICE_STATUS_H */
diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index a4a921dfe..050ebd841 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -12,7 +12,7 @@
 #include <stdint.h>
 #include <ghostty/vt/types.h>
 #include <ghostty/vt/allocator.h>
-#include <ghostty/vt/device_status.h>
+#include <ghostty/vt/device.h>
 #include <ghostty/vt/modes.h>
 #include <ghostty/vt/size_report.h>
 #include <ghostty/vt/grid_ref.h>
@@ -236,6 +236,27 @@ typedef bool (*GhosttyTerminalColorSchemeFn)(GhosttyTerminal terminal,
                                              void* userdata,
                                              GhosttyColorScheme* out_scheme);
 
+/**
+ * Callback function type for device attributes queries (DA1/DA2/DA3).
+ *
+ * Called when the terminal receives a device attributes query (CSI c,
+ * CSI > c, or CSI = c). Return true and fill *out_attrs with the
+ * response data, or return false to silently ignore the query.
+ *
+ * The terminal uses whichever sub-struct (primary, secondary, tertiary)
+ * matches the request type, but all three should be filled for simplicity.
+ *
+ * @param terminal The terminal handle
+ * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
+ * @param[out] out_attrs Pointer to store the device attributes response
+ * @return true if attributes were filled, false to ignore the query
+ *
+ * @ingroup terminal
+ */
+typedef bool (*GhosttyTerminalDeviceAttributesFn)(GhosttyTerminal terminal,
+                                                   void* userdata,
+                                                   GhosttyDeviceAttributes* out_attrs);
+
 /**
  * Callback function type for size queries (XTWINOPS).
  *
@@ -329,6 +350,16 @@ typedef enum {
    * Input type: GhosttyTerminalColorSchemeFn*
    */
   GHOSTTY_TERMINAL_OPT_COLOR_SCHEME = 7,
+
+  /**
+   * Callback invoked in response to a device attributes query
+   * (CSI c, CSI > c, or CSI = c). Return true and fill the out
+   * pointer with response data, or return false to silently ignore.
+   * Set to NULL to ignore device attributes queries.
+   *
+   * Input type: GhosttyTerminalDeviceAttributesFn*
+   */
+  GHOSTTY_TERMINAL_OPT_DEVICE_ATTRIBUTES = 8,
 } GhosttyTerminalOption;
 
 /**
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 4378091a3..15850acf8 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -11,6 +11,7 @@ const kitty = @import("../kitty/key.zig");
 const modes = @import("../modes.zig");
 const point = @import("../point.zig");
 const size = @import("../size.zig");
+const device_attributes = @import("../device_attributes.zig");
 const device_status = @import("../device_status.zig");
 const size_report = @import("../size_report.zig");
 const cell_c = @import("cell.zig");
@@ -40,6 +41,7 @@ const Effects = struct {
     write_pty: ?WritePtyFn = null,
     bell: ?BellFn = null,
     color_scheme: ?ColorSchemeFn = null,
+    device_attributes_cb: ?DeviceAttributesFn = null,
     enquiry: ?EnquiryFn = null,
     xtversion: ?XtversionFn = null,
     title_changed: ?TitleChangedFn = null,
@@ -75,6 +77,35 @@ const Effects = struct {
     /// or returns false to silently ignore the query.
     pub const SizeFn = *const fn (Terminal, ?*anyopaque, *size_report.Size) callconv(.c) bool;
 
+    /// C function pointer type for the device_attributes callback.
+    /// Returns true and fills out_attrs if attributes are available,
+    /// or returns false to silently ignore the query.
+    pub const DeviceAttributesFn = *const fn (Terminal, ?*anyopaque, *CDeviceAttributes) callconv(.c) bool;
+
+    /// C-compatible device attributes struct.
+    /// C: GhosttyDeviceAttributes
+    pub const CDeviceAttributes = extern struct {
+        primary: Primary,
+        secondary: Secondary,
+        tertiary: Tertiary,
+
+        pub const Primary = extern struct {
+            conformance_level: u16,
+            features: [64]u16,
+            num_features: usize,
+        };
+
+        pub const Secondary = extern struct {
+            device_type: u16,
+            firmware_version: u16,
+            rom_cartridge: u16,
+        };
+
+        pub const Tertiary = extern struct {
+            unit_id: u32,
+        };
+    };
+
     fn writePtyTrampoline(handler: *Handler, data: [:0]const u8) void {
         const stream_ptr: *Stream = @fieldParentPtr("handler", handler);
         const wrapper: *TerminalWrapper = @fieldParentPtr("stream", stream_ptr);
@@ -98,6 +129,38 @@ const Effects = struct {
         return null;
     }
 
+    fn deviceAttributesTrampoline(handler: *Handler) device_attributes.Attributes {
+        const stream_ptr: *Stream = @fieldParentPtr("handler", handler);
+        const wrapper: *TerminalWrapper = @fieldParentPtr("stream", stream_ptr);
+        const func = wrapper.effects.device_attributes_cb orelse return .{};
+
+        // Get our attributes from the callback.
+        var c_attrs: CDeviceAttributes = undefined;
+        if (!func(@ptrCast(wrapper), wrapper.effects.userdata, &c_attrs)) return .{};
+
+        // Note below we use a lot of enumFromInt but its always safe
+        // because all our types are non-exhaustive enums.
+
+        const n: usize = @min(c_attrs.primary.num_features, 64);
+        var features: [64]device_attributes.Primary.Feature = undefined;
+        for (0..n) |i| features[i] = @enumFromInt(c_attrs.primary.features[i]);
+
+        return .{
+            .primary = .{
+                .conformance_level = @enumFromInt(c_attrs.primary.conformance_level),
+                .features = features[0..n],
+            },
+            .secondary = .{
+                .device_type = @enumFromInt(c_attrs.secondary.device_type),
+                .firmware_version = c_attrs.secondary.firmware_version,
+                .rom_cartridge = c_attrs.secondary.rom_cartridge,
+            },
+            .tertiary = .{
+                .unit_id = c_attrs.tertiary.unit_id,
+            },
+        };
+    }
+
     fn enquiryTrampoline(handler: *Handler) []const u8 {
         const stream_ptr: *Stream = @fieldParentPtr("handler", handler);
         const wrapper: *TerminalWrapper = @fieldParentPtr("stream", stream_ptr);
@@ -193,6 +256,7 @@ fn new_(
     handler.effects.write_pty = &Effects.writePtyTrampoline;
     handler.effects.bell = &Effects.bellTrampoline;
     handler.effects.color_scheme = &Effects.colorSchemeTrampoline;
+    handler.effects.device_attributes = &Effects.deviceAttributesTrampoline;
     handler.effects.enquiry = &Effects.enquiryTrampoline;
     handler.effects.xtversion = &Effects.xtversionTrampoline;
     handler.effects.title_changed = &Effects.titleChangedTrampoline;
@@ -225,6 +289,7 @@ pub const Option = enum(c_int) {
     title_changed = 5,
     size_cb = 6,
     color_scheme = 7,
+    device_attributes = 8,
 
     /// Input type expected for setting the option.
     pub fn InType(comptime self: Option) type {
@@ -233,6 +298,7 @@ pub const Option = enum(c_int) {
             .write_pty => ?Effects.WritePtyFn,
             .bell => ?Effects.BellFn,
             .color_scheme => ?Effects.ColorSchemeFn,
+            .device_attributes => ?Effects.DeviceAttributesFn,
             .enquiry => ?Effects.EnquiryFn,
             .xtversion => ?Effects.XtversionFn,
             .title_changed => ?Effects.TitleChangedFn,
@@ -273,6 +339,7 @@ fn setTyped(
         .write_pty => wrapper.effects.write_pty = if (value) |v| v.* else null,
         .bell => wrapper.effects.bell = if (value) |v| v.* else null,
         .color_scheme => wrapper.effects.color_scheme = if (value) |v| v.* else null,
+        .device_attributes => wrapper.effects.device_attributes_cb = if (value) |v| v.* else null,
         .enquiry => wrapper.effects.enquiry = if (value) |v| v.* else null,
         .xtversion => wrapper.effects.xtversion = if (value) |v| v.* else null,
         .title_changed => wrapper.effects.title_changed = if (value) |v| v.* else null,
@@ -1377,6 +1444,254 @@ test "size without callback is silent" {
     vt_write(t, "\x1B[18t", 5);
 }
 
+test "set device_attributes callback primary" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const S = struct {
+        var last_data: ?[]u8 = null;
+
+        fn deinit() void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = null;
+        }
+
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
+        }
+
+        fn da(_: Terminal, _: ?*anyopaque, out: *Effects.CDeviceAttributes) callconv(.c) bool {
+            out.* = .{
+                .primary = .{
+                    .conformance_level = 64,
+                    .features = .{22, 52} ++ .{0} ** 62,
+                    .num_features = 2,
+                },
+                .secondary = .{
+                    .device_type = 1,
+                    .firmware_version = 10,
+                    .rom_cartridge = 0,
+                },
+                .tertiary = .{ .unit_id = 0 },
+            };
+            return true;
+        }
+    };
+    defer S.deinit();
+
+    const write_cb: ?Effects.WritePtyFn = &S.writePty;
+    set(t, .write_pty, @ptrCast(&write_cb));
+    const da_cb: ?Effects.DeviceAttributesFn = &S.da;
+    set(t, .device_attributes, @ptrCast(&da_cb));
+
+    // CSI c — primary DA
+    vt_write(t, "\x1B[c", 3);
+    try testing.expect(S.last_data != null);
+    try testing.expectEqualStrings("\x1b[?64;22;52c", S.last_data.?);
+}
+
+test "set device_attributes callback secondary" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const S = struct {
+        var last_data: ?[]u8 = null;
+
+        fn deinit() void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = null;
+        }
+
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
+        }
+
+        fn da(_: Terminal, _: ?*anyopaque, out: *Effects.CDeviceAttributes) callconv(.c) bool {
+            out.* = .{
+                .primary = .{
+                    .conformance_level = 62,
+                    .features = .{22} ++ .{0} ** 63,
+                    .num_features = 1,
+                },
+                .secondary = .{
+                    .device_type = 1,
+                    .firmware_version = 10,
+                    .rom_cartridge = 0,
+                },
+                .tertiary = .{ .unit_id = 0 },
+            };
+            return true;
+        }
+    };
+    defer S.deinit();
+
+    const write_cb: ?Effects.WritePtyFn = &S.writePty;
+    set(t, .write_pty, @ptrCast(&write_cb));
+    const da_cb: ?Effects.DeviceAttributesFn = &S.da;
+    set(t, .device_attributes, @ptrCast(&da_cb));
+
+    // CSI > c — secondary DA
+    vt_write(t, "\x1B[>c", 4);
+    try testing.expect(S.last_data != null);
+    try testing.expectEqualStrings("\x1b[>1;10;0c", S.last_data.?);
+}
+
+test "set device_attributes callback tertiary" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const S = struct {
+        var last_data: ?[]u8 = null;
+
+        fn deinit() void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = null;
+        }
+
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
+        }
+
+        fn da(_: Terminal, _: ?*anyopaque, out: *Effects.CDeviceAttributes) callconv(.c) bool {
+            out.* = .{
+                .primary = .{
+                    .conformance_level = 62,
+                    .features = .{0} ** 64,
+                    .num_features = 0,
+                },
+                .secondary = .{
+                    .device_type = 1,
+                    .firmware_version = 0,
+                    .rom_cartridge = 0,
+                },
+                .tertiary = .{ .unit_id = 0xAABBCCDD },
+            };
+            return true;
+        }
+    };
+    defer S.deinit();
+
+    const write_cb: ?Effects.WritePtyFn = &S.writePty;
+    set(t, .write_pty, @ptrCast(&write_cb));
+    const da_cb: ?Effects.DeviceAttributesFn = &S.da;
+    set(t, .device_attributes, @ptrCast(&da_cb));
+
+    // CSI = c — tertiary DA
+    vt_write(t, "\x1B[=c", 4);
+    try testing.expect(S.last_data != null);
+    try testing.expectEqualStrings("\x1bP!|AABBCCDD\x1b\\", S.last_data.?);
+}
+
+test "device_attributes without callback uses default" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const S = struct {
+        var last_data: ?[]u8 = null;
+
+        fn deinit() void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = null;
+        }
+
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
+        }
+    };
+    defer S.deinit();
+
+    const write_cb: ?Effects.WritePtyFn = &S.writePty;
+    set(t, .write_pty, @ptrCast(&write_cb));
+
+    // Without setting a device_attributes callback, DA1 should return the default
+    vt_write(t, "\x1B[c", 3);
+    try testing.expect(S.last_data != null);
+    try testing.expectEqualStrings("\x1b[?62;22c", S.last_data.?);
+}
+
+test "device_attributes callback returns false uses default" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const S = struct {
+        var last_data: ?[]u8 = null;
+
+        fn deinit() void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = null;
+        }
+
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
+        }
+
+        fn da(_: Terminal, _: ?*anyopaque, _: *Effects.CDeviceAttributes) callconv(.c) bool {
+            return false;
+        }
+    };
+    defer S.deinit();
+
+    const write_cb: ?Effects.WritePtyFn = &S.writePty;
+    set(t, .write_pty, @ptrCast(&write_cb));
+    const da_cb: ?Effects.DeviceAttributesFn = &S.da;
+    set(t, .device_attributes, @ptrCast(&da_cb));
+
+    // Callback returns false, should use default response
+    vt_write(t, "\x1B[c", 3);
+    try testing.expect(S.last_data != null);
+    try testing.expectEqualStrings("\x1b[?62;22c", S.last_data.?);
+}
+
 test "grid_ref out of bounds" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(

From bbfe1c278722c54ededd474b9567b58fd3ad801a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 11:35:20 -0700
Subject: [PATCH 374/391] vt: use struct literal for handler effects assignment

Assign handler.effects as a struct literal instead of setting fields
individually. This lets the compiler catch missing fields if new
effects are added to the Effects struct.

Also sort the callback function typedefs in vt/terminal.h
alphabetically (Bell, ColorScheme, DeviceAttributes, Enquiry, Size,
TitleChanged, WritePty, Xtversion).
---
 include/ghostty/vt/terminal.h | 138 +++++++++++++++++-----------------
 src/terminal/c/terminal.zig   |  18 +++--
 2 files changed, 79 insertions(+), 77 deletions(-)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 050ebd841..8f52565b3 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -136,26 +136,6 @@ typedef struct {
   uint64_t len;
 } GhosttyTerminalScrollbar;
 
-/**
- * Callback function type for write_pty.
- *
- * Called when the terminal needs to write data back to the pty, for
- * example in response to a device status report or mode query. The
- * data is only valid for the duration of the call; callers must copy
- * it if it needs to persist.
- *
- * @param terminal The terminal handle
- * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
- * @param data Pointer to the response bytes
- * @param len Length of the response in bytes
- *
- * @ingroup terminal
- */
-typedef void (*GhosttyTerminalWritePtyFn)(GhosttyTerminal terminal,
-                                          void* userdata,
-                                          const uint8_t* data,
-                                          size_t len);
-
 /**
  * Callback function type for bell.
  *
@@ -169,55 +149,6 @@ typedef void (*GhosttyTerminalWritePtyFn)(GhosttyTerminal terminal,
 typedef void (*GhosttyTerminalBellFn)(GhosttyTerminal terminal,
                                       void* userdata);
 
-/**
- * Callback function type for enquiry (ENQ, 0x05).
- *
- * Called when the terminal receives an ENQ character. Return the
- * response bytes as a GhosttyString. The memory must remain valid
- * until the callback returns. Return a zero-length string to send
- * no response.
- *
- * @param terminal The terminal handle
- * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
- * @return The response bytes to write back to the pty
- *
- * @ingroup terminal
- */
-typedef GhosttyString (*GhosttyTerminalEnquiryFn)(GhosttyTerminal terminal,
-                                                   void* userdata);
-
-/**
- * Callback function type for XTVERSION.
- *
- * Called when the terminal receives an XTVERSION query (CSI > q).
- * Return the version string (e.g. "myterm 1.0") as a GhosttyString.
- * The memory must remain valid until the callback returns. Return a
- * zero-length string to report the default "libghostty" version.
- *
- * @param terminal The terminal handle
- * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
- * @return The version string to report
- *
- * @ingroup terminal
- */
-typedef GhosttyString (*GhosttyTerminalXtversionFn)(GhosttyTerminal terminal,
-                                                     void* userdata);
-
-/**
- * Callback function type for title_changed.
- *
- * Called when the terminal title changes via escape sequences
- * (e.g. OSC 0 or OSC 2). The new title can be queried from the
- * terminal after the callback returns.
- *
- * @param terminal The terminal handle
- * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
- *
- * @ingroup terminal
- */
-typedef void (*GhosttyTerminalTitleChangedFn)(GhosttyTerminal terminal,
-                                              void* userdata);
-
 /**
  * Callback function type for color scheme queries (CSI ? 996 n).
  *
@@ -257,6 +188,23 @@ typedef bool (*GhosttyTerminalDeviceAttributesFn)(GhosttyTerminal terminal,
                                                    void* userdata,
                                                    GhosttyDeviceAttributes* out_attrs);
 
+/**
+ * Callback function type for enquiry (ENQ, 0x05).
+ *
+ * Called when the terminal receives an ENQ character. Return the
+ * response bytes as a GhosttyString. The memory must remain valid
+ * until the callback returns. Return a zero-length string to send
+ * no response.
+ *
+ * @param terminal The terminal handle
+ * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
+ * @return The response bytes to write back to the pty
+ *
+ * @ingroup terminal
+ */
+typedef GhosttyString (*GhosttyTerminalEnquiryFn)(GhosttyTerminal terminal,
+                                                   void* userdata);
+
 /**
  * Callback function type for size queries (XTWINOPS).
  *
@@ -275,6 +223,58 @@ typedef bool (*GhosttyTerminalSizeFn)(GhosttyTerminal terminal,
                                       void* userdata,
                                       GhosttySizeReportSize* out_size);
 
+/**
+ * Callback function type for title_changed.
+ *
+ * Called when the terminal title changes via escape sequences
+ * (e.g. OSC 0 or OSC 2). The new title can be queried from the
+ * terminal after the callback returns.
+ *
+ * @param terminal The terminal handle
+ * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
+ *
+ * @ingroup terminal
+ */
+typedef void (*GhosttyTerminalTitleChangedFn)(GhosttyTerminal terminal,
+                                              void* userdata);
+
+/**
+ * Callback function type for write_pty.
+ *
+ * Called when the terminal needs to write data back to the pty, for
+ * example in response to a device status report or mode query. The
+ * data is only valid for the duration of the call; callers must copy
+ * it if it needs to persist.
+ *
+ * @param terminal The terminal handle
+ * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
+ * @param data Pointer to the response bytes
+ * @param len Length of the response in bytes
+ *
+ * @ingroup terminal
+ */
+typedef void (*GhosttyTerminalWritePtyFn)(GhosttyTerminal terminal,
+                                          void* userdata,
+                                          const uint8_t* data,
+                                          size_t len);
+
+/**
+ * Callback function type for XTVERSION.
+ *
+ * Called when the terminal receives an XTVERSION query (CSI > q).
+ * Return the version string (e.g. "myterm 1.0") as a GhosttyString.
+ * The memory must remain valid until the callback returns. Return a
+ * zero-length string to report the default "libghostty" version.
+ *
+ * @param terminal The terminal handle
+ * @param userdata The userdata pointer set via GHOSTTY_TERMINAL_OPT_USERDATA
+ * @return The version string to report
+ *
+ * @ingroup terminal
+ */
+typedef GhosttyString (*GhosttyTerminalXtversionFn)(GhosttyTerminal terminal,
+                                                     void* userdata);
+
 /**
  * Terminal option identifiers.
  *
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 15850acf8..d0825d3cb 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -253,14 +253,16 @@ fn new_(
     // Setup our stream with trampolines always installed so that
     // setting C callbacks at any time takes effect immediately.
     var handler: Stream.Handler = t.vtHandler();
-    handler.effects.write_pty = &Effects.writePtyTrampoline;
-    handler.effects.bell = &Effects.bellTrampoline;
-    handler.effects.color_scheme = &Effects.colorSchemeTrampoline;
-    handler.effects.device_attributes = &Effects.deviceAttributesTrampoline;
-    handler.effects.enquiry = &Effects.enquiryTrampoline;
-    handler.effects.xtversion = &Effects.xtversionTrampoline;
-    handler.effects.title_changed = &Effects.titleChangedTrampoline;
-    handler.effects.size = &Effects.sizeTrampoline;
+    handler.effects = .{
+        .write_pty = &Effects.writePtyTrampoline,
+        .bell = &Effects.bellTrampoline,
+        .color_scheme = &Effects.colorSchemeTrampoline,
+        .device_attributes = &Effects.deviceAttributesTrampoline,
+        .enquiry = &Effects.enquiryTrampoline,
+        .xtversion = &Effects.xtversionTrampoline,
+        .title_changed = &Effects.titleChangedTrampoline,
+        .size = &Effects.sizeTrampoline,
+    };
 
     wrapper.* = .{
         .terminal = t,

From 4128e6a38c5c5c20d5119a46c691bf978b74c41a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 11:42:10 -0700
Subject: [PATCH 375/391] vt: add effects documentation section with example

Add a comprehensive "Effects" section to the terminal module
documentation in terminal.h explaining the callback system that
lets embedding applications react to terminal-initiated events
(bell, title changes, pty writes, device queries, etc.). The
section includes a reference table of all available effects and
their triggers, plus @snippet references to the new example.

Add c-vt-effects example project demonstrating how to register
write_pty, bell, and title_changed callbacks, attach userdata,
and feed VT data that triggers each effect.
---
 example/c-vt-effects/README.md     |  18 ++++++
 example/c-vt-effects/build.zig     |  42 ++++++++++++
 example/c-vt-effects/build.zig.zon |  24 +++++++
 example/c-vt-effects/src/main.c    | 100 +++++++++++++++++++++++++++++
 include/ghostty/vt/terminal.h      |  54 ++++++++++++++++
 5 files changed, 238 insertions(+)
 create mode 100644 example/c-vt-effects/README.md
 create mode 100644 example/c-vt-effects/build.zig
 create mode 100644 example/c-vt-effects/build.zig.zon
 create mode 100644 example/c-vt-effects/src/main.c

diff --git a/example/c-vt-effects/README.md b/example/c-vt-effects/README.md
new file mode 100644
index 000000000..5f5a22b14
--- /dev/null
+++ b/example/c-vt-effects/README.md
@@ -0,0 +1,18 @@
+# Example: `ghostty-vt` Terminal Effects
+
+This contains a simple example of how to register and use terminal
+effect callbacks (`write_pty`, `bell`, `title_changed`) with the
+`ghostty-vt` C library.
+
+This uses a `build.zig` and `Zig` to build the C program so that we
+can reuse a lot of our build logic and depend directly on our source
+tree, but Ghostty emits a standard C library that can be used with any
+C tooling.
+
+## Usage
+
+Run the program:
+
+```shell-session
+zig build run
+```
diff --git a/example/c-vt-effects/build.zig b/example/c-vt-effects/build.zig
new file mode 100644
index 000000000..c3b1af73b
--- /dev/null
+++ b/example/c-vt-effects/build.zig
@@ -0,0 +1,42 @@
+const std = @import("std");
+
+pub fn build(b: *std.Build) void {
+    const target = b.standardTargetOptions(.{});
+    const optimize = b.standardOptimizeOption(.{});
+
+    const run_step = b.step("run", "Run the app");
+
+    const exe_mod = b.createModule(.{
+        .target = target,
+        .optimize = optimize,
+    });
+    exe_mod.addCSourceFiles(.{
+        .root = b.path("src"),
+        .files = &.{"main.c"},
+    });
+
+    // You'll want to use a lazy dependency here so that ghostty is only
+    // downloaded if you actually need it.
+    if (b.lazyDependency("ghostty", .{
+        // Setting simd to false will force a pure static build that
+        // doesn't even require libc, but it has a significant performance
+        // penalty. If your embedding app requires libc anyway, you should
+        // always keep simd enabled.
+        // .simd = false,
+    })) |dep| {
+        exe_mod.linkLibrary(dep.artifact("ghostty-vt"));
+    }
+
+    // Exe
+    const exe = b.addExecutable(.{
+        .name = "c_vt_effects",
+        .root_module = exe_mod,
+    });
+    b.installArtifact(exe);
+
+    // Run
+    const run_cmd = b.addRunArtifact(exe);
+    run_cmd.step.dependOn(b.getInstallStep());
+    if (b.args) |args| run_cmd.addArgs(args);
+    run_step.dependOn(&run_cmd.step);
+}
diff --git a/example/c-vt-effects/build.zig.zon b/example/c-vt-effects/build.zig.zon
new file mode 100644
index 000000000..0275f4f68
--- /dev/null
+++ b/example/c-vt-effects/build.zig.zon
@@ -0,0 +1,24 @@
+.{
+    .name = .c_vt_effects,
+    .version = "0.0.0",
+    .fingerprint = 0xc02634cd65f5b583,
+    .minimum_zig_version = "0.15.1",
+    .dependencies = .{
+        // Ghostty dependency. In reality, you'd probably use a URL-based
+        // dependency like the one showed (and commented out) below this one.
+        // We use a path dependency here for simplicity and to ensure our
+        // examples always test against the source they're bundled with.
+        .ghostty = .{ .path = "../../" },
+
+        // Example of what a URL-based dependency looks like:
+        // .ghostty = .{
+        //     .url = "https://github.com/ghostty-org/ghostty/archive/COMMIT.tar.gz",
+        //     .hash = "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO36s",
+        // },
+    },
+    .paths = .{
+        "build.zig",
+        "build.zig.zon",
+        "src",
+    },
+}
diff --git a/example/c-vt-effects/src/main.c b/example/c-vt-effects/src/main.c
new file mode 100644
index 000000000..c6688cf5c
--- /dev/null
+++ b/example/c-vt-effects/src/main.c
@@ -0,0 +1,100 @@
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <ghostty/vt.h>
+
+//! [effects-write-pty]
+void on_write_pty(GhosttyTerminal terminal,
+                  void* userdata,
+                  const uint8_t* data,
+                  size_t len) {
+  (void)terminal;
+  (void)userdata;
+  printf("  write_pty (%zu bytes): ", len);
+  fwrite(data, 1, len, stdout);
+  printf("\n");
+}
+//! [effects-write-pty]
+
+//! [effects-bell]
+void on_bell(GhosttyTerminal terminal, void* userdata) {
+  (void)terminal;
+  int* count = (int*)userdata;
+  (*count)++;
+  printf("  bell! (count=%d)\n", *count);
+}
+//! [effects-bell]
+
+//! [effects-title-changed]
+void on_title_changed(GhosttyTerminal terminal, void* userdata) {
+  (void)userdata;
+  // Query the cursor position to confirm the terminal processed the
+  // title change (the title itself is tracked by the embedder via the
+  // OSC parser or its own state).
+  uint16_t col = 0;
+  ghostty_terminal_get(terminal, GHOSTTY_TERMINAL_DATA_CURSOR_X, &col);
+  printf("  title changed (cursor at col %u)\n", col);
+}
+//! [effects-title-changed]
+
+//! [effects-register]
+int main() {
+  // Create a terminal
+  GhosttyTerminal terminal = NULL;
+  GhosttyTerminalOptions opts = {
+    .cols = 80,
+    .rows = 24,
+    .max_scrollback = 0,
+  };
+  if (ghostty_terminal_new(NULL, &terminal, opts) != GHOSTTY_SUCCESS) {
+    fprintf(stderr, "Failed to create terminal\n");
+    return 1;
+  }
+
+  // Set up userdata — a simple bell counter
+  int bell_count = 0;
+  void* ud = &bell_count;
+  ghostty_terminal_set(terminal, GHOSTTY_TERMINAL_OPT_USERDATA, &ud);
+
+  // Register effect callbacks
+  GhosttyTerminalWritePtyFn write_fn = on_write_pty;
+  ghostty_terminal_set(terminal, GHOSTTY_TERMINAL_OPT_WRITE_PTY, &write_fn);
+
+  GhosttyTerminalBellFn bell_fn = on_bell;
+  ghostty_terminal_set(terminal, GHOSTTY_TERMINAL_OPT_BELL, &bell_fn);
+
+  GhosttyTerminalTitleChangedFn title_fn = on_title_changed;
+  ghostty_terminal_set(terminal, GHOSTTY_TERMINAL_OPT_TITLE_CHANGED, &title_fn);
+
+  // Feed VT data that triggers effects:
+
+  // 1. Bell (BEL = 0x07)
+  printf("Sending BEL:\n");
+  const uint8_t bel = 0x07;
+  ghostty_terminal_vt_write(terminal, &bel, 1);
+
+  // 2. Title change (OSC 2 ; <title> ST)
+  printf("Sending title change:\n");
+  const char* title_seq = "\x1B]2;Hello Effects\x1B\\";
+  ghostty_terminal_vt_write(terminal, (const uint8_t*)title_seq,
+                            strlen(title_seq));
+
+  // 3. Device status report (DECRQM for wraparound mode ?7)
+  //    triggers write_pty with the response
+  printf("Sending DECRQM query:\n");
+  const char* decrqm = "\x1B[?7$p";
+  ghostty_terminal_vt_write(terminal, (const uint8_t*)decrqm,
+                            strlen(decrqm));
+
+  // 4. Another bell to show the counter increments
+  printf("Sending another BEL:\n");
+  ghostty_terminal_vt_write(terminal, &bel, 1);
+
+  printf("Total bells: %d\n", bell_count);
+
+  ghostty_terminal_free(terminal);
+  return 0;
+}
+//! [effects-register]
diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 8f52565b3..a2c89d302 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -34,6 +34,60 @@ extern "C" {
  * Once a terminal session is up and running, you can configure a key encoder
  * to write keyboard input via ghostty_key_encoder_setopt_from_terminal().
  *
+ * ## Effects
+ *
+ * By default, the terminal sequence processing with ghostty_terminal_vt_write() 
+ * only process sequences that directly affect terminal state and 
+ * ignores sequences that have side effect behavior or require responses.
+ * These sequences include things like bell characters, title changes, device
+ * attributes queries, and more. To handle these sequences, the embedder
+ * must configure "effects."
+ *
+ * Effects are callbacks that the terminal invokes in response to VT
+ * sequences processed during ghostty_terminal_vt_write(). They let the
+ * embedding application react to terminal-initiated events such as bell
+ * characters, title changes, device status report responses, and more.
+ *
+ * Each effect is registered with ghostty_terminal_set() using the
+ * corresponding `GhosttyTerminalOption` identifier. A `NULL` value
+ * pointer clears the callback and disables the effect.
+ *
+ * A userdata pointer can be attached via `GHOSTTY_TERMINAL_OPT_USERDATA`
+ * and is passed to every callback, allowing callers to route events
+ * back to their own application state without global variables.
+ * You cannot specify different userdata for different callbacks.
+ *
+ * All callbacks are invoked synchronously during
+ * ghostty_terminal_vt_write(). Callbacks **must not** call
+ * ghostty_terminal_vt_write() on the same terminal (no reentrancy).
+ * And callbacks must be very careful to not block for too long or perform 
+ * expensive operations, since they are blocking further IO processing.
+ *
+ * The available effects are:
+ *
+ * | Option                                  | Callback Type                     | Trigger                                   |
+ * |-----------------------------------------|-----------------------------------|-------------------------------------------|
+ * | `GHOSTTY_TERMINAL_OPT_WRITE_PTY`        | `GhosttyTerminalWritePtyFn`       | Query responses written back to the pty   |
+ * | `GHOSTTY_TERMINAL_OPT_BELL`             | `GhosttyTerminalBellFn`           | BEL character (0x07)                      |
+ * | `GHOSTTY_TERMINAL_OPT_TITLE_CHANGED`    | `GhosttyTerminalTitleChangedFn`   | Title change via OSC 0 / OSC 2            |
+ * | `GHOSTTY_TERMINAL_OPT_ENQUIRY`          | `GhosttyTerminalEnquiryFn`        | ENQ character (0x05)                      |
+ * | `GHOSTTY_TERMINAL_OPT_XTVERSION`        | `GhosttyTerminalXtversionFn`      | XTVERSION query (CSI > q)                 |
+ * | `GHOSTTY_TERMINAL_OPT_SIZE`             | `GhosttyTerminalSizeFn`           | XTWINOPS size query (CSI 14/16/18 t)      |
+ * | `GHOSTTY_TERMINAL_OPT_COLOR_SCHEME`     | `GhosttyTerminalColorSchemeFn`    | Color scheme query (CSI ? 996 n)          |
+ * | `GHOSTTY_TERMINAL_OPT_DEVICE_ATTRIBUTES`| `GhosttyTerminalDeviceAttributesFn`| Device attributes query (CSI c / > c / = c)|
+ *
+ * ### Defining a write_pty callback
+ * @snippet c-vt-effects/src/main.c effects-write-pty
+ *
+ * ### Defining a bell callback
+ * @snippet c-vt-effects/src/main.c effects-bell
+ *
+ * ### Defining a title_changed callback
+ * @snippet c-vt-effects/src/main.c effects-title-changed
+ *
+ * ### Registering effects and processing VT data
+ * @snippet c-vt-effects/src/main.c effects-register
+ *
  * @{
  */
 

From e36b7453146099b3473b4d8a5c6638f6431448c4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 11:48:22 -0700
Subject: [PATCH 376/391] fmt

---
 src/terminal/c/terminal.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index d0825d3cb..370371f13 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -1476,7 +1476,7 @@ test "set device_attributes callback primary" {
             out.* = .{
                 .primary = .{
                     .conformance_level = 64,
-                    .features = .{22, 52} ++ .{0} ** 62,
+                    .features = .{ 22, 52 } ++ .{0} ** 62,
                     .num_features = 2,
                 },
                 .secondary = .{

From d2c6a3c775bc6952480442fe11ec2984a86b5c8c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 12:06:33 -0700
Subject: [PATCH 377/391] vt: store DA1 feature buffer in wrapper struct

The DA1 trampoline was converting C feature codes into a local
stack buffer and returning a slice pointing into it. This is
unsound because the slice outlives the stack frame once the
trampoline returns, leaving reportDeviceAttributes reading
invalid memory.

Move the scratch buffer into the wrapper effects struct so that
its lifetime extends beyond the trampoline call, keeping the
returned slice valid for the caller.
---
 src/terminal/c/terminal.zig | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 370371f13..f89630ba7 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -47,6 +47,13 @@ const Effects = struct {
     title_changed: ?TitleChangedFn = null,
     size_cb: ?SizeFn = null,
 
+    /// Scratch buffer for DA1 feature codes. The device attributes
+    /// trampoline converts C feature codes into this buffer and returns
+    /// a slice pointing into it. Storing it here ensures the slice
+    /// remains valid after the trampoline returns, since the caller
+    /// (`reportDeviceAttributes`) reads it before any re-entrant call.
+    da_features_buf: [64]device_attributes.Primary.Feature = undefined,
+
     /// C function pointer type for the write_pty callback.
     pub const WritePtyFn = *const fn (Terminal, ?*anyopaque, [*]const u8, usize) callconv(.c) void;
 
@@ -142,13 +149,12 @@ const Effects = struct {
         // because all our types are non-exhaustive enums.
 
         const n: usize = @min(c_attrs.primary.num_features, 64);
-        var features: [64]device_attributes.Primary.Feature = undefined;
-        for (0..n) |i| features[i] = @enumFromInt(c_attrs.primary.features[i]);
+        for (0..n) |i| wrapper.effects.da_features_buf[i] = @enumFromInt(c_attrs.primary.features[i]);
 
         return .{
             .primary = .{
                 .conformance_level = @enumFromInt(c_attrs.primary.conformance_level),
-                .features = features[0..n],
+                .features = wrapper.effects.da_features_buf[0..n],
             },
             .secondary = .{
                 .device_type = @enumFromInt(c_attrs.secondary.device_type),

From 81e21e4d0a4e6f3a12004542a907c55c2f3b587a Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Tue, 24 Mar 2026 20:12:57 +0100
Subject: [PATCH 378/391] build: refactor checkGhosttyHEnum to use @hasDecl
 instead of nested inline for
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace the O(N×M) nested inline for loop with direct @hasDecl lookups.
The old approach iterated over all translate-c declarations for each enum
field, which required a 10M comptime branch quota on MSVC (2173 decls ×
138 fields × ~20 branches). The new approach constructs the expected
declaration name and checks directly, reducing to O(N) and needing only
100K quota on all platforms.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/lib/enum.zig | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/lib/enum.zig b/src/lib/enum.zig
index bd410371c..76e05fa93 100644
--- a/src/lib/enum.zig
+++ b/src/lib/enum.zig
@@ -105,30 +105,27 @@ pub fn checkGhosttyHEnum(
     try std.testing.expect(info.@"enum".tag_type == c_int);
     try std.testing.expect(info.@"enum".is_exhaustive == true);
 
-    @setEvalBranchQuota(10_000_000);
+    @setEvalBranchQuota(100_000);
 
     const c = @import("ghostty.h");
 
     var set: std.EnumSet(T) = .initFull();
 
-    const c_decls = @typeInfo(c).@"struct".decls;
     const enum_fields = info.@"enum".fields;
 
     inline for (enum_fields) |field| {
-        const upper_name = comptime u: {
-            var buf: [128]u8 = undefined;
-            break :u std.ascii.upperString(&buf, field.name);
+        const expected_name: *const [prefix.len + field.name.len]u8 = comptime e: {
+            var buf: [prefix.len + field.name.len]u8 = undefined;
+            @memcpy(buf[0..prefix.len], prefix);
+            for (buf[prefix.len..], field.name) |*d, s| {
+                d.* = std.ascii.toUpper(s);
+            }
+            break :e &buf;
         };
 
-        inline for (c_decls) |decl| {
-            if (!comptime std.mem.startsWith(u8, decl.name, prefix)) continue;
-
-            const suffix = decl.name[prefix.len..];
-
-            if (!comptime std.mem.eql(u8, suffix, upper_name)) continue;
-
-            std.testing.expectEqual(field.value, @field(c, decl.name)) catch |e| {
-                std.log.err(@typeName(T) ++ " key " ++ field.name ++ " does not have the same backing int as " ++ decl.name, .{});
+        if (@hasDecl(c, expected_name)) {
+            std.testing.expectEqual(field.value, @field(c, expected_name)) catch |e| {
+                std.log.err(@typeName(T) ++ " key " ++ field.name ++ " does not have the same backing int as " ++ expected_name, .{});
                 return e;
             };
 

From 8f1ac0bd4e69e922167d4cf7560a6cdec12ba721 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 12:59:04 -0700
Subject: [PATCH 379/391] vt: expose title and pwd in C API

Add title and pwd as both gettable data keys
(GHOSTTY_TERMINAL_DATA_TITLE/PWD) and settable options
(GHOSTTY_TERMINAL_OPT_TITLE/PWD) in the C terminal API. Getting
returns a borrowed GhosttyString; setting copies the data into the
terminal via setTitle/setPwd.

The underlying Terminal.setTitle/setPwd now append a null sentinel so
that getTitle/getPwd can return sentinel-terminated slices ([:0]const
u8), which is useful for downstream consumers that need C strings.

Change ghostty_terminal_set to return GhosttyResult instead of void
so that the new title/pwd options can report allocation failures.
Existing option-setting calls cannot fail so the return value is
backwards-compatible for callers that discard it.
---
 include/ghostty/vt/terminal.h |  49 +++++++++-
 src/terminal/Terminal.zig     |  18 ++--
 src/terminal/c/terminal.zig   | 171 ++++++++++++++++++++++++++++------
 3 files changed, 201 insertions(+), 37 deletions(-)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index a2c89d302..30f6179c8 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -414,6 +414,26 @@ typedef enum {
    * Input type: GhosttyTerminalDeviceAttributesFn*
    */
   GHOSTTY_TERMINAL_OPT_DEVICE_ATTRIBUTES = 8,
+
+  /**
+   * Set the terminal title manually.
+   *
+   * The string data is copied into the terminal. A NULL value pointer
+   * clears the title (equivalent to setting an empty string).
+   *
+   * Input type: GhosttyString*
+   */
+  GHOSTTY_TERMINAL_OPT_TITLE = 9,
+
+  /**
+   * Set the terminal working directory manually.
+   *
+   * The string data is copied into the terminal. A NULL value pointer
+   * clears the pwd (equivalent to setting an empty string).
+   *
+   * Input type: GhosttyString*
+   */
+  GHOSTTY_TERMINAL_OPT_PWD = 10,
 } GhosttyTerminalOption;
 
 /**
@@ -513,6 +533,29 @@ typedef enum {
    * Output type: bool *
    */
   GHOSTTY_TERMINAL_DATA_MOUSE_TRACKING = 11,
+
+  /**
+   * The terminal title as set by escape sequences (e.g. OSC 0/2).
+   *
+   * Returns a borrowed string. The pointer is valid until the next call
+   * to ghostty_terminal_vt_write() or ghostty_terminal_reset(). An empty
+   * string (len=0) is returned when no title has been set.
+   *
+   * Output type: GhosttyString *
+   */
+  GHOSTTY_TERMINAL_DATA_TITLE = 12,
+
+  /**
+   * The terminal's current working directory as set by escape sequences
+   * (e.g. OSC 7).
+   *
+   * Returns a borrowed string. The pointer is valid until the next call
+   * to ghostty_terminal_vt_write() or ghostty_terminal_reset(). An empty
+   * string (len=0) is returned when no pwd has been set.
+   *
+   * Output type: GhosttyString *
+   */
+  GHOSTTY_TERMINAL_DATA_PWD = 13,
 } GhosttyTerminalData;
 
 /**
@@ -590,9 +633,9 @@ GhosttyResult ghostty_terminal_resize(GhosttyTerminal terminal,
  *
  * @ingroup terminal
  */
-void ghostty_terminal_set(GhosttyTerminal terminal,
-                           GhosttyTerminalOption option,
-                           const void* value);
+GhosttyResult ghostty_terminal_set(GhosttyTerminal terminal,
+                                   GhosttyTerminalOption option,
+                                   const void* value);
 
 /**
  * Write VT-encoded data to the terminal for processing.
diff --git a/src/terminal/Terminal.zig b/src/terminal/Terminal.zig
index a49e01b5d..9c956ec92 100644
--- a/src/terminal/Terminal.zig
+++ b/src/terminal/Terminal.zig
@@ -2876,27 +2876,33 @@ pub fn resize(
 /// Set the pwd for the terminal.
 pub fn setPwd(self: *Terminal, pwd: []const u8) !void {
     self.pwd.clearRetainingCapacity();
-    try self.pwd.appendSlice(self.gpa(), pwd);
+    if (pwd.len > 0) {
+        try self.pwd.appendSlice(self.gpa(), pwd);
+        try self.pwd.append(self.gpa(), 0);
+    }
 }
 
 /// Returns the pwd for the terminal, if any. The memory is owned by the
 /// Terminal and is not copied. It is safe until a reset or setPwd.
-pub fn getPwd(self: *const Terminal) ?[]const u8 {
+pub fn getPwd(self: *const Terminal) ?[:0]const u8 {
     if (self.pwd.items.len == 0) return null;
-    return self.pwd.items;
+    return self.pwd.items[0 .. self.pwd.items.len - 1 :0];
 }
 
 /// Set the title for the terminal, as set by escape sequences (e.g. OSC 0/2).
 pub fn setTitle(self: *Terminal, t: []const u8) !void {
     self.title.clearRetainingCapacity();
-    try self.title.appendSlice(self.gpa(), t);
+    if (t.len > 0) {
+        try self.title.appendSlice(self.gpa(), t);
+        try self.title.append(self.gpa(), 0);
+    }
 }
 
 /// Returns the title for the terminal, if any. The memory is owned by the
 /// Terminal and is not copied. It is safe until a reset or setTitle.
-pub fn getTitle(self: *const Terminal) ?[]const u8 {
+pub fn getTitle(self: *const Terminal) ?[:0]const u8 {
     if (self.title.items.len == 0) return null;
-    return self.title.items;
+    return self.title.items[0 .. self.title.items.len - 1 :0];
 }
 
 /// Switch to the given screen type (alternate or primary).
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index f89630ba7..da8e91a0f 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -298,6 +298,8 @@ pub const Option = enum(c_int) {
     size_cb = 6,
     color_scheme = 7,
     device_attributes = 8,
+    title = 9,
+    pwd = 10,
 
     /// Input type expected for setting the option.
     pub fn InType(comptime self: Option) type {
@@ -311,6 +313,7 @@ pub const Option = enum(c_int) {
             .xtversion => ?Effects.XtversionFn,
             .title_changed => ?Effects.TitleChangedFn,
             .size_cb => ?Effects.SizeFn,
+            .title, .pwd => lib.String,
         };
     }
 };
@@ -319,11 +322,11 @@ pub fn set(
     terminal_: Terminal,
     option: Option,
     value: ?*const anyopaque,
-) callconv(.c) void {
+) callconv(.c) Result {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(Option, @intFromEnum(option)) catch {
             log.warn("terminal_set invalid option value={d}", .{@intFromEnum(option)});
-            return;
+            return .invalid_value;
         };
     }
 
@@ -340,8 +343,8 @@ fn setTyped(
     terminal_: Terminal,
     comptime option: Option,
     value: ?*const option.InType(),
-) void {
-    const wrapper = terminal_ orelse return;
+) Result {
+    const wrapper = terminal_ orelse return .invalid_value;
     switch (option) {
         .userdata => wrapper.effects.userdata = if (value) |v| v.* else null,
         .write_pty => wrapper.effects.write_pty = if (value) |v| v.* else null,
@@ -352,7 +355,16 @@ fn setTyped(
         .xtversion => wrapper.effects.xtversion = if (value) |v| v.* else null,
         .title_changed => wrapper.effects.title_changed = if (value) |v| v.* else null,
         .size_cb => wrapper.effects.size_cb = if (value) |v| v.* else null,
+        .title => {
+            const str = if (value) |v| v.ptr[0..v.len] else "";
+            wrapper.terminal.setTitle(str) catch return .out_of_memory;
+        },
+        .pwd => {
+            const str = if (value) |v| v.ptr[0..v.len] else "";
+            wrapper.terminal.setPwd(str) catch return .out_of_memory;
+        },
     }
+    return .success;
 }
 
 /// C: GhosttyTerminalScrollViewport
@@ -430,6 +442,8 @@ pub const TerminalData = enum(c_int) {
     scrollbar = 9,
     cursor_style = 10,
     mouse_tracking = 11,
+    title = 12,
+    pwd = 13,
 
     /// Output type expected for querying the data of the given kind.
     pub fn OutType(comptime self: TerminalData) type {
@@ -441,6 +455,7 @@ pub const TerminalData = enum(c_int) {
             .kitty_keyboard_flags => u8,
             .scrollbar => TerminalScrollbar,
             .cursor_style => style_c.Style,
+            .title, .pwd => lib.String,
         };
     }
 };
@@ -489,6 +504,14 @@ fn getTyped(
             t.modes.get(.mouse_event_normal) or
             t.modes.get(.mouse_event_button) or
             t.modes.get(.mouse_event_any),
+        .title => {
+            const title = t.getTitle() orelse "";
+            out.* = .{ .ptr = title.ptr, .len = title.len };
+        },
+        .pwd => {
+            const pwd = t.getPwd() orelse "";
+            out.* = .{ .ptr = pwd.ptr, .len = pwd.len };
+        },
     }
 
     return .success;
@@ -1068,9 +1091,9 @@ test "set write_pty callback" {
     // Set userdata and write_pty callback
     var sentinel: u8 = 42;
     const ud: ?*anyopaque = @ptrCast(&sentinel);
-    set(t, .userdata, @ptrCast(&ud));
+    try testing.expectEqual(Result.success, set(t, .userdata, @ptrCast(&ud)));
     const cb: ?Effects.WritePtyFn = &S.writePty;
-    set(t, .write_pty, @ptrCast(&cb));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&cb)));
 
     // DECRQM for wraparound mode (mode 7, set by default) should trigger write_pty
     vt_write(t, "\x1B[?7$p", 6);
@@ -1119,8 +1142,8 @@ test "set write_pty null clears callback" {
 
     // Set then clear the callback
     const cb: ?Effects.WritePtyFn = &S.writePty;
-    set(t, .write_pty, @ptrCast(&cb));
-    set(t, .write_pty, null);
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&cb)));
+    try testing.expectEqual(Result.success, set(t, .write_pty, null));
 
     vt_write(t, "\x1B[?7$p", 6);
     try testing.expect(!S.called);
@@ -1154,9 +1177,9 @@ test "set bell callback" {
     // Set userdata and bell callback
     var sentinel: u8 = 99;
     const ud: ?*anyopaque = @ptrCast(&sentinel);
-    set(t, .userdata, @ptrCast(&ud));
+    try testing.expectEqual(Result.success, set(t, .userdata, @ptrCast(&ud)));
     const cb: ?Effects.BellFn = &S.bell;
-    set(t, .bell, @ptrCast(&cb));
+    try testing.expectEqual(Result.success, set(t, .bell, @ptrCast(&cb)));
 
     // Single BEL
     vt_write(t, "\x07", 1);
@@ -1219,9 +1242,9 @@ test "set enquiry callback" {
     defer S.deinit();
 
     const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    set(t, .write_pty, @ptrCast(&write_cb));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
     const enq_cb: ?Effects.EnquiryFn = &S.enquiry;
-    set(t, .enquiry, @ptrCast(&enq_cb));
+    try testing.expectEqual(Result.success, set(t, .enquiry, @ptrCast(&enq_cb)));
 
     // ENQ (0x05) should trigger the enquiry callback and write response via write_pty
     vt_write(t, "\x05", 1);
@@ -1280,9 +1303,9 @@ test "set xtversion callback" {
     defer S.deinit();
 
     const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    set(t, .write_pty, @ptrCast(&write_cb));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
     const xtv_cb: ?Effects.XtversionFn = &S.xtversion;
-    set(t, .xtversion, @ptrCast(&xtv_cb));
+    try testing.expectEqual(Result.success, set(t, .xtversion, @ptrCast(&xtv_cb)));
 
     // XTVERSION: CSI > q
     vt_write(t, "\x1B[>q", 4);
@@ -1321,7 +1344,7 @@ test "xtversion without callback reports default" {
 
     // Set write_pty but not xtversion — should get default "libghostty"
     const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    set(t, .write_pty, @ptrCast(&write_cb));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
 
     vt_write(t, "\x1B[>q", 4);
     try testing.expect(S.last_data != null);
@@ -1355,9 +1378,9 @@ test "set title_changed callback" {
 
     var sentinel: u8 = 77;
     const ud: ?*anyopaque = @ptrCast(&sentinel);
-    set(t, .userdata, @ptrCast(&ud));
+    try testing.expectEqual(Result.success, set(t, .userdata, @ptrCast(&ud)));
     const cb: ?Effects.TitleChangedFn = &S.titleChanged;
-    set(t, .title_changed, @ptrCast(&cb));
+    try testing.expectEqual(Result.success, set(t, .title_changed, @ptrCast(&cb)));
 
     // OSC 2 ; title ST — set window title
     vt_write(t, "\x1B]2;Hello\x1B\\", 10);
@@ -1425,9 +1448,9 @@ test "set size callback" {
     defer S.deinit();
 
     const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    set(t, .write_pty, @ptrCast(&write_cb));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
     const size_cb_fn: ?Effects.SizeFn = &S.sizeCb;
-    set(t, .size_cb, @ptrCast(&size_cb_fn));
+    try testing.expectEqual(Result.success, set(t, .size_cb, @ptrCast(&size_cb_fn)));
 
     // CSI 18 t — report text area size in characters
     vt_write(t, "\x1B[18t", 5);
@@ -1498,9 +1521,9 @@ test "set device_attributes callback primary" {
     defer S.deinit();
 
     const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    set(t, .write_pty, @ptrCast(&write_cb));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
     const da_cb: ?Effects.DeviceAttributesFn = &S.da;
-    set(t, .device_attributes, @ptrCast(&da_cb));
+    try testing.expectEqual(Result.success, set(t, .device_attributes, @ptrCast(&da_cb)));
 
     // CSI c — primary DA
     vt_write(t, "\x1B[c", 3);
@@ -1554,9 +1577,9 @@ test "set device_attributes callback secondary" {
     defer S.deinit();
 
     const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    set(t, .write_pty, @ptrCast(&write_cb));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
     const da_cb: ?Effects.DeviceAttributesFn = &S.da;
-    set(t, .device_attributes, @ptrCast(&da_cb));
+    try testing.expectEqual(Result.success, set(t, .device_attributes, @ptrCast(&da_cb)));
 
     // CSI > c — secondary DA
     vt_write(t, "\x1B[>c", 4);
@@ -1610,9 +1633,9 @@ test "set device_attributes callback tertiary" {
     defer S.deinit();
 
     const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    set(t, .write_pty, @ptrCast(&write_cb));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
     const da_cb: ?Effects.DeviceAttributesFn = &S.da;
-    set(t, .device_attributes, @ptrCast(&da_cb));
+    try testing.expectEqual(Result.success, set(t, .device_attributes, @ptrCast(&da_cb)));
 
     // CSI = c — tertiary DA
     vt_write(t, "\x1B[=c", 4);
@@ -1649,7 +1672,7 @@ test "device_attributes without callback uses default" {
     defer S.deinit();
 
     const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    set(t, .write_pty, @ptrCast(&write_cb));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
 
     // Without setting a device_attributes callback, DA1 should return the default
     vt_write(t, "\x1B[c", 3);
@@ -1690,9 +1713,9 @@ test "device_attributes callback returns false uses default" {
     defer S.deinit();
 
     const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    set(t, .write_pty, @ptrCast(&write_cb));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
     const da_cb: ?Effects.DeviceAttributesFn = &S.da;
-    set(t, .device_attributes, @ptrCast(&da_cb));
+    try testing.expectEqual(Result.success, set(t, .device_attributes, @ptrCast(&da_cb)));
 
     // Callback returns false, should use default response
     vt_write(t, "\x1B[c", 3);
@@ -1700,6 +1723,98 @@ test "device_attributes callback returns false uses default" {
     try testing.expectEqualStrings("\x1b[?62;22c", S.last_data.?);
 }
 
+test "set and get title" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    // No title set yet — should return empty string
+    var title: lib.String = undefined;
+    try testing.expectEqual(Result.success, get(t, .title, @ptrCast(&title)));
+    try testing.expectEqual(@as(usize, 0), title.len);
+
+    // Set title via option
+    const hello: lib.String = .{ .ptr = "Hello", .len = 5 };
+    try testing.expectEqual(Result.success, set(t, .title, @ptrCast(&hello)));
+
+    try testing.expectEqual(Result.success, get(t, .title, @ptrCast(&title)));
+    try testing.expectEqualStrings("Hello", title.ptr[0..title.len]);
+
+    // Overwrite title
+    const world: lib.String = .{ .ptr = "World", .len = 5 };
+    try testing.expectEqual(Result.success, set(t, .title, @ptrCast(&world)));
+
+    try testing.expectEqual(Result.success, get(t, .title, @ptrCast(&title)));
+    try testing.expectEqualStrings("World", title.ptr[0..title.len]);
+
+    // Clear title with NULL
+    try testing.expectEqual(Result.success, set(t, .title, null));
+
+    try testing.expectEqual(Result.success, get(t, .title, @ptrCast(&title)));
+    try testing.expectEqual(@as(usize, 0), title.len);
+}
+
+test "set and get pwd" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    // No pwd set yet — should return empty string
+    var pwd: lib.String = undefined;
+    try testing.expectEqual(Result.success, get(t, .pwd, @ptrCast(&pwd)));
+    try testing.expectEqual(@as(usize, 0), pwd.len);
+
+    // Set pwd via option
+    const home: lib.String = .{ .ptr = "/home/user", .len = 10 };
+    try testing.expectEqual(Result.success, set(t, .pwd, @ptrCast(&home)));
+
+    try testing.expectEqual(Result.success, get(t, .pwd, @ptrCast(&pwd)));
+    try testing.expectEqualStrings("/home/user", pwd.ptr[0..pwd.len]);
+
+    // Clear pwd with NULL
+    try testing.expectEqual(Result.success, set(t, .pwd, null));
+
+    try testing.expectEqual(Result.success, get(t, .pwd, @ptrCast(&pwd)));
+    try testing.expectEqual(@as(usize, 0), pwd.len);
+}
+
+test "get title set via vt_write" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    // Set title via OSC 2
+    vt_write(t, "\x1B]2;VT Title\x1B\\", 14);
+
+    var title: lib.String = undefined;
+    try testing.expectEqual(Result.success, get(t, .title, @ptrCast(&title)));
+    try testing.expectEqualStrings("VT Title", title.ptr[0..title.len]);
+}
+
 test "grid_ref out of bounds" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(

From 6e34bc686cbfd86c69418fffd9805d68c197b9a7 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 13:37:03 -0700
Subject: [PATCH 380/391] vt: pass pointer options directly to terminal_set

Previously ghostty_terminal_set required all values to be passed as
pointers to the value, even when the value itself was already a
pointer (userdata, function pointer callbacks). This forced callers
into awkward patterns like compound literals or intermediate
variables just to take the address of a pointer.

Now pointer-typed options (userdata and all callbacks) are passed
directly as the value parameter. Only non-pointer types like
GhosttyString still require a pointer to the value. This
simplifies InType to return the actual stored type for each option
and lets setTyped work with those types directly.
---
 example/c-vt-effects/src/main.c |  17 +++---
 include/ghostty/vt/terminal.h   |  24 ++++----
 src/terminal/c/terminal.zig     | 100 +++++++++++++-------------------
 3 files changed, 59 insertions(+), 82 deletions(-)

diff --git a/example/c-vt-effects/src/main.c b/example/c-vt-effects/src/main.c
index c6688cf5c..1e3a3d645 100644
--- a/example/c-vt-effects/src/main.c
+++ b/example/c-vt-effects/src/main.c
@@ -55,18 +55,15 @@ int main() {
 
   // Set up userdata — a simple bell counter
   int bell_count = 0;
-  void* ud = &bell_count;
-  ghostty_terminal_set(terminal, GHOSTTY_TERMINAL_OPT_USERDATA, &ud);
+  ghostty_terminal_set(terminal, GHOSTTY_TERMINAL_OPT_USERDATA, &bell_count);
 
   // Register effect callbacks
-  GhosttyTerminalWritePtyFn write_fn = on_write_pty;
-  ghostty_terminal_set(terminal, GHOSTTY_TERMINAL_OPT_WRITE_PTY, &write_fn);
-
-  GhosttyTerminalBellFn bell_fn = on_bell;
-  ghostty_terminal_set(terminal, GHOSTTY_TERMINAL_OPT_BELL, &bell_fn);
-
-  GhosttyTerminalTitleChangedFn title_fn = on_title_changed;
-  ghostty_terminal_set(terminal, GHOSTTY_TERMINAL_OPT_TITLE_CHANGED, &title_fn);
+  ghostty_terminal_set(terminal, GHOSTTY_TERMINAL_OPT_WRITE_PTY,
+      (const void *)on_write_pty);
+  ghostty_terminal_set(terminal, GHOSTTY_TERMINAL_OPT_BELL,
+      (const void *)on_bell);
+  ghostty_terminal_set(terminal, GHOSTTY_TERMINAL_OPT_TITLE_CHANGED,
+      (const void *)on_title_changed);
 
   // Feed VT data that triggers effects:
 
diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 30f6179c8..f8bb3aa22 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -341,7 +341,7 @@ typedef enum {
   /**
    * Opaque userdata pointer passed to all callbacks.
    *
-   * Input type: void**
+   * Input type: void*
    */
   GHOSTTY_TERMINAL_OPT_USERDATA = 0,
 
@@ -350,7 +350,7 @@ typedef enum {
    * to the pty (e.g. in response to a DECRQM query or device
    * status report). Set to NULL to ignore such sequences.
    *
-   * Input type: GhosttyTerminalWritePtyFn*
+   * Input type: GhosttyTerminalWritePtyFn
    */
   GHOSTTY_TERMINAL_OPT_WRITE_PTY = 1,
 
@@ -358,7 +358,7 @@ typedef enum {
    * Callback invoked when the terminal receives a BEL character
    * (0x07). Set to NULL to ignore bell events.
    *
-   * Input type: GhosttyTerminalBellFn*
+   * Input type: GhosttyTerminalBellFn
    */
   GHOSTTY_TERMINAL_OPT_BELL = 2,
 
@@ -366,7 +366,7 @@ typedef enum {
    * Callback invoked when the terminal receives an ENQ character
    * (0x05). Set to NULL to send no response.
    *
-   * Input type: GhosttyTerminalEnquiryFn*
+   * Input type: GhosttyTerminalEnquiryFn
    */
   GHOSTTY_TERMINAL_OPT_ENQUIRY = 3,
 
@@ -374,7 +374,7 @@ typedef enum {
    * Callback invoked when the terminal receives an XTVERSION query
    * (CSI > q). Set to NULL to report the default "libghostty" string.
    *
-   * Input type: GhosttyTerminalXtversionFn*
+   * Input type: GhosttyTerminalXtversionFn
    */
   GHOSTTY_TERMINAL_OPT_XTVERSION = 4,
 
@@ -383,7 +383,7 @@ typedef enum {
    * sequences (e.g. OSC 0 or OSC 2). Set to NULL to ignore title
    * change events.
    *
-   * Input type: GhosttyTerminalTitleChangedFn*
+   * Input type: GhosttyTerminalTitleChangedFn
    */
   GHOSTTY_TERMINAL_OPT_TITLE_CHANGED = 5,
 
@@ -391,7 +391,7 @@ typedef enum {
    * Callback invoked in response to XTWINOPS size queries
    * (CSI 14/16/18 t). Set to NULL to silently ignore size queries.
    *
-   * Input type: GhosttyTerminalSizeFn*
+   * Input type: GhosttyTerminalSizeFn
    */
   GHOSTTY_TERMINAL_OPT_SIZE = 6,
 
@@ -401,7 +401,7 @@ typedef enum {
    * to report the current scheme, or return false to silently ignore.
    * Set to NULL to ignore color scheme queries.
    *
-   * Input type: GhosttyTerminalColorSchemeFn*
+   * Input type: GhosttyTerminalColorSchemeFn
    */
   GHOSTTY_TERMINAL_OPT_COLOR_SCHEME = 7,
 
@@ -411,7 +411,7 @@ typedef enum {
    * pointer with response data, or return false to silently ignore.
    * Set to NULL to ignore device attributes queries.
    *
-   * Input type: GhosttyTerminalDeviceAttributesFn*
+   * Input type: GhosttyTerminalDeviceAttributesFn
    */
   GHOSTTY_TERMINAL_OPT_DEVICE_ATTRIBUTES = 8,
 
@@ -619,8 +619,10 @@ GhosttyResult ghostty_terminal_resize(GhosttyTerminal terminal,
  * Set an option on the terminal.
  *
  * Configures terminal callbacks and associated state such as the
- * write_pty callback and userdata pointer. A NULL value pointer
- * clears the option to its default (NULL/disabled).
+ * write_pty callback and userdata pointer. The value is passed
+ * directly for pointer types (callbacks, userdata) or as a pointer
+ * to the value for non-pointer types (e.g. GhosttyString*).
+ * NULL clears the option to its default.
  *
  * Callbacks are invoked synchronously during ghostty_terminal_vt_write().
  * Callbacks must not call ghostty_terminal_vt_write() on the same
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index da8e91a0f..f5b271e35 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -304,7 +304,7 @@ pub const Option = enum(c_int) {
     /// Input type expected for setting the option.
     pub fn InType(comptime self: Option) type {
         return switch (self) {
-            .userdata => ?*anyopaque,
+            .userdata => ?*const anyopaque,
             .write_pty => ?Effects.WritePtyFn,
             .bell => ?Effects.BellFn,
             .color_scheme => ?Effects.ColorSchemeFn,
@@ -313,7 +313,7 @@ pub const Option = enum(c_int) {
             .xtversion => ?Effects.XtversionFn,
             .title_changed => ?Effects.TitleChangedFn,
             .size_cb => ?Effects.SizeFn,
-            .title, .pwd => lib.String,
+            .title, .pwd => ?*const lib.String,
         };
     }
 };
@@ -330,9 +330,11 @@ pub fn set(
         };
     }
 
+    const wrapper = terminal_ orelse return .invalid_value;
+
     return switch (option) {
         inline else => |comptime_option| setTyped(
-            terminal_,
+            wrapper,
             comptime_option,
             @ptrCast(@alignCast(value)),
         ),
@@ -340,21 +342,20 @@ pub fn set(
 }
 
 fn setTyped(
-    terminal_: Terminal,
+    wrapper: *TerminalWrapper,
     comptime option: Option,
-    value: ?*const option.InType(),
+    value: option.InType(),
 ) Result {
-    const wrapper = terminal_ orelse return .invalid_value;
     switch (option) {
-        .userdata => wrapper.effects.userdata = if (value) |v| v.* else null,
-        .write_pty => wrapper.effects.write_pty = if (value) |v| v.* else null,
-        .bell => wrapper.effects.bell = if (value) |v| v.* else null,
-        .color_scheme => wrapper.effects.color_scheme = if (value) |v| v.* else null,
-        .device_attributes => wrapper.effects.device_attributes_cb = if (value) |v| v.* else null,
-        .enquiry => wrapper.effects.enquiry = if (value) |v| v.* else null,
-        .xtversion => wrapper.effects.xtversion = if (value) |v| v.* else null,
-        .title_changed => wrapper.effects.title_changed = if (value) |v| v.* else null,
-        .size_cb => wrapper.effects.size_cb = if (value) |v| v.* else null,
+        .userdata => wrapper.effects.userdata = @constCast(value),
+        .write_pty => wrapper.effects.write_pty = value,
+        .bell => wrapper.effects.bell = value,
+        .color_scheme => wrapper.effects.color_scheme = value,
+        .device_attributes => wrapper.effects.device_attributes_cb = value,
+        .enquiry => wrapper.effects.enquiry = value,
+        .xtversion => wrapper.effects.xtversion = value,
+        .title_changed => wrapper.effects.title_changed = value,
+        .size_cb => wrapper.effects.size_cb = value,
         .title => {
             const str = if (value) |v| v.ptr[0..v.len] else "";
             wrapper.terminal.setTitle(str) catch return .out_of_memory;
@@ -1090,10 +1091,8 @@ test "set write_pty callback" {
 
     // Set userdata and write_pty callback
     var sentinel: u8 = 42;
-    const ud: ?*anyopaque = @ptrCast(&sentinel);
-    try testing.expectEqual(Result.success, set(t, .userdata, @ptrCast(&ud)));
-    const cb: ?Effects.WritePtyFn = &S.writePty;
-    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&cb)));
+    try testing.expectEqual(Result.success, set(t, .userdata, @ptrCast(&sentinel)));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&S.writePty)));
 
     // DECRQM for wraparound mode (mode 7, set by default) should trigger write_pty
     vt_write(t, "\x1B[?7$p", 6);
@@ -1141,8 +1140,7 @@ test "set write_pty null clears callback" {
     S.called = false;
 
     // Set then clear the callback
-    const cb: ?Effects.WritePtyFn = &S.writePty;
-    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&cb)));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&S.writePty)));
     try testing.expectEqual(Result.success, set(t, .write_pty, null));
 
     vt_write(t, "\x1B[?7$p", 6);
@@ -1176,10 +1174,8 @@ test "set bell callback" {
 
     // Set userdata and bell callback
     var sentinel: u8 = 99;
-    const ud: ?*anyopaque = @ptrCast(&sentinel);
-    try testing.expectEqual(Result.success, set(t, .userdata, @ptrCast(&ud)));
-    const cb: ?Effects.BellFn = &S.bell;
-    try testing.expectEqual(Result.success, set(t, .bell, @ptrCast(&cb)));
+    try testing.expectEqual(Result.success, set(t, .userdata, @ptrCast(&sentinel)));
+    try testing.expectEqual(Result.success, set(t, .bell, @ptrCast(&S.bell)));
 
     // Single BEL
     vt_write(t, "\x07", 1);
@@ -1241,10 +1237,8 @@ test "set enquiry callback" {
     };
     defer S.deinit();
 
-    const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
-    const enq_cb: ?Effects.EnquiryFn = &S.enquiry;
-    try testing.expectEqual(Result.success, set(t, .enquiry, @ptrCast(&enq_cb)));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&S.writePty)));
+    try testing.expectEqual(Result.success, set(t, .enquiry, @ptrCast(&S.enquiry)));
 
     // ENQ (0x05) should trigger the enquiry callback and write response via write_pty
     vt_write(t, "\x05", 1);
@@ -1302,10 +1296,8 @@ test "set xtversion callback" {
     };
     defer S.deinit();
 
-    const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
-    const xtv_cb: ?Effects.XtversionFn = &S.xtversion;
-    try testing.expectEqual(Result.success, set(t, .xtversion, @ptrCast(&xtv_cb)));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&S.writePty)));
+    try testing.expectEqual(Result.success, set(t, .xtversion, @ptrCast(&S.xtversion)));
 
     // XTVERSION: CSI > q
     vt_write(t, "\x1B[>q", 4);
@@ -1343,8 +1335,7 @@ test "xtversion without callback reports default" {
     defer S.deinit();
 
     // Set write_pty but not xtversion — should get default "libghostty"
-    const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&S.writePty)));
 
     vt_write(t, "\x1B[>q", 4);
     try testing.expect(S.last_data != null);
@@ -1377,10 +1368,8 @@ test "set title_changed callback" {
     S.last_userdata = null;
 
     var sentinel: u8 = 77;
-    const ud: ?*anyopaque = @ptrCast(&sentinel);
-    try testing.expectEqual(Result.success, set(t, .userdata, @ptrCast(&ud)));
-    const cb: ?Effects.TitleChangedFn = &S.titleChanged;
-    try testing.expectEqual(Result.success, set(t, .title_changed, @ptrCast(&cb)));
+    try testing.expectEqual(Result.success, set(t, .userdata, @ptrCast(&sentinel)));
+    try testing.expectEqual(Result.success, set(t, .title_changed, @ptrCast(&S.titleChanged)));
 
     // OSC 2 ; title ST — set window title
     vt_write(t, "\x1B]2;Hello\x1B\\", 10);
@@ -1447,10 +1436,8 @@ test "set size callback" {
     };
     defer S.deinit();
 
-    const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
-    const size_cb_fn: ?Effects.SizeFn = &S.sizeCb;
-    try testing.expectEqual(Result.success, set(t, .size_cb, @ptrCast(&size_cb_fn)));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&S.writePty)));
+    try testing.expectEqual(Result.success, set(t, .size_cb, @ptrCast(&S.sizeCb)));
 
     // CSI 18 t — report text area size in characters
     vt_write(t, "\x1B[18t", 5);
@@ -1520,10 +1507,8 @@ test "set device_attributes callback primary" {
     };
     defer S.deinit();
 
-    const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
-    const da_cb: ?Effects.DeviceAttributesFn = &S.da;
-    try testing.expectEqual(Result.success, set(t, .device_attributes, @ptrCast(&da_cb)));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&S.writePty)));
+    try testing.expectEqual(Result.success, set(t, .device_attributes, @ptrCast(&S.da)));
 
     // CSI c — primary DA
     vt_write(t, "\x1B[c", 3);
@@ -1576,10 +1561,8 @@ test "set device_attributes callback secondary" {
     };
     defer S.deinit();
 
-    const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
-    const da_cb: ?Effects.DeviceAttributesFn = &S.da;
-    try testing.expectEqual(Result.success, set(t, .device_attributes, @ptrCast(&da_cb)));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&S.writePty)));
+    try testing.expectEqual(Result.success, set(t, .device_attributes, @ptrCast(&S.da)));
 
     // CSI > c — secondary DA
     vt_write(t, "\x1B[>c", 4);
@@ -1632,10 +1615,8 @@ test "set device_attributes callback tertiary" {
     };
     defer S.deinit();
 
-    const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
-    const da_cb: ?Effects.DeviceAttributesFn = &S.da;
-    try testing.expectEqual(Result.success, set(t, .device_attributes, @ptrCast(&da_cb)));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&S.writePty)));
+    try testing.expectEqual(Result.success, set(t, .device_attributes, @ptrCast(&S.da)));
 
     // CSI = c — tertiary DA
     vt_write(t, "\x1B[=c", 4);
@@ -1671,8 +1652,7 @@ test "device_attributes without callback uses default" {
     };
     defer S.deinit();
 
-    const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&S.writePty)));
 
     // Without setting a device_attributes callback, DA1 should return the default
     vt_write(t, "\x1B[c", 3);
@@ -1712,10 +1692,8 @@ test "device_attributes callback returns false uses default" {
     };
     defer S.deinit();
 
-    const write_cb: ?Effects.WritePtyFn = &S.writePty;
-    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&write_cb)));
-    const da_cb: ?Effects.DeviceAttributesFn = &S.da;
-    try testing.expectEqual(Result.success, set(t, .device_attributes, @ptrCast(&da_cb)));
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&S.writePty)));
+    try testing.expectEqual(Result.success, set(t, .device_attributes, @ptrCast(&S.da)));
 
     // Callback returns false, should use default response
     vt_write(t, "\x1B[c", 3);

From 2c16c9e40c8862342ea02a9f3ffae2a52c3735e3 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 13:57:34 -0700
Subject: [PATCH 381/391] vt: add total_rows and scrollback_rows to terminal
 get API

Add total_rows and scrollback_rows as new TerminalData variants
queryable through the existing ghostty_terminal_get interface,
using the cached O(1) total_rows field from PageList rather than
introducing standalone functions.
---
 include/ghostty/vt/terminal.h | 14 +++++++++++
 src/terminal/c/terminal.zig   | 47 +++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index 30f6179c8..86a425dce 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -556,6 +556,20 @@ typedef enum {
    * Output type: GhosttyString *
    */
   GHOSTTY_TERMINAL_DATA_PWD = 13,
+
+  /**
+   * The total number of rows in the active screen including scrollback.
+   *
+   * Output type: size_t *
+   */
+  GHOSTTY_TERMINAL_DATA_TOTAL_ROWS = 14,
+
+  /**
+   * The number of scrollback rows (total rows minus viewport rows).
+   *
+   * Output type: size_t *
+   */
+  GHOSTTY_TERMINAL_DATA_SCROLLBACK_ROWS = 15,
 } GhosttyTerminalData;
 
 /**
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index da8e91a0f..60b192c96 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -444,6 +444,8 @@ pub const TerminalData = enum(c_int) {
     mouse_tracking = 11,
     title = 12,
     pwd = 13,
+    total_rows = 14,
+    scrollback_rows = 15,
 
     /// Output type expected for querying the data of the given kind.
     pub fn OutType(comptime self: TerminalData) type {
@@ -456,6 +458,7 @@ pub const TerminalData = enum(c_int) {
             .scrollbar => TerminalScrollbar,
             .cursor_style => style_c.Style,
             .title, .pwd => lib.String,
+            .total_rows, .scrollback_rows => usize,
         };
     }
 };
@@ -512,6 +515,8 @@ fn getTyped(
             const pwd = t.getPwd() orelse "";
             out.* = .{ .ptr = pwd.ptr, .len = pwd.len };
         },
+        .total_rows => out.* = t.screens.active.pages.total_rows,
+        .scrollback_rows => out.* = t.screens.active.pages.total_rows - t.rows,
     }
 
     return .success;
@@ -1003,6 +1008,48 @@ test "get mouse_tracking" {
     try testing.expect(!tracking);
 }
 
+test "get total_rows" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer free(t);
+
+    var total: usize = undefined;
+    try testing.expectEqual(Result.success, get(t, .total_rows, @ptrCast(&total)));
+    try testing.expect(total >= 24);
+}
+
+test "get scrollback_rows" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 3,
+            .max_scrollback = 10_000,
+        },
+    ));
+    defer free(t);
+
+    var scrollback: usize = undefined;
+    try testing.expectEqual(Result.success, get(t, .scrollback_rows, @ptrCast(&scrollback)));
+    try testing.expectEqual(@as(usize, 0), scrollback);
+
+    // Write enough lines to push content into scrollback
+    vt_write(t, "line1\r\nline2\r\nline3\r\nline4\r\nline5\r\n", 34);
+
+    try testing.expectEqual(Result.success, get(t, .scrollback_rows, @ptrCast(&scrollback)));
+    try testing.expectEqual(@as(usize, 2), scrollback);
+}
+
 test "get invalid" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(

From c12f62c82d62f36c850a1e06221d84719948b2a4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 24 Mar 2026 14:15:02 -0700
Subject: [PATCH 382/391] vt: handle pixel sizes and size reports in
 ghostty_terminal_resize

The resize function now requires cell_width_px and cell_height_px
parameters and handles the full resize sequence: computing and
setting width_px/height_px on the terminal, clearing synchronized output mode
so changes display immediately, and encoding a mode 2048 in-band size report
via the write_pty callback when that mode is enabled.

A valid width/height px is critical for some applications and protocols
and some applications rely directly on in-band size reports, so this
change is necessary to support those use cases.
---
 include/ghostty/vt/terminal.h |  29 ++++-
 src/terminal/c/terminal.zig   | 227 +++++++++++++++++++++++++++++++++-
 2 files changed, 250 insertions(+), 6 deletions(-)

diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
index a6ea128e7..e23aea93b 100644
--- a/include/ghostty/vt/terminal.h
+++ b/include/ghostty/vt/terminal.h
@@ -570,6 +570,24 @@ typedef enum {
    * Output type: size_t *
    */
   GHOSTTY_TERMINAL_DATA_SCROLLBACK_ROWS = 15,
+
+  /**
+   * The total width of the terminal in pixels.
+   *
+   * This is cols * cell_width_px as set by ghostty_terminal_resize().
+   *
+   * Output type: uint32_t *
+   */
+  GHOSTTY_TERMINAL_DATA_WIDTH_PX = 16,
+
+  /**
+   * The total height of the terminal in pixels.
+   *
+   * This is rows * cell_height_px as set by ghostty_terminal_resize().
+   *
+   * Output type: uint32_t *
+   */
+  GHOSTTY_TERMINAL_DATA_HEIGHT_PX = 17,
 } GhosttyTerminalData;
 
 /**
@@ -618,16 +636,25 @@ void ghostty_terminal_reset(GhosttyTerminal terminal);
  * screen will reflow content if wraparound mode is enabled; the alternate
  * screen does not reflow. If the dimensions are unchanged, this is a no-op.
  *
+ * This also updates the terminal's pixel dimensions (used for image
+ * protocols and size reports), disables synchronized output mode (allowed
+ * by the spec so that resize results are shown immediately), and sends an
+ * in-band size report if mode 2048 is enabled.
+ *
  * @param terminal The terminal handle (NULL returns GHOSTTY_INVALID_VALUE)
  * @param cols New width in cells (must be greater than zero)
  * @param rows New height in cells (must be greater than zero)
+ * @param cell_width_px Width of a single cell in pixels
+ * @param cell_height_px Height of a single cell in pixels
  * @return GHOSTTY_SUCCESS on success, or an error code on failure
  *
  * @ingroup terminal
  */
 GhosttyResult ghostty_terminal_resize(GhosttyTerminal terminal,
                                       uint16_t cols,
-                                      uint16_t rows);
+                                      uint16_t rows,
+                                      uint32_t cell_width_px,
+                                      uint32_t cell_height_px);
 
 /**
  * Set an option on the terminal.
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index c366134b5..113e00b96 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -387,10 +387,39 @@ pub fn resize(
     terminal_: Terminal,
     cols: size.CellCountInt,
     rows: size.CellCountInt,
+    cell_width_px: u32,
+    cell_height_px: u32,
 ) callconv(.c) Result {
-    const t: *ZigTerminal = (terminal_ orelse return .invalid_value).terminal;
+    const wrapper = terminal_ orelse return .invalid_value;
+    const t = wrapper.terminal;
     if (cols == 0 or rows == 0) return .invalid_value;
     t.resize(t.gpa(), cols, rows) catch return .out_of_memory;
+
+    // Update pixel sizes
+    t.width_px = std.math.mul(u32, cols, cell_width_px) catch std.math.maxInt(u32);
+    t.height_px = std.math.mul(u32, rows, cell_height_px) catch std.math.maxInt(u32);
+
+    // Disable synchronized output mode so that we show changes
+    // immediately for a resize. This is allowed by the spec.
+    t.modes.set(.synchronized_output, false);
+
+    // If we have in-band size reporting enabled, send a report.
+    if (t.modes.get(.in_band_size_reports)) in_band: {
+        const func = wrapper.effects.write_pty orelse break :in_band;
+
+        var buf: [1024]u8 = undefined;
+        var writer: std.Io.Writer = .fixed(&buf);
+        size_report.encode(&writer, .mode_2048, .{
+            .rows = rows,
+            .columns = cols,
+            .cell_width = cell_width_px,
+            .cell_height = cell_height_px,
+        }) catch break :in_band;
+
+        const data = writer.buffered();
+        func(@ptrCast(wrapper), wrapper.effects.userdata, data.ptr, data.len);
+    }
+
     return .success;
 }
 
@@ -447,6 +476,8 @@ pub const TerminalData = enum(c_int) {
     pwd = 13,
     total_rows = 14,
     scrollback_rows = 15,
+    width_px = 16,
+    height_px = 17,
 
     /// Output type expected for querying the data of the given kind.
     pub fn OutType(comptime self: TerminalData) type {
@@ -460,6 +491,7 @@ pub const TerminalData = enum(c_int) {
             .cursor_style => style_c.Style,
             .title, .pwd => lib.String,
             .total_rows, .scrollback_rows => usize,
+            .width_px, .height_px => u32,
         };
     }
 };
@@ -518,6 +550,8 @@ fn getTyped(
         },
         .total_rows => out.* = t.screens.active.pages.total_rows,
         .scrollback_rows => out.* = t.screens.active.pages.total_rows - t.rows,
+        .width_px => out.* = t.width_px,
+        .height_px => out.* = t.height_px,
     }
 
     return .success;
@@ -692,13 +726,13 @@ test "resize" {
     ));
     defer free(t);
 
-    try testing.expectEqual(Result.success, resize(t, 40, 12));
+    try testing.expectEqual(Result.success, resize(t, 40, 12, 9, 18));
     try testing.expectEqual(40, t.?.terminal.cols);
     try testing.expectEqual(12, t.?.terminal.rows);
 }
 
 test "resize null" {
-    try testing.expectEqual(Result.invalid_value, resize(null, 80, 24));
+    try testing.expectEqual(Result.invalid_value, resize(null, 80, 24, 9, 18));
 }
 
 test "resize invalid value" {
@@ -714,8 +748,8 @@ test "resize invalid value" {
     ));
     defer free(t);
 
-    try testing.expectEqual(Result.invalid_value, resize(t, 0, 24));
-    try testing.expectEqual(Result.invalid_value, resize(t, 80, 0));
+    try testing.expectEqual(Result.invalid_value, resize(t, 0, 24, 9, 18));
+    try testing.expectEqual(Result.invalid_value, resize(t, 80, 0, 9, 18));
 }
 
 test "mode_get and mode_set" {
@@ -1840,6 +1874,189 @@ test "get title set via vt_write" {
     try testing.expectEqualStrings("VT Title", title.ptr[0..title.len]);
 }
 
+test "resize updates pixel dimensions" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    try testing.expectEqual(Result.success, resize(t, 100, 40, 9, 18));
+
+    const zt = t.?.terminal;
+    try testing.expectEqual(@as(u32, 100 * 9), zt.width_px);
+    try testing.expectEqual(@as(u32, 40 * 18), zt.height_px);
+}
+
+test "resize pixel overflow saturates" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    try testing.expectEqual(Result.success, resize(t, 100, 40, std.math.maxInt(u32), std.math.maxInt(u32)));
+
+    const zt = t.?.terminal;
+    try testing.expectEqual(std.math.maxInt(u32), zt.width_px);
+    try testing.expectEqual(std.math.maxInt(u32), zt.height_px);
+}
+
+test "resize disables synchronized output" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const zt = t.?.terminal;
+    zt.modes.set(.synchronized_output, true);
+
+    try testing.expectEqual(Result.success, resize(t, 100, 40, 9, 18));
+    try testing.expect(!zt.modes.get(.synchronized_output));
+}
+
+test "resize sends in-band size report" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const S = struct {
+        var last_data: ?[]u8 = null;
+
+        fn deinit() void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = null;
+        }
+
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+            if (last_data) |d| testing.allocator.free(d);
+            last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
+        }
+    };
+    defer S.deinit();
+
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&S.writePty)));
+
+    // Enable in-band size reports (mode 2048)
+    t.?.terminal.modes.set(.in_band_size_reports, true);
+
+    try testing.expectEqual(Result.success, resize(t, 100, 40, 9, 18));
+
+    // Expected: \x1B[48;rows;cols;height_px;width_pxt
+    // height_px = 40*18 = 720, width_px = 100*9 = 900
+    try testing.expect(S.last_data != null);
+    try testing.expectEqualStrings("\x1B[48;40;100;720;900t", S.last_data.?);
+}
+
+test "resize no size report without mode 2048" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    const S = struct {
+        var called: bool = false;
+        fn writePty(_: Terminal, _: ?*anyopaque, _: [*]const u8, _: usize) callconv(.c) void {
+            called = true;
+        }
+    };
+    S.called = false;
+
+    try testing.expectEqual(Result.success, set(t, .write_pty, @ptrCast(&S.writePty)));
+
+    // in_band_size_reports is off by default
+    try testing.expectEqual(Result.success, resize(t, 100, 40, 9, 18));
+    try testing.expect(!S.called);
+}
+
+test "resize in-band report without write_pty callback" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    // Enable mode 2048 but don't set a write_pty callback — should not crash
+    t.?.terminal.modes.set(.in_band_size_reports, true);
+    try testing.expectEqual(Result.success, resize(t, 100, 40, 9, 18));
+}
+
+test "resize null terminal" {
+    try testing.expectEqual(Result.invalid_value, resize(null, 100, 40, 9, 18));
+}
+
+test "resize zero cols" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    try testing.expectEqual(Result.invalid_value, resize(t, 0, 40, 9, 18));
+}
+
+test "resize zero rows" {
+    var t: Terminal = null;
+    try testing.expectEqual(Result.success, new(
+        &lib_alloc.test_allocator,
+        &t,
+        .{
+            .cols = 80,
+            .rows = 24,
+            .max_scrollback = 0,
+        },
+    ));
+    defer free(t);
+
+    try testing.expectEqual(Result.invalid_value, resize(t, 100, 0, 9, 18));
+}
+
 test "grid_ref out of bounds" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(

From f50aa90ced49a05066fae4ee00071adb34dee6b5 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 25 Mar 2026 07:22:02 -0700
Subject: [PATCH 383/391] terminal: add lib.zig to centralize lib target and
 re-exports

Previously every file in the terminal package independently imported
build_options and ../lib/main.zig, then computed the same
lib_target constant. This was repetitive and meant each file needed
both imports just to get the target.

Introduce src/terminal/lib.zig which computes the target once and
re-exports the commonly used lib types (Enum, TaggedUnion, Struct,
String, checkGhosttyHEnum, structSizedFieldFits). All terminal
package files now import lib.zig and use lib.target instead of the
local lib_target constant, removing the per-file boilerplate.
---
 src/terminal/ScreenSet.zig                    |  7 ++----
 src/terminal/Terminal.zig                     |  8 +++----
 src/terminal/ansi.zig                         | 10 ++++----
 src/terminal/c/render.zig                     |  2 +-
 src/terminal/c/terminal.zig                   |  2 +-
 src/terminal/csi.zig                          |  6 ++---
 src/terminal/device_attributes.zig            |  6 ++---
 src/terminal/device_status.zig                |  6 ++---
 src/terminal/focus.zig                        |  6 ++---
 src/terminal/formatter.zig                    |  6 ++---
 src/terminal/lib.zig                          | 23 +++++++++++++++++++
 src/terminal/mouse.zig                        |  7 +++---
 src/terminal/osc.zig                          |  6 ++---
 .../osc/parsers/kitty_text_sizing.zig         |  8 +++----
 src/terminal/point.zig                        |  9 +++-----
 src/terminal/render.zig                       |  6 ++---
 src/terminal/sgr.zig                          |  9 +++-----
 src/terminal/size_report.zig                  |  8 +++----
 src/terminal/stream.zig                       | 12 ++++------
 19 files changed, 69 insertions(+), 78 deletions(-)
 create mode 100644 src/terminal/lib.zig

diff --git a/src/terminal/ScreenSet.zig b/src/terminal/ScreenSet.zig
index 6fe866f70..d0856da51 100644
--- a/src/terminal/ScreenSet.zig
+++ b/src/terminal/ScreenSet.zig
@@ -9,16 +9,13 @@ const ScreenSet = @This();
 
 const std = @import("std");
 const assert = @import("../quirks.zig").inlineAssert;
-const build_options = @import("terminal_options");
-const lib = @import("../lib/main.zig");
+const lib = @import("lib.zig");
 const testing = std.testing;
 const Allocator = std.mem.Allocator;
 const Screen = @import("Screen.zig");
 
-const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
-
 /// The possible keys for screens in the screen set.
-pub const Key = lib.Enum(lib_target, &.{
+pub const Key = lib.Enum(lib.target, &.{
     "primary",
     "alternate",
 });
diff --git a/src/terminal/Terminal.zig b/src/terminal/Terminal.zig
index 9c956ec92..c09eb9981 100644
--- a/src/terminal/Terminal.zig
+++ b/src/terminal/Terminal.zig
@@ -5,7 +5,7 @@ const Terminal = @This();
 
 const std = @import("std");
 const build_options = @import("terminal_options");
-const lib = @import("../lib/main.zig");
+const lib = @import("lib.zig");
 const assert = @import("../quirks.zig").inlineAssert;
 const testing = std.testing;
 const Allocator = std.mem.Allocator;
@@ -35,8 +35,6 @@ const Page = pagepkg.Page;
 const Cell = pagepkg.Cell;
 const Row = pagepkg.Row;
 
-const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
-
 const log = std.log.scoped(.terminal);
 
 /// Default tabstop interval
@@ -1706,14 +1704,14 @@ pub const ScrollViewport = union(Tag) {
     /// Scroll by some delta amount, up is negative.
     delta: isize,
 
-    pub const Tag = lib.Enum(lib_target, &.{
+    pub const Tag = lib.Enum(lib.target, &.{
         "top",
         "bottom",
         "delta",
     });
 
     const c_union = lib.TaggedUnion(
-        lib_target,
+        lib.target,
         @This(),
         // Padding: largest variant is isize (8 bytes on 64-bit).
         // Use [2]u64 (16 bytes) for future expansion.
diff --git a/src/terminal/ansi.zig b/src/terminal/ansi.zig
index 86b00c801..4e777b7c6 100644
--- a/src/terminal/ansi.zig
+++ b/src/terminal/ansi.zig
@@ -1,6 +1,4 @@
-const build_options = @import("terminal_options");
-const lib = @import("../lib/main.zig");
-const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
+const lib = @import("lib.zig");
 
 /// C0 (7-bit) control characters from ANSI.
 ///
@@ -54,7 +52,7 @@ pub const RenditionAspect = enum(u16) {
 
 /// Possible cursor styles (ESC [ q)
 pub const CursorStyle = lib.Enum(
-    lib_target,
+    lib.target,
     &.{
         "default",
         "blinking_block",
@@ -78,7 +76,7 @@ pub const StatusLineType = enum(u16) {
 
 /// The display to target for status updates (DECSASD).
 pub const StatusDisplay = lib.Enum(
-    lib_target,
+    lib.target,
     &.{
         "main",
         "status_line",
@@ -88,7 +86,7 @@ pub const StatusDisplay = lib.Enum(
 /// The possible modify key formats to ESC[>{a};{b}m
 /// Note: this is not complete, we should add more as we support more
 pub const ModifyKeyFormat = lib.Enum(
-    lib_target,
+    lib.target,
     &.{
         "legacy",
         "cursor_keys",
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index 020dbc202..e29dfd019 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const testing = std.testing;
 const Allocator = std.mem.Allocator;
-const lib = @import("../../lib/main.zig");
+const lib = @import("../lib.zig");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const colorpkg = @import("../color.zig");
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 113e00b96..c01d1adab 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 const testing = std.testing;
-const lib = @import("../../lib/main.zig");
+const lib = @import("../lib.zig");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const ZigTerminal = @import("../Terminal.zig");
diff --git a/src/terminal/csi.zig b/src/terminal/csi.zig
index d2f4bd6f8..2491a2341 100644
--- a/src/terminal/csi.zig
+++ b/src/terminal/csi.zig
@@ -1,6 +1,4 @@
-const build_options = @import("terminal_options");
-const lib = @import("../lib/main.zig");
-const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
+const lib = @import("lib.zig");
 
 /// Modes for the ED CSI command.
 pub const EraseDisplay = enum(u8) {
@@ -38,7 +36,7 @@ pub const TabClear = enum(u8) {
 
 /// Style formats for terminal size reports.
 pub const SizeReportStyle = lib.Enum(
-    lib_target,
+    lib.target,
     &.{
         // XTWINOPS
         "csi_14_t",
diff --git a/src/terminal/device_attributes.zig b/src/terminal/device_attributes.zig
index 3b99459d3..38d081175 100644
--- a/src/terminal/device_attributes.zig
+++ b/src/terminal/device_attributes.zig
@@ -1,11 +1,9 @@
 const std = @import("std");
 const testing = std.testing;
-const build_options = @import("terminal_options");
-const lib = @import("../lib/main.zig");
-const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
+const lib = @import("lib.zig");
 
 /// The device attribute request type (CSI c).
-pub const Req = lib.Enum(lib_target, &.{
+pub const Req = lib.Enum(lib.target, &.{
     "primary", // Blank
     "secondary", // >
     "tertiary", // =
diff --git a/src/terminal/device_status.zig b/src/terminal/device_status.zig
index 61dd569f3..42b4bf01b 100644
--- a/src/terminal/device_status.zig
+++ b/src/terminal/device_status.zig
@@ -1,10 +1,8 @@
 const std = @import("std");
-const build_options = @import("terminal_options");
-const lib = @import("../lib/main.zig");
-const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
+const lib = @import("lib.zig");
 
 /// The color scheme reported in response to a CSI ? 996 n query.
-pub const ColorScheme = lib.Enum(lib_target, &.{
+pub const ColorScheme = lib.Enum(lib.target, &.{
     "light",
     "dark",
 });
diff --git a/src/terminal/focus.zig b/src/terminal/focus.zig
index 563c0871a..91c579e12 100644
--- a/src/terminal/focus.zig
+++ b/src/terminal/focus.zig
@@ -1,7 +1,5 @@
 const std = @import("std");
-const build_options = @import("terminal_options");
-const lib = @import("../lib/main.zig");
-const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
+const lib = @import("lib.zig");
 
 /// Maximum number of bytes that `encode` will write. Any users of this
 /// should be resilient to this changing, so this is always a specific
@@ -10,7 +8,7 @@ pub const max_encode_size = 3;
 
 /// A focus event that can be reported to the application running in the
 /// terminal when focus reporting mode (mode 1004) is enabled.
-pub const Event = lib.Enum(lib_target, &.{
+pub const Event = lib.Enum(lib.target, &.{
     "gained",
     "lost",
 });
diff --git a/src/terminal/formatter.zig b/src/terminal/formatter.zig
index 4da7248e3..a375b4dd7 100644
--- a/src/terminal/formatter.zig
+++ b/src/terminal/formatter.zig
@@ -1,8 +1,6 @@
 const std = @import("std");
-const build_options = @import("terminal_options");
 const assert = @import("../quirks.zig").inlineAssert;
-const lib = @import("../lib/main.zig");
-const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
+const lib = @import("lib.zig");
 const Allocator = std.mem.Allocator;
 const color = @import("color.zig");
 const size = @import("size.zig");
@@ -22,7 +20,7 @@ const Selection = @import("Selection.zig");
 const Style = @import("style.zig").Style;
 
 /// Formats available.
-pub const Format = lib.Enum(lib_target, &.{
+pub const Format = lib.Enum(lib.target, &.{
     // Plain text.
     "plain",
 
diff --git a/src/terminal/lib.zig b/src/terminal/lib.zig
new file mode 100644
index 000000000..f68cd4356
--- /dev/null
+++ b/src/terminal/lib.zig
@@ -0,0 +1,23 @@
+const std = @import("std");
+const build_options = @import("terminal_options");
+const lib = @import("../lib/main.zig");
+
+/// The target for the terminal lib in particular.
+pub const target: lib.Target = if (build_options.c_abi) .c else .zig;
+
+/// The calling convention to use for C APIs. If we're not building for
+/// C ABI then we use auto which allows our C APIs to be cleanly called
+/// by Zig. This is required because we modify our struct layouts based
+/// on C ABI too.
+pub const calling_conv: std.builtin.CallingConvention = if (build_options.c_abi)
+    .c
+else
+    .auto;
+
+/// Forwarded decls from lib that are used.
+pub const Enum = lib.Enum;
+pub const TaggedUnion = lib.TaggedUnion;
+pub const Struct = lib.Struct;
+pub const String = lib.String;
+pub const checkGhosttyHEnum = lib.checkGhosttyHEnum;
+pub const structSizedFieldFits = lib.structSizedFieldFits;
diff --git a/src/terminal/mouse.zig b/src/terminal/mouse.zig
index 5286ab856..2861ad1e0 100644
--- a/src/terminal/mouse.zig
+++ b/src/terminal/mouse.zig
@@ -1,11 +1,10 @@
 const std = @import("std");
 const build_options = @import("terminal_options");
-const lib = @import("../lib/main.zig");
-const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
+const lib = @import("lib.zig");
 
 /// The event types that can be reported for mouse-related activities.
 /// These are all mutually exclusive (hence in a single enum).
-pub const Event = lib.Enum(lib_target, &.{
+pub const Event = lib.Enum(lib.target, &.{
     "none",
     "x10", // 9
     "normal", // 1000
@@ -20,7 +19,7 @@ pub fn eventSendsMotion(event: Event) bool {
 
 /// The format of mouse events when enabled.
 /// These are all mutually exclusive (hence in a single enum).
-pub const Format = lib.Enum(lib_target, &.{
+pub const Format = lib.Enum(lib.target, &.{
     "x10",
     "utf8", // 1005
     "sgr", // 1006
diff --git a/src/terminal/osc.zig b/src/terminal/osc.zig
index 920ce3f7e..44e97e2c7 100644
--- a/src/terminal/osc.zig
+++ b/src/terminal/osc.zig
@@ -11,11 +11,11 @@ const build_options = @import("terminal_options");
 const mem = std.mem;
 const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = mem.Allocator;
-const LibEnum = @import("../lib/enum.zig").Enum;
+const lib = @import("lib.zig");
+const LibEnum = lib.Enum;
 const kitty_color = @import("kitty/color.zig");
 const parsers = @import("osc/parsers.zig");
 const encoding = @import("osc/encoding.zig");
-const lib = @import("../lib/main.zig");
 
 pub const color = parsers.color;
 pub const semantic_prompt = parsers.semantic_prompt;
@@ -165,7 +165,7 @@ pub const Command = union(Key) {
     pub const KittyClipboardProtocol = parsers.kitty_clipboard_protocol.OSC;
 
     pub const Key = LibEnum(
-        if (build_options.c_abi) .c else .zig,
+        lib.target,
         // NOTE: Order matters, see LibEnum documentation.
         &.{
             "invalid",
diff --git a/src/terminal/osc/parsers/kitty_text_sizing.zig b/src/terminal/osc/parsers/kitty_text_sizing.zig
index f0180cc8f..370e22a22 100644
--- a/src/terminal/osc/parsers/kitty_text_sizing.zig
+++ b/src/terminal/osc/parsers/kitty_text_sizing.zig
@@ -2,27 +2,25 @@
 //! Specification: https://sw.kovidgoyal.net/kitty/text-sizing-protocol/
 
 const std = @import("std");
-const build_options = @import("terminal_options");
 
 const assert = @import("../../../quirks.zig").inlineAssert;
 
 const Parser = @import("../../osc.zig").Parser;
 const Command = @import("../../osc.zig").Command;
 const encoding = @import("../encoding.zig");
-const lib = @import("../../../lib/main.zig");
-const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
+const lib = @import("../../lib.zig");
 
 const log = std.log.scoped(.kitty_text_sizing);
 
 pub const max_payload_length = 4096;
 
-pub const VAlign = lib.Enum(lib_target, &.{
+pub const VAlign = lib.Enum(lib.target, &.{
     "top",
     "bottom",
     "center",
 });
 
-pub const HAlign = lib.Enum(lib_target, &.{
+pub const HAlign = lib.Enum(lib.target, &.{
     "left",
     "right",
     "center",
diff --git a/src/terminal/point.zig b/src/terminal/point.zig
index db834732c..4297bf5b5 100644
--- a/src/terminal/point.zig
+++ b/src/terminal/point.zig
@@ -1,18 +1,15 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const build_options = @import("terminal_options");
-const lib = @import("../lib/main.zig");
+const lib = @import("lib.zig");
 const size = @import("size.zig");
 
-const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
-
 /// The possible reference locations for a point. When someone says "(42, 80)"
 /// in the context of a terminal, that could mean multiple things: it is in the
 /// current visible viewport? the current active area of the screen where the
 /// cursor is? the entire scrollback history? etc.
 ///
 /// This tag is used to differentiate those cases.
-pub const Tag = lib.Enum(lib_target, &.{
+pub const Tag = lib.Enum(lib.target, &.{
     // Top-left is part of the active area where a running program can
     // jump the cursor and make changes. The active area is the "editable"
     // part of the screen.
@@ -70,7 +67,7 @@ pub const Point = union(Tag) {
     }
 
     const c_union = lib.TaggedUnion(
-        lib_target,
+        lib.target,
         @This(),
         // Padding: largest variant is Coordinate (u16 + u32 = 6 bytes).
         // Use [2]u64 (16 bytes) for future expansion.
diff --git a/src/terminal/render.zig b/src/terminal/render.zig
index 09e0c6b93..98e142245 100644
--- a/src/terminal/render.zig
+++ b/src/terminal/render.zig
@@ -1,11 +1,9 @@
 const std = @import("std");
-const build_options = @import("terminal_options");
 const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const ArenaAllocator = std.heap.ArenaAllocator;
 const fastmem = @import("../fastmem.zig");
-const lib = @import("../lib/main.zig");
-const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
+const lib = @import("lib.zig");
 const color = @import("color.zig");
 const cursor = @import("cursor.zig");
 const highlight = @import("highlight.zig");
@@ -226,7 +224,7 @@ pub const RenderState = struct {
     };
 
     // Dirty state.
-    pub const Dirty = lib.Enum(lib_target, &.{
+    pub const Dirty = lib.Enum(lib.target, &.{
         // Not dirty at all. Can skip rendering if prior state was
         // already rendered.
         "false",
diff --git a/src/terminal/sgr.zig b/src/terminal/sgr.zig
index 314d60686..e9b9354c3 100644
--- a/src/terminal/sgr.zig
+++ b/src/terminal/sgr.zig
@@ -1,15 +1,12 @@
 //! SGR (Select Graphic Rendition) attrinvbute parsing and types.
 
 const std = @import("std");
-const build_options = @import("terminal_options");
 const assert = @import("../quirks.zig").inlineAssert;
 const testing = std.testing;
-const lib = @import("../lib/main.zig");
+const lib = @import("lib.zig");
 const color = @import("color.zig");
 const SepList = @import("Parser.zig").Action.CSI.SepList;
 
-const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
-
 /// Attribute type for SGR
 pub const Attribute = union(Tag) {
     /// Unset all attributes
@@ -81,7 +78,7 @@ pub const Attribute = union(Tag) {
     @"256_fg": u8,
 
     pub const Tag = lib.Enum(
-        lib_target,
+        lib.target,
         &.{
             "unset",
             "unknown",
@@ -158,7 +155,7 @@ pub const Attribute = union(Tag) {
 
     /// C ABI functions.
     const c_union = lib.TaggedUnion(
-        lib_target,
+        lib.target,
         @This(),
         // Padding size for C ABI compatibility.
         // Largest variant is Unknown.C: 2 pointers + 2 usize = 32 bytes on 64-bit.
diff --git a/src/terminal/size_report.zig b/src/terminal/size_report.zig
index d8089f96e..2ce89a937 100644
--- a/src/terminal/size_report.zig
+++ b/src/terminal/size_report.zig
@@ -1,11 +1,9 @@
 const std = @import("std");
-const build_options = @import("terminal_options");
-const lib = @import("../lib/main.zig");
-const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
+const lib = @import("lib.zig");
 const CellCountInt = @import("size.zig").CellCountInt;
 
 /// Output formats for terminal size reports written to the PTY.
-pub const Style = lib.Enum(lib_target, &.{
+pub const Style = lib.Enum(lib.target, &.{
     // In-band size reports (mode 2048)
     "mode_2048",
     // XTWINOPS: report text area size in pixels
@@ -17,7 +15,7 @@ pub const Style = lib.Enum(lib_target, &.{
 });
 
 /// Runtime size values used to encode terminal size reports.
-pub const Size = lib.Struct(lib_target, struct {
+pub const Size = lib.Struct(lib.target, struct {
     /// Terminal row count in cells.
     rows: CellCountInt,
 
diff --git a/src/terminal/stream.zig b/src/terminal/stream.zig
index 04410e94c..9771334f9 100644
--- a/src/terminal/stream.zig
+++ b/src/terminal/stream.zig
@@ -5,7 +5,7 @@ const assert = @import("../quirks.zig").inlineAssert;
 const testing = std.testing;
 const Allocator = std.mem.Allocator;
 const simd = @import("../simd/main.zig");
-const lib = @import("../lib/main.zig");
+const lib = @import("lib.zig");
 const Parser = @import("Parser.zig");
 const ansi = @import("ansi.zig");
 const charsets = @import("charsets.zig");
@@ -29,8 +29,6 @@ const log = std.log.scoped(.stream);
 /// do something else.
 const debug = false;
 
-const lib_target: lib.Target = if (build_options.c_abi) .c else .zig;
-
 /// The possible actions that can be emitted by the Stream
 /// function for handling.
 pub const Action = union(Key) {
@@ -129,7 +127,7 @@ pub const Action = union(Key) {
     semantic_prompt: SemanticPrompt,
 
     pub const Key = lib.Enum(
-        lib_target,
+        lib.target,
         &.{
             "print",
             "print_repeat",
@@ -229,7 +227,7 @@ pub const Action = union(Key) {
 
     /// C ABI functions.
     const c_union = lib.TaggedUnion(
-        lib_target,
+        lib.target,
         @This(),
         // TODO: Before shipping an ABI-compatible libghostty, verify this.
         // This was just arbitrarily chosen for now.
@@ -254,7 +252,7 @@ pub const Action = union(Key) {
         }
     };
 
-    pub const InvokeCharset = lib.Struct(lib_target, struct {
+    pub const InvokeCharset = lib.Struct(lib.target, struct {
         bank: charsets.ActiveSlot,
         charset: charsets.Slots,
         locking: bool,
@@ -384,7 +382,7 @@ pub const Action = union(Key) {
         }
     };
 
-    pub const ConfigureCharset = lib.Struct(lib_target, struct {
+    pub const ConfigureCharset = lib.Struct(lib.target, struct {
         slot: charsets.Slots,
         charset: charsets.Charset,
     });

From 2f2f003aa5f807f2b5b3b3be5f83f46fa9825fce Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 25 Mar 2026 07:26:22 -0700
Subject: [PATCH 384/391] terminal/c: use lib.calling_conv to allow Zig calling
 conv

---
 src/lib_vt.zig                  |  3 --
 src/terminal/c/allocator.zig    |  5 +-
 src/terminal/c/build_info.zig   |  3 +-
 src/terminal/c/cell.zig         |  3 +-
 src/terminal/c/color.zig        |  3 +-
 src/terminal/c/focus.zig        |  3 +-
 src/terminal/c/formatter.zig    |  9 ++--
 src/terminal/c/grid_ref.zig     |  9 ++--
 src/terminal/c/key_encode.zig   | 11 +++--
 src/terminal/c/key_event.zig    | 33 ++++++-------
 src/terminal/c/modes.zig        |  3 +-
 src/terminal/c/mouse_encode.zig | 13 +++---
 src/terminal/c/mouse_event.zig  | 23 ++++-----
 src/terminal/c/osc.zig          | 15 +++---
 src/terminal/c/paste.zig        |  3 +-
 src/terminal/c/render.zig       | 32 ++++++-------
 src/terminal/c/row.zig          |  3 +-
 src/terminal/c/sgr.zig          | 23 ++++-----
 src/terminal/c/size_report.zig  |  3 +-
 src/terminal/c/style.zig        |  5 +-
 src/terminal/c/terminal.zig     | 82 ++++++++++++++++-----------------
 src/terminal/main.zig           |  3 +-
 22 files changed, 152 insertions(+), 138 deletions(-)

diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index 0a749be87..a7d7171bc 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -264,7 +264,4 @@ test {
     _ = terminal;
     _ = @import("lib/main.zig");
     @import("std").testing.refAllDecls(input);
-    if (comptime terminal.options.c_abi) {
-        _ = terminal.c_api;
-    }
 }
diff --git a/src/terminal/c/allocator.zig b/src/terminal/c/allocator.zig
index f16c7237f..5dc65aab1 100644
--- a/src/terminal/c/allocator.zig
+++ b/src/terminal/c/allocator.zig
@@ -1,5 +1,6 @@
 const std = @import("std");
 const testing = std.testing;
+const lib = @import("../lib.zig");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 
@@ -11,7 +12,7 @@ const CAllocator = lib_alloc.Allocator;
 pub fn alloc(
     alloc_: ?*const CAllocator,
     len: usize,
-) callconv(.c) ?[*]u8 {
+) callconv(lib.calling_conv) ?[*]u8 {
     const allocator = lib_alloc.default(alloc_);
     const buf = allocator.alloc(u8, len) catch return null;
     return buf.ptr;
@@ -26,7 +27,7 @@ pub fn free(
     alloc_: ?*const CAllocator,
     ptr: ?[*]u8,
     len: usize,
-) callconv(.c) void {
+) callconv(lib.calling_conv) void {
     const mem = ptr orelse return;
     const allocator = lib_alloc.default(alloc_);
     allocator.free(mem[0..len]);
diff --git a/src/terminal/c/build_info.zig b/src/terminal/c/build_info.zig
index 312d94fec..5e55e50d5 100644
--- a/src/terminal/c/build_info.zig
+++ b/src/terminal/c/build_info.zig
@@ -1,5 +1,6 @@
 const std = @import("std");
 const builtin = @import("builtin");
+const lib = @import("../lib.zig");
 const build_options = @import("terminal_options");
 const Result = @import("result.zig").Result;
 
@@ -34,7 +35,7 @@ pub const BuildInfo = enum(c_int) {
 pub fn get(
     data: BuildInfo,
     out: ?*anyopaque,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(BuildInfo, @intFromEnum(data)) catch {
             log.warn("build_info invalid data value={d}", .{@intFromEnum(data)});
diff --git a/src/terminal/c/cell.zig b/src/terminal/c/cell.zig
index 171867048..c9746da72 100644
--- a/src/terminal/c/cell.zig
+++ b/src/terminal/c/cell.zig
@@ -1,5 +1,6 @@
 const std = @import("std");
 const testing = std.testing;
+const lib = @import("../lib.zig");
 const page = @import("../page.zig");
 const Cell = page.Cell;
 const color = @import("../color.zig");
@@ -102,7 +103,7 @@ pub fn get(
     cell_: CCell,
     data: CellData,
     out: ?*anyopaque,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(CellData, @intFromEnum(data)) catch {
             return .invalid_value;
diff --git a/src/terminal/c/color.zig b/src/terminal/c/color.zig
index 199339706..3d244a19e 100644
--- a/src/terminal/c/color.zig
+++ b/src/terminal/c/color.zig
@@ -1,3 +1,4 @@
+const lib = @import("../lib.zig");
 const color = @import("../color.zig");
 
 pub fn rgb_get(
@@ -5,7 +6,7 @@ pub fn rgb_get(
     r: *u8,
     g: *u8,
     b: *u8,
-) callconv(.c) void {
+) callconv(lib.calling_conv) void {
     r.* = c.r;
     g.* = c.g;
     b.* = c.b;
diff --git a/src/terminal/c/focus.zig b/src/terminal/c/focus.zig
index 05930c8f3..2c53191db 100644
--- a/src/terminal/c/focus.zig
+++ b/src/terminal/c/focus.zig
@@ -1,4 +1,5 @@
 const std = @import("std");
+const lib = @import("../lib.zig");
 const terminal_focus = @import("../focus.zig");
 const Result = @import("result.zig").Result;
 
@@ -7,7 +8,7 @@ pub fn encode(
     out_: ?[*]u8,
     out_len: usize,
     out_written: *usize,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     var writer: std.Io.Writer = .fixed(if (out_) |out| out[0..out_len] else &.{});
     terminal_focus.encode(&writer, event) catch |err| switch (err) {
         error.WriteFailed => {
diff --git a/src/terminal/c/formatter.zig b/src/terminal/c/formatter.zig
index a768287ad..dbaa0acc8 100644
--- a/src/terminal/c/formatter.zig
+++ b/src/terminal/c/formatter.zig
@@ -1,5 +1,6 @@
 const std = @import("std");
 const testing = std.testing;
+const lib = @import("../lib.zig");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const terminal_c = @import("terminal.zig");
@@ -100,7 +101,7 @@ pub fn terminal_new(
     result: *Formatter,
     terminal_: terminal_c.Terminal,
     opts: TerminalOptions,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     result.* = terminal_new_(
         alloc_,
         terminal_,
@@ -151,7 +152,7 @@ pub fn format_buf(
     out_: ?[*]u8,
     out_len: usize,
     out_written: *usize,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const wrapper = formatter_ orelse return .invalid_value;
 
     var writer: std.Io.Writer = .fixed(if (out_) |out|
@@ -181,7 +182,7 @@ pub fn format_alloc(
     alloc_: ?*const CAllocator,
     out_ptr: *?[*]u8,
     out_len: *usize,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const wrapper = formatter_ orelse return .invalid_value;
     const alloc = lib_alloc.default(alloc_);
 
@@ -198,7 +199,7 @@ pub fn format_alloc(
     return .success;
 }
 
-pub fn free(formatter_: Formatter) callconv(.c) void {
+pub fn free(formatter_: Formatter) callconv(lib.calling_conv) void {
     const wrapper = formatter_ orelse return;
     const alloc = wrapper.alloc;
     alloc.destroy(wrapper);
diff --git a/src/terminal/c/grid_ref.zig b/src/terminal/c/grid_ref.zig
index d6afb0c45..d029c5951 100644
--- a/src/terminal/c/grid_ref.zig
+++ b/src/terminal/c/grid_ref.zig
@@ -1,5 +1,6 @@
 const std = @import("std");
 const testing = std.testing;
+const lib = @import("../lib.zig");
 const page = @import("../page.zig");
 const PageList = @import("../PageList.zig");
 const size = @import("../size.zig");
@@ -40,7 +41,7 @@ pub const CGridRef = extern struct {
 pub fn grid_ref_cell(
     ref: *const CGridRef,
     out: ?*cell_c.CCell,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const p = ref.toPin() orelse return .invalid_value;
     if (out) |o| o.* = @bitCast(p.rowAndCell().cell.*);
     return .success;
@@ -49,7 +50,7 @@ pub fn grid_ref_cell(
 pub fn grid_ref_row(
     ref: *const CGridRef,
     out: ?*row_c.CRow,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const p = ref.toPin() orelse return .invalid_value;
     if (out) |o| o.* = @bitCast(p.rowAndCell().row.*);
     return .success;
@@ -60,7 +61,7 @@ pub fn grid_ref_graphemes(
     out_buf: ?[*]u32,
     buf_len: usize,
     out_len: *usize,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const p = ref.toPin() orelse return .invalid_value;
     const cell = p.rowAndCell().cell;
 
@@ -91,7 +92,7 @@ pub fn grid_ref_graphemes(
 pub fn grid_ref_style(
     ref: *const CGridRef,
     out: ?*style_c.Style,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const p = ref.toPin() orelse return .invalid_value;
     if (out) |o| {
         const cell = p.rowAndCell().cell;
diff --git a/src/terminal/c/key_encode.zig b/src/terminal/c/key_encode.zig
index 616a438d9..2dbf71821 100644
--- a/src/terminal/c/key_encode.zig
+++ b/src/terminal/c/key_encode.zig
@@ -1,5 +1,6 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
+const lib = @import("../lib.zig");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const key_encode = @import("../../input/key_encode.zig");
@@ -25,7 +26,7 @@ pub const Encoder = ?*KeyEncoderWrapper;
 pub fn new(
     alloc_: ?*const CAllocator,
     result: *Encoder,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const alloc = lib_alloc.default(alloc_);
     const ptr = alloc.create(KeyEncoderWrapper) catch
         return .out_of_memory;
@@ -37,7 +38,7 @@ pub fn new(
     return .success;
 }
 
-pub fn free(encoder_: Encoder) callconv(.c) void {
+pub fn free(encoder_: Encoder) callconv(lib.calling_conv) void {
     const wrapper = encoder_ orelse return;
     const alloc = wrapper.alloc;
     alloc.destroy(wrapper);
@@ -72,7 +73,7 @@ pub fn setopt(
     encoder_: Encoder,
     option: Option,
     value: ?*const anyopaque,
-) callconv(.c) void {
+) callconv(lib.calling_conv) void {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(Option, @intFromEnum(option)) catch {
             log.warn("setopt invalid option value={d}", .{@intFromEnum(option)});
@@ -120,7 +121,7 @@ fn setoptTyped(
 pub fn setopt_from_terminal(
     encoder_: Encoder,
     terminal_: Terminal,
-) callconv(.c) void {
+) callconv(lib.calling_conv) void {
     const wrapper = encoder_ orelse return;
     const t: *ZigTerminal = (terminal_ orelse return).terminal;
     wrapper.opts = .fromTerminal(t);
@@ -132,7 +133,7 @@ pub fn encode(
     out_: ?[*]u8,
     out_len: usize,
     out_written: *usize,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     // Attempt to write to this buffer
     var writer: std.Io.Writer = .fixed(if (out_) |out| out[0..out_len] else &.{});
     key_encode.encode(
diff --git a/src/terminal/c/key_event.zig b/src/terminal/c/key_event.zig
index 748b8799c..d3fe298d4 100644
--- a/src/terminal/c/key_event.zig
+++ b/src/terminal/c/key_event.zig
@@ -1,5 +1,6 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
+const lib = @import("../lib.zig");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const key = @import("../../input/key.zig");
@@ -21,7 +22,7 @@ pub const Event = ?*KeyEventWrapper;
 pub fn new(
     alloc_: ?*const CAllocator,
     result: *Event,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const alloc = lib_alloc.default(alloc_);
     const ptr = alloc.create(KeyEventWrapper) catch
         return .out_of_memory;
@@ -30,13 +31,13 @@ pub fn new(
     return .success;
 }
 
-pub fn free(event_: Event) callconv(.c) void {
+pub fn free(event_: Event) callconv(lib.calling_conv) void {
     const wrapper = event_ orelse return;
     const alloc = wrapper.alloc;
     alloc.destroy(wrapper);
 }
 
-pub fn set_action(event_: Event, action: key.Action) callconv(.c) void {
+pub fn set_action(event_: Event, action: key.Action) callconv(lib.calling_conv) void {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(key.Action, @intFromEnum(action)) catch {
             log.warn("set_action invalid action value={d}", .{@intFromEnum(action)});
@@ -48,12 +49,12 @@ pub fn set_action(event_: Event, action: key.Action) callconv(.c) void {
     event.action = action;
 }
 
-pub fn get_action(event_: Event) callconv(.c) key.Action {
+pub fn get_action(event_: Event) callconv(lib.calling_conv) key.Action {
     const event: *key.KeyEvent = &event_.?.event;
     return event.action;
 }
 
-pub fn set_key(event_: Event, k: key.Key) callconv(.c) void {
+pub fn set_key(event_: Event, k: key.Key) callconv(lib.calling_conv) void {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(key.Key, @intFromEnum(k)) catch {
             log.warn("set_key invalid key value={d}", .{@intFromEnum(k)});
@@ -65,58 +66,58 @@ pub fn set_key(event_: Event, k: key.Key) callconv(.c) void {
     event.key = k;
 }
 
-pub fn get_key(event_: Event) callconv(.c) key.Key {
+pub fn get_key(event_: Event) callconv(lib.calling_conv) key.Key {
     const event: *key.KeyEvent = &event_.?.event;
     return event.key;
 }
 
-pub fn set_mods(event_: Event, mods: key.Mods) callconv(.c) void {
+pub fn set_mods(event_: Event, mods: key.Mods) callconv(lib.calling_conv) void {
     const event: *key.KeyEvent = &event_.?.event;
     event.mods = mods;
 }
 
-pub fn get_mods(event_: Event) callconv(.c) key.Mods {
+pub fn get_mods(event_: Event) callconv(lib.calling_conv) key.Mods {
     const event: *key.KeyEvent = &event_.?.event;
     return event.mods;
 }
 
-pub fn set_consumed_mods(event_: Event, consumed_mods: key.Mods) callconv(.c) void {
+pub fn set_consumed_mods(event_: Event, consumed_mods: key.Mods) callconv(lib.calling_conv) void {
     const event: *key.KeyEvent = &event_.?.event;
     event.consumed_mods = consumed_mods;
 }
 
-pub fn get_consumed_mods(event_: Event) callconv(.c) key.Mods {
+pub fn get_consumed_mods(event_: Event) callconv(lib.calling_conv) key.Mods {
     const event: *key.KeyEvent = &event_.?.event;
     return event.consumed_mods;
 }
 
-pub fn set_composing(event_: Event, composing: bool) callconv(.c) void {
+pub fn set_composing(event_: Event, composing: bool) callconv(lib.calling_conv) void {
     const event: *key.KeyEvent = &event_.?.event;
     event.composing = composing;
 }
 
-pub fn get_composing(event_: Event) callconv(.c) bool {
+pub fn get_composing(event_: Event) callconv(lib.calling_conv) bool {
     const event: *key.KeyEvent = &event_.?.event;
     return event.composing;
 }
 
-pub fn set_utf8(event_: Event, utf8: ?[*]const u8, len: usize) callconv(.c) void {
+pub fn set_utf8(event_: Event, utf8: ?[*]const u8, len: usize) callconv(lib.calling_conv) void {
     const event: *key.KeyEvent = &event_.?.event;
     event.utf8 = if (utf8) |ptr| ptr[0..len] else "";
 }
 
-pub fn get_utf8(event_: Event, len: ?*usize) callconv(.c) ?[*]const u8 {
+pub fn get_utf8(event_: Event, len: ?*usize) callconv(lib.calling_conv) ?[*]const u8 {
     const event: *key.KeyEvent = &event_.?.event;
     if (len) |l| l.* = event.utf8.len;
     return if (event.utf8.len == 0) null else event.utf8.ptr;
 }
 
-pub fn set_unshifted_codepoint(event_: Event, codepoint: u32) callconv(.c) void {
+pub fn set_unshifted_codepoint(event_: Event, codepoint: u32) callconv(lib.calling_conv) void {
     const event: *key.KeyEvent = &event_.?.event;
     event.unshifted_codepoint = @truncate(codepoint);
 }
 
-pub fn get_unshifted_codepoint(event_: Event) callconv(.c) u32 {
+pub fn get_unshifted_codepoint(event_: Event) callconv(lib.calling_conv) u32 {
     const event: *key.KeyEvent = &event_.?.event;
     return event.unshifted_codepoint;
 }
diff --git a/src/terminal/c/modes.zig b/src/terminal/c/modes.zig
index d0d5fedf0..449ce63e3 100644
--- a/src/terminal/c/modes.zig
+++ b/src/terminal/c/modes.zig
@@ -1,4 +1,5 @@
 const std = @import("std");
+const lib = @import("../lib.zig");
 const modes = @import("../modes.zig");
 const Result = @import("result.zig").Result;
 
@@ -20,7 +21,7 @@ pub fn report_encode(
     out_: ?[*]u8,
     out_len: usize,
     out_written: *usize,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const mode_tag: modes.ModeTag = @bitCast(tag);
     const report: modes.Report = .{
         .tag = mode_tag,
diff --git a/src/terminal/c/mouse_encode.zig b/src/terminal/c/mouse_encode.zig
index 224b64837..6f9eb79da 100644
--- a/src/terminal/c/mouse_encode.zig
+++ b/src/terminal/c/mouse_encode.zig
@@ -1,6 +1,7 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const testing = std.testing;
+const lib = @import("../lib.zig");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const input_mouse_encode = @import("../../input/mouse_encode.zig");
@@ -89,7 +90,7 @@ pub const Option = enum(c_int) {
 pub fn new(
     alloc_: ?*const CAllocator,
     result: *Encoder,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const alloc = lib_alloc.default(alloc_);
     const ptr = alloc.create(MouseEncoderWrapper) catch
         return .out_of_memory;
@@ -101,7 +102,7 @@ pub fn new(
     return .success;
 }
 
-pub fn free(encoder_: Encoder) callconv(.c) void {
+pub fn free(encoder_: Encoder) callconv(lib.calling_conv) void {
     const wrapper = encoder_ orelse return;
     const alloc = wrapper.alloc;
     alloc.destroy(wrapper);
@@ -111,7 +112,7 @@ pub fn setopt(
     encoder_: Encoder,
     option: Option,
     value: ?*const anyopaque,
-) callconv(.c) void {
+) callconv(lib.calling_conv) void {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(Option, @intFromEnum(option)) catch {
             log.warn("setopt invalid option value={d}", .{@intFromEnum(option)});
@@ -187,7 +188,7 @@ fn setoptTyped(
 pub fn setopt_from_terminal(
     encoder_: Encoder,
     terminal_: Terminal,
-) callconv(.c) void {
+) callconv(lib.calling_conv) void {
     const wrapper = encoder_ orelse return;
     const t: *ZigTerminal = (terminal_ orelse return).terminal;
     wrapper.opts.event = t.flags.mouse_event;
@@ -195,7 +196,7 @@ pub fn setopt_from_terminal(
     wrapper.last_cell = null;
 }
 
-pub fn reset(encoder_: Encoder) callconv(.c) void {
+pub fn reset(encoder_: Encoder) callconv(lib.calling_conv) void {
     const wrapper = encoder_ orelse return;
     wrapper.last_cell = null;
 }
@@ -206,7 +207,7 @@ pub fn encode(
     out_: ?[*]u8,
     out_len: usize,
     out_written: *usize,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const wrapper = encoder_ orelse return .invalid_value;
     const event = event_ orelse return .invalid_value;
 
diff --git a/src/terminal/c/mouse_event.zig b/src/terminal/c/mouse_event.zig
index 91f4e2126..0f634d4da 100644
--- a/src/terminal/c/mouse_event.zig
+++ b/src/terminal/c/mouse_event.zig
@@ -1,6 +1,7 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const testing = std.testing;
+const lib = @import("../lib.zig");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const key = @import("../../input/key.zig");
@@ -34,7 +35,7 @@ pub const Mods = key.Mods;
 pub fn new(
     alloc_: ?*const CAllocator,
     result: *Event,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const alloc = lib_alloc.default(alloc_);
     const ptr = alloc.create(MouseEventWrapper) catch
         return .out_of_memory;
@@ -43,13 +44,13 @@ pub fn new(
     return .success;
 }
 
-pub fn free(event_: Event) callconv(.c) void {
+pub fn free(event_: Event) callconv(lib.calling_conv) void {
     const wrapper = event_ orelse return;
     const alloc = wrapper.alloc;
     alloc.destroy(wrapper);
 }
 
-pub fn set_action(event_: Event, action: Action) callconv(.c) void {
+pub fn set_action(event_: Event, action: Action) callconv(lib.calling_conv) void {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(Action, @intFromEnum(action)) catch {
             log.warn("set_action invalid action value={d}", .{@intFromEnum(action)});
@@ -60,11 +61,11 @@ pub fn set_action(event_: Event, action: Action) callconv(.c) void {
     event_.?.event.action = action;
 }
 
-pub fn get_action(event_: Event) callconv(.c) Action {
+pub fn get_action(event_: Event) callconv(lib.calling_conv) Action {
     return event_.?.event.action;
 }
 
-pub fn set_button(event_: Event, button: Button) callconv(.c) void {
+pub fn set_button(event_: Event, button: Button) callconv(lib.calling_conv) void {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(Button, @intFromEnum(button)) catch {
             log.warn("set_button invalid button value={d}", .{@intFromEnum(button)});
@@ -75,11 +76,11 @@ pub fn set_button(event_: Event, button: Button) callconv(.c) void {
     event_.?.event.button = button;
 }
 
-pub fn clear_button(event_: Event) callconv(.c) void {
+pub fn clear_button(event_: Event) callconv(lib.calling_conv) void {
     event_.?.event.button = null;
 }
 
-pub fn get_button(event_: Event, out: ?*Button) callconv(.c) bool {
+pub fn get_button(event_: Event, out: ?*Button) callconv(lib.calling_conv) bool {
     if (event_.?.event.button) |button| {
         if (out) |ptr| ptr.* = button;
         return true;
@@ -88,19 +89,19 @@ pub fn get_button(event_: Event, out: ?*Button) callconv(.c) bool {
     return false;
 }
 
-pub fn set_mods(event_: Event, mods: Mods) callconv(.c) void {
+pub fn set_mods(event_: Event, mods: Mods) callconv(lib.calling_conv) void {
     event_.?.event.mods = mods;
 }
 
-pub fn get_mods(event_: Event) callconv(.c) Mods {
+pub fn get_mods(event_: Event) callconv(lib.calling_conv) Mods {
     return event_.?.event.mods;
 }
 
-pub fn set_position(event_: Event, pos: Position) callconv(.c) void {
+pub fn set_position(event_: Event, pos: Position) callconv(lib.calling_conv) void {
     event_.?.event.pos = pos;
 }
 
-pub fn get_position(event_: Event) callconv(.c) Position {
+pub fn get_position(event_: Event) callconv(lib.calling_conv) Position {
     return event_.?.event.pos;
 }
 
diff --git a/src/terminal/c/osc.zig b/src/terminal/c/osc.zig
index 648e448fd..8d0c065f9 100644
--- a/src/terminal/c/osc.zig
+++ b/src/terminal/c/osc.zig
@@ -1,4 +1,5 @@
 const std = @import("std");
+const lib = @import("../lib.zig");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const osc = @import("../osc.zig");
@@ -15,7 +16,7 @@ pub const Command = ?*osc.Command;
 pub fn new(
     alloc_: ?*const CAllocator,
     result: *Parser,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const alloc = lib_alloc.default(alloc_);
     const ptr = alloc.create(osc.Parser) catch
         return .out_of_memory;
@@ -24,7 +25,7 @@ pub fn new(
     return .success;
 }
 
-pub fn free(parser_: Parser) callconv(.c) void {
+pub fn free(parser_: Parser) callconv(lib.calling_conv) void {
     // C-built parsers always have an associated allocator.
     const parser = parser_ orelse return;
     const alloc = parser.alloc.?;
@@ -32,19 +33,19 @@ pub fn free(parser_: Parser) callconv(.c) void {
     alloc.destroy(parser);
 }
 
-pub fn reset(parser_: Parser) callconv(.c) void {
+pub fn reset(parser_: Parser) callconv(lib.calling_conv) void {
     parser_.?.reset();
 }
 
-pub fn next(parser_: Parser, byte: u8) callconv(.c) void {
+pub fn next(parser_: Parser, byte: u8) callconv(lib.calling_conv) void {
     parser_.?.next(byte);
 }
 
-pub fn end(parser_: Parser, terminator: u8) callconv(.c) Command {
+pub fn end(parser_: Parser, terminator: u8) callconv(lib.calling_conv) Command {
     return parser_.?.end(terminator);
 }
 
-pub fn commandType(command_: Command) callconv(.c) osc.Command.Key {
+pub fn commandType(command_: Command) callconv(lib.calling_conv) osc.Command.Key {
     const command = command_ orelse return .invalid;
     return command.*;
 }
@@ -67,7 +68,7 @@ pub fn commandData(
     command_: Command,
     data: CommandData,
     out: ?*anyopaque,
-) callconv(.c) bool {
+) callconv(lib.calling_conv) bool {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(CommandData, @intFromEnum(data)) catch {
             log.warn("commandData invalid data value={d}", .{@intFromEnum(data)});
diff --git a/src/terminal/c/paste.zig b/src/terminal/c/paste.zig
index eb4117a70..69df416c0 100644
--- a/src/terminal/c/paste.zig
+++ b/src/terminal/c/paste.zig
@@ -1,7 +1,8 @@
 const std = @import("std");
+const lib = @import("../lib.zig");
 const paste = @import("../../input/paste.zig");
 
-pub fn is_safe(data: ?[*]const u8, len: usize) callconv(.c) bool {
+pub fn is_safe(data: ?[*]const u8, len: usize) callconv(lib.calling_conv) bool {
     const slice: []const u8 = if (data) |v| v[0..len] else &.{};
     return paste.isSafe(slice);
 }
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index e29dfd019..6d9ac8d15 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -143,7 +143,7 @@ pub const Colors = extern struct {
 pub fn new(
     alloc_: ?*const CAllocator,
     result: *RenderState,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     result.* = new_(alloc_) catch |err| {
         result.* = null;
         return switch (err) {
@@ -162,7 +162,7 @@ fn new_(alloc_: ?*const CAllocator) error{OutOfMemory}!*RenderStateWrapper {
     return ptr;
 }
 
-pub fn free(state_: RenderState) callconv(.c) void {
+pub fn free(state_: RenderState) callconv(lib.calling_conv) void {
     const state = state_ orelse return;
     const alloc = state.alloc;
     state.state.deinit(alloc);
@@ -172,7 +172,7 @@ pub fn free(state_: RenderState) callconv(.c) void {
 pub fn update(
     state_: RenderState,
     terminal_: terminal_c.Terminal,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const state = state_ orelse return .invalid_value;
     const t: *ZigTerminal = (terminal_ orelse return .invalid_value).terminal;
 
@@ -184,7 +184,7 @@ pub fn get(
     state_: RenderState,
     data: Data,
     out: ?*anyopaque,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(Data, @intFromEnum(data)) catch {
             log.warn("render_state_get invalid data value={d}", .{@intFromEnum(data)});
@@ -263,7 +263,7 @@ pub fn set(
     state_: RenderState,
     option: SetOption,
     value: ?*const anyopaque,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(SetOption, @intFromEnum(option)) catch {
             log.warn("render_state_set invalid option value={d}", .{@intFromEnum(option)});
@@ -296,7 +296,7 @@ fn setTyped(
 pub fn colors_get(
     state_: RenderState,
     out_colors_: ?*Colors,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const state = state_ orelse return .invalid_value;
     const out_colors = out_colors_ orelse return .invalid_value;
     const out_size = out_colors.size;
@@ -354,7 +354,7 @@ pub fn colors_get(
 pub fn row_iterator_new(
     alloc_: ?*const CAllocator,
     result: *RowIterator,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const alloc = lib_alloc.default(alloc_);
     const ptr = alloc.create(RowIteratorWrapper) catch {
         result.* = null;
@@ -372,13 +372,13 @@ pub fn row_iterator_new(
     return .success;
 }
 
-pub fn row_iterator_free(iterator_: RowIterator) callconv(.c) void {
+pub fn row_iterator_free(iterator_: RowIterator) callconv(lib.calling_conv) void {
     const iterator = iterator_ orelse return;
     const alloc = iterator.alloc;
     alloc.destroy(iterator);
 }
 
-pub fn row_iterator_next(iterator_: RowIterator) callconv(.c) bool {
+pub fn row_iterator_next(iterator_: RowIterator) callconv(lib.calling_conv) bool {
     const it = iterator_ orelse return false;
     const next_y: size.CellCountInt = if (it.y) |y| y + 1 else 0;
     if (next_y >= it.raws.len) return false;
@@ -389,7 +389,7 @@ pub fn row_iterator_next(iterator_: RowIterator) callconv(.c) bool {
 pub fn row_cells_new(
     alloc_: ?*const CAllocator,
     result: *RowCells,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const alloc = lib_alloc.default(alloc_);
     const ptr = alloc.create(RowCellsWrapper) catch {
         result.* = null;
@@ -407,7 +407,7 @@ pub fn row_cells_new(
     return .success;
 }
 
-pub fn row_cells_next(cells_: RowCells) callconv(.c) bool {
+pub fn row_cells_next(cells_: RowCells) callconv(lib.calling_conv) bool {
     const cells = cells_ orelse return false;
     const next_x: size.CellCountInt = if (cells.x) |x| x + 1 else 0;
     if (next_x >= cells.raws.len) return false;
@@ -415,14 +415,14 @@ pub fn row_cells_next(cells_: RowCells) callconv(.c) bool {
     return true;
 }
 
-pub fn row_cells_select(cells_: RowCells, x: size.CellCountInt) callconv(.c) Result {
+pub fn row_cells_select(cells_: RowCells, x: size.CellCountInt) callconv(lib.calling_conv) Result {
     const cells = cells_ orelse return .invalid_value;
     if (x >= cells.raws.len) return .invalid_value;
     cells.x = x;
     return .success;
 }
 
-pub fn row_cells_free(cells_: RowCells) callconv(.c) void {
+pub fn row_cells_free(cells_: RowCells) callconv(lib.calling_conv) void {
     const cells = cells_ orelse return;
     const alloc = cells.alloc;
     alloc.destroy(cells);
@@ -455,7 +455,7 @@ pub fn row_cells_get(
     cells_: RowCells,
     data: RowCellsData,
     out: ?*anyopaque,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(RowCellsData, @intFromEnum(data)) catch {
             log.warn("render_state_row_cells_get invalid data value={d}", .{@intFromEnum(data)});
@@ -555,7 +555,7 @@ pub fn row_get(
     iterator_: RowIterator,
     data: RowData,
     out: ?*anyopaque,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(RowData, @intFromEnum(data)) catch {
             log.warn("render_state_row_get invalid data value={d}", .{@intFromEnum(data)});
@@ -605,7 +605,7 @@ pub fn row_set(
     iterator_: RowIterator,
     option: RowOption,
     value: ?*const anyopaque,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(RowOption, @intFromEnum(option)) catch {
             log.warn("render_state_row_set invalid option value={d}", .{@intFromEnum(option)});
diff --git a/src/terminal/c/row.zig b/src/terminal/c/row.zig
index 7b765b56a..d45327066 100644
--- a/src/terminal/c/row.zig
+++ b/src/terminal/c/row.zig
@@ -1,5 +1,6 @@
 const std = @import("std");
 const testing = std.testing;
+const lib = @import("../lib.zig");
 const page = @import("../page.zig");
 const Row = page.Row;
 const Result = @import("result.zig").Result;
@@ -65,7 +66,7 @@ pub fn get(
     row_: CRow,
     data: RowData,
     out: ?*anyopaque,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(RowData, @intFromEnum(data)) catch {
             return .invalid_value;
diff --git a/src/terminal/c/sgr.zig b/src/terminal/c/sgr.zig
index 53536417f..7bd47b9ae 100644
--- a/src/terminal/c/sgr.zig
+++ b/src/terminal/c/sgr.zig
@@ -1,6 +1,7 @@
 const std = @import("std");
 const testing = std.testing;
 const Allocator = std.mem.Allocator;
+const lib = @import("../lib.zig");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const sgr = @import("../sgr.zig");
@@ -20,7 +21,7 @@ pub const Parser = ?*ParserWrapper;
 pub fn new(
     alloc_: ?*const CAllocator,
     result: *Parser,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const alloc = lib_alloc.default(alloc_);
     const ptr = alloc.create(ParserWrapper) catch
         return .out_of_memory;
@@ -32,7 +33,7 @@ pub fn new(
     return .success;
 }
 
-pub fn free(parser_: Parser) callconv(.c) void {
+pub fn free(parser_: Parser) callconv(lib.calling_conv) void {
     const wrapper = parser_ orelse return;
     const alloc = wrapper.alloc;
     const parser: *sgr.Parser = &wrapper.parser;
@@ -40,7 +41,7 @@ pub fn free(parser_: Parser) callconv(.c) void {
     alloc.destroy(wrapper);
 }
 
-pub fn reset(parser_: Parser) callconv(.c) void {
+pub fn reset(parser_: Parser) callconv(lib.calling_conv) void {
     const wrapper = parser_ orelse return;
     const parser: *sgr.Parser = &wrapper.parser;
     parser.idx = 0;
@@ -51,7 +52,7 @@ pub fn setParams(
     params: [*]const u16,
     seps_: ?[*]const u8,
     len: usize,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const wrapper = parser_ orelse return .invalid_value;
     const alloc = wrapper.alloc;
     const parser: *sgr.Parser = &wrapper.parser;
@@ -87,7 +88,7 @@ pub fn setParams(
 pub fn next(
     parser_: Parser,
     result: *sgr.Attribute.C,
-) callconv(.c) bool {
+) callconv(lib.calling_conv) bool {
     const wrapper = parser_ orelse return false;
     const parser: *sgr.Parser = &wrapper.parser;
     if (parser.next()) |attr| {
@@ -101,7 +102,7 @@ pub fn next(
 pub fn unknown_full(
     unknown: sgr.Attribute.Unknown.C,
     ptr: ?*[*]const u16,
-) callconv(.c) usize {
+) callconv(lib.calling_conv) usize {
     if (ptr) |p| p.* = unknown.full_ptr;
     return unknown.full_len;
 }
@@ -109,30 +110,30 @@ pub fn unknown_full(
 pub fn unknown_partial(
     unknown: sgr.Attribute.Unknown.C,
     ptr: ?*[*]const u16,
-) callconv(.c) usize {
+) callconv(lib.calling_conv) usize {
     if (ptr) |p| p.* = unknown.partial_ptr;
     return unknown.partial_len;
 }
 
 pub fn attribute_tag(
     attr: sgr.Attribute.C,
-) callconv(.c) sgr.Attribute.Tag {
+) callconv(lib.calling_conv) sgr.Attribute.Tag {
     return attr.tag;
 }
 
 pub fn attribute_value(
     attr: *sgr.Attribute.C,
-) callconv(.c) *sgr.Attribute.CValue {
+) callconv(lib.calling_conv) *sgr.Attribute.CValue {
     return &attr.value;
 }
 
-pub fn wasm_alloc_attribute() callconv(.c) *sgr.Attribute.C {
+pub fn wasm_alloc_attribute() callconv(lib.calling_conv) *sgr.Attribute.C {
     const alloc = std.heap.wasm_allocator;
     const ptr = alloc.create(sgr.Attribute.C) catch @panic("out of memory");
     return ptr;
 }
 
-pub fn wasm_free_attribute(attr: *sgr.Attribute.C) callconv(.c) void {
+pub fn wasm_free_attribute(attr: *sgr.Attribute.C) callconv(lib.calling_conv) void {
     const alloc = std.heap.wasm_allocator;
     alloc.destroy(attr);
 }
diff --git a/src/terminal/c/size_report.zig b/src/terminal/c/size_report.zig
index dac909a5c..1c350c8f7 100644
--- a/src/terminal/c/size_report.zig
+++ b/src/terminal/c/size_report.zig
@@ -1,4 +1,5 @@
 const std = @import("std");
+const lib = @import("../lib.zig");
 const terminal_size_report = @import("../size_report.zig");
 const Result = @import("result.zig").Result;
 
@@ -14,7 +15,7 @@ pub fn encode(
     out_: ?[*]u8,
     out_len: usize,
     out_written: *usize,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     var writer: std.Io.Writer = .fixed(if (out_) |out| out[0..out_len] else &.{});
     terminal_size_report.encode(&writer, style, size) catch |err| switch (err) {
         error.WriteFailed => {
diff --git a/src/terminal/c/style.zig b/src/terminal/c/style.zig
index 99f591c10..82729fa94 100644
--- a/src/terminal/c/style.zig
+++ b/src/terminal/c/style.zig
@@ -1,6 +1,7 @@
 const std = @import("std");
 const assert = std.debug.assert;
 const testing = std.testing;
+const lib = @import("../lib.zig");
 const style = @import("../style.zig");
 const color = @import("../color.zig");
 const sgr = @import("../sgr.zig");
@@ -77,13 +78,13 @@ pub const Style = extern struct {
 };
 
 /// Returns the default style.
-pub fn default_style(result: *Style) callconv(.c) void {
+pub fn default_style(result: *Style) callconv(lib.calling_conv) void {
     result.* = .fromStyle(.{});
     assert(result.size == @sizeOf(Style));
 }
 
 /// Returns true if the style is the default style.
-pub fn style_is_default(s: *const Style) callconv(.c) bool {
+pub fn style_is_default(s: *const Style) callconv(lib.calling_conv) bool {
     assert(s.size == @sizeOf(Style));
     return s.fg_color.tag == .none and
         s.bg_color.tag == .none and
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index c01d1adab..9eb3282b1 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -55,39 +55,39 @@ const Effects = struct {
     da_features_buf: [64]device_attributes.Primary.Feature = undefined,
 
     /// C function pointer type for the write_pty callback.
-    pub const WritePtyFn = *const fn (Terminal, ?*anyopaque, [*]const u8, usize) callconv(.c) void;
+    pub const WritePtyFn = *const fn (Terminal, ?*anyopaque, [*]const u8, usize) callconv(lib.calling_conv) void;
 
     /// C function pointer type for the bell callback.
-    pub const BellFn = *const fn (Terminal, ?*anyopaque) callconv(.c) void;
+    pub const BellFn = *const fn (Terminal, ?*anyopaque) callconv(lib.calling_conv) void;
 
     /// C function pointer type for the color_scheme callback.
     /// Returns true and fills out_scheme if a color scheme is available,
     /// or returns false to silently ignore the query.
-    pub const ColorSchemeFn = *const fn (Terminal, ?*anyopaque, *device_status.ColorScheme) callconv(.c) bool;
+    pub const ColorSchemeFn = *const fn (Terminal, ?*anyopaque, *device_status.ColorScheme) callconv(lib.calling_conv) bool;
 
     /// C function pointer type for the enquiry callback.
     /// Returns the response bytes. The memory must remain valid
     /// until the callback returns.
-    pub const EnquiryFn = *const fn (Terminal, ?*anyopaque) callconv(.c) lib.String;
+    pub const EnquiryFn = *const fn (Terminal, ?*anyopaque) callconv(lib.calling_conv) lib.String;
 
     /// C function pointer type for the xtversion callback.
     /// Returns the version string (e.g. "ghostty 1.2.3"). The memory
     /// must remain valid until the callback returns. An empty string
     /// (len=0) causes the default "libghostty" to be reported.
-    pub const XtversionFn = *const fn (Terminal, ?*anyopaque) callconv(.c) lib.String;
+    pub const XtversionFn = *const fn (Terminal, ?*anyopaque) callconv(lib.calling_conv) lib.String;
 
     /// C function pointer type for the title_changed callback.
-    pub const TitleChangedFn = *const fn (Terminal, ?*anyopaque) callconv(.c) void;
+    pub const TitleChangedFn = *const fn (Terminal, ?*anyopaque) callconv(lib.calling_conv) void;
 
     /// C function pointer type for the size callback.
     /// Returns true and fills out_size if size is available,
     /// or returns false to silently ignore the query.
-    pub const SizeFn = *const fn (Terminal, ?*anyopaque, *size_report.Size) callconv(.c) bool;
+    pub const SizeFn = *const fn (Terminal, ?*anyopaque, *size_report.Size) callconv(lib.calling_conv) bool;
 
     /// C function pointer type for the device_attributes callback.
     /// Returns true and fills out_attrs if attributes are available,
     /// or returns false to silently ignore the query.
-    pub const DeviceAttributesFn = *const fn (Terminal, ?*anyopaque, *CDeviceAttributes) callconv(.c) bool;
+    pub const DeviceAttributesFn = *const fn (Terminal, ?*anyopaque, *CDeviceAttributes) callconv(lib.calling_conv) bool;
 
     /// C-compatible device attributes struct.
     /// C: GhosttyDeviceAttributes
@@ -221,7 +221,7 @@ pub fn new(
     alloc_: ?*const CAllocator,
     result: *Terminal,
     opts: Options,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     result.* = new_(alloc_, opts) catch |err| {
         result.* = null;
         return switch (err) {
@@ -282,7 +282,7 @@ pub fn vt_write(
     terminal_: Terminal,
     ptr: [*]const u8,
     len: usize,
-) callconv(.c) void {
+) callconv(lib.calling_conv) void {
     const wrapper = terminal_ orelse return;
     wrapper.stream.nextSlice(ptr[0..len]);
 }
@@ -322,7 +322,7 @@ pub fn set(
     terminal_: Terminal,
     option: Option,
     value: ?*const anyopaque,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(Option, @intFromEnum(option)) catch {
             log.warn("terminal_set invalid option value={d}", .{@intFromEnum(option)});
@@ -374,7 +374,7 @@ pub const ScrollViewport = ZigTerminal.ScrollViewport.C;
 pub fn scroll_viewport(
     terminal_: Terminal,
     behavior: ScrollViewport,
-) callconv(.c) void {
+) callconv(lib.calling_conv) void {
     const t: *ZigTerminal = (terminal_ orelse return).terminal;
     t.scrollViewport(switch (behavior.tag) {
         .top => .top,
@@ -389,7 +389,7 @@ pub fn resize(
     rows: size.CellCountInt,
     cell_width_px: u32,
     cell_height_px: u32,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const wrapper = terminal_ orelse return .invalid_value;
     const t = wrapper.terminal;
     if (cols == 0 or rows == 0) return .invalid_value;
@@ -423,7 +423,7 @@ pub fn resize(
     return .success;
 }
 
-pub fn reset(terminal_: Terminal) callconv(.c) void {
+pub fn reset(terminal_: Terminal) callconv(lib.calling_conv) void {
     const t: *ZigTerminal = (terminal_ orelse return).terminal;
     t.fullReset();
 }
@@ -432,7 +432,7 @@ pub fn mode_get(
     terminal_: Terminal,
     tag: modes.ModeTag.Backing,
     out_value: *bool,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const t: *ZigTerminal = (terminal_ orelse return .invalid_value).terminal;
     const mode_tag: modes.ModeTag = @bitCast(tag);
     const mode = modes.modeFromInt(mode_tag.value, mode_tag.ansi) orelse return .invalid_value;
@@ -444,7 +444,7 @@ pub fn mode_set(
     terminal_: Terminal,
     tag: modes.ModeTag.Backing,
     value: bool,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const t: *ZigTerminal = (terminal_ orelse return .invalid_value).terminal;
     const mode_tag: modes.ModeTag = @bitCast(tag);
     const mode = modes.modeFromInt(mode_tag.value, mode_tag.ansi) orelse return .invalid_value;
@@ -500,7 +500,7 @@ pub fn get(
     terminal_: Terminal,
     data: TerminalData,
     out: ?*anyopaque,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     if (comptime std.debug.runtime_safety) {
         _ = std.meta.intToEnum(TerminalData, @intFromEnum(data)) catch {
             log.warn("terminal_get invalid data value={d}", .{@intFromEnum(data)});
@@ -561,7 +561,7 @@ pub fn grid_ref(
     terminal_: Terminal,
     pt: point.Point.C,
     out_ref: ?*grid_ref_c.CGridRef,
-) callconv(.c) Result {
+) callconv(lib.calling_conv) Result {
     const t: *ZigTerminal = (terminal_ orelse return .invalid_value).terminal;
     const zig_pt: point.Point = switch (pt.tag) {
         .active => .{ .active = pt.value.active },
@@ -575,7 +575,7 @@ pub fn grid_ref(
     return .success;
 }
 
-pub fn free(terminal_: Terminal) callconv(.c) void {
+pub fn free(terminal_: Terminal) callconv(lib.calling_conv) void {
     const wrapper = terminal_ orelse return;
     const t = wrapper.terminal;
 
@@ -1162,7 +1162,7 @@ test "set write_pty callback" {
             last_userdata = null;
         }
 
-        fn writePty(_: Terminal, ud: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+        fn writePty(_: Terminal, ud: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(lib.calling_conv) void {
             if (last_data) |d| testing.allocator.free(d);
             last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
             last_userdata = ud;
@@ -1214,7 +1214,7 @@ test "set write_pty null clears callback" {
 
     const S = struct {
         var called: bool = false;
-        fn writePty(_: Terminal, _: ?*anyopaque, _: [*]const u8, _: usize) callconv(.c) void {
+        fn writePty(_: Terminal, _: ?*anyopaque, _: [*]const u8, _: usize) callconv(lib.calling_conv) void {
             called = true;
         }
     };
@@ -1245,7 +1245,7 @@ test "set bell callback" {
         var bell_count: usize = 0;
         var last_userdata: ?*anyopaque = null;
 
-        fn bell(_: Terminal, ud: ?*anyopaque) callconv(.c) void {
+        fn bell(_: Terminal, ud: ?*anyopaque) callconv(lib.calling_conv) void {
             bell_count += 1;
             last_userdata = ud;
         }
@@ -1306,13 +1306,13 @@ test "set enquiry callback" {
             last_data = null;
         }
 
-        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(lib.calling_conv) void {
             if (last_data) |d| testing.allocator.free(d);
             last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
         }
 
         const response = "OK";
-        fn enquiry(_: Terminal, _: ?*anyopaque) callconv(.c) lib.String {
+        fn enquiry(_: Terminal, _: ?*anyopaque) callconv(lib.calling_conv) lib.String {
             return .{ .ptr = response, .len = response.len };
         }
     };
@@ -1365,13 +1365,13 @@ test "set xtversion callback" {
             last_data = null;
         }
 
-        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(lib.calling_conv) void {
             if (last_data) |d| testing.allocator.free(d);
             last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
         }
 
         const version = "myterm 1.0";
-        fn xtversion(_: Terminal, _: ?*anyopaque) callconv(.c) lib.String {
+        fn xtversion(_: Terminal, _: ?*anyopaque) callconv(lib.calling_conv) lib.String {
             return .{ .ptr = version, .len = version.len };
         }
     };
@@ -1408,7 +1408,7 @@ test "xtversion without callback reports default" {
             last_data = null;
         }
 
-        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(lib.calling_conv) void {
             if (last_data) |d| testing.allocator.free(d);
             last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
         }
@@ -1440,7 +1440,7 @@ test "set title_changed callback" {
         var title_count: usize = 0;
         var last_userdata: ?*anyopaque = null;
 
-        fn titleChanged(_: Terminal, ud: ?*anyopaque) callconv(.c) void {
+        fn titleChanged(_: Terminal, ud: ?*anyopaque) callconv(lib.calling_conv) void {
             title_count += 1;
             last_userdata = ud;
         }
@@ -1500,12 +1500,12 @@ test "set size callback" {
             last_data = null;
         }
 
-        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(lib.calling_conv) void {
             if (last_data) |d| testing.allocator.free(d);
             last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
         }
 
-        fn sizeCb(_: Terminal, _: ?*anyopaque, out_size: *size_report.Size) callconv(.c) bool {
+        fn sizeCb(_: Terminal, _: ?*anyopaque, out_size: *size_report.Size) callconv(lib.calling_conv) bool {
             out_size.* = .{
                 .rows = 24,
                 .columns = 80,
@@ -1564,12 +1564,12 @@ test "set device_attributes callback primary" {
             last_data = null;
         }
 
-        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(lib.calling_conv) void {
             if (last_data) |d| testing.allocator.free(d);
             last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
         }
 
-        fn da(_: Terminal, _: ?*anyopaque, out: *Effects.CDeviceAttributes) callconv(.c) bool {
+        fn da(_: Terminal, _: ?*anyopaque, out: *Effects.CDeviceAttributes) callconv(lib.calling_conv) bool {
             out.* = .{
                 .primary = .{
                     .conformance_level = 64,
@@ -1618,12 +1618,12 @@ test "set device_attributes callback secondary" {
             last_data = null;
         }
 
-        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(lib.calling_conv) void {
             if (last_data) |d| testing.allocator.free(d);
             last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
         }
 
-        fn da(_: Terminal, _: ?*anyopaque, out: *Effects.CDeviceAttributes) callconv(.c) bool {
+        fn da(_: Terminal, _: ?*anyopaque, out: *Effects.CDeviceAttributes) callconv(lib.calling_conv) bool {
             out.* = .{
                 .primary = .{
                     .conformance_level = 62,
@@ -1672,12 +1672,12 @@ test "set device_attributes callback tertiary" {
             last_data = null;
         }
 
-        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(lib.calling_conv) void {
             if (last_data) |d| testing.allocator.free(d);
             last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
         }
 
-        fn da(_: Terminal, _: ?*anyopaque, out: *Effects.CDeviceAttributes) callconv(.c) bool {
+        fn da(_: Terminal, _: ?*anyopaque, out: *Effects.CDeviceAttributes) callconv(lib.calling_conv) bool {
             out.* = .{
                 .primary = .{
                     .conformance_level = 62,
@@ -1726,7 +1726,7 @@ test "device_attributes without callback uses default" {
             last_data = null;
         }
 
-        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(lib.calling_conv) void {
             if (last_data) |d| testing.allocator.free(d);
             last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
         }
@@ -1762,12 +1762,12 @@ test "device_attributes callback returns false uses default" {
             last_data = null;
         }
 
-        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(lib.calling_conv) void {
             if (last_data) |d| testing.allocator.free(d);
             last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
         }
 
-        fn da(_: Terminal, _: ?*anyopaque, _: *Effects.CDeviceAttributes) callconv(.c) bool {
+        fn da(_: Terminal, _: ?*anyopaque, _: *Effects.CDeviceAttributes) callconv(lib.calling_conv) bool {
             return false;
         }
     };
@@ -1955,7 +1955,7 @@ test "resize sends in-band size report" {
             last_data = null;
         }
 
-        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(.c) void {
+        fn writePty(_: Terminal, _: ?*anyopaque, ptr: [*]const u8, len: usize) callconv(lib.calling_conv) void {
             if (last_data) |d| testing.allocator.free(d);
             last_data = testing.allocator.dupe(u8, ptr[0..len]) catch @panic("OOM");
         }
@@ -1990,7 +1990,7 @@ test "resize no size report without mode 2048" {
 
     const S = struct {
         var called: bool = false;
-        fn writePty(_: Terminal, _: ?*anyopaque, _: [*]const u8, _: usize) callconv(.c) void {
+        fn writePty(_: Terminal, _: ?*anyopaque, _: [*]const u8, _: usize) callconv(lib.calling_conv) void {
             called = true;
         }
     };
diff --git a/src/terminal/main.zig b/src/terminal/main.zig
index 9f5b65e34..3253a95ed 100644
--- a/src/terminal/main.zig
+++ b/src/terminal/main.zig
@@ -73,8 +73,7 @@ pub const Attribute = sgr.Attribute;
 pub const Options = @import("build_options.zig").Options;
 pub const options = @import("terminal_options");
 
-/// This is set to true when we're building the C library.
-pub const c_api = if (options.c_abi) @import("c/main.zig") else void;
+pub const c_api = @import("c/main.zig");
 
 test {
     @import("std").testing.refAllDecls(@This());

From 3c9c3a4f54f3c01e3b28fe63d5797bb3334c8e18 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 25 Mar 2026 07:29:23 -0700
Subject: [PATCH 385/391] terminal/c: use lib.alloc instead of direct
 lib/allocator.zig import

Each C API file independently imported ../../lib/allocator.zig as
lib_alloc. Now that terminal/lib.zig re-exports the allocator module
as lib.alloc, use that instead. This removes the redundant import
and keeps all lib dependencies flowing through the single lib.zig
entry point.
---
 src/terminal/c/allocator.zig    |  23 ++++---
 src/terminal/c/formatter.zig    |  37 +++++------
 src/terminal/c/key_encode.zig   |  25 ++++---
 src/terminal/c/key_event.zig    |  13 ++--
 src/terminal/c/main.zig         |   4 +-
 src/terminal/c/mouse_encode.zig |  29 ++++----
 src/terminal/c/mouse_event.zig  |   9 ++-
 src/terminal/c/osc.zig          |   9 ++-
 src/terminal/c/render.zig       | 113 ++++++++++++++++----------------
 src/terminal/c/sgr.zig          |   9 ++-
 src/terminal/c/terminal.zig     | 109 +++++++++++++++---------------
 src/terminal/lib.zig            |   1 +
 12 files changed, 186 insertions(+), 195 deletions(-)

diff --git a/src/terminal/c/allocator.zig b/src/terminal/c/allocator.zig
index 5dc65aab1..ca698f3c8 100644
--- a/src/terminal/c/allocator.zig
+++ b/src/terminal/c/allocator.zig
@@ -1,8 +1,7 @@
 const std = @import("std");
 const testing = std.testing;
 const lib = @import("../lib.zig");
-const lib_alloc = @import("../../lib/allocator.zig");
-const CAllocator = lib_alloc.Allocator;
+const CAllocator = lib.alloc.Allocator;
 
 /// Allocate a buffer of `len` bytes using the given allocator
 /// (or the default allocator if NULL).
@@ -13,7 +12,7 @@ pub fn alloc(
     alloc_: ?*const CAllocator,
     len: usize,
 ) callconv(lib.calling_conv) ?[*]u8 {
-    const allocator = lib_alloc.default(alloc_);
+    const allocator = lib.alloc.default(alloc_);
     const buf = allocator.alloc(u8, len) catch return null;
     return buf.ptr;
 }
@@ -29,14 +28,14 @@ pub fn free(
     len: usize,
 ) callconv(lib.calling_conv) void {
     const mem = ptr orelse return;
-    const allocator = lib_alloc.default(alloc_);
+    const allocator = lib.alloc.default(alloc_);
     allocator.free(mem[0..len]);
 }
 
 test "alloc returns non-null" {
-    const ptr = alloc(&lib_alloc.test_allocator, 16);
+    const ptr = alloc(&lib.alloc.test_allocator, 16);
     try testing.expect(ptr != null);
-    free(&lib_alloc.test_allocator, ptr, 16);
+    free(&lib.alloc.test_allocator, ptr, 16);
 }
 
 test "alloc with null allocator" {
@@ -46,23 +45,23 @@ test "alloc with null allocator" {
 }
 
 test "alloc zero length" {
-    const ptr = alloc(&lib_alloc.test_allocator, 0);
-    defer free(&lib_alloc.test_allocator, ptr, 0);
+    const ptr = alloc(&lib.alloc.test_allocator, 0);
+    defer free(&lib.alloc.test_allocator, ptr, 0);
 }
 
 test "free null pointer" {
-    free(&lib_alloc.test_allocator, null, 0);
+    free(&lib.alloc.test_allocator, null, 0);
 }
 
 test "free allocated memory" {
-    const allocator = lib_alloc.default(&lib_alloc.test_allocator);
+    const allocator = lib.alloc.default(&lib.alloc.test_allocator);
     const mem = try allocator.alloc(u8, 16);
-    free(&lib_alloc.test_allocator, mem.ptr, mem.len);
+    free(&lib.alloc.test_allocator, mem.ptr, mem.len);
 }
 
 test "free with null allocator" {
     // null allocator falls back to the default (test allocator in tests)
-    const allocator = lib_alloc.default(null);
+    const allocator = lib.alloc.default(null);
     const mem = try allocator.alloc(u8, 8);
     free(null, mem.ptr, mem.len);
 }
diff --git a/src/terminal/c/formatter.zig b/src/terminal/c/formatter.zig
index dbaa0acc8..11717bc22 100644
--- a/src/terminal/c/formatter.zig
+++ b/src/terminal/c/formatter.zig
@@ -1,8 +1,7 @@
 const std = @import("std");
 const testing = std.testing;
 const lib = @import("../lib.zig");
-const lib_alloc = @import("../../lib/allocator.zig");
-const CAllocator = lib_alloc.Allocator;
+const CAllocator = lib.alloc.Allocator;
 const terminal_c = @import("terminal.zig");
 const ZigTerminal = @import("../Terminal.zig");
 const formatterpkg = @import("../formatter.zig");
@@ -127,7 +126,7 @@ fn terminal_new_(
 }!*FormatterWrapper {
     const t: *ZigTerminal = (terminal_ orelse return error.InvalidValue).terminal;
 
-    const alloc = lib_alloc.default(alloc_);
+    const alloc = lib.alloc.default(alloc_);
     const ptr = alloc.create(FormatterWrapper) catch
         return error.OutOfMemory;
     errdefer alloc.destroy(ptr);
@@ -184,7 +183,7 @@ pub fn format_alloc(
     out_len: *usize,
 ) callconv(lib.calling_conv) Result {
     const wrapper = formatter_ orelse return .invalid_value;
-    const alloc = lib_alloc.default(alloc_);
+    const alloc = lib.alloc.default(alloc_);
 
     var aw: std.Io.Writer.Allocating = .init(alloc);
     defer aw.deinit();
@@ -208,7 +207,7 @@ pub fn free(formatter_: Formatter) callconv(lib.calling_conv) void {
 test "terminal_new/free" {
     var t: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{ .cols = 80, .rows = 24, .max_scrollback = 10_000 },
     ));
@@ -216,7 +215,7 @@ test "terminal_new/free" {
 
     var f: Formatter = null;
     try testing.expectEqual(Result.success, terminal_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &f,
         t,
         .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .{ .palette = false, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = false, .hyperlink = false, .protection = false, .kitty_keyboard = false, .charsets = false } } },
@@ -228,7 +227,7 @@ test "terminal_new/free" {
 test "terminal_new invalid_value on null terminal" {
     var f: Formatter = null;
     try testing.expectEqual(Result.invalid_value, terminal_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &f,
         null,
         .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .{ .palette = false, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = false, .hyperlink = false, .protection = false, .kitty_keyboard = false, .charsets = false } } },
@@ -243,7 +242,7 @@ test "free null" {
 test "format plain" {
     var t: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{ .cols = 80, .rows = 24, .max_scrollback = 10_000 },
     ));
@@ -253,7 +252,7 @@ test "format plain" {
 
     var f: Formatter = null;
     try testing.expectEqual(Result.success, terminal_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &f,
         t,
         .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .{ .palette = false, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = false, .hyperlink = false, .protection = false, .kitty_keyboard = false, .charsets = false } } },
@@ -269,7 +268,7 @@ test "format plain" {
 test "format reflects terminal changes" {
     var t: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{ .cols = 80, .rows = 24, .max_scrollback = 10_000 },
     ));
@@ -279,7 +278,7 @@ test "format reflects terminal changes" {
 
     var f: Formatter = null;
     try testing.expectEqual(Result.success, terminal_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &f,
         t,
         .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .{ .palette = false, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = false, .hyperlink = false, .protection = false, .kitty_keyboard = false, .charsets = false } } },
@@ -301,7 +300,7 @@ test "format reflects terminal changes" {
 test "format null returns required size" {
     var t: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{ .cols = 80, .rows = 24, .max_scrollback = 10_000 },
     ));
@@ -311,7 +310,7 @@ test "format null returns required size" {
 
     var f: Formatter = null;
     try testing.expectEqual(Result.success, terminal_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &f,
         t,
         .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .{ .palette = false, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = false, .hyperlink = false, .protection = false, .kitty_keyboard = false, .charsets = false } } },
@@ -333,7 +332,7 @@ test "format null returns required size" {
 test "format buffer too small" {
     var t: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{ .cols = 80, .rows = 24, .max_scrollback = 10_000 },
     ));
@@ -343,7 +342,7 @@ test "format buffer too small" {
 
     var f: Formatter = null;
     try testing.expectEqual(Result.success, terminal_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &f,
         t,
         .{ .emit = .plain, .unwrap = false, .trim = true, .extra = .{ .palette = false, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = false, .hyperlink = false, .protection = false, .kitty_keyboard = false, .charsets = false } } },
@@ -366,7 +365,7 @@ test "format null formatter" {
 test "format vt" {
     var t: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{ .cols = 80, .rows = 24, .max_scrollback = 10_000 },
     ));
@@ -376,7 +375,7 @@ test "format vt" {
 
     var f: Formatter = null;
     try testing.expectEqual(Result.success, terminal_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &f,
         t,
         .{ .emit = .vt, .unwrap = false, .trim = true, .extra = .{ .palette = true, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = true, .hyperlink = true, .protection = false, .kitty_keyboard = false, .charsets = false } } },
@@ -393,7 +392,7 @@ test "format vt" {
 test "format html" {
     var t: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{ .cols = 80, .rows = 24, .max_scrollback = 10_000 },
     ));
@@ -403,7 +402,7 @@ test "format html" {
 
     var f: Formatter = null;
     try testing.expectEqual(Result.success, terminal_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &f,
         t,
         .{ .emit = .html, .unwrap = false, .trim = true, .extra = .{ .palette = false, .modes = false, .scrolling_region = false, .tabstops = false, .pwd = false, .keyboard = false, .screen = .{ .cursor = false, .style = false, .hyperlink = false, .protection = false, .kitty_keyboard = false, .charsets = false } } },
diff --git a/src/terminal/c/key_encode.zig b/src/terminal/c/key_encode.zig
index 2dbf71821..15fa74dd8 100644
--- a/src/terminal/c/key_encode.zig
+++ b/src/terminal/c/key_encode.zig
@@ -1,8 +1,7 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const lib = @import("../lib.zig");
-const lib_alloc = @import("../../lib/allocator.zig");
-const CAllocator = lib_alloc.Allocator;
+const CAllocator = lib.alloc.Allocator;
 const key_encode = @import("../../input/key_encode.zig");
 const key_event = @import("key_event.zig");
 const KittyFlags = @import("../../terminal/kitty/key.zig").Flags;
@@ -27,7 +26,7 @@ pub fn new(
     alloc_: ?*const CAllocator,
     result: *Encoder,
 ) callconv(lib.calling_conv) Result {
-    const alloc = lib_alloc.default(alloc_);
+    const alloc = lib.alloc.default(alloc_);
     const ptr = alloc.create(KeyEncoderWrapper) catch
         return .out_of_memory;
     ptr.* = .{
@@ -166,7 +165,7 @@ test "alloc" {
     const testing = std.testing;
     var e: Encoder = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     free(e);
@@ -176,7 +175,7 @@ test "setopt bool" {
     const testing = std.testing;
     var e: Encoder = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     defer free(e);
@@ -198,7 +197,7 @@ test "setopt kitty flags" {
     const testing = std.testing;
     var e: Encoder = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     defer free(e);
@@ -219,7 +218,7 @@ test "setopt macos option as alt" {
     const testing = std.testing;
     var e: Encoder = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     defer free(e);
@@ -241,7 +240,7 @@ test "setopt_from_terminal" {
     // Create encoder
     var e: Encoder = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     defer free(e);
@@ -249,7 +248,7 @@ test "setopt_from_terminal" {
     // Create terminal
     var t: Terminal = undefined;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{ .cols = 80, .rows = 24, .max_scrollback = 0 },
     ));
@@ -275,7 +274,7 @@ test "setopt_from_terminal null" {
     const terminal_c = @import("terminal.zig");
     var t: Terminal = undefined;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{ .cols = 80, .rows = 24, .max_scrollback = 0 },
     ));
@@ -285,7 +284,7 @@ test "setopt_from_terminal null" {
     // Valid encoder with null terminal
     var e: Encoder = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     defer free(e);
@@ -298,7 +297,7 @@ test "encode: kitty ctrl release with ctrl mod set" {
     // Create encoder
     var encoder: Encoder = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &encoder,
     ));
     defer free(encoder);
@@ -319,7 +318,7 @@ test "encode: kitty ctrl release with ctrl mod set" {
     // Create key event
     var event: key_event.Event = undefined;
     try testing.expectEqual(Result.success, key_event.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &event,
     ));
     defer key_event.free(event);
diff --git a/src/terminal/c/key_event.zig b/src/terminal/c/key_event.zig
index d3fe298d4..1feac9ac5 100644
--- a/src/terminal/c/key_event.zig
+++ b/src/terminal/c/key_event.zig
@@ -1,8 +1,7 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const lib = @import("../lib.zig");
-const lib_alloc = @import("../../lib/allocator.zig");
-const CAllocator = lib_alloc.Allocator;
+const CAllocator = lib.alloc.Allocator;
 const key = @import("../../input/key.zig");
 const Result = @import("result.zig").Result;
 
@@ -23,7 +22,7 @@ pub fn new(
     alloc_: ?*const CAllocator,
     result: *Event,
 ) callconv(lib.calling_conv) Result {
-    const alloc = lib_alloc.default(alloc_);
+    const alloc = lib.alloc.default(alloc_);
     const ptr = alloc.create(KeyEventWrapper) catch
         return .out_of_memory;
     ptr.* = .{ .alloc = alloc };
@@ -126,7 +125,7 @@ test "alloc" {
     const testing = std.testing;
     var e: Event = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     free(e);
@@ -136,7 +135,7 @@ test "set" {
     const testing = std.testing;
     var e: Event = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     defer free(e);
@@ -183,7 +182,7 @@ test "get" {
     const testing = std.testing;
     var e: Event = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     defer free(e);
@@ -232,7 +231,7 @@ test "complete key event" {
     const testing = std.testing;
     var e: Event = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     defer free(e);
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
index d854ac60e..788790c69 100644
--- a/src/terminal/c/main.zig
+++ b/src/terminal/c/main.zig
@@ -1,5 +1,5 @@
-const lib_alloc = @import("../../lib/allocator.zig");
-const CAllocator = lib_alloc.Allocator;
+const lib = @import("../lib.zig");
+const CAllocator = lib.alloc.Allocator;
 
 const buildpkg = @import("build_info.zig");
 pub const allocator = @import("allocator.zig");
diff --git a/src/terminal/c/mouse_encode.zig b/src/terminal/c/mouse_encode.zig
index 6f9eb79da..331dd6060 100644
--- a/src/terminal/c/mouse_encode.zig
+++ b/src/terminal/c/mouse_encode.zig
@@ -2,8 +2,7 @@ const std = @import("std");
 const Allocator = std.mem.Allocator;
 const testing = std.testing;
 const lib = @import("../lib.zig");
-const lib_alloc = @import("../../lib/allocator.zig");
-const CAllocator = lib_alloc.Allocator;
+const CAllocator = lib.alloc.Allocator;
 const input_mouse_encode = @import("../../input/mouse_encode.zig");
 const renderer_size = @import("../../renderer/size.zig");
 const point = @import("../point.zig");
@@ -91,7 +90,7 @@ pub fn new(
     alloc_: ?*const CAllocator,
     result: *Encoder,
 ) callconv(lib.calling_conv) Result {
-    const alloc = lib_alloc.default(alloc_);
+    const alloc = lib.alloc.default(alloc_);
     const ptr = alloc.create(MouseEncoderWrapper) catch
         return .out_of_memory;
     ptr.* = .{
@@ -275,7 +274,7 @@ fn testSize() Size {
 test "alloc" {
     var e: Encoder = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     free(e);
@@ -284,7 +283,7 @@ test "alloc" {
 test "setopt" {
     var e: Encoder = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     defer free(e);
@@ -316,14 +315,14 @@ test "setopt_from_terminal" {
 
     var e: Encoder = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     defer free(e);
 
     var t: Terminal = undefined;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{ .cols = 80, .rows = 24, .max_scrollback = 0 },
     ));
@@ -345,7 +344,7 @@ test "setopt_from_terminal null" {
     const terminal_c = @import("terminal.zig");
     var t: Terminal = undefined;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{ .cols = 80, .rows = 24, .max_scrollback = 0 },
     ));
@@ -354,7 +353,7 @@ test "setopt_from_terminal null" {
 
     var e: Encoder = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     defer free(e);
@@ -364,7 +363,7 @@ test "setopt_from_terminal null" {
 test "encode: sgr press left" {
     var encoder: Encoder = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &encoder,
     ));
     defer free(encoder);
@@ -378,7 +377,7 @@ test "encode: sgr press left" {
 
     var event: Event = undefined;
     try testing.expectEqual(Result.success, mouse_event.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &event,
     ));
     defer mouse_event.free(event);
@@ -413,7 +412,7 @@ test "encode: sgr press left" {
 test "encode: motion dedupe and reset" {
     var encoder: Encoder = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &encoder,
     ));
     defer free(encoder);
@@ -429,7 +428,7 @@ test "encode: motion dedupe and reset" {
 
     var event: Event = undefined;
     try testing.expectEqual(Result.success, mouse_event.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &event,
     ));
     defer mouse_event.free(event);
@@ -483,7 +482,7 @@ test "encode: motion dedupe and reset" {
 test "encode: querying required size doesn't update dedupe state" {
     var encoder: Encoder = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &encoder,
     ));
     defer free(encoder);
@@ -499,7 +498,7 @@ test "encode: querying required size doesn't update dedupe state" {
 
     var event: Event = undefined;
     try testing.expectEqual(Result.success, mouse_event.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &event,
     ));
     defer mouse_event.free(event);
diff --git a/src/terminal/c/mouse_event.zig b/src/terminal/c/mouse_event.zig
index 0f634d4da..b3c19dd39 100644
--- a/src/terminal/c/mouse_event.zig
+++ b/src/terminal/c/mouse_event.zig
@@ -2,8 +2,7 @@ const std = @import("std");
 const Allocator = std.mem.Allocator;
 const testing = std.testing;
 const lib = @import("../lib.zig");
-const lib_alloc = @import("../../lib/allocator.zig");
-const CAllocator = lib_alloc.Allocator;
+const CAllocator = lib.alloc.Allocator;
 const key = @import("../../input/key.zig");
 const mouse = @import("../../input/mouse.zig");
 const mouse_encode = @import("../../input/mouse_encode.zig");
@@ -36,7 +35,7 @@ pub fn new(
     alloc_: ?*const CAllocator,
     result: *Event,
 ) callconv(lib.calling_conv) Result {
-    const alloc = lib_alloc.default(alloc_);
+    const alloc = lib.alloc.default(alloc_);
     const ptr = alloc.create(MouseEventWrapper) catch
         return .out_of_memory;
     ptr.* = .{ .alloc = alloc };
@@ -108,7 +107,7 @@ pub fn get_position(event_: Event) callconv(lib.calling_conv) Position {
 test "alloc" {
     var e: Event = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     free(e);
@@ -121,7 +120,7 @@ test "free null" {
 test "set/get" {
     var e: Event = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &e,
     ));
     defer free(e);
diff --git a/src/terminal/c/osc.zig b/src/terminal/c/osc.zig
index 8d0c065f9..7ba323001 100644
--- a/src/terminal/c/osc.zig
+++ b/src/terminal/c/osc.zig
@@ -1,7 +1,6 @@
 const std = @import("std");
 const lib = @import("../lib.zig");
-const lib_alloc = @import("../../lib/allocator.zig");
-const CAllocator = lib_alloc.Allocator;
+const CAllocator = lib.alloc.Allocator;
 const osc = @import("../osc.zig");
 const Result = @import("result.zig").Result;
 
@@ -17,7 +16,7 @@ pub fn new(
     alloc_: ?*const CAllocator,
     result: *Parser,
 ) callconv(lib.calling_conv) Result {
-    const alloc = lib_alloc.default(alloc_);
+    const alloc = lib.alloc.default(alloc_);
     const ptr = alloc.create(osc.Parser) catch
         return .out_of_memory;
     ptr.* = .init(alloc);
@@ -107,7 +106,7 @@ test "alloc" {
     const testing = std.testing;
     var p: Parser = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &p,
     ));
     free(p);
@@ -122,7 +121,7 @@ test "change window title" {
     const testing = std.testing;
     var p: Parser = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &p,
     ));
     defer free(p);
diff --git a/src/terminal/c/render.zig b/src/terminal/c/render.zig
index 6d9ac8d15..08a5c00f3 100644
--- a/src/terminal/c/render.zig
+++ b/src/terminal/c/render.zig
@@ -2,8 +2,7 @@ const std = @import("std");
 const testing = std.testing;
 const Allocator = std.mem.Allocator;
 const lib = @import("../lib.zig");
-const lib_alloc = @import("../../lib/allocator.zig");
-const CAllocator = lib_alloc.Allocator;
+const CAllocator = lib.alloc.Allocator;
 const colorpkg = @import("../color.zig");
 const cursorpkg = @import("../cursor.zig");
 const page = @import("../page.zig");
@@ -155,7 +154,7 @@ pub fn new(
 }
 
 fn new_(alloc_: ?*const CAllocator) error{OutOfMemory}!*RenderStateWrapper {
-    const alloc = lib_alloc.default(alloc_);
+    const alloc = lib.alloc.default(alloc_);
     const ptr = alloc.create(RenderStateWrapper) catch
         return error.OutOfMemory;
     ptr.* = .{ .alloc = alloc };
@@ -355,7 +354,7 @@ pub fn row_iterator_new(
     alloc_: ?*const CAllocator,
     result: *RowIterator,
 ) callconv(lib.calling_conv) Result {
-    const alloc = lib_alloc.default(alloc_);
+    const alloc = lib.alloc.default(alloc_);
     const ptr = alloc.create(RowIteratorWrapper) catch {
         result.* = null;
         return .out_of_memory;
@@ -390,7 +389,7 @@ pub fn row_cells_new(
     alloc_: ?*const CAllocator,
     result: *RowCells,
 ) callconv(lib.calling_conv) Result {
-    const alloc = lib_alloc.default(alloc_);
+    const alloc = lib.alloc.default(alloc_);
     const ptr = alloc.create(RowCellsWrapper) catch {
         result.* = null;
         return .out_of_memory;
@@ -639,7 +638,7 @@ fn rowSetTyped(
 test "render: new/free" {
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     try testing.expect(state != null);
@@ -653,7 +652,7 @@ test "render: free null" {
 test "render: update invalid value" {
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -670,7 +669,7 @@ test "render: get invalid value" {
 test "render: get invalid data" {
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -681,7 +680,7 @@ test "render: get invalid data" {
 test "render: colors get invalid value" {
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -706,7 +705,7 @@ test "render: get/set dirty invalid value" {
 test "render: get/set dirty" {
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -729,7 +728,7 @@ test "render: get/set dirty" {
 test "render: set null value" {
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -740,7 +739,7 @@ test "render: set null value" {
 test "render: row iterator get invalid value" {
     var iterator: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &iterator,
     ));
     defer row_iterator_free(iterator);
@@ -751,7 +750,7 @@ test "render: row iterator get invalid value" {
 test "render: row iterator new/free" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &terminal,
         .{
             .cols = 80,
@@ -763,7 +762,7 @@ test "render: row iterator new/free" {
 
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -772,7 +771,7 @@ test "render: row iterator new/free" {
 
     var iterator: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &iterator,
     ));
     defer row_iterator_free(iterator);
@@ -806,7 +805,7 @@ test "render: row get null" {
 test "render: row get invalid data" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &terminal,
         .{
             .cols = 80,
@@ -818,7 +817,7 @@ test "render: row get invalid data" {
 
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -827,7 +826,7 @@ test "render: row get invalid data" {
 
     var iterator: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &iterator,
     ));
     defer row_iterator_free(iterator);
@@ -845,7 +844,7 @@ test "render: row set null" {
 test "render: row set before iteration" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &terminal,
         .{
             .cols = 80,
@@ -857,7 +856,7 @@ test "render: row set before iteration" {
 
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -866,7 +865,7 @@ test "render: row set before iteration" {
 
     var iterator: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &iterator,
     ));
     defer row_iterator_free(iterator);
@@ -879,7 +878,7 @@ test "render: row set before iteration" {
 test "render: row get before iteration" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &terminal,
         .{
             .cols = 80,
@@ -891,7 +890,7 @@ test "render: row get before iteration" {
 
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -900,7 +899,7 @@ test "render: row get before iteration" {
 
     var iterator: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &iterator,
     ));
     defer row_iterator_free(iterator);
@@ -913,7 +912,7 @@ test "render: row get before iteration" {
 test "render: row get/set dirty" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &terminal,
         .{
             .cols = 80,
@@ -925,7 +924,7 @@ test "render: row get/set dirty" {
 
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -939,7 +938,7 @@ test "render: row get/set dirty" {
     // Create an iterator and verify it is dirty.
     var it: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &it,
     ));
     defer row_iterator_free(it);
@@ -957,7 +956,7 @@ test "render: row get/set dirty" {
     // It should not be dirty anymore.
     var it2: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &it2,
     ));
     defer row_iterator_free(it2);
@@ -971,7 +970,7 @@ test "render: row get/set dirty" {
 test "render: row iterator next" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &terminal,
         .{
             .cols = 80,
@@ -983,7 +982,7 @@ test "render: row iterator next" {
 
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -992,7 +991,7 @@ test "render: row iterator next" {
 
     var iterator: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &iterator,
     ));
     defer row_iterator_free(iterator);
@@ -1021,7 +1020,7 @@ test "render: row iterator next" {
 test "render: update" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &terminal,
         .{
             .cols = 80,
@@ -1033,7 +1032,7 @@ test "render: update" {
 
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -1054,7 +1053,7 @@ test "render: update" {
 test "render: colors get" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &terminal,
         .{
             .cols = 80,
@@ -1066,7 +1065,7 @@ test "render: colors get" {
 
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -1096,7 +1095,7 @@ test "render: colors get" {
 test "render: row cells bg_color no background" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &terminal,
         .{
             .cols = 80,
@@ -1111,7 +1110,7 @@ test "render: row cells bg_color no background" {
 
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -1120,7 +1119,7 @@ test "render: row cells bg_color no background" {
 
     var it: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &it,
     ));
     defer row_iterator_free(it);
@@ -1130,7 +1129,7 @@ test "render: row cells bg_color no background" {
 
     var cells: RowCells = null;
     try testing.expectEqual(Result.success, row_cells_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &cells,
     ));
     defer row_cells_free(cells);
@@ -1146,7 +1145,7 @@ test "render: row cells bg_color no background" {
 test "render: row cells bg_color from style" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &terminal,
         .{
             .cols = 80,
@@ -1161,7 +1160,7 @@ test "render: row cells bg_color from style" {
 
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -1170,7 +1169,7 @@ test "render: row cells bg_color from style" {
 
     var it: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &it,
     ));
     defer row_iterator_free(it);
@@ -1180,7 +1179,7 @@ test "render: row cells bg_color from style" {
 
     var cells: RowCells = null;
     try testing.expectEqual(Result.success, row_cells_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &cells,
     ));
     defer row_cells_free(cells);
@@ -1198,7 +1197,7 @@ test "render: row cells bg_color from style" {
 test "render: row cells bg_color from content tag" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &terminal,
         .{
             .cols = 80,
@@ -1215,7 +1214,7 @@ test "render: row cells bg_color from content tag" {
 
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -1224,7 +1223,7 @@ test "render: row cells bg_color from content tag" {
 
     var it: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &it,
     ));
     defer row_iterator_free(it);
@@ -1234,7 +1233,7 @@ test "render: row cells bg_color from content tag" {
 
     var cells: RowCells = null;
     try testing.expectEqual(Result.success, row_cells_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &cells,
     ));
     defer row_cells_free(cells);
@@ -1252,7 +1251,7 @@ test "render: row cells bg_color from content tag" {
 test "render: row cells fg_color no foreground" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &terminal,
         .{
             .cols = 80,
@@ -1267,7 +1266,7 @@ test "render: row cells fg_color no foreground" {
 
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -1276,7 +1275,7 @@ test "render: row cells fg_color no foreground" {
 
     var it: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &it,
     ));
     defer row_iterator_free(it);
@@ -1286,7 +1285,7 @@ test "render: row cells fg_color no foreground" {
 
     var cells: RowCells = null;
     try testing.expectEqual(Result.success, row_cells_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &cells,
     ));
     defer row_cells_free(cells);
@@ -1302,7 +1301,7 @@ test "render: row cells fg_color no foreground" {
 test "render: row cells fg_color from style" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &terminal,
         .{
             .cols = 80,
@@ -1317,7 +1316,7 @@ test "render: row cells fg_color from style" {
 
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
@@ -1326,7 +1325,7 @@ test "render: row cells fg_color from style" {
 
     var it: RowIterator = null;
     try testing.expectEqual(Result.success, row_iterator_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &it,
     ));
     defer row_iterator_free(it);
@@ -1336,7 +1335,7 @@ test "render: row cells fg_color from style" {
 
     var cells: RowCells = null;
     try testing.expectEqual(Result.success, row_cells_new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &cells,
     ));
     defer row_cells_free(cells);
@@ -1354,7 +1353,7 @@ test "render: row cells fg_color from style" {
 test "render: colors get supports truncated sized struct" {
     var terminal: terminal_c.Terminal = null;
     try testing.expectEqual(Result.success, terminal_c.new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &terminal,
         .{
             .cols = 80,
@@ -1366,7 +1365,7 @@ test "render: colors get supports truncated sized struct" {
 
     var state: RenderState = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &state,
     ));
     defer free(state);
diff --git a/src/terminal/c/sgr.zig b/src/terminal/c/sgr.zig
index 7bd47b9ae..b0ef23d05 100644
--- a/src/terminal/c/sgr.zig
+++ b/src/terminal/c/sgr.zig
@@ -2,8 +2,7 @@ const std = @import("std");
 const testing = std.testing;
 const Allocator = std.mem.Allocator;
 const lib = @import("../lib.zig");
-const lib_alloc = @import("../../lib/allocator.zig");
-const CAllocator = lib_alloc.Allocator;
+const CAllocator = lib.alloc.Allocator;
 const sgr = @import("../sgr.zig");
 const Result = @import("result.zig").Result;
 
@@ -22,7 +21,7 @@ pub fn new(
     alloc_: ?*const CAllocator,
     result: *Parser,
 ) callconv(lib.calling_conv) Result {
-    const alloc = lib_alloc.default(alloc_);
+    const alloc = lib.alloc.default(alloc_);
     const ptr = alloc.create(ParserWrapper) catch
         return .out_of_memory;
     ptr.* = .{
@@ -141,7 +140,7 @@ pub fn wasm_free_attribute(attr: *sgr.Attribute.C) callconv(lib.calling_conv) vo
 test "alloc" {
     var p: Parser = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &p,
     ));
     free(p);
@@ -150,7 +149,7 @@ test "alloc" {
 test "simple params, no seps" {
     var p: Parser = undefined;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &p,
     ));
     defer free(p);
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
index 9eb3282b1..62d3f61c4 100644
--- a/src/terminal/c/terminal.zig
+++ b/src/terminal/c/terminal.zig
@@ -1,8 +1,7 @@
 const std = @import("std");
 const testing = std.testing;
 const lib = @import("../lib.zig");
-const lib_alloc = @import("../../lib/allocator.zig");
-const CAllocator = lib_alloc.Allocator;
+const CAllocator = lib.alloc.Allocator;
 const ZigTerminal = @import("../Terminal.zig");
 const Stream = @import("../stream_terminal.zig").Stream;
 const ScreenSet = @import("../ScreenSet.zig");
@@ -239,7 +238,7 @@ fn new_(
 ) NewError!*TerminalWrapper {
     if (opts.cols == 0 or opts.rows == 0) return error.InvalidValue;
 
-    const alloc = lib_alloc.default(alloc_);
+    const alloc = lib.alloc.default(alloc_);
     const t = alloc.create(ZigTerminal) catch
         return error.OutOfMemory;
     errdefer alloc.destroy(t);
@@ -589,7 +588,7 @@ pub fn free(terminal_: Terminal) callconv(lib.calling_conv) void {
 test "new/free" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -606,7 +605,7 @@ test "new invalid value" {
     var t: Terminal = null;
 
     try testing.expectEqual(Result.invalid_value, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 0,
@@ -617,7 +616,7 @@ test "new invalid value" {
     try testing.expect(t == null);
 
     try testing.expectEqual(Result.invalid_value, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -635,7 +634,7 @@ test "free null" {
 test "scroll_viewport" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 5,
@@ -691,7 +690,7 @@ test "scroll_viewport null" {
 test "reset" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -716,7 +715,7 @@ test "reset null" {
 test "resize" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -738,7 +737,7 @@ test "resize null" {
 test "resize invalid value" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -755,7 +754,7 @@ test "resize invalid value" {
 test "mode_get and mode_set" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -801,7 +800,7 @@ test "mode_set null" {
 test "mode_get unknown mode" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -819,7 +818,7 @@ test "mode_get unknown mode" {
 test "mode_set unknown mode" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -836,7 +835,7 @@ test "mode_set unknown mode" {
 test "vt_write" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -856,7 +855,7 @@ test "vt_write" {
 test "vt_write split escape sequence" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -881,7 +880,7 @@ test "vt_write split escape sequence" {
 test "get cols and rows" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -902,7 +901,7 @@ test "get cols and rows" {
 test "get cursor position" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -930,7 +929,7 @@ test "get null" {
 test "get cursor_visible" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -954,7 +953,7 @@ test "get cursor_visible" {
 test "get active_screen" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -972,7 +971,7 @@ test "get active_screen" {
 test "get kitty_keyboard_flags" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -996,7 +995,7 @@ test "get kitty_keyboard_flags" {
 test "get mouse_tracking" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1046,7 +1045,7 @@ test "get mouse_tracking" {
 test "get total_rows" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1064,7 +1063,7 @@ test "get total_rows" {
 test "get scrollback_rows" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1088,7 +1087,7 @@ test "get scrollback_rows" {
 test "get invalid" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1104,7 +1103,7 @@ test "get invalid" {
 test "grid_ref" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1142,7 +1141,7 @@ test "grid_ref null terminal" {
 test "set write_pty callback" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1185,7 +1184,7 @@ test "set write_pty callback" {
 test "set write_pty without callback ignores queries" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1202,7 +1201,7 @@ test "set write_pty without callback ignores queries" {
 test "set write_pty null clears callback" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1231,7 +1230,7 @@ test "set write_pty null clears callback" {
 test "set bell callback" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1271,7 +1270,7 @@ test "set bell callback" {
 test "bell without callback is silent" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1288,7 +1287,7 @@ test "bell without callback is silent" {
 test "set enquiry callback" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1330,7 +1329,7 @@ test "set enquiry callback" {
 test "enquiry without callback is silent" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1347,7 +1346,7 @@ test "enquiry without callback is silent" {
 test "set xtversion callback" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1390,7 +1389,7 @@ test "set xtversion callback" {
 test "xtversion without callback reports default" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1426,7 +1425,7 @@ test "xtversion without callback reports default" {
 test "set title_changed callback" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1465,7 +1464,7 @@ test "set title_changed callback" {
 test "title_changed without callback is silent" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1482,7 +1481,7 @@ test "title_changed without callback is silent" {
 test "set size callback" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1529,7 +1528,7 @@ test "set size callback" {
 test "size without callback is silent" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1546,7 +1545,7 @@ test "size without callback is silent" {
 test "set device_attributes callback primary" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1600,7 +1599,7 @@ test "set device_attributes callback primary" {
 test "set device_attributes callback secondary" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1654,7 +1653,7 @@ test "set device_attributes callback secondary" {
 test "set device_attributes callback tertiary" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1708,7 +1707,7 @@ test "set device_attributes callback tertiary" {
 test "device_attributes without callback uses default" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1744,7 +1743,7 @@ test "device_attributes without callback uses default" {
 test "device_attributes callback returns false uses default" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1785,7 +1784,7 @@ test "device_attributes callback returns false uses default" {
 test "set and get title" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1824,7 +1823,7 @@ test "set and get title" {
 test "set and get pwd" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1856,7 +1855,7 @@ test "set and get pwd" {
 test "get title set via vt_write" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1877,7 +1876,7 @@ test "get title set via vt_write" {
 test "resize updates pixel dimensions" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1897,7 +1896,7 @@ test "resize updates pixel dimensions" {
 test "resize pixel overflow saturates" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1917,7 +1916,7 @@ test "resize pixel overflow saturates" {
 test "resize disables synchronized output" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1937,7 +1936,7 @@ test "resize disables synchronized output" {
 test "resize sends in-band size report" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -1978,7 +1977,7 @@ test "resize sends in-band size report" {
 test "resize no size report without mode 2048" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -2006,7 +2005,7 @@ test "resize no size report without mode 2048" {
 test "resize in-band report without write_pty callback" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -2028,7 +2027,7 @@ test "resize null terminal" {
 test "resize zero cols" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -2044,7 +2043,7 @@ test "resize zero cols" {
 test "resize zero rows" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
@@ -2060,7 +2059,7 @@ test "resize zero rows" {
 test "grid_ref out of bounds" {
     var t: Terminal = null;
     try testing.expectEqual(Result.success, new(
-        &lib_alloc.test_allocator,
+        &lib.alloc.test_allocator,
         &t,
         .{
             .cols = 80,
diff --git a/src/terminal/lib.zig b/src/terminal/lib.zig
index f68cd4356..8e8acf89d 100644
--- a/src/terminal/lib.zig
+++ b/src/terminal/lib.zig
@@ -15,6 +15,7 @@ else
     .auto;
 
 /// Forwarded decls from lib that are used.
+pub const alloc = lib.allocator;
 pub const Enum = lib.Enum;
 pub const TaggedUnion = lib.TaggedUnion;
 pub const Struct = lib.Struct;

From 43f3dc5f13d8bfb696702af4fc9b49cf7ca46d96 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Wed, 25 Mar 2026 10:46:02 -0400
Subject: [PATCH 386/391] zsh: fix trailing '%' in PS1/PS2 combining with marks

When PS1 ends with a bare '%' (e.g. `%3~ %`), concatenating our 133;B
mark (`%{...%}`) directly after it causes zsh's prompt expansion to
interpret the '%' + '{' result as a '%{' escape sequence. This swallows
the 133;B mark and produces a visible '{' in the prompt.

Work around this by doubling a trailing '%' into '%%' before appending
marks, so it expands to a literal '%' and won't merge with the `%{`
token.
---
 src/shell-integration/zsh/ghostty-integration | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/shell-integration/zsh/ghostty-integration b/src/shell-integration/zsh/ghostty-integration
index 2232f3202..76c5ce246 100644
--- a/src/shell-integration/zsh/ghostty-integration
+++ b/src/shell-integration/zsh/ghostty-integration
@@ -157,6 +157,11 @@ _ghostty_deferred_init() {
                 # unconditionally add mark1 and markB.
                 builtin local mark2=$'%{\e]133;P;k=s\a%}'
                 builtin local markB=$'%{\e]133;B\a%}'
+                # If PS1 ends with a bare '%', it combines with the '{'
+                # in markB to form a '%{' prompt escape, swallowing the
+                # marker and producing a visible '{'. Fix by doubling the
+                # trailing '%' so it becomes a literal '%%'.
+                [[ $PS1 == *[^%]% || $PS1 == % ]] && PS1=$PS1%
                 PS1=${mark1}${PS1}${markB}
 
                 # Handle multiline prompts by marking newline-separated
@@ -170,6 +175,7 @@ _ghostty_deferred_init() {
                 fi
 
                 # PS2 mark is needed when clearing the prompt on resize
+                [[ $PS2 == *[^%]% || $PS2 == % ]] && PS2=$PS2%
                 PS2=${mark2}${PS2}${markB}
 
                 # Save the marked PS1 so we can detect modifications

From ac85a2f3d621758c8302a0c6956d5ca30b833e73 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 25 Mar 2026 08:40:27 -0700
Subject: [PATCH 387/391] terminal: always use C ABI for now

---
 src/lib_vt.zig        |  3 +++
 src/terminal/lib.zig  | 14 ++++++--------
 src/terminal/main.zig |  3 ++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/lib_vt.zig b/src/lib_vt.zig
index a7d7171bc..0a749be87 100644
--- a/src/lib_vt.zig
+++ b/src/lib_vt.zig
@@ -264,4 +264,7 @@ test {
     _ = terminal;
     _ = @import("lib/main.zig");
     @import("std").testing.refAllDecls(input);
+    if (comptime terminal.options.c_abi) {
+        _ = terminal.c_api;
+    }
 }
diff --git a/src/terminal/lib.zig b/src/terminal/lib.zig
index 8e8acf89d..3cd657b4e 100644
--- a/src/terminal/lib.zig
+++ b/src/terminal/lib.zig
@@ -5,14 +5,12 @@ const lib = @import("../lib/main.zig");
 /// The target for the terminal lib in particular.
 pub const target: lib.Target = if (build_options.c_abi) .c else .zig;
 
-/// The calling convention to use for C APIs. If we're not building for
-/// C ABI then we use auto which allows our C APIs to be cleanly called
-/// by Zig. This is required because we modify our struct layouts based
-/// on C ABI too.
-pub const calling_conv: std.builtin.CallingConvention = if (build_options.c_abi)
-    .c
-else
-    .auto;
+/// The calling convention to use for C APIs.
+///
+/// This is always .c for now. I want to make this "Zig" when we're not
+/// building the C ABI but there are bigger issues we need to resolve to
+/// make that possible (change it and see for yourself).
+pub const calling_conv: std.builtin.CallingConvention = .c;
 
 /// Forwarded decls from lib that are used.
 pub const alloc = lib.allocator;
diff --git a/src/terminal/main.zig b/src/terminal/main.zig
index 3253a95ed..9f5b65e34 100644
--- a/src/terminal/main.zig
+++ b/src/terminal/main.zig
@@ -73,7 +73,8 @@ pub const Attribute = sgr.Attribute;
 pub const Options = @import("build_options.zig").Options;
 pub const options = @import("terminal_options");
 
-pub const c_api = @import("c/main.zig");
+/// This is set to true when we're building the C library.
+pub const c_api = if (options.c_abi) @import("c/main.zig") else void;
 
 test {
     @import("std").testing.refAllDecls(@This());

From 62aeabdc851f7b264721df2dea5527b9aec5788c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paal=20=C3=98ye-Str=C3=B8mme?= <paal.o.eye@gmail.com>
Date: Wed, 25 Mar 2026 19:11:33 +0100
Subject: [PATCH 388/391] build: make sure CMake can clean up after
 libghostty-vt

---
 CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c596dad00..6a6cd216a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,6 +121,11 @@ add_custom_target(zig_build_lib_vt ALL
     DEPENDS "${GHOSTTY_VT_SHARED_LIBRARY}" "${GHOSTTY_VT_STATIC_LIBRARY}"
 )
 
+# Tell CMake's clean target to also remove Zig's output directory.
+set_property(DIRECTORY APPEND PROPERTY
+    ADDITIONAL_CLEAN_FILES "${ZIG_OUT_DIR}"
+)
+
 # --- IMPORTED library targets ------------------------------------------------
 
 # Shared

From 26ba9bf57947b7799ebb0dae90f797c4777c1865 Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Wed, 25 Mar 2026 18:48:33 +0000
Subject: [PATCH 389/391] Update VOUCHED list (#11844)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11843#discussioncomment-16314609)
from @jcollie.

Vouch: @paaloeye

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index f8414bfdc..ceffc867e 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -147,6 +147,7 @@ noib3
 nwehg
 ocean6954
 oshdubh
+paaloeye
 pan93412
 pangoraw
 pauley-unsaturated

From c5bb97bcbda89ffb9e715a41727dcd61bdd70dd3 Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Wed, 25 Mar 2026 06:21:15 +0100
Subject: [PATCH 390/391] build: fix libghostty shared lib install for Windows

On Windows, install as ghostty.dll + ghostty-static.lib instead of
libghostty.so + libghostty.a, following Windows naming conventions.
Guard ubsan_rt bundling in initStatic for MSVC compatibility.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 build.zig                | 9 +++++++--
 src/build/GhosttyLib.zig | 6 ++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/build.zig b/build.zig
index 1f3d0c196..9362eeb59 100644
--- a/build.zig
+++ b/build.zig
@@ -152,8 +152,13 @@ pub fn build(b: *std.Build) !void {
         // build on macOS this way ironically so we need to fix that.
         if (!config.target.result.os.tag.isDarwin()) {
             lib_shared.installHeader(); // Only need one header
-            lib_shared.install("libghostty.so");
-            lib_static.install("libghostty.a");
+            if (config.target.result.os.tag == .windows) {
+                lib_shared.install("ghostty.dll");
+                lib_static.install("ghostty-static.lib");
+            } else {
+                lib_shared.install("libghostty.so");
+                lib_static.install("libghostty.a");
+            }
         }
     }
 
diff --git a/src/build/GhosttyLib.zig b/src/build/GhosttyLib.zig
index 2ac383544..9ec9147fa 100644
--- a/src/build/GhosttyLib.zig
+++ b/src/build/GhosttyLib.zig
@@ -39,6 +39,12 @@ pub fn initStatic(
     lib.bundle_compiler_rt = true;
     lib.bundle_ubsan_rt = true;
 
+    if (deps.config.target.result.os.tag == .windows) {
+        // Zig's ubsan emits /exclude-symbols linker directives that
+        // are incompatible with the MSVC linker (LNK4229).
+        lib.bundle_ubsan_rt = false;
+    }
+
     // Add our dependencies. Get the list of all static deps so we can
     // build a combined archive if necessary.
     var lib_list = try deps.add(lib);

From efc0e4118a39f2d8364a02053b5a9a8e4118dcec Mon Sep 17 00:00:00 2001
From: "ghostty-vouch[bot]"
 <262049992+ghostty-vouch[bot]@users.noreply.github.com>
Date: Wed, 25 Mar 2026 22:58:46 +0000
Subject: [PATCH 391/391] Update VOUCHED list (#11847)

Triggered by [discussion
comment](https://github.com/ghostty-org/ghostty/discussions/11669#discussioncomment-16318770)
from @jcollie.

Vouch: @brianc442

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/VOUCHED.td | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index ceffc867e..353053fe8 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -45,6 +45,7 @@ bitigchi
 bkircher
 bo2themax
 brentschroeter
+brianc442
 cespare
 charliie-dev
 chernetskyi