@dotobokuri/fleet-console 1.32.0 → 1.34.0

package/dist/cli.mjs

@@ -903,16 +903,22 @@ function sanitizeGlobalOptionsData(value) {
     return { data: createEmptyGlobalOptionsData(), changed: true };
   }
   const kimiModel = sanitizeKimiModel(value.kimiModel);
+  const agentIdleDormantMinutes = sanitizeAgentIdleDormantMinutes(value.agentIdleDormantMinutes);
   const data = {
     version: GLOBAL_OPTIONS_VERSION,
     ...typeof value.enableMetaphor === "boolean" ? { enableMetaphor: value.enableMetaphor } : {},
-    ...value.codexLaunchMode === "acp" || value.codexLaunchMode === "app-server" ? { codexLaunchMode: value.codexLaunchMode } : {},
-    ...kimiModel ? { kimiModel } : {}
+    ...kimiModel ? { kimiModel } : {},
+    ...agentIdleDormantMinutes !== void 0 ? { agentIdleDormantMinutes } : {}
   };
-  const allowedKeys = /* @__PURE__ */ new Set(["version", "enableMetaphor", "codexLaunchMode", "kimiModel"]);
-  const changed = Object.keys(value).some((key) => !allowedKeys.has(key)) || "enableMetaphor" in value && typeof value.enableMetaphor !== "boolean" || "codexLaunchMode" in value && value.codexLaunchMode !== "acp" && value.codexLaunchMode !== "app-server" || "kimiModel" in value && kimiModel === void 0;
+  const allowedKeys = /* @__PURE__ */ new Set(["version", "enableMetaphor", "kimiModel", "agentIdleDormantMinutes"]);
+  const changed = Object.keys(value).some((key) => !allowedKeys.has(key)) || "enableMetaphor" in value && typeof value.enableMetaphor !== "boolean" || "kimiModel" in value && kimiModel === void 0 || "agentIdleDormantMinutes" in value && agentIdleDormantMinutes === void 0;
   return { data, changed };
 }
