2 files changed, 13 insertions, 4 deletions
diff --git a/src/ninep/pane.zig b/src/ninep/pane.zig
index 899d8528..61642999 100644
--- a/src/ninep/pane.zig
+++ b/src/ninep/pane.zig
@@ -1143,11 +1143,15 @@ test "relative names use the file directory and can name a new target" {
     try testing.expect(dirtyOf(pane));
 }
 
-test "relative names follow inherited scratch and virtual directories" {
+test "relative names follow a pane/new scratch's session directory and virtual directories" {
     const p = try withFile(testing.allocator, "source body\n");
     defer p.deinit();
     const source = p.panes[0].?;
-    try testing.expectEqual(Status.ok, wr(p, Node.of(source.serial, .name), "/project/src/source.zig\n").reply.status);
+    try testing.expectEqual(Status.ok, wr(p, Node.of(source.serial, .name), "/elsewhere/source.zig\n").reply.status);
+    // pane/new's scratch is the session's, not the active pane's.
+    const session = "/project/src";
+    @memcpy(p.session_dir[0..session.len], session);
+    p.session_dir_len = session.len;
     const serial = try th.newPane(p);
     const scratch = p.panes[p.paneBySerial(serial).?].?;
     const name = Node.of(serial, .name);
diff --git a/src/ninep/tree.zig b/src/ninep/tree.zig
index af1c589d..69b89f53 100644
--- a/src/ninep/tree.zig
+++ b/src/ninep/tree.zig
@@ -1326,6 +1326,10 @@ test "opening /pane/new makes a pane and removing one closes it" {
 
     const id = p.paneBySerial(serial).?;
     try testing.expectEqualStrings("", p.panes[id].?.file.?.content);
+    // Its directory is the session's, not that of /test.txt, the pane
+    // that happened to have the keyboard.
+    var named: [4096]u8 = undefined;
+    try testing.expectEqualStrings(try std.fmt.bufPrint(&named, "{s}/+New", .{p.sessionDir()}), p.panes[id].?.file.?.path);
     _ = wr(p, Node.of(serial, .body), "hi");
 
     // A second open is a second pane, and releasing a clone fid leaves the
@@ -1433,8 +1437,9 @@ test "editor paths resolve to the same nodes the wire serves" {
 test "at the pane cap, pane/new, look and New each say so, and look reads back empty" {
     const p = try th.withFile(testing.allocator, "x\n");
     defer p.deinit();
-    // Tall enough that the column holds every pane at its tag and two rows.
-    p.update(.{ .resize = .{ .cols = 80, .rows = pardes.MAX_PANES * 4 } });
+    // Tall enough that the column holds every pane at its tag and two rows,
+    // and wide enough that each tag, the session directory's +New, is one.
+    p.update(.{ .resize = .{ .cols = 400, .rows = pardes.MAX_PANES * 4 } });
     const new = @intFromEnum(TopFile.new);
     while (p.freeSlot() != null) try testing.expectEqual(Status.ok, call(p, .{ .tag = 1, .op = .open, .node = new }).reply.status);
     var want: [64]u8 = undefined;