@kyo-so/cli 0.15.1 → 0.16.0

package/dist/index.js

@@ -184081,6 +184081,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`,
@@ -184089,7 +184090,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;
 }
@@ -184126,12 +184127,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",
@@ -184178,7 +184182,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: [],
@@ -184203,7 +184207,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: {
@@ -184321,22 +184325,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) {
@@ -185573,6 +185582,146 @@ function isMissingPathError(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(input, fields, constraints = {}) {
+  const hasMilliseconds = input.milliseconds !== undefined;
+  const hasSeconds = input.seconds !== undefined;
+  if (!hasMilliseconds && !hasSeconds)
+    return;
+  const milliseconds = hasMilliseconds ? validateMilliseconds(input.milliseconds, fields.milliseconds, constraints) : undefined;
+  const secondsMilliseconds = hasSeconds ? secondsToMilliseconds(input.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(input) {
+  let normalized = input;
+  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(input, path, update) {
+  if (path.length === 0) {
+    return isRecord3(input) ? update(input) : input;
+  }
+  if (!isRecord3(input))
+    return input;
+  const [key, ...rest] = path;
+  if (key === undefined)
+    return input;
+  const current = input[key];
+  const updated = updateRecordAtPath(current, rest, update);
+  return updated === current ? input : { ...input, [key]: updated };
+}
+function isRecord3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
 // src/config/loadConfig.ts
 var configValidationContexts = new WeakMap;
 class ProjectOpenRouterAuthorizationError extends Error {
@@ -185608,7 +185757,7 @@ async function loadConfig(options = {}) {
   let configTrustStatus = options.ignoreConfig ? "ignored" : "not_found";
   if (!options.ignoreConfig) {
     if (await exists(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 "));
@@ -185735,7 +185884,7 @@ async function loadProjectConfig(input) {
   const { canonicalDirectory, canonicalPath, requestedPath } = input.projectConfig;
   const extension = extname2(requestedPath);
   if (extension === ".toml") {
-    const projectTomlConfig = await loadTomlConfigFile(canonicalPath);
+    const projectTomlConfig = normalizeConfigTimeUnits(await loadTomlConfigFile(canonicalPath));
     const projectChangesOpenRouterPolicy = projectConfigChangesOpenRouterPolicy(projectTomlConfig, input.baseConfig);
     await assertProjectOpenRouterAuthorization({
       projectConfig: projectTomlConfig,
@@ -185781,7 +185930,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);
@@ -185813,13 +185962,13 @@ async function assertProjectOpenRouterAuthorization(input) {
   });
 }
 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) {
@@ -185862,7 +186011,7 @@ async function loadProjectTsConfig(input) {
     options: input.options
   });
   if (trustDecision.execute) {
-    const userConfig = await loadUserConfig(canonicalPath, source);
+    const userConfig = normalizeConfigTimeUnits(await loadUserConfig(canonicalPath, source));
     validateExplicitReviewBudgetThresholds(userConfig, input.baseConfig);
     const projectChangesOpenRouterPolicy = projectConfigChangesOpenRouterPolicy(userConfig, input.baseConfig);
     await assertProjectOpenRouterAuthorization({
@@ -185949,7 +186098,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)) {
@@ -185969,12 +186118,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 exists(path) {
@@ -185989,9 +186138,14 @@ async function exists(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)
@@ -186002,9 +186156,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];
@@ -186034,7 +186200,7 @@ function clearInheritedOpenRouterConfigForProviderReset(baseConfig, overridden,
     return;
   }
   const codex = readPath2(overridden, ["agents", "codex"]);
-  if (!isRecord4(codex))
+  if (!isRecord5(codex))
     return;
   if (!suppliesModel)
     delete codex.model;
@@ -186083,7 +186249,7 @@ function parseConfigOverrideValue(value, currentValue, path) {
 function readPath2(target, path) {
   let current = target;
   for (const key of path) {
-    if (!isRecord4(current))
+    if (!isRecord5(current))
       return;
     current = current[key];
   }
@@ -186093,7 +186259,7 @@ function writePath2(target, path, value) {
   let current = target;
   for (const key of path.slice(0, -1)) {
     const child = current[key];
-    if (!isRecord4(child)) {
+    if (!isRecord5(child)) {
       throw new Error(`Cannot apply --set key ${JSON.stringify(path.join("."))}.`);
     }
     current = child;
@@ -186102,7 +186268,7 @@ function writePath2(target, path, value) {
   if (leaf)
     current[leaf] = value;
 }
-function isRecord4(value) {
+function isRecord5(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -186448,6 +186614,9 @@ var zToolCallUpdate = object({
   title: defaultOnError(string2().nullish(), () => {
     return;
   }),
+  name: defaultOnError(string2().nullish(), () => {
+    return;
+  }),
   content: defaultOnError(vecSkipError(zToolCallContent).nullish(), () => {
     return;
   }),
@@ -187559,6 +187728,9 @@ var zContentChunk = object({
 var zToolCall = object({
   toolCallId: zToolCallId,
   title: string2(),
+  name: defaultOnError(string2().nullish(), () => {
+    return;
+  }),
   kind: defaultOnError(zToolKind.optional(), () => {
     return;
   }),
@@ -188482,37 +188654,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 isRecord5(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 isRecord6(value) {
   return typeof value === "object" && value !== null;
 }
+function isJsonRpcEnvelope(value) {
+  return isRecord6(value) && value["jsonrpc"] === "2.0";
+}
 function isJsonRpcId(value) {
   return value === null || typeof value === "string" || typeof value === "number" && Number.isFinite(value);
 }
+function isResponseShapedMessage(value) {
+  return isRecord6(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 (!isRecord6(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 (!isRecord5(params) || !isJsonRpcId(params["requestId"])) {
+  if (!isRecord6(params) || !isJsonRpcId(params["requestId"])) {
     return;
   }
   return params["requestId"];
 }
+function isErrorResponse(value) {
+  return isRecord6(value) && typeof value["code"] === "number" && Number.isInteger(value["code"]) && typeof value["message"] === "string";
+}
 var Handled = {
   yes() {
     return { handled: true };
@@ -188641,6 +188847,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);
   }
@@ -188668,6 +188877,7 @@ class Connection {
   retryQueue = [];
   context = new ConnectionContext(this);
   receiveReader;
+  allowBatches = true;
   constructor(requestHandlerOrStream, notificationHandlerOrHandlers, streamOrOptions, options) {
     if (typeof requestHandlerOrStream === "function") {
       const requestHandler = requestHandlerOrStream;
@@ -188676,16 +188886,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;
@@ -188730,14 +188937,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((resolve3, reject) => {
+    const response = new Promise((resolve3, reject) => {
       const pendingResponse = {
-        resolve: (response) => {
+        resolve: (value) => {
           try {
-            const value = mapResponse ? mapResponse(response) : response;
-            resolve3(value);
+            resolve3(mapResponse ? mapResponse(value) : value);
           } catch (error51) {
             reject(error51);
           }
@@ -188760,27 +189026,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) {
@@ -188799,9 +189050,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((resolve3) => {
       this.abortController.signal.addEventListener("abort", () => resolve3());
     });
@@ -188837,7 +189089,7 @@ class Connection {
           if (!message) {
             continue;
           }
-          this.receiveMessage(message);
+          this.receiveWireMessage(message);
         }
       } finally {
         if (this.receiveReader === reader) {
@@ -188851,24 +189103,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 (!isRecord5(message)) {
+    if (!isRecord6(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 (!isRecord6(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) {
@@ -188912,7 +189231,7 @@ class Connection {
       }
     }
   }
-  toIncomingMessage(message) {
+  toIncomingMessage(message, sendResponse) {
     if ("id" in message) {
       const abortController = new AbortController;
       this.incomingRequests.set(message.id, abortController);
@@ -188927,11 +189246,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 {
@@ -188946,13 +189268,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 && isRecord5(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);
@@ -188975,7 +189297,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());
     }
@@ -189158,7 +189480,7 @@ function ndJsonStream(output, input) {
         if (trimmedLine) {
           try {
             const message = JSON.parse(trimmedLine);
-            if (isRecord5(message)) {
+            if (isRecord6(message) || Array.isArray(message)) {
               controller.enqueue(message);
             } else {
               console.warn("Skipping JSON line that is not an object:", trimmedLine);
@@ -189232,7 +189554,28 @@ function ndJsonStream(output, input) {
   });
   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(output, input) {
+  return ndJsonStream(output, input);
+}
 function emptyObjectResponse(response) {
   return response ?? {};
 }
@@ -189817,6 +190160,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 = [];
@@ -189879,7 +190223,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());
@@ -189894,8 +190238,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)
@@ -189970,7 +190314,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());
@@ -189985,8 +190329,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)
@@ -190086,7 +190430,7 @@ function createModelExecutionIdentity(input) {
   };
 }
 function normalizeModelExecutionIdentity(value) {
-  if (!isRecord6(value) || !isModelProviderRoute(value.providerRoute)) {
+  if (!isRecord7(value) || !isModelProviderRoute(value.providerRoute)) {
     return;
   }
   return createModelExecutionIdentity({
@@ -190108,7 +190452,7 @@ function sanitizeIdentityValue(value) {
 function isModelProviderRoute(value) {
   return typeof value === "string" && MODEL_PROVIDER_ROUTES.has(value);
 }
-function isRecord6(value) {
+function isRecord7(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 
@@ -190122,7 +190466,7 @@ var TOKEN_USAGE_KEYS = [
   "cachedWriteTokens"
 ];
 function normalizeModelTokenUsage(usage) {
-  if (!isRecord7(usage))
+  if (!isRecord8(usage))
     return;
   const normalized = {};
   for (const key of TOKEN_USAGE_KEYS) {
@@ -190135,7 +190479,7 @@ function normalizeModelTokenUsage(usage) {
 function isTokenCount(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
 }
-function isRecord7(value) {
+function isRecord8(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -190526,12 +190870,12 @@ class AgentOutputAccumulator {
 var RETRY_ATTEMPT_PATTERN = /Reconnecting\.\.\.\s*(\d+)\/(\d+)/;
 var DISPLAY_MESSAGE_FIELDS = ["title", "text", "message", "description"];
 function parseCodexRetryUpdate(update) {
-  if (!isRecord8(update) || update.sessionUpdate !== "session_info_update") {
+  if (!isRecord9(update) || update.sessionUpdate !== "session_info_update") {
     return;
   }
-  const meta3 = isRecord8(update._meta) ? update._meta : undefined;
-  const codex = meta3 && isRecord8(meta3.codex) ? meta3.codex : undefined;
-  const error51 = codex && isRecord8(codex.error) ? codex.error : undefined;
+  const meta3 = isRecord9(update._meta) ? update._meta : undefined;
+  const codex = meta3 && isRecord9(meta3.codex) ? meta3.codex : undefined;
+  const error51 = codex && isRecord9(codex.error) ? codex.error : undefined;
   if (error51?.willRetry !== true)
     return;
   const rawMessage = typeof error51.message === "string" ? error51.message : findDisplayMessage(update) ?? "model stream retry";
@@ -190551,7 +190895,7 @@ function findDisplayMessage(update) {
   }
   return;
 }
-function isRecord8(value) {
+function isRecord9(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 
@@ -191036,7 +191380,7 @@ function isSeverity(value) {
   return typeof value === "string" && severities.includes(value);
 }
 function normalizeCisaSecureByDesign(value) {
-  if (!isRecord9(value))
+  if (!isRecord10(value))
     return;
   const normalized = {};
   const customerSecurityOutcomes = normalizeGateStatus(value.customerSecurityOutcomes);
@@ -191077,7 +191421,7 @@ function isEvidenceQuality(value) {
   return typeof value === "string" && evidenceQualities.includes(value);
 }
 function isStrictAgentOpinion(value) {
-  if (!isRecord9(value) || !hasOnlyKeys(value, STRICT_ROOT_KEYS))
+  if (!isRecord10(value) || !hasOnlyKeys(value, STRICT_ROOT_KEYS))
     return false;
   if (typeof value.summary !== "string")
     return false;
@@ -191087,7 +191431,7 @@ function isStrictAgentOpinion(value) {
   return value.cisaSecureByDesign === undefined || isStrictCisaSecureByDesign(value.cisaSecureByDesign);
 }
 function isStrictFinding(value) {
-  if (!isRecord9(value) || !hasOnlyKeys(value, STRICT_FINDING_KEYS)) {
+  if (!isRecord10(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)) {
@@ -191099,11 +191443,11 @@ function isStrictFinding(value) {
   return true;
 }
 function isStrictFindingFiles(value) {
-  return Array.isArray(value) && value.every((item) => isRecord9(item) && hasOnlyKeys(item, STRICT_FILE_KEYS) && isNonEmptyString(item.path) && isOptionalLineNumber(item.lineStart) && isOptionalLineNumber(item.lineEnd));
+  return Array.isArray(value) && value.every((item) => isRecord10(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 (!isRecord9(item) || !hasOnlyKeys(item, STRICT_EVIDENCE_REF_KEYS)) {
+    if (!isRecord10(item) || !hasOnlyKeys(item, STRICT_EVIDENCE_REF_KEYS)) {
       return false;
     }
     if (item.kind !== "file" && item.kind !== "diff_hunk" && item.kind !== "plan_clause") {
@@ -191119,7 +191463,7 @@ function isStrictEvidenceRefs(value) {
   });
 }
 function isStrictCisaSecureByDesign(value) {
-  if (!isRecord9(value) || !hasOnlyKeys(value, STRICT_CISA_KEYS))
+  if (!isRecord10(value) || !hasOnlyKeys(value, STRICT_CISA_KEYS))
     return false;
   for (const key of [
     "customerSecurityOutcomes",
@@ -191158,7 +191502,7 @@ function normalizeFindingFiles(value) {
   if (!Array.isArray(value))
     return;
   const files = value.flatMap((item) => {
-    if (!isRecord9(item) || typeof item.path !== "string" || item.path.trim().length === 0) {
+    if (!isRecord10(item) || typeof item.path !== "string" || item.path.trim().length === 0) {
       return [];
     }
     const file2 = {
@@ -191178,7 +191522,7 @@ function normalizeEvidenceRefs2(value) {
   if (!Array.isArray(value))
     return;
   const references = value.slice(0, MAX_EVIDENCE_REFS2).flatMap((item) => {
-    if (!isRecord9(item) || item.kind !== "file" && item.kind !== "diff_hunk" && item.kind !== "plan_clause") {
+    if (!isRecord10(item) || item.kind !== "file" && item.kind !== "diff_hunk" && item.kind !== "plan_clause") {
       return [];
     }
     const reference = { kind: item.kind };
@@ -191201,7 +191545,7 @@ function normalizeEvidenceRefs2(value) {
 function normalizeLineNumber(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value > 0 && value <= MAX_EVIDENCE_LINE2 ? value : undefined;
 }
-function isRecord9(value) {
+function isRecord10(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -191541,7 +191885,7 @@ async function runAcpClientWorkflow(child, input, abortController, configOption,
   }
   const output = Writable.toWeb(child.stdin);
   const inputStream = Readable.toWeb(child.stdout);
-  const stream2 = ndJsonStream(output, limitAcpNdJsonLineBytes(inputStream));
+  const stream = ndJsonStream2(output, limitAcpNdJsonLineBytes(inputStream));
   const app = client({ name: "kyoso" }).onRequest(methods.client.session.requestPermission, () => ({
     outcome: { outcome: "cancelled" }
   })).onRequest(methods.client.fs.readTextFile, async (ctx) => ({
@@ -191563,7 +191907,7 @@ async function runAcpClientWorkflow(child, input, 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: {
@@ -191826,7 +192170,7 @@ function normalizeUsage(usage) {
   return normalizeModelTokenUsage(usage);
 }
 function withReportedExecutionIdentity(identity, metadata) {
-  const record2 = isRecord10(metadata) ? metadata : {};
+  const record2 = isRecord11(metadata) ? metadata : {};
   return createModelExecutionIdentity({
     providerRoute: identity.providerRoute,
     requestedModel: identity.requestedModel,
@@ -191835,9 +192179,9 @@ function withReportedExecutionIdentity(identity, metadata) {
   });
 }
 function readChunkMeta(update) {
-  const record2 = isRecord10(update) ? update : {};
-  const metadata = isRecord10(record2._meta) ? record2._meta : {};
-  const codex = isRecord10(metadata.codex) ? metadata.codex : {};
+  const record2 = isRecord11(update) ? update : {};
+  const metadata = isRecord11(record2._meta) ? record2._meta : {};
+  const codex = isRecord11(metadata.codex) ? metadata.codex : {};
   const phase = codex.phase === "commentary" || codex.phase === "final_answer" ? codex.phase : "unknown";
   return {
     ...typeof record2.messageId === "string" ? { messageId: record2.messageId } : {},
@@ -191845,15 +192189,15 @@ function readChunkMeta(update) {
   };
 }
 function readCodexThreadStatus(update) {
-  const record2 = isRecord10(update) ? update : {};
+  const record2 = isRecord11(update) ? update : {};
   if (record2.sessionUpdate !== "session_info_update")
     return;
-  const metadata = isRecord10(record2._meta) ? record2._meta : {};
-  const codex = isRecord10(metadata.codex) ? metadata.codex : {};
-  const threadStatus = isRecord10(codex.threadStatus) ? codex.threadStatus : {};
+  const metadata = isRecord11(record2._meta) ? record2._meta : {};
+  const codex = isRecord11(metadata.codex) ? metadata.codex : {};
+  const threadStatus = isRecord11(codex.threadStatus) ? codex.threadStatus : {};
   return typeof threadStatus.type === "string" ? threadStatus.type : undefined;
 }
-function isRecord10(value) {
+function isRecord11(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function resolveEffortConfigOption(agent, effort) {
@@ -193558,7 +193902,7 @@ function validateReviewContract(request) {
   const contract = request.reviewContract;
   if (contract === undefined)
     return;
-  if (!isRecord11(contract)) {
+  if (!isRecord12(contract)) {
     throw new KyosoRequestError("reviewContract must be an object", "VALIDATION_ERROR");
   }
   const allowedKeys = new Set(["focus", "nonGoals", "acceptedRisks"]);
@@ -193575,7 +193919,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) => !isRecord11(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) => !isRecord12(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");
   }
 }
@@ -193587,13 +193931,13 @@ function validateSelectedFiles(request) {
     throw new KyosoRequestError("selectedFiles must be an array", "VALIDATION_ERROR");
   }
   for (const file2 of selectedFiles) {
-    if (!isRecord11(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 (!isRecord12(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 isRecord11(value) {
+function isRecord12(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -193854,7 +194198,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 (!isRecord12(item) || typeof item.topic !== "string" || typeof item.judgeComment !== "string") {
+    if (!isRecord13(item) || typeof item.topic !== "string" || typeof item.judgeComment !== "string") {
       return [];
     }
     return [
@@ -193870,7 +194214,7 @@ function parseJudgeOutput(text, fallbackSummaryText) {
   return { summaryText, disagreementComments, analysis };
 }
 function parseAnalysis(value) {
-  if (!isRecord12(value))
+  if (!isRecord13(value))
     return;
   if (!Array.isArray(value.blindSpots) || !Array.isArray(value.contradictions) || !Array.isArray(value.partialCoverage)) {
     return;
@@ -193878,7 +194222,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 (!isRecord12(item) || typeof item.topic !== "string" || typeof item.detail !== "string") {
+      if (!isRecord13(item) || typeof item.topic !== "string" || typeof item.detail !== "string") {
         return [];
       }
       return [
@@ -193889,7 +194233,7 @@ function parseAnalysis(value) {
       ];
     }),
     partialCoverage: value.partialCoverage.slice(0, ANALYSIS_MAX_ITEMS).flatMap((item) => {
-      if (!isRecord12(item) || typeof item.note !== "string")
+      if (!isRecord13(item) || typeof item.note !== "string")
         return [];
       const findingId = typeof item.findingId === "string" ? sanitizeAnalysisText(item.findingId) : undefined;
       return [
@@ -193936,7 +194280,7 @@ function extractFirstJsonObject2(text) {
   }
   return;
 }
-function isRecord12(value) {
+function isRecord13(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -194481,11 +194825,11 @@ function canonicalJson(value) {
 function canonicalize(value) {
   if (Array.isArray(value))
     return value.map(canonicalize);
-  if (!isRecord13(value))
+  if (!isRecord14(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 isRecord13(value) {
+function isRecord14(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -194493,19 +194837,24 @@ function isRecord13(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 && !isRecord14(requested)) {
+  if (requested !== undefined && !isRecord15(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");
@@ -194516,12 +194865,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)
@@ -194530,13 +194893,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,
@@ -194853,10 +195222,63 @@ function emptyReviewModelCallPlan() {
     ceilingEffects: []
   };
 }
-function isRecord14(value) {
+function isRecord15(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(input) {
+  if (input.progressHeartbeatS === undefined) {
+    return input.progressHeartbeatMs;
+  }
+  return resolveRequestTimeUnit({
+    milliseconds: input.progressHeartbeatMs,
+    seconds: input.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(input, fields, constraints) {
+  try {
+    return resolveTimeUnitPair(input, 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"]);
@@ -194915,7 +195337,7 @@ function parseVerificationVerdicts(rawText) {
     if (!Array.isArray(parsed.verdicts))
       return;
     return parsed.verdicts.flatMap((item) => {
-      if (!isRecord15(item))
+      if (!isRecord16(item))
         return [];
       if (typeof item.findingId !== "string")
         return [];
@@ -194993,7 +195415,7 @@ function verificationNote(reasoning) {
 function isVerdict(value) {
   return value === "confirmed" || value === "refuted" || value === "uncertain";
 }
-function isRecord15(value) {
+function isRecord16(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -195001,7 +195423,7 @@ function isRecord15(value) {
 var MAX_AGENT_RETRY_PROGRESS_EVENTS = 100;
 function requestForRecursionFingerprint(request) {
   try {
-    return scanAndRedactSecrets(request).redactedRequest;
+    return scanAndRedactSecrets(normalizeRequestTimeUnits(request)).redactedRequest;
   } catch {
     return { goal: "" };
   }
@@ -195261,15 +195683,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,
@@ -195320,7 +195744,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,
@@ -195328,7 +195752,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,
@@ -195415,7 +195839,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}`)));