orkestrator 2.30.0-beta → 2.31.0-beta

package/resources/codex-bridge/dist/index.js

@@ -3933,7 +3933,14 @@ var QUESTION_KEYS = new Set([
   "allowFreeText",
   "options"
 ]);
-var OPTION_KEYS = new Set(["id", "label", "providerValue", "description", "amendment"]);
+var OPTION_KEYS = new Set([
+  "id",
+  "label",
+  "providerValue",
+  "description",
+  "preview",
+  "amendment"
+]);
 var AMENDMENT_KEYS = new Set(["kind", "detail"]);
 var ANSWER_KEYS = new Set(["version", "interactionId", "sessionId", "answers"]);
 var QUESTION_ANSWER_KEYS = new Set(["questionId", "optionIds", "freeText"]);
@@ -4060,6 +4067,15 @@ var NATIVE_AGENT_APPROVAL_MODES = Object.freeze({
     }
   ]
 });
+var CODEX_CONTAINER_APPROVAL_DESCRIPTIONS = Object.freeze({
+  ask: {
+    "on-request": "Codex has no sandbox of its own in a container, so this asks before any command Codex does not trust, like Untrusted"
+  },
+  "auto-approve": {
+    "on-request": "Codex has no sandbox of its own in a container, so this never asks; choose Untrusted to approve commands",
+    "auto-review": "Codex has no sandbox of its own in a container, so the reviewer is never consulted and everything runs"
+  }
+});
 var NATIVE_AGENT_RETIRED_DISPATCH_TTL_MS = 24 * 60 * 60 * 1000;
 var SUPPRESSED_COMPOSER_PARAMETERS = Object.freeze({
   claude: Object.freeze(["parameter:thinking", "parameter:context1m"]),
@@ -12332,7 +12348,9 @@ var COORDINATOR_CONTROL_TOOL_NAMES = Object.freeze([
   "adopt_workflow",
   "cancel_build_pipeline",
   "cancel_multi_review",
+  "cancel_schedule",
   "compare_project_files",
+  "create_schedule",
   "create_ticket",
   "get_build_pipeline",
   "get_environment",
@@ -12354,6 +12372,7 @@ var COORDINATOR_CONTROL_TOOL_NAMES = Object.freeze([
   "list_node_environments",
   "list_nodes",
   "list_projects",
+  "list_schedules",
   "list_tabs",
   "list_tickets",
   "list_workflows",
@@ -12809,7 +12828,7 @@ function mergePersistedSessionMeta(sessionsById, meta) {
 }
 function isSyntheticPersistedUserText(text) {
   const trimmed = text.trim();
-  return trimmed.startsWith("# AGENTS.md instructions for ") || /^# AGENTS\.md instructions[ \t]*\n\s*<INSTRUCTIONS>/.test(trimmed) || trimmed.startsWith(`<recommended_plugins>
+  return trimmed.startsWith("# AGENTS.md instructions for ") || /^# AGENTS\.md instructions[ \t]*\n\s*<INSTRUCTIONS>/.test(trimmed) || trimmed.startsWith("<environment_context>") && trimmed.endsWith("</environment_context>") || trimmed.startsWith(`<recommended_plugins>
 Here is a list of plugins that are available but not installed.`);
 }
 function extractPersistedMessageContent(content, role) {
@@ -14257,7 +14276,7 @@ class AppServerUnavailableError extends Error {
 class AppServerCircuitOpenError extends Error {
   failures;
   constructor(failures, lastError) {
-    super(`app-server failed to start ${failures} times; not retrying${lastError ? ` (last error: ${lastError})` : ""}`);
+    super(`app-server failed to start ${failures} times; not retrying until the cooldown ends${lastError ? ` (last error: ${lastError})` : ""}`);
     this.name = "AppServerCircuitOpenError";
     this.failures = failures;
   }
@@ -14933,6 +14952,8 @@ function isOwnershipContention(error) {
 var DEFAULT_BACKOFF_MS = [250, 500, 1000, 2000, 5000, 1e4];
 var DEFAULT_CIRCUIT_THRESHOLD = 5;
 var DEFAULT_CIRCUIT_WINDOW_MS = 60000;
+var DEFAULT_CIRCUIT_COOLDOWN_MS = 5 * 60000;
+var DEFAULT_CIRCUIT_MAX_COOLDOWN_MS = 30 * 60000;
 var DEFAULT_SHUTDOWN_GRACE_MS = 5000;
 var INCOMPLETE_PIDFILE_GRACE_MS = 1000;
 var PID_OWNERSHIP_TTL_MS = 24 * 60 * 60 * 1000;
@@ -14947,6 +14968,8 @@ class AppServerSupervisor {
   backoffSchedule;
   circuitThreshold;
   circuitWindowMs;
+  circuitCooldownMs;
+  circuitMaxCooldownMs;
   shutdownGraceMs;
   fingerprintEnvironment;
   notificationQueue = new SerialQueue;
@@ -14959,6 +14982,9 @@ class AppServerSupervisor {
   restartFailures = [];
   restartCount = 0;
   circuitOpen = false;
+  circuitProbeAt = 0;
+  nextCircuitCooldownMs;
+  stopController = new AbortController;
   lastError;
   lastExitCode = null;
   lastExitSignal = null;
@@ -14974,6 +15000,9 @@ class AppServerSupervisor {
     this.backoffSchedule = options.backoffScheduleMs ?? DEFAULT_BACKOFF_MS;
     this.circuitThreshold = options.circuitBreakerThreshold ?? DEFAULT_CIRCUIT_THRESHOLD;
     this.circuitWindowMs = options.circuitWindowMs ?? DEFAULT_CIRCUIT_WINDOW_MS;
+    this.circuitCooldownMs = Math.max(0, options.circuitCooldownMs ?? DEFAULT_CIRCUIT_COOLDOWN_MS);
+    this.circuitMaxCooldownMs = Math.max(this.circuitCooldownMs, options.circuitMaxCooldownMs ?? DEFAULT_CIRCUIT_MAX_COOLDOWN_MS);
+    this.nextCircuitCooldownMs = this.circuitCooldownMs;
     this.shutdownGraceMs = options.shutdownGraceMs ?? DEFAULT_SHUTDOWN_GRACE_MS;
     this.fingerprintEnvironment = options.fingerprintEnvironment ?? fingerprintRuntimeEnvironment;
   }
@@ -15026,13 +15055,15 @@ class AppServerSupervisor {
   async ensureStarted() {
     if (this.stopping)
       throw new AppServerUnavailableError("stopped");
-    if (this.circuitOpen) {
+    if (this.startPromise)
+      return this.startPromise;
+    if (this.circuitOpen && this.now() < this.circuitProbeAt) {
       throw new AppServerCircuitOpenError(this.restartFailures.length, this.lastError);
     }
     if (this.current && !this.current.client.isClosed() && this.state === "ready") {
       return this.current;
     }
-    this.startPromise ??= this.startWithRetry().finally(() => {
+    this.startPromise = this.startWithRetry(this.circuitOpen).finally(() => {
       this.startPromise = null;
     });
     return this.startPromise;
@@ -15069,12 +15100,14 @@ class AppServerSupervisor {
       return;
     await this.current.client.respondWithError(id, code, message);
   }
-  async startWithRetry() {
+  async startWithRetry(probe = false) {
     let attempt = 0;
     for (;; ) {
       try {
         const generation = await this.start();
         this.restartFailures = [];
+        this.circuitOpen = false;
+        this.nextCircuitCooldownMs = this.circuitCooldownMs;
         return generation;
       } catch (error) {
         this.lastError = error instanceof Error ? error.message : String(error);
@@ -15084,7 +15117,7 @@ class AppServerSupervisor {
           this.setState("failed", this.lastError);
           throw error;
         }
-        this.recordFailure();
+        this.recordFailure(probe);
         if (this.circuitOpen) {
           this.setState("failed", this.lastError);
           throw new AppServerCircuitOpenError(this.restartFailures.length, this.lastError);
@@ -15092,19 +15125,21 @@ class AppServerSupervisor {
         const delay = this.backoffDelay(attempt);
         attempt += 1;
         this.setState("backoff", `retrying in ${delay}ms: ${this.lastError}`);
-        await sleep(delay);
+        await sleepUnlessAborted(delay, this.stopController.signal);
         if (this.stopping)
           throw new AppServerUnavailableError("stopped");
       }
     }
   }
-  recordFailure() {
+  recordFailure(probe = false) {
     const now = this.now();
     this.restartFailures = this.restartFailures.filter((at) => now - at <= this.circuitWindowMs);
     this.restartFailures.push(now);
-    if (this.restartFailures.length >= this.circuitThreshold) {
-      this.circuitOpen = true;
-    }
+    if (!probe && this.restartFailures.length < this.circuitThreshold)
+      return;
+    this.circuitOpen = true;
+    this.circuitProbeAt = now + this.nextCircuitCooldownMs;
+    this.nextCircuitCooldownMs = Math.min(this.circuitMaxCooldownMs, Math.max(1, this.nextCircuitCooldownMs) * 2);
   }
   backoffDelay(attempt) {
     const base = this.backoffSchedule[Math.min(attempt, this.backoffSchedule.length - 1)] ?? 1000;
@@ -15349,6 +15384,7 @@ class AppServerSupervisor {
   }
   async stop() {
     this.stopping = true;
+    this.stopController.abort();
     this.setState("draining", "bridge shutting down");
     const pendingStart = this.startPromise;
     const startingChild = this.startingChild;
@@ -15816,6 +15852,20 @@ function sleep(ms) {
     timer.unref?.();
   });
 }
+function sleepUnlessAborted(ms, signal) {
+  if (signal.aborted)
+    return Promise.resolve();
+  return new Promise((resolve) => {
+    const wake = () => {
+      clearTimeout(timer);
+      signal.removeEventListener("abort", wake);
+      resolve();
+    };
+    const timer = setTimeout(wake, ms);
+    timer.unref?.();
+    signal.addEventListener("abort", wake, { once: true });
+  });
+}
 
 // ../../bridges/codex-bridge/src/app-server/approvals.ts
 var MAX_APPROVAL_AMENDMENTS = 16;
@@ -18153,6 +18203,11 @@ function codexProjectTrustConfig(policy, cwd) {
     projects: Object.fromEntries([...roots].map((root) => [root, { trust_level: "untrusted" }]))
   };
 }
+function codexRequestUserInputConfig(policy) {
+  if (!policy || policy.id === "pipeline")
+    return {};
+  return { "features.default_mode_request_user_input": true };
+}
 var MAX_CODEX_DISABLED_SKILLS = 1024;
 var KEPT_SKILL_SCOPES = new Set(["user", "system", "admin"]);
 function codexProjectSkillsConfig(listed) {
@@ -19344,6 +19399,7 @@ class AppServerEngine {
     const threadConfig = {
       ...codexNetworkDeniedConfig(config.policy),
       ...codexProjectTrustConfig(config.policy, cwd),
+      ...codexRequestUserInputConfig(config.policy),
       ...extraConfig,
       ...config.agentMcp ? {
         ...config.agentMcp.design ? {
@@ -19380,7 +19436,6 @@ class AppServerEngine {
         sandbox: config.sandbox ?? (config.mode === "plan" ? "read-only" : "danger-full-access")
       },
       ...config.model ? { model: config.model } : {},
-      ...config.personality ? { personality: config.personality } : {},
       serviceTier: config.serviceTier ?? null,
       ...Object.keys(threadConfig).length > 0 ? { config: threadConfig } : {}
     };
@@ -19913,8 +19968,6 @@ class AppServerEngine {
       ...options.config.model ? { model: options.config.model } : {},
       ...options.config.serviceTier !== undefined ? { serviceTier: options.config.serviceTier } : {},
       ...options.config.reasoningEffort ? { effort: options.config.reasoningEffort } : {},
-      ...options.config.reasoningSummary ? { summary: options.config.reasoningSummary } : {},
-      ...options.config.personality ? { personality: options.config.personality } : {},
       ...options.config.permissionProfile ? {} : { sandboxPolicy: toSandboxPolicy(options.config) }
     };
     const { result, generation } = await this.supervisor.requestWithGeneration("turn/start", params);
@@ -24626,9 +24679,6 @@ class CodexRuntimeLifecycle {
     const policy = coordinatorReadOnly ? codexCoordinatorPolicy() : requestedPolicy;
     const model = typeof body.model === "string" && body.model.trim().length > 0 ? body.model.trim() : undefined;
     const reasoningEffort = typeof body.modelReasoningEffort === "string" ? body.modelReasoningEffort : undefined;
-    const rawParameters = body.parameterValues && typeof body.parameterValues === "object" && !Array.isArray(body.parameterValues) ? body.parameterValues : {};
-    const reasoningSummary = ["auto", "concise", "detailed", "none"].includes(String(rawParameters.summary ?? "")) ? rawParameters.summary : undefined;
-    const personality = ["none", "friendly", "pragmatic"].includes(String(rawParameters.personality ?? "")) ? rawParameters.personality : undefined;
     const rawAgentMcp = body.agentMcp;
     let agentMcp;
     if (rawAgentMcp && typeof rawAgentMcp === "object" && !Array.isArray(rawAgentMcp)) {
@@ -24652,8 +24702,6 @@ class CodexRuntimeLifecycle {
       mode,
       model,
       reasoningEffort,
-      reasoningSummary,
-      personality,
       serviceTier: body.fastMode === true ? "fast" : null,
       cwd: this.ctx.options.cwd,
       approvalPolicy: policy?.approvals === "ask" ? "on-request" : policy?.approvals === "deny" ? "never" : "never",
@@ -27678,7 +27726,7 @@ app.get("/session/:id/mcp", async (c) => {
         ...typeof server.pluginId === "string" ? { scope: "plugin" } : {},
         toolCount: tools.length,
         tools,
-        ...typeof server.error === "string" ? { error: server.error.slice(0, 1000) } : typeof server.toolsError === "string" ? { error: server.toolsError.slice(0, 1000) } : {},
+        ...typeof server.error === "string" ? { error: redactSecrets(server.error).slice(0, 1000) } : typeof server.toolsError === "string" ? { error: redactSecrets(server.toolsError).slice(0, 1000) } : {},
         actions: status === "needs-auth" ? ["sign-in"] : ["reconnect"]
       }
     ];