A Restore answers its writer before hanging up, and the log records dumps and restores

A client that wrote Restore saw its connection cut with no answer, and could
not tell a Restore from a crash. The listener now lets the writer's answer out
before the cut, and cuts only the old editor's connections, refusing their
requests meanwhile; a client that dials during it is the new editor's and
stays. Dump logs 'dump <path>' and the restored editor's log 'restore <path>'.
Keeping connections across a Restore was weighed and left: the fids name the
old editor's panes and opens, so it would mean carrying serials and open
records into the new one, where acme's Load only adds windows. tty's Restore
also closed its shells' ptys without reaping them; it retires them now.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/detached/server.zig b/src/detached/server.zig
index 5c0e1487..b088d833 100644
--- a/src/detached/server.zig
+++ b/src/detached/server.zig
@@ -233,8 +233,8 @@ pub const Session = struct {
         return batch.len != 0 or batch.status != null;
     }
 
-    pub fn restore(s: *Session, bytes: []const u8) !void {
-        const replacement = try dump.restore(s.core, bytes);
+    pub fn restore(s: *Session, bytes: []const u8, from: []const u8) !void {
+        const replacement = try dump.restore(s.core, bytes, from);
         s.cancelWorkers();
         for (0..s.ptys.len) |pane| s.closePty(@intCast(pane));
         s.harvest();
@@ -1183,7 +1183,7 @@ pub fn run(init: std.process.Init, opts: pardes.Options, name: []const u8) !void
                 break :restore;
             };
             defer gpa.free(bytes);
-            session.restore(bytes) catch |err| session.core.reportError(session.core.active, "Restore", err);
+            session.restore(bytes, path) catch |err| session.core.reportError(session.core.active, "Restore", err);
         }
     }
 }
@@ -1223,7 +1223,7 @@ test "detached queued results preserve current requests and are discarded before
     try std.testing.expect(s.pipe_tasks.add(.{ .id = 77, .future = .{ .any_future = null, .result = {} } }));
     s.mailbox.post(.{ .pipe = .{ .id = 77, .success = true, .outputs = outputs } });
     Session.lspStatus(&s, "old status");
-    try s.restore(saved);
+    try s.restore(saved, "test");
     try std.testing.expect(s.lsp_task == null);
     try std.testing.expectEqual(@as(usize, 0), s.pipe_tasks.len);
     try std.testing.expect(!s.drainCompletions(true));