@opengeni/api-router 2.12.1-canary.0 → 2.12.3-canary.0

package/dist/app.js

@@ -24,7 +24,7 @@ import {
   withDefaultEnabledCapabilityMcpTools,
   workflowIdForSession,
   workspaceActorContextExempt
-} from "./chunk-Y3EPAIEQ.js";
+} from "./chunk-4AQMKVQM.js";
 export {
   API_MAX_REQUEST_BODY_BYTES,
   allowedCorsOrigin,

package/dist/{chunk-Y3EPAIEQ.js → chunk-4AQMKVQM.js}

@@ -6041,6 +6041,8 @@ async function workspaceArtifactDownloads(storage, ref, audience) {
 // src/mcp/server.ts
 import {
   CreateScheduledTaskRequest,
+  CreateSessionRequest,
+  GoalSpec,
   boundSessionMcpText as capSessionDiscoveryText,
   compactSessionMcpListRow,
   sessionMcpIncludesRelatedWork,
@@ -6534,6 +6536,10 @@ import {
   withoutSandboxProviderIdentity,
   WorkspaceArchiveIntegrityError
 } from "@opengeni/runtime/sandbox";
+import {
+  downloadWorkspaceArchiveSpool,
+  WorkspaceArchiveStorageError
+} from "@opengeni/storage";
 function hasWorkspaceArchive(envelope) {
   const sessionState = envelope?.sessionState && typeof envelope.sessionState === "object" && !Array.isArray(envelope.sessionState) ? envelope.sessionState : null;
   return typeof sessionState?.workspaceArchive === "string" && sessionState.workspaceArchive.length > 0 || parseWorkspaceArchiveObjectRef(sessionState?.workspaceArchiveRef) !== null;
@@ -6555,6 +6561,10 @@ async function materializeArchiveObjectRef(envelope, objectStorage) {
       "workspace archive object storage is not configured"
     );
   }
+  const descriptor = parseWorkspaceArchiveDescriptor(sessionState.workspaceArchiveMeta);
+  if (process.platform === "linux" && descriptor?.version === 1 && descriptor.workspace.projection === "sdk_local_archive_v1") {
+    return envelope;
+  }
   return {
     ...envelope,
     sessionState: await inlineWorkspaceArchiveForRestore(
@@ -6645,6 +6655,24 @@ async function establishApiSandboxSpawner(input) {
     established = await establishSandboxSessionFromEnvelope(input.settings, hydrateEnvelope, {
       sessionId: input.sessionId,
       recovery: "create-or-restore",
+      ...input.objectStorage ? {
+        loadHostWorkspaceArchive: async (ref) => {
+          try {
+            return await downloadWorkspaceArchiveSpool(input.objectStorage, ref.key, {
+              bytes: ref.bytes,
+              sha256: ref.sha256
+            });
+          } catch (error) {
+            if (error instanceof WorkspaceArchiveStorageError) {
+              throw new WorkspaceArchiveIntegrityError(error.code, error.message, {
+                retryable: error.retryable,
+                cause: error
+              });
+            }
+            throw error;
+          }
+        }
+      } : {},
       backendOverride: input.backend,
       environment: input.environment,
       onSandboxCreated: async (created) => {
@@ -24927,6 +24955,30 @@ function orchestrationFailureCode(tool, error) {
   const suffix = error.status === 401 ? "unauthenticated" : error.status === 403 ? "forbidden" : error.status === 404 ? "not_found" : error.status === 409 ? "conflict" : error.status === 429 ? "limit_exceeded" : error.status >= 500 ? "unavailable" : "rejected";
   return `${tool}_${suffix}`.slice(0, ORCHESTRATION_FAILURE_CODE_MAX_LENGTH);
 }
+function sessionCreateValidationFailureResult(error) {
+  const details = error.issues.slice(0, 5).map((issue) => {
+    const [field, goalField] = issue.path;
+    let path = typeof field === "string" && Object.hasOwn(CreateSessionRequest.out.shape, field) ? field : "request";
+    if (field === "goal" && typeof goalField === "string" && Object.hasOwn(GoalSpec.shape, goalField)) {
+      path += `.${goalField}`;
+    }
+    const expected = issue.code === "invalid_type" && ["string", "number", "boolean", "object", "array", "int"].includes(issue.expected) ? `expected ${issue.expected === "int" ? "integer" : issue.expected}` : "failed schema validation";
+    return `${path} ${expected}`;
+  });
+  const envelope = {
+    error: {
+      code: "session_create_invalid_request",
+      message: boundedOrchestrationFailureMessage(
+        `Invalid session create request: ${details.join("; ") || "request failed schema validation"}${error.issues.length > 5 ? "; additional fields failed validation" : ""}.`
+      )
+    }
+  };
+  return {
+    content: [{ type: "text", text: JSON.stringify(envelope, null, 2) }],
+    structuredContent: envelope,
+    isError: true
+  };
+}
 function orchestrationFailureEnvelope(tool, error) {
   if (error instanceof SessionSpawnDeniedError) {
     const denial = sessionSpawnDenialEnvelope(error);
@@ -28818,7 +28870,7 @@ function registerWorkspaceOrchestrationTools(server, deps, grant, can, callerSes
         "Concise semantic title for the child session. Omit only when the delegated goal or initial message already provides a suitable title; OpenGeni derives a sensitive-safe bounded fallback from that text."
       ),
       instructions: z43.string().min(1).max(SESSION_INSTRUCTIONS_MAX_CHARACTERS).optional(),
-      goal: z43.unknown().optional(),
+      goal: GoalSpec.optional(),
       resources: z43.array(z43.unknown()).optional().describe(
         "Omit to inherit parent repositories only. Files are never inherited automatically; explicitly include file resources to attach them. An empty array inherits no resources."
       ),
@@ -28897,18 +28949,21 @@ function registerWorkspaceOrchestrationTools(server, deps, grant, can, callerSes
             await authorizeFirstPartySession(deps, grant, callerSessionId, "session.child.create");
           }
           const { machineTarget, title, projectId, ...request } = args;
+          const rawRequest = {
+            ...request,
+            ...projectId !== void 0 ? { channelId: projectId } : {},
+            ...machineTarget ? {
+              targetSandboxId: machineTarget.targetSandboxId,
+              ...machineTarget.workingDir !== void 0 ? { workingDir: machineTarget.workingDir } : {}
+            } : {}
+          };
+          const validation = CreateSessionRequest.safeParse(rawRequest);
+          if (!validation.success) return sessionCreateValidationFailureResult(validation.error);
           const result = await createSessionForRequestWithOutcome(
             deps,
             grant,
             grant.workspaceId,
-            {
-              ...request,
-              ...projectId !== void 0 ? { channelId: projectId } : {},
-              ...machineTarget ? {
-                targetSandboxId: machineTarget.targetSandboxId,
-                ...machineTarget.workingDir !== void 0 ? { workingDir: machineTarget.workingDir } : {}
-              } : {}
-            },
+            rawRequest,
             void 0,
             title === void 0 ? {} : { automaticTitleCandidate: title }
           );
@@ -55805,7 +55860,7 @@ import {
   GatewayRealtimeConnectRequest,
   ClientSessionEvent,
   CompactSessionContextRequest,
-  CreateSessionRequest,
+  CreateSessionRequest as CreateSessionRequest2,
   DeleteSessionQueueItemRequest,
   EditSessionQueueItemRequest,
   EndSessionRealtimeRequest,
@@ -57055,14 +57110,14 @@ function registerSessionRoutes(app, deps) {
         message: "durable interactive terminals require a session-home provider lease"
       });
     }
-    const process = await getRetainedProcess(db, {
+    const process2 = await getRetainedProcess(db, {
       workspaceId: ctx.workspaceId,
       sessionId: ctx.session.id,
       processId: pty.retainedProcessId
     });
-    if (!process || process.state !== "active" || process.ownerActorKind !== "direct" || process.accountId !== ctx.accountId || process.leaseId !== pty.leaseId || process.sandboxGroupId !== pty.sandboxGroupId || process.parentAdmissionId !== pty.openAdmissionId || process.leaseEpoch !== pty.leaseEpoch || process.providerBackend !== pty.providerBackend || process.providerInstanceId !== pty.providerInstanceId || process.routeKind !== pty.routeKind || process.routeTargetId !== pty.routeTargetId || process.routeEpoch !== pty.routeEpoch || process.providerSessionId !== pty.execSessionId || // Only a persistable home backend can currently be reconstructed by an
+    if (!process2 || process2.state !== "active" || process2.ownerActorKind !== "direct" || process2.accountId !== ctx.accountId || process2.leaseId !== pty.leaseId || process2.sandboxGroupId !== pty.sandboxGroupId || process2.parentAdmissionId !== pty.openAdmissionId || process2.leaseEpoch !== pty.leaseEpoch || process2.providerBackend !== pty.providerBackend || process2.providerInstanceId !== pty.providerInstanceId || process2.routeKind !== pty.routeKind || process2.routeTargetId !== pty.routeTargetId || process2.routeEpoch !== pty.routeEpoch || process2.providerSessionId !== pty.execSessionId || // Only a persistable home backend can currently be reconstructed by an
     // API request without consulting the mutable active pointer.
-    process.routeTargetId !== null || handle.lease.id !== process.leaseId || handle.lease.sandboxGroupId !== process.sandboxGroupId || handle.lease.leaseEpoch !== process.leaseEpoch || handle.lease.backend !== process.providerBackend || handle.lease.instanceId !== process.providerInstanceId) {
+    process2.routeTargetId !== null || handle.lease.id !== process2.leaseId || handle.lease.sandboxGroupId !== process2.sandboxGroupId || handle.lease.leaseEpoch !== process2.leaseEpoch || handle.lease.backend !== process2.providerBackend || handle.lease.instanceId !== process2.providerInstanceId) {
       throw new HTTPException70(409, {
         message: "pty retained-process identity is stale; reopen the terminal"
       });
@@ -57071,28 +57126,28 @@ function registerSessionRoutes(app, deps) {
       accountId: ctx.accountId,
       workspaceId: ctx.workspaceId,
       sessionId: ctx.session.id,
-      processId: process.id
+      processId: process2.id
     });
     handle.routingSession.adoptRetainedProcess({
       process: {
-        id: process.id,
-        providerSessionId: process.providerSessionId,
+        id: process2.id,
+        providerSessionId: process2.providerSessionId,
         ...providerCommand ? { providerCommand } : {}
       },
       backend: {
         sandboxId: null,
-        leaseEpoch: process.leaseEpoch,
-        providerInstanceId: process.providerInstanceId,
-        activeEpoch: process.routeEpoch
+        leaseEpoch: process2.leaseEpoch,
+        providerInstanceId: process2.providerInstanceId,
+        activeEpoch: process2.routeEpoch
       }
     });
-    return process;
+    return process2;
   };
-  const emitPtyExited = async (ctx, ptyId, process) => {
+  const emitPtyExited = async (ctx, ptyId, process2) => {
     const exited = {
       ptyId,
-      exitCode: process.exitCode,
-      reason: process.state === "exited" ? "exit" : "lost"
+      exitCode: process2.exitCode,
+      reason: process2.state === "exited" ? "exit" : "lost"
     };
     await appendAndPublishEvents4(db, bus, ctx.workspaceId, ctx.session.id, [
       { type: "terminal.pty.exited", payload: exited }
@@ -57207,7 +57262,7 @@ function registerSessionRoutes(app, deps) {
     }
     let session;
     try {
-      CreateSessionRequest.parse(payload);
+      CreateSessionRequest2.parse(payload);
       const origin = await resolveSiteSessionOrigin(
         db,
         workspaceId,
@@ -60398,12 +60453,12 @@ function registerSessionRoutes(app, deps) {
       const opened = await service.ptyOpen(req, ptyId);
       const execSessionId = opened.execSessionId;
       const retained = execSessionId === null ? null : handle.routingSession.retainedProcessIdentity(execSessionId);
-      const process = retained ? await getRetainedProcess(db, {
+      const process2 = retained ? await getRetainedProcess(db, {
         workspaceId: ctx.workspaceId,
         sessionId: ctx.session.id,
         processId: retained.id
       }) : null;
-      if (execSessionId === null || !retained || !process || process.state !== "active" || process.ownerActorKind !== "direct" || process.providerSessionId !== execSessionId || process.routeTargetId !== null || process.leaseId !== handle.lease.id || process.sandboxGroupId !== handle.lease.sandboxGroupId || process.leaseEpoch !== handle.lease.leaseEpoch || process.providerBackend !== handle.lease.backend || process.providerInstanceId !== handle.lease.instanceId) {
+      if (execSessionId === null || !retained || !process2 || process2.state !== "active" || process2.ownerActorKind !== "direct" || process2.providerSessionId !== execSessionId || process2.routeTargetId !== null || process2.leaseId !== handle.lease.id || process2.sandboxGroupId !== handle.lease.sandboxGroupId || process2.leaseEpoch !== handle.lease.leaseEpoch || process2.providerBackend !== handle.lease.backend || process2.providerInstanceId !== handle.lease.instanceId) {
         if (execSessionId !== null && handle.routingSession.hasRetainedProcess(execSessionId)) {
           await drainOpenedPty(handle, execSessionId);
         }
@@ -60412,17 +60467,17 @@ function registerSessionRoutes(app, deps) {
         });
       }
       const identity = {
-        leaseId: process.leaseId,
-        sandboxGroupId: process.sandboxGroupId,
-        retainedProcessId: process.id,
-        openAdmissionId: process.parentAdmissionId,
-        execSessionId: process.providerSessionId,
-        leaseEpoch: process.leaseEpoch,
-        providerBackend: process.providerBackend,
-        providerInstanceId: process.providerInstanceId,
-        routeKind: process.routeKind,
-        routeTargetId: process.routeTargetId,
-        routeEpoch: process.routeEpoch
+        leaseId: process2.leaseId,
+        sandboxGroupId: process2.sandboxGroupId,
+        retainedProcessId: process2.id,
+        openAdmissionId: process2.parentAdmissionId,
+        execSessionId: process2.providerSessionId,
+        leaseEpoch: process2.leaseEpoch,
+        providerBackend: process2.providerBackend,
+        providerInstanceId: process2.providerInstanceId,
+        routeKind: process2.routeKind,
+        routeTargetId: process2.routeTargetId,
+        routeEpoch: process2.routeEpoch
       };
       try {
         await insertPtySession(db, {
@@ -76525,4 +76580,4 @@ export {
   withDefaultEnabledCapabilityMcpTools,
   workflowIdForSession4 as workflowIdForSession
 };
-//# sourceMappingURL=chunk-Y3EPAIEQ.js.map
+//# sourceMappingURL=chunk-4AQMKVQM.js.map