fix(run): ignore DA queries when no terminal client connected

Commit `c654778`

Eric Bower · 2026-04-25 21:08:53 -0400 EDT

parent 758a137

fix(run): ignore DA queries when no terminal client connected

`run` is not a real terminal client, it just tails the output and cannot
respond to shell QA queries so we have a special flag that ignores read-only
clients

1 files changed, +9, -6

M src/main.zig

+9, -6

......@@ -539,6 +539,7 @@ const Daemon = struct {
    cwd: []const u8 = "",
    has_pty_output: bool = false,
    has_had_client: bool = false,
    has_terminal_client: bool = false, // true only after a real attach (.Init received)
    created_at: u64, // unix timestamp (ns)
    is_task_mode: bool = false, // flag for when session is run as a task
    task_exit_code: ?u8 = null, // null = running or n/a, set when task completes

......@@ -943,6 +944,7 @@ const Daemon = struct {

            // Mark that we've had a client init, so subsequent clients get terminal state
            self.has_had_client = true;
            self.has_terminal_client = true;

            std.log.debug("init resize rows={d} cols={d}", .{ resize.rows, resize.cols });
        }

......@@ -2408,12 +2410,13 @@ fn daemonLoop(daemon: *Daemon, server_sock_fd: i32, pty_fd: i32) !void {
                    try vt_stream.nextSlice(buf[0..n]);
                    daemon.has_pty_output = true;

                    // When no clients are attached, respond to terminal
                    // queries (e.g. DA1/DA2) on behalf of the terminal.
                    // This prevents shells like from fish from waiting 2s
                    // and then sending a no DA query response warning because
                    // there's no client terminal to respond to the query.
                    if (daemon.clients.items.len == 0 and
                    // When no real terminal client has attached yet, respond to
                    // terminal queries (e.g. DA1/DA2) on behalf of the terminal.
                    // This prevents fish from waiting 10s for unanswered queries.
                    // `has_terminal_client` is only set when a client sends .Init
                    // (a real zmx attach), not when a `zmx run` tail-only client
                    // connects.
                    if (!daemon.has_terminal_client and
                        daemon.pty_write_buf.items.len < Daemon.PTY_WRITE_BUF_MAX)
                    {
                        util.respondToDeviceAttributes(daemon.alloc, &daemon.pty_write_buf, buf[0..n]);

...	...		@@ -539,6 +539,7 @@ const Daemon = struct {
539	539		cwd: []const u8 = "",
540	540		has_pty_output: bool = false,
541	541		has_had_client: bool = false,
	542	+	has_terminal_client: bool = false, // true only after a real attach (.Init received)
542	543		created_at: u64, // unix timestamp (ns)
543	544		is_task_mode: bool = false, // flag for when session is run as a task
544	545		task_exit_code: ?u8 = null, // null = running or n/a, set when task completes

...	...		@@ -943,6 +944,7 @@ const Daemon = struct {
943	944
944	945		// Mark that we've had a client init, so subsequent clients get terminal state
945	946		self.has_had_client = true;
	947	+	self.has_terminal_client = true;
946	948
947	949		std.log.debug("init resize rows={d} cols={d}", .{ resize.rows, resize.cols });
948	950		}

...	...		@@ -2408,12 +2410,13 @@ fn daemonLoop(daemon: *Daemon, server_sock_fd: i32, pty_fd: i32) !void {
2408	2410		try vt_stream.nextSlice(buf[0..n]);
2409	2411		daemon.has_pty_output = true;
2410	2412
2411		-	// When no clients are attached, respond to terminal
2412		-	// queries (e.g. DA1/DA2) on behalf of the terminal.
2413		-	// This prevents shells like from fish from waiting 2s
2414		-	// and then sending a no DA query response warning because
2415		-	// there's no client terminal to respond to the query.
2416		-	if (daemon.clients.items.len == 0 and
	2413	+	// When no real terminal client has attached yet, respond to
	2414	+	// terminal queries (e.g. DA1/DA2) on behalf of the terminal.
	2415	+	// This prevents fish from waiting 10s for unanswered queries.
	2416	+	// `has_terminal_client` is only set when a client sends .Init
	2417	+	// (a real zmx attach), not when a `zmx run` tail-only client
	2418	+	// connects.
	2419	+	if (!daemon.has_terminal_client and
2417	2420		daemon.pty_write_buf.items.len < Daemon.PTY_WRITE_BUF_MAX)
2418	2421		{
2419	2422		util.respondToDeviceAttributes(daemon.alloc, &daemon.pty_write_buf, buf[0..n]);

Commit c654778

Commit `c654778`