@opengeni/config 0.4.0 → 0.5.1

package/dist/index.js

@@ -10,7 +10,7 @@ import {
   StaticUsageLimits,
   UsageLimitsMode
 } from "@opengeni/contracts";
-import { CODEX_MODEL_ID_PREFIX } from "@opengeni/codex/constants";
+import { CODEX_MODEL_ID_PREFIX, CODEX_PROVIDER_ID } from "@opengeni/codex/constants";
 import { z } from "zod";
 var envName = /^[A-Za-z_][A-Za-z0-9_]*$/;
 var registryId = /^[A-Za-z0-9_-]+$/;
@@ -67,9 +67,9 @@ var DEFAULT_AGENT_INSTRUCTIONS = [
   "File resources are mounted under files/<file-id>/ unless the session specifies another mount path.",
   "Attached files are mounted read-only; copy them before modifying.",
   "Bundled skills are under .agents/ and can include infrastructure, marketing, or other role-specific guidance.",
-  "Use Checkov, Terraform, Azure CLI, GitHub CLI, and repository tools when relevant.",
+  "Use Checkov, Terraform, Azure CLI, git provider CLIs, and repository tools when relevant; gh, glab, and az repos are pre-authenticated when the host brokers matching git credentials.",
   "When the Azure sandbox preparation profile is enabled and service-principal variables are present, the sandbox is pre-authenticated with normal Azure CLI before work starts.",
-  "Treat code-changing work as GitOps work: create a focused branch/commit/PR when GitHub credentials are available; otherwise report exact commands and blockers.",
+  "Treat code-changing work as GitOps work: create a focused branch/commit/PR when git provider credentials are available; otherwise report exact commands and blockers.",
   "Return concise, factual summaries with files changed, commands run, and remaining blockers.",
   AGENT_INSTRUCTIONS_CORE_PLACEHOLDER
 ].join(" ");
