orkestrator 2.30.0-beta → 2.32.0-beta

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

@@ -331,7 +331,7 @@ function createBridgeDiagnostics(bridge, state, metrics) {
 import { execFile as execFileCallback2 } from "node:child_process";
 import { randomBytes, timingSafeEqual } from "node:crypto";
 import { appendFile as appendFile5, mkdir as mkdir8, readFile as readFile7, writeFile as writeFile6 } from "node:fs/promises";
-import { join as join15 } from "node:path";
+import { join as join17 } from "node:path";
 import { promisify as promisify2 } from "node:util";
 
 // ../../node_modules/.bun/@hono+node-server@2.1.5+c539cad7f494f5c9/node_modules/@hono/node-server/dist/constants-BLSFu_RU.mjs
@@ -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"]),
@@ -5925,8 +5941,18 @@ function registerCodexChangeEvidenceRoutes(app, spool) {
 
 // ../../bridges/codex-bridge/src/change-evidence.ts
 import { createHash as createHash5 } from "node:crypto";
-import { existsSync } from "node:fs";
-import { join as join6 } from "node:path";
+import { existsSync as existsSync2 } from "node:fs";
+import { basename, join as join8 } from "node:path";
+
+// ../../bridges/codex-bridge/src/bridge-state-dir.ts
+import { isAbsolute as isAbsolute2, join as join2 } from "node:path";
+function codexBridgeStateDir(codexHome, env = process.env) {
+  const override = env.CODEX_BRIDGE_STATE_DIR?.trim();
+  return override && isAbsolute2(override) ? override : codexLoginBridgeDir(codexHome);
+}
+function codexLoginBridgeDir(codexHome) {
+  return join2(codexHome, "orkestrator-bridge");
+}
 
 // ../protocol/src/change-evidence.ts
 var PROVIDER_EVIDENCE_SCHEMA_VERSION = 1;
@@ -6324,7 +6350,7 @@ function workspaceObservationReportIssues(value) {
 import { createHash as createHash4, randomUUID as randomUUID3 } from "node:crypto";
 import { readdirSync, readFileSync } from "node:fs";
 import { appendFile, mkdir, rename, rm as rm2, writeFile } from "node:fs/promises";
-import { join as join2 } from "node:path";
+import { join as join3 } from "node:path";
 var DEFAULT_EVIDENCE_SPOOL_LIMITS = {
   maxEntries: 2048,
   maxEntryBytes: 256 * 1024,
@@ -6587,7 +6613,7 @@ class ChangeEvidenceSpool {
     const lines = this.pendingLines.splice(0).join("");
     this.enqueueIo(async () => {
       await mkdir(directory, { recursive: true, mode: 448 });
-      await appendFile(join2(directory, ENTRIES_FILE), lines, { mode: 384 });
+      await appendFile(join3(directory, ENTRIES_FILE), lines, { mode: 384 });
     });
   }
   persistBody(id, bytes) {
@@ -6595,9 +6621,9 @@ class ChangeEvidenceSpool {
     if (!directory || this.restoring)
       return;
     this.enqueueIo(async () => {
-      const bodies = join2(directory, BODY_DIRECTORY);
+      const bodies = join3(directory, BODY_DIRECTORY);
       await mkdir(bodies, { recursive: true, mode: 448 });
-      await writeFile(join2(bodies, bodyFileName(id)), bytes, { mode: 384, flag: "wx" }).catch((error) => {
+      await writeFile(join3(bodies, bodyFileName(id)), bytes, { mode: 384, flag: "wx" }).catch((error) => {
         if (error.code !== "EEXIST")
           throw error;
       });
@@ -6607,7 +6633,7 @@ class ChangeEvidenceSpool {
     const directory = this.directory;
     if (!directory)
       return;
-    this.enqueueIo(() => rm2(join2(directory, BODY_DIRECTORY, bodyFileName(id)), { force: true }));
+    this.enqueueIo(() => rm2(join3(directory, BODY_DIRECTORY, bodyFileName(id)), { force: true }));
   }
   compactPersisted() {
     const directory = this.directory;
@@ -6618,7 +6644,7 @@ class ChangeEvidenceSpool {
 `);
     this.enqueueIo(async () => {
       await mkdir(directory, { recursive: true, mode: 448 });
-      const file = join2(directory, ENTRIES_FILE);
+      const file = join3(directory, ENTRIES_FILE);
       const temp = `${file}.${process.pid}.tmp`;
       await writeFile(temp, body ? `${body}
 ` : "", { mode: 384 });
@@ -6630,10 +6656,10 @@ class ChangeEvidenceSpool {
     await this.io;
   }
   restore(directory) {
-    const bodyDirectory = join2(directory, BODY_DIRECTORY);
+    const bodyDirectory = join3(directory, BODY_DIRECTORY);
     try {
       for (const name of readdirSync(bodyDirectory)) {
-        const bytes = new Uint8Array(readFileSync(join2(bodyDirectory, name)));
+        const bytes = new Uint8Array(readFileSync(join3(bodyDirectory, name)));
         const id = evidenceBodyId(bytes);
         if (bodyFileName(id) !== name)
           continue;
@@ -6645,7 +6671,7 @@ class ChangeEvidenceSpool {
     } catch {}
     let text = "";
     try {
-      text = readFileSync(join2(directory, ENTRIES_FILE), "utf8");
+      text = readFileSync(join3(directory, ENTRIES_FILE), "utf8");
     } catch {
       return;
     }
@@ -6983,7 +7009,7 @@ function canonicalEvidence(evidence) {
 }
 
 // ../../bridges/codex-bridge/src/messages/apply-patch.ts
-import { isAbsolute as isAbsolute2, join as join3 } from "node:path";
+import { isAbsolute as isAbsolute3, join as join4 } from "node:path";
 
 // ../../bridges/codex-bridge/src/messages/diff-budget.ts
 var MAX_INLINE_FILE_BYTES = 256 * 1024;
@@ -7137,7 +7163,7 @@ function rawPatchTitle(change) {
 }
 function rawApplyPatchParts(value, cwd, state) {
   return parseRawApplyPatchChanges(value).map((change) => {
-    const filePath = isAbsolute2(change.targetPath) ? change.targetPath : join3(cwd, change.targetPath);
+    const filePath = isAbsolute3(change.targetPath) ? change.targetPath : join4(cwd, change.targetPath);
     return {
       type: "tool-invocation",
       content: change.targetPath,
@@ -7160,7 +7186,7 @@ function rawApplyPatchParts(value, cwd, state) {
 }
 
 // ../../bridges/codex-bridge/src/messages/file-change-diff.ts
-import { isAbsolute as isAbsolute3, join as join4, relative } from "node:path";
+import { isAbsolute as isAbsolute4, join as join5, relative } from "node:path";
 var MOVED_TO_SUFFIX = /\n\nMoved to: ([^\n]+)\n?$/;
 var UNIFIED_START = /^(?:@@ -\d+(?:,\d+)? \+\d+(?:,\d+)? @@|--- |diff --git )/;
 function suppliedFileChange(change) {
@@ -7184,7 +7210,7 @@ function suppliedFileChange(change) {
   };
 }
 function headerPath(cwd, path) {
-  return isAbsolute3(path) ? relative(cwd, path) || path : path;
+  return isAbsolute4(path) ? relative(cwd, path) || path : path;
 }
 function contentLines(content) {
   if (content.length === 0)
@@ -7223,11 +7249,11 @@ ${supplied.hunks}`;
 `);
 }
 function resolvedChangePath(cwd, path) {
-  return isAbsolute3(path) ? path : join4(cwd, path);
+  return isAbsolute4(path) ? path : join5(cwd, path);
 }
 
 // ../../bridges/codex-bridge/src/sessions/command-changes.ts
-import { isAbsolute as isAbsolute4, join as join5 } from "node:path";
+import { isAbsolute as isAbsolute5, join as join6 } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // ../protocol/src/node/command-change-journal.ts
@@ -7408,7 +7434,7 @@ function journalFileName(threadId) {
 }
 function commandChangeJournalPath(codexHome, threadId) {
   const fileName = journalFileName(threadId);
-  return fileName ? join5(codexHome, "orkestrator-bridge", "command-changes", fileName) : undefined;
+  return fileName ? join6(codexBridgeStateDir(codexHome), "command-changes", fileName) : undefined;
 }
 function commandChangeJournalFor(codexHome, threadId) {
   const path = commandChangeJournalPath(codexHome, threadId);
@@ -7433,7 +7459,13 @@ async function readCommandChanges(codexHome, threadId) {
   const journal = commandChangeJournalFor(codexHome, threadId);
   if (!journal)
     return new Map;
-  return journal.read().catch(() => new Map);
+  const current = await journal.read().catch(() => new Map);
+  const fileName = journalFileName(threadId);
+  const legacyPath = fileName ? join6(codexLoginBridgeDir(codexHome), "command-changes", fileName) : undefined;
+  if (!legacyPath || legacyPath === commandChangeJournalPath(codexHome, threadId))
+    return current;
+  const legacy = await new CommandChangeJournal(legacyPath).read().catch(() => new Map);
+  return legacy.size === 0 ? current : new Map([...legacy, ...current]);
 }
 function recordCommandChanges(codexHome, threadId, toolUseId, change) {
   if (!hasMeasuredChanges(change))
@@ -7463,7 +7495,7 @@ function commandChangeCwd(item, fallback) {
       return fallback;
     }
   }
-  return isAbsolute4(item.cwd) ? item.cwd : fallback;
+  return isAbsolute5(item.cwd) ? item.cwd : fallback;
 }
 function commandDidNotRun(item) {
   return item.type === "command_execution" && item.status === "failed" && item.exit_code === undefined;
@@ -7540,8 +7572,111 @@ async function inheritCommandChanges(codexHome, parentThreadId, forkThreadId, me
     journal?.append(id, change);
 }
 
+// ../../bridges/codex-bridge/src/change-evidence-migration.ts
+import { randomUUID as randomUUID4 } from "node:crypto";
+import {
+  existsSync,
+  mkdirSync,
+  readFileSync as readFileSync2,
+  readdirSync as readdirSync2,
+  renameSync,
+  rmSync as rmSync2,
+  statSync,
+  writeFileSync
+} from "node:fs";
+import { join as join7, resolve as resolve2 } from "node:path";
+import { isDeepStrictEqual } from "node:util";
+function readBounded(path, limit) {
+  if (statSync(path).size > limit)
+    throw new Error("Evidence migration exceeds storage capacity");
+  const bytes = readFileSync2(path);
+  if (bytes.length > limit)
+    throw new Error("Evidence migration exceeds storage capacity");
+  return bytes;
+}
+function publishFile(path, contents) {
+  const temporary = `${path}.${randomUUID4()}.tmp`;
+  try {
+    writeFileSync(temporary, contents, { mode: 384 });
+    renameSync(temporary, path);
+  } finally {
+    rmSync2(temporary, { force: true });
+  }
+}
+function migrateCodexChangeEvidence(legacy, shared) {
+  if (resolve2(legacy) === resolve2(shared))
+    return;
+  const legacyFile = join7(legacy, "entries.jsonl");
+  if (!existsSync(legacyFile))
+    return;
+  const entries = new Map;
+  const bodyIds = new Set;
+  for (const directory of [shared, legacy]) {
+    const file = join7(directory, "entries.jsonl");
+    if (!existsSync(file))
+      continue;
+    for (const line of readBounded(file, DEFAULT_EVIDENCE_SPOOL_LIMITS.maxQueuedBytes).toString("utf8").split(`
+`)) {
+      if (!line)
+        continue;
+      const entry = JSON.parse(line).entry;
+      let identity;
+      if (entry?.type === "frame" && isProviderEvidenceFrame(entry.frame)) {
+        identity = `frame:${entry.frame.frameId}`;
+        for (const id of collectBodyIds(entry.frame))
+          bodyIds.add(id);
+      } else if (entry?.type === "observation" && workspaceObservationReportIssues(entry.report).length === 0) {
+        identity = `observation:${entry.report.reportId}`;
+      } else {
+        throw new Error("Evidence migration encountered an invalid entry");
+      }
+      const normalized = { ...entry, seq: 0 };
+      const existing = entries.get(identity);
+      if (existing && !isDeepStrictEqual(existing, normalized)) {
+        throw new Error("Evidence migration encountered conflicting identities");
+      }
+      entries.set(identity, normalized);
+    }
+  }
+  const lines = [...entries.values()].map((entry, index) => {
+    const serialized = JSON.stringify({ ...entry, seq: index + 1 });
+    if (serialized.length > DEFAULT_EVIDENCE_SPOOL_LIMITS.maxEntryBytes) {
+      throw new Error("Evidence migration exceeds entry capacity");
+    }
+    return JSON.stringify({ entry: { ...entry, seq: index + 1 } });
+  });
+  const contents = lines.length ? `${lines.join(`
+`)}
+` : "";
+  if (entries.size >= DEFAULT_EVIDENCE_SPOOL_LIMITS.maxEntries || Buffer.byteLength(contents) > DEFAULT_EVIDENCE_SPOOL_LIMITS.maxQueuedBytes) {
+    throw new Error("Evidence migration exceeds queue capacity");
+  }
+  mkdirSync(join7(shared, "bodies"), { recursive: true, mode: 448 });
+  let bodyBytes = 0;
+  for (const id of bodyIds) {
+    const name = id.replace(/[^A-Za-z0-9]/g, "_");
+    const target = join7(shared, "bodies", name);
+    const bytes = readBounded(existsSync(target) ? target : join7(legacy, "bodies", name), DEFAULT_EVIDENCE_SPOOL_LIMITS.maxSingleBodyBytes);
+    if (evidenceBodyId(bytes) !== id)
+      throw new Error("Evidence migration body integrity failed");
+    bodyBytes += bytes.length;
+    if (bodyBytes > DEFAULT_EVIDENCE_SPOOL_LIMITS.maxBodyBytes)
+      throw new Error("Evidence migration exceeds body capacity");
+    if (!existsSync(target))
+      publishFile(target, bytes);
+  }
+  const retainedNames = new Set([...bodyIds].map((id) => id.replace(/[^A-Za-z0-9]/g, "_")));
+  for (const name of readdirSync2(join7(shared, "bodies"))) {
+    if (/^sha256_[a-f0-9]{64}$/.test(name) && !retainedNames.has(name)) {
+      rmSync2(join7(shared, "bodies", name));
+    }
+  }
+  publishFile(join7(shared, "entries.jsonl"), contents);
+  rmSync2(legacyFile);
+}
+
 // ../../bridges/codex-bridge/src/change-evidence.ts
-function detectCaptureExecutor(exists = existsSync) {
+function detectCaptureExecutor(exists = existsSync2) {
   return exists("/.dockerenv") || exists("/run/.containerenv") ? "container-worker" : "host-worker";
 }
 function codexChangeCapabilities(executor) {
@@ -7777,13 +7912,13 @@ function suppliedMovePath(change) {
 }
 function codexChangeEvidenceDir(codexHome, cwd) {
   const cwdHash = createHash5("sha256").update(cwd).digest("hex").slice(0, 16);
-  return join6(codexHome, "orkestrator-bridge", "change-evidence", cwdHash);
+  return join8(codexBridgeStateDir(codexHome), "change-evidence", cwdHash);
 }
 function createCodexChangeEvidence(options) {
+  const directory = codexChangeEvidenceDir(options.codexHome, options.cwd);
+  migrateCodexChangeEvidence(join8(codexLoginBridgeDir(options.codexHome), "change-evidence", basename(directory)), directory);
   return new CodexChangeEvidence({
-    spool: new ChangeEvidenceSpool({
-      directory: codexChangeEvidenceDir(options.codexHome, options.cwd)
-    }),
+    spool: new ChangeEvidenceSpool({ directory }),
     executor: options.executor ?? detectCaptureExecutor()
   });
 }
@@ -7812,7 +7947,7 @@ function codexApprovalConfig(policy, sandbox, mode) {
 import { spawn as spawn2 } from "node:child_process";
 import { appendFile as appendFile3, mkdir as mkdir3, mkdtemp as mkdtemp2, readFile as readFile2, rm as rm4, writeFile as writeFile3 } from "node:fs/promises";
 import { tmpdir as tmpdir2 } from "node:os";
-import { join as join7 } from "node:path";
+import { join as join9 } from "node:path";
 
 // ../protocol/src/codex-background-task.ts
 var CODEX_BACKGROUND_TASK_MODEL = "gpt-5.6-luna";
@@ -7892,7 +8027,7 @@ async function refreshRuntimeEnvironment(run = execFile2) {
       `if [ -f "$${RUNTIME_ENV_SCRIPT_ENV}" ]; then . "$${RUNTIME_ENV_SCRIPT_ENV}" 2>/dev/null || true; orkestrator_source_runtime_env 2>/dev/null || true; fi; env`
     ], {
       env: {
-        ...process.env,
+        ...runtimeEnvironmentSnapshot(),
         [RUNTIME_ENV_SCRIPT_ENV]: runtimeEnvScript
       },
       maxBuffer: 256 * 1024
@@ -7916,7 +8051,9 @@ function fingerprintRuntimeEnvironment(env = process.env) {
   return `sha256:${hash.digest("hex").slice(0, 32)}`;
 }
 function runtimeEnvironmentSnapshot(env = process.env) {
-  return { ...env };
+  const snapshot = { ...env };
+  delete snapshot.CODEX_BRIDGE_STATE_DIR;
+  return snapshot;
 }
 function runtimeEnvironmentWithoutCredentials(env = process.env) {
   const snapshot = runtimeEnvironmentSnapshot(env);
@@ -8201,10 +8338,10 @@ async function runCodexTitleCommand(codexPath, args, input, options = {}) {
   });
 }
 async function generateSessionTitleWithCodexExec(codexPath, sourcePrompt, options = {}) {
-  const temporaryDirectory = await mkdtemp2(join7(options.temporaryRoot ?? tmpdir2(), "orkestrator-session-title-"));
-  const outputPath = join7(temporaryDirectory, "title.txt");
-  const modelCatalogPath = join7(temporaryDirectory, "model-catalog.json");
-  const outputSchemaPath = join7(temporaryDirectory, "title-schema.json");
+  const temporaryDirectory = await mkdtemp2(join9(options.temporaryRoot ?? tmpdir2(), "orkestrator-session-title-"));
+  const outputPath = join9(temporaryDirectory, "title.txt");
+  const modelCatalogPath = join9(temporaryDirectory, "model-catalog.json");
+  const outputSchemaPath = join9(temporaryDirectory, "title-schema.json");
   const maxOutputBytes = options.maxOutputBytes ?? MAX_COMMAND_OUTPUT_LENGTH;
   try {
     await Promise.all([
@@ -8235,7 +8372,11 @@ async function generateSessionTitleWithCodexExec(codexPath, sourcePrompt, option
   }
 }
 function sessionTitleIndexPath(codexHome) {
-  return join7(codexHome, "orkestrator-bridge", SESSION_TITLE_INDEX_FILENAME);
+  return join9(codexBridgeStateDir(codexHome), SESSION_TITLE_INDEX_FILENAME);
+}
+function legacySessionTitleIndexPath(codexHome) {
+  const legacy = join9(codexLoginBridgeDir(codexHome), SESSION_TITLE_INDEX_FILENAME);
+  return legacy === sessionTitleIndexPath(codexHome) ? undefined : legacy;
 }
 function persistedSourcePriority(source) {
   if (source === "explicit")
@@ -8245,7 +8386,11 @@ function persistedSourcePriority(source) {
   return 1;
 }
 async function readPersistedSessionTitleEntries(codexHome) {
-  const raw = await readFile2(sessionTitleIndexPath(codexHome), "utf8").catch(() => "");
+  const legacyPath = legacySessionTitleIndexPath(codexHome);
+  const legacy = legacyPath ? await readFile2(legacyPath, "utf8").catch(() => "") : "";
+  const current = await readFile2(sessionTitleIndexPath(codexHome), "utf8").catch(() => "");
+  const raw = legacy ? `${legacy}
+${current}` : current;
   const selected = new Map;
   for (const [lineIndex, line] of raw.split(`
 `).entries()) {
@@ -8290,7 +8435,7 @@ async function persistSessionTitle(codexHome, threadId, title, options = {}) {
     throw new Error("Session title updatedAt must be a valid date");
   }
   const updatedAt = requestedUpdatedAt.toISOString();
-  const directory = join7(codexHome, "orkestrator-bridge");
+  const directory = codexBridgeStateDir(codexHome);
   await mkdir3(directory, { recursive: true });
   await appendFile3(sessionTitleIndexPath(codexHome), `${JSON.stringify({
     threadId: normalizedThreadId,
@@ -10809,7 +10954,7 @@ async function deriveTranscriptSubagentPartsForTurn({
 import { createHash as createHash7 } from "node:crypto";
 import { readFile as readFile4, readdir, stat as stat4 } from "node:fs/promises";
 import { homedir } from "node:os";
-import { basename, join as join8 } from "node:path";
+import { basename as basename2, join as join10 } from "node:path";
 
 // ../../bridges/codex-bridge/src/sessions/refused-cell-tail.ts
 import { open as open2, stat as stat3 } from "node:fs/promises";
@@ -11005,7 +11150,7 @@ class RefusedCellTail {
 }
 
 // ../../bridges/codex-bridge/src/app-server/item-adapter.ts
-import { isAbsolute as isAbsolute5 } from "node:path";
+import { isAbsolute as isAbsolute6 } from "node:path";
 function isRecord5(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
@@ -11027,7 +11172,7 @@ function imageGenerationInputPaths(value) {
     if (paths.size >= MAX_IMAGE_GENERATION_INPUTS)
       break;
     const path = isRecord5(entry) ? str(entry.path) : undefined;
-    if (path && isAbsolute5(path))
+    if (path && isAbsolute6(path))
       paths.add(path);
   }
   return [...paths];
@@ -11374,6 +11519,28 @@ function mapTodoArgs(items) {
   };
 }
 
+// ../../bridges/codex-bridge/src/messages/turn-failure.ts
+var MAX_TURN_FAILURE_CHARS = 2000;
+function turnFailureItemId(turnId) {
+  return `turn-error:${turnId}`;
+}
+function turnFailureText(message) {
+  const raw = message.trim();
+  let text = raw;
+  if (raw.startsWith("{")) {
+    try {
+      const body = JSON.parse(raw);
+      const nested = body.error && typeof body.error === "object" ? body.error.message : undefined;
+      const candidate = typeof nested === "string" ? nested : body.message;
+      if (typeof candidate === "string" && candidate.trim())
+        text = candidate.trim();
+    } catch {}
+  }
+  if (!text)
+    text = "Codex ended the turn on an error.";
+  return text.length > MAX_TURN_FAILURE_CHARS ? `${text.slice(0, MAX_TURN_FAILURE_CHARS - 1)}…` : text;
+}
+
 // ../../bridges/codex-bridge/src/sessions/turn-accumulator.ts
 var MAX_ITEM_PROGRESS_CHARS = 200;
 var MODEL_STEP_TOOL_ITEM_TYPES = new Set([
@@ -11695,6 +11862,14 @@ class TurnAccumulator {
         this.touch(accumulator);
     }
   }
+  recordProviderFailure(error) {
+    this.onItemCompleted({
+      id: turnFailureItemId(this.turnId),
+      type: "status",
+      text: turnFailureText(error.message),
+      severity: "error"
+    });
+  }
   interruptOpenAgentMessages(keepId) {
     for (const id of Array.from(this.openAgentMessageIds)) {
       if (id === keepId)
@@ -12332,7 +12507,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 +12531,7 @@ var COORDINATOR_CONTROL_TOOL_NAMES = Object.freeze([
   "list_node_environments",
   "list_nodes",
   "list_projects",
+  "list_schedules",
   "list_tabs",
   "list_tickets",
   "list_workflows",
@@ -12393,7 +12571,7 @@ function stripCoordinatorContext(text) {
 
 // ../../bridges/codex-bridge/src/history/rollout.ts
 function getCodexHomeDir() {
-  return process.env.CODEX_HOME || join8(homedir(), ".codex");
+  return process.env.CODEX_HOME || join10(homedir(), ".codex");
 }
 function getWorkingDirectory(explicitCwd) {
   return explicitCwd || process.env.CWD || process.cwd();
@@ -12407,7 +12585,7 @@ async function walkJsonlFiles(dir) {
   }
   const files = [];
   for (const entry of entries) {
-    const absolutePath = join8(dir, entry.name);
+    const absolutePath = join10(dir, entry.name);
     if (entry.isDirectory()) {
       files.push(...await walkJsonlFiles(absolutePath));
       continue;
@@ -12419,7 +12597,7 @@ async function walkJsonlFiles(dir) {
   return files;
 }
 async function listTranscriptPaths(codexHome = getCodexHomeDir()) {
-  const searchRoots = [join8(codexHome, "sessions"), join8(codexHome, "archived_sessions")];
+  const searchRoots = [join10(codexHome, "sessions"), join10(codexHome, "archived_sessions")];
   return (await Promise.all(searchRoots.map((root) => walkJsonlFiles(root)))).flat();
 }
 var cachedTranscriptPaths = new Map;
@@ -12446,7 +12624,7 @@ function rememberTranscriptPath(threadId, path) {
 }
 function selectTranscriptPath(paths, threadId) {
   const anchored = paths.find((file) => {
-    const stem = basename(file).replace(/\.jsonl$/, "");
+    const stem = basename2(file).replace(/\.jsonl$/, "");
     return stem === threadId || stem.endsWith(`-${threadId}`);
   });
   return anchored ?? paths.find((file) => file.includes(threadId)) ?? null;
@@ -12562,8 +12740,8 @@ async function buildTranscriptCatalog() {
   const metaByPath = new Map;
   const transcriptPathByThreadId = new Map;
   for (const root of [
-    join8(getCodexHomeDir(), "sessions"),
-    join8(getCodexHomeDir(), "archived_sessions")
+    join10(getCodexHomeDir(), "sessions"),
+    join10(getCodexHomeDir(), "archived_sessions")
   ]) {
     const files = await walkJsonlFiles(root);
     for (const transcriptPath of files) {
@@ -12573,7 +12751,7 @@ async function buildTranscriptCatalog() {
       }
       metas.push(meta);
       metaByPath.set(transcriptPath, meta);
-      const fileThreadId = basename(transcriptPath, ".jsonl");
+      const fileThreadId = basename2(transcriptPath, ".jsonl");
       if (!transcriptPathByThreadId.has(fileThreadId)) {
         transcriptPathByThreadId.set(fileThreadId, transcriptPath);
       }
@@ -12758,7 +12936,7 @@ async function listPersistedSessionsForCwd(cwd, options) {
   return (await listPersistedSessionsWithTitlesForCwd(cwd, options)).sessions;
 }
 async function listPersistedSessionsWithTitlesForCwd(cwd, options) {
-  const indexPath = join8(getCodexHomeDir(), "session_index.jsonl");
+  const indexPath = join10(getCodexHomeDir(), "session_index.jsonl");
   const lines = await readTranscriptLines(indexPath);
   const sessions = new Map;
   const transcriptCatalog = await buildTranscriptCatalogCached(options?.mustContainThreadId);
@@ -12807,9 +12985,16 @@ function mergePersistedSessionMeta(sessionsById, meta) {
     indexed.updatedAt = meta.updatedAt;
   }
 }
+var CODEX_CONTEXT_FRAGMENTS = [
+  ["<environment_context>", "</environment_context>"],
+  ["<skill>", "</skill>"],
+  ["<turn_aborted>", "</turn_aborted>"],
+  ["<subagent_notification>", "</subagent_notification>"],
+  ["<user_shell_command>", "</user_shell_command>"]
+];
 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) || CODEX_CONTEXT_FRAGMENTS.some(([open, close]) => trimmed.startsWith(open) && trimmed.endsWith(close)) || trimmed.startsWith(`<recommended_plugins>
 Here is a list of plugins that are available but not installed.`);
 }
 function extractPersistedMessageContent(content, role) {
@@ -12826,6 +13011,9 @@ function extractPersistedMessageContent(content, role) {
   if (segments.length === 0) {
     return null;
   }
+  if (role === "user" && segments.every((segment) => !segment.trim() || isSyntheticPersistedUserText(segment))) {
+    return null;
+  }
   const joined = segments.join(`
 `).trim();
   if (!joined) {
@@ -12835,7 +13023,7 @@ function extractPersistedMessageContent(content, role) {
   if (!text && parts.length === 0) {
     return null;
   }
-  if (role === "user" && isSyntheticPersistedUserText(text)) {
+  if (role === "user" && segments.length === 1 && isSyntheticPersistedUserText(text)) {
     return null;
   }
   return { text, attachments: parts };
@@ -12887,7 +13075,7 @@ function persistedOutputState(payloadType, part, output) {
   return payloadType === "custom_tool_call_output" ? resolveTranscriptToolOutputState(part.toolName, output, part.toolState ?? null) : null;
 }
 async function findSessionIndexEntry(threadId) {
-  const lines = await readTranscriptLines(join8(getCodexHomeDir(), "session_index.jsonl"));
+  const lines = await readTranscriptLines(join10(getCodexHomeDir(), "session_index.jsonl"));
   let match = null;
   for (const line of lines) {
     let parsed;
@@ -13219,6 +13407,17 @@ async function replayPersistedRollout(threadId, snapshot, meta, structuredTurns)
       visitCompletedItem(record.payload.item, timestamp);
       return;
     }
+    if (record.type === "event_msg" && record.payload?.type === "task_complete") {
+      const error = record.payload.error;
+      if (error && typeof error === "object" && typeof error.message === "string") {
+        ensureAssistantMessage(timestamp).parts.push({
+          type: "status",
+          severity: "error",
+          content: turnFailureText(error.message)
+        });
+      }
+      return;
+    }
     if (record.type === "token_usage_record" || record.type === "event_msg" && record.payload?.type === "token_count") {
       if (currentRowCalledTool)
         responseCompletedInRow = true;
@@ -14108,7 +14307,7 @@ async function publishAssistantRows(context, state, turn, options) {
 }
 
 // ../../bridges/codex-bridge/src/app-server-runtime-sessions.ts
-import { createHash as createHash10, randomUUID as randomUUID6 } from "node:crypto";
+import { createHash as createHash10, randomUUID as randomUUID7 } from "node:crypto";
 
 // ../protocol/src/agent-mail.ts
 var AGENT_MAIL_MAX_BODY_BYTES = 32 * 1024;
@@ -14173,11 +14372,11 @@ var ORKESTRATOR_ARTIFACT_MCP_PATH = "/artifact-mcp";
 // ../../bridges/codex-bridge/src/engine/app-server-engine.ts
 import { open as open6 } from "node:fs/promises";
 import { createHash as createHash9 } from "node:crypto";
-import { isAbsolute as isAbsolute7, join as join13 } from "node:path";
+import { isAbsolute as isAbsolute8, join as join15 } from "node:path";
 
 // ../../bridges/codex-bridge/src/app-server/process-supervisor.ts
 import { execFile as execFile3, spawn as spawn3 } from "node:child_process";
-import { randomUUID as randomUUID4 } from "node:crypto";
+import { randomUUID as randomUUID5 } from "node:crypto";
 import {
   link,
   mkdir as mkdir5,
@@ -14188,7 +14387,7 @@ import {
   rm as rm5,
   stat as stat5
 } from "node:fs/promises";
-import { join as join10 } from "node:path";
+import { join as join12 } from "node:path";
 
 // ../../bridges/codex-bridge/src/app-server/errors.ts
 var APP_SERVER_OVERLOAD_CODE = -32001;
@@ -14257,7 +14456,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;
   }
@@ -14776,7 +14975,7 @@ class SerialQueue {
 
 // ../../bridges/codex-bridge/src/app-server/notification-recorder.ts
 import { appendFile as appendFile4, mkdir as mkdir4 } from "node:fs/promises";
-import { join as join9 } from "node:path";
+import { join as join11 } from "node:path";
 var DEFAULT_MAX_RECORDING_BYTES = 64 * 1024 * 1024;
 var DEFAULT_FLUSH_INTERVAL_MS = 250;
 var DEFAULT_WARN_INTERVAL_MS = 60000;
@@ -14802,7 +15001,7 @@ class NotificationRecorder {
   stats;
   constructor(options) {
     this.options = options;
-    this.path = join9(options.directory, options.fileName);
+    this.path = join11(options.directory, options.fileName);
     this.maxBytes = options.maxBytes ?? DEFAULT_MAX_RECORDING_BYTES;
     this.flushIntervalMs = options.flushIntervalMs ?? DEFAULT_FLUSH_INTERVAL_MS;
     this.warnIntervalMs = options.warnIntervalMs ?? DEFAULT_WARN_INTERVAL_MS;
@@ -14933,6 +15132,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 +15148,8 @@ class AppServerSupervisor {
   backoffSchedule;
   circuitThreshold;
   circuitWindowMs;
+  circuitCooldownMs;
+  circuitMaxCooldownMs;
   shutdownGraceMs;
   fingerprintEnvironment;
   notificationQueue = new SerialQueue;
@@ -14959,6 +15162,9 @@ class AppServerSupervisor {
   restartFailures = [];
   restartCount = 0;
   circuitOpen = false;
+  circuitProbeAt = 0;
+  nextCircuitCooldownMs;
+  stopController = new AbortController;
   lastError;
   lastExitCode = null;
   lastExitSignal = null;
@@ -14966,7 +15172,7 @@ class AppServerSupervisor {
   unknownNotifications = 0;
   unknownServerRequests = 0;
   drainPromise = null;
-  pidOwnerToken = randomUUID4();
+  pidOwnerToken = randomUUID5();
   pidOwnershipHeld = false;
   constructor(options) {
     this.options = options;
@@ -14974,6 +15180,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 +15235,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 +15280,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 +15297,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 +15305,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;
@@ -15116,7 +15331,7 @@ class AppServerSupervisor {
     if (this.stopping)
       throw new AppServerUnavailableError("stopped");
     const environmentFingerprint = this.fingerprintEnvironment();
-    const instanceId = randomUUID4();
+    const instanceId = randomUUID5();
     const instanceStartedAt = this.now();
     if (this.options.pidFileEnabled !== false && !this.pidOwnershipHeld) {
       const available = await this.acquirePidFileOwnership(instanceId);
@@ -15134,7 +15349,7 @@ class AppServerSupervisor {
     const child = spawnFn(this.options.codexPath, args, {
       cwd: this.options.cwd,
       env: {
-        ...process.env,
+        ...runtimeEnvironmentSnapshot(),
         CODEX_HOME: this.options.codexHome,
         LOG_FORMAT: "json",
         ORKESTRATOR_APP_SERVER_INSTANCE_ID: instanceId
@@ -15349,6 +15564,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;
@@ -15409,10 +15625,10 @@ class AppServerSupervisor {
     } catch {}
   }
   pidFileDir() {
-    return join10(this.options.codexHome, "orkestrator-bridge");
+    return join12(this.options.codexHome, "orkestrator-bridge");
   }
   pidFilePath() {
-    return join10(this.pidFileDir(), `app-server-${hashPath(this.options.cwd)}.pid`);
+    return join12(this.pidFileDir(), `app-server-${hashPath(this.options.cwd)}.pid`);
   }
   async readOwnedPidRecord(path) {
     let raw;
@@ -15670,7 +15886,7 @@ function runPs(args) {
   return new Promise((resolve, reject) => {
     execFile3("/bin/ps", args, {
       maxBuffer: 1024 * 1024,
-      env: { ...process.env, LC_ALL: "C", LANG: "C", TZ: process.env.TZ }
+      env: { ...runtimeEnvironmentSnapshot(), LC_ALL: "C", LANG: "C", TZ: process.env.TZ }
     }, (error, stdout) => {
       if (error)
         reject(error);
@@ -15816,6 +16032,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;
@@ -17336,10 +17566,10 @@ function redactSecrets(value) {
 
 // ../../bridges/codex-bridge/src/sessions/dispatch-journal.ts
 import { mkdir as mkdir7, open as open4, rename as rename5, rm as rm7, writeFile as writeFile5 } from "node:fs/promises";
-import { join as join12 } from "node:path";
+import { join as join14 } from "node:path";
 
 // ../../bridges/codex-bridge/src/sessions/persistence.ts
-import { createHash as createHash8, randomUUID as randomUUID5 } from "node:crypto";
+import { createHash as createHash8, randomUUID as randomUUID6 } from "node:crypto";
 import {
   chmod,
   link as link2,
@@ -17351,7 +17581,7 @@ import {
   stat as stat6,
   writeFile as writeFile4
 } from "node:fs/promises";
-import { join as join11 } from "node:path";
+import { join as join13 } from "node:path";
 var BRIDGE_SESSION_REGISTRY_VERSION = 2;
 var SESSION_TITLE_SOURCES = new Set([
   "codex",
@@ -17453,19 +17683,23 @@ class BridgeSessionStore {
     this.now = options.now ?? Date.now;
   }
   dir() {
-    return join11(this.codexHome, "orkestrator-bridge");
+    return codexBridgeStateDir(this.codexHome);
   }
   path() {
-    return join11(this.dir(), `bridge-sessions-${this.cwdHash}.json`);
+    return join13(this.dir(), `bridge-sessions-${this.cwdHash}.json`);
   }
   recordsDir() {
-    return join11(this.dir(), `bridge-sessions-${this.cwdHash}`);
+    return join13(this.dir(), `bridge-sessions-${this.cwdHash}`);
+  }
+  loginRecordsDir() {
+    const directory = join13(codexLoginBridgeDir(this.codexHome), `bridge-sessions-${this.cwdHash}`);
+    return directory === this.recordsDir() ? undefined : directory;
   }
   recordKey(bridgeSessionId) {
     return createHash8("sha256").update(bridgeSessionId).digest("hex");
   }
   recordPath(bridgeSessionId) {
-    return join11(this.recordsDir(), `${this.recordKey(bridgeSessionId)}.json`);
+    return join13(this.recordsDir(), `${this.recordKey(bridgeSessionId)}.json`);
   }
   async ensurePrivateStorage() {
     await mkdir6(this.dir(), { recursive: true, mode: PRIVATE_DIRECTORY_MODE });
@@ -17484,6 +17718,7 @@ class BridgeSessionStore {
       migrationFailed = true;
       this.warnPersistenceFailure(error);
     });
+    await this.adoptLoginRecords().catch((error) => this.warnPersistenceFailure(error));
     let names;
     try {
       await this.ensurePrivateStorage();
@@ -17492,7 +17727,7 @@ class BridgeSessionStore {
       return legacy;
     }
     const records = await Promise.all(names.map(async (name) => {
-      const path = join11(this.recordsDir(), name);
+      const path = join13(this.recordsDir(), name);
       if (name.endsWith(".tmp")) {
         await chmod(path, PRIVATE_FILE_MODE).catch(() => {
           return;
@@ -17575,7 +17810,7 @@ class BridgeSessionStore {
     await this.ensurePrivateStorage();
     await Promise.all(sessions.map(async (session) => {
       const target = this.recordPath(session.bridgeSessionId);
-      const temporary = `${target}.${process.pid}.${randomUUID5()}.tmp`;
+      const temporary = `${target}.${process.pid}.${randomUUID6()}.tmp`;
       await writeFile4(temporary, `${JSON.stringify(session, null, 2)}
 `, {
         encoding: "utf8",
@@ -17595,13 +17830,43 @@ class BridgeSessionStore {
       return;
     });
   }
+  async adoptLoginRecords() {
+    const source = this.loginRecordsDir();
+    if (!source)
+      return;
+    const names = (await readdir2(source).catch(() => [])).filter((name) => name.endsWith(".json"));
+    if (names.length === 0)
+      return;
+    await this.ensurePrivateStorage();
+    await Promise.all(names.map(async (name) => {
+      const from = join13(source, name);
+      const target = join13(this.recordsDir(), name);
+      const temporary = `${target}.${process.pid}.${randomUUID6()}.tmp`;
+      await writeFile4(temporary, await readFile6(from), { mode: PRIVATE_FILE_MODE });
+      await chmod(temporary, PRIVATE_FILE_MODE);
+      try {
+        await link2(temporary, target).catch((error) => {
+          if (error.code !== "EEXIST")
+            throw error;
+        });
+      } finally {
+        await rm6(temporary, { force: true }).catch(() => {
+          return;
+        });
+      }
+      await chmod(target, PRIVATE_FILE_MODE);
+      await rm6(from, { force: true }).catch(() => {
+        return;
+      });
+    }));
+  }
   async writeRecordAtomic(session) {
     await this.ensurePrivateStorage();
     await this.writeAtomicPath(this.recordPath(session.bridgeSessionId), `${JSON.stringify(session, null, 2)}
 `);
   }
   async writeAtomicPath(path, payload) {
-    const temporary = `${path}.${process.pid}.${randomUUID5()}.tmp`;
+    const temporary = `${path}.${process.pid}.${randomUUID6()}.tmp`;
     await writeFile4(temporary, payload, {
       encoding: "utf8",
       mode: PRIVATE_FILE_MODE
@@ -17693,6 +17958,9 @@ function isPersistedRecord(value) {
   }
   return (record.threadId === null || record.threadId.length > 0) && record.turnId === undefined && record.terminalStatus === undefined;
 }
+function sameDispatchIdentity(left, right) {
+  return left.bridgeSessionId === right.bridgeSessionId && left.threadId === right.threadId && left.turnId === right.turnId && left.state === right.state && left.terminalStatus === right.terminalStatus && left.quarantined === right.quarantined;
+}
 
 class DispatchJournal {
   records = new Map;
@@ -17718,7 +17986,7 @@ class DispatchJournal {
     this.persist = options.persist !== false;
   }
   path() {
-    return join12(this.codexHome, "orkestrator-bridge", `dispatch-journal-${this.cwdHash}.json`);
+    return join14(codexBridgeStateDir(this.codexHome), `dispatch-journal-${this.cwdHash}.json`);
   }
   async load() {
     if (this.loaded)
@@ -17726,46 +17994,71 @@ class DispatchJournal {
     this.loaded = true;
     if (!this.persist)
       return;
+    const legacy = join14(codexLoginBridgeDir(this.codexHome), `dispatch-journal-${this.cwdHash}.json`);
     try {
-      const parsed = JSON.parse(await this.readBounded());
-      if (parsed.version !== DISPATCH_JOURNAL_VERSION || !Array.isArray(parsed.records)) {
-        this.integrityError = "Dispatch journal has an unsupported or malformed file shape";
-        return;
-      }
-      for (const persisted of parsed.records) {
-        const candidate = persisted && typeof persisted === "object" ? persisted : undefined;
-        const requestId = typeof candidate?.requestId === "string" ? candidate.requestId : "";
-        if (!requestId)
-          continue;
-        const sequence = Number.isSafeInteger(candidate?.sequence) && Number(candidate?.sequence) > 0 ? Number(candidate.sequence) : this.nextSequence + 1;
-        this.nextSequence = Math.max(this.nextSequence, sequence);
-        const timestamp = new Date(this.now()).toISOString();
-        const record = isPersistedRecord(persisted) ? { ...persisted, sequence } : {
-          requestId,
-          bridgeSessionId: typeof candidate?.bridgeSessionId === "string" ? candidate.bridgeSessionId : "",
-          threadId: typeof candidate?.threadId === "string" || candidate?.threadId === null ? candidate.threadId : null,
-          state: "terminal",
-          terminalStatus: "failed",
-          quarantined: true,
-          createdAt: timestamp,
-          updatedAt: timestamp,
-          sequence
-        };
-        const existing = this.records.get(requestId);
-        if (!existing || compareDispatchRecordsNewestFirst(record, existing) < 0) {
-          this.records.set(requestId, record);
-        }
+      await this.loadPath(this.path());
+      if (legacy !== this.path() && await this.loadPath(legacy, true)) {
+        this.collectGarbage();
+        this.refreshCapacityError();
+        if (this.capacityError)
+          throw new DispatchJournalCapacityError(this.capacityError);
+        await this.flush({ failClosed: true });
+        await rm7(legacy);
       }
       this.collectGarbage();
       this.refreshCapacityError();
     } catch (error) {
-      if (error?.code === "ENOENT")
-        return;
       this.integrityError = error instanceof DispatchJournalIntegrityError ? error.message : "Dispatch journal could not be safely decoded";
     }
   }
-  async readBounded() {
-    const handle = await open4(this.path(), "r");
+  async loadPath(path, merging = false) {
+    let contents;
+    try {
+      contents = await this.readBounded(path);
+    } catch (error) {
+      if (error?.code === "ENOENT")
+        return false;
+      throw error;
+    }
+    const parsed = JSON.parse(contents);
+    if (parsed.version !== DISPATCH_JOURNAL_VERSION || !Array.isArray(parsed.records)) {
+      throw new DispatchJournalIntegrityError("Dispatch journal has an unsupported or malformed file shape");
+    }
+    for (const persisted of parsed.records) {
+      const candidate = persisted && typeof persisted === "object" ? persisted : undefined;
+      const requestId = typeof candidate?.requestId === "string" ? candidate.requestId : "";
+      if (!requestId)
+        continue;
+      const sequence = Number.isSafeInteger(candidate?.sequence) && Number(candidate?.sequence) > 0 ? Number(candidate.sequence) : this.nextSequence + 1;
+      this.nextSequence = Math.max(this.nextSequence, sequence);
+      const timestamp = new Date(this.now()).toISOString();
+      const record = isPersistedRecord(persisted) ? { ...persisted, sequence } : {
+        requestId,
+        bridgeSessionId: typeof candidate?.bridgeSessionId === "string" ? candidate.bridgeSessionId : "",
+        threadId: typeof candidate?.threadId === "string" || candidate?.threadId === null ? candidate.threadId : null,
+        state: "terminal",
+        terminalStatus: "failed",
+        quarantined: true,
+        createdAt: timestamp,
+        updatedAt: timestamp,
+        sequence
+      };
+      const existing = this.records.get(requestId);
+      if (merging && existing && !sameDispatchIdentity(existing, record)) {
+        this.records.set(requestId, {
+          ...existing,
+          state: "terminal",
+          terminalStatus: "failed",
+          quarantined: true
+        });
+      } else if (!existing || !merging && compareDispatchRecordsNewestFirst(record, existing) < 0) {
+        this.records.set(requestId, record);
+      }
+    }
+    return true;
+  }
+  async readBounded(path) {
+    const handle = await open4(path, "r");
     try {
       const metadata = await handle.stat();
       if (!metadata.isFile() || metadata.size > this.maxBytes) {
@@ -17789,6 +18082,9 @@ class DispatchJournal {
   }
   classify(requestId) {
     const record = this.records.get(requestId);
+    if (this.integrityError) {
+      return { duplicate: Boolean(record), action: "blocked", reason: this.integrityError, record };
+    }
     if (!record) {
       const blockedReason = this.integrityError ?? this.capacityError;
       if (blockedReason) {
@@ -17900,6 +18196,13 @@ class DispatchJournal {
   latestForSession(bridgeSessionId) {
     return [...this.records.values()].filter((record) => record.bridgeSessionId === bridgeSessionId).sort(compareDispatchRecordsNewestFirst)[0];
   }
+  requestIdForTurn(turnId) {
+    for (const record of this.records.values()) {
+      if (record.turnId === turnId && !record.quarantined)
+        return record.requestId;
+    }
+    return;
+  }
   async forget(requestId) {
     if (this.integrityError)
       throw new DispatchJournalIntegrityError(this.integrityError);
@@ -17995,7 +18298,7 @@ class DispatchJournal {
     const attempt = this.writeChain.then(async () => {
       try {
         const path = this.path();
-        await mkdir7(join12(this.codexHome, "orkestrator-bridge"), { recursive: true });
+        await mkdir7(codexBridgeStateDir(this.codexHome), { recursive: true });
         const temporary = `${path}.${process.pid}.${Math.random().toString(36).slice(2, 8)}.tmp`;
         await writeFile5(temporary, `${JSON.stringify(snapshot, null, 2)}
 `, "utf8");
@@ -18123,7 +18426,7 @@ function coordinatorCapabilityPolicy(mode) {
 
 // ../../bridges/codex-bridge/src/codex-config.ts
 import { realpathSync } from "node:fs";
-import { isAbsolute as isAbsolute6 } from "node:path";
+import { isAbsolute as isAbsolute7 } from "node:path";
 var CODEX_MAX_CONCURRENT_THREADS_ENV = "CODEX_MAX_CONCURRENT_THREADS_PER_SESSION";
 var DEFAULT_CODEX_MAX_CONCURRENT_THREADS = 5;
 var ORKESTRATOR_AGENT_MCP_URL_ENV = "ORKESTRATOR_AGENT_MCP_URL";
@@ -18143,7 +18446,7 @@ function codexNetworkDeniedConfig(policy) {
   };
 }
 function codexProjectTrustConfig(policy, cwd) {
-  if (!policy || policy.projectResources || !cwd || !isAbsolute6(cwd))
+  if (!policy || policy.projectResources || !cwd || !isAbsolute7(cwd))
     return {};
   const roots = new Set([cwd]);
   try {
@@ -18153,6 +18456,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) {
@@ -18166,7 +18474,7 @@ function codexProjectSkillsConfig(listed) {
       const { path, scope, enabled } = skill ?? {};
       if (enabled === true && typeof scope === "string" && KEPT_SKILL_SCOPES.has(scope))
         continue;
-      if (typeof path !== "string" || !isAbsolute6(path)) {
+      if (typeof path !== "string" || !isAbsolute7(path)) {
         throw new Error("Codex listed a project skill without a path it can be disabled by");
       }
       disabled.add(path);
@@ -18251,11 +18559,11 @@ function codexAppServerConfigOverrides(env = process.env) {
     const readableRuntimeRoot = env.CODEX_BRIDGE_READABLE_RUNTIME_ROOT?.trim();
     const projectRoot = env.CWD?.trim();
     const attachmentRoot = env[BRIDGE_ATTACHMENT_ROOT_ENV]?.trim();
-    if (!permissionProfile || !/^[A-Za-z0-9_-]+$/.test(permissionProfile) || !readableRuntimeRoot || !isAbsolute6(readableRuntimeRoot) || !projectRoot || !isAbsolute6(projectRoot)) {
+    if (!permissionProfile || !/^[A-Za-z0-9_-]+$/.test(permissionProfile) || !readableRuntimeRoot || !isAbsolute7(readableRuntimeRoot) || !projectRoot || !isAbsolute7(projectRoot)) {
       throw new Error("Coordinator Codex permission profile configuration is invalid");
     }
     overrides.default_permissions = JSON.stringify(permissionProfile);
-    overrides[`permissions.${permissionProfile}.filesystem`] = `{ ":root" = "deny", ":minimal" = "read", ":tmpdir" = "deny", ` + `":slash_tmp" = "deny", ${JSON.stringify(readableRuntimeRoot)} = "read", ` + (attachmentRoot && isAbsolute6(attachmentRoot) ? `${JSON.stringify(attachmentRoot)} = "read", ` : "") + `":workspace_roots" = { "." = "read" } }`;
+    overrides[`permissions.${permissionProfile}.filesystem`] = `{ ":root" = "deny", ":minimal" = "read", ":tmpdir" = "deny", ` + `":slash_tmp" = "deny", ${JSON.stringify(readableRuntimeRoot)} = "read", ` + (attachmentRoot && isAbsolute7(attachmentRoot) ? `${JSON.stringify(attachmentRoot)} = "read", ` : "") + `":workspace_roots" = { "." = "read" } }`;
     overrides[`permissions.${permissionProfile}.network.enabled`] = "false";
     overrides.web_search = JSON.stringify(codexNetworkDeniedSearchMode(codexCoordinatorPolicy(env)));
     overrides["features.standalone_web_search"] = "false";
@@ -18841,7 +19149,7 @@ function signedOutAccountRead(error) {
 }
 async function readStoredLoginFingerprint(codexHome) {
   try {
-    const file = await open6(join13(codexHome, "auth.json"), "r");
+    const file = await open6(join15(codexHome, "auth.json"), "r");
     let raw;
     try {
       const bytes = Buffer.alloc(65537);
@@ -19119,6 +19427,9 @@ class AppServerEngine {
       this.invalidateAccountServing(sequence);
       this.checkAccountSignIn(true);
     }
+    if (notification.method === "account/login/completed" && objectRecord(notification.params).success === true) {
+      this.emit({ kind: "account.signedIn", engineGeneration: generation });
+    }
     const result = reduceNotification(notification, generation);
     if (result.unknownMethod) {
       this.unknownNotificationCount += 1;
@@ -19185,7 +19496,11 @@ class AppServerEngine {
     if (sequence < this.accountAppliedSequence || generation !== this.supervisor.getGeneration())
       return;
     this.accountAppliedSequence = sequence;
+    const wasSignInRequired = this.accountSignInRequired;
     const signedIn = this.recordAccount(response);
+    if (signedIn && wasSignInRequired) {
+      this.emit({ kind: "account.signedIn", engineGeneration: generation });
+    }
     if (!signedIn) {
       await this.requestAccountReloadFromStoredLogin(sequence, generation);
       return;
@@ -19344,6 +19659,7 @@ class AppServerEngine {
     const threadConfig = {
       ...codexNetworkDeniedConfig(config.policy),
       ...codexProjectTrustConfig(config.policy, cwd),
+      ...codexRequestUserInputConfig(config.policy),
       ...extraConfig,
       ...config.agentMcp ? {
         ...config.agentMcp.design ? {
@@ -19380,7 +19696,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 } : {}
     };
@@ -19798,7 +20113,7 @@ class AppServerEngine {
       thread.model = confirmedModel.trim();
     }
     if (thread.id) {
-      if (typeof raw.path === "string" && isAbsolute7(raw.path)) {
+      if (typeof raw.path === "string" && isAbsolute8(raw.path)) {
         this.rolloutPaths.set(thread.id, raw.path);
       }
       this.bindings.set(thread.id, {
@@ -19913,8 +20228,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);
@@ -20406,7 +20719,7 @@ class ThreadRegistry {
 
 // ../../bridges/codex-bridge/src/app-server-runtime-sessions.ts
 var SESSION_CLOSING_ERROR = "Session is closing";
-var ACTIVITY_PROCESS = randomUUID6();
+var ACTIVITY_PROCESS = randomUUID7();
 
 class CodexRuntimeSessions {
   ctx;
@@ -21213,6 +21526,7 @@ class CodexRuntimeSessions {
     const awaitingRecovery = session.threadId !== null && this.ctx.threadsAwaitingDispatchRecovery.has(session.threadId);
     const phase = context?.phase ?? (awaitingRecovery ? "recovering" : session.restartFailure ? "failed" : "idle");
     const latestDispatch = this.ctx.journal.latestForSession(sessionId);
+    const interruptedRequestId = session.restartFailure ? this.ctx.journal.requestIdForTurn(session.restartFailure.turnId) : undefined;
     const error = context?.error ?? (phase === "failed" && session.restartFailure ? CODEX_RESTARTED_MID_TURN_MESSAGE : undefined);
     return {
       status: phaseToExternalStatus(phase),
@@ -21220,7 +21534,10 @@ class CodexRuntimeSessions {
       phase,
       title: session.title,
       error,
-      ...phase === "failed" && session.restartFailure && error === CODEX_RESTARTED_MID_TURN_MESSAGE ? { interruption: "restart" } : {},
+      ...phase === "failed" && session.restartFailure && error === CODEX_RESTARTED_MID_TURN_MESSAGE ? {
+        interruption: "restart",
+        ...interruptedRequestId ? { interruptedRequestId } : {}
+      } : {},
       threadId: session.threadId,
       turnId: context?.activeTurn?.turnId,
       turnStartedAt: context?.turnStartedAt,
@@ -21761,7 +22078,7 @@ function parseCommandToken(text, sigils = ["/"]) {
 // ../../bridges/codex-bridge/src/prompts/template-discovery.ts
 import { createHash as createHash11 } from "node:crypto";
 import { open as open7, readdir as readdir3, stat as stat7 } from "node:fs/promises";
-import { join as join14 } from "node:path";
+import { join as join16 } from "node:path";
 
 // ../../bridges/codex-bridge/src/prompts/template-format.ts
 var TEMPLATE_DESCRIPTION_MAX_BYTES = 1000;
@@ -21889,8 +22206,8 @@ var RESERVED_TEMPLATE_PREFIXES = ["/skill:", "/prompts:"];
 var TEMPLATE_ID_PREFIX = "codex-template:";
 function templateRoots(cwd, codexHome = getCodexHomeDir()) {
   return [
-    { origin: "project", dir: join14(cwd, ".codex", "prompts") },
-    { origin: "user", dir: join14(codexHome, "prompts") }
+    { origin: "project", dir: join16(cwd, ".codex", "prompts") },
+    { origin: "user", dir: join16(codexHome, "prompts") }
   ];
 }
 function templateCommandId(origin, relativePath) {
@@ -21914,7 +22231,7 @@ function isReservedName(name) {
 }
 var metadataCache = new Map;
 var METADATA_CACHE_MAX = 1024;
-async function readBounded(absolutePath, maxBytes) {
+async function readBounded2(absolutePath, maxBytes) {
   const handle = await open7(absolutePath, "r");
   try {
     const info = await handle.stat();
@@ -21995,7 +22312,7 @@ async function scanPromptTemplates(roots, limits = TEMPLATE_LIMITS) {
         return;
       }
       visited += 1;
-      const absolutePath = join14(dir, entry.name);
+      const absolutePath = join16(dir, entry.name);
       const relativePath = relative ? `${relative}/${entry.name}` : entry.name;
       if (entry.isDirectory()) {
         if (depth + 1 > limits.maxDepth) {
@@ -22057,7 +22374,7 @@ async function scanPromptTemplates(roots, limits = TEMPLATE_LIMITS) {
     if (candidate.size > limits.maxTemplateBytes)
       return null;
     try {
-      const { bytes, oversized } = await readBounded(candidate.absolutePath, limits.maxTemplateBytes);
+      const { bytes, oversized } = await readBounded2(candidate.absolutePath, limits.maxTemplateBytes);
       if (oversized)
         return null;
       if (bytes.length === 0)
@@ -22134,7 +22451,7 @@ async function loadTemplateBody(entry, limits = TEMPLATE_LIMITS) {
   }
   let loaded;
   try {
-    loaded = await readBounded(entry.absolutePath, limits.maxTemplateBytes);
+    loaded = await readBounded2(entry.absolutePath, limits.maxTemplateBytes);
   } catch {
     return {
       ok: false,
@@ -22162,7 +22479,7 @@ async function loadTemplateBody(entry, limits = TEMPLATE_LIMITS) {
 }
 
 // ../../bridges/codex-bridge/src/commands/skill-inventory.ts
-import { isAbsolute as isAbsolute8 } from "node:path";
+import { isAbsolute as isAbsolute9 } from "node:path";
 var SKILL_INVENTORY_LIMITS = Object.freeze({
   maxSkills: 512,
   maxDescriptionBytes: 1000,
@@ -22214,7 +22531,7 @@ function normalizeSkillsList(raw, context) {
       }
       const name = nonEmpty(candidate.name);
       const path = typeof candidate.path === "string" ? candidate.path : undefined;
-      if (!name || !usableSkillName(name) || !path || !isAbsolute8(path)) {
+      if (!name || !usableSkillName(name) || !path || !isAbsolute9(path)) {
         truncated = true;
         continue;
       }
@@ -23593,6 +23910,12 @@ class CodexRuntimeLifecycle {
     }
     if (event.kind === "unknown.protocol")
       return;
+    if (event.kind === "account.signedIn") {
+      for (const context of this.ctx.registry.listThreads()) {
+        this.setThreadAuthNotice(context, undefined);
+      }
+      return;
+    }
     if (event.kind === "account.reload.requested") {
       this.ctx.callbacks.reloadStoredAccountLogin().catch((error) => {
         console.warn("[codex-bridge] Reloading the stored account login failed:", error instanceof Error ? error.message : error);
@@ -23878,8 +24201,11 @@ class CodexRuntimeLifecycle {
         this.discardOutlivingCommandWindows(turn);
         if (turn.stoppedByShutdown && event.status === "interrupted")
           this.completeRecoveredTurn(turn, event.status);
-        else
+        else {
           turn.complete(event.status, event.error);
+          if (event.status === "failed" && event.error)
+            turn.recordProviderFailure(event.error);
+        }
         this.ctx.options.changeEvidence?.turn(this.evidenceSource(context, turn), event.status);
         const finalize = () => this.runFinalization(context, turn).catch((error) => {
           console.error(`[codex-bridge] Failed to finalize turn ${turn.turnId}:`, error instanceof Error ? error.message : error);
@@ -24626,9 +24952,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 +24975,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",
@@ -26701,7 +27022,7 @@ async function writeCodexRawLog(sessionId, entry, logDir = codexRawLogDir) {
   try {
     await mkdir8(logDir, { recursive: true });
     const filename = `${sanitizeLogFileComponent(sessionId)}.jsonl`;
-    await appendFile5(join15(logDir, filename), `${JSON.stringify({
+    await appendFile5(join17(logDir, filename), `${JSON.stringify({
       timestamp: new Date().toISOString(),
       sessionId,
       ...entry
@@ -26898,10 +27219,10 @@ function emit(event) {
   }
 }
 function bridgeCacheDir() {
-  return join15(getCodexHomeDir(), "orkestrator-bridge");
+  return join17(getCodexHomeDir(), "orkestrator-bridge");
 }
 function bridgeCachePath() {
-  return join15(bridgeCacheDir(), "models-cache.json");
+  return join17(bridgeCacheDir(), "models-cache.json");
 }
 var BRIDGE_MODEL_CACHE_VERSION = 2;
 async function readPersistedBridgeCache() {
@@ -26925,7 +27246,7 @@ async function writePersistedBridgeCache(models) {
 }
 async function readCodexCliModelCache() {
   try {
-    const raw = await readFile7(join15(getCodexHomeDir(), "models_cache.json"), "utf8");
+    const raw = await readFile7(join17(getCodexHomeDir(), "models_cache.json"), "utf8");
     const models = parseModelCatalog(raw);
     return models.length > 0 ? models : null;
   } catch {
@@ -27358,7 +27679,10 @@ app.get("/session/:id/dispatch", (c) => {
     return c.json({ dispatch: "unknown" });
   const record = appServerRuntime.getJournal().get(requestId);
   const dispatched = record?.bridgeSessionId === c.req.param("id") && (record.state === "accepted" || record.state === "terminal");
-  return c.json({ dispatch: dispatched ? "dispatched" : "unknown" });
+  return c.json({
+    dispatch: dispatched ? "dispatched" : "unknown",
+    ...dispatched ? { pending: record.state === "accepted" } : {}
+  });
 });
 app.get("/session/:id/structured-output", (c) => {
   const result = appServerRuntime.getStructuredOutput(c.req.param("id"), c.req.query("requestId")?.trim());
@@ -27678,7 +28002,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"]
       }
     ];