@opengeni/core 1.1.0 → 1.2.1-canary.37222177070001

package/dist/default-session-model.d.ts

@@ -1,5 +1,5 @@
 import { type ConfiguredModel, type Settings } from "@opengeni/config";
-import { type DefaultModelSelection, type ReasoningEffort, type ScheduledTask, type WorkspaceSessionDefaults, type XaiProviderAccountAuthoritySnapshotV1, type ClaudeProviderAccountAuthoritySnapshotV1 } from "@opengeni/contracts";
+import { type DefaultModelSelection, type ReasoningEffort, type ScheduledTask, type WorkspaceSessionDefaults, type XaiProviderAccountAuthoritySnapshotV1, type ClaudeProviderAccountAuthoritySnapshotV1, type BillingBalance } from "@opengeni/contracts";
 import { type Database } from "@opengeni/db";
 import { type WorkspaceModelSelection, type WorkspaceModelSelectionInput } from "./model-catalog.js";
 /** The model's own default effort, matching the web picker's choice. */
@@ -18,6 +18,7 @@ export type DefaultSessionModelInput = {
      * `organizationHoldsCredits`).
      */
     creditsAvailable: boolean;
+    creditBalance?: BillingBalance;
 };
 /**
  * Default model policy for a new chat or scheduled task that names no model.
@@ -36,8 +37,8 @@ export type DefaultSessionModelInput = {
  *    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
@@ -57,6 +58,7 @@ export declare function creditsDefaultSessionModel(input: {
     settings: Settings;
     selections: readonly WorkspaceModelSelection[];
     workspaceSettings: unknown;
+    creditBalance?: BillingBalance;
 }): DefaultModelSelection | null;
 /**
  * Resolve the default for an already-loaded workspace selection. The credit

package/dist/goal-admission.d.ts

@@ -86,6 +86,14 @@ export declare function resolveGoalModelAdmission(db: Database, settings: Settin
         productAccessMode: "configured" | "local" | "managed";
         billingMode: "disabled" | "stripe";
         verifiedSignupTrialCreditsEnabled: boolean;
+        creditPromotionPolicy: {
+            defaultModelIds?: string[] | undefined;
+            signupModelIds?: string[] | undefined;
+            offers: Record<string, {
+                label: string;
+                eligibleModelIds?: string[] | undefined;
+            }>;
+        };
         entitlementsMode: "managed" | "none" | "static";
         usageLimitsMode: "managed" | "none" | "static";
         usageAllowancesEnabled: boolean;

package/dist/index.js

@@ -4826,7 +4826,7 @@ function withDeveloperSetupCredentialRestriction(policy, source) {
 import {
   CLAUDE_CONNECTION_KINDS as CLAUDE_CONNECTION_KINDS3,
   claudeProviderId as claudeProviderId2,
-  canonicalizeConfiguredModelId as canonicalizeConfiguredModelId2,
+  canonicalizeConfiguredModelId as canonicalizeConfiguredModelId3,
   configuredAllowedModels,
   withCodexCatalogProvider as withCodexCatalogProvider3,
   ORGANIZATION_GATEWAY_MODEL_ID_PREFIX as ORGANIZATION_GATEWAY_MODEL_ID_PREFIX2,
@@ -5088,6 +5088,7 @@ function prepareExternalLinkTaskAdmission(authorization, actor) {
 // src/billing/limits.ts
 import {
   configuredStaticUsageLimits,
+  canonicalizeConfiguredModelId,
   resolveModelProviderForTurn
 } from "@opengeni/config";
 import {
@@ -5096,7 +5097,7 @@ import {
   countActiveOrganizationApiKeysForAccount,
   countScheduledTasksForWorkspace,
   countWorkspacesForAccount,
-  getBillingBalance,
+  getSpendableCreditBalance,
   isCodexBilledTurn,
   recordUsageEvent,
   sumUsageQuantity
@@ -5177,11 +5178,19 @@ async function checkCreditBalance(deps, input, externallyBilled) {
   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) : void 0
+  );
   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(deps, input, funding) {
   const limits = configuredStaticUsageLimits(deps.settings);
@@ -7213,7 +7222,7 @@ function resolveWorkspaceModelSelection(input) {
 
 // src/default-session-model.ts
 import {
-  canonicalizeConfiguredModelId,
+  canonicalizeConfiguredModelId as canonicalizeConfiguredModelId2,
   CLAUDE_CONNECTION_KINDS as CLAUDE_CONNECTION_KINDS2
 } from "@opengeni/config";
 import {
@@ -7235,7 +7244,8 @@ import {
   workspaceCodexSubscriptionActive,
   workspaceOpenRouterConnectionActive,
   workspaceVercelAiGatewayConnectionActive,
-  organizationHoldsCredits,
+  getBillingBalance,
+  spendableCreditMicros,
   workspaceXaiSubscriptionActive,
   workspaceXaiSubscriptionActiveForAuthority,
   XaiAuthorityPoolInactiveError,
@@ -7371,9 +7381,12 @@ function findSelection(selections, modelId) {
   return selections.find((selection) => selection.model.id === modelId) ?? selections.find((selection) => selection.model.aliases.includes(modelId));
 }
 function creditsCandidate(input) {
+  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") {
     if (configured?.model.id !== deployment.model.id) return null;
     return {
@@ -7397,7 +7410,7 @@ function creditsCandidate(input) {
       source: "credits"
     };
   }
-  const first = input.selections.find(
+  const first = selections.find(
     (selection) => selection.availability.selectable && selection.model.cost === "credits"
   );
   return first ? {
@@ -7446,7 +7459,7 @@ function selectDefaultSessionModel(input) {
     reasoningEffort: defaultReasoningEffortForConfiguredModel(fallback.model, fallbackEffort),
     source: "deployment"
   } : {
-    model: canonicalizeConfiguredModelId(input.settings, input.settings.openaiModel),
+    model: canonicalizeConfiguredModelId2(input.settings, input.settings.openaiModel),
     reasoningEffort: fallbackEffort,
     source: "deployment"
   };
@@ -7457,7 +7470,8 @@ function creditsDefaultSessionModel(input) {
     settings: input.settings,
     selections: input.selections,
     workspaceDefaults: resolveWorkspaceSessionDefaults(input.workspaceSettings),
-    creditsAvailable: true
+    creditsAvailable: true,
+    ...input.creditBalance ? { creditBalance: input.creditBalance } : {}
   });
 }
 async function resolveDefaultSessionModelForSelections(db, input) {
@@ -7467,10 +7481,13 @@ async function resolveDefaultSessionModelForSelections(db, input) {
     workspaceDefaults: resolveWorkspaceSessionDefaults(input.workspaceSettings)
   };
   const withoutCredits = selectDefaultSessionModel({ ...decision, creditsAvailable: false });
-  if (withoutCredits.source !== "deployment" || input.settings.billingMode !== "stripe" || creditsCandidate(decision) === null) {
+  if (withoutCredits.source !== "deployment" || input.settings.billingMode !== "stripe" || !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 });
 }
 async function connectionRestrictionsAndXaiReadiness(db, settings, context) {
   const { workspaceId, subjectId, xaiAuthoritySnapshot } = context;
@@ -9636,7 +9653,7 @@ function canonicalConfiguredModel(settings, model) {
   if (model === null || model === void 0) {
     return model;
   }
-  const canonicalModel = canonicalizeConfiguredModelId2(settings, model);
+  const canonicalModel = canonicalizeConfiguredModelId3(settings, model);
   if (canonicalModel.startsWith(CODEX_MODEL_ID_PREFIX) && settings.resolvedCodexModelsJson !== void 0) {
     if (settings.codexSubscriptionEnabled && configuredAllowedModels(withCodexCatalogProvider3(settings)).includes(canonicalModel)) {
       return canonicalModel;
@@ -12397,7 +12414,7 @@ import {
   applyCreditDebitAfterUse,
   checkWorkspaceAllowance as checkWorkspaceAllowance2,
   creditDebitAttributionForTurn,
-  getBillingBalance as getBillingBalance2,
+  getSpendableCreditBalance as getSpendableCreditBalance2,
   listKnowledgeEntries,
   recordUsageEvent as recordUsageEvent2,
   sumUsageQuantity as sumUsageQuantity2,
@@ -12527,7 +12544,7 @@ async function searchKnowledgeEntries(db, context, input, embedder, settings) {
     context.accountId,
     context.workspaceId,
     async (lockedDb) => {
-      const balance = await getBillingBalance2(lockedDb, context.accountId);
+      const balance = await getSpendableCreditBalance2(lockedDb, context.accountId);
       if (balance.balanceMicros <= 0)
         return keywordFallback(lockedDb, new KnowledgeVectorFundingError(), "awaiting_funding");
       const attribution = billingActor.kind === "agent" ? await creditDebitAttributionForTurn(lockedDb, {
@@ -12773,10 +12790,13 @@ import { isCodexBilledModel as isCodexBilledModel2 } from "@opengeni/codex";
 import { getWorkspaceModelPolicy as getWorkspaceModelPolicy3 } from "@opengeni/db";
 
 // src/billing/agent-run-admission.ts
-import { configuredStaticUsageLimits as configuredStaticUsageLimits2 } from "@opengeni/config";
+import {
+  canonicalizeConfiguredModelId as canonicalizeConfiguredModelId4,
+  configuredStaticUsageLimits as configuredStaticUsageLimits2
+} from "@opengeni/config";
 import {
   checkWorkspaceAllowance as checkWorkspaceAllowance3,
-  getBillingBalance as getBillingBalance3,
+  getSpendableCreditBalance as getSpendableCreditBalance3,
   isCodexBilledTurn as isCodexBilledTurn2,
   sumUsageQuantity as sumUsageQuantity3
 } from "@opengeni/db";
@@ -12802,7 +12822,11 @@ async function agentRunAdmissionDenial(services, input) {
       });
       if (!decision.allowed) return "insufficient_credits";
     } else {
-      const balance = await getBillingBalance3(services.db, input.accountId);
+      const balance = await getSpendableCreditBalance3(
+        services.db,
+        input.accountId,
+        canonicalizeConfiguredModelId4(services.settings, input.model)
+      );
       if (balance.balanceMicros <= 0) return "insufficient_credits";
     }
   }
@@ -20391,7 +20415,7 @@ import {
   withWorkspaceSubjectRls as withWorkspaceSubjectRls6
 } from "@opengeni/db";
 import { HTTPException as HTTPException29 } from "hono/http-exception";
-import { canonicalizeConfiguredModelId as canonicalizeConfiguredModelId3 } from "@opengeni/config";
+import { canonicalizeConfiguredModelId as canonicalizeConfiguredModelId5 } from "@opengeni/config";
 function hasOwn(value, key) {
   return typeof value === "object" && value !== null && Object.hasOwn(value, key);
 }
@@ -20416,7 +20440,7 @@ function mapNewSessionDraft(row) {
 }
 function draftModelProvided(settings, draft) {
   if (draft.modelProvided !== void 0) return draft.modelProvided;
-  return !(canonicalizeConfiguredModelId3(settings, draft.model) === canonicalizeConfiguredModelId3(settings, settings.openaiModel) && draft.reasoningEffort === settings.openaiReasoningEffort && draft.latencyMode === "standard");
+  return !(canonicalizeConfiguredModelId5(settings, draft.model) === canonicalizeConfiguredModelId5(settings, settings.openaiModel) && draft.reasoningEffort === settings.openaiReasoningEffort && draft.latencyMode === "standard");
 }
 async function actorDefaultModel(deps, grant, workspaceId) {
   return await resolveDefaultSessionModel(deps.db, deps.settings, {