@@ -151,57 +151,33 @@ var SettingsSchema = z.object({
   // above; the graceful max-turns valve (idle + goal continuation, never a
   // session failure) remains as inert safety should a deployment set a cap.
   agentMaxModelCallsPerTurn: z.coerce.number().int().positive().default(1e6),
-  // Where turn-input conversation history comes from (issue #35):
-  // "items" (default) = the session_history_items table (SDK-native,
-  // version-stable conversation truth); "run_state" = the legacy serialized
-  // RunState blob. Items and the sandbox envelope are dual-written
-  // unconditionally; this flag governs the read path only, so flipping back to
-  // "run_state" remains a safe rollback at any time.
-  sessionHistorySource: z.enum(["run_state", "items"]).default("items"),
-  // Provider-aware conversation context management (long-lived sessions
-  // otherwise grow unbounded until they overflow the model context window and
-  // hard-fail every turn). Resolution (see resolveContextCompactionMode):
-  //   "auto" (default) -> "server" when openaiProvider === "openai" (the
-  //     OpenAI platform Responses API honors server-side context_management),
-  //     else "client" (Azure rejects context_management with a 400, so we run
-  //     our own client-side compaction).
-  //   "server" / "client" -> force that path regardless of provider.
-  //   "off" -> neither path (legacy unbounded growth; escape hatch only).
-  contextCompactionMode: z.enum(["auto", "server", "client", "off"]).default("auto"),
-  // The model's real context window in tokens. gpt-5.5's true window is
-  // 1,050,000; it is absent from the SDK's hardcoded compaction window map (it
-  // knows only up to gpt-5.4), so the SDK's DynamicCompactionPolicy would fall
-  // back to a wrong 240k. We pass an explicit StaticCompactionPolicy threshold
-  // derived from these settings on the server path, and use the same numbers to
-  // budget the client path.
+  // The model family's real context window in tokens. OpenGeni always performs
+  // one durable, portable plaintext compaction transition; there is no
+  // provider/server/off mode ladder.
   contextWindowTokens: z.coerce.number().int().positive().default(105e4),
+  // Optional model-catalog effective input ceiling. Codex models expose this as
+  // raw context_window * effective_context_window_percent; when absent, retain
+  // the deployment-level window-minus-reserved-output behavior.
+  contextEffectiveWindowTokens: z.coerce.number().int().positive().optional(),
   // Proactive compaction threshold as a ratio of the model context window.
-  // Defaults to 60% and is clamped to [0.3, 0.9] so deployments can tune the
-  // trigger without accidentally disabling compaction or waiting until the
-  // provider is already at the cliff.
-  contextCompactionThresholdRatio: z.coerce.number().default(0.6).transform((value) => {
+  // Defaults to 90%: compact as late as possible — retained context beats early
+  // headroom now that per-model windows are declared honestly (input-effective,
+  // empirically measured), and the fail-closed reactive compact-on-reject path
+  // absorbs any overshoot as one retried call rather than a dead session.
+  // Clamped to [0.3, 0.9] so deployments can tune the trigger without
+  // accidentally disabling compaction.
+  contextCompactionThresholdRatio: z.coerce.number().default(0.9).transform((value) => {
     if (!Number.isFinite(value)) {
-      return 0.6;
+      return 0.9;
     }
     return Math.min(0.9, Math.max(0.3, value));
   }),
   // Tokens reserved for model output; subtracted from the window to get the
   // usable input budget B = contextWindowTokens - contextReservedOutputTokens.
   contextReservedOutputTokens: z.coerce.number().int().nonnegative().default(128e3),
-  // Server path only: explicit compact_threshold (tokens) handed to the SDK's
-  // StaticCompactionPolicy. Defaults to floor(contextWindowTokens *
-  // contextCompactionThresholdRatio) when unset.
-  contextServerCompactThresholdTokens: z.coerce.number().int().positive().optional(),
-  // Deprecated back-compat knobs. The threshold is now controlled by
-  // contextCompactionThresholdRatio; these remain parsed so older deployments do
-  // not fail boot when their env still contains them.
-  contextCompactSoftFraction: z.coerce.number().positive().max(1).default(0.7),
-  contextCompactHardFraction: z.coerce.number().positive().max(1).default(0.85),
-  // Deprecated for the client path; parsed for env/back-compat only.
-  contextKeepRecentTokens: z.coerce.number().int().positive().default(32e3),
-  // Parsed for back-compat. Client compaction uses the fixed 20k Codex summary
-  // buffer as its generated-summary output ceiling.
-  contextSummaryMaxTokens: z.coerce.number().int().positive().default(2e4),
+  // Model-catalog auto-compact limit. When present it is clamped to
+  // 90% of the raw window, matching Codex core's auto_compact_token_limit().
+  contextAutoCompactThresholdTokens: z.coerce.number().int().positive().optional(),
   authRequired: EnvBoolean.default(false),
   accessKey: z.string().optional(),
   authAllowHealth: EnvBoolean.default(true),
@@ -214,8 +190,8 @@ var SettingsSchema = z.object({
   openaiProvider: z.enum(["openai", "azure"]).default("openai"),
   openaiApiKey: z.string().optional(),
   openaiBaseUrl: z.string().optional(),
-  openaiModel: z.string().default("gpt-5.5"),
-  openaiAllowedModels: z.string().default("gpt-5.5,gpt-5.4,gpt-5.4-mini"),
+  openaiModel: z.string().default("gpt-5.6-sol"),
+  openaiAllowedModels: z.string().default("gpt-5.6-sol,gpt-5.6-terra,gpt-5.6-luna"),
   modelPricingJson: z.string().default("{}"),
   // Extra (non-built-in) model providers, declared by the host as a JSON
   // provider registry. Each entry carries its own base URL, API key, wire API
@@ -237,6 +213,11 @@ var SettingsSchema = z.object({
   // tool that BM25-discloses only the matching connectors. Default OFF — a codex
   // turn is byte-for-byte unchanged until enabled. OPENGENI_CODEX_TOOL_SEARCH_ENABLED
   codexToolSearchEnabled: EnvBoolean.default(false),
+  // OPE-21 atomic, workspace-local credential allocation. Default OFF is a
+  // deliberate rolling-deploy fence: migrate + roll every worker first, then
+  // enable. Turning it off restores the legacy sticky selector without a schema
+  // rollback; the additive lease table/cursor columns become inert.
+  codexCredentialLeasingEnabled: EnvBoolean.default(false),
   // Multi-account P3 (auto-rotation): an account is "near exhaustion" — ineligible to be
   // rotated TO — when EITHER usage window (5h/weekly) is at/over this percent. Default 90 to
   // match the UI danger flip (UsageBar danger at pct >= 90). OPENGENI_CODEX_ROTATION_NEAR_EXHAUSTION_PCT.
@@ -274,7 +255,7 @@ var SettingsSchema = z.object({
   // the non-bypassable CORE at AGENT_INSTRUCTIONS_CORE_PLACEHOLDER (or appends
   // it when the template omits the marker), and uses the result as the agent's
   // instructions. Defaulting to DEFAULT_AGENT_INSTRUCTIONS keeps the composed
-  // default byte-identical to the historical hardcoded preamble.
+  // default pinned by runtime tests.
   agentInstructionsTemplate: z.string().default(DEFAULT_AGENT_INSTRUCTIONS),
   azureOpenaiBaseUrl: z.string().optional(),
   azureOpenaiEndpoint: z.string().optional(),
@@ -379,6 +360,13 @@ var SettingsSchema = z.object({
   // recordingMaxSeconds is the ffmpeg -t hard ceiling (bounds a multi-day turn).
   recordingEnabled: EnvBoolean.default(true),
   recordingDefaultCodec: z.enum(["h264-mp4", "vp9-webm"]).default("h264-mp4"),
+  // Workbench v2 turn-end workspace capture (dossier §10.1). When on, the turn
+  // activity probes the box's changed files off the live box at turn end and
+  // persists a capture revision (blobs in @opengeni/storage) so the workbench
+  // paints cold/offline sessions with zero machine round-trips. Best-effort and
+  // fully behind this flag: off ⇒ capture is skipped and reads fall back to the
+  // live/wake path (status-quo behavior). Default on; explicit per environment.
+  workspaceCaptureEnabled: EnvBoolean.default(true),
   recordingFramerate: z.coerce.number().int().positive().default(15),
   recordingMaxSeconds: z.coerce.number().int().positive().default(600),
   recordingMaxBytes: z.coerce.number().int().positive().default(268435456),
@@ -435,6 +423,19 @@ var SettingsSchema = z.object({
   // EnvBoolean (NOT z.coerce.boolean(), which would coerce "false" -> true and
   // turn the flag ON the moment anyone set the env var to disable it).
   sandboxOwnershipEnabled: EnvBoolean.default(false),
+  // --- lazy sandbox provisioning rollout flag, default OFF ---
+  // Only effective when sandboxOwnershipEnabled is ALSO on (lazy provisioning is a
+  // property of the owned path — the SDK never creates/resumes an injected session,
+  // so we control when the box is established). When TRUE, a turn does NOT provision
+  // its box at turn start: the lease acquire + resume-by-id + hooks + downloads +
+  // heartbeat + recording are deferred to an in-process single-flight provisioner
+  // that runs the FIRST time a sandbox op is dispatched (via the routing proxy's
+  // resolveActiveBackend). A turn whose model never calls a sandbox-backed tool ends
+  // with NO lease row and ZERO warm-seconds. When FALSE (or ownership off) the turn
+  // provisions eagerly exactly as today — byte-for-byte. EnvBoolean (NOT
+  // z.coerce.boolean(), which coerces "false" -> true and would turn the flag ON the
+  // moment anyone set the env var to disable it).
+  sandboxLazyProvisionEnabled: EnvBoolean.default(false),
   // --- bring-your-own-compute (selfhosted 11th backend) rollout flag, default OFF ---
   // The keystone flag for the whole selfhosted feature (the enrollment device-flow,
   // the NATS control plane, the relay stream tier). When FALSE the enrollment routes
@@ -443,6 +444,11 @@ var SettingsSchema = z.object({
   // z.coerce.boolean(), which coerces "false" -> true). Flipped per-environment via
   // the deploy-staging IaC secret/configmap pattern (dossier §17/§25.1).
   sandboxSelfhostedEnabled: EnvBoolean.default(false),
+  // Gates the op-stream (streaming exec) transport to Connected Machines. The
+  // runner must ALSO advertise Capabilities.op_stream; default off, and legacy
+  // request/reply exec is the permanent fallback. EnvBoolean (NOT
+  // z.coerce.boolean(), which coerces "false" -> true).
+  agentOpStreamEnabled: EnvBoolean.default(false),
   // The HMAC secret the control plane signs the enrollment bearer credential with
   // (the `oge_` envelope the agent presents back to the control plane). Optional:
   // when ABSENT and sandboxSelfhostedEnabled is on, the poll route reports the
@@ -499,6 +505,25 @@ var SettingsSchema = z.object({
   // bus connects anonymously (local dev / a NATS with no auth_callout).
   selfhostedNatsControlUser: z.string().optional(),
   selfhostedNatsControlPassword: z.string().optional(),
+  // --- selfhosted (Connected Machine) control/exec op deadlines ---------------
+  // The control plane splits its op deadline in two. CONTROL ops (ping / fs / git /
+  // desktop / pty) must stay responsive so a machine's liveness is never masked by a
+  // slow op, so they use the short control timeout. EXEC gets its OWN, larger budget:
+  // a real command (compile, test run, dependency install) routinely outlives the
+  // control timeout, and before the split a long command was killed at the ~30s
+  // control wall. The agent kills the exec child at this deadline; the wire waits
+  // slightly longer (SELFHOSTED_EXEC_REPLY_GRACE_MS) for the typed timed-out reply.
+  //
+  // The exec default is a DELIBERATELY MODEST 2min (not 5): the agent-side admission
+  // pool is (until a later agent release) a FLAT 8 permits with no per-class split,
+  // so 8 slow execs holding a permit for 5 minutes would blanket-DRAIN every fs/git
+  // op — shipping the amplifier before the class-aware-admission fix. 2min still
+  // clears the large majority of the observed >30s exec tail; genuinely long jobs run
+  // in the background (see the exec-deadline hint) or raise the knob per deployment.
+  // Knobs: OPENGENI_SANDBOX_SELFHOSTED_EXEC_TIMEOUT_MS (default 2min) and
+  // OPENGENI_SANDBOX_SELFHOSTED_CONTROL_TIMEOUT_MS (default 30s).
+  sandboxSelfhostedExecTimeoutMs: z.coerce.number().int().positive().default(12e4),
+  sandboxSelfhostedControlTimeoutMs: z.coerce.number().int().positive().default(3e4),
   // --- sandbox lease cadences (cadence invariant validated at boot below) ---
   // reaperPeriod < viewerHolderTTL, and reaperPeriod + idleGrace < the EFFECTIVE
   // box idle timeout (effectiveModalIdleTimeoutSeconds, which defaults to the hard
@@ -517,6 +542,22 @@ var SettingsSchema = z.object({
   // fresh EMPTY box; lower it to trade warm cost for a snappier reclaim. Knob:
   // OPENGENI_SANDBOX_IDLE_GRACE_MS.
   sandboxIdleGraceMs: z.coerce.number().int().positive().default(9e5),
+  // MID-SESSION /workspace snapshot cadence (sandbox-file-persistence). The
+  // reaper's drain-persist only protects boxes the reaper itself kills; a box
+  // that dies any other way (Modal's hard creation-time timeout on a session
+  // busy past it, provider OOM/infra death) loses everything since the last
+  // clean drain. While a turn holds the box, the turn heartbeat and turn-end
+  // both take a snapshot when at least this interval has passed since the last
+  // one (same epoch-fenced fold-onto-lease seam as the drain), bounding the
+  // worst-case loss of ANY unclean box death to this window. 0 disables.
+  // Knob: OPENGENI_SANDBOX_SNAPSHOT_INTERVAL_MS. Default 15min.
+  sandboxSnapshotIntervalMs: z.coerce.number().int().min(0).default(9e5),
+  // Maximum time a best-effort /workspace snapshot capture may hold turn/reaper
+  // cleanup. A hung provider snapshot must never pin a lease holder, block
+  // graceful shutdown, or become permission to GC an older archive. Timeout is
+  // treated exactly like a failed best-effort snapshot. Knob:
+  // OPENGENI_SANDBOX_SNAPSHOT_TIMEOUT_MS. Default 60s.
+  sandboxSnapshotTimeoutMs: z.coerce.number().int().positive().default(6e4),
   // expires_at refresh window for a held lease (>> the turn 10s heartbeat so a
   // single missed heartbeat never TTL-reaps a live turn). The warming TTL is the
   // window a cold->warming spawner has to commit warm before a reaper resets it.
@@ -526,6 +567,11 @@ var SettingsSchema = z.object({
   // (a liveness/reaper cadence), this bounds how long one turn waits for capacity
   // or provider creation before surfacing a clear turn.failed error.
   sandboxWarmingTimeoutMs: z.coerce.number().int().positive().default(6e5),
+  // Rig setup-script budget (M3): the wall-clock timeout the rig-setup lifecycle
+  // hook runs its script under, distinct from the 120s per-command lifecycle
+  // default (a rig may compile/install heavy tooling on first cold create).
+  // Env: OPENGENI_RIG_SETUP_TIMEOUT_MS. Default 10min.
+  rigSetupTimeoutMs: z.coerce.number().int().positive().default(6e5),
   // --- sandbox warm-time billing (P2.1) ---
   // Per-backend warm rate (usd_micros/sec), like modelPricingJson: an empty {}
   // means warm-cost is not debited (warm-seconds are still metered for audit).
@@ -586,30 +632,32 @@ var SettingsSchema = z.object({
   stripePublishableKey: z.string().optional(),
   stripeWebhookSecret: z.string().optional(),
   stripeCreditsProductId: z.string().optional(),
-  mcpServers: z.array(z.object({
-    id: z.string().min(1).regex(registryId),
-    name: z.string().min(1).optional(),
-    url: z.string().url(),
-    allowedTools: z.array(z.string().min(1)).optional(),
-    timeoutMs: z.number().int().positive().optional(),
-    cacheToolsList: z.boolean().default(false),
-    /**
-     * Human-approval policy for this server's tools, overlaid per-run from a
-     * session MCP server row (never from OPENGENI_MCP_SERVERS). `true` = all
-     * tools require approval; a string[] = only the listed UNPREFIXED tool
-     * names do; absent = auto-run (the historical default). Enforced in the
-     * runtime by attaching `needsApproval` to the matching MCP tools.
-     */
-    requireApproval: z.union([z.boolean(), z.array(z.string().min(1))]).optional(),
-    /**
-     * Extra request headers sent to this MCP server (credential injection
-     * for workspace-enabled capability MCPs). Populated at runtime from
-     * encrypted capability-installation credentials; do not put secrets in
-     * OPENGENI_MCP_SERVERS.
-     */
-    headers: z.record(z.string(), z.string()).optional(),
-    connectionRef: McpServerConnectionRefSchema.optional()
-  })).default([])
+  mcpServers: z.array(
+    z.object({
+      id: z.string().min(1).regex(registryId),
+      name: z.string().min(1).optional(),
+      url: z.string().url(),
+      allowedTools: z.array(z.string().min(1)).optional(),
+      timeoutMs: z.number().int().positive().optional(),
+      cacheToolsList: z.boolean().default(false),
+      /**
+       * Human-approval policy for this server's tools, overlaid per-run from a
+       * session MCP server row (never from OPENGENI_MCP_SERVERS). `true` = all
+       * tools require approval; a string[] = only the listed UNPREFIXED tool
+       * names do; absent = auto-run (the historical default). Enforced in the
+       * runtime by attaching `needsApproval` to the matching MCP tools.
+       */
+      requireApproval: z.union([z.boolean(), z.array(z.string().min(1))]).optional(),
+      /**
+       * Extra request headers sent to this MCP server (credential injection
+       * for workspace-enabled capability MCPs). Populated at runtime from
+       * encrypted capability-installation credentials; do not put secrets in
+       * OPENGENI_MCP_SERVERS.
+       */
+      headers: z.record(z.string(), z.string()).optional(),
+      connectionRef: McpServerConnectionRefSchema.optional()
+    })
+  ).default([])
 });
 var ModelPricingSchema = z.object({
   inputMicrosPerMillionTokens: z.number().int().nonnegative(),
@@ -625,6 +673,8 @@ var RegistryModelSchema = z.object({
   label: z.string().min(1).optional(),
   // display name; defaults to id
   contextWindowTokens: z.number().int().positive().optional(),
+  effectiveContextWindowTokens: z.number().int().positive().optional(),
+  autoCompactTokenLimit: z.number().int().positive().optional(),
   reasoningEffort: z.boolean().optional(),
   // model accepts a reasoning-effort control
   hostedWebSearch: z.boolean().optional(),
@@ -653,12 +703,24 @@ var IntegrationOAuthClientConfigSchema = z.object({
   tokenEndpointAuthMethod: z.enum(["none", "client_secret_post", "client_secret_basic"]).default("none")
 });
 var defaultModelPricing = {
-  "gpt-5.5": {
+  "gpt-5.6-sol": {
     inputMicrosPerMillionTokens: 5e6,
     cachedInputMicrosPerMillionTokens: 5e5,
     outputMicrosPerMillionTokens: 3e7,
     marginBps: 2500
   },
+  "gpt-5.6-terra": {
+    inputMicrosPerMillionTokens: 25e5,
+    cachedInputMicrosPerMillionTokens: 25e4,
+    outputMicrosPerMillionTokens: 15e6,
+    marginBps: 2500
+  },
+  "gpt-5.6-luna": {
+    inputMicrosPerMillionTokens: 1e6,
+    cachedInputMicrosPerMillionTokens: 1e5,
+    outputMicrosPerMillionTokens: 6e6,
+    marginBps: 2500
+  },
   "gpt-5.4": {
     inputMicrosPerMillionTokens: 25e5,
     cachedInputMicrosPerMillionTokens: 25e4,
@@ -734,21 +796,11 @@ var SANDBOX_REQUIRED_ENV = {
     { field: "modalTokenId", env: "OPENGENI_MODAL_TOKEN_ID" },
     { field: "modalTokenSecret", env: "OPENGENI_MODAL_TOKEN_SECRET" }
   ],
-  daytona: [
-    { field: "daytonaApiKey", env: "OPENGENI_DAYTONA_API_KEY" }
-  ],
-  runloop: [
-    { field: "runloopApiKey", env: "OPENGENI_RUNLOOP_API_KEY" }
-  ],
-  e2b: [
-    { field: "e2bApiKey", env: "OPENGENI_E2B_API_KEY" }
-  ],
-  blaxel: [
-    { field: "blaxelApiKey", env: "OPENGENI_BLAXEL_API_KEY" }
-  ],
-  cloudflare: [
-    { field: "cloudflareWorkerUrl", env: "OPENGENI_CLOUDFLARE_WORKER_URL" }
-  ],
+  daytona: [{ field: "daytonaApiKey", env: "OPENGENI_DAYTONA_API_KEY" }],
+  runloop: [{ field: "runloopApiKey", env: "OPENGENI_RUNLOOP_API_KEY" }],
+  e2b: [{ field: "e2bApiKey", env: "OPENGENI_E2B_API_KEY" }],
+  blaxel: [{ field: "blaxelApiKey", env: "OPENGENI_BLAXEL_API_KEY" }],
+  cloudflare: [{ field: "cloudflareWorkerUrl", env: "OPENGENI_CLOUDFLARE_WORKER_URL" }],
   vercel: [
     { field: "vercelToken", env: "OPENGENI_VERCEL_TOKEN" },
     { field: "vercelProjectId", env: "OPENGENI_VERCEL_PROJECT_ID" }
@@ -780,7 +832,9 @@ function getSettings() {
     temporalNamespace: optional("OPENGENI_TEMPORAL_NAMESPACE"),
     temporalTaskQueue: optional("OPENGENI_TEMPORAL_TASK_QUEUE"),
     startupDependencyRetryAttempts: optional("OPENGENI_STARTUP_DEPENDENCY_RETRY_ATTEMPTS"),
-    startupDependencyRetryInitialDelayMs: optional("OPENGENI_STARTUP_DEPENDENCY_RETRY_INITIAL_DELAY_MS"),
+    startupDependencyRetryInitialDelayMs: optional(
+      "OPENGENI_STARTUP_DEPENDENCY_RETRY_INITIAL_DELAY_MS"
+    ),
     startupDependencyRetryMaxDelayMs: optional("OPENGENI_STARTUP_DEPENDENCY_RETRY_MAX_DELAY_MS"),
     observabilityStructuredLogs: optional("OPENGENI_OBSERVABILITY_STRUCTURED_LOGS"),
     observabilityMetricsEnabled: optional("OPENGENI_OBSERVABILITY_METRICS_ENABLED"),
@@ -802,21 +856,18 @@ function getSettings() {
     environmentsEncryptionKey: optional("OPENGENI_ENVIRONMENTS_ENCRYPTION_KEY"),
     integrationsEnabled: optional("OPENGENI_INTEGRATIONS_ENABLED"),
     integrationsStateSecret: optional("OPENGENI_INTEGRATIONS_STATE_SECRET"),
-    integrationsAllowPrivateNetworkTargets: optional("OPENGENI_INTEGRATIONS_ALLOW_PRIVATE_NETWORK_TARGETS"),
+    integrationsAllowPrivateNetworkTargets: optional(
+      "OPENGENI_INTEGRATIONS_ALLOW_PRIVATE_NETWORK_TARGETS"
+    ),
     integrationsOauthClientsJson: optional("OPENGENI_INTEGRATIONS_OAUTH_CLIENTS_JSON"),
     goalMaxAutoContinuations: optional("OPENGENI_GOAL_MAX_AUTO_CONTINUATIONS"),
     goalNoProgressLimit: optional("OPENGENI_GOAL_NO_PROGRESS_LIMIT"),
     agentMaxModelCallsPerTurn: optional("OPENGENI_AGENT_MAX_MODEL_CALLS_PER_TURN"),
-    sessionHistorySource: optional("OPENGENI_SESSION_HISTORY_SOURCE"),
-    contextCompactionMode: optional("OPENGENI_CONTEXT_COMPACTION_MODE"),
     contextWindowTokens: optional("OPENGENI_CONTEXT_WINDOW_TOKENS"),
+    contextEffectiveWindowTokens: optional("OPENGENI_CONTEXT_EFFECTIVE_WINDOW_TOKENS"),
     contextCompactionThresholdRatio: optional("OPENGENI_COMPACTION_THRESHOLD_RATIO"),
     contextReservedOutputTokens: optional("OPENGENI_CONTEXT_RESERVED_OUTPUT_TOKENS"),
-    contextServerCompactThresholdTokens: optional("OPENGENI_CONTEXT_SERVER_COMPACT_THRESHOLD_TOKENS"),
-    contextCompactSoftFraction: optional("OPENGENI_CONTEXT_COMPACT_SOFT_FRACTION"),
-    contextCompactHardFraction: optional("OPENGENI_CONTEXT_COMPACT_HARD_FRACTION"),
-    contextKeepRecentTokens: optional("OPENGENI_CONTEXT_KEEP_RECENT_TOKENS"),
-    contextSummaryMaxTokens: optional("OPENGENI_CONTEXT_SUMMARY_MAX_TOKENS"),
+    contextAutoCompactThresholdTokens: optional("OPENGENI_CONTEXT_AUTO_COMPACT_THRESHOLD_TOKENS"),
     authRequired: optional("OPENGENI_AUTH_REQUIRED"),
     accessKey: optional("OPENGENI_ACCESS_KEY"),
     authAllowHealth: optional("OPENGENI_AUTH_ALLOW_HEALTH"),
@@ -835,6 +886,7 @@ function getSettings() {
     modelProvidersJson: optional("OPENGENI_MODEL_PROVIDERS_JSON"),
     codexSubscriptionEnabled: optional("OPENGENI_CODEX_SUBSCRIPTION_ENABLED"),
     codexToolSearchEnabled: optional("OPENGENI_CODEX_TOOL_SEARCH_ENABLED"),
+    codexCredentialLeasingEnabled: optional("OPENGENI_CODEX_CREDENTIAL_LEASING_ENABLED"),
     codexProductSku: optional("OPENGENI_CODEX_PRODUCT_SKU"),
     codexRotationNearExhaustionPct: optional("OPENGENI_CODEX_ROTATION_NEAR_EXHAUSTION_PCT"),
     openaiReasoningEffort: optional("OPENGENI_OPENAI_REASONING_EFFORT"),
@@ -874,6 +926,7 @@ function getSettings() {
     computerUseEnabled: optional("OPENGENI_COMPUTER_USE_ENABLED"),
     computerUseReadOnly: optional("OPENGENI_COMPUTER_USE_READONLY"),
     recordingEnabled: optional("OPENGENI_RECORDING_ENABLED"),
+    workspaceCaptureEnabled: optional("OPENGENI_WORKSPACE_CAPTURE"),
     recordingDefaultCodec: optional("OPENGENI_RECORDING_DEFAULT_CODEC"),
     recordingFramerate: optional("OPENGENI_RECORDING_FRAMERATE"),
     recordingMaxSeconds: optional("OPENGENI_RECORDING_MAX_SECONDS"),
@@ -913,7 +966,9 @@ function getSettings() {
     vercelTeamId: optional("OPENGENI_VERCEL_TEAM_ID"),
     vercelRuntime: optional("OPENGENI_VERCEL_RUNTIME"),
     sandboxOwnershipEnabled: optional("OPENGENI_SANDBOX_OWNERSHIP_ENABLED"),
+    sandboxLazyProvisionEnabled: optional("OPENGENI_SANDBOX_LAZY_PROVISION"),
     sandboxSelfhostedEnabled: optional("OPENGENI_SANDBOX_SELFHOSTED_ENABLED"),
+    agentOpStreamEnabled: optional("OPENGENI_AGENT_OP_STREAM_ENABLED"),
     enrollmentSigningSecret: optional("OPENGENI_ENROLLMENT_SIGNING_SECRET"),
     selfhostedNatsUrl: optional("OPENGENI_SELFHOSTED_NATS_URL"),
     selfhostedRelayUrl: optional("OPENGENI_SELFHOSTED_RELAY_URL"),
@@ -925,13 +980,20 @@ function getSettings() {
     selfhostedNatsCalloutPassword: optional("OPENGENI_SELFHOSTED_NATS_CALLOUT_PASSWORD"),
     selfhostedNatsControlUser: optional("OPENGENI_SELFHOSTED_NATS_CONTROL_USER"),
     selfhostedNatsControlPassword: optional("OPENGENI_SELFHOSTED_NATS_CONTROL_PASSWORD"),
+    sandboxSelfhostedExecTimeoutMs: optional("OPENGENI_SANDBOX_SELFHOSTED_EXEC_TIMEOUT_MS"),
+    sandboxSelfhostedControlTimeoutMs: optional("OPENGENI_SANDBOX_SELFHOSTED_CONTROL_TIMEOUT_MS"),
     sandboxLeaseReaperPeriodMs: optional("OPENGENI_SANDBOX_LEASE_REAPER_PERIOD_MS"),
     sandboxViewerHolderTtlMs: optional("OPENGENI_SANDBOX_VIEWER_HOLDER_TTL_MS"),
     sandboxIdleGraceMs: optional("OPENGENI_SANDBOX_IDLE_GRACE_MS"),
+    sandboxSnapshotIntervalMs: optional("OPENGENI_SANDBOX_SNAPSHOT_INTERVAL_MS"),
+    sandboxSnapshotTimeoutMs: optional("OPENGENI_SANDBOX_SNAPSHOT_TIMEOUT_MS"),
     sandboxLeaseTtlMs: optional("OPENGENI_SANDBOX_LEASE_TTL_MS"),
     sandboxLeaseWarmingTtlMs: optional("OPENGENI_SANDBOX_LEASE_WARMING_TTL_MS"),
     sandboxWarmingTimeoutMs: optional("OPENGENI_SANDBOX_WARMING_TIMEOUT_MS"),
-    sandboxWarmRateMicrosPerSecondJson: optional("OPENGENI_SANDBOX_WARM_RATE_MICROS_PER_SECOND_JSON"),
+    rigSetupTimeoutMs: optional("OPENGENI_RIG_SETUP_TIMEOUT_MS"),
+    sandboxWarmRateMicrosPerSecondJson: optional(
+      "OPENGENI_SANDBOX_WARM_RATE_MICROS_PER_SECOND_JSON"
+    ),
     sandboxMaxWarmSecondsPerWorkspace: optional("OPENGENI_SANDBOX_MAX_WARM_SECONDS_PER_WORKSPACE"),
     sandboxPreparationProfiles: optional("OPENGENI_SANDBOX_PREPARATION_PROFILES"),
     sandboxEnvAllowlist: optional("OPENGENI_SANDBOX_ENV_ALLOWLIST"),
@@ -1027,8 +1089,7 @@ function configuredProviders(settings) {
     label: builtinProviderLabel(settings),
     kind: "api-key",
     api: "responses",
-    builtin: true,
-    compactionMode: resolveContextCompactionMode(settings)
+    builtin: true
   };
   if (settings.openaiProvider === "azure") {
     builtin.baseUrl = settings.azureOpenaiBaseUrl ?? settings.azureOpenaiEndpoint;
@@ -1037,28 +1098,41 @@ function configuredProviders(settings) {
     builtin.baseUrl = settings.openaiBaseUrl;
     builtin.apiKey = settings.openaiApiKey;
   }
-  const registry = parseModelProvidersJson(settings.modelProvidersJson).map((provider) => ({
-    id: provider.id,
-    label: provider.label ?? provider.id,
-    kind: provider.kind,
-    api: provider.api,
-    builtin: false,
-    baseUrl: provider.baseUrl,
-    apiKey: resolveProviderApiKey(provider),
-    defaultQuery: provider.defaultQuery,
-    defaultHeaders: provider.defaultHeaders,
-    compactionMode: "client"
-  }));
+  const registry = parseModelProvidersJson(settings.modelProvidersJson).map(
+    (provider) => ({
+      id: provider.id,
+      label: provider.label ?? provider.id,
+      kind: provider.kind,
+      api: provider.api,
+      builtin: false,
+      baseUrl: provider.baseUrl,
+      apiKey: resolveProviderApiKey(provider),
+      defaultQuery: provider.defaultQuery,
+      defaultHeaders: provider.defaultHeaders
+    })
+  );
   return [builtin, ...registry];
 }
+function policyProviderIdForModel(settings, modelId) {
+  if (modelId.startsWith(CODEX_MODEL_ID_PREFIX)) {
+    return CODEX_PROVIDER_ID;
+  }
+  const configured = configuredModels(settings).find((model) => model.id === modelId);
+  return configured?.providerId ?? builtinProviderId(settings);
+}
 function configuredModels(settings) {
   const builtinId = builtinProviderId(settings);
   const builtinLabel = builtinProviderLabel(settings);
   const registryOwnedIds = new Set(
-    parseModelProvidersJson(settings.modelProvidersJson).flatMap((provider) => provider.models.map((model) => model.id))
+    parseModelProvidersJson(settings.modelProvidersJson).flatMap(
+      (provider) => provider.models.map((model) => model.id)
+    )
   );
   const isRegistryNamespaced = (id) => id.startsWith(CODEX_MODEL_ID_PREFIX) || id.includes("/") && registryOwnedIds.has(id);
-  const out = uniqueValues([settings.openaiModel, ...splitCsv(settings.openaiAllowedModels)]).filter((id) => !isRegistryNamespaced(id)).map((id) => ({
+  const out = uniqueValues([
+    settings.openaiModel,
+    ...splitCsv(settings.openaiAllowedModels)
+  ]).filter((id) => !isRegistryNamespaced(id)).map((id) => ({
     id,
     label: id,
     providerId: builtinId,
@@ -1078,6 +1152,8 @@ function configuredModels(settings) {
         providerLabel,
         api: provider.api,
         ...model.contextWindowTokens === void 0 ? {} : { contextWindowTokens: model.contextWindowTokens },
+        ...model.effectiveContextWindowTokens === void 0 ? {} : { effectiveContextWindowTokens: model.effectiveContextWindowTokens },
+        ...model.autoCompactTokenLimit === void 0 ? {} : { autoCompactTokenLimit: model.autoCompactTokenLimit },
         reasoningEffort: model.reasoningEffort ?? false,
         hostedWebSearch: model.hostedWebSearch ?? false
       });
@@ -1100,7 +1176,9 @@ function resolveModelProvider(settings, modelId) {
   if (!model) {
     return void 0;
   }
-  const provider = configuredProviders(settings).find((candidate) => candidate.id === model.providerId);
+  const provider = configuredProviders(settings).find(
+    (candidate) => candidate.id === model.providerId
+  );
   if (!provider) {
     return void 0;
   }
@@ -1122,27 +1200,25 @@ function configuredModelPricing(settings) {
     ...configured
   };
 }
-function resolveContextCompactionMode(settings) {
-  switch (settings.contextCompactionMode) {
-    case "server":
-      return "server";
-    case "client":
-      return "client";
-    case "off":
-      return "off";
-    case "auto":
-    default:
-      return settings.openaiProvider === "openai" ? "server" : "client";
-  }
-}
 function contextInputBudgetTokens(settings) {
+  if (settings.contextEffectiveWindowTokens !== void 0) {
+    return Math.min(settings.contextWindowTokens, settings.contextEffectiveWindowTokens);
+  }
   return Math.max(0, settings.contextWindowTokens - settings.contextReservedOutputTokens);
 }
-function contextServerCompactThreshold(settings) {
-  if (settings.contextServerCompactThresholdTokens) {
-    return settings.contextServerCompactThresholdTokens;
-  }
-  return Math.floor(settings.contextWindowTokens * settings.contextCompactionThresholdRatio);
+function settingsWithResolvedModelContext(settings, model) {
+  const contextWindowTokens = model.contextWindowTokens ?? settings.contextWindowTokens;
+  return {
+    ...settings,
+    contextWindowTokens,
+    ...model.effectiveContextWindowTokens === void 0 ? {} : {
+      contextEffectiveWindowTokens: Math.min(
+        contextWindowTokens,
+        model.effectiveContextWindowTokens
+      )
+    },
+    ...model.autoCompactTokenLimit === void 0 ? {} : { contextAutoCompactThresholdTokens: model.autoCompactTokenLimit }
+  };
 }
 function configuredStaticUsageLimits(settings) {
   return parseStaticUsageLimitsJson(settings.staticUsageLimitsJson);
@@ -1175,7 +1251,10 @@ function calculateModelUsageCostMicros(settings, model, usage) {
   return Math.ceil(rawCost * (1e4 + marginBps) / 1e4);
 }
 function configuredAllowedReasoningEfforts(settings) {
-  return uniqueValues([settings.openaiReasoningEffort, ...splitCsv(settings.openaiAllowedReasoningEfforts)]).map((value) => ReasoningEffort.parse(value));
+  return uniqueValues([
+    settings.openaiReasoningEffort,
+    ...splitCsv(settings.openaiAllowedReasoningEfforts)
+  ]).map((value) => ReasoningEffort.parse(value));
 }
 function environmentsEncryptionKeyBytes(settings) {
   if (!settings.environmentsEncryptionKey) {
@@ -1183,7 +1262,9 @@ function environmentsEncryptionKeyBytes(settings) {
   }
   const decoded = Buffer.from(settings.environmentsEncryptionKey, "base64");
   if (decoded.length !== 32) {
-    throw new Error("OPENGENI_ENVIRONMENTS_ENCRYPTION_KEY must be base64 for exactly 32 bytes (generate with: openssl rand -base64 32)");
+    throw new Error(
+      "OPENGENI_ENVIRONMENTS_ENCRYPTION_KEY must be base64 for exactly 32 bytes (generate with: openssl rand -base64 32)"
+    );
   }
   return new Uint8Array(decoded);
 }
@@ -1198,12 +1279,21 @@ function dbSearchPath(settings) {
   return `${schema},opengeni_private,public`;
 }
 function collectGitIdentityEnvironment(settings) {
-  return Object.fromEntries(Object.entries({
-    GIT_AUTHOR_NAME: settings.gitAuthorName,
-    GIT_AUTHOR_EMAIL: settings.gitAuthorEmail,
-    GIT_COMMITTER_NAME: settings.gitCommitterName ?? settings.gitAuthorName,
-    GIT_COMMITTER_EMAIL: settings.gitCommitterEmail ?? settings.gitAuthorEmail
-  }).filter((entry) => typeof entry[1] === "string" && entry[1].trim().length > 0));
+  return Object.fromEntries(
+    Object.entries({
+      GIT_AUTHOR_NAME: settings.gitAuthorName,
+      GIT_AUTHOR_EMAIL: settings.gitAuthorEmail,
+      GIT_COMMITTER_NAME: settings.gitCommitterName ?? settings.gitAuthorName,
+      GIT_COMMITTER_EMAIL: settings.gitCommitterEmail ?? settings.gitAuthorEmail
+    }).filter(
+      (entry) => typeof entry[1] === "string" && entry[1].trim().length > 0
+    )
+  );
+}
+var DEFAULT_SANDBOX_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
+function prependPathEntry(pathValue, entry) {
+  const parts = (pathValue ?? DEFAULT_SANDBOX_PATH).split(":").filter(Boolean);
+  return [entry, ...parts.filter((part) => part !== entry)].join(":");
 }
 function stableSandboxEnvironmentForRun(settings, workspaceEnvironment = {}, options = {}) {
   const environment = {
@@ -1215,18 +1305,35 @@ function stableSandboxEnvironmentForRun(settings, workspaceEnvironment = {}, opt
   if (settings.sandboxBackend !== "none" && settings.sandboxBackend !== "local") {
     environment.HOME ??= descriptor.workspaceRoot;
   }
-  environment.OPENGENI_GIT_TOKEN_FILE ??= `${environment.HOME ?? descriptor.workspaceRoot}/.opengeni/git-token`;
+  const provisionedGitHelperBackend = settings.sandboxBackend !== "none" && settings.sandboxBackend !== "local" && settings.sandboxBackend !== "selfhosted";
+  if (provisionedGitHelperBackend) {
+    const home = environment.HOME ?? descriptor.workspaceRoot;
+    environment.OPENGENI_GIT_CREDENTIALS_DIR ??= `${home}/.opengeni/git-credentials`;
+    environment.OPENGENI_GIT_TOKEN_FILE ??= `${home}/.opengeni/git-token`;
+    environment.OPENGENI_GIT_CLI_WRAPPER_DIR ??= `${home}/.opengeni/bin`;
+    environment.PATH = prependPathEntry(environment.PATH, environment.OPENGENI_GIT_CLI_WRAPPER_DIR);
+  }
   if (settings.toolspaceEnabled) {
     environment.OPENGENI_TOOLSPACE_TOKEN_FILE ??= `${environment.HOME ?? descriptor.workspaceRoot}/.opengeni/toolspace-token`;
     if (options.workspaceId) {
-      environment.OPENGENI_TOOLSPACE_URL ??= firstPartyMcpWorkspaceUrl(settings, options.workspaceId);
+      environment.OPENGENI_TOOLSPACE_URL ??= firstPartyMcpWorkspaceUrl(
+        settings,
+        options.workspaceId
+      );
     }
   }
   return environment;
 }
 function hasGitHubRepositorySelection(resources) {
   const positive = (value) => typeof value === "number" && Number.isInteger(value) && value > 0 || typeof value === "string" && /^\d+$/.test(value) && Number(value) > 0;
-  return resources.some((resource) => resource.kind === "repository" && positive(resource.githubInstallationId) && positive(resource.githubRepositoryId));
+  return resources.some(
+    (resource) => resource.kind === "repository" && (positive(resource.githubInstallationId) && positive(resource.githubRepositoryId) || resource.provider === "github" && positive(resource.installationId) && positive(resource.repositoryId))
+  );
+}
+function hasGitCredentialRepositorySelection(resources) {
+  return resources.some(
+    (resource) => resource.kind === "repository" && (resource.provider === "github" || resource.provider === "gitlab" || resource.provider === "azure_devops" || hasGitHubRepositorySelection([resource]))
+  );
 }
 function applyGitAuthPointerEnvironment(environment, identity) {
   environment.GIT_ASKPASS = `${environment.HOME ?? "/workspace"}/.opengeni/askpass`;
@@ -1281,10 +1388,14 @@ function sandboxLifecycleHookIds(settings) {
   return uniqueValues(ids);
 }
 function sandboxPreparationProfileNames(settings) {
-  const profiles = splitCsv(settings.sandboxPreparationProfiles).map((value) => value.toLowerCase());
+  const profiles = splitCsv(settings.sandboxPreparationProfiles).map(
+    (value) => value.toLowerCase()
+  );
   if (profiles.includes("none")) {
     if (profiles.length > 1) {
-      throw new Error("OPENGENI_SANDBOX_PREPARATION_PROFILES cannot combine none with other profiles");
+      throw new Error(
+        "OPENGENI_SANDBOX_PREPARATION_PROFILES cannot combine none with other profiles"
+      );
     }
     return ["none"];
   }
@@ -1316,7 +1427,7 @@ function parseMcpServers(raw) {
     return parsed;
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    throw new Error(`OPENGENI_MCP_SERVERS must be a JSON array: ${message}`);
+    throw new Error(`OPENGENI_MCP_SERVERS must be a JSON array: ${message}`, { cause: error });
   }
 }
 function parseModelPricingJson(raw) {
@@ -1328,7 +1439,7 @@ function parseModelPricingJson(raw) {
     parsed = JSON.parse(raw);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    throw new Error(`OPENGENI_MODEL_PRICING_JSON must be valid JSON: ${message}`);
+    throw new Error(`OPENGENI_MODEL_PRICING_JSON must be valid JSON: ${message}`, { cause: error });
   }
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
     throw new Error("OPENGENI_MODEL_PRICING_JSON must be a JSON object keyed by model name");
@@ -1351,19 +1462,28 @@ function parseSandboxWarmRateJson(raw) {
     parsed = JSON.parse(raw);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    throw new Error(`OPENGENI_SANDBOX_WARM_RATE_MICROS_PER_SECOND_JSON must be valid JSON: ${message}`);
+    throw new Error(
+      `OPENGENI_SANDBOX_WARM_RATE_MICROS_PER_SECOND_JSON must be valid JSON: ${message}`,
+      { cause: error }
+    );
   }
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-    throw new Error("OPENGENI_SANDBOX_WARM_RATE_MICROS_PER_SECOND_JSON must be a JSON object keyed by backend name");
+    throw new Error(
+      "OPENGENI_SANDBOX_WARM_RATE_MICROS_PER_SECOND_JSON must be a JSON object keyed by backend name"
+    );
   }
   const out = {};
   for (const [backend, value] of Object.entries(parsed)) {
     if (!backend.trim()) {
-      throw new Error("OPENGENI_SANDBOX_WARM_RATE_MICROS_PER_SECOND_JSON contains an empty backend name");
+      throw new Error(
+        "OPENGENI_SANDBOX_WARM_RATE_MICROS_PER_SECOND_JSON contains an empty backend name"
+      );
     }
     const rate = typeof value === "number" ? value : Number(value);
     if (!Number.isFinite(rate) || rate < 0) {
-      throw new Error(`OPENGENI_SANDBOX_WARM_RATE_MICROS_PER_SECOND_JSON rate for ${backend} must be a non-negative number`);
+      throw new Error(
+        `OPENGENI_SANDBOX_WARM_RATE_MICROS_PER_SECOND_JSON rate for ${backend} must be a non-negative number`
+      );
     }
     out[backend] = rate;
   }
@@ -1382,7 +1502,9 @@ function parseModelProvidersJson(raw) {
     parsed = JSON.parse(raw);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    throw new Error(`OPENGENI_MODEL_PROVIDERS_JSON must be valid JSON: ${message}`);
+    throw new Error(`OPENGENI_MODEL_PROVIDERS_JSON must be valid JSON: ${message}`, {
+      cause: error
+    });
   }
   if (!Array.isArray(parsed)) {
     throw new Error("OPENGENI_MODEL_PROVIDERS_JSON must be a JSON array of providers");
@@ -1390,7 +1512,9 @@ function parseModelProvidersJson(raw) {
   return parsed.map((entry, index) => {
     const result = RegistryProviderSchema.safeParse(entry);
     if (!result.success) {
-      throw new Error(`OPENGENI_MODEL_PROVIDERS_JSON provider[${index}] is invalid: ${result.error.message}`);
+      throw new Error(
+        `OPENGENI_MODEL_PROVIDERS_JSON provider[${index}] is invalid: ${result.error.message}`
+      );
     }
     return result.data;
   });
@@ -1404,10 +1528,14 @@ function parseIntegrationsOauthClientsJson(raw) {
     parsed = JSON.parse(raw);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    throw new Error(`OPENGENI_INTEGRATIONS_OAUTH_CLIENTS_JSON must be valid JSON: ${message}`);
+    throw new Error(`OPENGENI_INTEGRATIONS_OAUTH_CLIENTS_JSON must be valid JSON: ${message}`, {
+      cause: error
+    });
   }
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-    throw new Error("OPENGENI_INTEGRATIONS_OAUTH_CLIENTS_JSON must be a JSON object keyed by authorization-server issuer or URL");
+    throw new Error(
+      "OPENGENI_INTEGRATIONS_OAUTH_CLIENTS_JSON must be a JSON object keyed by authorization-server issuer or URL"
+    );
   }
   const out = {};
   for (const [key, value] of Object.entries(parsed)) {
@@ -1416,7 +1544,9 @@ function parseIntegrationsOauthClientsJson(raw) {
     }
     const result = IntegrationOAuthClientConfigSchema.safeParse(value);
     if (!result.success) {
-      throw new Error(`OPENGENI_INTEGRATIONS_OAUTH_CLIENTS_JSON client for ${key} is invalid: ${result.error.message}`);
+      throw new Error(
+        `OPENGENI_INTEGRATIONS_OAUTH_CLIENTS_JSON client for ${key} is invalid: ${result.error.message}`
+      );
     }
     out[key] = result.data;
   }
@@ -1431,7 +1561,9 @@ function parseStaticUsageLimitsJson(raw) {
     parsed = JSON.parse(raw);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    throw new Error(`OPENGENI_STATIC_USAGE_LIMITS_JSON must be valid JSON: ${message}`);
+    throw new Error(`OPENGENI_STATIC_USAGE_LIMITS_JSON must be valid JSON: ${message}`, {
+      cause: error
+    });
   }
   return StaticUsageLimits.parse(parsed);
 }
@@ -1444,7 +1576,9 @@ function parseStaticEntitlementsJson(raw) {
     parsed = JSON.parse(raw);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    throw new Error(`OPENGENI_STATIC_ENTITLEMENTS_JSON must be valid JSON: ${message}`);
+    throw new Error(`OPENGENI_STATIC_ENTITLEMENTS_JSON must be valid JSON: ${message}`, {
+      cause: error
+    });
   }
   return Entitlements.parse(parsed);
 }
@@ -1491,20 +1625,32 @@ function ensureBuiltInMcpServers(settings) {
       // safe to cache / leave as-is.)
       cacheToolsList: false
     },
-    ...hasFiles ? [] : [{
-      id: "files",
-      name: "Files",
-      url: firstPartyMcpUrl,
-      allowedTools: ["files_get_download_url"],
-      cacheToolsList: true
-    }],
-    ...hasDocs ? [] : [{
-      id: "docs",
-      name: "Document Search",
-      url: firstPartyDocsMcpUrl,
-      allowedTools: ["search_documents", "fetch_document_chunk", "list_document_bases", "knowledge_search", "knowledge_fetch", "memory_search", "memory_propose"],
-      cacheToolsList: false
-    }],
+    ...hasFiles ? [] : [
+      {
+        id: "files",
+        name: "Files",
+        url: firstPartyMcpUrl,
+        allowedTools: ["files_get_download_url"],
+        cacheToolsList: true
+      }
+    ],
+    ...hasDocs ? [] : [
+      {
+        id: "docs",
+        name: "Document Search",
+        url: firstPartyDocsMcpUrl,
+        allowedTools: [
+          "search_documents",
+          "fetch_document_chunk",
+          "list_document_bases",
+          "knowledge_search",
+          "knowledge_fetch",
+          "memory_search",
+          "memory_propose"
+        ],
+        cacheToolsList: false
+      }
+    ],
     ...existing
   ];
 }
@@ -1534,40 +1680,58 @@ function validateSettings(settings) {
   }
   if (settings.productAccessMode === "managed") {
     if (!settings.publicBaseUrl) {
-      throw new Error("OPENGENI_PUBLIC_BASE_URL is required when OPENGENI_PRODUCT_ACCESS_MODE=managed");
+      throw new Error(
+        "OPENGENI_PUBLIC_BASE_URL is required when OPENGENI_PRODUCT_ACCESS_MODE=managed"
+      );
     }
     if (!settings.betterAuthSecret) {
-      throw new Error("OPENGENI_BETTER_AUTH_SECRET is required when OPENGENI_PRODUCT_ACCESS_MODE=managed");
+      throw new Error(
+        "OPENGENI_BETTER_AUTH_SECRET is required when OPENGENI_PRODUCT_ACCESS_MODE=managed"
+      );
     }
     if (!settings.delegationSecret) {
-      throw new Error("OPENGENI_DELEGATION_SECRET is required when OPENGENI_PRODUCT_ACCESS_MODE=managed");
+      throw new Error(
+        "OPENGENI_DELEGATION_SECRET is required when OPENGENI_PRODUCT_ACCESS_MODE=managed"
+      );
     }
     if (!["local", "test"].includes(settings.environment) && !settings.resendApiKey) {
       throw new Error("OPENGENI_RESEND_API_KEY is required for managed mode outside local/test");
     }
     if (!["local", "test"].includes(settings.environment) && !settings.environmentsEncryptionKey) {
-      throw new Error("OPENGENI_ENVIRONMENTS_ENCRYPTION_KEY is required for managed mode outside local/test");
+      throw new Error(
+        "OPENGENI_ENVIRONMENTS_ENCRYPTION_KEY is required for managed mode outside local/test"
+      );
     }
   }
   environmentsEncryptionKeyBytes(settings);
   if (settings.integrationsEnabled) {
     if (settings.productAccessMode === "managed" && !settings.publicBaseUrl) {
-      throw new Error("OPENGENI_PUBLIC_BASE_URL is required when OPENGENI_INTEGRATIONS_ENABLED=true and OPENGENI_PRODUCT_ACCESS_MODE=managed");
+      throw new Error(
+        "OPENGENI_PUBLIC_BASE_URL is required when OPENGENI_INTEGRATIONS_ENABLED=true and OPENGENI_PRODUCT_ACCESS_MODE=managed"
+      );
     }
     if (settings.publicBaseUrl && !settings.publicBaseUrl.startsWith("https://") && !["local", "test"].includes(settings.environment)) {
-      throw new Error("OPENGENI_PUBLIC_BASE_URL must use https when OPENGENI_INTEGRATIONS_ENABLED=true outside local/test");
+      throw new Error(
+        "OPENGENI_PUBLIC_BASE_URL must use https when OPENGENI_INTEGRATIONS_ENABLED=true outside local/test"
+      );
     }
     if (!settings.integrationsStateSecret && !["local", "test"].includes(settings.environment)) {
-      throw new Error("OPENGENI_INTEGRATIONS_STATE_SECRET is required when OPENGENI_INTEGRATIONS_ENABLED=true outside local/test");
+      throw new Error(
+        "OPENGENI_INTEGRATIONS_STATE_SECRET is required when OPENGENI_INTEGRATIONS_ENABLED=true outside local/test"
+      );
     }
   }
   parseIntegrationsOauthClientsJson(settings.integrationsOauthClientsJson);
   if (settings.productAccessMode === "configured" && !["local", "test"].includes(settings.environment) && !settings.delegationSecret && !settings.authRequired) {
-    throw new Error("OPENGENI_PRODUCT_ACCESS_MODE=configured requires OPENGENI_DELEGATION_SECRET or OPENGENI_AUTH_REQUIRED=true outside local/test");
+    throw new Error(
+      "OPENGENI_PRODUCT_ACCESS_MODE=configured requires OPENGENI_DELEGATION_SECRET or OPENGENI_AUTH_REQUIRED=true outside local/test"
+    );
   }
   if (settings.billingMode === "stripe") {
     if (!settings.stripeSecretKey || !settings.stripeWebhookSecret) {
-      throw new Error("OPENGENI_STRIPE_SECRET_KEY and OPENGENI_STRIPE_WEBHOOK_SECRET are required when OPENGENI_BILLING_MODE=stripe");
+      throw new Error(
+        "OPENGENI_STRIPE_SECRET_KEY and OPENGENI_STRIPE_WEBHOOK_SECRET are required when OPENGENI_BILLING_MODE=stripe"
+      );
     }
   }
   if (settings.productAccessMode !== "managed" && settings.billingMode === "stripe") {
@@ -1577,13 +1741,17 @@ function validateSettings(settings) {
     const pricing = configuredModelPricing(settings);
     const missing = configuredAllowedModels(settings).filter((model) => !pricing[model]);
     if (missing.length > 0) {
-      throw new Error(`Missing model pricing for managed billing model(s): ${missing.join(", ")}. Set OPENGENI_MODEL_PRICING_JSON.`);
+      throw new Error(
+        `Missing model pricing for managed billing model(s): ${missing.join(", ")}. Set OPENGENI_MODEL_PRICING_JSON.`
+      );
     }
   }
   if (settings.usageLimitsMode === "static") {
     const limits = configuredStaticUsageLimits(settings);
     if (Object.keys(limits).length === 0) {
-      throw new Error("OPENGENI_STATIC_USAGE_LIMITS_JSON must define at least one cap when OPENGENI_USAGE_LIMITS_MODE=static");
+      throw new Error(
+        "OPENGENI_STATIC_USAGE_LIMITS_JSON must define at least one cap when OPENGENI_USAGE_LIMITS_MODE=static"
+      );
     }
   } else {
     parseStaticUsageLimitsJson(settings.staticUsageLimitsJson);
@@ -1591,7 +1759,9 @@ function validateSettings(settings) {
   if (settings.entitlementsMode === "static") {
     const entitlements = parseStaticEntitlementsJson(settings.staticEntitlementsJson);
     if (Object.keys(entitlements).length === 0) {
-      throw new Error("OPENGENI_STATIC_ENTITLEMENTS_JSON must define at least one feature when OPENGENI_ENTITLEMENTS_MODE=static");
+      throw new Error(
+        "OPENGENI_STATIC_ENTITLEMENTS_JSON must define at least one feature when OPENGENI_ENTITLEMENTS_MODE=static"
+      );
     }
   } else {
     parseStaticEntitlementsJson(settings.staticEntitlementsJson);
@@ -1601,7 +1771,9 @@ function validateSettings(settings) {
   }
   if (settings.openaiProvider === "azure") {
     if (!settings.azureOpenaiBaseUrl && !settings.azureOpenaiEndpoint) {
-      throw new Error("Azure OpenAI requires OPENGENI_AZURE_OPENAI_BASE_URL or OPENGENI_AZURE_OPENAI_ENDPOINT");
+      throw new Error(
+        "Azure OpenAI requires OPENGENI_AZURE_OPENAI_BASE_URL or OPENGENI_AZURE_OPENAI_ENDPOINT"
+      );
     }
     if (!settings.azureOpenaiBaseUrl && !settings.azureOpenaiDeployment) {
       throw new Error("Azure OpenAI endpoint mode requires OPENGENI_AZURE_OPENAI_DEPLOYMENT");
@@ -1614,52 +1786,76 @@ function validateSettings(settings) {
     }
   }
   if (Boolean(settings.modalTokenId) !== Boolean(settings.modalTokenSecret)) {
-    throw new Error("OPENGENI_MODAL_TOKEN_ID and OPENGENI_MODAL_TOKEN_SECRET must both be set or both omitted");
+    throw new Error(
+      "OPENGENI_MODAL_TOKEN_ID and OPENGENI_MODAL_TOKEN_SECRET must both be set or both omitted"
+    );
   }
   for (const required of SANDBOX_REQUIRED_ENV[settings.sandboxBackend] ?? []) {
     const value = settings[required.field];
     if (value === void 0 || value === null || typeof value === "string" && value.trim().length === 0) {
-      throw new Error(`${required.env} is required when OPENGENI_SANDBOX_BACKEND=${settings.sandboxBackend}`);
+      throw new Error(
+        `${required.env} is required when OPENGENI_SANDBOX_BACKEND=${settings.sandboxBackend}`
+      );
     }
   }
   if (settings.objectStorageBackend === "s3-compatible" || settings.objectStorageBackend === "aws-s3") {
     if (Boolean(settings.objectStorageAccessKeyId) !== Boolean(settings.objectStorageSecretAccessKey)) {
-      throw new Error("OPENGENI_OBJECT_STORAGE_ACCESS_KEY_ID and OPENGENI_OBJECT_STORAGE_SECRET_ACCESS_KEY must both be set or both omitted");
+      throw new Error(
+        "OPENGENI_OBJECT_STORAGE_ACCESS_KEY_ID and OPENGENI_OBJECT_STORAGE_SECRET_ACCESS_KEY must both be set or both omitted"
+      );
     }
     if (settings.objectStorageBackend === "s3-compatible" && (settings.objectStorageEndpoint || settings.objectStorageSandboxEndpoint) && (!settings.objectStorageAccessKeyId || !settings.objectStorageSecretAccessKey)) {
-      throw new Error("S3-compatible object storage endpoints require OPENGENI_OBJECT_STORAGE_ACCESS_KEY_ID and OPENGENI_OBJECT_STORAGE_SECRET_ACCESS_KEY");
+      throw new Error(
+        "S3-compatible object storage endpoints require OPENGENI_OBJECT_STORAGE_ACCESS_KEY_ID and OPENGENI_OBJECT_STORAGE_SECRET_ACCESS_KEY"
+      );
     }
     if (settings.objectStorageAzureConnectionString || settings.objectStorageAzureAccountName || settings.objectStorageAzureAccountKey || settings.objectStorageAzureEndpoint) {
-      throw new Error("S3 object storage uses OPENGENI_OBJECT_STORAGE_* S3 settings, not OPENGENI_OBJECT_STORAGE_AZURE_* settings");
+      throw new Error(
+        "S3 object storage uses OPENGENI_OBJECT_STORAGE_* S3 settings, not OPENGENI_OBJECT_STORAGE_AZURE_* settings"
+      );
     }
     if (settings.objectStorageGcsProjectId || settings.objectStorageGcsCredentialsJson || settings.objectStorageGcsKeyFilename || settings.objectStorageGcsApiEndpoint) {
-      throw new Error("S3 object storage uses OPENGENI_OBJECT_STORAGE_* S3 settings, not OPENGENI_OBJECT_STORAGE_GCS_* settings");
+      throw new Error(
+        "S3 object storage uses OPENGENI_OBJECT_STORAGE_* S3 settings, not OPENGENI_OBJECT_STORAGE_GCS_* settings"
+      );
     }
   } else if (settings.objectStorageBackend === "azure-blob") {
     if (settings.objectStorageEndpoint || settings.objectStorageSandboxEndpoint || settings.objectStorageAccessKeyId || settings.objectStorageSecretAccessKey) {
-      throw new Error("Azure Blob storage uses OPENGENI_OBJECT_STORAGE_AZURE_* settings, not S3-compatible object storage settings");
+      throw new Error(
+        "Azure Blob storage uses OPENGENI_OBJECT_STORAGE_AZURE_* settings, not S3-compatible object storage settings"
+      );
     }
     if (settings.objectStorageGcsProjectId || settings.objectStorageGcsCredentialsJson || settings.objectStorageGcsKeyFilename || settings.objectStorageGcsApiEndpoint) {
-      throw new Error("Azure Blob storage uses OPENGENI_OBJECT_STORAGE_AZURE_* settings, not OPENGENI_OBJECT_STORAGE_GCS_* settings");
+      throw new Error(
+        "Azure Blob storage uses OPENGENI_OBJECT_STORAGE_AZURE_* settings, not OPENGENI_OBJECT_STORAGE_GCS_* settings"
+      );
     }
     const hasConnectionString = Boolean(settings.objectStorageAzureConnectionString);
     const hasSharedKey = Boolean(settings.objectStorageAzureAccountName) && Boolean(settings.objectStorageAzureAccountKey);
     if (!hasConnectionString && !hasSharedKey) {
-      throw new Error("Azure Blob storage requires OPENGENI_OBJECT_STORAGE_AZURE_CONNECTION_STRING or OPENGENI_OBJECT_STORAGE_AZURE_ACCOUNT_NAME plus OPENGENI_OBJECT_STORAGE_AZURE_ACCOUNT_KEY");
+      throw new Error(
+        "Azure Blob storage requires OPENGENI_OBJECT_STORAGE_AZURE_CONNECTION_STRING or OPENGENI_OBJECT_STORAGE_AZURE_ACCOUNT_NAME plus OPENGENI_OBJECT_STORAGE_AZURE_ACCOUNT_KEY"
+      );
     }
   } else {
     if (settings.objectStorageEndpoint || settings.objectStorageSandboxEndpoint || settings.objectStorageAccessKeyId || settings.objectStorageSecretAccessKey) {
-      throw new Error("GCS object storage uses OPENGENI_OBJECT_STORAGE_GCS_* settings, not S3-compatible object storage settings");
+      throw new Error(
+        "GCS object storage uses OPENGENI_OBJECT_STORAGE_GCS_* settings, not S3-compatible object storage settings"
+      );
     }
     if (settings.objectStorageAzureConnectionString || settings.objectStorageAzureAccountName || settings.objectStorageAzureAccountKey || settings.objectStorageAzureEndpoint) {
-      throw new Error("GCS object storage uses OPENGENI_OBJECT_STORAGE_GCS_* settings, not OPENGENI_OBJECT_STORAGE_AZURE_* settings");
+      throw new Error(
+        "GCS object storage uses OPENGENI_OBJECT_STORAGE_GCS_* settings, not OPENGENI_OBJECT_STORAGE_AZURE_* settings"
+      );
     }
     if (settings.objectStorageGcsCredentialsJson) {
       parseGcsCredentialsJson(settings.objectStorageGcsCredentialsJson);
     }
   }
   if (settings.documentChunkOverlap >= settings.documentChunkSize) {
-    throw new Error("OPENGENI_DOCUMENT_CHUNK_OVERLAP must be smaller than OPENGENI_DOCUMENT_CHUNK_SIZE");
+    throw new Error(
+      "OPENGENI_DOCUMENT_CHUNK_OVERLAP must be smaller than OPENGENI_DOCUMENT_CHUNK_SIZE"
+    );
   }
   parseExposedPorts(settings.dockerExposedPorts);
   sandboxEnvironmentVariableNames(settings);
@@ -1709,14 +1905,20 @@ function validateSettings(settings) {
   const providerIds = /* @__PURE__ */ new Set();
   for (const provider of registryProviders) {
     if (provider.id === builtinId) {
-      throw new Error(`OPENGENI_MODEL_PROVIDERS_JSON provider id ${provider.id} collides with the built-in provider id`);
+      throw new Error(
+        `OPENGENI_MODEL_PROVIDERS_JSON provider id ${provider.id} collides with the built-in provider id`
+      );
     }
     if (providerIds.has(provider.id)) {
-      throw new Error(`OPENGENI_MODEL_PROVIDERS_JSON contains duplicate provider id ${provider.id}`);
+      throw new Error(
+        `OPENGENI_MODEL_PROVIDERS_JSON contains duplicate provider id ${provider.id}`
+      );
     }
     providerIds.add(provider.id);
     if (!resolveProviderApiKey(provider)) {
-      throw new Error(`OPENGENI_MODEL_PROVIDERS_JSON provider ${provider.id} requires a resolvable API key (set apiKey or apiKeyEnv)`);
+      throw new Error(
+        `OPENGENI_MODEL_PROVIDERS_JSON provider ${provider.id} requires a resolvable API key (set apiKey or apiKeyEnv)`
+      );
     }
   }
 }
@@ -1794,7 +1996,9 @@ function parseGcsCredentialsJson(raw) {
     return JSON.parse(raw);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    throw new Error(`OPENGENI_OBJECT_STORAGE_GCS_CREDENTIALS_JSON must be valid JSON: ${message}`);
+    throw new Error(`OPENGENI_OBJECT_STORAGE_GCS_CREDENTIALS_JSON must be valid JSON: ${message}`, {
+      cause: error
+    });
   }
 }
 function delay(ms) {
@@ -1809,6 +2013,7 @@ export {
   RegistryProviderKind,
   SANDBOX_REQUIRED_ENV,
   applyGitAuthPointerEnvironment,
+  builtinProviderId,
   calculateModelUsageCostMicros,
   collectGitIdentityEnvironment,
   collectSandboxEnvironment,
@@ -1820,7 +2025,6 @@ export {
   configuredProviders,
   configuredStaticUsageLimits,
   contextInputBudgetTokens,
-  contextServerCompactThreshold,
   dbSearchPath,
   defaultModelPricing,
   effectiveModalIdleTimeoutSeconds,
@@ -1828,6 +2032,7 @@ export {
   firstPartyMcpBaseUrl,
   firstPartyMcpWorkspaceUrl,
   getSettings,
+  hasGitCredentialRepositorySelection,
   hasGitHubRepositorySelection,
   parseExposedPorts,
   parseIntegrationsOauthClientsJson,
@@ -1837,8 +2042,8 @@ export {
   parseSandboxWarmRateJson,
   parseStaticEntitlementsJson,
   parseStaticUsageLimitsJson,
+  policyProviderIdForModel,
   requiredSandboxEnvForBackend,
-  resolveContextCompactionMode,
   resolveEnrollmentSigningSecret,
   resolveModelProvider,
   resolveNatsCalloutConfig,
@@ -1851,6 +2056,7 @@ export {
   sandboxLifecycleHookIds,
   sandboxPreparationProfiles,
   sandboxWarmRateMicrosPerSecond,
+  settingsWithResolvedModelContext,
   stableSandboxEnvironmentForRun,
   startupRetryOptions,
   streamTokenDegraded