@dotobokuri/fleet-console 1.17.1 → 1.18.0

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

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import * as fs8 from 'fs';
-import fs8__default, { existsSync, mkdtempSync, writeFileSync, mkdirSync, rmSync, chmodSync, renameSync, readdirSync, readFileSync, constants, openSync, closeSync, realpathSync, fstatSync, lstatSync, unlinkSync, statSync } from 'fs';
+import fs8__default, { mkdtempSync, writeFileSync, mkdirSync, existsSync, rmSync, chmodSync, renameSync, readdirSync, readFileSync, constants, openSync, closeSync, realpathSync, fstatSync, lstatSync, unlinkSync, statSync } from 'fs';
 import * as path27 from 'path';
 import path27__default, { dirname } from 'path';
 import * as os3 from 'os';
 import os3__default from 'os';
+import crypto3, { createHash, randomUUID } from 'crypto';
+import process4 from 'process';
 import { EventEmitter } from 'events';
 import { mkdir, writeFile, access, readFile, stat, readdir, appendFile, rename, rm } from 'fs/promises';
 import { execFile, execSync, spawn, spawnSync } from 'child_process';
 import { Writable, Readable } from 'stream';
-import crypto3, { createHash, randomUUID } from 'crypto';
-import process4 from 'process';
 import http from 'http';
 import { fileURLToPath, pathToFileURL } from 'url';
 import { createRequire } from 'module';
@@ -556,6 +556,43 @@ function updateGlobalOptions(store2, mutate) {
   return store2.update(mutate);
 }
 
