@dotobokuri/fleet-console 1.17.1 → 1.19.0

package/dist/fleet-plugins/terminal/routes.mjs

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
-import * as fs8 from 'fs';
-import fs8__default, { existsSync, mkdtempSync, writeFileSync, mkdirSync, rmSync, chmodSync, renameSync, readdirSync, readFileSync, constants, openSync, closeSync, realpathSync, fstatSync, lstatSync, unlinkSync, statSync } from 'fs';
+import * as fs2 from 'fs';
+import fs2__default, { existsSync, accessSync, constants, mkdtempSync, writeFileSync, mkdirSync, rmSync, chmodSync, renameSync, readdirSync, readFileSync, openSync, closeSync, realpathSync, fstatSync, lstatSync, unlinkSync, statSync } from 'fs';
 import * as path27 from 'path';
 import path27__default, { dirname } from 'path';
 import * as os3 from 'os';
-import os3__default from 'os';
+import os3__default, { homedir } from 'os';
+import crypto4, { createHash, randomUUID } from 'crypto';
+import process5 from 'process';
 import { EventEmitter } from 'events';
 import { mkdir, writeFile, access, readFile, stat, readdir, appendFile, rename, rm } from 'fs/promises';
-import { execFile, execSync, spawn, spawnSync } from 'child_process';
+import { execFile, spawn, execSync, spawnSync } from 'child_process';
 import { Writable, Readable } from 'stream';
-import crypto3, { createHash, randomUUID } from 'crypto';
-import process4 from 'process';
 import http from 'http';
 import { fileURLToPath, pathToFileURL } from 'url';
 import { createRequire } from 'module';
@@ -44,10 +44,10 @@ function getFleetDataDir() {
 }
 var SECURE_DIR_MODE = 448;
 var SECURE_FILE_MODE = 384;
