@opengeni/worker-bundle 1.0.0-canary.1 → 1.0.0

package/dist/workflows/activities.d.ts

@@ -1,5 +1,5 @@
 import type * as activities from "../activities.js";
-type WorkflowControlActivities = Pick<typeof activities, "enqueueGoalRetryWake" | "expireSessionHumanInput" | "expireSessionInteractionIntervention" | "failSessionAttempt" | "getCodexCapacityWait" | "markSessionIdle" | "peekSessionWork" | "persistSessionAttemptQuiescence" | "reconcileSessionAttemptQuiescence" | "reconcileCodexCapacityWait" | "recoverDispatch" | "recoverEscapedMcpTimeout" | "settleSessionInterruptions" | "settleSessionInputWait">;
+type WorkflowControlActivities = Pick<typeof activities, "enqueueGoalRetryWake" | "expireSessionHumanInput" | "expireSessionInteractionIntervention" | "expireScheduledRunHumanWait" | "failSessionAttempt" | "getCodexCapacityWait" | "markSessionIdle" | "peekSessionWork" | "persistSessionAttemptQuiescence" | "reconcileSessionAttemptQuiescence" | "reconcileSettledSessionAttempt" | "reconcileCodexCapacityWait" | "recoverDispatch" | "recoverEscapedMcpTimeout" | "settleSessionInterruptions" | "settleSessionInputWait">;
 /**
  * Session/schedule workflow control activities are bounded, idempotent database
  * and provider-metadata operations. They must not inherit the agent turn's

package/dist/workflows/browser-deadline-checkpoint.d.ts

@@ -0,0 +1,9 @@
+import type { BrowserDeadlineCheckpointTarget } from "@opengeni/db";
+export declare function browserDeadlineCheckpointWorkflow(target: BrowserDeadlineCheckpointTarget): Promise<{
+    status: "skipped";
+} | {
+    status: "suspended";
+}>;
+/** Runs from the existing lease-sweep dispatch. Inventory never performs provider
+ * I/O; each exact browser has an independent durable capture/cleanup child. */
+export declare function browserDeadlineCheckpointSweepWorkflow(): Promise<void>;

package/dist/workflows/scheduled-tasks.d.ts

@@ -1,4 +1,5 @@
 import type { TurnInitiator } from "@opengeni/contracts";
