From 2bdbda20fd105d193f106116f7358c6c38ca030a Mon Sep 17 00:00:00 2001
From: Peter Cardenas <16930781+PeterCardenas@users.noreply.github.com>
Date: Sun, 4 Jan 2026 18:57:27 -0800
Subject: [PATCH 1/2] fix(completions.fish): add +help and +version to
 completions

---
 src/extra/fish.zig | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/extra/fish.zig b/src/extra/fish.zig
index 12343c62f..73fa9a706 100644
--- a/src/extra/fish.zig
+++ b/src/extra/fish.zig
@@ -28,8 +28,6 @@ fn writeCompletions(writer: *std.Io.Writer) !void {
         try writer.writeAll("set -l commands \"");
         var count: usize = 0;
         for (@typeInfo(Action).@"enum".fields) |field| {
-            if (std.mem.eql(u8, "help", field.name)) continue;
-            if (std.mem.eql(u8, "version", field.name)) continue;
             if (count > 0) try writer.writeAll(" ");
             try writer.writeAll("+");
             try writer.writeAll(field.name);
@@ -98,8 +96,6 @@ fn writeCompletions(writer: *std.Io.Writer) !void {
         try writer.writeAll("complete -c ghostty -n \"string match -q -- '+*' (commandline -pt)\" -f -a \"");
         var count: usize = 0;
         for (@typeInfo(Action).@"enum".fields) |field| {
-            if (std.mem.eql(u8, "help", field.name)) continue;
-            if (std.mem.eql(u8, "version", field.name)) continue;
             if (count > 0) try writer.writeAll(" ");
             try writer.writeAll("+");
             try writer.writeAll(field.name);

From e47272878d5da048125b49b882518e483a27da9d Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Sun, 11 Jan 2026 19:26:27 -0500
Subject: [PATCH 2/2] extra: enable +help and +version in bash and zsh

---
 src/extra/bash.zig | 9 ---------
 src/extra/zsh.zig  | 6 ------
 2 files changed, 15 deletions(-)

diff --git a/src/extra/bash.zig b/src/extra/bash.zig
index ee9a7895c..14bf3a225 100644
--- a/src/extra/bash.zig
+++ b/src/extra/bash.zig
@@ -158,9 +158,6 @@ fn writeBashCompletions(writer: *std.Io.Writer) !void {
     );
 
     for (@typeInfo(Action).@"enum".fields) |field| {
-        if (std.mem.eql(u8, "help", field.name)) continue;
-        if (std.mem.eql(u8, "version", field.name)) continue;
-
         const options = @field(Action, field.name).options();
         // assumes options will never be created with only <_name> members
         if (@typeInfo(options).@"struct".fields.len == 0) continue;
@@ -194,9 +191,6 @@ fn writeBashCompletions(writer: *std.Io.Writer) !void {
     );
 
     for (@typeInfo(Action).@"enum".fields) |field| {
-        if (std.mem.eql(u8, "help", field.name)) continue;
-        if (std.mem.eql(u8, "version", field.name)) continue;
-
         const options = @field(Action, field.name).options();
         if (@typeInfo(options).@"struct".fields.len == 0) continue;
 
@@ -272,9 +266,6 @@ fn writeBashCompletions(writer: *std.Io.Writer) !void {
     );
 
     for (@typeInfo(Action).@"enum".fields) |field| {
-        if (std.mem.eql(u8, "help", field.name)) continue;
-        if (std.mem.eql(u8, "version", field.name)) continue;
-
         try writer.writeAll(pad1 ++ "topLevel+=\" +" ++ field.name ++ "\"\n");
     }
 
diff --git a/src/extra/zsh.zig b/src/extra/zsh.zig
index 2fad4234a..376db807f 100644
--- a/src/extra/zsh.zig
+++ b/src/extra/zsh.zig
@@ -139,9 +139,6 @@ fn writeZshCompletions(writer: *std.Io.Writer) !void {
         var count: usize = 0;
         const padding = "        ";
         for (@typeInfo(Action).@"enum".fields) |field| {
-            if (std.mem.eql(u8, "help", field.name)) continue;
-            if (std.mem.eql(u8, "version", field.name)) continue;
-
             try writer.writeAll(padding ++ "'+");
             try writer.writeAll(field.name);
             try writer.writeAll("'\n");
@@ -168,9 +165,6 @@ fn writeZshCompletions(writer: *std.Io.Writer) !void {
     {
         const padding = "        ";
         for (@typeInfo(Action).@"enum".fields) |field| {
-            if (std.mem.eql(u8, "help", field.name)) continue;
-            if (std.mem.eql(u8, "version", field.name)) continue;
-
             const options = @field(Action, field.name).options();
             // assumes options will never be created with only <_name> members
             if (@typeInfo(options).@"struct".fields.len == 0) continue;