fix(daemon): sync pwd on IPC queries and add wait_for_cwd test helper

Commit `7a001c4`

Eric Bower · 2026-08-11 11:04:23 -0400 EDT

parent e4e7ad7

fix(daemon): sync pwd on IPC queries and add wait_for_cwd test helper

Ensure daemon.cwd is updated from the terminal emulator state when handling
IPC Info and History requests. This prevents zmx list from reporting stale
working directory state if queried before the PTY read loop calls setPwd.

Also add a deterministic wait_for_cwd helper to test_helper.bash so BATS
OSC 7 tests poll zmx list until the expected CWD is populated, fixing host-side
test race conditions.

3 files changed, +22, -3

M src/loop.zig

M test/cwd.bats

M test/test_helper.bash

M src/loop.zig

+6, -3

......@@ -469,7 +469,7 @@ fn daemonLoop(daemon: *Daemon, gpa: std.mem.Allocator, io: std.Io, server_sock_f
                        .Kill => {
                            break :daemon_loop;
                        },
                        .Info => try daemon.handleInfo(gpa, client),
                        .Info => try daemon.handleInfo(gpa, client, &term),
                        .LabelGet => try daemon.handleLabelGet(gpa, client),
                        .LabelSet => try daemon.handleLabelSet(gpa, client, msg.payload),
                        .LabelClear => try daemon.handleLabelClear(gpa, client),

......@@ -1036,7 +1036,9 @@ pub const Daemon = struct {
        };
    }

    pub fn handleInfo(self: *Daemon, gpa: std.mem.Allocator, client: *Client) !void {
    pub fn handleInfo(self: *Daemon, gpa: std.mem.Allocator, client: *Client, term: *ghostty_vt.Terminal) !void {
        self.setPwd(term);

        // zeroes() so asBytes() doesn't ship struct padding + unused cmd/cwd
        // tail bytes (daemon stack contents) to clients.
        var info = std.mem.zeroes(ipc.Info);

......@@ -1085,12 +1087,13 @@ pub const Daemon = struct {
    }

    pub fn handleHistory(
        _: *Daemon,
        self: *Daemon,
        gpa: std.mem.Allocator,
        client: *Client,
        term: *ghostty_vt.Terminal,
        payload: []const u8,
    ) !void {
        self.setPwd(term);
        const format: util.HistoryFormat = if (payload.len > 0)
            @enumFromInt(payload[0])
        else

M test/cwd.bats

+2, -0

...	...		@@ -28,6 +28,7 @@ osc7_session() {
28	28		osc7_session test-cwd-uri "$dir"
29	29		wait_for_session test-cwd-uri
30	30		wait_for_output test-cwd-uri marker-test-cwd-uri
	31	+	wait_for_cwd test-cwd-uri "cwd=file://$(hostname)${dir// /%20}"
31	32
32	33		run "$ZMX" list
33	34		[ "$status" -eq 0 ]

...	...		@@ -39,6 +40,7 @@ osc7_session() {
39	40		"printf '\033]7;file://some-remote-box/home/me\007marker-remote\n'; sleep 30"
40	41		wait_for_session test-cwd-remote
41	42		wait_for_output test-cwd-remote marker-remote
	43	+	wait_for_cwd test-cwd-remote "cwd=file://some-remote-box/home/me"
42	44
43	45		run "$ZMX" list
44	46		[ "$status" -eq 0 ]

M test/test_helper.bash

+14, -0

......@@ -54,3 +54,17 @@ wait_for_output() {
  echo "Timed out waiting for output '$marker' in session '$name'" >&2
  return 1
}

# Helper: wait for a session's cwd to match expected substring (up to N seconds).
wait_for_cwd() {
  local name="$1" pattern="$2" timeout="${3:-5}" i=0
  while (( i < timeout * 10 )); do
    if "$ZMX" list 2>/dev/null | grep -F "name=$name" | grep -qF "$pattern"; then
      return 0
    fi
    sleep 0.1
    (( i++ )) || true
  done
  echo "Timed out waiting for cwd '$pattern' in session '$name'" >&2
  return 1
}

...	...		@@ -1036,7 +1036,9 @@ pub const Daemon = struct {
1036	1036		};
1037	1037		}
1038	1038
1039		-	pub fn handleInfo(self: Daemon, gpa: std.mem.Allocator, client: Client) !void {
	1039	+	pub fn handleInfo(self: Daemon, gpa: std.mem.Allocator, client: Client, term: *ghostty_vt.Terminal) !void {
	1040	+	self.setPwd(term);
	1041	+
1040	1042		// zeroes() so asBytes() doesn't ship struct padding + unused cmd/cwd
1041	1043		// tail bytes (daemon stack contents) to clients.
1042	1044		var info = std.mem.zeroes(ipc.Info);

...	...		@@ -1085,12 +1087,13 @@ pub const Daemon = struct {
1085	1087		}
1086	1088
1087	1089		pub fn handleHistory(
1088		-	_: *Daemon,
	1090	+	self: *Daemon,
1089	1091		gpa: std.mem.Allocator,
1090	1092		client: *Client,
1091	1093		term: *ghostty_vt.Terminal,
1092	1094		payload: []const u8,
1093	1095		) !void {
	1096	+	self.setPwd(term);
1094	1097		const format: util.HistoryFormat = if (payload.len > 0)
1095	1098		@enumFromInt(payload[0])
1096	1099		else

...	...		@@ -469,7 +469,7 @@ fn daemonLoop(daemon: *Daemon, gpa: std.mem.Allocator, io: std.Io, server_sock_f
469	469		.Kill => {
470	470		break :daemon_loop;
471	471		},
472		-	.Info => try daemon.handleInfo(gpa, client),
	472	+	.Info => try daemon.handleInfo(gpa, client, &term),
473	473		.LabelGet => try daemon.handleLabelGet(gpa, client),
474	474		.LabelSet => try daemon.handleLabelSet(gpa, client, msg.payload),
475	475		.LabelClear => try daemon.handleLabelClear(gpa, client),

...	...		@@ -54,3 +54,17 @@ wait_for_output() {
54	54		echo "Timed out waiting for output '$marker' in session '$name'" >&2
55	55		return 1
56	56		}
	57	+
	58	+	# Helper: wait for a session's cwd to match expected substring (up to N seconds).
	59	+	wait_for_cwd() {
	60	+	local name="$1" pattern="$2" timeout="${3:-5}" i=0
	61	+	while (( i < timeout * 10 )); do
	62	+	if "$ZMX" list 2>/dev/null \| grep -F "name=$name" \| grep -qF "$pattern"; then
	63	+	return 0
	64	+	fi
	65	+	sleep 0.1
	66	+	(( i++ )) \|\| true
	67	+	done
	68	+	echo "Timed out waiting for cwd '$pattern' in session '$name'" >&2
	69	+	return 1
	70	+	}

Commit 7a001c4

Commit `7a001c4`