1 files changed, 31 insertions, 5 deletions

diff --git a/src/ninep/pty.zig b/src/ninep/pty.zig
index dcf9a8a7..3599b612 100644
--- a/src/ninep/pty.zig
+++ b/src/ninep/pty.zig
@@ -43,7 +43,7 @@ pub fn writeCtl(p: *Pardes, req: Req, id: usize) Reply {
         while (it.next()) |raw| {
             const line = std.mem.trim(u8, raw, " \t\r");
             if (line.len == 0) continue;
-            if (!verb(p, id, line, apply)) return tree.failText(req.tag, E.INVAL, tree.e_bad_ctl);
+            if (!verb(p, id, line, apply)) return tree.failText(req.tag, E.INVAL, e_bad_pty_ctl);
         }
     }
     return .{ .tag = req.tag, .written = @intCast(req.data.len) };
@@ -65,13 +65,13 @@ fn verb(p: *Pardes, id: usize, line: []const u8, apply: bool) bool {
             const which = signalNamed(words.next() orelse return false) orelse return false;
             if (words.next() != null) return false;
             if (!apply) return true;
-            p.emit(.{ .signal_pty = .{ .pane = @intCast(id), .sig = which } });
+            p.emit(.{ .signal_pty = .{ .pane = @intCast(id), .serial = pane.serial, .sig = which } });
         },
         .exec => {
             if (words.next() != null) return false;
             if (pane.cwdSlice().len > pardes.effect_path_cap) return false;
             if (!apply) return true;
-            p.emit(.{ .spawn = .{ .pane = @intCast(id), .cwd = .from(pane.cwdSlice()) } });
+            p.emit(.{ .spawn = .{ .pane = @intCast(id), .serial = pane.serial, .cwd = .from(pane.cwdSlice()) } });
         },
     }
     return true;
@@ -92,7 +92,8 @@ pub fn readStatus(p: *Pardes, req: Req, id: usize, pane: *Pane) Reply {
     // Busy is what a run written now would be told: a command is running
     // or a line is typed at the prompt. Before the shell's first prompt a
     // run waits for it rather than answer busy, so that is not busy.
-    const marks = if (pane.terminal) |state| &state.stream.handler else null;
+    // A build with no terminal panes (the board) has no marks to read.
+    const marks = if (comptime !pardes.panes.Terminal.enabled) null else if (pane.terminal) |state| &state.stream.handler else null;
     const busy = p.hostTtyTaken(id) or (!pane.fs.unmarked and (waitingRun(p, pane) != null or
         (if (marks) |m| m.prompts > 0 and (m.phase != .input or !pardes.panes.Terminal.promptInputEmpty(pane)) else false)));
     const out = p.fs.stage(p.gpa);
@@ -162,10 +163,14 @@ pub fn writeRun(p: *Pardes, req: Req, id: usize, pane: *Pane) Reply {
     if (std.mem.trim(u8, line, " \t").len == 0) return tree.failText(req.tag, E.INVAL, e_bad_line);
     if (line.len == 0) return tree.failText(req.tag, E.INVAL, e_bad_line);
     for (line) |c| if (c < ' ' and c != '\t') return tree.failText(req.tag, E.INVAL, e_bad_line);
+    if (comptime !pardes.panes.Terminal.enabled) return tree.failText(req.tag, E.INVAL, e_bad_line);
     const pf = &pane.fs;
     const state = pane.terminal orelse return tree.failText(req.tag, E.INVAL, e_bad_line);
     const marks = &state.stream.handler;
-    if (pf.unmarked) {
+    if (pane.command != null) {
+        // Its child is the command, and no shell is there to take a line.
+        answer(p, slot, "error {s}", .{if (pane.command_done) "command done; not a shell" else "a command runs here, not a shell"});
+    } else if (pf.unmarked) {
         answer(p, slot, "error no prompt marks", .{});
     } else if (waitingRun(p, pane) != null or (marks.prompts > 0 and (marks.phase != .input or
         !pardes.panes.Terminal.promptInputEmpty(pane) or p.hostTtyTaken(id))))
@@ -335,6 +340,7 @@ fn waitingRun(p: *Pardes, pane: *Pane) ?*Run {
 }
 
 const e_bad_line = "bad command line";
+const e_bad_pty_ctl = tree.e_bad_ctl ++ "; takes winsize COLS ROWS, sig INT|TERM|HUP|QUIT|KILL, or exec";
 
 pub fn readData(p: *Pardes, req: Req, pf: *pane_files.State) Reply {
     if (pf.pty_out.empty()) return .{ .tag = req.tag, .status = .again };
@@ -505,6 +511,7 @@ test "every pty/ctl verb, and every refusal" {
     }) |bad| {
         const a = wr(p, ctl, bad);
         try testing.expectEqual(E.INVAL, a.errno());
+        try testing.expectEqualStrings(e_bad_pty_ctl, a.reply.ename); // names what it takes
         try testing.expect(a.winsize == null);
         try testing.expect(a.signal == null);
         try testing.expect(!a.spawned);
@@ -743,6 +750,25 @@ test "run answers how its command ended once the shell is back at a prompt" {
     for (p.fs.opens) |o| try testing.expect(o.node == 0);
 }
 
+test "run on a command pane says no shell is there" {
+    const gpa = testing.allocator;
+    const p = try withTerm(gpa);
+    defer p.deinit();
+    const node = Node.of(serialOf(p), .pty_run);
+    const pane = p.panes[0].?;
+    pane.command = try gpa.dupe(u8, "make");
+    for ([_]struct { bool, []const u8 }{
+        .{ false, "error a command runs here, not a shell\n" },
+        .{ true, "error command done; not a shell\n" },
+    }) |case| {
+        pane.command_done = case[0];
+        const o = call(p, .{ .tag = 1, .op = .open, .node = node });
+        _ = call(p, .{ .tag = 2, .op = .write, .node = node, .handle = o.reply.handle, .data = "ls\n" });
+        try testing.expectEqualStrings(case[1], call(p, .{ .tag = 3, .op = .read, .node = node, .handle = o.reply.handle, .size = 64 }).bytes);
+        _ = call(p, .{ .tag = 4, .op = .release, .node = node, .handle = o.reply.handle });
+    }
+}
+
 test "a run's answer says cut when its output's start is gone, and reads a bounded tail" {
     const gpa = testing.allocator;
     const p = try withTerm(gpa);