@opengeni/core 1.0.2 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeni/core",
-  "version": "1.0.2",
+  "version": "1.2.0",
   "description": "OpenGeni framework-agnostic core: the domain, access, and billing layers (neutral access, off-HTTP V2 surface). Behavior-preserving extraction from apps/api — keeps Hono's HTTPException for error throwing (typed-errors cleanup deferred).",
   "license": "Apache-2.0",
   "repository": {
@@ -50,17 +50,17 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@opengeni/capabilities": "1.0.2",
-    "@opengeni/codex": "1.0.2",
-    "@opengeni/config": "1.0.2",
-    "@opengeni/contracts": "1.0.2",
-    "@opengeni/db": "1.0.2",
-    "@opengeni/documents": "1.0.2",
-    "@opengeni/events": "1.0.2",
-    "@opengeni/network": "1.0.2",
-    "@opengeni/observability": "1.0.2",
-    "@opengeni/runtime": "1.0.2",
-    "@opengeni/storage": "1.0.2",
+    "@opengeni/capabilities": "1.2.0",
+    "@opengeni/codex": "1.2.0",
+    "@opengeni/config": "1.2.0",
+    "@opengeni/contracts": "1.2.0",
+    "@opengeni/db": "1.2.0",
+    "@opengeni/documents": "1.2.0",
+    "@opengeni/events": "1.2.0",
+    "@opengeni/network": "1.2.0",
+    "@opengeni/observability": "1.2.0",
+    "@opengeni/runtime": "1.2.0",
+    "@opengeni/storage": "1.2.0",
     "hono": "^4.12.18",
     "zod": "^4.2.1"
   },

package/src/application/session-tenancy.ts

@@ -19,10 +19,8 @@ import {
   isRetryableDatabaseTransportFailure,
   nestedPostgresSqlState,
   replayAppliedSessionFork,
-  sessionTenancyProductActivated,
   SessionTenancyAccessError,
   SessionTenancyInvalidRequestError,
-  SessionTenancyNotActivatedError,
   transitionSessionVisibility,
   type Database,
   type ForkSessionContentResult,
@@ -101,9 +99,10 @@ export async function getManagedHumanSessionCreateCapabilities(
     }
     throw error;
   }
