@opengeni/core 3.0.1 → 4.0.0

package/src/domain/skills.ts

@@ -3,6 +3,7 @@ import type {
   SkillInstallInput,
   SkillRevisionInput,
   SkillSaveInput,
+  SkillRemoveInput,
 } from "@opengeni/contracts";
 import { validateSkillTextFiles } from "@opengeni/contracts";
 import { buildPortableSkillArtifact } from "@opengeni/runtime/skill-library";
@@ -30,6 +31,14 @@ export function skillBundleHash(files: readonly SkillFile[]): string {
 }
 
 export const listSkills = listSkillRecords;
+export async function removeSkill(db: Database, input: SkillRemoveInput) {
+  const { accountId, workspaceId, actor, ...request } = input;
+  return applySkillLifecycle(
+    db,
+    { accountId, workspaceId, actor },
+    { ...request, operation: "remove" },
+  );
+}
 export async function readSkill(
   db: Database,
   context: SkillReadContext,

package/src/index.ts

@@ -1,4 +1,7 @@
+export { readSessionAttachmentFiles } from "./domain/session-file-access";
 export * from "./domain/skills";
+export * from "./domain/mcp-account-bindings";
+export * from "./domain/organization-integration-catalog";
 export * from "./domain/knowledge";
 export * from "./domain/knowledge-search";
 // @opengeni/core — the framework-agnostic OpenGeni core.
@@ -65,12 +68,10 @@ export * from "./sandbox/runtime-settings";
 export * from "./access";
 export * from "./application/external-workspace-members";
 export * from "./application/external-identity-lifecycle";
-export * from "./application/host-mcp-resolvers";
 export * from "./application/external-continuation";
 export * from "./application/session-mcp-credential-rotation";
 export * from "./application/external-link-work-admission";
 export * from "./application/connect-authority";
-export * from "./application/host-mcp-owner";
 export * from "./application/connect-operation";
 export * from "./session-authorization";
 
@@ -78,19 +79,18 @@ export * from "./session-authorization";
 export * from "./billing/limits";
 
 // Domain layer — the off-HTTP V2 surface (createSessionForRequest,
-// postUserMessageTurn, createAndStartSession, capability/pack/environment/
+
 // scheduled-task/workspace-member logic, …).
 export * from "./domain/capabilities";
-export * from "./domain/host-mcp-authority-source-admission";
+export * from "./domain/native-mcp-connection-admission";
 export * from "./domain/skill-imports";
 export * from "./domain/skill-search";
 export * from "./domain/github-skill-source";
 export * from "./domain/environments";
 export * from "./rigs";
-export * from "./domain/packs";
 export * from "./domain/automations";
 export * from "./domain/pr-review";
-export * from "./domain/product-integration-pack";
+
 export * from "./domain/personal-connection-delegations";
 export * from "./domain/resources";
 export * from "./domain/github-repository-bindings";
@@ -116,6 +116,7 @@ export * from "./application/new-session-drafts";
 export * from "./application/composer-submit";
 export * from "./application/session-commands";
 export * from "./application/session-tenancy";
+export * from "./application/sandbox-recovery";
 export * from "./application/user-resource-grants";
 export * from "./application/api-integration-servers";
 
@@ -129,5 +130,8 @@ export { withSiteSessionOrigin } from "./site-session-origin";
 export { fileOwnerContextForAccess, fileOwnerContextForAgent } from "./domain/file-owner";
 
 export { prepareKnowledgeFile } from "./domain/knowledge-files";
+export { prepareKnowledgeSave } from "./domain/knowledge-preparation";
 
 export { retainKnowledgeMessage } from "./domain/knowledge-messages";
+
+export * from "./domain/connector-tool-permissions";

package/src/rigs/index.ts

@@ -128,7 +128,7 @@ export async function requireRigForApi(
 ): Promise<Rig> {
   const rig = await getRig(db, grant, rigId);
   if (!rig) {
-    throw new HTTPException(404, { message: "rig not found" });
+    throw new HTTPException(404, { message: "sandbox environment not found" });
   }
   return rig;
 }
@@ -143,7 +143,7 @@ export async function requireRigChangeForApi(
   // RLS + the workspace clause make a cross-workspace id indistinguishable from
   // missing; the rigId clause keeps the change addressable only under its rig.
   if (!change || change.rigId !== rigId) {
-    throw new HTTPException(404, { message: "rig change not found" });
+    throw new HTTPException(404, { message: "sandbox environment change not found" });
   }
   return change;
 }
@@ -151,7 +151,7 @@ export async function requireRigChangeForApi(
 function trimmedRigName(name: string): string {
   const trimmed = name.trim();
   if (!trimmed) {
-    throw new HTTPException(422, { message: "rig name is required" });
+    throw new HTTPException(422, { message: "sandbox environment name is required" });
   }
   return trimmed;
 }
@@ -165,7 +165,7 @@ function assertUniqueCheckNames(checks: ReadonlyArray<{ name: string }> | undefi
   for (const check of checks) {
     if (seen.has(check.name)) {
       throw new HTTPException(422, {
-        message: `duplicate rig check name: ${check.name}`,
+        message: `duplicate sandbox environment check name: ${check.name}`,
       });
     }
     seen.add(check.name);
@@ -198,7 +198,7 @@ async function assertVariableSetsExist(
     }
     if (!variableSetScopeAllowedForRig(rigScope, variableSet.scope)) {
       throw new HTTPException(422, {
-        message: `${rigScope}-scoped rigs cannot use ${variableSet.scope}-scoped variable sets`,
+        message: `${rigScope}-scoped sandbox environments cannot use ${variableSet.scope}-scoped variable sets`,
       });
     }
   }
@@ -233,12 +233,12 @@ export async function createRigForApi(
   );
   if ((await countRigs(deps.db, grant, payload.scope)) >= MAX_RIGS_PER_WORKSPACE) {
     throw new HTTPException(422, {
-      message: `a workspace supports at most ${MAX_RIGS_PER_WORKSPACE} rigs`,
+      message: `a workspace supports at most ${MAX_RIGS_PER_WORKSPACE} sandbox environments`,
     });
   }
   if (await getRigByName(deps.db, grant, name, payload.scope)) {
     throw new HTTPException(409, {
-      message: `rig name is already in use: ${name}`,
+      message: `sandbox environment name is already in use: ${name}`,
     });
   }
   const createdBy = rigActorForGrant(grant);
@@ -281,7 +281,7 @@ export async function updateRigForApi(
     const existing = await getRigByName(deps.db, grant, name, rig.scope);
     if (existing && existing.id !== rig.id) {
       throw new HTTPException(409, {
-        message: `rig name is already in use: ${name}`,
+        message: `sandbox environment name is already in use: ${name}`,
       });
     }
   }
@@ -339,7 +339,7 @@ export async function proposeRigChangeForApi(
   const workspaceId = rig.workspaceId;
   if (!rig.activeVersion) {
     throw new HTTPException(422, {
-      message: "rig has no active version to base a change on",
+      message: "sandbox environment has no active version to base a change on",
     });
   }
   if (request.kind === "definition_edit") {
@@ -412,7 +412,7 @@ async function promoteChangeWithActiveCas(
   } catch (error) {
     if (error instanceof RigActiveVersionChangedError) {
       throw new HTTPException(409, {
-        message: `rig moved since this change was verified (base ${error.expectedVersionId}, now ${error.actualVersionId ?? "none"}); re-verify before promoting`,
+        message: `sandbox environment moved since this change was verified (base ${error.expectedVersionId}, now ${error.actualVersionId ?? "none"}); re-verify before promoting`,
       });
     }
     if (error instanceof RigChangeTransitionError) {
@@ -435,15 +435,15 @@ export async function promoteSetupAppendChange(
   }
   if (change.status !== "proposed" && change.status !== "verifying") {
     throw new HTTPException(409, {
-      message: `rig change is ${change.status}; cannot promote`,
+      message: `sandbox environment change is ${change.status}; cannot promote`,
     });
   }
   if (!change.baseVersionId) {
-    throw new HTTPException(422, { message: "rig change has no base version" });
+    throw new HTTPException(422, { message: "sandbox environment change has no base version" });
   }
   const base = await getRigVersion(deps.db, rig.workspaceId, rig.id, change.baseVersionId);
   if (!base) {
-    throw new HTTPException(404, { message: "base rig version not found" });
+    throw new HTTPException(404, { message: "base sandbox environment version not found" });
   }
   const payload = change.payload as { command?: unknown; note?: unknown };
   if (typeof payload.command !== "string" || !payload.command.trim()) {
@@ -510,7 +510,7 @@ export async function promoteVerifiedDefinitionEditChangeForApi(
   }
   if (change.status !== "proposed") {
     throw new HTTPException(409, {
-      message: `rig change is ${change.status}; cannot promote`,
+      message: `sandbox environment change is ${change.status}; cannot promote`,
     });
   }
   if (change.verification?.passed !== true) {
@@ -519,11 +519,11 @@ export async function promoteVerifiedDefinitionEditChangeForApi(
     });
   }
   if (!change.baseVersionId) {
-    throw new HTTPException(422, { message: "rig change has no base version" });
+    throw new HTTPException(422, { message: "sandbox environment change has no base version" });
   }
   const base = await getRigVersion(deps.db, rig.workspaceId, rig.id, change.baseVersionId);
   if (!base) {
-    throw new HTTPException(404, { message: "base rig version not found" });
+    throw new HTTPException(404, { message: "base sandbox environment version not found" });
   }
   const payload = change.payload as {
     setupScript?: unknown;
@@ -590,7 +590,7 @@ export async function createRigVersionForApi(
   payload: RigDefinitionEditPayload,
 ): Promise<RigVersion> {
   if (!rig.activeVersion) {
-    throw new HTTPException(422, { message: "rig has no active version" });
+    throw new HTTPException(422, { message: "sandbox environment has no active version" });
   }
   assertUniqueCheckNames(payload.checks);
   await assertVariableSetsExist(

package/src/sandbox/routing.ts

@@ -15,10 +15,11 @@ import { sandboxLifecycleTransitionWaitMs, type Settings } from "@opengeni/confi
 import { appendSessionCommandOutput } from "@opengeni/db/session-command-output";
 import {
   createProviderCommandRetainer,
-  retainedProviderCommandPersistence,
+  supervisedCommandProtocolReady,
 } from "@opengeni/db/retained-provider-commands";
 import {
   advanceWorkspaceGenerationForDirectRequest,
+  retainedProviderCommandPersistence,
   advanceWorkspaceGenerationForRetainedProcess,
   getLiveEnrollmentConnection,
   getRetainedProcess,
@@ -52,6 +53,7 @@ import {
   type RoutingRetainedProcess,
   type RoutingRetainedProcessTerminalProof,
   type RoutingSandboxOperationObserver,
+  type RoutingSandboxCaptureWaitObserver,
   type SelfhostedRelayConfig,
   type SelfhostedConnectionBinding,
   type SelfhostedOpStreamDeps,
@@ -116,6 +118,7 @@ export type ChannelARoutingServices = {
   settings: Settings;
   bus?: EventBus;
   onSandboxOperation?: RoutingSandboxOperationObserver;
+  onSandboxCaptureWait?: RoutingSandboxCaptureWaitObserver;
   waitSignal?: AbortSignal;
 };
 
@@ -530,17 +533,23 @@ export function wrapChannelABoxWithRouting(
   });
 
   const proxy = new RoutingSandboxSession({
+    providerSupervisionReady: async () =>
+      settings.modalCommandSupervisionEnabled && (await supervisedCommandProtocolReady(db)),
     providerCommandHandle: (value) =>
       value && typeof value === "object"
         ? (value as PersistableMutationAdmission).admission?.workspaceGeneration
         : undefined,
     providerCommandPersistence: (process) =>
-      retainedProviderCommandPersistence(db, {
-        accountId: ids.accountId,
-        workspaceId: ids.workspaceId,
-        sessionId: ids.sessionId,
-        processId: process.id,
-      }),
+      retainedProviderCommandPersistence(
+        db,
+        {
+          accountId: ids.accountId,
+          workspaceId: ids.workspaceId,
+          sessionId: ids.sessionId,
+          processId: process.id,
+        },
+        bus ? (events) => bus.publish(ids.workspaceId, ids.sessionId, events) : undefined,
+      ),
     captureProcessOutput: async ({ process, chunkId, chunk, stream, streamFidelity }) => {
       const events = await appendSessionCommandOutput(db, {
         accountId: ids.accountId,
@@ -576,6 +585,7 @@ export function wrapChannelABoxWithRouting(
     },
     resolveActiveBackend: resolver,
     ...(services.onSandboxOperation ? { onOperation: services.onSandboxOperation } : {}),
+    ...(services.onSandboxCaptureWait ? { onCaptureWait: services.onSandboxCaptureWait } : {}),
     ...(beforeMutation ? { beforeMutation } : {}),
     ...(afterMutation ? { afterMutation } : {}),
     ...(beforeProcessMutation ? { beforeProcessMutation } : {}),
@@ -591,6 +601,7 @@ export function wrapChannelABoxWithRouting(
               sandboxGroupId: homeLease.sandboxGroupId,
               expectedEpoch: homeLease.leaseEpoch,
               expectedInstanceId: homeLease.instanceId,
+              expectedBackend: homeLease.backend,
               diagnostic: "provider_not_found_during_routed_operation",
             });
             if (marked.status === "marked" && bus) {

package/src/sandbox/runtime-settings.ts

@@ -1,18 +1,11 @@
 import type { Settings } from "@opengeni/config";
 import {
-  CapabilityPack,
-  StoredCapabilityPack,
   type RigVersion,
   type Session,
   type SandboxBackend,
   type SandboxOs,
 } from "@opengeni/contracts";
-import {
-  getRigVersion,
-  getWorkspacePack,
-  listPackInstallations,
-  type Database,
-} from "@opengeni/db";
+import { getRigVersion, type Database } from "@opengeni/db";
 import { resolveModalCheckpointProviderBinding } from "@opengeni/runtime/sandbox";
 import {
   rigProviderImageContentHash,
@@ -51,76 +44,6 @@ export function managedSessionGroupOs(
   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
- * Computer cannot resolve different physical machines for the same session. */
-export function packInstallationUsesLegacyRuntime(input: {
-  manifestSnapshot: unknown | null;
-  manifestDigest: string | null;
-}): boolean {
-  return input.manifestSnapshot === null && input.manifestDigest === null;
-}
-
-export async function resolveWorkspaceLegacyRuntimePacks(
-  db: Database,
-  workspaceId: string,
-): Promise<CapabilityPack[]> {
-  const installations = await listPackInstallations(db, workspaceId);
-  const packs: CapabilityPack[] = [];
-  for (const installation of installations) {
-    if (installation.status !== "active" || !packInstallationUsesLegacyRuntime(installation)) {
-      continue;
-    }
-    const registration = await getWorkspacePack(db, workspaceId, installation.packId);
-    if (!registration)
-      throw new Error(`Enabled Pack ${installation.packId} has no registered manifest`);
-    const parsed = StoredCapabilityPack.safeParse(registration.pack);
-    if (!parsed.success)
-      throw new Error(
-        `Enabled Pack ${installation.packId} requires repair: ${parsed.error.message}`,
-      );
-    packs.push(parsed.data);
-  }
-  return packs;
-}
-
-export function legacySandboxRuntimeFromPacks(packs: readonly CapabilityPack[]): {
-  sandboxImage: string | null;
-  sandboxProviderImages: CapabilityPack["sandboxProviderImages"] | null;
-} {
-  const imagePacks = packs.filter(
-    (pack) => typeof pack.sandboxImage === "string" && pack.sandboxImage.trim().length > 0,
-  );
-  if (imagePacks.length > 1) {
-    const ids = imagePacks
-      .map((pack) => pack.id)
-      .sort()
-      .join(", ");
-    throw new Error(
-      `Multiple enabled packs declare a sandbox image (${ids}). Only one enabled pack per workspace may declare sandboxImage; disable the others and retry.`,
-    );
-  }
-  return {
-    sandboxImage: imagePacks[0]?.sandboxImage?.trim() ?? null,
-    sandboxProviderImages: imagePacks[0]?.sandboxProviderImages ?? null,
-  };
-}
-
-export function settingsWithPackSandboxImage(
-  settings: Settings,
-  sandboxImage: string | null,
-  sandboxProviderImages: CapabilityPack["sandboxProviderImages"] | null = null,
-): Settings {
-  if (!sandboxImage) return settings;
-  return {
-    ...settings,
-    dockerImage: sandboxImage,
-    modalImageRef: sandboxImage,
-    modalImageId: sandboxProviderImages?.modal?.imageId,
-  };
-}
-
 export function settingsWithRigImage(settings: Settings, rigImage: string | null): Settings {
   // Explicit Rig image overrides are intentionally inert. Preserve this helper
   // as a compatibility seam for callers and historical rows while ensuring the
@@ -277,22 +200,15 @@ export async function resolveSessionSandboxRuntime(
   settings: Settings,
   session: Pick<Session, "workspaceId" | "sandboxBackend" | "rigId" | "rigVersionId">,
 ): Promise<SessionSandboxRuntime> {
-  const [packs, rigVersion] = await Promise.all([
-    resolveWorkspaceLegacyRuntimePacks(db, session.workspaceId),
+  const rigVersion =
     session.rigId && session.rigVersionId
-      ? getRigVersion(db, session.workspaceId, session.rigId, session.rigVersionId)
-      : Promise.resolve(null),
-  ]);
+      ? await getRigVersion(db, session.workspaceId, session.rigId, session.rigVersionId)
+      : null;
   if (session.rigVersionId && !rigVersion) {
-    throw new Error(`Frozen rig version ${session.rigVersionId} is unavailable`);
+    throw new Error(`Frozen sandbox environment version ${session.rigVersionId} is unavailable`);
   }
-  const legacy = legacySandboxRuntimeFromPacks(packs);
-  // A Rig is always a setup/check layer over the deployment-owned platform
-  // sandbox. Legacy pre-v2 Pack image compatibility remains available only to
-  // rig-less sessions; it cannot replace the base beneath a Rig.
-  const logicalSettings = rigVersion
-    ? settings
-    : settingsWithPackSandboxImage(settings, legacy.sandboxImage, legacy.sandboxProviderImages);
+  // Setup and checks always layer on the deployment-owned sandbox image.
+  const logicalSettings = settings;
   return {
     settings: {
       ...logicalSettings,

package/dist/application/host-mcp-owner.d.ts

@@ -1,6 +0,0 @@
-import { type Database } from "@opengeni/db";
-import { type AccessGrantAuthorization } from "../access/index.js";
-/** Direct user admission only. Agents inherit exact accepted snapshots instead.
- * Native and externally represented users share owner semantics; service keys
- * cannot impersonate a human owner merely by naming a subject. */
-export declare function prepareHostMcpOwnerAuthorization(authorization: AccessGrantAuthorization, workspaceId: string, permission: "connections:read" | "connections:write"): (tx: Database) => Promise<import("@opengeni/db").HostMcpBindingOwner>;

package/dist/application/host-mcp-resolvers.d.ts

@@ -1,13 +0,0 @@
-import type { Context } from "hono";
-import { type AccessDeps } from "../access/index.js";
-export declare function hostMcpResolverForRequest(context: Context, deps: AccessDeps, organizationId: string, source: string, method: "get" | "put" | "revoke", raw?: unknown): Promise<{
-    id: string;
-    organizationId: string;
-    externalSource: string;
-    url: string;
-    timeoutMs: number;
-    generation: number;
-    status: "active" | "revoked";
-    createdAt: string;
-    updatedAt: string;
-}>;