+import type { DispatchScheduledTaskRunInput } from "../activities/types.js";
 type ScheduledTaskFireWorkflowBase = {
     accountId: string;
     workspaceId: string;
@@ -8,10 +9,13 @@ export type ScheduledTaskFireWorkflowInput = ScheduledTaskFireWorkflowBase & ({
     triggerType: "scheduled";
     agentRunUsageIdempotencyKey?: never;
     initiator?: never;
+    credentialRestriction?: never;
 } | {
     triggerType: "manual" | "initial" | "provider_event" | "retry" | "repair";
     agentRunUsageIdempotencyKey: string;
     initiator: TurnInitiator;
+    credentialRestriction?: "developer_setup";
 });
+export declare function scheduledTaskDispatchInput(input: ScheduledTaskFireWorkflowInput, producerKey: string): DispatchScheduledTaskRunInput;
 export declare function scheduledTaskFireWorkflow(input: ScheduledTaskFireWorkflowInput): Promise<void>;
 export {};

package/dist/workflows/session.d.ts

@@ -1,5 +1,40 @@
 import type * as activities from "../activities.js";
 import { type EscapedMcpTimeoutRecoveryDetail, type PostClaimDatabaseRecoveryDetail, type PreClaimFailureDetail, type PreClaimFailureDisposition } from "../activities/types.js";
+/**
+ * Provider capacity waits are shared: every waiter of one exhausted pool learns
+ * the same authoritative reset time, and one capacity mutation (for example the
+ * bounded refresh that verifies a quota reset) wakes every waiter at once, both
+ * as the typed capacity signal and as the generic durable workflow wake. Without
+ * spread, a reset resumes the whole backlog in the same few seconds and its
+ * turns stampede sandbox creation and the provider. Each workflow therefore
+ * delays its reconciliation by a bounded, replay-deterministic (Temporal-seeded
+ * `Math.random`) jitter: up to one minute past a scheduled reset timer and up to
+ * 30 seconds after a capacity or queue wake or an already-due waiter. A wake
+ * that lands inside a waiter's timer spread does not shorten it. The Postgres
+ * waiter stays authoritative; jitter only delays the same reconciliation
+ * activity and never creates queue rows, input, or inference. Interruptions are
+ * never delayed.
+ *
+ * The patch marker is not understood by workers built before it: rolling the
+ * worker image back past this change while a session has recorded the marker
+ * (it waited on capacity in its current run) fails that workflow's tasks as
+ * nondeterministic until a patched worker returns.
+ */
+export declare const CAPACITY_WAKE_JITTER_PATCH = "session-capacity-wake-jitter-v1";
+/**
+ * A scheduled run's approval timeout sleeps on a durable Temporal timer. A
+ * history recorded by a worker that ignored the deadline has no timer command
+ * there, so replay only arms it behind this marker.
+ */
+export declare const SCHEDULED_HUMAN_WAIT_TIMEOUT_PATCH = "session-scheduled-human-wait-timeout-v1";
+export declare const CAPACITY_TIMER_WAKE_JITTER_MAX_MS = 60000;
+export declare const CAPACITY_WAKE_JITTER_MAX_MS = 30000;
+/**
+ * Pure + exported so the bound is unit-testable without a workflow environment.
+ * `overrideMaxMs` is the test-only SessionWorkflowInput ceiling; it can only
+ * narrow the production bound.
+ */
+export declare function capacityWakeJitterMs(kind: "timer" | "wake", sample: number, overrideMaxMs?: number): number;
 /**
  * How long the continuation loop must hold before re-admitting the next turn. 0 ⇒ no
  * hold (re-dispatch immediately — a rotation candidate is ready, or no idle delay was
@@ -76,5 +111,6 @@ export type SessionWorkflowInput = {
     initialEventId?: string;
     maxTurnsPerRun?: number;
     maxCapacityChecksPerRun?: number;
+    capacityWakeJitterMaxMs?: number;
 };
 export declare function sessionWorkflow(input: SessionWorkflowInput): Promise<void>;

package/dist/workflows.d.ts

@@ -6,6 +6,7 @@ export { automationRunWorkflow, type AutomationRunWorkflowInput } from "./workfl
 export { knowledgeSourceSyncWake, knowledgeSourceSyncWorkflow, knowledgeSourceSyncWorkflowId, type KnowledgeSourceSyncWorkflowInput, } from "./workflows/knowledge-source-sync.js";
 export { sandboxDrainWorkflow, sandboxReaperMaintenanceWorkflow, sandboxReaperWorkflow, sandboxReaperWorkflowV2, } from "./workflows/sandbox-reaper.js";
 export { fileUploadReaperWorkflow } from "./workflows/file-upload-reaper.js";
+export { browserDeadlineCheckpointWorkflow, browserDeadlineCheckpointSweepWorkflow, } from "./workflows/browser-deadline-checkpoint.js";
 export { siteAuthMaintenanceWorkflow } from "./workflows/site-auth-maintenance.js";
 export { videoGenerationWorkflow, videoGenerationWorkflowId, type VideoGenerationWorkflowInput, } from "./workflows/video-generation.js";
 export { sessionWorkflowWakeDispatcherWorkflow } from "./workflows/workflow-wake.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeni/worker-bundle",
-  "version": "1.0.0-canary.1",
+  "version": "1.0.0",
   "description": "OpenGeni worker entry and reusable embedded lifecycle, shipped with a release-coherent pre-bundled Temporal workflow artifact.",
   "license": "Apache-2.0",
   "repository": {
@@ -54,24 +54,26 @@
   },
   "dependencies": {
     "@llamaindex/liteparse": "2.14.2",
-    "@opengeni/agent-proto": "^0.6.0-canary.4",
-    "@opengeni/capabilities": "^0.3.3-canary.16",
-    "@opengeni/codemode": "^0.5.8-canary.1",
-    "@opengeni/codex": "^0.2.23-canary.1",
-    "@opengeni/config": "^1.2.1-canary.1",
-    "@opengeni/contracts": "^4.0.0-canary.1",
-    "@opengeni/core": "^3.0.0-canary.1",
-    "@opengeni/db": "^5.0.0-canary.1",
-    "@opengeni/documents": "^0.8.29-canary.1",
-    "@opengeni/events": "^0.4.27-canary.1",
-    "@opengeni/github": "^0.7.12-canary.1",
-    "@opengeni/network": "^0.3.1-canary.16",
-    "@opengeni/observability": "^0.8.28-canary.1",
-    "@opengeni/runtime": "^3.0.0-canary.1",
-    "@opengeni/sdk": "^6.0.0-canary.1",
-    "@opengeni/storage": "^0.2.129-canary.1",
-    "@opengeni/tool-gateway": "^0.1.9-canary.1",
-    "@opengeni/xai-subscription": "^0.1.4-canary.16",
+    "@opengeni/agent-proto": "1.0.0",
+    "@opengeni/capabilities": "1.0.0",
+    "@opengeni/codemode": "1.0.0",
+    "@opengeni/codex": "1.0.0",
+    "@opengeni/config": "1.0.0",
+    "@opengeni/contracts": "1.0.0",
+    "@opengeni/core": "1.0.0",
+    "@opengeni/db": "1.0.0",
+    "@opengeni/documents": "1.0.0",
+    "@opengeni/events": "1.0.0",
+    "@opengeni/github": "1.0.0",
+    "@opengeni/interaction": "1.0.0",
+    "@opengeni/jev": "1.0.0",
+    "@opengeni/network": "1.0.0",
+    "@opengeni/observability": "1.0.0",
+    "@opengeni/runtime": "1.0.0",
+    "@opengeni/sdk": "1.0.0",
+    "@opengeni/storage": "1.0.0",
+    "@opengeni/tool-gateway": "1.0.0",
+    "@opengeni/xai-subscription": "1.0.0",
     "@temporalio/activity": "^1.17.0",
     "@temporalio/client": "^1.17.0",
     "@temporalio/worker": "^1.17.0",

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

@@ -1,10 +1,16 @@
 import { configuredStaticUsageLimits, type Settings } from "@opengeni/config";
 import { modelFundingForAdmission } from "@opengeni/core";
-import { getBillingBalance, isCodexBilledTurn, sumUsageQuantity } from "@opengeni/db";
+import {
+  checkWorkspaceAllowance,
+  getBillingBalance,
+  isCodexBilledTurn,
+  sumUsageQuantity,
+} from "@opengeni/db";
 import type { ControlActivityServices } from "./types";
 
 export type AgentRunAdmissionDenial =
   | "insufficient_credits"
+  | "allowance_exhausted"
   | "monthly_model_cost_limit"
   | "monthly_agent_run_limit";
 
@@ -16,6 +22,8 @@ export async function agentRunAdmissionDenial(
     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({
@@ -46,6 +54,14 @@ export async function agentRunAdmissionDenial(
       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"

package/src/activities/agent-turn/admission.ts

@@ -1,4 +1,4 @@
-import { getBillingBalance, sumUsageQuantity } from "@opengeni/db";
+import { checkWorkspaceAllowance, getBillingBalance, sumUsageQuantity } from "@opengeni/db";
 import {
   configuredStaticUsageLimits,
   resolveTurnExecutionPolicyV1,
@@ -8,6 +8,7 @@ import { selectCodexCredentialId } from "@opengeni/codex";
 import { directPersonalConnectionSubjectId } from "@opengeni/core";
 import type { TurnActivityServices as ActivityServices } from "../types";
 import {
+  type AllowanceExhaustedRefusal,
   type SessionEvent,
   type SessionTurn,
   type ToolAuthNeededPayload,
@@ -243,12 +244,65 @@ export class BudgetExhaustedError extends Error {
   constructor(
     message: string,
     readonly serializedRunState: string | null,
+    readonly allowance: AllowanceRefusal | null = null,
   ) {
     super(message);
     this.name = "BudgetExhaustedError";
   }
 }
 
+export type AllowanceRefusal = AllowanceExhaustedRefusal;
+
+/** Account allowance exhaustion is recoverable state, never a provider failure. */
+export class AllowanceExhaustedError extends Error {
+  readonly code = "allowance_exhausted";
+
+  constructor(readonly refusal: AllowanceRefusal) {
+    super(refusal.message);
+    this.name = "AllowanceExhaustedError";
+  }
+}
+
+/** Revalidate between paid calls without replaying provider work or reserving credits. */
+export async function ensureRunAllowedBetweenModelCalls(input: {
+  settings: Settings;
+  db: ActivityServices["db"];
+  accountId: string;
+  workspaceId: string;
+  isExternallyBilledTurn: boolean;
+  entitlements?: ActivityServices["entitlements"];
+  chargesOpenGeniCredits: boolean;
+  countsTowardTokenCap: boolean;
+  initiatingHumanSubjectId: string | null;
+  serializedRunState?: () => string | null;
+}): Promise<void> {
+  try {
+    await ensureRunAllowed(
+      input.settings,
+      input.db,
+      input.accountId,
+      input.workspaceId,
+      input.isExternallyBilledTurn,
+      input.entitlements,
+      input.chargesOpenGeniCredits,
+      input.countsTowardTokenCap,
+      input.initiatingHumanSubjectId,
+    );
+  } catch (limitError) {
+    let serializedRunState: string | null = null;
+    try {
+      serializedRunState = input.serializedRunState?.() ?? null;
+    } catch {
+      // Durable history remains authoritative when the SDK state cannot serialize.
+    }
+    throw new BudgetExhaustedError(
+      limitError instanceof Error ? limitError.message : String(limitError),
+      serializedRunState,
+      limitError instanceof AllowanceExhaustedError ? limitError.refusal : null,
+    );
+  }
+}
+
 // Exported for unit testing the external-billing bypass (codex-billing.test.ts); not
 // part of the activity surface. Takes the accepted policy's billing attribution and
 // the optional §7.5 P3 host `entitlements` port (when bound, its `admitRun` REPLACES
@@ -262,6 +316,7 @@ export async function ensureRunAllowed(
   entitlements?: ActivityServices["entitlements"],
   chargesOpenGeniCredits = !isExternallyBilledTurn,
   countsTowardTokenCap = !isExternallyBilledTurn,
+  initiatingHumanSubjectId: string | null = null,
 ): Promise<void> {
   // Upstream settlement and workspace-facing cost are independent. External
   // metering skips the token cap; free/subscription/workspace cost skips the
@@ -291,7 +346,7 @@ export async function ensureRunAllowed(
       quantity: 1,
     });
     if (!decision.allowed) {
-      throw new Error(decision.reason || "insufficient OpenGeni credits");
+      throw new Error(decision.reason || "insufficient Opengeni credits");
     }
   } else if (
     chargesOpenGeniCredits &&
@@ -299,9 +354,17 @@ export async function ensureRunAllowed(
   ) {
     const balance = await getBillingBalance(db, accountId);
     if (balance.balanceMicros <= 0) {
-      throw new Error("insufficient OpenGeni credits");
+      throw new Error("insufficient Opengeni credits");
     }
   }
+  if (chargesOpenGeniCredits) {
+    const refusal = await checkWorkspaceAllowance(db, {
+      accountId,
+      workspaceId,
+      subjectId: initiatingHumanSubjectId,
+    });
+    if (refusal) throw new AllowanceExhaustedError(refusal);
+  }
   if (settings.usageLimitsMode === "static" || settings.usageLimitsMode === "managed") {
     const limits = configuredStaticUsageLimits(settings);
     if (limits.maxMonthlyAgentRunsPerWorkspace) {

package/src/activities/agent-turn/agent-build.ts

@@ -8,9 +8,14 @@ import {
   loadWorkspaceVercelAiGatewayCredentialLease,
   getExternalLinkTurnAuthorization,
   getSessionTurnForAttempt,
+  ensureSessionReasoningConfiguration,
+  ensureSessionSkillCatalog,
+  sessionHasToolRouterHistory,
 } from "@opengeni/db";
+import { recoveryAwareSessionInstructions } from "./recovery-warning";
 import {
   formatSkillCatalog,
+  skillCatalogEntryIds,
   type AttemptConnectorActionBinding,
   type BuildAgentOptions,
   type ConnectorActionPolicyHooks,
@@ -24,7 +29,7 @@ import {
   resolveModelProvider,
   type Settings,
 } from "@opengeni/config";
-import { type CodexRequestContext } from "@opengeni/codex";
+import { type CodexRequestContext, supportsReasoningConfiguration } from "@opengeni/codex";
 import { executeXaiSubscriptionImageGeneration } from "../xai-image-generation";
 import { rigProviderImageContentHash, videoGenerationCapabilitiesForPolicy } from "@opengeni/core";
 import {
@@ -34,7 +39,7 @@ import {
   type VideoGenerationCredentialLease,
 } from "../video-generation-admission";
 import { VideoReferenceInputError } from "../video-reference-staging";
-import { rigProviderImageSourceImage } from "../packs";
+import { rigProviderImageSourceImage } from "../sandbox-images";
 import type { TurnActivityServices as ActivityServices, RunAgentTurnInput } from "../types";
 import { recordTurnStartupPhase } from "../../observability-metrics";
 import { summarizeCompanyBrainContributions } from "../../model-context-contributions";
@@ -48,12 +53,14 @@ import {
 } from "../image-generation-references";
 import { SandboxChannelAService } from "@opengeni/runtime/sandbox";
 import { sandboxRunAs } from "@opengeni/runtime";
-import { VideoGenerationRejectedResult } from "@opengeni/contracts";
+import { VideoGenerationRejectedResult, resolveAgentToolFamilies } from "@opengeni/contracts";
 
 import {
   structuredToolTransportForTurn,
   hostedWebSearchForTurn,
   connectedSubscriptionImageGenerationAuthority,
+  textVerbosityForTurn,
+  reasoningSummaryForTurn,
 } from "./tool-policy";
 import type { ClaimTurnOk } from "./claim";
 import type { GovernanceModelOk } from "./governance-model";
@@ -76,6 +83,7 @@ import { resolveVideoReferenceSandboxAccess } from "./video-reference-sandbox";
 
 export type BuildTurnAgentDeps = {
   skillCatalog: NonNullable<BuildAgentOptions["skillCatalog"]>;
+  mcpServers: Settings["mcpServers"];
   input: RunAgentTurnInput;
   db: ActivityServices["db"];
   runtime: ActivityServices["runtime"];
@@ -105,6 +113,7 @@ export type BuildTurnAgentDeps = {
   supportsImageInput: GovernanceModelOk["supportsImageInput"];
   agentHumanInputEnabled: GovernanceModelOk["agentHumanInputEnabled"];
   workspaceAgentInstructions: GovernanceModelOk["workspaceAgentInstructions"];
+  workspaceAgentIdentity: GovernanceModelOk["workspaceAgentIdentity"];
   workspaceGovernance: GovernanceModelOk["workspaceGovernance"];
   structuredWorkspacePolicyActive: GovernanceModelOk["structuredWorkspacePolicyActive"];
   workspaceMemory: GovernanceModelOk["workspaceMemory"];
@@ -127,6 +136,8 @@ export type BuildTurnAgentDeps = {
   connectorActionPolicy: ConnectorActionPolicyHooks;
   trigger: ClaimTurnOk["trigger"];
   preparationIndependentToolNames: readonly string[];
+  /** The attempt's tool catalog includes the Jev-backed code_search tool. */
+  codeSearchAvailable: boolean;
   videoGenerationAcceptancesByCallId: Map<string, { operationId: string; requestDigest: string }>;
   activeSandboxBackend: Settings["sandboxBackend"] | undefined;
   groupBoxBackend: Settings["sandboxBackend"];
@@ -136,6 +147,7 @@ export type BuildTurnAgentDeps = {
 
 export async function buildTurnAgent(deps: BuildTurnAgentDeps) {
   const {
+    mcpServers,
     input,
     db,
     runtime,
@@ -164,6 +176,7 @@ export async function buildTurnAgent(deps: BuildTurnAgentDeps) {
     supportsImageInput,
     agentHumanInputEnabled,
     workspaceAgentInstructions,
+    workspaceAgentIdentity,
     workspaceGovernance,
     structuredWorkspacePolicyActive,
     workspaceMemory,
@@ -184,6 +197,7 @@ export async function buildTurnAgent(deps: BuildTurnAgentDeps) {
     connectorActionPolicy,
     trigger,
     preparationIndependentToolNames,
+    codeSearchAvailable,
     videoGenerationAcceptancesByCallId,
     activeSandboxBackend,
     groupBoxBackend,
@@ -191,6 +205,14 @@ export async function buildTurnAgent(deps: BuildTurnAgentDeps) {
     codexContext,
   } = deps;
   const preparedTools = eventing.preparedTools!;
+  // Durable recovery truth is read for every attempt, including reconstruction
+  // after compaction. It is never inferred from transcript tool successes.
+  // These scoped reads are independent. Keep the second live video-policy
+  // read here rather than reusing tool preparation's earlier policy snapshot.
+  const [sessionInstructions, videoGenerationPolicy] = await Promise.all([
+    recoveryAwareSessionInstructions(db, input.workspaceId, session),
+    getWorkspaceVideoGenerationPolicy(db, input.workspaceId),
+  ]);
 
   const missingSessionTitleHint = preparationIndependentToolNames.includes(
     SESSION_TITLE_MODEL_TOOL_NAME,
@@ -267,7 +289,7 @@ export async function buildTurnAgent(deps: BuildTurnAgentDeps) {
     // Never expose a paid image operation unless its permanent artifact can
     // be committed. Failing after provider execution would leave an
     // unrecoverable outcome-unknown operation with no user-visible image.
-    if (!objectStorage) return {};
+    if (!objectStorage || !resolveAgentToolFamilies(session.agent).media) return {};
     if (nativeImageProviderBinding) {
       media.nativeImageGenerationRetention = {
         ...nativeImageProviderBinding,
@@ -383,12 +405,11 @@ export async function buildTurnAgent(deps: BuildTurnAgentDeps) {
       },
     };
   })();
-  const videoGenerationPolicy = await getWorkspaceVideoGenerationPolicy(db, input.workspaceId);
   const videoGenerationEnabled =
     videoGenerationPolicy.defaultModelId !== null &&
     videoGenerationPolicy.enabledModelIds.length > 0;
   let videoGenerationCredential: VideoGenerationCredentialLease | null = null;
-  if (objectStorage && videoGenerationEnabled) {
+  if (objectStorage && videoGenerationEnabled && resolveAgentToolFamilies(session.agent).media) {
     if (videoGenerationPolicy.fundingSource === "opengeni_credits") {
       videoGenerationCredential = managedVideoGenerationCredentialLease(eventing.modelRunSettings);
     } else if (videoGenerationPolicy.fundingSource === "workspace_gateway") {
@@ -555,8 +576,19 @@ export async function buildTurnAgent(deps: BuildTurnAgentDeps) {
     turnExecutionPolicy.providerId,
     turnExecutionPolicy.latencyMode,
   );
+  const textVerbosity = textVerbosityForTurn(resolvedModel, turnExecutionPolicy.upstreamModelId);
+  const reasoningSummary = reasoningSummaryForTurn(resolvedModel);
   const approvedToolCallId = approvedConnectorActionCallId(trigger);
-  const modelVisibleSkillCatalogText = formatSkillCatalog(deps.skillCatalog);
+  const modelVisibleSkillCatalogText = await ensureSessionSkillCatalog(db, {
+    accountId: input.accountId,
+    workspaceId: input.workspaceId,
+    sessionId: input.sessionId,
+    turnId: turn.id,
+    expectedExecutionGeneration: turn.executionGeneration,
+    expectedAttemptId: input.attemptId,
+    catalog: formatSkillCatalog(deps.skillCatalog),
+  });
+  eventing.modelVisibleSkillIds = skillCatalogEntryIds(modelVisibleSkillCatalogText);
   try {
     eventing.companyBrainContextContributions = summarizeCompanyBrainContributions(
       buildCompanyBrainContributionReceiptFor(modelVisibleSkillCatalogText),
@@ -581,11 +613,38 @@ export async function buildTurnAgent(deps: BuildTurnAgentDeps) {
   );
   if (linkedToolAuthority && !linkedToolAuthority.authorized)
     throw new Error("Native identity link was revoked");
+  const useReasoningUpdates =
+    eventing.modelRunSettings.reasoningConfigurationUpdatesEnabled &&
+    resolvedModel?.provider.api === "responses" &&
+    (resolvedModel.provider.id === "codex" || resolvedModel.provider.id === "openai") &&
+    supportsReasoningConfiguration(turnExecutionPolicy.upstreamModelId, turn.reasoningEffort);
+  const requestReasoningEffort =
+    useReasoningUpdates &&
+    supportsReasoningConfiguration(turnExecutionPolicy.upstreamModelId, turn.reasoningEffort)
+      ? await ensureSessionReasoningConfiguration(db, {
+          accountId: input.accountId,
+          workspaceId: input.workspaceId,
+          sessionId: input.sessionId,
+          turnId: turn.id,
+          expectedExecutionGeneration: turn.executionGeneration,
+          expectedAttemptId: input.attemptId,
+          effort: turn.reasoningEffort,
+        })
+      : turn.reasoningEffort;
+  const toolRouterInHistory = session.agent
+    ? await sessionHasToolRouterHistory(db, {
+        accountId: input.accountId,
+        workspaceId: input.workspaceId,
+        sessionId: input.sessionId,
+      })
+    : false;
   const agent = (() => {
     const agentConstructionStartedAt = performance.now();
     let agentConstructionOutcome: "completed" | "failed" = "completed";
     try {
-      return runtime.buildAgent(eventing.modelRunSettings, runtimeResources, {
+      // Approval policy must use the same accepted account identities as tool
+      // preparation. Keep the separately resolved model/sandbox settings intact.
+      return runtime.buildAgent({ ...eventing.modelRunSettings, mcpServers }, runtimeResources, {
         ...(linkedToolAuthority
           ? {
               authorizeAttemptExecution: async () => {
@@ -605,9 +664,12 @@ export async function buildTurnAgent(deps: BuildTurnAgentDeps) {
             }
           : {}),
         ...(preparedTools.inputWaitYield ? { inputWaitYield: preparedTools.inputWaitYield } : {}),
-        reasoningEffort: turn.reasoningEffort,
+        ...(session.agent ? { agentConfig: session.agent, toolRouterInHistory } : {}),
+        reasoningEffort: requestReasoningEffort,
+        ...(reasoningSummary ? { reasoningSummary } : {}),
         latencyMode: turnExecutionPolicy.latencyMode,
         ...(serviceTier ? { serviceTier } : {}),
+        ...(textVerbosity ? { textVerbosity } : {}),
         ...(humanInputResume ? { humanInputResponse: humanInputResume } : {}),
         humanInputEnabled: agentHumanInputEnabled,
         missingSessionTitleHint,
@@ -636,6 +698,7 @@ export async function buildTurnAgent(deps: BuildTurnAgentDeps) {
           ? { gitTokenSeed: sandboxGitToken }
           : {}),
         ...(sandboxCodemodeToken ? { codemodeAvailable: true } : {}),
+        ...(codeSearchAvailable ? { codeSearchAvailable: true } : {}),
         // Managed boxes receive the bearer through their protected per-session
         // token file. Connected Machines use transient per-exec delivery above,
         // so they must not run the file-seeding lifecycle hook.
@@ -707,6 +770,17 @@ export async function buildTurnAgent(deps: BuildTurnAgentDeps) {
             }),
         onRetainableSessionImageOutput: media.retainSessionImageAtToolBoundary,
         skillCatalog: deps.skillCatalog,
+        skillCatalogInHistory: true,
+        // A session with an agent configuration composes the modular prompt
+        // (identity, base behavior, runtime mechanics, capability modules);
+        // its workspace identity survives instruction policies. Null keeps
+        // the legacy composition below byte-for-byte.
+        ...(session.agent
+          ? {
+              agentConfig: session.agent,
+              ...(workspaceAgentIdentity ? { workspaceAgentIdentity } : {}),
+            }
+          : {}),
         ...(!structuredWorkspacePolicyActive && workspaceAgentInstructions
           ? { instructionsTemplate: workspaceAgentInstructions }
           : {}),
@@ -715,7 +789,7 @@ export async function buildTurnAgent(deps: BuildTurnAgentDeps) {
         // Per-session persona tier (session > workspace > deployment default).
         // Composed system-level AFTER the workspace persona so it refines it for
         // this one session; absent ⇒ byte-identical to today's composition.
-        ...(session.instructions ? { sessionInstructions: session.instructions } : {}),
+        ...(sessionInstructions ? { sessionInstructions } : {}),
         ...workspaceEnvironmentOption,
         // RIG RUNTIME (M3): the doctrine block, the setup-script hook (only when
         // the frozen version carries a non-empty script), and the rig credential