@opengeni/core 2.2.0-canary.0 → 2.4.0-canary.0

package/src/domain/packs.ts

@@ -535,13 +535,15 @@ async function resolvePackRig(
       image: null,
     };
   }
-  const image = rig.activeVersion.image ?? null;
-  const status =
-    pack.sandboxImage && image !== pack.sandboxImage
-      ? "mismatch"
-      : pack.rig?.requireVerified && rig.activeVersionHealth?.checkHealth !== "passing"
-        ? "unverified"
-        : "ready";
+  // Explicit Rig images are disabled: a selected Rig always composes on the
+  // deployment platform base. Historical image values remain stored but are
+  // neither effective runtime truth nor a valid v2 Pack compatibility target.
+  const image = null;
+  const status = pack.sandboxImage
+    ? "mismatch"
+    : pack.rig?.requireVerified && rig.activeVersionHealth?.checkHealth !== "passing"
+      ? "unverified"
+      : "ready";
   return {
     required,
     status,
@@ -561,7 +563,7 @@ function packRigBlocker(rig: PackRigResolution, legacyImage: string | null): str
     return "Verify the selected compute environment before installing this Pack";
   }
   if (legacyImage) {
-    return `The selected compute environment must use the Pack's previous image ${legacyImage}; the Pack will not replace workspace compute`;
+    return `This Pack requires the retired explicit sandbox image ${legacyImage}; Rig-bound Packs currently must use the deployment-managed platform sandbox`;
   }
   return "The selected compute environment does not satisfy this Pack's requirement";
 }

package/src/domain/remember.ts

@@ -27,6 +27,7 @@ import {
   getWorkspaceInstructionPolicyBaseline,
   getWorkspaceKnowledgeChangeProposalSummary,
   getWorkspaceKnowledgeClaimInitiatingHuman,
+  materializeConfirmedRememberKnowledgeMemory,
   nestedPostgresSqlState,
   rebaselineWorkspaceInstructionPolicyKnowledgeProposal,
 } from "@opengeni/db";
