chore: merge develop into hare/develop

crates/worker-runtime/src/worker_backend.rs

@@ -129,10 +129,11 @@ use worker::feature::builtin::{
 #[cfg(feature = "ws-server")]
 use worker::ipc::protocol_session::{live_log_entry_event, subscribe_worker_protocol_session};
 use worker::{
-    PreparedWorker, PromptCatalogSource, SegmentLogSink, Worker, WorkerBootstrap,
-    WorkerBootstrapError, WorkerBootstrapLayout, WorkerControllerTransport, WorkerError,
-    WorkerFilesystemAuthority, WorkerHandle, WorkerSharedState, WorkerWorkspaceContext,
-    WorkspaceClient, WorkspaceId, bash_output_dir_for_worker_id,
+    PreparedWorker, PromptCatalogSource, SegmentLogSink, SubjektivSessionAttributionLifecycle,
+    Worker, WorkerBootstrap, WorkerBootstrapError, WorkerBootstrapLayout,
+    WorkerControllerTransport, WorkerError, WorkerFilesystemAuthority, WorkerHandle,
+    WorkerSharedState, WorkerWorkspaceContext, WorkspaceClient, WorkspaceId,
+    bash_output_dir_for_worker_id,
 };
 
 const DEFAULT_BACKEND_ID: &str = "worker-crate";
@@ -1279,6 +1280,12 @@ impl RuntimeWorkerFactory for ProfileRuntimeWorkerFactory {
         })?;
         let worker = prepared.worker_mut();
         validate_worker_memory_settings(worker.manifest(), &request.request)?;
+        worker
+            .finalize_subjektiv_session_attribution(
+                request.request.subjektiv_attached,
+                SubjektivSessionAttributionLifecycle::NewSession,
+            )
+            .map_err(|error| format!("finalize Worker Session attribution: {error}"))?;
         let workdir_capabilities = request
             .workdir_attachments
             .keys()
@@ -1517,6 +1524,12 @@ impl RuntimeWorkerFactory for ProfileRuntimeWorkerFactory {
             Err(err) => return Err(format!("failed to restore Worker from metadata: {err}")),
         };
         validate_worker_memory_settings(worker.manifest(), &request.request)?;
+        worker
+            .finalize_subjektiv_session_attribution(
+                request.request.subjektiv_attached,
+                SubjektivSessionAttributionLifecycle::RestoredSession,
+            )
+            .map_err(|error| format!("finalize restored Worker Session attribution: {error}"))?;
         let flow_transition_enabled = worker.manifest().feature.flow.enabled;
         let workdir_sessions = restored_workdir_router(
             &request.workdir_attachments,
@@ -5079,6 +5092,7 @@ mod tests {
             &[
                 "WorkerBootstrap::new(",
                 ".prepare()",
+                "finalize_subjektiv_session_attribution(",
                 "worker.bind_workdir_sessions(",
                 "worker.bind_worker_observation_provider(",
                 "install_runtime_flow_transition_feature()",
@@ -5089,6 +5103,7 @@ mod tests {
             restore,
             &[
                 "Worker::restore_from_worker_metadata_with_context(",
+                "finalize_subjektiv_session_attribution(",
                 "worker.bind_workdir_sessions(",
                 "worker.bind_worker_observation_provider(",
                 "install_runtime_flow_transition_feature()",