From 8aafc3fa24c7475a07259eb06cd5d217f510df98 Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Wed, 5 Aug 2026 19:32:30 -0300
Subject: add a Shell builtin, default fish, with per-family prompt integration

---
 src/tty/tty.zig | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/tty/tty.zig')

diff --git a/src/tty/tty.zig b/src/tty/tty.zig
index b5b4ff75..22449719 100644
--- a/src/tty/tty.zig
+++ b/src/tty/tty.zig
@@ -12,6 +12,7 @@ const pardes = @import("../pardes.zig");
 const tracy = @import("../tracy.zig");
 const look = @import("../look.zig");
 const temp_file = @import("../temp_file.zig");
+const shell_bin = @import("../shell_bin.zig");
 const message = @import("../message.zig");
 const selection_pipe = @import("../selection_pipe.zig");
 
@@ -21,9 +22,6 @@ extern "c" fn chdir(path: [*:0]const u8) c_int;
 extern "c" fn _exit(status: c_int) noreturn;
 extern "c" fn setenv(name: [*:0]const u8, value: [*:0]const u8, overwrite: c_int) c_int;
 
-// absolute shell path per OS: execv must not search PATH (no allocation
-// between fork and exec)
-const bash_path: [*:0]const u8 = if (builtin.os.tag == .linux) "/usr/bin/bash" else "/bin/bash";
 // TIOCSWINSZ: absent from std.c.T on darwin — _IOW('t', 103, winsize)
 const TIOCSWINSZ: c_int = @bitCast(@as(u32, if (@hasDecl(posix.T, "IOCSWINSZ")) posix.T.IOCSWINSZ else 0x80087467));
 
@@ -379,7 +377,8 @@ pub fn run(init: std.process.Init, opts: pardes.Options) !void {
     defer core.deinit();
 
     // shells emit OSC 133 prompt marks via this rc (prompt hiding, click-move)
-    writeFile(pardes.bash_rc);
+    writeFile(shell_bin.bash_rc_path, shell_bin.bash_rc);
+    writeFile(shell_bin.fish_rc_path, shell_bin.fish_rc);
     // macos: apple's bash 3.2 prints the zsh-deprecation banner into every
     // pane unless this is in the env BEFORE bash starts (the rc is too late)
     if (comptime builtin.os.tag.isDarwin()) _ = setenv("BASH_SILENCE_DEPRECATION_WARNING", "1", 1);
@@ -854,7 +853,7 @@ fn drainEffects(
                 cwd_buf[cwd.len] = 0;
                 cwd_z = @ptrCast(&cwd_buf);
             }
-            const child = forkShell(cwd_z, core.screen_h, core.screen_w);
+            const child = forkShell(core.shellBin(), cwd_z, core.screen_h, core.screen_w);
             ptys[sp.pane] = .{ .file = child.file, .pid = child.pid, .reader = .{ .any_future = null, .result = {} } };
             // report the pane's starting directory back to the core (tags)
             var lbuf: [1024]u8 = undefined;
@@ -1105,8 +1104,12 @@ fn winchWatch(loop: *Loop, vx: *vaxis.Vaxis, tty: *vaxis.Tty) void {
     }
 }
 
-fn forkShell(cwd: ?[*:0]const u8, rows: u16, cols: u16) struct { file: std.Io.File, pid: posix.pid_t } {
+fn forkShell(bin: []const u8, cwd: ?[*:0]const u8, rows: u16, cols: u16) struct { file: std.Io.File, pid: posix.pid_t } {
     var master: c_int = undefined;
+    // resolved BEFORE the fork, into this frame, which the child inherits:
+    // nothing between fork and exec may allocate, and a PATH search would
+    var path_buf: [std.fs.max_path_bytes]u8 = undefined;
+    const spawn = shell_bin.resolve(bin, &path_buf);
     const ws = posix.winsize{ .row = rows, .col = cols, .xpixel = 0, .ypixel = 0 };
     const pid = forkpty(&master, null, null, &ws);
     if (pid == 0) {
@@ -1117,8 +1120,7 @@ fn forkShell(cwd: ?[*:0]const u8, rows: u16, cols: u16) struct { file: std.Io.Fi
         posix.sigaddset(&set, posix.SIG.WINCH);
         posix.sigprocmask(posix.SIG.UNBLOCK, &set, null);
         if (cwd) |c| _ = chdir(c);
-        const argv: [4:null]?[*:0]const u8 = .{ bash_path, "--rcfile", "/tmp/pardes-osc133.bash", null };
-        _ = execv(bash_path, &argv);
+        _ = execv(spawn.path, &spawn.argv);
         _exit(127);
     }
     return .{ .file = .{ .handle = master, .flags = .{ .nonblocking = false } }, .pid = pid };
@@ -1203,8 +1205,8 @@ fn vaxisColor(c: pardes.Color) vaxis.Color {
     };
 }
 
-fn writeFile(data: []const u8) void {
-    const fd = libc.open("/tmp/pardes-osc133.bash", .{ .ACCMODE = .WRONLY, .CREAT = true, .TRUNC = true }, @as(libc.mode_t, 0o644));
+fn writeFile(path: [*:0]const u8, data: []const u8) void {
+    const fd = libc.open(path, .{ .ACCMODE = .WRONLY, .CREAT = true, .TRUNC = true }, @as(libc.mode_t, 0o644));
     if (fd < 0) return;
     defer _ = libc.close(fd);
     writeFd(fd, data);
-- 
cgit v1.3