New from a column's exec makes its scratch in the session's directory, as tagexec's does

A word run from a header runs in the session's directory (execDir), but
New named its scratch after the pane with the keyboard.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

2 files changed, 18 insertions, 4 deletions

diff --git a/src/ninep/cols.zig b/src/ninep/cols.zig
index 7745ee5e..b00ecdba 100644
--- a/src/ninep/cols.zig
+++ b/src/ninep/cols.zig
@@ -177,6 +177,18 @@ pub fn writeExec(p: *Pardes, req: Req, serial: ?u32) Reply {
     return .{ .tag = req.tag, .written = @intCast(req.data.len) };
 }
 
+test "New written to a column's exec makes its scratch in the session's directory, as tagexec's does" {
+    const p = try th.withFile(testing.allocator, "x\n");
+    defer p.deinit();
+    const session = "/project/src";
+    @memcpy(p.session_dir[0..session.len], session);
+    p.session_dir_len = session.len;
+    const serial = layout.columnSerial(p, 0);
+    const exec_node = tree.Node.ofCol(serial, .exec);
+    try testing.expectEqual(tree.Status.ok, th.wr(p, exec_node, "New\n").reply.status);
+    try testing.expectEqualStrings("/project/src/+New", p.panes[p.active].?.file.?.path);
+}
+
 /// rmdir of a column closes it when it is empty; one with panes is
 /// refused, saying so (close them, or Delcol on its ctl, which asks first).
 pub fn remove(p: *Pardes, req: Req, serial: u32, file: tree.ColFile) Reply {
diff --git a/src/pardes.zig b/src/pardes.zig
index 739d5bf2..52d11bec 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -4852,11 +4852,13 @@ pub const Pardes = struct {
         errdefer p.gpa.free(content);
         // A terminal that has not said where it is yet (the boot layout's)
         // has no directory: the scratch is the session's, <cwd>/+New. So is
-        // 9P's pane/new: no pane asked for it, whichever last had the
-        // keyboard (acme's new window has acme's directory).
-        const dir = if (kind == .fs) "" else paneDir(src);
+        // 9P's pane/new, and a New from a column's or the workspace's tag:
+        // no pane asked for it, whichever last had the keyboard (acme's new
+        // window has acme's directory).
+        const own = kind != .fs and !p.exec_header;
+        const dir = if (own) paneDir(src) else "";
         const np = try panes.Output.open(p, free, if (dir.len == 0) p.sessionDir() else dir, .{ .cmd = .New }, "", content);
-        if (kind != .fs) np.cwd = .{ .inherited = src };
+        if (own) np.cwd = .{ .inherited = src };
         np.body.cur_pinned = true;
         return np;
     }