@dotobokuri/fleet-cli 1.5.5 → 1.7.0

package/dist/index.js

@@ -17560,7 +17560,9 @@ function killProcess(child, forceTimeoutMs = 3e3) {
     try {
       execSync(`taskkill /PID ${child.pid} /T /F`, {
         stdio: "pipe",
-        timeout: 5e3
+        timeout: 5e3,
+        // 콘솔 없는 호스트에서 taskkill 호출 시 새 콘솔 창이 깜빡이는 것을 방지한다.
+        windowsHide: true
       });
     } catch {
       child.kill("SIGKILL");
@@ -17663,7 +17665,12 @@ var init_BaseConnection = __esm({
           cwd: this.cwd,
           stdio: ["pipe", "pipe", "pipe"],
           env: this.env,
-          windowsVerbatimArguments: true
+          windowsVerbatimArguments: true,
+          // 콘솔이 없는 호스트(예: fleet-console 백엔드)에서 cmd.exe를 spawn하면
+          // Windows가 새 콘솔 창을 할당해 깜빡인다. stdio는 모두 pipe라 가시 콘솔이
+          // 불필요하므로 CREATE_NO_WINDOW로 창 생성을 억제한다. (fleet-cli처럼 콘솔이
+          // 이미 있는 경우에도 무해하다.)
+          windowsHide: true
         }) : spawn(this.command, this.args, {
           cwd: this.cwd,
           stdio: ["pipe", "pipe", "pipe"],
@@ -18423,7 +18430,9 @@ function resolveNpxPath(env) {
       encoding: "utf-8",
       stdio: "pipe",
       timeout: 5e3,
-      env
+      env,
+      // 콘솔 없는 호스트에서 `where npx` 실행 시 콘솔 창이 깜빡이는 것을 방지한다.
+      windowsHide: true
     }).trim();
     const candidates = result.split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
     if (windows) {
@@ -18469,7 +18478,7 @@ var init_models = __esm({
   "../../packages/core-unified-agent/models.json"() {
     models_default = {
       version: 1,
-      updatedAt: "2026-06-13T00:00:00Z",
+      updatedAt: "2026-06-16T00:00:00Z",
       providers: {
         claude: {
           name: "Claude Code with Anthropic",
@@ -18479,7 +18488,9 @@ var init_models = __esm({
             { modelId: "sonnet", name: "Claude Sonnet", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "medium" } },
             { modelId: "opus", name: "Claude Opus", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "xhigh" } },
             { modelId: "opus[1m]", name: "Claude Opus [1M]", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "xhigh" } },
-            { modelId: "claude-opus-4-6[1m]", name: "Claude Opus 4.6 [1M]", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "high" } }
+            { modelId: "claude-opus-4-6[1m]", name: "Claude Opus 4.6 [1M]", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "high" } },
+            { modelId: "claude-opus-4-7[1m]", name: "Claude Opus 4.7 [1M]", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "high" } },
+            { modelId: "claude-opus-4-8[1m]", name: "Claude Opus 4.8 [1M]", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "high" } }
           ]
         },
         "claude-zai": {
@@ -33431,6 +33442,8 @@ function createClaudeFamilyCliDefinition(options2) {
           lineTerminator: "\r",
           multilineStrategy: "paste-mode"
         },
+        // Claude Code 계열은 세션 이름 변경 슬래시 명령 `/rename`을 지원한다.
+        renameCommand: "/rename",
         terminalName: "xterm-256color"
       };
     }
@@ -33454,7 +33467,7 @@ var codexCli = {
   async createProfile(options2) {
     const { bin, prefixArgs } = resolveBinary("codex", "CODEX_BIN", options2.env);
     return {
-      args: [...prefixArgs, "--no-alt-screen", ...buildModelArgs2(options2.model)],
+      args: [...prefixArgs, ...buildResumeArgs(options2.resumeSessionId), "--no-alt-screen", ...buildModelArgs2(options2.model)],
       bin,
       binPrefixArgs: prefixArgs,
       cwd: options2.cwd,
@@ -33466,10 +33479,15 @@ var codexCli = {
         lineTerminator: "\r",
         multilineStrategy: "paste-mode"
       },
+      // Codex CLI도 세션 이름 변경 슬래시 명령 `/rename`을 지원한다.
+      renameCommand: "/rename",
       terminalName: "xterm-256color"
     };
   }
 };
+function buildResumeArgs(resumeSessionId) {
+  return resumeSessionId === void 0 ? [] : ["resume", resumeSessionId];
+}
 function buildModelArgs2(model) {
   return model === void 0 ? [] : ["--model", model];
 }
@@ -33486,7 +33504,8 @@ async function resolveAgentCliProfile(env, cwd, options2 = {}) {
     authService: options2.authService,
     cwd,
     env,
-    model: options2.model
+    model: options2.model,
+    resumeSessionId: options2.resumeSessionId
   });
 }
 function resolveAgentCliId(env, options2 = {}) {
@@ -33562,6 +33581,7 @@ function buildClaudeNativeSubagentPlan(registry4) {
 function buildClaudeNativeArgs(context) {
   const systemPromptArg = context.replaceSystemPrompt ? "--system-prompt-file" : "--append-system-prompt-file";
   return [
+    ...buildResumeArgs2(context.resumeSessionId),
     systemPromptArg,
     requireSystemPromptFile(context),
     ...context.pluginRoots.flatMap((pluginRoot) => [
@@ -33572,6 +33592,9 @@ function buildClaudeNativeArgs(context) {
     "--dangerously-skip-permissions"
   ];
 }
+function buildResumeArgs2(resumeSessionId) {
+  return resumeSessionId === void 0 ? [] : ["--resume", resumeSessionId];
+}
 function buildClaudeMcpConfig(servers) {
   return JSON.stringify({
     mcpServers: Object.fromEntries(
@@ -33629,20 +33652,32 @@ function escapeTomlMultilineString(value) {
   });
   return result;
 }
+function buildPosixShellCommand(values) {
+  return values.map(posixShellQuote).join(" ");
+}
+function posixShellQuote(value) {
+  return `'${value.replaceAll("'", "'\\''")}'`;
+}
 var CODEX_TOOL_TIMEOUT_SEC = 1800;
 function buildCodexNativeArgs(context) {
   const profileName = requireCodexProfileName(context);
   const args = [
+    ...buildResumeArgs3(context.resumeSessionId),
     "--enable",
     "plugins",
     "--enable",
     "child_agents_md",
+    "--enable",
+    "hooks",
     "--profile",
     profileName,
     "-c",
     'approval_policy="never"',
     "-c",
-    'sandbox_mode="danger-full-access"'
+    'sandbox_mode="danger-full-access"',
+    // hook 신뢰 프롬프트("Hooks need review")를 fleet 관리 세션에서 건너뛴다. bypass_hook_trust는
+    // config 키가 아니라 전용 CLI 플래그이므로 -c override가 아닌 플래그로 전달해야 한다.
+    "--dangerously-bypass-hook-trust"
   ];
   for (const server of context.mcpServers) {
     const prefix = `mcp_servers.${server.name}`;
@@ -33658,6 +33693,9 @@ function buildCodexNativeArgs(context) {
   }
   return args;
 }
+function buildResumeArgs3(resumeSessionId) {
+  return resumeSessionId === void 0 ? [] : ["resume", resumeSessionId];
+}
 function requireCodexProfileName(context) {
   if (context.codexProfileName) return context.codexProfileName;
   throw new Error("Codex profile name is required for native injection");
@@ -33868,20 +33906,38 @@ function claudeHooks(options2) {
   if (!hookExec) {
     throw new Error("Fleet Claude session hook command is required");
   }
+  const userPromptSubmitExecs = [options2.captureSessionHookExec, options2.turnStartHookExec].filter((exec) => exec !== void 0);
+  const stopExecs = [options2.turnEndHookExec].filter((exec) => exec !== void 0);
   return {
     hooks: {
       SessionStart: [{
-        hooks: [{
-          // exec 형식: command는 직접 spawn되는 실행 파일, args는 셸 토크나이징 없이 그대로 전달된다.
-          // Windows cmd/powershell의 따옴표 규칙과 무관하게 동작하며 공백 포함 경로도 안전하다.
-          args: [...hookExec.args],
-          command: hookExec.command,
-          type: "command"
+        hooks: [claudeCommandHook(hookExec)]
+      }],
+      ...userPromptSubmitExecs.length > 0 ? {
+        UserPromptSubmit: [{
+          hooks: userPromptSubmitExecs.map(claudeCommandHook)
+        }]
+      } : {},
+      ...stopExecs.length > 0 ? {
+        Stop: [{
+          hooks: stopExecs.map(claudeCommandHook)
         }]
-      }]
+      } : {}
     }
   };
 }
+function claudeCommandHook(hookExec) {
+  if (!hookExec) {
+    throw new Error("Fleet Claude session hook command is required");
+  }
+  return {
+    // exec 형식: command는 직접 spawn되는 실행 파일, args는 셸 토크나이징 없이 그대로 전달된다.
+    // Windows cmd/powershell의 따옴표 규칙과 무관하게 동작하며 공백 포함 경로도 안전하다.
+    args: [...hookExec.args],
+    command: hookExec.command,
+    type: "command"
+  };
+}
 function claudeAgentFile(subagent) {
   const frontmatter = [
     "---",
@@ -34417,7 +34473,6 @@ function renderPluginRoot(pluginRoot, bundle, options2, fleetRoot) {
   const stagedPluginRoot = path82.join(stageParent, path82.basename(pluginRoot));
   try {
     ensurePrivateDir(stagedPluginRoot, stagedPluginRoot);
-    writePrivateJson(path82.join(stagedPluginRoot, ".codex-plugin", "plugin.json"), codexManifest(bundle), stagedPluginRoot);
     writePrivateJson(path82.join(stagedPluginRoot, ".claude-plugin", "plugin.json"), claudeManifest(bundle), stagedPluginRoot);
     switch (bundle.source) {
       case "asset":
@@ -34432,6 +34487,7 @@ function renderPluginRoot(pluginRoot, bundle, options2, fleetRoot) {
         renderGlobalPluginRoot(stagedPluginRoot, fleetRoot);
         break;
     }
+    writePrivateJson(path82.join(stagedPluginRoot, ".codex-plugin", "plugin.json"), codexManifest(bundle, stagedPluginRoot), stagedPluginRoot);
     removePrivatePath(pluginRoot, parentRoot);
     renameSync22(stagedPluginRoot, pluginRoot);
   } finally {
@@ -34563,14 +34619,36 @@ function marketplacePluginPath(target, bundle) {
   if (target.flat) return `./${FLAT_PLUGIN_DIR_NAME}`;
   return `./${PLUGIN_BUNDLES_DIR_NAME}/${bundle.directoryName}`;
 }
-function codexManifest(bundle) {
+function codexManifest(bundle, pluginRoot) {
   return {
     name: bundle.name,
-    version: "0.0.0",
+    version: codexManifestVersion(bundle, pluginRoot),
     description: bundle.description,
     skills: "./skills/"
   };
 }
+function codexManifestVersion(bundle, pluginRoot) {
+  const hash3 = crypto4.createHash("sha256");
+  hash3.update(bundle.name);
+  hash3.update("\0");
+  hash3.update(bundle.description);
+  hash3.update("\0");
+  for (const filePath of listCodexEffectivePluginFiles(pluginRoot)) {
+    const relativePath = path82.relative(pluginRoot, filePath);
+    hash3.update(relativePath);
+    hash3.update("\0");
+    hash3.update(readFileSync42(filePath));
+    hash3.update("\0");
+  }
+  return `0.0.0+${hash3.digest("hex").slice(0, 12)}`;
+}
+function listCodexEffectivePluginFiles(pluginRoot) {
+  const skillsPath = path82.join(pluginRoot, "skills");
+  if (!existsSync5(skillsPath)) return [];
+  const files = [];
+  collectRenderableFiles(pluginRoot, skillsPath, files, /* @__PURE__ */ new Set());
+  return files.sort();
+}
 function claudeManifest(bundle) {
   return {
     name: bundle.name,
@@ -34604,11 +34682,18 @@ async function injectAgentCliProfile(profile, options2) {
       cwd: profile.cwd,
       dataDir: options2.dataDir,
       rootDir: options2.pluginRootDir,
+      captureSessionHookExec: options2.captureSessionHookExec,
+      turnStartHookExec: options2.turnStartHookExec,
+      turnEndHookExec: options2.turnEndHookExec,
       hookExec: startupDefinitions.host === "claude" ? requireHookExec(options2.hookExec) : void 0,
       withMarketplaceLock: options2.withMarketplaceLock
     });
     const codexPluginKeys = plugin.codexRegistrations.map((registration) => `${registration.pluginName}@${registration.marketplaceName}`);
-    const codexProfile = profile.id === "codex" ? writeCodexFleetProfile(profile.env, doctrine, codexPluginKeys, (cleanup2) => tempCleanups.push(cleanup2)) : void 0;
+    const codexProfile = profile.id === "codex" ? writeCodexFleetProfile(profile.env, doctrine, codexPluginKeys, {
+      captureSessionHookExec: options2.captureSessionHookExec,
+      turnStartHookExec: options2.turnStartHookExec,
+      turnEndHookExec: options2.turnEndHookExec
+    }, (cleanup2) => tempCleanups.push(cleanup2)) : void 0;
     const launchWarnings = [];
     for (const registration of plugin.codexRegistrations) {
       const registrationWarning = await ensureCodexPluginRegistered(registration, {
@@ -34635,13 +34720,14 @@ async function injectAgentCliProfile(profile, options2) {
       pluginRoot: plugin.pluginRoot,
       pluginRoots: plugin.pluginRoots,
       codexProfileName: codexProfile?.profileName,
-      replaceSystemPrompt: options2.replaceSystemPrompt ?? true,
+      replaceSystemPrompt: options2.replaceSystemPrompt ?? false,
+      resumeSessionId: options2.resumeSessionId,
       systemPromptFile
     };
     const injectedArgs = buildAgentCliArgs(capability.builderId, context);
     return {
       ...profile,
-      args: [...profile.args, ...injectedArgs],
+      args: mergeAgentCliArgs(profile, capability.builderId, context, injectedArgs),
       cleanup,
       launchWarnings: [...profile.launchWarnings ?? [], ...launchWarnings]
     };
@@ -34683,7 +34769,7 @@ function writeSystemPromptFile(cliId, systemPrompt, onCleanup) {
   chmodBestEffort2(filePath, SYSTEM_PROMPT_FILE_MODE);
   return filePath;
 }
-function writeCodexFleetProfile(env, doctrine, pluginKeys, onCleanup) {
+function writeCodexFleetProfile(env, doctrine, pluginKeys, hookExecs, onCleanup) {
   const codexHome = env.CODEX_HOME ?? path92.join(env.HOME ?? os23.homedir(), ".codex");
   mkdirSync32(codexHome, { recursive: true });
   pruneStaleCodexFleetProfiles(codexHome);
@@ -34702,11 +34788,33 @@ function writeCodexFleetProfile(env, doctrine, pluginKeys, onCleanup) {
       `[plugins."${escapeTomlBasicString2(pluginKey)}"]`,
       "enabled = true",
       ""
-    ])
+    ]),
+    ...codexHooksConfig(hookExecs)
   ].join("\n"));
   chmodBestEffort2(profilePath, SYSTEM_PROMPT_FILE_MODE);
   return { profileName, profilePath };
 }
+function codexHooksConfig(hookExecs) {
+  const userPromptSubmitExecs = [hookExecs.captureSessionHookExec, hookExecs.turnStartHookExec].filter((exec) => exec !== void 0);
+  const stopExecs = [hookExecs.turnEndHookExec].filter((exec) => exec !== void 0);
+  if (userPromptSubmitExecs.length === 0 && stopExecs.length === 0) return [];
+  const lines = ["[hooks]"];
+  if (userPromptSubmitExecs.length > 0) {
+    lines.push(`UserPromptSubmit = ${codexHookHandlersInline(userPromptSubmitExecs)}`);
+  }
+  if (stopExecs.length > 0) {
+    lines.push(`Stop = ${codexHookHandlersInline(stopExecs)}`);
+  }
+  lines.push("");
+  return lines;
+}
+function codexHookHandlersInline(execs) {
+  const handlers = execs.map((exec) => {
+    const command3 = buildPosixShellCommand([exec.command, ...exec.args]);
+    return `{ type = "command", command = "${escapeTomlBasicString2(command3)}" }`;
+  }).join(", ");
+  return `[{ hooks = [${handlers}] }]`;
+}
 function writeFileNoFollow2(filePath, content) {
   const flags = constants32.O_WRONLY | constants32.O_CREAT | constants32.O_TRUNC | constants32.O_NOFOLLOW;
   const fd = openSync32(filePath, flags, SYSTEM_PROMPT_FILE_MODE);
@@ -34779,6 +34887,24 @@ function buildAgentCliArgs(builderId, context) {
       return buildCodexNativeArgs(context);
   }
 }
+function mergeAgentCliArgs(profile, builderId, context, injectedArgs) {
+  if (builderId !== "codex-native" || context.resumeSessionId === void 0) {
+    return [...profile.args, ...injectedArgs];
+  }
+  const resumeSessionId = context.resumeSessionId;
+  const prefixLength = profile.binPrefixArgs?.length ?? 0;
+  const codexResumeArgs = ["resume", resumeSessionId];
+  const injectedTail = injectedArgs.slice(codexResumeArgs.length);
+  return [
+    ...profile.args.slice(0, prefixLength),
+    ...codexResumeArgs,
+    ...profile.args.slice(prefixLength).filter((arg, index, args) => !isCodexResumeArgAt(args, index, resumeSessionId)),
+    ...injectedTail
+  ];
+}
+function isCodexResumeArgAt(args, index, resumeSessionId) {
+  return args[index] === "resume" && args[index + 1] === resumeSessionId || args[index] === resumeSessionId && args[index - 1] === "resume";
+}
 function createOnceCleanup(cleanup) {
   let cleaned = false;
   return () => {
@@ -39592,14 +39718,14 @@ import * as fs52 from "fs";
 import fs5__default, { readFileSync as readFileSync8, existsSync as existsSync8, mkdtempSync as mkdtempSync3, writeFileSync as writeFileSync6, mkdirSync as mkdirSync8, rmSync as rmSync5, chmodSync as chmodSync5, renameSync as renameSync5, readdirSync as readdirSync6, constants as constants8, openSync as openSync8, closeSync as closeSync8, lstatSync as lstatSync8, unlinkSync as unlinkSync5, realpathSync as realpathSync6, statSync as statSync6, symlinkSync as symlinkSync2, fstatSync as fstatSync7 } from "fs";
 import * as path93 from "path";
 import path93__default, { join as join10, resolve, relative, dirname as dirname6 } from "path";
-import process4 from "process";
+import process6 from "process";
 import { fileURLToPath, pathToFileURL as pathToFileURL2 } from "url";
 import * as os222 from "os";
 import os22__default from "os";
 import { EventEmitter as EventEmitter6 } from "events";
 import { stat, mkdir as mkdir2, readFile as readFile2, readdir, appendFile, writeFile as writeFile2, rename, access as access2, rm } from "fs/promises";
 import { Writable as Writable2, Readable as Readable2 } from "stream";
-import crypto32, { createHash as createHash2, randomUUID as randomUUID2, timingSafeEqual } from "crypto";
+import crypto5, { createHash as createHash2, randomUUID as randomUUID2, timingSafeEqual } from "crypto";
 import http2 from "http";
 import { createRequire } from "module";
 import net2 from "net";
@@ -40544,10 +40670,10 @@ function mergeDefs2(...defs) {
 function cloneDef2(schema) {
   return mergeDefs2(schema._zod.def);
 }
-function getElementAtPath2(obj, path30) {
-  if (!path30)
+function getElementAtPath2(obj, path35) {
+  if (!path35)
     return obj;
-  return path30.reduce((acc, key) => acc?.[key], obj);
+  return path35.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject2(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -40956,11 +41082,11 @@ function explicitlyAborted2(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues2(path30, issues) {
+function prefixIssues2(path35, issues) {
   return issues.map((iss) => {
     var _a32;
     (_a32 = iss).path ?? (_a32.path = []);
-    iss.path.unshift(path30);
+    iss.path.unshift(path35);
     return iss;
   });
 }
@@ -41105,16 +41231,16 @@ function flattenError2(error512, mapper = (issue32) => issue32.message) {
 }
 function formatError3(error512, mapper = (issue32) => issue32.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error522, path30 = []) => {
+  const processError = (error522, path35 = []) => {
     for (const issue32 of error522.issues) {
       if (issue32.code === "invalid_union" && issue32.errors.length) {
-        issue32.errors.map((issues) => processError({ issues }, [...path30, ...issue32.path]));
+        issue32.errors.map((issues) => processError({ issues }, [...path35, ...issue32.path]));
       } else if (issue32.code === "invalid_key") {
-        processError({ issues: issue32.issues }, [...path30, ...issue32.path]);
+        processError({ issues: issue32.issues }, [...path35, ...issue32.path]);
       } else if (issue32.code === "invalid_element") {
-        processError({ issues: issue32.issues }, [...path30, ...issue32.path]);
+        processError({ issues: issue32.issues }, [...path35, ...issue32.path]);
       } else {
-        const fullpath = [...path30, ...issue32.path];
+        const fullpath = [...path35, ...issue32.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue32));
         } else {
@@ -41141,17 +41267,17 @@ function formatError3(error512, mapper = (issue32) => issue32.message) {
 }
 function treeifyError2(error512, mapper = (issue32) => issue32.message) {
   const result = { errors: [] };
-  const processError = (error522, path30 = []) => {
+  const processError = (error522, path35 = []) => {
     var _a32, _b;
     for (const issue32 of error522.issues) {
       if (issue32.code === "invalid_union" && issue32.errors.length) {
-        issue32.errors.map((issues) => processError({ issues }, [...path30, ...issue32.path]));
+        issue32.errors.map((issues) => processError({ issues }, [...path35, ...issue32.path]));
       } else if (issue32.code === "invalid_key") {
-        processError({ issues: issue32.issues }, [...path30, ...issue32.path]);
+        processError({ issues: issue32.issues }, [...path35, ...issue32.path]);
       } else if (issue32.code === "invalid_element") {
-        processError({ issues: issue32.issues }, [...path30, ...issue32.path]);
+        processError({ issues: issue32.issues }, [...path35, ...issue32.path]);
       } else {
-        const fullpath = [...path30, ...issue32.path];
+        const fullpath = [...path35, ...issue32.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue32));
           continue;
@@ -41183,8 +41309,8 @@ function treeifyError2(error512, mapper = (issue32) => issue32.message) {
 }
 function toDotPath2(_path) {
   const segs = [];
-  const path30 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path30) {
+  const path35 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path35) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -53705,13 +53831,13 @@ function resolveRef2(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path30 = ref.slice(1).split("/").filter(Boolean);
-  if (path30.length === 0) {
+  const path35 = ref.slice(1).split("/").filter(Boolean);
+  if (path35.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path30[0] === defsKey) {
-    const key = path30[1];
+  if (path35[0] === defsKey) {
+    const key = path35[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -56462,7 +56588,9 @@ function killProcess2(child, forceTimeoutMs = 3e3) {
     try {
       execSync3(`taskkill /PID ${child.pid} /T /F`, {
         stdio: "pipe",
-        timeout: 5e3
+        timeout: 5e3,
+        // 콘솔 없는 호스트에서 taskkill 호출 시 새 콘솔 창이 깜빡이는 것을 방지한다.
+        windowsHide: true
       });
     } catch {
       child.kill("SIGKILL");
@@ -56534,7 +56662,12 @@ var BaseConnection2 = class extends EventEmitter6 {
       cwd: this.cwd,
       stdio: ["pipe", "pipe", "pipe"],
       env: this.env,
-      windowsVerbatimArguments: true
+      windowsVerbatimArguments: true,
+      // 콘솔이 없는 호스트(예: fleet-console 백엔드)에서 cmd.exe를 spawn하면
+      // Windows가 새 콘솔 창을 할당해 깜빡인다. stdio는 모두 pipe라 가시 콘솔이
+      // 불필요하므로 CREATE_NO_WINDOW로 창 생성을 억제한다. (fleet-cli처럼 콘솔이
+      // 이미 있는 경우에도 무해하다.)
+      windowsHide: true
     }) : spawn3(this.command, this.args, {
       cwd: this.cwd,
       stdio: ["pipe", "pipe", "pipe"],
@@ -57288,7 +57421,9 @@ function resolveNpxPath2(env) {
       encoding: "utf-8",
       stdio: "pipe",
       timeout: 5e3,
-      env
+      env,
+      // 콘솔 없는 호스트에서 `where npx` 실행 시 콘솔 창이 깜빡이는 것을 방지한다.
+      windowsHide: true
     }).trim();
     const candidates = result.split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
     if (windows) {
@@ -57323,7 +57458,7 @@ function inferBinName2(packageName) {
 }
 var models_default2 = {
   version: 1,
-  updatedAt: "2026-06-13T00:00:00Z",
+  updatedAt: "2026-06-16T00:00:00Z",
   providers: {
     claude: {
       name: "Claude Code with Anthropic",
@@ -57333,7 +57468,9 @@ var models_default2 = {
         { modelId: "sonnet", name: "Claude Sonnet", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "medium" } },
         { modelId: "opus", name: "Claude Opus", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "xhigh" } },
         { modelId: "opus[1m]", name: "Claude Opus [1M]", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "xhigh" } },
-        { modelId: "claude-opus-4-6[1m]", name: "Claude Opus 4.6 [1M]", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "high" } }
+        { modelId: "claude-opus-4-6[1m]", name: "Claude Opus 4.6 [1M]", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "high" } },
+        { modelId: "claude-opus-4-7[1m]", name: "Claude Opus 4.7 [1M]", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "high" } },
+        { modelId: "claude-opus-4-8[1m]", name: "Claude Opus 4.8 [1M]", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "high" } }
       ]
     },
     "claude-zai": {
@@ -60466,7 +60603,7 @@ function specToMcpTool2(spec) {
 }
 function installExecutorToolCallRouter2(runtime, sessionToken, ctx) {
   runtime.server.setOnToolCallArrived(sessionToken, (toolName, args) => {
-    const toolCallId = crypto32.randomUUID();
+    const toolCallId = crypto5.randomUUID();
     void runtime.registry.invoke(toolName, args, { cwd: ctx.cwd, sessionLabel: ctx.sessionLabel, toolCallId, signal: ctx.signal }).then((result) => runtime.server.resolveNextToolCall(sessionToken, toolCallId, result)).catch((err) => {
       runtime.server.resolveNextToolCall(sessionToken, toolCallId, {
         content: [{ type: "text", text: err instanceof Error ? err.message : String(err) }],
@@ -60857,7 +60994,7 @@ function createInProcessMcpServer2(deps = {}) {
       if (activeStopPromise) await activeStopPromise;
       if (activeServer && activeServerUrl) return activeServerUrl;
       if (activeStartPromise) return activeStartPromise;
-      activeOpaquePath = `/${crypto32.randomUUID()}`;
+      activeOpaquePath = `/${crypto5.randomUUID()}`;
       activeStartPromise = new Promise((resolve2, reject) => {
         const srv = http2.createServer(handleRequest);
         srv.timeout = MCP_SERVER_TIMEOUT_MS2;
@@ -61114,7 +61251,7 @@ function createExecutorMcpSession2(deps, toolTimeoutSeconds, request) {
     throw new Error("Executor session cwd is required");
   }
   assertNonEmptyExecutorTools2(request.serverName, request.specs);
-  const token = crypto32.randomUUID();
+  const token = crypto5.randomUUID();
   registerExecutorSessionTools2(runtime.runtime, token, [...request.specs]);
   installExecutorToolCallRouter2(runtime.runtime, token, {
     cwd,
@@ -61160,7 +61297,7 @@ function issueSessionToken2(deps, sessionTokensByLabel, request) {
     for (const { name, runtime } of deps.runtimes) {
       const tools = runtime.registry.getAllAgentTools();
       assertNonEmptyExecutorTools2(name, tools);
-      const token = crypto32.randomUUID();
+      const token = crypto5.randomUUID();
       registerExecutorSessionTools2(runtime, token, tools);
       installExecutorToolCallRouter2(runtime, token, { cwd, sessionLabel: label, signal: request.signal });
       tokens.push({ name, token });
@@ -62526,7 +62663,8 @@ function sleepSync2(ms) {
 var DEFAULT_TEMP_FILE_MIN_AGE_MS2 = 6e4;
 function createDurableJsonStore2(deps) {
   const now = deps.now ?? (() => Date.now());
-  const mode = SECURE_FILE_MODE2;
+  const sensitivity = deps.sensitivity;
+  const mode = sensitivity === "sensitive" ? SECURE_FILE_MODE2 : 420;
   const minAgeMs = deps.tempCleanupMinAgeMs ?? DEFAULT_TEMP_FILE_MIN_AGE_MS2;
   const dir = path93.dirname(deps.filePath);
   return {
@@ -62554,10 +62692,10 @@ function createDurableJsonStore2(deps) {
   };
   function withLock(operation) {
     if (!deps.lockDir) {
-      ensureSafeDirectoryIfSensitive2(dir);
+      ensureSafeDirectoryIfSensitive2(dir, sensitivity);
       return operation();
     }
-    ensureSafeDirectoryIfSensitive2(dir);
+    ensureSafeDirectoryIfSensitive2(dir, sensitivity);
     return withDirectoryLock2(
       {
         lockDir: deps.lockDir,
@@ -62599,8 +62737,10 @@ function readJsonFile2(filePath, sanitize) {
   }
 }
 function ensureSafeDirectoryIfSensitive2(dir, sensitivity) {
-  {
+  if (sensitivity === "sensitive") {
     ensureSafeDirectory2(dir);
+  } else {
+    fs52.mkdirSync(dir, { recursive: true });
   }
 }
 var memory_exports2 = {};
@@ -70278,7 +70418,7 @@ var LOCK_FILE_MODE = 384;
 function createConsoleLock(deps = {}) {
   const fsImpl = deps.fs ?? fs5__default;
   const now = deps.now ?? Date.now;
-  const randomToken = deps.randomToken ?? (() => crypto32.randomBytes(32).toString("base64url"));
+  const randomToken = deps.randomToken ?? (() => crypto5.randomBytes(32).toString("base64url"));
   const hostname52 = deps.hostname ?? (() => "127.0.0.1");
   function ensureLockDir(dir) {
     fsImpl.mkdirSync(dir, { recursive: true, mode: LOCK_DIR_MODE });
@@ -70373,6 +70513,387 @@ function createConsoleLock(deps = {}) {
   }
   return { ensureLockDir, readLock, writeLock, removeLock, assertLockModes, assertTrustedLock };
 }
+var FLEET_DATA_DIR_NAME2 = ".fleet";
+function getFleetDataDir2() {
+  return path93.join(os222.homedir(), FLEET_DATA_DIR_NAME2);
+}
+function readAuthStoreFile2(filePath) {
+  let fd;
+  try {
+    fd = fs52.openSync(filePath, fs52.constants.O_RDONLY | NOFOLLOW_FLAG2);
+    if (!fs52.fstatSync(fd).isFile()) {
+      return {};
+    }
+    return JSON.parse(fs52.readFileSync(fd, "utf-8"));
+  } catch {
+    return {};
+  } finally {
+    if (fd !== void 0) {
+      try {
+        fs52.closeSync(fd);
+      } catch {
+      }
+    }
+  }
+}
+var DEFAULT_AUTH_PATH2 = path93.join(getFleetDataDir2(), "auth.json");
+var AUTH_LOCK_OWNER_FILE_NAME2 = "owner.json";
+var AUTH_LOCK_TIMEOUT_MS2 = 5e3;
+function createAuthService2(deps = {}) {
+  const authPath = deps.authPath ?? DEFAULT_AUTH_PATH2;
+  const lockDir = `${authPath}.lock`;
+  return {
+    // [HIGH #1] TOCTOU 수정: existsSync/read/check/delete/write 전체를 락 블록 안으로 이동
+    async deleteApiKey(providerId) {
+      let deleted = false;
+      withAuthLock2(authPath, lockDir, () => {
+        if (!fs52.existsSync(authPath)) return;
+        const data = readAuthStoreFile2(authPath);
+        if (!Object.prototype.hasOwnProperty.call(data, providerId)) return;
+        delete data[providerId];
+        writeAuthData2(authPath, data);
+        deleted = true;
+      });
+      return deleted;
+    },
+    // [HIGH #2] 읽기 경로: fd 기반 O_RDONLY|O_NOFOLLOW+fstatSync isFile
+    async getApiKey(providerId) {
+      let fd;
+      try {
+        if (!fs52.existsSync(authPath)) {
+          return void 0;
+        }
+        fd = fs52.openSync(authPath, fs52.constants.O_RDONLY | NOFOLLOW_FLAG2);
+        if (!fs52.fstatSync(fd).isFile()) {
+          return void 0;
+        }
+        const data = JSON.parse(fs52.readFileSync(fd, "utf-8"));
+        return typeof data[providerId]?.key === "string" ? data[providerId].key : void 0;
+      } catch {
+        return void 0;
+      } finally {
+        if (fd !== void 0) {
+          try {
+            fs52.closeSync(fd);
+          } catch {
+          }
+        }
+      }
+    },
+    // [HIGH #2] 읽기 경로: fd 기반 O_RDONLY|O_NOFOLLOW 통일
+    async listProviderIds() {
+      if (!fs52.existsSync(authPath)) {
+        return [];
+      }
+      try {
+        return Object.keys(readAuthStoreFile2(authPath)).sort();
+      } catch {
+        return [];
+      }
+    },
+    async setApiKey(providerId, key) {
+      const dir = path93.dirname(authPath);
+      ensureSafeDirectory2(dir);
+      withAuthLock2(authPath, lockDir, () => {
+        const data = fs52.existsSync(authPath) ? readAuthStoreFile2(authPath) : {};
+        data[providerId] = {
+          ...data[providerId] ?? {},
+          key
+        };
+        writeAuthData2(authPath, data);
+      });
+    }
+  };
+}
+function withAuthLock2(authPath, lockDir, operation) {
+  return withDirectoryLock2(
+    {
+      lockDir,
+      ownerFileName: AUTH_LOCK_OWNER_FILE_NAME2,
+      timeoutMs: AUTH_LOCK_TIMEOUT_MS2
+    },
+    operation
+  );
+}
+function writeAuthData2(authPath, data) {
+  writeAtomicSync2(authPath, `${JSON.stringify(data, null, 2)}
+`, {
+    mode: SECURE_FILE_MODE2,
+    fsync: true
+  });
+}
+function formatMissingAuthKeyMessage2(input) {
+  const cliHint = input.cli ? `cli '${input.cli}'` : "selected CLI";
+  return `Auth token not found for ${cliHint} (providerId: '${input.providerId}'). Run \`fleet auth login\` to register one.`;
+}
+function formatAuthValidationFailureMessage2(input) {
+  const detail = input.detail ? ` Detail: ${input.detail}` : "";
+  if (input.status === "unauthorized") {
+    return `Auth token was rejected (providerId: '${input.providerId}'). Check the token and try again.${detail}`;
+  }
+  if (input.status === "forbidden") {
+    return `Auth token is not allowed for this provider (providerId: '${input.providerId}'). Check the token permissions.${detail}`;
+  }
+  if (input.status === "timeout") {
+    return `Auth token validation timed out (providerId: '${input.providerId}'). Check the connection and try again.${detail}`;
+  }
+  if (input.status === "network") {
+    return `Auth token validation failed due to a network error (providerId: '${input.providerId}'). Check the connection and try again.${detail}`;
+  }
+  if (input.status === "server") {
+    return `Auth token validation failed because the provider returned an error (providerId: '${input.providerId}'). Try again later.${detail}`;
+  }
+  return `Auth token validation failed (providerId: '${input.providerId}'). Check the token and try again.${detail}`;
+}
+var LEGACY_AUTH_PATH2 = path93.join(getFleetDataDir2(), "agent", "auth.json");
+var CURRENT_AUTH_PATH2 = path93.join(getFleetDataDir2(), "auth.json");
+function mergeAuthStoresNoOverwrite2(legacy, current) {
+  const data = { ...current };
+  const migratedProviderIds = [];
+  const skippedProviderIds = [];
+  for (const [providerId, entry] of Object.entries(legacy)) {
+    if (Object.prototype.hasOwnProperty.call(data, providerId)) {
+      skippedProviderIds.push(providerId);
+      continue;
+    }
+    data[providerId] = entry;
+    migratedProviderIds.push(providerId);
+  }
+  return {
+    data,
+    migratedProviderIds,
+    skippedProviderIds
+  };
+}
+async function migrateLegacyAuthStore2(options2 = {}) {
+  const legacyPath = options2.legacyPath ?? LEGACY_AUTH_PATH2;
+  const currentPath = options2.currentPath ?? CURRENT_AUTH_PATH2;
+  if (!fs52.existsSync(legacyPath)) {
+    return createMigrationResult2({
+      legacyPath,
+      currentPath,
+      status: "legacy-missing",
+      migratedProviderIds: [],
+      skippedProviderIds: [],
+      shouldPrintNotice: false
+    });
+  }
+  const legacy = readAuthStoreFile2(legacyPath);
+  const current = fs52.existsSync(currentPath) ? readAuthStoreFile2(currentPath) : {};
+  const merged = mergeAuthStoresNoOverwrite2(legacy, current);
+  if (merged.migratedProviderIds.length > 0) {
+    const dir = path93.dirname(currentPath);
+    ensureSafeDirectory2(dir);
+    writeAtomicSync2(currentPath, `${JSON.stringify(merged.data, null, 2)}
+`, {
+      mode: SECURE_FILE_MODE2,
+      fsync: true
+    });
+  }
+  return createMigrationResult2({
+    legacyPath,
+    currentPath,
+    status: merged.migratedProviderIds.length > 0 ? "migrated" : "unchanged",
+    migratedProviderIds: merged.migratedProviderIds,
+    skippedProviderIds: merged.skippedProviderIds,
+    shouldPrintNotice: options2.notify !== false && merged.migratedProviderIds.length > 0
+  });
+}
+function createMigrationResult2(input) {
+  return {
+    legacyPath: input.legacyPath,
+    currentPath: input.currentPath,
+    migratedCount: input.migratedProviderIds.length,
+    skippedCount: input.skippedProviderIds.length,
+    migratedProviderIds: input.migratedProviderIds,
+    skippedProviderIds: input.skippedProviderIds,
+    shouldPrintNotice: input.shouldPrintNotice,
+    status: input.status
+  };
+}
+var DEFAULT_AUTH_VALIDATION_TIMEOUT_MS2 = 5e3;
+async function validateAnthropicCompatibleApiKey2(request) {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => {
+    controller.abort();
+  }, request.timeoutMs ?? DEFAULT_AUTH_VALIDATION_TIMEOUT_MS2);
+  try {
+    const response = await fetch(buildMessagesUrl2(request.baseUrl), {
+      method: "POST",
+      headers: {
+        "anthropic-version": "2023-06-01",
+        "content-type": "application/json",
+        "x-api-key": request.apiKey
+      },
+      body: JSON.stringify({
+        model: "claude-3-5-haiku-20241022",
+        max_tokens: 1,
+        messages: [
+          {
+            role: "user",
+            content: "ping"
+          }
+        ]
+      }),
+      signal: controller.signal
+    });
+    if (response.ok) {
+      return { providerId: request.providerId, status: "success" };
+    }
+    if (response.status === 401) {
+      return { providerId: request.providerId, status: "unauthorized" };
+    }
+    if (response.status === 403) {
+      return { providerId: request.providerId, status: "forbidden" };
+    }
+    if (response.status >= 500) {
+      return {
+        providerId: request.providerId,
+        status: "server",
+        detail: `HTTP ${response.status}`
+      };
+    }
+    return {
+      providerId: request.providerId,
+      status: "unknown",
+      detail: `HTTP ${response.status}`
+    };
+  } catch (error512) {
+    if (isAbortError2(error512)) {
+      return { providerId: request.providerId, status: "timeout" };
+    }
+    return {
+      providerId: request.providerId,
+      status: "network",
+      detail: error512 instanceof Error ? error512.message : String(error512)
+    };
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+function isAuthValidationSuccess2(result) {
+  return result.status === "success";
+}
+function createAuthValidationError2(result) {
+  return new Error(formatAuthValidationFailureMessage2(result));
+}
+function buildMessagesUrl2(baseUrl) {
+  return `${baseUrl.replace(/\/+$/, "")}/v1/messages`;
+}
+function isAbortError2(error512) {
+  return error512 instanceof DOMException && error512.name === "AbortError";
+}
+var CLAUDE_ZAI_PROVIDER_ID2 = "Claude Code with Z.AI GLM";
+var CLAUDE_KIMI_PROVIDER_ID2 = "Claude Code with Moonshot Kimi";
+var AUTH_PROVIDER_DEFINITIONS2 = {
+  "claude-zai": {
+    providerId: CLAUDE_ZAI_PROVIDER_ID2,
+    baseUrl: CLI_BACKENDS2["claude-zai"].defaultEnv.ANTHROPIC_BASE_URL,
+    env: CLI_BACKENDS2["claude-zai"].defaultEnv
+  },
+  "claude-kimi": {
+    providerId: CLAUDE_KIMI_PROVIDER_ID2,
+    baseUrl: CLI_BACKENDS2["claude-kimi"].defaultEnv.ANTHROPIC_BASE_URL,
+    env: CLI_BACKENDS2["claude-kimi"].defaultEnv
+  }
+};
+async function resolveAuthEnv2(cli, deps) {
+  const provider = AUTH_PROVIDER_DEFINITIONS2[cli];
+  if (!provider) return {};
+  await migrateLegacyAuthStore2();
+  const auth = deps?.authService ?? createAuthService2({ authPath: DEFAULT_AUTH_PATH2 });
+  const token = await auth.getApiKey(provider.providerId);
+  if (!token) {
+    throw new Error(formatMissingAuthKeyMessage2({ cli, providerId: provider.providerId }));
+  }
+  const validation = await validateAnthropicCompatibleApiKey2({
+    providerId: provider.providerId,
+    apiKey: token,
+    baseUrl: provider.baseUrl
+  });
+  if (!isAuthValidationSuccess2(validation)) {
+    const failure = {
+      providerId: validation.providerId,
+      status: validation.status,
+      detail: validation.detail
+    };
+    throw createAuthValidationError2(failure);
+  }
+  return { ...provider.env, ANTHROPIC_AUTH_TOKEN: token };
+}
+var GLOBAL_OPTIONS_VERSION2 = 1;
+var GLOBAL_OPTIONS_FILE_NAME2 = "settings.json";
+var LOCK_DIR_NAME2 = "settings.json.lock";
+var LOCK_OWNER_FILE_NAME2 = "owner";
+var TEMP_FILE_PREFIX2 = `.tmp-${GLOBAL_OPTIONS_FILE_NAME2}-`;
+function createGlobalOptionsStore2(deps = {}) {
+  const dataDir = deps.dataDir ?? getFleetDataDir2();
+  const optionsPath = path93.join(dataDir, GLOBAL_OPTIONS_FILE_NAME2);
+  const lockDir = path93.join(dataDir, LOCK_DIR_NAME2);
+  const store22 = createDurableJsonStore2({
+    filePath: optionsPath,
+    lockDir,
+    lockOwnerFileName: LOCK_OWNER_FILE_NAME2,
+    sanitize: (value) => sanitizeGlobalOptionsData2(value).data,
+    sensitivity: "sensitive",
+    timeoutMs: deps.timeoutMs,
+    staleLockMs: deps.staleLockMs,
+    tempCleanupPrefix: TEMP_FILE_PREFIX2,
+    now: deps.now
+  });
+  return {
+    path: optionsPath,
+    load: () => store22.load(),
+    save: (data) => store22.save(sanitizeGlobalOptionsData2(data).data),
+    update: (mutate) => store22.update((current) => sanitizeGlobalOptionsData2(mutate(current)).data)
+  };
+}
+function createEmptyGlobalOptionsData2() {
+  return {
+    version: GLOBAL_OPTIONS_VERSION2
+  };
+}
+function sanitizeGlobalOptionsData2(value) {
+  if (!isRecord32(value)) {
+    return { data: createEmptyGlobalOptionsData2(), changed: true };
+  }
+  if (value.version !== GLOBAL_OPTIONS_VERSION2) {
+    return { data: createEmptyGlobalOptionsData2(), changed: true };
+  }
+  const data = {
+    version: GLOBAL_OPTIONS_VERSION2,
+    ...typeof value.replaceSystemPrompt === "boolean" ? { replaceSystemPrompt: value.replaceSystemPrompt } : {},
+    ...typeof value.enableMetaphor === "boolean" ? { enableMetaphor: value.enableMetaphor } : {}
+  };
+  const allowedKeys = /* @__PURE__ */ new Set(["version", "replaceSystemPrompt", "enableMetaphor"]);
+  const changed = Object.keys(value).some((key) => !allowedKeys.has(key)) || "replaceSystemPrompt" in value && typeof value.replaceSystemPrompt !== "boolean" || "enableMetaphor" in value && typeof value.enableMetaphor !== "boolean";
+  return { data, changed };
+}
+function isRecord32(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function createGlobalOptionsService2(deps = {}) {
+  const store22 = deps.store ?? createGlobalOptionsStore2({ dataDir: deps.dataDir });
+  return {
+    load: () => store22.load(),
+    save: (data) => {
+      store22.save(data);
+      return store22.load();
+    },
+    update: (mutate) => updateGlobalOptions2(store22, mutate)
+  };
+}
+function updateGlobalOptions2(store22, mutate) {
+  return store22.update(mutate);
+}
+function createInfraServices2(deps = {}) {
+  const globalOptionsService = createGlobalOptionsService2();
+  const authService = createAuthService2({ authPath: deps.authPath ?? DEFAULT_AUTH_PATH2 });
+  return {
+    authService,
+    globalOptionsService
+  };
+}
 function readFleetConsoleRelease() {
   const requireFromHere2 = createRequire(import.meta.url);
   const packageJsonPath = requireFromHere2.resolve("../package.json");
@@ -70384,17 +70905,34 @@ function readFleetConsoleRelease() {
   }
   return { channel: "stable", version: version22, packageRoot };
 }
-var LOCK_DIR_NAME2 = "fleet-console";
+var LOCK_DIR_NAME22 = "fleet-console";
+var CONSOLE_RUNTIME_DIR_NAME = "console";
 var LOCK_FILE_NAME = "console.lock";
+var CONSOLE_DATA_DIR_NAME = "console";
+var CONSOLE_STATE_FILE_NAME = "state.json";
+var CONSOLE_CAPTURES_DIR_NAME = "captures";
 function createConsolePaths(deps = {}) {
   const env = deps.env ?? process.env;
   const base = env.FLEET_CONSOLE_DIR ?? defaultConsoleBaseDir(deps);
   return { dir: base, lockFile: path93__default.join(base, LOCK_FILE_NAME) };
 }
+function createConsoleDataPaths(deps = {}) {
+  const dir = path93__default.join(deps.fleetDataDir ?? getFleetDataDir2(), CONSOLE_DATA_DIR_NAME);
+  return {
+    dir,
+    stateFile: path93__default.join(dir, CONSOLE_STATE_FILE_NAME),
+    capturesDir: path93__default.join(dir, CONSOLE_CAPTURES_DIR_NAME)
+  };
+}
 function defaultConsoleBaseDir(deps) {
+  let release2;
+  const channel = deps.channel ?? (release2 = readFleetConsoleRelease()).channel;
+  if (channel === "local") {
+    const packageRoot = deps.packageRoot ?? (release2 ??= readFleetConsoleRelease()).packageRoot;
+    return path93__default.join(path93__default.resolve(packageRoot, "..", ".."), ".fleet", CONSOLE_RUNTIME_DIR_NAME);
+  }
   const uid = deps.uid ?? (typeof process.getuid === "function" ? process.getuid() : 0);
-  const channel = deps.channel ?? readFleetConsoleRelease().channel;
-  return path93__default.join(os22__default.tmpdir(), `${LOCK_DIR_NAME2}-${uid}-${channel}`);
+  return path93__default.join(os22__default.tmpdir(), `${LOCK_DIR_NAME22}-${uid}-${channel}`);
 }
 var FLEET_PROTOCOL_GATE_PROMPT2 = String.raw`# Protocol Gate
 
@@ -70787,6 +71325,8 @@ function createClaudeFamilyCliDefinition2(options2) {
           lineTerminator: "\r",
           multilineStrategy: "paste-mode"
         },
+        // Claude Code 계열은 세션 이름 변경 슬래시 명령 `/rename`을 지원한다.
+        renameCommand: "/rename",
         terminalName: "xterm-256color"
       };
     }
@@ -70810,7 +71350,7 @@ var codexCli2 = {
   async createProfile(options2) {
     const { bin, prefixArgs } = resolveBinary2("codex", "CODEX_BIN", options2.env);
     return {
-      args: [...prefixArgs, "--no-alt-screen", ...buildModelArgs22(options2.model)],
+      args: [...prefixArgs, ...buildResumeArgs4(options2.resumeSessionId), "--no-alt-screen", ...buildModelArgs22(options2.model)],
       bin,
       binPrefixArgs: prefixArgs,
       cwd: options2.cwd,
@@ -70822,10 +71362,15 @@ var codexCli2 = {
         lineTerminator: "\r",
         multilineStrategy: "paste-mode"
       },
+      // Codex CLI도 세션 이름 변경 슬래시 명령 `/rename`을 지원한다.
+      renameCommand: "/rename",
       terminalName: "xterm-256color"
     };
   }
 };
+function buildResumeArgs4(resumeSessionId) {
+  return resumeSessionId === void 0 ? [] : ["resume", resumeSessionId];
+}
 function buildModelArgs22(model) {
   return model === void 0 ? [] : ["--model", model];
 }
@@ -70842,7 +71387,8 @@ async function resolveAgentCliProfile2(env, cwd, options2 = {}) {
     authService: options2.authService,
     cwd,
     env,
-    model: options2.model
+    model: options2.model,
+    resumeSessionId: options2.resumeSessionId
   });
 }
 function resolveAgentCliId2(env, options2 = {}) {
@@ -70886,6 +71432,20 @@ var AGENT_CLI_INJECTION_CAPABILITIES2 = {
 function getAgentCliInjectionCapability2(cliId) {
   return AGENT_CLI_INJECTION_CAPABILITIES2[cliId];
 }
+function createSessionCaptureHookExec(deps) {
+  const args = deps.tsxLoader ? [
+    "--import",
+    pathToFileURL2(deps.tsxLoader).href,
+    deps.entryPath,
+    "hook",
+    "capture-session",
+    deps.provider
+  ] : [deps.entryPath, "hook", "capture-session", deps.provider];
+  return {
+    command: deps.execPath ?? process6.execPath,
+    args
+  };
+}
 function buildHostCarrierModelDefaults22(config22) {
   const cliType = resolveAgentCliType22(config22.id, config22.defaultCliType);
   const cliDefaults = buildCarrierModelDefaults2(config22, cliType);
@@ -70915,6 +71475,7 @@ function buildClaudeNativeSubagentPlan22(registry32) {
 function buildClaudeNativeArgs2(context) {
   const systemPromptArg = context.replaceSystemPrompt ? "--system-prompt-file" : "--append-system-prompt-file";
   return [
+    ...buildResumeArgs22(context.resumeSessionId),
     systemPromptArg,
     requireSystemPromptFile2(context),
     ...context.pluginRoots.flatMap((pluginRoot) => [
@@ -70925,6 +71486,9 @@ function buildClaudeNativeArgs2(context) {
     "--dangerously-skip-permissions"
   ];
 }
+function buildResumeArgs22(resumeSessionId) {
+  return resumeSessionId === void 0 ? [] : ["--resume", resumeSessionId];
+}
 function buildClaudeMcpConfig2(servers) {
   return JSON.stringify({
     mcpServers: Object.fromEntries(
@@ -70982,20 +71546,32 @@ function escapeTomlMultilineString2(value) {
   });
   return result;
 }
+function buildPosixShellCommand2(values) {
+  return values.map(posixShellQuote2).join(" ");
+}
+function posixShellQuote2(value) {
+  return `'${value.replaceAll("'", "'\\''")}'`;
+}
 var CODEX_TOOL_TIMEOUT_SEC2 = 1800;
 function buildCodexNativeArgs2(context) {
   const profileName = requireCodexProfileName2(context);
   const args = [
+    ...buildResumeArgs32(context.resumeSessionId),
     "--enable",
     "plugins",
     "--enable",
     "child_agents_md",
+    "--enable",
+    "hooks",
     "--profile",
     profileName,
     "-c",
     'approval_policy="never"',
     "-c",
-    'sandbox_mode="danger-full-access"'
+    'sandbox_mode="danger-full-access"',
+    // hook 신뢰 프롬프트("Hooks need review")를 fleet 관리 세션에서 건너뛴다. bypass_hook_trust는
+    // config 키가 아니라 전용 CLI 플래그이므로 -c override가 아닌 플래그로 전달해야 한다.
+    "--dangerously-bypass-hook-trust"
   ];
   for (const server of context.mcpServers) {
     const prefix = `mcp_servers.${server.name}`;
@@ -71011,6 +71587,9 @@ function buildCodexNativeArgs2(context) {
   }
   return args;
 }
+function buildResumeArgs32(resumeSessionId) {
+  return resumeSessionId === void 0 ? [] : ["resume", resumeSessionId];
+}
 function requireCodexProfileName2(context) {
   if (context.codexProfileName) return context.codexProfileName;
   throw new Error("Codex profile name is required for native injection");
@@ -71221,20 +71800,38 @@ function claudeHooks2(options2) {
   if (!hookExec) {
     throw new Error("Fleet Claude session hook command is required");
   }
+  const userPromptSubmitExecs = [options2.captureSessionHookExec, options2.turnStartHookExec].filter((exec) => exec !== void 0);
+  const stopExecs = [options2.turnEndHookExec].filter((exec) => exec !== void 0);
   return {
     hooks: {
       SessionStart: [{
-        hooks: [{
-          // exec 형식: command는 직접 spawn되는 실행 파일, args는 셸 토크나이징 없이 그대로 전달된다.
-          // Windows cmd/powershell의 따옴표 규칙과 무관하게 동작하며 공백 포함 경로도 안전하다.
-          args: [...hookExec.args],
-          command: hookExec.command,
-          type: "command"
+        hooks: [claudeCommandHook2(hookExec)]
+      }],
+      ...userPromptSubmitExecs.length > 0 ? {
+        UserPromptSubmit: [{
+          hooks: userPromptSubmitExecs.map(claudeCommandHook2)
+        }]
+      } : {},
+      ...stopExecs.length > 0 ? {
+        Stop: [{
+          hooks: stopExecs.map(claudeCommandHook2)
         }]
-      }]
+      } : {}
     }
   };
 }
+function claudeCommandHook2(hookExec) {
+  if (!hookExec) {
+    throw new Error("Fleet Claude session hook command is required");
+  }
+  return {
+    // exec 형식: command는 직접 spawn되는 실행 파일, args는 셸 토크나이징 없이 그대로 전달된다.
+    // Windows cmd/powershell의 따옴표 규칙과 무관하게 동작하며 공백 포함 경로도 안전하다.
+    args: [...hookExec.args],
+    command: hookExec.command,
+    type: "command"
+  };
+}
 function claudeAgentFile2(subagent) {
   const frontmatter = [
     "---",
@@ -71744,7 +72341,7 @@ function homeMarketplaceTarget2(fleetRoot) {
 }
 function projectMarketplaceTarget2(cwd) {
   const projectFleetRoot = resolveProjectFleetRoot2(cwd);
-  const hash22 = crypto32.createHash("sha256").update(path93__default.resolve(cwd, ".fleet")).digest("hex").slice(0, 12);
+  const hash22 = crypto5.createHash("sha256").update(path93__default.resolve(cwd, ".fleet")).digest("hex").slice(0, 12);
   return {
     flat: true,
     name: `${FLEET_PROJECT_MARKETPLACE_NAME_PREFIX2}-${hash22}`,
@@ -71770,7 +72367,6 @@ function renderPluginRoot2(pluginRoot, bundle, options2, fleetRoot) {
   const stagedPluginRoot = path93__default.join(stageParent, path93__default.basename(pluginRoot));
   try {
     ensurePrivateDir2(stagedPluginRoot, stagedPluginRoot);
-    writePrivateJson2(path93__default.join(stagedPluginRoot, ".codex-plugin", "plugin.json"), codexManifest2(bundle), stagedPluginRoot);
     writePrivateJson2(path93__default.join(stagedPluginRoot, ".claude-plugin", "plugin.json"), claudeManifest2(bundle), stagedPluginRoot);
     switch (bundle.source) {
       case "asset":
@@ -71785,6 +72381,7 @@ function renderPluginRoot2(pluginRoot, bundle, options2, fleetRoot) {
         renderGlobalPluginRoot2(stagedPluginRoot, fleetRoot);
         break;
     }
+    writePrivateJson2(path93__default.join(stagedPluginRoot, ".codex-plugin", "plugin.json"), codexManifest2(bundle, stagedPluginRoot), stagedPluginRoot);
     removePrivatePath2(pluginRoot, parentRoot);
     renameSync5(stagedPluginRoot, pluginRoot);
   } finally {
@@ -71813,7 +72410,7 @@ function pruneMarketplaceRoot2(target) {
   }
 }
 function buildContentHash2(target) {
-  const hash22 = crypto32.createHash("sha256");
+  const hash22 = crypto5.createHash("sha256");
   for (const filePath of listRenderableFiles2(target)) {
     const relativePath2 = path93__default.relative(target.root, filePath);
     hash22.update(relativePath2);
@@ -71916,14 +72513,36 @@ function marketplacePluginPath2(target, bundle) {
   if (target.flat) return `./${FLAT_PLUGIN_DIR_NAME2}`;
   return `./${PLUGIN_BUNDLES_DIR_NAME2}/${bundle.directoryName}`;
 }
-function codexManifest2(bundle) {
+function codexManifest2(bundle, pluginRoot) {
   return {
     name: bundle.name,
-    version: "0.0.0",
+    version: codexManifestVersion2(bundle, pluginRoot),
     description: bundle.description,
     skills: "./skills/"
   };
 }
+function codexManifestVersion2(bundle, pluginRoot) {
+  const hash22 = crypto5.createHash("sha256");
+  hash22.update(bundle.name);
+  hash22.update("\0");
+  hash22.update(bundle.description);
+  hash22.update("\0");
+  for (const filePath of listCodexEffectivePluginFiles2(pluginRoot)) {
+    const relativePath2 = path93__default.relative(pluginRoot, filePath);
+    hash22.update(relativePath2);
+    hash22.update("\0");
+    hash22.update(readFileSync8(filePath));
+    hash22.update("\0");
+  }
+  return `0.0.0+${hash22.digest("hex").slice(0, 12)}`;
+}
+function listCodexEffectivePluginFiles2(pluginRoot) {
+  const skillsPath = path93__default.join(pluginRoot, "skills");
+  if (!existsSync8(skillsPath)) return [];
+  const files = [];
+  collectRenderableFiles2(pluginRoot, skillsPath, files, /* @__PURE__ */ new Set());
+  return files.sort();
+}
 function claudeManifest2(bundle) {
   return {
     name: bundle.name,
@@ -71943,7 +72562,7 @@ async function injectAgentCliProfile2(profile, options2) {
   const injectTone = options2.enableMetaphor ?? false;
   const endpoint = await options2.dedicatedMcpSession.getEndpoint();
   const startupDefinitions = buildStartupNativeDefinitions2(profile.id, options2.carrierRuntime);
-  const tokenLabel = options2.mcpSessionLabel ?? `agent:${profile.id}:${crypto32.randomUUID()}`;
+  const tokenLabel = options2.mcpSessionLabel ?? `agent:${profile.id}:${crypto5.randomUUID()}`;
   const tokens = await options2.dedicatedMcpSession.issueSessionToken({ cwd: profile.cwd, label: tokenLabel });
   const mcpServers = buildAgentCliMcpServerConfigs2(endpoint.servers, tokens);
   const doctrine = options2.buildSystemPrompt(injectTone);
@@ -71957,11 +72576,18 @@ async function injectAgentCliProfile2(profile, options2) {
       cwd: profile.cwd,
       dataDir: options2.dataDir,
       rootDir: options2.pluginRootDir,
+      captureSessionHookExec: options2.captureSessionHookExec,
+      turnStartHookExec: options2.turnStartHookExec,
+      turnEndHookExec: options2.turnEndHookExec,
       hookExec: startupDefinitions.host === "claude" ? requireHookExec2(options2.hookExec) : void 0,
       withMarketplaceLock: options2.withMarketplaceLock
     });
     const codexPluginKeys = plugin.codexRegistrations.map((registration) => `${registration.pluginName}@${registration.marketplaceName}`);
-    const codexProfile = profile.id === "codex" ? writeCodexFleetProfile2(profile.env, doctrine, codexPluginKeys, (cleanup2) => tempCleanups.push(cleanup2)) : void 0;
+    const codexProfile = profile.id === "codex" ? writeCodexFleetProfile2(profile.env, doctrine, codexPluginKeys, {
+      captureSessionHookExec: options2.captureSessionHookExec,
+      turnStartHookExec: options2.turnStartHookExec,
+      turnEndHookExec: options2.turnEndHookExec
+    }, (cleanup2) => tempCleanups.push(cleanup2)) : void 0;
     const launchWarnings = [];
     for (const registration of plugin.codexRegistrations) {
       const registrationWarning = await ensureCodexPluginRegistered2(registration, {
@@ -71988,13 +72614,14 @@ async function injectAgentCliProfile2(profile, options2) {
       pluginRoot: plugin.pluginRoot,
       pluginRoots: plugin.pluginRoots,
       codexProfileName: codexProfile?.profileName,
-      replaceSystemPrompt: options2.replaceSystemPrompt ?? true,
+      replaceSystemPrompt: options2.replaceSystemPrompt ?? false,
+      resumeSessionId: options2.resumeSessionId,
       systemPromptFile
     };
     const injectedArgs = buildAgentCliArgs2(capability.builderId, context);
     return {
       ...profile,
-      args: [...profile.args, ...injectedArgs],
+      args: mergeAgentCliArgs2(profile, capability.builderId, context, injectedArgs),
       cleanup,
       launchWarnings: [...profile.launchWarnings ?? [], ...launchWarnings]
     };
@@ -72036,11 +72663,11 @@ function writeSystemPromptFile2(cliId, systemPrompt, onCleanup) {
   chmodBestEffort22(filePath, SYSTEM_PROMPT_FILE_MODE2);
   return filePath;
 }
-function writeCodexFleetProfile2(env, doctrine, pluginKeys, onCleanup) {
+function writeCodexFleetProfile2(env, doctrine, pluginKeys, hookExecs, onCleanup) {
   const codexHome = env.CODEX_HOME ?? path93__default.join(env.HOME ?? os22__default.homedir(), ".codex");
   mkdirSync8(codexHome, { recursive: true });
   pruneStaleCodexFleetProfiles2(codexHome);
-  const profileName = `fleet-${crypto32.randomUUID()}`;
+  const profileName = `fleet-${crypto5.randomUUID()}`;
   const profilePath = path93__default.join(codexHome, `${profileName}.config.toml`);
   onCleanup(() => rmBestEffort2(profilePath));
   writeFileNoFollow22(profilePath, [
@@ -72055,11 +72682,33 @@ function writeCodexFleetProfile2(env, doctrine, pluginKeys, onCleanup) {
       `[plugins."${escapeTomlBasicString22(pluginKey)}"]`,
       "enabled = true",
       ""
-    ])
+    ]),
+    ...codexHooksConfig2(hookExecs)
   ].join("\n"));
   chmodBestEffort22(profilePath, SYSTEM_PROMPT_FILE_MODE2);
   return { profileName, profilePath };
 }
+function codexHooksConfig2(hookExecs) {
+  const userPromptSubmitExecs = [hookExecs.captureSessionHookExec, hookExecs.turnStartHookExec].filter((exec) => exec !== void 0);
+  const stopExecs = [hookExecs.turnEndHookExec].filter((exec) => exec !== void 0);
+  if (userPromptSubmitExecs.length === 0 && stopExecs.length === 0) return [];
+  const lines = ["[hooks]"];
+  if (userPromptSubmitExecs.length > 0) {
+    lines.push(`UserPromptSubmit = ${codexHookHandlersInline2(userPromptSubmitExecs)}`);
+  }
+  if (stopExecs.length > 0) {
+    lines.push(`Stop = ${codexHookHandlersInline2(stopExecs)}`);
+  }
+  lines.push("");
+  return lines;
+}
+function codexHookHandlersInline2(execs) {
+  const handlers = execs.map((exec) => {
+    const command22 = buildPosixShellCommand2([exec.command, ...exec.args]);
+    return `{ type = "command", command = "${escapeTomlBasicString22(command22)}" }`;
+  }).join(", ");
+  return `[{ hooks = [${handlers}] }]`;
+}
 function writeFileNoFollow22(filePath, content) {
   const flags = constants8.O_WRONLY | constants8.O_CREAT | constants8.O_TRUNC | constants8.O_NOFOLLOW;
   const fd = openSync8(filePath, flags, SYSTEM_PROMPT_FILE_MODE2);
@@ -72132,6 +72781,24 @@ function buildAgentCliArgs2(builderId, context) {
       return buildCodexNativeArgs2(context);
   }
 }
+function mergeAgentCliArgs2(profile, builderId, context, injectedArgs) {
+  if (builderId !== "codex-native" || context.resumeSessionId === void 0) {
+    return [...profile.args, ...injectedArgs];
+  }
+  const resumeSessionId = context.resumeSessionId;
+  const prefixLength = profile.binPrefixArgs?.length ?? 0;
+  const codexResumeArgs = ["resume", resumeSessionId];
+  const injectedTail = injectedArgs.slice(codexResumeArgs.length);
+  return [
+    ...profile.args.slice(0, prefixLength),
+    ...codexResumeArgs,
+    ...profile.args.slice(prefixLength).filter((arg, index, args) => !isCodexResumeArgAt2(args, index, resumeSessionId)),
+    ...injectedTail
+  ];
+}
+function isCodexResumeArgAt2(args, index, resumeSessionId) {
+  return args[index] === "resume" && args[index + 1] === resumeSessionId || args[index] === resumeSessionId && args[index - 1] === "resume";
+}
 function createOnceCleanup2(cleanup) {
   let cleaned = false;
   return () => {
@@ -72315,387 +72982,6 @@ function applyMessagePolicy2(text, policy) {
     submit: policy.lineTerminator
   };
 }
-var FLEET_DATA_DIR_NAME2 = ".fleet";
-function getFleetDataDir2() {
-  return path93.join(os222.homedir(), FLEET_DATA_DIR_NAME2);
-}
-function readAuthStoreFile2(filePath) {
-  let fd;
-  try {
-    fd = fs52.openSync(filePath, fs52.constants.O_RDONLY | NOFOLLOW_FLAG2);
-    if (!fs52.fstatSync(fd).isFile()) {
-      return {};
-    }
-    return JSON.parse(fs52.readFileSync(fd, "utf-8"));
-  } catch {
-    return {};
-  } finally {
-    if (fd !== void 0) {
-      try {
-        fs52.closeSync(fd);
-      } catch {
-      }
-    }
-  }
-}
-var DEFAULT_AUTH_PATH2 = path93.join(getFleetDataDir2(), "auth.json");
-var AUTH_LOCK_OWNER_FILE_NAME2 = "owner.json";
-var AUTH_LOCK_TIMEOUT_MS2 = 5e3;
-function createAuthService2(deps = {}) {
-  const authPath = deps.authPath ?? DEFAULT_AUTH_PATH2;
-  const lockDir = `${authPath}.lock`;
-  return {
-    // [HIGH #1] TOCTOU 수정: existsSync/read/check/delete/write 전체를 락 블록 안으로 이동
-    async deleteApiKey(providerId) {
-      let deleted = false;
-      withAuthLock2(authPath, lockDir, () => {
-        if (!fs52.existsSync(authPath)) return;
-        const data = readAuthStoreFile2(authPath);
-        if (!Object.prototype.hasOwnProperty.call(data, providerId)) return;
-        delete data[providerId];
-        writeAuthData2(authPath, data);
-        deleted = true;
-      });
-      return deleted;
-    },
-    // [HIGH #2] 읽기 경로: fd 기반 O_RDONLY|O_NOFOLLOW+fstatSync isFile
-    async getApiKey(providerId) {
-      let fd;
-      try {
-        if (!fs52.existsSync(authPath)) {
-          return void 0;
-        }
-        fd = fs52.openSync(authPath, fs52.constants.O_RDONLY | NOFOLLOW_FLAG2);
-        if (!fs52.fstatSync(fd).isFile()) {
-          return void 0;
-        }
-        const data = JSON.parse(fs52.readFileSync(fd, "utf-8"));
-        return typeof data[providerId]?.key === "string" ? data[providerId].key : void 0;
-      } catch {
-        return void 0;
-      } finally {
-        if (fd !== void 0) {
-          try {
-            fs52.closeSync(fd);
-          } catch {
-          }
-        }
-      }
-    },
-    // [HIGH #2] 읽기 경로: fd 기반 O_RDONLY|O_NOFOLLOW 통일
-    async listProviderIds() {
-      if (!fs52.existsSync(authPath)) {
-        return [];
-      }
-      try {
-        return Object.keys(readAuthStoreFile2(authPath)).sort();
-      } catch {
-        return [];
-      }
-    },
-    async setApiKey(providerId, key) {
-      const dir = path93.dirname(authPath);
-      ensureSafeDirectory2(dir);
-      withAuthLock2(authPath, lockDir, () => {
-        const data = fs52.existsSync(authPath) ? readAuthStoreFile2(authPath) : {};
-        data[providerId] = {
-          ...data[providerId] ?? {},
-          key
-        };
-        writeAuthData2(authPath, data);
-      });
-    }
-  };
-}
-function withAuthLock2(authPath, lockDir, operation) {
-  return withDirectoryLock2(
-    {
-      lockDir,
-      ownerFileName: AUTH_LOCK_OWNER_FILE_NAME2,
-      timeoutMs: AUTH_LOCK_TIMEOUT_MS2
-    },
-    operation
-  );
-}
-function writeAuthData2(authPath, data) {
-  writeAtomicSync2(authPath, `${JSON.stringify(data, null, 2)}
-`, {
-    mode: SECURE_FILE_MODE2,
-    fsync: true
-  });
-}
-function formatMissingAuthKeyMessage2(input) {
-  const cliHint = input.cli ? `cli '${input.cli}'` : "selected CLI";
-  return `Auth token not found for ${cliHint} (providerId: '${input.providerId}'). Run \`fleet auth login\` to register one.`;
-}
-function formatAuthValidationFailureMessage2(input) {
-  const detail = input.detail ? ` Detail: ${input.detail}` : "";
-  if (input.status === "unauthorized") {
-    return `Auth token was rejected (providerId: '${input.providerId}'). Check the token and try again.${detail}`;
-  }
-  if (input.status === "forbidden") {
-    return `Auth token is not allowed for this provider (providerId: '${input.providerId}'). Check the token permissions.${detail}`;
-  }
-  if (input.status === "timeout") {
-    return `Auth token validation timed out (providerId: '${input.providerId}'). Check the connection and try again.${detail}`;
-  }
-  if (input.status === "network") {
-    return `Auth token validation failed due to a network error (providerId: '${input.providerId}'). Check the connection and try again.${detail}`;
-  }
-  if (input.status === "server") {
-    return `Auth token validation failed because the provider returned an error (providerId: '${input.providerId}'). Try again later.${detail}`;
-  }
-  return `Auth token validation failed (providerId: '${input.providerId}'). Check the token and try again.${detail}`;
-}
-var LEGACY_AUTH_PATH2 = path93.join(getFleetDataDir2(), "agent", "auth.json");
-var CURRENT_AUTH_PATH2 = path93.join(getFleetDataDir2(), "auth.json");
-function mergeAuthStoresNoOverwrite2(legacy, current) {
-  const data = { ...current };
-  const migratedProviderIds = [];
-  const skippedProviderIds = [];
-  for (const [providerId, entry] of Object.entries(legacy)) {
-    if (Object.prototype.hasOwnProperty.call(data, providerId)) {
-      skippedProviderIds.push(providerId);
-      continue;
-    }
-    data[providerId] = entry;
-    migratedProviderIds.push(providerId);
-  }
-  return {
-    data,
-    migratedProviderIds,
-    skippedProviderIds
-  };
-}
-async function migrateLegacyAuthStore2(options2 = {}) {
-  const legacyPath = options2.legacyPath ?? LEGACY_AUTH_PATH2;
-  const currentPath = options2.currentPath ?? CURRENT_AUTH_PATH2;
-  if (!fs52.existsSync(legacyPath)) {
-    return createMigrationResult2({
-      legacyPath,
-      currentPath,
-      status: "legacy-missing",
-      migratedProviderIds: [],
-      skippedProviderIds: [],
-      shouldPrintNotice: false
-    });
-  }
-  const legacy = readAuthStoreFile2(legacyPath);
-  const current = fs52.existsSync(currentPath) ? readAuthStoreFile2(currentPath) : {};
-  const merged = mergeAuthStoresNoOverwrite2(legacy, current);
-  if (merged.migratedProviderIds.length > 0) {
-    const dir = path93.dirname(currentPath);
-    ensureSafeDirectory2(dir);
-    writeAtomicSync2(currentPath, `${JSON.stringify(merged.data, null, 2)}
-`, {
-      mode: SECURE_FILE_MODE2,
-      fsync: true
-    });
-  }
-  return createMigrationResult2({
-    legacyPath,
-    currentPath,
-    status: merged.migratedProviderIds.length > 0 ? "migrated" : "unchanged",
-    migratedProviderIds: merged.migratedProviderIds,
-    skippedProviderIds: merged.skippedProviderIds,
-    shouldPrintNotice: options2.notify !== false && merged.migratedProviderIds.length > 0
-  });
-}
-function createMigrationResult2(input) {
-  return {
-    legacyPath: input.legacyPath,
-    currentPath: input.currentPath,
-    migratedCount: input.migratedProviderIds.length,
-    skippedCount: input.skippedProviderIds.length,
-    migratedProviderIds: input.migratedProviderIds,
-    skippedProviderIds: input.skippedProviderIds,
-    shouldPrintNotice: input.shouldPrintNotice,
-    status: input.status
-  };
-}
-var DEFAULT_AUTH_VALIDATION_TIMEOUT_MS2 = 5e3;
-async function validateAnthropicCompatibleApiKey2(request) {
-  const controller = new AbortController();
-  const timeout = setTimeout(() => {
-    controller.abort();
-  }, request.timeoutMs ?? DEFAULT_AUTH_VALIDATION_TIMEOUT_MS2);
-  try {
-    const response = await fetch(buildMessagesUrl2(request.baseUrl), {
-      method: "POST",
-      headers: {
-        "anthropic-version": "2023-06-01",
-        "content-type": "application/json",
-        "x-api-key": request.apiKey
-      },
-      body: JSON.stringify({
-        model: "claude-3-5-haiku-20241022",
-        max_tokens: 1,
-        messages: [
-          {
-            role: "user",
-            content: "ping"
-          }
-        ]
-      }),
-      signal: controller.signal
-    });
-    if (response.ok) {
-      return { providerId: request.providerId, status: "success" };
-    }
-    if (response.status === 401) {
-      return { providerId: request.providerId, status: "unauthorized" };
-    }
-    if (response.status === 403) {
-      return { providerId: request.providerId, status: "forbidden" };
-    }
-    if (response.status >= 500) {
-      return {
-        providerId: request.providerId,
-        status: "server",
-        detail: `HTTP ${response.status}`
-      };
-    }
-    return {
-      providerId: request.providerId,
-      status: "unknown",
-      detail: `HTTP ${response.status}`
-    };
-  } catch (error512) {
-    if (isAbortError2(error512)) {
-      return { providerId: request.providerId, status: "timeout" };
-    }
-    return {
-      providerId: request.providerId,
-      status: "network",
-      detail: error512 instanceof Error ? error512.message : String(error512)
-    };
-  } finally {
-    clearTimeout(timeout);
-  }
-}
-function isAuthValidationSuccess2(result) {
-  return result.status === "success";
-}
-function createAuthValidationError2(result) {
-  return new Error(formatAuthValidationFailureMessage2(result));
-}
-function buildMessagesUrl2(baseUrl) {
-  return `${baseUrl.replace(/\/+$/, "")}/v1/messages`;
-}
-function isAbortError2(error512) {
-  return error512 instanceof DOMException && error512.name === "AbortError";
-}
-var CLAUDE_ZAI_PROVIDER_ID2 = "Claude Code with Z.AI GLM";
-var CLAUDE_KIMI_PROVIDER_ID2 = "Claude Code with Moonshot Kimi";
-var AUTH_PROVIDER_DEFINITIONS2 = {
-  "claude-zai": {
-    providerId: CLAUDE_ZAI_PROVIDER_ID2,
-    baseUrl: CLI_BACKENDS2["claude-zai"].defaultEnv.ANTHROPIC_BASE_URL,
-    env: CLI_BACKENDS2["claude-zai"].defaultEnv
-  },
-  "claude-kimi": {
-    providerId: CLAUDE_KIMI_PROVIDER_ID2,
-    baseUrl: CLI_BACKENDS2["claude-kimi"].defaultEnv.ANTHROPIC_BASE_URL,
-    env: CLI_BACKENDS2["claude-kimi"].defaultEnv
-  }
-};
-async function resolveAuthEnv2(cli, deps) {
-  const provider = AUTH_PROVIDER_DEFINITIONS2[cli];
-  if (!provider) return {};
-  await migrateLegacyAuthStore2();
-  const auth = deps?.authService ?? createAuthService2({ authPath: DEFAULT_AUTH_PATH2 });
-  const token = await auth.getApiKey(provider.providerId);
-  if (!token) {
-    throw new Error(formatMissingAuthKeyMessage2({ cli, providerId: provider.providerId }));
-  }
-  const validation = await validateAnthropicCompatibleApiKey2({
-    providerId: provider.providerId,
-    apiKey: token,
-    baseUrl: provider.baseUrl
-  });
-  if (!isAuthValidationSuccess2(validation)) {
-    const failure = {
-      providerId: validation.providerId,
-      status: validation.status,
-      detail: validation.detail
-    };
-    throw createAuthValidationError2(failure);
-  }
-  return { ...provider.env, ANTHROPIC_AUTH_TOKEN: token };
-}
-var GLOBAL_OPTIONS_VERSION2 = 1;
-var GLOBAL_OPTIONS_FILE_NAME2 = "settings.json";
-var LOCK_DIR_NAME22 = "settings.json.lock";
-var LOCK_OWNER_FILE_NAME2 = "owner";
-var TEMP_FILE_PREFIX2 = `.tmp-${GLOBAL_OPTIONS_FILE_NAME2}-`;
-function createGlobalOptionsStore2(deps = {}) {
-  const dataDir = deps.dataDir ?? getFleetDataDir2();
-  const optionsPath = path93.join(dataDir, GLOBAL_OPTIONS_FILE_NAME2);
-  const lockDir = path93.join(dataDir, LOCK_DIR_NAME22);
-  const store22 = createDurableJsonStore2({
-    filePath: optionsPath,
-    lockDir,
-    lockOwnerFileName: LOCK_OWNER_FILE_NAME2,
-    sanitize: (value) => sanitizeGlobalOptionsData2(value).data,
-    sensitivity: "sensitive",
-    timeoutMs: deps.timeoutMs,
-    staleLockMs: deps.staleLockMs,
-    tempCleanupPrefix: TEMP_FILE_PREFIX2,
-    now: deps.now
-  });
-  return {
-    path: optionsPath,
-    load: () => store22.load(),
-    save: (data) => store22.save(sanitizeGlobalOptionsData2(data).data),
-    update: (mutate) => store22.update((current) => sanitizeGlobalOptionsData2(mutate(current)).data)
-  };
-}
-function createEmptyGlobalOptionsData2() {
-  return {
-    version: GLOBAL_OPTIONS_VERSION2
-  };
-}
-function sanitizeGlobalOptionsData2(value) {
-  if (!isRecord32(value)) {
-    return { data: createEmptyGlobalOptionsData2(), changed: true };
-  }
-  if (value.version !== GLOBAL_OPTIONS_VERSION2) {
-    return { data: createEmptyGlobalOptionsData2(), changed: true };
-  }
-  const data = {
-    version: GLOBAL_OPTIONS_VERSION2,
-    ...typeof value.replaceSystemPrompt === "boolean" ? { replaceSystemPrompt: value.replaceSystemPrompt } : {},
-    ...typeof value.enableMetaphor === "boolean" ? { enableMetaphor: value.enableMetaphor } : {}
-  };
-  const allowedKeys = /* @__PURE__ */ new Set(["version", "replaceSystemPrompt", "enableMetaphor"]);
-  const changed = Object.keys(value).some((key) => !allowedKeys.has(key)) || "replaceSystemPrompt" in value && typeof value.replaceSystemPrompt !== "boolean" || "enableMetaphor" in value && typeof value.enableMetaphor !== "boolean";
-  return { data, changed };
-}
-function isRecord32(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function createGlobalOptionsService2(deps = {}) {
-  const store22 = deps.store ?? createGlobalOptionsStore2({ dataDir: deps.dataDir });
-  return {
-    load: () => store22.load(),
-    save: (data) => {
-      store22.save(data);
-      return store22.load();
-    },
-    update: (mutate) => updateGlobalOptions2(store22, mutate)
-  };
-}
-function updateGlobalOptions2(store22, mutate) {
-  return store22.update(mutate);
-}
-function createInfraServices2(deps = {}) {
-  const globalOptionsService = createGlobalOptionsService2();
-  const authService = createAuthService2({ authPath: deps.authPath ?? DEFAULT_AUTH_PATH2 });
-  return {
-    authService,
-    globalOptionsService
-  };
-}
 var FLEET_WIKI_ENTRY_BEGIN = "<<<FLEET_WIKI_ENTRY_BEGIN";
 var FLEET_WIKI_ENTRY_END = "<<<FLEET_WIKI_ENTRY_END>>>";
 var FLEET_WIKI_RAW_SOURCE_BEGIN = "<<<FLEET_WIKI_RAW_SOURCE_BEGIN";
@@ -73722,7 +74008,7 @@ function stripLeadingFrontmatter(body) {
   return stripped ? next : body;
 }
 function computeContentHash(content) {
-  return crypto32.createHash("sha256").update(content, "utf8").digest("hex").slice(0, 8);
+  return crypto5.createHash("sha256").update(content, "utf8").digest("hex").slice(0, 8);
 }
 function assertWithinRawDir(absolutePath, paths) {
   const relative2 = path93__default.relative(paths.rawDir, absolutePath);
@@ -73935,7 +74221,7 @@ async function writeAtomic(filePath, content, paths) {
   await ensureMemoryRoot(paths);
   const tempPath = path93__default.join(
     path93__default.dirname(filePath),
-    `.tmp-${process.pid}-${Date.now()}-${crypto32.randomUUID()}-${os22__default.hostname()}`
+    `.tmp-${process.pid}-${Date.now()}-${crypto5.randomUUID()}-${os22__default.hostname()}`
   );
   await writeFile2(tempPath, content, "utf8");
   await rename(tempPath, filePath);
@@ -76472,7 +76758,7 @@ function parseOptionalIsoDate(value) {
   return Number.isFinite(timestamp) ? timestamp : null;
 }
 function hashBodyForComparison(body) {
-  return crypto32.createHash("sha256").update(body.replace(/\s+/g, " ").trim(), "utf8").digest("hex").slice(0, 8);
+  return crypto5.createHash("sha256").update(body.replace(/\s+/g, " ").trim(), "utf8").digest("hex").slice(0, 8);
 }
 function hasConflictingStatuses(entries) {
   const statuses = new Set(entries.map((entry) => entry.status).filter((status) => status !== "unknown"));
@@ -78654,6 +78940,418 @@ function buildWikiToolSpec(config22, usage) {
     }
   };
 }
+var SUBAGENT_CLI_TYPES = /* @__PURE__ */ new Set(["claude", "claude-zai", "claude-kimi"]);
+var TASKFORCE_MIN_BACKENDS = 2;
+function createCarrierSettingsRouter(deps) {
+  const controller = createStatusOverlayController(deps.registry);
+  return async function handleCarrierSettingsRoute(context) {
+    const { req, res, pathname } = context;
+    if (pathname === "/carrier-settings/state") {
+      if (req.method !== "GET") {
+        deps.writeJson(res, 405, { error: "Method not allowed" });
+        return true;
+      }
+      deps.writeJson(res, 200, buildCarrierSettingsState(deps.registry));
+      return true;
+    }
+    if (pathname === "/carrier-settings/options") {
+      if (req.method !== "GET") {
+        deps.writeJson(res, 405, { error: "Method not allowed" });
+        return true;
+      }
+      deps.writeJson(res, 200, buildCarrierSettingsOptions());
+      return true;
+    }
+    const mutation = parseCarrierMutation(pathname);
+    if (!mutation) return false;
+    await handleCarrierMutation(req, res, deps, controller, mutation);
+    return true;
+  };
+}
+function buildCarrierSettingsState(registry32) {
+  const defaultsByCarrier = buildDefaultsByCarrier(registry32);
+  const snapshot = readCarriersSnapshot2(defaultsByCarrier);
+  return {
+    generation: snapshot.generation,
+    carriers: getRegisteredOrder2(registry32).map((carrierId) => {
+      const config22 = requireCarrierConfig(registry32, carrierId);
+      const resolved = snapshot.carriers[carrierId] ?? fallbackResolvedState(config22);
+      return toCarrierSettingsCarrier(registry32, config22, resolved);
+    })
+  };
+}
+function buildCarrierSettingsOptions() {
+  return {
+    cliTypes: getCliTypes().map(toCliOption),
+    taskForceConstraints: { minBackends: TASKFORCE_MIN_BACKENDS }
+  };
+}
+async function handleCarrierMutation(req, res, deps, controller, mutation) {
+  const method = req.method ?? "GET";
+  const expectedMethod = mutation.kind === "display-name" ? "PATCH" : mutation.kind === "taskforce-backend" || mutation.kind === "taskforce-all" ? method : "PUT";
+  if (!isExpectedCarrierMethod(mutation, method, expectedMethod)) {
+    deps.writeJson(res, 405, { error: "Method not allowed" });
+    return;
+  }
+  if (!deps.isAuthorized(req)) {
+    deps.writeJson(res, 401, { error: "unauthorized" });
+    return;
+  }
+  if (!isJsonRequest(req)) {
+    deps.writeJson(res, 415, { error: "unsupported_media_type" });
+    return;
+  }
+  if (!getRegisteredCarrierConfig2(deps.registry, mutation.carrierId)) {
+    deps.writeJson(res, 404, { error: "carrier_not_found" });
+    return;
+  }
+  if (mutation.kind === "taskforce-backend" && !isCliType(mutation.cliType)) {
+    deps.writeJson(res, 400, { error: "invalid_cli_type" });
+    return;
+  }
+  try {
+    if (mutation.kind === "cli") {
+      const body2 = await readRequiredJsonBody(req, res, deps);
+      if (!body2.ok) return;
+      await mutateCarrierCli(res, deps, controller, mutation.carrierId, body2.body);
+      return;
+    }
+    if (mutation.kind === "model") {
+      const body2 = await readRequiredJsonBody(req, res, deps);
+      if (!body2.ok) return;
+      await mutateCarrierModel(res, deps, mutation.carrierId, body2.body);
+      return;
+    }
+    if (mutation.kind === "display-name") {
+      const body2 = await readRequiredJsonBody(req, res, deps);
+      if (!body2.ok) return;
+      mutateDisplayName(res, deps, mutation.carrierId, body2.body);
+      return;
+    }
+    if (mutation.kind === "agent-mode") {
+      const body2 = await readRequiredJsonBody(req, res, deps);
+      if (!body2.ok) return;
+      mutateAgentMode(res, deps, mutation.carrierId, body2.body);
+      return;
+    }
+    if (mutation.kind === "taskforce-backend") {
+      if (method === "DELETE") {
+        const body3 = await readRequiredJsonBody(req, res, deps);
+        if (!body3.ok) return;
+        resetTaskForceModelSelection2(mutation.carrierId, mutation.cliType);
+        refreshTaskForceConfiguredCarriers(deps.registry);
+        writeMutationState(res, deps);
+        return;
+      }
+      const body2 = await readRequiredJsonBody(req, res, deps);
+      if (!body2.ok) return;
+      mutateTaskForceBackend(res, deps, mutation.carrierId, mutation.cliType, body2.body);
+      return;
+    }
+    const body = await readRequiredJsonBody(req, res, deps);
+    if (!body.ok) return;
+    resetCarrierTaskForceConfig2(mutation.carrierId);
+    refreshTaskForceConfiguredCarriers(deps.registry);
+    writeMutationState(res, deps);
+  } catch (error512) {
+    deps.writeJson(res, 400, { error: error512 instanceof Error ? error512.message : "invalid_request" });
+  }
+}
+async function mutateCarrierCli(res, deps, controller, carrierId, body) {
+  const cliType = readCliType(body.cliType);
+  if (!cliType) {
+    deps.writeJson(res, 400, { error: "invalid_cli_type" });
+    return;
+  }
+  await controller.changeCliType(carrierId, cliType);
+  if (!SUBAGENT_CLI_TYPES.has(cliType)) {
+    const resolved = readCarriersSnapshot2(buildDefaultsByCarrier(deps.registry)).carriers[carrierId];
+    if (resolved?.agentMode === "subagent") {
+      const config22 = requireCarrierConfig(deps.registry, carrierId);
+      updateCarrierAgentModeAtomically(carrierId, "cli", config22.defaultAgentMode ?? "cli");
+    }
+  }
+  writeMutationState(res, deps);
+}
+async function mutateCarrierModel(res, deps, carrierId, body) {
+  const config22 = requireCarrierConfig(deps.registry, carrierId);
+  const cliType = resolveAgentCliType22(carrierId, config22.defaultCliType);
+  const selection = readSelection(cliType, body);
+  if (!selection) {
+    deps.writeJson(res, 400, { error: "invalid_model_selection" });
+    return;
+  }
+  await updateAgentCliSelection2(carrierId, cliType, selection);
+  notifyStatusUpdate2(deps.registry);
+  writeMutationState(res, deps);
+}
+function mutateDisplayName(res, deps, carrierId, body) {
+  const displayName = normalizeCarrierDisplayNameInput2(body.displayName);
+  if (displayName === null) {
+    deps.writeJson(res, 400, { error: "invalid_display_name" });
+    return;
+  }
+  updateCarrierDisplayName2(carrierId, displayName, getCarrierSourceDisplayName2(deps.registry, carrierId));
+  notifyStatusUpdate2(deps.registry);
+  writeMutationState(res, deps);
+}
+function mutateAgentMode(res, deps, carrierId, body) {
+  const config22 = requireCarrierConfig(deps.registry, carrierId);
+  const agentMode = body.agentMode;
+  if (agentMode !== "cli" && agentMode !== "subagent") {
+    deps.writeJson(res, 400, { error: "invalid_agent_mode" });
+    return;
+  }
+  const cliType = resolveAgentCliType22(carrierId, config22.defaultCliType);
+  if (agentMode === "subagent" && !SUBAGENT_CLI_TYPES.has(cliType)) {
+    deps.writeJson(res, 400, { error: "subagent_unsupported" });
+    return;
+  }
+  updateCarrierAgentModeAtomically(carrierId, agentMode, config22.defaultAgentMode ?? "cli");
+  if (agentMode === "subagent") refreshTaskForceConfiguredCarriers(deps.registry);
+  notifyStatusUpdate2(deps.registry);
+  writeMutationState(res, deps);
+}
+function mutateTaskForceBackend(res, deps, carrierId, cliType, body) {
+  const selection = readSelection(cliType, body);
+  if (!selection) {
+    deps.writeJson(res, 400, { error: "invalid_model_selection" });
+    return;
+  }
+  updateTaskForceBackendAtomically(carrierId, cliType, selection);
+  refreshTaskForceConfiguredCarriers(deps.registry);
+  notifyStatusUpdate2(deps.registry);
+  writeMutationState(res, deps);
+}
+function writeMutationState(res, deps) {
+  const response = { state: buildCarrierSettingsState(deps.registry) };
+  deps.writeJson(res, 200, response);
+}
+async function readRequiredJsonBody(req, res, deps) {
+  const body = await deps.readJsonBody(req);
+  if (!body || typeof body !== "object" || Array.isArray(body)) {
+    deps.writeJson(res, 400, { error: "invalid_json" });
+    return { ok: false };
+  }
+  return { ok: true, body };
+}
+function buildDefaultsByCarrier(registry32) {
+  return Object.fromEntries(
+    getRegisteredOrder2(registry32).map((carrierId) => {
+      const config22 = requireCarrierConfig(registry32, carrierId);
+      return [carrierId, {
+        cliType: config22.defaultCliType,
+        ...config22.defaultAgentMode ? { defaultAgentMode: config22.defaultAgentMode } : {},
+        ...buildCarrierModelDefaults2(config22, config22.defaultCliType)
+      }];
+    })
+  );
+}
+function toCarrierSettingsCarrier(registry32, config22, resolved) {
+  const cliType = resolved.agentCliType ?? config22.defaultCliType;
+  const selection = resolved.agentCli[cliType] ?? readDefaultSelection(cliType);
+  const taskForceBackends = toTaskForceBackends(resolved.taskforce);
+  return {
+    carrierId: config22.id,
+    displayName: resolved.displayName ?? getCarrierSourceDisplayName2(registry32, config22.id),
+    sourceDisplayName: getCarrierSourceDisplayName2(registry32, config22.id),
+    role: config22.carrierMetadata?.title ?? config22.displayName,
+    roleDescription: config22.carrierMetadata?.summary ?? "",
+    ...config22.carrierMetadata?.category ? { category: config22.carrierMetadata.category } : {},
+    slot: config22.slot,
+    cliType,
+    defaultCliType: config22.defaultCliType,
+    model: selection.model,
+    ...selection.effort ? { effort: selection.effort } : {},
+    agentMode: resolved.agentMode,
+    subagentMode: resolved.agentMode === "subagent",
+    taskForceBackendCount: taskForceBackends.length,
+    taskforce: { backends: taskForceBackends }
+  };
+}
+function toTaskForceBackends(taskforce) {
+  return TASKFORCE_CLI_TYPES2.map((cliType) => {
+    const selection = taskforce[cliType];
+    if (!selection) return null;
+    return {
+      cliType,
+      model: selection.model,
+      ...selection.effort ? { effort: selection.effort } : {}
+    };
+  }).filter((backend) => backend !== null);
+}
+function toCliOption(cliType) {
+  const provider = getProviderModels2(cliType);
+  return {
+    id: cliType,
+    displayName: CLI_DISPLAY_NAMES2[cliType] ?? provider.name,
+    supportsSubagent: SUBAGENT_CLI_TYPES.has(cliType),
+    models: provider.models.map((model) => {
+      const effort = getEffort2(cliType, model.modelId);
+      return {
+        modelId: model.modelId,
+        name: model.name,
+        ...effort.supported ? { effort: { levels: effort.levels, default: effort.default } } : {}
+      };
+    }),
+    defaultModel: provider.defaultModel ?? provider.models[0]?.modelId
+  };
+}
+function createStatusOverlayController(registry32) {
+  return new StatusOverlayController2({
+    getEntries: () => [],
+    getRegisteredOrder: () => getRegisteredOrder2(registry32),
+    getCarrierConfig: (carrierId) => getRegisteredCarrierConfig2(registry32, carrierId),
+    getResolvedCliType: (carrierId) => {
+      const config22 = getRegisteredCarrierConfig2(registry32, carrierId);
+      return config22 ? resolveAgentCliType22(carrierId, config22.defaultCliType) : void 0;
+    },
+    getCurrentModelSelection: (carrierId) => {
+      return readCurrentModelSelection(registry32, carrierId);
+    },
+    getAvailableModels: (cliType) => {
+      const provider = getProviderModels2(cliType);
+      return {
+        defaultModel: provider.defaultModel,
+        models: provider.models.map((model) => ({
+          modelId: model.modelId,
+          name: model.name,
+          effort: getEffort2(cliType, model.modelId)
+        }))
+      };
+    },
+    getEffort: (cliType, modelId) => getEffort2(cliType, modelId),
+    getAgentCliSelection: (carrierId, cliType) => getAgentCliSelection2(carrierId, cliType),
+    saveAgentCliSelection: saveAgentCliSelection2,
+    updateCarrierCliType: (carrierId, cliType) => updateCarrierCliType2(registry32, carrierId),
+    applyAgentCliTypeSelectionUpdate: applyAgentCliTypeSelectionUpdate2,
+    refreshAgentPanel: () => void 0,
+    syncModelConfig: () => void 0,
+    notifyStatusUpdate: () => notifyStatusUpdate2(registry32)
+  });
+}
+function updateCarrierAgentModeAtomically(carrierId, agentMode, defaultAgentMode) {
+  if (agentMode === "cli") {
+    setCarrierAgentMode2(carrierId, false, defaultAgentMode);
+    return;
+  }
+  updateCarriers2((states) => {
+    const carriers = { ...states.carriers ?? {} };
+    const current = carriers[carrierId] ?? {};
+    const next = { ...current };
+    next.agentMode = "subagent";
+    delete next.taskforce;
+    carriers[carrierId] = next;
+    states.carriers = carriers;
+  });
+}
+function updateTaskForceBackendAtomically(carrierId, cliType, selection) {
+  updateCarriers2((states) => {
+    const carriers = { ...states.carriers ?? {} };
+    const current = carriers[carrierId] ?? {};
+    carriers[carrierId] = {
+      ...current,
+      agentMode: "cli",
+      taskforce: {
+        ...current.taskforce ?? {},
+        [cliType]: selection
+      }
+    };
+    states.carriers = carriers;
+  });
+}
+function refreshTaskForceConfiguredCarriers(registry32) {
+  setTaskForceConfiguredCarriers2(registry32, getConfiguredTaskForceCarrierIds2(getRegisteredOrder2(registry32)));
+  notifyStatusUpdate2(registry32);
+}
+function readSelection(cliType, body) {
+  if (typeof body.model !== "string") return null;
+  const provider = getProviderModels2(cliType);
+  if (!provider.models.some((model) => model.modelId === body.model)) return null;
+  const effort = getEffort2(cliType, body.model);
+  if (!effort.supported) {
+    return body.effort === void 0 ? { model: body.model } : null;
+  }
+  if (typeof body.effort !== "string" || !effort.levels.includes(body.effort)) return null;
+  return { model: body.model, effort: body.effort };
+}
+function readDefaultSelection(cliType) {
+  const provider = getProviderModels2(cliType);
+  const model = provider.defaultModel;
+  const effort = getEffort2(cliType, model);
+  return {
+    model,
+    ...effort.supported ? { effort: effort.default } : {}
+  };
+}
+function readCurrentModelSelection(registry32, carrierId) {
+  const config22 = getRegisteredCarrierConfig2(registry32, carrierId);
+  if (!config22) return void 0;
+  const defaults = {
+    [carrierId]: {
+      cliType: config22.defaultCliType,
+      ...config22.defaultAgentMode ? { defaultAgentMode: config22.defaultAgentMode } : {},
+      ...buildCarrierModelDefaults2(config22, config22.defaultCliType)
+    }
+  };
+  const resolved = readCarriersSnapshot2(defaults).carriers[carrierId] ?? fallbackResolvedState(config22);
+  const cliType = resolved.agentCliType ?? config22.defaultCliType;
+  return resolved.agentCli[cliType] ?? readDefaultSelection(cliType);
+}
+function fallbackResolvedState(config22) {
+  return {
+    agentMode: config22.defaultAgentMode ?? "cli",
+    agentCliType: config22.defaultCliType,
+    agentCli: { [config22.defaultCliType]: readDefaultSelection(config22.defaultCliType) },
+    taskforce: {}
+  };
+}
+function parseCarrierMutation(pathname) {
+  const parts = pathname.split("/").filter(Boolean);
+  if (parts[0] !== "carrier-settings" || parts[1] !== "carriers" || !parts[2]) return null;
+  const carrierId = safeDecodeURIComponent(parts[2]);
+  if (!carrierId) return null;
+  if (parts.length === 4 && parts[3] === "cli") return { kind: "cli", carrierId };
+  if (parts.length === 4 && parts[3] === "model") return { kind: "model", carrierId };
+  if (parts.length === 4 && parts[3] === "display-name") return { kind: "display-name", carrierId };
+  if (parts.length === 4 && parts[3] === "agent-mode") return { kind: "agent-mode", carrierId };
+  if (parts.length === 4 && parts[3] === "taskforce") return { kind: "taskforce-all", carrierId };
+  if (parts.length === 5 && parts[3] === "taskforce") {
+    const cliType = safeDecodeURIComponent(parts[4] ?? "");
+    return cliType ? { kind: "taskforce-backend", carrierId, cliType } : null;
+  }
+  return null;
+}
+function safeDecodeURIComponent(value) {
+  try {
+    return decodeURIComponent(value);
+  } catch {
+    return null;
+  }
+}
+function isExpectedCarrierMethod(mutation, method, expectedMethod) {
+  if (mutation.kind === "taskforce-backend") return method === "PUT" || method === "DELETE";
+  if (mutation.kind === "taskforce-all") return method === "DELETE";
+  return method === expectedMethod;
+}
+function isJsonRequest(req) {
+  const contentType = req.headers["content-type"];
+  return typeof contentType === "string" && contentType.toLowerCase().split(";")[0]?.trim() === "application/json";
+}
+function readCliType(value) {
+  return typeof value === "string" && isCliType(value) ? value : null;
+}
+function isCliType(value) {
+  return Object.prototype.hasOwnProperty.call(CLI_BACKENDS2, value);
+}
+function getCliTypes() {
+  return Object.keys(CLI_BACKENDS2);
+}
+function requireCarrierConfig(registry32, carrierId) {
+  const config22 = getRegisteredCarrierConfig2(registry32, carrierId);
+  if (!config22) throw new Error(`Carrier not found: ${carrierId}`);
+  return config22;
+}
 var CONTENT_SECURITY_POLICY = "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; connect-src 'self'; object-src 'none'; base-uri 'none'";
 var SECURITY_HEADERS = {
   "content-security-policy": CONTENT_SECURITY_POLICY,
@@ -78680,7 +79378,7 @@ function safeEqual(left, right) {
   return timingSafeEqual(leftBytes, rightBytes);
 }
 function workspaceHash(canonicalCwd) {
-  return crypto32.createHash("sha256").update(canonicalCwd).digest("hex").slice(0, 12);
+  return crypto5.createHash("sha256").update(canonicalCwd).digest("hex").slice(0, 12);
 }
 async function canonicalizeTheaterPath(cwd) {
   return canonicalizeTheaterPathSync(cwd);
@@ -79552,7 +80250,7 @@ function createCodexGateway(deps) {
       return true;
     }
     if (selected.kind === "no-workspace") {
-      if (isJsonRequest(request)) {
+      if (isJsonRequest2(request)) {
         sendJson2(response, 404, { error: "no_workspace_registered" });
         return true;
       }
@@ -79664,7 +80362,7 @@ function legacyWorkspacePath(url22) {
   }
   return null;
 }
-function isJsonRequest(request) {
+function isJsonRequest2(request) {
   const accept = Array.isArray(request.headers.accept) ? request.headers.accept.join(",") : request.headers.accept ?? "";
   const requestedWith = Array.isArray(request.headers["x-requested-with"]) ? request.headers["x-requested-with"].join(",") : request.headers["x-requested-with"] ?? "";
   return accept.includes("application/json") || requestedWith.toLowerCase() === "xmlhttprequest";
@@ -79739,6 +80437,155 @@ function readRawHeaderValues(rawHeaders, name) {
 function stripIpv6Brackets2(host) {
   return host.startsWith("[") && host.endsWith("]") ? host.slice(1, -1) : host;
 }
+var STATE_VERSION = 1;
+var STATE_LOCK_DIR_NAME = "state.lock";
+var STATE_LOCK_OWNER_FILE_NAME = "owner.json";
+var STATE_TEMP_PREFIX = ".state.";
+function createConsoleDurableStateStore(deps = {}) {
+  const paths = deps.paths ?? createConsoleDataPaths();
+  const createStore = deps.createStore ?? createDurableJsonStore2;
+  return createStore({
+    filePath: paths.stateFile,
+    lockDir: path93__default.join(paths.dir, STATE_LOCK_DIR_NAME),
+    lockOwnerFileName: STATE_LOCK_OWNER_FILE_NAME,
+    now: deps.now,
+    sanitize: sanitizeDurableConsoleState,
+    sensitivity: "sensitive",
+    tempCleanupPrefix: STATE_TEMP_PREFIX
+  });
+}
+function sanitizeDurableConsoleState(value) {
+  if (!isRecord4(value) || value.version !== STATE_VERSION) return emptyDurableConsoleState();
+  return {
+    version: STATE_VERSION,
+    theaters: readTheaterRegistrations(value.theaters),
+    operations: readDurableOperations(value.operations)
+  };
+}
+function emptyDurableConsoleState() {
+  return { version: STATE_VERSION, theaters: [], operations: [] };
+}
+function readProviderSessionCapture(fleetSessionId, deps = {}) {
+  if (!isSafeCaptureId(fleetSessionId)) return null;
+  const capturesDir = deps.capturesDir ?? createConsoleDataPaths().capturesDir;
+  const filePath = path93__default.join(capturesDir, `${fleetSessionId}.json`);
+  try {
+    const parsed = JSON.parse(fs5__default.readFileSync(filePath, "utf8"));
+    return sanitizeProviderSession(parsed);
+  } catch {
+    return null;
+  }
+}
+function mergeProviderSessionCaptures(state, deps = {}) {
+  let changed = false;
+  const operations = state.operations.map((operation) => {
+    if (operation.providerSession) return operation;
+    const providerSession = readProviderSessionCapture(operation.sessionId, deps);
+    if (!providerSession) return operation;
+    changed = true;
+    return { ...operation, providerSession };
+  });
+  return changed ? { ...state, operations } : state;
+}
+function unlinkProviderSessionCapture(fleetSessionId, deps = {}) {
+  if (!isSafeCaptureId(fleetSessionId)) return false;
+  const capturesDir = deps.capturesDir ?? createConsoleDataPaths().capturesDir;
+  try {
+    fs5__default.unlinkSync(path93__default.join(capturesDir, `${fleetSessionId}.json`));
+    return true;
+  } catch {
+    return false;
+  }
+}
+function cleanupProviderSessionCaptures(state, deps = {}) {
+  for (const operation of state.operations) {
+    if (operation.providerSession) unlinkProviderSessionCapture(operation.sessionId, deps);
+  }
+}
+function readTheaterRegistrations(value) {
+  if (!Array.isArray(value)) return [];
+  const registrations = [];
+  for (const item of value) {
+    const registration = sanitizeTheaterRegistration(item);
+    if (registration) registrations.push(registration);
+  }
+  return registrations;
+}
+function readDurableOperations(value) {
+  if (!Array.isArray(value)) return [];
+  const operations = [];
+  for (const item of value) {
+    const operation = sanitizeDurableOperation(item);
+    if (operation) operations.push(operation);
+  }
+  return operations;
+}
+function sanitizeTheaterRegistration(value) {
+  if (!isRecord4(value)) return null;
+  const id = readNonEmptyString(value.id);
+  const theaterPath = readNonEmptyString(value.path);
+  const realpath = readNonEmptyString(value.realpath);
+  const label = readNonEmptyString(value.label);
+  const registeredAt = readNonEmptyString(value.registeredAt);
+  const lastOpenedAt = readNonEmptyString(value.lastOpenedAt);
+  if (!id || !theaterPath || !realpath || !label || !registeredAt || !lastOpenedAt) return null;
+  return { id, path: theaterPath, realpath, label, registeredAt, lastOpenedAt };
+}
+function sanitizeDurableOperation(value) {
+  if (!isRecord4(value)) return null;
+  const sessionId = readNonEmptyString(value.sessionId);
+  const theaterId = readNonEmptyString(value.theaterId);
+  const cwd = readNonEmptyString(value.cwd);
+  const cwdLabel = readNonEmptyString(value.cwdLabel);
+  const sequence = readPositiveInteger(value.sequence);
+  const createdAt = readFiniteNumber(value.createdAt);
+  if (!sessionId || !theaterId || !cwd || !cwdLabel || sequence === null || createdAt === null) return null;
+  const providerSession = sanitizeProviderSession(value.providerSession);
+  return {
+    sessionId,
+    theaterId,
+    cwd,
+    cwdLabel,
+    sequence,
+    ...readOptionalString(value.label) ? { label: readOptionalString(value.label) } : {},
+    ...readOptionalString(value.cliId) ? { cliId: readOptionalString(value.cliId) } : {},
+    ...readOptionalString(value.cliLabel) ? { cliLabel: readOptionalString(value.cliLabel) } : {},
+    createdAt,
+    ...providerSession ? { providerSession } : {}
+  };
+}
+function sanitizeProviderSession(value) {
+  if (!isRecord4(value)) return null;
+  const provider = value.provider === "claude" || value.provider === "codex" ? value.provider : null;
+  const sessionId = readNonEmptyString(value.sessionId);
+  const capturedAt = readNonEmptyString(value.capturedAt);
+  if (!provider || !sessionId || !capturedAt) return null;
+  return {
+    provider,
+    sessionId,
+    ...readOptionalString(value.transcriptPath) ? { transcriptPath: readOptionalString(value.transcriptPath) } : {},
+    ...readOptionalString(value.source) ? { source: readOptionalString(value.source) } : {},
+    capturedAt
+  };
+}
+function isRecord4(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isSafeCaptureId(value) {
+  return value.length > 0 && path93__default.basename(value) === value && !value.includes(path93__default.sep) && !value.includes(path93__default.posix.sep);
+}
+function readNonEmptyString(value) {
+  return typeof value === "string" && value.length > 0 ? value : null;
+}
+function readOptionalString(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function readPositiveInteger(value) {
+  return typeof value === "number" && Number.isInteger(value) && value > 0 ? value : null;
+}
+function readFiniteNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : null;
+}
 function writeObserverEvents(req, res, workspace, store22) {
   res.writeHead(200, withSecurityHeaders2({
     "Content-Type": "text/event-stream",
@@ -79947,15 +80794,77 @@ function createConsoleObservabilityStore(deps = {}) {
     terminalSessionsById.set(state.sessionId, state);
     return toTerminalSessionInfo(state);
   }
+  function injectDormantOperation(operation) {
+    const currentSequence = terminalSequenceByTheater.get(operation.theaterId) ?? 0;
+    terminalSequenceByTheater.set(operation.theaterId, Math.max(currentSequence, operation.sequence));
+    const state = {
+      sessionId: operation.sessionId,
+      cwd: operation.cwd,
+      canonicalCwd: canonicalizeTheaterPathSync(operation.cwd),
+      cwdLabel: operation.cwdLabel,
+      sequence: operation.sequence,
+      label: operation.label,
+      cliId: operation.cliId,
+      cliLabel: operation.cliLabel,
+      createdAt: operation.createdAt,
+      theaterId: operation.theaterId,
+      terminalSessionId: operation.sessionId,
+      status: "dormant",
+      providerSession: operation.providerSession
+    };
+    terminalSessionsById.set(state.sessionId, state);
+    return toTerminalSessionInfo(state);
+  }
   function listTerminalSessions() {
     return Array.from(terminalSessionsById.values()).map(toTerminalSessionInfo).sort((a, b) => b.createdAt - a.createdAt);
   }
+  function listDurableOperations() {
+    return Array.from(terminalSessionsById.values()).map((session) => ({
+      sessionId: session.sessionId,
+      theaterId: session.theaterId,
+      cwd: session.cwd,
+      cwdLabel: session.cwdLabel,
+      sequence: session.sequence,
+      ...session.label ? { label: session.label } : {},
+      ...session.cliId ? { cliId: session.cliId } : {},
+      ...session.cliLabel ? { cliLabel: session.cliLabel } : {},
+      createdAt: session.createdAt,
+      ...session.providerSession ? { providerSession: session.providerSession } : {}
+    }));
+  }
+  function getDurableOperation(sessionId) {
+    return listDurableOperations().find((operation) => operation.sessionId === sessionId) ?? null;
+  }
+  function updateTerminalSessionProviderSession(sessionId, providerSession) {
+    const session = terminalSessionsById.get(sessionId);
+    if (!session) return null;
+    session.providerSession = providerSession;
+    return toTerminalSessionInfo(session);
+  }
   function updateTerminalSessionStatus(sessionId, status) {
     const session = terminalSessionsById.get(sessionId);
     if (!session) return null;
     session.status = status;
     return toTerminalSessionInfo(session);
   }
+  function setTerminalSessionTurnState(sessionId, turnState) {
+    const session = terminalSessionsById.get(sessionId);
+    if (!session) return null;
+    session.turnState = turnState;
+    return toTerminalSessionInfo(session);
+  }
+  function transitionTerminalSessionToDormant(sessionId, providerSession) {
+    const session = terminalSessionsById.get(sessionId);
+    if (!session) return null;
+    const workspace = workspacesByCliRunId.get(sessionId);
+    if (workspace?.terminalSessionId === sessionId) {
+      removeWorkspaceIndexes(workspace);
+      workspacesByCliRunId.delete(sessionId);
+    }
+    session.status = "dormant";
+    session.providerSession = providerSession;
+    return toTerminalSessionInfo(session);
+  }
   function renameTerminalSession(sessionId, rawLabel) {
     const session = terminalSessionsById.get(sessionId);
     if (!session) return null;
@@ -79995,18 +80904,24 @@ function createConsoleObservabilityStore(deps = {}) {
     clear,
     getLaunchCwd,
     getTruncation,
+    getDurableOperation,
     getWorkspace,
     listEvents,
     listJobs,
+    listDurableOperations,
     listTerminalSessions,
     listWorkspaces,
     appendTerminalRuntimeEvent,
     createPendingTerminalSession,
+    injectDormantOperation,
     notifySessionUpdated,
     renameTerminalSession,
     subscribe,
     subscribeAll,
+    updateTerminalSessionProviderSession,
     updateTerminalSessionStatus,
+    setTerminalSessionTurnState,
+    transitionTerminalSessionToDormant,
     removeTerminalSession,
     registerTerminalRuntimeSession,
     workspaceCount: () => listWorkspaces().length
@@ -80074,11 +80989,13 @@ function toTerminalSessionInfo(state) {
     cliId: state.cliId,
     cliLabel: state.cliLabel,
     status: state.status,
+    turnState: state.turnState ?? "none",
     createdAt: state.createdAt,
     theaterId: state.theaterId,
     registrationId: state.registrationId,
     cliRunId: state.cliRunId,
-    tenantId: state.cliRunId
+    tenantId: state.cliRunId,
+    resumeAvailable: state.providerSession !== void 0
   };
 }
 function pruneTenantJobs(state) {
@@ -80289,10 +81206,130 @@ function resolveConsolePath(pathname) {
   if (!path93__default.extname(withoutPrefix)) return "index.html";
   return withoutPrefix;
 }
+var TerminalFolderListError = class extends Error {
+  code;
+  constructor(code) {
+    super(code);
+    this.name = "TerminalFolderListError";
+    this.code = code;
+  }
+};
+var DIRECTORY_ENTRY_CAP = 500;
+var WINDOWS_DRIVE_LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".split("");
+async function listTerminalFolders(requestedPath, deps = {}) {
+  const platform2 = deps.platform ?? process.platform;
+  const stat5 = deps.stat ?? fs5__default.promises.stat;
+  const opendir = deps.opendir ?? fs5__default.promises.opendir;
+  const targetPath = normalizeListPath(requestedPath, platform2, deps);
+  const roots = await listRoots(platform2, stat5);
+  const targetStat = await statDirectory(targetPath, stat5);
+  if (!targetStat.isDirectory()) throw new TerminalFolderListError("invalid_path");
+  const entries = [];
+  const truncated = await collectDirectoryEntries(targetPath, opendir, stat5, entries);
+  entries.sort((a, b) => a.name.localeCompare(b.name));
+  return {
+    path: targetPath,
+    parentPath: parentPath(targetPath, platform2),
+    roots,
+    entries,
+    ...truncated ? { truncated: true } : {}
+  };
+}
+function normalizeFolderBrowserPath(value, platform2 = process.platform) {
+  if (typeof value !== "string" || value.length === 0 || value.includes("\0")) throw new TerminalFolderListError("invalid_path");
+  if (isWindowsAmbiguousPath(value, platform2) || !path93__default.isAbsolute(value)) throw new TerminalFolderListError("invalid_path");
+  return path93__default.resolve(value);
+}
+function normalizeListPath(requestedPath, platform2, deps) {
+  if (requestedPath === null || requestedPath === void 0) {
+    const home = deps.homedir?.() ?? os22__default.homedir();
+    const start = home || deps.cwd?.() || process.cwd();
+    return path93__default.resolve(start);
+  }
+  return normalizeFolderBrowserPath(requestedPath, platform2);
+}
+async function listRoots(platform2, stat5) {
+  if (platform2 !== "win32") return ["/"];
+  const roots = [];
+  await Promise.all(WINDOWS_DRIVE_LETTERS.map(async (letter) => {
+    const root = `${letter}:\\`;
+    try {
+      if ((await stat5(root)).isDirectory()) roots.push(root);
+    } catch {
+    }
+  }));
+  return roots.sort();
+}
+async function statDirectory(targetPath, stat5) {
+  try {
+    return await stat5(targetPath);
+  } catch (error512) {
+    throw mapFsError(error512);
+  }
+}
+async function collectDirectoryEntries(targetPath, opendir, stat5, entries) {
+  const directory = await openDirectory(targetPath, opendir);
+  try {
+    let dirent = await directory.read();
+    while (dirent !== null) {
+      const entry = await toTerminalFolderEntry(targetPath, dirent, stat5);
+      if (entry !== null) {
+        if (entries.length >= DIRECTORY_ENTRY_CAP) return true;
+        entries.push(entry);
+      }
+      dirent = await directory.read();
+    }
+    return false;
+  } catch (error512) {
+    throw mapFsError(error512);
+  } finally {
+    await directory.close();
+  }
+}
+async function openDirectory(targetPath, opendir) {
+  try {
+    return await opendir(targetPath);
+  } catch (error512) {
+    throw mapFsError(error512);
+  }
+}
+async function toTerminalFolderEntry(targetPath, dirent, stat5) {
+  if (!dirent.isDirectory() && !dirent.isSymbolicLink()) return null;
+  const entryPath = path93__default.join(targetPath, dirent.name);
+  if (dirent.isDirectory()) return { name: dirent.name, path: entryPath, kind: "dir", accessible: true };
+  const accessible = await statSymlinkDirectory(entryPath, stat5);
+  if (accessible === null) return null;
+  return { name: dirent.name, path: entryPath, kind: "dir", accessible };
+}
+async function statSymlinkDirectory(entryPath, stat5) {
+  try {
+    return (await stat5(entryPath)).isDirectory() ? true : null;
+  } catch {
+    return false;
+  }
+}
+function mapFsError(error512) {
+  const code = error512.code;
+  if (code === "EACCES" || code === "EPERM") return new TerminalFolderListError("forbidden");
+  if (code === "ENOENT" || code === "ENOTDIR") return new TerminalFolderListError("not_found");
+  return new TerminalFolderListError("invalid_path");
+}
+function parentPath(targetPath, platform2) {
+  const parsed = path93__default.parse(targetPath);
+  const resolved = path93__default.resolve(targetPath);
+  if (resolved === path93__default.resolve(parsed.root)) return null;
+  const parent = path93__default.dirname(resolved);
+  if (platform2 === "win32" && parent === resolved) return null;
+  return parent;
+}
+function isWindowsAmbiguousPath(value, platform2) {
+  if (platform2 !== "win32") return false;
+  return /^[a-zA-Z]:(?![\\/])/.test(value) || /^[\\/](?![\\/])/.test(value);
+}
 var GRANT_ID_BYTES = 24;
 var DEFAULT_GRANT_TTL_MS = 6e4;
 function createFolderGrantStore(deps = {}) {
-  const randomId = deps.randomId ?? (() => crypto32.randomBytes(GRANT_ID_BYTES).toString("base64url"));
+  const randomId = deps.randomId ?? (() => crypto5.randomBytes(GRANT_ID_BYTES).toString("base64url"));
   const statSync52 = deps.statSync ?? fs5__default.statSync;
   const ttlMs = deps.ttlMs ?? DEFAULT_GRANT_TTL_MS;
   const now = deps.now ?? Date.now;
@@ -80320,165 +81357,15 @@ function createFolderGrantStore(deps = {}) {
   return { issue: issue32, consume };
 }
 function validateAbsoluteDirectory(cwd, statSync52 = fs5__default.statSync) {
-  if (!path93__default.isAbsolute(cwd)) throw new Error("invalid_folder");
+  if (typeof cwd !== "string" || cwd.length === 0 || cwd.includes("\0")) throw new Error("invalid_folder");
+  if (isWindowsAmbiguousPath2(cwd) || !path93__default.isAbsolute(cwd)) throw new Error("invalid_folder");
   const normalized = path93__default.resolve(cwd);
   if (!statSync52(normalized).isDirectory()) throw new Error("invalid_folder");
   return normalized;
 }
-var execFileAsync = promisify(execFile2);
-var DIALOG_TIMEOUT_MS = 3e4;
-var POWERSHELL_FOLDER_PICKER_CSHARP = `
-using System;
-using System.Runtime.InteropServices;
-namespace FleetPicker {
-  [ComImport, Guid("43826d1e-e718-42ee-bc55-a1e261c37bfe"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-  public interface IShellItem {
-    void BindToHandler();
-    void GetParent();
-    [PreserveSig] int GetDisplayName(int sigdn, out IntPtr ppszName);
-    void GetAttributes();
-    void Compare();
-  }
-  [ComImport, Guid("d57c7288-d4ad-4768-be02-9d969532d960"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-  public interface IFileOpenDialog {
-    [PreserveSig] int Show(IntPtr parent);
-    void SetFileTypes(); void SetFileTypeIndex(); void GetFileTypeIndex();
-    void Advise(); void Unadvise();
-    [PreserveSig] int SetOptions(uint fos);
-    [PreserveSig] int GetOptions(out uint pfos);
-    void SetDefaultFolder();
-    void SetFolder(IShellItem psi);
-    void GetFolder(); void GetCurrentSelection();
-    void SetFileName(); void GetFileName(); void SetTitle(); void SetOkButtonLabel(); void SetFileNameLabel();
-    [PreserveSig] int GetResult(out IShellItem ppsi);
-    void AddPlace(IShellItem psi, int fdap);
-    void SetDefaultExtension(); void Close(); void SetClientGuid(); void ClearClientData(); void SetFilter();
-    void GetResults(); void GetSelectedItems();
-  }
-  [ComImport, Guid("DC1C5A9C-E88A-4DDE-A5A1-60F82A20AEF7")] public class FileOpenDialog { }
-  public static class Picker {
-    [DllImport("shell32.dll", CharSet=CharSet.Unicode, PreserveSig=false)]
-    static extern void SHCreateItemFromParsingName(string pszPath, IntPtr pbc, ref Guid riid, [MarshalAs(UnmanagedType.Interface)] out IShellItem ppv);
-    static IShellItem ItemFromPath(string path) {
-      Guid iid = new Guid("43826d1e-e718-42ee-bc55-a1e261c37bfe");
-      IShellItem it; SHCreateItemFromParsingName(path, IntPtr.Zero, ref iid, out it); return it;
-    }
-    public static string Pick(string initialPath) {
-      var dlg = (IFileOpenDialog)(new FileOpenDialog());
-      uint opts; dlg.GetOptions(out opts);
-      dlg.SetOptions(opts | 0x20); // FOS_PICKFOLDERS
-      if (!string.IsNullOrEmpty(initialPath)) {
-        // \uC2DC\uC791 \uD3F4\uB354\uB97C WSL \uC704\uCE58\uB85C \uC9C0\uC815\uD558\uACE0 \uC88C\uCE21\uC5D0 \uACE0\uC815(FDAP_TOP). \uC2E4\uD328\uD574\uB3C4 \uAE30\uBCF8 \uC704\uCE58\uB85C \uC9C4\uD589\uD55C\uB2E4.
-        try { IShellItem s = ItemFromPath(initialPath); dlg.AddPlace(s, 1); dlg.SetFolder(s); } catch { }
-      }
-      if (dlg.Show(IntPtr.Zero) != 0) return null; // \uCDE8\uC18C/\uC2E4\uD328 \uC2DC null
-      IShellItem item; dlg.GetResult(out item);
-      IntPtr ptr; if (item.GetDisplayName(unchecked((int)0x80058000), out ptr) != 0) return null; // SIGDN_FILESYSPATH; \uBE44 \uD30C\uC77C\uC2DC\uC2A4\uD15C \uC120\uD0DD \uAC00\uB4DC
-      string path = Marshal.PtrToStringAuto(ptr);
-      Marshal.FreeCoTaskMem(ptr);
-      return path;
-    }
-  }
-}`;
-function createNativeFolderPicker(deps = {}) {
-  const platform2 = deps.platform ?? process.platform;
-  const runCommand = deps.runCommand ?? runNativeCommand;
-  const statSync52 = deps.statSync ?? fs5__default.statSync;
-  const readProcVersion = deps.readProcVersion ?? defaultReadProcVersion;
-  const env = deps.env ?? process.env;
-  return async () => {
-    const isWsl = platform2 === "linux" && detectWsl(readProcVersion, env);
-    const wslStartPath = isWsl ? wslStartFolderUnc(env) : "";
-    const commands = buildPickerCommands(platform2, isWsl, wslStartPath);
-    if (commands.length === 0) return { kind: "error", error: "unsupported_platform" };
-    for (const command22 of commands) {
-      const result = await runPickerCommand(runCommand, command22);
-      if ("kind" in result && result.kind === "unavailable") continue;
-      if ("kind" in result && result.kind === "cancelled") return { kind: "cancelled" };
-      if ("kind" in result && result.kind === "timeout") return { kind: "error", error: "dialog_timeout" };
-      if ("kind" in result) continue;
-      let resolvedPath = result.stdout.trim();
-      if (command22.postProcess === "wslpath") {
-        try {
-          const wslResult = await runCommand("wslpath", ["-u", resolvedPath]);
-          resolvedPath = wslResult.stdout.trim();
-        } catch {
-          return { kind: "error", error: "invalid_folder" };
-        }
-      }
-      try {
-        return { kind: "selected", cwd: validateAbsoluteDirectory(resolvedPath, statSync52) };
-      } catch {
-        return { kind: "error", error: "invalid_folder" };
-      }
-    }
-    return { kind: "error", error: "dialog_unavailable" };
-  };
-}
-function defaultReadProcVersion() {
-  try {
-    return fs5__default.readFileSync("/proc/version", "utf8");
-  } catch {
-    return "";
-  }
-}
-function detectWsl(readProcVersion, env) {
-  if (env.WSL_INTEROP !== void 0 || env.WSL_DISTRO_NAME !== void 0) return true;
-  return /microsoft|wsl/i.test(readProcVersion());
-}
-function buildPickerCommands(platform2, isWsl = false, wslStartPath = "") {
-  if (platform2 === "darwin") {
-    return [{ bin: "osascript", args: ["-e", 'POSIX path of (choose folder with prompt "Choose a Fleet workspace")'] }];
-  }
-  if (platform2 === "linux") {
-    const commands = [];
-    if (isWsl) {
-      commands.push({ bin: "powershell.exe", args: buildPowerShellPickerArgs(wslStartPath), postProcess: "wslpath" });
-    }
-    commands.push(
-      { bin: "zenity", args: ["--file-selection", "--directory", "--title=Choose a Fleet workspace"] },
-      { bin: "kdialog", args: ["--getexistingdirectory", ".", "Choose a Fleet workspace"] }
-    );
-    return commands;
-  }
-  if (platform2 === "win32") {
-    return [{ bin: "powershell.exe", args: buildPowerShellPickerArgs("") }];
-  }
-  return [];
-}
-function buildPowerShellPickerArgs(initialWindowsPath) {
-  const escaped = initialWindowsPath.replace(/'/g, "''");
-  const script = [
-    "[Console]::OutputEncoding=[Text.Encoding]::UTF8",
-    `Add-Type -TypeDefinition '${POWERSHELL_FOLDER_PICKER_CSHARP}'`,
-    `$selection = [FleetPicker.Picker]::Pick('${escaped}')`,
-    "if ([string]::IsNullOrEmpty($selection)) { exit 1 }",
-    "[Console]::Out.Write($selection)"
-  ].join("\n");
-  return ["-NoProfile", "-Sta", "-Command", script];
-}
-function wslStartFolderUnc(env) {
-  const distro = env.WSL_DISTRO_NAME;
-  if (!distro) return "";
-  const home = env.HOME;
-  if (home && home.startsWith("/") && !home.startsWith("/mnt/")) {
-    return `\\\\wsl.localhost\\${distro}${home.replace(/\//g, "\\")}`;
-  }
-  return `\\\\wsl.localhost\\${distro}`;
-}
-async function runPickerCommand(runCommand, command22) {
-  try {
-    return await runCommand(command22.bin, command22.args);
-  } catch (error512) {
-    const err = error512;
-    if (err.code === "ENOENT") return { kind: "unavailable" };
-    if (err.code === "ETIMEDOUT") return { kind: "timeout" };
-    return { kind: "cancelled" };
-  }
-}
-async function runNativeCommand(bin, args) {
-  const result = await execFileAsync(bin, [...args], { timeout: DIALOG_TIMEOUT_MS, windowsHide: true });
-  return { stdout: result.stdout, stderr: result.stderr };
+function isWindowsAmbiguousPath2(value) {
+  if (process.platform !== "win32") return false;
+  return /^[a-zA-Z]:(?![\\/])/.test(value) || /^[\\/](?![\\/])/.test(value);
 }
 var JAVASCRIPT_ENTRY_EXTENSIONS2 = /* @__PURE__ */ new Set([".cjs", ".js", ".mjs"]);
 var TYPESCRIPT_ENTRY_EXTENSIONS2 = /* @__PURE__ */ new Set([".cts", ".mts", ".ts", ".tsx"]);
@@ -80487,29 +81374,43 @@ function buildConsoleHookCommand(entry) {
   if (entry === void 0) {
     throw new Error("Fleet Console session hook command requires the current console entry path");
   }
+  return buildConsoleCliHookExec(entry, ["hook", "subagents-context"]);
+}
+function buildConsoleTurnHookCommand(entry, phase) {
+  return buildConsoleCliHookExec(entry, ["hook", phase === "start" ? "turn-start" : "turn-end"]);
+}
+function buildConsoleCaptureHookCommand(entry, cliId) {
   const extension = path93__default.extname(entry.entryPath);
   if (JAVASCRIPT_ENTRY_EXTENSIONS2.has(extension)) {
-    return {
-      command: entry.execPath,
-      args: [entry.entryPath, "hook", "subagents-context"]
-    };
+    return createSessionCaptureHookExec({
+      entryPath: entry.entryPath,
+      execPath: entry.execPath,
+      provider: toCaptureProvider(cliId)
+    });
   }
   if (TYPESCRIPT_ENTRY_EXTENSIONS2.has(extension)) {
     if (!entry.tsxLoaderPath) {
-      throw new Error("Fleet Console session hook command for TypeScript entries requires a tsx loader path");
+      throw new Error("Fleet Console capture session hook requires a tsx loader path");
     }
-    return {
-      command: entry.execPath,
-      args: ["--import", pathToFileURL2(entry.tsxLoaderPath).href, entry.entryPath, "hook", "subagents-context"]
-    };
+    return createSessionCaptureHookExec({
+      entryPath: entry.entryPath,
+      execPath: entry.execPath,
+      provider: toCaptureProvider(cliId),
+      tsxLoader: entry.tsxLoaderPath
+    });
   }
   throw new Error(`Unsupported Fleet Console session hook entry extension: ${extension}`);
 }
+function toCaptureProvider(cliId) {
+  return cliId === "codex" ? "codex" : "claude";
+}
 function runCodexCommand2(command22) {
   const result = spawnSync2(command22.bin, command22.args, {
     cwd: command22.cwd,
     encoding: "utf8",
-    env: command22.env
+    env: command22.env,
+    // 콘솔 없는 fleet-console 백엔드에서 codex 등록 명령 실행 시 콘솔 창이 깜빡이는 것을 방지한다.
+    windowsHide: true
   });
   return {
     status: result.status,
@@ -80522,18 +81423,37 @@ function withConsoleMarketplaceLock(target, fn) {
   mkdirSync8(path93__default.dirname(lockDir), { recursive: true });
   return withDirectoryLock2({ lockDir }, fn);
 }
+function buildConsoleCliHookExec(entry, trailingArgs) {
+  const extension = path93__default.extname(entry.entryPath);
+  if (JAVASCRIPT_ENTRY_EXTENSIONS2.has(extension)) {
+    return {
+      command: entry.execPath,
+      args: [entry.entryPath, ...trailingArgs]
+    };
+  }
+  if (TYPESCRIPT_ENTRY_EXTENSIONS2.has(extension)) {
+    if (!entry.tsxLoaderPath) {
+      throw new Error("Fleet Console session hook command for TypeScript entries requires a tsx loader path");
+    }
+    return {
+      command: entry.execPath,
+      args: ["--import", pathToFileURL2(entry.tsxLoaderPath).href, entry.entryPath, ...trailingArgs]
+    };
+  }
+  throw new Error(`Unsupported Fleet Console session hook entry extension: ${extension}`);
+}
 var DEFAULT_TERMINAL_CWD_FALLBACK = os22__default.homedir;
 var TERMINAL_TERM = "xterm-256color";
 var CONSOLE_ENTRY_PATH = fileURLToPath(import.meta.url);
 var HOOK_ENTRY_EXTENSIONS = /* @__PURE__ */ new Set([".cjs", ".cts", ".js", ".mjs", ".mts", ".ts", ".tsx"]);
 var require2 = createRequire(import.meta.url);
 function createDefaultTerminalLaunchResolver(deps = {}) {
-  const baseCwd = deps.cwd ?? process4.cwd();
-  const env = deps.env ?? process4.env;
-  const execPath = deps.execPath ?? process4.execPath;
+  const baseCwd = deps.cwd ?? process6.cwd();
+  const env = deps.env ?? process6.env;
+  const execPath = deps.execPath ?? process6.execPath;
   const homedir32 = deps.homedir ?? DEFAULT_TERMINAL_CWD_FALLBACK;
-  const platform2 = deps.platform ?? process4.platform;
-  const entryPath = resolveHookEntryPath(deps.entryPath ?? process4.argv[1]);
+  const platform2 = deps.platform ?? process6.platform;
+  const entryPath = resolveHookEntryPath(deps.entryPath ?? process6.argv[1]);
   const tsxLoaderPath = deps.tsxLoaderPath ?? resolveOptionalPackage("tsx");
   const dataDir = deps.dataDir ?? getFleetDataDir2();
   const infraServices = deps.infraServices ?? createInfraServices2();
@@ -80573,6 +81493,7 @@ function createDefaultTerminalLaunchResolver(deps = {}) {
       onRuntimeSessionStart: deps.onRuntimeSessionStart,
       resolveProfile,
       cliId: context?.cliId,
+      resumeSessionId: context?.resumeSessionId,
       sessionId
     });
   };
@@ -80593,7 +81514,7 @@ function hasHookEntryExtension(entryPath) {
 }
 function startTerminalShell(launch, size) {
   const { spawn: spawnPty } = require2("node-pty");
-  const useConptyDll = resolveUseConptyDll2(process4.platform, process4.env);
+  const useConptyDll = resolveUseConptyDll2(process6.platform, process6.env);
   return spawnPty(launch.bin, [...launch.args], {
     cols: size.cols,
     rows: size.rows,
@@ -80618,7 +81539,8 @@ async function createAgentCliLaunchSpec(options2) {
     const profile = await options2.resolveProfile(options2.env, options2.cwd, {
       authEnvResolver: options2.authEnvResolver,
       authService: options2.infraServices.authService,
-      cliId: options2.cliId
+      cliId: options2.cliId,
+      resumeSessionId: options2.resumeSessionId
     });
     const injectedProfile = await options2.injectProfile(profile, {
       buildSystemPrompt: (injectTone) => createSystemPromptBuilder2({ carrierRuntime: agentRuntime.carrierRuntime }).build(injectTone),
@@ -80627,9 +81549,13 @@ async function createAgentCliLaunchSpec(options2) {
       dataDir: options2.dataDir,
       dedicatedMcpSession: agentRuntime.dedicatedMcpSession,
       enableMetaphor: false,
+      captureSessionHookExec: buildConsoleCaptureHookCommand(options2.hookEntry, profile.id),
+      turnStartHookExec: buildConsoleTurnHookCommand(options2.hookEntry, "start"),
+      turnEndHookExec: buildConsoleTurnHookCommand(options2.hookEntry, "end"),
       hookExec: buildConsoleHookCommand(options2.hookEntry),
       onCleanup: (cleanup) => cleanupStack.push(cleanup),
-      replaceSystemPrompt: true,
+      replaceSystemPrompt: false,
+      resumeSessionId: options2.resumeSessionId,
       withMarketplaceLock: withConsoleMarketplaceLock,
       mcpSessionLabel: options2.sessionId
     });
@@ -80663,6 +81589,7 @@ function toLaunchSpec(profile, cleanup) {
     cwd: profile.cwd,
     env: { ...profile.env },
     messagePolicy: profile.messagePolicy,
+    renameCommand: profile.renameCommand,
     terminalName: profile.terminalName
   };
 }
@@ -80723,6 +81650,8 @@ var DEFAULT_COLS = 80;
 var DEFAULT_ROWS2 = 24;
 var DEFAULT_SCROLLBACK_LIMIT = 512;
 var WS_OPEN_STATE = 1;
+var THEATER_SHELL_SESSION_PREFIX = "shell:";
+var THEATER_SHELL_DETACH_GRACE_MS = 4e3;
 function createTerminalSessionManager(deps) {
   const startShell2 = deps.startShell ?? startTerminalShell;
   const scrollbackLimit = deps.scrollbackLimit ?? DEFAULT_SCROLLBACK_LIMIT;
@@ -80733,6 +81662,7 @@ function createTerminalSessionManager(deps) {
   }
   async function attach(socket, context) {
     const session = await getOrCreateSession(context);
+    clearGraceTimer(session);
     if (session.activeSocket && session.activeSocket !== socket) {
       session.activeSocket.close(4e3, "terminal_replaced");
     }
@@ -80754,6 +81684,9 @@ function createTerminalSessionManager(deps) {
   function getSessionMessagePolicy(sessionId) {
     return sessions.get(sessionId)?.messagePolicy;
   }
+  function getSessionRenameCommand(sessionId) {
+    return sessions.get(sessionId)?.renameCommand;
+  }
   function writeToSession(sessionId, data) {
     const session = sessions.get(sessionId);
     if (!session || typeof session.pty.write !== "function") return false;
@@ -80791,7 +81724,7 @@ function createTerminalSessionManager(deps) {
     }
   }
   async function launchSession(context) {
-    const launch = await deps.launch(context.cwd, { sessionId: context.sessionId, kind: context.kind, cliId: context.cliId });
+    const launch = await deps.launch(context.cwd, { sessionId: context.sessionId, kind: context.kind, cliId: context.cliId, resumeSessionId: context.resumeSessionId });
     let pty;
     try {
       pty = startShell2(launch, { cols: DEFAULT_COLS, rows: DEFAULT_ROWS2 });
@@ -80806,9 +81739,11 @@ function createTerminalSessionManager(deps) {
       scrollback: [],
       cleanup: launch.cleanup,
       messagePolicy: launch.messagePolicy,
+      renameCommand: launch.renameCommand,
       activeSocket: null,
       cols: DEFAULT_COLS,
-      rows: DEFAULT_ROWS2
+      rows: DEFAULT_ROWS2,
+      graceTimer: null
     };
     const dataDisposable = pty.onData((data) => handlePtyData(session, data));
     const exitDisposable = pty.onExit(() => removeSession(session));
@@ -80846,6 +81781,13 @@ function createTerminalSessionManager(deps) {
   function detachSocket(session, socket) {
     if (session.activeSocket !== socket) return;
     session.activeSocket = null;
+    if (isTheaterShell(session.id)) {
+      clearGraceTimer(session);
+      session.graceTimer = setTimeout(() => {
+        session.graceTimer = null;
+        if (session.activeSocket === null) removeSession(session);
+      }, THEATER_SHELL_DETACH_GRACE_MS);
+    }
   }
   function replayScrollback(session, socket) {
     for (const chunk of session.scrollback) {
@@ -80861,6 +81803,7 @@ function createTerminalSessionManager(deps) {
   }
   async function killSession(session, options2 = {}) {
     const killPty = options2.killPty ?? true;
+    clearGraceTimer(session);
     session.activeSocket?.close(4001, "terminal_closed");
     session.activeSocket = null;
     for (const disposable of session.disposables) disposable.dispose();
@@ -80870,7 +81813,7 @@ function createTerminalSessionManager(deps) {
       await runLaunchCleanup(session.cleanup);
     }
   }
-  return { canAttach, createSession, attach, getSessionMessagePolicy, terminate, stop, writeToSession };
+  return { canAttach, createSession, attach, getSessionMessagePolicy, getSessionRenameCommand, terminate, stop, writeToSession };
 }
 async function runLaunchCleanup(cleanup) {
   try {
@@ -80884,6 +81827,14 @@ function killPtyBestEffort2(pty) {
   } catch {
   }
 }
+function isTheaterShell(sessionId) {
+  return sessionId.startsWith(THEATER_SHELL_SESSION_PREFIX);
+}
+function clearGraceTimer(session) {
+  if (session.graceTimer === null) return;
+  clearTimeout(session.graceTimer);
+  session.graceTimer = null;
+}
 function toBuffer(data) {
   if (Buffer.isBuffer(data)) return data;
   if (Array.isArray(data)) return Buffer.concat(data);
@@ -80900,7 +81851,7 @@ var DEFAULT_TICKET_TTL_MS = 1e4;
 function createTerminalTicketRegistry(deps = {}) {
   const ttlMs = deps.ttlMs ?? DEFAULT_TICKET_TTL_MS;
   const now = deps.now ?? Date.now;
-  const randomTicket = deps.randomTicket ?? (() => crypto32.randomBytes(32).toString("base64url"));
+  const randomTicket = deps.randomTicket ?? (() => crypto5.randomBytes(32).toString("base64url"));
   const tickets = /* @__PURE__ */ new Map();
   function issue32(context) {
     prune();
@@ -80927,7 +81878,7 @@ function createTerminalTicketRegistry(deps = {}) {
   }
   return { ttlMs, issue: issue32, consume, prune };
 }
-var execFileAsync2 = promisify(execFile2);
+var execFileAsync = promisify(execFile2);
 var GIT_STATUS_TIMEOUT_MS = 4e3;
 var GIT_STATUS_MAX_BUFFER = 1024 * 1024;
 var GIT_HASH_TIMEOUT_MS = 4e3;
@@ -80936,11 +81887,13 @@ function createWorkspaceChangeScanner() {
   return {
     async snapshot(cwd) {
       try {
-        const { stdout } = await execFileAsync2("git", ["status", "--porcelain=v1", "-z", "--untracked-files=all"], {
+        const { stdout } = await execFileAsync("git", ["status", "--porcelain=v1", "-z", "--untracked-files=all"], {
           cwd,
           encoding: "utf8",
           maxBuffer: GIT_STATUS_MAX_BUFFER,
-          timeout: GIT_STATUS_TIMEOUT_MS
+          timeout: GIT_STATUS_TIMEOUT_MS,
+          // 콘솔 없는 fleet-console 백엔드에서 git.exe 실행 시 콘솔 창이 깜빡이는 것을 방지한다.
+          windowsHide: true
         });
         const entries = parseGitStatusPorcelainZ(stdout);
         if (!entries) return null;
@@ -81000,7 +81953,9 @@ function execGitHashObject(cwd, paths) {
         cwd,
         encoding: "utf8",
         maxBuffer: GIT_HASH_MAX_BUFFER,
-        timeout: GIT_HASH_TIMEOUT_MS
+        timeout: GIT_HASH_TIMEOUT_MS,
+        // 콘솔 없는 fleet-console 백엔드에서 git.exe 실행 시 콘솔 창이 깜빡이는 것을 방지한다.
+        windowsHide: true
       },
       (error512, stdout) => {
         if (error512) {
@@ -81088,6 +82043,26 @@ var TheaterRegistry = class {
     this.#mruId = id;
     return item;
   }
+  load(items) {
+    this.restore(items);
+  }
+  restore(items) {
+    const restored = /* @__PURE__ */ new Map();
+    let mruId = null;
+    for (const item of items) {
+      const existing = restored.get(item.id);
+      if (existing && existing.realpath !== item.realpath) {
+        throw new Error("theater_id_collision");
+      }
+      restored.set(item.id, item);
+      if (!mruId || item.lastOpenedAt.localeCompare(restored.get(mruId)?.lastOpenedAt ?? "") > 0) {
+        mruId = item.id;
+      }
+    }
+    this.#items.clear();
+    for (const [id, item] of restored) this.#items.set(id, item);
+    this.#mruId = mruId;
+  }
   get(id) {
     return this.#items.get(id) ?? null;
   }
@@ -81097,6 +82072,11 @@ var TheaterRegistry = class {
   list() {
     return [...this.#items.values()].sort((left, right) => right.lastOpenedAt.localeCompare(left.lastOpenedAt));
   }
+  remove(id) {
+    const removed = this.#items.delete(id);
+    if (this.#mruId === id) this.#mruId = this.list()[0]?.id ?? null;
+    return removed;
+  }
 };
 var FLEET_CONSOLE_PACKAGE_NAME = "@dotobokuri/fleet-console";
 var UPDATE_CHECK_TTL_MS = 60 * 60 * 1e3;
@@ -81152,6 +82132,7 @@ function createConsoleUpdateCheckService(deps = {}) {
 var DEFAULT_HOST22 = "127.0.0.1";
 var DEFAULT_PORT22 = 0;
 var SHELL_TERMINAL_SESSION_ID = "shell";
+var THEATER_SHELL_SESSION_PREFIX2 = "shell:";
 var SERVER_TIMEOUT_MS = 30 * 60 * 1e3;
 var MAX_BODY_BYTES = 1024 * 1024;
 function createConsoleServer(deps = {}) {
@@ -81169,6 +82150,9 @@ function createConsoleServer(deps = {}) {
   const folderGrants = createFolderGrantStore();
   const infraServices = createInfraServices2();
   const dataDir = deps.dataDir ?? getFleetDataDir2();
+  initStore2(dataDir);
+  const durablePaths = createConsoleDataPaths({ fleetDataDir: dataDir });
+  const durableStateStore = createConsoleDurableStateStore({ paths: durablePaths });
   const authEnvResolver = (cli) => resolveAuthEnv2(cli, { authService: infraServices.authService });
   const ownsAgentRuntime = deps.agentRuntime === void 0;
   const agentRuntime = deps.agentRuntime ?? createFleetAgentRuntimeLifecycle2({
@@ -81193,7 +82177,6 @@ function createConsoleServer(deps = {}) {
     getPort: () => lockHandle?.payload.port ?? port,
     getAdminToken: () => lockHandle?.payload.token ?? null
   });
-  const pickTerminalFolder = deps.terminalPickFolder ?? createNativeFolderPicker();
   const pendingRuntimeSessions = /* @__PURE__ */ new Map();
   const terminalSessions = createTerminalSessionManager({
     launch: deps.terminalLaunch ?? createDefaultTerminalLaunchResolver({
@@ -81207,10 +82190,18 @@ function createConsoleServer(deps = {}) {
     }),
     startShell: deps.terminalStartShell,
     maxSessions: deps.maxTerminalSessions,
-    // PTY가 종료되면 콘솔 세션 목록에서도 제거해 잔존/재실행을 막는다.
     onSessionExit: (sessionId) => {
       pendingRuntimeSessions.delete(sessionId);
-      observability.removeTerminalSession(sessionId);
+      const operation = observability.getDurableOperation(sessionId);
+      const providerSession = operation?.providerSession ?? readProviderSessionCapture(sessionId, { capturesDir: durablePaths.capturesDir });
+      if (providerSession) {
+        observability.updateTerminalSessionProviderSession(sessionId, providerSession);
+        const dormant = observability.transitionTerminalSessionToDormant(sessionId, providerSession);
+        if (dormant) observability.notifySessionUpdated(dormant);
+      } else {
+        observability.removeTerminalSession(sessionId);
+      }
+      persistDurableState();
     }
   });
   const unsubscribeCarrierReminderRouter = createCarrierResultReminderRouter2({
@@ -81242,6 +82233,12 @@ function createConsoleServer(deps = {}) {
   let activeEndpoint = null;
   let agentRuntimeStopped = false;
   let consoleResourcesDisposed = false;
+  const carrierSettingsRouter = createCarrierSettingsRouter({
+    registry: carrierRegistry,
+    isAuthorized: isTerminalAuthorized,
+    readJsonBody,
+    writeJson
+  });
   function handleRequest(req, res) {
     const pathname = getPathname(req);
     if (pathname === "/console/codex" || pathname.startsWith("/console/codex/")) {
@@ -81261,14 +82258,28 @@ function createConsoleServer(deps = {}) {
       runAsyncHandler(handleTerminalTicket(req, res), res);
       return;
     }
-    if (pathname === "/terminal/folders/pick") {
-      runAsyncHandler(handleTerminalFolderPick(req, res), res);
+    if (pathname === "/terminal/folders/list") {
+      runAsyncHandler(handleTerminalFoldersList(req, res), res);
+      return;
+    }
+    if (pathname === "/terminal/folders/grants") {
+      runAsyncHandler(handleTerminalFolderGrants(req, res), res);
       return;
     }
     if (pathname === "/terminal/sessions") {
       runAsyncHandler(handleTerminalSessions(req, res), res);
       return;
     }
+    const terminalSessionResumeMatch = pathname.match(/^\/terminal\/sessions\/([^/]+)\/resume$/);
+    if (terminalSessionResumeMatch) {
+      runAsyncHandler(handleTerminalSessionResume(req, res, decodeURIComponent(terminalSessionResumeMatch[1] ?? "")), res);
+      return;
+    }
+    const terminalSessionTurnMatch = pathname.match(/^\/terminal\/sessions\/([^/]+)\/turn$/);
+    if (terminalSessionTurnMatch) {
+      runAsyncHandler(handleTerminalSessionTurn(req, res, decodeURIComponent(terminalSessionTurnMatch[1] ?? "")), res);
+      return;
+    }
     const terminalSessionItemMatch = pathname.match(/^\/terminal\/sessions\/([^/]+)$/);
     if (terminalSessionItemMatch) {
       runAsyncHandler(handleTerminalSessionItem(req, res, decodeURIComponent(terminalSessionItemMatch[1] ?? "")), res);
@@ -81278,6 +82289,11 @@ function createConsoleServer(deps = {}) {
       runAsyncHandler(handleObserverTheaters(req, res), res);
       return;
     }
+    const theaterItemMatch = pathname.match(/^\/observer\/theaters\/([^/]+)$/);
+    if (theaterItemMatch) {
+      runAsyncHandler(handleObserverTheaterItem(req, res, decodeURIComponent(theaterItemMatch[1] ?? "")), res);
+      return;
+    }
     const theaterSessionMatch = pathname.match(/^\/observer\/theaters\/([^/]+)\/sessions$/);
     if (theaterSessionMatch) {
       runAsyncHandler(handleObserverTheaterSessions(req, res, decodeURIComponent(theaterSessionMatch[1] ?? "")), res);
@@ -81291,6 +82307,10 @@ function createConsoleServer(deps = {}) {
       handleObserverCarriers(req, res);
       return;
     }
+    if (pathname === "/carrier-settings" || pathname.startsWith("/carrier-settings/")) {
+      runAsyncBooleanHandler(carrierSettingsRouter({ req, res, pathname }), res);
+      return;
+    }
     if (pathname === "/observer/tenants") {
       handleObserverWorkspaces(req, res);
       return;
@@ -81326,6 +82346,30 @@ function createConsoleServer(deps = {}) {
     };
     writeJson(res, 200, body);
   }
+  async function handleTerminalSessionTurn(req, res, sessionId) {
+    if (req.method !== "POST") {
+      writeJson(res, 405, { error: "Method not allowed" });
+      return;
+    }
+    const token = lockHandle?.payload.token;
+    if (!token || req.headers.authorization !== `Bearer ${token}`) {
+      writeJson(res, 401, { error: "Unauthorized" });
+      return;
+    }
+    const body = await readJsonBody(req);
+    const turnState = body?.phase === "start" ? "running" : body?.phase === "end" ? "ended" : null;
+    if (turnState === null) {
+      writeJson(res, 400, { error: "invalid_phase" });
+      return;
+    }
+    const updated = observability.setTerminalSessionTurnState(sessionId, turnState);
+    if (!updated) {
+      writeJson(res, 404, { error: "terminal_session_not_found" });
+      return;
+    }
+    observability.notifySessionUpdated(updated);
+    writeJson(res, 200, { ok: true });
+  }
   async function handleTerminalTicket(req, res) {
     if (req.method !== "POST") {
       writeJson(res, 405, { error: "Method not allowed" });
@@ -81338,16 +82382,29 @@ function createConsoleServer(deps = {}) {
     const body = await readJsonBody(req);
     const kind = body?.kind === "shell" ? "shell" : "fleet";
     const requestedSessionId = body?.sessionId;
+    const requestedTheaterId = typeof body?.theaterId === "string" ? body.theaterId : void 0;
     let sessionId;
+    let cwd;
     if (kind === "shell") {
-      sessionId = SHELL_TERMINAL_SESSION_ID;
+      if (typeof requestedSessionId === "string" && requestedSessionId.startsWith(THEATER_SHELL_SESSION_PREFIX2) && requestedTheaterId) {
+        const theater = theaters.get(requestedTheaterId);
+        if (!theater) {
+          writeJson(res, 404, { error: "theater_not_found" });
+          return;
+        }
+        sessionId = requestedSessionId;
+        cwd = theater.path;
+      } else {
+        sessionId = SHELL_TERMINAL_SESSION_ID;
+        cwd = "";
+      }
     } else if (typeof requestedSessionId === "string" && requestedSessionId.length > 0) {
       sessionId = requestedSessionId;
+      cwd = observability.getLaunchCwd(sessionId);
     } else {
       writeJson(res, 400, { error: "terminal_session_not_found" });
       return;
     }
-    const cwd = kind === "shell" ? "" : observability.getLaunchCwd(sessionId);
     if (cwd === null) {
       writeJson(res, 404, { error: "terminal_session_not_found" });
       return;
@@ -81362,7 +82419,7 @@ function createConsoleServer(deps = {}) {
       kind
     }));
   }
-  async function handleTerminalFolderPick(req, res) {
+  async function handleTerminalFoldersList(req, res) {
     if (req.method !== "POST") {
       writeJson(res, 405, { error: "Method not allowed" });
       return;
@@ -81371,16 +82428,41 @@ function createConsoleServer(deps = {}) {
       writeJson(res, 401, { error: "unauthorized" });
       return;
     }
-    const result = await pickTerminalFolder();
-    if (result.kind === "cancelled") {
-      writeJson(res, 200, { cancelled: true });
+    const body = await readJsonBody(req);
+    if (!isPlainObject22(body) || body.path !== void 0 && body.path !== null && typeof body.path !== "string") {
+      writeJson(res, 400, { error: "invalid_path" });
       return;
     }
-    if (result.kind === "error") {
-      writeJson(res, result.error === "invalid_folder" ? 400 : 503, { error: result.error });
+    try {
+      const payload = await listTerminalFolders(body.path === void 0 ? null : body.path);
+      writeJson(res, 200, payload);
+    } catch (error512) {
+      if (error512 instanceof TerminalFolderListError) {
+        writeJson(res, terminalFolderListStatus(error512), { error: error512.code });
+        return;
+      }
+      throw error512;
+    }
+  }
+  async function handleTerminalFolderGrants(req, res) {
+    if (req.method !== "POST") {
+      writeJson(res, 405, { error: "Method not allowed" });
       return;
     }
-    writeJson(res, 200, { folderGrantId: folderGrants.issue(result.cwd) });
+    if (!isTerminalAuthorized(req)) {
+      writeJson(res, 401, { error: "unauthorized" });
+      return;
+    }
+    const body = await readJsonBody(req);
+    if (!isPlainObject22(body) || typeof body.path !== "string") {
+      writeJson(res, 400, { error: "invalid_folder" });
+      return;
+    }
+    try {
+      writeJson(res, 200, { folderGrantId: folderGrants.issue(body.path) });
+    } catch {
+      writeJson(res, 400, { error: "invalid_folder" });
+    }
   }
   async function handleTerminalSessions(req, res) {
     if (!isTerminalAuthorized(req)) {
@@ -81409,6 +82491,17 @@ function createConsoleServer(deps = {}) {
     }
     await createTerminalSessionForCwd(cwd, res, cliId);
   }
+  function injectRenameCommand(sessionId, label) {
+    if (!label) return;
+    const renameCommand = terminalSessions.getSessionRenameCommand(sessionId);
+    if (!renameCommand) return;
+    const safeLabel = sanitizeCarrierResultReminder2(label.replace(/[\r\n\t]+/g, " ")).trim();
+    if (safeLabel.length === 0) return;
+    const policy = terminalSessions.getSessionMessagePolicy(sessionId) ?? {};
+    for (const chunk of formatCarrierResultReminderMessage2(policy, `${renameCommand} ${safeLabel}`)) {
+      terminalSessions.writeToSession(sessionId, chunk);
+    }
+  }
   async function handleTerminalSessionItem(req, res, sessionId) {
     if (req.method !== "DELETE" && req.method !== "PATCH") {
       writeJson(res, 405, { error: "Method not allowed" });
@@ -81430,13 +82523,62 @@ function createConsoleServer(deps = {}) {
         return;
       }
       observability.notifySessionUpdated(updated);
+      injectRenameCommand(sessionId, updated.label);
+      persistDurableState();
       writeJson(res, 200, updated);
       return;
     }
-    terminalSessions.terminate(sessionId);
-    observability.removeTerminalSession(sessionId);
+    forgetTerminalSession(sessionId);
     writeJson(res, 200, { ok: true });
   }
+  async function handleTerminalSessionResume(req, res, sessionId) {
+    if (req.method !== "POST") {
+      writeJson(res, 405, { error: "Method not allowed" });
+      return;
+    }
+    if (!isTerminalAuthorized(req)) {
+      writeJson(res, 401, { error: "unauthorized" });
+      return;
+    }
+    const dormantSession = observability.listTerminalSessions().find((session) => session.sessionId === sessionId && session.status === "dormant");
+    const operation = dormantSession ? observability.getDurableOperation(sessionId) : null;
+    if (!operation) {
+      writeJson(res, 404, { error: "session_not_found" });
+      return;
+    }
+    const cliId = readDurableAgentCliId(operation);
+    if (!cliId) {
+      writeJson(res, 409, { error: "resume_unavailable" });
+      return;
+    }
+    const providerSession = operation.providerSession ?? readProviderSessionCapture(sessionId, { capturesDir: durablePaths.capturesDir });
+    if (!providerSession) {
+      writeJson(res, 409, { error: "resume_unavailable" });
+      return;
+    }
+    observability.updateTerminalSessionProviderSession(sessionId, providerSession);
+    const starting = observability.updateTerminalSessionStatus(sessionId, "starting");
+    if (starting) observability.notifySessionUpdated(starting);
+    try {
+      await terminalSessions.createSession({ sessionId, cwd: operation.cwd, cliId, resumeSessionId: providerSession.sessionId });
+      const runtimeSession = pendingRuntimeSessions.get(sessionId);
+      pendingRuntimeSessions.delete(sessionId);
+      const resumed = runtimeSession ? observability.registerTerminalRuntimeSession(runtimeSession) ?? starting : observability.updateTerminalSessionStatus(sessionId, "terminal-only") ?? starting;
+      if (!resumed) {
+        writeJson(res, 404, { error: "session_not_found" });
+        return;
+      }
+      observability.notifySessionUpdated(resumed);
+      persistDurableState();
+      writeJson(res, 200, resumed);
+    } catch {
+      pendingRuntimeSessions.delete(sessionId);
+      const reverted = observability.updateTerminalSessionStatus(sessionId, "dormant");
+      if (reverted) observability.notifySessionUpdated(reverted);
+      persistDurableState();
+      writeJson(res, 503, { error: "terminal_unavailable" });
+    }
+  }
   async function handleObserverTheaters(req, res) {
     if (req.method === "GET") {
       writeJson(res, 200, { theaters: listTheaterInfos(), agentClis: getAgentCliMetadata2() });
@@ -81450,27 +82592,44 @@ function createConsoleServer(deps = {}) {
       writeJson(res, 401, { error: "unauthorized" });
       return;
     }
-    const result = await pickTerminalFolder();
-    if (result.kind === "cancelled") {
-      writeJson(res, 200, { cancelled: true });
+    const body = await readJsonBody(req);
+    if (!isPlainObject22(body) || typeof body.folderGrantId !== "string") {
+      writeJson(res, 400, { error: "invalid_folder_grant" });
       return;
     }
-    if (result.kind === "error") {
-      writeJson(res, result.error === "invalid_folder" ? 400 : 503, { error: result.error });
+    const cwd = folderGrants.consume(body.folderGrantId);
+    if (!cwd) {
+      writeJson(res, 400, { error: "invalid_folder_grant" });
       return;
     }
-    const theater = await theaters.register(result.cwd);
+    const theater = await theaters.register(cwd);
     let hasWiki = false;
     try {
-      await codex.registerWorkspace(result.cwd);
+      await codex.registerWorkspace(cwd);
       hasWiki = true;
     } catch (error512) {
       if (!(error512 instanceof Error && error512.message === "knowledge_root_missing")) {
         console.warn(`[fleet-console] Codex workspace registration skipped for Theater ${theater.id}: ${error512 instanceof Error ? error512.message : String(error512)}`);
       }
     }
+    persistDurableState();
     writeJson(res, 200, toTheaterInfo(theater, hasWiki));
   }
+  async function handleObserverTheaterItem(req, res, theaterId) {
+    if (req.method !== "DELETE") {
+      writeJson(res, 405, { error: "Method not allowed" });
+      return;
+    }
+    if (!isTerminalAuthorized(req)) {
+      writeJson(res, 401, { error: "unauthorized" });
+      return;
+    }
+    const operations = observability.listDurableOperations().filter((operation) => operation.theaterId === theaterId);
+    theaters.remove(theaterId);
+    for (const operation of operations) forgetTerminalSession(operation.sessionId, { persist: false });
+    persistDurableState();
+    writeJson(res, 200, { ok: true });
+  }
   async function handleObserverTheaterSessions(req, res, theaterId) {
     if (req.method !== "POST") {
       writeJson(res, 405, { error: "Method not allowed" });
@@ -81491,7 +82650,7 @@ function createConsoleServer(deps = {}) {
     await createTerminalSessionForCwd(theater.path, res, cliId);
   }
   async function createTerminalSessionForCwd(cwd, res, cliId) {
-    const sessionId = crypto32.randomUUID();
+    const sessionId = crypto5.randomUUID();
     const session = observability.createPendingTerminalSession({ sessionId, cwd, cliId });
     try {
       await terminalSessions.createSession({ sessionId, cwd, cliId });
@@ -81499,6 +82658,7 @@ function createConsoleServer(deps = {}) {
       pendingRuntimeSessions.delete(sessionId);
       const created = runtimeSession ? observability.registerTerminalRuntimeSession(runtimeSession) ?? session : observability.updateTerminalSessionStatus(sessionId, "terminal-only") ?? session;
       observability.notifySessionUpdated(created);
+      persistDurableState();
       writeJson(res, 200, created);
     } catch (error512) {
       pendingRuntimeSessions.delete(sessionId);
@@ -81572,6 +82732,13 @@ function createConsoleServer(deps = {}) {
   function listTheaterInfos() {
     return theaters.list().map((theater) => toTheaterInfo(theater, codex.getWorkspace(theater.id) !== null));
   }
+  function forgetTerminalSession(sessionId, options2 = {}) {
+    terminalSessions.terminate(sessionId);
+    pendingRuntimeSessions.delete(sessionId);
+    observability.removeTerminalSession(sessionId);
+    unlinkProviderSessionCapture(sessionId, { capturesDir: durablePaths.capturesDir });
+    if (options2.persist !== false) persistDurableState();
+  }
   function toTheaterInfo(theater, hasWiki) {
     return {
       id: theater.id,
@@ -81634,12 +82801,69 @@ function createConsoleServer(deps = {}) {
     terminalUpgrade.close();
     currentLock?.release();
   }
+  function rehydrateDurableState() {
+    let state;
+    try {
+      state = durableStateStore.load();
+      theaters.restore(state.theaters);
+    } catch (error512) {
+      console.warn(`[fleet-console] Durable state restore skipped: ${error512 instanceof Error ? error512.message : String(error512)}`);
+      state = emptyDurableConsoleState();
+      theaters.restore([]);
+    }
+    const merged = mergeProviderSessionCaptures(state, { capturesDir: durablePaths.capturesDir });
+    syncProviderSessionsToObservability(merged);
+    const restorable = {
+      ...merged,
+      operations: merged.operations.filter((operation) => operation.providerSession)
+    };
+    if (merged !== state || restorable.operations.length !== merged.operations.length) {
+      try {
+        durableStateStore.save(restorable);
+        cleanupProviderSessionCaptures(restorable, { capturesDir: durablePaths.capturesDir });
+      } catch (error512) {
+        console.warn(`[fleet-console] Durable state capture merge was not persisted: ${error512 instanceof Error ? error512.message : String(error512)}`);
+      }
+    } else {
+      cleanupProviderSessionCaptures(restorable, { capturesDir: durablePaths.capturesDir });
+    }
+    for (const operation of restorable.operations) {
+      if (theaters.get(operation.theaterId)) observability.injectDormantOperation(operation);
+    }
+  }
+  function persistDurableState() {
+    try {
+      const state = mergeProviderSessionCaptures({
+        version: 1,
+        theaters: theaters.list(),
+        operations: observability.listDurableOperations()
+      }, { capturesDir: durablePaths.capturesDir });
+      syncProviderSessionsToObservability(state);
+      const operationsWithProviderSession = state.operations.filter((operation) => operation.providerSession);
+      durableStateStore.save({
+        version: state.version,
+        theaters: state.theaters,
+        // 대화 없는 빈 Operation 드롭은 rehydrate에서 capture 머지 뒤에만 수행한다.
+        // create 시점의 메타데이터를 먼저 남겨야 이후 도착한 capture 파일이 재시작 때 병합될 수 있다.
+        operations: state.operations
+      });
+      cleanupProviderSessionCaptures({ ...state, operations: operationsWithProviderSession }, { capturesDir: durablePaths.capturesDir });
+    } catch (error512) {
+      console.warn(`[fleet-console] Durable state save failed: ${error512 instanceof Error ? error512.message : String(error512)}`);
+    }
+  }
+  function syncProviderSessionsToObservability(state) {
+    for (const operation of state.operations) {
+      if (operation.providerSession) observability.updateTerminalSessionProviderSession(operation.sessionId, operation.providerSession);
+    }
+  }
   return {
     host,
     port,
     async start(lockPaths) {
       if (server && lockHandle) return lockHandle.payload.endpoint;
       try {
+        rehydrateDurableState();
         await new Promise((resolve2, reject) => {
           const srv = createHttpServer(handleRequest, terminalUpgrade);
           srv.once("error", reject);
@@ -81722,6 +82946,14 @@ function resolveCarrierEventOrigin(event, jobOriginById) {
 function queueOriginCleanup(jobId, jobOriginById) {
   queueMicrotask(() => jobOriginById.delete(jobId));
 }
+function readDurableAgentCliId(operation) {
+  if (!operation.cliId) return null;
+  try {
+    return parseAgentCliId2(operation.cliId) ?? null;
+  } catch {
+    return null;
+  }
+}
 function createHttpServer(handler, terminalUpgrade) {
   const srv = http2.createServer(handler);
   srv.timeout = SERVER_TIMEOUT_MS;
@@ -81781,6 +83013,14 @@ function readOptionalAgentCliId(value, res) {
     return false;
   }
 }
+function terminalFolderListStatus(error512) {
+  if (error512.code === "forbidden") return 403;
+  if (error512.code === "not_found") return 404;
+  return 400;
+}
+function isPlainObject22(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 async function readJsonBody(req) {
   const chunks = [];
   let total = 0;
@@ -81839,6 +83079,78 @@ function isAllowedTerminalOrigin(req, expectedPort) {
   if (origin === void 0) return true;
   return origin === `http://127.0.0.1:${expectedPort}`;
 }
+var CAPTURE_TEMP_PREFIX = ".capture.";
+async function runCaptureSessionHook(provider, env = process6.env) {
+  return captureSession({
+    diagnostics: process6.stderr,
+    env,
+    input: await readStdin(),
+    provider
+  });
+}
+function captureSession(options2) {
+  try {
+    return captureSessionStrict(options2);
+  } catch (error512) {
+    options2.diagnostics?.write(`[fleet-console] capture-session skipped: ${error512 instanceof Error ? error512.message : String(error512)}
+`);
+    return null;
+  }
+}
+function captureSessionStrict(options2) {
+  const provider = parseProvider(options2.provider);
+  const fleetSessionId = readFleetSessionId(options2.env ?? process6.env);
+  const input = parseHookInput(options2.input ?? "");
+  const providerSession = toProviderSession(provider, input, options2.now ?? (() => /* @__PURE__ */ new Date()));
+  const capturesDir = (options2.paths ?? createConsoleDataPaths()).capturesDir;
+  const finalPath = path93__default.join(capturesDir, `${fleetSessionId}.json`);
+  const tempPath = path93__default.join(capturesDir, `${CAPTURE_TEMP_PREFIX}${fleetSessionId}.${process6.pid}.${Date.now()}.tmp`);
+  fs5__default.mkdirSync(capturesDir, { recursive: true, mode: 448 });
+  fs5__default.writeFileSync(tempPath, `${JSON.stringify(providerSession, null, 2)}
+`, { mode: 384 });
+  fs5__default.renameSync(tempPath, finalPath);
+  return { path: finalPath, providerSession };
+}
+function parseProvider(value) {
+  if (value === "claude" || value === "codex") return value;
+  throw new Error("invalid_provider");
+}
+function readFleetSessionId(env) {
+  const value = env.FLEET_CONSOLE_SESSION_ID;
+  if (!value) throw new Error("missing_fleet_session_id");
+  if (path93__default.basename(value) !== value || value.includes(path93__default.sep) || value.includes(path93__default.posix.sep)) {
+    throw new Error("invalid_fleet_session_id");
+  }
+  return value;
+}
+function parseHookInput(input) {
+  try {
+    const parsed = JSON.parse(input);
+    if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) return parsed;
+  } catch {
+  }
+  throw new Error("invalid_hook_input");
+}
+function toProviderSession(provider, input, now) {
+  if (typeof input.session_id !== "string" || input.session_id.length === 0) throw new Error("missing_provider_session_id");
+  return {
+    provider,
+    sessionId: input.session_id,
+    ...typeof input.transcript_path === "string" && input.transcript_path.length > 0 ? { transcriptPath: input.transcript_path } : {},
+    ...typeof input.source === "string" && input.source.length > 0 ? { source: input.source } : {},
+    capturedAt: now().toISOString()
+  };
+}
+function readStdin() {
+  return new Promise((resolve2, reject) => {
+    const chunks = [];
+    process6.stdin.on("data", (chunk) => {
+      chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+    });
+    process6.stdin.on("error", reject);
+    process6.stdin.on("end", () => resolve2(Buffer.concat(chunks).toString("utf8")));
+  });
+}
 function createConsoleStalePolicy(deps = {}) {
   const fsImpl = deps.fs ?? fs5__default;
   function isBuildStale(lock, buildFile) {
@@ -81851,10 +83163,40 @@ function createConsoleStalePolicy(deps = {}) {
   }
   return { isBuildStale };
 }
+var TURN_POST_TIMEOUT_MS = 1500;
+async function runTurnStateHook(phase, env = process6.env, options2 = {}) {
+  try {
+    await postTurnState(phase, env, options2);
+  } catch {
+  }
+}
+async function postTurnState(phase, env, options2) {
+  const sessionId = env.FLEET_CONSOLE_SESSION_ID;
+  if (!sessionId) return;
+  const paths = createConsolePaths({ env });
+  const lock = createConsoleLock().readLock(paths.lockFile);
+  if (!lock) return;
+  const fetchImpl = options2.fetchImpl ?? fetch;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), options2.timeoutMs ?? TURN_POST_TIMEOUT_MS);
+  try {
+    await fetchImpl(`${lock.endpoint}terminal/sessions/${encodeURIComponent(sessionId)}/turn`, {
+      method: "POST",
+      headers: {
+        authorization: `Bearer ${lock.token}`,
+        "content-type": "application/json"
+      },
+      body: JSON.stringify({ phase }),
+      signal: controller.signal
+    });
+  } finally {
+    clearTimeout(timer);
+  }
+}
 var FIXED_HOST = "127.0.0.1";
 var HELP_BANNER_INDENT = "  ";
 var DEFAULT_HELP_RELEASE = "local";
-var CONSOLE_HOOK_COMMANDS = /* @__PURE__ */ new Set(["subagents-context"]);
+var CONSOLE_HOOK_COMMANDS = /* @__PURE__ */ new Set(["capture-session", "subagents-context", "turn-start", "turn-end"]);
 function parseConsoleCliMode(argv2) {
   if (argv2.length === 0) return "start";
   const [first, ...rest] = argv2;
@@ -81881,10 +83223,14 @@ Run 'fleet console --help' for usage.`);
 }
 function parseConsoleHookCommand(argv2) {
   const [commandName, ...rest] = argv2;
-  if (!commandName || !CONSOLE_HOOK_COMMANDS.has(commandName) || rest.length > 0) {
+  if (!commandName || !CONSOLE_HOOK_COMMANDS.has(commandName)) {
     throw new Error("Unknown fleet-console hook command");
   }
-  return "subagents-context";
+  if (commandName === "subagents-context" && rest.length === 0) return { command: "subagents-context" };
+  if (commandName === "turn-start" && rest.length === 0) return { command: "turn-start" };
+  if (commandName === "turn-end" && rest.length === 0) return { command: "turn-end" };
+  if (commandName === "capture-session" && rest.length === 1 && rest[0]) return { command: "capture-session", provider: rest[0] };
+  throw new Error("Unknown fleet-console hook command");
 }
 function buildConsoleHelpText(options2 = {}) {
   const colorEnabled = resolveColorEnabled2(options2);
@@ -81946,8 +83292,8 @@ function buildWikiHelpText(options2 = {}) {
   return colorEnabled ? text : stripAnsi2(text);
 }
 function createConsoleDaemonLifecycle(deps = {}) {
-  const env = deps.env ?? process4.env;
-  const execPath = deps.execPath ?? process4.execPath;
+  const env = deps.env ?? process6.env;
+  const execPath = deps.execPath ?? process6.execPath;
   const serverModulePath = deps.serverModulePath ?? resolveDefaultServerModulePath();
   const spawnDetached = deps.spawnDetached ?? ((bin, args, options2) => {
     spawn3(bin, [...args], options2).unref();
@@ -81961,10 +83307,10 @@ function createConsoleDaemonLifecycle(deps = {}) {
     const server = createConsoleServer();
     await server.start(paths);
     await new Promise((resolve2) => {
-      process4.once("SIGTERM", () => {
+      process6.once("SIGTERM", () => {
         void server.stop().finally(resolve2);
       });
-      process4.once("SIGINT", () => {
+      process6.once("SIGINT", () => {
         void server.stop().finally(resolve2);
       });
     });
@@ -81978,14 +83324,14 @@ function createConsoleDaemonLifecycle(deps = {}) {
     const payload = readTrustedLock();
     if (!payload) return;
     try {
-      process4.kill(payload.pid, "SIGTERM");
+      process6.kill(payload.pid, "SIGTERM");
     } catch (err) {
       if (err.code !== "ESRCH") throw err;
     }
     await sleep(200);
     try {
-      process4.kill(payload.pid, 0);
-      process4.kill(payload.pid, "SIGKILL");
+      process6.kill(payload.pid, 0);
+      process6.kill(payload.pid, "SIGKILL");
     } catch (err) {
       if (err.code !== "ESRCH") throw err;
     }
@@ -82103,49 +83449,55 @@ async function runConsoleRestart(deps = {}) {
   return openFleetConsole({ lifecycle, openBrowser: deps.openBrowser });
 }
 async function main() {
-  if (process4.argv[2] === "serve") {
+  if (process6.argv[2] === "serve") {
     await createConsoleDaemonLifecycle().runServer();
     return;
   }
-  if (process4.argv[2] === "hook") {
-    parseConsoleHookCommand(process4.argv.slice(3));
-    {
-      process4.stdout.write(`${runSubagentsContextHook(process4.env)}
+  if (process6.argv[2] === "hook") {
+    const hookCommand = parseConsoleHookCommand(process6.argv.slice(3));
+    if (hookCommand.command === "subagents-context") {
+      process6.stdout.write(`${runSubagentsContextHook(process6.env)}
 `);
       return;
     }
+    if (hookCommand.command === "turn-start" || hookCommand.command === "turn-end") {
+      await runTurnStateHook(hookCommand.command === "turn-start" ? "start" : "end", process6.env);
+      return;
+    }
+    await runCaptureSessionHook(hookCommand.provider, process6.env);
+    return;
   }
-  if (process4.argv[2] === "codex") {
-    await mainWiki(process4.argv.slice(3));
+  if (process6.argv[2] === "codex") {
+    await mainWiki(process6.argv.slice(3));
     return;
   }
-  const mode = parseConsoleCliMode(process4.argv.slice(2));
+  const mode = parseConsoleCliMode(process6.argv.slice(2));
   if (mode === "help") {
-    process4.stdout.write(`${buildConsoleHelpText({ env: process4.env, isTTY: process4.stdout.isTTY })}
+    process6.stdout.write(`${buildConsoleHelpText({ env: process6.env, isTTY: process6.stdout.isTTY })}
 `);
     return;
   }
   if (mode === "status") {
-    process4.stdout.write(`${await runConsoleStatus()}
+    process6.stdout.write(`${await runConsoleStatus()}
 `);
     return;
   }
   if (mode === "stop") {
-    process4.stdout.write(`${await runConsoleStop()}
+    process6.stdout.write(`${await runConsoleStop()}
 `);
     return;
   }
   if (mode === "restart") {
     await runConsoleRestart();
-    process4.stdout.write("Fleet Console restarted.\n");
+    process6.stdout.write("Fleet Console restarted.\n");
     return;
   }
   await openFleetConsole();
-  process4.stdout.write("Fleet Console opened.\n");
+  process6.stdout.write("Fleet Console opened.\n");
 }
-async function mainWiki(argv2 = process4.argv.slice(2)) {
+async function mainWiki(argv2 = process6.argv.slice(2)) {
   if (argv2.includes("--help") || argv2.includes("-h")) {
-    process4.stdout.write(`${buildWikiHelpText({ env: process4.env, isTTY: process4.stdout.isTTY })}
+    process6.stdout.write(`${buildWikiHelpText({ env: process6.env, isTTY: process6.stdout.isTTY })}
 `);
     return;
   }
@@ -82157,19 +83509,19 @@ async function mainWiki(argv2 = process4.argv.slice(2)) {
   if (unsupported.length > 0) {
     throw new Error(`Unknown fleet wiki option: ${unsupported[0]}`);
   }
-  await openFleetWikiWorkspace({ cwd: process4.cwd() });
+  await openFleetWikiWorkspace({ cwd: process6.cwd() });
 }
 function resolveDefaultServerModulePath() {
   const builtPath = new URL("../dist/cli.mjs", import.meta.url).pathname;
   if (fs5__default.existsSync(builtPath)) return builtPath;
   return fileURLToPath(import.meta.url);
 }
-var isDirectRun = process4.argv[1] && path93__default.resolve(process4.argv[1]) === fileURLToPath(import.meta.url);
+var isDirectRun = process6.argv[1] && path93__default.resolve(process6.argv[1]) === fileURLToPath(import.meta.url);
 if (isDirectRun) {
   await main().catch((error512) => {
-    process4.stderr.write(`${error512 instanceof Error ? error512.message : String(error512)}
+    process6.stderr.write(`${error512 instanceof Error ? error512.message : String(error512)}
 `);
-    process4.exitCode = 1;
+    process6.exitCode = 1;
   });
 }
 
@@ -82997,7 +84349,7 @@ import { join as join11 } from "path";
 import path63 from "path";
 import path12 from "path";
 import path53 from "path";
-import crypto5 from "crypto";
+import crypto6 from "crypto";
 import { mkdir as mkdir4, readdir as readdir2, readFile as readFile3, rename as rename2, rm as rm2, stat as stat2, writeFile as writeFile22 } from "fs/promises";
 import os6 from "os";
 import path43 from "path";
@@ -84050,7 +85402,7 @@ function stripLeadingFrontmatter2(body) {
   return stripped ? next : body;
 }
 function computeContentHash2(content) {
-  return crypto5.createHash("sha256").update(content, "utf8").digest("hex").slice(0, 8);
+  return crypto6.createHash("sha256").update(content, "utf8").digest("hex").slice(0, 8);
 }
 function assertWithinRawDir2(absolutePath, paths) {
   const relative2 = path43.relative(paths.rawDir, absolutePath);
@@ -84263,7 +85615,7 @@ async function writeAtomic2(filePath, content, paths) {
   await ensureMemoryRoot2(paths);
   const tempPath = path43.join(
     path43.dirname(filePath),
-    `.tmp-${process.pid}-${Date.now()}-${crypto5.randomUUID()}-${os6.hostname()}`
+    `.tmp-${process.pid}-${Date.now()}-${crypto6.randomUUID()}-${os6.hostname()}`
   );
   await writeFile22(tempPath, content, "utf8");
   await rename2(tempPath, filePath);
@@ -90389,7 +91741,7 @@ function reconcileRuntimeState(carrierRuntime) {
 // src/runtime/workspace-scanner.ts
 import { execFile as execFile3 } from "child_process";
 import { promisify as promisify2 } from "util";
-var execFileAsync3 = promisify2(execFile3);
+var execFileAsync2 = promisify2(execFile3);
 var GIT_STATUS_TIMEOUT_MS2 = 4e3;
 var GIT_STATUS_MAX_BUFFER2 = 1024 * 1024;
 var GIT_HASH_TIMEOUT_MS2 = 4e3;
@@ -90398,11 +91750,13 @@ function createWorkspaceChangeScanner2() {
   return {
     async snapshot(cwd) {
       try {
-        const { stdout } = await execFileAsync3("git", ["status", "--porcelain=v1", "-z", "--untracked-files=all"], {
+        const { stdout } = await execFileAsync2("git", ["status", "--porcelain=v1", "-z", "--untracked-files=all"], {
           cwd,
           encoding: "utf8",
           maxBuffer: GIT_STATUS_MAX_BUFFER2,
-          timeout: GIT_STATUS_TIMEOUT_MS2
+          timeout: GIT_STATUS_TIMEOUT_MS2,
+          // 콘솔 없는 호스트에서 git.exe 실행 시 콘솔 창이 깜빡이는 것을 방지한다(방어적).
+          windowsHide: true
         });
         const entries = parseGitStatusPorcelainZ2(stdout);
         if (!entries) return null;
@@ -90461,7 +91815,9 @@ function execGitHashObject2(cwd, paths) {
         cwd,
         encoding: "utf8",
         maxBuffer: GIT_HASH_MAX_BUFFER2,
-        timeout: GIT_HASH_TIMEOUT_MS2
+        timeout: GIT_HASH_TIMEOUT_MS2,
+        // 콘솔 없는 호스트에서 git.exe 실행 시 콘솔 창이 깜빡이는 것을 방지한다(방어적).
+        windowsHide: true
       },
       (error53, stdout) => {
         if (error53) {
@@ -90884,7 +92240,7 @@ async function runApp(options2 = {}) {
     defaults: {
       cliId: getDefaultAgentCliId(),
       enableMetaphor: false,
-      replaceSystemPrompt: true
+      replaceSystemPrompt: false
     },
     env: process.env,
     globalOptionsService: runtime.infraServices.globalOptionsService,
@@ -91269,11 +92625,11 @@ function canReadCarrierState2(filePath) {
   }
 }
 function isReadableCarrierStateRoot2(value) {
-  if (!isRecord4(value)) return false;
+  if (!isRecord5(value)) return false;
   const carriers = value.carriers;
-  return carriers === void 0 || isRecord4(carriers);
+  return carriers === void 0 || isRecord5(carriers);
 }
-function isRecord4(value) {
+function isRecord5(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -91314,7 +92670,7 @@ async function runNativeApp(options2 = {}) {
     defaults: {
       cliId: getDefaultAgentCliId(),
       enableMetaphor: false,
-      replaceSystemPrompt: true
+      replaceSystemPrompt: false
     },
     env: process.env,
     globalOptionsService: runtime.infraServices.globalOptionsService,