@opengeni/worker-bundle 2.0.0 → 2.0.1-canary.35916963870001

package/dist/{activities-turn-2B3WMHBB.js → activities-turn-KBLXHBWS.js}

@@ -86,7 +86,7 @@ import {
   withFirstPartyTools,
   wrapLazyTurnBoxWithRouting,
   wrapTurnBoxWithRouting
-} from "./chunk-TVEE2UUC.js";
+} from "./chunk-K3BPAI4R.js";
 import {
   StreamTimingMetrics,
   makeMachineOpObserver,
@@ -1450,6 +1450,7 @@ import {
 import {
   RetainedScreenshotQuotaExceededError,
   getRetainedScreenshotArtifact,
+  getRetainedScreenshotArtifactForToolCall,
   isDatabasePersistenceFailure,
   isSessionEventPersistenceError,
   prepareRetainedScreenshotArtifact,
@@ -2005,6 +2006,20 @@ async function materializeRetainedScreenshotHistory(input) {
 }
 async function materializeRetainedScreenshotHistoryWithCache(input, cache) {
   const now = input.now ?? /* @__PURE__ */ new Date();
+  const receiptForMarker = async (marker, callId) => {
+    if (!isRetainedImageMarker(marker)) return null;
+    const receipt = retainedReceipt(marker.artifact);
+    if (receipt) return receipt;
+    if (!callId) throw new Error("Retained screenshot receipt has no tool call identity");
+    const artifact = await getRetainedScreenshotArtifactForToolCall(
+      input.db,
+      input.workspaceId,
+      input.sessionId,
+      callId
+    );
+    if (!artifact) throw new Error("Retained screenshot receipt cannot be recovered");
+    return reference(artifact);
+  };
   const dataUrlForReceipt = async (receipt) => {
     let dataUrl = cache.get(receipt.artifactId);
     if (!dataUrl) {
@@ -2045,15 +2060,17 @@ async function materializeRetainedScreenshotHistoryWithCache(input, cache) {
     }
     return dataUrl;
   };
-  const materializeEntry = async (entry) => {
-    const receipt = retainedReceiptFromImageContent(entry);
+  const materializeEntry = async (entry, callId) => {
+    const image = entry && typeof entry === "object" && !Array.isArray(entry) ? entry.image : null;
+    const receipt = await receiptForMarker(image, callId);
     if (!receipt) return entry;
     const dataUrl = await dataUrlForReceipt(receipt);
     return { ...entry, image: dataUrl };
   };
   const materialized = [];
   for (const item of input.history) {
-    const directReceipt = retainedReceiptFromDirectOutput(item.output);
+    const callId = historyCallId(item);
+    const directReceipt = await receiptForMarker(item.output, callId);
     if (directReceipt) {
       materialized.push({
         ...item,
@@ -2070,7 +2087,7 @@ async function materializeRetainedScreenshotHistoryWithCache(input, cache) {
     let changed = false;
     const output = [];
     for (const entry of outputEntries) {
-      const next = await materializeEntry(entry);
+      const next = await materializeEntry(entry, callId);
       changed ||= next !== entry;
       output.push(next);
     }
@@ -2166,6 +2183,11 @@ function retainedReceiptFromImageContent(entry) {
   if (marker.type !== RETAINED_IMAGE_MARKER) return null;
   return retainedReceipt(marker.artifact);
 }
+function isRetainedImageMarker(value) {
+  return Boolean(
+    value && typeof value === "object" && !Array.isArray(value) && value.type === RETAINED_IMAGE_MARKER
+  );
+}
 function retainedReceiptFromDirectOutput(output) {
   if (!output || typeof output !== "object" || Array.isArray(output)) return null;
   const marker = output;
@@ -5110,7 +5132,8 @@ import {
 } from "@opengeni/db";
 import { publishDurableSessionEvents as publishDurableSessionEvents2 } from "@opengeni/events";
 import { maxTurnsExceededRunState } from "@opengeni/runtime";
-import { CancelledFailure } from "@temporalio/activity";
+import { ApplicationFailure, CancelledFailure } from "@temporalio/activity";
+import { TurnExecutionPolicyDefinitionMismatchError } from "@opengeni/config";
 import {
   classifyCodexEncryptedArtifactRejection,
   classifyCodexUsageLimitError,
@@ -6853,10 +6876,11 @@ async function settleTurnFailure(deps) {
       return claimedResult({ status: "recovering" });
     }
   }
-  let failure = agentRunFailurePayload(error51, {
+  const earlyDefinitionMismatch = error51 instanceof TurnExecutionPolicyDefinitionMismatchError && !attempt.modelRequestStarted && !eventing.turnStartedPublished && !!attempt.turnId && !!attempt.triggerEventId && attempt.executionGeneration > 0;
+  let failure = earlyDefinitionMismatch ? { error: error51.message, code: error51.code, retryable: true } : agentRunFailurePayload(error51, {
     isCodexTurn: billingState.isCodexTurn
   });
-  if (failure.retryable && eventing.publish && attempt.turnId && eventing.turnStartedPublished) {
+  if (attempt.turnId && (earlyDefinitionMismatch || failure.retryable && eventing.publish && eventing.turnStartedPublished)) {
     const nextProviderRecoveryCount = attempt.providerRecoveryCount + 1;
     const recoveryResult = providerRecoveryResult({
       failureCode: failure.code,
@@ -6865,8 +6889,10 @@ async function settleTurnFailure(deps) {
     });
     try {
       if (recoveryResult.status === "recovering") {
-        await flushRuntimeBatcher();
-        await historySink.reconcileConversationTruth({ requireDurable: true });
+        if (!earlyDefinitionMismatch) {
+          await flushRuntimeBatcher();
+          await historySink.reconcileConversationTruth({ requireDurable: true });
+        }
         const recovery = await requestSessionTurnRecovery(db, input.workspaceId, {
           sessionId: input.sessionId,
           turnId: attempt.turnId,
@@ -6894,6 +6920,16 @@ async function settleTurnFailure(deps) {
         return claimedResult(recoveryResult);
       }
       failure = providerRecoveryExhaustedFailure(failure, recoveryResult);
+      if (earlyDefinitionMismatch) {
+        control.activityStatus = "failed";
+        control.turnMetricOutcome = "failed";
+        control.activityError = error51;
+        throw ApplicationFailure.create({
+          message: `${error51.message}. Automatic same-turn configuration recovery exhausted after ${recoveryResult.providerRecoveryCount} retries.`,
+          type: "TurnExecutionPolicyDefinitionMismatchError",
+          nonRetryable: true
+        });
+      }
     } catch (recoveryError) {
       const escaped = recoveryResult.status === "recovering" ? escapedMcpTimeoutRecoveryFailure({
         failureCode: failure.code,
@@ -6994,6 +7030,7 @@ import { publishDurableSessionEvents as publishDurableSessionEvents3 } from "@op
 import {
   normalizeModelCallUsage as normalizeModelCallUsage2,
   normalizeSdkEvent,
+  withMcpToolDisplayMetadata,
   extractOpenSuffixFromRunState,
   assertOpenSuffixResumable,
   interruptionKindForCallItem,
@@ -8824,6 +8861,11 @@ async function runTurnStreamAttempt(deps) {
           } : {}
         );
         for (const event of normalized) {
+          if (event.type === "agent.toolCall.created")
+            event.payload = withMcpToolDisplayMetadata(
+              eventing.preparedTools?.mcpServers ?? [],
+              event.payload
+            );
           streamTiming.onEvent(event.type);
           await eventing.batcher.push(event);
         }
@@ -9113,7 +9155,14 @@ async function runTurnStreamAttempt(deps) {
           ...approvals.length > 0 ? [
             {
               type: "session.requiresAction",
-              payload: { approvals }
+              payload: {
+                approvals: approvals.map(
+                  (approval) => withMcpToolDisplayMetadata(
+                    eventing.preparedTools?.mcpServers ?? [],
+                    approval
+                  )
+                )
+              }
             }
           ] : [],
           {
@@ -9407,6 +9456,7 @@ import { appendAndPublishTurnEventsFenced as appendAndPublishTurnEventsFenced2,
 import { linkCurrentSpanToAdmission, turnExecutionTelemetryKey } from "@opengeni/observability";
 import {
   assertTurnExecutionPolicyMatchesConfigV1,
+  settingsForAcceptedSubscriptionTurn,
   resolveTurnExecutionPolicyV1 as resolveTurnExecutionPolicyV12
 } from "@opengeni/config";
 
@@ -9730,7 +9780,7 @@ async function claimTurnAttempt(deps) {
     gatewaySettings,
     claimedPolicy.kind === "valid" ? claimedPolicy.policy.productModelId : turn.model
   );
-  const capabilitySettings = await settingsWithOrganizationProviderCredentials(
+  let capabilitySettings = await settingsWithOrganizationProviderCredentials(
     db,
     input.accountId,
     input.workspaceId,
@@ -9738,7 +9788,6 @@ async function claimTurnAttempt(deps) {
     claimedPolicy.kind === "valid" ? claimedPolicy.policy.productModelId : turn.model
   );
   const codexAppsCredentialId = capabilitySettings.codexConnectedAppsEnabled ? await resolveCodexAppsCredentialIdForRun(db, input.workspaceId) : null;
-  runtime.configure(capabilitySettings);
   const policyForAbsent = claimedPolicy.kind === "valid" ? claimedPolicy.policy : resolveTurnExecutionPolicyV12(capabilitySettings, legacyTurnExecutionPolicyInput(turn));
   const installedPolicy = await installOrReadTurnExecutionPolicyForAttempt(db, {
     accountId: input.accountId,
@@ -9752,6 +9801,16 @@ async function claimTurnAttempt(deps) {
   if (!installedPolicy.accepted) {
     throw new TurnAttemptFencedError(`turn execution policy was fenced: ${installedPolicy.reason}`);
   }
+  capabilitySettings = settingsForAcceptedSubscriptionTurn(
+    capabilitySettings,
+    installedPolicy.policy,
+    {
+      modelId: turn.model,
+      reasoningEffort: turn.reasoningEffort,
+      latencyMode: turn.latencyMode
+    }
+  );
+  runtime.configure(capabilitySettings);
   const verifiedExecutionPolicy = assertTurnExecutionPolicyMatchesConfigV1(
     capabilitySettings,
     installedPolicy.policy,
@@ -11981,7 +12040,7 @@ async function runPostAgentCompaction(deps) {
 import {
   advanceWorkspaceGeneration,
   verifyWorkspaceMutationSettlement,
-  heartbeatLeaseHolder,
+  heartbeatLeaseHolderStatus,
   readLease as readLease2,
   accrueWarmSeconds,
   SandboxWorkspaceMutationFencedError
@@ -12289,21 +12348,29 @@ function createSandboxTurnRuntime(deps) {
     const heartbeatEpoch = sandbox.leaseEpoch;
     const heartbeatHolderId = sandboxState.sandboxHolderId;
     const heartbeatGroupId = sandboxState.sandboxGroupId;
-    const warmRate = sandboxWarmRateMicrosPerSecond(
+    const warmRate = settings.sandboxWarmBillingMode === "usage_only" ? 0 : sandboxWarmRateMicrosPerSecond(
       settings,
       warmBackend ?? sandbox.established.backendId
     );
     sandboxState.leaseHeartbeatTimer = setInterval(() => {
-      void heartbeatLeaseHolder(db, {
+      void heartbeatLeaseHolderStatus(db, {
         accountId: input.accountId,
         workspaceId: input.workspaceId,
         sandboxGroupId: heartbeatGroupId,
         kind: "turn",
         holderId: heartbeatHolderId,
         leaseTtlMs: settings.sandboxLeaseTtlMs,
-        expectedEpoch: heartbeatEpoch
-      }).then(async (alive) => {
-        if (alive) return;
+        expectedEpoch: heartbeatEpoch,
+        billingMode: settings.sandboxWarmBillingMode
+      }).then(async (status) => {
+        if (status.fence === "funding") {
+          stopLeaseHeartbeat();
+          sandboxRotationController.abort(
+            new Error("Insufficient OpenGeni credits to extend paid sandbox compute")
+          );
+          return;
+        }
+        if (status.leaseExtended) return;
         const rotation = await beginRotationPreemption(sandbox, heartbeatEpoch, heartbeatGroupId);
         if (rotation === "not_rotating") {
           stopLeaseHeartbeat();
@@ -12315,8 +12382,13 @@ function createSandboxTurnRuntime(deps) {
         sandboxGroupId: heartbeatGroupId,
         expectedEpoch: heartbeatEpoch,
         warmRateMicrosPerSecond: warmRate,
+        billingMode: settings.sandboxWarmBillingMode,
         subjectId: input.sessionId
-      }).then((result) => recordCreditMicros(observability, "usage", result.costMicros)).catch(() => void 0);
+      }).then((result) => {
+        if (settings.sandboxWarmBillingMode === "credits") {
+          recordCreditMicros(observability, "usage", result.costMicros);
+        }
+      }).catch(() => void 0);
       const snapshotSession = sandboxState.setupBoxSession;
       const snapshotTurnId = attempt.turnId;
       if (snapshotSession && snapshotTurnId && shouldStartPeriodicWorkspaceSnapshot({
@@ -14684,7 +14756,8 @@ import {
 } from "@opengeni/db";
 import { publishDurableSessionEvents as publishDurableSessionEvents9 } from "@opengeni/events";
 import {
-  createFirstPartyInteractionAttemptToolDefinitions
+  createFirstPartyInteractionAttemptToolDefinitions,
+  mcpToolDisplayMetadata
 } from "@opengeni/runtime";
 
 // src/activities/google-drive-publication.ts
@@ -30932,13 +31005,14 @@ import {
   publishDurableSessionEvents as publishDurableSessionEvents8
 } from "@opengeni/events";
 var CodemodeAttemptDispatcher = class {
-  constructor(db, bus, environment, scope, turnSignal, maxConcurrentCalls = CODEMODE_MAX_CONCURRENT_CALLS_PER_ATTEMPT, timings = {}) {
+  constructor(db, bus, environment, scope, turnSignal, maxConcurrentCalls = CODEMODE_MAX_CONCURRENT_CALLS_PER_ATTEMPT, timings = {}, toolDisplayMetadata) {
     this.db = db;
     this.bus = bus;
     this.environment = environment;
     this.scope = scope;
     this.turnSignal = turnSignal;
     this.maxConcurrentCalls = maxConcurrentCalls;
+    this.toolDisplayMetadata = toolDisplayMetadata;
     if (environment.catalog.accountId !== scope.accountId || environment.catalog.workspaceId !== scope.workspaceId || environment.catalog.sessionId !== scope.sessionId || environment.catalog.turnId !== scope.turnId || environment.catalog.attemptId !== scope.attemptId || environment.catalog.executionGeneration !== scope.executionGeneration) {
       throw new Error("Codemode dispatcher scope does not match its tool environment");
     }
@@ -31196,6 +31270,10 @@ var CodemodeAttemptDispatcher = class {
             payload: {
               id: operation.operationId,
               name: entry.modelName,
+              display: this.toolDisplayMetadata?.(entry.modelName) ?? {
+                toolName: entry.identity.toolName,
+                ...entry.title ? { title: entry.title } : {}
+              },
               arguments: operation.arguments,
               origin: "codemode",
               subjectId: operation.caller.subjectId,
@@ -32957,7 +33035,10 @@ async function prepareTurnToolRuntime(deps) {
         attemptId: input.attemptId,
         executionGeneration: attempt.executionGeneration
       },
-      cancellationSignal
+      cancellationSignal,
+      void 0,
+      {},
+      (name) => mcpToolDisplayMetadata(tools.mcpServers, name)
     );
     eventing.codemodeDispatcher.start();
   };
@@ -32973,6 +33054,7 @@ async function prepareTurnToolRuntime(deps) {
   return {
     attemptConnectorActionBindings,
     connectorActionPolicy,
+    mcpServers: runSettings.mcpServers,
     generateSessionTitleInParallel: titleToolPlan.generateTitleInParallel,
     postToolPreparationStartedAt,
     preparationIndependentToolNames: [
@@ -34348,6 +34430,7 @@ async function resolveVideoReferenceSandboxAccess(request, sandboxState, sdkOwne
 // src/activities/agent-turn/agent-build.ts
 async function buildTurnAgent(deps) {
   const {
+    mcpServers,
     input,
     db,
     runtime,
@@ -34765,7 +34848,7 @@ async function buildTurnAgent(deps) {
     const agentConstructionStartedAt = performance.now();
     let agentConstructionOutcome = "completed";
     try {
-      return runtime.buildAgent(eventing.modelRunSettings, runtimeResources, {
+      return runtime.buildAgent({ ...eventing.modelRunSettings, mcpServers }, runtimeResources, {
         ...linkedToolAuthority ? {
           authorizeAttemptExecution: async () => {
             const current = await getSessionTurnForAttempt2(
@@ -35942,6 +36025,7 @@ These are publication receipts for the human's earlier answer. Do not call the r
           } = toolRuntime;
           const builtAgent = await buildTurnAgent({
             skillCatalog: toolRuntime.skillCatalog,
+            mcpServers: toolRuntime.mcpServers,
             input,
             db,
             runtime,
@@ -37498,4 +37582,4 @@ export {
   createTurnActivities,
   createTurnActivitiesFromServices
 };
-//# sourceMappingURL=activities-turn-2B3WMHBB.js.map
+//# sourceMappingURL=activities-turn-KBLXHBWS.js.map