+// ../../packages/fleet-infra/src/index.ts
+function createInfraServices(deps = {}) {
+  const globalOptionsService = createGlobalOptionsService();
+  const authService = createAuthService({ authPath: deps.authPath ?? DEFAULT_AUTH_PATH });
+  return {
+    authService,
+    globalOptionsService
+  };
+}
+
+// ../../packages/fleet-carriers/src/dispatch/framework.ts
+var framework_exports = {};
+__export(framework_exports, {
+  CarrierRegistry: () => CarrierRegistry,
+  clearRegisteredCarriers: () => clearRegisteredCarriers,
+  createCarrierRegistry: () => createCarrierRegistry,
+  emitStreamEvent: () => emitStreamEvent,
+  getAllCliTypes: () => getAllCliTypes,
+  getCarrierConfig: () => getCarrierConfig,
+  getCarrierSourceDisplayName: () => getCarrierSourceDisplayName,
+  getRegisteredCarrierConfig: () => getRegisteredCarrierConfig,
+  getRegisteredOrder: () => getRegisteredOrder,
+  normalizeEffort: () => normalizeEffort,
+  notifyStatusUpdate: () => notifyStatusUpdate,
+  registerCarrier: () => registerCarrier,
+  registerStreamHandler: () => registerStreamHandler,
+  resetCarrierRegistryForTests: () => resetCarrierRegistryForTests,
+  resolveAgentCliType: () => resolveAgentCliType2,
+  resolveCarrierDisplayName: () => resolveCarrierDisplayName,
+  resolveValidatedEffort: () => resolveValidatedEffort,
+  setTaskForceConfiguredCarriers: () => setTaskForceConfiguredCarriers,
+  toCarrierJobStatus: () => toCarrierJobStatus,
+  toTrackFinalStatus: () => toTrackFinalStatus,
+  unregisterStreamHandler: () => unregisterStreamHandler,
+  updateCarrierCliType: () => updateCarrierCliType
+});
+
 // ../../node_modules/.pnpm/zod@4.4.1/node_modules/zod/v4/classic/external.js
 var external_exports = {};
 __export(external_exports, {
@@ -17941,7 +17978,7 @@ var AcpConnection = class extends BaseConnection {
   }
   /** Claude 계열 브릿지인지 여부를 단일 판별 지점으로 유지합니다. */
   isClaudeBackend() {
-    return this.cliType === "claude" || this.cliType === "claude-zai" || this.cliType === "claude-kimi" || this.cliType === "claude-glm";
+    return this.cliType === "claude";
   }
   /** Claude bridge만 native system prompt append를 지원하므로 이 경로만 사용합니다. */
   getClaudeSystemPrompt(systemPrompt) {
@@ -18439,7 +18476,7 @@ function inferBinName(packageName) {
 // ../../packages/core-unified-agent/models.json
 var models_default = {
   version: 1,
-  updatedAt: "2026-06-16T00:00:00Z",
+  updatedAt: "2026-07-04T00:00:00Z",
   providers: {
     claude: {
       name: "Claude Code with Anthropic",
@@ -18454,48 +18491,6 @@ var models_default = {
         { modelId: "claude-opus-4-8[1m]", name: "Claude Opus 4.8 [1M]", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "high" } }
       ]
     },
-    "claude-zai": {
-      name: "Claude Code with Z.AI GLM",
-      defaultModel: "opus",
-      models: [
-        { modelId: "haiku", name: "GLM-4.5 Air (Haiku slot)", effort: { supported: false } },
-        { modelId: "sonnet", name: "GLM-5 Turbo (Sonnet slot)", effort: { supported: false } },
-        { modelId: "opus", name: "GLM-5.1 (Opus slot)", effort: { supported: false } }
-      ],
-      modelsMapping: {
-        haiku: "glm-4.5-air",
-        sonnet: "glm-5-turbo",
-        opus: "glm-5.1"
-      }
-    },
-    "claude-kimi": {
-      name: "Claude Code with Moonshot Kimi",
-      defaultModel: "opus",
-      models: [
-        { modelId: "haiku", name: "Kimi K2.7 Code (Haiku slot)", effort: { supported: false } },
-        { modelId: "sonnet", name: "Kimi K2.7 Code (Sonnet slot)", effort: { supported: false } },
-        { modelId: "opus", name: "Kimi K2.7 Code (Opus slot)", effort: { supported: false } }
-      ],
-      modelsMapping: {
-        haiku: "kimi-k2.7-code",
-        sonnet: "kimi-k2.7-code",
-        opus: "kimi-k2.7-code"
-      }
-    },
-    "claude-glm": {
-      name: "Claude Code with ZhipuAI GLM",
-      defaultModel: "opus",
-      models: [
-        { modelId: "haiku", name: "GLM-4.5-Air (Haiku slot)", effort: { supported: false } },
-        { modelId: "sonnet", name: "GLM-4.7 (Sonnet slot)", effort: { supported: false } },
-        { modelId: "opus", name: "GLM-5.1 (Opus slot)", effort: { supported: false } }
-      ],
-      modelsMapping: {
-        haiku: "glm-4.5-air",
-        sonnet: "glm-4.7",
-        opus: "glm-5.1"
-      }
-    },
     codex: {
       name: "OpenAI Codex CLI",
       defaultModel: "gpt-5.4",
@@ -18513,7 +18508,9 @@ var models_default = {
         { modelId: "opencode-go/deepseek-v4-pro", name: "DeepSeek V4 Pro", effort: { supported: false } },
         { modelId: "opencode-go/glm-5", name: "GLM-5", effort: { supported: false } },
         { modelId: "opencode-go/glm-5.1", name: "GLM-5.1", effort: { supported: false } },
-        { modelId: "opencode-go/kimi-k2.6", name: "Kimi K2.6 (3x limits)", effort: { supported: false } }
+        { modelId: "opencode-go/glm-5.2", name: "GLM-5.2", effort: { supported: false } },
+        { modelId: "opencode-go/kimi-k2.6", name: "Kimi K2.6 (3x limits)", effort: { supported: false } },
+        { modelId: "opencode-go/kimi-k2.7-code", name: "Kimi K2.7 Code", effort: { supported: false } }
       ]
     },
     cursor: {
@@ -18526,9 +18523,9 @@ var models_default = {
         { modelId: "gemini-3.1-pro", name: "Gemini 3.1 Pro", effort: { supported: false } },
         { modelId: "gemini-3-flash", name: "Gemini 3 Flash", effort: { supported: false } },
         { modelId: "gemini-3.5-flash", name: "Gemini 3.5 Flash", effort: { supported: false } },
-        { modelId: "claude-opus-4-7-thinking", name: "Claude Opus 4.7 Thinking", spawnModelTemplate: "claude-opus-4-7-thinking-{effort}", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "xhigh" } },
-        { modelId: "claude-opus-4-8-thinking", name: "Claude Opus 4.8 Thinking", spawnModelTemplate: "claude-opus-4-8-thinking-{effort}", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "xhigh" } },
-        { modelId: "claude-4.6-sonnet-medium-thinking", name: "Claude Sonnet 4.6 Medium Thinking", effort: { supported: false } }
+        { modelId: "kimi-k2.7-code", name: "Kimi K2.7 Code", effort: { supported: false } },
+        { modelId: "glm-5.2", name: "GLM 5.2", spawnModelTemplate: "glm-5.2-{effort}", effort: { supported: true, levels: ["high", "max"], default: "max" } },
+        { modelId: "claude-opus-4-8-thinking", name: "Claude Opus 4.8 Thinking", spawnModelTemplate: "claude-opus-4-8-thinking-{effort}", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "xhigh" } }
       ]
     }
   }
@@ -18699,77 +18696,6 @@ var CLI_BACKENDS = {
     usesNpxBridge: true,
     defaultMaxTokens: 16384
   },
-  "claude-zai": {
-    id: "claude-zai",
-    cliCommand: "claude",
-    protocol: "acp",
-    authRequired: true,
-    npxPackage: "@agentclientprotocol/claude-agent-acp@0.33.1",
-    modes: [
-      { id: "default", label: "Default" },
-      { id: "plan", label: "Plan" },
-      { id: "bypassPermissions", label: "YOLO" }
-    ],
-    supportsSessionClose: true,
-    supportsSessionLoad: true,
-    requiresModelAtSpawn: false,
-    usesNpxBridge: true,
-    defaultMaxTokens: 16384,
-    defaultEnv: {
-      ANTHROPIC_BASE_URL: "https://api.z.ai/api/anthropic",
-      API_TIMEOUT_MS: "3000000"
-    }
-  },
-  "claude-kimi": {
-    id: "claude-kimi",
-    cliCommand: "claude",
-    protocol: "acp",
-    authRequired: true,
-    npxPackage: "@agentclientprotocol/claude-agent-acp@0.33.1",
-    modes: [
-      { id: "default", label: "Default" },
-      { id: "plan", label: "Plan" },
-      { id: "bypassPermissions", label: "YOLO" }
-    ],
-    supportsSessionClose: true,
-    supportsSessionLoad: true,
-    requiresModelAtSpawn: false,
-    usesNpxBridge: true,
-    defaultMaxTokens: 16384,
-    defaultEnv: {
-      ANTHROPIC_BASE_URL: "https://api.kimi.com/coding/",
-      ENABLE_TOOL_SEARCH: "false",
-      ANTHROPIC_MODEL: "kimi-k2.7-code",
-      CLAUDE_CODE_SUBAGENT_MODEL: "kimi-k2.7-code",
-      API_TIMEOUT_MS: "3000000"
-    }
-  },
-  "claude-glm": {
-    id: "claude-glm",
-    cliCommand: "claude",
-    protocol: "acp",
-    authRequired: true,
-    npxPackage: "@agentclientprotocol/claude-agent-acp@0.33.1",
-    modes: [
-      { id: "default", label: "Default" },
-      { id: "plan", label: "Plan" },
-      { id: "bypassPermissions", label: "YOLO" }
-    ],
-    supportsSessionClose: true,
-    supportsSessionLoad: true,
-    requiresModelAtSpawn: false,
-    usesNpxBridge: true,
-    defaultMaxTokens: 16384,
-    defaultEnv: {
-      ANTHROPIC_BASE_URL: "https://open.bigmodel.cn/api/anthropic",
-      // ZhipuAI Claude Code 권장 슬롯 매핑 — 직접 launch(Native PTY) 경로에서도
-      // haiku/sonnet/opus 별칭이 GLM 모델로 해석되도록 env로 고정한다.
-      ANTHROPIC_DEFAULT_HAIKU_MODEL: "glm-4.5-air",
-      ANTHROPIC_DEFAULT_SONNET_MODEL: "glm-4.7",
-      ANTHROPIC_DEFAULT_OPUS_MODEL: "glm-5.1",
-      API_TIMEOUT_MS: "3000000"
-    }
-  },
   codex: {
     id: "codex",
     cliCommand: "codex",
@@ -18864,9 +18790,6 @@ function getBackendConfig(cli) {
 function getYoloModeId(cli) {
   switch (cli) {
     case "claude":
-    case "claude-zai":
-    case "claude-kimi":
-    case "claude-glm":
       return "bypassPermissions";
     case "opencode-go":
       return "build";
@@ -21768,9 +21691,6 @@ var UnifiedAgent = {
   createClient(cli) {
     switch (cli) {
       case "claude":
-      case "claude-zai":
-      case "claude-kimi":
-      case "claude-glm":
         return new UnifiedClaudeAgentClient(cli);
       case "codex":
         return new UnifiedCodexAgentClient();
@@ -21790,7 +21710,7 @@ var UnifiedAgent = {
     const preferred = await new CliDetector().getPreferred();
     if (!preferred) {
       throw new Error(
-        "\uC0AC\uC6A9 \uAC00\uB2A5\uD55C CLI\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. claude, claude-zai, claude-kimi, claude-glm, codex, opencode-go, cursor \uC911 \uD558\uB098\uB97C \uC124\uCE58\uD574\uC8FC\uC138\uC694."
+        "\uC0AC\uC6A9 \uAC00\uB2A5\uD55C CLI\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. claude, codex, opencode-go, cursor \uC911 \uD558\uB098\uB97C \uC124\uCE58\uD574\uC8FC\uC138\uC694."
       );
     }
     return this.createClient(preferred.cli);
@@ -21805,211 +21725,6 @@ var UnifiedAgent = {
   }
 };
 
-// ../../packages/fleet-infra/src/auth/messages.ts
-function formatMissingAuthKeyMessage(input) {
-  const cliHint = input.cli ? `cli '${input.cli}'` : "selected CLI";
-  return `Auth token not found for ${cliHint} (providerId: '${input.providerId}'). Run \`fleet auth login\` to register one.`;
-}
-function formatAuthValidationFailureMessage(input) {
-  const detail = input.detail ? ` Detail: ${input.detail}` : "";
-  if (input.status === "unauthorized") {
-    return `Auth token was rejected (providerId: '${input.providerId}'). Check the token and try again.${detail}`;
-  }
-  if (input.status === "forbidden") {
-    return `Auth token is not allowed for this provider (providerId: '${input.providerId}'). Check the token permissions.${detail}`;
-  }
-  if (input.status === "timeout") {
-    return `Auth token validation timed out (providerId: '${input.providerId}'). Check the connection and try again.${detail}`;
-  }
-  if (input.status === "network") {
-    return `Auth token validation failed due to a network error (providerId: '${input.providerId}'). Check the connection and try again.${detail}`;
-  }
-  if (input.status === "server") {
-    return `Auth token validation failed because the provider returned an error (providerId: '${input.providerId}'). Try again later.${detail}`;
-  }
-  return `Auth token validation failed (providerId: '${input.providerId}'). Check the token and try again.${detail}`;
-}
-
-// ../../packages/fleet-infra/src/auth/validation.ts
-var DEFAULT_AUTH_VALIDATION_TIMEOUT_MS = 5e3;
-async function validateAnthropicCompatibleApiKey(request) {
-  const controller = new AbortController();
-  const timeout = setTimeout(() => {
-    controller.abort();
-  }, request.timeoutMs ?? DEFAULT_AUTH_VALIDATION_TIMEOUT_MS);
-  try {
-    const response = await fetch(buildMessagesUrl(request.baseUrl), {
-      method: "POST",
-      headers: {
-        "anthropic-version": "2023-06-01",
-        "content-type": "application/json",
-        "x-api-key": request.apiKey
-      },
-      body: JSON.stringify({
-        model: "claude-3-5-haiku-20241022",
-        max_tokens: 1,
-        messages: [
-          {
-            role: "user",
-            content: "ping"
-          }
-        ]
-      }),
-      signal: controller.signal
-    });
-    if (response.ok) {
-      return { providerId: request.providerId, status: "success" };
-    }
-    if (response.status === 401) {
-      return { providerId: request.providerId, status: "unauthorized" };
-    }
-    if (response.status === 403) {
-      return { providerId: request.providerId, status: "forbidden" };
-    }
-    if (response.status >= 500) {
-      return {
-        providerId: request.providerId,
-        status: "server",
-        detail: `HTTP ${response.status}`
-      };
-    }
-    return {
-      providerId: request.providerId,
-      status: "unknown",
-      detail: `HTTP ${response.status}`
-    };
-  } catch (error51) {
-    if (isAbortError(error51)) {
-      return { providerId: request.providerId, status: "timeout" };
-    }
-    return {
-      providerId: request.providerId,
-      status: "network",
-      detail: error51 instanceof Error ? error51.message : String(error51)
-    };
-  } finally {
-    clearTimeout(timeout);
-  }
-}
-function isAuthValidationSuccess(result) {
-  return result.status === "success";
-}
-function createAuthValidationError(result) {
-  return new Error(formatAuthValidationFailureMessage(result));
-}
-function buildMessagesUrl(baseUrl) {
-  return `${baseUrl.replace(/\/+$/, "")}/v1/messages`;
-}
-function isAbortError(error51) {
-  return error51 instanceof DOMException && error51.name === "AbortError";
-}
-
-// ../../packages/fleet-infra/src/auth/auth-providers.ts
-var CLI_TO_AUTH_PROVIDER_ID = {
-  "claude-zai": "Claude Code with Z.AI GLM",
-  "claude-kimi": "Claude Code with Moonshot Kimi",
-  "claude-glm": "Claude Code with ZhipuAI GLM"
-};
-var CLAUDE_ZAI_PROVIDER_ID = "Claude Code with Z.AI GLM";
-var CLAUDE_KIMI_PROVIDER_ID = "Claude Code with Moonshot Kimi";
-var CLAUDE_GLM_PROVIDER_ID = "Claude Code with ZhipuAI GLM";
-var AUTH_PROVIDER_DEFINITIONS = {
-  "claude-zai": {
-    providerId: CLAUDE_ZAI_PROVIDER_ID,
-    baseUrl: CLI_BACKENDS["claude-zai"].defaultEnv.ANTHROPIC_BASE_URL,
-    env: CLI_BACKENDS["claude-zai"].defaultEnv
-  },
-  "claude-kimi": {
-    providerId: CLAUDE_KIMI_PROVIDER_ID,
-    baseUrl: CLI_BACKENDS["claude-kimi"].defaultEnv.ANTHROPIC_BASE_URL,
-    env: CLI_BACKENDS["claude-kimi"].defaultEnv
-  },
-  "claude-glm": {
-    providerId: CLAUDE_GLM_PROVIDER_ID,
-    baseUrl: CLI_BACKENDS["claude-glm"].defaultEnv.ANTHROPIC_BASE_URL,
-    env: CLI_BACKENDS["claude-glm"].defaultEnv
-  }
-};
-async function resolveAuthEnv(cli, deps) {
-  const provider = AUTH_PROVIDER_DEFINITIONS[cli];
-  if (!provider) return {};
-  const auth = deps?.authService ?? createAuthService({ authPath: DEFAULT_AUTH_PATH });
-  const token = await auth.getApiKey(provider.providerId);
-  if (!token) {
-    throw new Error(formatMissingAuthKeyMessage({ cli, providerId: provider.providerId }));
-  }
-  const validation = await validateAnthropicCompatibleApiKey({
-    providerId: provider.providerId,
-    apiKey: token,
-    baseUrl: provider.baseUrl
-  });
-  if (!isAuthValidationSuccess(validation)) {
-    const failure = {
-      providerId: validation.providerId,
-      status: validation.status,
-      detail: validation.detail
-    };
-    throw createAuthValidationError(failure);
-  }
-  return { ...provider.env, ANTHROPIC_AUTH_TOKEN: token };
-}
-async function validateAuthKeyForCli(cli, apiKey) {
-  const provider = AUTH_PROVIDER_DEFINITIONS[cli];
-  if (!provider) {
-    return { providerId: cli, status: "success" };
-  }
-  const validation = await validateAnthropicCompatibleApiKey({
-    providerId: provider.providerId,
-    apiKey,
-    baseUrl: provider.baseUrl
-  });
-  if (isAuthValidationSuccess(validation)) {
-    return { providerId: validation.providerId, status: "success" };
-  }
-  return {
-    providerId: validation.providerId,
-    status: validation.status,
-    detail: validation.detail
-  };
-}
-
-// ../../packages/fleet-infra/src/index.ts
-function createInfraServices(deps = {}) {
-  const globalOptionsService = createGlobalOptionsService();
-  const authService = createAuthService({ authPath: deps.authPath ?? DEFAULT_AUTH_PATH });
-  return {
-    authService,
-    globalOptionsService
-  };
-}
-
-// ../../packages/fleet-carriers/src/dispatch/framework.ts
-var framework_exports = {};
-__export(framework_exports, {
-  CarrierRegistry: () => CarrierRegistry,
-  clearRegisteredCarriers: () => clearRegisteredCarriers,
-  createCarrierRegistry: () => createCarrierRegistry,
-  emitStreamEvent: () => emitStreamEvent,
-  getAllCliTypes: () => getAllCliTypes,
-  getCarrierConfig: () => getCarrierConfig,
-  getCarrierSourceDisplayName: () => getCarrierSourceDisplayName,
-  getRegisteredCarrierConfig: () => getRegisteredCarrierConfig,
-  getRegisteredOrder: () => getRegisteredOrder,
-  normalizeEffort: () => normalizeEffort,
-  notifyStatusUpdate: () => notifyStatusUpdate,
-  registerCarrier: () => registerCarrier,
-  registerStreamHandler: () => registerStreamHandler,
-  resetCarrierRegistryForTests: () => resetCarrierRegistryForTests,
-  resolveAgentCliType: () => resolveAgentCliType2,
-  resolveCarrierDisplayName: () => resolveCarrierDisplayName,
-  resolveValidatedEffort: () => resolveValidatedEffort,
-  setTaskForceConfiguredCarriers: () => setTaskForceConfiguredCarriers,
-  toCarrierJobStatus: () => toCarrierJobStatus,
-  toTrackFinalStatus: () => toTrackFinalStatus,
-  unregisterStreamHandler: () => unregisterStreamHandler,
-  updateCarrierCliType: () => updateCarrierCliType
-});
-
 // ../../packages/fleet-carriers/src/constants.ts
 var CLI_PROVIDER_DISPLAY_NAMES = Object.fromEntries(
   Object.keys(CLI_BACKENDS).map((cliType) => [
@@ -22034,21 +21749,17 @@ var store_exports = {};
 __export(store_exports, {
   applyAgentCliTypeSelectionUpdate: () => applyAgentCliTypeSelectionUpdate,
   buildHealedCarriers: () => buildHealedCarriers,
-  filterCarrierAgentModesToRegisteredIds: () => filterCarrierAgentModesToRegisteredIds,
   getAgentCliSelection: () => getAgentCliSelection,
   getCarriersFilePath: () => getCarriersFilePath,
   getConfiguredTaskForceBackends: () => getConfiguredTaskForceBackends,
   getConfiguredTaskForceBackendsFromSnapshot: () => getConfiguredTaskForceBackendsFromSnapshot,
   getConfiguredTaskForceCarrierIds: () => getConfiguredTaskForceCarrierIds,
   getConfiguredTaskForceCarrierIdsFromSnapshot: () => getConfiguredTaskForceCarrierIdsFromSnapshot,
-  getEnabledCarrierSubagentIds: () => getEnabledCarrierSubagentIds,
   getTaskForceModelConfig: () => getTaskForceModelConfig,
   initStore: () => initStore,
-  isCarrierAgentModeSubagent: () => isCarrierAgentModeSubagent,
   loadCarrierDisplayNameOverrides: () => loadCarrierDisplayNameOverrides,
   loadCarrierStates: () => loadCarrierStates,
   normalizeCarrierDisplayNameInput: () => normalizeCarrierDisplayNameInput,
-  readCarrierAgentModeSnapshot: () => readCarrierAgentModeSnapshot,
   readCarriersSnapshot: () => readCarriersSnapshot,
   readFileBackedCarriersSnapshot: () => readFileBackedCarriersSnapshot,
   readRawCarriers: () => readRawCarriers,
@@ -22060,7 +21771,6 @@ __export(store_exports, {
   resolveCarrierState: () => resolveCarrierState,
   sanitizeCarrierDisplayName: () => sanitizeCarrierDisplayName,
   saveAgentCliSelection: () => saveAgentCliSelection,
-  setCarrierAgentMode: () => setCarrierAgentMode,
   store: () => store,
   updateAgentCliSelection: () => updateAgentCliSelection,
   updateAgentCliTypeOverride: () => updateAgentCliTypeOverride,
@@ -22101,9 +21811,6 @@ function sanitizeFreeformText(value) {
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function sanitizeAgentMode(value) {
-  return value === "cli" || value === "subagent" ? value : void 0;
-}
 function sanitizeAgentCliType(value) {
   return typeof value === "string" && value in CLI_BACKENDS ? value : void 0;
 }
@@ -22153,13 +21860,11 @@ function sanitizeTaskforce(value) {
 }
 function sanitizeCarrierState(value) {
   if (!isRecord2(value)) return void 0;
-  const agentMode = sanitizeAgentMode(value.agentMode);
   const agentCliType = sanitizeAgentCliType(value.agentCliType);
   const agentCli = sanitizeAgentCli(value.agentCli);
   const taskforce = sanitizeTaskforce(value.taskforce);
   const displayName = sanitizeFreeformText(value.displayName);
   const result = {};
-  if (agentMode) result.agentMode = agentMode;
   if (agentCliType) result.agentCliType = agentCliType;
   if (Object.keys(agentCli).length > 0) result.agentCli = agentCli;
   if (Object.keys(taskforce).length > 0) result.taskforce = taskforce;
@@ -24229,7 +23934,6 @@ function resolveCarriersRecord(raw, defaultsByCarrier, resolve2) {
 function buildResolvedCarrierState(state, defaults, agentCliType, taskforce) {
   const agentCli = sanitizeAgentCli(state.agentCli);
   return {
-    agentMode: state.agentMode ?? defaults?.defaultAgentMode ?? "cli",
     agentCliType,
     agentCli: {
       ...agentCli,
@@ -24255,57 +23959,6 @@ function resolveSelectionForCliType(stored, cliType, defaults) {
   return { model, effort };
 }
 
-// ../../packages/fleet-carriers/src/store/subagent-mode.ts
-var subagent_mode_exports = {};
-__export(subagent_mode_exports, {
-  filterCarrierAgentModesToRegisteredIds: () => filterCarrierAgentModesToRegisteredIds,
-  getEnabledCarrierSubagentIds: () => getEnabledCarrierSubagentIds,
-  isCarrierAgentModeSubagent: () => isCarrierAgentModeSubagent,
-  readCarrierAgentModeSnapshot: () => readCarrierAgentModeSnapshot,
-  setCarrierAgentMode: () => setCarrierAgentMode
-});
-function readCarrierAgentModeSnapshot(defaultsByCarrier = {}) {
-  const raw = readRawCarriers();
-  const carriers = buildHealedCarriers(defaultsByCarrier);
-  return {
-    agentModes: Object.fromEntries(
-      Object.entries(carriers).filter(([, state]) => state.agentMode === "subagent").map(([id]) => [id, "subagent"])
-    ),
-    generation: raw._meta?.generation ?? 0
-  };
-}
-function isCarrierAgentModeSubagent(carrierId, defaultAgentMode = "cli") {
-  const rawMode = readRawCarriers().carriers?.[carrierId]?.agentMode;
-  return (rawMode ?? defaultAgentMode) === "subagent";
-}
-function setCarrierAgentMode(carrierId, enabled, defaultAgentMode = "cli") {
-  const sanitizedCarrierId = sanitizeConfigKey(carrierId);
-  if (!sanitizedCarrierId) return;
-  const nextAgentMode = enabled ? "subagent" : "cli";
-  updateCarriers((states) => {
-    const carriers = { ...states.carriers ?? {} };
-    const current = carriers[sanitizedCarrierId] ?? {};
-    const next = { ...current };
-    if (nextAgentMode === defaultAgentMode) delete next.agentMode;
-    else next.agentMode = nextAgentMode;
-    carriers[sanitizedCarrierId] = next;
-    states.carriers = carriers;
-  });
-}
-function filterCarrierAgentModesToRegisteredIds(snapshot, registeredCarrierIds) {
-  const allowed = new Set(registeredCarrierIds);
-  return {
-    agentModes: Object.fromEntries(
-      Object.entries(snapshot.agentModes).filter(([carrierId]) => allowed.has(carrierId))
-    ),
-    generation: snapshot.generation
-  };
-}
-function getEnabledCarrierSubagentIds(snapshot, registeredCarrierIds) {
-  const filtered = registeredCarrierIds ? filterCarrierAgentModesToRegisteredIds(snapshot, registeredCarrierIds) : snapshot;
-  return Object.keys(filtered.agentModes).sort();
-}
-
 // ../../packages/fleet-carriers/src/store/taskforce-config.ts
 var taskforce_config_exports = {};
 __export(taskforce_config_exports, {
@@ -24430,13 +24083,11 @@ function isTaskForceCliType(value) {
 // ../../packages/fleet-carriers/src/store/index.ts
 var store = {
   ...state_io_exports,
-  ...subagent_mode_exports,
   ...models_exports,
   ...taskforce_config_exports,
   ...cli_types_exports,
   ...display_names_exports,
   stateIo: state_io_exports,
-  subagentMode: subagent_mode_exports,
   models: models_exports,
   taskforceConfig: taskforce_config_exports,
   cliTypes: cli_types_exports,
@@ -24487,7 +24138,6 @@ function registerCarrier(registry3, config2) {
     existing.defaultModel = config2.defaultModel;
     existing.defaultEffort = config2.defaultEffort;
     existing.carrierMetadata = config2.carrierMetadata;
-    existing.subagent = config2.subagent;
   } else {
     gs.modes.set(config2.id, { config: config2 });
   }
@@ -24631,14 +24281,8 @@ var CHRONICLE_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "sonnet",
       defaultEffort: "low"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "sonnet", defaultEffort: "low" }
-      }
     }
   }
 };
@@ -24731,14 +24375,8 @@ var GENESIS_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "sonnet",
       defaultEffort: "medium"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "sonnet", defaultEffort: "medium" }
-      }
     }
   }
 };
@@ -24806,14 +24444,8 @@ var KIROV_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "opus[1m]",
       defaultEffort: "xhigh"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "opus[1m]", defaultEffort: "xhigh" }
-      }
     }
   }
 };
@@ -24876,14 +24508,8 @@ var NIMITZ_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "opus[1m]",
       defaultEffort: "max"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "opus[1m]", defaultEffort: "xhigh" }
-      }
     }
   }
 };
@@ -24947,14 +24573,8 @@ var OHIO_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "sonnet",
       defaultEffort: "low"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "sonnet", defaultEffort: "low" }
-      }
     }
   }
 };