@@ -101,6 +102,7 @@ export type RememberRouterOptions = {
   rebaselineProposal?: typeof rebaselineWorkspaceInstructionPolicyKnowledgeProposal;
   activateHumanConfirmed?: typeof activateHumanConfirmedLearningDecision;
   confirmKnowledgeClaim?: typeof confirmRememberKnowledgeClaim;
+  materializeKnowledgeMemory?: typeof materializeConfirmedRememberKnowledgeMemory;
   proposalSummary?: typeof getWorkspaceKnowledgeChangeProposalSummary;
   claimInitiatingHuman?: typeof getWorkspaceKnowledgeClaimInitiatingHuman;
   instructionPolicyBaseline?: typeof getWorkspaceInstructionPolicyBaseline;
@@ -283,6 +285,8 @@ function activationSummary(receipt: GovernedLearningActivationReceipt) {
  * and the result is either an immediate activation (automatic policy), a
  * proposal for the human Knowledge review lifecycle, or a durable proposal that
  * still needs one bound human confirmation through `request_human_input`.
+ * A confirmed Knowledge claim is then materialized as a keyword-searchable
+ * Memory record from its exact approved Task-note text.
  */
 export function createRememberRouter(options: RememberRouterOptions): {
   remember: (input: { attempt: unknown; request: unknown }) => Promise<RememberReceiptType>;
@@ -297,6 +301,8 @@ export function createRememberRouter(options: RememberRouterOptions): {
   const activateHumanConfirmed =
     options.activateHumanConfirmed ?? activateHumanConfirmedLearningDecision;
   const confirmKnowledgeClaim = options.confirmKnowledgeClaim ?? confirmRememberKnowledgeClaim;
+  const materializeKnowledgeMemory =
+    options.materializeKnowledgeMemory ?? materializeConfirmedRememberKnowledgeMemory;
   const proposalSummary = options.proposalSummary ?? getWorkspaceKnowledgeChangeProposalSummary;
   const claimInitiatingHuman =
     options.claimInitiatingHuman ?? getWorkspaceKnowledgeClaimInitiatingHuman;
@@ -362,7 +368,11 @@ export function createRememberRouter(options: RememberRouterOptions): {
         scope: request.scope,
       };
       if (route.decision === "blocked" || route.write === null) {
-        return RememberReceipt.parse({ ...base, status: "blocked", reason: "learning_policy_off" });
+        return RememberReceipt.parse({
+          ...base,
+          status: "blocked",
+          reason: "learning_policy_off",
+        });
       }
       if (route.write.knowledgeChangeProposalId === null) {
         // Knowledge is owned by the human review lifecycle: the same one-click
@@ -424,19 +434,30 @@ export function createRememberRouter(options: RememberRouterOptions): {
         if (!initiatingHuman) {
           throw new RememberError("proposal_unavailable", "The remember claim is not available");
         }
-        const receipt = await confirmKnowledgeClaim(options.db, {
-          caller: {
-            workspaceId: attempt.workspaceId,
-            subjectId: initiatingHuman,
-            sessionId: attempt.sessionId,
-            turnId: attempt.turnId,
-            executionGeneration: attempt.executionGeneration,
-          },
-          request: {
-            operationId: request.operationId,
-            claimId: request.claimId,
-            humanInputRequestId: request.humanInputRequestId,
-          },
+        // Approval and Memory materialization are one outer transaction. The
+        // nested RLS helpers use savepoints, so a failed Memory write rolls the
+        // approval back instead of leaving an approved but unretrievable claim.
+        const { receipt, materialization } = await options.db.transaction(async (tx) => {
+          const transaction = tx as unknown as Database;
+          const activationReceipt = await confirmKnowledgeClaim(transaction, {
+            caller: {
+              workspaceId: attempt.workspaceId,
+              subjectId: initiatingHuman,
+              sessionId: attempt.sessionId,
+              turnId: attempt.turnId,
+              executionGeneration: attempt.executionGeneration,
+            },
+            request: {
+              operationId: request.operationId,
+              claimId: request.claimId,
+              humanInputRequestId: request.humanInputRequestId,
+            },
+          });
+          const materializedMemory = await materializeKnowledgeMemory(
+            transaction,
+            activationReceipt,
+          );
+          return { receipt: activationReceipt, materialization: materializedMemory };
         });
         return RememberConfirmReceipt.parse({
           status: "activated",
@@ -448,10 +469,11 @@ export function createRememberRouter(options: RememberRouterOptions): {
             destination: "knowledge",
             receiptId: receipt.id,
             claimId: receipt.claimId,
+            memoryId: materialization.memoryId,
             approvalReviewId: receipt.approvalReviewId,
             effectiveAt: receipt.createdAt,
             authorityKind: "human_confirmed",
-            undo: "knowledge_review",
+            undo: "memory_management",
           },
         });
       }

package/src/domain/sessions.ts

@@ -54,6 +54,7 @@ import {
   type TurnInitiator,
   type TurnInitiatorContext,
   type TurnExecutionPolicyV1,
+  type VariableSet,
   type XaiProviderAccountAuthoritySnapshotV1,
 } from "@opengeni/contracts";
 import {
@@ -65,7 +66,7 @@ import {
   getChannel,
   getRig,
   getWorkspaceDefaultRigId,
-  listDistinctVariableSetIdsInGroup,
+  listDistinctVariableSetSelectionsInGroup,
   listDistinctRigVersionIdsInGroup,
   getSandbox,
   getSession,
@@ -87,7 +88,7 @@ import {
   requireSession,
   submitHumanPromptInTransaction,
   appendSessionEventsWithLockedSessionUpdate,
-  updateSessionTitle as updateSessionTitleRow,
+  updateSessionTitleWithEvent,
   withWorkspaceSubjectSessionActivityRls,
   type CreateSessionMcpServerInput,
   type Database,
@@ -107,7 +108,6 @@ import {
   type NewSessionDraftSnapshot,
 } from "@opengeni/db";
 import {
-  appendAndPublishEvents,
   publishDurableSessionEvents,
   publishDurableWorkspaceControlEvent,
   type EventBus,
@@ -640,8 +640,9 @@ export async function createAndStartSessionWithOutcome(input: {
   createdBy?: TurnInitiator;
   createdByContext?: TurnInitiatorContext;
   createdByActor?: Extract<SessionCommandActor, { type: "agent_attempt" }> | null;
-  // Names/ids only; the session.created payload never carries variable values.
-  variableSet?: { id: string; name: string } | null;
+  // Ordered low-to-high precedence. Names/ids only; session.created never
+  // carries variable values.
+  variableSets?: Array<{ id: string; name: string; scope: VariableSet["scope"] }>;
   // The rig + frozen active rig version resolved at create (M3). Both null ⇒ a
   // rig-less session (byte-for-byte today's behavior). Frozen here so a later
   // rig promote never moves an existing session's version.
@@ -760,7 +761,8 @@ export async function createAndStartSessionWithOutcome(input: {
       reasoningEffort: input.reasoningEffort,
       latencyMode: input.latencyMode ?? "standard",
       sandboxBackend: input.sandboxBackend,
-      variableSetId: input.variableSet?.id ?? null,
+      variableSetIds: input.variableSets?.map((variableSet) => variableSet.id) ?? [],
+      variableSetId: input.variableSets?.at(-1)?.id ?? null,
       rigId: input.rigId ?? null,
       rigVersionId: input.rigVersionId ?? null,
       channelId: input.channelId ?? null,
@@ -831,7 +833,8 @@ export async function createAndStartSessionWithOutcome(input: {
       reasoningEffort: input.reasoningEffort,
       latencyMode: input.latencyMode ?? "standard",
       sandboxBackend: input.sandboxBackend,
-      variableSetId: input.variableSet?.id ?? null,
+      variableSetIds: input.variableSets?.map((variableSet) => variableSet.id) ?? [],
+      variableSetId: input.variableSets?.at(-1)?.id ?? null,
       rigId: input.rigId ?? null,
       rigVersionId: input.rigVersionId ?? null,
       channelId: input.channelId ?? null,
@@ -900,7 +903,7 @@ async function finishStartSession(
     reasoningEffort: Settings["openaiReasoningEffort"];
     turnExecutionPolicy: TurnExecutionPolicyV1;
     sandboxBackend: Settings["sandboxBackend"];
-    variableSet?: { id: string; name: string } | null;
+    variableSets?: Array<{ id: string; name: string; scope: VariableSet["scope"] }>;
     goal?: GoalSpec | null;
     sessionMcpServers?: SessionMcpServerMetadata[];
     seedTargetSandbox?: {
@@ -978,10 +981,13 @@ async function finishStartSession(
     turnExecutionPolicy: input.turnExecutionPolicy,
     createdEventPayload: {
       toolPolicy: input.toolPolicy,
-      ...(input.variableSet
+      ...(input.variableSets?.length
         ? {
-            variableSetId: input.variableSet.id,
-            variableSetName: input.variableSet.name,
+            variableSetIds: input.variableSets.map((variableSet) => variableSet.id),
+            variableSets: input.variableSets,
+            // Legacy highest-precedence aliases.
+            variableSetId: input.variableSets.at(-1)!.id,
+            variableSetName: input.variableSets.at(-1)!.name,
           }
         : {}),
       ...(input.sessionMcpServers?.length ? { mcpServers: input.sessionMcpServers } : {}),
@@ -1719,17 +1725,15 @@ export async function createSessionForRequestWithOutcome(
     });
   }
   await validateFileResources(db, grant.accountId, workspaceId, grant.subjectId, resources);
-  // VariableSet attachment requires variable-sets:use on the calling grant
-  // (validateVariableSetAttachment enforces it), preserving the invariant
-  // that sandboxed agents cannot self-attach workspace secrets.
-  const variableSet = payload.variableSetId
-    ? await validateVariableSetAttachment(
-        { settings, db },
-        grant,
-        workspaceId,
-        payload.variableSetId,
-      )
-    : null;
+  // Every selected Variable Set is independently authorized. Scope does not
+  // affect precedence: explicit order is low-to-high and later sets win name
+  // collisions.
+  const variableSets: VariableSet[] = [];
+  for (const variableSetId of payload.variableSetIds ?? []) {
+    variableSets.push(
+      await validateVariableSetAttachment({ settings, db }, grant, workspaceId, variableSetId),
+    );
+  }
   // RIG BINDING (M3). Resolve the rig this session rides — a UUID binds that
   // rig, null explicitly opts out, and omission inherits the workspace default
   // (workspaces.default_rig_id) — then FREEZE both the rig id and its currently-
@@ -1827,7 +1831,12 @@ export async function createSessionForRequestWithOutcome(
             ...(payload.sandboxBackend ? { sandboxBackend: payload.sandboxBackend } : {}),
             ...(payload.targetSandboxId ? { targetSandboxId: payload.targetSandboxId } : {}),
             ...(payload.workingDir ? { workingDir: payload.workingDir } : {}),
-            ...(payload.variableSetId ? { variableSetId: payload.variableSetId } : {}),
+            ...(variableSets.length
+              ? {
+                  variableSetIds: variableSets.map((variableSet) => variableSet.id),
+                  variableSetId: variableSets.at(-1)!.id,
+                }
+              : {}),
             ...(payload.rigId ? { rigId: payload.rigId } : {}),
             ...(payload.goal ? { goal: payload.goal } : {}),
             ...(payload.firstPartyMcpPermissions
@@ -2041,9 +2050,9 @@ export async function createSessionForRequestWithOutcome(
   // provided-session attach — no shared box state exists to conflict, and
   // env-differing spawns from such parents shared safely before the env-aware
   // check. They keep sharing (and keep inheriting "none").
-  const requestedVariableSetId = payload.variableSetId ?? null;
-  const variableSetMatchesGroup = (memberVariableSetId: string | null): boolean =>
-    memberVariableSetId === requestedVariableSetId;
+  const requestedVariableSetIds = variableSets.map((variableSet) => variableSet.id);
+  const variableSetsMatchGroup = (memberVariableSetIds: readonly string[]): boolean =>
+    stableJson(memberVariableSetIds) === stableJson(requestedVariableSetIds);
   // RIG-AWARE GROUPING (M3), the exact sibling of the env-aware gate above: the
   // box's rig-baked setup/tooling is fixed at cold-create, so a session joining a
   // shared box must ride the SAME frozen rig_version_id. A mismatch is a genuine
@@ -2067,8 +2076,7 @@ export async function createSessionForRequestWithOutcome(
     }
     const parent = parentSession;
     const parentBoxed = parent.sandboxBackend !== "none";
-    const variableSetMismatch =
-      parentBoxed && !variableSetMatchesGroup(parent.variableSetId ?? null);
+    const variableSetMismatch = parentBoxed && !variableSetsMatchGroup(parent.variableSetIds);
     let rigMismatch = parentBoxed && !rigVersionMatchesGroup(parent.rigVersionId ?? null);
     if (parentBoxed && !rigMismatch) {
       const memberRigVersionIds = await listDistinctRigVersionIdsInGroup(
@@ -2113,14 +2121,14 @@ export async function createSessionForRequestWithOutcome(
       // the join verdict nondeterministic. Post-env-aware groups are homogeneous
       // (both join paths enforce equality), so this reads one distinct value in
       // the common case; a mixed legacy group deterministically rejects.
-      const memberVariableSetIds = await listDistinctVariableSetIdsInGroup(
+      const memberVariableSetSelections = await listDistinctVariableSetSelectionsInGroup(
         db,
         workspaceId,
         sandboxChoice.groupId,
       );
       if (
-        !memberVariableSetIds.every((memberVariableSetId) =>
-          variableSetMatchesGroup(memberVariableSetId),
+        !memberVariableSetSelections.every((memberVariableSetIds) =>
+          variableSetsMatchGroup(memberVariableSetIds),
         )
       ) {
         throw new HTTPException(422, {
@@ -2263,7 +2271,11 @@ export async function createSessionForRequestWithOutcome(
       ...(creationInitiator.initiator ? { createdBy: creationInitiator.initiator } : {}),
       ...(creationInitiator.context ? { createdByContext: creationInitiator.context } : {}),
       createdByActor: creationInitiator.actor ?? null,
-      variableSet: variableSet ? { id: variableSet.id, name: variableSet.name } : null,
+      variableSets: variableSets.map((variableSet) => ({
+        id: variableSet.id,
+        name: variableSet.name,
+        scope: variableSet.scope,
+      })),
       // Frozen rig binding (M3): both null for a rig-less session (today's path).
       rigId: frozenRigId,
       rigVersionId: frozenRigVersionId,
@@ -2663,25 +2675,18 @@ export async function updateSessionTitle(
     surface: "core",
   });
   const workspaceId = grant.workspaceId;
-  const result = await updateSessionTitleRow(db, {
+  const result = await updateSessionTitleWithEvent(db, {
     workspaceId,
     sessionId,
     title,
     source,
   });
-  if (result.updated) {
-    await appendAndPublishEvents(db, bus, workspaceId, sessionId, [
-      {
-        type: "session.title_set",
-        payload: {
-          title: result.title ?? title,
-          source,
-        },
-      },
-    ]);
+  if (result.events.length > 0) {
+    await publishDurableSessionEvents(bus, workspaceId, sessionId, result.events);
   }
   return {
-    ...result,
+    updated: result.updated,
+    title: result.title,
     relatedSessionAccess: authorization?.relatedSessionAccess ?? "root",
   };
 }

package/src/rigs/index.ts

@@ -252,7 +252,7 @@ export async function createRigForApi(
     description: payload.description ?? null,
     createdBy,
     initialVersion: {
-      image: payload.image ?? null,
+      image: null,
       setupScript: payload.setupScript ?? null,
       checks: payload.checks,
       credentialHooks: payload.credentialHooks,
@@ -452,7 +452,7 @@ export async function promoteSetupAppendChange(
     });
   }
   const nextDefinition = {
-    image: base.image,
+    image: null,
     setupScript: appendRigSetupCommand(base.setupScript, payload.command),
     checks: base.checks,
     credentialHooks: base.credentialHooks,
@@ -526,7 +526,6 @@ export async function promoteVerifiedDefinitionEditChangeForApi(
     throw new HTTPException(404, { message: "base rig version not found" });
   }
   const payload = change.payload as {
-    image?: unknown;
     setupScript?: unknown;
     checks?: unknown;
     credentialHooks?: unknown;
@@ -534,7 +533,7 @@ export async function promoteVerifiedDefinitionEditChangeForApi(
     changelog?: unknown;
   };
   const nextDefinition = {
-    image: payload.image === undefined ? base.image : (payload.image as string | null),
+    image: null,
     setupScript:
       payload.setupScript === undefined ? base.setupScript : (payload.setupScript as string | null),
     checks: Array.isArray(payload.checks) ? (payload.checks as RigVersion["checks"]) : base.checks,
@@ -606,7 +605,7 @@ export async function createRigVersionForApi(
     rig.workspaceId,
     rig.id,
     {
-      image: payload.image === undefined ? base.image : payload.image,
+      image: null,
       setupScript: payload.setupScript === undefined ? base.setupScript : payload.setupScript,
       checks: payload.checks ?? base.checks,
       credentialHooks: payload.credentialHooks ?? base.credentialHooks,

package/src/rigs/provider-images.ts

@@ -11,7 +11,7 @@ import {
 
 export type RigProviderImageDefinition = Pick<
   RigVersion,
-  "image" | "setupScript" | "checks" | "credentialHooks" | "defaultVariableSetIds"
+  "setupScript" | "checks" | "credentialHooks" | "defaultVariableSetIds"
 >;
 
 function sha256(value: string): string {
@@ -42,10 +42,9 @@ export function rigProviderImageContentHash(input: {
 }): string {
   return sha256(
     stableJson({
-      version: 1,
+      version: 2,
       backend: input.backend,
       sourceImage: input.sourceImage,
-      image: input.definition.image,
       setupScript: input.definition.setupScript,
       checks: input.definition.checks,
       credentialHooks: input.definition.credentialHooks,

package/src/sandbox/runtime-settings.ts

@@ -83,13 +83,11 @@ export function settingsWithPackSandboxImage(
 }
 
 export function settingsWithRigImage(settings: Settings, rigImage: string | null): Settings {
-  if (!rigImage) return settings;
-  return {
-    ...settings,
-    dockerImage: rigImage,
-    modalImageRef: rigImage,
-    modalImageId: undefined,
-  };
+  // Explicit Rig image overrides are intentionally inert. Preserve this helper
+  // as a compatibility seam for callers and historical rows while ensuring the
+  // deployment-owned platform image remains authoritative.
+  void rigImage;
+  return settings;
 }
 
 export function rigProviderImageSourceImage(
@@ -250,10 +248,12 @@ export async function resolveSessionSandboxRuntime(
     throw new Error(`Frozen rig version ${session.rigVersionId} is unavailable`);
   }
   const legacy = legacySandboxRuntimeFromPacks(packs);
-  const logicalSettings = settingsWithRigImage(
-    settingsWithPackSandboxImage(settings, legacy.sandboxImage, legacy.sandboxProviderImages),
-    rigVersion?.image ?? null,
-  );
+  // 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);
   return {
     settings: {
       ...logicalSettings,