@kyo-so/cli 0.15.1 → 0.16.0

package/dist/bin/kyoso.js

@@ -183964,7 +183964,7 @@ var JUDGE_MAX_OUTPUT_TOKENS = 4096;
 var RAW_OUTPUT_MAX_CHARS = 16384;
 var TRACE_DIR = ".kyoso/traces";
 var KYOSO_CHILD_AGENT = "KYOSO_CHILD_AGENT";
-var KYOSO_VERSION = "0.15.1";
+var KYOSO_VERSION = "0.16.0";
 
 // src/utils/pathContainment.ts
 import { resolve, sep as sep2 } from "node:path";
@@ -184269,7 +184269,7 @@ var defaultConfig = {
       enabled: true,
       type: "acp",
       command: "npx",
-      args: ["-y", "@agentclientprotocol/codex-acp@1.1.5"],
+      args: ["-y", "@agentclientprotocol/codex-acp@1.1.7"],
       role: "implementation_reviewer",
       timeoutMs: DEFAULT_AGENT_TIMEOUT_MS,
       allowProjectProvider: [],
@@ -184294,7 +184294,7 @@ var defaultConfig = {
       enabled: true,
       type: "acp",
       command: "npx",
-      args: ["-y", "@agentclientprotocol/claude-agent-acp@0.60.0"],
+      args: ["-y", "@agentclientprotocol/claude-agent-acp@0.61.0"],
       role: "architecture_security_reviewer",
       timeoutMs: DEFAULT_AGENT_TIMEOUT_MS,
       env: {
@@ -184405,22 +184405,27 @@ var kyosoConfigOverridePaths = [
   "agents.codex.model",
   "agents.codex.provider",
   "agents.codex.openRouter.streamIdleTimeoutMs",
+  "agents.codex.openRouter.streamIdleTimeoutS",
   "agents.codex.openRouter.streamMaxRetries",
   "agents.codex.openRouter.requestMaxRetries",
   "agents.codex.effort",
   "agents.codex.role",
   "agents.codex.timeoutMs",
+  "agents.codex.timeoutS",
   "agents.claude.enabled",
   "agents.claude.model",
   "agents.claude.effort",
   "agents.claude.role",
   "agents.claude.timeoutMs",
+  "agents.claude.timeoutS",
   "verification.enabled",
   "verification.maxFindings",
   "verification.timeoutMs",
+  "verification.timeoutS",
   "judge.mode",
   "judge.provider",
-  "judge.timeoutMs"
+  "judge.timeoutMs",
+  "judge.timeoutS"
 ];
 var CONFIG_OVERRIDE_PATHS = new Set(kyosoConfigOverridePaths);
 function isAllowedConfigOverridePath(path) {
@@ -184893,6 +184898,7 @@ function agentConfigLeafPaths(agent) {
     `agents.${agent}.effort`,
     `agents.${agent}.role`,
     `agents.${agent}.timeoutMs`,
+    `agents.${agent}.timeoutS`,
     `agents.${agent}.env`,
     `agents.${agent}.auth.mode`,
     `agents.${agent}.auth.preferExistingLogin`,
@@ -184901,7 +184907,7 @@ function agentConfigLeafPaths(agent) {
     `agents.${agent}.auth.envWhitelist`
   ];
   if (agent === "codex") {
-    paths.push("agents.codex.provider", "agents.codex.allowProjectProvider", "agents.codex.openRouter.streamIdleTimeoutMs", "agents.codex.openRouter.streamMaxRetries", "agents.codex.openRouter.requestMaxRetries");
+    paths.push("agents.codex.provider", "agents.codex.allowProjectProvider", "agents.codex.openRouter.streamIdleTimeoutMs", "agents.codex.openRouter.streamIdleTimeoutS", "agents.codex.openRouter.streamMaxRetries", "agents.codex.openRouter.requestMaxRetries");
   }
   return paths;
 }
@@ -184938,12 +184944,15 @@ var kyosoConfigKnownLeafPaths = [
   "judge.mode",
   "judge.provider",
   "judge.timeoutMs",
+  "judge.timeoutS",
   "verification.enabled",
   "verification.maxFindings",
   "verification.timeoutMs",
+  "verification.timeoutS",
   "verification.allowDemotion",
   "reviewBudget.maxModelCalls",
   "reviewBudget.maxTotalWallTimeMs",
+  "reviewBudget.maxTotalWallTimeS",
   "reviewBudget.warnAgentOutputBytes",
   "reviewBudget.maxAgentOutputBytes",
   "reviewBudget.maxFindingsPerAgent",
@@ -186039,6 +186048,146 @@ function isMissingPathError2(error51) {
   return typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "ENOENT";
 }
 
+// src/utils/timeUnits.ts
+class TimeUnitValidationError extends Error {
+  field;
+  constructor(field, message) {
+    super(`${field} ${message}`);
+    this.name = "TimeUnitValidationError";
+    this.field = field;
+  }
+}
+function validateMilliseconds(value, field, constraints = {}) {
+  assertFiniteNumber(value, field);
+  if (!Number.isSafeInteger(value)) {
+    throw new TimeUnitValidationError(field, "must be a safe integer number of milliseconds.");
+  }
+  assertMinimumMilliseconds(value, field, constraints);
+  return value;
+}
+function secondsToMilliseconds(value, field, constraints = {}) {
+  assertFiniteNumber(value, field);
+  const milliseconds = value * 1000;
+  if (!Number.isSafeInteger(milliseconds)) {
+    throw new TimeUnitValidationError(field, "must convert to a safe integer number of milliseconds.");
+  }
+  assertMinimumMilliseconds(milliseconds, field, constraints);
+  return milliseconds;
+}
+function resolveTimeUnitPair(input2, fields, constraints = {}) {
+  const hasMilliseconds = input2.milliseconds !== undefined;
+  const hasSeconds = input2.seconds !== undefined;
+  if (!hasMilliseconds && !hasSeconds)
+    return;
+  const milliseconds = hasMilliseconds ? validateMilliseconds(input2.milliseconds, fields.milliseconds, constraints) : undefined;
+  const secondsMilliseconds = hasSeconds ? secondsToMilliseconds(input2.seconds, fields.seconds, constraints) : undefined;
+  if (secondsMilliseconds !== undefined) {
+    return {
+      milliseconds: secondsMilliseconds,
+      source: "seconds",
+      sourceField: fields.seconds
+    };
+  }
+  return {
+    milliseconds,
+    source: "milliseconds",
+    sourceField: fields.milliseconds
+  };
+}
+function assertFiniteNumber(value, field) {
+  if (typeof value !== "number" || !Number.isFinite(value)) {
+    throw new TimeUnitValidationError(field, "must be a finite number.");
+  }
+}
+function assertMinimumMilliseconds(value, field, constraints) {
+  if (constraints.allowZero && value === 0)
+    return;
+  const minimumMilliseconds = constraints.minimumMilliseconds ?? 1;
+  if (value < minimumMilliseconds) {
+    throw new TimeUnitValidationError(field, `must be at least ${minimumMilliseconds} milliseconds.`);
+  }
+}
+
+// src/config/timeUnits.ts
+var configTimeUnitPairs = [
+  {
+    parentPath: ["agents", "codex"],
+    millisecondsKey: "timeoutMs",
+    secondsKey: "timeoutS"
+  },
+  {
+    parentPath: ["agents", "claude"],
+    millisecondsKey: "timeoutMs",
+    secondsKey: "timeoutS"
+  },
+  {
+    parentPath: ["agents", "codex", "openRouter"],
+    millisecondsKey: "streamIdleTimeoutMs",
+    secondsKey: "streamIdleTimeoutS",
+    constraints: { minimumMilliseconds: 1000 }
+  },
+  {
+    parentPath: ["judge"],
+    millisecondsKey: "timeoutMs",
+    secondsKey: "timeoutS"
+  },
+  {
+    parentPath: ["verification"],
+    millisecondsKey: "timeoutMs",
+    secondsKey: "timeoutS"
+  },
+  {
+    parentPath: ["reviewBudget"],
+    millisecondsKey: "maxTotalWallTimeMs",
+    secondsKey: "maxTotalWallTimeS"
+  }
+];
+function normalizeConfigTimeUnits(input2) {
+  let normalized = input2;
+  for (const pair of configTimeUnitPairs) {
+    normalized = updateRecordAtPath(normalized, pair.parentPath, (parent) => normalizePair(parent, pair));
+  }
+  return normalized;
+}
+function normalizePair(parent, pair) {
+  const hasSecondsProperty = Object.hasOwn(parent, pair.secondsKey);
+  if (!hasSecondsProperty)
+    return parent;
+  const normalized = { ...parent };
+  if (parent[pair.secondsKey] === undefined) {
+    delete normalized[pair.secondsKey];
+    return normalized;
+  }
+  const parentPath = pair.parentPath.join(".");
+  const resolved = resolveTimeUnitPair({
+    milliseconds: parent[pair.millisecondsKey],
+    seconds: parent[pair.secondsKey]
+  }, {
+    milliseconds: `${parentPath}.${pair.millisecondsKey}`,
+    seconds: `${parentPath}.${pair.secondsKey}`
+  }, pair.constraints);
+  if (resolved)
+    normalized[pair.millisecondsKey] = resolved.milliseconds;
+  delete normalized[pair.secondsKey];
+  return normalized;
+}
+function updateRecordAtPath(input2, path, update) {
+  if (path.length === 0) {
+    return isRecord3(input2) ? update(input2) : input2;
+  }
+  if (!isRecord3(input2))
+    return input2;
+  const [key, ...rest] = path;
+  if (key === undefined)
+    return input2;
+  const current = input2[key];
+  const updated = updateRecordAtPath(current, rest, update);
+  return updated === current ? input2 : { ...input2, [key]: updated };
+}
+function isRecord3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
 // src/config/loadConfig.ts
 var configValidationContexts = new WeakMap;
 function getConfigValidationContext(error51) {
@@ -186078,7 +186227,7 @@ async function loadConfig(options = {}) {
   let configTrustStatus = options.ignoreConfig ? "ignored" : "not_found";
   if (!options.ignoreConfig) {
     if (await exists2(globalConfigPath)) {
-      const globalConfig2 = await loadTomlConfigFile(globalConfigPath);
+      const globalConfig2 = normalizeConfigTimeUnits(await loadTomlConfigFile(globalConfigPath));
       validateExplicitReviewBudgetThresholds(globalConfig2, defaultConfig);
       const globalConfigWarnings = collectGlobalConfigWarnings(globalConfigPath, globalConfig2);
       const securitySensitiveWarnings = globalConfigWarnings.filter((warning) => warning.startsWith("security-sensitive unknown settings "));
@@ -186205,7 +186354,7 @@ async function loadProjectConfig(input2) {
   const { canonicalDirectory, canonicalPath, requestedPath } = input2.projectConfig;
   const extension = extname3(requestedPath);
   if (extension === ".toml") {
-    const projectTomlConfig = await loadTomlConfigFile(canonicalPath);
+    const projectTomlConfig = normalizeConfigTimeUnits(await loadTomlConfigFile(canonicalPath));
     const projectChangesOpenRouterPolicy = projectConfigChangesOpenRouterPolicy(projectTomlConfig, input2.baseConfig);
     await assertProjectOpenRouterAuthorization({
       projectConfig: projectTomlConfig,
@@ -186251,7 +186400,7 @@ function configSelectsOpenRouter(config2) {
   return flattenLeaves(config2).some((leaf) => leaf.path.join(".") === "agents.codex.provider" && leaf.value === CODEX_OPENROUTER_PROVIDER);
 }
 function applyProjectCodexProviderReset(baseConfig, projectConfig, mergedConfig) {
-  if (!projectConfigSelectsDefaultProvider(projectConfig) || !configSelectsOpenRouter(baseConfig) || !isRecord3(mergedConfig) || !isRecord3(mergedConfig.agents) || !isRecord3(mergedConfig.agents.codex)) {
+  if (!projectConfigSelectsDefaultProvider(projectConfig) || !configSelectsOpenRouter(baseConfig) || !isRecord4(mergedConfig) || !isRecord4(mergedConfig.agents) || !isRecord4(mergedConfig.agents.codex)) {
     return mergedConfig;
   }
   const shouldClearInheritedModel = !projectConfigSuppliesCodexModel(projectConfig);
@@ -186283,13 +186432,13 @@ async function assertProjectOpenRouterAuthorization(input2) {
   });
 }
 async function projectProviderIsAuthorized(config2, projectDirectory) {
-  if (!isRecord3(config2))
+  if (!isRecord4(config2))
     return false;
   const agents = config2.agents;
-  if (!isRecord3(agents))
+  if (!isRecord4(agents))
     return false;
   const codex = agents.codex;
-  if (!isRecord3(codex) || !Array.isArray(codex.allowProjectProvider)) {
+  if (!isRecord4(codex) || !Array.isArray(codex.allowProjectProvider)) {
     return false;
   }
   for (const directory of codex.allowProjectProvider) {
@@ -186332,7 +186481,7 @@ async function loadProjectTsConfig(input2) {
     options: input2.options
   });
   if (trustDecision.execute) {
-    const userConfig = await loadUserConfig(canonicalPath, source);
+    const userConfig = normalizeConfigTimeUnits(await loadUserConfig(canonicalPath, source));
     validateExplicitReviewBudgetThresholds(userConfig, input2.baseConfig);
     const projectChangesOpenRouterPolicy = projectConfigChangesOpenRouterPolicy(userConfig, input2.baseConfig);
     await assertProjectOpenRouterAuthorization({
@@ -186419,7 +186568,7 @@ async function promptForConfigTrust(configPath, configHash) {
   }
 }
 function deepMerge2(base, override) {
-  if (!isRecord3(base) || !isRecord3(override))
+  if (!isRecord4(base) || !isRecord4(override))
     return override ?? base;
   const result = { ...base };
   for (const [key, value] of Object.entries(override)) {
@@ -186439,12 +186588,12 @@ function validateExplicitReviewBudgetThresholds(config2, baseConfig) {
   }
 }
 function readRecord(value, key) {
-  if (!isRecord3(value))
+  if (!isRecord4(value))
     return;
   const nested = value[key];
-  return isRecord3(nested) ? nested : undefined;
+  return isRecord4(nested) ? nested : undefined;
 }
-function isRecord3(value) {
+function isRecord4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 async function exists2(path) {
@@ -186479,7 +186628,7 @@ function createModelExecutionIdentity(input2) {
   };
 }
 function normalizeModelExecutionIdentity(value) {
-  if (!isRecord4(value) || !isModelProviderRoute(value.providerRoute)) {
+  if (!isRecord5(value) || !isModelProviderRoute(value.providerRoute)) {
     return;
   }
   return createModelExecutionIdentity({
@@ -186501,7 +186650,7 @@ function sanitizeIdentityValue(value) {
 function isModelProviderRoute(value) {
   return typeof value === "string" && MODEL_PROVIDER_ROUTES.has(value);
 }
-function isRecord4(value) {
+function isRecord5(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 
@@ -186515,7 +186664,7 @@ var TOKEN_USAGE_KEYS = [
   "cachedWriteTokens"
 ];
 function normalizeModelTokenUsage(usage) {
-  if (!isRecord5(usage))
+  if (!isRecord6(usage))
     return;
   const normalized = {};
   for (const key of TOKEN_USAGE_KEYS) {
@@ -186528,7 +186677,7 @@ function normalizeModelTokenUsage(usage) {
 function isTokenCount(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
 }
-function isRecord5(value) {
+function isRecord6(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -186580,7 +186729,7 @@ function parseJudgeOutput(text, fallbackSummaryText) {
   const parsed = JSON.parse(json2);
   const summaryText = typeof parsed.summaryText === "string" && parsed.summaryText.trim().length > 0 ? sanitizeText(parsed.summaryText) : fallbackSummaryText;
   const disagreementComments = Array.isArray(parsed.disagreementComments) ? parsed.disagreementComments.flatMap((item) => {
-    if (!isRecord6(item) || typeof item.topic !== "string" || typeof item.judgeComment !== "string") {
+    if (!isRecord7(item) || typeof item.topic !== "string" || typeof item.judgeComment !== "string") {
       return [];
     }
     return [
@@ -186596,7 +186745,7 @@ function parseJudgeOutput(text, fallbackSummaryText) {
   return { summaryText, disagreementComments, analysis };
 }
 function parseAnalysis(value) {
-  if (!isRecord6(value))
+  if (!isRecord7(value))
     return;
   if (!Array.isArray(value.blindSpots) || !Array.isArray(value.contradictions) || !Array.isArray(value.partialCoverage)) {
     return;
@@ -186604,7 +186753,7 @@ function parseAnalysis(value) {
   return {
     blindSpots: value.blindSpots.slice(0, ANALYSIS_MAX_ITEMS).flatMap((item) => typeof item === "string" ? [sanitizeAnalysisText(item)] : []),
     contradictions: value.contradictions.slice(0, ANALYSIS_MAX_ITEMS).flatMap((item) => {
-      if (!isRecord6(item) || typeof item.topic !== "string" || typeof item.detail !== "string") {
+      if (!isRecord7(item) || typeof item.topic !== "string" || typeof item.detail !== "string") {
         return [];
       }
       return [
@@ -186615,7 +186764,7 @@ function parseAnalysis(value) {
       ];
     }),
     partialCoverage: value.partialCoverage.slice(0, ANALYSIS_MAX_ITEMS).flatMap((item) => {
-      if (!isRecord6(item) || typeof item.note !== "string")
+      if (!isRecord7(item) || typeof item.note !== "string")
         return [];
       const findingId = typeof item.findingId === "string" ? sanitizeAnalysisText(item.findingId) : undefined;
       return [
@@ -186662,7 +186811,7 @@ function extractFirstJsonObject(text) {
   }
   return;
 }
-function isRecord6(value) {
+function isRecord7(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -187156,9 +187305,9 @@ var PLUGIN_RUNTIME_COMPATIBILITY_SCHEMA_VERSION = 2;
 var MINIMUM_SUPPORTED_CODEX_VERSION = "0.144.0-alpha.4";
 var PLUGIN_RUNTIME_EXPECTED_CONTRACT = {
   distribution: {
-    pluginVersion: "0.7.5",
+    pluginVersion: "0.7.7",
     mcpCommand: "npx",
-    mcpPackagePin: "@kyo-so/cli@0.15.0",
+    mcpPackagePin: "@kyo-so/cli@0.15.2",
     mcpExecutable: "kyoso"
   },
   marketplace: {
@@ -187404,7 +187553,7 @@ function parseJson(value) {
   }
 }
 function parsePluginList(value) {
-  if (!isRecord7(value))
+  if (!isRecord8(value))
     return;
   const allowedKeys = new Set(PLUGIN_LIST_JSON_SCHEMA.collections);
   if (Object.keys(value).some((key) => !allowedKeys.has(key))) {
@@ -187432,7 +187581,7 @@ function parsePluginEntries(value) {
     return;
   const entries = [];
   for (const item of value) {
-    if (!isRecord7(item))
+    if (!isRecord8(item))
       return;
     if (typeof item.pluginId !== "string" || typeof item.installed !== "boolean" || typeof item.enabled !== "boolean") {
       return;
@@ -187458,7 +187607,7 @@ function parseMcpList(value) {
     return;
   const matches = [];
   for (const item of value) {
-    if (!isRecord7(item) || typeof item.name !== "string")
+    if (!isRecord8(item) || typeof item.name !== "string")
       return "unknown";
     if (item.name !== "kyoso")
       continue;
@@ -187540,7 +187689,7 @@ function comparePrerelease(left, right) {
   }
   return 0;
 }
-function isRecord7(value) {
+function isRecord8(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -187701,7 +187850,7 @@ function findKyosoPackage(executable) {
     if (existsSync(packagePath)) {
       try {
         const parsed = JSON.parse(readFileSync(packagePath, "utf8"));
-        if (isRecord8(parsed) && parsed.name === "@kyo-so/cli" && typeof parsed.version === "string" && parsed.version.trim().length > 0) {
+        if (isRecord9(parsed) && parsed.name === "@kyo-so/cli" && typeof parsed.version === "string" && parsed.version.trim().length > 0) {
           return { directory, version: parsed.version };
         }
       } catch {}
@@ -187870,7 +188019,7 @@ function isWithin(path, parent) {
   const relativePath = relative(resolve5(parent), resolve5(path));
   return relativePath === "" || !relativePath.startsWith(`..${process.platform === "win32" ? "\\" : "/"}`) && relativePath !== ".." && !isAbsolute4(relativePath);
 }
-function isRecord8(value) {
+function isRecord9(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -187915,7 +188064,7 @@ var GENERATED_MCP_ENV_VAR_NAMES = new Set([
   "CLAUDE_CODE_OAUTH_TOKEN"
 ]);
 function inspectManualMcpInvocation(value) {
-  if (!isRecord9(value)) {
+  if (!isRecord10(value)) {
     return { kind: "unknown", reason: "MCP entry is not an object." };
   }
   if (typeof value.command !== "string" || value.command.length === 0) {
@@ -187961,7 +188110,7 @@ function applyEnvironmentSafety(invocation, environment) {
   return environment ?? invocation;
 }
 function isGeneratedMcpEnvironment(value) {
-  if (!isRecord9(value))
+  if (!isRecord10(value))
     return false;
   return Object.entries(value).every(([name, placeholder]) => GENERATED_MCP_ENV_VALUE_NAMES.has(name) && placeholder === `\${${name}}`);
 }
@@ -188069,7 +188218,7 @@ function versionFromKnownPackageSpec(packageSpec) {
   const version2 = packageSpec.slice(prefix.length);
   return isCompleteSemVer(version2) ? version2 : undefined;
 }
-function isRecord9(value) {
+function isRecord10(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isString(value) {
@@ -188102,8 +188251,14 @@ import {
 } from "node:path";
 
 // src/cli/knownSkillDigests.ts
-var CURRENT_SKILL_DIGEST = "sha256:d28acaadf490df9e58e12f195804f181a683d0d33344275d7989efbee26a4504";
+var CURRENT_SKILL_DIGEST = "sha256:1ea8914f4657741fcd544822326f80e82033078f8e2b11b1f5aad420072dcb39";
 var KNOWN_SKILL_DIGESTS_BY_VERSION = {
+  "0.15.2": [
+    {
+      digest: "sha256:d28acaadf490df9e58e12f195804f181a683d0d33344275d7989efbee26a4504",
+      kind: "historical"
+    }
+  ],
   "0.13.1": [
     {
       digest: "sha256:8654e68ea61f2acea29027056802bf627ad737f084c9a86ab052946943538409",
@@ -189366,7 +189521,7 @@ function parseJsonObject(path, content) {
   if (content.trim().length === 0)
     return {};
   const parsed = JSON.parse(content);
-  if (!isRecord10(parsed))
+  if (!isRecord11(parsed))
     throw new Error(`${path} must contain a JSON object`);
   return parsed;
 }
@@ -189375,7 +189530,7 @@ function inspectCodexAppendSafety(content, cwd, home) {
     return { ok: true };
   try {
     const parsed = parse5(content);
-    if (!isRecord10(parsed)) {
+    if (!isRecord11(parsed)) {
       return {
         ok: false,
         detail: "Codex config is not a TOML object and was left unchanged."
@@ -189387,13 +189542,13 @@ function inspectCodexAppendSafety(content, cwd, home) {
         detail: "Codex has a project-scoped MCP or Plugin override; the global config was left unchanged."
       };
     }
-    if ("mcp_servers" in parsed && !isRecord10(parsed.mcp_servers)) {
+    if ("mcp_servers" in parsed && !isRecord11(parsed.mcp_servers)) {
       return {
         ok: false,
         detail: "Codex mcp_servers is malformed and was left unchanged."
       };
     }
-    if (isRecord10(parsed.mcp_servers) && "kyoso" in parsed.mcp_servers) {
+    if (isRecord11(parsed.mcp_servers) && "kyoso" in parsed.mcp_servers) {
       return {
         ok: false,
         detail: "Codex already defines mcp_servers.kyoso in a form setup cannot safely extend; migrate it manually."
@@ -189429,7 +189584,7 @@ function inspectCodexMcpContent(content, path, cwd, home) {
         value: undefined
       });
     }
-    if (!isRecord10(parsed) || !isRecord10(parsed.mcp_servers)) {
+    if (!isRecord11(parsed) || !isRecord11(parsed.mcp_servers)) {
       return manualMcpRegistration({
         path,
         scope: "codex-global",
@@ -189457,7 +189612,7 @@ function inspectCodexMcpContent(content, path, cwd, home) {
 function inspectClaudeProjectMcp(current, path) {
   if (!("mcpServers" in current))
     return;
-  if (!isRecord10(current.mcpServers)) {
+  if (!isRecord11(current.mcpServers)) {
     return manualMcpRegistration({
       path,
       scope: "claude-project",
@@ -190087,7 +190242,7 @@ function detectCodexMcp(path, cwd, home) {
         value: undefined
       }));
     }
-    if (!isRecord10(parsed)) {
+    if (!isRecord11(parsed)) {
       return singleMcpDetection(manualMcpRegistration({
         path,
         scope: "codex-global",
@@ -190097,7 +190252,7 @@ function detectCodexMcp(path, cwd, home) {
     }
     if (!("mcp_servers" in parsed))
       return missingMcpDetection();
-    if (!isRecord10(parsed.mcp_servers)) {
+    if (!isRecord11(parsed.mcp_servers)) {
       return singleMcpDetection(manualMcpRegistration({
         path,
         scope: "codex-global",
@@ -190147,7 +190302,7 @@ function detectClaudeMcp(path, cwd, home) {
 }
 function jsonMcpRegistrations(value, path, cwd, home) {
   const directScope = path.endsWith(".mcp.json") ? "claude-project" : "claude-global";
-  if (!isRecord10(value)) {
+  if (!isRecord11(value)) {
     return [
       manualMcpRegistration({
         path,
@@ -190160,7 +190315,7 @@ function jsonMcpRegistrations(value, path, cwd, home) {
   const registrations = directMcpRegistrations(value, path, directScope);
   if (!("projects" in value))
     return registrations;
-  if (!isRecord10(value.projects)) {
+  if (!isRecord11(value.projects)) {
     return [
       ...registrations,
       manualMcpRegistration({
@@ -190175,7 +190330,7 @@ function jsonMcpRegistrations(value, path, cwd, home) {
   for (const [projectPath, projectConfig] of Object.entries(value.projects)) {
     if (normalizeProjectPath(projectPath, home) !== currentProject)
       continue;
-    if (!isRecord10(projectConfig)) {
+    if (!isRecord11(projectConfig)) {
       registrations.push(manualMcpRegistration({
         path,
         scope: "claude-global-project",
@@ -190191,7 +190346,7 @@ function jsonMcpRegistrations(value, path, cwd, home) {
 function directMcpRegistrations(value, path, scope) {
   if (!("mcpServers" in value))
     return [];
-  if (!isRecord10(value.mcpServers)) {
+  if (!isRecord11(value.mcpServers)) {
     return [
       manualMcpRegistration({
         path,
@@ -190215,7 +190370,7 @@ function directMcpRegistrations(value, path, scope) {
 function nestedMcpEntryStatus(value, path) {
   let current = value;
   for (const key of path) {
-    if (!isRecord10(current))
+    if (!isRecord11(current))
       return "unknown";
     if (!(key in current))
       return "missing";
@@ -190224,11 +190379,11 @@ function nestedMcpEntryStatus(value, path) {
   return mcpEntryStatus(current);
 }
 function hasUnprobedProjectIntegrationOverride(value, cwd, home) {
-  if (!isRecord10(value) || !isRecord10(value.projects))
+  if (!isRecord11(value) || !isRecord11(value.projects))
     return false;
   const currentProject = normalizeProjectPath(cwd, home);
   for (const [projectPath, projectConfig] of Object.entries(value.projects)) {
-    if (normalizeProjectPath(projectPath, home) !== currentProject || !isRecord10(projectConfig)) {
+    if (normalizeProjectPath(projectPath, home) !== currentProject || !isRecord11(projectConfig)) {
       continue;
     }
     if ("mcp_servers" in projectConfig || "plugins" in projectConfig) {
@@ -190251,7 +190406,7 @@ function normalizeProjectPath(path, home) {
   return process.platform === "win32" ? normalized.toLowerCase() : normalized;
 }
 function mcpEntryStatus(value) {
-  if (!isRecord10(value))
+  if (!isRecord11(value))
     return "unknown";
   if (!("enabled" in value))
     return "enabled";
@@ -190302,7 +190457,7 @@ function readTextSync(path) {
 function recordValue(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value) ? value : {};
 }
-function isRecord10(value) {
+function isRecord11(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function diffForAppend(path, snippet) {
@@ -190506,12 +190661,13 @@ async function runDoctor(options) {
   }
   const judgeRoute = resolveJudgeCallRoute(loaded.config.judge.mode, loaded.config.judge.provider, env);
   const reviewTiming = calculateReviewTiming(loaded.config, judgeRoute.llmAvailable);
+  const recommendedReviewWallTimeS = Math.ceil(reviewTiming.recommendedReviewWallTimeMs / 1000);
   lines.push("", "Review timing");
   lines.push(`  review-wide deadline: ${loaded.config.reviewBudget.maxTotalWallTimeMs} ms`, `  sequential phases: primary ${reviewTiming.primaryPhaseMs} + verification ${reviewTiming.verificationPhaseMs} + LLM judge ${reviewTiming.judgePhaseMs} = ${reviewTiming.sequentialPhaseMs} ms`, `  recommended review-wide deadline: ${reviewTiming.recommendedReviewWallTimeMs} ms`);
   if (loaded.config.reviewBudget.maxTotalWallTimeMs < reviewTiming.sequentialPhaseMs) {
-    lines.push(`  warning: review-wide deadline is insufficient: ${loaded.config.reviewBudget.maxTotalWallTimeMs} ms is below the configured sequential phase time of ${reviewTiming.sequentialPhaseMs} ms; later phases cannot receive their configured timeout.`, `  hint: set user-global reviewBudget.maxTotalWallTimeMs to at least ${reviewTiming.recommendedReviewWallTimeMs}.`);
+    lines.push(`  warning: review-wide deadline is insufficient: ${loaded.config.reviewBudget.maxTotalWallTimeMs} ms is below the configured sequential phase time of ${reviewTiming.sequentialPhaseMs} ms; later phases cannot receive their configured timeout.`, `  hint: set user-global reviewBudget.maxTotalWallTimeS to at least ${recommendedReviewWallTimeS}.`);
   } else if (loaded.config.reviewBudget.maxTotalWallTimeMs < reviewTiming.recommendedReviewWallTimeMs) {
-    lines.push(`  warning: review-wide deadline has low margin: ${loaded.config.reviewBudget.maxTotalWallTimeMs} ms is below the recommended ${reviewTiming.recommendedReviewWallTimeMs} ms; scheduling and finalization margin is reduced.`, `  hint: set user-global reviewBudget.maxTotalWallTimeMs to at least ${reviewTiming.recommendedReviewWallTimeMs}.`);
+    lines.push(`  warning: review-wide deadline has low margin: ${loaded.config.reviewBudget.maxTotalWallTimeMs} ms is below the recommended ${reviewTiming.recommendedReviewWallTimeMs} ms; scheduling and finalization margin is reduced.`, `  hint: set user-global reviewBudget.maxTotalWallTimeS to at least ${recommendedReviewWallTimeS}.`);
   }
   const judgeProvider = judgeRoute.llmAvailable ? judgeRoute.provider : "deterministic_fallback";
   lines.push("", "Judge");
@@ -191322,6 +191478,9 @@ var zToolCallUpdate = object({
   title: defaultOnError(string2().nullish(), () => {
     return;
   }),
+  name: defaultOnError(string2().nullish(), () => {
+    return;
+  }),
   content: defaultOnError(vecSkipError(zToolCallContent).nullish(), () => {
     return;
   }),
@@ -192433,6 +192592,9 @@ var zContentChunk = object({
 var zToolCall = object({
   toolCallId: zToolCallId,
   title: string2(),
+  name: defaultOnError(string2().nullish(), () => {
+    return;
+  }),
   kind: defaultOnError(zToolKind.optional(), () => {
     return;
   }),
@@ -193356,37 +193518,71 @@ var zCancelRequestNotification = object({
   })
 });
 
-// node_modules/@agentclientprotocol/sdk/dist/schema/guards.gen.js
-var zGuardCreateElicitationRequestForm = zElicitationFormMode.and(object({ mode: literal("form") })).and(object({ message: string2() }));
-var zGuardCreateElicitationRequestUrl = zElicitationUrlMode.and(object({ mode: literal("url") })).and(object({ message: string2() }));
-var zGuardCreateElicitationRequestCustom = union([zElicitationSessionScope, zElicitationRequestScope]).and(object({ message: string2() }));
-var zGuardElicitationPropertySchemaString = zStringPropertySchema.and(object({ type: literal("string") }));
-var zGuardElicitationPropertySchemaNumber = zNumberPropertySchema.and(object({ type: literal("number") }));
-var zGuardElicitationPropertySchemaInteger = zIntegerPropertySchema.and(object({ type: literal("integer") }));
-var zGuardElicitationPropertySchemaBoolean = zBooleanPropertySchema.and(object({ type: literal("boolean") }));
-var zGuardElicitationPropertySchemaArray = zMultiSelectPropertySchema.and(object({ type: literal("array") }));
-var zGuardMultiSelectItemsString = zStringMultiSelectItems.and(object({ type: literal("string") }));
-var zGuardCreateElicitationResponseAccept = zElicitationAcceptAction.and(object({ action: literal("accept") }));
-var zGuardCreateElicitationResponseDecline = object({
-  action: literal("decline")
-});
-var zGuardCreateElicitationResponseCancel = object({
-  action: literal("cancel")
-});
 // node_modules/@agentclientprotocol/sdk/dist/jsonrpc.js
 var CANCEL_REQUEST_METHOD = "$/cancel_request";
-function isRecord11(value) {
+function isRequestMessage(value) {
+  return isJsonRpcEnvelope(value) && "id" in value && typeof value["method"] === "string" && isJsonRpcId(value["id"]);
+}
+function isResponseMessage(value) {
+  if (!isJsonRpcEnvelope(value) || "method" in value) {
+    return false;
+  }
+  if (!("id" in value) || !isJsonRpcId(value["id"])) {
+    return false;
+  }
+  const hasResult = Object.hasOwn(value, "result");
+  const hasError = Object.hasOwn(value, "error");
+  if (hasResult === hasError) {
+    return false;
+  }
+  return !hasError || isErrorResponse(value["error"]);
+}
+function isNotificationMessage(value) {
+  return isJsonRpcEnvelope(value) && !("id" in value) && typeof value["method"] === "string";
+}
+function isRecord12(value) {
   return typeof value === "object" && value !== null;
 }
+function isJsonRpcEnvelope(value) {
+  return isRecord12(value) && value["jsonrpc"] === "2.0";
+}
 function isJsonRpcId(value) {
   return value === null || typeof value === "string" || typeof value === "number" && Number.isFinite(value);
 }
+function isResponseShapedMessage(value) {
+  return isRecord12(value) && !("method" in value) && (("id" in value) || ("result" in value) || ("error" in value));
+}
+function isResponseBatch(batch) {
+  let hasValidCall = false;
+  let hasValidResponse = false;
+  let hasCallShape = false;
+  let hasResponseShape = false;
+  for (const entry of batch) {
+    hasValidCall ||= isRequestMessage(entry) || isNotificationMessage(entry);
+    hasValidResponse ||= isResponseMessage(entry);
+    if (!isRecord12(entry)) {
+      continue;
+    }
+    hasCallShape ||= "method" in entry;
+    hasResponseShape ||= "result" in entry || "error" in entry;
+  }
+  if (hasValidCall) {
+    return false;
+  }
+  if (hasValidResponse) {
+    return true;
+  }
+  return hasResponseShape && !hasCallShape;
+}
 function cancelRequestId(params) {
-  if (!isRecord11(params) || !isJsonRpcId(params["requestId"])) {
+  if (!isRecord12(params) || !isJsonRpcId(params["requestId"])) {
     return;
   }
   return params["requestId"];
 }
+function isErrorResponse(value) {
+  return isRecord12(value) && typeof value["code"] === "number" && Number.isInteger(value["code"]) && typeof value["message"] === "string";
+}
 var Handled = {
   yes() {
     return { handled: true };
@@ -193515,6 +193711,9 @@ class ConnectionContext {
   sendNotification(method, params) {
     return this.connection.sendNotification(method, params);
   }
+  sendBatch(entries) {
+    return this.connection.sendBatch(entries);
+  }
   sendCancelRequest(requestId) {
     return this.connection.sendCancelRequest(requestId);
   }
@@ -193542,6 +193741,7 @@ class Connection {
   retryQueue = [];
   context = new ConnectionContext(this);
   receiveReader;
+  allowBatches = true;
   constructor(requestHandlerOrStream, notificationHandlerOrHandlers, streamOrOptions, options) {
     if (typeof requestHandlerOrStream === "function") {
       const requestHandler = requestHandlerOrStream;
@@ -193550,16 +193750,13 @@ class Connection {
       this.initialize(stream2, [
         ...options?.handlers ?? [],
         this.legacyHandler(requestHandler, notificationHandler)
-      ]);
+      ], options);
       return;
     }
     const stream = requestHandlerOrStream;
     const handlers = notificationHandlerOrHandlers;
     const connectionOptions = streamOrOptions;
-    this.initialize(stream, [
-      ...connectionOptions?.handlers ?? [],
-      ...handlers
-    ]);
+    this.initialize(stream, [...connectionOptions?.handlers ?? [], ...handlers], connectionOptions);
   }
   static builder() {
     return new ConnectionBuilder;
@@ -193604,14 +193801,73 @@ class Connection {
     if (this.abortController.signal.aborted) {
       return rejectedPromise(this.closedReason());
     }
+    const request = this.prepareRequest(method, params, mapResponse, options);
+    const requestSent = this.sendWireMessage(request.message);
+    requestSent.catch(() => {});
+    if (options.cancellationSignal?.aborted) {
+      request.cancel();
+    }
+    return request.response;
+  }
+  sendBatch(entries) {
+    if (this.abortController.signal.aborted) {
+      return rejectedPromise(this.closedReason());
+    }
+    if (!this.allowBatches) {
+      return rejectedPromise(new TypeError("JSON-RPC batches are not supported on this connection"));
+    }
+    if (entries.length === 0) {
+      return rejectedPromise(new TypeError("JSON-RPC batch must contain at least one entry"));
+    }
+    const messages = [];
+    const cancellations = [];
+    const outputs = [];
+    for (const entry of entries) {
+      if (entry.kind === "notification") {
+        messages.push({
+          jsonrpc: "2.0",
+          method: entry.method,
+          params: entry.params
+        });
+        outputs.push(Promise.resolve(undefined));
+        continue;
+      }
+      const request = this.prepareRequest(entry.method, entry.params, entry.mapResponse, entry.options);
+      messages.push(request.message);
+      outputs.push(request.response);
+      cancellations.push({
+        signal: entry.options?.cancellationSignal,
+        cancel: request.cancel
+      });
+    }
+    const batch = messages;
+    const batchSent = this.sendWireMessage(batch);
+    for (const cancellation of cancellations) {
+      if (cancellation.signal?.aborted) {
+        cancellation.cancel();
+      }
+    }
+    const response = Promise.all([batchSent, ...outputs]).then(([, ...resolved]) => resolved);
+    response.catch(() => {});
+    return response;
+  }
+  sendCancelRequest(requestId) {
+    return this.sendNotification(CANCEL_REQUEST_METHOD, { requestId });
+  }
+  sendNotification(method, params) {
+    if (this.abortController.signal.aborted) {
+      return rejectedPromise(this.closedReason());
+    }
+    return this.sendWireMessage({ jsonrpc: "2.0", method, params });
+  }
+  prepareRequest(method, params, mapResponse, options = {}) {
     const id = this.nextRequestId++;
     let cancel = () => {};
-    const responsePromise = new Promise((resolve9, reject) => {
+    const response = new Promise((resolve9, reject) => {
       const pendingResponse = {
-        resolve: (response) => {
+        resolve: (value) => {
           try {
-            const value = mapResponse ? mapResponse(response) : response;
-            resolve9(value);
+            resolve9(mapResponse ? mapResponse(value) : value);
           } catch (error51) {
             reject(error51);
           }
@@ -193634,27 +193890,12 @@ class Connection {
       };
       this.pendingResponses.set(id, pendingResponse);
     });
-    responsePromise.catch(() => {});
-    const requestSent = this.sendMessage({
-      jsonrpc: "2.0",
-      id,
-      method,
-      params
-    });
-    requestSent.catch(() => {});
-    if (options.cancellationSignal?.aborted) {
-      cancel();
-    }
-    return responsePromise;
-  }
-  sendCancelRequest(requestId) {
-    return this.sendNotification(CANCEL_REQUEST_METHOD, { requestId });
-  }
-  sendNotification(method, params) {
-    if (this.abortController.signal.aborted) {
-      return rejectedPromise(this.closedReason());
-    }
-    return this.sendMessage({ jsonrpc: "2.0", method, params });
+    response.catch(() => {});
+    return {
+      message: { jsonrpc: "2.0", id, method, params },
+      response,
+      cancel: () => cancel()
+    };
   }
   close(error51) {
     if (this.abortController.signal.aborted) {
@@ -193673,9 +193914,10 @@ class Connection {
     this.incomingRequests.clear();
     this.receiveReader?.cancel(closeError).catch(() => {});
   }
-  initialize(stream, handlers) {
+  initialize(stream, handlers, options) {
     this.stream = stream;
     this.staticHandlers = handlers;
+    this.allowBatches = options?.allowBatches ?? true;
     this.closedPromise = new Promise((resolve9) => {
       this.abortController.signal.addEventListener("abort", () => resolve9());
     });
@@ -193711,7 +193953,7 @@ class Connection {
           if (!message) {
             continue;
           }
-          this.receiveMessage(message);
+          this.receiveWireMessage(message);
         }
       } finally {
         if (this.receiveReader === reader) {
@@ -193725,24 +193967,91 @@ class Connection {
       this.close(closeError);
     }
   }
-  receiveMessage(message) {
-    if (this.abortController.signal.aborted) {
+  receiveWireMessage(message) {
+    if (Array.isArray(message)) {
+      if (!this.allowBatches) {
+        this.close(new TypeError("JSON-RPC batches are not supported on this connection"));
+        return;
+      }
+      this.receiveBatch(message);
       return;
     }
-    if (!isRecord11(message)) {
+    if (!isRecord12(message)) {
       console.error("Invalid message", { message });
       return;
     }
+    this.receiveMessage(message);
+  }
+  receiveBatch(batch) {
+    if (batch.length === 0) {
+      this.sendWireMessage({
+        jsonrpc: "2.0",
+        id: null,
+        error: RequestError.invalidRequest(batch).toErrorResponse()
+      }).catch(() => {});
+      return;
+    }
+    const responseBatch = isResponseBatch(batch);
+    const responseCount = responseBatch ? 0 : batch.reduce((count, message) => count + (isNotificationMessage(message) ? 0 : 1), 0);
+    let remaining = responseCount;
+    let remainingNotifications = batch.reduce((count, message) => count + (isNotificationMessage(message) ? 1 : 0), 0);
+    let responseSent = false;
+    const responses = [];
+    const sendResponsesIfReady = async () => {
+      if (responseSent || remaining !== 0 || remainingNotifications !== 0 || responses.length === 0) {
+        return;
+      }
+      responseSent = true;
+      await this.sendWireMessage(responses);
+    };
+    const collectResponse = async (response) => {
+      responses.push(response);
+      remaining -= 1;
+      await sendResponsesIfReady();
+    };
+    for (const message of batch) {
+      if (responseBatch) {
+        if (isResponseShapedMessage(message)) {
+          this.receiveMessage(message);
+        }
+        continue;
+      }
+      if (!isRequestMessage(message) && !isNotificationMessage(message)) {
+        collectResponse({
+          jsonrpc: "2.0",
+          id: null,
+          error: RequestError.invalidRequest(message).toErrorResponse()
+        }).catch(() => {});
+        continue;
+      }
+      const processing = this.receiveMessage(message, isRequestMessage(message) ? collectResponse : undefined);
+      if (isNotificationMessage(message)) {
+        processing.finally(() => {
+          remainingNotifications -= 1;
+          sendResponsesIfReady().catch((error51) => this.close(error51));
+        });
+      }
+    }
+  }
+  receiveMessage(message, sendResponse) {
+    if (this.abortController.signal.aborted) {
+      return Promise.resolve();
+    }
+    if (!isRecord12(message)) {
+      console.error("Invalid message", { message });
+      return Promise.resolve();
+    }
     if ("method" in message) {
       if (!("id" in message)) {
         this.handleProtocolNotification(message);
       }
-      this.processIncomingMessage(this.toIncomingMessage(message)).catch((error51) => this.close(error51));
+      return this.processIncomingMessage(this.toIncomingMessage(message, sendResponse)).catch((error51) => this.close(error51));
     } else if ("id" in message) {
       this.handleResponse(message);
     } else {
       console.error("Invalid message", { message });
     }
+    return Promise.resolve();
   }
   async processIncomingMessage(message) {
     if (this.abortController.signal.aborted) {
@@ -193786,7 +194095,7 @@ class Connection {
       }
     }
   }
-  toIncomingMessage(message) {
+  toIncomingMessage(message, sendResponse) {
     if ("id" in message) {
       const abortController = new AbortController;
       this.incomingRequests.set(message.id, abortController);
@@ -193801,11 +194110,14 @@ class Connection {
         params: message.params,
         raw: message,
         signal: abortController.signal,
-        responder: new RequestResponder(message.id, (result) => this.sendMessage({
-          jsonrpc: "2.0",
-          id: message.id,
-          ...result
-        }), abortController.signal, finishRequest)
+        responder: new RequestResponder(message.id, (result) => {
+          const response = {
+            jsonrpc: "2.0",
+            id: message.id,
+            ...result
+          };
+          return sendResponse ? sendResponse(response) : this.sendWireMessage(response);
+        }, abortController.signal, finishRequest)
       };
     }
     return {
@@ -193820,13 +194132,13 @@ class Connection {
     if (pendingResponse) {
       this.pendingResponses.delete(response.id);
       pendingResponse.cleanup?.();
-      if ("result" in response) {
+      if (!isResponseMessage(response)) {
+        pendingResponse.reject(RequestError.invalidRequest(response));
+      } else if ("result" in response) {
         pendingResponse.resolve(response.result);
-      } else if ("error" in response && isRecord11(response.error)) {
+      } else {
         const { code, message, data } = response.error;
         pendingResponse.reject(new RequestError(code, message, data));
-      } else {
-        pendingResponse.reject(RequestError.invalidRequest(response));
       }
     } else {
       console.error("Got response to unknown request", response.id);
@@ -193849,7 +194161,7 @@ class Connection {
   closedReason() {
     return this.abortController.signal.reason ?? new Error("ACP connection closed");
   }
-  async sendMessage(message) {
+  async sendWireMessage(message) {
     if (this.abortController.signal.aborted) {
       return rejectedPromise(this.closedReason());
     }
@@ -194032,7 +194344,7 @@ function ndJsonStream(output2, input2) {
         if (trimmedLine) {
           try {
             const message = JSON.parse(trimmedLine);
-            if (isRecord11(message)) {
+            if (isRecord12(message) || Array.isArray(message)) {
               controller.enqueue(message);
             } else {
               console.warn("Skipping JSON line that is not an object:", trimmedLine);
@@ -194106,7 +194418,28 @@ function ndJsonStream(output2, input2) {
   });
   return { readable, writable };
 }
+
+// node_modules/@agentclientprotocol/sdk/dist/schema/guards.gen.js
+var zGuardCreateElicitationRequestForm = zElicitationFormMode.and(object({ mode: literal("form") })).and(object({ message: string2() }));
+var zGuardCreateElicitationRequestUrl = zElicitationUrlMode.and(object({ mode: literal("url") })).and(object({ message: string2() }));
+var zGuardCreateElicitationRequestCustom = union([zElicitationSessionScope, zElicitationRequestScope]).and(object({ message: string2() }));
+var zGuardElicitationPropertySchemaString = zStringPropertySchema.and(object({ type: literal("string") }));
+var zGuardElicitationPropertySchemaNumber = zNumberPropertySchema.and(object({ type: literal("number") }));
+var zGuardElicitationPropertySchemaInteger = zIntegerPropertySchema.and(object({ type: literal("integer") }));
+var zGuardElicitationPropertySchemaBoolean = zBooleanPropertySchema.and(object({ type: literal("boolean") }));
+var zGuardElicitationPropertySchemaArray = zMultiSelectPropertySchema.and(object({ type: literal("array") }));
+var zGuardMultiSelectItemsString = zStringMultiSelectItems.and(object({ type: literal("string") }));
+var zGuardCreateElicitationResponseAccept = zElicitationAcceptAction.and(object({ action: literal("accept") }));
+var zGuardCreateElicitationResponseDecline = object({
+  action: literal("decline")
+});
+var zGuardCreateElicitationResponseCancel = object({
+  action: literal("cancel")
+});
 // node_modules/@agentclientprotocol/sdk/dist/acp.js
+function ndJsonStream2(output2, input2) {
+  return ndJsonStream(output2, input2);
+}
 function emptyObjectResponse(response) {
   return response ?? {};
 }
@@ -194691,6 +195024,7 @@ function runConnectHandlers(connection, handlers) {
 var appBuilder = Symbol("appBuilder");
 var runAgentConnectHandlers = Symbol("runAgentConnectHandlers");
 var runClientConnectHandlers = Symbol("runClientConnectHandlers");
+var stableConnectionOptions = { allowBatches: false };
 class AgentApp {
   builder = Connection.builder();
   connectHandlers = [];
@@ -194753,7 +195087,7 @@ class AgentApp {
       return state2;
     }
     const [thisStream, peerStream] = memoryStreamPair();
-    const peerRawConnection = target[appBuilder]().connect(peerStream);
+    const peerRawConnection = target[appBuilder]().connect(peerStream, stableConnectionOptions);
     const peerConnection = clientConnection(peerRawConnection);
     const state = this.openStreamConnection(thisStream);
     state.rawConnection.closed.then(() => peerConnection.close());
@@ -194768,8 +195102,8 @@ class AgentApp {
     }
     return state;
   }
-  openStreamConnection(stream2) {
-    const rawConnection = this.builder.connect(stream2);
+  openStreamConnection(stream) {
+    const rawConnection = this.builder.connect(stream, stableConnectionOptions);
     return {
       rawConnection,
       connection: agentConnection(rawConnection, this.connectHandlers)
@@ -194844,7 +195178,7 @@ class ClientApp {
       return state2;
     }
     const [thisStream, peerStream] = memoryStreamPair();
-    const peerRawConnection = target[appBuilder]().connect(peerStream);
+    const peerRawConnection = target[appBuilder]().connect(peerStream, stableConnectionOptions);
     const peerConnection = agentConnection(peerRawConnection);
     const state = this.openStreamConnection(thisStream);
     state.rawConnection.closed.then(() => peerConnection.close());
@@ -194859,8 +195193,8 @@ class ClientApp {
     }
     return state;
   }
-  openStreamConnection(stream2) {
-    const rawConnection = this.builder.connect(stream2);
+  openStreamConnection(stream) {
+    const rawConnection = this.builder.connect(stream, stableConnectionOptions);
     return {
       rawConnection,
       connection: clientConnection(rawConnection, this.connectHandlers)
@@ -195042,12 +195376,12 @@ class AgentOutputAccumulator {
 var RETRY_ATTEMPT_PATTERN = /Reconnecting\.\.\.\s*(\d+)\/(\d+)/;
 var DISPLAY_MESSAGE_FIELDS = ["title", "text", "message", "description"];
 function parseCodexRetryUpdate(update) {
-  if (!isRecord12(update) || update.sessionUpdate !== "session_info_update") {
+  if (!isRecord13(update) || update.sessionUpdate !== "session_info_update") {
     return;
   }
-  const meta3 = isRecord12(update._meta) ? update._meta : undefined;
-  const codex = meta3 && isRecord12(meta3.codex) ? meta3.codex : undefined;
-  const error51 = codex && isRecord12(codex.error) ? codex.error : undefined;
+  const meta3 = isRecord13(update._meta) ? update._meta : undefined;
+  const codex = meta3 && isRecord13(meta3.codex) ? meta3.codex : undefined;
+  const error51 = codex && isRecord13(codex.error) ? codex.error : undefined;
   if (error51?.willRetry !== true)
     return;
   const rawMessage = typeof error51.message === "string" ? error51.message : findDisplayMessage(update) ?? "model stream retry";
@@ -195067,7 +195401,7 @@ function findDisplayMessage(update) {
   }
   return;
 }
-function isRecord12(value) {
+function isRecord13(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 
@@ -195552,7 +195886,7 @@ function isSeverity(value) {
   return typeof value === "string" && severities.includes(value);
 }
 function normalizeCisaSecureByDesign(value) {
-  if (!isRecord13(value))
+  if (!isRecord14(value))
     return;
   const normalized = {};
   const customerSecurityOutcomes = normalizeGateStatus(value.customerSecurityOutcomes);
@@ -195593,7 +195927,7 @@ function isEvidenceQuality(value) {
   return typeof value === "string" && evidenceQualities.includes(value);
 }
 function isStrictAgentOpinion(value) {
-  if (!isRecord13(value) || !hasOnlyKeys(value, STRICT_ROOT_KEYS))
+  if (!isRecord14(value) || !hasOnlyKeys(value, STRICT_ROOT_KEYS))
     return false;
   if (typeof value.summary !== "string")
     return false;
@@ -195603,7 +195937,7 @@ function isStrictAgentOpinion(value) {
   return value.cisaSecureByDesign === undefined || isStrictCisaSecureByDesign(value.cisaSecureByDesign);
 }
 function isStrictFinding(value) {
-  if (!isRecord13(value) || !hasOnlyKeys(value, STRICT_FINDING_KEYS)) {
+  if (!isRecord14(value) || !hasOnlyKeys(value, STRICT_FINDING_KEYS)) {
     return false;
   }
   if (!isSeverity(value.severity) || !isCategory(value.category) || !isNonEmptyString(value.title) || !isNonEmptyString(value.evidence) || !isNonEmptyString(value.recommendation) || !isConfidence(value.confidence)) {
@@ -195615,11 +195949,11 @@ function isStrictFinding(value) {
   return true;
 }
 function isStrictFindingFiles(value) {
-  return Array.isArray(value) && value.every((item) => isRecord13(item) && hasOnlyKeys(item, STRICT_FILE_KEYS) && isNonEmptyString(item.path) && isOptionalLineNumber(item.lineStart) && isOptionalLineNumber(item.lineEnd));
+  return Array.isArray(value) && value.every((item) => isRecord14(item) && hasOnlyKeys(item, STRICT_FILE_KEYS) && isNonEmptyString(item.path) && isOptionalLineNumber(item.lineStart) && isOptionalLineNumber(item.lineEnd));
 }
 function isStrictEvidenceRefs(value) {
   return Array.isArray(value) && value.length <= MAX_EVIDENCE_REFS2 && value.every((item) => {
-    if (!isRecord13(item) || !hasOnlyKeys(item, STRICT_EVIDENCE_REF_KEYS)) {
+    if (!isRecord14(item) || !hasOnlyKeys(item, STRICT_EVIDENCE_REF_KEYS)) {
       return false;
     }
     if (item.kind !== "file" && item.kind !== "diff_hunk" && item.kind !== "plan_clause") {
@@ -195635,7 +195969,7 @@ function isStrictEvidenceRefs(value) {
   });
 }
 function isStrictCisaSecureByDesign(value) {
-  if (!isRecord13(value) || !hasOnlyKeys(value, STRICT_CISA_KEYS))
+  if (!isRecord14(value) || !hasOnlyKeys(value, STRICT_CISA_KEYS))
     return false;
   for (const key of [
     "customerSecurityOutcomes",
@@ -195674,7 +196008,7 @@ function normalizeFindingFiles(value) {
   if (!Array.isArray(value))
     return;
   const files = value.flatMap((item) => {
-    if (!isRecord13(item) || typeof item.path !== "string" || item.path.trim().length === 0) {
+    if (!isRecord14(item) || typeof item.path !== "string" || item.path.trim().length === 0) {
       return [];
     }
     const file2 = {
@@ -195694,7 +196028,7 @@ function normalizeEvidenceRefs2(value) {
   if (!Array.isArray(value))
     return;
   const references = value.slice(0, MAX_EVIDENCE_REFS2).flatMap((item) => {
-    if (!isRecord13(item) || item.kind !== "file" && item.kind !== "diff_hunk" && item.kind !== "plan_clause") {
+    if (!isRecord14(item) || item.kind !== "file" && item.kind !== "diff_hunk" && item.kind !== "plan_clause") {
       return [];
     }
     const reference = { kind: item.kind };
@@ -195717,7 +196051,7 @@ function normalizeEvidenceRefs2(value) {
 function normalizeLineNumber(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value > 0 && value <= MAX_EVIDENCE_LINE2 ? value : undefined;
 }
-function isRecord13(value) {
+function isRecord14(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -196057,7 +196391,7 @@ async function runAcpClientWorkflow(child, input2, abortController, configOption
   }
   const output2 = Writable.toWeb(child.stdin);
   const inputStream = Readable.toWeb(child.stdout);
-  const stream2 = ndJsonStream(output2, limitAcpNdJsonLineBytes(inputStream));
+  const stream = ndJsonStream2(output2, limitAcpNdJsonLineBytes(inputStream));
   const app = client({ name: "kyoso" }).onRequest(methods.client.session.requestPermission, () => ({
     outcome: { outcome: "cancelled" }
   })).onRequest(methods.client.fs.readTextFile, async (ctx) => ({
@@ -196079,7 +196413,7 @@ async function runAcpClientWorkflow(child, input2, abortController, configOption
       policy: "Kyoso does not create terminals."
     });
   }).onRequest(methods.client.terminal.kill, () => ({}));
-  return app.connectWith(stream2, async (ctx) => {
+  return app.connectWith(stream, async (ctx) => {
     await ctx.request(methods.agent.initialize, {
       protocolVersion: PROTOCOL_VERSION,
       clientCapabilities: {
@@ -196342,7 +196676,7 @@ function normalizeUsage3(usage) {
   return normalizeModelTokenUsage(usage);
 }
 function withReportedExecutionIdentity(identity, metadata) {
-  const record2 = isRecord14(metadata) ? metadata : {};
+  const record2 = isRecord15(metadata) ? metadata : {};
   return createModelExecutionIdentity({
     providerRoute: identity.providerRoute,
     requestedModel: identity.requestedModel,
@@ -196351,9 +196685,9 @@ function withReportedExecutionIdentity(identity, metadata) {
   });
 }
 function readChunkMeta(update) {
-  const record2 = isRecord14(update) ? update : {};
-  const metadata = isRecord14(record2._meta) ? record2._meta : {};
-  const codex = isRecord14(metadata.codex) ? metadata.codex : {};
+  const record2 = isRecord15(update) ? update : {};
+  const metadata = isRecord15(record2._meta) ? record2._meta : {};
+  const codex = isRecord15(metadata.codex) ? metadata.codex : {};
   const phase = codex.phase === "commentary" || codex.phase === "final_answer" ? codex.phase : "unknown";
   return {
     ...typeof record2.messageId === "string" ? { messageId: record2.messageId } : {},
@@ -196361,15 +196695,15 @@ function readChunkMeta(update) {
   };
 }
 function readCodexThreadStatus(update) {
-  const record2 = isRecord14(update) ? update : {};
+  const record2 = isRecord15(update) ? update : {};
   if (record2.sessionUpdate !== "session_info_update")
     return;
-  const metadata = isRecord14(record2._meta) ? record2._meta : {};
-  const codex = isRecord14(metadata.codex) ? metadata.codex : {};
-  const threadStatus = isRecord14(codex.threadStatus) ? codex.threadStatus : {};
+  const metadata = isRecord15(record2._meta) ? record2._meta : {};
+  const codex = isRecord15(metadata.codex) ? metadata.codex : {};
+  const threadStatus = isRecord15(codex.threadStatus) ? codex.threadStatus : {};
   return typeof threadStatus.type === "string" ? threadStatus.type : undefined;
 }
-function isRecord14(value) {
+function isRecord15(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function resolveEffortConfigOption(agent, effort) {
@@ -196814,7 +197148,7 @@ var __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create2(__
   enumerable: true
 }) : target, mod));
 
-// node_modules/@modelcontextprotocol/core/dist/auth-DFgbUATV.mjs
+// node_modules/@modelcontextprotocol/core/dist/auth-CUe6YdwF.mjs
 var LATEST_PROTOCOL_VERSION = "2025-11-25";
 var SUPPORTED_PROTOCOL_VERSIONS = [
   LATEST_PROTOCOL_VERSION,
@@ -196826,6 +197160,7 @@ var SUPPORTED_PROTOCOL_VERSIONS = [
 var RELATED_TASK_META_KEY = "io.modelcontextprotocol/related-task";
 var PROTOCOL_VERSION_META_KEY = "io.modelcontextprotocol/protocolVersion";
 var CLIENT_INFO_META_KEY = "io.modelcontextprotocol/clientInfo";
+var SERVER_INFO_META_KEY = "io.modelcontextprotocol/serverInfo";
 var CLIENT_CAPABILITIES_META_KEY = "io.modelcontextprotocol/clientCapabilities";
 var SUBSCRIPTION_ID_META_KEY = "io.modelcontextprotocol/subscriptionId";
 var LOG_LEVEL_META_KEY = "io.modelcontextprotocol/logLevel";
@@ -196859,7 +197194,10 @@ var NotificationSchema = object({
   method: string2(),
   params: NotificationsParamsSchema.loose().optional()
 });
-var ResultSchema = looseObject({ _meta: RequestMetaSchema.optional() });
+var ResultMetaObjectSchema = looseObject({ get [SERVER_INFO_META_KEY]() {
+  return ImplementationSchema.optional().catch(undefined);
+} });
+var ResultSchema = looseObject({ _meta: ResultMetaObjectSchema.optional() });
 var RequestIdSchema = union([string2(), number2().int()]);
 var JSONRPCRequestSchema = object({
   jsonrpc: literal(JSONRPC_VERSION),
@@ -196990,7 +197328,6 @@ var DiscoverRequestSchema = RequestSchema.extend({
 var DiscoverResultSchema = ResultSchema.extend({
   supportedVersions: array(string2()),
   capabilities: ServerCapabilitiesSchema,
-  serverInfo: ImplementationSchema,
   instructions: string2().optional()
 });
 var PingRequestSchema = RequestSchema.extend({
@@ -197095,7 +197432,7 @@ var SubscriptionsAcknowledgedNotificationSchema = NotificationSchema.extend({
   method: literal("notifications/subscriptions/acknowledged"),
   params: SubscriptionsAcknowledgedNotificationParamsSchema
 });
-var SubscriptionsListenResultMetaSchema = looseObject({ [SUBSCRIPTION_ID_META_KEY]: RequestIdSchema });
+var SubscriptionsListenResultMetaSchema = ResultMetaObjectSchema.extend({ [SUBSCRIPTION_ID_META_KEY]: RequestIdSchema });
 var SubscriptionsListenResultSchema = ResultSchema.extend({ _meta: SubscriptionsListenResultMetaSchema });
 var ResourceUpdatedNotificationParamsSchema = NotificationsParamsSchema.extend({ uri: string2() });
 var ResourceUpdatedNotificationSchema = NotificationSchema.extend({
@@ -197752,7 +198089,7 @@ var OAuthTokenRevocationRequestSchema = object({
   token_type_hint: string2().optional()
 }).strip();
 
-// node_modules/@modelcontextprotocol/server/dist/src-D5Nfqtoz.mjs
+// node_modules/@modelcontextprotocol/server/dist/src-D86MbS1I.mjs
 var BRANDS = Symbol.for("mcp.sdk.errorBrands");
 function stampErrorBrands(instance, ctor) {
   const brands = /* @__PURE__ */ new Set;
@@ -197870,7 +198207,7 @@ var SdkHttpError = class extends SdkError {
     return this.data.statusText;
   }
 };
-function isPlainObject$6(value) {
+function isPlainObject$7(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function isImpliedCapabilityMember(capability, member, declaredValue) {
@@ -197904,7 +198241,7 @@ function missingClientCapabilities(required2, declared) {
       missing[capability] = requirement;
       continue;
     }
-    if (isPlainObject$6(requirement) && isPlainObject$6(declaredValue)) {
+    if (isPlainObject$7(requirement) && isPlainObject$7(declaredValue)) {
       const missingMembers = {};
       for (const [member, memberRequirement] of Object.entries(requirement))
         if (memberRequirement !== undefined && declaredValue[member] === undefined && !isImpliedCapabilityMember(capability, member, declaredValue))
@@ -199023,7 +199360,7 @@ function getNotificationSchema(method) {
 }
 var rev2025RequestMethods = Object.keys(requestMethodKeys$1);
 var rev2025NotificationMethods = Object.keys(notificationMethodKeys$1);
-function isPlainObject$5(value) {
+function isPlainObject$6(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function triState$1(schema, raw) {
@@ -199047,7 +199384,7 @@ var NOT_IN_ERA$1 = {
   reason: "not-in-era"
 };
 function toolNeedsLegacyWrap(t) {
-  return isPlainObject$5(t) && isPlainObject$5(t["outputSchema"]) && isNonObjectJsonSchemaRoot(t["outputSchema"]);
+  return isPlainObject$6(t) && isPlainObject$6(t["outputSchema"]) && isNonObjectJsonSchemaRoot(t["outputSchema"]);
 }
 function toNeutralResult(value) {
   return value;
@@ -199085,7 +199422,7 @@ var rev2025Codec = {
     };
   },
   decodeResult(_method, raw) {
-    if (isPlainObject$5(raw) && "resultType" in raw) {
+    if (isPlainObject$6(raw) && "resultType" in raw) {
       const stripped = { ...raw };
       delete stripped["resultType"];
       return {
@@ -199506,7 +199843,7 @@ function build() {
   const RequestMetaEnvelopeSchema = looseObject({
     progressToken: ProgressTokenSchema$1.optional(),
     [PROTOCOL_VERSION_META_KEY]: string2(),
-    [CLIENT_INFO_META_KEY]: ImplementationSchema$1,
+    [CLIENT_INFO_META_KEY]: ImplementationSchema$1.optional(),
     [CLIENT_CAPABILITIES_META_KEY]: ClientCapabilities2026Schema,
     [LOG_LEVEL_META_KEY]: LoggingLevelSchema$1.optional()
   });
@@ -199543,7 +199880,8 @@ function build() {
     _meta: record(string2(), unknown()).optional()
   });
   const ResultTypeSchema = string2();
-  const wireMeta = record(string2(), unknown()).optional();
+  const ResultMetaSchema = looseObject({ [SERVER_INFO_META_KEY]: ImplementationSchema$1.optional().catch(undefined) });
+  const wireMeta = ResultMetaSchema.optional();
   function wireResult(shape) {
     return looseObject({
       _meta: wireMeta,
@@ -199605,7 +199943,6 @@ function build() {
     cacheScope: _enum2(["public", "private"]).catch("private"),
     supportedVersions: array(string2()),
     capabilities: ServerCapabilities2026Schema,
-    serverInfo: ImplementationSchema$1,
     instructions: string2().optional()
   });
   const CreateMessageRequestParamsSchema$1 = object({
@@ -199742,7 +200079,7 @@ function build() {
   });
   const subscriptionsListenParamsShape = { notifications: SubscriptionFilterSchema$1 };
   const SubscriptionsListenRequestSchema$1 = wireRequest("subscriptions/listen", subscriptionsListenParamsShape);
-  const SubscriptionsListenResultMetaSchema$1 = looseObject({ "io.modelcontextprotocol/subscriptionId": RequestIdSchema$1 });
+  const SubscriptionsListenResultMetaSchema$1 = ResultMetaSchema.extend({ "io.modelcontextprotocol/subscriptionId": RequestIdSchema$1 });
   const SubscriptionsListenResultSchema$1 = looseObject({
     _meta: SubscriptionsListenResultMetaSchema$1,
     resultType: ResultTypeSchema.default("complete")
@@ -199817,7 +200154,6 @@ function build() {
       cacheScope: _enum2(["public", "private"]).catch("private"),
       supportedVersions: array(string2()),
       capabilities: ServerCapabilities2026Schema,
-      serverInfo: ImplementationSchema$1,
       instructions: string2().optional()
     }),
     "subscriptions/listen": liftedResult({})
@@ -199931,6 +200267,7 @@ function build() {
     SamplingMessageContentBlockSchema: SamplingMessageContentBlockSchema$1,
     SamplingMessageSchema: SamplingMessageSchema$1,
     ResultTypeSchema,
+    ResultMetaSchema,
     ResultSchema: ResultSchema$1,
     PaginatedResultSchema: PaginatedResultSchema$1,
     CallToolResultSchema: CallToolResultSchema$1,
@@ -200182,6 +200519,30 @@ function fillCacheFields(method, result) {
   delete filled[RESULT_CACHE_HINT_FALLBACK];
   return filled;
 }
+function isPlainObject$5(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function stampServerInfoMeta(result, serverInfo) {
+  if (serverInfo === undefined)
+    return result;
+  const meta3 = result["_meta"];
+  if (meta3 === undefined)
+    return {
+      ...result,
+      _meta: { [SERVER_INFO_META_KEY]: serverInfo }
+    };
+  if (!isPlainObject$5(meta3))
+    return result;
+  if (meta3[SERVER_INFO_META_KEY] !== undefined)
+    return result;
+  return {
+    ...result,
+    _meta: {
+      ...meta3,
+      [SERVER_INFO_META_KEY]: serverInfo
+    }
+  };
+}
 function resolveTtlMs(fallback) {
   return fallback !== undefined && isValidCacheTtlMs(fallback.ttlMs) ? fallback.ttlMs : DEFAULT_CACHE_TTL_MS;
 }
@@ -200300,11 +200661,7 @@ var NOT_IN_ERA = {
   ok: false,
   reason: "not-in-era"
 };
-var REQUIRED_ENVELOPE_KEYS = [
-  PROTOCOL_VERSION_META_KEY,
-  CLIENT_INFO_META_KEY,
-  CLIENT_CAPABILITIES_META_KEY
-];
+var REQUIRED_ENVELOPE_KEYS = [PROTOCOL_VERSION_META_KEY, CLIENT_CAPABILITIES_META_KEY];
 function enforceDeletedFields(method, result) {
   let next = result;
   let copied = false;
@@ -200441,13 +200798,13 @@ var rev2026Codec = {
       result: lifted
     };
   },
-  encodeResult(method, result) {
-    return fillCacheFields(method, stampResultType(method, enforceDeletedFields(method, result)));
+  encodeResult(method, result, serverInfo) {
+    return stampServerInfoMeta(fillCacheFields(method, stampResultType(method, enforceDeletedFields(method, result))), serverInfo);
   },
   encodeErrorCode: (code) => code === -32002 ? -32602 : code,
   checkInboundEnvelope(material) {
     if (material.envelope === undefined)
-      return "Request is missing the required _meta envelope for protocol revision 2026-07-28 (io.modelcontextprotocol/protocolVersion, io.modelcontextprotocol/clientInfo, io.modelcontextprotocol/clientCapabilities)";
+      return "Request is missing the required _meta envelope for protocol revision 2026-07-28 (io.modelcontextprotocol/protocolVersion, io.modelcontextprotocol/clientCapabilities)";
     const parsed = buildSchemas2026().RequestMetaEnvelopeSchema.safeParse(material.envelope);
     if (!parsed.success)
       return `Invalid _meta envelope for protocol revision 2026-07-28: ${parsed.error.issues.map((issue2) => issue2.message).join("; ")}`;
@@ -200606,6 +200963,7 @@ var schemas_exports = /* @__PURE__ */ __exportAll({
   ResourceTemplateSchema: () => ResourceTemplateSchema,
   ResourceUpdatedNotificationParamsSchema: () => ResourceUpdatedNotificationParamsSchema,
   ResourceUpdatedNotificationSchema: () => ResourceUpdatedNotificationSchema,
+  ResultMetaObjectSchema: () => ResultMetaObjectSchema,
   ResultSchema: () => ResultSchema,
   RoleSchema: () => RoleSchema,
   RootSchema: () => RootSchema,
@@ -201287,6 +201645,7 @@ var SPEC_SCHEMA_KEYS = [
   "ResourceTemplateReferenceSchema",
   "ResourceUpdatedNotificationSchema",
   "ResourceUpdatedNotificationParamsSchema",
+  "ResultMetaObjectSchema",
   "ResultSchema",
   "RoleSchema",
   "RootSchema",
@@ -201713,7 +202072,7 @@ var Protocol = class {
         return;
       let encoded;
       try {
-        encoded = codec2.encodeResult(request.method, result);
+        encoded = codec2.encodeResult(request.method, result, this._outboundServerInfo());
       } catch (error51) {
         this._onerror(/* @__PURE__ */ new Error(`Failed to encode result for ${request.method}: ${error51}`));
         sendErrorResponse(ProtocolErrorCode.InternalError, "Internal error");
@@ -202012,6 +202371,7 @@ var Protocol = class {
   _wrapHandler(_method, handler) {
     return handler;
   }
+  _outboundServerInfo() {}
   removeRequestHandler(method) {
     this._requestHandlers.delete(method);
   }
@@ -209439,7 +209799,7 @@ var Ajv = import_ajv.Ajv;
 // node_modules/@modelcontextprotocol/server/dist/shimsNode.mjs
 import process3 from "node:process";
 
-// node_modules/@modelcontextprotocol/server/dist/mcp-Ctiu4nBa.mjs
+// node_modules/@modelcontextprotocol/server/dist/mcp-IJurDZVN.mjs
 var COMPLETABLE_SYMBOL = Symbol.for("mcp.completable");
 function isCompletable(schema) {
   return !!schema && typeof schema === "object" && COMPLETABLE_SYMBOL in schema;
@@ -209602,6 +209962,7 @@ var INPUT_REQUIRED_CAPABLE_METHODS = new Set([
 ]);
 var writeClientIdentity;
 var installDiscoverHandler;
+var readServerIdentity;
 var Server = class extends Protocol {
   _clientCapabilities;
   _clientVersion;
@@ -209618,6 +209979,7 @@ var Server = class extends Protocol {
         server2._supportedProtocolVersions = [...server2._supportedProtocolVersions, ...missing];
       server2.setRequestHandler("server/discover", () => server2._ondiscover());
     };
+    readServerIdentity = (server2) => server2._serverInfo;
   }
   _capabilities;
   _instructions;
@@ -209922,10 +210284,12 @@ var Server = class extends Protocol {
     return {
       supportedVersions: modernProtocolVersions(this._supportedProtocolVersions),
       capabilities: discoverAdvertisedCapabilities(this.getCapabilities()),
-      serverInfo: this._serverInfo,
       ...this._instructions && { instructions: this._instructions }
     };
   }
+  _outboundServerInfo() {
+    return this._serverInfo;
+  }
   getClientCapabilities() {
     return this._clientCapabilities;
   }
@@ -210742,9 +211106,14 @@ import { resolve as resolve10 } from "node:path";
 // src/config/configOverrides.ts
 var NUMBER_VALUE = /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i;
 var UNSET_NUMBER_OVERRIDE_PATHS = new Set([
+  "agents.codex.timeoutS",
+  "agents.claude.timeoutS",
   "agents.codex.openRouter.streamIdleTimeoutMs",
+  "agents.codex.openRouter.streamIdleTimeoutS",
   "agents.codex.openRouter.streamMaxRetries",
-  "agents.codex.openRouter.requestMaxRetries"
+  "agents.codex.openRouter.requestMaxRetries",
+  "judge.timeoutS",
+  "verification.timeoutS"
 ]);
 function applyConfigOverrides(config2, assignments) {
   if (assignments.length === 0)
@@ -210755,9 +211124,21 @@ function applyConfigOverrides(config2, assignments) {
   for (const override of overrides) {
     writePath2(overridden, override.path, parseConfigOverrideValue(override.value, readPath2(baseConfig, override.path), override.path));
   }
-  clearInheritedOpenRouterConfigForProviderReset(baseConfig, overridden, overrides);
-  assertOpenRouterProviderOverrideIncludesModel(baseConfig, overridden, overrides);
-  const parsed = kyosoConfigSchema.safeParse(overridden);
+  let normalized;
+  try {
+    normalized = normalizeConfigTimeUnits(overridden);
+  } catch (error51) {
+    if (!(error51 instanceof TimeUnitValidationError))
+      throw error51;
+    const assignment2 = findAssignmentForPath(overrides, error51.field);
+    if (!assignment2) {
+      throw new Error(`Invalid config time value: ${error51.message}`);
+    }
+    throw new Error(`Invalid --set value ${JSON.stringify(assignment2)}: ${error51.message}`);
+  }
+  clearInheritedOpenRouterConfigForProviderReset(baseConfig, normalized, overrides);
+  assertOpenRouterProviderOverrideIncludesModel(baseConfig, normalized, overrides);
+  const parsed = kyosoConfigSchema.safeParse(normalized);
   if (parsed.success)
     return parsed.data;
   const issue2 = parsed.error.issues[0];
@@ -210787,7 +211168,7 @@ function clearInheritedOpenRouterConfigForProviderReset(baseConfig, overridden,
     return;
   }
   const codex = readPath2(overridden, ["agents", "codex"]);
-  if (!isRecord15(codex))
+  if (!isRecord16(codex))
     return;
   if (!suppliesModel)
     delete codex.model;
@@ -210836,7 +211217,7 @@ function parseConfigOverrideValue(value, currentValue, path) {
 function readPath2(target, path) {
   let current = target;
   for (const key of path) {
-    if (!isRecord15(current))
+    if (!isRecord16(current))
       return;
     current = current[key];
   }
@@ -210846,7 +211227,7 @@ function writePath2(target, path, value) {
   let current = target;
   for (const key of path.slice(0, -1)) {
     const child = current[key];
-    if (!isRecord15(child)) {
+    if (!isRecord16(child)) {
       throw new Error(`Cannot apply --set key ${JSON.stringify(path.join("."))}.`);
     }
     current = child;
@@ -210855,7 +211236,7 @@ function writePath2(target, path, value) {
   if (leaf)
     current[leaf] = value;
 }
-function isRecord15(value) {
+function isRecord16(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -212093,7 +212474,7 @@ function validateReviewContract(request) {
   const contract = request.reviewContract;
   if (contract === undefined)
     return;
-  if (!isRecord16(contract)) {
+  if (!isRecord17(contract)) {
     throw new KyosoRequestError("reviewContract must be an object", "VALIDATION_ERROR");
   }
   const allowedKeys = new Set(["focus", "nonGoals", "acceptedRisks"]);
@@ -212110,7 +212491,7 @@ function validateReviewContract(request) {
     throw new KyosoRequestError("reviewContract.nonGoals must contain at most 20 non-empty strings of 500 characters or fewer", "VALIDATION_ERROR");
   }
   const acceptedRisks = contract.acceptedRisks;
-  if (acceptedRisks !== undefined && (!Array.isArray(acceptedRisks) || acceptedRisks.length > 20 || acceptedRisks.some((risk) => !isRecord16(risk) || typeof risk.findingFingerprint !== "string" || !/^sha256:[0-9a-f]{64}$/.test(risk.findingFingerprint) || typeof risk.rationale !== "string" || risk.rationale.trim().length === 0 || risk.rationale.length > 500))) {
+  if (acceptedRisks !== undefined && (!Array.isArray(acceptedRisks) || acceptedRisks.length > 20 || acceptedRisks.some((risk) => !isRecord17(risk) || typeof risk.findingFingerprint !== "string" || !/^sha256:[0-9a-f]{64}$/.test(risk.findingFingerprint) || typeof risk.rationale !== "string" || risk.rationale.trim().length === 0 || risk.rationale.length > 500))) {
     throw new KyosoRequestError("reviewContract.acceptedRisks must contain valid finding fingerprints and bounded rationales", "VALIDATION_ERROR");
   }
 }
@@ -212122,13 +212503,13 @@ function validateSelectedFiles(request) {
     throw new KyosoRequestError("selectedFiles must be an array", "VALIDATION_ERROR");
   }
   for (const file2 of selectedFiles) {
-    if (!isRecord16(file2) || typeof file2.path !== "string" || file2.path.trim().length === 0 || typeof file2.content !== "string" || file2.language !== undefined && typeof file2.language !== "string" || file2.truncated !== undefined && typeof file2.truncated !== "boolean") {
+    if (!isRecord17(file2) || typeof file2.path !== "string" || file2.path.trim().length === 0 || typeof file2.content !== "string" || file2.language !== undefined && typeof file2.language !== "string" || file2.truncated !== undefined && typeof file2.truncated !== "boolean") {
       throw new KyosoRequestError("selectedFiles entries require string path/content and valid optional metadata", "VALIDATION_ERROR");
     }
     normalizeRelativePath(file2.path);
   }
 }
-function isRecord16(value) {
+function isRecord17(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -212659,11 +213040,11 @@ function canonicalJson(value) {
 function canonicalize(value) {
   if (Array.isArray(value))
     return value.map(canonicalize);
-  if (!isRecord17(value))
+  if (!isRecord18(value))
     return value;
   return Object.fromEntries(Object.entries(value).filter(([, child]) => child !== undefined).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0).map(([key, child]) => [key, canonicalize(child)]));
 }
-function isRecord17(value) {
+function isRecord18(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -212671,19 +213052,24 @@ function isRecord17(value) {
 var REVIEW_BUDGET_KEYS = new Set([
   "maxModelCalls",
   "maxTotalWallTimeMs",
+  "maxTotalWallTimeS",
   "maxAgentOutputBytes",
   "maxFindingsPerAgent",
   "skipOptionalPhasesWhenTokenUsageUnknown"
 ]);
 var MODEL_CALL_KINDS = ["primary", "verifier", "judge"];
 function resolveReviewBudget(ceiling, requested) {
-  if (requested !== undefined && !isRecord18(requested)) {
+  if (requested !== undefined && !isRecord19(requested)) {
     throw new KyosoRequestError("options.reviewBudget must be an object.", "REVIEW_BUDGET_INVALID");
   }
+  const hasWallTimeSeconds = requested?.maxTotalWallTimeS !== undefined;
   for (const [key, value] of Object.entries(requested ?? {})) {
     if (!REVIEW_BUDGET_KEYS.has(key)) {
       throw new KyosoRequestError(`options.reviewBudget.${key} is not supported.`, "REVIEW_BUDGET_INVALID");
     }
+    if (key === "maxTotalWallTimeS" || key === "maxTotalWallTimeMs" && hasWallTimeSeconds) {
+      continue;
+    }
     if (key === "skipOptionalPhasesWhenTokenUsageUnknown") {
       if (typeof value !== "boolean") {
         throw new KyosoRequestError(`options.reviewBudget.${key} must be a boolean.`, "REVIEW_BUDGET_INVALID");
@@ -212694,12 +213080,26 @@ function resolveReviewBudget(ceiling, requested) {
       throw new KyosoRequestError(`options.reviewBudget.${key} must be a positive integer.`, "REVIEW_BUDGET_INVALID");
     }
   }
-  const numericKeys = [
-    "maxModelCalls",
-    "maxTotalWallTimeMs",
-    "maxAgentOutputBytes",
-    "maxFindingsPerAgent"
-  ];
+  let requestedWallTime;
+  if (hasWallTimeSeconds) {
+    try {
+      requestedWallTime = resolveTimeUnitPair({
+        milliseconds: requested?.maxTotalWallTimeMs,
+        seconds: requested?.maxTotalWallTimeS
+      }, {
+        milliseconds: "options.reviewBudget.maxTotalWallTimeMs",
+        seconds: "options.reviewBudget.maxTotalWallTimeS"
+      });
+    } catch (error51) {
+      if (error51 instanceof TimeUnitValidationError) {
+        throw new KyosoRequestError(error51.message, "REVIEW_BUDGET_INVALID");
+      }
+      throw error51;
+    }
+  }
+  const numericKeys = ["maxModelCalls", "maxAgentOutputBytes", "maxFindingsPerAgent"];
+  if (!hasWallTimeSeconds)
+    numericKeys.push("maxTotalWallTimeMs");
   for (const key of numericKeys) {
     const value = requested?.[key];
     if (value === undefined)
@@ -212708,13 +213108,19 @@ function resolveReviewBudget(ceiling, requested) {
       throw new KyosoRequestError(`options.reviewBudget.${key} cannot exceed the user-global ceiling.`, "REVIEW_BUDGET_EXCEEDS_CEILING");
     }
   }
+  if (hasWallTimeSeconds && requested?.maxTotalWallTimeMs !== undefined && requested.maxTotalWallTimeMs > ceiling.maxTotalWallTimeMs) {
+    throw new KyosoRequestError("options.reviewBudget.maxTotalWallTimeMs cannot exceed the user-global ceiling.", "REVIEW_BUDGET_EXCEEDS_CEILING");
+  }
+  if (requestedWallTime && requestedWallTime.milliseconds > ceiling.maxTotalWallTimeMs) {
+    throw new KyosoRequestError(`${requestedWallTime.sourceField} cannot exceed the user-global ceiling.`, "REVIEW_BUDGET_EXCEEDS_CEILING");
+  }
   if (ceiling.skipOptionalPhasesWhenTokenUsageUnknown && requested?.skipOptionalPhasesWhenTokenUsageUnknown === false) {
     throw new KyosoRequestError("options.reviewBudget.skipOptionalPhasesWhenTokenUsageUnknown cannot relax the user-global ceiling.", "REVIEW_BUDGET_EXCEEDS_CEILING");
   }
   const maxAgentOutputBytes = requested?.maxAgentOutputBytes ?? ceiling.maxAgentOutputBytes;
   return {
     maxModelCalls: requested?.maxModelCalls ?? ceiling.maxModelCalls,
-    maxTotalWallTimeMs: requested?.maxTotalWallTimeMs ?? ceiling.maxTotalWallTimeMs,
+    maxTotalWallTimeMs: requestedWallTime?.milliseconds ?? requested?.maxTotalWallTimeMs ?? ceiling.maxTotalWallTimeMs,
     warnAgentOutputBytes: ceiling.warnAgentOutputBytes,
     maxAgentOutputBytes,
     maxFindingsPerAgent: requested?.maxFindingsPerAgent ?? ceiling.maxFindingsPerAgent,
@@ -213031,10 +213437,63 @@ function emptyReviewModelCallPlan() {
     ceilingEffects: []
   };
 }
-function isRecord18(value) {
+function isRecord19(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// src/core/requestTimeUnits.ts
+function normalizeRequestTimeUnits(request) {
+  if (!request.options)
+    return request;
+  const options = { ...request.options };
+  normalizeRequestTimeUnitField(options, "maxAgentTimeoutMs", "maxAgentTimeoutS", {
+    milliseconds: "options.maxAgentTimeoutMs",
+    seconds: "options.maxAgentTimeoutS"
+  });
+  if (options.reviewBudget) {
+    const reviewBudget = { ...options.reviewBudget };
+    normalizeRequestTimeUnitField(reviewBudget, "maxTotalWallTimeMs", "maxTotalWallTimeS", {
+      milliseconds: "options.reviewBudget.maxTotalWallTimeMs",
+      seconds: "options.reviewBudget.maxTotalWallTimeS"
+    });
+    options.reviewBudget = reviewBudget;
+  }
+  return { ...request, options };
+}
+function resolveProgressHeartbeatMs(input2) {
+  if (input2.progressHeartbeatS === undefined) {
+    return input2.progressHeartbeatMs;
+  }
+  return resolveRequestTimeUnit({
+    milliseconds: input2.progressHeartbeatMs,
+    seconds: input2.progressHeartbeatS
+  }, {
+    milliseconds: "progressHeartbeatMs",
+    seconds: "progressHeartbeatS"
+  }, { allowZero: true })?.milliseconds;
+}
+function normalizeRequestTimeUnitField(target, millisecondsKey, secondsKey, fields) {
+  if (target[secondsKey] !== undefined) {
+    const resolved = resolveRequestTimeUnit({
+      milliseconds: target[millisecondsKey],
+      seconds: target[secondsKey]
+    }, fields);
+    if (resolved)
+      target[millisecondsKey] = resolved.milliseconds;
+  }
+  delete target[secondsKey];
+}
+function resolveRequestTimeUnit(input2, fields, constraints) {
+  try {
+    return resolveTimeUnitPair(input2, fields, constraints);
+  } catch (error51) {
+    if (error51 instanceof TimeUnitValidationError) {
+      throw new KyosoRequestError(error51.message, "VALIDATION_ERROR");
+    }
+    throw error51;
+  }
+}
+
 // src/core/verification.ts
 var REAL_AGENTS = ["codex", "claude"];
 var VERIFIABLE_SEVERITIES = new Set(["critical", "high"]);
@@ -213093,7 +213552,7 @@ function parseVerificationVerdicts(rawText) {
     if (!Array.isArray(parsed.verdicts))
       return;
     return parsed.verdicts.flatMap((item) => {
-      if (!isRecord19(item))
+      if (!isRecord20(item))
         return [];
       if (typeof item.findingId !== "string")
         return [];
@@ -213171,7 +213630,7 @@ function verificationNote(reasoning) {
 function isVerdict(value) {
   return value === "confirmed" || value === "refuted" || value === "uncertain";
 }
-function isRecord19(value) {
+function isRecord20(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -213179,7 +213638,7 @@ function isRecord19(value) {
 var MAX_AGENT_RETRY_PROGRESS_EVENTS = 100;
 function requestForRecursionFingerprint(request) {
   try {
-    return scanAndRedactSecrets(request).redactedRequest;
+    return scanAndRedactSecrets(normalizeRequestTimeUnits(request)).redactedRequest;
   } catch {
     return { goal: "" };
   }
@@ -213439,15 +213898,17 @@ async function runReview(tool, request, options = {}) {
       });
       validateReviewRequest(tool, request);
       const reviewBudget = resolveReviewBudget(loaded.config.reviewBudget, request.options?.reviewBudget);
-      const budgetTracker = new ReviewBudgetTracker(reviewBudget, startedAtEpochMs, configuredReviewModelCallPlan(loaded.config, reviewBudget, options.env ?? process.env, request.options?.judgeProvider));
-      assertTrustedWorkspaceRoot(request.workspace?.root, loaded.config.workspace.root, cwd);
-      const networkMode = resolveNetworkMode(request.options?.network, loaded.config.network.defaultMode, options.mcpNetworkMode);
+      const normalizedRequest = normalizeRequestTimeUnits(request);
+      const progressHeartbeatMs = resolveProgressHeartbeatMs(options);
+      const budgetTracker = new ReviewBudgetTracker(reviewBudget, startedAtEpochMs, configuredReviewModelCallPlan(loaded.config, reviewBudget, options.env ?? process.env, normalizedRequest.options?.judgeProvider));
+      assertTrustedWorkspaceRoot(normalizedRequest.workspace?.root, loaded.config.workspace.root, cwd);
+      const networkMode = resolveNetworkMode(normalizedRequest.options?.network, loaded.config.network.defaultMode, options.mcpNetworkMode);
       if (networkMode === "unrestricted" && !loaded.config.network.allowUnrestricted) {
         throw new KyosoRequestError("unrestricted network mode is disabled by config", "NETWORK_MODE_DISABLED");
       }
       const disabledPolicy = disabledReviewPolicy(tool, loaded.config, options.entrypoint);
       if (disabledPolicy) {
-        const redactedRequest = requestForRecursionFingerprint(request);
+        const redactedRequest = requestForRecursionFingerprint(normalizedRequest);
         const requestFingerprint2 = createRequestFingerprint({
           tool,
           request: redactedRequest,
@@ -213498,7 +213959,7 @@ async function runReview(tool, request, options = {}) {
         warnings.push("Network mode is unrestricted; write policy remains denied.");
       }
       startPhase("context");
-      const secretScan = scanAndRedactSecrets(request);
+      const secretScan = scanAndRedactSecrets(normalizedRequest);
       await trace.write({
         type: "secret_scan_completed",
         traceId,
@@ -213506,7 +213967,7 @@ async function runReview(tool, request, options = {}) {
         redactions: secretScan.redactions,
         timestamp: new Date().toISOString()
       });
-      const allowSecretOverride = loaded.config.secrets.allowOverride && request.options?.allowSecretRedaction === true;
+      const allowSecretOverride = loaded.config.secrets.allowOverride && normalizedRequest.options?.allowSecretRedaction === true;
       if (secretScan.detected && loaded.config.secrets.blockOnDetectedSecret && !allowSecretOverride) {
         const requestFingerprint2 = createRequestFingerprint({
           tool,
@@ -213593,7 +214054,7 @@ async function runReview(tool, request, options = {}) {
         budgetTracker,
         progressDispatcher: dispatcher,
         signal: options.signal,
-        progressHeartbeatMs: options.progressHeartbeatMs
+        progressHeartbeatMs
       });
       completePhase("primary");
       warnings.push(...agentResults.flatMap((result) => (result.warnings ?? []).map((warning) => `Agent ${result.agent} ${warning}`)));
@@ -215141,9 +215602,11 @@ var kyosoReviewRequestSchema = object({
   options: object({
     network: _enum2(["model_only", "unrestricted"]).optional(),
     maxAgentTimeoutMs: number2().int().positive().optional(),
+    maxAgentTimeoutS: secondsSchema("options.maxAgentTimeoutS").optional(),
     reviewBudget: object({
       maxModelCalls: number2().int().positive().optional(),
       maxTotalWallTimeMs: number2().int().positive().optional(),
+      maxTotalWallTimeS: secondsSchema("options.reviewBudget.maxTotalWallTimeS").optional(),
       maxAgentOutputBytes: number2().int().positive().optional(),
       maxFindingsPerAgent: number2().int().positive().optional(),
       skipOptionalPhasesWhenTokenUsageUnknown: boolean2().optional()
@@ -215153,6 +215616,18 @@ var kyosoReviewRequestSchema = object({
     allowSecretRedaction: boolean2().optional()
   }).optional()
 });
+function secondsSchema(field) {
+  return number2().superRefine((value, context) => {
+    try {
+      secondsToMilliseconds(value, field);
+    } catch (error51) {
+      context.addIssue({
+        code: "custom",
+        message: error51 instanceof TimeUnitValidationError ? error51.message : `${field} is invalid.`
+      });
+    }
+  });
+}
 
 // src/mcp/server.ts
 var KYOSO_MCP_INSTRUCTIONS = "Kyoso is a multi-agent planning and review gate. Use it only when the user explicitly asks for Kyoso, multi-agent review, plan review, security review, CISA Secure by Design review, or diff review. Kyoso does not apply code changes. It returns structured review results and Markdown summaries.";