@@ -25019,14 +24639,8 @@ var SENTINEL_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "sonnet",
       defaultEffort: "max"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "sonnet", defaultEffort: "xhigh" }
-      }
     }
   }
 };
@@ -25082,14 +24696,8 @@ var TEMPEST_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "sonnet",
       defaultEffort: "medium"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "sonnet", defaultEffort: "medium" }
-      }
     }
   }
 };
@@ -25144,14 +24752,8 @@ var VANGUARD_DEFAULTS = {
   agent: {
     dispatch: {
       defaultCliType: "claude",
-      defaultAgentMode: "subagent",
       defaultModel: "haiku",
       defaultEffort: "low"
-    },
-    nativeSubagents: {
-      byHost: {
-        claude: { defaultModel: "haiku", defaultEffort: "low" }
-      }
     }
   }
 };
@@ -25216,24 +24818,14 @@ function registerDefaultCarriers(registry3) {
 }
 function buildDefaultCarrierConfig(registration) {
   const { defaults, metadata } = registration;
-  const claudeSubagentDefaults = defaults.agent.nativeSubagents?.byHost?.claude;
   return {
     id: defaults.id,
     defaultCliType: defaults.agent.dispatch.defaultCliType,
-    defaultAgentMode: defaults.agent.dispatch.defaultAgentMode,
     defaultEffort: defaults.agent.dispatch.defaultEffort,
     defaultModel: defaults.agent.dispatch.defaultModel,
     slot: defaults.slot,
     displayName: defaults.displayName,
-    carrierMetadata: metadata,
-    subagent: {
-      provider: "claude",
-      defaultModel: claudeSubagentDefaults?.defaultModel,
-      defaultEffort: claudeSubagentDefaults?.defaultEffort,
-      byHost: {
-        claude: claudeSubagentDefaults
-      }
-    }
+    carrierMetadata: metadata
   };
 }
 