-var NOFOLLOW_FLAG = fs8.constants.O_NOFOLLOW ?? 0;
+var NOFOLLOW_FLAG = fs2.constants.O_NOFOLLOW ?? 0;
 function safeLstat(targetPath) {
   try {
-    return fs8.lstatSync(targetPath);
+    return fs2.lstatSync(targetPath);
   } catch (error51) {
     if (error51.code === "ENOENT") {
       return null;
@@ -61,18 +61,18 @@ function ensureSafeDirectory(dirPath) {
     if (!stat3.isDirectory() || stat3.isSymbolicLink()) {
       throw new Error(`Unsafe Fleet directory: ${dirPath}`);
     }
-    fs8.chmodSync(dirPath, SECURE_DIR_MODE);
+    fs2.chmodSync(dirPath, SECURE_DIR_MODE);
     return;
   }
-  fs8.mkdirSync(dirPath, { recursive: true, mode: SECURE_DIR_MODE });
+  fs2.mkdirSync(dirPath, { recursive: true, mode: SECURE_DIR_MODE });
   const created = safeLstat(dirPath);
   if (!created?.isDirectory() || created.isSymbolicLink()) {
     throw new Error(`Unsafe Fleet directory: ${dirPath}`);
   }
-  fs8.chmodSync(dirPath, SECURE_DIR_MODE);
+  fs2.chmodSync(dirPath, SECURE_DIR_MODE);
 }
 
-// ../../packages/fleet-infra/src/fs-store/atomic-write.ts
+// ../../packages/core-infra/src/fs-store/atomic-write.ts
 var DEFAULT_MAX_ATTEMPTS = 10;
 var IGNORED_FSYNC_ERROR_CODES = /* @__PURE__ */ new Set(["EPERM", "EINVAL", "ENOSYS"]);
 function buildTempPath(filePath) {
@@ -88,17 +88,17 @@ function writeAtomicSync(filePath, content, options = {}) {
     const tempPath = buildTempPath(filePath);
     let tempCreated = false;
     try {
-      fs8.writeFileSync(tempPath, content, { encoding: "utf-8", flag: "wx", mode });
+      fs2.writeFileSync(tempPath, content, { encoding: "utf-8", flag: "wx", mode });
       tempCreated = true;
       if (doFsync) {
-        const fd = fs8.openSync(tempPath, "r");
+        const fd = fs2.openSync(tempPath, "r");
         try {
           fsyncSyncBestEffort(fd);
         } finally {
-          fs8.closeSync(fd);
+          fs2.closeSync(fd);
         }
       }
-      fs8.renameSync(tempPath, filePath);
+      fs2.renameSync(tempPath, filePath);
       return;
     } catch (error51) {
       const code = error51.code;
@@ -108,7 +108,7 @@ function writeAtomicSync(filePath, content, options = {}) {
       }
       if (tempCreated) {
         try {
-          fs8.unlinkSync(tempPath);
+          fs2.unlinkSync(tempPath);
         } catch {
         }
       }
@@ -120,7 +120,7 @@ function writeAtomicSync(filePath, content, options = {}) {
 function cleanupTempFiles(dir, prefix, minAgeMs, now) {
   let entries;
   try {
-    entries = fs8.readdirSync(dir);
+    entries = fs2.readdirSync(dir);
   } catch {
     return;
   }
@@ -130,9 +130,9 @@ function cleanupTempFiles(dir, prefix, minAgeMs, now) {
     }
     const tempPath = path27.join(dir, entry);
     try {
-      const stat3 = fs8.lstatSync(tempPath);
+      const stat3 = fs2.lstatSync(tempPath);
       if (stat3?.isFile() && !stat3.isSymbolicLink() && now - stat3.mtimeMs >= minAgeMs) {
-        fs8.unlinkSync(tempPath);
+        fs2.unlinkSync(tempPath);
       }
     } catch {
     }
@@ -144,7 +144,7 @@ function isIgnoredFsyncError(error51) {
 }
 function fsyncSyncBestEffort(fd) {
   try {
-    fs8.fsyncSync(fd);
+    fs2.fsyncSync(fd);
   } catch (error51) {
     if (!isIgnoredFsyncError(error51)) {
       throw error51;
@@ -164,7 +164,7 @@ function withDirectoryLock(deps, operation) {
   const startedAt = now();
   while (true) {
     try {
-      fs8.mkdirSync(deps.lockDir, { mode: 448 });
+      fs2.mkdirSync(deps.lockDir, { mode: 448 });
       writeLockOwner(deps.lockDir, ownerFileName, now());
       try {
         return operation();
@@ -184,7 +184,7 @@ function withDirectoryLock(deps, operation) {
 }
 function releaseLock(lockDir) {
   try {
-    fs8.rmSync(lockDir, { recursive: true, force: true });
+    fs2.rmSync(lockDir, { recursive: true, force: true });
   } catch {
   }
 }
@@ -194,14 +194,14 @@ function recoverStaleLock(lockDir, ownerFileName, now, staleLockMs) {
     if (!isRecoverableSnapshot(initialSnapshot, now, staleLockMs)) return;
     const quarantineDir = buildQuarantinePath(lockDir);
     try {
-      fs8.renameSync(lockDir, quarantineDir);
+      fs2.renameSync(lockDir, quarantineDir);
     } catch {
       return;
     }
     try {
       const quarantinedSnapshot = readLockSnapshot(quarantineDir, ownerFileName);
       if (sameLockSnapshot(initialSnapshot, quarantinedSnapshot) && isRecoverableSnapshot(quarantinedSnapshot, now, staleLockMs)) {
-        fs8.rmSync(quarantineDir, { recursive: true, force: true });
+        fs2.rmSync(quarantineDir, { recursive: true, force: true });
       } else {
         restoreQuarantinedLock(quarantineDir, lockDir);
       }
@@ -215,7 +215,7 @@ function recoverStaleLock(lockDir, ownerFileName, now, staleLockMs) {
   }
 }
 function readLockSnapshot(lockDir, ownerFileName) {
-  const stat3 = fs8.lstatSync(lockDir);
+  const stat3 = fs2.lstatSync(lockDir);
   if (stat3.isSymbolicLink()) {
     return { owner: null, mtimeMs: 0 };
   }
@@ -236,7 +236,7 @@ function writeLockOwner(lockDir, ownerFileName, startedAt) {
   };
   const ownerPath = path27.join(lockDir, ownerFileName);
   try {
-    fs8.writeFileSync(ownerPath, JSON.stringify(owner), { encoding: "utf-8", mode: 384 });
+    fs2.writeFileSync(ownerPath, JSON.stringify(owner), { encoding: "utf-8", mode: 384 });
   } catch (error51) {
     releaseLock(lockDir);
     throw error51;
@@ -245,7 +245,7 @@ function writeLockOwner(lockDir, ownerFileName, startedAt) {
 function readLockOwner(lockDir, ownerFileName) {
   const ownerPath = path27.join(lockDir, ownerFileName);
   try {
-    return sanitizeLockOwner(JSON.parse(fs8.readFileSync(ownerPath, "utf-8")));
+    return sanitizeLockOwner(JSON.parse(fs2.readFileSync(ownerPath, "utf-8")));
   } catch (error51) {
     const code = error51.code;
     if (code === "ENOENT") return null;
@@ -267,7 +267,7 @@ function sameLockSnapshot(a, b) {
 }
 function restoreQuarantinedLock(quarantineDir, lockDir) {
   try {
-    fs8.renameSync(quarantineDir, lockDir);
+    fs2.renameSync(quarantineDir, lockDir);
   } catch {
   }
 }
@@ -302,24 +302,24 @@ function sleepSync(ms) {
 function readAuthStoreFile(filePath) {
   let fd;
   try {
-    fd = fs8.openSync(filePath, fs8.constants.O_RDONLY | NOFOLLOW_FLAG);
-    if (!fs8.fstatSync(fd).isFile()) {
+    fd = fs2.openSync(filePath, fs2.constants.O_RDONLY | NOFOLLOW_FLAG);
+    if (!fs2.fstatSync(fd).isFile()) {
       return {};
     }
-    return JSON.parse(fs8.readFileSync(fd, "utf-8"));
+    return JSON.parse(fs2.readFileSync(fd, "utf-8"));
   } catch {
     return {};
   } finally {
     if (fd !== void 0) {
       try {
-        fs8.closeSync(fd);
+        fs2.closeSync(fd);
       } catch {
       }
     }
   }
 }
 
-// ../../packages/fleet-infra/src/auth/auth-storage.ts
+// ../../packages/core-infra/src/auth/auth-storage.ts
 var DEFAULT_AUTH_PATH = path27.join(getFleetDataDir(), "auth.json");
 var AUTH_LOCK_OWNER_FILE_NAME = "owner.json";
 var AUTH_LOCK_TIMEOUT_MS = 5e3;
@@ -331,7 +331,7 @@ function createAuthService(deps = {}) {
     async deleteApiKey(providerId) {
       let deleted = false;
       withAuthLock(authPath, lockDir, () => {
-        if (!fs8.existsSync(authPath)) return;
+        if (!fs2.existsSync(authPath)) return;
         const data = readAuthStoreFile(authPath);
         if (!Object.prototype.hasOwnProperty.call(data, providerId)) return;
         delete data[providerId];
@@ -344,21 +344,21 @@ function createAuthService(deps = {}) {
     async getApiKey(providerId) {
       let fd;
       try {
-        if (!fs8.existsSync(authPath)) {
+        if (!fs2.existsSync(authPath)) {
           return void 0;
         }
-        fd = fs8.openSync(authPath, fs8.constants.O_RDONLY | NOFOLLOW_FLAG);
-        if (!fs8.fstatSync(fd).isFile()) {
+        fd = fs2.openSync(authPath, fs2.constants.O_RDONLY | NOFOLLOW_FLAG);
+        if (!fs2.fstatSync(fd).isFile()) {
           return void 0;
         }
-        const data = JSON.parse(fs8.readFileSync(fd, "utf-8"));
+        const data = JSON.parse(fs2.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 {
-            fs8.closeSync(fd);
+            fs2.closeSync(fd);
           } catch {
           }
         }
@@ -366,7 +366,7 @@ function createAuthService(deps = {}) {
     },
     // [HIGH #2] 읽기 경로: fd 기반 O_RDONLY|O_NOFOLLOW 통일
     async listProviderIds() {
-      if (!fs8.existsSync(authPath)) {
+      if (!fs2.existsSync(authPath)) {
         return [];
       }
       try {
@@ -379,7 +379,7 @@ function createAuthService(deps = {}) {
       const dir = path27.dirname(authPath);
       ensureSafeDirectory(dir);
       withAuthLock(authPath, lockDir, () => {
-        const data = fs8.existsSync(authPath) ? readAuthStoreFile(authPath) : {};
+        const data = fs2.existsSync(authPath) ? readAuthStoreFile(authPath) : {};
         data[providerId] = {
           ...data[providerId] ?? {},
           key
@@ -461,21 +461,21 @@ function createDurableJsonStore(deps) {
 function readJsonFile(filePath, sanitize) {
   let fd;
   try {
-    const stat3 = fs8.lstatSync(filePath);
+    const stat3 = fs2.lstatSync(filePath);
     if (!stat3 || !stat3.isFile() || stat3.isSymbolicLink()) {
       return sanitize(void 0);
     }
-    fd = fs8.openSync(filePath, fs8.constants.O_RDONLY | NOFOLLOW_FLAG);
-    if (!fs8.fstatSync(fd).isFile()) {
+    fd = fs2.openSync(filePath, fs2.constants.O_RDONLY | NOFOLLOW_FLAG);
+    if (!fs2.fstatSync(fd).isFile()) {
       return sanitize(void 0);
     }
-    return sanitize(JSON.parse(fs8.readFileSync(fd, "utf-8")));
+    return sanitize(JSON.parse(fs2.readFileSync(fd, "utf-8")));
   } catch {
     return sanitize(void 0);
   } finally {
     if (fd !== void 0) {
       try {
-        fs8.closeSync(fd);
+        fs2.closeSync(fd);
       } catch {
       }
     }
@@ -487,7 +487,7 @@ function ensureSafeDirectoryIfSensitive(dir, sensitivity) {
   }
 }
 
-// ../../packages/fleet-infra/src/global-options/store.ts
+// ../../packages/core-infra/src/data-dir/settings/store.ts
 var GLOBAL_OPTIONS_VERSION = 1;
 var GLOBAL_OPTIONS_FILE_NAME = "settings.json";
 var LOCK_DIR_NAME = "settings.json.lock";
@@ -529,18 +529,17 @@ function sanitizeGlobalOptionsData(value) {
   }
   const data = {
     version: GLOBAL_OPTIONS_VERSION,
-    ...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";
+  const allowedKeys = /* @__PURE__ */ new Set(["version", "enableMetaphor"]);
+  const changed = Object.keys(value).some((key) => !allowedKeys.has(key)) || "enableMetaphor" in value && typeof value.enableMetaphor !== "boolean";
   return { data, changed };
 }
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
-// ../../packages/fleet-infra/src/global-options/service.ts
+// ../../packages/core-infra/src/data-dir/settings/service.ts
 function createGlobalOptionsService(deps = {}) {
   const store2 = deps.store ?? createGlobalOptionsStore({ dataDir: deps.dataDir });
   return {
@@ -556,6 +555,43 @@ function updateGlobalOptions(store2, mutate) {
   return store2.update(mutate);
 }
 
+// ../../packages/core-infra/src/index.ts
+function createInfraServices(deps = {}) {
+  const globalOptionsService = createGlobalOptionsService();
+  const authService = createAuthService({ authPath: deps.authPath ?? DEFAULT_AUTH_PATH });
+  return {
+    authService,
+    globalOptionsService
+  };
+}
+
+// ../../packages/fleet-carriers/src/dispatch/framework.ts
+var framework_exports = {};
+__export(framework_exports, {
+  CarrierRegistry: () => CarrierRegistry,
+  clearRegisteredCarriers: () => clearRegisteredCarriers,
+  createCarrierRegistry: () => createCarrierRegistry,
+  emitStreamEvent: () => emitStreamEvent,
+  getAllCliTypes: () => getAllCliTypes,
+  getCarrierConfig: () => getCarrierConfig,
+  getCarrierSourceDisplayName: () => getCarrierSourceDisplayName,
+  getRegisteredCarrierConfig: () => getRegisteredCarrierConfig,
+  getRegisteredOrder: () => getRegisteredOrder,
+  normalizeEffort: () => normalizeEffort,
+  notifyStatusUpdate: () => notifyStatusUpdate,
+  registerCarrier: () => registerCarrier,
+  registerStreamHandler: () => registerStreamHandler,
+  resetCarrierRegistryForTests: () => resetCarrierRegistryForTests,
+  resolveAgentCliType: () => resolveAgentCliType2,
+  resolveCarrierDisplayName: () => resolveCarrierDisplayName,
+  resolveValidatedEffort: () => resolveValidatedEffort,
+  setTaskForceConfiguredCarriers: () => setTaskForceConfiguredCarriers,
+  toCarrierJobStatus: () => toCarrierJobStatus,
+  toTrackFinalStatus: () => toTrackFinalStatus,
+  unregisterStreamHandler: () => unregisterStreamHandler,
+  updateCarrierCliType: () => updateCarrierCliType
+});
+
 // ../../node_modules/.pnpm/zod@4.4.1/node_modules/zod/v4/classic/external.js
 var external_exports = {};
 __export(external_exports, {
@@ -17356,6 +17392,122 @@ var RequestError = class _RequestError extends Error {
     };
   }
 };
+var DEFAULT_WINDOWS_PATHEXT = ".COM;.EXE;.BAT;.CMD";
+var WINDOWS_PATH_SEPARATOR = ";";
+var WINDOWS_SHIM_EXTENSIONS = /* @__PURE__ */ new Set([".cmd", ".bat"]);
+var CMD_EXPANSION_SENSITIVE_PATTERN = /[%^]/;
+function resolveBinary(defaultBin, overrideName, env, options = {}) {
+  const override = env[overrideName];
+  if (override && override.trim().length > 0) {
+    const resolvedOverride = resolvePathBinary(override, env, options);
+    if (!resolvedOverride) {
+      throw new Error(`${overrideName}="${override}" did not resolve to an executable; provide an absolute path or a name discoverable on PATH`);
+    }
+    return resolvedOverride;
+  }
+  const resolved = resolvePathBinary(defaultBin, env, options);
+  if (!resolved) {
+    throw new Error(`${defaultBin} binary not found; set ${overrideName} or install ${defaultBin} on PATH`);
+  }
+  return resolved;
+}
+function resolvePathBinary(command, env, options = {}) {
+  const resolved = findBinaryPath(command, env, options);
+  return resolved ? wrapWindowsShim(resolved, env, options.platform ?? process.platform) : void 0;
+}
+function findBinaryPath(command, env, options = {}) {
+  const platform = options.platform ?? process.platform;
+  const isWindows2 = platform === "win32";
+  const pathValue = isWindows2 ? env.Path ?? env.PATH ?? "" : env.PATH ?? "";
+  const pathExts = isWindows2 ? parsePathExt(env.PATHEXT) : [""];
+  return findOnPath(command, pathValue, pathExts, platform);
+}
+function createChildEnv(env, overlay) {
+  const child = {};
+  for (const [key, value] of Object.entries(env)) {
+    if (value !== void 0) {
+      child[key] = value;
+    }
+  }
+  for (const [key, value] of Object.entries(overlay)) {
+    if (value !== void 0) {
+      child[key] = value;
+    }
+  }
+  return child;
+}
+function wrapWindowsShim(resolved, env, platform) {
+  if (platform !== "win32" || !WINDOWS_SHIM_EXTENSIONS.has(path27__default.extname(resolved).toLowerCase())) {
+    return { bin: resolved, prefixArgs: [] };
+  }
+  rejectCmdExpansionSensitiveShim(resolved);
+  return {
+    bin: env.ComSpec ?? "cmd.exe",
+    prefixArgs: ["/d", "/s", "/c", "call", forceWindowsArgQuoting(resolved)]
+  };
+}
+function rejectCmdExpansionSensitiveShim(resolved) {
+  if (CMD_EXPANSION_SENSITIVE_PATTERN.test(resolved)) {
+    throw new Error(`Refusing to run Windows shim path with cmd.exe expansion-sensitive characters (% or ^): ${resolved}`);
+  }
+}
+function forceWindowsArgQuoting(value) {
+  return `${value} `;
+}
+function findOnPath(bin, pathValue, pathExts, platform) {
+  const pathSeparator = platform === "win32" ? WINDOWS_PATH_SEPARATOR : path27__default.delimiter;
+  if (hasPathSeparator(bin, platform) || path27__default.isAbsolute(bin)) {
+    return resolveWithExtensions(bin, pathExts, platform);
+  }
+  for (const entry of pathValue.split(pathSeparator)) {
+    const searchDir = entry.length === 0 ? "." : entry;
+    const candidate = resolveWithExtensions(path27__default.join(searchDir, bin), pathExts, platform);
+    if (candidate) {
+      return candidate;
+    }
+  }
+  return void 0;
+}
+function resolveWithExtensions(candidate, pathExts, platform) {
+  if (platform !== "win32" || path27__default.extname(candidate).length > 0) {
+    return isAccessibleExecutable(candidate, platform) ? candidate : void 0;
+  }
+  for (const ext of pathExts) {
+    if (ext.length === 0) {
+      continue;
+    }
+    const withExt = `${candidate}${ext}`;
+    if (existsSync(withExt)) {
+      return withExt;
+    }
+  }
+  return isAccessibleExecutable(candidate, platform) ? candidate : void 0;
+}
+function isAccessibleExecutable(candidate, platform) {
+  if (!existsSync(candidate)) return false;
+  if (platform === "win32") return true;
+  try {
+    accessSync(candidate, constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function hasPathSeparator(value, platform) {
+  if (value.includes("/")) {
+    return true;
+  }
+  return platform === "win32" && value.includes("\\");
+}
+function parsePathExt(pathExt) {
+  const raw = pathExt && pathExt.trim().length > 0 ? pathExt : DEFAULT_WINDOWS_PATHEXT;
+  return raw.split(WINDOWS_PATH_SEPARATOR).map((entry) => entry.trim()).filter((entry) => entry.length > 0);
+}
+
+// ../../packages/core-process/src/hidden.ts
+function withHidden(options) {
+  return { ...options ?? {}, windowsHide: true };
+}
 
 // ../../packages/core-unified-agent/src/utils/env.ts
 var REMOVE_KEYS = [
@@ -17393,12 +17545,7 @@ function killProcess(child, forceTimeoutMs = 3e3) {
   markIntentionalKill(child);
   if (isWindows()) {
     try {
-      execSync(`taskkill /PID ${child.pid} /T /F`, {
-        stdio: "pipe",
-        timeout: 5e3,
-        // 콘솔 없는 호스트에서 taskkill 호출 시 새 콘솔 창이 깜빡이는 것을 방지한다.
-        windowsHide: true
-      });
+      execSync(`taskkill /PID ${child.pid} /T /F`, withHidden({ stdio: "pipe", timeout: 5e3 }));
     } catch {
       child.kill("SIGKILL");
     }
@@ -17501,17 +17648,12 @@ var BaseConnection = class extends EventEmitter {
     const child = isWindows() ? spawn(
       this.env.ComSpec ?? "cmd.exe",
       buildWindowsCmdArgs(this.command, this.args),
-      {
+      withHidden({
         cwd: this.cwd,
         stdio: ["pipe", "pipe", "pipe"],
         env: this.env,
-        windowsVerbatimArguments: true,
-        // 콘솔이 없는 호스트(예: fleet-console 백엔드)에서 cmd.exe를 spawn하면
-        // Windows가 새 콘솔 창을 할당해 깜빡인다. stdio는 모두 pipe라 가시 콘솔이
-        // 불필요하므로 CREATE_NO_WINDOW로 창 생성을 억제한다. (fleet-cli처럼 콘솔이
-        // 이미 있는 경우에도 무해하다.)
-        windowsHide: true
-      }
+        windowsVerbatimArguments: true
+      })
     ) : spawn(this.command, this.args, {
       cwd: this.cwd,
       stdio: ["pipe", "pipe", "pipe"],
@@ -17941,7 +18083,7 @@ var AcpConnection = class extends BaseConnection {
   }
   /** Claude 계열 브릿지인지 여부를 단일 판별 지점으로 유지합니다. */
   isClaudeBackend() {
-    return this.cliType === "claude" || this.cliType === "claude-zai" || this.cliType === "claude-kimi" || this.cliType === "claude-glm";
+    return this.cliType === "claude";
   }
   /** Claude bridge만 native system prompt append를 지원하므로 이 경로만 사용합니다. */
   getClaudeSystemPrompt(systemPrompt) {
@@ -18392,35 +18534,14 @@ function createIdleTimeoutRace(promise2, idleMs, label) {
   });
   return [wrapped, resetTimer];
 }
+
+// ../../packages/core-unified-agent/src/utils/npx.ts
 function resolveNpxPath(env) {
-  const windows = isWindows();
-  const whichCmd = windows ? "where npx" : "which npx";
-  try {
-    const result = execSync(whichCmd, {
-      encoding: "utf-8",
-      stdio: "pipe",
-      timeout: 5e3,
-      env,
-      // 콘솔 없는 호스트에서 `where npx` 실행 시 콘솔 창이 깜빡이는 것을 방지한다.
-      windowsHide: true
-    }).trim();
-    const candidates = result.split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
-    if (windows) {
-      const executable = candidates.find((p) => /\.(cmd|bat|exe)$/i.test(p));
-      if (executable) {
-        return executable;
-      }
-    }
-    if (candidates.length > 0) {
-      return candidates[0];
-    }
-    return windows ? "npx.cmd" : "npx";
-  } catch {
-    if (windows) {
-      return "npx.cmd";
-    }
-    return "npx";
+  const resolved = findBinaryPath("npx", env ?? process.env);
+  if (resolved) {
+    return resolved;
   }
+  return isWindows() ? "npx.cmd" : "npx";
 }
 function buildNpxArgs(packageName, preferOffline = false) {
   const args = ["--yes"];
@@ -18439,10 +18560,10 @@ function inferBinName(packageName) {
 // ../../packages/core-unified-agent/models.json
 var models_default = {
   version: 1,
-  updatedAt: "2026-06-16T00:00:00Z",
+  updatedAt: "2026-07-04T00:00:00Z",
   providers: {
     claude: {
-      name: "Claude Code with Anthropic",
+      name: "Claude Code",
       defaultModel: "opus[1m]",
       models: [
         { modelId: "haiku", name: "Claude Haiku", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "low" } },
@@ -18454,50 +18575,8 @@ var models_default = {
         { 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": {
-      name: "Claude Code with Z.AI GLM",
-      defaultModel: "opus",
-      models: [
-        { modelId: "haiku", name: "GLM-4.5 Air (Haiku slot)", effort: { supported: false } },
-        { modelId: "sonnet", name: "GLM-5 Turbo (Sonnet slot)", effort: { supported: false } },
-        { modelId: "opus", name: "GLM-5.1 (Opus slot)", effort: { supported: false } }
-      ],
-      modelsMapping: {
-        haiku: "glm-4.5-air",
-        sonnet: "glm-5-turbo",
-        opus: "glm-5.1"
-      }
-    },
-    "claude-kimi": {
-      name: "Claude Code with Moonshot Kimi",
-      defaultModel: "opus",
-      models: [
-        { modelId: "haiku", name: "Kimi K2.7 Code (Haiku slot)", effort: { supported: false } },
-        { modelId: "sonnet", name: "Kimi K2.7 Code (Sonnet slot)", effort: { supported: false } },
-        { modelId: "opus", name: "Kimi K2.7 Code (Opus slot)", effort: { supported: false } }
-      ],
-      modelsMapping: {
-        haiku: "kimi-k2.7-code",
-        sonnet: "kimi-k2.7-code",
-        opus: "kimi-k2.7-code"
-      }
-    },
-    "claude-glm": {
-      name: "Claude Code with ZhipuAI GLM",
-      defaultModel: "opus",
-      models: [
-        { modelId: "haiku", name: "GLM-4.5-Air (Haiku slot)", effort: { supported: false } },
-        { modelId: "sonnet", name: "GLM-4.7 (Sonnet slot)", effort: { supported: false } },
-        { modelId: "opus", name: "GLM-5.1 (Opus slot)", effort: { supported: false } }
-      ],
-      modelsMapping: {
-        haiku: "glm-4.5-air",
-        sonnet: "glm-4.7",
-        opus: "glm-5.1"
-      }
-    },
     codex: {
-      name: "OpenAI Codex CLI",
+      name: "Codex",
       defaultModel: "gpt-5.4",
       models: [
         { modelId: "gpt-5.4", name: "GPT-5.4", effort: { supported: true, levels: ["low", "medium", "high", "xhigh"], default: "high" } },
@@ -18513,7 +18592,9 @@ var models_default = {
         { modelId: "opencode-go/deepseek-v4-pro", name: "DeepSeek V4 Pro", effort: { supported: false } },
         { modelId: "opencode-go/glm-5", name: "GLM-5", effort: { supported: false } },
         { modelId: "opencode-go/glm-5.1", name: "GLM-5.1", effort: { supported: false } },
-        { modelId: "opencode-go/kimi-k2.6", name: "Kimi K2.6 (3x limits)", effort: { supported: false } }
+        { modelId: "opencode-go/glm-5.2", name: "GLM-5.2", effort: { supported: false } },
+        { modelId: "opencode-go/kimi-k2.6", name: "Kimi K2.6 (3x limits)", effort: { supported: false } },
+        { modelId: "opencode-go/kimi-k2.7-code", name: "Kimi K2.7 Code", effort: { supported: false } }
       ]
     },
     cursor: {
@@ -18526,9 +18607,9 @@ var models_default = {
         { modelId: "gemini-3.1-pro", name: "Gemini 3.1 Pro", effort: { supported: false } },
         { modelId: "gemini-3-flash", name: "Gemini 3 Flash", effort: { supported: false } },
         { modelId: "gemini-3.5-flash", name: "Gemini 3.5 Flash", effort: { supported: false } },
-        { modelId: "claude-opus-4-7-thinking", name: "Claude Opus 4.7 Thinking", spawnModelTemplate: "claude-opus-4-7-thinking-{effort}", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "xhigh" } },
-        { modelId: "claude-opus-4-8-thinking", name: "Claude Opus 4.8 Thinking", spawnModelTemplate: "claude-opus-4-8-thinking-{effort}", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "xhigh" } },
-        { modelId: "claude-4.6-sonnet-medium-thinking", name: "Claude Sonnet 4.6 Medium Thinking", effort: { supported: false } }
+        { modelId: "kimi-k2.7-code", name: "Kimi K2.7 Code", effort: { supported: false } },
+        { modelId: "glm-5.2", name: "GLM 5.2", spawnModelTemplate: "glm-5.2-{effort}", effort: { supported: true, levels: ["high", "max"], default: "max" } },
+        { modelId: "claude-opus-4-8-thinking", name: "Claude Opus 4.8 Thinking", spawnModelTemplate: "claude-opus-4-8-thinking-{effort}", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "xhigh" } }
       ]
     }
   }
@@ -18699,77 +18780,6 @@ var CLI_BACKENDS = {
     usesNpxBridge: true,
     defaultMaxTokens: 16384
   },
-  "claude-zai": {
-    id: "claude-zai",
-    cliCommand: "claude",
-    protocol: "acp",
-    authRequired: true,
-    npxPackage: "@agentclientprotocol/claude-agent-acp@0.33.1",
-    modes: [
-      { id: "default", label: "Default" },
-      { id: "plan", label: "Plan" },
-      { id: "bypassPermissions", label: "YOLO" }
-    ],
-    supportsSessionClose: true,
-    supportsSessionLoad: true,
-    requiresModelAtSpawn: false,
-    usesNpxBridge: true,
-    defaultMaxTokens: 16384,
-    defaultEnv: {
-      ANTHROPIC_BASE_URL: "https://api.z.ai/api/anthropic",
-      API_TIMEOUT_MS: "3000000"
-    }
-  },
-  "claude-kimi": {
-    id: "claude-kimi",
-    cliCommand: "claude",
-    protocol: "acp",
-    authRequired: true,
-    npxPackage: "@agentclientprotocol/claude-agent-acp@0.33.1",
-    modes: [
-      { id: "default", label: "Default" },
-      { id: "plan", label: "Plan" },
-      { id: "bypassPermissions", label: "YOLO" }
-    ],
-    supportsSessionClose: true,
-    supportsSessionLoad: true,
-    requiresModelAtSpawn: false,
-    usesNpxBridge: true,
-    defaultMaxTokens: 16384,
-    defaultEnv: {
-      ANTHROPIC_BASE_URL: "https://api.kimi.com/coding/",
-      ENABLE_TOOL_SEARCH: "false",
-      ANTHROPIC_MODEL: "kimi-k2.7-code",
-      CLAUDE_CODE_SUBAGENT_MODEL: "kimi-k2.7-code",
-      API_TIMEOUT_MS: "3000000"
-    }
-  },
-  "claude-glm": {
-    id: "claude-glm",
-    cliCommand: "claude",
-    protocol: "acp",
-    authRequired: true,
-    npxPackage: "@agentclientprotocol/claude-agent-acp@0.33.1",
-    modes: [
-      { id: "default", label: "Default" },
-      { id: "plan", label: "Plan" },
-      { id: "bypassPermissions", label: "YOLO" }
-    ],
-    supportsSessionClose: true,
-    supportsSessionLoad: true,
-    requiresModelAtSpawn: false,
-    usesNpxBridge: true,
-    defaultMaxTokens: 16384,
-    defaultEnv: {
-      ANTHROPIC_BASE_URL: "https://open.bigmodel.cn/api/anthropic",
-      // ZhipuAI Claude Code 권장 슬롯 매핑 — 직접 launch(Native PTY) 경로에서도
-      // haiku/sonnet/opus 별칭이 GLM 모델로 해석되도록 env로 고정한다.
-      ANTHROPIC_DEFAULT_HAIKU_MODEL: "glm-4.5-air",
-      ANTHROPIC_DEFAULT_SONNET_MODEL: "glm-4.7",
-      ANTHROPIC_DEFAULT_OPUS_MODEL: "glm-5.1",
-      API_TIMEOUT_MS: "3000000"
-    }
-  },
   codex: {
     id: "codex",
     cliCommand: "codex",
@@ -18864,9 +18874,6 @@ function getBackendConfig(cli) {
 function getYoloModeId(cli) {
   switch (cli) {
     case "claude":
-    case "claude-zai":
-    case "claude-kimi":
-    case "claude-glm":
       return "bypassPermissions";
     case "opencode-go":
       return "build";
@@ -19034,25 +19041,23 @@ var CliDetector = class {
    * @returns 사용 가능 여부
    */
   async isCliAvailable(command) {
-    const whichCommand = isWindows() ? "where" : "which";
-    try {
-      await this.execCommand(whichCommand, [command], 3e3);
+    const resolved = findBinaryPath(command, process.env);
+    if (resolved !== void 0) {
       return true;
-    } catch {
-      if (isWindows()) {
-        try {
-          await this.execCommand(
-            "powershell",
-            ["-NoProfile", "-Command", `Get-Command -All ${command}`],
-            5e3
-          );
-          return true;
-        } catch {
-          return false;
-        }
+    }
+    if (process.platform === "win32") {
+      try {
+        await this.execCommand(
+          "powershell",
+          ["-NoProfile", "-Command", `Get-Command -All ${command}`],
+          5e3
+        );
+        return true;
+      } catch {
+        return false;
       }
-      return false;
     }
+    return false;
   }
   /**
    * CLI의 버전을 감지합니다.
@@ -19076,13 +19081,8 @@ var CliDetector = class {
    * @returns 전체 경로 또는 커맨드 이름
    */
   async getCliPath(command) {
-    const whichCommand = isWindows() ? "where" : "which";
-    try {
-      const result = await this.execCommand(whichCommand, [command], 3e3);
-      return result.split(/\r?\n/)[0].trim();
-    } catch {
-      return command;
-    }
+    const resolved = findBinaryPath(command, process.env);
+    return resolved ?? command;
   }
   /**
    * 외부 명령 실행 결과(stdout)를 문자열로 반환합니다.
@@ -19092,11 +19092,7 @@ var CliDetector = class {
       execFile(
         command,
         args,
-        {
-          encoding: "utf-8",
-          timeout,
-          windowsHide: true
-        },
+        withHidden({ encoding: "utf-8", timeout }),
         (error51, stdout) => {
           if (error51) {
             reject(error51);
@@ -20312,10 +20308,10 @@ function isMissingRolloutError(error51, threadId) {
   return error51 instanceof Error && error51.message.includes(`no rollout found for thread id ${threadId}`);
 }
 function findRolloutPath(root, threadId) {
-  if (!fs8.existsSync(root)) {
+  if (!fs2.existsSync(root)) {
     return null;
   }
-  for (const entry of fs8.readdirSync(root, { withFileTypes: true })) {
+  for (const entry of fs2.readdirSync(root, { withFileTypes: true })) {
     const entryPath = path27.join(root, entry.name);
     if (entry.isDirectory()) {
       const found = findRolloutPath(entryPath, threadId);
@@ -21768,9 +21764,6 @@ var UnifiedAgent = {
   createClient(cli) {
     switch (cli) {
       case "claude":
-      case "claude-zai":
-      case "claude-kimi":
-      case "claude-glm":
         return new UnifiedClaudeAgentClient(cli);
       case "codex":
         return new UnifiedCodexAgentClient();
@@ -21790,7 +21783,7 @@ var UnifiedAgent = {
     const preferred = await new CliDetector().getPreferred();
     if (!preferred) {
       throw new Error(
-        "\uC0AC\uC6A9 \uAC00\uB2A5\uD55C CLI\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. claude, claude-zai, claude-kimi, claude-glm, codex, opencode-go, cursor \uC911 \uD558\uB098\uB97C \uC124\uCE58\uD574\uC8FC\uC138\uC694."
+        "\uC0AC\uC6A9 \uAC00\uB2A5\uD55C CLI\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. claude, codex, opencode-go, cursor \uC911 \uD558\uB098\uB97C \uC124\uCE58\uD574\uC8FC\uC138\uC694."
       );
     }
     return this.createClient(preferred.cli);
@@ -21805,211 +21798,6 @@ var UnifiedAgent = {
   }
 };
 
-// ../../packages/fleet-infra/src/auth/messages.ts
-function formatMissingAuthKeyMessage(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 formatAuthValidationFailureMessage(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}`;
-}
-
-// ../../packages/fleet-infra/src/auth/validation.ts
-var DEFAULT_AUTH_VALIDATION_TIMEOUT_MS = 5e3;
-async function validateAnthropicCompatibleApiKey(request) {
-  const controller = new AbortController();
-  const timeout = setTimeout(() => {
-    controller.abort();
-  }, request.timeoutMs ?? DEFAULT_AUTH_VALIDATION_TIMEOUT_MS);
-  try {
-    const response = await fetch(buildMessagesUrl(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 (error51) {
-    if (isAbortError(error51)) {
-      return { providerId: request.providerId, status: "timeout" };
-    }
-    return {
-      providerId: request.providerId,
-      status: "network",
-      detail: error51 instanceof Error ? error51.message : String(error51)
-    };
-  } finally {
-    clearTimeout(timeout);
-  }
-}
-function isAuthValidationSuccess(result) {
-  return result.status === "success";
-}
-function createAuthValidationError(result) {
-  return new Error(formatAuthValidationFailureMessage(result));
-}
-function buildMessagesUrl(baseUrl) {
-  return `${baseUrl.replace(/\/+$/, "")}/v1/messages`;
-}
-function isAbortError(error51) {
-  return error51 instanceof DOMException && error51.name === "AbortError";
-}
-
-// ../../packages/fleet-infra/src/auth/auth-providers.ts
-var CLI_TO_AUTH_PROVIDER_ID = {
-  "claude-zai": "Claude Code with Z.AI GLM",
-  "claude-kimi": "Claude Code with Moonshot Kimi",
-  "claude-glm": "Claude Code with ZhipuAI GLM"
-};
-var CLAUDE_ZAI_PROVIDER_ID = "Claude Code with Z.AI GLM";
-var CLAUDE_KIMI_PROVIDER_ID = "Claude Code with Moonshot Kimi";
-var CLAUDE_GLM_PROVIDER_ID = "Claude Code with ZhipuAI GLM";
-var AUTH_PROVIDER_DEFINITIONS = {
-  "claude-zai": {
-    providerId: CLAUDE_ZAI_PROVIDER_ID,
-    baseUrl: CLI_BACKENDS["claude-zai"].defaultEnv.ANTHROPIC_BASE_URL,
-    env: CLI_BACKENDS["claude-zai"].defaultEnv
-  },
-  "claude-kimi": {
-    providerId: CLAUDE_KIMI_PROVIDER_ID,
-    baseUrl: CLI_BACKENDS["claude-kimi"].defaultEnv.ANTHROPIC_BASE_URL,
-    env: CLI_BACKENDS["claude-kimi"].defaultEnv
-  },
-  "claude-glm": {
-    providerId: CLAUDE_GLM_PROVIDER_ID,
-    baseUrl: CLI_BACKENDS["claude-glm"].defaultEnv.ANTHROPIC_BASE_URL,
-    env: CLI_BACKENDS["claude-glm"].defaultEnv
-  }
-};
-async function resolveAuthEnv(cli, deps) {
-  const provider = AUTH_PROVIDER_DEFINITIONS[cli];
-  if (!provider) return {};
-  const auth = deps?.authService ?? createAuthService({ authPath: DEFAULT_AUTH_PATH });
-  const token = await auth.getApiKey(provider.providerId);
-  if (!token) {
-    throw new Error(formatMissingAuthKeyMessage({ cli, providerId: provider.providerId }));
-  }
-  const validation = await validateAnthropicCompatibleApiKey({
-    providerId: provider.providerId,
-    apiKey: token,
-    baseUrl: provider.baseUrl
-  });
-  if (!isAuthValidationSuccess(validation)) {
-    const failure = {
-      providerId: validation.providerId,
-      status: validation.status,
-      detail: validation.detail
-    };
-    throw createAuthValidationError(failure);
-  }
-  return { ...provider.env, ANTHROPIC_AUTH_TOKEN: token };
-}
-async function validateAuthKeyForCli(cli, apiKey) {
-  const provider = AUTH_PROVIDER_DEFINITIONS[cli];
-  if (!provider) {
-    return { providerId: cli, status: "success" };
-  }
-  const validation = await validateAnthropicCompatibleApiKey({
-    providerId: provider.providerId,
-    apiKey,
-    baseUrl: provider.baseUrl
-  });
-  if (isAuthValidationSuccess(validation)) {
-    return { providerId: validation.providerId, status: "success" };
-  }
-  return {
-    providerId: validation.providerId,
-    status: validation.status,
-    detail: validation.detail
-  };
-}
-
-// ../../packages/fleet-infra/src/index.ts
-function createInfraServices(deps = {}) {
-  const globalOptionsService = createGlobalOptionsService();
-  const authService = createAuthService({ authPath: deps.authPath ?? DEFAULT_AUTH_PATH });
-  return {
-    authService,
-    globalOptionsService
-  };
-}
-
-// ../../packages/fleet-carriers/src/dispatch/framework.ts
-var framework_exports = {};
-__export(framework_exports, {
-  CarrierRegistry: () => CarrierRegistry,
-  clearRegisteredCarriers: () => clearRegisteredCarriers,
-  createCarrierRegistry: () => createCarrierRegistry,
-  emitStreamEvent: () => emitStreamEvent,
-  getAllCliTypes: () => getAllCliTypes,
-  getCarrierConfig: () => getCarrierConfig,
-  getCarrierSourceDisplayName: () => getCarrierSourceDisplayName,
-  getRegisteredCarrierConfig: () => getRegisteredCarrierConfig,
-  getRegisteredOrder: () => getRegisteredOrder,
-  normalizeEffort: () => normalizeEffort,
-  notifyStatusUpdate: () => notifyStatusUpdate,
-  registerCarrier: () => registerCarrier,
-  registerStreamHandler: () => registerStreamHandler,
-  resetCarrierRegistryForTests: () => resetCarrierRegistryForTests,
-  resolveAgentCliType: () => resolveAgentCliType2,
-  resolveCarrierDisplayName: () => resolveCarrierDisplayName,
-  resolveValidatedEffort: () => resolveValidatedEffort,
-  setTaskForceConfiguredCarriers: () => setTaskForceConfiguredCarriers,
-  toCarrierJobStatus: () => toCarrierJobStatus,
-  toTrackFinalStatus: () => toTrackFinalStatus,
-  unregisterStreamHandler: () => unregisterStreamHandler,
-  updateCarrierCliType: () => updateCarrierCliType
-});
-
 // ../../packages/fleet-carriers/src/constants.ts
 var CLI_PROVIDER_DISPLAY_NAMES = Object.fromEntries(
   Object.keys(CLI_BACKENDS).map((cliType) => [
@@ -22034,21 +21822,17 @@ var store_exports = {};
 __export(store_exports, {
   applyAgentCliTypeSelectionUpdate: () => applyAgentCliTypeSelectionUpdate,
   buildHealedCarriers: () => buildHealedCarriers,
-  filterCarrierAgentModesToRegisteredIds: () => filterCarrierAgentModesToRegisteredIds,
   getAgentCliSelection: () => getAgentCliSelection,
   getCarriersFilePath: () => getCarriersFilePath,
   getConfiguredTaskForceBackends: () => getConfiguredTaskForceBackends,
   getConfiguredTaskForceBackendsFromSnapshot: () => getConfiguredTaskForceBackendsFromSnapshot,
   getConfiguredTaskForceCarrierIds: () => getConfiguredTaskForceCarrierIds,
   getConfiguredTaskForceCarrierIdsFromSnapshot: () => getConfiguredTaskForceCarrierIdsFromSnapshot,
-  getEnabledCarrierSubagentIds: () => getEnabledCarrierSubagentIds,
   getTaskForceModelConfig: () => getTaskForceModelConfig,
   initStore: () => initStore,
-  isCarrierAgentModeSubagent: () => isCarrierAgentModeSubagent,
   loadCarrierDisplayNameOverrides: () => loadCarrierDisplayNameOverrides,
   loadCarrierStates: () => loadCarrierStates,
   normalizeCarrierDisplayNameInput: () => normalizeCarrierDisplayNameInput,
-  readCarrierAgentModeSnapshot: () => readCarrierAgentModeSnapshot,
   readCarriersSnapshot: () => readCarriersSnapshot,
   readFileBackedCarriersSnapshot: () => readFileBackedCarriersSnapshot,
   readRawCarriers: () => readRawCarriers,
@@ -22060,7 +21844,6 @@ __export(store_exports, {
   resolveCarrierState: () => resolveCarrierState,
   sanitizeCarrierDisplayName: () => sanitizeCarrierDisplayName,
   saveAgentCliSelection: () => saveAgentCliSelection,
-  setCarrierAgentMode: () => setCarrierAgentMode,
   store: () => store,
   updateAgentCliSelection: () => updateAgentCliSelection,
   updateAgentCliTypeOverride: () => updateAgentCliTypeOverride,
@@ -22101,9 +21884,6 @@ function sanitizeFreeformText(value) {
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function sanitizeAgentMode(value) {
-  return value === "cli" || value === "subagent" ? value : void 0;
-}
 function sanitizeAgentCliType(value) {
   return typeof value === "string" && value in CLI_BACKENDS ? value : void 0;
 }
@@ -22153,13 +21933,11 @@ function sanitizeTaskforce(value) {
 }
 function sanitizeCarrierState(value) {
   if (!isRecord2(value)) return void 0;
-  const agentMode = sanitizeAgentMode(value.agentMode);
   const agentCliType = sanitizeAgentCliType(value.agentCliType);
   const agentCli = sanitizeAgentCli(value.agentCli);
   const taskforce = sanitizeTaskforce(value.taskforce);
   const displayName = sanitizeFreeformText(value.displayName);
   const result = {};
-  if (agentMode) result.agentMode = agentMode;
   if (agentCliType) result.agentCliType = agentCliType;
   if (Object.keys(agentCli).length > 0) result.agentCli = agentCli;
   if (Object.keys(taskforce).length > 0) result.taskforce = taskforce;
@@ -22187,7 +21965,7 @@ function specToMcpTool(spec) {
 }
 function installExecutorToolCallRouter(runtime, sessionToken, ctx) {
   runtime.server.setOnToolCallArrived(sessionToken, (toolName, args) => {
-    const toolCallId = crypto3.randomUUID();
+    const toolCallId = crypto4.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) }],
@@ -22582,7 +22360,7 @@ function createInProcessMcpServer(deps = {}) {
       if (activeStopPromise) await activeStopPromise;
       if (activeServer && activeServerUrl) return activeServerUrl;
       if (activeStartPromise) return activeStartPromise;
-      activeOpaquePath = `/${crypto3.randomUUID()}`;
+      activeOpaquePath = `/${crypto4.randomUUID()}`;
       activeStartPromise = new Promise((resolve2, reject) => {
         const srv = http.createServer(handleRequest);
         srv.timeout = MCP_SERVER_TIMEOUT_MS;
@@ -22839,7 +22617,7 @@ function createExecutorMcpSession(deps, toolTimeoutSeconds, request) {
     throw new Error("Executor session cwd is required");
   }
   assertNonEmptyExecutorTools(request.serverName, request.specs);
-  const token = crypto3.randomUUID();
+  const token = crypto4.randomUUID();
   registerExecutorSessionTools(runtime.runtime, token, [...request.specs]);
   installExecutorToolCallRouter(runtime.runtime, token, {
     cwd,
@@ -22885,7 +22663,7 @@ function issueSessionToken(deps, sessionTokensByLabel, request) {
     for (const { name, runtime } of deps.runtimes) {
       const tools = runtime.registry.getAllAgentTools();
       assertNonEmptyExecutorTools(name, tools);
-      const token = crypto3.randomUUID();
+      const token = crypto4.randomUUID();
       registerExecutorSessionTools(runtime, token, tools);
       installExecutorToolCallRouter(runtime, token, { cwd, sessionLabel: label, signal: request.signal });
       tokens.push({ name, token });
@@ -23023,104 +22801,6 @@ function assertNoAuthorizationHeader(config2) {
     throw new Error(`Builtin external MCP server "${config2.name}" must not define headers.`);
   }
 }
-var DEFAULT_WINDOWS_PATHEXT = ".COM;.EXE;.BAT;.CMD";
-var WINDOWS_PATH_SEPARATOR = ";";
-var WINDOWS_SHIM_EXTENSIONS = /* @__PURE__ */ new Set([".cmd", ".bat"]);
-var CMD_EXPANSION_SENSITIVE_PATTERN = /[%^]/;
-function resolveBinary(defaultBin, overrideName, env, options = {}) {
-  const override = env[overrideName];
-  if (override && override.trim().length > 0) {
-    const resolvedOverride = resolvePathBinary(override, env, options);
-    if (!resolvedOverride) {
-      throw new Error(`${overrideName}="${override}" did not resolve to an executable; provide an absolute path or a name discoverable on PATH`);
-    }
-    return resolvedOverride;
-  }
-  const resolved = resolvePathBinary(defaultBin, env, options);
-  if (!resolved) {
-    throw new Error(`${defaultBin} binary not found; set ${overrideName} or install ${defaultBin} on PATH`);
-  }
-  return resolved;
-}
-function resolvePathBinary(command, env, options = {}) {
-  const platform = options.platform ?? process.platform;
-  const isWindows2 = platform === "win32";
-  const pathValue = isWindows2 ? env.Path ?? env.PATH ?? "" : env.PATH ?? "";
-  const pathExts = isWindows2 ? parsePathExt(env.PATHEXT) : [""];
-  const resolved = findOnPath(command, pathValue, pathExts, platform);
-  return resolved ? wrapWindowsShim(resolved, env, platform) : void 0;
-}
-function createChildEnv(env, overlay) {
-  const child = {};
-  for (const [key, value] of Object.entries(env)) {
-    if (value !== void 0) {
-      child[key] = value;
-    }
-  }
-  for (const [key, value] of Object.entries(overlay)) {
-    if (value !== void 0) {
-      child[key] = value;
-    }
-  }
-  return child;
-}
-function wrapWindowsShim(resolved, env, platform) {
-  if (platform !== "win32" || !WINDOWS_SHIM_EXTENSIONS.has(path27__default.extname(resolved).toLowerCase())) {
-    return { bin: resolved, prefixArgs: [] };
-  }
-  rejectCmdExpansionSensitiveShim(resolved);
-  return {
-    bin: env.ComSpec ?? "cmd.exe",
-    prefixArgs: ["/d", "/s", "/c", "call", forceWindowsArgQuoting(resolved)]
-  };
-}
-function rejectCmdExpansionSensitiveShim(resolved) {
-  if (CMD_EXPANSION_SENSITIVE_PATTERN.test(resolved)) {
-    throw new Error(`Refusing to run Windows shim path with cmd.exe expansion-sensitive characters (% or ^): ${resolved}`);
-  }
-}
-function forceWindowsArgQuoting(value) {
-  return `${value} `;
-}
-function findOnPath(bin, pathValue, pathExts, platform) {
-  const pathSeparator = platform === "win32" ? WINDOWS_PATH_SEPARATOR : path27__default.delimiter;
-  if (hasPathSeparator(bin, platform) || path27__default.isAbsolute(bin)) {
-    return resolveWithExtensions(bin, pathExts, platform);
-  }
-  for (const entry of pathValue.split(pathSeparator)) {
-    const searchDir = entry.length === 0 ? "." : entry;
-    const candidate = resolveWithExtensions(path27__default.join(searchDir, bin), pathExts, platform);
-    if (candidate) {
-      return candidate;
-    }
-  }
-  return void 0;
-}
-function resolveWithExtensions(candidate, pathExts, platform) {
-  if (platform !== "win32" || path27__default.extname(candidate).length > 0) {
-    return existsSync(candidate) ? candidate : void 0;
-  }
-  for (const ext of pathExts) {
-    if (ext.length === 0) {
-      continue;
-    }
-    const withExt = `${candidate}${ext}`;
-    if (existsSync(withExt)) {
-      return withExt;
-    }
-  }
-  return existsSync(candidate) ? candidate : void 0;
-}
-function hasPathSeparator(value, platform) {
-  if (value.includes("/")) {
-    return true;
-  }
-  return platform === "win32" && value.includes("\\");
-}
-function parsePathExt(pathExt) {
-  const raw = pathExt && pathExt.trim().length > 0 ? pathExt : DEFAULT_WINDOWS_PATHEXT;
-  return raw.split(WINDOWS_PATH_SEPARATOR).map((entry) => entry.trim()).filter((entry) => entry.length > 0);
-}
 
 // ../../packages/core-agent/src/internal/session-errors.ts
 var DEAD_SESSION_PATTERNS = [
@@ -23914,7 +23594,6 @@ __export(state_io_exports, {
   withStoreLock: () => withStoreLock
 });
 var FILENAME = "carriers.json";
-var DEFAULT_STORE_DIRNAME = ".fleet";
 var STALE_SUBAGENT_MODE_FILENAME = "carrier-subagent.json";
 var LOCK_DIRNAME = "carriers.json.lock";
 var LOCK_OWNER_FILENAME = "owner.json";
@@ -23924,10 +23603,11 @@ var runtimeState = {
   lastLocalWriteFingerprint: null
 };
 function initStore(dir) {
-  runtimeState.storeDir = dir;
-  ensureSafeDirectory(dir);
+  const resolvedDir = dir ?? getFleetDataDir();
+  runtimeState.storeDir = resolvedDir;
+  ensureSafeDirectory(resolvedDir);
   withStoreLock(() => {
-    unlinkStaleSubagentModeFile(dir);
+    unlinkStaleSubagentModeFile(resolvedDir);
   });
 }
 function resetStoreForTests() {
@@ -23939,14 +23619,12 @@ function readRawCarriers() {
   return readCarriers();
 }
 function readRawCarriersOrDefaultStore() {
-  return runtimeState.storeDir ? readCarriers() : readCarriersFromDir(resolveDefaultStoreDir());
+  return readCarriers();
 }
 function getCarriersFilePath() {
-  if (!runtimeState.storeDir) return null;
-  return path27.join(runtimeState.storeDir, FILENAME);
+  return path27.join(resolveStoreDir(), FILENAME);
 }
 function updateCarriers(mutator) {
-  if (!runtimeState.storeDir) return;
   withStoreLock(() => {
     const carriers = readCarriers();
     const snapshot = structuredClone(carriers);
@@ -23956,36 +23634,35 @@ function updateCarriers(mutator) {
   });
 }
 function withStoreLock(operation) {
-  if (!runtimeState.storeDir) return operation();
-  fs8.mkdirSync(runtimeState.storeDir, { recursive: true });
-  const lockDir = path27.join(runtimeState.storeDir, LOCK_DIRNAME);
+  const dir = resolveStoreDir();
+  ensureSafeDirectory(dir);
+  const lockDir = path27.join(dir, LOCK_DIRNAME);
   return withDirectoryLock(
     { lockDir, ownerFileName: LOCK_OWNER_FILENAME },
     operation
   );
 }
-function readCarriers() {
-  if (!runtimeState.storeDir) return {};
-  return readCarriersFromDir(runtimeState.storeDir);
+function resolveStoreDir() {
+  return runtimeState.storeDir ?? getFleetDataDir();
 }
-function resolveDefaultStoreDir() {
-  return path27.join(os3.homedir(), DEFAULT_STORE_DIRNAME);
+function readCarriers() {
+  return readCarriersFromDir(resolveStoreDir());
 }
 function readCarriersFromDir(dir) {
   const filePath = path27.join(dir, FILENAME);
   let fd;
   try {
-    const stat3 = fs8.lstatSync(filePath);
+    const stat3 = fs2.lstatSync(filePath);
     if (!stat3.isFile() || stat3.isSymbolicLink()) return {};
-    fd = fs8.openSync(filePath, fs8.constants.O_RDONLY | NOFOLLOW_FLAG);
-    if (!fs8.fstatSync(fd).isFile()) return {};
-    return sanitizeFleetCarriers(JSON.parse(fs8.readFileSync(fd, "utf-8")));
+    fd = fs2.openSync(filePath, fs2.constants.O_RDONLY | NOFOLLOW_FLAG);
+    if (!fs2.fstatSync(fd).isFile()) return {};
+    return sanitizeFleetCarriers(JSON.parse(fs2.readFileSync(fd, "utf-8")));
   } catch {
     return {};
   } finally {
     if (fd !== void 0) {
       try {
-        fs8.closeSync(fd);
+        fs2.closeSync(fd);
       } catch {
       }
     }
@@ -23993,16 +23670,15 @@ function readCarriersFromDir(dir) {
 }
 function recordLastLocalWriteFingerprint(filePath, generation) {
   try {
-    const st = fs8.statSync(filePath);
+    const st = fs2.statSync(filePath);
     runtimeState.lastLocalWriteFingerprint = { generation, mtimeMs: st.mtimeMs, size: st.size };
   } catch {
     runtimeState.lastLocalWriteFingerprint = { generation, mtimeMs: 0, size: 0 };
   }
 }
 function writeCarriers(s) {
-  if (!runtimeState.storeDir) throw new Error("Fleet store is not initialized.");
-  fs8.mkdirSync(runtimeState.storeDir, { recursive: true });
-  const filePath = path27.join(runtimeState.storeDir, FILENAME);
+  const dir = resolveStoreDir();
+  const filePath = path27.join(dir, FILENAME);
   const next = serializeFleetCarriers(s);
   writeAtomicSync(filePath, `${JSON.stringify(next, null, 2)}
 `, { fsync: false, mode: 420 });
@@ -24027,7 +23703,7 @@ function sanitizeFleetCarriers(value) {
 }
 function unlinkStaleSubagentModeFile(dir) {
   try {
-    fs8.unlinkSync(path27.join(dir, STALE_SUBAGENT_MODE_FILENAME));
+    fs2.unlinkSync(path27.join(dir, STALE_SUBAGENT_MODE_FILENAME));
   } catch {
   }
 }
@@ -24229,7 +23905,6 @@ function resolveCarriersRecord(raw, defaultsByCarrier, resolve2) {
 function buildResolvedCarrierState(state, defaults, agentCliType, taskforce) {
   const agentCli = sanitizeAgentCli(state.agentCli);
   return {
-    agentMode: state.agentMode ?? defaults?.defaultAgentMode ?? "cli",
     agentCliType,
     agentCli: {
       ...agentCli,
@@ -24255,57 +23930,6 @@ function resolveSelectionForCliType(stored, cliType, defaults) {
   return { model, effort };
 }
 
-// ../../packages/fleet-carriers/src/store/subagent-mode.ts
-var subagent_mode_exports = {};
-__export(subagent_mode_exports, {
-  filterCarrierAgentModesToRegisteredIds: () => filterCarrierAgentModesToRegisteredIds,
-  getEnabledCarrierSubagentIds: () => getEnabledCarrierSubagentIds,
-  isCarrierAgentModeSubagent: () => isCarrierAgentModeSubagent,
-  readCarrierAgentModeSnapshot: () => readCarrierAgentModeSnapshot,
-  setCarrierAgentMode: () => setCarrierAgentMode
-});
-function readCarrierAgentModeSnapshot(defaultsByCarrier = {}) {
-  const raw = readRawCarriers();
-  const carriers = buildHealedCarriers(defaultsByCarrier);
-  return {
-    agentModes: Object.fromEntries(
-      Object.entries(carriers).filter(([, state]) => state.agentMode === "subagent").map(([id]) => [id, "subagent"])
-    ),
-    generation: raw._meta?.generation ?? 0
-  };
-}
-function isCarrierAgentModeSubagent(carrierId, defaultAgentMode = "cli") {
-  const rawMode = readRawCarriers().carriers?.[carrierId]?.agentMode;
-  return (rawMode ?? defaultAgentMode) === "subagent";
-}
-function setCarrierAgentMode(carrierId, enabled, defaultAgentMode = "cli") {
-  const sanitizedCarrierId = sanitizeConfigKey(carrierId);
-  if (!sanitizedCarrierId) return;
-  const nextAgentMode = enabled ? "subagent" : "cli";
-  updateCarriers((states) => {
-    const carriers = { ...states.carriers ?? {} };
-    const current = carriers[sanitizedCarrierId] ?? {};
-    const next = { ...current };
-    if (nextAgentMode === defaultAgentMode) delete next.agentMode;
-    else next.agentMode = nextAgentMode;
-    carriers[sanitizedCarrierId] = next;
-    states.carriers = carriers;
-  });
-}
-function filterCarrierAgentModesToRegisteredIds(snapshot, registeredCarrierIds) {
-  const allowed = new Set(registeredCarrierIds);
-  return {
-    agentModes: Object.fromEntries(
-      Object.entries(snapshot.agentModes).filter(([carrierId]) => allowed.has(carrierId))
-    ),
-    generation: snapshot.generation
-  };
-}
-function getEnabledCarrierSubagentIds(snapshot, registeredCarrierIds) {
-  const filtered = registeredCarrierIds ? filterCarrierAgentModesToRegisteredIds(snapshot, registeredCarrierIds) : snapshot;
-  return Object.keys(filtered.agentModes).sort();
-}
-
 // ../../packages/fleet-carriers/src/store/taskforce-config.ts
 var taskforce_config_exports = {};
 __export(taskforce_config_exports, {
@@ -24430,13 +24054,11 @@ function isTaskForceCliType(value) {
 // ../../packages/fleet-carriers/src/store/index.ts
 var store = {
   ...state_io_exports,
-  ...subagent_mode_exports,
   ...models_exports,
   ...taskforce_config_exports,
   ...cli_types_exports,
   ...display_names_exports,
   stateIo: state_io_exports,
-  subagentMode: subagent_mode_exports,
   models: models_exports,
   taskforceConfig: taskforce_config_exports,
   cliTypes: cli_types_exports,
@@ -24487,7 +24109,6 @@ function registerCarrier(registry3, config2) {
     existing.defaultModel = config2.defaultModel;
     existing.defaultEffort = config2.defaultEffort;
     existing.carrierMetadata = config2.carrierMetadata;
-    existing.subagent = config2.subagent;
   } else {
     gs.modes.set(config2.id, { config: config2 });
   }
@@ -24631,14 +24252,8 @@ var CHRONICLE_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "sonnet",
       defaultEffort: "low"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "sonnet", defaultEffort: "low" }
-      }
     }
   }
 };
@@ -24731,14 +24346,8 @@ var GENESIS_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "sonnet",
       defaultEffort: "medium"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "sonnet", defaultEffort: "medium" }
-      }
     }
   }
 };
@@ -24806,14 +24415,8 @@ var KIROV_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "opus[1m]",
       defaultEffort: "xhigh"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "opus[1m]", defaultEffort: "xhigh" }
-      }
     }
   }
 };
@@ -24876,14 +24479,8 @@ var NIMITZ_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "opus[1m]",
       defaultEffort: "max"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "opus[1m]", defaultEffort: "xhigh" }
-      }
     }
   }
 };
@@ -24947,14 +24544,8 @@ var OHIO_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "sonnet",
       defaultEffort: "low"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "sonnet", defaultEffort: "low" }
-      }
     }
   }
 };
@@ -25019,14 +24610,8 @@ var SENTINEL_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "sonnet",
       defaultEffort: "max"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "sonnet", defaultEffort: "xhigh" }
-      }
     }
   }
 };
@@ -25082,14 +24667,8 @@ var TEMPEST_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "sonnet",
       defaultEffort: "medium"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "sonnet", defaultEffort: "medium" }
-      }
     }
   }
 };
@@ -25144,14 +24723,8 @@ var VANGUARD_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "haiku",
       defaultEffort: "low"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "haiku", defaultEffort: "low" }
-      }
     }
   }
 };
@@ -25216,24 +24789,14 @@ function registerDefaultCarriers(registry3) {
 }
 function buildDefaultCarrierConfig(registration) {
   const { defaults, metadata } = registration;
-  const claudeSubagentDefaults = defaults.agent.nativeSubagents?.byHost?.claude;
   return {
     id: defaults.id,
     defaultCliType: defaults.agent.dispatch.defaultCliType,
-    defaultAgentMode: defaults.agent.dispatch.defaultAgentMode,
     defaultEffort: defaults.agent.dispatch.defaultEffort,
     defaultModel: defaults.agent.dispatch.defaultModel,
     slot: defaults.slot,
     displayName: defaults.displayName,
-    carrierMetadata: metadata,
-    subagent: {
-      provider: "claude",
-      defaultModel: claudeSubagentDefaults?.defaultModel,
-      defaultEffort: claudeSubagentDefaults?.defaultEffort,
-      byHost: {
-        claude: claudeSubagentDefaults
-      }
-    }
+    carrierMetadata: metadata
   };
 }
 
@@ -25366,7 +24929,7 @@ var StatusOverlayController = class {
 function buildCarrierModelDefaults(config2, cliType) {
   if (!config2) return {};
   if (cliType === "claude") {
-    return config2.subagent?.byHost?.claude ?? {
+    return {
       ...config2.defaultModel ? { defaultModel: config2.defaultModel } : {},
       ...config2.defaultEffort ? { defaultEffort: config2.defaultEffort } : {}
     };
@@ -26427,8 +25990,8 @@ function Create(hidden, enumerable, options = {}) {
   Metrics.create += 1;
   const settings2 = settings_exports.Get();
   const withOptions = Merge(enumerable, options);
-  const withHidden = settings2.enumerableKind ? Merge(withOptions, hidden) : MergeHidden(withOptions, hidden);
-  return settings2.immutableTypes ? Object.freeze(withHidden) : withHidden;
+  const withHidden2 = settings2.enumerableKind ? Merge(withOptions, hidden) : MergeHidden(withOptions, hidden);
+  return settings2.immutableTypes ? Object.freeze(withHidden2) : withHidden2;
 }
 
 // ../../node_modules/.pnpm/typebox@1.1.34/node_modules/typebox/build/system/memory/discard.mjs
@@ -30501,6 +30064,79 @@ function getGuardState() {
   return guardState;
 }
 
+// ../../packages/fleet-carriers/src/jobs/report-extract.ts
+var REPORT_OPEN = "<report>";
+var REPORT_CLOSE = "</report>";
+function extractFinalReport(text) {
+  let openIdx = text.lastIndexOf(REPORT_OPEN);
+  while (openIdx !== -1) {
+    const bodyStart = openIdx + REPORT_OPEN.length;
+    const closeIdx = text.indexOf(REPORT_CLOSE, bodyStart);
+    if (closeIdx !== -1) {
+      const body = text.slice(bodyStart, closeIdx).trim();
+      if (body) return body;
+    }
+    openIdx = openIdx === 0 ? -1 : text.lastIndexOf(REPORT_OPEN, openIdx - 1);
+  }
+  return null;
+}
+
+// ../../packages/fleet-carriers/src/jobs/workspace-manifest.ts
+var WORKSPACE_CHANGE_LIMIT = 200;
+var WORKSPACE_CHANGE_CLEARED_STATUS = "cleared";
+async function captureWorkspaceSnapshot(scanner, cwd) {
+  if (!scanner) return null;
+  try {
+    return await scanner.snapshot(cwd);
+  } catch {
+    return null;
+  }
+}
+async function captureJobWindowManifest(scanner, cwd, baseline) {
+  if (!scanner) return void 0;
+  const end = await captureWorkspaceSnapshot(scanner, cwd);
+  return buildWorkspaceManifest(baseline, end);
+}
+function buildWorkspaceManifest(baseline, end) {
+  if (!baseline || !end) return void 0;
+  const baselineByPath = new Map(baseline.map((entry) => [entry.path, normalizeSnapshotEntry(entry)]));
+  const endChanges = end.map(normalizeSnapshotEntry).filter((entry) => hasWindowChange(baselineByPath.get(entry.path), entry)).map(toManifestEntry);
+  const endPaths = new Set(end.map((entry) => entry.path));
+  const clearedChanges = [...baselineByPath.values()].filter((entry) => !endPaths.has(entry.path)).map((entry) => ({ status: WORKSPACE_CHANGE_CLEARED_STATUS, path: entry.path }));
+  const changes = [...endChanges, ...clearedChanges];
+  const truncated = changes.length > WORKSPACE_CHANGE_LIMIT;
+  const capped = changes.slice(0, WORKSPACE_CHANGE_LIMIT);
+  return {
+    changes: capped,
+    truncated
+  };
+}
+function buildStatLine(changeCount, truncated) {
+  const suffix = changeCount === 1 ? "file" : "files";
+  return `${truncated ? `${WORKSPACE_CHANGE_LIMIT}+` : String(changeCount)} ${suffix} (window-approx)`;
+}
+function normalizeSnapshotEntry(entry) {
+  return {
+    status: entry.status.trim(),
+    path: entry.path,
+    contentHash: entry.contentHash?.trim()
+  };
+}
+function toManifestEntry(entry) {
+  return {
+    status: entry.status,
+    path: entry.path
+  };
+}
+function hasWindowChange(baseline, end) {
+  if (!baseline) return true;
+  if (baseline.status !== end.status) return true;
+  if (baseline.contentHash && end.contentHash) {
+    return baseline.contentHash !== end.contentHash;
+  }
+  return false;
+}
+
 // ../../packages/fleet-carriers/src/jobs/dispatch.ts
 var CARRIER_RESULT_PUSH_PREFIX = "[carrier:result]";
 var CARRIER_JOBS_DOCTRINE = {
@@ -30533,11 +30169,12 @@ var REMINDER_WHITESPACE = /\s+/g;
 var ACTIVE_STATUS_NOTICE = "Job is still running. The [carrier:result] push will be delivered automatically when it finishes \u2014 do not call carrier_jobs again until that push arrives. Stop calling tools now and return control to the user; the push wakes the agent even after this response ends.";
 var ACTIVE_CANCEL_NOTICE = "Cancel did not apply: the job is still running normally, not hung. Long-running carrier jobs are expected \u2014 do not retry cancel without an explicit user request to abort. The [carrier:result] push will arrive automatically; stop calling tools and return control to the user.";
 function buildCarrierResultSystemReminder(input) {
+  const changes = input.summary.workspaceChanges ? buildStatLine(input.summary.workspaceChanges.changes.length, input.summary.workspaceChanges.truncated) : "unavailable";
   const lines = [`- ${input.jobId}: ${sanitizeReminderText(input.summary.summary)}`];
   const metadata = [
     `kind=${input.kind}`,
     `status=${input.status}`,
-    `changes=${sanitizeReminderText(input.summary.workspaceChanges?.statLine ?? "unavailable")}`,
+    `changes=${sanitizeReminderText(changes)}`,
     input.label ? `label=${sanitizeReminderText(input.label)}` : void 0,
     input.taskforceBackend ? `backend=${sanitizeReminderText(input.taskforceBackend)}` : void 0,
     input.error ? `error=${sanitizeReminderText(input.error)}` : void 0
@@ -30564,8 +30201,8 @@ function buildCarrierJobsSchema() {
     })),
     format: typebox_exports.Optional(typebox_exports.Unsafe({
       type: "string",
-      enum: ["summary", "full"],
-      description: "Optional result detail level for renderers and result lookups."
+      enum: ["summary", "full", "raw"],
+      description: `Optional result detail level. "full" returns the final report (extracted deterministically from the carrier's <report> block; falls back to the raw archive when absent). "summary" returns metadata only. "raw" returns the unprocessed full archive (debugging/audit). Defaults to "full" when omitted.`
     }))
   });
 }
@@ -30586,7 +30223,6 @@ function buildCarrierJobsToolSpec() {
 function dispatchCarrierJobsAction(params, now = Date.now()) {
   if (params.action === "list") {
     return {
-      action: "list",
       ok: true,
       active: listActiveJobs(),
       recent: listJobSummaries(now)
@@ -30595,7 +30231,6 @@ function dispatchCarrierJobsAction(params, now = Date.now()) {
   const jobIdError = validateJobId(params.job_id);
   if (jobIdError) {
     return {
-      action: params.action,
       job_id: params.job_id,
       ok: false,
       error: jobIdError
@@ -30606,7 +30241,6 @@ function dispatchCarrierJobsAction(params, now = Date.now()) {
   if (params.action === "result") return resultResponse(jobId, normalizeFormat(params.format), now);
   if (params.action === "cancel") return cancelResponse(jobId, now);
   return {
-    action: String(params.action),
     job_id: jobId,
     ok: false,
     error: "unsupported action"
@@ -30634,7 +30268,6 @@ function statusResponse(jobId, now) {
   const summary = getJobSummary(jobId, now);
   const availability = getAvailability(jobId, summary, now);
   return {
-    action: "status",
     job_id: jobId,
     ok: Boolean(active || summary || availability.full_available),
     status: active?.status ?? summary?.status ?? "not_found",
@@ -30649,8 +30282,6 @@ function resultResponse(jobId, format, now) {
   const availability = getAvailability(jobId, summary, now);
   if (active) {
     return {
-      action: "result",
-      format,
       job_id: jobId,
       ok: false,
       status: active.status,
@@ -30663,8 +30294,6 @@ function resultResponse(jobId, format, now) {
   }
   if (format === "summary") {
     return {
-      action: "result",
-      format,
       job_id: jobId,
       ok: Boolean(summary),
       status: summary?.status ?? "not_found",
@@ -30677,17 +30306,31 @@ function resultResponse(jobId, format, now) {
   const isTaskForceJob = jobId.startsWith("taskforce:");
   const isSubOpJob = isTaskForceJob;
   const serializeOpts = isSubOpJob ? { perSubOpMaxBytes: CARRIER_JOBS_PER_SUBOP_BYTE_CAP, maxBytes: CARRIER_JOBS_GLOBAL_BYTE_CAP } : { maxBytes: CARRIER_JOBS_FULL_RESULT_BYTE_CAP };
-  const fullResult = archive ? serializeJobArchive(archive, serializeOpts) : void 0;
+  let fullResult;
+  let results;
+  if (archive) {
+    if (isTaskForceJob) {
+      results = serializeTaskForceResultsByBackend(archive, format);
+    } else if (format === "raw") {
+      fullResult = serializeJobArchive(archive, serializeOpts);
+    } else {
+      const rawSerialized = serializeJobArchive(archive);
+      const reportBody = extractFinalReport(rawSerialized);
+      if (reportBody !== null) {
+        fullResult = capTextBytes(reportBody, CARRIER_JOBS_FULL_RESULT_BYTE_CAP);
+      } else {
+        fullResult = serializeJobArchive(archive, serializeOpts);
+      }
+    }
+  }
   return {
-    action: "result",
-    format,
     job_id: jobId,
     ok: Boolean(archive),
     status: archive?.status ?? summary?.status ?? "not_found",
     summary: summary ?? void 0,
     ...availability,
     full_result: isTaskForceJob ? void 0 : fullResult,
-    results: archive && isTaskForceJob ? serializeTaskForceResultsByBackend(archive) : void 0,
+    results: archive && isTaskForceJob ? results : void 0,
     error: archive ? void 0 : "full result unavailable or expired"
   };
 }
@@ -30696,7 +30339,6 @@ function cancelResponse(jobId, now) {
   const active = getActiveJob(jobId);
   const summary = getJobSummary(jobId, now);
   return {
-    action: "cancel",
     job_id: jobId,
     ok: result.cancelled,
     cancelled: result.cancelled,
@@ -30710,7 +30352,6 @@ function cancelResponse(jobId, now) {
 function getAvailability(jobId, summary, now) {
   const fullAvailable = hasFinalizedJobArchive(jobId, now);
   return {
-    summary_available: Boolean(summary),
     full_available: fullAvailable,
     full_invalidated: !hasJobArchive(jobId, now) && Boolean(summary)
   };
@@ -30721,9 +30362,10 @@ function validateJobId(jobId) {
   return null;
 }
 function normalizeFormat(format) {
-  return format === "summary" ? "summary" : "full";
+  if (format === "summary" || format === "raw") return format;
+  return "full";
 }
-function serializeTaskForceResultsByBackend(archive) {
+function serializeTaskForceResultsByBackend(archive, format) {
   const grouped = /* @__PURE__ */ new Map();
   const orderedKeys = [];
   for (const block of archive.blocks) {
@@ -30737,13 +30379,30 @@ function serializeTaskForceResultsByBackend(archive) {
   const results = {};
   for (const cliType of orderedKeys) {
     const blocks = grouped.get(cliType);
-    results[cliType] = serializeJobArchive(
-      { ...archive, blocks },
-      { maxBytes: CARRIER_JOBS_PER_SUBOP_BYTE_CAP }
-    );
+    const subArchive = { ...archive, blocks };
+    if (format === "raw") {
+      results[cliType] = serializeJobArchive(subArchive, { maxBytes: CARRIER_JOBS_PER_SUBOP_BYTE_CAP });
+    } else {
+      const rawSerialized = serializeJobArchive(subArchive);
+      const reportBody = extractFinalReport(rawSerialized);
+      if (reportBody !== null) {
+        results[cliType] = capTextBytes(reportBody, CARRIER_JOBS_PER_SUBOP_BYTE_CAP);
+      } else {
+        results[cliType] = serializeJobArchive(subArchive, { maxBytes: CARRIER_JOBS_PER_SUBOP_BYTE_CAP });
+      }
+    }
   }
   return results;
 }
+function capTextBytes(text, maxBytes) {
+  if (Buffer.byteLength(text, "utf8") <= maxBytes) return text;
+  const buf = Buffer.from(text, "utf8");
+  const marker = "\n\n[truncated]";
+  const markerBytes = Buffer.byteLength(marker, "utf8");
+  let end = Math.max(0, maxBytes - markerBytes);
+  while (end > 0 && (buf[end] & 192) === 128) end--;
+  return buf.subarray(0, end).toString("utf8") + marker;
+}
 
 // ../../packages/fleet-carriers/src/jobs/sanitize.ts
 var sanitize_exports = {};
@@ -30839,84 +30498,17 @@ function isEscIntermediate(code) {
   return code >= 32 && code <= 47;
 }
 
-// ../../packages/fleet-carriers/src/jobs/workspace-manifest.ts
-var WORKSPACE_CHANGE_ATTRIBUTION = "window-approximate";
-var WORKSPACE_CHANGE_LIMIT = 200;
-var WORKSPACE_CHANGE_CLEARED_STATUS = "cleared";
-async function captureWorkspaceSnapshot(scanner, cwd) {
-  if (!scanner) return null;
-  try {
-    return await scanner.snapshot(cwd);
-  } catch {
-    return null;
-  }
-}
-async function captureJobWindowManifest(scanner, cwd, baseline) {
-  if (!scanner) {
-    return unavailableWorkspaceManifest("scanner-not-configured");
-  }
-  const end = await captureWorkspaceSnapshot(scanner, cwd);
-  return buildWorkspaceManifest(baseline, end);
-}
-function buildWorkspaceManifest(baseline, end, reason) {
-  if (!baseline || !end) {
-    return unavailableWorkspaceManifest("snapshot-unavailable");
-  }
-  const baselineByPath = new Map(baseline.map((entry) => [entry.path, normalizeSnapshotEntry(entry)]));
-  const endChanges = end.map(normalizeSnapshotEntry).filter((entry) => hasWindowChange(baselineByPath.get(entry.path), entry)).map(toManifestEntry);
-  const endPaths = new Set(end.map((entry) => entry.path));
-  const clearedChanges = [...baselineByPath.values()].filter((entry) => !endPaths.has(entry.path)).map((entry) => ({ status: WORKSPACE_CHANGE_CLEARED_STATUS, path: entry.path }));
-  const changes = [...endChanges, ...clearedChanges];
-  const truncated = changes.length > WORKSPACE_CHANGE_LIMIT;
-  const capped = changes.slice(0, WORKSPACE_CHANGE_LIMIT);
-  return {
-    attribution: WORKSPACE_CHANGE_ATTRIBUTION,
-    available: true,
-    changes: capped,
-    statLine: buildStatLine(changes.length, truncated),
-    truncated
-  };
-}
-function unavailableWorkspaceManifest(reason) {
-  return {
-    attribution: WORKSPACE_CHANGE_ATTRIBUTION,
-    available: false,
-    reason,
-    changes: [],
-    statLine: "unavailable",
-    truncated: false
-  };
-}
-function normalizeSnapshotEntry(entry) {
-  return {
-    status: entry.status.trim(),
-    path: entry.path,
-    contentHash: entry.contentHash?.trim()
-  };
-}
-function toManifestEntry(entry) {
-  return {
-    status: entry.status,
-    path: entry.path
-  };
-}
-function hasWindowChange(baseline, end) {
-  if (!baseline) return true;
-  if (baseline.status !== end.status) return true;
-  if (baseline.contentHash && end.contentHash) {
-    return baseline.contentHash !== end.contentHash;
-  }
-  return false;
-}
-function buildStatLine(changeCount, truncated) {
-  const suffix = changeCount === 1 ? "file" : "files";
-  return `${truncated ? `${WORKSPACE_CHANGE_LIMIT}+` : String(changeCount)} ${suffix} (window-approx)`;
-}
-
 // ../../packages/fleet-carriers/src/dispatch/prompt.ts
 var CARRIER_FLEET_BACKGROUND = String.raw`You are an autonomous agent (Carrier) operating within a coordinated multi-agent Fleet system. The Admiral, your superior, dispatches specialized tasks to you and synthesizes your output for the user. Below is your identity, operational permissions, behavioral principles, and required output format. Your assigned task arrives in the user message channel below.`;
+var COMMON_RESPONSE_PROTOCOL = `<response_protocol>
+Keep progress narration concise \u2014 at most one line per meaningful step. No verbose play-by-play or step-by-step essays (short streaming lines are acceptable for the live observation channel).
+
+When the mission is complete, wrap the entire final output in a <report>...</report> tag and emit it exactly once, at the very end. The Admiral retrieves only the report block, so everything you need to convey \u2014 results, evidence, file paths, caveats \u2014 must be inside it. Your persona's output_format structure applies inside the report block as usual.
+
+Do not mention or demonstrate the literal opening and closing report tag anywhere in the body outside that final block.
+</response_protocol>`;
 function buildCarrierSystemPrompt(metadata) {
-  const parts = [CARRIER_FLEET_BACKGROUND];
+  const parts = [CARRIER_FLEET_BACKGROUND, COMMON_RESPONSE_PROTOCOL];
   if (metadata) {
     parts.push(`<your_identity>
 ${metadata.title}
@@ -31376,7 +30968,6 @@ function buildCarrierDispatchToolSpec(registry3, deps) {
         });
       }
       const metadata = config2.carrierMetadata;
-      const isNativeSubagentMode = isCarrierAgentModeSubagent(carrierId, config2.defaultAgentMode);
       if (metadata) {
         const blockValidation = validateRequiredRequestBlocks(metadata, request, carrierId);
         if (!blockValidation.ok) {
@@ -31387,7 +30978,7 @@ function buildCarrierDispatchToolSpec(registry3, deps) {
           });
         }
       }
-      if (!isNativeSubagentMode && getConfiguredTaskForceBackends(carrierId).length >= 2) {
+      if (getConfiguredTaskForceBackends(carrierId).length >= 2) {
         return launchTaskForceJob({
           registry: registry3,
           carrierId,
@@ -31622,7 +31213,6 @@ function resolveCarrierTrackModelInfo(registry3, carrierId) {
   const modelConfig = loadCarrierStates({
     [carrierId]: carrierConfig ? {
       cliType,
-      ...carrierConfig.defaultAgentMode ? { defaultAgentMode: carrierConfig.defaultAgentMode } : {},
       ...carrierConfig.defaultEffort ? { defaultEffort: carrierConfig.defaultEffort } : {},
       ...carrierConfig.defaultModel ? { defaultModel: carrierConfig.defaultModel } : {}
     } : cliType
@@ -31710,72 +31300,6 @@ function formatRequestBlocksGuide(meta3) {
   });
 }
 
-// ../../packages/fleet-carriers/src/subagents/index.ts
-var subagents_exports = {};
-__export(subagents_exports, {
-  CLAUDE_SUBAGENT_COLORS: () => CLAUDE_SUBAGENT_COLORS,
-  buildClaudeSubagentDefinition: () => buildClaudeSubagentDefinition,
-  buildClaudeSubagentDefinitions: () => buildClaudeSubagentDefinitions,
-  buildClaudeSubagentName: () => buildClaudeSubagentName
-});
-
-// ../../packages/fleet-carriers/src/subagents/claude.ts
-var NAME_SEGMENT_SPLIT_PATTERN = /[^a-zA-Z0-9]+/;
-var CLAUDE_MAX_EFFORT = "xhigh";
-var CLAUDE_SUBAGENT_COLORS = {
-  nimitz: "blue",
-  vanguard: "cyan",
-  chronicle: "green",
-  genesis: "orange",
-  kirov: "purple",
-  ohio: "yellow",
-  sentinel: "red",
-  tempest: "pink"
-};
-function buildClaudeSubagentDefinitions(options) {
-  const enabled = new Set(options.enabledCarrierIds);
-  return options.carrierConfigs.filter((config2) => enabled.has(config2.id)).map((config2) => buildClaudeSubagentDefinition(config2));
-}
-function buildClaudeSubagentDefinition(config2) {
-  const color = CLAUDE_SUBAGENT_COLORS[config2.id];
-  const effort = getClaudeEffort(config2);
-  const model = getClaudeModel(config2);
-  const definition = {
-    carrierId: config2.id,
-    ...color ? { color } : {},
-    description: buildDescription(config2),
-    ...effort ? { effort } : {},
-    ...model ? { model } : {},
-    name: buildClaudeSubagentName(config2.id),
-    prompt: buildCarrierSystemPrompt(config2.carrierMetadata)
-  };
-  return definition;
-}
-function buildClaudeSubagentName(carrierId) {
-  const lowerCaseName = carrierId.split(NAME_SEGMENT_SPLIT_PATTERN).filter((segment) => segment.length > 0).map((segment) => segment.toLowerCase()).join("");
-  return lowerCaseName || "carrier";
-}
-function buildDescription(config2) {
-  const metadata = config2.carrierMetadata;
-  const parts = [
-    config2.displayName,
-    metadata?.title,
-    metadata?.summary,
-    metadata?.whenToUse?.length ? `Use for: ${metadata.whenToUse.join(", ")}.` : void 0
-  ];
-  return parts.filter((part) => typeof part === "string" && part.trim().length > 0).join(" - ").replace(/\s+/g, " ").trim();
-}
-function getClaudeEffort(config2) {
-  const effort = config2.subagent?.byHost?.claude?.defaultEffort ?? config2.subagent?.defaultEffort;
-  return clampClaudeEffort(effort);
-}
-function getClaudeModel(config2) {
-  return config2.subagent?.byHost?.claude?.defaultModel ?? config2.subagent?.defaultModel;
-}
-function clampClaudeEffort(effort) {
-  return effort === "max" ? CLAUDE_MAX_EFFORT : effort;
-}
-
 // ../../packages/fleet-carriers/src/index.ts
 var dispatch = {
   ...framework_exports,
@@ -31814,7 +31338,6 @@ function createCarrierRuntime() {
     dispatch,
     jobs: boundCarrierJobs,
     personas: personas_exports,
-    subagents: subagents_exports,
     store: store_exports,
     stream: boundStream,
     registerCarrierDefaults() {
@@ -32090,6 +31613,10 @@ Disposition (report one line): ${"`"}inspection: pass${"`"} | ${"`"}inspection:
 deviations corrected by the Admiral${"`"} | ${"`"}inspection: rejected — re-dispatched
 with findings${"`"}. Small deviations the Admiral corrects directly during
 integration; systematic deviations route back to the owning carrier.
+"Small/harmless" is a claim that needs evidence, not an eyeball impression:
+before so classifying a deviation, confirm it changes no observable behavior,
+contract, or output and is unreachable by any real execution path; if
+unconfirmed, treat it as a defect, not a small deviation.
 Proportionality: full-diff reading for doctrine/prompt/structural changes;
 stat + targeted sampling for large mechanical changes. Read-only jobs skip
 this gate — their claims route through Deep Dive instead.
@@ -32239,12 +31766,11 @@ function createClaudeFamilyCliDefinition(options) {
     label: options.label,
     async createProfile(profileOptions) {
       const { bin, prefixArgs } = resolveBinary("claude", "CLAUDE_BIN", profileOptions.env);
-      const authEnv = options.authCli && profileOptions.authEnvResolver ? await profileOptions.authEnvResolver(options.authCli, { authService: profileOptions.authService }) : {};
       return {
         args: [...prefixArgs, ...buildModelArgs(profileOptions.model)],
         bin,
         cwd: profileOptions.cwd,
-        env: createChildEnv(profileOptions.env, authEnv),
+        env: createChildEnv(profileOptions.env, {}),
         id: options.id,
         label: options.label,
         messagePolicy: {
@@ -32269,20 +31795,6 @@ var claudeCli = createClaudeFamilyCliDefinition({
   label: "Claude"
 });
 
-// ../../packages/fleet-admiral/src/agent-cli/claude-glm/claude-glm.ts
-var claudeGlmCli = createClaudeFamilyCliDefinition({
-  authCli: "claude-glm",
-  id: "claude-glm",
-  label: "Claude GLM"
-});
-
-// ../../packages/fleet-admiral/src/agent-cli/claude-kimi/claude-kimi.ts
-var claudeKimiCli = createClaudeFamilyCliDefinition({
-  authCli: "claude-kimi",
-  id: "claude-kimi",
-  label: "Claude Kimi"
-});
-
 // ../../packages/fleet-admiral/src/agent-cli/codex/codex.ts
 var codexCli = {
   id: "codex",
@@ -32315,19 +31827,43 @@ function buildModelArgs2(model) {
   return model === void 0 ? [] : ["--model", model];
 }
 
+// ../../packages/fleet-admiral/src/agent-cli/cursor/cursor.ts
+var cursorCli = {
+  id: "cursor",
+  label: "Cursor",
+  async createProfile(options) {
+    const { bin, prefixArgs } = resolveBinary("cursor-agent", "CURSOR_AGENT_BIN", options.env);
+    return {
+      args: [...prefixArgs, ...buildModelArgs3(options.model)],
+      bin,
+      binPrefixArgs: prefixArgs,
+      cwd: options.cwd,
+      env: createChildEnv(options.env, {}),
+      id: "cursor",
+      label: "Cursor",
+      messagePolicy: {
+        bracketedPaste: true,
+        lineTerminator: "\r",
+        multilineStrategy: "paste-mode"
+      },
+      terminalName: "xterm-256color"
+    };
+  }
+};
+function buildModelArgs3(model) {
+  return model === void 0 ? [] : ["--model", model];
+}
+
 // ../../packages/fleet-admiral/src/agent-cli/registry.ts
 var DEFAULT_CLI_ID = "claude";
 var DEFINITIONS = {
   claude: claudeCli,
-  "claude-kimi": claudeKimiCli,
-  "claude-glm": claudeGlmCli,
-  codex: codexCli
+  codex: codexCli,
+  cursor: cursorCli
 };
 async function resolveAgentCliProfile(env, cwd, options = {}) {
   const id = resolveAgentCliId(env, options);
   return DEFINITIONS[id].createProfile({
-    authEnvResolver: options.authEnvResolver,
-    authService: options.authService,
     cwd,
     env,
     model: options.model,
@@ -32365,17 +31901,13 @@ var AGENT_CLI_INJECTION_CAPABILITIES = {
     builderId: "claude-native",
     enabled: true
   },
-  "claude-kimi": {
-    builderId: "claude-native",
-    enabled: true
-  },
-  "claude-glm": {
-    builderId: "claude-native",
-    enabled: true
-  },
   codex: {
     builderId: "codex-native",
     enabled: true
+  },
+  cursor: {
+    builderId: "cursor-native",
+    enabled: true
   }
 };
 function getAgentCliInjectionCapability(cliId) {
@@ -32391,45 +31923,16 @@ function createSessionCaptureHookExec(deps) {
     deps.provider
   ] : [deps.entryPath, "hook", "capture-session", deps.provider];
   return {
-    command: deps.execPath ?? process4.execPath,
+    command: deps.execPath ?? process5.execPath,
     args
   };
 }
 
-// ../../packages/fleet-admiral/src/agent-cli/carrier-defaults.ts
-function buildHostCarrierModelDefaults(config2) {
-  const cliType = resolveAgentCliType2(config2.id, config2.defaultCliType);
-  const cliDefaults = buildCarrierModelDefaults(config2, cliType);
-  return {
-    cliType,
-    ...config2.defaultAgentMode ? { defaultAgentMode: config2.defaultAgentMode } : {},
-    ...cliDefaults.defaultEffort ? { defaultEffort: cliDefaults.defaultEffort } : {},
-    ...cliDefaults.defaultModel ? { defaultModel: cliDefaults.defaultModel } : {}
-  };
-}
-function buildClaudeNativeSubagentPlan(registry3) {
-  const carrierIds = getRegisteredOrder(registry3);
-  const carrierConfigs = carrierIds.map((carrierId) => getCarrierConfig(registry3, carrierId)).filter((config2) => config2 !== void 0);
-  const defaultsByCarrier = Object.fromEntries(
-    carrierConfigs.map((config2) => [config2.id, buildHostCarrierModelDefaults(config2)])
-  );
-  const enabledCarrierIds = getEnabledCarrierSubagentIds(
-    readCarrierAgentModeSnapshot(defaultsByCarrier),
-    carrierIds
-  );
-  return {
-    carrierConfigs,
-    definitions: buildClaudeSubagentDefinitions({ carrierConfigs, enabledCarrierIds }),
-    enabledCarrierIds
-  };
-}
-
 // ../../packages/fleet-admiral/src/agent-cli/builders/claude.ts
 function buildClaudeNativeArgs(context) {
-  const systemPromptArg = context.replaceSystemPrompt ? "--system-prompt-file" : "--append-system-prompt-file";
   return [
     ...buildResumeArgs2(context.resumeSessionId),
-    systemPromptArg,
+    "--append-system-prompt-file",
     requireSystemPromptFile(context),
     ...context.pluginRoots.flatMap((pluginRoot) => [
       "--plugin-dir",
@@ -32459,8 +31962,6 @@ function requireSystemPromptFile(context) {
   if (context.systemPromptFile) return context.systemPromptFile;
   throw new Error("Claude system prompt file is required for native injection");
 }
-
-// ../../packages/fleet-admiral/src/agent-cli/builders/toml.ts
 var TOML_BASIC_STRING_ESCAPE_PATTERN = /[\u0000-\u001f"\\\u007f]/g;
 var TOML_MULTILINE_CONTROL_PATTERN = new RegExp("[\\u0000-\\u0008\\u000b-\\u001f\\u007f]", "g");
 var TOML_MULTILINE_QUOTE_RUN_PATTERN = /"+/g;
@@ -32504,9 +32005,16 @@ function escapeTomlMultilineString(value) {
 function buildPosixShellCommand(values) {
   return values.map(posixShellQuote).join(" ");
 }
+function buildHostShellCommand(values, platform = process5.platform) {
+  if (platform === "win32") return values.map(windowsShellQuote).join(" ");
+  return buildPosixShellCommand(values);
+}
 function posixShellQuote(value) {
   return `'${value.replaceAll("'", "'\\''")}'`;
 }
+function windowsShellQuote(value) {
+  return `"${value.replaceAll('"', '""')}"`;
+}
 
 // ../../packages/fleet-admiral/src/agent-cli/builders/codex.ts
 var CODEX_TOOL_TIMEOUT_SEC = 1800;
@@ -32523,10 +32031,7 @@ function buildCodexNativeArgs(context) {
     "-c",
     'approval_policy="never"',
     "-c",
-    'sandbox_mode="danger-full-access"',
-    // hook 신뢰 프롬프트("Hooks need review")를 fleet 관리 세션에서 건너뛴다. bypass_hook_trust는
-    // config 키가 아니라 전용 CLI 플래그이므로 -c override가 아닌 플래그로 전달해야 한다.
-    "--dangerously-bypass-hook-trust"
+    'sandbox_mode="danger-full-access"'
   ];
   for (const server of context.mcpServers) {
     const prefix = `mcp_servers.${server.name}`;
@@ -32550,6 +32055,24 @@ function requireCodexProfileName(context) {
   throw new Error("Codex profile name is required for native injection");
 }
 
+// ../../packages/fleet-admiral/src/agent-cli/builders/cursor.ts
+function buildCursorNativeArgs(context) {
+  return [
+    ...buildResumeArgs4(context.resumeSessionId),
+    ...context.pluginRoots.flatMap((pluginRoot) => [
+      "--plugin-dir",
+      pluginRoot
+    ]),
+    "--sandbox",
+    "disabled",
+    "--force",
+    ...context.mcpServers.length > 0 ? ["--approve-mcps"] : []
+  ];
+}
+function buildResumeArgs4(resumeSessionId) {
+  return resumeSessionId === void 0 ? [] : ["--resume", resumeSessionId];
+}
+
 // ../../packages/fleet-admiral/src/agent-cli/assets.generated.ts
 var EMBEDDED_AGENT_CLI_SKILL_ASSETS = [
   { relativePath: "assumption-audit/SKILL.md", content: "---\nname: assumption-audit\ndescription: Resolve decision-shaped Context Confidence gate failures one blocking gap at a time before the active protocol re-applies its planning boundary.\n---\n\nUse this auxiliary skill only when the active protocol or Context Confidence re-entry path has already found an unresolved blocking gap and the gap is decision-shaped. This skill is not a protocol mode, does not replace the active protocol, and cannot declare the planning boundary passed by itself.\n\nFor each unresolved blocking gap, triage the gap before questioning:\n\n- **Scout-shaped**: the answer should come from direct file reads, focused reconnaissance, carrier scouting, or another verifiable evidence source. Send the workflow back to that evidence-gathering path instead of asking the user to decide.\n- **Decision-shaped**: the answer depends on preference, scope, risk appetite, product intent, or authority that evidence alone cannot settle. Ask exactly one question for this gap.\n- **Escalation-shaped**: the answer requires authority beyond the current operator, changes the mission boundary, repeatedly fails to resolve, or would weaken the active protocol's required gate. Escalate to the Admiral of the Navy (\uB300\uC6D0\uC218).\n\nWhen a gap is decision-shaped, ask one question at a time. Present your recommended answer first, then give one or two concrete alternatives when useful. Walk decision dependencies one branch at a time until the current gap is resolved; do not bundle unrelated gaps into the same question.\n\nAfter the gap is answered, report the resolved decision in one short line and return control to the active protocol or Context Confidence Standing Order. The active workflow must re-evaluate confidence and re-apply the required planning boundary gate before planning proceeds.\n" },
@@ -32717,50 +32240,59 @@ function assertSegmentRealpathWithinRoot(resolvedBase, segmentPath) {
 }
 
 // ../../packages/fleet-admiral/src/agent-cli/plugin/fleet.ts
-var CLAUDE_AGENT_FILE_STEM_ALLOWLIST = /^[A-Za-z0-9][A-Za-z0-9_-]{0,79}$/;
+var CURSOR_DOCTRINE_RULE_FILE = "fleet-doctrine.mdc";
+var CURSOR_DOCTRINE_RULE_FRONTMATTER = `---
+description: Fleet Admiral operating doctrine. Always apply in Fleet-launched Cursor Agent sessions.
+globs:
+alwaysApply: true
+---
+`;
+var CURSOR_DOCTRINE_RULE_PREAMBLE = `# Fleet Runtime Doctrine for Cursor Agent
+
+You are running as Cursor Agent inside Fleet. Cursor provides this file as a persistent rule, not as a native system prompt. For this Fleet-launched session, treat the embedded Fleet system prompt below as your active Fleet runtime doctrine.
+
+Priority and interpretation:
+
+- Follow higher-priority platform, system, developer, and direct user instructions first.
+- Within Cursor rules, project instructions, and other same-layer guidance, this Fleet doctrine is the governing instruction set for Fleet identity, roles, workflow, carrier operations, and reporting.
+- Treat Fleet identity and role names from the embedded prompt as the identity anchor for this session. Do not replace them with generic Cursor Agent identity when answering, planning, or delegating.
+- Do not treat this document as optional background or reference material. Apply it continuously when deciding who you are, how Fleet roles are named, which protocol applies, and how to report work.
+- Do not merely summarize or acknowledge the embedded prompt. Execute the operational requirements it defines, including protocol selection, evidence thresholds, carrier routing, and result reporting.
+- If other same-layer Cursor rules conflict with this doctrine, preserve the Fleet doctrine unless the user's latest explicit instruction requires a narrower task-specific exception.
+- When unsure whether a Fleet instruction applies, prefer following the Fleet doctrine and briefly surface the uncertainty instead of silently ignoring it.
+
+## Embedded Fleet System Prompt
+
+The following block is the Fleet system prompt content adapted for Cursor's rules mechanism. It is intentionally embedded verbatim after this wrapper.
+
+<fleet-system-prompt>
+`;
+var CURSOR_DOCTRINE_RULE_FOOTER = `
+</fleet-system-prompt>
+`;
 var assetBundle = {
   description: "Fleet carrier delegation and wiki evidence plugin",
   directoryName: "fleet",
   displayName: "Fleet",
   hashFileName: ".fleet-codex-plugin.hash",
-  includeClaudeAgents: true,
   name: "fleet",
   source: "asset"
 };
 function renderAssetPluginRoot(pluginRoot, bundle, options) {
   renderEmbeddedSkillAssets(pluginRoot);
-  if (bundle.includeClaudeAgents) {
-    for (const subagent of options.claudeDefinitions) {
-      const fileStem = parseClaudeAgentFileStem(subagent.name);
-      writePrivateFile(path27__default.join(pluginRoot, "agents", `${fileStem}.md`), claudeAgentFile(subagent), pluginRoot);
-    }
-  }
-  if (options.cliId === "claude" || options.cliId === "claude-kimi" || options.cliId === "claude-glm") {
+  if (options.cliId === "claude") {
     writePrivateJson(path27__default.join(pluginRoot, "hooks", "hooks.json"), claudeHooks(options), pluginRoot);
   }
-}
-function validateClaudeAgentFileStems(subagents) {
-  for (const subagent of subagents) {
-    parseClaudeAgentFileStem(subagent.name);
+  if (options.cliId === "cursor") {
+    renderCursorPluginRoot(pluginRoot, options);
   }
 }
-function parseClaudeAgentFileStem(name) {
-  if (CLAUDE_AGENT_FILE_STEM_ALLOWLIST.test(name) && path27__default.basename(name) === name) return name;
-  throw new Error(`Invalid Claude agent file name: ${name}`);
-}
 function claudeHooks(options) {
-  const hookExec = options.hookExec;
-  if (!hookExec) {
-    throw new Error("Fleet Claude session hook command is required");
-  }
   const userPromptSubmitExecs = [options.captureSessionHookExec, options.turnStartHookExec, options.autoNameHookExec].filter((exec) => exec !== void 0);
   const stopExecs = [options.turnEndHookExec].filter((exec) => exec !== void 0);
   const inputWaitingExec = options.inputWaitingHookExec;
   return {
     hooks: {
-      SessionStart: [{
-        hooks: [claudeCommandHook(hookExec)]
-      }],
       ...userPromptSubmitExecs.length > 0 ? {
         UserPromptSubmit: [{
           hooks: userPromptSubmitExecs.map(claudeCommandHook)
@@ -32785,9 +32317,6 @@ function claudeHooks(options) {
   };
 }
 function claudeCommandHook(hookExec) {
-  if (!hookExec) {
-    throw new Error("Fleet Claude session hook command is required");
-  }
   return {
     // exec 형식: command는 직접 spawn되는 실행 파일, args는 셸 토크나이징 없이 그대로 전달된다.
     // Windows cmd/powershell의 따옴표 규칙과 무관하게 동작하며 공백 포함 경로도 안전하다.
@@ -32796,22 +32325,59 @@ function claudeCommandHook(hookExec) {
     type: "command"
   };
 }
-function claudeAgentFile(subagent) {
-  const frontmatter = [
-    "---",
-    `name: ${yamlScalar(subagent.name)}`,
-    `description: ${yamlScalar(subagent.description)}`,
-    ...subagent.model ? [`model: ${yamlScalar(subagent.model)}`] : [],
-    ...subagent.effort ? [`effort: ${yamlScalar(subagent.effort)}`] : [],
-    ...subagent.color ? [`color: ${yamlScalar(subagent.color)}`] : [],
-    "background: true",
-    "---",
-    ""
-  ];
-  return [...frontmatter, subagent.prompt, ""].join("\n");
+function renderCursorPluginRoot(pluginRoot, options) {
+  if (options.doctrine !== void 0) {
+    renderCursorDoctrineRule(pluginRoot, options.doctrine);
+  }
+  if ((options.mcpServers ?? []).length > 0) {
+    writePrivateJson(path27__default.join(pluginRoot, "mcp.json"), cursorMcpConfig(options.mcpServers ?? []), pluginRoot);
+  }
+  const hooks = cursorHooks(options);
+  if (hooks !== void 0) {
+    writePrivateJson(path27__default.join(pluginRoot, "hooks", "hooks.json"), hooks, pluginRoot);
+  }
 }
-function yamlScalar(value) {
-  return JSON.stringify(value);
+function renderCursorDoctrineRule(pluginRoot, doctrine) {
+  writePrivateFile(
+    path27__default.join(pluginRoot, "rules", CURSOR_DOCTRINE_RULE_FILE),
+    `${CURSOR_DOCTRINE_RULE_FRONTMATTER}${CURSOR_DOCTRINE_RULE_PREAMBLE}${doctrine}${CURSOR_DOCTRINE_RULE_FOOTER}`,
+    pluginRoot
+  );
+}
+function cursorMcpConfig(servers) {
+  return {
+    mcpServers: Object.fromEntries(
+      servers.map((server) => [server.name, {
+        type: "http",
+        url: server.endpointUrl,
+        headers: {
+          Authorization: `Bearer ${server.bearerToken}`
+        }
+      }])
+    )
+  };
+}
+function cursorHooks(options) {
+  const sessionStartExecs = [options.captureSessionHookExec].filter((exec) => exec !== void 0);
+  const beforeSubmitPromptExecs = [options.turnStartHookExec, options.autoNameHookExec].filter((exec) => exec !== void 0);
+  const stopExecs = [options.turnEndHookExec].filter((exec) => exec !== void 0);
+  if (sessionStartExecs.length === 0 && beforeSubmitPromptExecs.length === 0 && stopExecs.length === 0) return void 0;
+  return {
+    version: 1,
+    hooks: {
+      ...sessionStartExecs.length > 0 ? {
+        sessionStart: sessionStartExecs.map((exec) => cursorCommandHook(exec))
+      } : {},
+      ...beforeSubmitPromptExecs.length > 0 ? { beforeSubmitPrompt: beforeSubmitPromptExecs.map((exec) => cursorCommandHook(exec)) } : {},
+      ...stopExecs.length > 0 ? { stop: stopExecs.map((exec) => cursorCommandHook(exec)) } : {}
+    }
+  };
+}
+function cursorCommandHook(hookExec, extraArgs = []) {
+  return {
+    type: "command",
+    command: buildHostShellCommand([hookExec.command, ...hookExec.args, ...extraArgs])
+  };
 }
 function renderEmbeddedSkillAssets(pluginRoot) {
   for (const asset of EMBEDDED_AGENT_CLI_SKILL_ASSETS) {
@@ -33199,9 +32765,11 @@ var MARKETPLACE_MANAGED_ENTRIES = [
   ".agents",
   ".claude-plugin",
   ".codex-plugin",
+  ".cursor-plugin",
   "hooks",
   "skills",
   "agents",
+  "mcp.json",
   "claude",
   "codex-marketplace",
   "plugins"
@@ -33210,20 +32778,21 @@ var MARKETPLACE_PRUNE_ENTRIES = [
   ".agents",
   ".claude-plugin",
   ".codex-plugin",
+  ".cursor-plugin",
   "hooks",
   "skills",
   "agents",
+  "mcp.json",
   "claude",
   "codex-marketplace"
 ];
 var HASH_IGNORED_RELATIVE_PATHS = new Set(PLUGIN_BUNDLES.map((bundle) => bundle.hashFileName));
 async function createAgentCliPlugin(options) {
-  const fleetRoot = options.rootDir ?? options.dataDir;
+  const fleetRoot = options.rootDir ?? options.dataDir ?? getFleetDataDir();
   const renderableBundles = resolveRenderablePluginBundles(fleetRoot);
   const marketplaceBundles = groupRenderableBundlesByMarketplace(renderableBundles);
   const pluginRoots = /* @__PURE__ */ new Map();
   const contentHashes = /* @__PURE__ */ new Map();
-  validateClaudeAgentFileStems(options.claudeDefinitions);
   for (const marketplace of marketplaceBundles) {
     await options.withMarketplaceLock(marketplace.target.root, () => {
       for (const { bundle, target } of marketplace.bundles) {
@@ -33285,12 +32854,15 @@ function renderPluginRoot(pluginRoot, bundle, options) {
     writePrivateJson(path27__default.join(stagedPluginRoot, ".claude-plugin", "plugin.json"), claudeManifest(bundle), stagedPluginRoot);
     switch (bundle.source) {
       case "asset":
-        ensurePrivateDir(path27__default.join(stagedPluginRoot, "agents"), stagedPluginRoot);
+        if (options.cliId === "claude") {
+          ensurePrivateDir(path27__default.join(stagedPluginRoot, "agents"), stagedPluginRoot);
+        }
         ensurePrivateDir(path27__default.join(stagedPluginRoot, "skills"), stagedPluginRoot);
         renderAssetPluginRoot(stagedPluginRoot, bundle, options);
         break;
     }
     writePrivateJson(path27__default.join(stagedPluginRoot, ".codex-plugin", "plugin.json"), codexManifest(bundle, stagedPluginRoot), stagedPluginRoot);
+    writePrivateJson(path27__default.join(stagedPluginRoot, ".cursor-plugin", "plugin.json"), cursorManifest(bundle, stagedPluginRoot), stagedPluginRoot);
     removePrivatePath(pluginRoot, parentRoot);
     renameSync(stagedPluginRoot, pluginRoot);
   } finally {
@@ -33304,6 +32876,7 @@ function renderMarketplaceRoot(target, bundles) {
   try {
     writePrivateJson(path27__default.join(stagedRoot, ".agents", "plugins", "marketplace.json"), codexMarketplace(target, bundles), stagedRoot);
     writePrivateJson(path27__default.join(stagedRoot, ".claude-plugin", "marketplace.json"), claudeMarketplace(target, bundles), stagedRoot);
+    writePrivateJson(path27__default.join(stagedRoot, ".cursor-plugin", "marketplace.json"), cursorMarketplace(target, bundles), stagedRoot);
     pruneMarketplaceRoot(target);
     pruneStalePluginDirs(target, bundles);
     for (const entry of readdirSync(stagedRoot)) {
@@ -33328,7 +32901,7 @@ function pruneStalePluginDirs(target, bundles) {
   }
 }
 function buildContentHash(target) {
-  const hash2 = crypto3.createHash("sha256");
+  const hash2 = crypto4.createHash("sha256");
   for (const filePath of listRenderableFiles(target)) {
     const relativePath = path27__default.relative(target.root, filePath);
     hash2.update(relativePath);
@@ -33423,6 +32996,17 @@ function claudeMarketplace(target, bundles) {
     }))
   };
 }
+function cursorMarketplace(target, bundles) {
+  return {
+    name: target.name,
+    owner: "fleet",
+    plugins: bundles.map((bundle) => ({
+      name: bundle.name,
+      description: bundle.description,
+      source: marketplacePluginPath(target, bundle)
+    }))
+  };
+}
 function pluginRootForTarget(target, bundle) {
   return path27__default.join(target.root, PLUGIN_BUNDLES_DIR_NAME, bundle.directoryName);
 }
@@ -33437,8 +33021,30 @@ function codexManifest(bundle, pluginRoot) {
     skills: "./skills/"
   };
 }
+function cursorManifest(bundle, pluginRoot) {
+  return {
+    name: bundle.name,
+    version: cursorManifestVersion(bundle, pluginRoot),
+    description: bundle.description
+  };
+}
+function cursorManifestVersion(bundle, pluginRoot) {
+  const hash2 = crypto4.createHash("sha256");
+  hash2.update(bundle.name);
+  hash2.update("\0");
+  hash2.update(bundle.description);
+  hash2.update("\0");
+  for (const filePath of listCursorEffectivePluginFiles(pluginRoot)) {
+    const relativePath = path27__default.relative(pluginRoot, filePath);
+    hash2.update(relativePath);
+    hash2.update("\0");
+    hash2.update(readFileSync(filePath));
+    hash2.update("\0");
+  }
+  return `0.0.0+${hash2.digest("hex").slice(0, 12)}`;
+}
 function codexManifestVersion(bundle, pluginRoot) {
-  const hash2 = crypto3.createHash("sha256");
+  const hash2 = crypto4.createHash("sha256");
   hash2.update(bundle.name);
   hash2.update("\0");
   hash2.update(bundle.description);
@@ -33459,6 +33065,22 @@ function listCodexEffectivePluginFiles(pluginRoot) {
   collectRenderableFiles(pluginRoot, skillsPath, files, /* @__PURE__ */ new Set());
   return files.sort();
 }
+function listCursorEffectivePluginFiles(pluginRoot) {
+  const files = [];
+  for (const entry of ["skills", "rules", "hooks", "mcp.json"]) {
+    const entryPath = path27__default.join(pluginRoot, entry);
+    if (!existsSync(entryPath)) continue;
+    const stat3 = lstatSync(entryPath);
+    if (stat3.isFile()) {
+      files.push(entryPath);
+      continue;
+    }
+    if (stat3.isDirectory()) {
+      collectRenderableFiles(pluginRoot, entryPath, files, /* @__PURE__ */ new Set());
+    }
+  }
+  return files.sort();
+}
 function claudeManifest(bundle) {
   return {
     name: bundle.name,
@@ -33468,9 +33090,11 @@ function claudeManifest(bundle) {
 }
 
 // ../../packages/fleet-admiral/src/agent-cli/injection.ts
-var CODEX_FLEET_PROFILE_FILE_NAME_PATTERN = /^fleet-[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.config\.toml$/;
-var CODEX_FLEET_PROFILE_MARKER = "# Fleet-managed Codex session profile";
-var CODEX_STALE_PROFILE_MAX_AGE_MS = 24 * 60 * 60 * 1e3;
+var CODEX_FLEET_PROFILE_NAME = "fleet";
+var CODEX_FLEET_PROFILE_FILE_NAME = `${CODEX_FLEET_PROFILE_NAME}.config.toml`;
+var CODEX_LEGACY_FLEET_PROFILE_FILE_NAME_PATTERN = /^fleet-[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.config\.toml$/;
+var CODEX_FLEET_PROFILE_MARKER = "# Fleet-managed Codex profile";
+var CODEX_LEGACY_FLEET_PROFILE_MARKER = "# Fleet-managed Codex session profile";
 var SYSTEM_PROMPT_FILE_MODE = 384;
 async function injectAgentCliProfile(profile, options) {
   const capability = getAgentCliInjectionCapability(profile.id);
@@ -33479,27 +33103,26 @@ async function injectAgentCliProfile(profile, options) {
   }
   const injectTone = options.enableMetaphor ?? false;
   const endpoint = await options.dedicatedMcpSession.getEndpoint();
-  const startupDefinitions = buildStartupNativeDefinitions(profile.id, options.carrierRuntime);
-  const tokenLabel = options.mcpSessionLabel ?? `agent:${profile.id}:${crypto3.randomUUID()}`;
+  const tokenLabel = options.mcpSessionLabel ?? `agent:${profile.id}:${crypto4.randomUUID()}`;
   const tokens = await options.dedicatedMcpSession.issueSessionToken({ cwd: profile.cwd, label: tokenLabel });
   const mcpServers = buildAgentCliMcpServerConfigs(endpoint.servers, tokens);
   const doctrine = options.buildSystemPrompt(injectTone);
   const tempCleanups = [];
   try {
-    const systemPromptFile = profile.id === "claude" || profile.id === "claude-kimi" || profile.id === "claude-glm" ? writeSystemPromptFile(profile.id, doctrine, (cleanup2) => tempCleanups.push(cleanup2)) : void 0;
+    const systemPromptFile = profile.id === "claude" ? writeSystemPromptFile(profile.id, doctrine, (cleanup2) => tempCleanups.push(cleanup2)) : void 0;
     const plugin = await createAgentCliPlugin({
-      claudeDefinitions: startupDefinitions.host === "claude" ? startupDefinitions.definitions : [],
       cliId: profile.id,
       codexCommandRunner: options.codexCommandRunner,
       cwd: profile.cwd,
       dataDir: options.dataDir,
+      doctrine,
       rootDir: options.pluginRootDir,
+      mcpServers,
       captureSessionHookExec: options.captureSessionHookExec,
       turnStartHookExec: options.turnStartHookExec,
       turnEndHookExec: options.turnEndHookExec,
       inputWaitingHookExec: options.inputWaitingHookExec,
       autoNameHookExec: options.autoNameHookExec,
-      hookExec: startupDefinitions.host === "claude" ? requireHookExec(options.hookExec) : void 0,
       withMarketplaceLock: options.withMarketplaceLock
     });
     const codexPluginKeys = plugin.codexRegistrations.map((registration) => `${registration.pluginName}@${registration.marketplaceName}`);
@@ -33508,7 +33131,7 @@ async function injectAgentCliProfile(profile, options) {
       turnStartHookExec: options.turnStartHookExec,
       turnEndHookExec: options.turnEndHookExec,
       autoNameHookExec: options.autoNameHookExec
-    }, (cleanup2) => tempCleanups.push(cleanup2)) : void 0;
+    }) : void 0;
     const launchWarnings = [];
     if (profile.id === "codex") {
       const cleanupWarning = await cleanupDeprecatedCodexPluginState({
@@ -33518,7 +33141,7 @@ async function injectAgentCliProfile(profile, options) {
         env: { ...profile.env }
       }, requireCodexCommandRunner(options.codexCommandRunner), options.withMarketplaceLock, {
         homeMarketplaceName: FLEET_MARKETPLACE_NAME,
-        homeMarketplaceRoot: path27__default.join(options.pluginRootDir ?? options.dataDir, "marketplace"),
+        homeMarketplaceRoot: path27__default.join(options.pluginRootDir ?? options.dataDir ?? getFleetDataDir(), "marketplace"),
         projectMarketplaceRoot: path27__default.join(profile.cwd, ".fleet")
       });
       if (cleanupWarning !== void 0) {
@@ -33550,7 +33173,6 @@ async function injectAgentCliProfile(profile, options) {
       pluginRoot: plugin.pluginRoot,
       pluginRoots: plugin.pluginRoots,
       codexProfileName: codexProfile?.profileName,
-      replaceSystemPrompt: options.replaceSystemPrompt ?? false,
       resumeSessionId: options.resumeSessionId,
       systemPromptFile
     };
@@ -33569,15 +33191,6 @@ async function injectAgentCliProfile(profile, options) {
     throw error51;
   }
 }
-function buildStartupNativeDefinitions(cliId, carrierRuntime) {
-  const host = getNativeSubagentHost(cliId);
-  if (host === "none") return { host, definitions: [] };
-  return { host, definitions: buildClaudeNativeSubagentPlan(carrierRuntime.registry).definitions };
-}
-function getNativeSubagentHost(cliId) {
-  if (cliId === "claude" || cliId === "claude-kimi" || cliId === "claude-glm") return "claude";
-  return "none";
-}
 function buildAgentCliMcpServerConfigs(endpoints, tokens) {
   return endpoints.map((endpoint) => {
     const token = tokens.find((entry) => entry.name === endpoint.name)?.token;
@@ -33599,13 +33212,13 @@ function writeSystemPromptFile(cliId, systemPrompt, onCleanup) {
   chmodBestEffort2(filePath, SYSTEM_PROMPT_FILE_MODE);
   return filePath;
 }
-function writeCodexFleetProfile(env, doctrine, pluginKeys, hookExecs, onCleanup) {
+function writeCodexFleetProfile(env, doctrine, pluginKeys, hookExecs) {
   const codexHome = env.CODEX_HOME ?? path27__default.join(env.HOME ?? os3__default.homedir(), ".codex");
   mkdirSync(codexHome, { recursive: true });
-  pruneStaleCodexFleetProfiles(codexHome);
-  const profileName = `fleet-${crypto3.randomUUID()}`;
-  const profilePath = path27__default.join(codexHome, `${profileName}.config.toml`);
-  onCleanup(() => rmBestEffort(profilePath));
+  pruneLegacyCodexFleetProfiles(codexHome);
+  const profileName = CODEX_FLEET_PROFILE_NAME;
+  const profilePath = path27__default.join(codexHome, CODEX_FLEET_PROFILE_FILE_NAME);
+  const hookTrustState = readCodexFleetHookTrustState(profilePath);
   writeFileNoFollow2(profilePath, [
     CODEX_FLEET_PROFILE_MARKER,
     // doctrine를 멀티라인 TOML 문자열로 직렬화해 실제 줄바꿈을 보존(pretty)한다.
@@ -33614,12 +33227,16 @@ function writeCodexFleetProfile(env, doctrine, pluginKeys, hookExecs, onCleanup)
     escapeTomlMultilineString(doctrine),
     `"""`,
     "",
+    "[features]",
+    "hooks = true",
+    "",
     ...pluginKeys.flatMap((pluginKey) => [
       `[plugins."${escapeTomlBasicString2(pluginKey)}"]`,
       "enabled = true",
       ""
     ]),
-    ...codexHooksConfig(hookExecs)
+    ...codexHooksConfig(hookExecs),
+    ...hookTrustState
   ].join("\n"));
   chmodBestEffort2(profilePath, SYSTEM_PROMPT_FILE_MODE);
   return { profileName, profilePath };
@@ -33654,27 +33271,67 @@ function writeFileNoFollow2(filePath, content) {
     closeSync(fd);
   }
 }
-function pruneStaleCodexFleetProfiles(codexHome) {
+function readCodexFleetHookTrustState(profilePath) {
+  try {
+    const content = readFileNoFollow(profilePath);
+    if ((content.split(/\r?\n/, 1)[0] ?? "") !== CODEX_FLEET_PROFILE_MARKER) return [];
+    return extractCodexHookTrustStateSections(content);
+  } catch {
+    return [];
+  }
+}
+function readFileNoFollow(filePath) {
+  const fd = openSync(filePath, constants.O_RDONLY | constants.O_NOFOLLOW);
+  try {
+    return readFileSync(fd, "utf8");
+  } finally {
+    closeSync(fd);
+  }
+}
+function extractCodexHookTrustStateSections(content) {
+  const sections = [];
+  let current;
+  for (const line of content.split(/\r?\n/)) {
+    if (/^\[hooks\.state\./.test(line)) {
+      if (current !== void 0) pushCodexHookTrustStateSection(sections, current);
+      current = [line];
+      continue;
+    }
+    if (current === void 0) continue;
+    if (/^\s*\[/.test(line)) {
+      pushCodexHookTrustStateSection(sections, current);
+      current = void 0;
+      continue;
+    }
+    current.push(line);
+  }
+  if (current !== void 0) pushCodexHookTrustStateSection(sections, current);
+  return sections;
+}
+function pushCodexHookTrustStateSection(sections, section) {
+  sections.push(...section);
+  if (section[section.length - 1] !== "") sections.push("");
+}
+function pruneLegacyCodexFleetProfiles(codexHome) {
   let entries;
   try {
     entries = readdirSync(codexHome);
   } catch {
     return;
   }
-  const now = Date.now();
   for (const entry of entries) {
-    if (!CODEX_FLEET_PROFILE_FILE_NAME_PATTERN.test(entry)) continue;
+    if (!CODEX_LEGACY_FLEET_PROFILE_FILE_NAME_PATTERN.test(entry)) continue;
     const filePath = path27__default.join(codexHome, entry);
-    if (!isStaleFleetCodexProfile(filePath, now)) continue;
+    if (!isLegacyFleetCodexProfile(filePath)) continue;
     unlinkBestEffort2(filePath);
   }
 }
-function isStaleFleetCodexProfile(filePath, now) {
+function isLegacyFleetCodexProfile(filePath) {
   try {
     const stat3 = lstatSync(filePath);
     if (!stat3.isFile() || stat3.isSymbolicLink()) return false;
-    if (now - stat3.mtimeMs <= CODEX_STALE_PROFILE_MAX_AGE_MS) return false;
-    return readFirstLine(filePath) === CODEX_FLEET_PROFILE_MARKER;
+    const firstLine = readFirstLine(filePath);
+    return firstLine === CODEX_LEGACY_FLEET_PROFILE_MARKER;
   } catch {
     return false;
   }
@@ -33701,10 +33358,6 @@ function unlinkBestEffort2(targetPath) {
   } catch {
   }
 }
-function requireHookExec(hookExec) {
-  if (hookExec) return hookExec;
-  throw new Error("Fleet session hook executable is required for Claude native injection");
-}
 function requireCodexCommandRunner(codexCommandRunner) {
   if (codexCommandRunner) return codexCommandRunner;
   throw new Error("Codex plugin registration requires an injected command runner");
@@ -33715,6 +33368,8 @@ function buildAgentCliArgs(builderId, context) {
       return buildClaudeNativeArgs(context);
     case "codex-native":
       return buildCodexNativeArgs(context);
+    case "cursor-native":
+      return buildCursorNativeArgs(context);
   }
 }
 function mergeAgentCliArgs(profile, builderId, context, injectedArgs) {
@@ -33762,6 +33417,7 @@ var CHRONICLE_WIKI_TOOL_IDS = /* @__PURE__ */ new Set([
 ]);
 function createFleetAgentRuntimeLifecycle(deps) {
   let active = true;
+  const resolvedDataDir = deps.dataDir ?? getFleetDataDir();
   const mcpRuntime = createFleetAgentRuntimeMcpServices();
   const carrierRuntime = createCarrierRuntime();
   const dedicatedMcpSession = createExecutorSessionManager({
@@ -33777,7 +33433,7 @@ function createFleetAgentRuntimeLifecycle(deps) {
     ]
   });
   registerExecutorPort(mcpRuntime.mcpRegistry, carrierRuntime, () => active);
-  carrierRuntime.store.initStore(deps.dataDir);
+  carrierRuntime.store.initStore(resolvedDataDir);
   carrierRuntime.registerCarrierDefaults();
   registerFleetAgentRuntimeTools(mcpRuntime.mcpRegistry, carrierRuntime, deps);
   registerExecutorMcpRuntimeProvider(mcpRuntime, dedicatedMcpSession, () => active);
@@ -33825,7 +33481,7 @@ function registerExecutorPort(mcpRegistry, carrierRuntime, isActive) {
 }
 function registerFleetAgentRuntimeTools(mcpRegistry, carrierRuntime, deps) {
   registerAgentToolDefaults(mcpRegistry, carrierRuntime, {
-    authEnvResolver: deps.authEnvResolver,
+    authEnvResolver: async () => ({}),
     reservedExternalMcpServerIds: buildReservedExternalMcpServerIds(deps.reservedExternalMcpServerIds),
     workspaceChangeScanner: deps.workspaceChangeScanner
   });
@@ -34964,7 +34620,7 @@ function stripLeadingFrontmatter(body) {
   return stripped ? next : body;
 }
 function computeContentHash(content) {
-  return crypto3.createHash("sha256").update(content, "utf8").digest("hex").slice(0, 8);
+  return crypto4.createHash("sha256").update(content, "utf8").digest("hex").slice(0, 8);
 }
 function assertWithinRawDir(absolutePath, paths) {
   const relative = path27__default.relative(paths.rawDir, absolutePath);
@@ -35177,7 +34833,7 @@ async function writeAtomic(filePath, content, paths) {
   await ensureMemoryRoot(paths);
   const tempPath = path27__default.join(
     path27__default.dirname(filePath),
-    `.tmp-${process.pid}-${Date.now()}-${crypto3.randomUUID()}-${os3__default.hostname()}`
+    `.tmp-${process.pid}-${Date.now()}-${crypto4.randomUUID()}-${os3__default.hostname()}`
   );
   await writeFile(tempPath, content, "utf8");
   await rename(tempPath, filePath);
@@ -37730,7 +37386,7 @@ function parseOptionalIsoDate(value) {
   return Number.isFinite(timestamp) ? timestamp : null;
 }
 function hashBodyForComparison(body) {
-  return crypto3.createHash("sha256").update(body.replace(/\s+/g, " ").trim(), "utf8").digest("hex").slice(0, 8);
+  return crypto4.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"));
@@ -39926,7 +39582,7 @@ var DEFAULT_TICKET_TTL_MS = 1e4;
 function createPluginTerminalTicketRegistry(deps = {}) {
   const ttlMs = deps.ttlMs ?? DEFAULT_TICKET_TTL_MS;
   const now = deps.now ?? Date.now;
-  const randomTicket = deps.randomTicket ?? (() => crypto3.randomBytes(32).toString("base64url"));
+  const randomTicket = deps.randomTicket ?? (() => crypto4.randomBytes(32).toString("base64url"));
   const tickets = /* @__PURE__ */ new Map();
   function issue3(context) {
     prune();
@@ -39958,10 +39614,10 @@ var TERMINAL_TERM = "xterm-256color";
 var FLEET_CONSOLE_PACKAGE_NAME = "@dotobokuri/fleet-console";
 var require2 = createRequire(import.meta.url);
 function createShellTerminalLaunchResolver(deps = {}) {
-  const baseCwd = deps.cwd ?? process4.cwd();
-  const env = deps.env ?? process4.env;
+  const baseCwd = deps.cwd ?? process5.cwd();
+  const env = deps.env ?? process5.env;
   const homedir3 = deps.homedir ?? DEFAULT_TERMINAL_CWD_FALLBACK;
-  const platform = deps.platform ?? process4.platform;
+  const platform = deps.platform ?? process5.platform;
   return async (selectedCwd) => {
     const cwd = selectedCwd || baseCwd || homedir3();
     const shell = resolveWindowsLaunchBinary(resolveUserShell(env, platform), [], env, platform, "user shell");
@@ -39972,7 +39628,7 @@ function startTerminalShell(launch, size) {
   const testStartShell = globalThis.__fleetTerminalStartShell;
   if (testStartShell) return testStartShell(launch, size);
   const { spawn: spawnPty } = loadNodePty();
-  const useConptyDll = resolveUseConptyDll(process4.platform, process4.env);
+  const useConptyDll = resolveUseConptyDll(process5.platform, process5.env);
   return spawnPty(launch.bin, [...launch.args], {
     cols: size.cols,
     rows: size.rows,
@@ -40591,7 +40247,8 @@ var BINARY_DISPLAY_NAMES = {
 };
 var OVERRIDE_ENV_BY_COMMAND = {
   claude: "CLAUDE_BIN",
-  codex: "CODEX_BIN"
+  codex: "CODEX_BIN",
+  "cursor-agent": "CURSOR_AGENT_BIN"
 };
 var VERSION_PROBE_TIMEOUT_MS = 5e3;
 var SEMVER_PATTERN = /(\d+\.\d+\.\d+)/;
@@ -40655,7 +40312,7 @@ function execFileVersion(bin, args) {
     execFile(
       bin,
       [...args],
-      { encoding: "utf-8", timeout: VERSION_PROBE_TIMEOUT_MS, windowsHide: true },
+      withHidden({ encoding: "utf-8", timeout: VERSION_PROBE_TIMEOUT_MS }),
       (error51, stdout, stderr) => {
         if (error51) {
           reject(error51);
@@ -40668,9 +40325,8 @@ function execFileVersion(bin, args) {
 }
 
 // ../fleet-plugins/terminal/server/agent-api/agent-cli-launch-kinds.ts
-var UNSUPPORTED_AGENT_CLI_IDS = /* @__PURE__ */ new Set(["claude-kimi", "claude-glm"]);
 function buildAgentCliLaunchKinds(metadata, operationType) {
-  return metadata.filter((cli) => !UNSUPPORTED_AGENT_CLI_IDS.has(cli.id)).map((cli) => {
+  return metadata.map((cli) => {
     const disabledReason = resolveDisabledReason(cli);
     return {
       id: cli.id,
@@ -40693,10 +40349,7 @@ function combineAgentCliLaunchMetadata(metadata, installStatuses, authStatuses)
   return metadata.map((meta3) => ({
     id: meta3.id,
     label: meta3.label,
-    // claude 계열 3종은 같은 `claude` 바이너리를 공유하므로 cliCommand로 설치 여부를 판정한다.
     available: availableByCommand.get(CLI_BACKENDS[meta3.id].cliCommand) ?? false,
-    // model-auth 게이트 대상(claude-kimi/glm)만 실제 로그인 상태를 반영하고,
-    // 자체 인증 CLI(claude/codex)는 Fleet이 로그인 여부를 알 수 없으므로 게이트하지 않는다(true).
     signedIn: signedInByCli.has(meta3.id) ? signedInByCli.get(meta3.id) ?? false : true
   }));
 }
@@ -40793,7 +40446,7 @@ function readProviderSessionCapture(fleetSessionId, deps = {}) {
   const capturesDir = deps.capturesDir ?? defaultCapturePaths().capturesDir;
   const filePath = path27__default.join(capturesDir, `${fleetSessionId}.json`);
   try {
-    const parsed = JSON.parse(fs8__default.readFileSync(filePath, "utf8"));
+    const parsed = JSON.parse(fs2__default.readFileSync(filePath, "utf8"));
     return sanitizeProviderSession(parsed);
   } catch {
     return null;
@@ -40803,7 +40456,7 @@ function unlinkProviderSessionCapture(fleetSessionId, deps = {}) {
   if (!isSafeCaptureId(fleetSessionId)) return false;
   const capturesDir = deps.capturesDir ?? defaultCapturePaths().capturesDir;
   try {
-    fs8__default.unlinkSync(path27__default.join(capturesDir, `${fleetSessionId}.json`));
+    fs2__default.unlinkSync(path27__default.join(capturesDir, `${fleetSessionId}.json`));
     return true;
   } catch {
     return false;
@@ -40811,20 +40464,20 @@ function unlinkProviderSessionCapture(fleetSessionId, deps = {}) {
 }
 function captureSessionStrict(options) {
   const provider = parseProvider(options.provider);
-  const fleetSessionId = readFleetSessionId(options.env ?? process4.env);
+  const fleetSessionId = readFleetSessionId(options.env ?? process5.env);
   const input = parseHookInput(options.input ?? "");
   const providerSession = toProviderSession(provider, input, options.now ?? (() => /* @__PURE__ */ new Date()));
   const capturesDir = (options.paths ?? defaultCapturePaths()).capturesDir;
   const finalPath = path27__default.join(capturesDir, `${fleetSessionId}.json`);
-  const tempPath = path27__default.join(capturesDir, `${CAPTURE_TEMP_PREFIX}${fleetSessionId}.${process4.pid}.${Date.now()}.tmp`);
-  fs8__default.mkdirSync(capturesDir, { recursive: true, mode: 448 });
-  fs8__default.writeFileSync(tempPath, `${JSON.stringify(providerSession, null, 2)}
+  const tempPath = path27__default.join(capturesDir, `${CAPTURE_TEMP_PREFIX}${fleetSessionId}.${process5.pid}.${Date.now()}.tmp`);
+  fs2__default.mkdirSync(capturesDir, { recursive: true, mode: 448 });
+  fs2__default.writeFileSync(tempPath, `${JSON.stringify(providerSession, null, 2)}
 `, { mode: 384 });
-  fs8__default.renameSync(tempPath, finalPath);
+  fs2__default.renameSync(tempPath, finalPath);
   return { path: finalPath, providerSession };
 }
 function parseProvider(value) {
-  if (value === "claude" || value === "codex") return value;
+  if (isProvider(value)) return value;
   throw new Error("invalid_provider");
 }
 function readFleetSessionId(env) {
@@ -40844,10 +40497,10 @@ function parseHookInput(input) {
   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");
+  const sessionId = readProviderSessionId(input);
   return {
     provider,
-    sessionId: input.session_id,
+    sessionId,
     ...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()
@@ -40856,7 +40509,7 @@ function toProviderSession(provider, input, now) {
 function sanitizeProviderSession(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return null;
   const candidate = value;
-  if (candidate.provider !== "claude" && candidate.provider !== "codex" || typeof candidate.sessionId !== "string" || typeof candidate.capturedAt !== "string") return null;
+  if (!isProvider(candidate.provider) || typeof candidate.sessionId !== "string" || typeof candidate.capturedAt !== "string") return null;
   return {
     provider: candidate.provider,
     sessionId: candidate.sessionId,
@@ -40865,6 +40518,15 @@ function sanitizeProviderSession(value) {
     capturedAt: candidate.capturedAt
   };
 }
+function readProviderSessionId(input) {
+  for (const value of [input.session_id, input.conversation_id, input.chat_id]) {
+    if (typeof value === "string" && value.length > 0) return value;
+  }
+  throw new Error("missing_provider_session_id");
+}
+function isProvider(value) {
+  return value === "claude" || value === "codex" || value === "cursor";
+}
 function isSafeCaptureId(value) {
   return value.length > 0 && path27__default.basename(value) === value && !value.includes(path27__default.sep) && !value.includes(path27__default.posix.sep);
 }
@@ -40874,12 +40536,6 @@ function defaultCapturePaths() {
 var JAVASCRIPT_ENTRY_EXTENSIONS = /* @__PURE__ */ new Set([".cjs", ".js", ".mjs"]);
 var TYPESCRIPT_ENTRY_EXTENSIONS = /* @__PURE__ */ new Set([".cts", ".mts", ".ts", ".tsx"]);
 var MARKETPLACE_LOCK_DIR_SUFFIX = ".lock";
-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"]);
 }
@@ -40912,16 +40568,12 @@ function buildConsoleCaptureHookCommand(entry, cliId) {
   throw new Error(`Unsupported Fleet Console session hook entry extension: ${extension}`);
 }
 function toCaptureProvider(cliId) {
-  return cliId === "codex" ? "codex" : "claude";
+  if (cliId === "codex") return "codex";
+  if (cliId === "cursor") return "cursor";
+  return "claude";
 }
 function runCodexCommand(command) {
-  const result = spawnSync(command.bin, command.args, {
-    cwd: command.cwd,
-    encoding: "utf8",
-    env: command.env,
-    // 콘솔 없는 fleet-console 백엔드에서 codex 등록 명령 실행 시 콘솔 창이 깜빡이는 것을 방지한다.
-    windowsHide: true
-  });
+  const result = spawnSync(command.bin, command.args, withHidden({ cwd: command.cwd, encoding: "utf8", env: command.env }));
   return {
     status: result.status,
     stderr: result.stderr ?? "",
@@ -40960,19 +40612,18 @@ var CONSOLE_ENTRY_PATH = fileURLToPath(import.meta.url);
 var HOOK_ENTRY_EXTENSIONS = /* @__PURE__ */ new Set([".cjs", ".cts", ".js", ".mjs", ".mts", ".ts", ".tsx"]);
 var require4 = createRequire(import.meta.url);
 function createAgentTerminalLaunchResolver(deps = {}) {
-  const baseCwd = deps.cwd ?? process4.cwd();
-  const env = deps.env ?? process4.env;
-  const execPath = deps.execPath ?? process4.execPath;
+  const baseCwd = deps.cwd ?? process5.cwd();
+  const env = deps.env ?? process5.env;
+  const execPath = deps.execPath ?? process5.execPath;
   const homedir3 = deps.homedir ?? DEFAULT_TERMINAL_CWD_FALLBACK2;
-  const platform = deps.platform ?? process4.platform;
-  const entryPath = resolveHookEntryPath(deps.entryPath ?? process4.argv[1]);
+  const platform = deps.platform ?? process5.platform;
+  const entryPath = resolveHookEntryPath(deps.entryPath ?? process5.argv[1]);
   const tsxLoaderPath = deps.tsxLoaderPath ?? resolveOptionalPackage("tsx");
   const dataDir = deps.dataDir ?? getFleetDataDir();
   const infraServices = deps.infraServices ?? createInfraServices();
   const agentRuntime = deps.agentRuntime;
   const injectProfile = deps.injectProfile ?? injectAgentCliProfile;
   const resolveProfile = deps.resolveProfile ?? resolveAgentCliProfile;
-  const authEnvResolver = (cli) => resolveAuthEnv(cli, { authService: infraServices.authService });
   const hookEntry = { entryPath, execPath, ...tsxLoaderPath ? { tsxLoaderPath } : {} };
   return async (selectedCwd, context) => {
     const cwd = selectedCwd || baseCwd || homedir3();
@@ -40992,7 +40643,6 @@ function createAgentTerminalLaunchResolver(deps = {}) {
     }
     const sessionId = context?.sessionId ?? "default";
     return createAgentCliLaunchSpec({
-      authEnvResolver,
       agentRuntime,
       cwd,
       dataDir,
@@ -41012,7 +40662,7 @@ function resolveHookEntryPath(candidate) {
   if (candidate && hasHookEntryExtension(candidate)) return candidate;
   if (candidate) {
     try {
-      const realPath = fs8__default.realpathSync(candidate);
+      const realPath = fs2__default.realpathSync(candidate);
       if (hasHookEntryExtension(realPath)) return realPath;
     } catch {
     }
@@ -41030,15 +40680,12 @@ async function createAgentCliLaunchSpec(options) {
       throw new Error("Fleet Console agent runtime is unavailable.");
     }
     const profile = await options.resolveProfile(options.env, options.cwd, {
-      authEnvResolver: options.authEnvResolver,
-      authService: options.infraServices.authService,
       cliId: options.cliId,
       resumeSessionId: options.resumeSessionId
     });
     const globalSettings = readGlobalSettingsSnapshot(options.infraServices);
     const injectedProfile = await options.injectProfile(profile, {
       buildSystemPrompt: (injectTone) => createSystemPromptBuilder({ carrierRuntime: agentRuntime.carrierRuntime }).build(injectTone),
-      carrierRuntime: agentRuntime.carrierRuntime,
       codexCommandRunner: runCodexCommand,
       dataDir: options.dataDir,
       dedicatedMcpSession: agentRuntime.dedicatedMcpSession,
@@ -41048,9 +40695,7 @@ async function createAgentCliLaunchSpec(options) {
       turnEndHookExec: buildConsoleTurnHookCommand(options.hookEntry, "end"),
       inputWaitingHookExec: buildConsoleAttentionHookCommand(options.hookEntry),
       autoNameHookExec: buildConsoleAutoNameHookCommand(options.hookEntry),
-      hookExec: buildConsoleHookCommand(options.hookEntry),
       onCleanup: (cleanup) => cleanupStack.push(cleanup),
-      replaceSystemPrompt: globalSettings.replaceSystemPrompt,
       resumeSessionId: options.resumeSessionId,
       withMarketplaceLock: withConsoleMarketplaceLock,
       mcpSessionLabel: options.sessionId
@@ -41134,12 +40779,9 @@ function resolveOptionalPackage(id) {
 function readGlobalSettingsSnapshot(infraServices) {
   try {
     const data = infraServices.globalOptionsService.load();
-    return {
-      enableMetaphor: data.enableMetaphor ?? false,
-      replaceSystemPrompt: data.replaceSystemPrompt ?? false
-    };
+    return { enableMetaphor: data.enableMetaphor ?? false };
   } catch {
-    return { enableMetaphor: false, replaceSystemPrompt: false };
+    return { enableMetaphor: false };
   }
 }
 var TENANT_EVENT_LIMIT = 1e3;
@@ -41276,7 +40918,6 @@ function createConsoleObservabilityStore(deps = {}) {
       cwdLabel: path27__default.basename(operation.cwd) || operation.cwd,
       label: operation.label,
       labelSource: operation.labelSource,
-      autoNamePromptSeen: operation.autoNamePromptSeen,
       cliId: operation.cliId,
       cliLabel: operation.cliLabel,
       createdAt: operation.createdAt,
@@ -41298,7 +40939,6 @@ function createConsoleObservabilityStore(deps = {}) {
       cwd: session.cwd,
       ...session.label ? { label: session.label } : {},
       ...session.labelSource ? { labelSource: session.labelSource } : {},
-      ...session.autoNamePromptSeen ? { autoNamePromptSeen: true } : {},
       ...session.cliId ? { cliId: session.cliId } : {},
       ...session.cliLabel ? { cliLabel: session.cliLabel } : {},
       createdAt: session.createdAt,
@@ -41345,11 +40985,9 @@ function createConsoleObservabilityStore(deps = {}) {
     if (label.length === 0) {
       delete session.label;
       delete session.labelSource;
-      delete session.autoNamePromptSeen;
     } else {
       session.label = label;
       session.labelSource = "user";
-      session.autoNamePromptSeen = true;
     }
     return toTerminalSessionInfo(session);
   }
@@ -41357,17 +40995,16 @@ function createConsoleObservabilityStore(deps = {}) {
     const session = terminalSessionsById.get(sessionId);
     if (!session) return null;
     const effectiveSource = session.labelSource ?? (session.label ? "user" : void 0);
-    if (effectiveSource === "user" || session.autoNamePromptSeen) {
-      return { session: toTerminalSessionInfo(session), changed: false, renamed: false };
+    if (effectiveSource === "user") {
+      return { session: toTerminalSessionInfo(session), renamed: false };
     }
-    session.autoNamePromptSeen = true;
     const next = label?.trim().slice(0, 200) ?? "";
     if (next.length === 0 || next === session.label) {
-      return { session: toTerminalSessionInfo(session), changed: true, renamed: false };
+      return { session: toTerminalSessionInfo(session), renamed: false };
     }
     session.label = next;
     session.labelSource = "auto";
-    return { session: toTerminalSessionInfo(session), changed: true, renamed: true };
+    return { session: toTerminalSessionInfo(session), renamed: true };
   }
   function notifySessionUpdated(session) {
     const event = { type: "session:updated", session };
@@ -41502,12 +41139,12 @@ function toTerminalSessionInfo(state) {
   };
 }
 function defaultWorkspaceHash(canonicalCwd) {
-  return crypto3.createHash("sha256").update(canonicalCwd).digest("hex").slice(0, 12);
+  return crypto4.createHash("sha256").update(canonicalCwd).digest("hex").slice(0, 12);
 }
 function defaultCanonicalizeTheaterPath(cwd) {
   const resolved = path27__default.resolve(cwd);
   try {
-    return fs8__default.realpathSync.native(resolved);
+    return fs2__default.realpathSync.native(resolved);
   } catch {
     return resolved;
   }
@@ -41539,7 +41176,8 @@ function normalizeEventPayload(event) {
         label: safeString(obj.label),
         startedAt: safeNumber(obj.startedAt),
         activeJobToolCallId: safeOptionalString(obj.activeJobToolCallId),
-        tracks: Array.isArray(obj.tracks) ? obj.tracks.map(normalizeTrackMeta) : []
+        tracks: Array.isArray(obj.tracks) ? obj.tracks.map(normalizeTrackMeta) : [],
+        signatureCli: safeOptionalString(obj.signatureCli)
       };
     case "job:finalized":
       return {
@@ -41721,26 +41359,6 @@ function withAgentSecurityHeaders(headers) {
   };
 }
 
-// ../fleet-plugins/terminal/server/model-auth-state.ts
-var TERMINAL_MODEL_AUTH_PROVIDERS = [
-  { cli: "claude-kimi", displayName: "Moonshot Kimi" },
-  { cli: "claude-glm", displayName: "ZhipuAI GLM" }
-];
-async function buildModelAuthState(authService) {
-  const signedInIds = new Set(await authService.listProviderIds());
-  return {
-    providers: TERMINAL_MODEL_AUTH_PROVIDERS.map((provider) => toProviderState(provider, signedInIds))
-  };
-}
-function toProviderState(provider, signedInIds) {
-  const providerId = CLI_TO_AUTH_PROVIDER_ID[provider.cli] ?? provider.cli;
-  return {
-    cli: provider.cli,
-    displayName: provider.displayName,
-    signedIn: signedInIds.has(providerId)
-  };
-}
-
 // ../fleet-plugins/terminal/server/agent.ts
 var AGENT_OPERATION_TYPE = "agent";
 var OPERATION_RENAMED_EVENT_CHANNEL = "operation:renamed";
@@ -41755,12 +41373,15 @@ function registerAgentRoutes(ctx, terminalRuntime, deps) {
   registerRouter(ctx, "agent", api.handle);
   return api.launchKinds;
 }
+function buildAgentLaunchKindBackfillPatch(operation) {
+  if (operation.pluginId !== TERMINAL_PLUGIN_ID || operation.type !== AGENT_OPERATION_TYPE) return null;
+  const cliId = operation.payload.cliId;
+  if (typeof cliId !== "string" || cliId.length === 0) return null;
+  if (operation.payload.launchKindId !== void 0) return null;
+  return { payload: { ...operation.payload, launchKindId: cliId } };
+}
 function createAgentApi(ctx, terminalRuntime, deps) {
-  const dataDir = ctx.host.paths.dataDir;
-  const authEnvResolver = (cli) => resolveAuthEnv(cli, { authService: deps.authService });
   const runtime = createFleetAgentRuntimeLifecycle({
-    authEnvResolver,
-    dataDir,
     onMcpServerStartError: (error51) => {
       console.error("[fleet-console] Failed to start MCP server", error51);
     },
@@ -41776,7 +41397,6 @@ function createAgentApi(ctx, terminalRuntime, deps) {
   const jobOriginById = /* @__PURE__ */ new Map();
   const launchResolver = createAgentTerminalLaunchResolver({
     agentRuntime: runtime,
-    dataDir,
     infraServices: deps,
     onRuntimeSessionStart: (session) => {
       pendingRuntimeSessions.set(session.sessionId, session);
@@ -41785,7 +41405,7 @@ function createAgentApi(ctx, terminalRuntime, deps) {
   const unsubscribeStream = runtime.carrierRuntime.jobs.streaming.register((event) => {
     const sessionId = resolveCarrierEventOrigin(event, jobOriginById);
     if (!sessionId) return;
-    observability.appendTerminalRuntimeEvent(sessionId, event);
+    observability.appendTerminalRuntimeEvent(sessionId, withSignatureCli(event, runtime.carrierRuntime.registry));
   });
   const unsubscribeReminder = createCarrierResultReminderRouter({
     streamRegister: runtime.carrierRuntime.jobs.streaming.register,
@@ -41801,8 +41421,19 @@ function createAgentApi(ctx, terminalRuntime, deps) {
   const unsubscribeRename = ctx.host.events.subscribe(OPERATION_RENAMED_EVENT_CHANNEL, (payload) => {
     if (!isOperationRenamedEvent(payload)) return;
     if (payload.pluginId !== TERMINAL_PLUGIN_ID || payload.type !== AGENT_OPERATION_TYPE) return;
+    const updated = observability.renameTerminalSession(payload.operationId, payload.title);
+    if (updated) {
+      observability.notifySessionUpdated(updated);
+      const operation = ctx.host.operations.get(payload.operationId);
+      if (operation) {
+        const cwd = readPayloadString(operation.payload, "cwd") || ctx.host.paths.resolveTheaterPath(operation.theaterId) || "";
+        const providerSession = readProviderSession(operation.payload);
+        ctx.host.operations.patch(payload.operationId, { title: updated.label ?? updated.cwdLabel, payload: toOperationPayload(cwd, updated, providerSession) });
+      }
+    }
     injectRenameCommand(payload.operationId, payload.title);
   });
+  backfillAgentOperationLaunchKinds();
   rehydrateDormantAgentOperations();
   async function handle({ req, res, pathname }) {
     const path42 = pathname.slice(`${ctx.basePath}/agent`.length) || "/";
@@ -41926,24 +41557,6 @@ function createAgentApi(ctx, terminalRuntime, deps) {
       ctx.host.http.writeJson(res, 200, { ok: true });
       return true;
     }
-    if (req.method === "PATCH") {
-      const body = await ctx.host.http.readJsonBody(req);
-      if (!body || body.label !== void 0 && typeof body.label !== "string") {
-        ctx.host.http.writeJson(res, 400, { error: "invalid_session_label" });
-        return true;
-      }
-      const updated = observability.renameTerminalSession(sessionId, body.label ?? "");
-      if (!updated) {
-        ctx.host.http.writeJson(res, 404, { error: "session_not_found" });
-        return true;
-      }
-      observability.notifySessionUpdated(updated);
-      const renamedCwd = readPayloadString(ctx.host.operations.get(sessionId)?.payload ?? {}, "cwd") ?? updated.cwdLabel;
-      ctx.host.operations.patch(sessionId, { title: updated.label ?? path27__default.basename(renamedCwd) });
-      injectRenameCommand(sessionId, updated.label);
-      ctx.host.http.writeJson(res, 200, updated);
-      return true;
-    }
     return methodNotAllowed(res);
   }
   async function createSession(cwd, theaterId, cliId, res) {
@@ -41952,7 +41565,7 @@ function createAgentApi(ctx, terminalRuntime, deps) {
       ctx.host.http.writeJson(res, 409, { error: "agent_cli_unavailable" });
       return;
     }
-    const sessionId = crypto3.randomUUID();
+    const sessionId = crypto4.randomUUID();
     const session = observability.createPendingTerminalSession({ sessionId, cwd, cliId });
     ctx.host.operations.create({
       id: session.sessionId,
@@ -42084,8 +41697,8 @@ function createAgentApi(ctx, terminalRuntime, deps) {
       return true;
     }
     const result = captureSession({
-      diagnostics: process4.stderr,
-      env: { ...process4.env, FLEET_CONSOLE_SESSION_ID: sessionId },
+      diagnostics: process5.stderr,
+      env: { ...process5.env, FLEET_CONSOLE_SESSION_ID: sessionId },
       input: body.input,
       paths: ctx.host.paths,
       provider: body.provider
@@ -42104,14 +41717,11 @@ function createAgentApi(ctx, terminalRuntime, deps) {
   }
   async function buildAgentCliLaunchMetadata() {
     const metadata = getAgentCliMetadata();
-    if ((process4.env.FLEET_TERMINAL_CMD ?? "").trim().length > 0) {
+    if ((process5.env.FLEET_TERMINAL_CMD ?? "").trim().length > 0) {
       return metadata.map((meta3) => ({ id: meta3.id, label: meta3.label, available: true, signedIn: true }));
     }
-    const [detected, modelAuth] = await Promise.all([
-      detector.detect(),
-      buildModelAuthState(deps.authService)
-    ]);
-    return combineAgentCliLaunchMetadata(metadata, detected, modelAuth.providers);
+    const detected = await detector.detect();
+    return combineAgentCliLaunchMetadata(metadata, detected, []);
   }
   async function buildLaunchKinds() {
     const metadata = await buildAgentCliLaunchMetadata();
@@ -42187,6 +41797,13 @@ function createAgentApi(ctx, terminalRuntime, deps) {
       ctx.host.operations.patch(operation.id, { payload: { ...operation.payload, ...toOperationPayload(cwd, dormant, providerSession) } });
     }
   }
+  function backfillAgentOperationLaunchKinds() {
+    for (const operation of ctx.host.operations.list()) {
+      const patch = buildAgentLaunchKindBackfillPatch(operation);
+      if (!patch) continue;
+      ctx.host.operations.patch(operation.id, patch);
+    }
+  }
   return { cleanup, handle, handleExit, launch, launchKinds: buildLaunchKinds };
   function methodNotAllowed(res) {
     ctx.host.http.writeJson(res, 405, { error: "Method not allowed" });
@@ -42201,6 +41818,7 @@ function toOperationPayload(cwd, session, providerSession) {
   return {
     cwd,
     ...session.cliId ? { cliId: session.cliId } : {},
+    ...session.cliId ? { launchKindId: session.cliId } : {},
     ...session.cliLabel ? { cliLabel: session.cliLabel } : {},
     ...providerSession ? { providerSession } : {},
     ...session.labelSource ? { labelSource: session.labelSource } : {}
@@ -42230,7 +41848,7 @@ function readProviderSession(value) {
   const providerSession = value?.providerSession;
   if (!providerSession || typeof providerSession !== "object") return void 0;
   const candidate = providerSession;
-  if (candidate.provider !== "claude" && candidate.provider !== "codex" || typeof candidate.sessionId !== "string" || typeof candidate.capturedAt !== "string") return void 0;
+  if (!isProvider2(candidate.provider) || typeof candidate.sessionId !== "string" || typeof candidate.capturedAt !== "string") return void 0;
   return {
     provider: candidate.provider,
     sessionId: candidate.sessionId,
@@ -42239,6 +41857,9 @@ function readProviderSession(value) {
     ...typeof candidate.source === "string" ? { source: candidate.source } : {}
   };
 }
+function isProvider2(value) {
+  return value === "claude" || value === "codex" || value === "cursor";
+}
 function resolveCarrierEventOrigin(event, jobOriginById) {
   if (event.originSessionId) {
     jobOriginById.set(event.jobId, event.originSessionId);
@@ -42271,135 +41892,55 @@ function readHookPrompt(value) {
     return void 0;
   }
 }
-
-// ../fleet-plugins/terminal/server/model-auth-routes.ts
-var UPSTREAM_FAILURE_STATUSES = /* @__PURE__ */ new Set(["timeout", "network", "server"]);
-function registerTerminalModelAuthRoutes(ctx, deps) {
-  registerRouter(ctx, "model-auth", createTerminalModelAuthRouter(ctx, {
-    ...deps,
-    validateApiKey: (cli, apiKey) => validateAuthKeyForCli(cli, apiKey)
-  }));
-}
-function createTerminalModelAuthRouter(ctx, deps) {
-  return async function handleTerminalModelAuthRoute({ req, res, pathname }) {
-    const path42 = pathname.slice(`${ctx.basePath}/model-auth`.length) || "/";
-    if (path42 === "/state") {
-      if (req.method !== "GET") {
-        ctx.host.http.writeJson(res, 405, { error: "Method not allowed" });
-        return true;
-      }
-      ctx.host.http.writeJson(res, 200, await buildModelAuthState(deps.authService));
+function withSignatureCli(event, registry3) {
+  if (typeof event !== "object" || event === null) return event;
+  const obj = event;
+  if (obj.type !== "job:registered" || typeof obj.ownerCarrierId !== "string") return event;
+  const config2 = getCarrierConfig(registry3, obj.ownerCarrierId);
+  if (!config2) return event;
+  const signatureCli = resolveAgentCliType2(obj.ownerCarrierId, config2.defaultCliType);
+  return { ...obj, signatureCli };
+}
+var GLOBAL_SHELL_SESSION_ID = "global-shell";
+var GLOBAL_SHELL_OPERATION_TYPE = "shell";
+function registerGlobalShellRoutes(ctx, runtime) {
+  registerRouter(ctx, "global/ticket", async ({ req, res }) => {
+    if (req.method !== "POST") {
+      ctx.host.http.writeJson(res, 405, { error: "Method not allowed" });
       return true;
     }
-    const cli = parseProviderPath(path42);
-    if (!cli) return false;
-    const provider = await findProvider(deps, cli);
-    if (!provider) {
-      ctx.host.http.writeJson(res, 404, { error: "provider_not_found" });
+    if (!ctx.host.security.isTerminalAuthorized(req)) {
+      ctx.host.http.writeJson(res, 401, { error: "Unauthorized" });
       return true;
     }
-    if (req.method === "PUT") {
-      await signInProvider(ctx, req, res, deps, provider);
+    if (req.headers.origin === void 0) {
+      ctx.host.http.writeJson(res, 401, { error: "Unauthorized" });
       return true;
     }
-    if (req.method === "DELETE") {
-      await signOutProvider(ctx, req, res, deps, provider);
+    const body = await ctx.host.http.readJsonBody(req);
+    const operationId = typeof body?.operationId === "string" ? body.operationId : typeof body?.sessionId === "string" ? body.sessionId : null;
+    if (!operationId) {
+      ctx.host.http.writeJson(res, 400, { error: "operation_id_required" });
       return true;
     }
-    ctx.host.http.writeJson(res, 405, { error: "Method not allowed" });
+    if (operationId !== GLOBAL_SHELL_SESSION_ID) {
+      ctx.host.http.writeJson(res, 409, { error: "invalid_global_shell_operation" });
+      return true;
+    }
+    if (!runtime.canAttach(GLOBAL_SHELL_SESSION_ID)) {
+      ctx.host.http.writeJson(res, 503, { error: "Terminal session capacity exhausted" });
+      return true;
+    }
+    ctx.host.http.writeJson(res, 200, runtime.issueTicket({
+      cwd: homedir(),
+      sessionId: GLOBAL_SHELL_SESSION_ID,
+      operationId,
+      operationType: GLOBAL_SHELL_OPERATION_TYPE,
+      pluginId: ctx.pluginId,
+      kind: "shell"
+    }));
     return true;
-  };
-}
-async function signInProvider(ctx, req, res, deps, provider) {
-  if (!ctx.host.security.isTerminalAuthorized(req)) {
-    ctx.host.http.writeJson(res, 401, { error: "unauthorized" });
-    return;
-  }
-  if (!isJsonRequest(req)) {
-    ctx.host.http.writeJson(res, 415, { error: "unsupported_media_type" });
-    return;
-  }
-  const body = await ctx.host.http.readJsonBody(req);
-  if (!body || typeof body !== "object" || Array.isArray(body)) {
-    ctx.host.http.writeJson(res, 400, { error: "invalid_json" });
-    return;
-  }
-  if (Object.keys(body).length !== 1 || typeof body.apiKey !== "string") {
-    ctx.host.http.writeJson(res, 400, { error: "invalid_api_key" });
-    return;
-  }
-  const apiKey = body.apiKey.trim();
-  if (apiKey.length === 0) {
-    ctx.host.http.writeJson(res, 400, { error: "invalid_api_key" });
-    return;
-  }
-  const providerId = CLI_TO_AUTH_PROVIDER_ID[provider.cli];
-  if (!providerId) {
-    ctx.host.http.writeJson(res, 500, { error: "provider_unavailable" });
-    return;
-  }
-  const validation = await deps.validateApiKey(provider.cli, apiKey);
-  if (validation.status !== "success") {
-    const status = UPSTREAM_FAILURE_STATUSES.has(validation.status) ? 502 : 400;
-    ctx.host.http.writeJson(res, status, {
-      error: formatSignInFailureMessage(provider.displayName, validation.status),
-      status: validation.status
-    });
-    return;
-  }
-  await deps.authService.setApiKey(providerId, apiKey);
-  await writeMutationState(ctx, res, deps);
-}
-async function signOutProvider(ctx, req, res, deps, provider) {
-  if (!ctx.host.security.isTerminalAuthorized(req)) {
-    ctx.host.http.writeJson(res, 401, { error: "unauthorized" });
-    return;
-  }
-  const providerId = CLI_TO_AUTH_PROVIDER_ID[provider.cli];
-  if (!providerId) {
-    ctx.host.http.writeJson(res, 500, { error: "provider_unavailable" });
-    return;
-  }
-  await deps.authService.deleteApiKey(providerId);
-  await writeMutationState(ctx, res, deps);
-}
-async function writeMutationState(ctx, res, deps) {
-  ctx.host.http.writeJson(res, 200, { state: await buildModelAuthState(deps.authService) });
-}
-async function findProvider(deps, cli) {
-  return (await buildModelAuthState(deps.authService)).providers.find((provider) => provider.cli === cli) ?? null;
-}
-function parseProviderPath(path42) {
-  const parts = path42.split("/").filter(Boolean);
-  if (parts.length !== 2 || parts[0] !== "providers") return null;
-  return safeDecodeURIComponent(parts[1] ?? "");
-}
-function safeDecodeURIComponent(value) {
-  try {
-    return decodeURIComponent(value);
-  } catch {
-    return null;
-  }
-}
-function isJsonRequest(req) {
-  const contentType = req.headers["content-type"];
-  return typeof contentType === "string" && contentType.toLowerCase().split(";")[0]?.trim() === "application/json";
-}
-function formatSignInFailureMessage(displayName, status) {
-  switch (status) {
-    case "unauthorized":
-      return `${displayName} rejected the API key. Check the key and try again.`;
-    case "forbidden":
-      return `The API key is not allowed for ${displayName}. Check its permissions.`;
-    case "timeout":
-      return `Validating the ${displayName} API key timed out. Check your connection and try again.`;
-    case "network":
-      return `Could not reach ${displayName} to validate the API key. Check your connection and try again.`;
-    case "server":
-      return `${displayName} returned an error while validating the API key. Try again later.`;
-    default:
-      return `Could not validate the ${displayName} API key. Check the key and try again.`;
-  }
+  });
 }
 
 // ../fleet-plugins/terminal/server/settings-routes.ts
@@ -42414,7 +41955,7 @@ function registerTerminalSettingsRoutes(ctx, deps) {
         ctx.host.http.writeJson(res, 401, { error: "unauthorized" });
         return true;
       }
-      if (!isJsonRequest2(req)) {
+      if (!isJsonRequest(req)) {
         ctx.host.http.writeJson(res, 415, { error: "unsupported_media_type" });
         return true;
       }
@@ -42425,7 +41966,6 @@ function registerTerminalSettingsRoutes(ctx, deps) {
       }
       const updated = deps.globalOptionsService.update((current) => ({
         ...current,
-        replaceSystemPrompt: body.replaceSystemPrompt,
         enableMetaphor: body.enableMetaphor
       }));
       ctx.host.http.writeJson(res, 200, toTerminalSettingsState(updated));
@@ -42437,17 +41977,16 @@ function registerTerminalSettingsRoutes(ctx, deps) {
 }
 function toTerminalSettingsState(data) {
   return {
-    replaceSystemPrompt: data.replaceSystemPrompt ?? false,
     enableMetaphor: data.enableMetaphor ?? false
   };
 }
 function isTerminalSettingsBody(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return false;
-  if (Object.keys(value).length !== 2) return false;
+  if (Object.keys(value).length !== 1) return false;
   const body = value;
-  return typeof body.replaceSystemPrompt === "boolean" && typeof body.enableMetaphor === "boolean";
+  return typeof body.enableMetaphor === "boolean";
 }
-function isJsonRequest2(req) {
+function isJsonRequest(req) {
   const contentType = req.headers["content-type"];
   return typeof contentType === "string" && contentType.toLowerCase().split(";")[0]?.trim() === "application/json";
 }
@@ -42537,10 +42076,9 @@ var routes_default = definePlugin({
     });
     ctx.host.lifecycle.registerCleanup(unsubscribeDelete);
     registerShellRoutes(ctx, runtime);
+    registerGlobalShellRoutes(ctx, runtime);
     registerTerminalSettingsRoutes(ctx, { globalOptionsService: infraServices.globalOptionsService });
-    registerTerminalModelAuthRoutes(ctx, { authService: infraServices.authService });
     const agentLaunchKinds = registerAgentRoutes(ctx, runtime, {
-      authService: infraServices.authService,
       globalOptionsService: infraServices.globalOptionsService
     });
     registerLaunchCatalog(ctx, async () => [...await agentLaunchKinds(), SHELL_LAUNCH_KIND]);