Persist workspace state across clean restarts

Cargo.toml

@@ -29,6 +29,8 @@ predicates = "3"
 proptest = "1"
 rhai = "1"
 rhai-autodocs = "0.11"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
 tempfile = "3"
 thiserror = "2"
 tokio = { version = "1", features = ["fs", "io-util", "macros", "net", "process", "rt-multi-thread", "signal", "sync", "time"] }

crates/embers-core/Cargo.toml

@@ -6,6 +6,7 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
+serde.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true

crates/embers-core/src/geometry.rs

@@ -1,4 +1,6 @@
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct PtySize {
     pub cols: u16,
     pub rows: u16,
@@ -17,19 +19,19 @@ impl PtySize {
     }
 }
 
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Point {
     pub x: i32,
     pub y: i32,
 }
 
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Size {
     pub width: u16,
     pub height: u16,
 }
 
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Rect {
     pub origin: Point,
     pub size: Size,
@@ -44,7 +46,7 @@ impl Rect {
     }
 }
 
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct FloatGeometry {
     pub x: u16,
     pub y: u16,
@@ -63,7 +65,7 @@ impl FloatGeometry {
     }
 }
 
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum SplitDirection {
     #[default]
     Horizontal,

crates/embers-protocol/schema/embers.fbs

@@ -111,7 +111,8 @@ enum ActivityStateWire : ubyte {
 enum BufferStateWire : ubyte {
   Created = 0,
   Running = 1,
-  Exited = 2,
+  Interrupted = 2,
+  Exited = 3,
 }
 
 enum NodeRecordKindWire : ubyte {

crates/embers-protocol/src/codec.rs

@@ -1554,6 +1554,7 @@ fn encode_buffer_record<'a>(
     let state = match record.state {
         BufferRecordState::Created => fb::BufferStateWire::Created,
         BufferRecordState::Running => fb::BufferStateWire::Running,
+        BufferRecordState::Interrupted => fb::BufferStateWire::Interrupted,
         BufferRecordState::Exited => fb::BufferStateWire::Exited,
     };
 
@@ -2371,6 +2372,7 @@ fn decode_buffer_record(record: fb::BufferRecord) -> Result<BufferRecord, Protoc
     let state = match record.state() {
         fb::BufferStateWire::Created => BufferRecordState::Created,
         fb::BufferStateWire::Running => BufferRecordState::Running,
+        fb::BufferStateWire::Interrupted => BufferRecordState::Interrupted,
         fb::BufferStateWire::Exited => BufferRecordState::Exited,
         _ => return Err(ProtocolError::InvalidMessage("unknown buffer state")),
     };

crates/embers-protocol/src/types.rs

@@ -335,6 +335,7 @@ impl ClientMessage {
 pub enum BufferRecordState {
     Created,
     Running,
+    Interrupted,
     Exited,
 }
 

crates/embers-server/Cargo.toml

@@ -10,6 +10,8 @@ alacritty_terminal = "0.25.1"
 embers-core = { path = "../embers-core" }
 embers-protocol = { path = "../embers-protocol" }
 portable-pty.workspace = true
+serde.workspace = true
+serde_json.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 

crates/embers-server/src/config.rs

@@ -7,6 +7,7 @@ pub const SOCKET_ENV_VAR: &str = "EMBERS_SOCKET";
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ServerConfig {
     pub socket_path: PathBuf,
+    pub workspace_path: PathBuf,
     pub buffer_env: BTreeMap<String, OsString>,
 }
 
@@ -17,8 +18,10 @@ impl ServerConfig {
             SOCKET_ENV_VAR.to_owned(),
             socket_path.as_os_str().to_owned(),
         );
+        let workspace_path = socket_path.with_extension("workspace.json");
         Self {
             socket_path,
+            workspace_path,
             buffer_env,
         }
     }

crates/embers-server/src/lib.rs

@@ -3,6 +3,7 @@ pub mod state;
 
 mod buffer_runtime;
 mod config;
+mod persist;
 mod protocol;
 mod server;
 mod terminal_backend;
@@ -11,7 +12,7 @@ pub use buffer_runtime::{BufferRuntimeCallbacks, BufferRuntimeHandle};
 pub use config::{SOCKET_ENV_VAR, ServerConfig};
 pub use model::{
     Buffer, BufferAttachment, BufferState, BufferViewNode, BufferViewState, ExitedBuffer,
-    FloatingWindow, Node, RunningBuffer, Session, SplitNode, TabEntry, TabsNode,
+    FloatingWindow, InterruptedBuffer, Node, RunningBuffer, Session, SplitNode, TabEntry, TabsNode,
 };
 pub use server::{Server, ServerHandle};
 pub use state::ServerState;

crates/embers-server/src/model.rs

@@ -37,6 +37,11 @@ pub struct RunningBuffer {
     pub pid: Option<u32>,
 }
 
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+pub struct InterruptedBuffer {
+    pub last_known_pid: Option<u32>,
+}
+
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ExitedBuffer {
     pub exit_code: Option<i32>,
@@ -48,6 +53,7 @@ pub enum BufferState {
     #[default]
     Created,
     Running(RunningBuffer),
+    Interrupted(InterruptedBuffer),
     Exited(ExitedBuffer),
 }