@ycodium-ai/agent-kimi 0.2.3614 → 0.2.3635

package/dist/index.js

@@ -42,9 +42,10 @@ var KIMI_CARD = {
   verifiedSkills: false,
   everydayHarness: false,
   capabilities: {
-    sessionModelSwitch: "unsupported",
-    // 档位只在建会话时经 `session/set_config_option` 发一次：中途换档，宿主带 resume cursor 重开。
-    sessionOptionSwitch: "unsupported",
+    // 型号与档位都经 `session/set_config_option` 在会话里切，执行器发送前写进去，不重开会话
+    // （2.3.3 实测，同一进程，下一轮发给模型的就是新型号、新档）。
+    sessionModelSwitch: "in-session",
+    sessionOptionSwitch: "in-session",
     // 与通用 ACP 同：`setRuntimeMode` 只改自己的会话记录，用户真正切得动的是
     // `nativeModeSwitch`。kimi `acp` 的 `session/set_mode plan` 实测回 `{}` 并推
     // `current_mode_update`，不存在的 modeId 被 `-32602 Unknown modeId` 拒掉。
@@ -183,6 +184,40 @@ var AcpExecutorTurnEndedError = class extends AcpExecutorError {
     this.name = "AcpExecutorTurnEndedError";
   }
 };
+var AcpExecutorOptionRejectedError = class extends AcpExecutorError {
+  constructor(option, value, cause) {
+    const detail = acpErrorDetail(cause);
+    super(
+      "provider-rejected",
+      `The agent rejected the ${option}${value === void 0 ? "" : ` "${value}"`}${detail === void 0 ? "" : ` (${detail})`}. This turn was not sent.`
+    );
+    this.name = "AcpExecutorOptionRejectedError";
+  }
+};
+var AcpExecutorOptionTimeoutError = class extends AcpExecutorError {
+  constructor(option, value) {
+    super(
+      "provider-rejected",
+      `The agent did not answer the ${option} "${value}" change in time. This turn was not sent.`
+    );
+    this.name = "AcpExecutorOptionTimeoutError";
+  }
+};
+var AcpOptionWriteStoppedError = class extends Error {
+  constructor() {
+    super("option write stopped");
+    this.name = "AcpOptionWriteStoppedError";
+  }
+};
+function acpErrorDetail(cause) {
+  if (typeof cause !== "object" || cause === null) return void 0;
+  const message = cause.message;
+  const data = cause.data;
+  const parts = [message, data].filter(
+    (part) => typeof part === "string" && part.trim().length > 0
+  );
+  return parts.length === 0 ? void 0 : parts.join(": ");
+}
 var AcpExecutorNotStartedError = class extends AcpExecutorError {
   constructor(message = "ACP session has not been started") {
     super("not-started", message);
@@ -296,10 +331,88 @@ var UnboundedEventStream = class {
   }
 };
 
-// ../../packages/ycodium-acp-executor/src/util.ts
+// ../../packages/ycodium-acp-executor/src/config-options.ts
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function asString(value) {
+  return typeof value === "string" ? value : void 0;
+}
+function normalizedField(option, key) {
+  return asString(option[key])?.trim().toLowerCase() ?? "";
+}
+function looksLikeEffortOption(option) {
+  const id = normalizedField(option, "id");
+  const name = normalizedField(option, "name");
+  return id === "effort" || id === "reasoning" || name === "effort" || name === "reasoning" || name.includes("effort") || name.includes("reasoning") || normalizedField(option, "category") === "thought_level";
+}
+function flattenChoices(rawOptions, currentValue) {
+  if (!Array.isArray(rawOptions)) return [];
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  const push = (entry) => {
+    if (!isRecord(entry)) return;
+    const value = asString(entry["value"]);
+    if (value === void 0 || seen.has(value)) return;
+    seen.add(value);
+    const description = asString(entry["description"])?.trim();
+    const name = asString(entry["name"])?.trim();
+    out.push({
+      value,
+      ...name ? { name } : {},
+      label: name || value,
+      ...description ? { description } : {},
+      ...currentValue !== void 0 && currentValue === value ? { isDefault: true } : {}
+    });
+  };
+  for (const entry of rawOptions) {
+    if (isRecord(entry) && Array.isArray(entry["options"])) {
+      for (const nested of entry["options"]) push(nested);
+      continue;
+    }
+    push(entry);
+  }
+  return out;
+}
+function isConfigOption(entry, configId) {
+  return isRecord(entry) && asString(entry["id"])?.trim() === configId.trim();
+}
+function findConfigOptionEntry(configOptions, configId) {
+  return Array.isArray(configOptions) && configId.trim() !== "" ? configOptions.find(
+    (entry) => isConfigOption(entry, configId)
+  ) : void 0;
+}
+function withConfigOptionValue(configOptions, configId, value) {
+  if (!Array.isArray(configOptions)) return configOptions;
+  return configOptions.map(
+    (option) => isConfigOption(option, configId) ? { ...option, currentValue: value } : option
+  );
+}
+function pickEffortOption(configOptions) {
+  if (!Array.isArray(configOptions)) return void 0;
+  const candidates = configOptions.filter(isRecord).filter((option) => normalizedField(option, "type") === "select").filter(looksLikeEffortOption);
+  return candidates.find((option) => normalizedField(option, "category") === "model_option") ?? candidates.find((option) => normalizedField(option, "id") === "effort") ?? candidates.find((option) => normalizedField(option, "category") === "thought_level") ?? candidates[0];
+}
+function findAcpEffortConfig(configOptions) {
+  const picked = pickEffortOption(configOptions);
+  if (picked === void 0) return void 0;
+  const configId = asString(picked["id"])?.trim();
+  if (!configId) return void 0;
+  const currentValue = asString(picked["currentValue"])?.trim() || void 0;
+  const choices = flattenChoices(picked["options"], currentValue);
+  if (choices.length === 0) return void 0;
+  return {
+    configId,
+    label: asString(picked["name"])?.trim() ?? "",
+    choices,
+    ...currentValue === void 0 ? {} : { currentValue }
+  };
+}
+
+// ../../packages/ycodium-acp-executor/src/util.ts
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function asTrimmedString(value) {
   if (typeof value !== "string") {
     return void 0;
@@ -352,11 +465,11 @@ function extractCommandFromTitle(title) {
   return backtickMatch?.[1]?.trim() || void 0;
 }
 function extractToolCommand(data, title) {
-  const item = isRecord(data?.["item"]) ? data["item"] : void 0;
-  const itemInput = item && isRecord(item["input"]) ? item["input"] : void 0;
-  const itemResult = item && isRecord(item["result"]) ? item["result"] : void 0;
-  const rawInput = isRecord(data?.["rawInput"]) ? data["rawInput"] : void 0;
-  const dataInput = isRecord(data?.["input"]) ? data["input"] : void 0;
+  const item = isRecord2(data?.["item"]) ? data["item"] : void 0;
+  const itemInput = item && isRecord2(item["input"]) ? item["input"] : void 0;
+  const itemResult = item && isRecord2(item["result"]) ? item["result"] : void 0;
+  const rawInput = isRecord2(data?.["rawInput"]) ? data["rawInput"] : void 0;
+  const dataInput = isRecord2(data?.["input"]) ? data["input"] : void 0;
   const candidates = [
     normalizeCommandValue(item?.["command"]),
     normalizeCommandValue(itemInput?.["command"]),
@@ -401,7 +514,7 @@ function collectPaths(value, paths, seen, depth) {
     }
     return;
   }
-  if (!isRecord(value)) {
+  if (!isRecord2(value)) {
     return;
   }
   for (const key of ["path", "filePath", "relativePath", "filename", "newPath", "oldPath"]) {
@@ -479,7 +592,7 @@ function deriveToolActivityPresentation(input2) {
   const title = asTrimmedString(input2.title);
   const detail = stripTrailingExitCode(asTrimmedString(input2.detail));
   const fallbackSummary = asTrimmedString(input2.fallbackSummary) ?? "Tool";
-  const data = isRecord(input2.data) ? input2.data : void 0;
+  const data = isRecord2(input2.data) ? input2.data : void 0;
   const command = extractToolCommand(data, title);
   const primaryPath = extractPrimaryPath(data);
   const action = classifyToolAction({
@@ -511,7 +624,7 @@ function deriveToolActivityPresentation(input2) {
     };
   }
   if (action === "search") {
-    const rawInput = isRecord(data?.["rawInput"]) ? data["rawInput"] : void 0;
+    const rawInput = isRecord2(data?.["rawInput"]) ? data["rawInput"] : void 0;
     const query = asTrimmedString(rawInput?.["query"]) ?? asTrimmedString(rawInput?.["pattern"]) ?? asTrimmedString(rawInput?.["searchTerm"]);
     return {
       summary: "Searched files",
@@ -571,7 +684,7 @@ function extractCommandFromTitle2(title) {
   return match?.[1]?.trim() || void 0;
 }
 function extractToolCallCommand(rawInput, title) {
-  if (isRecord(rawInput)) {
+  if (isRecord2(rawInput)) {
     const directCommand = normalizeCommandValue2(rawInput["command"]);
     if (directCommand) {
       return directCommand;
@@ -599,7 +712,7 @@ function boundTailText(text, limit = TOOL_CALL_CONTENT_MAX_CHARS) {
 var boundToolCallOutputText = (text) => boundTailText(text);
 var RAW_OUTPUT_TEXT_FIELDS = ["content", "stdout", "stderr", "output"];
 function boundToolCallRawOutput(rawOutput) {
-  if (!isRecord(rawOutput)) {
+  if (!isRecord2(rawOutput)) {
     return rawOutput;
   }
   let changed = false;
@@ -780,14 +893,7 @@ function extractModelConfigId(sessionResponse) {
   return configOptions.find((opt) => opt.id.trim() === "model" && opt.type === "select") ? "model" : void 0;
 }
 function findSessionConfigOption(configOptions, configId) {
-  if (!configOptions) {
-    return void 0;
-  }
-  const normalizedConfigId = configId.trim();
-  if (!normalizedConfigId) {
-    return void 0;
-  }
-  return configOptions.find((option) => option.id.trim() === normalizedConfigId);
+  return findConfigOptionEntry(configOptions, configId);
 }
 function collectSessionConfigOptionValues(configOption) {
   if (configOption.type !== "select" || !configOption.options) {
@@ -798,11 +904,11 @@ function collectSessionConfigOptionValues(configOption) {
   );
 }
 function collectSessionModelIds(models) {
-  if (!isRecord(models) || !Array.isArray(models["availableModels"])) {
+  if (!isRecord2(models) || !Array.isArray(models["availableModels"])) {
     return [];
   }
   return models["availableModels"].flatMap(
-    (model) => isRecord(model) && typeof model["modelId"] === "string" ? [model["modelId"]] : []
+    (model) => isRecord2(model) && typeof model["modelId"] === "string" ? [model["modelId"]] : []
   );
 }
 function catalogModelLastSegment(value) {
@@ -874,7 +980,7 @@ function parseAvailableCommandsUpdate(params) {
   }
   const commands = [];
   for (const command of availableCommands) {
-    if (!isRecord(command)) {
+    if (!isRecord2(command)) {
       continue;
     }
     const name = typeof command["name"] === "string" ? command["name"].trim() : "";
@@ -882,7 +988,7 @@ function parseAvailableCommandsUpdate(params) {
       continue;
     }
     const description = typeof command["description"] === "string" ? command["description"].trim() || void 0 : void 0;
-    const input2 = isRecord(command["input"]) ? command["input"] : void 0;
+    const input2 = isRecord2(command["input"]) ? command["input"] : void 0;
     const inputHint = typeof input2?.["hint"] === "string" ? input2["hint"].trim() || void 0 : void 0;
     commands.push({
       name,
@@ -936,7 +1042,7 @@ function boundToolCallRawPayload(params, update, toolCall) {
 }
 function textFromContentBlocks(blocks) {
   const parts = blocks.flatMap(
-    (block) => isRecord(block) && block["type"] === "text" && typeof block["text"] === "string" ? [block["text"]] : []
+    (block) => isRecord2(block) && block["type"] === "text" && typeof block["text"] === "string" ? [block["text"]] : []
   );
   const joined = parts.join("");
   return joined.trim().length > 0 ? joined : void 0;
@@ -961,7 +1067,7 @@ function parseSessionUpdateEvent(params) {
       const entries = Array.isArray(upd["entries"]) ? upd["entries"] : [];
       const plan = entries.map((entry, index) => ({
         step: readAcpText(entry, "content") ?? `Step ${index + 1}`,
-        status: normalizePlanStepStatus(isRecord(entry) ? entry["status"] : void 0)
+        status: normalizePlanStepStatus(isRecord2(entry) ? entry["status"] : void 0)
       }));
       if (plan.length > 0) {
         events.push({
@@ -1001,7 +1107,7 @@ function parseSessionUpdateEvent(params) {
     }
     case "agent_message_chunk":
     case "agent_thought_chunk": {
-      const content = isRecord(upd["content"]) ? upd["content"] : void 0;
+      const content = isRecord2(upd["content"]) ? upd["content"] : void 0;
       const contentType = content?.["type"];
       const streamKind = kind === "agent_thought_chunk" ? "reasoning_text" : "assistant_text";
       if (contentType === "text") {
@@ -1041,7 +1147,7 @@ function parseSessionUpdateEvent(params) {
     }
     case "compaction_summary_chunk": {
       const compactionId = readAcpText(upd, "compactionId");
-      const content = isRecord(upd["content"]) ? upd["content"] : void 0;
+      const content = isRecord2(upd["content"]) ? upd["content"] : void 0;
       const text = content?.["type"] === "text" ? content["text"] : void 0;
       if (compactionId === void 0 || typeof text !== "string" || text.length === 0) break;
       events.push({ _tag: "CompactionSummaryChunk", compactionId, text });
@@ -22735,17 +22841,17 @@ function isResponseMessage(value) {
 function isNotificationMessage(value) {
   return isJsonRpcEnvelope(value) && !("id" in value) && typeof value["method"] === "string";
 }
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null;
 }
 function isJsonRpcEnvelope(value) {
-  return isRecord2(value) && value["jsonrpc"] === "2.0";
+  return isRecord3(value) && value["jsonrpc"] === "2.0";
 }
 function isJsonRpcId(value) {
   return value === null || typeof value === "string" || typeof value === "number" && Number.isFinite(value);
 }
 function isResponseShapedMessage(value) {
-  return isRecord2(value) && !("method" in value) && ("id" in value || "result" in value || "error" in value);
+  return isRecord3(value) && !("method" in value) && ("id" in value || "result" in value || "error" in value);
 }
 function isResponseBatch(batch) {
   let hasValidCall = false;
@@ -22755,7 +22861,7 @@ function isResponseBatch(batch) {
   for (const entry of batch) {
     hasValidCall ||= isRequestMessage(entry) || isNotificationMessage(entry);
     hasValidResponse ||= isResponseMessage(entry);
-    if (!isRecord2(entry)) {
+    if (!isRecord3(entry)) {
       continue;
     }
     hasCallShape ||= "method" in entry;
@@ -22770,13 +22876,13 @@ function isResponseBatch(batch) {
   return hasResponseShape && !hasCallShape;
 }
 function cancelRequestId(params) {
-  if (!isRecord2(params) || !isJsonRpcId(params["requestId"])) {
+  if (!isRecord3(params) || !isJsonRpcId(params["requestId"])) {
     return void 0;
   }
   return params["requestId"];
 }
 function isErrorResponse(value) {
-  return isRecord2(value) && typeof value["code"] === "number" && Number.isInteger(value["code"]) && typeof value["message"] === "string";
+  return isRecord3(value) && typeof value["code"] === "number" && Number.isInteger(value["code"]) && typeof value["message"] === "string";
 }
 var Handled = {
   /**
@@ -23321,7 +23427,7 @@ var Connection = class {
     if (this.abortController.signal.aborted) {
       return Promise.resolve();
     }
-    if (!isRecord2(message)) {
+    if (!isRecord3(message)) {
       console.error("Invalid message", { message });
       return Promise.resolve();
     }
@@ -23724,7 +23830,7 @@ function ndJsonStream(output2, input2) {
           await writeJson(protocolErrorResponse(RequestError.parseError()));
           return;
         }
-        if (isRecord2(message) || Array.isArray(message)) {
+        if (isRecord3(message) || Array.isArray(message)) {
           controller.enqueue(message);
         } else {
           await writeJson(protocolErrorResponse(RequestError.invalidRequest(message)));
@@ -24711,14 +24817,14 @@ var legacyClientNotificationMethods = /* @__PURE__ */ new Set([
 import * as NodeStream from "node:stream";
 
 // ../../packages/ycodium-acp-executor/src/jsonrpc.ts
-function isRecord3(value) {
+function isRecord4(value) {
   return typeof value === "object" && value !== null;
 }
 function isJsonRpcId2(value) {
   return typeof value === "string" || typeof value === "number" && Number.isFinite(value);
 }
 function isJsonRpcEnvelope2(value) {
-  return isRecord3(value) && value["jsonrpc"] === "2.0";
+  return isRecord4(value) && value["jsonrpc"] === "2.0";
 }
 function isRequestMessage2(value) {
   return isJsonRpcEnvelope2(value) && "id" in value && typeof value["method"] === "string" && isJsonRpcId2(value["id"]);
@@ -24738,7 +24844,7 @@ function isNotificationMessage2(value) {
   return isJsonRpcEnvelope2(value) && !("id" in value) && typeof value["method"] === "string";
 }
 function readJsonRpcError(value) {
-  if (!isRecord3(value) || typeof value["code"] !== "number" || typeof value["message"] !== "string") {
+  if (!isRecord4(value) || typeof value["code"] !== "number" || typeof value["message"] !== "string") {
     return void 0;
   }
   return {
@@ -24811,11 +24917,11 @@ var KNOWN_SESSION_UPDATES = /* @__PURE__ */ new Set([
   "compaction_summary_chunk"
 ]);
 function isSessionUpdateEnvelope(payload) {
-  if (!isRecord3(payload) || typeof payload["sessionId"] !== "string") {
+  if (!isRecord4(payload) || typeof payload["sessionId"] !== "string") {
     return false;
   }
   const update = payload["update"];
-  return isRecord3(update) && typeof update["sessionUpdate"] === "string";
+  return isRecord4(update) && typeof update["sessionUpdate"] === "string";
 }
 function hasKnownVariantShape(update) {
   const kind = update["sessionUpdate"];
@@ -24823,7 +24929,7 @@ function hasKnownVariantShape(update) {
     return false;
   }
   if (kind === "user_message_chunk" || kind === "agent_message_chunk" || kind === "agent_thought_chunk") {
-    return isRecord3(update["content"]);
+    return isRecord4(update["content"]);
   }
   return true;
 }
@@ -25012,6 +25118,10 @@ function createAcpConnection(options) {
       );
     } catch {
     }
+    try {
+      waiter.onArrival?.();
+    } catch {
+    }
     if (Object.hasOwn(message, "error")) {
       const rpcError = readJsonRpcError(message["error"]);
       waiter.reject(
@@ -25142,7 +25252,7 @@ function createAcpConnection(options) {
   options.readable.on("end", onEnd);
   options.readable.on("error", onError);
   options.writable.once("error", onWritableError);
-  const begin = (method, params, promptId) => {
+  const begin = (method, params, promptId, onArrival) => {
     failIfClosed();
     const id = nextRequestId;
     nextRequestId += 1;
@@ -25150,6 +25260,7 @@ function createAcpConnection(options) {
     pending.set(String(id), {
       method,
       ...promptId === void 0 ? {} : { promptId },
+      ...onArrival === void 0 ? {} : { onArrival },
       resolve: resolve3,
       reject
     });
@@ -25205,10 +25316,31 @@ function createAcpConnection(options) {
 function normalizeModelId(value) {
   return value?.trim() || void 0;
 }
+function adoptReportedConfigOptions(state, configOptions) {
+  const option = state.modelConfigId === void 0 ? void 0 : findConfigOptionEntry(configOptions, state.modelConfigId);
+  const value = option?.["currentValue"];
+  const reported = typeof value === "string" ? normalizeModelId(value) : void 0;
+  if (reported === void 0) return { ...state, configOptions };
+  const { modelUnconfirmed: _confirmed, ...known } = state;
+  return { ...known, configOptions, currentModelId: reported };
+}
+function forgetConfigOptionValue(state, configId) {
+  const forgetsModel = configId === void 0 || configId === state.modelConfigId;
+  const configOptions = configId !== void 0 && Array.isArray(state.configOptions) ? state.configOptions.map((option) => {
+    if (!isRecord2(option) || option["id"] !== configId) return option;
+    const { currentValue: _forgotten, ...rest } = option;
+    return rest;
+  }) : state.configOptions;
+  return {
+    ...state,
+    configOptions,
+    ...forgetsModel ? { currentModelId: void 0, modelUnconfirmed: true } : {}
+  };
+}
 function modelSelectionStateFromSetup(setup) {
-  const sessionModels = isRecord(setup.models) ? setup.models : void 0;
+  const sessionModels = isRecord2(setup.models) ? setup.models : void 0;
   const modelConfigId = extractModelConfigId(setup);
-  const strategy = sessionModels === void 0 && modelConfigId !== void 0 ? "config-option" : "session/set_model";
+  const strategy = modelConfigId !== void 0 ? "config-option" : "session/set_model";
   const modelConfigOption = modelConfigId === void 0 ? void 0 : findSessionConfigOption(setup.configOptions, modelConfigId);
   const configModel = modelConfigOption?.currentValue;
   const currentModelId = strategy === "config-option" ? typeof configModel === "string" ? normalizeModelId(configModel) : void 0 : typeof sessionModels?.["currentModelId"] === "string" ? normalizeModelId(sessionModels["currentModelId"]) : void 0;
@@ -25218,7 +25350,8 @@ function modelSelectionStateFromSetup(setup) {
     modelConfigId,
     currentModelId,
     advertisedModelValues: strategy === "config-option" ? modelConfigOption === void 0 ? [] : collectSessionConfigOptionValues(modelConfigOption) : collectSessionModelIds(sessionModels),
-    configOptions: setup.configOptions
+    configOptions: setup.configOptions,
+    catalogSetup: setup
   };
 }
 
@@ -25316,6 +25449,10 @@ function createExecutorLifecycle({
     if (targetTurnId !== void 0) {
       interruptedTurnIds.add(targetTurnId);
     }
+    const optionWrites = shared.optionWriteStop;
+    if (optionWrites !== void 0 && (targetTurnId === void 0 || optionWrites.turnId === targetTurnId)) {
+      optionWrites.stop();
+    }
     settleAllApprovals("cancel");
     settleAllUserInputs();
     abortPendingSettlement("turn cancelled");
@@ -25528,6 +25665,41 @@ function isAcpRequestPermissionParams(value) {
   return Array.isArray(record2["options"]);
 }
 
+// ../../packages/ycodium-acp-executor/src/apply-effort.ts
+var alignRequestedEffort = async (input2) => {
+  const unchanged = { configOptions: input2.configOptions };
+  const effort = findAcpEffortConfig(input2.configOptions);
+  if (effort === void 0) return unchanged;
+  const values = new Set(effort.choices.map((choice) => choice.value));
+  const current = effort.currentValue;
+  const requested = input2.requestedEffort?.trim() || void 0;
+  const unsupportedEffort = requested !== void 0 && !values.has(requested) ? requested : void 0;
+  const staleCurrent = current !== void 0 && !values.has(current);
+  const fallback = input2.modelDefaultEffort !== void 0 && values.has(input2.modelDefaultEffort) ? input2.modelDefaultEffort : void 0;
+  const target = requested !== void 0 && unsupportedEffort === void 0 ? requested : unsupportedEffort !== void 0 || staleCurrent ? fallback : void 0;
+  const written = target === void 0 || target === current ? void 0 : await input2.write(effort.configId, target);
+  const configOptions = written === void 0 ? input2.configOptions : written.configOptions;
+  if (unsupportedEffort === void 0) return { configOptions };
+  const confirmed = fallback !== void 0 && written?.reported === true && findAcpEffortConfig(written.configOptions)?.currentValue === fallback;
+  return { configOptions, unsupportedEffort, ...confirmed ? { appliedEffort: fallback } : {} };
+};
+
+// ../../packages/ycodium-acp-executor/src/reasoning-level-fallback.ts
+var REASONING_LEVEL_FALLBACK_CODE = "reasoning-level-fallback";
+function reasoningLevelFallbackWarning(input2) {
+  const model = input2.model ?? "This model";
+  const outcome = input2.appliedEffort === void 0 ? "so the agent picks this turn's level" : `so this turn uses its default, "${input2.appliedEffort}"`;
+  return {
+    message: `${model} does not offer the "${input2.requestedEffort}" reasoning effort, ${outcome}. Your saved choice is unchanged.`,
+    detail: {
+      code: REASONING_LEVEL_FALLBACK_CODE,
+      ...input2.model === void 0 ? {} : { model: input2.model },
+      requestedEffort: input2.requestedEffort,
+      ...input2.appliedEffort === void 0 ? {} : { appliedEffort: input2.appliedEffort }
+    }
+  };
+}
+
 // ../../packages/ycodium-acp-executor/src/failureCategory.ts
 var ACP_FAILURE_CATEGORIES = [
   "quota",
@@ -25868,6 +26040,8 @@ function createExecutorPrompt({
   threadMutex,
   promptMutex,
   applyRequestedModel,
+  modelDefaultEffort,
+  writeConfigOptionReported,
   notifyPromptSettled,
   shared,
   promptResults,
@@ -25961,6 +26135,57 @@ function createExecutorPrompt({
       }
     }
   };
+  const alignTurnOptions = async (input2, sessionId, generation, isStale, signal) => {
+    const applied = await applyRequestedModel({
+      state: shared.modelSelectionState,
+      acpSessionId: sessionId,
+      requestedModelId: input2.requestedModelId,
+      expectedGeneration: generation,
+      signal
+    });
+    shared.modelSelectionState = applied;
+    if (isStale()) return;
+    const switched = applied.configOptions;
+    let aligned;
+    try {
+      aligned = await alignRequestedEffort({
+        configOptions: switched,
+        write: (configId, value) => writeConfigOptionReported(sessionId, switched, configId, value, {
+          option: "reasoning level",
+          signal
+        }),
+        requestedEffort: input2.requestedEffort,
+        modelDefaultEffort: modelDefaultEffort(applied)
+      });
+    } catch (error62) {
+      throw error62 instanceof RequestError ? new AcpExecutorOptionRejectedError(
+        "reasoning level",
+        input2.requestedEffort?.trim(),
+        error62
+      ) : error62;
+    }
+    if (!isLive(generation)) throw new AcpExecutorDisposedError();
+    if (aligned.configOptions !== switched) {
+      shared.modelSelectionState = adoptReportedConfigOptions(
+        shared.modelSelectionState,
+        aligned.configOptions
+      );
+    }
+    if (aligned.unsupportedEffort !== void 0) {
+      emit({
+        type: "runtime.warning",
+        ...stamp(),
+        provider: options.provider,
+        threadId: options.threadId,
+        ...shared.activeTurnId === void 0 ? {} : { turnId: shared.activeTurnId },
+        payload: reasoningLevelFallbackWarning({
+          model: applied.currentModelId,
+          requestedEffort: aligned.unsupportedEffort,
+          appliedEffort: aligned.appliedEffort
+        })
+      });
+    }
+  };
   const failIfPromptUnavailable = () => {
     failIfDisposed();
     if (shared.connectionClosed) throw new AcpExecutorDisposedError();
@@ -25968,7 +26193,7 @@ function createExecutorPrompt({
   const prompt = async (input2) => {
     failIfPromptUnavailable();
     const started = requireStarted();
-    let sessionId = started.sessionId;
+    const sessionId = started.sessionId;
     let record2;
     const settle2 = (rest) => settleTurn({
       expectedGeneration: started.generation,
@@ -26055,32 +26280,34 @@ function createExecutorPrompt({
       failIfDisposed();
       const queuedTurnId = turnId;
       const isStale = () => interruptedTurnIds.has(queuedTurnId) || input2.expectedActiveTurnId !== void 0 && shared.activeTurnId !== queuedTurnId;
-      if (!isStale()) {
+      if (!isStale() && input2.expectedActiveTurnId === void 0) {
+        const optionWrites = new AbortController();
+        shared.optionWriteStop = { turnId, stop: () => optionWrites.abort() };
         try {
-          const applied = await applyRequestedModel({
-            state: shared.modelSelectionState,
-            acpSessionId: sessionId,
-            setup: shared.startResult?.sessionSetupResult ?? {},
-            requestedModelId: input2.requestedModelId,
-            expectedGeneration: started.generation
-          });
-          shared.modelSelectionState = applied.state;
-          sessionId = applied.sessionId;
-          record2.sessionId = applied.sessionId;
+          await alignTurnOptions(
+            input2,
+            sessionId,
+            started.generation,
+            isStale,
+            optionWrites.signal
+          );
         } catch (error62) {
-          const failureCategory = readAcpFailureCategory(error62);
-          if (failureCategory === "model-unavailable") {
-            const errorMessage = error62 instanceof Error && error62.message.trim().length > 0 ? error62.message : "Requested model is not in this agent's catalog. This turn was not sent.";
-            settle2({
-              turnId,
-              stopReason: "error",
-              state: "failed",
-              errorMessage,
-              failureCategory
-            });
-            throw error62 instanceof Error ? withFailureCategory(error62, failureCategory) : error62;
+          if (error62 instanceof AcpExecutorDisposedError) throw error62;
+          if (isStale()) {
+            settle2({ turnId, stopReason: "cancelled", state: "cancelled" });
+            return { threadId: options.threadId, turnId, stopReason: "cancelled" };
           }
-          throw error62;
+          const failureCategory = readAcpFailureCategory(error62);
+          settle2({
+            turnId,
+            stopReason: "error",
+            state: "failed",
+            errorMessage: error62 instanceof Error && error62.message.trim() || "Switching the model or reasoning level failed. This turn was not sent.",
+            ...failureCategory === void 0 ? {} : { failureCategory }
+          });
+          throw error62 instanceof Error ? withFailureCategory(error62, failureCategory) : error62;
+        } finally {
+          shared.optionWriteStop = void 0;
         }
       }
       failIfDisposed();
@@ -26463,7 +26690,7 @@ function createExecutorRequests({
     pendingUserInputs.delete(requestId);
     pending.resolve({
       kind: "answered",
-      answers: isRecord(answers) ? answers : {}
+      answers: isRecord2(answers) ? answers : {}
     });
   };
   return {
@@ -26638,97 +26865,6 @@ function createExecutorRuntime({
   };
 }
 
-// ../../packages/ycodium-acp-executor/src/config-options.ts
-function isRecord4(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function asString(value) {
-  return typeof value === "string" ? value : void 0;
-}
-function normalizedField(option, key) {
-  return asString(option[key])?.trim().toLowerCase() ?? "";
-}
-function looksLikeEffortOption(option) {
-  const id = normalizedField(option, "id");
-  const name = normalizedField(option, "name");
-  return id === "effort" || id === "reasoning" || name === "effort" || name === "reasoning" || name.includes("effort") || name.includes("reasoning") || normalizedField(option, "category") === "thought_level";
-}
-function flattenChoices(rawOptions, currentValue) {
-  if (!Array.isArray(rawOptions)) return [];
-  const out = [];
-  const seen = /* @__PURE__ */ new Set();
-  const push = (entry) => {
-    if (!isRecord4(entry)) return;
-    const value = asString(entry["value"]);
-    if (value === void 0 || seen.has(value)) return;
-    seen.add(value);
-    const description = asString(entry["description"])?.trim();
-    const name = asString(entry["name"])?.trim();
-    out.push({
-      value,
-      ...name ? { name } : {},
-      label: name || value,
-      ...description ? { description } : {},
-      ...currentValue !== void 0 && currentValue === value ? { isDefault: true } : {}
-    });
-  };
-  for (const entry of rawOptions) {
-    if (isRecord4(entry) && Array.isArray(entry["options"])) {
-      for (const nested of entry["options"]) push(nested);
-      continue;
-    }
-    push(entry);
-  }
-  return out;
-}
-function findAcpEffortConfig(configOptions) {
-  if (!Array.isArray(configOptions)) return void 0;
-  const candidates = configOptions.filter(isRecord4).filter((option) => normalizedField(option, "type") === "select").filter(looksLikeEffortOption);
-  if (candidates.length === 0) return void 0;
-  const picked = candidates.find((option) => normalizedField(option, "category") === "model_option") ?? candidates.find((option) => normalizedField(option, "id") === "effort") ?? candidates.find((option) => normalizedField(option, "category") === "thought_level") ?? candidates[0];
-  if (picked === void 0) return void 0;
-  const configId = asString(picked["id"])?.trim();
-  if (!configId) return void 0;
-  const choices = flattenChoices(picked["options"], asString(picked["currentValue"])?.trim());
-  if (choices.length === 0) return void 0;
-  return {
-    configId,
-    label: asString(picked["name"])?.trim() ?? "",
-    choices
-  };
-}
-
-// ../../packages/ycodium-acp-executor/src/apply-effort.ts
-var applyRequestedEffort = async (input2) => {
-  const requested = input2.requestedEffort?.trim();
-  if (!requested) return;
-  const effort = findAcpEffortConfig(input2.configOptions);
-  if (effort === void 0) return;
-  const matched = effort.choices.find((choice) => choice.value === requested);
-  if (matched === void 0) {
-    input2.log?.info("requested effort is not in the agent catalog; keeping its own", {
-      requestedEffort: requested,
-      advertised: effort.choices.map((choice) => choice.value)
-    });
-    return;
-  }
-  if (matched.isDefault === true) return;
-  if (!input2.isLive(input2.expectedGeneration)) return;
-  try {
-    await input2.connection.request("session/set_config_option", {
-      sessionId: input2.acpSessionId,
-      configId: effort.configId,
-      value: requested
-    });
-  } catch (error62) {
-    input2.log?.info("setting the effort level failed; the session keeps its own", {
-      requestedEffort: requested,
-      configId: effort.configId,
-      error: error62 instanceof Error ? error62.message : String(error62)
-    });
-  }
-};
-
 // ../../packages/ycodium-acp-executor/src/config-option-wiring.ts
 var VENDOR_CATEGORY_PREFIX = "_";
 var ACP_CONFIG_CATEGORY_HANDLING = {
@@ -26742,7 +26878,7 @@ var ACP_CONFIG_CATEGORY_HANDLING = {
   },
   thought_level: {
     consumed: true,
-    via: "config-options.ts:findAcpEffortConfig \u2192 apply-effort.ts:applyRequestedEffort"
+    via: "config-options.ts:findAcpEffortConfig \u2192 apply-effort.ts:alignRequestedEffort"
   },
   model_option: {
     consumed: true,
@@ -26811,13 +26947,14 @@ function judgeRequestedModel(input2) {
   if (requested === void 0 || requested === current) return { kind: "keep" };
   const hasCatalog = input2.state.advertisedModelValues.length > 0;
   const hasCurrent = current !== void 0;
-  if (!hasCatalog && !hasCurrent) return { kind: "keep" };
-  const canSwitch = input2.state.strategy === "session/set_model" && input2.state.sessionModelsAdvertised || input2.state.strategy === "config-option" && input2.state.modelConfigId !== void 0;
+  if (!hasCatalog && !hasCurrent && input2.state.modelUnconfirmed !== true) return { kind: "keep" };
+  const canSwitch = canSwitchModel(input2.state);
   const value = hasCatalog ? matchAdvertisedModelValue(requested, input2.state.advertisedModelValues) : void 0;
   if (value !== void 0 && value === current) return { kind: "keep" };
   if (value !== void 0 && canSwitch) return { kind: "switch", value };
-  return input2.refreshed ? { kind: "unavailable" } : { kind: "refresh" };
+  return { kind: "refresh" };
 }
+var canSwitchModel = (state) => state.strategy === "session/set_model" && state.sessionModelsAdvertised || state.strategy === "config-option" && state.modelConfigId !== void 0;
 function modelUnavailableError(requestedModelId, currentModelId) {
   const current = currentModelId ?? "its own model";
   return withFailureCategory(
@@ -26892,6 +27029,7 @@ function acpCurrentModeId(setup) {
 // ../../packages/ycodium-acp-executor/src/executor/session.ts
 function createExecutorSession({
   options,
+  hooks,
   connection,
   isLive,
   emit,
@@ -26913,131 +27051,140 @@ function createExecutorSession({
       shared.sessionOpensInFlight -= 1;
     }
   };
-  const openFreshSession = async (expectedGeneration) => {
-    const initialized = shared.initializeResult;
-    if (initialized === void 0) {
-      throw new Error("no handshake");
+  const optionDeadlineMs = () => options.modelCatalogRefreshTimeoutMs ?? MODEL_CATALOG_REFRESH_TIMEOUT_MS;
+  const within = async (work, signal, onTimeout) => {
+    void work.catch(() => void 0);
+    let timer;
+    let onStop;
+    const bound = new Promise((_resolve, reject) => {
+      timer = setTimeout(() => reject(onTimeout()), optionDeadlineMs());
+      onStop = () => reject(new AcpOptionWriteStoppedError());
+      if (signal?.aborted === true) onStop();
+      else signal?.addEventListener("abort", onStop, { once: true });
+    });
+    try {
+      return await Promise.race([work, bound]);
+    } finally {
+      clearTimeout(timer);
+      if (onStop !== void 0) signal?.removeEventListener("abort", onStop);
     }
-    const mcpServers = filterMcpServersByAgentCapabilities(
-      options.mcpServers ?? [],
-      initialized.agentCapabilities
+  };
+  const awaitOptionReply = async (pending, configId, write) => {
+    void pending.response.catch(() => void 0);
+    try {
+      return await within(
+        pending.written.then(() => pending.response),
+        write.signal,
+        () => new AcpExecutorOptionTimeoutError(write.option, write.value)
+      );
+    } catch (error62) {
+      if (error62 instanceof AcpExecutorOptionTimeoutError || error62 instanceof AcpOptionWriteStoppedError) {
+        shared.modelSelectionState = forgetConfigOptionValue(shared.modelSelectionState, configId);
+      }
+      throw error62;
+    }
+  };
+  const writeConfigOptionReported = async (sessionId, configOptions, configId, value, write) => {
+    const issuedAt = shared.configUpdateSeq;
+    let arrivedAt = Number.POSITIVE_INFINITY;
+    const pending = connection.begin(
+      "session/set_config_option",
+      { sessionId, configId, value },
+      void 0,
+      () => {
+        arrivedAt = shared.configUpdateSeq;
+      }
     );
-    const additionalDirectories = options.additionalDirectories !== void 0 && options.additionalDirectories.length > 0 ? { additionalDirectories: options.additionalDirectories } : {};
-    const created = await requestSession("session/new", {
-      cwd: options.cwd,
-      mcpServers,
-      ...additionalDirectories
-    });
-    if (!isLive(expectedGeneration)) {
-      throw new AcpExecutorDisposedError();
+    const reply = await awaitOptionReply(pending, configId, { ...write, value });
+    await connection.awaitInboundIdle();
+    const ours = shared.configOptionUpdates.get(sessionId);
+    if (ours !== void 0 && ours.seq > arrivedAt) {
+      return { configOptions: ours.configOptions, reported: true };
     }
-    if (created.sessionId === void 0 || created.sessionId.length === 0) {
-      throw new Error("session/new did not return a session id");
+    if (reply?.configOptions !== void 0) {
+      return { configOptions: reply.configOptions, reported: true };
     }
-    return { sessionId: created.sessionId, setup: created };
+    const base = ours !== void 0 && ours.seq > issuedAt ? ours.configOptions : configOptions;
+    return { configOptions: withConfigOptionValue(base, configId, value), reported: false };
   };
+  const writeConfigOption = async (...args) => (await writeConfigOptionReported(...args)).configOptions;
   const switchModel = async (input2) => {
     let configOptions = input2.state.configOptions;
-    if (input2.state.strategy === "config-option") {
-      const switched = await connection.request(
-        "session/set_config_option",
-        { sessionId: input2.sessionId, configId: input2.state.modelConfigId, value: input2.value }
+    const write = { option: "model", signal: input2.signal };
+    if (input2.state.strategy === "config-option" && input2.state.modelConfigId !== void 0) {
+      configOptions = await writeConfigOption(
+        input2.sessionId,
+        configOptions,
+        input2.state.modelConfigId,
+        input2.value,
+        write
       );
-      configOptions = switched?.configOptions ?? configOptions;
     } else {
-      await connection.request("session/set_model", {
+      const before = shared.configOptionUpdates.get(input2.sessionId);
+      const pending = connection.begin("session/set_model", {
         sessionId: input2.sessionId,
         modelId: input2.value
       });
+      await awaitOptionReply(pending, void 0, { ...write, value: input2.value });
+      await connection.awaitInboundIdle();
+      const reported = shared.configOptionUpdates.get(input2.sessionId);
+      if (reported !== void 0 && reported !== before) {
+        configOptions = reported.configOptions;
+      }
     }
     if (!isLive(input2.expectedGeneration)) {
       throw new AcpExecutorDisposedError();
     }
-    return { ...input2.state, currentModelId: input2.value, configOptions };
-  };
-  const adoptReopenedSession = (applied) => {
-    if (shared.sessionId === void 0 && shared.startResult === void 0) return;
-    const setup = applied.setup;
-    shared.sessionId = applied.sessionId;
-    shared.modelSelectionState = applied.state;
-    shared.modeState = parseSessionModeState(setup);
-    if (shared.startResult !== void 0) {
-      shared.startResult = {
-        ...shared.startResult,
-        sessionId: applied.sessionId,
-        sessionSetupResult: setup,
-        modelConfigId: extractModelConfigId(setup),
-        modelId: applied.state.currentModelId
-      };
-    }
+    const { modelUnconfirmed: _confirmed, ...known } = input2.state;
+    return adoptReportedConfigOptions({ ...known, currentModelId: input2.value }, configOptions);
   };
   const applyRequestedModel = async (input2) => {
-    async function applyOnce(state, sessionId, setup, refreshed) {
-      const requestedModelId = normalizeModelId(input2.requestedModelId) ?? "";
+    const requestedModelId = normalizeModelId(input2.requestedModelId) ?? "";
+    const switchTo = (value) => switchModel({
+      state: input2.state,
+      sessionId: input2.acpSessionId,
+      value,
+      expectedGeneration: input2.expectedGeneration,
+      signal: input2.signal
+    });
+    try {
       const judgment = judgeRequestedModel({
-        state,
-        requestedModelId: input2.requestedModelId,
-        refreshed
+        state: input2.state,
+        requestedModelId: input2.requestedModelId
       });
-      if (judgment.kind === "keep") return { state, sessionId, setup };
-      if (judgment.kind === "unavailable") {
-        throw modelUnavailableError(requestedModelId, state.currentModelId);
-      }
-      if (judgment.kind === "switch") {
-        return {
-          state: await switchModel({
-            state,
-            sessionId,
-            value: judgment.value,
-            expectedGeneration: input2.expectedGeneration
-          }),
-          sessionId,
-          setup
-        };
-      }
-      return refreshAndRejudge(requestedModelId);
-    }
-    async function refreshAndRejudge(requestedModelId) {
-      const timeoutMs = options.modelCatalogRefreshTimeoutMs ?? MODEL_CATALOG_REFRESH_TIMEOUT_MS;
-      let timedOut = false;
-      const timeoutError = new ModelCatalogRefreshTimeoutError();
-      let timer;
-      const work = (async () => {
-        await options.refreshCatalogForSend?.();
-        if (timedOut) throw timeoutError;
-        const reopened = await openFreshSession(input2.expectedGeneration);
-        if (timedOut) throw timeoutError;
-        const next = modelSelectionStateFromSetup(reopened.setup);
-        const applied = await applyOnce(next, reopened.sessionId, reopened.setup, true);
-        if (timedOut) throw timeoutError;
-        adoptReopenedSession(applied);
-        return applied;
-      })();
-      void work.then(
-        () => void 0,
-        () => void 0
+      if (judgment.kind === "keep") return input2.state;
+      if (judgment.kind === "switch") return await switchTo(judgment.value);
+      await refreshCatalog(requestedModelId, input2.signal);
+      if (!isLive(input2.expectedGeneration)) throw new AcpExecutorDisposedError();
+      if (!canSwitchModel(input2.state)) {
+        throw modelUnavailableError(requestedModelId, input2.state.currentModelId);
+      }
+      const switched = await switchTo(requestedModelId);
+      return switched.advertisedModelValues.includes(requestedModelId) ? switched : {
+        ...switched,
+        advertisedModelValues: [...switched.advertisedModelValues, requestedModelId]
+      };
+    } catch (error62) {
+      throw error62 instanceof RequestError ? withFailureCategory(
+        new AcpExecutorOptionRejectedError("model", requestedModelId, error62),
+        "model-unavailable"
+      ) : error62;
+    }
+  };
+  const refreshCatalog = async (requestedModelId, signal) => {
+    try {
+      await within(
+        Promise.resolve(options.refreshCatalogForSend?.()),
+        signal,
+        () => new ModelCatalogRefreshTimeoutError()
       );
-      const deadline = new Promise((_resolve, reject) => {
-        timer = setTimeout(() => {
-          timedOut = true;
-          connection.abandonPending(timeoutError);
-          reject(timeoutError);
-        }, timeoutMs);
-      });
-      try {
-        return await Promise.race([work, deadline]);
-      } catch (error62) {
-        if (error62 instanceof AcpExecutorDisposedError) throw error62;
-        if (timedOut || error62 instanceof ModelCatalogRefreshTimeoutError) {
-          throw modelRefreshTimedOutError(requestedModelId);
-        }
-        if (readAcpFailureCategory(error62) === "model-unavailable") throw error62;
-        throw modelRefreshFailedError(requestedModelId, error62);
-      } finally {
-        if (timer !== void 0) clearTimeout(timer);
+    } catch (error62) {
+      if (error62 instanceof AcpOptionWriteStoppedError) throw error62;
+      if (error62 instanceof ModelCatalogRefreshTimeoutError) {
+        throw modelRefreshTimedOutError(requestedModelId);
       }
+      throw modelRefreshFailedError(requestedModelId, error62);
     }
-    return applyOnce(input2.state, input2.acpSessionId, input2.setup, false);
   };
   const startOnce = async (expectedGeneration) => {
     const initializePayload = acpInitializePayload(
@@ -27112,26 +27259,45 @@ function createExecutorSession({
         categories: unhandledCategories
       });
     }
-    const openedSetup = setup;
-    const appliedModel = await applyRequestedModel({
-      state: modelSelectionStateFromSetup(openedSetup),
+    let nextModelSelectionState = await applyRequestedModel({
+      state: modelSelectionStateFromSetup(setup),
       acpSessionId: nextSessionId,
-      setup: openedSetup,
       requestedModelId: options.requestedModelId,
       expectedGeneration
     });
-    nextSessionId = appliedModel.sessionId;
-    setup = appliedModel.setup;
-    const nextModelSelectionState = appliedModel.state;
-    await applyRequestedEffort({
-      connection,
-      log: options.log,
-      isLive,
-      configOptions: nextModelSelectionState.configOptions,
-      acpSessionId: nextSessionId,
-      requestedEffort: options.requestedEffort,
-      expectedGeneration
-    });
+    if (!isLive(expectedGeneration)) {
+      throw new AcpExecutorDisposedError();
+    }
+    try {
+      const opened = nextModelSelectionState.configOptions;
+      const aligned = await alignRequestedEffort({
+        configOptions: opened,
+        write: (configId, value) => writeConfigOptionReported(nextSessionId, opened, configId, value, {
+          option: "reasoning level"
+        }),
+        requestedEffort: options.requestedEffort,
+        modelDefaultEffort: modelDefaultEffort(nextModelSelectionState)
+      });
+      nextModelSelectionState = adoptReportedConfigOptions(
+        nextModelSelectionState,
+        aligned.configOptions
+      );
+      if (aligned.unsupportedEffort !== void 0) {
+        options.log?.info("requested effort is not offered by this model; using its default", {
+          requestedEffort: aligned.unsupportedEffort,
+          modelId: nextModelSelectionState.currentModelId
+        });
+      }
+    } catch (error62) {
+      const effortConfigId = findAcpEffortConfig(nextModelSelectionState.configOptions)?.configId;
+      if (error62 instanceof AcpExecutorOptionTimeoutError && effortConfigId !== void 0) {
+        nextModelSelectionState = forgetConfigOptionValue(nextModelSelectionState, effortConfigId);
+      }
+      options.log?.info("setting the effort level failed; the session keeps its own", {
+        requestedEffort: options.requestedEffort,
+        error: error62 instanceof Error ? error62.message : String(error62)
+      });
+    }
     if (options.beforeApplyResult) {
       await options.beforeApplyResult();
     }
@@ -27191,6 +27357,7 @@ function createExecutorSession({
     );
     return shared.startInFlight;
   };
+  const modelDefaultEffort = (state) => state.currentModelId === void 0 ? void 0 : hooks.modelDefaultEffort?.({ setup: state.catalogSetup, modelId: state.currentModelId });
   const requireStarted = () => {
     failIfDisposed();
     if (!shared.sessionId || !shared.startResult) {
@@ -27218,7 +27385,14 @@ function createExecutorSession({
       modeId
     });
   };
-  return { applyRequestedModel, start, requireStarted, setNativeMode };
+  return {
+    applyRequestedModel,
+    modelDefaultEffort,
+    writeConfigOptionReported,
+    start,
+    requireStarted,
+    setNativeMode
+  };
 }
 
 // ../../packages/ycodium-acp-executor/src/executor/settlement.ts
@@ -27282,14 +27456,14 @@ function createExecutorSettlement({
 
 // ../../packages/ycodium-acp-executor/src/executor/subagent-sessions.ts
 function parseState(raw) {
-  if (!isRecord(raw)) return { status: void 0, error: void 0 };
+  if (!isRecord2(raw)) return { status: void 0, error: void 0 };
   const state = raw["state"];
   if (state === "running") return { status: "running", error: void 0 };
   if (state === "requires_action") return { status: "waiting", error: void 0 };
   if (state !== "idle") return { status: void 0, error: void 0 };
   const stopReason = raw["stopReason"];
-  const error62 = isRecord(raw["error"]) ? asTrimmedString(raw["error"]["message"]) : void 0;
-  if (stopReason === "error" || isRecord(raw["error"])) return { status: "failed", error: error62 };
+  const error62 = isRecord2(raw["error"]) ? asTrimmedString(raw["error"]["message"]) : void 0;
+  if (stopReason === "error" || isRecord2(raw["error"])) return { status: "failed", error: error62 };
   if (stopReason === "cancelled") return { status: "cancelled", error: void 0 };
   return { status: "idle", error: void 0 };
 }
@@ -27305,7 +27479,7 @@ function childLinkage(childId, record2) {
 function createSubagentSessionTracker(registry2) {
   const observe = (notification, ctx) => {
     const update = notification.update;
-    if (!isRecord(update) || update["sessionUpdate"] !== "subagent_update") return [];
+    if (!isRecord2(update) || update["sessionUpdate"] !== "subagent_update") return [];
     const childId = asTrimmedString(update["sessionId"]);
     if (childId === void 0 || ctx.ownSessionIds.has(childId)) return [];
     const outerId = notification.sessionId;
@@ -27531,6 +27705,21 @@ function createExecutorUpdates({
     markChildSession
   });
   const handleSessionUpdate = (params) => {
+    const update = params.update;
+    const reportedOptions = update["configOptions"];
+    if (update["sessionUpdate"] === "config_option_update" && Array.isArray(reportedOptions)) {
+      shared.configUpdateSeq += 1;
+      shared.configOptionUpdates.set(params.sessionId, {
+        configOptions: reportedOptions,
+        seq: shared.configUpdateSeq
+      });
+      if (params.sessionId === shared.sessionId) {
+        shared.modelSelectionState = adoptReportedConfigOptions(
+          shared.modelSelectionState,
+          reportedOptions
+        );
+      }
+    }
     const parsed = parseSessionUpdateEvent(params);
     if (parsed.modeId && shared.modeState) {
       shared.modeState = {
@@ -27846,7 +28035,10 @@ function createAcpExecutor(options) {
     droppedReplayUpdates: 0,
     ownSessionIds: /* @__PURE__ */ new Set(),
     childSessions: createChildSessionRegistry(),
-    sessionOpensInFlight: 0
+    sessionOpensInFlight: 0,
+    configOptionUpdates: /* @__PURE__ */ new Map(),
+    optionWriteStop: void 0,
+    configUpdateSeq: 0
   };
   const interruptedTurnIds = /* @__PURE__ */ new Set();
   const approvals = createApprovalGate({
@@ -27995,8 +28187,16 @@ function createAcpExecutor(options) {
   };
   options.readable.once("end", onInputDead);
   options.readable.once("error", onInputDead);
-  const { applyRequestedModel, start, requireStarted, setNativeMode } = createExecutorSession({
+  const {
+    applyRequestedModel,
+    modelDefaultEffort,
+    writeConfigOptionReported,
+    start,
+    requireStarted,
+    setNativeMode
+  } = createExecutorSession({
     options,
+    hooks,
     connection,
     isLive,
     emit,
@@ -28022,6 +28222,8 @@ function createAcpExecutor(options) {
     threadMutex,
     promptMutex,
     applyRequestedModel,
+    modelDefaultEffort,
+    writeConfigOptionReported,
     notifyPromptSettled,
     shared
   });
@@ -28943,12 +29145,13 @@ function positiveInt2(value) {
 }
 function kimiEffortDescriptor(entry) {
   const supported = entry["supportEfforts"];
-  if (!Array.isArray(supported)) return void 0;
+  if (!Array.isArray(supported)) return "unknown";
   const values = supported.flatMap((value) => {
     const effort = asString4(value);
     return effort === void 0 ? [] : [effort];
   });
-  if (values.length === 0) return void 0;
+  if (values.length !== supported.length) return "unknown";
+  if (values.length === 0) return "none";
   const defaultEffort = asString4(entry["defaultEffort"]);
   return {
     id: ACP_EFFORT_OPTION_ID,
@@ -28983,7 +29186,7 @@ function kimiProbeModels(stdout) {
       slug: trimmed2,
       ...name === void 0 ? {} : { name },
       ...contextWindow === void 0 ? {} : { contextWindow },
-      ...effort === void 0 ? {} : { capabilities: { optionDescriptors: [effort] } }
+      ...effort === "unknown" ? {} : { capabilities: { optionDescriptors: effort === "none" ? [] : [effort] } }
     });
   }
   return out;
@@ -29569,10 +29772,15 @@ var createKimiInstance = (config2, host) => {
       signal?.addEventListener("abort", onAbort);
       try {
         const requestedModelId = modelIdFromSelection(input2.modelSelection);
+        const requestedEffort = modelSelectionStringOption(
+          input2.modelSelection,
+          ACP_EFFORT_OPTION_ID
+        );
         const turn = await dispatchAcpPrompt(booked.executor, {
           text: input2.input ?? "",
           expectedActiveTurnId: input2.expectedTurnId,
-          ...requestedModelId === void 0 ? {} : { requestedModelId }
+          ...requestedModelId === void 0 ? {} : { requestedModelId },
+          ...requestedEffort === void 0 ? {} : { requestedEffort }
         });
         booked.turns.push({ id: turn.turnId, items: [] });
         return {
@@ -29672,7 +29880,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-kimi",
-  apiVersion: 49,
+  apiVersion: 50,
   executors,
   activate(ctx) {
     ctx.log.info("Kimi Code executor ready");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-kimi",
-  "version": "0.2.3614",
+  "version": "0.2.3635",
   "description": "Kimi Code executor: runs `kimi acp` over Agent Client Protocol stdio.",
   "keywords": [
     "ycodium",
@@ -21,9 +21,9 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "ycodium-acp-executor": "0.2.3614",
-    "@ycodium-ai/plugin-api": "0.2.3614",
-    "ycodium-executor-testing": "0.0.0"
+    "@ycodium-ai/plugin-api": "0.2.3635",
+    "ycodium-executor-testing": "0.0.0",
+    "ycodium-acp-executor": "0.2.3635"
   },
   "ycodium": {
     "plugin": "./dist/index.js",