From 00903264f388de89227aa5fa93c95d013726a633 Mon Sep 17 00:00:00 2001
From: Hare <kei.hiracchi.0928@gmail.com>
Date: Wed, 28 Oct 2026 13:38:47 +0900
Subject: [PATCH] fix: bind deletion Job fixtures to current Subject authority

Use a real connected origin with exact request/supply permissions, assert immutable Job origin, and materialize its cleanup storage. Reuse test-only setup helpers without weakening production authorization.
---
 .../server/tests/subject_deletion_tests.rs    | 23 ++++++++++++++++++-
 .../src/server/tests/subjektiv_jobs_tests.rs  |  7 ++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/crates/workspace-server/src/server/tests/subject_deletion_tests.rs b/crates/workspace-server/src/server/tests/subject_deletion_tests.rs
index 8ddca16ad..5cc349ee1 100644
--- a/crates/workspace-server/src/server/tests/subject_deletion_tests.rs
+++ b/crates/workspace-server/src/server/tests/subject_deletion_tests.rs
@@ -3,6 +3,18 @@
 //! canonical removal suites, rather than claiming HTTP acceptance proves shutdown.
 use super::*;
 
+async fn consolidation_origin(api: &WorkspaceApi, subject: &str) -> RuntimeWorkerRef {
+    super::subjektiv_jobs_tests::grant_memory_operations(
+        api,
+        subject,
+        &[
+            "memory.consolidation.request",
+            "memory.consolidation.supply",
+        ],
+    );
+    super::subjektiv_jobs_tests::attach_memory_job_source(api, subject).await
+}
+
 async fn delete_request(
     api: &WorkspaceApi,
     subject: &str,
@@ -510,9 +522,12 @@ async fn pending_consolidation_is_purged_and_captured_dispatch_and_late_result_a
             candidate,
         ))
         .unwrap();
+    let origin = consolidation_origin(&api, &subject.id).await;
+    seed_worker_session_for_cleanup(dir.path(), &origin);
     let started = start_subjektiv_staging_consolidation(
         api.clone(),
         &subject.id,
+        Some(origin.clone()),
         MemoryConsolidateStagingOperation { force: true },
     )
     .await
@@ -526,6 +541,7 @@ async fn pending_consolidation_is_purged_and_captured_dispatch_and_late_result_a
         )
         .unwrap()
         .unwrap();
+    assert_eq!(job.request.source_worker.as_ref(), Some(&origin));
     let attempt = api
         .store
         .get_backend_job_attempt(
@@ -766,13 +782,17 @@ async fn old_job_removal_reconciles_exact_input_then_erases_copies_across_http_r
                 candidate,
             ))
             .unwrap();
-        start_subjektiv_staging_consolidation(
+        let origin = consolidation_origin(&api, &subject.id).await;
+        seed_worker_session_for_cleanup(dir.path(), &origin);
+        let started = start_subjektiv_staging_consolidation(
             api.clone(),
             &subject.id,
+            Some(origin.clone()),
             MemoryConsolidateStagingOperation { force: true },
         )
         .await
         .unwrap();
+        assert_eq!(started.status, "started");
         let job = api
             .store
             .find_active_backend_job_for_resource(
@@ -781,6 +801,7 @@ async fn old_job_removal_reconciles_exact_input_then_erases_copies_across_http_r
             )
             .unwrap()
             .unwrap();
+        assert_eq!(job.request.source_worker.as_ref(), Some(&origin));
         let attempt = api
             .store
             .get_backend_job_attempt(
diff --git a/crates/workspace-server/src/server/tests/subjektiv_jobs_tests.rs b/crates/workspace-server/src/server/tests/subjektiv_jobs_tests.rs
index 97bf5327a..92110be5e 100644
--- a/crates/workspace-server/src/server/tests/subjektiv_jobs_tests.rs
+++ b/crates/workspace-server/src/server/tests/subjektiv_jobs_tests.rs
@@ -22,7 +22,7 @@ const MEMORY_JOB_OPERATIONS: &[&str] = &[
     "memory.surface.fail",
 ];
 
-fn grant_memory_operations(api: &WorkspaceApi, subject: &str, operations: &[&str]) {
+pub(super) fn grant_memory_operations(api: &WorkspaceApi, subject: &str, operations: &[&str]) {
     use server_api::authorization::{
         PermissionResource, ScopedPermission, SubjectPermissionsUpdate,
     };
@@ -55,7 +55,10 @@ async fn memory_job_source(api: &WorkspaceApi, subject: &str) -> RuntimeWorkerRe
     attach_memory_job_source(api, subject).await
 }
 
-async fn attach_memory_job_source(api: &WorkspaceApi, subject: &str) -> RuntimeWorkerRef {
+pub(super) async fn attach_memory_job_source(
+    api: &WorkspaceApi,
+    subject: &str,
+) -> RuntimeWorkerRef {
     seed_test_delivery_binding(api);
     let Json(created) = create_workspace_worker(
         State(api.clone()),