@@ -25366,7 +24958,7 @@ var StatusOverlayController = class {
 function buildCarrierModelDefaults(config2, cliType) {
   if (!config2) return {};
   if (cliType === "claude") {
-    return config2.subagent?.byHost?.claude ?? {
+    return {
       ...config2.defaultModel ? { defaultModel: config2.defaultModel } : {},
       ...config2.defaultEffort ? { defaultEffort: config2.defaultEffort } : {}
     };
@@ -30501,6 +30093,79 @@ function getGuardState() {
   return guardState;
 }
 
+// ../../packages/fleet-carriers/src/jobs/report-extract.ts
+var REPORT_OPEN = "<report>";
+var REPORT_CLOSE = "</report>";
+function extractFinalReport(text) {
+  let openIdx = text.lastIndexOf(REPORT_OPEN);
+  while (openIdx !== -1) {
+    const bodyStart = openIdx + REPORT_OPEN.length;
+    const closeIdx = text.indexOf(REPORT_CLOSE, bodyStart);
+    if (closeIdx !== -1) {
+      const body = text.slice(bodyStart, closeIdx).trim();
+      if (body) return body;
+    }
+    openIdx = openIdx === 0 ? -1 : text.lastIndexOf(REPORT_OPEN, openIdx - 1);
+  }
+  return null;
+}
+
+// ../../packages/fleet-carriers/src/jobs/workspace-manifest.ts
+var WORKSPACE_CHANGE_LIMIT = 200;
+var WORKSPACE_CHANGE_CLEARED_STATUS = "cleared";
+async function captureWorkspaceSnapshot(scanner, cwd) {
+  if (!scanner) return null;
+  try {
+    return await scanner.snapshot(cwd);
+  } catch {
+    return null;
+  }
+}
+async function captureJobWindowManifest(scanner, cwd, baseline) {
+  if (!scanner) return void 0;
+  const end = await captureWorkspaceSnapshot(scanner, cwd);
+  return buildWorkspaceManifest(baseline, end);
+}
+function buildWorkspaceManifest(baseline, end) {
+  if (!baseline || !end) return void 0;
+  const baselineByPath = new Map(baseline.map((entry) => [entry.path, normalizeSnapshotEntry(entry)]));
+  const endChanges = end.map(normalizeSnapshotEntry).filter((entry) => hasWindowChange(baselineByPath.get(entry.path), entry)).map(toManifestEntry);
+  const endPaths = new Set(end.map((entry) => entry.path));
+  const clearedChanges = [...baselineByPath.values()].filter((entry) => !endPaths.has(entry.path)).map((entry) => ({ status: WORKSPACE_CHANGE_CLEARED_STATUS, path: entry.path }));
+  const changes = [...endChanges, ...clearedChanges];
+  const truncated = changes.length > WORKSPACE_CHANGE_LIMIT;
+  const capped = changes.slice(0, WORKSPACE_CHANGE_LIMIT);
+  return {
+    changes: capped,
+    truncated
+  };
+}
+function buildStatLine(changeCount, truncated) {
+  const suffix = changeCount === 1 ? "file" : "files";
+  return `${truncated ? `${WORKSPACE_CHANGE_LIMIT}+` : String(changeCount)} ${suffix} (window-approx)`;
+}
+function normalizeSnapshotEntry(entry) {
+  return {
+    status: entry.status.trim(),
+    path: entry.path,
+    contentHash: entry.contentHash?.trim()
+  };
+}
+function toManifestEntry(entry) {
+  return {
+    status: entry.status,
+    path: entry.path
+  };
+}
+function hasWindowChange(baseline, end) {
+  if (!baseline) return true;
+  if (baseline.status !== end.status) return true;
+  if (baseline.contentHash && end.contentHash) {
+    return baseline.contentHash !== end.contentHash;
+  }
+  return false;
+}
+
 // ../../packages/fleet-carriers/src/jobs/dispatch.ts
 var CARRIER_RESULT_PUSH_PREFIX = "[carrier:result]";
 var CARRIER_JOBS_DOCTRINE = {
@@ -30533,11 +30198,12 @@ var REMINDER_WHITESPACE = /\s+/g;
 var ACTIVE_STATUS_NOTICE = "Job is still running. The [carrier:result] push will be delivered automatically when it finishes \u2014 do not call carrier_jobs again until that push arrives. Stop calling tools now and return control to the user; the push wakes the agent even after this response ends.";
 var ACTIVE_CANCEL_NOTICE = "Cancel did not apply: the job is still running normally, not hung. Long-running carrier jobs are expected \u2014 do not retry cancel without an explicit user request to abort. The [carrier:result] push will arrive automatically; stop calling tools and return control to the user.";
 function buildCarrierResultSystemReminder(input) {
+  const changes = input.summary.workspaceChanges ? buildStatLine(input.summary.workspaceChanges.changes.length, input.summary.workspaceChanges.truncated) : "unavailable";
   const lines = [`- ${input.jobId}: ${sanitizeReminderText(input.summary.summary)}`];
   const metadata = [
     `kind=${input.kind}`,
     `status=${input.status}`,
-    `changes=${sanitizeReminderText(input.summary.workspaceChanges?.statLine ?? "unavailable")}`,
+    `changes=${sanitizeReminderText(changes)}`,
     input.label ? `label=${sanitizeReminderText(input.label)}` : void 0,
     input.taskforceBackend ? `backend=${sanitizeReminderText(input.taskforceBackend)}` : void 0,
     input.error ? `error=${sanitizeReminderText(input.error)}` : void 0
@@ -30564,8 +30230,8 @@ function buildCarrierJobsSchema() {
     })),
     format: typebox_exports.Optional(typebox_exports.Unsafe({
       type: "string",
-      enum: ["summary", "full"],
-      description: "Optional result detail level for renderers and result lookups."
+      enum: ["summary", "full", "raw"],
+      description: `Optional result detail level. "full" returns the final report (extracted deterministically from the carrier's <report> block; falls back to the raw archive when absent). "summary" returns metadata only. "raw" returns the unprocessed full archive (debugging/audit). Defaults to "full" when omitted.`
     }))
   });
 }
@@ -30586,7 +30252,6 @@ function buildCarrierJobsToolSpec() {
 function dispatchCarrierJobsAction(params, now = Date.now()) {
   if (params.action === "list") {
     return {
-      action: "list",
       ok: true,
       active: listActiveJobs(),
       recent: listJobSummaries(now)
@@ -30595,7 +30260,6 @@ function dispatchCarrierJobsAction(params, now = Date.now()) {
   const jobIdError = validateJobId(params.job_id);
   if (jobIdError) {
     return {
-      action: params.action,
       job_id: params.job_id,
       ok: false,
       error: jobIdError
@@ -30606,7 +30270,6 @@ function dispatchCarrierJobsAction(params, now = Date.now()) {
   if (params.action === "result") return resultResponse(jobId, normalizeFormat(params.format), now);
   if (params.action === "cancel") return cancelResponse(jobId, now);
   return {
-    action: String(params.action),
     job_id: jobId,
     ok: false,
     error: "unsupported action"
@@ -30634,7 +30297,6 @@ function statusResponse(jobId, now) {
   const summary = getJobSummary(jobId, now);
   const availability = getAvailability(jobId, summary, now);
   return {
-    action: "status",
     job_id: jobId,
     ok: Boolean(active || summary || availability.full_available),
     status: active?.status ?? summary?.status ?? "not_found",
@@ -30649,8 +30311,6 @@ function resultResponse(jobId, format, now) {
   const availability = getAvailability(jobId, summary, now);
   if (active) {
     return {
-      action: "result",
-      format,
       job_id: jobId,
       ok: false,
       status: active.status,
@@ -30663,8 +30323,6 @@ function resultResponse(jobId, format, now) {
   }
   if (format === "summary") {
     return {
-      action: "result",
-      format,
       job_id: jobId,
       ok: Boolean(summary),
       status: summary?.status ?? "not_found",
@@ -30677,17 +30335,31 @@ function resultResponse(jobId, format, now) {
   const isTaskForceJob = jobId.startsWith("taskforce:");
   const isSubOpJob = isTaskForceJob;
   const serializeOpts = isSubOpJob ? { perSubOpMaxBytes: CARRIER_JOBS_PER_SUBOP_BYTE_CAP, maxBytes: CARRIER_JOBS_GLOBAL_BYTE_CAP } : { maxBytes: CARRIER_JOBS_FULL_RESULT_BYTE_CAP };
-  const fullResult = archive ? serializeJobArchive(archive, serializeOpts) : void 0;
+  let fullResult;
+  let results;
+  if (archive) {
+    if (isTaskForceJob) {
+      results = serializeTaskForceResultsByBackend(archive, format);
+    } else if (format === "raw") {
+      fullResult = serializeJobArchive(archive, serializeOpts);
+    } else {
+      const rawSerialized = serializeJobArchive(archive);
+      const reportBody = extractFinalReport(rawSerialized);
+      if (reportBody !== null) {
+        fullResult = capTextBytes(reportBody, CARRIER_JOBS_FULL_RESULT_BYTE_CAP);
+      } else {
+        fullResult = serializeJobArchive(archive, serializeOpts);
+      }
+    }
+  }
   return {
-    action: "result",
-    format,
     job_id: jobId,
     ok: Boolean(archive),
     status: archive?.status ?? summary?.status ?? "not_found",
     summary: summary ?? void 0,
     ...availability,
     full_result: isTaskForceJob ? void 0 : fullResult,
-    results: archive && isTaskForceJob ? serializeTaskForceResultsByBackend(archive) : void 0,
+    results: archive && isTaskForceJob ? results : void 0,
     error: archive ? void 0 : "full result unavailable or expired"
   };
 }
@@ -30696,7 +30368,6 @@ function cancelResponse(jobId, now) {
   const active = getActiveJob(jobId);
   const summary = getJobSummary(jobId, now);
   return {
-    action: "cancel",
     job_id: jobId,
     ok: result.cancelled,
     cancelled: result.cancelled,
@@ -30710,7 +30381,6 @@ function cancelResponse(jobId, now) {
 function getAvailability(jobId, summary, now) {
   const fullAvailable = hasFinalizedJobArchive(jobId, now);
   return {
-    summary_available: Boolean(summary),
     full_available: fullAvailable,
     full_invalidated: !hasJobArchive(jobId, now) && Boolean(summary)
   };
@@ -30721,9 +30391,10 @@ function validateJobId(jobId) {
   return null;
 }
 function normalizeFormat(format) {
-  return format === "summary" ? "summary" : "full";
+  if (format === "summary" || format === "raw") return format;
+  return "full";
 }
-function serializeTaskForceResultsByBackend(archive) {
+function serializeTaskForceResultsByBackend(archive, format) {
   const grouped = /* @__PURE__ */ new Map();
   const orderedKeys = [];
   for (const block of archive.blocks) {
@@ -30737,13 +30408,30 @@ function serializeTaskForceResultsByBackend(archive) {
   const results = {};
   for (const cliType of orderedKeys) {
     const blocks = grouped.get(cliType);
-    results[cliType] = serializeJobArchive(
-      { ...archive, blocks },
-      { maxBytes: CARRIER_JOBS_PER_SUBOP_BYTE_CAP }
-    );
+    const subArchive = { ...archive, blocks };
+    if (format === "raw") {
+      results[cliType] = serializeJobArchive(subArchive, { maxBytes: CARRIER_JOBS_PER_SUBOP_BYTE_CAP });
+    } else {
+      const rawSerialized = serializeJobArchive(subArchive);
+      const reportBody = extractFinalReport(rawSerialized);
+      if (reportBody !== null) {
+        results[cliType] = capTextBytes(reportBody, CARRIER_JOBS_PER_SUBOP_BYTE_CAP);
+      } else {
+        results[cliType] = serializeJobArchive(subArchive, { maxBytes: CARRIER_JOBS_PER_SUBOP_BYTE_CAP });
+      }
+    }
   }
   return results;
 }
+function capTextBytes(text, maxBytes) {
+  if (Buffer.byteLength(text, "utf8") <= maxBytes) return text;
+  const buf = Buffer.from(text, "utf8");
+  const marker = "\n\n[truncated]";
+  const markerBytes = Buffer.byteLength(marker, "utf8");
+  let end = Math.max(0, maxBytes - markerBytes);
+  while (end > 0 && (buf[end] & 192) === 128) end--;
+  return buf.subarray(0, end).toString("utf8") + marker;
+}
 
 // ../../packages/fleet-carriers/src/jobs/sanitize.ts
 var sanitize_exports = {};
@@ -30839,84 +30527,17 @@ function isEscIntermediate(code) {
   return code >= 32 && code <= 47;
 }
 
-// ../../packages/fleet-carriers/src/jobs/workspace-manifest.ts
-var WORKSPACE_CHANGE_ATTRIBUTION = "window-approximate";
-var WORKSPACE_CHANGE_LIMIT = 200;
-var WORKSPACE_CHANGE_CLEARED_STATUS = "cleared";
-async function captureWorkspaceSnapshot(scanner, cwd) {
-  if (!scanner) return null;
-  try {
-    return await scanner.snapshot(cwd);
-  } catch {
-    return null;
-  }
-}
-async function captureJobWindowManifest(scanner, cwd, baseline) {
-  if (!scanner) {
-    return unavailableWorkspaceManifest("scanner-not-configured");
-  }
-  const end = await captureWorkspaceSnapshot(scanner, cwd);
-  return buildWorkspaceManifest(baseline, end);
-}
-function buildWorkspaceManifest(baseline, end, reason) {
-  if (!baseline || !end) {
-    return unavailableWorkspaceManifest("snapshot-unavailable");
-  }
-  const baselineByPath = new Map(baseline.map((entry) => [entry.path, normalizeSnapshotEntry(entry)]));
-  const endChanges = end.map(normalizeSnapshotEntry).filter((entry) => hasWindowChange(baselineByPath.get(entry.path), entry)).map(toManifestEntry);
-  const endPaths = new Set(end.map((entry) => entry.path));
-  const clearedChanges = [...baselineByPath.values()].filter((entry) => !endPaths.has(entry.path)).map((entry) => ({ status: WORKSPACE_CHANGE_CLEARED_STATUS, path: entry.path }));
-  const changes = [...endChanges, ...clearedChanges];
-  const truncated = changes.length > WORKSPACE_CHANGE_LIMIT;
-  const capped = changes.slice(0, WORKSPACE_CHANGE_LIMIT);
-  return {
-    attribution: WORKSPACE_CHANGE_ATTRIBUTION,
-    available: true,
-    changes: capped,
-    statLine: buildStatLine(changes.length, truncated),
-    truncated
-  };
-}
-function unavailableWorkspaceManifest(reason) {
-  return {
-    attribution: WORKSPACE_CHANGE_ATTRIBUTION,
-    available: false,
-    reason,
-    changes: [],
-    statLine: "unavailable",
-    truncated: false
-  };
-}
-function normalizeSnapshotEntry(entry) {
-  return {
-    status: entry.status.trim(),
-    path: entry.path,
-    contentHash: entry.contentHash?.trim()
-  };
-}
-function toManifestEntry(entry) {
-  return {
-    status: entry.status,
-    path: entry.path
-  };
-}
-function hasWindowChange(baseline, end) {
-  if (!baseline) return true;
-  if (baseline.status !== end.status) return true;
-  if (baseline.contentHash && end.contentHash) {
-    return baseline.contentHash !== end.contentHash;
-  }
-  return false;
-}
-function buildStatLine(changeCount, truncated) {
-  const suffix = changeCount === 1 ? "file" : "files";
-  return `${truncated ? `${WORKSPACE_CHANGE_LIMIT}+` : String(changeCount)} ${suffix} (window-approx)`;
-}
-
 // ../../packages/fleet-carriers/src/dispatch/prompt.ts
 var CARRIER_FLEET_BACKGROUND = String.raw`You are an autonomous agent (Carrier) operating within a coordinated multi-agent Fleet system. The Admiral, your superior, dispatches specialized tasks to you and synthesizes your output for the user. Below is your identity, operational permissions, behavioral principles, and required output format. Your assigned task arrives in the user message channel below.`;
+var COMMON_RESPONSE_PROTOCOL = `<response_protocol>
+Keep progress narration concise \u2014 at most one line per meaningful step. No verbose play-by-play or step-by-step essays (short streaming lines are acceptable for the live observation channel).
+
+When the mission is complete, wrap the entire final output in a <report>...</report> tag and emit it exactly once, at the very end. The Admiral retrieves only the report block, so everything you need to convey \u2014 results, evidence, file paths, caveats \u2014 must be inside it. Your persona's output_format structure applies inside the report block as usual.
+
+Do not mention or demonstrate the literal opening and closing report tag anywhere in the body outside that final block.
+</response_protocol>`;
 function buildCarrierSystemPrompt(metadata) {
-  const parts = [CARRIER_FLEET_BACKGROUND];
+  const parts = [CARRIER_FLEET_BACKGROUND, COMMON_RESPONSE_PROTOCOL];
   if (metadata) {
     parts.push(`<your_identity>
 ${metadata.title}
@@ -31376,7 +30997,6 @@ function buildCarrierDispatchToolSpec(registry3, deps) {
         });
       }
       const metadata = config2.carrierMetadata;
-      const isNativeSubagentMode = isCarrierAgentModeSubagent(carrierId, config2.defaultAgentMode);
       if (metadata) {
         const blockValidation = validateRequiredRequestBlocks(metadata, request, carrierId);
         if (!blockValidation.ok) {
@@ -31387,7 +31007,7 @@ function buildCarrierDispatchToolSpec(registry3, deps) {
           });
         }
       }
-      if (!isNativeSubagentMode && getConfiguredTaskForceBackends(carrierId).length >= 2) {
+      if (getConfiguredTaskForceBackends(carrierId).length >= 2) {
         return launchTaskForceJob({
           registry: registry3,
           carrierId,
@@ -31622,7 +31242,6 @@ function resolveCarrierTrackModelInfo(registry3, carrierId) {
   const modelConfig = loadCarrierStates({
     [carrierId]: carrierConfig ? {
       cliType,
-      ...carrierConfig.defaultAgentMode ? { defaultAgentMode: carrierConfig.defaultAgentMode } : {},
       ...carrierConfig.defaultEffort ? { defaultEffort: carrierConfig.defaultEffort } : {},
       ...carrierConfig.defaultModel ? { defaultModel: carrierConfig.defaultModel } : {}
     } : cliType
@@ -31710,72 +31329,6 @@ function formatRequestBlocksGuide(meta3) {
   });
 }
 
-// ../../packages/fleet-carriers/src/subagents/index.ts
-var subagents_exports = {};
-__export(subagents_exports, {
-  CLAUDE_SUBAGENT_COLORS: () => CLAUDE_SUBAGENT_COLORS,
-  buildClaudeSubagentDefinition: () => buildClaudeSubagentDefinition,
-  buildClaudeSubagentDefinitions: () => buildClaudeSubagentDefinitions,
-  buildClaudeSubagentName: () => buildClaudeSubagentName
-});
-
-// ../../packages/fleet-carriers/src/subagents/claude.ts
-var NAME_SEGMENT_SPLIT_PATTERN = /[^a-zA-Z0-9]+/;
-var CLAUDE_MAX_EFFORT = "xhigh";
-var CLAUDE_SUBAGENT_COLORS = {
-  nimitz: "blue",
-  vanguard: "cyan",
-  chronicle: "green",
-  genesis: "orange",
-  kirov: "purple",
-  ohio: "yellow",
-  sentinel: "red",
-  tempest: "pink"
-};
-function buildClaudeSubagentDefinitions(options) {
-  const enabled = new Set(options.enabledCarrierIds);
-  return options.carrierConfigs.filter((config2) => enabled.has(config2.id)).map((config2) => buildClaudeSubagentDefinition(config2));
-}
-function buildClaudeSubagentDefinition(config2) {
-  const color = CLAUDE_SUBAGENT_COLORS[config2.id];
-  const effort = getClaudeEffort(config2);
-  const model = getClaudeModel(config2);
-  const definition = {
-    carrierId: config2.id,
-    ...color ? { color } : {},
-    description: buildDescription(config2),
-    ...effort ? { effort } : {},
-    ...model ? { model } : {},
-    name: buildClaudeSubagentName(config2.id),
-    prompt: buildCarrierSystemPrompt(config2.carrierMetadata)
-  };
-  return definition;
-}
-function buildClaudeSubagentName(carrierId) {
-  const lowerCaseName = carrierId.split(NAME_SEGMENT_SPLIT_PATTERN).filter((segment) => segment.length > 0).map((segment) => segment.toLowerCase()).join("");
-  return lowerCaseName || "carrier";
-}
-function buildDescription(config2) {
-  const metadata = config2.carrierMetadata;
-  const parts = [
-    config2.displayName,
-    metadata?.title,
-    metadata?.summary,
-    metadata?.whenToUse?.length ? `Use for: ${metadata.whenToUse.join(", ")}.` : void 0
-  ];
-  return parts.filter((part) => typeof part === "string" && part.trim().length > 0).join(" - ").replace(/\s+/g, " ").trim();
-}
-function getClaudeEffort(config2) {
-  const effort = config2.subagent?.byHost?.claude?.defaultEffort ?? config2.subagent?.defaultEffort;
-  return clampClaudeEffort(effort);
-}
-function getClaudeModel(config2) {
-  return config2.subagent?.byHost?.claude?.defaultModel ?? config2.subagent?.defaultModel;
-}
-function clampClaudeEffort(effort) {
-  return effort === "max" ? CLAUDE_MAX_EFFORT : effort;
-}
-
 // ../../packages/fleet-carriers/src/index.ts
 var dispatch = {
   ...framework_exports,
@@ -31814,7 +31367,6 @@ function createCarrierRuntime() {
     dispatch,
     jobs: boundCarrierJobs,
     personas: personas_exports,
-    subagents: subagents_exports,
     store: store_exports,
     stream: boundStream,
     registerCarrierDefaults() {
@@ -32090,6 +31642,10 @@ Disposition (report one line): ${"`"}inspection: pass${"`"} | ${"`"}inspection:
 deviations corrected by the Admiral${"`"} | ${"`"}inspection: rejected — re-dispatched
 with findings${"`"}. Small deviations the Admiral corrects directly during
 integration; systematic deviations route back to the owning carrier.
+"Small/harmless" is a claim that needs evidence, not an eyeball impression:
+before so classifying a deviation, confirm it changes no observable behavior,
+contract, or output and is unreachable by any real execution path; if
+unconfirmed, treat it as a defect, not a small deviation.
 Proportionality: full-diff reading for doctrine/prompt/structural changes;
 stat + targeted sampling for large mechanical changes. Read-only jobs skip
 this gate — their claims route through Deep Dive instead.
@@ -32239,12 +31795,11 @@ function createClaudeFamilyCliDefinition(options) {
     label: options.label,
     async createProfile(profileOptions) {
       const { bin, prefixArgs } = resolveBinary("claude", "CLAUDE_BIN", profileOptions.env);
-      const authEnv = options.authCli && profileOptions.authEnvResolver ? await profileOptions.authEnvResolver(options.authCli, { authService: profileOptions.authService }) : {};
       return {
         args: [...prefixArgs, ...buildModelArgs(profileOptions.model)],
         bin,
         cwd: profileOptions.cwd,
-        env: createChildEnv(profileOptions.env, authEnv),
+        env: createChildEnv(profileOptions.env, {}),
         id: options.id,
         label: options.label,
         messagePolicy: {
@@ -32269,20 +31824,6 @@ var claudeCli = createClaudeFamilyCliDefinition({
   label: "Claude"
 });
 
-// ../../packages/fleet-admiral/src/agent-cli/claude-glm/claude-glm.ts
-var claudeGlmCli = createClaudeFamilyCliDefinition({
-  authCli: "claude-glm",
-  id: "claude-glm",
-  label: "Claude GLM"
-});
-
-// ../../packages/fleet-admiral/src/agent-cli/claude-kimi/claude-kimi.ts
-var claudeKimiCli = createClaudeFamilyCliDefinition({
-  authCli: "claude-kimi",
-  id: "claude-kimi",
-  label: "Claude Kimi"
-});
-
 // ../../packages/fleet-admiral/src/agent-cli/codex/codex.ts
 var codexCli = {
   id: "codex",
@@ -32319,15 +31860,11 @@ function buildModelArgs2(model) {
 var DEFAULT_CLI_ID = "claude";
 var DEFINITIONS = {
   claude: claudeCli,
-  "claude-kimi": claudeKimiCli,
-  "claude-glm": claudeGlmCli,
   codex: codexCli
 };
 async function resolveAgentCliProfile(env, cwd, options = {}) {
   const id = resolveAgentCliId(env, options);
   return DEFINITIONS[id].createProfile({
-    authEnvResolver: options.authEnvResolver,
-    authService: options.authService,
     cwd,
     env,
     model: options.model,
@@ -32365,14 +31902,6 @@ var AGENT_CLI_INJECTION_CAPABILITIES = {
     builderId: "claude-native",
     enabled: true
   },
-  "claude-kimi": {
-    builderId: "claude-native",
-    enabled: true
-  },
-  "claude-glm": {
-    builderId: "claude-native",
-    enabled: true
-  },
   codex: {
     builderId: "codex-native",
     enabled: true
@@ -32396,34 +31925,6 @@ function createSessionCaptureHookExec(deps) {
   };
 }
 
-// ../../packages/fleet-admiral/src/agent-cli/carrier-defaults.ts
-function buildHostCarrierModelDefaults(config2) {
-  const cliType = resolveAgentCliType2(config2.id, config2.defaultCliType);
-  const cliDefaults = buildCarrierModelDefaults(config2, cliType);
-  return {
-    cliType,
-    ...config2.defaultAgentMode ? { defaultAgentMode: config2.defaultAgentMode } : {},
-    ...cliDefaults.defaultEffort ? { defaultEffort: cliDefaults.defaultEffort } : {},
-    ...cliDefaults.defaultModel ? { defaultModel: cliDefaults.defaultModel } : {}
-  };
-}
-function buildClaudeNativeSubagentPlan(registry3) {
-  const carrierIds = getRegisteredOrder(registry3);
-  const carrierConfigs = carrierIds.map((carrierId) => getCarrierConfig(registry3, carrierId)).filter((config2) => config2 !== void 0);
-  const defaultsByCarrier = Object.fromEntries(
-    carrierConfigs.map((config2) => [config2.id, buildHostCarrierModelDefaults(config2)])
-  );
-  const enabledCarrierIds = getEnabledCarrierSubagentIds(
-    readCarrierAgentModeSnapshot(defaultsByCarrier),
-    carrierIds
-  );
-  return {
-    carrierConfigs,
-    definitions: buildClaudeSubagentDefinitions({ carrierConfigs, enabledCarrierIds }),
-    enabledCarrierIds
-  };
-}
-
 // ../../packages/fleet-admiral/src/agent-cli/builders/claude.ts
 function buildClaudeNativeArgs(context) {
   const systemPromptArg = context.replaceSystemPrompt ? "--system-prompt-file" : "--append-system-prompt-file";
@@ -32523,10 +32024,7 @@ function buildCodexNativeArgs(context) {
     "-c",
     'approval_policy="never"',
     "-c",
-    'sandbox_mode="danger-full-access"',
-    // hook 신뢰 프롬프트("Hooks need review")를 fleet 관리 세션에서 건너뛴다. bypass_hook_trust는
-    // config 키가 아니라 전용 CLI 플래그이므로 -c override가 아닌 플래그로 전달해야 한다.
-    "--dangerously-bypass-hook-trust"
+    'sandbox_mode="danger-full-access"'
   ];
   for (const server of context.mcpServers) {
     const prefix = `mcp_servers.${server.name}`;
@@ -32717,50 +32215,26 @@ function assertSegmentRealpathWithinRoot(resolvedBase, segmentPath) {
 }
 
 // ../../packages/fleet-admiral/src/agent-cli/plugin/fleet.ts
-var CLAUDE_AGENT_FILE_STEM_ALLOWLIST = /^[A-Za-z0-9][A-Za-z0-9_-]{0,79}$/;
 var assetBundle = {
   description: "Fleet carrier delegation and wiki evidence plugin",
   directoryName: "fleet",
   displayName: "Fleet",
   hashFileName: ".fleet-codex-plugin.hash",
-  includeClaudeAgents: true,
   name: "fleet",
   source: "asset"
 };
 function renderAssetPluginRoot(pluginRoot, bundle, options) {
   renderEmbeddedSkillAssets(pluginRoot);
-  if (bundle.includeClaudeAgents) {
-    for (const subagent of options.claudeDefinitions) {
-      const fileStem = parseClaudeAgentFileStem(subagent.name);
-      writePrivateFile(path27__default.join(pluginRoot, "agents", `${fileStem}.md`), claudeAgentFile(subagent), pluginRoot);
-    }
-  }
-  if (options.cliId === "claude" || options.cliId === "claude-kimi" || options.cliId === "claude-glm") {
+  if (options.cliId === "claude") {
     writePrivateJson(path27__default.join(pluginRoot, "hooks", "hooks.json"), claudeHooks(options), pluginRoot);
   }
 }
-function validateClaudeAgentFileStems(subagents) {
-  for (const subagent of subagents) {
-    parseClaudeAgentFileStem(subagent.name);
-  }
-}
-function parseClaudeAgentFileStem(name) {
-  if (CLAUDE_AGENT_FILE_STEM_ALLOWLIST.test(name) && path27__default.basename(name) === name) return name;
-  throw new Error(`Invalid Claude agent file name: ${name}`);
-}
 function claudeHooks(options) {
-  const hookExec = options.hookExec;
-  if (!hookExec) {
-    throw new Error("Fleet Claude session hook command is required");
-  }
   const userPromptSubmitExecs = [options.captureSessionHookExec, options.turnStartHookExec, options.autoNameHookExec].filter((exec) => exec !== void 0);
   const stopExecs = [options.turnEndHookExec].filter((exec) => exec !== void 0);
   const inputWaitingExec = options.inputWaitingHookExec;
   return {
     hooks: {
-      SessionStart: [{
-        hooks: [claudeCommandHook(hookExec)]
-      }],
       ...userPromptSubmitExecs.length > 0 ? {
         UserPromptSubmit: [{
           hooks: userPromptSubmitExecs.map(claudeCommandHook)
@@ -32785,9 +32259,6 @@ function claudeHooks(options) {
   };
 }
 function claudeCommandHook(hookExec) {
-  if (!hookExec) {
-    throw new Error("Fleet Claude session hook command is required");
-  }
   return {
     // exec 형식: command는 직접 spawn되는 실행 파일, args는 셸 토크나이징 없이 그대로 전달된다.
     // Windows cmd/powershell의 따옴표 규칙과 무관하게 동작하며 공백 포함 경로도 안전하다.
@@ -32796,23 +32267,6 @@ function claudeCommandHook(hookExec) {
     type: "command"
   };
 }
-function claudeAgentFile(subagent) {
-  const frontmatter = [
-    "---",
-    `name: ${yamlScalar(subagent.name)}`,
-    `description: ${yamlScalar(subagent.description)}`,
-    ...subagent.model ? [`model: ${yamlScalar(subagent.model)}`] : [],
-    ...subagent.effort ? [`effort: ${yamlScalar(subagent.effort)}`] : [],
-    ...subagent.color ? [`color: ${yamlScalar(subagent.color)}`] : [],
-    "background: true",
-    "---",
-    ""
-  ];
-  return [...frontmatter, subagent.prompt, ""].join("\n");
-}
-function yamlScalar(value) {
-  return JSON.stringify(value);
-}
 function renderEmbeddedSkillAssets(pluginRoot) {
   for (const asset of EMBEDDED_AGENT_CLI_SKILL_ASSETS) {
     writePrivateFile(path27__default.join(pluginRoot, "skills", asset.relativePath), asset.content, pluginRoot);
@@ -33223,7 +32677,6 @@ async function createAgentCliPlugin(options) {
   const marketplaceBundles = groupRenderableBundlesByMarketplace(renderableBundles);
   const pluginRoots = /* @__PURE__ */ new Map();
   const contentHashes = /* @__PURE__ */ new Map();
-  validateClaudeAgentFileStems(options.claudeDefinitions);
   for (const marketplace of marketplaceBundles) {
     await options.withMarketplaceLock(marketplace.target.root, () => {
       for (const { bundle, target } of marketplace.bundles) {
@@ -33468,9 +32921,11 @@ function claudeManifest(bundle) {
 }
 
 // ../../packages/fleet-admiral/src/agent-cli/injection.ts
-var CODEX_FLEET_PROFILE_FILE_NAME_PATTERN = /^fleet-[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.config\.toml$/;
-var CODEX_FLEET_PROFILE_MARKER = "# Fleet-managed Codex session profile";
-var CODEX_STALE_PROFILE_MAX_AGE_MS = 24 * 60 * 60 * 1e3;
+var CODEX_FLEET_PROFILE_NAME = "fleet";
+var CODEX_FLEET_PROFILE_FILE_NAME = `${CODEX_FLEET_PROFILE_NAME}.config.toml`;
+var CODEX_LEGACY_FLEET_PROFILE_FILE_NAME_PATTERN = /^fleet-[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.config\.toml$/;
+var CODEX_FLEET_PROFILE_MARKER = "# Fleet-managed Codex profile";
+var CODEX_LEGACY_FLEET_PROFILE_MARKER = "# Fleet-managed Codex session profile";
 var SYSTEM_PROMPT_FILE_MODE = 384;
 async function injectAgentCliProfile(profile, options) {
   const capability = getAgentCliInjectionCapability(profile.id);
@@ -33479,16 +32934,14 @@ async function injectAgentCliProfile(profile, options) {
   }
   const injectTone = options.enableMetaphor ?? false;
   const endpoint = await options.dedicatedMcpSession.getEndpoint();
-  const startupDefinitions = buildStartupNativeDefinitions(profile.id, options.carrierRuntime);
   const tokenLabel = options.mcpSessionLabel ?? `agent:${profile.id}:${crypto3.randomUUID()}`;
   const tokens = await options.dedicatedMcpSession.issueSessionToken({ cwd: profile.cwd, label: tokenLabel });
   const mcpServers = buildAgentCliMcpServerConfigs(endpoint.servers, tokens);
   const doctrine = options.buildSystemPrompt(injectTone);
   const tempCleanups = [];
   try {
-    const systemPromptFile = profile.id === "claude" || profile.id === "claude-kimi" || profile.id === "claude-glm" ? writeSystemPromptFile(profile.id, doctrine, (cleanup2) => tempCleanups.push(cleanup2)) : void 0;
+    const systemPromptFile = profile.id === "claude" ? writeSystemPromptFile(profile.id, doctrine, (cleanup2) => tempCleanups.push(cleanup2)) : void 0;
     const plugin = await createAgentCliPlugin({
-      claudeDefinitions: startupDefinitions.host === "claude" ? startupDefinitions.definitions : [],
       cliId: profile.id,
       codexCommandRunner: options.codexCommandRunner,
       cwd: profile.cwd,
@@ -33499,7 +32952,6 @@ async function injectAgentCliProfile(profile, options) {
       turnEndHookExec: options.turnEndHookExec,
       inputWaitingHookExec: options.inputWaitingHookExec,
       autoNameHookExec: options.autoNameHookExec,
-      hookExec: startupDefinitions.host === "claude" ? requireHookExec(options.hookExec) : void 0,
       withMarketplaceLock: options.withMarketplaceLock
     });
     const codexPluginKeys = plugin.codexRegistrations.map((registration) => `${registration.pluginName}@${registration.marketplaceName}`);
@@ -33508,7 +32960,7 @@ async function injectAgentCliProfile(profile, options) {
       turnStartHookExec: options.turnStartHookExec,
       turnEndHookExec: options.turnEndHookExec,
       autoNameHookExec: options.autoNameHookExec
-    }, (cleanup2) => tempCleanups.push(cleanup2)) : void 0;
+    }) : void 0;
     const launchWarnings = [];
     if (profile.id === "codex") {
       const cleanupWarning = await cleanupDeprecatedCodexPluginState({
@@ -33569,15 +33021,6 @@ async function injectAgentCliProfile(profile, options) {
     throw error51;
   }
 }
-function buildStartupNativeDefinitions(cliId, carrierRuntime) {
-  const host = getNativeSubagentHost(cliId);
-  if (host === "none") return { host, definitions: [] };
-  return { host, definitions: buildClaudeNativeSubagentPlan(carrierRuntime.registry).definitions };
-}
-function getNativeSubagentHost(cliId) {
-  if (cliId === "claude" || cliId === "claude-kimi" || cliId === "claude-glm") return "claude";
-  return "none";
-}
 function buildAgentCliMcpServerConfigs(endpoints, tokens) {
   return endpoints.map((endpoint) => {
     const token = tokens.find((entry) => entry.name === endpoint.name)?.token;
@@ -33599,13 +33042,13 @@ function writeSystemPromptFile(cliId, systemPrompt, onCleanup) {
   chmodBestEffort2(filePath, SYSTEM_PROMPT_FILE_MODE);
   return filePath;
 }
-function writeCodexFleetProfile(env, doctrine, pluginKeys, hookExecs, onCleanup) {
+function writeCodexFleetProfile(env, doctrine, pluginKeys, hookExecs) {
   const codexHome = env.CODEX_HOME ?? path27__default.join(env.HOME ?? os3__default.homedir(), ".codex");
   mkdirSync(codexHome, { recursive: true });
-  pruneStaleCodexFleetProfiles(codexHome);
-  const profileName = `fleet-${crypto3.randomUUID()}`;
-  const profilePath = path27__default.join(codexHome, `${profileName}.config.toml`);
-  onCleanup(() => rmBestEffort(profilePath));
+  pruneLegacyCodexFleetProfiles(codexHome);
+  const profileName = CODEX_FLEET_PROFILE_NAME;
+  const profilePath = path27__default.join(codexHome, CODEX_FLEET_PROFILE_FILE_NAME);
+  const hookTrustState = readCodexFleetHookTrustState(profilePath);
   writeFileNoFollow2(profilePath, [
     CODEX_FLEET_PROFILE_MARKER,
     // doctrine를 멀티라인 TOML 문자열로 직렬화해 실제 줄바꿈을 보존(pretty)한다.
@@ -33614,12 +33057,16 @@ function writeCodexFleetProfile(env, doctrine, pluginKeys, hookExecs, onCleanup)
     escapeTomlMultilineString(doctrine),
     `"""`,
     "",
+    "[features]",
+    "hooks = true",
+    "",
     ...pluginKeys.flatMap((pluginKey) => [
       `[plugins."${escapeTomlBasicString2(pluginKey)}"]`,
       "enabled = true",
       ""
     ]),
-    ...codexHooksConfig(hookExecs)
+    ...codexHooksConfig(hookExecs),
+    ...hookTrustState
   ].join("\n"));
   chmodBestEffort2(profilePath, SYSTEM_PROMPT_FILE_MODE);
   return { profileName, profilePath };
@@ -33654,27 +33101,67 @@ function writeFileNoFollow2(filePath, content) {
     closeSync(fd);
   }
 }
-function pruneStaleCodexFleetProfiles(codexHome) {
+function readCodexFleetHookTrustState(profilePath) {
+  try {
+    const content = readFileNoFollow(profilePath);
+    if ((content.split(/\r?\n/, 1)[0] ?? "") !== CODEX_FLEET_PROFILE_MARKER) return [];
+    return extractCodexHookTrustStateSections(content);
+  } catch {
+    return [];
+  }
+}
+function readFileNoFollow(filePath) {
+  const fd = openSync(filePath, constants.O_RDONLY | constants.O_NOFOLLOW);
+  try {
+    return readFileSync(fd, "utf8");
+  } finally {
+    closeSync(fd);
+  }
+}
+function extractCodexHookTrustStateSections(content) {
+  const sections = [];
+  let current;
+  for (const line of content.split(/\r?\n/)) {
+    if (/^\[hooks\.state\./.test(line)) {
+      if (current !== void 0) pushCodexHookTrustStateSection(sections, current);
+      current = [line];
+      continue;
+    }
+    if (current === void 0) continue;
+    if (/^\s*\[/.test(line)) {
+      pushCodexHookTrustStateSection(sections, current);
+      current = void 0;
+      continue;
+    }
+    current.push(line);
+  }
+  if (current !== void 0) pushCodexHookTrustStateSection(sections, current);
+  return sections;
+}
+function pushCodexHookTrustStateSection(sections, section) {
+  sections.push(...section);
+  if (section[section.length - 1] !== "") sections.push("");
+}
+function pruneLegacyCodexFleetProfiles(codexHome) {
   let entries;
   try {
     entries = readdirSync(codexHome);
   } catch {
     return;
   }
-  const now = Date.now();
   for (const entry of entries) {
-    if (!CODEX_FLEET_PROFILE_FILE_NAME_PATTERN.test(entry)) continue;
+    if (!CODEX_LEGACY_FLEET_PROFILE_FILE_NAME_PATTERN.test(entry)) continue;
     const filePath = path27__default.join(codexHome, entry);
-    if (!isStaleFleetCodexProfile(filePath, now)) continue;
+    if (!isLegacyFleetCodexProfile(filePath)) continue;
     unlinkBestEffort2(filePath);
   }
 }
-function isStaleFleetCodexProfile(filePath, now) {
+function isLegacyFleetCodexProfile(filePath) {
   try {
     const stat3 = lstatSync(filePath);
     if (!stat3.isFile() || stat3.isSymbolicLink()) return false;
-    if (now - stat3.mtimeMs <= CODEX_STALE_PROFILE_MAX_AGE_MS) return false;
-    return readFirstLine(filePath) === CODEX_FLEET_PROFILE_MARKER;
+    const firstLine = readFirstLine(filePath);
+    return firstLine === CODEX_LEGACY_FLEET_PROFILE_MARKER;
   } catch {
     return false;
   }
@@ -33701,10 +33188,6 @@ function unlinkBestEffort2(targetPath) {
   } catch {
   }
 }
-function requireHookExec(hookExec) {
-  if (hookExec) return hookExec;
-  throw new Error("Fleet session hook executable is required for Claude native injection");
-}
 function requireCodexCommandRunner(codexCommandRunner) {
   if (codexCommandRunner) return codexCommandRunner;
   throw new Error("Codex plugin registration requires an injected command runner");
@@ -33825,7 +33308,7 @@ function registerExecutorPort(mcpRegistry, carrierRuntime, isActive) {
 }
 function registerFleetAgentRuntimeTools(mcpRegistry, carrierRuntime, deps) {
   registerAgentToolDefaults(mcpRegistry, carrierRuntime, {
-    authEnvResolver: deps.authEnvResolver,
+    authEnvResolver: async () => ({}),
     reservedExternalMcpServerIds: buildReservedExternalMcpServerIds(deps.reservedExternalMcpServerIds),
     workspaceChangeScanner: deps.workspaceChangeScanner
   });
@@ -40668,9 +40151,8 @@ function execFileVersion(bin, args) {
 }
 
 // ../fleet-plugins/terminal/server/agent-api/agent-cli-launch-kinds.ts
-var UNSUPPORTED_AGENT_CLI_IDS = /* @__PURE__ */ new Set(["claude-kimi", "claude-glm"]);
 function buildAgentCliLaunchKinds(metadata, operationType) {
-  return metadata.filter((cli) => !UNSUPPORTED_AGENT_CLI_IDS.has(cli.id)).map((cli) => {
+  return metadata.map((cli) => {
     const disabledReason = resolveDisabledReason(cli);
     return {
       id: cli.id,
@@ -40693,10 +40175,7 @@ function combineAgentCliLaunchMetadata(metadata, installStatuses, authStatuses)
   return metadata.map((meta3) => ({
     id: meta3.id,
     label: meta3.label,
-    // claude 계열 3종은 같은 `claude` 바이너리를 공유하므로 cliCommand로 설치 여부를 판정한다.
     available: availableByCommand.get(CLI_BACKENDS[meta3.id].cliCommand) ?? false,
-    // model-auth 게이트 대상(claude-kimi/glm)만 실제 로그인 상태를 반영하고,
-    // 자체 인증 CLI(claude/codex)는 Fleet이 로그인 여부를 알 수 없으므로 게이트하지 않는다(true).
     signedIn: signedInByCli.has(meta3.id) ? signedInByCli.get(meta3.id) ?? false : true
   }));
 }
@@ -40874,12 +40353,6 @@ function defaultCapturePaths() {
 var JAVASCRIPT_ENTRY_EXTENSIONS = /* @__PURE__ */ new Set([".cjs", ".js", ".mjs"]);
 var TYPESCRIPT_ENTRY_EXTENSIONS = /* @__PURE__ */ new Set([".cts", ".mts", ".ts", ".tsx"]);
 var MARKETPLACE_LOCK_DIR_SUFFIX = ".lock";
-function buildConsoleHookCommand(entry) {
-  if (entry === void 0) {
-    throw new Error("Fleet Console session hook command requires the current console entry path");
-  }
-  return buildConsoleCliHookExec(entry, ["hook", "subagents-context"]);
-}
 function buildConsoleTurnHookCommand(entry, phase) {
   return buildConsoleCliHookExec(entry, ["hook", phase === "start" ? "turn-start" : "turn-end"]);
 }
@@ -40972,7 +40445,6 @@ function createAgentTerminalLaunchResolver(deps = {}) {
   const agentRuntime = deps.agentRuntime;
   const injectProfile = deps.injectProfile ?? injectAgentCliProfile;
   const resolveProfile = deps.resolveProfile ?? resolveAgentCliProfile;
-  const authEnvResolver = (cli) => resolveAuthEnv(cli, { authService: infraServices.authService });
   const hookEntry = { entryPath, execPath, ...tsxLoaderPath ? { tsxLoaderPath } : {} };
   return async (selectedCwd, context) => {
     const cwd = selectedCwd || baseCwd || homedir3();
@@ -40992,7 +40464,6 @@ function createAgentTerminalLaunchResolver(deps = {}) {
     }
     const sessionId = context?.sessionId ?? "default";
     return createAgentCliLaunchSpec({
-      authEnvResolver,
       agentRuntime,
       cwd,
       dataDir,
@@ -41030,15 +40501,12 @@ async function createAgentCliLaunchSpec(options) {
       throw new Error("Fleet Console agent runtime is unavailable.");
     }
     const profile = await options.resolveProfile(options.env, options.cwd, {
-      authEnvResolver: options.authEnvResolver,
-      authService: options.infraServices.authService,
       cliId: options.cliId,
       resumeSessionId: options.resumeSessionId
     });
     const globalSettings = readGlobalSettingsSnapshot(options.infraServices);
     const injectedProfile = await options.injectProfile(profile, {
       buildSystemPrompt: (injectTone) => createSystemPromptBuilder({ carrierRuntime: agentRuntime.carrierRuntime }).build(injectTone),
-      carrierRuntime: agentRuntime.carrierRuntime,
       codexCommandRunner: runCodexCommand,
       dataDir: options.dataDir,
       dedicatedMcpSession: agentRuntime.dedicatedMcpSession,
@@ -41048,7 +40516,6 @@ async function createAgentCliLaunchSpec(options) {
       turnEndHookExec: buildConsoleTurnHookCommand(options.hookEntry, "end"),
       inputWaitingHookExec: buildConsoleAttentionHookCommand(options.hookEntry),
       autoNameHookExec: buildConsoleAutoNameHookCommand(options.hookEntry),
-      hookExec: buildConsoleHookCommand(options.hookEntry),
       onCleanup: (cleanup) => cleanupStack.push(cleanup),
       replaceSystemPrompt: globalSettings.replaceSystemPrompt,
       resumeSessionId: options.resumeSessionId,
@@ -41276,7 +40743,6 @@ function createConsoleObservabilityStore(deps = {}) {
       cwdLabel: path27__default.basename(operation.cwd) || operation.cwd,
       label: operation.label,
       labelSource: operation.labelSource,
-      autoNamePromptSeen: operation.autoNamePromptSeen,
       cliId: operation.cliId,
       cliLabel: operation.cliLabel,
       createdAt: operation.createdAt,
@@ -41298,7 +40764,6 @@ function createConsoleObservabilityStore(deps = {}) {
       cwd: session.cwd,
       ...session.label ? { label: session.label } : {},
       ...session.labelSource ? { labelSource: session.labelSource } : {},
-      ...session.autoNamePromptSeen ? { autoNamePromptSeen: true } : {},
       ...session.cliId ? { cliId: session.cliId } : {},
       ...session.cliLabel ? { cliLabel: session.cliLabel } : {},
       createdAt: session.createdAt,
@@ -41345,11 +40810,9 @@ function createConsoleObservabilityStore(deps = {}) {
     if (label.length === 0) {
       delete session.label;
       delete session.labelSource;
-      delete session.autoNamePromptSeen;
     } else {
       session.label = label;
       session.labelSource = "user";
-      session.autoNamePromptSeen = true;
     }
     return toTerminalSessionInfo(session);
   }
@@ -41357,17 +40820,16 @@ function createConsoleObservabilityStore(deps = {}) {
     const session = terminalSessionsById.get(sessionId);
     if (!session) return null;
     const effectiveSource = session.labelSource ?? (session.label ? "user" : void 0);
-    if (effectiveSource === "user" || session.autoNamePromptSeen) {
-      return { session: toTerminalSessionInfo(session), changed: false, renamed: false };
+    if (effectiveSource === "user") {
+      return { session: toTerminalSessionInfo(session), renamed: false };
     }
-    session.autoNamePromptSeen = true;
     const next = label?.trim().slice(0, 200) ?? "";
     if (next.length === 0 || next === session.label) {
-      return { session: toTerminalSessionInfo(session), changed: true, renamed: false };
+      return { session: toTerminalSessionInfo(session), renamed: false };
     }
     session.label = next;
     session.labelSource = "auto";
-    return { session: toTerminalSessionInfo(session), changed: true, renamed: true };
+    return { session: toTerminalSessionInfo(session), renamed: true };
   }
   function notifySessionUpdated(session) {
     const event = { type: "session:updated", session };
@@ -41539,7 +41001,8 @@ function normalizeEventPayload(event) {
         label: safeString(obj.label),
         startedAt: safeNumber(obj.startedAt),
         activeJobToolCallId: safeOptionalString(obj.activeJobToolCallId),
-        tracks: Array.isArray(obj.tracks) ? obj.tracks.map(normalizeTrackMeta) : []
+        tracks: Array.isArray(obj.tracks) ? obj.tracks.map(normalizeTrackMeta) : [],
+        signatureCli: safeOptionalString(obj.signatureCli)
       };
     case "job:finalized":
       return {
@@ -41721,26 +41184,6 @@ function withAgentSecurityHeaders(headers) {
   };
 }
 
-// ../fleet-plugins/terminal/server/model-auth-state.ts
-var TERMINAL_MODEL_AUTH_PROVIDERS = [
-  { cli: "claude-kimi", displayName: "Moonshot Kimi" },
-  { cli: "claude-glm", displayName: "ZhipuAI GLM" }
-];
-async function buildModelAuthState(authService) {
-  const signedInIds = new Set(await authService.listProviderIds());
-  return {
-    providers: TERMINAL_MODEL_AUTH_PROVIDERS.map((provider) => toProviderState(provider, signedInIds))
-  };
-}
-function toProviderState(provider, signedInIds) {
-  const providerId = CLI_TO_AUTH_PROVIDER_ID[provider.cli] ?? provider.cli;
-  return {
-    cli: provider.cli,
-    displayName: provider.displayName,
-    signedIn: signedInIds.has(providerId)
-  };
-}
-
 // ../fleet-plugins/terminal/server/agent.ts
 var AGENT_OPERATION_TYPE = "agent";
 var OPERATION_RENAMED_EVENT_CHANNEL = "operation:renamed";
@@ -41757,9 +41200,7 @@ function registerAgentRoutes(ctx, terminalRuntime, deps) {
 }
 function createAgentApi(ctx, terminalRuntime, deps) {
   const dataDir = ctx.host.paths.dataDir;
-  const authEnvResolver = (cli) => resolveAuthEnv(cli, { authService: deps.authService });
   const runtime = createFleetAgentRuntimeLifecycle({
-    authEnvResolver,
     dataDir,
     onMcpServerStartError: (error51) => {
       console.error("[fleet-console] Failed to start MCP server", error51);
@@ -41785,7 +41226,7 @@ function createAgentApi(ctx, terminalRuntime, deps) {
   const unsubscribeStream = runtime.carrierRuntime.jobs.streaming.register((event) => {
     const sessionId = resolveCarrierEventOrigin(event, jobOriginById);
     if (!sessionId) return;
-    observability.appendTerminalRuntimeEvent(sessionId, event);
+    observability.appendTerminalRuntimeEvent(sessionId, withSignatureCli(event, runtime.carrierRuntime.registry));
   });
   const unsubscribeReminder = createCarrierResultReminderRouter({
     streamRegister: runtime.carrierRuntime.jobs.streaming.register,
@@ -41801,6 +41242,16 @@ function createAgentApi(ctx, terminalRuntime, deps) {
   const unsubscribeRename = ctx.host.events.subscribe(OPERATION_RENAMED_EVENT_CHANNEL, (payload) => {
     if (!isOperationRenamedEvent(payload)) return;
     if (payload.pluginId !== TERMINAL_PLUGIN_ID || payload.type !== AGENT_OPERATION_TYPE) return;
+    const updated = observability.renameTerminalSession(payload.operationId, payload.title);
+    if (updated) {
+      observability.notifySessionUpdated(updated);
+      const operation = ctx.host.operations.get(payload.operationId);
+      if (operation) {
+        const cwd = readPayloadString(operation.payload, "cwd") || ctx.host.paths.resolveTheaterPath(operation.theaterId) || "";
+        const providerSession = readProviderSession(operation.payload);
+        ctx.host.operations.patch(payload.operationId, { title: updated.label ?? updated.cwdLabel, payload: toOperationPayload(cwd, updated, providerSession) });
+      }
+    }
     injectRenameCommand(payload.operationId, payload.title);
   });
   rehydrateDormantAgentOperations();
@@ -41926,24 +41377,6 @@ function createAgentApi(ctx, terminalRuntime, deps) {
       ctx.host.http.writeJson(res, 200, { ok: true });
       return true;
     }
-    if (req.method === "PATCH") {
-      const body = await ctx.host.http.readJsonBody(req);
-      if (!body || body.label !== void 0 && typeof body.label !== "string") {
-        ctx.host.http.writeJson(res, 400, { error: "invalid_session_label" });
-        return true;
-      }
-      const updated = observability.renameTerminalSession(sessionId, body.label ?? "");
-      if (!updated) {
-        ctx.host.http.writeJson(res, 404, { error: "session_not_found" });
-        return true;
-      }
-      observability.notifySessionUpdated(updated);
-      const renamedCwd = readPayloadString(ctx.host.operations.get(sessionId)?.payload ?? {}, "cwd") ?? updated.cwdLabel;
-      ctx.host.operations.patch(sessionId, { title: updated.label ?? path27__default.basename(renamedCwd) });
-      injectRenameCommand(sessionId, updated.label);
-      ctx.host.http.writeJson(res, 200, updated);
-      return true;
-    }
     return methodNotAllowed(res);
   }
   async function createSession(cwd, theaterId, cliId, res) {
@@ -42107,11 +41540,8 @@ function createAgentApi(ctx, terminalRuntime, deps) {
     if ((process4.env.FLEET_TERMINAL_CMD ?? "").trim().length > 0) {
       return metadata.map((meta3) => ({ id: meta3.id, label: meta3.label, available: true, signedIn: true }));
     }
-    const [detected, modelAuth] = await Promise.all([
-      detector.detect(),
-      buildModelAuthState(deps.authService)
-    ]);
-    return combineAgentCliLaunchMetadata(metadata, detected, modelAuth.providers);
+    const detected = await detector.detect();
+    return combineAgentCliLaunchMetadata(metadata, detected, []);
   }
   async function buildLaunchKinds() {
     const metadata = await buildAgentCliLaunchMetadata();
@@ -42271,135 +41701,14 @@ function readHookPrompt(value) {
     return void 0;
   }
 }
-
-// ../fleet-plugins/terminal/server/model-auth-routes.ts
-var UPSTREAM_FAILURE_STATUSES = /* @__PURE__ */ new Set(["timeout", "network", "server"]);
-function registerTerminalModelAuthRoutes(ctx, deps) {
-  registerRouter(ctx, "model-auth", createTerminalModelAuthRouter(ctx, {
-    ...deps,
-    validateApiKey: (cli, apiKey) => validateAuthKeyForCli(cli, apiKey)
-  }));
-}
-function createTerminalModelAuthRouter(ctx, deps) {
-  return async function handleTerminalModelAuthRoute({ req, res, pathname }) {
-    const path42 = pathname.slice(`${ctx.basePath}/model-auth`.length) || "/";
-    if (path42 === "/state") {
-      if (req.method !== "GET") {
-        ctx.host.http.writeJson(res, 405, { error: "Method not allowed" });
-        return true;
-      }
-      ctx.host.http.writeJson(res, 200, await buildModelAuthState(deps.authService));
-      return true;
-    }
-    const cli = parseProviderPath(path42);
-    if (!cli) return false;
-    const provider = await findProvider(deps, cli);
-    if (!provider) {
-      ctx.host.http.writeJson(res, 404, { error: "provider_not_found" });
-      return true;
-    }
-    if (req.method === "PUT") {
-      await signInProvider(ctx, req, res, deps, provider);
-      return true;
-    }
-    if (req.method === "DELETE") {
-      await signOutProvider(ctx, req, res, deps, provider);
-      return true;
-    }
-    ctx.host.http.writeJson(res, 405, { error: "Method not allowed" });
-    return true;
-  };
-}
-async function signInProvider(ctx, req, res, deps, provider) {
-  if (!ctx.host.security.isTerminalAuthorized(req)) {
-    ctx.host.http.writeJson(res, 401, { error: "unauthorized" });
-    return;
-  }
-  if (!isJsonRequest(req)) {
-    ctx.host.http.writeJson(res, 415, { error: "unsupported_media_type" });
-    return;
-  }
-  const body = await ctx.host.http.readJsonBody(req);
-  if (!body || typeof body !== "object" || Array.isArray(body)) {
-    ctx.host.http.writeJson(res, 400, { error: "invalid_json" });
-    return;
-  }
-  if (Object.keys(body).length !== 1 || typeof body.apiKey !== "string") {
-    ctx.host.http.writeJson(res, 400, { error: "invalid_api_key" });
-    return;
-  }
-  const apiKey = body.apiKey.trim();
-  if (apiKey.length === 0) {
-    ctx.host.http.writeJson(res, 400, { error: "invalid_api_key" });
-    return;
-  }
-  const providerId = CLI_TO_AUTH_PROVIDER_ID[provider.cli];
-  if (!providerId) {
-    ctx.host.http.writeJson(res, 500, { error: "provider_unavailable" });
-    return;
-  }
-  const validation = await deps.validateApiKey(provider.cli, apiKey);
-  if (validation.status !== "success") {
-    const status = UPSTREAM_FAILURE_STATUSES.has(validation.status) ? 502 : 400;
-    ctx.host.http.writeJson(res, status, {
-      error: formatSignInFailureMessage(provider.displayName, validation.status),
-      status: validation.status
-    });
-    return;
-  }
-  await deps.authService.setApiKey(providerId, apiKey);
-  await writeMutationState(ctx, res, deps);
-}
-async function signOutProvider(ctx, req, res, deps, provider) {
-  if (!ctx.host.security.isTerminalAuthorized(req)) {
-    ctx.host.http.writeJson(res, 401, { error: "unauthorized" });
-    return;
-  }
-  const providerId = CLI_TO_AUTH_PROVIDER_ID[provider.cli];
-  if (!providerId) {
-    ctx.host.http.writeJson(res, 500, { error: "provider_unavailable" });
-    return;
-  }
-  await deps.authService.deleteApiKey(providerId);
-  await writeMutationState(ctx, res, deps);
-}
-async function writeMutationState(ctx, res, deps) {
-  ctx.host.http.writeJson(res, 200, { state: await buildModelAuthState(deps.authService) });
-}
-async function findProvider(deps, cli) {
-  return (await buildModelAuthState(deps.authService)).providers.find((provider) => provider.cli === cli) ?? null;
-}
-function parseProviderPath(path42) {
-  const parts = path42.split("/").filter(Boolean);
-  if (parts.length !== 2 || parts[0] !== "providers") return null;
-  return safeDecodeURIComponent(parts[1] ?? "");
-}
-function safeDecodeURIComponent(value) {
-  try {
-    return decodeURIComponent(value);
-  } catch {
-    return null;
-  }
-}
-function isJsonRequest(req) {
-  const contentType = req.headers["content-type"];
-  return typeof contentType === "string" && contentType.toLowerCase().split(";")[0]?.trim() === "application/json";
-}
-function formatSignInFailureMessage(displayName, status) {
-  switch (status) {
-    case "unauthorized":
-      return `${displayName} rejected the API key. Check the key and try again.`;
-    case "forbidden":
-      return `The API key is not allowed for ${displayName}. Check its permissions.`;
-    case "timeout":
-      return `Validating the ${displayName} API key timed out. Check your connection and try again.`;
-    case "network":
-      return `Could not reach ${displayName} to validate the API key. Check your connection and try again.`;
-    case "server":
-      return `${displayName} returned an error while validating the API key. Try again later.`;
-    default:
-      return `Could not validate the ${displayName} API key. Check the key and try again.`;
-  }
+function withSignatureCli(event, registry3) {
+  if (typeof event !== "object" || event === null) return event;
+  const obj = event;
+  if (obj.type !== "job:registered" || typeof obj.ownerCarrierId !== "string") return event;
+  const config2 = getCarrierConfig(registry3, obj.ownerCarrierId);
+  if (!config2) return event;
+  const signatureCli = resolveAgentCliType2(obj.ownerCarrierId, config2.defaultCliType);
+  return { ...obj, signatureCli };
 }
 
 // ../fleet-plugins/terminal/server/settings-routes.ts
@@ -42414,7 +41723,7 @@ function registerTerminalSettingsRoutes(ctx, deps) {
         ctx.host.http.writeJson(res, 401, { error: "unauthorized" });
         return true;
       }
-      if (!isJsonRequest2(req)) {
+      if (!isJsonRequest(req)) {
         ctx.host.http.writeJson(res, 415, { error: "unsupported_media_type" });
         return true;
       }
@@ -42447,7 +41756,7 @@ function isTerminalSettingsBody(value) {
   const body = value;
   return typeof body.replaceSystemPrompt === "boolean" && typeof body.enableMetaphor === "boolean";
 }
-function isJsonRequest2(req) {
+function isJsonRequest(req) {
   const contentType = req.headers["content-type"];
   return typeof contentType === "string" && contentType.toLowerCase().split(";")[0]?.trim() === "application/json";
 }
@@ -42538,9 +41847,7 @@ var routes_default = definePlugin({
     ctx.host.lifecycle.registerCleanup(unsubscribeDelete);
     registerShellRoutes(ctx, runtime);
     registerTerminalSettingsRoutes(ctx, { globalOptionsService: infraServices.globalOptionsService });
-    registerTerminalModelAuthRoutes(ctx, { authService: infraServices.authService });
     const agentLaunchKinds = registerAgentRoutes(ctx, runtime, {
-      authService: infraServices.authService,
       globalOptionsService: infraServices.globalOptionsService
     });
     registerLaunchCatalog(ctx, async () => [...await agentLaunchKinds(), SHELL_LAUNCH_KIND]);