@opengeni/core 2.5.3 → 2.6.4-canary.0

package/src/sandbox/routing.ts

@@ -26,6 +26,7 @@ import {
   verifyDirectWorkspaceMutationSettlement,
   verifyRetainedProcessMutationSettlement,
   type Database,
+  type SandboxRetainedProcess,
   type SandboxWorkspaceMutationAdmission,
 } from "@opengeni/db";
 import { settleSessionBackgroundCommandForRetainedProcess } from "@opengeni/db/session-background-commands";
@@ -86,6 +87,20 @@ export function directRetainedProcessMatchesBackend(
   );
 }
 
+export function retainedProcessBackgroundSettlement(
+  process: Pick<SandboxRetainedProcess, "state" | "exitCode" | "settlementReason">,
+  fallback: RoutingRetainedProcessTerminalProof,
+): { outcome: "exited" | "lost"; exitCode: number | null; reason: string } {
+  if (process.state === "active") {
+    throw new Error("Retained-process settlement returned an active durable process");
+  }
+  return {
+    outcome: process.state,
+    exitCode: process.exitCode,
+    reason: process.settlementReason ?? fallback.reason,
+  };
+}
+
 export type ChannelARoutingServices = {
   db: Database;
   settings: Settings;
@@ -423,7 +438,7 @@ export function wrapChannelABoxWithRouting(
             "API retained-process settlement lost its exact durable backend identity",
           );
         }
-        await settleRetainedProcess(db, {
+        const settlement = await settleRetainedProcess(db, {
           accountId: ids.accountId,
           workspaceId: ids.workspaceId,
           sessionId: ids.sessionId,
@@ -434,14 +449,13 @@ export function wrapChannelABoxWithRouting(
           reason: proof.reason,
           idleGraceMs: settings.sandboxIdleGraceMs,
         });
+        const backgroundSettlement = retainedProcessBackgroundSettlement(settlement.process, proof);
         await settleSessionBackgroundCommandForRetainedProcess(db, {
           accountId: ids.accountId,
           workspaceId: ids.workspaceId,
           sessionId: ids.sessionId,
           retainedProcessId: process.id,
-          outcome: proof.outcome,
-          exitCode: proof.exitCode,
-          reason: proof.reason,
+          ...backgroundSettlement,
         });
       }
     : undefined;

package/src/sandbox/runtime-settings.ts

@@ -4,6 +4,7 @@ import {
   type RigVersion,
   type Session,
   type SandboxBackend,
+  type SandboxOs,
 } from "@opengeni/contracts";
 import {
   getRigVersion,
@@ -18,6 +19,37 @@ import {
   rigProviderImageProviderBindingKeyHash,
 } from "../rigs/provider-images";
 
+export type ManagedSessionGroupBackend = Exclude<SandboxBackend, "none" | "selfhosted">;
+
+/**
+ * Resolve the provider backend behind a session's synthetic managed group.
+ *
+ * A machine-home session keeps `selfhosted` as its durable policy while a
+ * non-null active pointer selects the enrolled machine. Clearing that pointer
+ * is an explicit switch to the deployment's managed group, so API readiness,
+ * viewer attachment, Channel-A, and worker turns must all select the same
+ * provider. Deployments configured with `none` or `selfhosted` have no managed
+ * fallback to expose.
+ */
+export function managedSessionGroupBackend(
+  deploymentBackend: SandboxBackend,
+  sessionBackend: SandboxBackend,
+): ManagedSessionGroupBackend | null {
+  if (sessionBackend === "none") return null;
+  const backend = sessionBackend === "selfhosted" ? deploymentBackend : sessionBackend;
+  return backend === "none" || backend === "selfhosted" ? null : backend;
+}
+
+/** A machine-home row carries the machine's host OS; its managed group uses the
+ * platform's canonical managed-sandbox OS instead. Ordinary sessions preserve
+ * their explicitly selected OS. */
+export function managedSessionGroupOs(
+  sessionBackend: SandboxBackend,
+  sessionOs: SandboxOs,
+): SandboxOs {
+  return sessionBackend === "selfhosted" ? "linux" : sessionOs;
+}
+
 /** Pre-V2 Packs are the sole compatibility path where a Pack can still own a
  * sandbox image. V2 installations select a Rig instead. Keep this predicate at
  * the shared runtime boundary so turns, API-direct tools, viewers, Browser and