-  // Mirror the database create fence exactly: a managed human's own Personal
-  // workspace needs only the operator readiness receipt, while a shared
-  // organization workspace additionally needs the owner/admin product setting.
+  // Mirror the database create fence exactly: every organization is
+  // session-tenancy activated (migration 0611), so a member's own Personal
+  // workspace is always private-capable, while a shared organization workspace
+  // additionally needs the owner/admin Only-me product setting.
   let activated = false;
   try {
     const policy = await getPrivateSessionCreatePolicy(deps.db, {
@@ -153,9 +152,6 @@ async function requireSessionTenancyMutationGate(
   // missing, shared, or another owner's private session.
   requireVerifiedOwningUser(authorization, workspaceId);
   for (const permission of permissions) requirePermission(authorization.grant, permission);
-  if (!(await sessionTenancyProductActivated(deps.db, workspaceId))) {
-    throw new SessionTenancyNotActivatedError();
-  }
 }
 
 async function publishExactCommittedEvent(

package/src/application/user-resource-grants.ts

@@ -8,8 +8,6 @@ import {
   issueSelfUserResourceGrant,
   listSelfUserResourceAuthorities,
   revokeSelfUserResourceGrant,
-  sessionTenancyProductActivated,
-  SessionTenancyNotActivatedError,
 } from "@opengeni/db";
 import { requirePermission, type AccessGrantAuthorization } from "../access";
 import type { AppDependencies } from "../dependencies";
@@ -46,9 +44,6 @@ async function requireOwnerProductGate(
   // Target-free gates must run before an optional target-session lookup or host
   // callback so rejected principals cannot use grant management as an oracle.
   requireOwnerAuthority(authorization, workspaceId, permissions);
-  if (!(await sessionTenancyProductActivated(deps.db, workspaceId))) {
-    throw new SessionTenancyNotActivatedError();
-  }
 }
 
 function requireOwnerAuthority(
@@ -75,14 +70,6 @@ export async function listManagedHumanUserResourceAuthorities(
   input: { resourceKind: UserResourceKind; cursor?: string | undefined; limit: number },
 ) {
   requireOwnerAuthority(authorization, workspaceId, LIST_PERMISSIONS[input.resourceKind]);
-  // Before activation there cannot be usable personal-resource authority in
-  // this organization. Discovery therefore has an exact empty answer; only
-  // issue/revoke and runtime use remain behind the forward-only product gate.
-  // This keeps ordinary workspace-owned Rig/Variable Set selection independent
-  // from an optional personal-resource product that is not enabled.
-  if (!(await sessionTenancyProductActivated(deps.db, workspaceId))) {
-    return { authorities: [], nextCursor: null };
-  }
   return await listSelfUserResourceAuthorities(deps.db, {
     accountId: authorization.grant.accountId,
     workspaceId,

package/src/billing/agent-run-admission.ts

@@ -0,0 +1,107 @@
+import {
+  canonicalizeConfiguredModelId,
+  configuredStaticUsageLimits,
+  type Settings,
+} from "@opengeni/config";
+import type { EntitlementsPort } from "@opengeni/contracts";
+import { modelFundingForAdmission } from "./limits";
+import {
+  checkWorkspaceAllowance,
+  getSpendableCreditBalance,
+  isCodexBilledTurn,
+  sumUsageQuantity,
+  type Database,
+} from "@opengeni/db";
+
+export type AgentRunAdmissionDenial =
+  | "insufficient_credits"
+  | "allowance_exhausted"
+  | "monthly_model_cost_limit"
+  | "monthly_agent_run_limit";
+
+/** Read-only admission shared by service-authored runs and goal Resume. */
+export async function agentRunAdmissionDenial(
+  services: { db: Database; settings: Settings; entitlements?: EntitlementsPort | null },
+  input: {
+    accountId: string;
+    workspaceId: string;
+    model: string;
+    requestedAgentRuns: number;
+    /** The accepted work's causal human, not the scheduler/service caller. */
+    initiatingHumanSubjectId?: string | null;
+  },
+): Promise<AgentRunAdmissionDenial | null> {
+  const codexBilled = await isCodexBilledTurn({
+    db: services.db,
+    settings: services.settings,
+    workspaceId: input.workspaceId,
+    model: input.model,
+  });
+  const externallyBilled = modelFundingForAdmission(
+    services.settings,
+    input.model,
+    codexBilled,
+  ).fundedWithoutCredits;
+  if (
+    !externallyBilled &&
+    (services.settings.billingMode === "stripe" || services.settings.usageLimitsMode === "managed")
+  ) {
+    if (services.entitlements) {
+      const decision = await services.entitlements.admitRun({
+        accountId: input.accountId,
+        workspaceId: input.workspaceId,
+        action: "agent_run:create",
+        quantity: input.requestedAgentRuns,
+      });
+      if (!decision.allowed) return "insufficient_credits";
+    } else {
+      const balance = await getSpendableCreditBalance(
+        services.db,
+        input.accountId,
+        canonicalizeConfiguredModelId(services.settings, input.model),
+      );
+      if (balance.balanceMicros <= 0) return "insufficient_credits";
+    }
+  }
+  if (!externallyBilled) {
+    const refusal = await checkWorkspaceAllowance(services.db, {
+      accountId: input.accountId,
+      workspaceId: input.workspaceId,
+      subjectId: input.initiatingHumanSubjectId ?? null,
+    });
+    if (refusal) return refusal.code;
+  }
+  if (
+    services.settings.usageLimitsMode !== "static" &&
+    services.settings.usageLimitsMode !== "managed"
+  ) {
+    return null;
+  }
+  const limits = configuredStaticUsageLimits(services.settings);
+  if (!externallyBilled && limits.maxMonthlyCostMicrosPerAccount) {
+    const used = await sumUsageQuantity(services.db, {
+      accountId: input.accountId,
+      eventType: "model.cost",
+      since: startOfUtcMonth(),
+    });
+    if (used >= limits.maxMonthlyCostMicrosPerAccount) {
+      return "monthly_model_cost_limit";
+    }
+  }
+  if (limits.maxMonthlyAgentRunsPerWorkspace) {
+    const used = await sumUsageQuantity(services.db, {
+      workspaceId: input.workspaceId,
+      eventType: "agent_run.created",
+      since: startOfUtcMonth(),
+    });
+    if (used + input.requestedAgentRuns > limits.maxMonthlyAgentRunsPerWorkspace) {
+      return "monthly_agent_run_limit";
+    }
+  }
+  return null;
+}
+
+function startOfUtcMonth(): Date {
+  const now = new Date();
+  return new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), 1));
+}

package/src/billing/limits.ts

@@ -1,5 +1,6 @@
 import {
   configuredStaticUsageLimits,
+  canonicalizeConfiguredModelId,
   resolveModelProviderForTurn,
   type Settings,
 } from "@opengeni/config";
@@ -16,7 +17,7 @@ import {
   countActiveOrganizationApiKeysForAccount,
   countScheduledTasksForWorkspace,
   countWorkspacesForAccount,
-  getBillingBalance,
+  getSpendableCreditBalance,
   isCodexBilledTurn,
   recordUsageEvent,
   sumUsageQuantity,
@@ -148,11 +149,21 @@ async function checkCreditBalance(
   if (!usesCreditLimits(deps) || !isCostlyAction(input.action)) {
     return { allowed: true };
   }
-  const balance = await getBillingBalance(deps.db, input.accountId);
+  const balance = await getSpendableCreditBalance(
+    deps.db,
+    input.accountId,
+    input.model ? canonicalizeConfiguredModelId(deps.settings, input.model) : undefined,
+  );
   if (balance.balanceMicros > 0) {
     return { allowed: true };
   }
-  return { allowed: false, code: "insufficient_credits", message: "insufficient Opengeni credits" };
+  return {
+    allowed: false,
+    code: "insufficient_credits",
+    message: input.model
+      ? "No credits available for this model. Choose a model covered by your promotional credits or add credits."
+      : "No general credits available. Promotional credits cover eligible models only.",
+  };
 }
 
 async function checkStaticCaps(

package/src/default-session-model.ts

@@ -13,6 +13,7 @@ import {
   type WorkspaceSessionDefaults,
   type XaiProviderAccountAuthoritySnapshotV1,
   type ClaudeProviderAccountAuthoritySnapshotV1,
+  type BillingBalance,
 } from "@opengeni/contracts";
 import {
   getScheduledTaskXaiProviderAccountAuthoritySnapshot,
@@ -30,7 +31,8 @@ import {
   workspaceCodexSubscriptionActive,
   workspaceOpenRouterConnectionActive,
   workspaceVercelAiGatewayConnectionActive,
-  organizationHoldsCredits,
+  getBillingBalance,
+  spendableCreditMicros,
   workspaceXaiSubscriptionActive,
   workspaceXaiSubscriptionActiveForAuthority,
   XaiAuthorityPoolInactiveError,
@@ -112,16 +114,22 @@ export type DefaultSessionModelInput = {
    * `organizationHoldsCredits`).
    */
   creditsAvailable: boolean;
+  creditBalance?: BillingBalance;
 };
 
 function creditsCandidate(
-  input: Pick<DefaultSessionModelInput, "settings" | "selections">,
+  input: Pick<DefaultSessionModelInput, "settings" | "selections" | "creditBalance">,
 ): DefaultModelSelection | null {
+  const selections = input.creditBalance
+    ? input.selections.filter(
+        (selection) => spendableCreditMicros(input.creditBalance!, selection.model.id) > 0,
+      )
+    : input.selections;
   const fallbackEffort = input.settings.openaiReasoningEffort;
-  const deployment = findSelection(input.selections, input.settings.openaiModel);
-  const configured = findSelection(input.selections, input.settings.creditsDefaultModel);
+  const deployment = findSelection(selections, input.settings.openaiModel);
+  const configured = findSelection(selections, input.settings.creditsDefaultModel);
   if (deployment?.availability.selectable && deployment.model.cost === "credits") {
-    // An operator's paid deployment default is never replaced. When it is the
+    // A funded paid deployment default is preserved. When it is the
     // credits default model itself, credit holders get the credits default
     // effort rather than the deployment-wide fallback effort.
     if (configured?.model.id !== deployment.model.id) return null;
@@ -146,7 +154,7 @@ function creditsCandidate(
       source: "credits",
     };
   }
-  const first = input.selections.find(
+  const first = selections.find(
     (selection) => selection.availability.selectable && selection.model.cost === "credits",
   );
   return first
@@ -175,8 +183,8 @@ function creditsCandidate(
  *    configured credits default (`OPENGENI_CREDITS_DEFAULT_MODEL`, effort
  *    clamped to what the model supports), or the first selectable
  *    credits-billed model when that one is not selectable. When the
- *    deployment default is already a selectable credits-billed model it is
- *    never replaced: it keeps the deployment effort, except that it takes the
+ *    deployment default is already a funded, selectable credits-billed model it
+ *    keeps the deployment effort, except that it takes the
  *    credits default effort when it is the credits default model itself.
  * 4. `deployment`: the deployment default with the deployment reasoning effort
  *    when stably admissible; otherwise the first stably admissible catalog
@@ -247,6 +255,7 @@ export function creditsDefaultSessionModel(input: {
   settings: Settings;
   selections: readonly WorkspaceModelSelection[];
   workspaceSettings: unknown;
+  creditBalance?: BillingBalance;
 }): DefaultModelSelection | null {
   if (input.settings.billingMode !== "stripe") return null;
   return selectDefaultSessionModel({
@@ -254,6 +263,7 @@ export function creditsDefaultSessionModel(input: {
     selections: input.selections,
     workspaceDefaults: resolveWorkspaceSessionDefaults(input.workspaceSettings),
     creditsAvailable: true,
+    ...(input.creditBalance ? { creditBalance: input.creditBalance } : {}),
   });
 }
 
@@ -279,13 +289,14 @@ export async function resolveDefaultSessionModelForSelections(
   if (
     withoutCredits.source !== "deployment" ||
     input.settings.billingMode !== "stripe" ||
-    creditsCandidate(decision) === null
+    !input.selections.some(
+      (selection) => selection.availability.selectable && selection.model.cost === "credits",
+    )
   ) {
     return withoutCredits;
   }
-  return (await organizationHoldsCredits(db, input.accountId))
-    ? selectDefaultSessionModel({ ...decision, creditsAvailable: true })
-    : withoutCredits;
+  const creditBalance = await getBillingBalance(db, input.accountId);
+  return selectDefaultSessionModel({ ...decision, creditsAvailable: true, creditBalance });
 }
 
 export type WorkspaceModelSelectionContext = {

package/src/dependencies.ts

@@ -3,6 +3,7 @@ import type {
   ConnectionCredentialsPort,
   Document,
   DocumentAuthorityKind,
+  EntitlementsPort,
   GitHubAppApiPort,
   ScheduledTask,
   ScheduledTaskTriggerType,
@@ -155,6 +156,8 @@ export type AppDependencies = {
    */
   catalogSourceSettings?: Settings;
   db: Database;
+  /** Read-only host funding admission; unset uses the standalone billing ledger. */
+  entitlements?: EntitlementsPort | null;
   /**
    * Host-composed editable artifact engine. Standalone startup binds the same
    * native kernel/DB/object-store implementation; embedded hosts may inject an

package/src/domain/knowledge-search.test.ts

@@ -40,7 +40,7 @@ const usage = mock(
 );
 mock.module("@opengeni/db", () => ({
   listKnowledgeEntries: list,
-  getBillingBalance: async () => ({ balanceMicros: balance }),
+  getSpendableCreditBalance: async () => ({ balanceMicros: balance }),
   applyCreditDebitAfterUse: debits,
   checkWorkspaceAllowance: allowanceChecks,
   creditDebitAttributionForTurn: async (_db: unknown, input: { turnId: string }) => ({

package/src/domain/knowledge-search.ts

@@ -4,7 +4,7 @@ import {
   applyCreditDebitAfterUse,
   checkWorkspaceAllowance,
   creditDebitAttributionForTurn,
-  getBillingBalance,
+  getSpendableCreditBalance,
   listKnowledgeEntries,
   recordUsageEvent,
   sumUsageQuantity,
@@ -190,7 +190,7 @@ export async function searchKnowledgeEntries(
     context.accountId,
     context.workspaceId,
     async (lockedDb) => {
-      const balance = await getBillingBalance(lockedDb, context.accountId);
+      const balance = await getSpendableCreditBalance(lockedDb, context.accountId);
       if (balance.balanceMicros <= 0)
         return keywordFallback(lockedDb, new KnowledgeVectorFundingError(), "awaiting_funding");
       const attribution =

package/src/domain/session-tool-policy.ts

@@ -8,6 +8,7 @@ import {
 import {
   AGENT_SKILL_MANAGE_TOOL_NAMES,
   AUTOMATIC_SESSION_TITLE_FALLBACK,
+  bundledSkillSelectionForAgentConfig,
   DEFAULT_FIRST_PARTY_MCP_PERMISSIONS,
   FIRST_PARTY_IN_PROCESS_TOOL_NAMES,
   type FirstPartyMcpToolName,
@@ -395,14 +396,19 @@ export async function workspaceSessionEffectiveToolsContext(
 
 function sessionHasSkills(session: Session, context: SessionEffectiveToolsContext): boolean {
   if (context.hasWorkspaceSkills || session.skills.length > 0) return true;
-  // Undefined is the worker's bundled default. Explicit [] means no bundles.
-  if (session.bundledSkillIds === undefined) return true;
+  // Undefined is the worker's bundled default. Explicit [] means no bundles,
+  // and a "none" agent without an explicit list has none (as in the worker).
+  const bundledSkillIds = bundledSkillSelectionForAgentConfig(
+    session.bundledSkillIds,
+    session.agent,
+  );
+  if (bundledSkillIds === undefined) return true;
   const tools = new Set(
     resolveAgentToolFamilies(session.agent).firstPartyTools(
       allowedFirstPartyMcpToolsForSession(context.settings, session.firstPartyMcpTools),
     ),
   );
-  return session.bundledSkillIds.some((id) => {
+  return bundledSkillIds.some((id) => {
     if (
       [
         "builtin:opengeni-documents",
@@ -479,7 +485,7 @@ export function sessionEffectiveToolProjectionInput(
     (!session.title?.trim() || session.title.trim() === AUTOMATIC_SESSION_TITLE_FALLBACK);
   const firstPartyMcpTools =
     context && toolRefs.some((ref) => ref.id === "opengeni")
-      ? resolveAgentToolFamilies(session.agent)
+      ? resolveAgentToolFamilies(session.agent, { sandboxAttached: sandboxAvailable })
           .firstPartyTools(
             allowedFirstPartyMcpToolsForSession(context.settings, session.firstPartyMcpTools),
           )
@@ -512,7 +518,9 @@ export function sessionEffectiveToolProjectionInput(
         firstPartyModelNames.set(name, `interaction__${name}`);
         if (
           !firstPartyMcpTools.includes(name) &&
-          resolveAgentToolFamilies(session.agent).allowsFirstPartyTool(name) &&
+          resolveAgentToolFamilies(session.agent, {
+            sandboxAttached: sandboxAvailable,
+          }).allowsFirstPartyTool(name) &&
           session.firstPartyMcpTools.includes(name)
         )
           firstPartyMcpTools.push(name);
@@ -561,6 +569,7 @@ export function sessionEffectiveToolProjectionInput(
     routerInHistory:
       context?.routerInHistory === true ||
       context?.routerHistorySessionIds?.has(session.id) === true,
+    ...(context ? { sandboxAttached: sandboxAvailable } : {}),
   };
   const families = resolveAgentToolFamilies(session.agent, environment);
   environment.hasDeferredTools =

package/src/domain/sessions.ts

@@ -72,6 +72,7 @@ import {
   OPENGENI_SLACK_BOT_SESSION_METADATA_KEY,
   SessionSkills,
   resolveBundledSkillSelection,
+  bundledSkillSelectionForAgentConfig,
   SessionSpawnDenial,
   ServiceTurnInitiator,
   ServiceTurnInitiatorContext,
@@ -182,7 +183,6 @@ import {
   SessionToolPolicyVersionConflictError,
   SessionCreateIdempotencyConflictError,
   PersonalResourceAttachmentAcceptanceError,
-  sessionTenancyProductActivated,
   workspaceControlRequestLockTimeoutMs,
   WorkspaceControlBusyError,
   type SessionCommandActor,
@@ -327,11 +327,6 @@ async function requireAtomicPersonalResourceAttachment(
       cause: error,
     });
   }
-  if (!(await sessionTenancyProductActivated(deps.db, workspaceId))) {
-    throw new HTTPException(409, {
-      message: "Session tenancy is not activated for this organization.",
-    });
-  }
   if (existingSession && intent.expectedAuthorityEpoch === undefined) {
     throw new HTTPException(422, {
       message: "Personal-resource attachment requires expectedAuthorityEpoch.",
@@ -1051,6 +1046,13 @@ export async function createAndStartSessionWithOutcome(input: {
   allowNestedAgentDepthIncrease?: boolean;
   subjectId?: string | null;
 }): Promise<CreateSessionOutcome> {
+  const frozenBundledSkillIds = bundledSkillSelectionForAgentConfig(
+    input.bundledSkillIds,
+    input.agentConfig,
+  );
+  if (frozenBundledSkillIds !== input.bundledSkillIds) {
+    input = { ...input, bundledSkillIds: frozenBundledSkillIds };
+  }
   const sessionMetadata = metadataWithTurnExecutionPolicyV1(
     {
       ...input.metadata,
@@ -2545,6 +2547,9 @@ async function createSessionForRequestInFileScope(
   if (agentResolution.instructions !== undefined) {
     payload.instructions = agentResolution.instructions;
   }
+  // Freeze what the agent configuration implies before keyed replay compares
+  // it: a `"none"` agent omits the bundled guides unless the request lists them.
+  bundledSkillIds = bundledSkillSelectionForAgentConfig(bundledSkillIds, agentConfig);
   const parentCallingTurn =
     parentSession && creationInitiator.actor
       ? await getSessionTurnForAttempt(