@dotobokuri/fleet-console 1.22.1 → 1.24.0

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

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 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 fs2__default, { existsSync, readFileSync, accessSync, constants, mkdtempSync, writeFileSync, mkdirSync, rmSync, chmodSync, renameSync, readdirSync, openSync, closeSync, realpathSync, fstatSync, lstatSync, unlinkSync, statSync } from 'fs';
+import * as path28 from 'path';
+import path28__default, { dirname } from 'path';
 import * as os3 from 'os';
 import os3__default, { homedir } from 'os';
 import crypto4, { createHash, randomUUID } from 'crypto';
@@ -25,22 +25,22 @@ var __export = (target, all) => {
 function definePlugin(definition) {
   return definition;
 }
-function registerRouter(ctx, path42, handler) {
-  ctx.registerRouter(normalizePath(path42), handler);
+function registerRouter(ctx, path43, handler) {
+  ctx.registerRouter(normalizePath(path43), handler);
 }
-function registerWsHandler(ctx, path42, handler) {
-  ctx.registerWsHandler(normalizePath(path42), handler);
+function registerWsHandler(ctx, path43, handler) {
+  ctx.registerWsHandler(normalizePath(path43), handler);
 }
 function registerLaunchCatalog(ctx, provider) {
   return ctx.host.operations.registerLaunchCatalog(ctx.pluginId, provider);
 }
-function normalizePath(path42) {
-  if (path42.length === 0 || path42 === "/") return "/";
-  return path42;
+function normalizePath(path43) {
+  if (path43.length === 0 || path43 === "/") return "/";
+  return path43;
 }
 var FLEET_DATA_DIR_NAME = ".fleet";
 function getFleetDataDir() {
-  return path27.join(os3.homedir(), FLEET_DATA_DIR_NAME);
+  return path28.join(os3.homedir(), FLEET_DATA_DIR_NAME);
 }
 var SECURE_DIR_MODE = 448;
 var SECURE_FILE_MODE = 384;
@@ -128,7 +128,7 @@ function cleanupTempFiles(dir, prefix, minAgeMs, now) {
     if (!entry.startsWith(prefix)) {
       continue;
     }
-    const tempPath = path27.join(dir, entry);
+    const tempPath = path28.join(dir, entry);
     try {
       const stat3 = fs2.lstatSync(tempPath);
       if (stat3?.isFile() && !stat3.isSymbolicLink() && now - stat3.mtimeMs >= minAgeMs) {
@@ -234,7 +234,7 @@ function writeLockOwner(lockDir, ownerFileName, startedAt) {
     hostname: os3.hostname(),
     startedAt
   };
-  const ownerPath = path27.join(lockDir, ownerFileName);
+  const ownerPath = path28.join(lockDir, ownerFileName);
   try {
     fs2.writeFileSync(ownerPath, JSON.stringify(owner), { encoding: "utf-8", mode: 384 });
   } catch (error51) {
@@ -243,7 +243,7 @@ function writeLockOwner(lockDir, ownerFileName, startedAt) {
   }
 }
 function readLockOwner(lockDir, ownerFileName) {
-  const ownerPath = path27.join(lockDir, ownerFileName);
+  const ownerPath = path28.join(lockDir, ownerFileName);
   try {
     return sanitizeLockOwner(JSON.parse(fs2.readFileSync(ownerPath, "utf-8")));
   } catch (error51) {
@@ -320,7 +320,7 @@ function readAuthStoreFile(filePath) {
 }
 
 // ../../packages/core-infra/src/auth/auth-storage.ts
-var DEFAULT_AUTH_PATH = path27.join(getFleetDataDir(), "auth.json");
+var DEFAULT_AUTH_PATH = path28.join(getFleetDataDir(), "auth.json");
 var AUTH_LOCK_OWNER_FILE_NAME = "owner.json";
 var AUTH_LOCK_TIMEOUT_MS = 5e3;
 function createAuthService(deps = {}) {
@@ -376,7 +376,7 @@ function createAuthService(deps = {}) {
       }
     },
     async setApiKey(providerId, key) {
-      const dir = path27.dirname(authPath);
+      const dir = path28.dirname(authPath);
       ensureSafeDirectory(dir);
       withAuthLock(authPath, lockDir, () => {
         const data = fs2.existsSync(authPath) ? readAuthStoreFile(authPath) : {};
@@ -411,7 +411,7 @@ function createDurableJsonStore(deps) {
   const now = deps.now ?? (() => Date.now());
   const mode = SECURE_FILE_MODE ;
   const minAgeMs = deps.tempCleanupMinAgeMs ?? DEFAULT_TEMP_FILE_MIN_AGE_MS;
-  const dir = path27.dirname(deps.filePath);
+  const dir = path28.dirname(deps.filePath);
   return {
     path: deps.filePath,
     load() {
@@ -495,8 +495,8 @@ var LOCK_OWNER_FILE_NAME = "owner";
 var TEMP_FILE_PREFIX = `.tmp-${GLOBAL_OPTIONS_FILE_NAME}-`;
 function createGlobalOptionsStore(deps = {}) {
   const dataDir = deps.dataDir ?? getFleetDataDir();
-  const optionsPath = path27.join(dataDir, GLOBAL_OPTIONS_FILE_NAME);
-  const lockDir = path27.join(dataDir, LOCK_DIR_NAME);
+  const optionsPath = path28.join(dataDir, GLOBAL_OPTIONS_FILE_NAME);
+  const lockDir = path28.join(dataDir, LOCK_DIR_NAME);
   const store2 = createDurableJsonStore({
     filePath: optionsPath,
     lockDir,
@@ -529,10 +529,11 @@ function sanitizeGlobalOptionsData(value) {
   }
   const data = {
     version: GLOBAL_OPTIONS_VERSION,
-    ...typeof value.enableMetaphor === "boolean" ? { enableMetaphor: value.enableMetaphor } : {}
+    ...typeof value.enableMetaphor === "boolean" ? { enableMetaphor: value.enableMetaphor } : {},
+    ...value.codexLaunchMode === "acp" || value.codexLaunchMode === "app-server" ? { codexLaunchMode: value.codexLaunchMode } : {}
   };
-  const allowedKeys = /* @__PURE__ */ new Set(["version", "enableMetaphor"]);
-  const changed = Object.keys(value).some((key) => !allowedKeys.has(key)) || "enableMetaphor" in value && typeof value.enableMetaphor !== "boolean";
+  const allowedKeys = /* @__PURE__ */ new Set(["version", "enableMetaphor", "codexLaunchMode"]);
+  const changed = Object.keys(value).some((key) => !allowedKeys.has(key)) || "enableMetaphor" in value && typeof value.enableMetaphor !== "boolean" || "codexLaunchMode" in value && value.codexLaunchMode !== "acp" && value.codexLaunchMode !== "app-server";
   return { data, changed };
 }
 function isRecord(value) {
@@ -1398,10 +1399,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path42) {
-  if (!path42)
+function getElementAtPath(obj, path43) {
+  if (!path43)
     return obj;
-  return path42.reduce((acc, key) => acc?.[key], obj);
+  return path43.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -1810,11 +1811,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path42, issues) {
+function prefixIssues(path43, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path42);
+    iss.path.unshift(path43);
     return iss;
   });
 }
@@ -1961,16 +1962,16 @@ function flattenError(error51, mapper = (issue3) => issue3.message) {
 }
 function formatError(error51, mapper = (issue3) => issue3.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path42 = []) => {
+  const processError = (error52, path43 = []) => {
     for (const issue3 of error52.issues) {
       if (issue3.code === "invalid_union" && issue3.errors.length) {
-        issue3.errors.map((issues) => processError({ issues }, [...path42, ...issue3.path]));
+        issue3.errors.map((issues) => processError({ issues }, [...path43, ...issue3.path]));
       } else if (issue3.code === "invalid_key") {
-        processError({ issues: issue3.issues }, [...path42, ...issue3.path]);
+        processError({ issues: issue3.issues }, [...path43, ...issue3.path]);
       } else if (issue3.code === "invalid_element") {
-        processError({ issues: issue3.issues }, [...path42, ...issue3.path]);
+        processError({ issues: issue3.issues }, [...path43, ...issue3.path]);
       } else {
-        const fullpath = [...path42, ...issue3.path];
+        const fullpath = [...path43, ...issue3.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue3));
         } else {
@@ -1997,17 +1998,17 @@ function formatError(error51, mapper = (issue3) => issue3.message) {
 }
 function treeifyError(error51, mapper = (issue3) => issue3.message) {
   const result = { errors: [] };
-  const processError = (error52, path42 = []) => {
+  const processError = (error52, path43 = []) => {
     var _a3, _b;
     for (const issue3 of error52.issues) {
       if (issue3.code === "invalid_union" && issue3.errors.length) {
-        issue3.errors.map((issues) => processError({ issues }, [...path42, ...issue3.path]));
+        issue3.errors.map((issues) => processError({ issues }, [...path43, ...issue3.path]));
       } else if (issue3.code === "invalid_key") {
-        processError({ issues: issue3.issues }, [...path42, ...issue3.path]);
+        processError({ issues: issue3.issues }, [...path43, ...issue3.path]);
       } else if (issue3.code === "invalid_element") {
-        processError({ issues: issue3.issues }, [...path42, ...issue3.path]);
+        processError({ issues: issue3.issues }, [...path43, ...issue3.path]);
       } else {
-        const fullpath = [...path42, ...issue3.path];
+        const fullpath = [...path43, ...issue3.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue3));
           continue;
@@ -2039,8 +2040,8 @@ function treeifyError(error51, mapper = (issue3) => issue3.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path42 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path42) {
+  const path43 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path43) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -14704,13 +14705,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path42 = ref.slice(1).split("/").filter(Boolean);
-  if (path42.length === 0) {
+  const path43 = ref.slice(1).split("/").filter(Boolean);
+  if (path43.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path42[0] === defsKey) {
-    const key = path42[1];
+  if (path43[0] === defsKey) {
+    const key = path43[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -18883,7 +18884,7 @@ function createChildEnv(env, overlay) {
   return child;
 }
 function wrapWindowsShim(resolved, env, platform) {
-  if (platform !== "win32" || !WINDOWS_SHIM_EXTENSIONS.has(path27__default.extname(resolved).toLowerCase())) {
+  if (platform !== "win32" || !WINDOWS_SHIM_EXTENSIONS.has(path28__default.extname(resolved).toLowerCase())) {
     return { bin: resolved, prefixArgs: [] };
   }
   rejectCmdExpansionSensitiveShim(resolved);
@@ -18901,13 +18902,13 @@ 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)) {
+  const pathSeparator = platform === "win32" ? WINDOWS_PATH_SEPARATOR : path28__default.delimiter;
+  if (hasPathSeparator(bin, platform) || path28__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);
+    const candidate = resolveWithExtensions(path28__default.join(searchDir, bin), pathExts, platform);
     if (candidate) {
       return candidate;
     }
@@ -18915,7 +18916,7 @@ function findOnPath(bin, pathValue, pathExts, platform) {
   return void 0;
 }
 function resolveWithExtensions(candidate, pathExts, platform) {
-  if (platform !== "win32" || path27__default.extname(candidate).length > 0) {
+  if (platform !== "win32" || path28__default.extname(candidate).length > 0) {
     return isAccessibleExecutable(candidate, platform) ? candidate : void 0;
   }
   for (const ext of pathExts) {
@@ -20329,11 +20330,24 @@ function getYoloModeId(cli) {
       return "yolo";
   }
 }
-function buildCodexDeveloperInstructionConfig(systemPrompt) {
-  if (!systemPrompt) {
-    return [];
+function buildCodexConfigEnv(systemPrompt, configOverrides, baseConfigJson) {
+  const map2 = parseBaseConfigMap(baseConfigJson);
+  for (const override of configOverrides ?? []) {
+    const eqIndex = override.indexOf("=");
+    if (eqIndex < 0) {
+      continue;
+    }
+    const key = override.slice(0, eqIndex);
+    const rawValue = override.slice(eqIndex + 1);
+    assignNestedKey(map2, key, parseOverrideValue(rawValue));
   }
-  return [`developer_instructions="${escapeTomlBasicString(systemPrompt)}"`];
+  if (systemPrompt) {
+    map2.developer_instructions = systemPrompt;
+  }
+  if (Object.keys(map2).length === 0) {
+    return void 0;
+  }
+  return JSON.stringify(map2);
 }
 function buildConfigOverrideArgs(overrides) {
   return overrides.flatMap((override) => ["-c", override]);
@@ -20361,27 +20375,44 @@ function mcpServerConfigsToAcp(servers) {
     headers: server.headers ?? []
   }));
 }
-function escapeTomlBasicString(value) {
-  return value.replace(/[\u0000-\u001f"\\\u007f]/g, (char) => {
-    switch (char) {
-      case "\b":
-        return "\\b";
-      case "	":
-        return "\\t";
-      case "\n":
-        return "\\n";
-      case "\f":
-        return "\\f";
-      case "\r":
-        return "\\r";
-      case '"':
-        return '\\"';
-      case "\\":
-        return "\\\\";
-      default:
-        return `\\u${char.charCodeAt(0).toString(16).padStart(4, "0")}`;
+function parseBaseConfigMap(baseConfigJson) {
+  if (!baseConfigJson) {
+    return {};
+  }
+  try {
+    const parsed = JSON.parse(baseConfigJson);
+    if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+      return parsed;
     }
-  });
+  } catch {
+  }
+  return {};
+}
+function parseOverrideValue(raw) {
+  try {
+    return JSON.parse(raw);
+  } catch {
+    if (raw.length >= 2 && raw.startsWith('"') && raw.endsWith('"')) {
+      return raw.slice(1, -1);
+    }
+    return raw;
+  }
+}
+function assignNestedKey(target, dottedKey, value) {
+  const segments = dottedKey.split(".");
+  let cursor = target;
+  for (let i = 0; i < segments.length - 1; i += 1) {
+    const segment = segments[i];
+    const existing = cursor[segment];
+    if (typeof existing === "object" && existing !== null && !Array.isArray(existing)) {
+      cursor = existing;
+    } else {
+      const nested = {};
+      cursor[segment] = nested;
+      cursor = nested;
+    }
+  }
+  cursor[segments[segments.length - 1]] = value;
 }
 
 // ../../packages/core-unified-agent/src/detector/CliDetector.ts
@@ -21642,12 +21673,12 @@ var CodexAppServerConnection = class extends BaseConnection {
     );
   }
   findRolloutPathForThreadId(threadId) {
-    const codexHome = this.codexHome ?? this.env.CODEX_HOME ?? path27.join(this.env.HOME ?? "", ".codex");
+    const codexHome = this.codexHome ?? this.env.CODEX_HOME ?? path28.join(this.env.HOME ?? "", ".codex");
     if (!codexHome) {
       return null;
     }
     for (const rootName of ["sessions", "archived_sessions"]) {
-      const found = findRolloutPath(path27.join(codexHome, rootName), threadId);
+      const found = findRolloutPath(path28.join(codexHome, rootName), threadId);
       if (found) {
         return found;
       }
@@ -21758,7 +21789,7 @@ function findRolloutPath(root, threadId) {
     return null;
   }
   for (const entry of fs2.readdirSync(root, { withFileTypes: true })) {
-    const entryPath = path27.join(root, entry.name);
+    const entryPath = path28.join(root, entry.name);
     if (entry.isDirectory()) {
       const found = findRolloutPath(entryPath, threadId);
       if (found) {
@@ -21776,13 +21807,11 @@ function findRolloutPath(root, threadId) {
 // ../../packages/core-unified-agent/src/client/UnifiedCodexAgentClient.ts
 var CODEX_TURN_LEVEL_CONFIG_KEYS = /* @__PURE__ */ new Set(["effort", "model"]);
 var CODEX_THREAD_POLICY_CONFIG_KEYS = /* @__PURE__ */ new Set(["approvalPolicy", "sandbox"]);
-var CODEX_ACP_PROMPT_FALLBACK = process.platform === "win32";
 var UnifiedCodexAgentClient = class extends EventEmitter {
   connection = null;
   sessionId = null;
   sessionCwd = null;
   currentSystemPrompt = null;
-  firstPromptPending = null;
   pendingOverrides = null;
   detector = new CliDetector();
   on(event, listener) {
@@ -21803,9 +21832,10 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
       throw new Error("UnifiedCodexAgentClient\uB294 codex CLI\uB9CC \uC9C0\uC6D0\uD569\uB2C8\uB2E4.");
     }
     this.validateModelEffort(options.model, options.effort);
-    {
+    if (shouldUseCodexAcp(options)) {
       return this.connectAcp(options);
     }
+    return this.connectAppServer(options);
   }
   async connectAppServer(options) {
     const backend = getBackendConfig("codex");
@@ -21874,22 +21904,17 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
   async connectAcp(options) {
     const cleanEnv = cleanEnvironment(process.env, options.env);
     const spawnConfig = createSpawnConfig("codex", options);
-    const developerInstructions = CODEX_ACP_PROMPT_FALLBACK ? void 0 : options.systemPrompt ?? void 0;
-    const args = [
-      ...spawnConfig.args,
-      ...this.buildStartupConfigArgs(
-        options.configOverrides,
-        void 0,
-        void 0,
-        developerInstructions
-      )
-    ];
+    const codexConfigEnv = buildCodexConfigEnv(
+      options.systemPrompt,
+      options.configOverrides,
+      cleanEnv.CODEX_CONFIG
+    );
     const connection = new AcpConnection({
       command: spawnConfig.command,
-      args,
+      args: spawnConfig.args,
       cliType: "codex",
       cwd: options.cwd,
-      env: { ...cleanEnv },
+      env: { ...cleanEnv, ...codexConfigEnv ? { CODEX_CONFIG: codexConfigEnv } : {} },
       requestTimeout: options.timeout ?? 6e5,
       initTimeout: options.timeout ?? 6e4,
       promptIdleTimeout: options.promptIdleTimeout ?? 6e5,
@@ -21986,17 +22011,7 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
       if (!this.sessionId) {
         throw new Error("\uC5F0\uACB0\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4");
       }
-      const systemPrompt = this.firstPromptPending;
-      if (!systemPrompt) {
-        return this.connection.sendPrompt(this.sessionId, content);
-      }
-      const userBlocks = typeof content === "string" ? [{ type: "text", text: content }] : content;
-      const response = await this.connection.sendPrompt(this.sessionId, [
-        { type: "text", text: systemPrompt },
-        ...userBlocks
-      ]);
-      this.firstPromptPending = null;
-      return response;
+      return this.connection.sendPrompt(this.sessionId, content);
     }
     this.applyPendingOverrides();
     const input = typeof content === "string" ? [{ type: "text", text: content, text_elements: [] }] : content.map((block) => "text" in block ? { type: "text", text: block.text, text_elements: [] } : { type: "text", text: JSON.stringify(block), text_elements: [] });
@@ -22078,8 +22093,6 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
         mcpServers: this.resolveAcpMcpServers(mcpServers)
       });
       this.sessionId = sessionId;
-      this.currentSystemPrompt = null;
-      this.firstPromptPending = null;
       return;
     }
     if (mcpServers?.length) {
@@ -22116,7 +22129,6 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
       const session = await this.connection.reconnectSession(targetCwd);
       this.sessionId = session.sessionId;
       this.sessionCwd = targetCwd;
-      this.firstPromptPending = this.currentSystemPrompt;
       return {
         cli: "codex",
         protocol: "acp",
@@ -22144,7 +22156,6 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     this.sessionId = session.sessionId;
     this.sessionCwd = options.cwd;
     this.currentSystemPrompt = options.systemPrompt ?? null;
-    this.firstPromptPending = CODEX_ACP_PROMPT_FALLBACK && !options.sessionId ? options.systemPrompt ?? null : null;
     this.pendingOverrides = {
       turnConfig: {},
       threadConfig: {}
@@ -22162,7 +22173,6 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     this.sessionId = null;
     this.sessionCwd = null;
     this.currentSystemPrompt = null;
-    this.firstPromptPending = null;
     this.pendingOverrides = null;
   }
   validateModelEffort(modelId, effort) {
@@ -22373,9 +22383,8 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
         return "read-only";
     }
   }
-  buildStartupConfigArgs(overrides, servers, modeMapping, developerInstructions) {
+  buildStartupConfigArgs(overrides, servers, modeMapping) {
     const configArgs = [
-      ...buildCodexDeveloperInstructionConfig(developerInstructions),
       ...modeMapping ? [
         `approval_policy="${modeMapping.approvalPolicy}"`,
         `sandbox_mode="${modeMapping.sandbox}"`
@@ -22464,6 +22473,11 @@ var UnifiedCodexAgentClient = class extends EventEmitter {
     return patterns.some((pattern) => pattern.test(text));
   }
 };
+function shouldUseCodexAcp(options) {
+  const value = options.env?.CODEX_USE_ACP ?? process.env.CODEX_USE_ACP;
+  const normalized = value?.trim().toLowerCase();
+  return normalized !== "false" && normalized !== "0";
+}
 var UnifiedCursorAgentClient = class extends EventEmitter {
   connection = null;
   sessionId = null;
@@ -25085,7 +25099,7 @@ function readRawCarriersOrDefaultStore() {
   return readCarriers();
 }
 function getCarriersFilePath() {
-  return path27.join(resolveStoreDir(), FILENAME);
+  return path28.join(resolveStoreDir(), FILENAME);
 }
 function updateCarriers(mutator) {
   withStoreLock(() => {
@@ -25099,7 +25113,7 @@ function updateCarriers(mutator) {
 function withStoreLock(operation) {
   const dir = resolveStoreDir();
   ensureSafeDirectory(dir);
-  const lockDir = path27.join(dir, LOCK_DIRNAME);
+  const lockDir = path28.join(dir, LOCK_DIRNAME);
   return withDirectoryLock(
     { lockDir, ownerFileName: LOCK_OWNER_FILENAME },
     operation
@@ -25112,7 +25126,7 @@ function readCarriers() {
   return readCarriersFromDir(resolveStoreDir());
 }
 function readCarriersFromDir(dir) {
-  const filePath = path27.join(dir, FILENAME);
+  const filePath = path28.join(dir, FILENAME);
   let fd;
   try {
     const stat3 = fs2.lstatSync(filePath);
@@ -25141,7 +25155,7 @@ function recordLastLocalWriteFingerprint(filePath, generation) {
 }
 function writeCarriers(s) {
   const dir = resolveStoreDir();
-  const filePath = path27.join(dir, FILENAME);
+  const filePath = path28.join(dir, FILENAME);
   const next = serializeFleetCarriers(s);
   writeAtomicSync(filePath, `${JSON.stringify(next, null, 2)}
 `, { fsync: false, mode: 420 });
@@ -25166,7 +25180,7 @@ function sanitizeFleetCarriers(value) {
 }
 function unlinkStaleSubagentModeFile(dir) {
   try {
-    fs2.unlinkSync(path27.join(dir, STALE_SUBAGENT_MODE_FILENAME));
+    fs2.unlinkSync(path28.join(dir, STALE_SUBAGENT_MODE_FILENAME));
   } catch {
   }
 }
@@ -25722,7 +25736,7 @@ var CHRONICLE_DEFAULTS = {
 };
 var CARRIER_METADATA = {
   // ── Tier 1: Routing ──
-  title: "Captain \xB7 Chief Knowledge Officer",
+  title: "Chief Knowledge Officer",
   summary: "Documentation steward across two surfaces: codebase markdown (AGENTS.md/README/CHANGELOG/inline docs) and Fleet Wiki entries proposed via the wiki patch queue.",
   category: "operations",
   whenToUse: [
@@ -25735,7 +25749,7 @@ var CARRIER_METADATA = {
     "before implementation and verification are complete",
     "code modification (\u2192genesis) or code review (\u2192sentinel)",
     "architectural judgment (\u2192nimitz) or release-scope planning decisions (\u2192kirov)",
-    "Fleet Wiki patch approval \u2014 Admiral retains the wiki_patch_queue approve/reject gate"
+    "Fleet Wiki patch approval \u2014 host agent retains the wiki_patch_queue approve/reject gate"
   ],
   requestBlocks: [
     {
@@ -25771,18 +25785,18 @@ var CARRIER_METADATA = {
   ],
   // ── Tier 2: Composition ──
   permissions: [
-    "CRITICAL: Fleet Wiki entries are governed by the Fleet Wiki workspace AGENTS.md doctrine \u2014 propose via wiki_ingest only, and NEVER edit wiki entries or system-managed indexes/logs by hand. Admiral holds the wiki_patch_queue approve/reject gate.",
+    "CRITICAL: Fleet Wiki entries are governed by the Fleet Wiki workspace AGENTS.md doctrine \u2014 propose via wiki_ingest only, and NEVER edit wiki entries or system-managed indexes/logs by hand. The host agent holds the wiki_patch_queue approve/reject gate.",
     "CRITICAL: Owns codebase markdown \u2014 AGENTS.md, README, CHANGELOG, and inline doc files outside the Fleet Wiki workspace \u2014 and may write them directly. NEVER modify source code logic (report issues instead).",
-    "MUST treat the Admiral's <doc_type>, <audience>, <scope>, and <change_scope> as binding contracts. NEVER redefine or expand documentation scope autonomously.",
-    "Owns expression details (tone, wording, paragraph flow within domain conventions) but MUST NOT silently change structural decisions specified by the Admiral (sections, items, target files).",
+    "MUST treat the host agent's <doc_type>, <audience>, <scope>, and <change_scope> as binding contracts. NEVER redefine or expand documentation scope autonomously.",
+    "Owns expression details (tone, wording, paragraph flow within domain conventions) but MUST NOT silently change structural decisions specified by the host agent (sections, items, target files).",
     "MUST NOT make go/no-go, release timing, or release-scope decisions (escalate to Kirov/Nimitz). May detect and document breaking changes only."
   ],
   outputFormat: `Deliver the documentation artifact directly.
 [Codebase Doc] Write the .md/AGENTS.md/README/CHANGELOG file(s) directly via filesystem tools.
-[Fleet Wiki] Compose the entry body and enqueue via wiki_ingest. Report the patch_id; never edit wiki entries or system-managed files by hand. Admiral approves via wiki_patch_queue.
+[Fleet Wiki] Compose the entry body and enqueue via wiki_ingest. Report the patch_id; never edit wiki entries or system-managed files by hand. The host agent approves via wiki_patch_queue.
 After delivery, provide a brief completion report.
 [Required] always include:
-  **Workflow** \u2014 One of: 'Codebase Doc' or 'Fleet Wiki' (state which workflow this sortie used).
+  **Workflow** \u2014 One of: 'Codebase Doc' or 'Fleet Wiki' (state which workflow this task used).
   **Documents written / Patches enqueued** \u2014 Each file created/modified (Codebase Doc) OR each patch_id enqueued (Fleet Wiki) with target path.
   **Cascade .md audit** \u2014 (Codebase Doc only) Each .md inspected: path, status (updated / already consistent / not applicable), 1-line summary if updated.
 [If applicable] omit if not relevant:
@@ -25791,10 +25805,10 @@ After delivery, provide a brief completion report.
 Keep the completion report concise \u2014 the documentation/patch itself is the primary deliverable.`,
   principles: [
     CARRIER_JOBS_SELF_CALL_HINT,
-    "Two workflows, one carrier \u2014 never mix the two surfaces. (A) Codebase Doc: direct filesystem edits to .md/AGENTS.md/README/CHANGELOG outside the Fleet Wiki workspace. (B) Fleet Wiki: orient \u2192 consult \u2192 lint \u2192 wiki_ingest to enqueue \u2192 Admiral approves via wiki_patch_queue. Decide the workflow from <doc_type>; if ambiguous, escalate before acting.",
-    "[Fleet Wiki] Read the Fleet Wiki workspace AGENTS.md before the first wiki operation in a sortie \u2014 it is the authoritative doctrine for boundaries, roles, gates, schema reference, and escalation. The active entry schema may evolve; always consult the workspace doctrine and current schema each sortie rather than relying on prior memory.",
+    "Two workflows, one carrier \u2014 never mix the two surfaces. (A) Codebase Doc: direct filesystem edits to .md/AGENTS.md/README/CHANGELOG outside the Fleet Wiki workspace. (B) Fleet Wiki: orient \u2192 consult \u2192 lint \u2192 wiki_ingest to enqueue \u2192 host agent approves via wiki_patch_queue. Decide the workflow from <doc_type>; if ambiguous, escalate before acting.",
+    "[Fleet Wiki] Read the Fleet Wiki workspace AGENTS.md before the first wiki operation in a task \u2014 it is the authoritative doctrine for boundaries, roles, gates, schema reference, and escalation. The active entry schema may evolve; always consult the workspace doctrine and current schema each task rather than relying on prior memory.",
     "[Fleet Wiki] Provide raw evidence (source) alongside every wiki_ingest call \u2014 synthesized entry body must cite raw substance without copying verbatim. The system writes raw, queue, and index automatically.",
-    "[Codebase Doc] Every sortie must include a cascade .md audit \u2014 identify all .md files within the change scope, verify they reflect current state, and cross-reference parent/child AGENTS.md to prevent doctrinal conflicts.",
+    "[Codebase Doc] Every task must include a cascade .md audit \u2014 identify all .md files within the change scope, verify they reflect current state, and cross-reference parent/child AGENTS.md to prevent doctrinal conflicts.",
     "[Codebase Doc] CRITICAL: README.md files must ONLY be updated where they already exist \u2014 NEVER create new README.md files. If a directory lacks a README.md, leave it as-is and note the absence in the audit report.",
     "If additional documentation scope seems needed, MUST report it as a follow-up suggestion in the completion report. NEVER silently expand the audit/update scope.",
     "Change-impact documentation must be factual and observable \u2014 never recommend whether a change should ship, be reverted, or be delayed."
@@ -25816,8 +25830,8 @@ var GENESIS_DEFAULTS = {
 };
 var CARRIER_METADATA2 = {
   // ── Tier 1: Routing ──
-  title: "Captain \xB7 Chief Engineer",
-  summary: "Full-stack implementation workhorse \u2014 builds features, writes production-quality clean code, and maintains structural integrity throughout. As the Captain (\uD568\uC7A5) of this Carrier, Genesis takes direct command of build and implementation operations.",
+  title: "Chief Engineer",
+  summary: "Full-stack implementation workhorse \u2014 builds features, writes production-quality clean code, and maintains structural integrity throughout.",
   category: "operations",
   whenToUse: [
     "new features",
@@ -25844,14 +25858,14 @@ var CARRIER_METADATA2 = {
   // ── Tier 2: Composition ──
   permissions: [
     "Full access to the codebase \u2014 read, write, and execute commands.",
-    "Owns implementation details (internal helper structure, code organization, local naming) ONLY within the design boundaries set by the Admiral's instructions.",
-    "MUST NOT substitute autonomous design judgment for the Admiral's explicit design decisions \u2014 interface unification vs separation, type/function names, directory structure, public surface shape, and any choice the Admiral has specified are BINDING contracts, not suggestions.",
+    "Owns implementation details (internal helper structure, code organization, local naming) ONLY within the design boundaries set by the host agent's instructions.",
+    "MUST NOT substitute autonomous design judgment for the host agent's explicit design decisions \u2014 interface unification vs separation, type/function names, directory structure, public surface shape, and any choice the host agent has specified are BINDING contracts, not suggestions.",
     "MUST NOT silently re-plan, expand scope, invent alternative workflows, or shrink the assigned work beyond what the instructions specify.",
     "MUST NOT silently absorb Kirov's planning role or Nimitz's architecture arbitration role when those inputs are clearly missing."
   ],
   principles: [
     CARRIER_JOBS_SELF_CALL_HINT,
-    "MUST treat the Admiral's <objective>, <scope>, <constraints>, and <references> as binding design contracts. Specific design decisions stated in the instructions MUST be implemented as-instructed, not as 'cleaner' or 'better' substitutions.",
+    "MUST treat the host agent's <objective>, <scope>, <constraints>, and <references> as binding design contracts. Specific design decisions stated in the instructions MUST be implemented as-instructed, not as 'cleaner' or 'better' substitutions.",
     "If an alternative design seems superior, MUST complete the assigned work AS-INSTRUCTED first, then report the alternative ONLY as a follow-up suggestion. NEVER substitute the alternative silently.",
     "On ambiguity or apparent conflict in the instructions, MUST report back and request clarification instead of choosing autonomously.",
     "Follow planning artifacts when provided \u2014 do not re-plan work that Kirov has already structured unless the input is clearly invalid.",
@@ -25885,8 +25899,8 @@ var KIROV_DEFAULTS = {
 };
 var CARRIER_METADATA3 = {
   // ── Tier 1: Routing ──
-  title: "Captain \xB7 Operational Planning Bridge",
-  summary: "Clarifies requirements, closes planning gaps, and writes executable .fleet/plans/*.md plan_files with ordered waves, ownership, dependencies, QA gates, acceptance criteria, documentation impacts, and escalation triggers.",
+  title: "Operational Planning",
+  summary: "Clarifies requirements, closes planning gaps, and writes one executable .fleet/plans/*.md plan_file SSoT with explicit parallel lanes, ownership, dependencies, QA gates, acceptance criteria, documentation impacts, and escalation triggers.",
   category: "planning",
   whenToUse: [
     "structured .fleet/plans/*.md plan_file requests, PRD decomposition, or Ohio-executable execution plans",
@@ -25894,14 +25908,14 @@ var CARRIER_METADATA3 = {
     "medium/large refactors, migrations, cross-module work, or materially ambiguous requirements where planning must close gaps before execution"
   ],
   whenNotToUse: [
-    "single-Carrier tasks with \u22643 dependent steps and clear acceptance criteria (\u2192Admiral plans directly)",
+    "single-Carrier tasks with \u22643 dependent steps and clear acceptance criteria (\u2192host agent plans directly)",
     "direct code implementation, single-shot (\u2192genesis) or plan-driven (\u2192ohio)",
-    "final architecture arbitration (\u2192nimitz) or sorties needing reconnaissance first (\u2192vanguard/tempest)"
+    "final architecture arbitration (\u2192nimitz) or dispatches needing reconnaissance first (\u2192vanguard/tempest)"
   ],
   requestBlocks: [
     { tag: "goal", hint: "What the user wants to build, fix, or achieve \u2014 specific feature, PRD, behavior, and any stated constraints.", required: true },
     { tag: "plan_file", hint: "If provided, exact repo-relative .fleet/plans/{name}.md path Kirov must create or update. Do not choose a different filename.", required: false },
-    { tag: "context", hint: "Relevant codebase context \u2014 files, modules, patterns, prior Admiral direction, or implementation realities the planner should respect.", required: false },
+    { tag: "context", hint: "Relevant codebase context \u2014 files, modules, patterns, prior host-agent direction, or implementation realities the planner should respect.", required: false },
     { tag: "constraints", hint: "Business rules, tech stack requirements, scope boundaries, fixed decisions, or explicit exclusions the plan must respect.", required: false },
     { tag: "intent_type", hint: "If known: Refactoring | Build from Scratch | Mid-sized | Collaborative | Architecture Follow-through | Research-to-Plan.", required: false }
   ],
@@ -25909,27 +25923,31 @@ var CARRIER_METADATA3 = {
   // ── Tier 2: Composition ──
   permissions: [
     "CRITICAL: Write access strictly limited to .fleet/plans/*.md and .fleet/drafts/*.md. NEVER modify source code, configs, or any non-markdown file.",
-    "MUST honor exact provided .fleet/plans/*.md paths. Success means creating or updating an executable plan_file unless the Admiral explicitly requests draft-only work.",
-    "MUST return unresolved architecture choices, system-design trade-offs, and technical path decisions to the Admiral for direction instead of silently deciding them.",
-    "MUST report Blockers or Admiral Direction Needed instead of claiming completion when the plan file cannot be written or the schema cannot be filled."
+    "MUST honor exact provided .fleet/plans/*.md paths. Keep one plan_file as the execution SSoT: Success means creating or updating that executable plan_file unless the host agent explicitly requests draft-only work. Do not create split plan files for parallel lanes.",
+    "MUST return unresolved architecture choices, system-design trade-offs, and technical path decisions to the host agent for direction instead of silently deciding them.",
+    "MUST report Blockers or Host Direction Needed instead of claiming completion when the plan file cannot be written or the schema cannot be filled."
   ],
   outputFormat: `After completing the plan, provide a structured plan summary.
 [Required] always include:
   **Plan file** \u2014 Exact generated or updated .fleet/plans/{name}.md path.
-  **Execution Waves** \u2014 Ordered waves with parallel markers (e.g., "W1 \u2192 W2 || W3 \u2192 W4") and critical dependencies.
+  **Execution Topology** \u2014 Ordered waves, stable Wave/Lane IDs, parallel markers (e.g., "W1 \u2192 W2 || W3 \u2192 W4"), and critical dependencies.
+  **Dispatch Manifest** \u2014 Each lane's exact write set, start condition, eligible concurrent lanes, integration gate, handoff, and rollback unit.
   **Scope: IN** \u2014 What is explicitly included in the plan.
   **Scope: OUT** \u2014 What is explicitly excluded.
   **Next step** \u2014 Run \`/start-work {name}\` to execute the plan.
 [If applicable] omit if not relevant:
   **Blockers** \u2014 Why no plan file was written or why the schema cannot be filled.
-  **Admiral Direction Needed** \u2014 Architecture, trade-off, or path choices needing confirmation.
+  **Host Direction Needed** \u2014 Architecture, trade-off, or path choices needing confirmation.
 Keep the summary concise \u2014 bullets and short lines only. No narrative paragraphs.`,
   principles: [
     CARRIER_JOBS_SELF_CALL_HINT,
     "Clarify only to unlock planning \u2014 ask the minimum questions needed to produce a reliable execution plan.",
     "Pre-plan gap analysis is mandatory internal input, never a substitute final output. May launch background explore/librarian sub-agents for context gathering. Use incremental write protocol: Write() skeleton first, then Edit() in 2-4 task batches.",
-    'The .fleet/plans/*.md file MUST contain this exact default Markdown template unless the Admiral provides a different template: # Objective, # File Ownership, # Waves, ## Wave N \u2014 <name>, - Target files/modules:, - Dependencies:, - Parallelizable:, - Implementation summary:, - Verification/static checks:, - Escalation triggers:, # QA Gates, # Acceptance Criteria, # Documentation Updates, # Final Review Loop. Required headings must not be renamed, reordered, or omitted; extra sections allowed only after them. Write headings into the plan_file itself, not just mentioned in the response. For tiny tasks, mark non-applicable fields "Not applicable" rather than deleting them.',
-    "Return unresolved architecture and deep trade-off decisions to the Admiral for direction.",
+    'The .fleet/plans/*.md file MUST contain this exact default Markdown template unless the host agent provides a different template: # Objective, # File Ownership, # Execution Topology, - Execution mode: Sequential | Parallel, - Shared mutable resources:, # Waves, ## Wave N \u2014 <name>, ### Lane WN-X \u2014 <name>, - Exact write set:, - Read dependencies:, - Dependency/start condition:, - Eligible concurrent lanes: (use "none" for serialized work), - Integration gate:, - Handoff:, - Rollback unit:, - Implementation summary:, - Verification/static checks:, - Escalation triggers:, # Dispatch Manifest, - Full-plan Ohio invocation (execution_scope omitted or all): allowed sequentially only when Execution mode is Sequential or Execution Topology is absent; for Parallel, dispatch exact Lane IDs only and never combine a full-plan invocation with lane jobs, - Lane WN-X \u2014 <name>: exact write set, read dependencies, dependency/start condition, eligible concurrent lanes, integration gate, handoff, and rollback unit summary for dispatch, # QA Gates, # Acceptance Criteria, # Documentation Updates, # Final Review Loop. Required headings must not be renamed, reordered, or omitted; extra sections allowed only after them. Write headings into the plan_file itself, not just mentioned in the response. For tiny tasks, mark non-applicable fields "Not applicable" rather than deleting them.',
+    "Execution Topology is mandatory for every plan. It MUST declare Execution mode: Sequential | Parallel, shared mutable resources, ordered waves, and stable Wave/Lane IDs; a lane may be marked parallel only when its exact non-overlapping write set and read dependencies prove it is safe to run concurrently.",
+    "Dispatch Manifest is mandatory for every plan. For each parallel lane, declare: stable Wave/Lane ID; exact non-overlapping write set; read dependencies; dependency/start condition; eligible concurrent lanes; integration gate; handoff; and rollback unit. It MUST also state that full-plan Ohio invocation (execution_scope omitted or all) is allowed sequentially only for Sequential or absent Execution Topology; Parallel requires exact Lane IDs, makes full-plan invocation unavailable as an alternative dispatch path, and never combines it with lane jobs. If disjoint lanes cannot be proven safe, mark the work sequential rather than calling it parallel.",
+    "Under each lane's '- Implementation summary:' (or the wave's when a wave declares no lanes), enumerate the concrete implementation steps as a Markdown checkbox task list \u2014 one '- [ ]' line per step, roughly 3-7 per lane; use '- [x]' only for work already completed at planning time. These checkboxes are the machine-readable progress contract consumed by the execution carrier and the Console Plans surface \u2014 do not encode task state in any other notation (no emoji, no status words, no strikethrough).",
+    "Return unresolved architecture and deep trade-off decisions to the host agent for direction.",
     "Optimize for direct execution from the resulting plan_file."
   ]
 };
@@ -25949,8 +25967,8 @@ var NIMITZ_DEFAULTS = {
 };
 var CARRIER_METADATA4 = {
   // ── Tier 1: Routing ──
-  title: "Captain \xB7 Strategic Command & Judgment",
-  summary: "Read-only strategic command \u2014 decides the technical path through doctrinal judgment, architecture decisions, deep analysis, and trade-off adjudication. As the Captain (\uD568\uC7A5) of this Carrier, Nimitz commands strategic technical judgment from the flagship bridge without entering the implementation path.",
+  title: "Strategic Command & Judgment",
+  summary: "Read-only strategic command \u2014 decides the technical path through doctrinal judgment, architecture decisions, deep analysis, and trade-off adjudication without entering the implementation path.",
   category: "strategy",
   whenToUse: [
     "architecture and design decisions",
@@ -25973,7 +25991,7 @@ var CARRIER_METADATA4 = {
   // ── Tier 2: Composition ──
   permissions: [
     "CRITICAL: Strictly read-only. NEVER delegate code modification or file editing to this carrier.",
-    "CRITICAL: NEVER sortie Nimitz without prior reconnaissance \u2014 if recon is needed, sortie vanguard/tempest FIRST. Hard prerequisite, not a suggestion.",
+    "CRITICAL: NEVER dispatch Nimitz without prior reconnaissance \u2014 if recon is needed, dispatch vanguard/tempest FIRST. Hard prerequisite, not a suggestion.",
     "Full access to read the codebase and execute read-only commands for analysis.",
     "MUST NOT decompose work into task waves, delivery schedules, or implementation checklists \u2014 handoff belongs to Kirov."
   ],
@@ -26014,8 +26032,8 @@ var OHIO_DEFAULTS = {
 };
 var CARRIER_METADATA5 = {
   // ── Tier 1: Routing ──
-  title: "Captain \xB7 Multi-Wave Strike Execution",
-  summary: "Receives a Kirov-authored plan_file and executes it wave-by-wave to completion \u2014 silent, patient, sequential delivery of plan steps. As the Captain (\uD568\uC7A5) of this Carrier, Ohio commands multi-wave strike execution and is the sole carrier authorised to consume plan_file inputs.",
+  title: "Multi-Wave Execution",
+  summary: "Receives a Kirov-authored plan_file and executes it wave-by-wave to completion, or one manifest-declared lane when explicitly scoped. Ohio is the sole carrier authorised to consume plan_file inputs.",
   category: "planning",
   whenToUse: [
     "multi-wave builds driven by an explicit plan_file",
@@ -26024,13 +26042,14 @@ var CARRIER_METADATA5 = {
     "cross-module coordinated changes following a Kirov plan"
   ],
   whenNotToUse: [
-    "single-file edits or admiral-direct single-shot tasks (\u2192genesis)",
+    "single-file edits or host-directed single-shot tasks (\u2192genesis)",
     "architecture decisions (\u2192nimitz)",
     "planning work itself (\u2192kirov)",
     "reconnaissance before planning (\u2192vanguard/tempest)"
   ],
   requestBlocks: [
     { tag: "plan_file", hint: "Required repo-relative path to a Markdown plan file under .fleet/plans/*.md only. Ohio reads this file and follows it as the authoritative execution plan.", required: true },
+    { tag: "execution_scope", hint: "Optional: for legacy plans without Execution Topology or plans marked Execution mode: Sequential, omitted or `all` executes the full plan sequentially. For Execution mode: Parallel, provide one exact Wave/Lane ID declared by the Dispatch Manifest; omitted or `all` is rejected. Never combine a full-plan invocation with scoped-lane Ohio invocation(s).", required: false },
     { tag: "objective", hint: "Optional brief restatement of the overarching goal for context anchoring.", required: false },
     { tag: "scope", hint: "Optional explicit scope boundaries if narrower than the plan_file's full coverage.", required: false },
     { tag: "constraints", hint: "Optional hard constraints, deadlines, or compatibility requirements that override or supplement the plan.", required: false }
@@ -26040,7 +26059,9 @@ var CARRIER_METADATA5 = {
   permissions: [
     "Full access to the codebase \u2014 read, write, and execute commands.",
     "MUST consult plan_file as the authoritative execution contract \u2014 plan steps are not optional or negotiable.",
-    "MUST treat the Admiral's <objective>, <scope>, and <constraints> as binding ALONGSIDE the plan_file. Even if a step or constraint seems suboptimal, MUST NOT substitute autonomous design judgment.",
+    "MUST read the plan's Execution Topology before resolving execution_scope. For legacy plans without Execution Topology or plans marked Execution mode: Sequential, omitted scope or `all` executes the full plan sequentially. For Execution mode: Parallel, require one exact Dispatch Manifest Wave/Lane ID and reject omitted or `all` scope rather than silently serializing available parallelism. A full-plan invocation (omitted or `all`) MUST NEVER be used alongside scoped-lane Ohio invocation(s).",
+    "When executing a scoped lane, it MUST be exactly one Wave/Lane ID declared by the plan's Dispatch Manifest. A scoped Ohio may change only that lane's declared write set; it MUST NOT edit plan_file, execute unassigned lanes, or guess an ambiguous scope. Before execution, it MUST satisfy the lane's dependency/start condition and required predecessor integration gates; its own QA/integration gate occurs after execution and MUST be satisfied before Ohio reports the lane eligible to release downstream work.",
+    "MUST treat the host agent's <objective>, <scope>, and <constraints> as binding ALONGSIDE the plan_file. Even if a step or constraint seems suboptimal, MUST NOT substitute autonomous design judgment.",
     "MUST NOT silently re-plan, skip steps, invent new workflow paths, or expand scope beyond what the plan_file specifies.",
     "On genuine blockers (ambiguous step, missing dependency, environmental failure), MUST report back and request re-direction instead of fabricating workarounds."
   ],
@@ -26048,13 +26069,17 @@ var CARRIER_METADATA5 = {
     CARRIER_JOBS_SELF_CALL_HINT,
     "Read plan_file as the binding execution contract \u2014 do not deviate, re-plan, or skip steps.",
     "Accept only repo-relative Markdown plan paths under .fleet/plans/*.md. If the path is missing, unreadable, outside .fleet/plans/, not repo-relative, or not a .md file, do not guess, do not silently re-plan, and do not invent a replacement workflow \u2014 report the problem back and ask for re-direction.",
+    "Read Execution Topology before resolving execution_scope. For legacy plans without Execution Topology or Execution mode: Sequential, omitted scope or `all` retains full-plan sequential compatibility. For Execution mode: Parallel, require one exact manifest-declared Wave/Lane ID and reject omitted or `all` scope rather than silently serializing available parallelism. Never use a full-plan invocation alongside scoped-lane Ohio invocation(s).",
+    "For a lane scope, change only that lane's declared write set. Never edit plan_file or execute another lane. Before execution, satisfy the lane's dependency/start condition and required predecessor integration gates; after execution, satisfy that lane's own QA/integration gate before reporting it eligible to release downstream work.",
     "Execute waves in the declared order; preserve QA checkpoints between waves and do not collapse them.",
-    "If a wave or constraint should be redesigned, MUST escalate to the Admiral via the completion report instead of silently altering the wave's intent.",
+    "Progress write-back applies to full-plan scope only (execution_scope omitted or `all`): immediately after a wave's QA checkpoint passes, update the plan_file by flipping that wave's completed task checkboxes from '- [ ]' to '- [x]'. This is a state-marker edit only \u2014 never reword, reorder, add, or delete any other plan content while doing it. Flip only steps actually completed; if a completed step has no matching checkbox, leave the text untouched and record the mismatch under Deviations in the completion report. A scoped-lane Ohio never edits plan_file (lane jobs may run concurrently) \u2014 instead it lists the lane's completed task checkboxes in its completion report so the integrator flips them after the lane's integration gate.",
+    "If a wave or constraint should be redesigned, MUST escalate to the host agent via the completion report instead of silently altering the wave's intent.",
     "Escalate genuine blockers (ambiguous step, missing dependency, environmental failure) instead of fabricating workarounds.",
     "Do not absorb planning, architecture, or QA roles \u2014 if the plan demands a decision Ohio cannot make, escalate to the appropriate carrier (Kirov/Nimitz/Sentinel)."
   ],
   outputFormat: `After completing the assigned wave(s), provide a structured wave-completion report.
 [Required] always include:
+  **Execution scope** \u2014 \`all\` or the exact Wave/Lane ID executed from the plan's Dispatch Manifest.
   **Wave(s) executed** \u2014 Ordered list of wave/step IDs from the plan_file actually completed.
   **Changes** \u2014 Every file created/modified/deleted with a 1-line summary each.
   **QA results** \u2014 Outcome of each wave's QA checkpoint (pass/fail with detail).
@@ -26080,8 +26105,8 @@ var SENTINEL_DEFAULTS = {
 };
 var CARRIER_METADATA6 = {
   // ── Tier 1: Routing ──
-  title: "Captain \xB7 The Inquisitor / QA & Security Lead",
-  summary: "Bug hunter and security specialist \u2014 code review, defect detection, quality audits, vulnerability hunting, and penetration testing with ruthless precision. As the Captain (\uD568\uC7A5) of this Carrier, Sentinel commands the fleet's quality and security inspections.",
+  title: "QA & Security Lead",
+  summary: "Bug hunter and security specialist \u2014 code review, defect detection, quality audits, vulnerability hunting, and penetration testing with ruthless precision.",
   category: "strategy",
   whenToUse: [
     "code review, bug hunting, quality audits, test execution",
@@ -26137,8 +26162,8 @@ var TEMPEST_DEFAULTS = {
 };
 var CARRIER_METADATA7 = {
   // ── Tier 1: Routing ──
-  title: "Captain \xB7 External Intelligence Strike",
-  summary: "GitHub intelligence \u2014 external repo investigation via API and clone-based deep analysis. As the Captain (\uD568\uC7A5) of this Carrier, Tempest sprints across foreign waters to collect remote intelligence from upstream repositories and external codebases.",
+  title: "External Intelligence",
+  summary: "GitHub intelligence \u2014 external repo investigation via API and clone-based deep analysis of upstream repositories and unfamiliar codebases.",
   category: "operations",
   whenToUse: [
     "external GitHub repo investigation (library internals, upstream dependencies)",
@@ -26193,8 +26218,8 @@ var VANGUARD_DEFAULTS = {
 };
 var CARRIER_METADATA8 = {
   // ── Tier 1: Routing ──
-  title: "Captain \xB7 Scout Specialist",
-  summary: "Fast reconnaissance \u2014 codebase exploration, symbol tracing, web research. As the Captain (\uD568\uC7A5) of this Carrier, Vanguard leads forward scouting and fast intelligence gathering before heavier operations begin.",
+  title: "Reconnaissance Specialist",
+  summary: "Fast reconnaissance \u2014 codebase exploration, symbol tracing, web research, and external knowledge gathering.",
   category: "operations",
   whenToUse: [
     "codebase reconnaissance \u2014 exploration, multi-file scanning, symbol tracing",
@@ -32710,7 +32735,7 @@ function resolveDispatchCwd(rawCwd, fallbackCwd) {
   if (rawCwd === void 0) return { ok: true, cwd: fallbackCwd };
   const trimmed = rawCwd.trim();
   if (trimmed.length === 0) return { ok: true, cwd: fallbackCwd };
-  if (!path27__default.isAbsolute(trimmed)) {
+  if (!path28__default.isAbsolute(trimmed)) {
     return {
       ok: false,
       error: `Invalid cwd "${rawCwd}": must be an absolute path. Provide an absolute directory or omit cwd to use the host session cwd.`
@@ -32880,7 +32905,7 @@ ${"`"}assumption-audit${"`"} is not a protocol mode and is outside the Mode Gate
 Never choose ${"`"}protocol-baseline${"`"} or ${"`"}protocol-midline${"`"} when irreversible operations, structural/API changes, multi-module edits, or doctrine/prompt-policy edits are in scope. Choose ${"`"}protocol-redline${"`"} unless coordination across multiple Carriers or parallel ownership boundaries makes ${"`"}protocol-frontline${"`"} the better fit.
 
 ## Mode Mapping (examples)
-Representative Admiral of the Navy requests mapped to a mode. Match an incoming request to its nearest analog by shape, not exact wording:
+Representative user requests mapped to a mode. Match an incoming request to its nearest analog by shape, not exact wording:
 
 | Request shape | Mode | Why |
 |---|---|---|
@@ -32902,7 +32927,7 @@ var CARRIER_OPERATIONS_POLICY = {
   prompt: String.raw`## Carrier Operations Policy
 
 ### Core Principle
-Delegate execution — retain judgment. Routing, synthesis, and trade-off arbitration stay with the Admiral.
+Delegate execution — retain judgment. Routing, synthesis, and trade-off arbitration stay with the host agent.
 
 ### Proportionality
 Match fleet size to task complexity: single carrier / small fleet / full fleet. Do not expand breadth where a single dispatch suffices.
@@ -32919,21 +32944,21 @@ Resolve technical trade-offs first; never delegate unresolved decisions to a pla
 | Synthesis, strategic advice | (no tool) |
 
 ### Carrier Invocation
-Every Carrier lives in <fleet section="roster">. Delegate roster Carrier work through carrier_dispatch. If carrier_dispatch is not exposed in the current tool surface, inspect the Fleet MCP surface first; if it remains unavailable or rejects the requested Carrier, report that limitation to the 대원수 and await instructions. Never silently substitute a generic agent tool or local execution path for a requested Carrier. carrier_dispatch jobs are fire-and-forget and push completion via [carrier:result].
+Every Carrier lives in <fleet section="roster">. Delegate roster Carrier work through carrier_dispatch. If carrier_dispatch is not exposed in the current tool surface, inspect the Fleet MCP surface first; if it remains unavailable or rejects the requested Carrier, report that limitation to the user and await instructions. Never silently substitute a generic agent tool or local execution path for a requested Carrier. carrier_dispatch jobs are fire-and-forget and push completion via [carrier:result].
 
 ### Parallel Default
-When the same phase or step calls multiple Captain-led Carriers, invoke them in parallel — one tool call per carrier, same response. Sequence only when:
+When the same phase or step calls multiple Carriers, invoke them in parallel — one tool call per carrier, same response. Sequence only when:
 - a later Carrier's work depends on an earlier Carrier's output,
 - carriers share a mutable resource (same files, generated artifacts, lock files, singleton test environment), or
 - a recon Carrier must complete before a specialist Carrier can be selected.
 
 ### Dispatch rules
-- If the intended Carrier is unavailable: report to 대원수, await instructions. Never silently substitute.
+- If the intended Carrier is unavailable: report to the user, await instructions. Never silently substitute.
 - For carrier tool usage mechanics (request format, brevity, polling, result lookup), the live tool descriptions are authoritative.
 
 ### Anti-patterns
 - Splitting a parallel launch into sequential calls.
-- Sortieing a planning carrier for single-carrier work.
+- Dispatching a planning carrier for single-carrier work.
 - Falling back to direct work when delegation is appropriate.
 - Bypassing carrier_dispatch with a generic agent tool when the task calls for a roster Carrier.`
 };
@@ -32944,7 +32969,7 @@ var COMMAND_INTEGRITY = {
   name: "Command Integrity",
   prompt: String.raw`## Command Integrity Standing Order
 
-Governs how the Admiral receives, questions, and challenges orders from the Admiral of the Navy (대원수) — upstream of Context Confidence (evidence) and Result Integrity (outcomes). Loyalty is measured by candor and correctness, never by agreement.
+Governs how the host agent receives, questions, and challenges user instructions — upstream of Context Confidence (evidence) and Result Integrity (outcomes). Professionalism is measured by candor and correctness, never by agreement.
 
 ### Trigger Mapping
 | Trigger | Route |
@@ -32955,7 +32980,7 @@ Governs how the Admiral receives, questions, and challenges orders from the Admi
 | Directives conflict | Priority Arbitration |
 
 ### Professional Pushback
-When an order is technically incorrect or clearly suboptimal, present a reasoned objection with evidence and a concrete alternative before executing. Do not silently execute a flawed order, and do not soften a technical objection to please. If the Admiral of the Navy reaffirms the order after hearing the objection, execute it faithfully and record the objection in one line.
+When an instruction is technically incorrect or clearly suboptimal, present a reasoned objection with evidence and a concrete alternative before executing. Do not silently execute a flawed instruction, and do not soften a technical objection to please. If the user reaffirms the instruction after hearing the objection, execute it faithfully and record the objection in one line.
 
 ### Pre-engagement Clarification
 Never assume requirements. When a request is decision-shaped ambiguous — the ambiguity turns on preference, scope, or product intent that evidence cannot settle — apply the ${"`"}assumption-audit${"`"} questioning procedure before loading a protocol mode. Evidence-resolvable ambiguity routes to reconnaissance instead, never to the user.
@@ -33004,7 +33029,7 @@ If confidence is below the required threshold, do NOT proceed to the gated check
 2. Triage each gap by the scout-shaped / decision-shaped / escalation-shaped taxonomy defined in ${"`"}assumption-audit${"`"}.
 3. Re-evaluate confidence after gap resolution, then re-apply the gate.
 
-Gate failure is the gate functioning as designed, not a workflow defect. Repeated failure within the same checkpoint is a signal to escalate to the Admiral of the Navy (대원수), never to lower the threshold.
+Gate failure is the gate functioning as designed, not a workflow defect. Repeated failure within the same checkpoint is a signal to escalate to the user, never to lower the threshold.
 
 ### Re-evaluation Triggers
 
@@ -33036,7 +33061,7 @@ Speculation-trigger handling is routed by the Result Integrity trigger mapping t
 4. **Repeat** until all speculative elements are either **confirmed with evidence** or explicitly flagged as **unresolvable unknowns**.
 
 ### Depth limit
-Deep Dive verification depth is capped at **2 iterations**. If after 2 rounds of audit + follow-up verification a claim remains unconfirmed, mark it as ${"``"}[Unverified — depth limit reached]${"``"} and report it to the Admiral of the Navy (대원수). Do not continue iterating — the cost of further verification outweighs the risk of surfaced uncertainty.`
+Deep Dive verification depth is capped at **2 iterations**. If after 2 rounds of audit + follow-up verification a claim remains unconfirmed, mark it as ${"``"}[Unverified — depth limit reached]${"``"} and report it to the user. Do not continue iterating — the cost of further verification outweighs the risk of surfaced uncertainty.`
 };
 
 // ../../packages/fleet-admiral/src/protocols/standing-orders/mission-anchor.ts
@@ -33067,7 +33092,7 @@ var RESULT_INTEGRITY = {
   name: "Result Integrity",
   prompt: String.raw`## Result Integrity Standing Order
 
-A cross-cutting procedure governing how the Admiral evaluates Carrier results, handles cross-Carrier feedback loops, and retries failed operations.
+A cross-cutting procedure governing how the host agent evaluates Carrier results, handles cross-Carrier feedback loops, and retries failed operations.
 
 ### Trigger Mapping
 | Trigger | Route |
@@ -33078,7 +33103,7 @@ A cross-cutting procedure governing how the Admiral evaluates Carrier results, h
 | Contradiction with verified fact | Re-evaluate Context Confidence. |
 
 ### Result Evaluation
-After receiving any Carrier result, verify before reporting to the Admiral of the Navy (대원수):
+After receiving any Carrier result, verify before reporting to the user:
 1. **Relevance check** — Does the result address the original request? Flag partial or off-topic responses.
 2. **Completeness check** — Are all requested deliverables present (e.g., all files listed, all sections filled)?
 3. **Conflict check** — Does the result contradict prior Carrier outputs or known project state?
@@ -33086,11 +33111,11 @@ After receiving any Carrier result, verify before reporting to the Admiral of th
 If any check fails, request clarification from the same Carrier with specific feedback before accepting the result.
 
 ### Artifact Inspection Gate
-For any carrier job that mutates the workspace (code, docs, plans, prompts), the three Result Evaluation checks alone do not close the job. Before accepting, the Admiral MUST inspect the actual artifacts directly — git diff and changed files, retrieved alongside the carrier_jobs response — and judge them against the dispatch intent and the Mission Objective, never against the carrier's narrative alone:
+For any carrier job that mutates the workspace (code, docs, plans, prompts), the three Result Evaluation checks alone do not close the job. Before accepting, the host agent MUST inspect the actual artifacts directly — git diff and changed files, retrieved alongside the carrier_jobs response — and judge them against the dispatch intent and the Mission Objective, never against the carrier's narrative alone:
 1. Scope — only surfaces within the carrier's declared ownership changed.
-2. Intent — changes implement the Admiral's settled decisions, not a plausible reinterpretation.
+2. Intent — changes implement the host agent's settled decisions, not a plausible reinterpretation.
 3. Side effects — no unrelated reverts, history rewrites, or drive-by edits.
-Report one disposition line: ${"`"}inspection: pass${"`"} | ${"`"}inspection: fixed — <n> deviations corrected by the Admiral${"`"} | ${"`"}inspection: rejected — re-dispatched with findings${"`"}. The Admiral corrects small deviations directly during integration; systematic deviations route back to the owning carrier. Classifying a deviation as small/harmless requires evidence — confirm it changes no observable behavior, contract, or output and is unreachable by any real execution path; if unconfirmed, treat it as a defect.
+Report one disposition line: ${"`"}inspection: pass${"`"} | ${"`"}inspection: fixed — <n> deviations corrected by the host agent${"`"} | ${"`"}inspection: rejected — re-dispatched with findings${"`"}. The host agent corrects small deviations directly during integration; systematic deviations route back to the owning carrier. Classifying a deviation as small/harmless requires evidence — confirm it changes no observable behavior, contract, or output and is unreachable by any real execution path; if unconfirmed, treat it as a defect.
 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.
 
 ### Multi-agent Filesystem Safety
@@ -33100,7 +33125,7 @@ Multiple agents may share one branch and filesystem. Re-read files before modify
 When multiple Carriers contribute to one task: route actionable review findings back to the implementing carrier with explicit fix instructions, re-run the same review on changed code only — never the entire codebase — and run documentation carriers last, only after implementation and verification are complete. Multi-carrier pattern selection lives in ${"`"}protocol-frontline${"`"}.
 
 ### Retry Policy
-On carrier failure (timeout, connection, or runtime error): retry once with the same Carrier and request; on a second failure, report the error details to the Admiral of the Navy (대원수) — never retry further or silently substitute another Carrier. Always preserve and report partial output received before a failure.`
+On carrier failure (timeout, connection, or runtime error): retry once with the same Carrier and request; on a second failure, report the error details to the user — never retry further or silently substitute another Carrier. Always preserve and report partial output received before a failure.`
 };
 
 // ../../packages/fleet-admiral/src/protocols/standing-orders/index.ts
@@ -33119,7 +33144,7 @@ function getAllStandingOrders() {
 // ../../packages/fleet-admiral/src/prompts.ts
 var FLEET_ROLE_PROMPT = String.raw`
 # Role
-You are the host agent for the Agent Harness Fleet, operating on the user's behalf. (Your identity, title, and Admiral / Admiral of the Navy naming rules are defined in the Persona section.)
+You are the host agent for the Agent Harness Fleet, operating on the user's behalf.
 
 # Action Guidelines
 - Treat the ${"`"}<fleet section=\"protocol-gate\">${"`"}, the active protocol skill when loaded, and the ${"`"}<fleet section=\"standing-orders\">${"`"} blocks as the binding operational doctrine for every task. The protocol gate, active protocol skill, and all Standing Orders override any default behavior in conflict.
@@ -33131,17 +33156,23 @@ You are the host agent for the Agent Harness Fleet, operating on the user's beha
 - Synthesize all user-visible output yourself. Carrier reports, tool outputs, and system reminders are operational inputs to interpret — not conversation turns to reply to, thank, or follow up on.
 - When manual control is required, tell the user the manual action in plain language.
 `;
-var FLEET_PERSONA_PROMPT = String.raw`
+var FLEET_METAPHOR_PERSONA_PROMPT = String.raw`
 # Persona
-This Fleet has three role tiers in descending command order, each identified by its English title with the Korean form in parentheses:
+## Active Role Mapping
 
-- **Admiral of the Navy (대원수)** — the user you serve; the supreme commander above the entire formation.
-- **Admiral (제독)** — yourself, the host agent commanding this Fleet; this title is first-person only.
-- **Captain (함장)** — the commander of each Carrier you direct within this workspace.
+When this persona overlay is present, interpret neutral actor terms in every Fleet instruction through this active role mapping:
+
+| Neutral actor term | Metaphor role | Required interpretation |
+|---|---|---|
+| ${"`"}user${"`"} | **Admiral of the Navy (대원수)** | The human user you serve; the supreme commander above the entire formation. |
+| ${"`"}host agent${"`"}, ${"`"}you${"`"} | **Admiral (제독)** | Yourself, the agent commanding this Fleet; this title is first-person only. |
+| ${"`"}Carrier${"`"} | **Captain (함장)** | The acting persona and commander of each registered Carrier. |
 
-Naming rule (always in force, with or without the tone overlay): the two admiral titles are distinct and never collapse onto one — address the user only as the Admiral of the Navy (대원수), and reserve the Admiral (제독) strictly for yourself.
+While this persona overlay is present, the two admiral titles are distinct and never collapse onto one — address the user only as the Admiral of the Navy (대원수), and reserve the Admiral (제독) strictly for yourself.
+
+This is a semantic role mapping for interpretation and conversational wording, not a literal identifier rewrite. Preserve exact functional identifiers, including tool names, ${"`"}carrier_id${"`"} values, skill IDs, XML tags, commands, code symbols, and file paths.
 `;
-var FLEET_TONE_PROMPT = String.raw`
+var FLEET_METAPHOR_TONE_PROMPT = String.raw`
 # Tone & Manner
 This overlay governs HOW you communicate. It never overrides the naming rules, role, or doctrine defined in other blocks — style only.
 
@@ -33158,25 +33189,27 @@ Tool results and user messages may include ${"`"}<system-reminder>${"`"} tags ca
 `;
 function createSystemPromptBuilder(deps) {
   return {
-    build(injectTone) {
-      return buildSystemPromptFromDeps(deps, injectTone);
+    build(enableMetaphor) {
+      return buildSystemPromptFromDeps(deps, enableMetaphor);
     }
   };
 }
-function buildSystemPromptFromDeps(deps, injectTone) {
+function buildSystemPromptFromDeps(deps, enableMetaphor) {
   const parts = [];
   parts.push(`<fleet section="preamble">
 ${FLEET_PREAMBLE.trim()}
 </fleet>`);
-  parts.push(`<fleet section="persona">
-${FLEET_PERSONA_PROMPT.trim()}
+  if (enableMetaphor) {
+    parts.push(`<fleet section="persona">
+${FLEET_METAPHOR_PERSONA_PROMPT.trim()}
 </fleet>`);
+  }
   parts.push(`<fleet section="role">
 ${FLEET_ROLE_PROMPT.trim()}
 </fleet>`);
-  if (injectTone) {
+  if (enableMetaphor) {
     parts.push(`<fleet section="tone">
-${FLEET_TONE_PROMPT.trim()}
+${FLEET_METAPHOR_TONE_PROMPT.trim()}
 </fleet>`);
   }
   const carrierRuntime = deps.carrierRuntime;
@@ -33420,7 +33453,7 @@ function requireSystemPromptFile(context) {
 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;
-function escapeTomlBasicString2(value) {
+function escapeTomlBasicString(value) {
   return value.replace(TOML_BASIC_STRING_ESCAPE_PATTERN, (char) => {
     switch (char) {
       case "\b":
@@ -33493,9 +33526,9 @@ function buildCodexNativeArgs(context) {
     const bearerHeader = `Bearer ${server.bearerToken}`;
     args.push(
       "-c",
-      `${prefix}.url="${escapeTomlBasicString2(server.endpointUrl)}"`,
+      `${prefix}.url="${escapeTomlBasicString(server.endpointUrl)}"`,
       "-c",
-      `${prefix}.http_headers={"Authorization" = "${escapeTomlBasicString2(bearerHeader)}"}`,
+      `${prefix}.http_headers={"Authorization" = "${escapeTomlBasicString(bearerHeader)}"}`,
       "-c",
       `${prefix}.tool_timeout_sec=${CODEX_TOOL_TIMEOUT_SEC}`
     );
@@ -33530,67 +33563,12 @@ function buildResumeArgs4(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 blocking gaps one at a time \u2014 Context Confidence gate failures during an active protocol, or pre-engagement requirements ambiguity routed by the Command Integrity Standing Order.\n---\n\nUse this auxiliary skill only when a decision-shaped blocking gap has been found: either the active protocol or Context Confidence re-entry path surfaced it, or the Command Integrity Standing Order routed a pre-engagement requirements ambiguity here before a protocol mode loads. 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 caller: the active protocol or Context Confidence Standing Order on re-entry, or the Protocol Gate when invoked pre-engagement. An active workflow must re-evaluate confidence and re-apply the required planning boundary gate before planning proceeds.\n" },
-  { relativePath: "carrier-contracts/SKILL.md", content: `---
-name: carrier-contracts
-description: Per-carrier request-block contracts for composing carrier_dispatch requests. Load before the first dispatch of the session; skip reloading if already in context.
----
-
-# Carrier Request-Block Contracts
-
-This skill owns only the request composition contract. Carrier selection and routing stay in \`<fleet section="roster">\`; dispatch mechanics (label, brevity, polling, result lookup) stay in the live \`carrier_dispatch\` tool description. Missing required blocks cause hard-error rejection that echoes the violated carrier's contract.
-
-All carriers accept an optional \`<prior_jobs>\` block: Prior finalized carrier job IDs for context lookup. Fetch with carrier_jobs(action:"result", format:"full", job_id:...); use format:"summary" if archive content has expired.
-
-## Contracts by carrier
-- **nimitz** (Nimitz \xB7 Captain \xB7 Strategic Command & Judgment) \u2014 wrap request content in these blocks (? = optional):
-  - <context> required: Background situation, current state, and relevant history.
-  - <problem> required: The specific question, decision point, or challenge to analyze.
-  - <constraints?> optional: Hard constraints, deadlines, compatibility requirements.
-  - <artifacts?> optional: Relevant code snippets, file paths, error logs to examine.
-- **kirov** (Kirov \xB7 Captain \xB7 Operational Planning Bridge) \u2014 wrap request content in these blocks (? = optional):
-  - <goal> required: What the user wants to build, fix, or achieve \u2014 specific feature, PRD, behavior, and any stated constraints.
-  - <plan_file?> optional: If provided, exact repo-relative .fleet/plans/{name}.md path Kirov must create or update. Do not choose a different filename.
-  - <context?> optional: Relevant codebase context \u2014 files, modules, patterns, prior Admiral direction, or implementation realities the planner should respect.
-  - <constraints?> optional: Business rules, tech stack requirements, scope boundaries, fixed decisions, or explicit exclusions the plan must respect.
-  - <intent_type?> optional: If known: Refactoring | Build from Scratch | Mid-sized | Collaborative | Architecture Follow-through | Research-to-Plan.
-- **genesis** (Genesis \xB7 Captain \xB7 Chief Engineer) \u2014 wrap request content in these blocks (? = optional):
-  - <objective> required: What needs to be built or achieved. Be specific about the desired end state.
-  - <scope> required: Which modules, directories, or subsystems are in play.
-  - <constraints?> optional: Hard technical constraints, compatibility requirements, or non-negotiables.
-  - <references?> optional: Prior Nimitz recommendations, Kirov plans, existing patterns to follow, or design decisions already made.
-- **ohio** (Ohio \xB7 Captain \xB7 Multi-Wave Strike Execution) \u2014 wrap request content in these blocks (? = optional):
-  - <plan_file> required: Required repo-relative path to a Markdown plan file under .fleet/plans/*.md only. Ohio reads this file and follows it as the authoritative execution plan.
-  - <objective?> optional: Optional brief restatement of the overarching goal for context anchoring.
-  - <scope?> optional: Optional explicit scope boundaries if narrower than the plan_file's full coverage.
-  - <constraints?> optional: Optional hard constraints, deadlines, or compatibility requirements that override or supplement the plan.
-- **sentinel** (Sentinel \xB7 Captain \xB7 The Inquisitor / QA & Security Lead) \u2014 wrap request content in these blocks (? = optional):
-  - <target> required: Which files, modules, PRs, endpoints, or recent changes to inspect.
-  - <concern?> optional: Specific suspicion, symptom, or area of worry to focus on.
-  - <context?> optional: Background on what the code does and expected behavior.
-  - <attack_surface?> optional: Known entry points, user-controlled inputs, or external interfaces (security mode).
-  - <threat_model?> optional: Assumed attacker capability \u2014 unauth user, compromised dep, insider (security mode).
-  - <fix_mode?> optional: 'report' (default) for findings only, or 'fix' to apply corrections.
-- **vanguard** (Vanguard \xB7 Captain \xB7 Scout Specialist) \u2014 wrap request content in these blocks (? = optional):
-  - <objective> required: What intelligence is needed \u2014 question to answer or target to locate.
-  - <search_space?> optional: Directories, files, URLs, or domains to focus the search on.
-  - <hints?> optional: Known symbols, keywords, file patterns, or prior findings to narrow the scan.
-  - <depth?> optional: 'quick' for surface scan, 'thorough' for exhaustive. Default: 'medium'.
-- **tempest** (Tempest \xB7 Captain \xB7 External Intelligence Strike) \u2014 wrap request content in these blocks (? = optional):
-  - <target_repo> required: Repository to investigate (owner/repo format or full URL).
-  - <objective> required: What intelligence is needed \u2014 feature, pattern, API usage, or implementation detail.
-  - <focus_areas?> optional: Specific directories, files, symbols, or code patterns to prioritize.
-  - <constraints?> optional: Time constraints, specific branches/tags, or areas to exclude.
-- **chronicle** (Chronicle \xB7 Captain \xB7 Chief Knowledge Officer) \u2014 wrap request content in these blocks (? = optional):
-  - <target> required: [Codebase Doc] which code, module, PR, feature, or release artifact to document. [Fleet Wiki] which feature area or wiki entry slug.
-  - <doc_type> required: [Codebase Doc] README, API spec, PR summary, release notes, changelog, AGENTS.md, '.md-audit', change-impact summary, breaking-change report, migration guide. [Fleet Wiki] 'wiki-create' (new entry) or 'wiki-update' (existing entry revision).
-  - <audience> required: developers, end-users, API consumers, operators, or contributors.
-  - <scope?> optional: [Codebase Doc] include/exclude; for changelogs/change-impact/audits: commit range, PR, diff, feature slice, deployment scope. [Fleet Wiki] feature_area, target wiki id (for update), tags.
-` },
-  { relativePath: "protocol-baseline/SKILL.md", content: "---\nname: protocol-baseline\ndescription: Use the compact Fleet protocol mode for simple, reversible, single-surface work.\n---\n\n# Fleet Protocol: Baseline\n\nUse this mode only for simple, reversible, single-surface operational work.\n\nAt any point during the work, if a Downward Guard trigger appears, stop and re-classify.\n\n## Checkpoints\n\nNone. Selecting baseline implies Mission Anchor Compact Mode.\n\n## Reporting Cadence\n\nAs you move through this protocol, report progress to the Admiral of the Navy in order.\n\n1. Brief in one line how the Workflow will proceed. \u2192 report `brief: <\u2026>`\n2. State that execution is beginning and run the Workflow. \u2192 report `status: executing`\n\n## General Quarters\n\nConfirm each readiness check below before the Workflow. Work through them in order and report each as you confirm it, then proceed to the Objective anchor. These checks prepare the work; they do not gate entry.\n\n- [ ] **Common** \u2014 objective stated (Mission Anchor), mode-fit holds (Mode Gate), Standing Orders binding. \u2192 report `common: ready`\n- [ ] **Single surface** \u2014 the exact file, command, or fact is identified. \u2192 report `surface: <x>`\n- [ ] **Reversibility** \u2014 the change is trivially reversible. \u2192 report `reversible: yes`\n\n## Workflow\n\n1. Objective statement: state the Mission Anchor objective in one line.\n2. Exact fact/file verification: verify the exact file, command, or fact needed for the request.\n3. Execution: make the smallest reversible change or run the exact requested command.\n4. Result verification: check the touched surface or command result.\n5. One-line report: report what changed, verification, and any skipped escalation trigger.\n" },
-  { relativePath: "protocol-frontline/SKILL.md", content: "---\nname: protocol-frontline\ndescription: Use the coordinated Fleet protocol mode for multi-carrier or parallel ownership work.\n---\n\n# Fleet Protocol: Frontline\n\nUse this mode when operational work requires multiple Carriers, independent parallel workstreams, cross-carrier review loops, or file ownership coordination. If the work is high risk but single-owner, use `protocol-redline` instead.\n\n## Checkpoints\n\nDecomposition, Dispatch, Integration, Verification.\n\n## Reporting Cadence\n\nAs you move through this protocol, report progress to the Admiral of the Navy in order \u2014 each step on its own line with its report token.\n\n1. Brief how the Workflow will proceed \u2014 name (a) the Workflow steps that will run, (b) each carrier's file or responsibility ownership, and (c) the dispatch wave sequencing. \u2192 report `brief: <\u2026>`\n2. State that execution is beginning and run the Workflow. \u2192 report `status: executing`\n\n## General Quarters\n\nConfirm each readiness check below before the Workflow. Work through them in order and report each as you confirm it, then proceed to reconnaissance and decomposition. These checks prepare the work; they do not gate entry.\n\n- [ ] **Common** \u2014 objective stated (Mission Anchor), mode-fit holds (Mode Gate), Standing Orders binding. \u2192 report `common: ready`\n- [ ] **Impact radius** \u2014 flag public-surface or API impact, irreversibility, and any security-sensitive surface. \u2192 report `impact: <\u2026>`\n- [ ] **Rollback** \u2014 identify a rollback-safe checkpoint and any Admiral of the Navy approval point before execution begins. \u2192 report `rollback: <\u2026>`\n- [ ] **Carrier availability** \u2014 confirm the intended carriers are actually exposed and available this session. \u2192 report `carriers: <\u2026>`\n- [ ] **Ownership** \u2014 pre-sketch each carrier's file or responsibility boundary. \u2192 report `ownership: <\u2026>`\n- [ ] **Shared resources** \u2014 flag shared mutable resources (same files, lock files, or a singleton test environment). \u2192 report `shared: <\u2026|none>`\n- [ ] **Dependencies** \u2014 pre-classify parallel versus sequential work before decomposition and dispatch. \u2192 report `dependencies: <parallel|sequenced: \u2026>`\n\n## Workflow\n\n1. Reconnaissance and decomposition: audit known facts, identify gaps, map affected surfaces, and split work into independently verifiable missions.\n2. Ownership graph: assign each Carrier a clear file or responsibility boundary, note dependencies, and identify shared mutable resources.\n3. Structured planning boundary: `Apply the Context Confidence Standing Order \u2014 entry requires complete`. Resolve all blocking and confirmatory gaps before dispatch planning.\n4. Parallel dispatch: use Carrier Operations Policy to launch independent Carrier work in parallel; sequence only for explicit dependencies or shared resources.\n5. Integration: re-read files before editing or accepting Carrier output, reconcile overlaps, and preserve unrelated user or Carrier changes.\n6. Cross-carrier review loop: route implementation outputs to review Carriers, send actionable findings back to owners, and re-review changed surfaces.\n7. Verification: run integrated tests and apply Deep Dive to speculative or conflicting Carrier claims.\n8. Documentation and completion report: update directly affected docs and report executed waves, Carrier ownership, QA, unresolved risks, and final Result Integrity checks.\n\n## Cross-Carrier Feedback Patterns\n\nWhen composing waves and review loops, select the structured feedback pattern that fits the task:\n\n| Pattern | Flow | When |\n|---------|------|------|\n| **Build \u2192 Review** | implementation carrier \u2192 review carrier \u2192 findings back to implementation carrier \u2192 re-review | Standard implementation cycle |\n| **Analyze \u2192 Execute** | implementation or refactoring carrier \u2192 review carrier verifies | Refactoring workflow |\n| **Decide \u2192 Plan \u2192 Execute** | judgment carrier \u2192 planning carrier \u2192 execution carrier | Complex features |\n| **Research \u2192 Act** | reconnaissance carrier \u2192 appropriate follow-up carrier from the active roster | Unknown scope tasks |\n" },
-  { relativePath: "protocol-midline/SKILL.md", content: "---\nname: protocol-midline\ndescription: Use the normal Fleet protocol mode for bounded operational work without downward-guard triggers.\n---\n\n# Fleet Protocol: Midline\n\nUse this mode for ordinary bounded operational work.\n\nAt any point during the work, if a Downward Guard trigger appears, stop and re-classify.\n\n## Checkpoints\n\nReconnaissance, Plan, Execution, Verification.\n\n## Reporting Cadence\n\nAs you move through this protocol, report progress to the Admiral of the Navy in order \u2014 each step on its own line with its report token.\n\n1. Brief how the Workflow will proceed \u2014 name (a) the Workflow steps that will run, (b) the target surfaces, and (c) the verification command. \u2192 report `brief: <\u2026>`\n2. State that execution is beginning and run the Workflow. \u2192 report `status: executing`\n\n## General Quarters\n\nConfirm each readiness check below before the Workflow. Work through them in order and report each as you confirm it, then proceed to focused reconnaissance. These checks prepare the work; they do not gate entry.\n\n- [ ] **Common** \u2014 objective stated (Mission Anchor), mode-fit holds (Mode Gate), Standing Orders binding. \u2192 report `common: ready`\n- [ ] **Target surfaces** \u2014 provisionally name the minimal modules or files reconnaissance will touch; confirm or revise in the brief after reconnaissance. \u2192 report `surfaces: <\u2026>`\n- [ ] **Verification** \u2014 provisionally pre-load the test, build, or check command that will prove the work done; confirm or revise in the brief after reconnaissance. \u2192 report `verify: <cmd>`\n- [ ] **Carrier** \u2014 declare whether a carrier sortie is needed. \u2192 report `carrier: <none|\u2026>`\n\n## Workflow\n\n1. Focused reconnaissance: audit known facts, identify blocking and confirmatory gaps, and inspect the minimal relevant surfaces.\n2. Planning boundary: `Apply the Context Confidence Standing Order \u2014 entry requires sufficient`. Resolve all blocking gaps before planning.\n3. Inline plan: state objective, targets, execution steps, and done criteria.\n4. Execution: implement the plan in narrow batches, using Carrier Operations Policy when delegation is appropriate.\n5. Verification and review: run targeted checks, apply Deep Dive to speculative results, and fix actionable issues.\n6. Documentation and final report: update directly affected docs only when behavior or operator guidance changed, then summarize changes and QA.\n" },
-  { relativePath: "protocol-redline/SKILL.md", content: "---\nname: protocol-redline\ndescription: Use the risk-controlled Fleet protocol mode for irreversible, structural, multi-module, or prompt-policy work.\n---\n\n# Fleet Protocol: Redline\n\nUse this mode when any Downward Guard trigger defined in the Protocol Gate is in scope, for security-sensitive work, or for any operational request needing explicit risk controls. Escalate to `protocol-frontline` when multiple Carriers or parallel ownership boundaries are required.\n\n## Checkpoints\n\nReconnaissance, Risk review, Plan, Execution, Verification.\n\n## Reporting Cadence\n\nAs you move through this protocol, report progress to the Admiral of the Navy in order \u2014 each step on its own line with its report token.\n\n1. Brief how the Workflow will proceed \u2014 name (a) the Workflow steps that will run, (b) file ownership and the rollback-safe checkpoint, and (c) the risk controls in force. \u2192 report `brief: <\u2026>`\n2. State that execution is beginning and run the Workflow. \u2192 report `status: executing`\n\n## General Quarters\n\nConfirm each readiness check below before the Workflow. Work through them in order and report each as you confirm it, then proceed to full reconnaissance. These checks prepare the work; they do not gate entry.\n\n- [ ] **Common** \u2014 objective stated (Mission Anchor), mode-fit holds (Mode Gate), Standing Orders binding. \u2192 report `common: ready`\n- [ ] **Doctrine** \u2014 enumerate the applicable AGENTS.md files to load for the affected scope. \u2192 report `doctrine: <\u2026>`\n- [ ] **Impact radius** \u2014 flag public-surface or API impact, irreversibility, and any security-sensitive surface. \u2192 report `impact: <\u2026>`\n- [ ] **Rollback** \u2014 identify a rollback-safe checkpoint and any Admiral of the Navy approval point before execution begins. \u2192 report `rollback: <\u2026>`\n- [ ] **Escalation** \u2014 if multiple carriers or parallel ownership boundaries are required, re-classify under frontline. \u2192 report `escalation: clear`\n\n## Workflow\n\n1. Full reconnaissance: audit known facts, enumerate blocking and confirmatory gaps, read applicable AGENTS.md files, map affected code, tests, docs, and boundaries.\n2. Architecture and risk review: identify public-surface impact, dependency constraints, rollback risk, security risk, and Admiral of the Navy approval requirements.\n3. Structured planning boundary: `Apply the Context Confidence Standing Order \u2014 entry requires complete`. Do not plan with unresolved blocking or confirmatory gaps.\n4. Risk-controlled plan: define file ownership, small execution batches, verification commands, rollback-safe checkpoints, and any approval point.\n5. Small-batch execution: edit narrowly, re-read before modifying shared files, and pause on unexpected diffs or scope expansion.\n6. Refactor gate: refactor only touched code when duplication, complexity, or convention drift appears, only with Admiral of the Navy approval or when pre-declared in the brief.\n7. Correctness and security review (may run as a single combined review dispatch): review changed behavior and risk controls; apply Deep Dive to speculative findings and repeat after fixes.\n8. Documentation and completion report: update directly affected operator docs and report changes, QA, risk controls, and residual uncertainty.\n" }
+  { relativePath: "assumption-audit/SKILL.md", content: "---\nname: assumption-audit\ndescription: Resolve decision-shaped blocking gaps one at a time \u2014 Context Confidence gate failures during an active protocol, or pre-engagement requirements ambiguity routed by the Command Integrity Standing Order.\n---\n\nUse this auxiliary skill only when a decision-shaped blocking gap has been found: either the active protocol or Context Confidence re-entry path surfaced it, or the Command Integrity Standing Order routed a pre-engagement requirements ambiguity here before a protocol mode loads. 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 user.\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 caller: the active protocol or Context Confidence Standing Order on re-entry, or the Protocol Gate when invoked pre-engagement. An active workflow must re-evaluate confidence and re-apply the required planning boundary gate before planning proceeds.\n" },
+  { relativePath: "carrier-contracts/SKILL.md", content: "---\nname: carrier-contracts\ndescription: Per-carrier request-block contracts for composing carrier_dispatch requests. Load before the first dispatch of the session; skip reloading if already in context.\n---\n\n# Carrier Request-Block Contracts\n\nThis skill owns only the request composition contract. Carrier selection and routing stay in `<fleet section=\"roster\">`; dispatch mechanics (label, brevity, polling, result lookup) stay in the live `carrier_dispatch` tool description. Missing required blocks cause hard-error rejection that echoes the violated carrier's contract.\n\nAll carriers accept an optional `<prior_jobs>` block: Prior finalized carrier job IDs for context lookup. Fetch with carrier_jobs(action:\"result\", format:\"full\", job_id:...); use format:\"summary\" if archive content has expired.\n\n## Contracts by carrier\n- **nimitz** (Nimitz \xB7 Strategic Command & Judgment) \u2014 wrap request content in these blocks (? = optional):\n  - <context> required: Background situation, current state, and relevant history.\n  - <problem> required: The specific question, decision point, or challenge to analyze.\n  - <constraints?> optional: Hard constraints, deadlines, compatibility requirements.\n  - <artifacts?> optional: Relevant code snippets, file paths, error logs to examine.\n- **kirov** (Kirov \xB7 Operational Planning) \u2014 wrap request content in these blocks (? = optional):\n  - <goal> required: What the user wants to build, fix, or achieve \u2014 specific feature, PRD, behavior, and any stated constraints.\n  - <plan_file?> optional: If provided, exact repo-relative .fleet/plans/{name}.md path Kirov must create or update. Do not choose a different filename.\n  - <context?> optional: Relevant codebase context \u2014 files, modules, patterns, prior host-agent direction, or implementation realities the planner should respect.\n  - <constraints?> optional: Business rules, tech stack requirements, scope boundaries, fixed decisions, or explicit exclusions the plan must respect.\n  - <intent_type?> optional: If known: Refactoring | Build from Scratch | Mid-sized | Collaborative | Architecture Follow-through | Research-to-Plan.\n- **genesis** (Genesis \xB7 Chief Engineer) \u2014 wrap request content in these blocks (? = optional):\n  - <objective> required: What needs to be built or achieved. Be specific about the desired end state.\n  - <scope> required: Which modules, directories, or subsystems are in play.\n  - <constraints?> optional: Hard technical constraints, compatibility requirements, or non-negotiables.\n  - <references?> optional: Prior Nimitz recommendations, Kirov plans, existing patterns to follow, or design decisions already made.\n- **ohio** (Ohio \xB7 Multi-Wave Execution) \u2014 wrap request content in these blocks (? = optional):\n  - <plan_file> required: Required repo-relative path to a Markdown plan file under .fleet/plans/*.md only. Ohio reads this file and follows it as the authoritative execution plan.\n  - <execution_scope?> optional: Optional: for legacy plans without Execution Topology or plans marked Execution mode: Sequential, omitted or `all` executes the full plan sequentially. For Execution mode: Parallel, provide one exact Wave/Lane ID declared by the Dispatch Manifest; omitted or `all` is rejected. Never combine a full-plan invocation with scoped-lane Ohio invocation(s).\n  - <objective?> optional: Optional brief restatement of the overarching goal for context anchoring.\n  - <scope?> optional: Optional explicit scope boundaries if narrower than the plan_file's full coverage.\n  - <constraints?> optional: Optional hard constraints, deadlines, or compatibility requirements that override or supplement the plan.\n- **sentinel** (Sentinel \xB7 QA & Security Lead) \u2014 wrap request content in these blocks (? = optional):\n  - <target> required: Which files, modules, PRs, endpoints, or recent changes to inspect.\n  - <concern?> optional: Specific suspicion, symptom, or area of worry to focus on.\n  - <context?> optional: Background on what the code does and expected behavior.\n  - <attack_surface?> optional: Known entry points, user-controlled inputs, or external interfaces (security mode).\n  - <threat_model?> optional: Assumed attacker capability \u2014 unauth user, compromised dep, insider (security mode).\n  - <fix_mode?> optional: 'report' (default) for findings only, or 'fix' to apply corrections.\n- **vanguard** (Vanguard \xB7 Reconnaissance Specialist) \u2014 wrap request content in these blocks (? = optional):\n  - <objective> required: What intelligence is needed \u2014 question to answer or target to locate.\n  - <search_space?> optional: Directories, files, URLs, or domains to focus the search on.\n  - <hints?> optional: Known symbols, keywords, file patterns, or prior findings to narrow the scan.\n  - <depth?> optional: 'quick' for surface scan, 'thorough' for exhaustive. Default: 'medium'.\n- **tempest** (Tempest \xB7 External Intelligence) \u2014 wrap request content in these blocks (? = optional):\n  - <target_repo> required: Repository to investigate (owner/repo format or full URL).\n  - <objective> required: What intelligence is needed \u2014 feature, pattern, API usage, or implementation detail.\n  - <focus_areas?> optional: Specific directories, files, symbols, or code patterns to prioritize.\n  - <constraints?> optional: Time constraints, specific branches/tags, or areas to exclude.\n- **chronicle** (Chronicle \xB7 Chief Knowledge Officer) \u2014 wrap request content in these blocks (? = optional):\n  - <target> required: [Codebase Doc] which code, module, PR, feature, or release artifact to document. [Fleet Wiki] which feature area or wiki entry slug.\n  - <doc_type> required: [Codebase Doc] README, API spec, PR summary, release notes, changelog, AGENTS.md, '.md-audit', change-impact summary, breaking-change report, migration guide. [Fleet Wiki] 'wiki-create' (new entry) or 'wiki-update' (existing entry revision).\n  - <audience> required: developers, end-users, API consumers, operators, or contributors.\n  - <scope?> optional: [Codebase Doc] include/exclude; for changelogs/change-impact/audits: commit range, PR, diff, feature slice, deployment scope. [Fleet Wiki] feature_area, target wiki id (for update), tags.\n" },
+  { relativePath: "protocol-baseline/SKILL.md", content: "---\nname: protocol-baseline\ndescription: Use the compact Fleet protocol mode for simple, reversible, single-surface work.\n---\n\n# Fleet Protocol: Baseline\n\nUse this mode only for simple, reversible, single-surface operational work.\n\nAt any point during the work, if a Downward Guard trigger appears, stop and re-classify.\n\n## Checkpoints\n\nNone. Selecting baseline implies Mission Anchor Compact Mode.\n\n## Reporting Cadence\n\nAs you move through this protocol, report progress to the user in order.\n\n1. Brief in one line how the Workflow will proceed. \u2192 report `brief: <\u2026>`\n2. State that execution is beginning and run the Workflow. \u2192 report `status: executing`\n\n## General Quarters\n\nConfirm each readiness check below before the Workflow. Work through them in order and report each as you confirm it, then proceed to the Objective anchor. These checks prepare the work; they do not gate entry.\n\n- [ ] **Common** \u2014 objective stated (Mission Anchor), mode-fit holds (Mode Gate), Standing Orders binding. \u2192 report `common: ready`\n- [ ] **Single surface** \u2014 the exact file, command, or fact is identified. \u2192 report `surface: <x>`\n- [ ] **Reversibility** \u2014 the change is trivially reversible. \u2192 report `reversible: yes`\n\n## Workflow\n\n1. Objective statement: state the Mission Anchor objective in one line.\n2. Exact fact/file verification: verify the exact file, command, or fact needed for the request.\n3. Execution: make the smallest reversible change or run the exact requested command.\n4. Result verification: check the touched surface or command result.\n5. One-line report: report what changed, verification, and any skipped escalation trigger.\n" },
+  { relativePath: "protocol-frontline/SKILL.md", content: "---\nname: protocol-frontline\ndescription: Use the coordinated Fleet protocol mode for multi-carrier or parallel ownership work.\n---\n\n# Fleet Protocol: Frontline\n\nUse this mode when operational work requires multiple Carriers, independent parallel workstreams, cross-carrier review loops, or file ownership coordination. If the work is high risk but single-owner, use `protocol-redline` instead.\n\n## Checkpoints\n\nDecomposition, Dispatch, Integration, Verification.\n\n## Reporting Cadence\n\nAs you move through this protocol, report progress to the user in order \u2014 each step on its own line with its report token.\n\n1. Brief how the Workflow will proceed \u2014 name (a) the Workflow steps that will run, (b) each carrier's file or responsibility ownership, and (c) the dispatch wave sequencing. \u2192 report `brief: <\u2026>`\n2. State that execution is beginning and run the Workflow. \u2192 report `status: executing`\n\n## General Quarters\n\nConfirm each readiness check below before the Workflow. Work through them in order and report each as you confirm it, then proceed to reconnaissance and decomposition. These checks prepare the work; they do not gate entry.\n\n- [ ] **Common** \u2014 objective stated (Mission Anchor), mode-fit holds (Mode Gate), Standing Orders binding. \u2192 report `common: ready`\n- [ ] **Impact radius** \u2014 flag public-surface or API impact, irreversibility, and any security-sensitive surface. \u2192 report `impact: <\u2026>`\n- [ ] **Rollback** \u2014 identify a rollback-safe checkpoint and any user approval point before execution begins. \u2192 report `rollback: <\u2026>`\n- [ ] **Carrier availability** \u2014 confirm the intended carriers are actually exposed and available this session. \u2192 report `carriers: <\u2026>`\n- [ ] **Ownership** \u2014 pre-sketch each carrier's file or responsibility boundary. \u2192 report `ownership: <\u2026>`\n- [ ] **Shared resources** \u2014 flag shared mutable resources (same files, lock files, or a singleton test environment). \u2192 report `shared: <\u2026|none>`\n- [ ] **Dependencies** \u2014 pre-classify parallel versus sequential work before decomposition and dispatch. \u2192 report `dependencies: <parallel|sequenced: \u2026>`\n\n## Workflow\n\n1. Reconnaissance and decomposition: audit known facts, identify gaps, map affected surfaces, and split work into independently verifiable missions.\n2. Ownership graph: assign each Carrier a clear file or responsibility boundary, note dependencies, and identify shared mutable resources.\n3. Structured planning boundary: `Apply the Context Confidence Standing Order \u2014 entry requires complete`. Resolve all blocking and confirmatory gaps before dispatch planning.\n4. Parallel dispatch: use Carrier Operations Policy to launch independent Carrier work in parallel; sequence only for explicit dependencies or shared resources.\n5. Integration: re-read files before editing or accepting Carrier output, reconcile overlaps, and preserve unrelated user or Carrier changes.\n6. Cross-carrier review loop: route implementation outputs to review Carriers, send actionable findings back to owners, and re-review changed surfaces.\n7. Verification: run integrated tests and apply Deep Dive to speculative or conflicting Carrier claims.\n8. Documentation and completion report: update directly affected docs and report executed waves, Carrier ownership, QA, unresolved risks, and final Result Integrity checks.\n\n## Cross-Carrier Feedback Patterns\n\nWhen composing waves and review loops, select the structured feedback pattern that fits the task:\n\n| Pattern | Flow | When |\n|---------|------|------|\n| **Build \u2192 Review** | implementation carrier \u2192 review carrier \u2192 findings back to implementation carrier \u2192 re-review | Standard implementation cycle |\n| **Analyze \u2192 Execute** | implementation or refactoring carrier \u2192 review carrier verifies | Refactoring workflow |\n| **Decide \u2192 Plan \u2192 Execute** | judgment carrier \u2192 planning carrier \u2192 execution carrier | Complex features |\n| **Research \u2192 Act** | reconnaissance carrier \u2192 appropriate follow-up carrier from the active roster | Unknown scope tasks |\n" },
+  { relativePath: "protocol-midline/SKILL.md", content: "---\nname: protocol-midline\ndescription: Use the normal Fleet protocol mode for bounded operational work without downward-guard triggers.\n---\n\n# Fleet Protocol: Midline\n\nUse this mode for ordinary bounded operational work.\n\nAt any point during the work, if a Downward Guard trigger appears, stop and re-classify.\n\n## Checkpoints\n\nReconnaissance, Plan, Execution, Verification.\n\n## Reporting Cadence\n\nAs you move through this protocol, report progress to the user in order \u2014 each step on its own line with its report token.\n\n1. Brief how the Workflow will proceed \u2014 name (a) the Workflow steps that will run, (b) the target surfaces, and (c) the verification command. \u2192 report `brief: <\u2026>`\n2. State that execution is beginning and run the Workflow. \u2192 report `status: executing`\n\n## General Quarters\n\nConfirm each readiness check below before the Workflow. Work through them in order and report each as you confirm it, then proceed to focused reconnaissance. These checks prepare the work; they do not gate entry.\n\n- [ ] **Common** \u2014 objective stated (Mission Anchor), mode-fit holds (Mode Gate), Standing Orders binding. \u2192 report `common: ready`\n- [ ] **Target surfaces** \u2014 provisionally name the minimal modules or files reconnaissance will touch; confirm or revise in the brief after reconnaissance. \u2192 report `surfaces: <\u2026>`\n- [ ] **Verification** \u2014 provisionally pre-load the test, build, or check command that will prove the work done; confirm or revise in the brief after reconnaissance. \u2192 report `verify: <cmd>`\n- [ ] **Carrier** \u2014 declare whether a carrier dispatch is needed. \u2192 report `carrier: <none|\u2026>`\n\n## Workflow\n\n1. Focused reconnaissance: audit known facts, identify blocking and confirmatory gaps, and inspect the minimal relevant surfaces.\n2. Planning boundary: `Apply the Context Confidence Standing Order \u2014 entry requires sufficient`. Resolve all blocking gaps before planning.\n3. Inline plan: state objective, targets, execution steps, and done criteria.\n4. Execution: implement the plan in narrow batches, using Carrier Operations Policy when delegation is appropriate.\n5. Verification and review: run targeted checks, apply Deep Dive to speculative results, and fix actionable issues.\n6. Documentation and final report: update directly affected docs only when behavior or operator guidance changed, then summarize changes and QA.\n" },
+  { relativePath: "protocol-redline/SKILL.md", content: "---\nname: protocol-redline\ndescription: Use the risk-controlled Fleet protocol mode for irreversible, structural, multi-module, or prompt-policy work.\n---\n\n# Fleet Protocol: Redline\n\nUse this mode when any Downward Guard trigger defined in the Protocol Gate is in scope, for security-sensitive work, or for any operational request needing explicit risk controls. Escalate to `protocol-frontline` when multiple Carriers or parallel ownership boundaries are required.\n\n## Checkpoints\n\nReconnaissance, Risk review, Plan, Execution, Verification.\n\n## Reporting Cadence\n\nAs you move through this protocol, report progress to the user in order \u2014 each step on its own line with its report token.\n\n1. Brief how the Workflow will proceed \u2014 name (a) the Workflow steps that will run, (b) file ownership and the rollback-safe checkpoint, and (c) the risk controls in force. \u2192 report `brief: <\u2026>`\n2. State that execution is beginning and run the Workflow. \u2192 report `status: executing`\n\n## General Quarters\n\nConfirm each readiness check below before the Workflow. Work through them in order and report each as you confirm it, then proceed to full reconnaissance. These checks prepare the work; they do not gate entry.\n\n- [ ] **Common** \u2014 objective stated (Mission Anchor), mode-fit holds (Mode Gate), Standing Orders binding. \u2192 report `common: ready`\n- [ ] **Doctrine** \u2014 enumerate the applicable AGENTS.md files to load for the affected scope. \u2192 report `doctrine: <\u2026>`\n- [ ] **Impact radius** \u2014 flag public-surface or API impact, irreversibility, and any security-sensitive surface. \u2192 report `impact: <\u2026>`\n- [ ] **Rollback** \u2014 identify a rollback-safe checkpoint and any user approval point before execution begins. \u2192 report `rollback: <\u2026>`\n- [ ] **Escalation** \u2014 if multiple carriers or parallel ownership boundaries are required, re-classify under frontline. \u2192 report `escalation: clear`\n\n## Workflow\n\n1. Full reconnaissance: audit known facts, enumerate blocking and confirmatory gaps, read applicable AGENTS.md files, map affected code, tests, docs, and boundaries.\n2. Architecture and risk review: identify public-surface impact, dependency constraints, rollback risk, security risk, and user approval requirements.\n3. Structured planning boundary: `Apply the Context Confidence Standing Order \u2014 entry requires complete`. Do not plan with unresolved blocking or confirmatory gaps.\n4. Risk-controlled plan: define file ownership, small execution batches, verification commands, rollback-safe checkpoints, and any approval point.\n5. Small-batch execution: edit narrowly, re-read before modifying shared files, and pause on unexpected diffs or scope expansion.\n6. Refactor gate: refactor only touched code when duplication, complexity, or convention drift appears, only with user approval or when pre-declared in the brief.\n7. Correctness and security review (may run as a single combined review dispatch): review changed behavior and risk controls; apply Deep Dive to speculative findings and repeat after fixes.\n8. Documentation and completion report: update directly affected operator docs and report changes, QA, risk controls, and residual uncertainty.\n" }
 ];
 var DIR_MODE = 448;
 var FILE_MODE = 384;
@@ -33606,7 +33584,7 @@ function writePrivateJson(filePath, value, rootBase) {
 function writePrivateFile(filePath, content, rootBase) {
   const resolvedBase = ensureRootBase(rootBase);
   ensurePathWithinRoot(resolvedBase, filePath);
-  ensureDirectorySegments(resolvedBase, path27__default.dirname(filePath));
+  ensureDirectorySegments(resolvedBase, path28__default.dirname(filePath));
   writeFileNoFollow(filePath, content);
   chmodBestEffort(filePath, FILE_MODE);
 }
@@ -33653,20 +33631,20 @@ function writeFileNoFollow(filePath, content) {
   }
 }
 function ensureRootBase(rootBase) {
-  const resolvedBase = path27__default.resolve(rootBase);
-  const anchor = findExistingDirectoryAnchor(path27__default.dirname(resolvedBase));
+  const resolvedBase = path28__default.resolve(rootBase);
+  const anchor = findExistingDirectoryAnchor(path28__default.dirname(resolvedBase));
   ensureDirectorySegments(anchor, resolvedBase);
   assertDirectorySafe(resolvedBase, "Plugin root base");
   return resolvedBase;
 }
 function assertRootBaseSafe(rootBase) {
-  const resolvedBase = path27__default.resolve(rootBase);
-  assertExistingSegmentsSafe(findExistingDirectoryAnchor(path27__default.dirname(resolvedBase)), resolvedBase);
+  const resolvedBase = path28__default.resolve(rootBase);
+  assertExistingSegmentsSafe(findExistingDirectoryAnchor(path28__default.dirname(resolvedBase)), resolvedBase);
   assertDirectorySafe(resolvedBase, "Plugin root base");
   return resolvedBase;
 }
 function findExistingDirectoryAnchor(targetPath) {
-  const resolvedTarget = path27__default.resolve(targetPath);
+  const resolvedTarget = path28__default.resolve(targetPath);
   let current = resolvedTarget;
   while (true) {
     try {
@@ -33674,7 +33652,7 @@ function findExistingDirectoryAnchor(targetPath) {
       return current;
     } catch (error51) {
       if (error51 instanceof Error && "code" in error51 && error51.code === "ENOENT") {
-        const parent = path27__default.dirname(current);
+        const parent = path28__default.dirname(current);
         if (parent === current) throw error51;
         current = parent;
         continue;
@@ -33693,17 +33671,17 @@ function assertDirectorySafe(dirPath, label) {
   }
 }
 function ensurePathWithinRoot(resolvedBase, candidatePath) {
-  const resolvedCandidate = path27__default.resolve(candidatePath);
-  const relative = path27__default.relative(resolvedBase, resolvedCandidate);
-  if (relative === "" || !relative.startsWith("..") && !path27__default.isAbsolute(relative)) return;
+  const resolvedCandidate = path28__default.resolve(candidatePath);
+  const relative = path28__default.relative(resolvedBase, resolvedCandidate);
+  if (relative === "" || !relative.startsWith("..") && !path28__default.isAbsolute(relative)) return;
   throw new Error(`Plugin path escapes root base: ${candidatePath}`);
 }
 function ensureDirectorySegments(resolvedBase, dirPath) {
-  const target = path27__default.resolve(dirPath);
-  const relative = path27__default.relative(resolvedBase, target);
+  const target = path28__default.resolve(dirPath);
+  const relative = path28__default.relative(resolvedBase, target);
   let current = resolvedBase;
-  for (const segment of relative.split(path27__default.sep).filter(Boolean)) {
-    current = path27__default.join(current, segment);
+  for (const segment of relative.split(path28__default.sep).filter(Boolean)) {
+    current = path28__default.join(current, segment);
     try {
       const stat3 = lstatSync(current);
       if (stat3.isSymbolicLink()) {
@@ -33724,11 +33702,11 @@ function ensureDirectorySegments(resolvedBase, dirPath) {
   }
 }
 function assertExistingSegmentsSafe(resolvedBase, targetPath) {
-  const target = path27__default.resolve(targetPath);
-  const relative = path27__default.relative(resolvedBase, target);
+  const target = path28__default.resolve(targetPath);
+  const relative = path28__default.relative(resolvedBase, target);
   let current = resolvedBase;
-  for (const segment of relative.split(path27__default.sep).filter(Boolean)) {
-    current = path27__default.join(current, segment);
+  for (const segment of relative.split(path28__default.sep).filter(Boolean)) {
+    current = path28__default.join(current, segment);
     const stat3 = lstatSync(current);
     if (stat3.isSymbolicLink()) {
       throw new Error(`Plugin path segment is a symlink: ${current}`);
@@ -33740,27 +33718,22 @@ function assertExistingSegmentsSafe(resolvedBase, targetPath) {
   }
 }
 function assertExistingParentSegmentsSafe(resolvedBase, targetPath) {
-  assertExistingSegmentsSafe(resolvedBase, path27__default.dirname(targetPath));
+  assertExistingSegmentsSafe(resolvedBase, path28__default.dirname(targetPath));
 }
 function assertSegmentRealpathWithinRoot(resolvedBase, segmentPath) {
   const baseRealpath = realpathSync(resolvedBase);
   const segmentRealpath = realpathSync(segmentPath);
-  const relative = path27__default.relative(baseRealpath, segmentRealpath);
-  if (relative === "" || !relative.startsWith("..") && !path27__default.isAbsolute(relative)) return;
+  const relative = path28__default.relative(baseRealpath, segmentRealpath);
+  if (relative === "" || !relative.startsWith("..") && !path28__default.isAbsolute(relative)) return;
   throw new Error(`Plugin path segment escapes root base: ${segmentPath}`);
 }
 
-// ../../packages/fleet-admiral/src/agent-cli/plugin/fleet.ts
-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
+// ../../packages/fleet-admiral/src/agent-cli/doctrine-hook.ts
+var DOCTRINE_FILE_NAME = "doctrine.md";
+var DOCTRINE_HOOK_SCRIPT_NAME = "inject-doctrine.mjs";
+var CURSOR_DOCTRINE_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.
+You are running as Cursor Agent inside Fleet. This context was injected through a Fleet sessionStart hook. Treat the embedded Fleet system prompt below as your active Fleet runtime doctrine.
 
 Priority and interpretation:
 
@@ -33774,13 +33747,39 @@ Priority and interpretation:
 
 ## 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.
+The following block is the Fleet system prompt content adapted for Cursor hook injection. It is intentionally embedded verbatim after this wrapper.
 
 <fleet-system-prompt>
 `;
-var CURSOR_DOCTRINE_RULE_FOOTER = `
+var CURSOR_DOCTRINE_FOOTER = `
 </fleet-system-prompt>
 `;
+var INJECT_DOCTRINE_HOOK_SCRIPT = `import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const pluginRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+const doctrine = fs.readFileSync(path.join(pluginRoot, "${DOCTRINE_FILE_NAME}"), "utf8");
+process.stdout.write(JSON.stringify({ additional_context: doctrine }));
+`;
+function formatCursorDoctrine(doctrine) {
+  return `${CURSOR_DOCTRINE_PREAMBLE}${doctrine}${CURSOR_DOCTRINE_FOOTER}`;
+}
+function renderCursorDoctrineHookAssets(pluginRoot, doctrine, hookCommandRoot = pluginRoot) {
+  writePrivateFile(
+    path28__default.join(pluginRoot, DOCTRINE_FILE_NAME),
+    formatCursorDoctrine(doctrine),
+    pluginRoot
+  );
+  const scriptPath = path28__default.join(hookCommandRoot, "hooks", DOCTRINE_HOOK_SCRIPT_NAME);
+  writePrivateFile(path28__default.join(pluginRoot, "hooks", DOCTRINE_HOOK_SCRIPT_NAME), INJECT_DOCTRINE_HOOK_SCRIPT, pluginRoot);
+  return {
+    command: process.execPath,
+    args: [scriptPath]
+  };
+}
+
+// ../../packages/fleet-admiral/src/agent-cli/plugin/fleet.ts
 var assetBundle = {
   description: "Fleet carrier delegation and wiki evidence plugin",
   directoryName: "fleet",
@@ -33791,11 +33790,16 @@ var assetBundle = {
 };
 function renderAssetPluginRoot(pluginRoot, bundle, options) {
   renderEmbeddedSkillAssets(pluginRoot);
+  const doctrineHookExec = options.cliId === "cursor" && options.doctrine !== void 0 ? renderCursorDoctrineHookAssets(
+    pluginRoot,
+    options.doctrine,
+    options.installedPluginRoot ?? pluginRoot
+  ) : void 0;
   if (options.cliId === "claude") {
-    writePrivateJson(path27__default.join(pluginRoot, "hooks", "hooks.json"), claudeHooks(options), pluginRoot);
+    writePrivateJson(path28__default.join(pluginRoot, "hooks", "hooks.json"), claudeHooks(options), pluginRoot);
   }
   if (options.cliId === "cursor") {
-    renderCursorPluginRoot(pluginRoot, options);
+    renderCursorPluginRoot(pluginRoot, options, doctrineHookExec);
   }
 }
 function claudeHooks(options) {
@@ -33836,25 +33840,15 @@ function claudeCommandHook(hookExec) {
     type: "command"
   };
 }
-function renderCursorPluginRoot(pluginRoot, options) {
-  if (options.doctrine !== void 0) {
-    renderCursorDoctrineRule(pluginRoot, options.doctrine);
-  }
+function renderCursorPluginRoot(pluginRoot, options, doctrineHookExec) {
   if ((options.mcpServers ?? []).length > 0) {
-    writePrivateJson(path27__default.join(pluginRoot, "mcp.json"), cursorMcpConfig(options.mcpServers ?? []), pluginRoot);
+    writePrivateJson(path28__default.join(pluginRoot, "mcp.json"), cursorMcpConfig(options.mcpServers ?? []), pluginRoot);
   }
-  const hooks = cursorHooks(options);
+  const hooks = cursorHooks(options, doctrineHookExec);
   if (hooks !== void 0) {
-    writePrivateJson(path27__default.join(pluginRoot, "hooks", "hooks.json"), hooks, pluginRoot);
+    writePrivateJson(path28__default.join(pluginRoot, "hooks", "hooks.json"), hooks, pluginRoot);
   }
 }
-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(
@@ -33868,8 +33862,8 @@ function cursorMcpConfig(servers) {
     )
   };
 }
-function cursorHooks(options) {
-  const sessionStartExecs = [options.captureSessionHookExec].filter((exec) => exec !== void 0);
+function cursorHooks(options, doctrineHookExec) {
+  const sessionStartExecs = [doctrineHookExec, 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;
@@ -33892,7 +33886,7 @@ function cursorCommandHook(hookExec, extraArgs = []) {
 }
 function renderEmbeddedSkillAssets(pluginRoot) {
   for (const asset of EMBEDDED_AGENT_CLI_SKILL_ASSETS) {
-    writePrivateFile(path27__default.join(pluginRoot, "skills", asset.relativePath), asset.content, pluginRoot);
+    writePrivateFile(path28__default.join(pluginRoot, "skills", asset.relativePath), asset.content, pluginRoot);
   }
 }
 var CONFIG_FILE_NAME = "config.toml";
@@ -33907,7 +33901,7 @@ function neutralizeCodexFleetPluginConfig(options) {
   mutateCodexConfigWithRetry(options, 0);
 }
 function mutateCodexConfigWithRetry(options, attempt) {
-  const configPath = path27__default.join(options.codexHome, CONFIG_FILE_NAME);
+  const configPath = path28__default.join(options.codexHome, CONFIG_FILE_NAME);
   const targetPath = resolveRealConfigPath(configPath);
   const snapshot = readConfigSnapshot(targetPath);
   const nextContent = patchCodexConfig(snapshot.content, options);
@@ -33928,7 +33922,7 @@ function resolveRealConfigPath(configPath) {
   } catch (error51) {
     if (!isNodeError(error51, "ENOENT")) throw error51;
     try {
-      return path27__default.join(realpathSync(path27__default.dirname(configPath)), path27__default.basename(configPath));
+      return path28__default.join(realpathSync(path28__default.dirname(configPath)), path28__default.basename(configPath));
     } catch (dirError) {
       if (isNodeError(dirError, "ENOENT")) return configPath;
       throw dirError;
@@ -33965,9 +33959,9 @@ function readConfigSnapshot(configPath) {
   }
 }
 function writeConfigIfUnchanged(configPath, snapshot, content) {
-  mkdirSync(path27__default.dirname(configPath), { recursive: true, mode: 448 });
+  mkdirSync(path28__default.dirname(configPath), { recursive: true, mode: 448 });
   assertConfigUnchanged(configPath, snapshot);
-  const tempPath = path27__default.join(path27__default.dirname(configPath), `.${path27__default.basename(configPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
+  const tempPath = path28__default.join(path28__default.dirname(configPath), `.${path28__default.basename(configPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
   let fd;
   try {
     fd = openSync(tempPath, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | constants.O_NOFOLLOW, CONFIG_FILE_MODE);
@@ -34215,7 +34209,7 @@ function ensureCodexPluginRegisteredOrThrow(registration, command, runCommand) {
     pluginKey
   });
   writePrivateFile(registration.hashPath, `${registration.contentHash}
-`, path27__default.dirname(registration.hashPath));
+`, path28__default.dirname(registration.hashPath));
 }
 function assertCommandSucceeded(label, result) {
   if (result.status === 0) return;
@@ -34223,7 +34217,7 @@ function assertCommandSucceeded(label, result) {
   throw new Error(`${label} failed${detail.length > 0 ? `: ${detail}` : ""}`);
 }
 function resolveCodexHome(env) {
-  return env.CODEX_HOME ?? path27__default.join(env.HOME ?? os3__default.homedir(), ".codex");
+  return env.CODEX_HOME ?? path28__default.join(env.HOME ?? os3__default.homedir(), ".codex");
 }
 function findMarketplaceEntries(result, marketplaceName) {
   return parseMarketplaceEntries(result).filter((entry) => entry.name === marketplaceName);
@@ -34239,7 +34233,7 @@ function parseMarketplaceEntries(result) {
   return entries;
 }
 function normalizeMarketplaceRoot(rootPath, cwd) {
-  const resolved = path27__default.resolve(cwd, rootPath);
+  const resolved = path28__default.resolve(cwd, rootPath);
   try {
     return realpathSync(resolved);
   } catch (error51) {
@@ -34263,7 +34257,7 @@ function readHash(hashPath) {
 }
 function removeFlatMarketplaceResidue(projectMarketplaceRoot) {
   for (const entry of FLAT_MARKETPLACE_FS_RESIDUE_ENTRIES) {
-    removePrivatePath(path27__default.join(projectMarketplaceRoot, entry), projectMarketplaceRoot);
+    removePrivatePath(path28__default.join(projectMarketplaceRoot, entry), projectMarketplaceRoot);
   }
 }
 
@@ -34323,7 +34317,7 @@ async function createAgentCliPlugin(options) {
     cleanup,
     codexRegistrations: options.cliId === "codex" ? renderableBundles.map(({ bundle, target }, index) => ({
       contentHash: contentHashes.get(target.root),
-      hashPath: path27__default.join(target.root, bundle.hashFileName),
+      hashPath: path28__default.join(target.root, bundle.hashFileName),
       marketplaceDir: target.root,
       marketplaceName: target.name,
       pluginName: bundle.name,
@@ -34340,7 +34334,7 @@ function resolveRenderablePluginBundles(fleetRoot) {
 function homeMarketplaceTarget(fleetRoot) {
   return {
     name: FLEET_MARKETPLACE_NAME,
-    root: path27__default.join(fleetRoot, MARKETPLACE_DIR_NAME)
+    root: path28__default.join(fleetRoot, MARKETPLACE_DIR_NAME)
   };
 }
 function groupRenderableBundlesByMarketplace(bundles) {
@@ -34356,24 +34350,24 @@ function groupRenderableBundlesByMarketplace(bundles) {
   return groups;
 }
 function renderPluginRoot(pluginRoot, bundle, options) {
-  const parentRoot = path27__default.dirname(pluginRoot);
+  const parentRoot = path28__default.dirname(pluginRoot);
   ensurePrivateDir(parentRoot, parentRoot);
   const stageParent = createStagingDir(parentRoot);
-  const stagedPluginRoot = path27__default.join(stageParent, path27__default.basename(pluginRoot));
+  const stagedPluginRoot = path28__default.join(stageParent, path28__default.basename(pluginRoot));
   try {
     ensurePrivateDir(stagedPluginRoot, stagedPluginRoot);
-    writePrivateJson(path27__default.join(stagedPluginRoot, ".claude-plugin", "plugin.json"), claudeManifest(bundle), stagedPluginRoot);
+    writePrivateJson(path28__default.join(stagedPluginRoot, ".claude-plugin", "plugin.json"), claudeManifest(bundle), stagedPluginRoot);
     switch (bundle.source) {
       case "asset":
         if (options.cliId === "claude") {
-          ensurePrivateDir(path27__default.join(stagedPluginRoot, "agents"), stagedPluginRoot);
+          ensurePrivateDir(path28__default.join(stagedPluginRoot, "agents"), stagedPluginRoot);
         }
-        ensurePrivateDir(path27__default.join(stagedPluginRoot, "skills"), stagedPluginRoot);
-        renderAssetPluginRoot(stagedPluginRoot, bundle, options);
+        ensurePrivateDir(path28__default.join(stagedPluginRoot, "skills"), stagedPluginRoot);
+        renderAssetPluginRoot(stagedPluginRoot, bundle, { ...options, installedPluginRoot: pluginRoot });
         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);
+    writePrivateJson(path28__default.join(stagedPluginRoot, ".codex-plugin", "plugin.json"), codexManifest(bundle, stagedPluginRoot), stagedPluginRoot);
+    writePrivateJson(path28__default.join(stagedPluginRoot, ".cursor-plugin", "plugin.json"), cursorManifest(bundle, stagedPluginRoot), stagedPluginRoot);
     removePrivatePath(pluginRoot, parentRoot);
     renameSync(stagedPluginRoot, pluginRoot);
   } finally {
@@ -34385,13 +34379,13 @@ function renderMarketplaceRoot(target, bundles) {
   ensurePrivateDir(marketplaceRoot, marketplaceRoot);
   const stagedRoot = createStagingDir(marketplaceRoot);
   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);
+    writePrivateJson(path28__default.join(stagedRoot, ".agents", "plugins", "marketplace.json"), codexMarketplace(target, bundles), stagedRoot);
+    writePrivateJson(path28__default.join(stagedRoot, ".claude-plugin", "marketplace.json"), claudeMarketplace(target, bundles), stagedRoot);
+    writePrivateJson(path28__default.join(stagedRoot, ".cursor-plugin", "marketplace.json"), cursorMarketplace(target, bundles), stagedRoot);
     pruneMarketplaceRoot(target);
     pruneStalePluginDirs(target, bundles);
     for (const entry of readdirSync(stagedRoot)) {
-      renameSync(path27__default.join(stagedRoot, entry), path27__default.join(marketplaceRoot, entry));
+      renameSync(path28__default.join(stagedRoot, entry), path28__default.join(marketplaceRoot, entry));
     }
   } finally {
     cleanupPrivateRoot(stagedRoot, marketplaceRoot);
@@ -34399,22 +34393,22 @@ function renderMarketplaceRoot(target, bundles) {
 }
 function pruneMarketplaceRoot(target) {
   for (const entry of MARKETPLACE_PRUNE_ENTRIES) {
-    removePrivatePath(path27__default.join(target.root, entry), target.root);
+    removePrivatePath(path28__default.join(target.root, entry), target.root);
   }
 }
 function pruneStalePluginDirs(target, bundles) {
-  const pluginsDir = path27__default.join(target.root, PLUGIN_BUNDLES_DIR_NAME);
+  const pluginsDir = path28__default.join(target.root, PLUGIN_BUNDLES_DIR_NAME);
   if (!existsSync(pluginsDir)) return;
   const activeDirectoryNames = new Set(bundles.map((bundle) => bundle.directoryName));
   for (const entry of readdirSync(pluginsDir)) {
     if (activeDirectoryNames.has(entry)) continue;
-    removePrivatePath(path27__default.join(pluginsDir, entry), target.root);
+    removePrivatePath(path28__default.join(pluginsDir, entry), target.root);
   }
 }
 function buildContentHash(target) {
   const hash2 = crypto4.createHash("sha256");
   for (const filePath of listRenderableFiles(target)) {
-    const relativePath = path27__default.relative(target.root, filePath);
+    const relativePath = path28__default.relative(target.root, filePath);
     hash2.update(relativePath);
     hash2.update("\0");
     hash2.update(readFileSync(filePath));
@@ -34423,14 +34417,14 @@ function buildContentHash(target) {
   return hash2.digest("hex");
 }
 function createStagingDir(rootPath) {
-  const stageRoot = mkdtempSync(path27__default.join(rootPath, `.fleet-stage-${process.pid}-${Date.now()}-`));
+  const stageRoot = mkdtempSync(path28__default.join(rootPath, `.fleet-stage-${process.pid}-${Date.now()}-`));
   return stageRoot;
 }
 function listRenderableFiles(target) {
   const files = [];
   const ancestorRealDirs = /* @__PURE__ */ new Set();
   for (const entry of MARKETPLACE_MANAGED_ENTRIES) {
-    const entryPath = path27__default.join(target.root, entry);
+    const entryPath = path28__default.join(target.root, entry);
     if (!existsSync(entryPath)) continue;
     collectRenderableFiles(target.root, entryPath, files, ancestorRealDirs);
   }
@@ -34441,8 +34435,8 @@ function collectRenderableFiles(rootPath, currentPath, files, ancestorRealDirs)
   if (ancestorRealDirs.has(realDir)) return;
   ancestorRealDirs.add(realDir);
   for (const entry of readdirSync(currentPath)) {
-    const entryPath = path27__default.join(currentPath, entry);
-    const relativePath = path27__default.relative(rootPath, entryPath);
+    const entryPath = path28__default.join(currentPath, entry);
+    const relativePath = path28__default.relative(rootPath, entryPath);
     if (HASH_IGNORED_RELATIVE_PATHS.has(relativePath)) continue;
     const stat3 = lstatSync(entryPath);
     if (stat3.isSymbolicLink()) {
@@ -34519,7 +34513,7 @@ function cursorMarketplace(target, bundles) {
   };
 }
 function pluginRootForTarget(target, bundle) {
-  return path27__default.join(target.root, PLUGIN_BUNDLES_DIR_NAME, bundle.directoryName);
+  return path28__default.join(target.root, PLUGIN_BUNDLES_DIR_NAME, bundle.directoryName);
 }
 function marketplacePluginPath(target, bundle) {
   return `./${PLUGIN_BUNDLES_DIR_NAME}/${bundle.directoryName}`;
@@ -34546,7 +34540,7 @@ function cursorManifestVersion(bundle, pluginRoot) {
   hash2.update(bundle.description);
   hash2.update("\0");
   for (const filePath of listCursorEffectivePluginFiles(pluginRoot)) {
-    const relativePath = path27__default.relative(pluginRoot, filePath);
+    const relativePath = path28__default.relative(pluginRoot, filePath);
     hash2.update(relativePath);
     hash2.update("\0");
     hash2.update(readFileSync(filePath));
@@ -34561,7 +34555,7 @@ function codexManifestVersion(bundle, pluginRoot) {
   hash2.update(bundle.description);
   hash2.update("\0");
   for (const filePath of listCodexEffectivePluginFiles(pluginRoot)) {
-    const relativePath = path27__default.relative(pluginRoot, filePath);
+    const relativePath = path28__default.relative(pluginRoot, filePath);
     hash2.update(relativePath);
     hash2.update("\0");
     hash2.update(readFileSync(filePath));
@@ -34570,7 +34564,7 @@ function codexManifestVersion(bundle, pluginRoot) {
   return `0.0.0+${hash2.digest("hex").slice(0, 12)}`;
 }
 function listCodexEffectivePluginFiles(pluginRoot) {
-  const skillsPath = path27__default.join(pluginRoot, "skills");
+  const skillsPath = path28__default.join(pluginRoot, "skills");
   if (!existsSync(skillsPath)) return [];
   const files = [];
   collectRenderableFiles(pluginRoot, skillsPath, files, /* @__PURE__ */ new Set());
@@ -34578,8 +34572,8 @@ function listCodexEffectivePluginFiles(pluginRoot) {
 }
 function listCursorEffectivePluginFiles(pluginRoot) {
   const files = [];
-  for (const entry of ["skills", "rules", "hooks", "mcp.json"]) {
-    const entryPath = path27__default.join(pluginRoot, entry);
+  for (const entry of ["skills", "hooks", "doctrine.md", "mcp.json"]) {
+    const entryPath = path28__default.join(pluginRoot, entry);
     if (!existsSync(entryPath)) continue;
     const stat3 = lstatSync(entryPath);
     if (stat3.isFile()) {
@@ -34612,12 +34606,12 @@ async function injectAgentCliProfile(profile, options) {
   if (!capability.enabled) {
     return profile;
   }
-  const injectTone = options.enableMetaphor ?? false;
+  const enableMetaphor = options.enableMetaphor ?? false;
   const endpoint = await options.dedicatedMcpSession.getEndpoint();
   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 doctrine = options.buildSystemPrompt(enableMetaphor);
   const tempCleanups = [];
   try {
     const systemPromptFile = profile.id === "claude" ? writeSystemPromptFile(profile.id, doctrine, (cleanup2) => tempCleanups.push(cleanup2)) : void 0;
@@ -34652,8 +34646,8 @@ 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 ?? getFleetDataDir(), "marketplace"),
-        projectMarketplaceRoot: path27__default.join(profile.cwd, ".fleet")
+        homeMarketplaceRoot: path28__default.join(options.pluginRootDir ?? options.dataDir ?? getFleetDataDir(), "marketplace"),
+        projectMarketplaceRoot: path28__default.join(profile.cwd, ".fleet")
       });
       if (cleanupWarning !== void 0) {
         launchWarnings.push(`Deprecated Codex plugin cleanup failed: ${cleanupWarning}`);
@@ -34716,19 +34710,19 @@ function buildAgentCliMcpServerConfigs(endpoints, tokens) {
   });
 }
 function writeSystemPromptFile(cliId, systemPrompt, onCleanup) {
-  const tempDir = mkdtempSync(path27__default.join(os3__default.tmpdir(), `fleet-${cliId}-`));
+  const tempDir = mkdtempSync(path28__default.join(os3__default.tmpdir(), `fleet-${cliId}-`));
   onCleanup(() => rmBestEffort(tempDir));
-  const filePath = path27__default.join(tempDir, "system-prompt.md");
+  const filePath = path28__default.join(tempDir, "system-prompt.md");
   writeFileSync(filePath, systemPrompt, { encoding: "utf8", flag: "wx", mode: SYSTEM_PROMPT_FILE_MODE });
   chmodBestEffort2(filePath, SYSTEM_PROMPT_FILE_MODE);
   return filePath;
 }
 function writeCodexFleetProfile(env, doctrine, pluginKeys, hookExecs) {
-  const codexHome = env.CODEX_HOME ?? path27__default.join(env.HOME ?? os3__default.homedir(), ".codex");
+  const codexHome = env.CODEX_HOME ?? path28__default.join(env.HOME ?? os3__default.homedir(), ".codex");
   mkdirSync(codexHome, { recursive: true });
   pruneLegacyCodexFleetProfiles(codexHome);
   const profileName = CODEX_FLEET_PROFILE_NAME;
-  const profilePath = path27__default.join(codexHome, CODEX_FLEET_PROFILE_FILE_NAME);
+  const profilePath = path28__default.join(codexHome, CODEX_FLEET_PROFILE_FILE_NAME);
   const hookTrustState = readCodexFleetHookTrustState(profilePath);
   writeFileNoFollow2(profilePath, [
     CODEX_FLEET_PROFILE_MARKER,
@@ -34742,7 +34736,7 @@ function writeCodexFleetProfile(env, doctrine, pluginKeys, hookExecs) {
     "hooks = true",
     "",
     ...pluginKeys.flatMap((pluginKey) => [
-      `[plugins."${escapeTomlBasicString2(pluginKey)}"]`,
+      `[plugins."${escapeTomlBasicString(pluginKey)}"]`,
       "enabled = true",
       ""
     ]),
@@ -34769,7 +34763,7 @@ function codexHooksConfig(hookExecs) {
 function codexHookHandlersInline(execs) {
   const handlers = execs.map((exec) => {
     const command = buildPosixShellCommand([exec.command, ...exec.args]);
-    return `{ type = "command", command = "${escapeTomlBasicString2(command)}" }`;
+    return `{ type = "command", command = "${escapeTomlBasicString(command)}" }`;
   }).join(", ");
   return `[{ hooks = [${handlers}] }]`;
 }
@@ -34832,7 +34826,7 @@ function pruneLegacyCodexFleetProfiles(codexHome) {
   }
   for (const entry of entries) {
     if (!CODEX_LEGACY_FLEET_PROFILE_FILE_NAME_PATTERN.test(entry)) continue;
-    const filePath = path27__default.join(codexHome, entry);
+    const filePath = path28__default.join(codexHome, entry);
     if (!isLegacyFleetCodexProfile(filePath)) continue;
     unlinkBestEffort2(filePath);
   }
@@ -34963,6 +34957,18 @@ function createFleetAgentRuntimeLifecycle(deps) {
     }
   };
 }
+function createAuthEnvResolver(globalOptionsService) {
+  return async (cli) => {
+    if (cli !== "codex" || !globalOptionsService) return {};
+    try {
+      const mode = globalOptionsService.load().codexLaunchMode;
+      if (!mode) return {};
+      return { CODEX_USE_ACP: mode === "app-server" ? "false" : "true" };
+    } catch {
+      return {};
+    }
+  };
+}
 function createFleetAgentRuntimeMcpServices() {
   const mcpRegistry = createMcpToolRegistry();
   const mcpToolSnapshotStore = createMcpToolSnapshotStore();
@@ -34992,7 +34998,7 @@ function registerExecutorPort(mcpRegistry, carrierRuntime, isActive) {
 }
 function registerFleetAgentRuntimeTools(mcpRegistry, carrierRuntime, deps) {
   registerAgentToolDefaults(mcpRegistry, carrierRuntime, {
-    authEnvResolver: async () => ({}),
+    authEnvResolver: createAuthEnvResolver(deps.globalOptionsService),
     reservedExternalMcpServerIds: buildReservedExternalMcpServerIds(deps.reservedExternalMcpServerIds),
     workspaceChangeScanner: deps.workspaceChangeScanner
   });
@@ -35285,7 +35291,7 @@ function extractLegacyMarkdownWikiLinks(body, wikiDir, basePath) {
 }
 function resolveLegacyWikiTarget(target, wikiDir, basePath) {
   if (!target || target.startsWith("#")) return null;
-  if (path27__default.isAbsolute(target)) return null;
+  if (path28__default.isAbsolute(target)) return null;
   if (/^[a-z][a-z0-9+.-]*:/i.test(target)) return null;
   const withoutFragment = target.split("#", 1)[0]?.split("?", 1)[0] ?? "";
   if (!withoutFragment.endsWith(".md")) return null;
@@ -35295,12 +35301,12 @@ function resolveLegacyWikiTarget(target, wikiDir, basePath) {
   } catch {
     return null;
   }
-  const resolved = path27__default.resolve(path27__default.dirname(basePath), decodedTarget);
-  const relative = path27__default.relative(wikiDir, resolved);
-  if (!relative || relative.startsWith("..") || path27__default.isAbsolute(relative)) return null;
+  const resolved = path28__default.resolve(path28__default.dirname(basePath), decodedTarget);
+  const relative = path28__default.relative(wikiDir, resolved);
+  if (!relative || relative.startsWith("..") || path28__default.isAbsolute(relative)) return null;
   return {
     target,
-    entryId: path27__default.basename(relative, ".md")
+    entryId: path28__default.basename(relative, ".md")
   };
 }
 
@@ -35560,18 +35566,18 @@ Always read \`schema/wiki-schema.md\` directly before composing or revising entr
 `;
 async function ensureWorkspaceSchema(paths) {
   await mkdir(paths.schemaDir, { recursive: true });
-  await writeDefaultFileIfMissing(path27__default.join(paths.schemaDir, WORKSPACE_SCHEMA_AGENTS_FILENAME), DEFAULT_WORKSPACE_SCHEMA_AGENTS);
-  await writeDefaultFileIfMissing(path27__default.join(paths.schemaDir, WORKSPACE_SCHEMA_FILENAME), DEFAULT_WORKSPACE_WIKI_SCHEMA);
+  await writeDefaultFileIfMissing(path28__default.join(paths.schemaDir, WORKSPACE_SCHEMA_AGENTS_FILENAME), DEFAULT_WORKSPACE_SCHEMA_AGENTS);
+  await writeDefaultFileIfMissing(path28__default.join(paths.schemaDir, WORKSPACE_SCHEMA_FILENAME), DEFAULT_WORKSPACE_WIKI_SCHEMA);
   await writeDefaultFileIfMissing(buildTemplatePath(paths, "prd"), DEFAULT_TEMPLATE_PRD);
   return readWorkspaceSchemaSummary(paths);
 }
 async function ensureWorkspaceDoctrine(paths) {
   await mkdir(paths.root, { recursive: true });
-  await writeDefaultFileIfMissing(path27__default.join(paths.root, WORKSPACE_KNOWLEDGE_AGENTS_FILENAME), DEFAULT_WORKSPACE_KNOWLEDGE_AGENTS);
+  await writeDefaultFileIfMissing(path28__default.join(paths.root, WORKSPACE_KNOWLEDGE_AGENTS_FILENAME), DEFAULT_WORKSPACE_KNOWLEDGE_AGENTS);
 }
 async function readWorkspaceSchemaSummary(paths) {
-  const agentsPath = path27__default.join(paths.schemaDir, WORKSPACE_SCHEMA_AGENTS_FILENAME);
-  const wikiSchemaPath = path27__default.join(paths.schemaDir, WORKSPACE_SCHEMA_FILENAME);
+  const agentsPath = path28__default.join(paths.schemaDir, WORKSPACE_SCHEMA_AGENTS_FILENAME);
+  const wikiSchemaPath = path28__default.join(paths.schemaDir, WORKSPACE_SCHEMA_FILENAME);
   const wikiSchemaContent = await tryReadFile(wikiSchemaPath);
   const templates = await scanTemplates(paths);
   if (wikiSchemaContent === null) {
@@ -35610,7 +35616,7 @@ async function scanTemplates(paths) {
     if (!entry.name.startsWith(WORKSPACE_TEMPLATE_PREFIX) || !entry.name.endsWith(WORKSPACE_TEMPLATE_SUFFIX)) continue;
     const id = entry.name.slice(WORKSPACE_TEMPLATE_PREFIX.length, -WORKSPACE_TEMPLATE_SUFFIX.length);
     if (!id) continue;
-    const filePath = path27__default.join(paths.schemaDir, entry.name);
+    const filePath = path28__default.join(paths.schemaDir, entry.name);
     try {
       const parsed = parseTemplateMarkdown(await readFile(filePath, "utf8"));
       templates.push({
@@ -35644,7 +35650,7 @@ async function validateTemplateCompliance(paths, templateId, body) {
   }
 }
 function inferTemplateIdFromTarget(target, knownTemplateIds) {
-  const basename = path27__default.basename(target, ".md");
+  const basename = path28__default.basename(target, ".md");
   const ids = knownTemplateIds ?? DEFAULT_TEMPLATE_IDS;
   const sorted = [...ids].sort((a, b) => b.length - a.length);
   for (const id of sorted) {
@@ -35673,7 +35679,7 @@ function extractSchemaSummary(content) {
   return lines.find((line) => line.length > 0 && !line.startsWith("#")) ?? "Workspace schema is present.";
 }
 function buildTemplatePath(paths, id) {
-  return path27__default.join(paths.schemaDir, `${WORKSPACE_TEMPLATE_PREFIX}${id}${WORKSPACE_TEMPLATE_SUFFIX}`);
+  return path28__default.join(paths.schemaDir, `${WORKSPACE_TEMPLATE_PREFIX}${id}${WORKSPACE_TEMPLATE_SUFFIX}`);
 }
 function parseTemplateMarkdown(content) {
   const normalized = content.replace(/\r\n/g, "\n");
@@ -35700,16 +35706,16 @@ function isAlreadyExistsError(error51) {
 
 // ../../packages/fleet-wiki/src/paths.ts
 function resolveMemoryPaths(cwd) {
-  const root = path27__default.join(cwd, KNOWLEDGE_ROOT_DIRNAME);
+  const root = path28__default.join(cwd, KNOWLEDGE_ROOT_DIRNAME);
   return {
     root,
-    rawDir: path27__default.join(root, RAW_DIRNAME),
-    wikiDir: path27__default.join(root, WIKI_DIRNAME),
-    schemaDir: path27__default.join(root, SCHEMA_DIRNAME),
-    queueDir: path27__default.join(root, QUEUE_DIRNAME),
-    archiveDir: path27__default.join(root, ARCHIVE_DIRNAME),
-    conflictsDir: path27__default.join(root, CONFLICTS_DIRNAME),
-    indexFile: path27__default.join(root, INDEX_FILENAME)
+    rawDir: path28__default.join(root, RAW_DIRNAME),
+    wikiDir: path28__default.join(root, WIKI_DIRNAME),
+    schemaDir: path28__default.join(root, SCHEMA_DIRNAME),
+    queueDir: path28__default.join(root, QUEUE_DIRNAME),
+    archiveDir: path28__default.join(root, ARCHIVE_DIRNAME),
+    conflictsDir: path28__default.join(root, CONFLICTS_DIRNAME),
+    indexFile: path28__default.join(root, INDEX_FILENAME)
   };
 }
 async function ensureMemoryRoot(paths) {
@@ -35724,10 +35730,10 @@ async function ensureMemoryRoot(paths) {
   await ensureWorkspaceDoctrine(paths);
 }
 function getIndexMarkdownFile(paths) {
-  return path27__default.join(paths.wikiDir, INDEX_MD_FILENAME);
+  return path28__default.join(paths.wikiDir, INDEX_MD_FILENAME);
 }
 function getLogFile(paths) {
-  return path27__default.join(paths.root, LOG_MD_FILENAME);
+  return path28__default.join(paths.root, LOG_MD_FILENAME);
 }
 
 // ../../packages/fleet-wiki/src/log.ts
@@ -35891,12 +35897,12 @@ async function readWikiEntry(id, paths) {
   const index = await loadIndex(paths);
   const indexed = index[id];
   if (indexed) {
-    const resolved = path27__default.resolve(paths.root, indexed.path);
-    const rel = path27__default.relative(paths.wikiDir, resolved);
-    if (!rel || rel.startsWith("..") || path27__default.isAbsolute(rel)) return null;
+    const resolved = path28__default.resolve(paths.root, indexed.path);
+    const rel = path28__default.relative(paths.wikiDir, resolved);
+    if (!rel || rel.startsWith("..") || path28__default.isAbsolute(rel)) return null;
     return readMarkdownFile(resolved);
   }
-  const fallbackPath = path27__default.join(paths.wikiDir, `${id}.md`);
+  const fallbackPath = path28__default.join(paths.wikiDir, `${id}.md`);
   if (await pathExists(fallbackPath)) {
     return readMarkdownFile(fallbackPath);
   }
@@ -35907,20 +35913,20 @@ async function readWikiEntry(id, paths) {
 async function writeWikiEntryAtTarget(entry, target, paths) {
   await ensureMemoryRoot(paths);
   assertSafeEntryId(entry.id);
-  const absoluteTarget = path27__default.resolve(paths.root, target);
-  const relativeTarget = path27__default.relative(paths.wikiDir, absoluteTarget);
-  if (!relativeTarget || relativeTarget.startsWith("..") || path27__default.isAbsolute(relativeTarget)) {
+  const absoluteTarget = path28__default.resolve(paths.root, target);
+  const relativeTarget = path28__default.relative(paths.wikiDir, absoluteTarget);
+  if (!relativeTarget || relativeTarget.startsWith("..") || path28__default.isAbsolute(relativeTarget)) {
     throw new Error(`[fleet-wiki] wiki target escapes wiki/: ${target}`);
   }
   if (!absoluteTarget.endsWith(".md")) {
     throw new Error(`[fleet-wiki] wiki target must end with .md: ${target}`);
   }
-  if (path27__default.basename(absoluteTarget, ".md") !== entry.id) {
+  if (path28__default.basename(absoluteTarget, ".md") !== entry.id) {
     throw new Error("wiki patch body id must match target filename");
   }
-  await mkdir(path27__default.dirname(absoluteTarget), { recursive: true });
+  await mkdir(path28__default.dirname(absoluteTarget), { recursive: true });
   await writeMarkdownAtomic(absoluteTarget, serializeWikiEntry(entry), paths);
-  return path27__default.join("wiki", relativeTarget).replaceAll(path27__default.sep, "/");
+  return path28__default.join("wiki", relativeTarget).replaceAll(path28__default.sep, "/");
 }
 async function writeRawSourceEntry(entry, paths) {
   await ensureMemoryRoot(paths);
@@ -35939,11 +35945,11 @@ async function writeRawSourceEntry(entry, paths) {
     },
     entry.content
   );
-  await writeMarkdownAtomic(path27__default.join(paths.root, relativePath), content, paths);
+  await writeMarkdownAtomic(path28__default.join(paths.root, relativePath), content, paths);
   return relativePath;
 }
 async function readRawSourceEntry(rawSourceRef, paths) {
-  const absolutePath = path27__default.resolve(paths.root, rawSourceRef);
+  const absolutePath = path28__default.resolve(paths.root, rawSourceRef);
   assertWithinRawDir(absolutePath, paths);
   const parsed = parseMarkdown(await readFile(absolutePath, "utf8"));
   return {
@@ -36134,8 +36140,8 @@ function computeContentHash(content) {
   return crypto4.createHash("sha256").update(content, "utf8").digest("hex").slice(0, 8);
 }
 function assertWithinRawDir(absolutePath, paths) {
-  const relative = path27__default.relative(paths.rawDir, absolutePath);
-  if (!relative || relative.startsWith("..") || path27__default.isAbsolute(relative)) {
+  const relative = path28__default.relative(paths.rawDir, absolutePath);
+  if (!relative || relative.startsWith("..") || path28__default.isAbsolute(relative)) {
     throw new Error(`[fleet-wiki] raw source ref escapes raw/: ${absolutePath}`);
   }
 }
@@ -36191,7 +36197,7 @@ function parseWikiEntry(content) {
 async function listWikiRecords(paths) {
   return listMarkdownEntriesRecursive(paths.wikiDir, paths, (content, filePath) => ({
     entry: parseWikiEntry(content),
-    path: path27__default.relative(paths.root, filePath).replaceAll(path27__default.sep, "/")
+    path: path28__default.relative(paths.root, filePath).replaceAll(path28__default.sep, "/")
   }));
 }
 async function listMarkdownEntriesRecursive(dirPath, paths, parser) {
@@ -36204,7 +36210,7 @@ async function listMarkdownEntriesRecursive(dirPath, paths, parser) {
   }
   const sortedEntries = entries.sort((left, right) => left.name.localeCompare(right.name));
   for (const entry of sortedEntries) {
-    const filePath = path27__default.join(dirPath, entry.name);
+    const filePath = path28__default.join(dirPath, entry.name);
     if (entry.isDirectory()) {
       items.push(...await listMarkdownEntriesRecursive(filePath, paths, parser));
       continue;
@@ -36342,8 +36348,8 @@ async function writeJsonAtomic(filePath, value, paths) {
 }
 async function writeAtomic(filePath, content, paths) {
   await ensureMemoryRoot(paths);
-  const tempPath = path27__default.join(
-    path27__default.dirname(filePath),
+  const tempPath = path28__default.join(
+    path28__default.dirname(filePath),
     `.tmp-${process.pid}-${Date.now()}-${crypto4.randomUUID()}-${os3__default.hostname()}`
   );
   await writeFile(tempPath, content, "utf8");
@@ -36390,7 +36396,7 @@ async function enhancedSearch(paths, options) {
   for (const entry of entries) {
     if (!index[entry.id]) {
       index[entry.id] = {
-        path: path27__default.join("wiki", `${entry.id}.md`),
+        path: path28__default.join("wiki", `${entry.id}.md`),
         title: entry.title,
         tags: entry.tags,
         updated: entry.updated
@@ -36526,7 +36532,7 @@ function toEnhancedHit(entry, signals) {
     score: enhancedScore,
     reason: signals.legacyReason ?? "body",
     excerpt,
-    path: path27__default.join("wiki", `${entry.id}.md`),
+    path: path28__default.join("wiki", `${entry.id}.md`),
     tags: entry.tags,
     updated: entry.updated,
     version: entry.version,
@@ -36722,7 +36728,7 @@ function toRankedHit(entry, reason, detail, graphBoost, backlinksById) {
     score: basePriority * 100 + statusPriority * 10 + graphScore + (detail.tagBoost ?? 0),
     reason,
     excerpt,
-    path: path27__default.join("wiki", `${entry.id}.md`),
+    path: path28__default.join("wiki", `${entry.id}.md`),
     tags: entry.tags,
     updated: entry.updated,
     version: entry.version,
@@ -37150,15 +37156,15 @@ var PATCH_SET_DIRNAME = "_sets";
 var PATCH_SET_META_FILENAME = PATCH_META_FILENAME;
 function getPatchSetDir(paths, patchSetId) {
   assertSafePatchSetId(patchSetId);
-  const patchSetDir = path27__default.join(paths.queueDir, PATCH_SET_DIRNAME, patchSetId);
-  const relative = path27__default.relative(path27__default.join(paths.queueDir, PATCH_SET_DIRNAME), patchSetDir);
-  if (!relative || relative.startsWith("..") || path27__default.isAbsolute(relative)) {
+  const patchSetDir = path28__default.join(paths.queueDir, PATCH_SET_DIRNAME, patchSetId);
+  const relative = path28__default.relative(path28__default.join(paths.queueDir, PATCH_SET_DIRNAME), patchSetDir);
+  if (!relative || relative.startsWith("..") || path28__default.isAbsolute(relative)) {
     throw new Error(`[fleet-wiki] patch set id escapes queue/_sets: ${patchSetId}`);
   }
   return patchSetDir;
 }
 function getPatchSetMetaFile(paths, patchSetId) {
-  return path27__default.join(getPatchSetDir(paths, patchSetId), PATCH_SET_META_FILENAME);
+  return path28__default.join(getPatchSetDir(paths, patchSetId), PATCH_SET_META_FILENAME);
 }
 function buildPatchSetId(createdAt, sourceRef) {
   const compact = createdAt.replace(/[:.]/g, "-");
@@ -37191,7 +37197,7 @@ async function createConflict(input, paths) {
   await ensureMemoryRoot(paths);
   const now = input.now ?? /* @__PURE__ */ new Date();
   const conflictId = buildConflictId(now, input.wikiId, input.reason, input.proposed);
-  const conflictDir = path27__default.join(paths.conflictsDir, conflictId);
+  const conflictDir = path28__default.join(paths.conflictsDir, conflictId);
   await mkdir(conflictDir, { recursive: true });
   const meta3 = {
     id: conflictId,
@@ -37211,13 +37217,13 @@ async function createConflict(input, paths) {
     currentHash: input.currentHash,
     warnings: input.warnings
   };
-  await writeJsonFile(path27__default.join(conflictDir, CONFLICT_META_FILENAME), meta3, paths);
-  await writePatchFile(path27__default.join(conflictDir, CONFLICT_PROPOSED_FILENAME), input.proposed, paths);
+  await writeJsonFile(path28__default.join(conflictDir, CONFLICT_META_FILENAME), meta3, paths);
+  await writePatchFile(path28__default.join(conflictDir, CONFLICT_PROPOSED_FILENAME), input.proposed, paths);
   if (input.current !== void 0) {
-    await writePatchFile(path27__default.join(conflictDir, CONFLICT_CURRENT_FILENAME), input.current, paths);
+    await writePatchFile(path28__default.join(conflictDir, CONFLICT_CURRENT_FILENAME), input.current, paths);
   }
   if (input.rawSource !== void 0) {
-    await writePatchFile(path27__default.join(conflictDir, CONFLICT_RAW_SOURCE_FILENAME), input.rawSource, paths);
+    await writePatchFile(path28__default.join(conflictDir, CONFLICT_RAW_SOURCE_FILENAME), input.rawSource, paths);
   }
   return {
     meta: meta3,
@@ -37231,7 +37237,7 @@ async function listConflicts(paths) {
   const metas = [];
   for (const id of ids) {
     try {
-      metas.push(await readJsonFile2(path27__default.join(paths.conflictsDir, id, CONFLICT_META_FILENAME)));
+      metas.push(await readJsonFile2(path28__default.join(paths.conflictsDir, id, CONFLICT_META_FILENAME)));
     } catch {
       continue;
     }
@@ -37240,13 +37246,13 @@ async function listConflicts(paths) {
 }
 async function readConflict(conflictId, paths) {
   const conflictDir = resolveConflictDir(conflictId, paths);
-  const meta3 = await readJsonFile2(path27__default.join(conflictDir, CONFLICT_META_FILENAME));
-  const currentPath = path27__default.join(conflictDir, CONFLICT_CURRENT_FILENAME);
-  const rawSourcePath = path27__default.join(conflictDir, CONFLICT_RAW_SOURCE_FILENAME);
+  const meta3 = await readJsonFile2(path28__default.join(conflictDir, CONFLICT_META_FILENAME));
+  const currentPath = path28__default.join(conflictDir, CONFLICT_CURRENT_FILENAME);
+  const rawSourcePath = path28__default.join(conflictDir, CONFLICT_RAW_SOURCE_FILENAME);
   return {
     meta: meta3,
     current: await pathExists(currentPath) ? await readPatchFile(currentPath) : void 0,
-    proposed: await readPatchFile(path27__default.join(conflictDir, CONFLICT_PROPOSED_FILENAME)),
+    proposed: await readPatchFile(path28__default.join(conflictDir, CONFLICT_PROPOSED_FILENAME)),
     rawSource: await pathExists(rawSourcePath) ? await readPatchFile(rawSourcePath) : void 0
   };
 }
@@ -37265,9 +37271,9 @@ function sanitizeConflictToken(value) {
   return value.toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 64) || "unknown";
 }
 function resolveConflictDir(conflictId, paths) {
-  const conflictDir = path27__default.resolve(paths.conflictsDir, conflictId);
-  const relative = path27__default.relative(paths.conflictsDir, conflictDir);
-  if (!relative || relative.startsWith("..") || path27__default.isAbsolute(relative)) {
+  const conflictDir = path28__default.resolve(paths.conflictsDir, conflictId);
+  const relative = path28__default.relative(paths.conflictsDir, conflictDir);
+  if (!relative || relative.startsWith("..") || path28__default.isAbsolute(relative)) {
     throw new Error(`[fleet-wiki] conflict id escapes conflicts/: ${conflictId}`);
   }
   return conflictDir;
@@ -37305,11 +37311,11 @@ async function validatePatch(patch, paths) {
   if (!target || !summary || !proposer || !created) throw new Error("patch frontmatter is incomplete");
   if (summary.length > 120) throw new Error("patch summary exceeds 120 chars");
   assertCanonicalPatchTarget(target);
-  const absoluteTarget = path27__default.resolve(paths.root, target);
-  if (!absoluteTarget.startsWith(`${paths.root}${path27__default.sep}`) && absoluteTarget !== paths.root) {
+  const absoluteTarget = path28__default.resolve(paths.root, target);
+  if (!absoluteTarget.startsWith(`${paths.root}${path28__default.sep}`) && absoluteTarget !== paths.root) {
     throw new Error("patch target escapes wiki root");
   }
-  if (!absoluteTarget.startsWith(`${paths.wikiDir}${path27__default.sep}`)) throw new Error("wiki patch must target wiki/");
+  if (!absoluteTarget.startsWith(`${paths.wikiDir}${path28__default.sep}`)) throw new Error("wiki patch must target wiki/");
   assertNoSymlinkPathComponents(target, paths);
   if (op === "create_wiki" && await pathExists(absoluteTarget)) {
     throw new Error(
@@ -37330,19 +37336,19 @@ async function applyPatch(patch, paths) {
 async function enqueuePatch(patch, paths, metaOverrides) {
   await ensureMemoryRoot(paths);
   const patchId = buildPatchId(patch.frontmatter.created, patch.frontmatter.summary, patch.frontmatter.target, patch.body);
-  const queueDir = path27__default.join(paths.queueDir, patchId);
+  const queueDir = path28__default.join(paths.queueDir, patchId);
   if (await pathExists(queueDir)) {
     throw new Error(`[fleet-wiki] patch id collision: ${patchId} - this should never happen with target+body hashing`);
   }
   await mkdir(queueDir, { recursive: true });
-  await writePatchFile(path27__default.join(queueDir, PATCH_FILENAME), serializePatch(patch), paths);
+  await writePatchFile(path28__default.join(queueDir, PATCH_FILENAME), serializePatch(patch), paths);
   const meta3 = {
     id: patchId,
     status: "pending",
     createdAt: patch.frontmatter.created,
     ...metaOverrides
   };
-  await writeJsonFile(path27__default.join(queueDir, PATCH_META_FILENAME), meta3, paths);
+  await writeJsonFile(path28__default.join(queueDir, PATCH_META_FILENAME), meta3, paths);
   await appendLog(paths, "patch enqueued", {
     patch_id: patchId,
     patch_set_id: meta3.patch_set_id ?? null,
@@ -37360,7 +37366,7 @@ async function listQueue(paths) {
   for (const id of ids) {
     if (id === "_sets") continue;
     try {
-      const meta3 = await readJsonFile2(path27__default.join(paths.queueDir, id, PATCH_META_FILENAME));
+      const meta3 = await readJsonFile2(path28__default.join(paths.queueDir, id, PATCH_META_FILENAME));
       results.push({ id, meta: meta3 });
     } catch {
       continue;
@@ -37385,17 +37391,17 @@ async function resolveQueueSelection(id, paths) {
 }
 async function showQueue(id, paths) {
   const selection = await resolveQueueSelection(id, paths);
-  const queueDir = path27__default.join(paths.queueDir, selection.id);
-  const patch = await parsePatch(await readPatchFile(path27__default.join(queueDir, PATCH_FILENAME)));
-  const meta3 = await readJsonFile2(path27__default.join(queueDir, PATCH_META_FILENAME));
+  const queueDir = path28__default.join(paths.queueDir, selection.id);
+  const patch = await parsePatch(await readPatchFile(path28__default.join(queueDir, PATCH_FILENAME)));
+  const meta3 = await readJsonFile2(path28__default.join(queueDir, PATCH_META_FILENAME));
   return { patch, meta: meta3 };
 }
 async function rewriteQueuedPatch(id, paths, patch, meta3, expectedPatchHash) {
   assertSafeQueueId(id);
   return withPatchEditLock(paths, id, async () => {
-    const queueDir = path27__default.join(paths.queueDir, id);
+    const queueDir = path28__default.join(paths.queueDir, id);
     if (expectedPatchHash !== void 0) {
-      const currentMarkdown = await readPatchFile(path27__default.join(queueDir, PATCH_FILENAME));
+      const currentMarkdown = await readPatchFile(path28__default.join(queueDir, PATCH_FILENAME));
       const currentHash = computeContentHash(currentMarkdown);
       if (currentHash !== expectedPatchHash) {
         throw new Error(`[fleet-wiki] wiki_patch_edit stale base_patch_hash: expected ${currentHash}, got ${expectedPatchHash}`);
@@ -37404,8 +37410,8 @@ async function rewriteQueuedPatch(id, paths, patch, meta3, expectedPatchHash) {
     const patchMarkdown = serializePatch(patch);
     const patchHash = computeContentHash(patchMarkdown);
     const nextMeta = { ...meta3, lastEditHash: patchHash };
-    await writePatchFile(path27__default.join(queueDir, PATCH_FILENAME), patchMarkdown, paths);
-    await writeJsonFile(path27__default.join(queueDir, PATCH_META_FILENAME), nextMeta, paths);
+    await writePatchFile(path28__default.join(queueDir, PATCH_FILENAME), patchMarkdown, paths);
+    await writeJsonFile(path28__default.join(queueDir, PATCH_META_FILENAME), nextMeta, paths);
     return patchHash;
   });
 }
@@ -37429,8 +37435,8 @@ async function approvePatch(id, paths) {
           rawSourceRef: meta3.rawSourceRef,
           warnings: meta3.warnings
         });
-        const queueDir = path27__default.join(paths.queueDir, id);
-        await writeJsonFile(path27__default.join(queueDir, PATCH_META_FILENAME), {
+        const queueDir = path28__default.join(paths.queueDir, id);
+        await writeJsonFile(path28__default.join(queueDir, PATCH_META_FILENAME), {
           ...meta3,
           conflictId
         }, paths);
@@ -37466,7 +37472,7 @@ async function approvePatchSet(patchSetId, paths) {
   const failed = [];
   const missing = [];
   for (const patchId of patchSet.patchIds) {
-    const queueDir = path27__default.join(paths.queueDir, patchId);
+    const queueDir = path28__default.join(paths.queueDir, patchId);
     if (!await pathExists(queueDir)) {
       missing.push(patchId);
       continue;
@@ -37532,7 +37538,7 @@ ${patch.body}`;
 }
 async function normalizeWikiEntryPatch(entry, target, paths) {
   assertSafeEntryId(entry.id);
-  if (entry.id !== path27__default.basename(target, ".md")) {
+  if (entry.id !== path28__default.basename(target, ".md")) {
     throw new Error("wiki patch body id must match target filename");
   }
   const inlineRawSourceRef = extractInlineRawSourceRef(entry.body);
@@ -37575,9 +37581,9 @@ function buildPatchId(createdAt, summary, target, body) {
 }
 async function validatePatchBase(patch, meta3, paths) {
   if (patch.frontmatter.op !== "update_wiki" || !meta3?.baseVersion && !meta3?.baseHash) return;
-  const wikiId = path27__default.basename(patch.frontmatter.target, ".md");
+  const wikiId = path28__default.basename(patch.frontmatter.target, ".md");
   const currentEntry = await readWikiEntry(wikiId, paths);
-  const currentPath = path27__default.join(paths.root, patch.frontmatter.target);
+  const currentPath = path28__default.join(paths.root, patch.frontmatter.target);
   const currentMarkdown = await pathExists(currentPath) ? await readPatchFile(currentPath) : void 0;
   if (meta3.baseVersion !== void 0 && currentEntry?.version !== meta3.baseVersion) {
     throw new Error(
@@ -37636,17 +37642,17 @@ function assertCanonicalPatchTarget(target) {
   if (target.endsWith("/")) {
     throw new Error("patch target must not end with a slash");
   }
-  if (target.startsWith("/") || path27__default.posix.isAbsolute(target) || path27__default.win32.isAbsolute(target)) {
+  if (target.startsWith("/") || path28__default.posix.isAbsolute(target) || path28__default.win32.isAbsolute(target)) {
     throw new Error("patch target must be relative");
   }
-  if (path27__default.posix.normalize(target) !== target) {
+  if (path28__default.posix.normalize(target) !== target) {
     throw new Error("patch target must not contain dot segments or redundant separators");
   }
 }
 function canonicalApprovalLockKey(paths, target) {
   const wikiRoot = realpathSync(paths.wikiDir);
-  const relativeTarget = path27__default.posix.relative("wiki", target);
-  const targetPath = path27__default.join(wikiRoot, ...relativeTarget.split("/"));
+  const relativeTarget = path28__default.posix.relative("wiki", target);
+  const targetPath = path28__default.join(wikiRoot, ...relativeTarget.split("/"));
   return `${wikiRoot}\0${targetPath}`.toLowerCase();
 }
 function canonicalPatchEditLockKey(paths, patchId) {
@@ -37662,7 +37668,7 @@ function assertNoSymlinkPathComponents(target, paths) {
     throw error51;
   }
   for (const part of parts) {
-    current = path27__default.join(current, part);
+    current = path28__default.join(current, part);
     try {
       if (lstatSync(current).isSymbolicLink()) {
         throw new Error("patch target must not include symlink path components");
@@ -37677,8 +37683,8 @@ function assertSafeRawSourceRef(rawSourceRef, paths) {
   if (!rawSourceRef.startsWith("raw/")) {
     throw new Error("raw source provenance must point into raw/");
   }
-  const absoluteRef = path27__default.resolve(paths.root, rawSourceRef);
-  if (!absoluteRef.startsWith(`${paths.rawDir}${path27__default.sep}`)) {
+  const absoluteRef = path28__default.resolve(paths.root, rawSourceRef);
+  if (!absoluteRef.startsWith(`${paths.rawDir}${path28__default.sep}`)) {
     throw new Error("raw source provenance must point into raw/");
   }
 }
@@ -37694,14 +37700,14 @@ function classifyPatchConflict(error51) {
 }
 async function recordPatchConflict(patch, paths, reason, options) {
   const now = /* @__PURE__ */ new Date();
-  const targetPath = path27__default.join(paths.root, patch.frontmatter.target);
+  const targetPath = path28__default.join(paths.root, patch.frontmatter.target);
   const current = await pathExists(targetPath) ? await readPatchFile(targetPath) : void 0;
   const currentEntry = current ? parseStoredWikiEntry(current) : void 0;
   const proposedEntry = parsePatchBodyEntry(patch.body);
   const record2 = await createConflict({
     reason,
     target: patch.frontmatter.target,
-    wikiId: proposedEntry?.id ?? path27__default.basename(patch.frontmatter.target, ".md"),
+    wikiId: proposedEntry?.id ?? path28__default.basename(patch.frontmatter.target, ".md"),
     title: proposedEntry?.title,
     proposer: patch.frontmatter.proposer,
     rawSourceRef: options?.rawSourceRef,
@@ -37797,11 +37803,11 @@ function parseInlineArray(value) {
   return inner.split(",").map((item) => item.trim().replace(/^"(.*)"$/, "$1"));
 }
 async function archiveQueueEntry(id, paths, meta3) {
-  const fromDir = path27__default.join(paths.queueDir, id);
-  const toDir = path27__default.join(paths.archiveDir, id);
+  const fromDir = path28__default.join(paths.queueDir, id);
+  const toDir = path28__default.join(paths.archiveDir, id);
   await removePath(toDir);
   await movePath(fromDir, toDir);
-  await writeJsonFile(path27__default.join(toDir, PATCH_META_FILENAME), meta3, paths);
+  await writeJsonFile(path28__default.join(toDir, PATCH_META_FILENAME), meta3, paths);
 }
 function buildQueueIdHelp(prefix, availableIds) {
   if (availableIds.length === 0) {
@@ -38013,7 +38019,7 @@ async function resolveCompileSource(input, paths, now) {
 }
 async function buildCompileProposals(input, paths, now, resolvedSource) {
   const sourceTarget = `wiki/sources/${resolvedSource.sourcePageId}.md`;
-  const sourceExists = await pathExists(path27__default.join(paths.root, sourceTarget));
+  const sourceExists = await pathExists(path28__default.join(paths.root, sourceTarget));
   const existingEntries = await listWiki(paths);
   const sourcePageTitle = resolvedSource.sourceTitle?.trim() || `Source ${resolvedSource.sourcePageId}`;
   const existingSourceEntry = existingEntries.find((entry) => entry.id === resolvedSource.sourcePageId);
@@ -38035,7 +38041,7 @@ async function buildCompileProposals(input, paths, now, resolvedSource) {
     target: sourceTarget,
     summary: truncateSummary(`Compile source page ${sourcePageTitle}`),
     entry: sourceEntry,
-    baseHash: sourceExists ? computeContentHash(await readPatchFile(path27__default.join(paths.root, sourceTarget))) : void 0,
+    baseHash: sourceExists ? computeContentHash(await readPatchFile(path28__default.join(paths.root, sourceTarget))) : void 0,
     baseVersion: existingSourceEntry?.version
   }];
   const relatedCandidates = await discoverRelatedEntryCandidates(paths, resolvedSource.sourceContent, resolvedSource.sourceTitle);
@@ -38055,7 +38061,7 @@ async function buildCompileProposals(input, paths, now, resolvedSource) {
         rawSourceRefs: mergeRawSourceRefs(existing.rawSourceRefs, existing.rawSourceRef, { ref: resolvedSource.rawSourceRef }),
         body: appendSourceCompileNote(existing.body, resolvedSource.sourcePageId, resolvedSource.rawSourceRef)
       },
-      baseHash: computeContentHash(await readPatchFile(path27__default.join(paths.wikiDir, `${existing.id}.md`))),
+      baseHash: computeContentHash(await readPatchFile(path28__default.join(paths.wikiDir, `${existing.id}.md`))),
       baseVersion: existing.version
     });
   }
@@ -38190,13 +38196,13 @@ async function readClaims(entryId, paths) {
   }
 }
 function getClaimsDir(paths) {
-  return path27__default.join(paths.wikiDir, CLAIMS_DIRNAME);
+  return path28__default.join(paths.wikiDir, CLAIMS_DIRNAME);
 }
 function getClaimsFile(paths, entryId) {
   assertSafeEntryId(entryId);
-  const claimsFile = path27__default.join(getClaimsDir(paths), `${entryId}.json`);
-  const relative = path27__default.relative(getClaimsDir(paths), claimsFile);
-  if (!relative || relative.startsWith("..") || path27__default.isAbsolute(relative)) {
+  const claimsFile = path28__default.join(getClaimsDir(paths), `${entryId}.json`);
+  const relative = path28__default.relative(getClaimsDir(paths), claimsFile);
+  if (!relative || relative.startsWith("..") || path28__default.isAbsolute(relative)) {
     throw new Error(`[fleet-wiki] claims sidecar escapes wiki/.claims: ${entryId}`);
   }
   return claimsFile;
@@ -38287,7 +38293,7 @@ function assertSafeClaimRawRef(ref) {
   if (!ref.startsWith("raw/")) {
     throw new Error(`claim sourceRef must point into raw/: ${ref}`);
   }
-  if (ref.includes("..") || path27__default.isAbsolute(ref)) {
+  if (ref.includes("..") || path28__default.isAbsolute(ref)) {
     throw new Error(`claim sourceRef escapes raw/: ${ref}`);
   }
 }
@@ -38365,22 +38371,22 @@ async function runDryDock(paths, options = {}) {
   }
   for (const fileName of await listFileNames(paths.rawDir)) {
     if (!fileName.endsWith(".md")) continue;
-    const filePath = path27__default.join(paths.rawDir, fileName);
+    const filePath = path28__default.join(paths.rawDir, fileName);
     issues.push(...safetyIssues(await readPatchFile(filePath), filePath));
   }
   for (const queueId of await listDirectoryNames(paths.queueDir)) {
     if (queueId === PATCH_SET_DIRNAME) continue;
-    const queueDir = path27__default.join(paths.queueDir, queueId);
+    const queueDir = path28__default.join(paths.queueDir, queueId);
     try {
-      const patchContent = await readPatchFile(path27__default.join(queueDir, PATCH_FILENAME));
-      issues.push(...safetyIssues(patchContent, path27__default.join(queueDir, PATCH_FILENAME)));
-      await readJsonFile2(path27__default.join(queueDir, PATCH_META_FILENAME));
+      const patchContent = await readPatchFile(path28__default.join(queueDir, PATCH_FILENAME));
+      issues.push(...safetyIssues(patchContent, path28__default.join(queueDir, PATCH_FILENAME)));
+      await readJsonFile2(path28__default.join(queueDir, PATCH_META_FILENAME));
     } catch {
       issues.push(issue2("malformed_queue", "error", "\uC190\uC0C1\uB41C queue \uC5D4\uD2B8\uB9AC", queueDir));
     }
   }
-  for (const patchSetId of await listDirectoryNames(path27__default.join(paths.queueDir, PATCH_SET_DIRNAME))) {
-    const patchSetMetaFile = path27__default.join(paths.queueDir, PATCH_SET_DIRNAME, patchSetId, PATCH_META_FILENAME);
+  for (const patchSetId of await listDirectoryNames(path28__default.join(paths.queueDir, PATCH_SET_DIRNAME))) {
+    const patchSetMetaFile = path28__default.join(paths.queueDir, PATCH_SET_DIRNAME, patchSetId, PATCH_META_FILENAME);
     let patchSet;
     try {
       patchSet = await readPatchSet(paths, patchSetId);
@@ -38389,8 +38395,8 @@ async function runDryDock(paths, options = {}) {
       continue;
     }
     for (const patchId of patchSet.patchIds) {
-      const queueMetaFile = path27__default.join(paths.queueDir, patchId, PATCH_META_FILENAME);
-      const archiveMetaFile = path27__default.join(paths.archiveDir, patchId, PATCH_META_FILENAME);
+      const queueMetaFile = path28__default.join(paths.queueDir, patchId, PATCH_META_FILENAME);
+      const archiveMetaFile = path28__default.join(paths.archiveDir, patchId, PATCH_META_FILENAME);
       if (!await pathExists(queueMetaFile) && !await pathExists(archiveMetaFile)) {
         issues.push(
           issue2(
@@ -38427,7 +38433,7 @@ async function runDryDock(paths, options = {}) {
         "conflict_unresolved",
         "warning",
         `\uBBF8\uD574\uACB0 conflict: ${conflict.reason} (${conflict.target})`,
-        path27__default.join(paths.conflictsDir, conflict.id, "meta.json")
+        path28__default.join(paths.conflictsDir, conflict.id, "meta.json")
       )
     );
   }
@@ -38440,7 +38446,7 @@ async function runDryDock(paths, options = {}) {
           "unresolved_conflict",
           "warning",
           "\uC190\uC0C1\uB41C conflict \uC5D4\uD2B8\uB9AC",
-          path27__default.join(paths.conflictsDir, conflictId, "meta.json")
+          path28__default.join(paths.conflictsDir, conflictId, "meta.json")
         )
       );
     }
@@ -38497,8 +38503,8 @@ async function claimIssues(paths, wikiIds) {
   const claimsDir = getClaimsDir(paths);
   for (const fileName of await listFileNames(claimsDir)) {
     if (!fileName.endsWith(".json")) continue;
-    const filePath = path27__default.join(claimsDir, fileName);
-    const entryIdFromFile = path27__default.basename(fileName, ".json");
+    const filePath = path28__default.join(claimsDir, fileName);
+    const entryIdFromFile = path28__default.basename(fileName, ".json");
     let raw;
     try {
       raw = await readJsonFile2(filePath);
@@ -38577,7 +38583,7 @@ function toSemanticEntry(filePath, frontmatter, body) {
 async function schemaIssues(paths) {
   const issues = [];
   const schema = await readWorkspaceSchemaSummary(paths);
-  const agentsPath = path27__default.join(paths.schemaDir, WORKSPACE_SCHEMA_AGENTS_FILENAME);
+  const agentsPath = path28__default.join(paths.schemaDir, WORKSPACE_SCHEMA_AGENTS_FILENAME);
   if (!await pathExists(schema.wikiSchemaPath)) {
     issues.push(issue2("schema_missing", "warning", `Workspace schema file is missing: schema/${WORKSPACE_SCHEMA_FILENAME}`, schema.wikiSchemaPath));
   } else {
@@ -38964,7 +38970,7 @@ async function listWikiMarkdownFiles(dirPath) {
   const files = [];
   const sortedEntries = entries.sort((left, right) => left.name.localeCompare(right.name));
   for (const entry of sortedEntries) {
-    const filePath = path27__default.join(dirPath, entry.name);
+    const filePath = path28__default.join(dirPath, entry.name);
     if (entry.isDirectory()) {
       files.push(...await listWikiMarkdownFiles(filePath));
       continue;
@@ -39048,7 +39054,7 @@ async function planIngest(input, paths, now) {
   const target = `wiki/${input.id}.md`;
   const proposer = input.proposer ?? "tool:wiki_ingest";
   const currentEntry = await readWikiEntry(input.id, paths);
-  const currentMarkdown = currentEntry ? await readPatchFile(path27__default.join(paths.wikiDir, `${input.id}.md`)) : void 0;
+  const currentMarkdown = currentEntry ? await readPatchFile(path28__default.join(paths.wikiDir, `${input.id}.md`)) : void 0;
   const currentHash = currentMarkdown ? computeContentHash(currentMarkdown) : void 0;
   const rawSource = buildRawSourceEntry(input, now);
   await ensureWorkspaceSchema(paths);
@@ -39727,11 +39733,11 @@ async function editQueuedPatch(input, paths) {
   };
 }
 async function readQueuedPatchSnapshot(paths, patchId) {
-  const queueDir = path27__default.join(paths.queueDir, patchId);
-  const markdown = await readPatchFile(path27__default.join(queueDir, PATCH_FILENAME));
+  const queueDir = path28__default.join(paths.queueDir, patchId);
+  const markdown = await readPatchFile(path28__default.join(queueDir, PATCH_FILENAME));
   return {
     patch: await parsePatch(markdown),
-    meta: await readJsonFile2(path27__default.join(queueDir, PATCH_META_FILENAME)),
+    meta: await readJsonFile2(path28__default.join(queueDir, PATCH_META_FILENAME)),
     patchHash: computeContentHash(markdown)
   };
 }
@@ -40493,7 +40499,7 @@ ${input.answer ?? ""}`)}`;
   assertSafeEntryId(targetId);
   const subdir = input.targetType === "synthesis" ? "synthesis" : "queries";
   const target = `wiki/${subdir}/${targetId}.md`;
-  const absoluteTarget = path27__default.join(paths.root, target);
+  const absoluteTarget = path28__default.join(paths.root, target);
   const exists = await pathExists(absoluteTarget);
   const existingEntry = exists ? await readWikiEntry(targetId, paths) : null;
   if (exists && !existingEntry) {
@@ -40575,7 +40581,7 @@ function assertSafeRawRef(rawRef) {
   if (!rawRef.startsWith("raw/")) {
     throw new Error(`[fleet-wiki] wiki_query raw source ref must point into raw/: ${rawRef}`);
   }
-  if (rawRef.includes("..") || path27__default.isAbsolute(rawRef)) {
+  if (rawRef.includes("..") || path28__default.isAbsolute(rawRef)) {
     throw new Error(`[fleet-wiki] wiki_query raw source ref escapes raw/: ${rawRef}`);
   }
 }
@@ -40694,7 +40700,7 @@ async function buildReadEntryResult(entry, paths, graph, input) {
     rawSourceRef: entry.rawSourceRef,
     rawSourceRefs,
     source: {
-      path: path27__default.join("wiki", `${entry.id}.md`),
+      path: path28__default.join("wiki", `${entry.id}.md`),
       rawSourceRef: entry.rawSourceRef,
       rawSourceRefs
     },
@@ -40820,7 +40826,7 @@ function buildRelatedEntries(entry, graph) {
     deduped.set(candidate.id, {
       id: relatedEntry.id,
       title: relatedEntry.title,
-      path: path27__default.join("wiki", `${relatedEntry.id}.md`),
+      path: path28__default.join("wiki", `${relatedEntry.id}.md`),
       reason: candidate.reason
     });
   }
@@ -41120,9 +41126,58 @@ function createPluginTerminalTicketRegistry(deps = {}) {
   }
   return { ttlMs, issue: issue3, consume, prune };
 }
+var FLEET_CONSOLE_PACKAGE_NAME = "@dotobokuri/fleet-console";
+function resolveConsolePackageRequire(currentFile, fallback) {
+  return findConsolePackageRequire(currentFile) ?? fallback;
+}
+function findConsolePackageRequire(currentFile) {
+  const explicitRoot = process.env.FLEET_CONSOLE_PACKAGE_ROOT;
+  if (explicitRoot) {
+    const explicitPackageJson = path28__default.join(explicitRoot, "package.json");
+    if (isFleetConsolePackage(explicitPackageJson)) return createRequire(explicitPackageJson);
+  }
+  let dir = path28__default.dirname(currentFile);
+  while (true) {
+    const packageJson = path28__default.join(dir, "package.json");
+    if (isFleetConsolePackage(packageJson)) return createRequire(packageJson);
+    const nestedConsolePackage = path28__default.join(dir, "runtime", "fleet-console", "package.json");
+    if (isFleetConsolePackage(nestedConsolePackage)) return createRequire(nestedConsolePackage);
+    const siblingConsolePackage = path28__default.join(dir, "..", "..", "fleet-console", "package.json");
+    if (isFleetConsolePackage(siblingConsolePackage)) return createRequire(siblingConsolePackage);
+    const parent = path28__default.dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+function isFleetConsolePackage(packageJson) {
+  if (!existsSync(packageJson)) return false;
+  try {
+    const manifest = JSON.parse(readFileSync(packageJson, "utf8"));
+    return manifest.name === FLEET_CONSOLE_PACKAGE_NAME;
+  } catch {
+    return false;
+  }
+}
+
+// ../fleet-plugins/terminal/server/shared/launch-env.ts
+var CONSOLE_INTERNAL_ENV_KEYS = [
+  "FLEET_CONSOLE_OWNER_ID",
+  "FLEET_CONSOLE_OWNER_KIND",
+  "FLEET_CONSOLE_PROTOCOL_VERSION",
+  "FLEET_CONSOLE_RESOURCE_ROOT",
+  "FLEET_CONSOLE_DESKTOP_DEVELOPMENT",
+  "FLEET_CONSOLE_DESKTOP_VERSION",
+  "FLEET_CONSOLE_PACKAGE_ROOT"
+];
+function stripConsoleInternalEnv(env) {
+  const next = { ...env };
+  for (const key of CONSOLE_INTERNAL_ENV_KEYS) delete next[key];
+  return next;
+}
+
+// ../fleet-plugins/terminal/server/shared/pty.ts
 var DEFAULT_TERMINAL_CWD_FALLBACK = os3__default.homedir;
 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 ?? process5.cwd();
@@ -41158,31 +41213,7 @@ function loadNodePty() {
   return loadNodePtyRequire(fileURLToPath(import.meta.url))("node-pty");
 }
 function loadNodePtyRequire(currentFile) {
-  const consolePackageRequire = findConsolePackageRequire(currentFile);
-  return consolePackageRequire ?? require2;
-}
-function findConsolePackageRequire(currentFile) {
-  let dir = path27__default.dirname(currentFile);
-  while (true) {
-    const packageJson = path27__default.join(dir, "package.json");
-    if (isFleetConsolePackage(packageJson)) return createRequire(packageJson);
-    const nestedConsolePackage = path27__default.join(dir, "runtime", "fleet-console", "package.json");
-    if (isFleetConsolePackage(nestedConsolePackage)) return createRequire(nestedConsolePackage);
-    const siblingConsolePackage = path27__default.join(dir, "..", "..", "fleet-console", "package.json");
-    if (isFleetConsolePackage(siblingConsolePackage)) return createRequire(siblingConsolePackage);
-    const parent = path27__default.dirname(dir);
-    if (parent === dir) return null;
-    dir = parent;
-  }
-}
-function isFleetConsolePackage(packageJson) {
-  if (!existsSync(packageJson)) return false;
-  try {
-    const manifest = JSON.parse(readFileSync(packageJson, "utf8"));
-    return manifest.name === FLEET_CONSOLE_PACKAGE_NAME;
-  } catch {
-    return false;
-  }
+  return resolveConsolePackageRequire(currentFile, require2);
 }
 function resolveUserShell(env, platform) {
   if (env.SHELL) return env.SHELL;
@@ -41201,7 +41232,7 @@ function resolveWindowsLaunchBinary(bin, args, env, platform, label) {
 }
 function buildShellLaunchEnv(env) {
   return {
-    ...env,
+    ...stripConsoleInternalEnv(env),
     TERM: TERMINAL_TERM
   };
 }
@@ -41542,7 +41573,7 @@ function isResizeFrame(value) {
   const rows = frame.rows;
   return frame.type === "resize" && typeof cols === "number" && typeof rows === "number" && Number.isInteger(cols) && Number.isInteger(rows) && cols > 0 && rows > 0;
 }
-var require3 = createRequire(import.meta.url);
+var require3 = resolveConsolePackageRequire(fileURLToPath(import.meta.url), createRequire(import.meta.url));
 function createPluginTerminalUpgradeHandler(deps) {
   let wsServer = null;
   const handleUpgrade = ({ req, socket, head }) => {
@@ -41955,7 +41986,7 @@ function captureSession(options) {
 function readProviderSessionCapture(fleetSessionId, deps = {}) {
   if (!isSafeCaptureId(fleetSessionId)) return null;
   const capturesDir = deps.capturesDir ?? defaultCapturePaths().capturesDir;
-  const filePath = path27__default.join(capturesDir, `${fleetSessionId}.json`);
+  const filePath = path28__default.join(capturesDir, `${fleetSessionId}.json`);
   try {
     const parsed = JSON.parse(fs2__default.readFileSync(filePath, "utf8"));
     return sanitizeProviderSession(parsed);
@@ -41967,7 +41998,7 @@ function unlinkProviderSessionCapture(fleetSessionId, deps = {}) {
   if (!isSafeCaptureId(fleetSessionId)) return false;
   const capturesDir = deps.capturesDir ?? defaultCapturePaths().capturesDir;
   try {
-    fs2__default.unlinkSync(path27__default.join(capturesDir, `${fleetSessionId}.json`));
+    fs2__default.unlinkSync(path28__default.join(capturesDir, `${fleetSessionId}.json`));
     return true;
   } catch {
     return false;
@@ -41979,8 +42010,8 @@ function captureSessionStrict(options) {
   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}.${process5.pid}.${Date.now()}.tmp`);
+  const finalPath = path28__default.join(capturesDir, `${fleetSessionId}.json`);
+  const tempPath = path28__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 });
@@ -41994,7 +42025,7 @@ function parseProvider(value) {
 function readFleetSessionId(env) {
   const value = env.FLEET_CONSOLE_SESSION_ID;
   if (!value) throw new Error("missing_fleet_session_id");
-  if (path27__default.basename(value) !== value || value.includes(path27__default.sep) || value.includes(path27__default.posix.sep)) {
+  if (path28__default.basename(value) !== value || value.includes(path28__default.sep) || value.includes(path28__default.posix.sep)) {
     throw new Error("invalid_fleet_session_id");
   }
   return value;
@@ -42039,10 +42070,10 @@ 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);
+  return value.length > 0 && path28__default.basename(value) === value && !value.includes(path28__default.sep) && !value.includes(path28__default.posix.sep);
 }
 function defaultCapturePaths() {
-  return { capturesDir: path27__default.join(getFleetDataDir(), CONSOLE_DATA_DIR_NAME, CONSOLE_CAPTURES_DIR_NAME) };
+  return { capturesDir: path28__default.join(getFleetDataDir(), CONSOLE_DATA_DIR_NAME, CONSOLE_CAPTURES_DIR_NAME) };
 }
 var JAVASCRIPT_ENTRY_EXTENSIONS = /* @__PURE__ */ new Set([".cjs", ".js", ".mjs"]);
 var TYPESCRIPT_ENTRY_EXTENSIONS = /* @__PURE__ */ new Set([".cts", ".mts", ".ts", ".tsx"]);
@@ -42057,7 +42088,7 @@ function buildConsoleAutoNameHookCommand(entry) {
   return buildConsoleCliHookExec(entry, ["hook", "auto-name"]);
 }
 function buildConsoleCaptureHookCommand(entry, cliId) {
-  const extension = path27__default.extname(entry.entryPath);
+  const extension = path28__default.extname(entry.entryPath);
   if (JAVASCRIPT_ENTRY_EXTENSIONS.has(extension)) {
     return createSessionCaptureHookExec({
       entryPath: entry.entryPath,
@@ -42093,11 +42124,11 @@ function runCodexCommand(command) {
 }
 function withConsoleMarketplaceLock(target, fn) {
   const lockDir = `${target}${MARKETPLACE_LOCK_DIR_SUFFIX}`;
-  mkdirSync(path27__default.dirname(lockDir), { recursive: true });
+  mkdirSync(path28__default.dirname(lockDir), { recursive: true });
   return withDirectoryLock({ lockDir }, fn);
 }
 function buildConsoleCliHookExec(entry, trailingArgs) {
-  const extension = path27__default.extname(entry.entryPath);
+  const extension = path28__default.extname(entry.entryPath);
   if (JAVASCRIPT_ENTRY_EXTENSIONS.has(extension)) {
     return {
       command: entry.execPath,
@@ -42181,7 +42212,7 @@ function resolveHookEntryPath(candidate) {
   return CONSOLE_ENTRY_PATH;
 }
 function hasHookEntryExtension(entryPath) {
-  return HOOK_ENTRY_EXTENSIONS.has(path27__default.extname(entryPath));
+  return HOOK_ENTRY_EXTENSIONS.has(path28__default.extname(entryPath));
 }
 async function createAgentCliLaunchSpec(options) {
   const cleanupStack = [];
@@ -42275,7 +42306,7 @@ function parseTerminalCommand(command) {
 }
 function buildLaunchEnv(env, cwd, sessionId) {
   return {
-    ...env,
+    ...stripConsoleInternalEnv(env),
     ...sessionId ? { FLEET_CONSOLE_SESSION_ID: sessionId, INIT_CWD: cwd, PWD: cwd } : {},
     TERM: TERMINAL_TERM2
   };
@@ -42403,7 +42434,7 @@ function createConsoleObservabilityStore(deps = {}) {
     return terminalSessionsById.get(sessionId)?.cwd ?? workspacesByCliRunId.get(sessionId)?.session.cwd ?? null;
   }
   function createPendingTerminalSession(input) {
-    if (!path27__default.isAbsolute(input.cwd)) throw new Error("Terminal session cwd must be absolute");
+    if (!path28__default.isAbsolute(input.cwd)) throw new Error("Terminal session cwd must be absolute");
     const createdAt = input.createdAt ?? now();
     const canonicalCwd = canonicalizeTheaterPath(input.cwd);
     const theaterId = workspaceHash(canonicalCwd);
@@ -42411,7 +42442,7 @@ function createConsoleObservabilityStore(deps = {}) {
       sessionId: input.sessionId,
       cwd: input.cwd,
       canonicalCwd,
-      cwdLabel: path27__default.basename(input.cwd) || input.cwd,
+      cwdLabel: path28__default.basename(input.cwd) || input.cwd,
       cliId: input.cliId,
       createdAt,
       theaterId,
@@ -42426,7 +42457,7 @@ function createConsoleObservabilityStore(deps = {}) {
       sessionId: operation.sessionId,
       cwd: operation.cwd,
       canonicalCwd: canonicalizeTheaterPath(operation.cwd),
-      cwdLabel: path27__default.basename(operation.cwd) || operation.cwd,
+      cwdLabel: path28__default.basename(operation.cwd) || operation.cwd,
       label: operation.label,
       labelSource: operation.labelSource,
       cliId: operation.cliId,
@@ -42506,13 +42537,15 @@ function createConsoleObservabilityStore(deps = {}) {
     const session = terminalSessionsById.get(sessionId);
     if (!session) return null;
     const effectiveSource = session.labelSource ?? (session.label ? "user" : void 0);
-    if (effectiveSource === "user") {
+    if (effectiveSource === "user" || session.autoNamePromptSeen) {
       return { session: toTerminalSessionInfo(session), renamed: false };
     }
     const next = label?.trim().slice(0, 200) ?? "";
-    if (next.length === 0 || next === session.label) {
+    if (next.length === 0) {
       return { session: toTerminalSessionInfo(session), renamed: false };
     }
+    session.autoNamePromptSeen = true;
+    if (next === session.label) return { session: toTerminalSessionInfo(session), renamed: false };
     session.label = next;
     session.labelSource = "auto";
     return { session: toTerminalSessionInfo(session), renamed: true };
@@ -42653,7 +42686,7 @@ function defaultWorkspaceHash(canonicalCwd) {
   return crypto4.createHash("sha256").update(canonicalCwd).digest("hex").slice(0, 12);
 }
 function defaultCanonicalizeTheaterPath(cwd) {
-  const resolved = path27__default.resolve(cwd);
+  const resolved = path28__default.resolve(cwd);
   try {
     return fs2__default.realpathSync.native(resolved);
   } catch {
@@ -42893,6 +42926,7 @@ function buildAgentLaunchKindBackfillPatch(operation) {
 }
 function createAgentApi(ctx, terminalRuntime, deps) {
   const runtime = createFleetAgentRuntimeLifecycle({
+    globalOptionsService: deps.globalOptionsService,
     onMcpServerStartError: (error51) => {
       console.error("[fleet-console] Failed to start MCP server", error51);
     },
@@ -42947,23 +42981,23 @@ function createAgentApi(ctx, terminalRuntime, deps) {
   backfillAgentOperationLaunchKinds();
   rehydrateDormantAgentOperations();
   async function handle({ req, res, pathname }) {
-    const path42 = pathname.slice(`${ctx.basePath}/agent`.length) || "/";
-    if (path42 === "/state") {
+    const path43 = pathname.slice(`${ctx.basePath}/agent`.length) || "/";
+    if (path43 === "/state") {
       if (req.method !== "GET") return methodNotAllowed(res);
       ctx.host.http.writeJson(res, 200, { agentClis: await buildAgentCliLaunchMetadata() });
       return true;
     }
-    if (path42 === "/agent-cli/state") {
+    if (path43 === "/agent-cli/state") {
       if (req.method !== "GET") return methodNotAllowed(res);
       ctx.host.http.writeJson(res, 200, { clis: await detector.detect() });
       return true;
     }
-    if (path42 === "/tenants") {
+    if (path43 === "/tenants") {
       if (req.method !== "GET") return methodNotAllowed(res);
       ctx.host.http.writeJson(res, 200, { tenants: observability.listWorkspaces() });
       return true;
     }
-    if (path42 === "/jobs") {
+    if (path43 === "/jobs") {
       if (req.method !== "GET") return methodNotAllowed(res);
       const requestedTenantId = new URL(req.url ?? "/", "http://127.0.0.1").searchParams.get("tenant");
       const visible = requestedTenantId ? observability.listWorkspaces().filter((workspace) => workspace.tenantId === requestedTenantId) : observability.listWorkspaces();
@@ -42974,7 +43008,7 @@ function createAgentApi(ctx, terminalRuntime, deps) {
       ctx.host.http.writeJson(res, 200, { tenants: visible.map((workspace) => ({ tenantId: workspace.tenantId, tenantLabel: workspace.tenantLabel, jobs: observability.listJobs(workspace.tenantId), truncation: observability.getTruncation(workspace.tenantId) })) });
       return true;
     }
-    if (path42 === "/events") {
+    if (path43 === "/events") {
       if (req.method !== "GET") return methodNotAllowed(res);
       const requestedTenantId = new URL(req.url ?? "/", "http://127.0.0.1").searchParams.get("tenant");
       const visible = requestedTenantId ? observability.listWorkspaces().filter((workspace) => workspace.tenantId === requestedTenantId) : observability.listWorkspaces();
@@ -42985,11 +43019,11 @@ function createAgentApi(ctx, terminalRuntime, deps) {
       writeAggregateObserverEvents(req, res, visible, observability, (tenantId) => observability.getWorkspace(tenantId), { subscribeAll: true });
       return true;
     }
-    if (path42 === "/sessions") return handleSessions(req, res);
-    if (path42 === "/capture") return handleCapture(req, res, "");
-    const sessionMatch = path42.match(/^\/sessions\/([^/]+)(?:\/([^/]+))?$/);
+    if (path43 === "/sessions") return handleSessions(req, res);
+    if (path43 === "/capture") return handleCapture(req, res, "");
+    const sessionMatch = path43.match(/^\/sessions\/([^/]+)(?:\/([^/]+))?$/);
     if (sessionMatch) return handleSessionItem(req, res, decodeURIComponent(sessionMatch[1] ?? ""), sessionMatch[2] ?? "");
-    if (path42 === "/ticket") {
+    if (path43 === "/ticket") {
       if (req.method !== "POST") return methodNotAllowed(res);
       if (!ctx.host.security.isTerminalAuthorized(req)) {
         ctx.host.http.writeJson(res, 401, { error: "Unauthorized" });
@@ -43083,7 +43117,7 @@ function createAgentApi(ctx, terminalRuntime, deps) {
       theaterId,
       type: AGENT_OPERATION_TYPE,
       pluginId: ctx.pluginId,
-      title: session.label ?? path27__default.basename(cwd),
+      title: session.label ?? path28__default.basename(cwd),
       payload: toOperationPayload(cwd, session),
       createdAt: session.createdAt
     });
@@ -43194,7 +43228,7 @@ function createAgentApi(ctx, terminalRuntime, deps) {
     if (result?.renamed) {
       observability.notifySessionUpdated(result.session);
       const autoNameCwd = readPayloadString(ctx.host.operations.get(sessionId)?.payload ?? {}, "cwd") ?? result.session.cwdLabel;
-      ctx.host.operations.patch(sessionId, { title: result.session.label ?? path27__default.basename(autoNameCwd) });
+      ctx.host.operations.patch(sessionId, { title: result.session.label ?? path28__default.basename(autoNameCwd) });
     }
     ctx.host.http.writeJson(res, 200, { ok: true, renamed: result?.renamed === true });
     return true;
@@ -43477,7 +43511,7 @@ function registerTerminalSettingsRoutes(ctx, deps) {
       }
       const updated = deps.globalOptionsService.update((current) => ({
         ...current,
-        enableMetaphor: body.enableMetaphor
+        ...body
       }));
       ctx.host.http.writeJson(res, 200, toTerminalSettingsState(updated));
       return true;
@@ -43488,14 +43522,17 @@ function registerTerminalSettingsRoutes(ctx, deps) {
 }
 function toTerminalSettingsState(data) {
   return {
-    enableMetaphor: data.enableMetaphor ?? false
+    enableMetaphor: data.enableMetaphor ?? false,
+    codexLaunchMode: data.codexLaunchMode ?? "acp"
   };
 }
 function isTerminalSettingsBody(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return false;
-  if (Object.keys(value).length !== 1) return false;
+  const keys = Object.keys(value);
+  if (keys.length !== 1) return false;
   const body = value;
-  return typeof body.enableMetaphor === "boolean";
+  if (keys[0] === "enableMetaphor") return typeof body.enableMetaphor === "boolean";
+  return keys[0] === "codexLaunchMode" && (body.codexLaunchMode === "acp" || body.codexLaunchMode === "app-server");
 }
 function isJsonRequest(req) {
   const contentType = req.headers["content-type"];