From c46e880b50000d433f0ab6f6cfe1be381eb2a779 Mon Sep 17 00:00:00 2001
From: Hare <kei.hiracchi.0928@gmail.com>
Date: Mon, 29 Jun 2026 04:54:33 +0900
Subject: [PATCH] fix: finish worker wording cleanup

---
 crates/worker/src/runtime/worker_allocation/error.rs | 12 ++++++------
 crates/yoi/src/worker_cleanup_cli.rs                 |  4 ++--
 tests/e2e/src/lib.rs                                 | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/crates/worker/src/runtime/worker_allocation/error.rs b/crates/worker/src/runtime/worker_allocation/error.rs
index 8e3da1aa..a0bcb78e 100644
--- a/crates/worker/src/runtime/worker_allocation/error.rs
+++ b/crates/worker/src/runtime/worker_allocation/error.rs
@@ -1,4 +1,4 @@
-//! Error type for mutating pod-worker allocation operations.
+//! Error type for mutating Worker allocation operations.
 
 use std::io;
 use std::path::PathBuf;
@@ -6,14 +6,14 @@ use std::path::PathBuf;
 use manifest::{ScopeError, ScopeRule};
 use session_store::SegmentId;
 
-/// Errors raised by the mutating pod-worker allocation operations.
+/// Errors raised by the mutating Worker allocation operations.
 #[derive(Debug, thiserror::Error)]
 pub enum ScopeLockError {
     #[error("I/O error on workers.json: {0}")]
     Io(#[from] io::Error),
-    #[error("pod name `{0}` is already registered")]
+    #[error("worker `{0}` is already allocated")]
     DuplicateWorkerName(String),
-    #[error("requested scope `{}` conflicts with pod `{competitor}` rule `{}`", .rule.target.display(), .competitor_rule.target.display())]
+    #[error("requested scope `{}` conflicts with worker allocation `{competitor}` rule `{}`", .rule.target.display(), .competitor_rule.target.display())]
     WriteConflict {
         competitor: String,
         rule: ScopeRule,
@@ -26,10 +26,10 @@ pub enum ScopeLockError {
     NotSubset { spawner: String, rule: ScopeRule },
     #[error("invalid delegation scope: {source}")]
     InvalidScope { source: ScopeError },
-    #[error("pod `{0}` is not registered")]
+    #[error("worker `{0}` is not allocated")]
     UnknownWorker(String),
     #[error(
-        "session {segment_id} is already held by pod `{worker_name}` at {}",
+        "session {segment_id} is already allocated to worker `{worker_name}` at {}",
         .socket.display()
     )]
     SegmentConflict {
diff --git a/crates/yoi/src/worker_cleanup_cli.rs b/crates/yoi/src/worker_cleanup_cli.rs
index 8e5a2c30..54d1eddb 100644
--- a/crates/yoi/src/worker_cleanup_cli.rs
+++ b/crates/yoi/src/worker_cleanup_cli.rs
@@ -239,7 +239,7 @@ async fn run_delete(
     let Some(metadata) = metadata else {
         return Ok(WorkerCleanupCliOutput {
             stdout: format!(
-                "yoi worker delete\nstatus: refused\npod: {}\nreason: worker metadata is missing\n",
+                "yoi worker delete\nstatus: refused\nworker: {}\nreason: worker metadata is missing\n",
                 options.name
             ),
             status: WorkerCleanupCliStatus::Failure,
@@ -250,7 +250,7 @@ async fn run_delete(
     if let Some(reason) = probe.refusal_reason() {
         return Ok(WorkerCleanupCliOutput {
             stdout: format!(
-                "yoi worker delete\nstatus: refused\npod: {}\nreason: {}\nsocket: {}\n",
+                "yoi worker delete\nstatus: refused\nworker: {}\nreason: {}\nsocket: {}\n",
                 options.name,
                 reason,
                 probe.socket_path.display()
diff --git a/tests/e2e/src/lib.rs b/tests/e2e/src/lib.rs
index 5f79acd1..a614c039 100644
--- a/tests/e2e/src/lib.rs
+++ b/tests/e2e/src/lib.rs
@@ -1350,8 +1350,8 @@ impl FixtureWorkspace {
         };
         fixture.write_fixture_metadata("created", None)?;
 
-        write_blocking_pod_metadata(&fixture.xdg_data_home, "workspace")?;
-        write_blocking_pod_metadata(&fixture.xdg_data_home, "workspace-orchestrator")?;
+        write_blocking_worker_metadata(&fixture.xdg_data_home, "workspace")?;
+        write_blocking_worker_metadata(&fixture.xdg_data_home, "workspace-orchestrator")?;
         run_yoi(
             binary,
             &fixture.workspace,
@@ -1621,8 +1621,8 @@ impl FixtureWorkspace {
                     "host_runtime_inherited": false,
                     "host_xdg_runtime_dir_present": std::env::var_os("XDG_RUNTIME_DIR").is_some(),
                     "tested_yoi_runtime_source": "fixture XDG_RUNTIME_DIR",
-                    "tested_yoi_pod_registry": self.xdg_runtime_dir.join("yoi").join("pods.json"),
-                    "fixture_pod_metadata_root": self.xdg_data_home.join("yoi").join("pods")
+                    "tested_yoi_worker_allocation": self.xdg_runtime_dir.join("yoi").join("workers.json"),
+                    "fixture_worker_metadata_root": self.xdg_data_home.join("yoi").join("workers")
                 },
                 "tested_yoi_env_policy": tested_yoi_env_policy_overview(),
                 "cleanup": cleanup,
@@ -1997,8 +1997,8 @@ fn copy_dir_recursive(source: &Path, destination: &Path) -> Result<()> {
     Ok(())
 }
 
-fn write_blocking_pod_metadata(data_home: &Path, worker_name: &str) -> Result<()> {
-    let dir = data_home.join("yoi").join("pods").join(worker_name);
+fn write_blocking_worker_metadata(data_home: &Path, worker_name: &str) -> Result<()> {
+    let dir = data_home.join("yoi").join("workers").join(worker_name);
     fs::create_dir_all(&dir)?;
     fs::write(dir.join("metadata.json"), b"not valid metadata for e2e\n")?;
     Ok(())