fix: make WorkerId the standalone primary identity

crates/client/src/lib.rs

@@ -35,9 +35,9 @@ pub use backend_workspace::{
 };
 pub use client::{Client, ClientError};
 pub use target::{
-    BackendTarget, Dashboard, ResolvedTarget, StandaloneSessionListIntent,
-    StandaloneSessionResumeIntent, StandaloneTarget, Target, TargetError, TargetKind,
-    WorkerConnection, WorkerConnectionSelector, WorkerList, WorkerListRequest, WorkerSpawn,
+    BackendTarget, Dashboard, ResolvedTarget, StandaloneTarget, StandaloneWorkerListIntent,
+    StandaloneWorkerResumeIntent, Target, TargetError, TargetKind, WorkerConnection,
+    WorkerConnectionSelector, WorkerList, WorkerListRequest, WorkerSpawn,
 };
 pub use workspace_api::{ObjectiveDetail, ObjectiveSummary};
 pub use workspace_product::BackendWorkspaceProductClient;

crates/client/src/target.rs

@@ -105,16 +105,16 @@ pub struct WorkerSpawn {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub struct StandaloneSessionListIntent {
+pub struct StandaloneWorkerListIntent {
     pub state_dir: PathBuf,
     pub cwd: PathBuf,
     pub include_all: bool,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub struct StandaloneSessionResumeIntent {
+pub struct StandaloneWorkerResumeIntent {
     pub state_dir: PathBuf,
-    pub session_id: String,
+    pub worker_id: String,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -175,22 +175,22 @@ pub trait Target: fmt::Debug + Send + Sync {
         Err(TargetError::unsupported("Worker spawn", self.kind()))
     }
 
-    fn standalone_session_list(
+    fn standalone_worker_list(
         &self,
         _include_all: bool,
-    ) -> Result<StandaloneSessionListIntent, TargetError> {
+    ) -> Result<StandaloneWorkerListIntent, TargetError> {
         Err(TargetError::unsupported(
-            "standalone session listing",
+            "standalone Worker listing",
             self.kind(),
         ))
     }
 
-    fn standalone_session_resume(
+    fn standalone_worker_resume(
         &self,
-        _session_id: String,
-    ) -> Result<StandaloneSessionResumeIntent, TargetError> {
+        _worker_id: String,
+    ) -> Result<StandaloneWorkerResumeIntent, TargetError> {
         Err(TargetError::unsupported(
-            "standalone session restore",
+            "standalone Worker restore",
             self.kind(),
         ))
     }
@@ -243,26 +243,26 @@ impl Target for StandaloneTarget {
         })
     }
 
-    fn standalone_session_list(
+    fn standalone_worker_list(
         &self,
         include_all: bool,
-    ) -> Result<StandaloneSessionListIntent, TargetError> {
+    ) -> Result<StandaloneWorkerListIntent, TargetError> {
         let cwd = std::env::current_dir()
             .map_err(|error| TargetError::invalid(self.kind(), error.to_string()))?;
-        Ok(StandaloneSessionListIntent {
+        Ok(StandaloneWorkerListIntent {
             state_dir: self.state_dir.clone(),
             cwd,
             include_all,
         })
     }
 
-    fn standalone_session_resume(
+    fn standalone_worker_resume(
         &self,
-        session_id: String,
-    ) -> Result<StandaloneSessionResumeIntent, TargetError> {
-        Ok(StandaloneSessionResumeIntent {
+        worker_id: String,
+    ) -> Result<StandaloneWorkerResumeIntent, TargetError> {
+        Ok(StandaloneWorkerResumeIntent {
             state_dir: self.state_dir.clone(),
-            session_id,
+            worker_id,
         })
     }
 }
@@ -437,17 +437,17 @@ mod tests {
     }
 
     #[test]
-    fn standalone_target_builds_explicit_session_intents() {
-        let target = StandaloneTarget::new("/tmp/yoi-client-sessions");
-        let list = target.standalone_session_list(true).unwrap();
-        assert_eq!(list.state_dir, PathBuf::from("/tmp/yoi-client-sessions"));
+    fn standalone_target_builds_explicit_worker_intents() {
+        let target = StandaloneTarget::new("/tmp/yoi-client-workers");
+        let list = target.standalone_worker_list(true).unwrap();
+        assert_eq!(list.state_dir, PathBuf::from("/tmp/yoi-client-workers"));
         assert!(list.include_all);
         assert!(list.cwd.is_absolute());
 
         let resume = target
-            .standalone_session_resume("019d1234-0000-7000-8000-000000000000".to_string())
+            .standalone_worker_resume("019d1234-0000-7000-8000-000000000000".to_string())
             .unwrap();
         assert_eq!(resume.state_dir, list.state_dir);
-        assert_eq!(resume.session_id, "019d1234-0000-7000-8000-000000000000");
+        assert_eq!(resume.worker_id, "019d1234-0000-7000-8000-000000000000");
     }
 }