1 files changed, 6 insertions, 0 deletions
diff --git a/src/pardes.zig b/src/pardes.zig
index c6e68517..24595045 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -4999,6 +4999,11 @@ pub const Pardes = struct {
             else => "",
         };
         if (std.mem.eql(u8, cur, cwd)) return;
+        // A shell started in a directory is asked where it is before it has
+        // said anything: its chdir may not have happened yet, and the answer
+        // is this process's directory, a rename to undo. That answer, then,
+        // is not taken.
+        if (pane.isTerminal() and !pane.shell_spoke and pane.cwd == .owned and std.mem.eql(u8, cwd, p.sessionDir())) return;
         pane.setOwnedCwd(cwd) catch |err| return p.reportError(id, "directory", err);
         if (look.lookHoverPane(p) == id) look.cancelLookHover(p);
         // A terminal is named by its directory, so /log hears it renamed; one
@@ -5560,6 +5565,7 @@ pub const Pardes = struct {
             },
             .output => |o| {
                 const pane = p.panes[o.pane] orelse return;
+                pane.shell_spoke = true;
                 ctlfs.events.notePtyOutput(p, o.pane, o.bytes);
                 panes.Terminal.feedOutput(p, pane, o.bytes);
                 ctlfs.pty.noteMarks(p, o.pane, pane);