@opengeni/worker-bundle 2.2.0-canary.36844267522001 → 2.2.0

package/dist/{chunk-WADNTBZZ.js → chunk-RZAAGRFQ.js}

@@ -1242,7 +1242,7 @@ function createDocumentActivities(services, resolveDocumentServices) {
 // src/activities/goals.ts
 import {
   allowedFirstPartyMcpToolsForSession,
-  configuredStaticUsageLimits as configuredStaticUsageLimits2,
+  configuredStaticUsageLimits,
   policyProviderIdForModel,
   resolveModelProvider,
   resolveTurnExecutionPolicyV1,
@@ -1258,92 +1258,19 @@ import {
 import { isCodexBilledModel } from "@opengeni/codex";
 import {
   enqueueSessionWorkflowWakeIfRunnable,
+  getBillingBalance,
   getWorkspaceModelPolicy,
   getSessionGoal,
+  isCodexBilledTurn,
   materializeGoalContinuation,
-  requireSession
+  requireSession,
+  sumUsageQuantity
 } from "@opengeni/db";
 import {
-  modelFundingForAdmission as modelFundingForAdmission2,
+  modelFundingForAdmission,
   resolveCatalogSettings as resolveCatalogSettings2,
   resolveWorkspaceCatalogSettings
 } from "@opengeni/core";
-
-// src/activities/agent-run-admission.ts
-import { configuredStaticUsageLimits } from "@opengeni/config";
-import { modelFundingForAdmission } from "@opengeni/core";
-import {
-  checkWorkspaceAllowance,
-  getBillingBalance,
-  isCodexBilledTurn,
-  sumUsageQuantity
-} from "@opengeni/db";
-async function agentRunAdmissionDenial(services, input) {
-  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 getBillingBalance(services.db, input.accountId);
-      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() {
-  const now = /* @__PURE__ */ new Date();
-  return new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), 1));
-}
-
-// src/activities/goals.ts
 function createGoalActivities(services) {
   async function enqueueGoalRetryWake(input) {
     const { db } = await services();
@@ -1390,6 +1317,24 @@ function createGoalActivities(services) {
     if (!modelPolicyBlocked && session.codexCompactionMode === "remote_v2" && !isCodexBilledModel(continuationModel)) {
       modelPolicyBlocked = `session is locked to Codex remote compaction v2; model "${continuationModel}" is not a Codex subscription model`;
     }
+    const isCodexRun = await isCodexBilledTurn({
+      db,
+      settings,
+      workspaceId: input.workspaceId,
+      model: continuationModel
+    });
+    const fundedWithoutCredits = goalContinuationFundedWithoutCredits(
+      settings,
+      continuationModel,
+      isCodexRun
+    );
+    const budgetBlocked = await goalRunBudgetBlocked(
+      settings,
+      db,
+      input.accountId,
+      input.workspaceId,
+      fundedWithoutCredits
+    );
     const turnExecutionPolicy = resolveTurnExecutionPolicyV1(settings, {
       modelId: continuationModel,
       requestedModelId: null,
@@ -1414,21 +1359,7 @@ function createGoalActivities(services) {
       // A model-policy block takes precedence: it is deterministic (a budget
       // pause can clear on its own; a policy pause needs a model/policy change)
       // and rides the same visible-pause channel.
-      admission: async (tx, causalTurn) => {
-        const budgetBlocked = modelPolicyBlocked ? null : await goalRunBudgetBlocked(
-          { ...service, settings, db: tx },
-          {
-            accountId: input.accountId,
-            workspaceId: input.workspaceId,
-            model: continuationModel,
-            initiatingHumanSubjectId: causalTurn?.initiatingHumanSubjectId ?? null
-          }
-        );
-        return {
-          budgetBlocked: modelPolicyBlocked ?? budgetBlocked?.message ?? null,
-          budgetPausedReason: modelPolicyBlocked ? "limits" : budgetBlocked?.pausedReason ?? "limits"
-        };
-      },
+      budgetBlocked: modelPolicyBlocked ?? budgetBlocked,
       policy: {
         model: continuationModel,
         reasoningEffort: continuationReasoningEffort,
@@ -1486,6 +1417,9 @@ function goalContinuationModelDecision(input) {
     blocked: `workspace model policy blocks model "${input.inheritedModel}"; pick an allowed model or change the workspace model policy`
   };
 }
+function goalContinuationFundedWithoutCredits(settings, model, codexBilled) {
+  return modelFundingForAdmission(settings, model, codexBilled).fundedWithoutCredits;
+}
 function goalContinuationPrompt(_goal, _autoContinuation, _cap, options = {}) {
   const waitingGuidance = options.inputWaitAvailable ? [
     "Waiting on child sessions, background commands, or external events:",
@@ -1560,19 +1494,41 @@ function withFirstPartyTools(settings, tools) {
   }
   return mergeToolRefs(tools, [{ kind: "mcp", id: "opengeni" }]);
 }
-async function goalRunBudgetBlocked(services, input) {
-  const denial = await agentRunAdmissionDenial(services, { ...input, requestedAgentRuns: 1 });
-  if (denial === null) return null;
-  if (denial === "allowance_exhausted") {
-    return { pausedReason: "allowance", message: "OpenGeni usage allowance exhausted" };
-  }
-  const limits = configuredStaticUsageLimits2(services.settings);
-  const messages = {
-    insufficient_credits: "insufficient OpenGeni credits",
-    monthly_model_cost_limit: `monthly model cost limit reached (${limits.maxMonthlyCostMicrosPerAccount} micros)`,
-    monthly_agent_run_limit: `monthly agent run limit reached (${limits.maxMonthlyAgentRunsPerWorkspace})`
-  };
-  return { pausedReason: "limits", message: messages[denial] };
+async function goalRunBudgetBlocked(settings, db, accountId, workspaceId, fundedWithoutCredits) {
+  if (!fundedWithoutCredits && (settings.billingMode === "stripe" || settings.usageLimitsMode === "managed")) {
+    const balance = await getBillingBalance(db, accountId);
+    if (balance.balanceMicros <= 0) {
+      return "insufficient OpenGeni credits";
+    }
+  }
+  if (settings.usageLimitsMode === "static" || settings.usageLimitsMode === "managed") {
+    const limits = configuredStaticUsageLimits(settings);
+    if (!fundedWithoutCredits && limits.maxMonthlyCostMicrosPerAccount) {
+      const used = await sumUsageQuantity(db, {
+        accountId,
+        eventType: "model.cost",
+        since: startOfUtcMonth()
+      });
+      if (used >= limits.maxMonthlyCostMicrosPerAccount) {
+        return `monthly model cost limit reached (${limits.maxMonthlyCostMicrosPerAccount} micros)`;
+      }
+    }
+    if (limits.maxMonthlyAgentRunsPerWorkspace) {
+      const used = await sumUsageQuantity(db, {
+        workspaceId,
+        eventType: "agent_run.created",
+        since: startOfUtcMonth()
+      });
+      if (used + 1 > limits.maxMonthlyAgentRunsPerWorkspace) {
+        return `monthly agent run limit reached (${limits.maxMonthlyAgentRunsPerWorkspace})`;
+      }
+    }
+  }
+  return null;
+}
+function startOfUtcMonth() {
+  const now = /* @__PURE__ */ new Date();
+  return new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), 1));
 }
 
 // src/activities/knowledge-source-sync.ts
@@ -10370,7 +10326,6 @@ export {
   signalPendingCodexCapacityWakeTargets,
   armAndReconcileCodexCapacityWait,
   createCodexCapacityActivities,
-  agentRunAdmissionDenial,
   createDocumentActivities,
   createGoalActivities,
   withFirstPartyTools,
@@ -10473,4 +10428,4 @@ export {
   codexUsageLimitFailurePayload,
   CODEX_USAGE_LIMIT_MAX_RESUME_MS
 };
-//# sourceMappingURL=chunk-WADNTBZZ.js.map
+//# sourceMappingURL=chunk-RZAAGRFQ.js.map