+function sanitizeAgentIdleDormantMinutes(value) {
+  if (value === null) return null;
+  if (typeof value === "number" && Number.isFinite(value) && Number.isInteger(value) && value > 0) return value;
+  return void 0;
+}
 function sanitizeKimiModel(value) {
   if (!isRecord(value)) {
     return void 0;
@@ -1679,55 +1685,55 @@ authority: Admiral of the Navy (\uB300\uC6D0\uC218)
 
 # Fleet Wiki Workspace Doctrine
 
-This directory is the **Fleet Wiki** \u2014 a workspace-local markdown knowledge base. All entries here are governed by a deterministic patch queue with mandatory Admiral approval. **Direct filesystem edits are forbidden for any agent or carrier.**
+This directory is the **Fleet Wiki** \u2014 a workspace-local markdown knowledge base. All entries here are governed by a deterministic patch queue with mandatory host approval. **Direct filesystem edits are forbidden for any agent or carrier.**
 
 The active entry schema is defined in \`schema/wiki-schema.md\` and may be revised by the Admiral of the Navy (\uB300\uC6D0\uC218) at any time. Always consult the current schema rather than assuming a fixed format.
 
 ## 1. Hard Boundaries (CRITICAL)
 
-The following prohibitions are **absolute** for every carrier (including Chronicle) and any sub-agent operating in this directory:
+The following prohibitions are **absolute** for every carrier and any sub-agent operating in this directory:
 
-- **NEVER** edit any file under \`wiki/\` directly via filesystem tools (Read/Write/Edit). Entry creation and new staged revisions must go through \`wiki_ingest\`; already-pending queue proposal revisions may use \`wiki_patch_edit\`.
+- **NEVER** edit any file under \`wiki/\` directly via filesystem tools (Read/Write/Edit). Entry creation and new staged revisions must go through host-only \`wiki_ingest\`; already-pending queue proposal revisions may use host-only \`wiki_patch_edit\`.
 - **NEVER** edit \`index.json\`, \`wiki/index.md\`, or \`log.md\` by hand. These files are **system-managed** and rebuilt automatically when patches are approved.
 - **NEVER** edit files under \`raw/\` after creation \u2014 raw sources are immutable evidence and \`wiki_ingest\` writes them automatically.
 - **NEVER** touch \`queue/\`, \`archive/\`, or \`conflicts/\` \u2014 these are workflow-internal stores managed by the wiki tooling.
-- \`schema/\` is the **only** directory in this workspace where direct edits are permitted, and only the Admiral of the Navy (\uB300\uC6D0\uC218) authorizes schema changes.
+- **NEVER** invoke mutation, staging, lint, schema, or approval Wiki tools from a carrier executor. Those tools are **host-only**; runtime ACLs are authoritative.
+- **NEVER** approve or reject patches from a carrier executor. Approval authority is **host-only** through \`wiki_patch_queue\`.
 
 ## 2. Roles and Gates
 
 | Role | Capability | Gate |
 |------|-----------|------|
-| **Carriers** (Chronicle for entry proposals; any carrier for read-only consult) | Propose: \`wiki_ingest\` \xB7 Revise pending: \`wiki_patch_edit\` \xB7 Orient: \`wiki_orient\` \xB7 Lookup: \`wiki_briefing\` / \`wiki_read\` / \`wiki_resolve\` \xB7 Lint: \`wiki_drydock\` \xB7 Query: \`wiki_query\` \xB7 Chronicle schema lookup: \`wiki_schema_list\` / \`wiki_schema_read\` | Cannot approve patches |
-| **Admiral (Host PI)** | All carrier capabilities + \`wiki_schema_create\` (new custom templates) + \`wiki_patch_queue\` (approve / reject) | Sole approval authority |
+| **Carriers** | Read-only consult: \`wiki_orient\` \xB7 \`wiki_briefing\` \xB7 \`wiki_read\` \xB7 \`wiki_resolve\` | Cannot mutate, stage, lint, inspect/create schema, or approve patches |
+| **Host (Admiral PI)** | Read, compose, stage (\`wiki_ingest\`), revise pending (\`wiki_patch_edit\`), lint (\`wiki_drydock\`), query (\`wiki_query\`), compile (\`wiki_compile_source\`), schema (\`wiki_schema_list\` / \`wiki_schema_read\` / \`wiki_schema_create\`), approve/reject (\`wiki_patch_queue\`) | Sole mutation, schema, and approval authority |
 
-Sub-agents **propose**; the Admiral **commits**. Wiki entry writes reach disk only after \`wiki_patch_queue approve\` is invoked by the Admiral. New custom schema templates are created directly through the Admiral's create-only \`wiki_schema_create\` tool.
+The host performs every Fleet Wiki operation directly. Carriers may consult read-only tools for context but must not stage entries, revise patches, lint, create schema templates, or approve queue items.
 
 ## 3. Standard Workflow
 
 ### 3.1 Read / Lookup
 
-\`wiki_orient\` \u2192 \`wiki_briefing\` \u2192 \`wiki_read\` \u2192 \`wiki_resolve\`. Read-only; no approval needed.
+\`wiki_orient\` \u2192 \`wiki_briefing\` \u2192 \`wiki_read\` \u2192 \`wiki_resolve\`. Read-only; globally shared with carriers; no approval needed.
 
-### 3.2 Propose a New Entry
+### 3.2 Stage a New Entry (Host)
 
 1. **Orient** \u2014 \`wiki_orient\` to confirm workspace state and locate the active schema.
 2. **Compose** \u2014 Draft the entry body per the active workspace schema (see \`schema/wiki-schema.md\`). Synthesize raw sources, never copy verbatim.
 3. **Ingest** \u2014 \`wiki_ingest\` with \`id\`, \`title\`, \`tags\`, \`body\`, and \`source\` (raw evidence). System auto-writes raw, stages a patch under \`queue/\`, and returns a \`patch_id\`.
 4. **Lint** \u2014 \`wiki_drydock\` to verify schema compliance and link integrity.
-5. **Hand off** \u2014 Report the \`patch_id\` to the Admiral. Do **not** invoke \`wiki_patch_queue approve\`.
-6. **Admiral approves** \u2014 \`wiki_patch_queue approve\` writes the entry to \`wiki/\`, updates indexes, and appends to \`log.md\`. No mutation is performed by hand.
+5. **Approve** \u2014 \`wiki_patch_queue approve\` writes the entry to \`wiki/\`, updates indexes, and appends to \`log.md\`. No filesystem mutation is performed by hand.
 
-### 3.3 Update an Existing Entry
+### 3.3 Update an Existing Entry (Host)
 
 Same as 3.2 but \`wiki_ingest\` runs in \`update\` mode with \`base_version\` for stale-base detection.
 
-### 3.4 Revise an Already-Pending Patch
+### 3.4 Revise an Already-Pending Patch (Host)
 
-Use \`wiki_patch_edit\` with a pending \`patch_id\` for small exact body replacements or metadata corrections before Admiral approval. Do not create another ingest patch for a one-line correction to an existing pending proposal.
+Use \`wiki_patch_edit\` with a pending \`patch_id\` for small exact body replacements or metadata corrections before approval. Do not create another ingest patch for a one-line correction to an existing pending proposal.
 
 ## 4. Schema Reference
 
-The authoritative source is **\`schema/wiki-schema.md\`**. The Admiral of the Navy (\uB300\uC6D0\uC218) may revise the schema at any time, and \`wiki_drydock\` enforces the current version.
+The authoritative source is **\`schema/wiki-schema.md\`**. The Admiral of the Navy (\uB300\uC6D0\uC218) may revise the schema at any time through host-only schema tools, and \`wiki_drydock\` enforces the current version.
 
 \`schema/AGENTS.md\` defines the maintainer role for the schema directory itself.
 
@@ -1742,7 +1748,7 @@ Always read \`schema/wiki-schema.md\` directly before composing or revising entr
 ## 6. Escalation
 
 - Schema disputes \u2192 Admiral.
-- Approval requests \u2192 Admiral with reported \`patch_id\`.
+- Approval or rejection decisions \u2192 host via \`wiki_patch_queue\`.
 - Tool failures / stale state \u2192 re-run \`wiki_drydock\`, then escalate to Admiral if unresolved.
 `;
 async function ensureWorkspaceSchema(paths) {
@@ -1911,9 +1917,10 @@ async function writeDefaultFileIfMissing(filePath, content) {
   try {
     await writeFile(filePath, content, { encoding: "utf8", flag: "wx" });
   } catch (error51) {
-    if (!isAlreadyExistsError(error51)) {
-      throw error51;
+    if (isAlreadyExistsError(error51) || isEisdirError(error51) || isEloopError(error51)) {
+      return;
     }
+    throw error51;
   }
 }
 async function tryReadSchemaFile(paths, filePath) {
@@ -2023,6 +2030,12 @@ function parseRequiredSections(content) {
   }
   return sections;
 }
+function isEloopError(error51) {
+  return typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "ELOOP";
+}
+function isEisdirError(error51) {
+  return typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "EISDIR";
+}
 function isAlreadyExistsError(error51) {
   return typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "EEXIST";
 }
@@ -31767,35 +31780,23 @@ var AcpConnection = class extends BaseConnection {
       }
       case "tool_call": {
         const { sessionUpdate: _tc, ...toolCallData } = update;
-        const rawTcTitle = toolCallData.title ?? "";
-        const cleanTcTitle = rawTcTitle.replace(/\s*\(\s*[\d.,\s-]*\b(?:NaN|undefined)\b[\d.,\s-]*\)/g, "");
-        if (cleanTcTitle !== rawTcTitle) {
-          console.debug("[AcpConnection] sanitized tool_call payload", { rawTitle: rawTcTitle, cleanTitle: cleanTcTitle });
-        }
-        const titleTcOverride = "title" in toolCallData ? { title: cleanTcTitle } : {};
         this.emit(
           "toolCall",
-          cleanTcTitle,
+          toolCallData.title ?? "",
           toolCallData.status ?? "",
           sessionId,
-          { ...toolCallData, ...titleTcOverride }
+          toolCallData
         );
         break;
       }
       case "tool_call_update": {
         const { sessionUpdate: _tcu, ...toolCallUpdateData } = update;
-        const rawTitle = toolCallUpdateData.title ?? "";
-        const cleanTitle = rawTitle.replace(/\s*\(\s*[\d.,\s-]*\b(?:NaN|undefined)\b[\d.,\s-]*\)/g, "");
-        if (cleanTitle !== rawTitle) {
-          console.debug("[AcpConnection] sanitized tool_call_update payload", { rawTitle, cleanTitle });
-        }
-        const titleOverride = "title" in toolCallUpdateData ? { title: cleanTitle } : {};
         this.emit(
           "toolCallUpdate",
-          cleanTitle,
+          toolCallUpdateData.title ?? "",
           toolCallUpdateData.status ?? "",
           sessionId,
-          { ...toolCallUpdateData, ...titleOverride }
+          toolCallUpdateData
         );
         break;
       }
@@ -31960,7 +31961,7 @@ function inferBinName(packageName) {
 // ../../packages/core-unified-agent/models.json
 var models_default = {
   version: 1,
-  updatedAt: "2026-07-21T00:00:00Z",
+  updatedAt: "2026-07-25T00:00:00Z",
   providers: {
     claude: {
       name: "Claude Code",
@@ -31996,11 +31997,13 @@ var models_default = {
       defaultModel: "gpt-5.6-sol",
       models: [
         { modelId: "gpt-5.6-sol", name: "GPT-5.6-Sol", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max", "ultra"], default: "low" } },
+        { modelId: "gpt-5.6-sol-fast", name: "GPT-5.6-Sol Fast", providerModelId: "gpt-5.6-sol", serviceTier: "priority", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max", "ultra"], default: "low" } },
         { modelId: "gpt-5.6-terra", name: "GPT-5.6-Terra", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max", "ultra"], default: "medium" } },
+        { modelId: "gpt-5.6-terra-fast", name: "GPT-5.6-Terra Fast", providerModelId: "gpt-5.6-terra", serviceTier: "priority", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max", "ultra"], default: "medium" } },
         { modelId: "gpt-5.6-luna", name: "GPT-5.6-Luna", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "medium" } },
+        { modelId: "gpt-5.6-luna-fast", name: "GPT-5.6-Luna Fast", providerModelId: "gpt-5.6-luna", serviceTier: "priority", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "medium" } },
         { modelId: "gpt-5.5", name: "GPT-5.5", effort: { supported: true, levels: ["low", "medium", "high", "xhigh"], default: "high" } },
-        { modelId: "gpt-5.4", name: "GPT-5.4", effort: { supported: true, levels: ["low", "medium", "high", "xhigh"], default: "high" } },
-        { modelId: "gpt-5.4-mini", name: "GPT-5.4 Mini", effort: { supported: true, levels: ["low", "medium", "high", "xhigh"], default: "high" } }
+        { modelId: "gpt-5.5-fast", name: "GPT-5.5 Fast", providerModelId: "gpt-5.5", serviceTier: "priority", effort: { supported: true, levels: ["low", "medium", "high", "xhigh"], default: "high" } }
       ]
     },
     "opencode-go": {
@@ -32086,6 +32089,10 @@ var ModelEntrySchema = external_exports.object({
   description: external_exports.string().optional(),
   /** spawn 시 실제 CLI 모델 ID를 조립해야 하는 경우의 템플릿 */
   spawnModelTemplate: external_exports.string().optional(),
+  /** 카탈로그 ID와 실제 provider 모델 ID가 다른 경우의 원본 모델 ID */
+  providerModelId: external_exports.string().optional(),
+  /** provider가 모델과 별도로 받는 서비스 티어 */
+  serviceTier: external_exports.string().optional(),
   /** 모델의 컨텍스트 윈도우 크기 (토큰) */
   contextWindow: external_exports.number().int().positive().optional(),
   /** 모델별 effort 설정 */
@@ -32108,6 +32115,14 @@ var ModelEntrySchema = external_exports.object({
       path: ["spawnModelTemplate"]
     });
   }
+  if (ctx.value.serviceTier && !ctx.value.providerModelId) {
+    ctx.issues.push({
+      code: "custom",
+      input: ctx.value.serviceTier,
+      message: "serviceTier\uB97C \uC9C0\uC815\uD55C \uBAA8\uB378\uC740 providerModelId\uB3C4 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4",
+      path: ["serviceTier"]
+    });
+  }
 });
 var ModelsMappingSchema = external_exports.record(external_exports.string(), external_exports.string());
 var ProviderSchema = external_exports.object({
@@ -32257,8 +32272,6 @@ var CLI_BACKENDS = {
     cliCommand: "codex",
     protocol: "codex-app-server",
     authRequired: true,
-    npxPackage: "@agentclientprotocol/codex-acp@1.1.2",
-    acpArgs: [],
     appServerArgs: ["app-server", "--listen", "stdio://"],
     modes: [
       { id: "default", label: "Plan" },
@@ -32268,7 +32281,7 @@ var CLI_BACKENDS = {
     supportsSessionClose: true,
     supportsSessionLoad: true,
     requiresModelAtSpawn: false,
-    usesNpxBridge: true,
+    usesNpxBridge: false,
     defaultMaxTokens: 1e5
   },
   "opencode-go": {
@@ -32359,22 +32372,6 @@ function getYoloModeId(cli) {
 function getAllBackendConfigs() {
   return Object.values(CLI_BACKENDS);
 }
-function buildCodexConfigEnv(configOverrides, baseConfigJson) {
-  const map2 = parseBaseConfigMap(baseConfigJson);
-  for (const override of configOverrides ?? []) {
-    const eqIndex = override.indexOf("=");
-    if (eqIndex < 0) {
-      continue;
-    }
-    const key = override.slice(0, eqIndex);
-    const rawValue = override.slice(eqIndex + 1);
-    assignNestedKey(map2, key, parseOverrideValue(rawValue));
-  }
-  if (Object.keys(map2).length === 0) {
-    return void 0;
-  }
-  return JSON.stringify(map2);
-}
 function buildConfigOverrideArgs(overrides) {
   return overrides.flatMap((override) => ["-c", override]);
 }
@@ -32401,45 +32398,6 @@ function mcpServerConfigsToAcp(servers) {
     headers: server.headers ?? []
   }));
 }
-function parseBaseConfigMap(baseConfigJson) {
-  if (!baseConfigJson) {
-    return {};
-  }
-  try {
-    const parsed = JSON.parse(baseConfigJson);
-    if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
-      return parsed;
-    }
-  } catch {
-  }
-  return {};
-}
-function parseOverrideValue(raw) {
-  try {
-    return JSON.parse(raw);
-  } catch {
-    if (raw.length >= 2 && raw.startsWith('"') && raw.endsWith('"')) {
-      return raw.slice(1, -1);
-    }
-    return raw;
-  }
-}
-function assignNestedKey(target, dottedKey, value) {
-  const segments = dottedKey.split(".");
-  let cursor = target;
-  for (let i = 0; i < segments.length - 1; i += 1) {
-    const segment = segments[i];
-    const existing = cursor[segment];
-    if (typeof existing === "object" && existing !== null && !Array.isArray(existing)) {
-      cursor = existing;
-    } else {
-      const nested = {};
-      cursor[segment] = nested;
-      cursor = nested;
-    }
-  }
-  cursor[segments[segments.length - 1]] = value;
-}
 
 // ../../packages/core-unified-agent/src/detector/CliDetector.ts
 var CLI_DETECT_LIST = Object.entries(CLI_BACKENDS).map(([id, backend]) => ({
@@ -32995,6 +32953,7 @@ var CODEX_METHODS = {
   THREAD_RESUME: "thread/resume",
   THREAD_READ: "thread/read",
   THREAD_ARCHIVE: "thread/archive",
+  THREAD_UNARCHIVE: "thread/unarchive",
   TURN_START: "turn/start",
   TURN_INTERRUPT: "turn/interrupt",
   TURN_STEER: "turn/steer"
@@ -33023,6 +32982,7 @@ var CODEX_MCP_READY_STATUS = "ready";
 var CODEX_MCP_FAILED_STATUSES = /* @__PURE__ */ new Set(["failed", "error"]);
 var DEFAULT_MCP_STARTUP_TIMEOUT = 6e4;
 var STDERR_TAIL_LIMIT = 20;
+var SESSION_TEARDOWN_TIMEOUT_MS = 5e3;
 var CodexAppServerConnection = class extends BaseConnection {
   clientInfo;
   autoApprove;
@@ -33035,6 +32995,7 @@ var CodexAppServerConnection = class extends BaseConnection {
   pendingMcpReadyWaiters = /* @__PURE__ */ new Set();
   stdoutBuffer = "";
   pendingModel = null;
+  pendingServiceTier = void 0;
   pendingEffort = null;
   codexHome = null;
   isDisconnecting = false;
@@ -33059,6 +33020,9 @@ var CodexAppServerConnection = class extends BaseConnection {
   setPendingModel(model) {
     this.pendingModel = model;
   }
+  setPendingServiceTier(serviceTier) {
+    this.pendingServiceTier = serviceTier;
+  }
   setPendingEffort(effort) {
     this.pendingEffort = effort;
   }
@@ -33101,6 +33065,7 @@ var CodexAppServerConnection = class extends BaseConnection {
           cwd: options?.cwd ?? this.cwd,
           developerInstructions: options?.developerInstructions ?? null,
           model: options?.model ?? null,
+          serviceTier: options?.serviceTier ?? null,
           approvalPolicy: options?.approvalPolicy ?? null,
           sandbox: options?.sandbox ?? null,
           config: options?.config ?? null
@@ -33111,10 +33076,11 @@ var CodexAppServerConnection = class extends BaseConnection {
       this.setState("ready");
       return response;
     } catch (error51) {
+      const diagnosticError = this.withStderrDiagnostics(error51, "Codex initialize");
       this.setState("error");
       this.isDisconnecting = true;
       await this.disconnect();
-      throw error51;
+      throw diagnosticError;
     }
   }
   async loadSession(threadId, options) {
@@ -33122,11 +33088,37 @@ var CodexAppServerConnection = class extends BaseConnection {
     try {
       response = await this.sendThreadResumeRequest(threadId, options);
     } catch (error51) {
-      const rolloutPath = this.findRolloutPathForThreadId(threadId);
-      if (!rolloutPath || !isMissingRolloutError(error51, threadId)) {
-        throw error51;
+      if (isArchivedThreadError(error51, threadId)) {
+        try {
+          await this.sendRequest(
+            CODEX_METHODS.THREAD_UNARCHIVE,
+            { threadId }
+          );
+        } catch (unarchiveError) {
+          const message = unarchiveError instanceof Error ? unarchiveError.message : String(unarchiveError);
+          throw new Error(
+            `thread/unarchive\uC5D0 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4(\uC6D0\uC778: archived \uC0C1\uD0DC\uB85C resume \uAC70\uBD80\uB428): ${message}`,
+            { cause: unarchiveError }
+          );
+        }
+        try {
+          response = await this.sendThreadResumeRequest(threadId, options);
+        } catch (resumeError) {
+          await this.sendRequest(
+            CODEX_METHODS.THREAD_ARCHIVE,
+            { threadId },
+            SESSION_TEARDOWN_TIMEOUT_MS
+          ).catch(() => {
+          });
+          throw resumeError;
+        }
+      } else {
+        const rolloutPath = this.findRolloutPathForThreadId(threadId);
+        if (!rolloutPath || !isMissingRolloutError(error51, threadId)) {
+          throw error51;
+        }
+        response = await this.sendThreadResumeRequest(threadId, options, rolloutPath);
       }
-      response = await this.sendThreadResumeRequest(threadId, options, rolloutPath);
     }
     this.threadId = response.thread.id;
     this.turnId = null;
@@ -33188,16 +33180,19 @@ var CodexAppServerConnection = class extends BaseConnection {
       this.on("exit", onExit);
     });
     try {
+      const serviceTier = options?.serviceTier !== void 0 ? options.serviceTier : this.pendingServiceTier;
       const response = await this.sendRequest(
         CODEX_METHODS.TURN_START,
         {
           threadId: sessionId,
           input,
           model: options?.model ?? this.pendingModel ?? null,
+          ...serviceTier !== void 0 ? { serviceTier } : {},
           effort: options?.effort ?? this.pendingEffort ?? null
         }
       );
       this.pendingModel = null;
+      this.pendingServiceTier = void 0;
       this.pendingEffort = null;
       this.turnId = response.turn.id;
       await turnCompleted;
@@ -33224,14 +33219,16 @@ var CodexAppServerConnection = class extends BaseConnection {
     if (threadId && activeTurnId) {
       await this.sendRequest(
         CODEX_METHODS.TURN_INTERRUPT,
-        { threadId, turnId: activeTurnId }
+        { threadId, turnId: activeTurnId },
+        SESSION_TEARDOWN_TIMEOUT_MS
       ).catch(() => {
       });
     }
     if (threadId) {
       await this.sendRequest(
         CODEX_METHODS.THREAD_ARCHIVE,
-        { threadId }
+        { threadId },
+        SESSION_TEARDOWN_TIMEOUT_MS
       ).catch(() => {
       });
     }
@@ -33249,6 +33246,7 @@ var CodexAppServerConnection = class extends BaseConnection {
         cwd: options?.cwd ?? this.cwd,
         developerInstructions: options?.developerInstructions ?? null,
         model: options?.model ?? null,
+        serviceTier: options?.serviceTier ?? null,
         approvalPolicy: options?.approvalPolicy ?? null,
         sandbox: options?.sandbox ?? null,
         config: options?.config ?? null
@@ -33266,6 +33264,9 @@ var CodexAppServerConnection = class extends BaseConnection {
     this.rejectPendingRequests(new Error("Codex \uC5F0\uACB0\uC774 \uC885\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4."));
     this.rejectPendingMcpReadyWaiters(new Error("Codex \uC5F0\uACB0\uC774 \uC885\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4."));
     this.stdoutBuffer = "";
+    this.pendingModel = null;
+    this.pendingServiceTier = void 0;
+    this.pendingEffort = null;
     this.codexHome = null;
     try {
       await super.disconnect();
@@ -33714,6 +33715,7 @@ var CodexAppServerConnection = class extends BaseConnection {
         path: rolloutPath ?? null,
         cwd: options?.cwd ?? this.cwd,
         model: options?.model ?? null,
+        serviceTier: options?.serviceTier ?? null,
         approvalPolicy: options?.approvalPolicy ?? null,
         sandbox: options?.sandbox ?? null,
         developerInstructions: options?.developerInstructions ?? null,
@@ -33833,6 +33835,9 @@ var CodexAppServerConnection = class extends BaseConnection {
 function isMissingRolloutError(error51, threadId) {
   return error51 instanceof Error && error51.message.includes(`no rollout found for thread id ${threadId}`);
 }
+function isArchivedThreadError(error51, threadId) {
+  return error51 instanceof Error && error51.message.includes(`session ${threadId} is archived`);
+}
 function findRolloutPath(root, threadId) {
   if (!fs10.existsSync(root)) {
     return null;
@@ -33854,7 +33859,7 @@ function findRolloutPath(root, threadId) {
 }
 
 // ../../packages/core-unified-agent/src/client/UnifiedCodexAgentClient.ts
-var CODEX_TURN_LEVEL_CONFIG_KEYS = /* @__PURE__ */ new Set(["effort", "model"]);
+var CODEX_TURN_LEVEL_CONFIG_KEYS = /* @__PURE__ */ new Set(["effort"]);
 var CODEX_THREAD_POLICY_CONFIG_KEYS = /* @__PURE__ */ new Set(["approvalPolicy", "sandbox"]);
 var UnifiedCodexAgentClient = class extends EventEmitter {
   connection = null;
@@ -33863,6 +33868,8 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
   currentSystemPrompt = null;
   firstPromptPending = null;
   pendingOverrides = null;
+  currentModelSelection = {};
+  archiveSessionOnDisconnect = false;
   detector = new CliDetector();
   on(event, listener) {
     return super.on(event, listener);
@@ -33882,9 +33889,6 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
       throw new Error("UnifiedCodexAgentClient\uB294 codex CLI\uB9CC \uC9C0\uC6D0\uD569\uB2C8\uB2E4.");
     }
     this.validateModelEffort(options.model, options.effort);
-    if (shouldUseCodexAcp(options)) {
-      return this.connectAcp(options);
-    }
     return this.connectAppServer(options);
   }
   async connectAppServer(options) {
@@ -33893,6 +33897,7 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     const command2 = options.cliPath ?? backend.cliCommand;
     const baseArgs = backend.appServerArgs ?? ["app-server", "--listen", "stdio://"];
     const modeMapping = this.resolveMode(options.yoloMode === false ? "default" : "yolo");
+    const modelSelection = this.resolveModelSelection(options.model);
     const args = [
       ...baseArgs,
       ...this.buildStartupConfigArgs(options.configOverrides, options.mcpServers, modeMapping)
@@ -33916,13 +33921,14 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     if (options.sessionId) {
       await connection.connect({
         skipThreadStart: true,
-        model: options.model
+        model: modelSelection.providerModelId,
+        serviceTier: modelSelection.serviceTier
       });
       await connection.loadSession(
         options.sessionId,
         this.buildCodexThreadDefaultsForResume(
           options.cwd,
-          options.model,
+          modelSelection,
           null,
           modeMapping
         )
@@ -33930,7 +33936,8 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     } else {
       await connection.connect({
         developerInstructions: void 0,
-        model: options.model,
+        model: modelSelection.providerModelId,
+        serviceTier: modelSelection.serviceTier,
         approvalPolicy: modeMapping.approvalPolicy,
         sandbox: modeMapping.sandbox
       });
@@ -33944,6 +33951,8 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     this.sessionCwd = options.cwd;
     this.currentSystemPrompt = options.systemPrompt ?? null;
     this.firstPromptPending = options.sessionId ? null : this.currentSystemPrompt;
+    this.currentModelSelection = modelSelection;
+    this.archiveSessionOnDisconnect = options.archiveSessionOnDisconnect === true;
     this.pendingOverrides = {
       turnConfig: options.effort ? { effort: options.effort } : {},
       threadConfig: {
@@ -33957,71 +33966,17 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
       session: { sessionId }
     };
   }
-  async connectAcp(options) {
-    const cleanEnv = cleanEnvironment(process.env, options.env);
-    const spawnConfig = createSpawnConfig("codex", options);
-    const codexConfigEnv = buildCodexConfigEnv(
-      options.configOverrides,
-      cleanEnv.CODEX_CONFIG
-    );
-    const connection = new AcpConnection({
-      command: spawnConfig.command,
-      args: spawnConfig.args,
-      cliType: "codex",
-      cwd: options.cwd,
-      env: { ...cleanEnv, ...codexConfigEnv ? { CODEX_CONFIG: codexConfigEnv } : {} },
-      requestTimeout: options.timeout ?? 6e5,
-      initTimeout: options.timeout ?? 6e4,
-      promptIdleTimeout: options.promptIdleTimeout ?? 6e5,
-      clientInfo: options.clientInfo,
-      autoApprove: options.autoApprove,
-      fsAccess: options.fsAccess
-    });
-    this.connection = connection;
-    this.setupEventForwarding();
-    const recentLogs = [];
-    const collectLog = (message) => {
-      recentLogs.push(message);
-      if (recentLogs.length > 30) {
-        recentLogs.shift();
-      }
-    };
-    connection.on("log", collectLog);
-    let session;
-    try {
-      session = await connection.connect(
-        options.cwd,
-        options.sessionId,
-        this.resolveAcpMcpServers(options.mcpServers)
-      );
-    } catch (error51) {
-      const connectionError = this.buildConnectionError(error51, recentLogs);
-      await this.cleanupFailedConnection();
-      throw connectionError;
-    } finally {
-      connection.off("log", collectLog);
-    }
-    await this.finalizeAcpConnect(options, session);
-    return {
-      cli: "codex",
-      protocol: "acp",
-      session
-    };
-  }
   async disconnect() {
     if (!this.connection) {
       this.clearSessionState();
       return;
     }
-    const conn = this.connection;
-    if (this.sessionId && conn instanceof AcpConnection && conn.canResetSession) {
-      try {
-        await conn.endSession(this.sessionId);
-      } catch {
-      }
+    if (this.archiveSessionOnDisconnect && this.sessionId) {
+      await this.connection.endSession().catch(() => {
+      });
     }
-    await conn.disconnect();
-    conn.removeAllListeners();
+    await this.connection.disconnect();
+    this.connection.removeAllListeners();
     this.connection = null;
     this.clearSessionState();
   }
@@ -34029,14 +33984,7 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     if (!this.connection) {
       throw new Error("\uC5F0\uACB0\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4");
     }
-    if (this.connection instanceof AcpConnection) {
-      if (!this.sessionId) {
-        throw new Error("\uC5F0\uACB0\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4");
-      }
-      await this.connection.endSession(this.sessionId);
-    } else {
-      await this.connection.endSession();
-    }
+    await this.connection.endSession();
     this.sessionId = null;
     this.sessionCwd = null;
   }
@@ -34051,7 +33999,7 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     }
     return {
       cli: "codex",
-      protocol: this.connection instanceof AcpConnection ? "acp" : "codex-app-server",
+      protocol: "codex-app-server",
       sessionId: this.sessionId,
       state: this.connection.connectionState
     };
@@ -34063,12 +34011,6 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     if (!this.connection) {
       throw new Error("\uC5F0\uACB0\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4");
     }
-    if (this.connection instanceof AcpConnection) {
-      if (!this.sessionId) {
-        throw new Error("\uC5F0\uACB0\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4");
-      }
-      return this.sendPromptWithPendingSystemPrompt(content);
-    }
     this.applyPendingOverrides();
     const input = typeof content === "string" ? [{ type: "text", text: content, text_elements: [] }] : content.map((block) => "text" in block ? { type: "text", text: block.text, text_elements: [] } : { type: "text", text: JSON.stringify(block), text_elements: [] });
     const systemPrompt = this.firstPromptPending;
@@ -34079,53 +34021,20 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     }
     return { stopReason: "end_turn" };
   }
-  async sendPromptWithPendingSystemPrompt(content) {
-    if (!(this.connection instanceof AcpConnection) || !this.sessionId) {
-      throw new Error("\uC5F0\uACB0\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4");
-    }
-    const systemPrompt = this.firstPromptPending;
-    if (!systemPrompt) {
-      return this.connection.sendPrompt(this.sessionId, content);
-    }
-    const userBlocks = typeof content === "string" ? [{ type: "text", text: content }] : content;
-    const response = await this.connection.sendPrompt(this.sessionId, [
-      { type: "text", text: systemPrompt },
-      ...userBlocks
-    ]);
-    this.firstPromptPending = null;
-    return response;
-  }
   async cancelPrompt() {
     if (!this.connection) {
       throw new Error("\uC5F0\uACB0\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4");
     }
-    if (this.connection instanceof AcpConnection) {
-      if (!this.sessionId) {
-        throw new Error("\uC5F0\uACB0\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4");
-      }
-      await this.connection.cancelSession(this.sessionId);
-      return;
-    }
     await this.connection.cancelPrompt();
   }
   async setModel(model) {
-    if (this.connection instanceof AcpConnection && this.sessionId) {
-      await this.connection.setModel(this.sessionId, model);
-      return;
-    }
-    this.ensurePendingOverrides().model = model;
+    const selection = this.resolveModelSelection(model);
+    this.currentModelSelection = selection;
+    this.ensurePendingOverrides().model = selection;
   }
   async setConfigOption(configId, value) {
-    if (this.connection instanceof AcpConnection && this.sessionId) {
-      if (configId === "model") {
-        await this.connection.setModel(this.sessionId, value);
-        return;
-      }
-      await this.connection.setConfigOption(
-        this.sessionId,
-        configId === "effort" ? "reasoning_effort" : configId,
-        value
-      );
+    if (configId === "model") {
+      await this.setModel(value);
       return;
     }
     const pending = this.ensurePendingOverrides();
@@ -34137,10 +34046,6 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     this.emitTyped("log", `[codex] config '${configId}' will apply on next thread/start or thread/resume`);
   }
   async setMode(mode) {
-    if (this.connection instanceof AcpConnection && this.sessionId) {
-      await this.connection.setMode(this.sessionId, this.resolveAcpMode(mode));
-      return;
-    }
     const resolved = this.resolveMode(mode);
     const pending = this.ensurePendingOverrides();
     pending.threadConfig.approvalPolicy = resolved.approvalPolicy;
@@ -34163,17 +34068,6 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     if (!this.connection) {
       throw new Error("\uC5F0\uACB0\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4");
     }
-    if (this.connection instanceof AcpConnection) {
-      await this.connection.loadSession({
-        sessionId,
-        cwd: this.sessionCwd ?? process.cwd(),
-        mcpServers: this.resolveAcpMcpServers(mcpServers)
-      });
-      this.sessionId = sessionId;
-      this.currentSystemPrompt = null;
-      this.firstPromptPending = null;
-      return;
-    }
     if (mcpServers?.length) {
       this.emitTyped(
         "log",
@@ -34185,7 +34079,7 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
       sessionId,
       this.buildCodexThreadDefaultsForResume(
         targetCwd,
-        void 0,
+        this.currentModelSelection,
         null,
         this.pendingOverrides?.threadConfig ?? {}
       )
@@ -34199,24 +34093,6 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
       throw new Error("\uC5F0\uACB0\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4");
     }
     const targetCwd = cwd ?? this.sessionCwd ?? process.cwd();
-    if (this.connection instanceof AcpConnection) {
-      if (!this.sessionId) {
-        throw new Error("\uC5F0\uACB0\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4");
-      }
-      if (!this.connection.canResetSession) {
-        throw new Error("[codex] \uC138\uC158 \uB9AC\uC14B\uC744 \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. disconnect() \uD6C4 \uC7AC\uC5F0\uACB0\uD558\uC138\uC694.");
-      }
-      await this.connection.endSession(this.sessionId);
-      const session = await this.connection.reconnectSession(targetCwd);
-      this.sessionId = session.sessionId;
-      this.sessionCwd = targetCwd;
-      this.firstPromptPending = this.currentSystemPrompt;
-      return {
-        cli: "codex",
-        protocol: "acp",
-        session
-      };
-    }
     const result = await this.connection.resetSession(
       this.buildCodexThreadDefaultsForReset(targetCwd)
     );
@@ -34232,33 +34108,14 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
       protocol: "codex-app-server"
     };
   }
-  resolveAcpMcpServers(servers) {
-    return servers?.length ? mcpServerConfigsToAcp(servers) : [];
-  }
-  async finalizeAcpConnect(options, session) {
-    this.sessionId = session.sessionId;
-    this.sessionCwd = options.cwd;
-    this.currentSystemPrompt = options.systemPrompt ?? null;
-    this.firstPromptPending = options.sessionId ? null : this.currentSystemPrompt;
-    this.pendingOverrides = {
-      turnConfig: {},
-      threadConfig: {}
-    };
-    const mode = options.yoloMode === false ? "default" : "yolo";
-    await this.setMode(mode);
-    if (options.model) {
-      await this.setModel(options.model);
-    }
-    if (options.effort) {
-      await this.setConfigOption("effort", options.effort);
-    }
-  }
   clearSessionState() {
     this.sessionId = null;
     this.sessionCwd = null;
     this.currentSystemPrompt = null;
     this.firstPromptPending = null;
     this.pendingOverrides = null;
+    this.currentModelSelection = {};
+    this.archiveSessionOnDisconnect = false;
   }
   validateModelEffort(modelId, effort) {
     if (!effort) {
@@ -34281,69 +34138,7 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
   }
   setupEventForwarding() {
     if (!this.connection) return;
-    const connection = this.connection;
-    if (connection instanceof AcpConnection) {
-      this.setupAcpEventForwarding(connection);
-      return;
-    }
-    this.setupAppServerEventForwarding(connection);
-  }
-  setupAcpEventForwarding(connection) {
-    connection.on("stateChange", (state) => {
-      this.emitTyped("stateChange", state);
-    });
-    connection.on("userMessageChunk", (text, sessionId) => {
-      this.emitTyped("userMessageChunk", text, sessionId);
-    });
-    connection.on("messageChunk", (text, sessionId) => {
-      this.emitTyped("messageChunk", text, sessionId);
-    });
-    connection.on("thoughtChunk", (text, sessionId) => {
-      this.emitTyped("thoughtChunk", text, sessionId);
-    });
-    connection.on("toolCall", (title, status, sessionId, data) => {
-      this.emitTyped("toolCall", title, status, sessionId, data);
-    });
-    connection.on("toolCallUpdate", (title, status, sessionId, data) => {
-      this.emitTyped("toolCallUpdate", title, status, sessionId, data);
-    });
-    connection.on("plan", (plan, sessionId) => {
-      this.emitTyped("plan", plan, sessionId);
-    });
-    connection.on("availableCommandsUpdate", (commands, sessionId) => {
-      this.emitTyped("availableCommandsUpdate", commands, sessionId);
-    });
-    connection.on("promptComplete", (sessionId) => {
-      this.emitTyped("promptComplete", sessionId);
-    });
-    connection.on("permissionRequest", (params, resolve3) => {
-      this.emitTyped(
-        "permissionRequest",
-        params,
-        resolve3
-      );
-    });
-    connection.on("sessionUpdate", (update) => {
-      this.emitTyped("sessionUpdate", update);
-    });
-    connection.on("fileRead", (params, resolve3) => {
-      this.emitTyped("fileRead", params, resolve3);
-    });
-    connection.on("fileWrite", (params, resolve3) => {
-      this.emitTyped("fileWrite", params, resolve3);
-    });
-    connection.on("error", (err) => {
-      this.emitTyped("error", err);
-    });
-    connection.on("exit", (code, signal) => {
-      this.emitTyped("exit", code, signal);
-    });
-    connection.on("log", (msg) => {
-      this.emitTyped("log", msg);
-    });
-    connection.on("logEntry", (entry) => {
-      this.emitTyped("logEntry", entry);
-    });
+    this.setupAppServerEventForwarding(this.connection);
   }
   setupAppServerEventForwarding(connection) {
     connection.on("stateChange", (state) => {
@@ -34406,15 +34201,15 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     if (!this.pendingOverrides || !this.connection) {
       return;
     }
-    if (this.connection instanceof AcpConnection) {
-      return;
-    }
     if (this.pendingOverrides.model) {
-      this.connection.setPendingModel(this.pendingOverrides.model);
+      this.connection.setPendingModel(this.pendingOverrides.model.providerModelId ?? null);
+      this.connection.setPendingServiceTier(this.pendingOverrides.model.serviceTier ?? null);
       this.pendingOverrides.model = void 0;
     }
     if (this.pendingOverrides.turnConfig.model) {
-      this.connection.setPendingModel(this.pendingOverrides.turnConfig.model);
+      const selection = this.resolveModelSelection(this.pendingOverrides.turnConfig.model);
+      this.connection.setPendingModel(selection.providerModelId ?? null);
+      this.connection.setPendingServiceTier(selection.serviceTier ?? null);
       delete this.pendingOverrides.turnConfig.model;
     }
     if (this.pendingOverrides.turnConfig.effort) {
@@ -34429,19 +34224,22 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     const config2 = configEntries.length > 0 ? Object.fromEntries(configEntries) : void 0;
     return {
       cwd,
+      model: this.currentModelSelection.providerModelId,
+      serviceTier: this.currentModelSelection.serviceTier,
       approvalPolicy,
       sandbox,
       developerInstructions: void 0,
       config: config2
     };
   }
-  buildCodexThreadDefaultsForResume(cwd, model, systemPrompt, threadConfig) {
+  buildCodexThreadDefaultsForResume(cwd, modelSelection, systemPrompt, threadConfig) {
     const { approvalPolicy, sandbox } = threadConfig;
     const configEntries = Object.entries(threadConfig).filter(([key]) => !CODEX_THREAD_POLICY_CONFIG_KEYS.has(key));
     const config2 = configEntries.length > 0 ? Object.fromEntries(configEntries) : void 0;
     return {
       cwd,
-      ...model ? { model } : {},
+      ...modelSelection.providerModelId ? { model: modelSelection.providerModelId } : {},
+      ...modelSelection.serviceTier ? { serviceTier: modelSelection.serviceTier } : {},
       approvalPolicy,
       sandbox,
       developerInstructions: systemPrompt ?? void 0,
@@ -34458,16 +34256,6 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
         return { approvalPolicy: "on-request", sandbox: "read-only" };
     }
   }
-  resolveAcpMode(modeId) {
-    switch (modeId) {
-      case "autoEdit":
-        return "agent";
-      case "yolo":
-        return "agent-full-access";
-      default:
-        return "read-only";
-    }
-  }
   buildStartupConfigArgs(overrides, servers, modeMapping) {
     const configArgs = [
       ...modeMapping ? [
@@ -34497,6 +34285,10 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
       return;
     }
     try {
+      if (this.archiveSessionOnDisconnect && this.sessionId) {
+        await this.connection.endSession().catch(() => {
+        });
+      }
       await this.connection.disconnect();
     } catch {
     }
@@ -34504,65 +34296,17 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     this.connection = null;
     this.clearSessionState();
   }
-  buildConnectionError(error51, recentLogs) {
-    if (getBackendConfig("codex").authRequired && this.isAuthenticationError(error51, recentLogs)) {
-      return new Error(
-        "[codex] \uC778\uC99D\uC774 \uD544\uC694\uD558\uAC70\uB098 \uC778\uC99D\uC774 \uB9CC\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uBA3C\uC800 \uD574\uB2F9 CLI\uC5D0\uC11C \uB85C\uADF8\uC778/\uC778\uC99D\uC744 \uC644\uB8CC\uD55C \uB4A4 \uB2E4\uC2DC \uC2DC\uB3C4\uD574\uC8FC\uC138\uC694."
-      );
-    }
-    if (error51 instanceof Error) {
-      return error51;
-    }
-    if (typeof error51 === "object" && error51 !== null) {
-      const obj = error51;
-      if (typeof obj.message === "string") {
-        const code = typeof obj.code === "number" ? ` (code: ${obj.code})` : "";
-        const data = obj.data ? ` \u2014 ${JSON.stringify(obj.data)}` : "";
-        return new Error(`${obj.message}${code}${data}`);
-      }
-      return new Error(JSON.stringify(error51));
-    }
-    return new Error(String(error51));
-  }
-  isAuthenticationError(error51, recentLogs) {
-    const authPatterns = [
-      /auth_required/i,
-      /authentication required/i,
-      /not authenticated/i,
-      /please login/i,
-      /please log in/i,
-      /sign in/i,
-      /reauth/i,
-      /unauthorized/i,
-      /invalid api key/i
-    ];
-    if (this.matchAnyPattern(this.extractErrorText(error51), authPatterns)) {
-      return true;
-    }
-    return recentLogs.some((log) => this.matchAnyPattern(log, authPatterns));
-  }
-  extractErrorText(error51) {
-    if (error51 instanceof Error) {
-      const code = error51.code;
-      if (code === -32e3) {
-        return `auth_required ${error51.message}`;
-      }
-      return error51.message;
-    }
-    if (typeof error51 === "string") {
-      return error51;
+  resolveModelSelection(modelId) {
+    if (!modelId) {
+      return {};
     }
-    return String(error51);
-  }
-  matchAnyPattern(text, patterns) {
-    return patterns.some((pattern) => pattern.test(text));
+    const model = getProviderModels("codex").models.find((entry) => entry.modelId === modelId);
+    return {
+      providerModelId: model?.providerModelId ?? modelId,
+      serviceTier: model?.serviceTier
+    };
   }
 };
-function shouldUseCodexAcp(options) {
-  const value = options.env?.CODEX_USE_ACP ?? process.env.CODEX_USE_ACP;
-  const normalized = value?.trim().toLowerCase();
-  return normalized !== void 0 && normalized !== "false" && normalized !== "0";
-}
 var UnifiedCursorAgentClient = class extends EventEmitter {
   connection = null;
   sessionId = null;
@@ -38079,9 +37823,243 @@ function stripIpv6Brackets2(host) {
 
 // core/host/operations/types.ts
 var MAX_GROUP_NAME_LENGTH = 64;
+var DELETION_GRACE_MS = 8e3;
 
-// core/host/durable-state.ts
-var STATE_VERSION = 2;
+// core/host/deferred-deletion.ts
+var DeferredDeletionError = class extends Error {
+  status;
+  constructor(status, message) {
+    super(message);
+    this.name = "DeferredDeletionError";
+    this.status = status;
+  }
+};
+var OPERATION_DELETED_EVENT_CHANNEL = "operation:deleted";
+var OPERATION_RESTORED_EVENT_CHANNEL = "operation:restored";
+var OPERATION_PURGED_EVENT_CHANNEL = "operation:purged";
+var PURGE_RETRY_MS = 1e3;
+function createDeferredDeletionCoordinator(deps) {
+  const now = deps.now ?? Date.now;
+  const randomId = deps.randomId ?? crypto2.randomUUID;
+  const setTimer = deps.setTimer ?? setTimeout;
+  const clearTimer = deps.clearTimer ?? clearTimeout;
+  let tombstones = [];
+  let timer = null;
+  function list() {
+    return tombstones;
+  }
+  function load(nextTombstones) {
+    tombstones = [...nextTombstones];
+    schedule();
+  }
+  function deleteOperation(operationId) {
+    sweepExpired();
+    const existing = tombstones.find((item) => item.kind === "operation" && item.targetId === operationId);
+    if (existing) return toReceipt(existing);
+    const operation = deps.operations.get(operationId);
+    if (!operation) return null;
+    const previousOperations = deps.operations.list();
+    const deletedAt = now();
+    const tombstone = {
+      deletionId: randomId(),
+      targetId: operation.id,
+      deletedAt,
+      expiresAt: deletedAt + DELETION_GRACE_MS,
+      kind: "operation",
+      operation
+    };
+    const nextTombstones = [...tombstones, tombstone];
+    deps.operations.delete(operationId);
+    try {
+      deps.save(nextTombstones);
+    } catch (error51) {
+      deps.operations.replace(previousOperations);
+      throw error51;
+    }
+    tombstones = nextTombstones;
+    publishOperation(OPERATION_DELETED_EVENT_CHANNEL, operation);
+    schedule();
+    return toReceipt(tombstone);
+  }
+  function deleteTheater(theaterId) {
+    sweepExpired();
+    const existing = tombstones.find((item) => item.kind === "theater" && item.targetId === theaterId);
+    if (existing) return toReceipt(existing);
+    const theater = deps.theaters.get(theaterId);
+    if (!theater) return null;
+    const previousTheaters = deps.theaters.list();
+    const previousOperations = deps.operations.list();
+    const previousGroups = deps.operations.listAllGroups();
+    const deletedOperations = deps.operations.listByTheater(theaterId);
+    const deletedGroups = deps.operations.listGroups(theaterId);
+    const deletedAt = now();
+    const tombstone = {
+      deletionId: randomId(),
+      targetId: theater.id,
+      deletedAt,
+      expiresAt: deletedAt + DELETION_GRACE_MS,
+      kind: "theater",
+      theater,
+      operations: deletedOperations,
+      groups: deletedGroups
+    };
+    const nextTombstones = [...tombstones, tombstone];
+    deps.theaters.remove(theaterId);
+    deps.operations.deleteByTheater(theaterId);
+    try {
+      deps.save(nextTombstones);
+    } catch (error51) {
+      deps.theaters.restore(previousTheaters);
+      deps.operations.replace(previousOperations);
+      deps.operations.replaceGroups(previousGroups);
+      throw error51;
+    }
+    tombstones = nextTombstones;
+    deps.unregisterTheaterWorkspaces(theaterId);
+    for (const operation of deletedOperations) publishOperation(OPERATION_DELETED_EVENT_CHANNEL, operation);
+    schedule();
+    return toReceipt(tombstone);
+  }
+  async function restore(deletionId) {
+    const restoredAt = now();
+    const tombstone = tombstones.find((item) => item.deletionId === deletionId);
+    if (!tombstone || tombstone.expiresAt <= restoredAt) {
+      if (tombstone) sweepExpired();
+      throw new DeferredDeletionError(404, "deletion_not_found");
+    }
+    if (tombstone.kind === "operation") {
+      if (deps.operations.get(tombstone.targetId) || !deps.theaters.get(tombstone.operation.theaterId)) {
+        throw new DeferredDeletionError(409, "restore_conflict");
+      }
+      const previousOperations2 = deps.operations.list();
+      const nextTombstones2 = tombstones.filter((item) => item.deletionId !== deletionId);
+      deps.operations.replace([...previousOperations2, tombstone.operation]);
+      try {
+        deps.save(nextTombstones2);
+      } catch (error51) {
+        deps.operations.replace(previousOperations2);
+        throw error51;
+      }
+      tombstones = nextTombstones2;
+      publishOperation(OPERATION_RESTORED_EVENT_CHANNEL, tombstone.operation);
+      schedule();
+      return { ok: true, kind: tombstone.kind, targetId: tombstone.targetId };
+    }
+    await deps.validateTheaterRestore(tombstone.theater);
+    if (deps.theaters.get(tombstone.targetId) || tombstone.operations.some((operation) => deps.operations.get(operation.id)) || hasGroupConflict(tombstone.groups, deps.operations.listAllGroups())) {
+      throw new DeferredDeletionError(409, "restore_conflict");
+    }
+    const previousTheaters = deps.theaters.list();
+    const previousOperations = deps.operations.list();
+    const previousGroups = deps.operations.listAllGroups();
+    const nextTombstones = tombstones.filter((item) => item.deletionId !== deletionId);
+    deps.theaters.restore([...previousTheaters, tombstone.theater]);
+    deps.operations.replace([...previousOperations, ...tombstone.operations]);
+    deps.operations.replaceGroups([...previousGroups, ...tombstone.groups]);
+    try {
+      deps.save(nextTombstones);
+    } catch (error51) {
+      deps.theaters.restore(previousTheaters);
+      deps.operations.replace(previousOperations);
+      deps.operations.replaceGroups(previousGroups);
+      throw error51;
+    }
+    tombstones = nextTombstones;
+    await deps.registerTheaterWorkspace(tombstone.theater);
+    for (const operation of tombstone.operations) publishOperation(OPERATION_RESTORED_EVENT_CHANNEL, operation);
+    schedule();
+    return { ok: true, kind: tombstone.kind, targetId: tombstone.targetId };
+  }
+  function sweepExpired() {
+    const cutoff = now();
+    const expired = tombstones.filter((item) => item.expiresAt <= cutoff);
+    if (expired.length === 0) {
+      schedule();
+      return;
+    }
+    const expiredIds = new Set(expired.map((item) => item.deletionId));
+    const nextTombstones = tombstones.filter((item) => !expiredIds.has(item.deletionId));
+    try {
+      deps.save(nextTombstones);
+    } catch (error51) {
+      schedule(PURGE_RETRY_MS);
+      throw error51;
+    }
+    tombstones = nextTombstones;
+    for (const tombstone of expired) {
+      if (tombstone.kind === "operation") {
+        publishOperation(OPERATION_PURGED_EVENT_CHANNEL, tombstone.operation);
+      } else {
+        for (const operation of tombstone.operations) publishOperation(OPERATION_PURGED_EVENT_CHANNEL, operation);
+      }
+    }
+    schedule();
+  }
+  function hasPendingOperation(operationId) {
+    sweepExpired();
+    return tombstones.some((item) => item.kind === "operation" ? item.targetId === operationId : item.operations.some((operation) => operation.id === operationId));
+  }
+  function hasPendingTheater(theaterId) {
+    sweepExpired();
+    return tombstones.some((item) => item.kind === "theater" && item.targetId === theaterId);
+  }
+  function schedule(forcedDelay) {
+    if (timer) clearTimer(timer);
+    timer = null;
+    if (forcedDelay !== void 0) {
+      timer = setTimer(runScheduledSweep, forcedDelay);
+      timer.unref?.();
+      return;
+    }
+    const nearest = tombstones.reduce((minimum, item) => minimum === null ? item.expiresAt : Math.min(minimum, item.expiresAt), null);
+    if (nearest === null) return;
+    timer = setTimer(runScheduledSweep, Math.max(0, nearest - now()));
+    timer.unref?.();
+  }
+  function runScheduledSweep() {
+    timer = null;
+    try {
+      sweepExpired();
+    } catch {
+    }
+  }
+  function dispose() {
+    if (timer) clearTimer(timer);
+    timer = null;
+  }
+  function publishOperation(channel, operation) {
+    deps.publish(channel, {
+      operationId: operation.id,
+      pluginId: operation.pluginId,
+      type: operation.type,
+      ...channel === OPERATION_RESTORED_EVENT_CHANNEL ? { operation } : {}
+    });
+  }
+  return {
+    list,
+    load,
+    deleteOperation,
+    deleteTheater,
+    restore,
+    sweepExpired,
+    hasPendingOperation,
+    hasPendingTheater,
+    dispose
+  };
+}
+function toReceipt(tombstone) {
+  return {
+    deletionId: tombstone.deletionId,
+    kind: tombstone.kind,
+    targetId: tombstone.targetId,
+    expiresAt: tombstone.expiresAt
+  };
+}
+function hasGroupConflict(groups, existing) {
+  const existingIds = new Set(existing.map((group) => group.id));
+  return groups.some((group) => existingIds.has(group.id));
+}
+var STATE_VERSION = 3;
 var STATE_LOCK_DIR_NAME = "state.lock";
 var STATE_LOCK_OWNER_FILE_NAME = "owner.json";
 var STATE_TEMP_PREFIX = ".state.";
@@ -38128,25 +38106,37 @@ function sanitizeDurableConsoleState(value) {
     version: STATE_VERSION,
     theaters: readTheaterRegistrations(upgraded.theaters),
     operations: readOperations(upgraded.operations),
-    groups: readOperationGroups(upgraded.groups)
+    groups: readOperationGroups(upgraded.groups),
+    deletionTombstones: readDeletionTombstones(upgraded.deletionTombstones)
   };
 }
 function emptyDurableConsoleState() {
-  return { version: STATE_VERSION, theaters: [], operations: [], groups: [] };
+  return { version: STATE_VERSION, theaters: [], operations: [], groups: [], deletionTombstones: [] };
 }
 function migrateToCurrentVersion(value) {
-  if (value.version === 1) return migrateV1ToV2(value);
-  return value;
+  let current = value;
+  if (current.version === 1) current = migrateV1ToV2(current);
+  if (current.version === 2) current = migrateV2ToV3(current);
+  return current;
 }
 function migrateV1ToV2(v1) {
   const operations = Array.isArray(v1.operations) ? v1.operations.map(migrateV1Operation) : [];
   return {
-    version: STATE_VERSION,
+    version: 2,
     theaters: v1.theaters ?? [],
     operations,
     groups: []
   };
 }
+function migrateV2ToV3(v2) {
+  return {
+    version: STATE_VERSION,
+    theaters: v2.theaters ?? [],
+    operations: v2.operations ?? [],
+    groups: v2.groups ?? [],
+    deletionTombstones: []
+  };
+}
 function migrateV1Operation(value) {
   if (!isRecord5(value)) return null;
   const sessionId = readNonEmptyString(value.sessionId);
@@ -38310,6 +38300,37 @@ function sanitizeOperationGroup(value) {
   if (!VALID_GROUP_COLOR_KEYS.has(color)) return null;
   return { id, theaterId, name: rawName, color, order, createdAt };
 }
+function readDeletionTombstones(value) {
+  if (!Array.isArray(value)) return [];
+  const tombstones = [];
+  for (const item of value) {
+    const tombstone = sanitizeDeletionTombstone(item);
+    if (tombstone) tombstones.push(tombstone);
+  }
+  return tombstones;
+}
+function sanitizeDeletionTombstone(value) {
+  if (!isRecord5(value)) return null;
+  const deletionId = readNonEmptyString(value.deletionId);
+  const targetId = readNonEmptyString(value.targetId);
+  const deletedAt = readFiniteNumber(value.deletedAt);
+  const expiresAt = readFiniteNumber(value.expiresAt);
+  if (!deletionId || !targetId || deletedAt === null || expiresAt === null) return null;
+  if (value.kind === "operation") {
+    const operation = sanitizeOperationNode(value.operation);
+    if (!operation || operation.id !== targetId) return null;
+    return { deletionId, targetId, deletedAt, expiresAt, kind: "operation", operation };
+  }
+  if (value.kind === "theater") {
+    const theater = sanitizeTheaterRegistration(value.theater);
+    if (!theater || theater.id !== targetId || !Array.isArray(value.operations) || !Array.isArray(value.groups)) return null;
+    const operations = value.operations.map(sanitizeOperationNode).filter((operation) => operation !== null);
+    const groups = value.groups.map(sanitizeOperationGroup).filter((group) => group !== null);
+    if (operations.length !== value.operations.length || groups.length !== value.groups.length || operations.some((operation) => operation.theaterId !== targetId) || groups.some((group) => group.theaterId !== targetId)) return null;
+    return { deletionId, targetId, deletedAt, expiresAt, kind: "theater", theater, operations, groups };
+  }
+  return null;
+}
 
 // core/host/operations/sanitize.ts
 var FIXED_SENSITIVE_OPERATION_FIELDS = /* @__PURE__ */ new Set([
@@ -38325,11 +38346,20 @@ var FIXED_SENSITIVE_OPERATION_FIELDS = /* @__PURE__ */ new Set([
 ]);
 function createSanitizedOpDto(node, options = {}) {
   const sensitiveFields = /* @__PURE__ */ new Set([...FIXED_SENSITIVE_OPERATION_FIELDS, ...options.sensitiveFields ?? []]);
+  const payload = sanitizeRecord(node.payload, sensitiveFields);
+  delete payload.resumeAvailable;
+  if (isResumableProviderSession(node.payload?.providerSession)) payload.resumeAvailable = true;
   return {
     ...node,
-    payload: sanitizeRecord(node.payload, sensitiveFields)
+    payload
   };
 }
+function isResumableProviderSession(value) {
+  if (!isRecord6(value)) return false;
+  const provider = value.provider;
+  const sessionId = value.sessionId;
+  return typeof provider === "string" && provider.length > 0 && typeof sessionId === "string" && sessionId.length > 0;
+}
 function sanitizeRecord(value, sensitiveFields) {
   const output = {};
   for (const [key, item] of Object.entries(value)) {
@@ -38411,6 +38441,10 @@ async function handleCollection(req, res, deps) {
     deps.writeJson(res, 400, { error: "invalid_operation_accent" });
     return;
   }
+  if (typeof body2.id === "string" && deps.isPendingDeletion?.(body2.id)) {
+    deps.writeJson(res, 409, { error: "pending_deletion" });
+    return;
+  }
   try {
     const node = deps.store.create({
       id: typeof body2.id === "string" ? body2.id : void 0,
@@ -38443,8 +38477,8 @@ async function handleItem(req, res, id, deps) {
     return;
   }
   if (req.method === "DELETE") {
-    const deleted = deps.deleteOperation(id);
-    deps.writeJson(res, deleted ? 200 : 404, deleted ? { ok: true } : { error: "operation_not_found" });
+    const deletion = deps.deleteOperation(id);
+    deps.writeJson(res, 200, { ok: true, deletion });
     return;
   }
   const body2 = await deps.readJsonBody(req);
@@ -39035,6 +39069,10 @@ function createPlansRouter(deps) {
       await handlePlansRead(req, res, deps);
       return true;
     }
+    if (pathname === "/api/v1/plans/search") {
+      await handlePlansSearch(req, res, deps);
+      return true;
+    }
     if (pathname === "/api/v1/plans/events") {
       await handlePlansEvents(req, res, deps);
       return true;
@@ -39042,6 +39080,38 @@ function createPlansRouter(deps) {
     return false;
   };
 }
+async function handlePlansSearch(req, res, deps) {
+  if (req.method !== "POST") {
+    deps.writeJson(res, 405, { error: "Method not allowed" });
+    return;
+  }
+  if (!deps.isAuthorized(req)) {
+    deps.writeJson(res, 401, { error: "unauthorized" });
+    return;
+  }
+  const body2 = await deps.readJsonBody(req);
+  if (!isPlainObject2(body2) || typeof body2.theaterId !== "string" || typeof body2.query !== "string" || body2.query.trim() === "" || !Number.isInteger(body2.limit) || body2.limit < 1 || body2.limit > 8 || "relPath" in body2) {
+    deps.writeJson(res, 400, { error: "invalid_request" });
+    return;
+  }
+  const theaterPath = deps.resolveTheaterPath(body2.theaterId);
+  if (!theaterPath) {
+    deps.writeJson(res, 404, { error: "theater_not_found" });
+    return;
+  }
+  try {
+    const context = await resolveTheaterRoot(theaterPath);
+    const tokens = body2.query.trim().toLocaleLowerCase().split(/\s+/).filter(Boolean);
+    const plans = (await listPlansForWorkspace(deps.dataDir, context.realRoot)).filter((plan) => {
+      const text = `${plan.name}
+${plan.title}`.toLocaleLowerCase();
+      return tokens.every((token) => text.includes(token));
+    }).slice(0, body2.limit).map((plan) => ({ name: plan.name, title: plan.title }));
+    deps.writeJson(res, 200, { plans });
+  } catch (error51) {
+    writePlanStoreError(res, deps, error51);
+  }
+}
 async function handlePlansEvents(req, res, deps) {
   if (req.method !== "GET") {
     deps.writeJson(res, 405, { error: "Method not allowed" });
@@ -40857,7 +40927,6 @@ var SERVER_TIMEOUT_MS = 30 * 60 * 1e3;
 var MAX_BODY_BYTES = 1024 * 1024;
 var UPDATE_APPLY_FORBIDDEN_BODY_KEYS = /* @__PURE__ */ new Set(["channel", "package", "packageName", "packageVersion", "packages", "targetVersion", "version"]);
 var OPERATION_RENAMED_EVENT_CHANNEL = "operation:renamed";
-var OPERATION_DELETED_EVENT_CHANNEL = "operation:deleted";
 var PAIRING_IDENTITY_PATH = "/api/v1/pairing-identity";
 var PAIRING_IDENTITY = { product: "fleet-console", schemaVersion: 1, pairingProtocolVersion: 1 };
 var SERVER_API_CATALOG = [
@@ -40917,6 +40986,13 @@ var SERVER_API_CATALOG = [
     category: "Observer",
     gate: "origin-write"
   },
+  {
+    method: "POST",
+    path: "/api/v1/deletions/:deletionId/restore",
+    summary: "\uC720\uC608 \uC911\uC778 Operation \uB610\uB294 Theater \uC0AD\uC81C\uB97C \uBCF5\uAD6C\uD569\uB2C8\uB2E4.",
+    category: "Observer",
+    gate: "origin-write"
+  },
   {
     method: "POST",
     path: "/api/v1/theaters/:theaterId/codex-workspace",
@@ -41044,16 +41120,29 @@ function createConsoleServer(deps = {}) {
   function publishPluginEvent(channel2, payload) {
     for (const listener of pluginEventListeners.get(channel2) ?? []) listener(payload);
   }
-  function deleteOperation(operationId) {
-    const operation = operations.get(operationId);
-    if (!operation || !operations.delete(operationId)) return false;
-    persistDurableState();
-    publishPluginEvent(OPERATION_DELETED_EVENT_CHANNEL, {
-      operationId: operation.id,
-      pluginId: operation.pluginId,
-      type: operation.type
-    });
-    return true;
+  const deletionCoordinator = createDeferredDeletionCoordinator({
+    operations,
+    theaters,
+    save: saveDurableState,
+    publish: publishPluginEvent,
+    unregisterTheaterWorkspaces: (theaterId) => codex.unregisterTheaterWorkspaces(theaterId),
+    validateTheaterRestore: async (theater) => {
+      try {
+        const restoredRealpath = await fs10__default.promises.realpath(theater.path);
+        const stat4 = await fs10__default.promises.stat(restoredRealpath);
+        if (!stat4.isDirectory() || restoredRealpath !== theater.realpath || workspaceHash(restoredRealpath) !== theater.id) {
+          throw new Error("restore_conflict");
+        }
+      } catch {
+        throw new DeferredDeletionError(409, "restore_parent_missing");
+      }
+    },
+    registerTheaterWorkspace: async (theater) => {
+      await codex.registerWorkspace(theater.realpath, theater.lastOpenedAt, theater.id);
+    }
+  });
+  function deleteOperationForPlugin(operationId) {
+    return deletionCoordinator.deleteOperation(operationId) !== null;
   }
   let desktopFullscreen = false;
   let unsubscribeUpdateCheckChanges = updateCheck.onChange?.(() => {
@@ -41064,6 +41153,7 @@ function createConsoleServer(deps = {}) {
       list: () => operations.list(),
       get: (id) => operations.get(id),
       create: (input) => {
+        if (input.id && deletionCoordinator.hasPendingOperation(input.id)) throw new Error("pending_deletion");
         const operation = operations.create(input);
         persistDurableState();
         return operation;
@@ -41079,7 +41169,7 @@ function createConsoleServer(deps = {}) {
         }
         return operation;
       },
-      delete: deleteOperation,
+      delete: deleteOperationForPlugin,
       registerOperationType: (type) => {
         pluginOperationTypes.add(type);
         return () => {
@@ -41293,7 +41383,8 @@ function createConsoleServer(deps = {}) {
     readJsonBody,
     writeJson,
     persist: persistDurableState,
-    deleteOperation,
+    deleteOperation: (operationId) => deletionCoordinator.deleteOperation(operationId),
+    isPendingDeletion: (operationId) => deletionCoordinator.hasPendingOperation(operationId),
     getPluginSensitiveFields: (pluginId) => [
       ...pluginHost.sensitiveFieldsByPluginId.get(pluginId) ?? [],
       ...pluginPayloadSanitizers.get(pluginId) ?? []
@@ -41383,6 +41474,11 @@ function createConsoleServer(deps = {}) {
       runAsyncBooleanHandler(plansRouter({ req, res, pathname }), res, () => false);
       return;
     }
+    const restoreMatch = pathname.match(/^\/api\/v1\/deletions\/([^/]+)\/restore$/);
+    if (restoreMatch) {
+      runAsyncHandler(handleDeferredDeletionRestore(req, res, decodeURIComponent(restoreMatch[1] ?? "")), res);
+      return;
+    }
     const theaterItemMatch = pathname.match(/^\/api\/v1\/theaters\/([^/]+)$/);
     if (theaterItemMatch) {
       runAsyncHandler(handleObserverTheaterItem(req, res, decodeURIComponent(theaterItemMatch[1] ?? "")), res);
@@ -41530,6 +41626,11 @@ function createConsoleServer(deps = {}) {
       writeJson(res, 400, { error: "invalid_folder_grant" });
       return;
     }
+    const canonicalCwd = canonicalizeTheaterPathSync(cwd);
+    if (deletionCoordinator.hasPendingTheater(workspaceHash(canonicalCwd))) {
+      writeJson(res, 409, { error: "pending_deletion" });
+      return;
+    }
     const theater = await theaters.register(cwd);
     await codex.registerWorkspace(theater.realpath, void 0, theater.id);
     persistDurableState();
@@ -41559,12 +41660,27 @@ function createConsoleServer(deps = {}) {
       writeJson(res, 200, toTheaterInfo(theater, true));
       return;
     }
-    theaters.remove(theaterId);
-    codex.unregisterTheaterWorkspaces(theaterId);
-    for (const operation of operations.listByTheater(theaterId)) deleteOperation(operation.id);
-    operations.deleteGroupsByTheater(theaterId);
-    persistDurableState();
-    writeJson(res, 200, { ok: true });
+    const deletion = deletionCoordinator.deleteTheater(theaterId);
+    writeJson(res, 200, { ok: true, deletion });
+  }
+  async function handleDeferredDeletionRestore(req, res, deletionId) {
+    if (req.method !== "POST") {
+      writeJson(res, 405, { error: "Method not allowed" });
+      return;
+    }
+    if (!isTerminalAuthorized(req)) {
+      writeJson(res, 401, { error: "unauthorized" });
+      return;
+    }
+    try {
+      writeJson(res, 200, await deletionCoordinator.restore(deletionId));
+    } catch (error51) {
+      if (error51 instanceof DeferredDeletionError) {
+        writeJson(res, error51.status, { error: error51.message });
+        return;
+      }
+      throw error51;
+    }
   }
   function handleStatus(req, res) {
     const theaterId = readUrl(req).searchParams.get("theaterId");
@@ -41781,6 +41897,12 @@ function createConsoleServer(deps = {}) {
       operations.replace([]);
       operations.replaceGroups([]);
     }
+    deletionCoordinator.load(state.deletionTombstones ?? []);
+    try {
+      deletionCoordinator.sweepExpired();
+    } catch (error51) {
+      console.warn(`[fleet-console] Expired deletion sweep deferred: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    }
     await restoreCodexWorkspaces();
   }
   async function restoreCodexWorkspaces() {
@@ -41822,16 +41944,20 @@ function createConsoleServer(deps = {}) {
   }
   function persistDurableState() {
     try {
-      durableStateStore.save({
-        version: 2,
-        theaters: theaters.list(),
-        operations: operations.list(),
-        groups: operations.listAllGroups()
-      });
+      saveDurableState(deletionCoordinator.list());
     } catch (error51) {
       console.warn(`[fleet-console] Durable state save failed: ${error51 instanceof Error ? error51.message : String(error51)}`);
     }
   }
+  function saveDurableState(deletionTombstones) {
+    durableStateStore.save({
+      version: STATE_VERSION,
+      theaters: theaters.list(),
+      operations: operations.list(),
+      groups: operations.listAllGroups(),
+      deletionTombstones
+    });
+  }
   async function stopServer() {
     const current = server;
     const currentLoopback = loopbackServer;
@@ -41841,6 +41967,7 @@ function createConsoleServer(deps = {}) {
     lockHandle = null;
     activeLockFile = null;
     activeEndpoint = null;
+    deletionCoordinator.dispose();
     try {
       await Promise.all([
         closeHttpServer(current),