@ycodium-ai/agent-dsh 0.2.2092 → 0.2.2126

package/dist/index.js

@@ -9,6 +9,7 @@ import { definePlugin } from "@ycodium-ai/plugin-api";
 
 // src/card.ts
 var DSH_DRIVER_KIND = "dsh";
+var DSH_CLIENT_INFO = { name: "ycodium-agent-dsh", version: "0.1.0" };
 var DSH_CARD = {
   driverKind: DSH_DRIVER_KIND,
   displayName: "DeepSeek Harness",
@@ -30,6 +31,12 @@ var DSH_CARD = {
   setupNote: "",
   // 模型 id 是 agent 自家目录的 `provider/model` 对：只 trim，不做别名展开，
   // 也没有默认值——空选择 = 保持 agent 起来时那个。
+  //
+  // **清单不靠这一栏兜底**：`probeDshModels` 每次探测都问 CLI 要那份目录
+  // （会话握手的 `configOptions`），报上来的是四个带名字的型号。这里留空是有意的：
+  // 编一个型号当兜底，等 CLI 换了目录就变成了发出去被拒的坏 id（grok 的名片上
+  // 有一条这样的兜底，代价写在它自己的注释里）。探测问不到时这双手就是没有清单，
+  // 界面按「机器没报模型」处理，比摆一个可能不对的型号诚实。
   defaultModel: "",
   defaultTextGenerationModel: "",
   customModelIdExample: "",
@@ -47,6 +54,17 @@ var DSH_CARD = {
     // DSH 换模型只有 `session/set_config_option` 一条路；库会按握手形状自动协商，
     // 但插件侧的执行路径还没接到模型管理 UI，名片必须说实话。
     sessionModelSwitch: "unsupported",
+    // **这一位今天是空头支票，别当它验过**（2026-09-19 拿真 `dsh --profile acp`
+    // 起一轮 ACP 会话实测）。两件事都不成立：
+    //
+    // 1. 本插件的 `setRuntimeMode` 只改自己的会话记录，一个字节都不发给 CLI——用户
+    //    中途切档，什么也没发生（与 Grok 那次 F8 同款缺陷）。
+    // 2. CLI 那头根本没有这条路：`session/new` 不报 `modes`，`session/set_mode` 回
+    //    `-32601 "Method not found"`。所以照 kimi 那样接 `session/set_mode` 也没用，
+    //    得先查 dsh 自己有没有启动旗标（Grok 那条是 `--permission-mode`）。
+    //
+    // 改这一位要连着 `packages/contracts` 那张表一起改（`executorRegistry.test.ts`
+    // 的防漂移闸把两边钉成同值）。
     runtimeModeSwitch: "in-session"
   },
   // 凭据由 CLI 自己保管在它 home 里，宿主不读 token。
@@ -85,8 +103,7 @@ var DSH_CARD = {
 };
 
 // src/dshInstance.ts
-import * as NodeOS from "node:os";
-import * as NodePath from "node:path";
+import { nodeStreamsFromHandle as nodeStreamsFromHandle2 } from "@ycodium-ai/plugin-api/process-stdin";
 
 // ../../packages/ycodium-acp-executor/src/executor.ts
 import * as NodeCrypto from "node:crypto";
@@ -23956,6 +23973,12 @@ function acpApprovalOptions(request) {
   }
   return options;
 }
+function selectAutoApprovedAcpPermissionOption(request) {
+  if (new Set(request.options.map((option) => option.kind)).size !== request.options.length) {
+    return void 0;
+  }
+  return selectAcpPermissionOptionId(request, "acceptForSession") ?? selectAcpPermissionOptionId(request, "accept");
+}
 function parseAcpResumeCursor(raw, schemaVersion) {
   if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return void 0;
   const record2 = raw;
@@ -24338,7 +24361,7 @@ function makeAcpContentDeltaEvent(input2) {
     ...input2.turnId !== void 0 ? { turnId: input2.turnId } : {},
     ...input2.itemId ? { itemId: input2.itemId } : {},
     payload: {
-      streamKind: "assistant_text",
+      streamKind: input2.streamKind ?? "assistant_text",
       delta: input2.text
     },
     raw: {
@@ -24349,6 +24372,158 @@ function makeAcpContentDeltaEvent(input2) {
   };
 }
 
+// ../../packages/ycodium-acp-executor/src/config-options.ts
+function isRecord3(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 (!isRecord3(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 (isRecord3(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(isRecord3).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
+  };
+}
+function acpModelChoicesFromConfigOptions(configOptions) {
+  if (!Array.isArray(configOptions)) return void 0;
+  const records = configOptions.filter(isRecord3);
+  const modelOption = records.find((option) => normalizedField(option, "category") === "model");
+  if (modelOption === void 0) return void 0;
+  if (!asString(modelOption["id"])?.trim()) return void 0;
+  return flattenChoices(modelOption["options"], asString(modelOption["currentValue"])?.trim());
+}
+
+// ../../packages/ycodium-acp-executor/src/runtime-mode.ts
+function isRecord4(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function asString2(value) {
+  return typeof value === "string" ? value : void 0;
+}
+function acpModeConfigId(setup) {
+  if (!isRecord4(setup)) return void 0;
+  const configOptions = setup["configOptions"];
+  if (!Array.isArray(configOptions)) return void 0;
+  for (const option of configOptions) {
+    if (!isRecord4(option)) continue;
+    if (asString2(option["category"])?.trim().toLowerCase() !== "mode") continue;
+    const id = asString2(option["id"])?.trim();
+    if (id) return id;
+  }
+  return void 0;
+}
+
+// ../../packages/ycodium-acp-executor/src/handshake.ts
+function acpInitializePayload(clientInfo, overrides) {
+  return {
+    protocolVersion: PROTOCOL_VERSION,
+    clientCapabilities: {
+      fs: {
+        readTextFile: false,
+        writeTextFile: false,
+        ...overrides?.fs
+      },
+      terminal: overrides?.terminal ?? false
+    },
+    clientInfo
+  };
+}
+
+// ../../packages/ycodium-acp-executor/src/config-option-wiring.ts
+var VENDOR_CATEGORY_PREFIX = "_";
+var ACP_CONFIG_CATEGORY_HANDLING = {
+  mode: {
+    consumed: true,
+    via: "runtime-mode.ts\uFF1AacpAvailableModes / acpCurrentModeId / acpModeConfigId"
+  },
+  model: {
+    consumed: true,
+    via: "runtime-model.ts:extractModelConfigId \u2192 executor.ts:applyRequestedModel"
+  },
+  thought_level: {
+    consumed: true,
+    via: "config-options.ts:findAcpEffortConfig \u2192 executor.ts:applyRequestedEffort"
+  },
+  model_option: {
+    consumed: true,
+    // 精确说法：它不是**识别器**，是**优先级**。`looksLikeEffortOption` 先筛出候选，
+    // 标了 `model_option` 的在候选里排第一（厂商自己标的最准），排在 id 叫 `effort`
+    // 的和标 `thought_level` 的前面。光有这个 category 而 id/name 不像力度档的，
+    // 压根进不了候选。
+    via: "config-options.ts:findAcpEffortConfig\uFF08\u5019\u9009\u91CC\u7684\u6700\u9AD8\u4F18\u5148\u7EA7\uFF0C\u538B\u8FC7 thought_level\uFF09"
+  },
+  model_config: {
+    consumed: false,
+    note: "\u53EA\u6709\u5BBF\u4E3B\u7684 CursorProvider \u6D88\u8D39\u8FC7\uFF08context / fast / thinking \u4E09\u4E2A\u5F00\u5173\uFF09\u3002Cursor 2026-09-20 \u5E9F\u5F03\u5220\u9664\uFF0C\u8FD9\u4E00\u7C7B\u73B0\u5728\u6CA1\u6709\u6D88\u8D39\u70B9\uFF1B\u6CA1\u89C1\u8FC7\u522B\u5BB6\u7684\u771F\u5B9E\u8F7D\u8377\uFF0C\u5148\u8BB0\u8D26\u4E0D\u731C\u5F62\u72B6\u3002"
+  }
+};
+var KNOWN_CATEGORIES = new Set(Object.keys(ACP_CONFIG_CATEGORY_HANDLING));
+function unhandledConfigCategories(configOptions) {
+  if (!configOptions) return [];
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const option of configOptions) {
+    const category = option.category?.trim();
+    if (!category) continue;
+    if (KNOWN_CATEGORIES.has(category)) continue;
+    if (seen.has(category)) continue;
+    seen.add(category);
+    out.push({
+      category,
+      optionId: option.id.trim(),
+      vendorExtension: category.startsWith(VENDOR_CATEGORY_PREFIX)
+    });
+  }
+  return out;
+}
+
 // ../../packages/ycodium-acp-executor/src/mutex.ts
 var Mutex = class {
   locked = false;
@@ -24391,7 +24566,7 @@ var Mutex = class {
 };
 
 // ../../packages/ycodium-acp-executor/src/util.ts
-function isRecord3(value) {
+function isRecord5(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function asTrimmedString(value) {
@@ -24437,11 +24612,11 @@ function extractCommandFromTitle(title) {
   return backtickMatch?.[1]?.trim() || void 0;
 }
 function extractToolCommand(data, title) {
-  const item = isRecord3(data?.["item"]) ? data["item"] : void 0;
-  const itemInput = item && isRecord3(item["input"]) ? item["input"] : void 0;
-  const itemResult = item && isRecord3(item["result"]) ? item["result"] : void 0;
-  const rawInput = isRecord3(data?.["rawInput"]) ? data["rawInput"] : void 0;
-  const dataInput = isRecord3(data?.["input"]) ? data["input"] : void 0;
+  const item = isRecord5(data?.["item"]) ? data["item"] : void 0;
+  const itemInput = item && isRecord5(item["input"]) ? item["input"] : void 0;
+  const itemResult = item && isRecord5(item["result"]) ? item["result"] : void 0;
+  const rawInput = isRecord5(data?.["rawInput"]) ? data["rawInput"] : void 0;
+  const dataInput = isRecord5(data?.["input"]) ? data["input"] : void 0;
   const candidates = [
     normalizeCommandValue(item?.["command"]),
     normalizeCommandValue(itemInput?.["command"]),
@@ -24486,7 +24661,7 @@ function collectPaths(value, paths, seen, depth) {
     }
     return;
   }
-  if (!isRecord3(value)) {
+  if (!isRecord5(value)) {
     return;
   }
   for (const key of ["path", "filePath", "relativePath", "filename", "newPath", "oldPath"]) {
@@ -24549,7 +24724,7 @@ function deriveToolActivityPresentation(input2) {
   const title = asTrimmedString(input2.title);
   const detail = stripTrailingExitCode(asTrimmedString(input2.detail));
   const fallbackSummary = asTrimmedString(input2.fallbackSummary) ?? "Tool";
-  const data = isRecord3(input2.data) ? input2.data : void 0;
+  const data = isRecord5(input2.data) ? input2.data : void 0;
   const command = extractToolCommand(data, title);
   const primaryPath = extractPrimaryPath(data);
   const action = classifyToolAction({
@@ -24581,7 +24756,7 @@ function deriveToolActivityPresentation(input2) {
     };
   }
   if (action === "search") {
-    const rawInput = isRecord3(data?.["rawInput"]) ? data["rawInput"] : void 0;
+    const rawInput = isRecord5(data?.["rawInput"]) ? data["rawInput"] : void 0;
     const query = asTrimmedString(rawInput?.["query"]) ?? asTrimmedString(rawInput?.["pattern"]) ?? asTrimmedString(rawInput?.["searchTerm"]);
     return {
       summary: "Searched files",
@@ -24620,6 +24795,46 @@ function findSessionConfigOption(configOptions, configId) {
   }
   return configOptions.find((option) => option.id.trim() === normalizedConfigId);
 }
+function collectSessionConfigOptionValues(configOption) {
+  if (configOption.type !== "select" || !configOption.options) {
+    return [];
+  }
+  return configOption.options.flatMap(
+    (entry) => "value" in entry ? [entry.value] : entry.options.map((option) => option.value)
+  );
+}
+function collectSessionModelIds(models) {
+  if (!isRecord5(models) || !Array.isArray(models["availableModels"])) {
+    return [];
+  }
+  return models["availableModels"].flatMap(
+    (model) => isRecord5(model) && typeof model["modelId"] === "string" ? [model["modelId"]] : []
+  );
+}
+function catalogModelLastSegment(value) {
+  if (value.startsWith("[")) {
+    let parsed;
+    try {
+      parsed = JSON.parse(value);
+    } catch {
+      return void 0;
+    }
+    if (!Array.isArray(parsed) || parsed.length < 2) return void 0;
+    const last = parsed[parsed.length - 1];
+    return typeof last === "string" ? last : void 0;
+  }
+  const separator = value.indexOf("/");
+  return separator > 0 && separator < value.length - 1 ? value.slice(separator + 1) : void 0;
+}
+function matchAdvertisedModelValue(requestedModelId, advertisedValues) {
+  const wanted = requestedModelId.trim();
+  if (!wanted) return void 0;
+  if (advertisedValues.includes(wanted)) return wanted;
+  const byLastSegment = advertisedValues.filter(
+    (value) => catalogModelLastSegment(value) === wanted
+  );
+  return byLastSegment.length === 1 ? byLastSegment[0] : void 0;
+}
 function parseSessionModeState(sessionResponse) {
   const modes = sessionResponse.modes;
   if (!modes) return void 0;
@@ -24658,7 +24873,7 @@ function parseAvailableCommandsUpdate(params) {
   }
   const commands = [];
   for (const command of availableCommands) {
-    if (!isRecord3(command)) {
+    if (!isRecord5(command)) {
       continue;
     }
     const name = typeof command["name"] === "string" ? command["name"].trim() : "";
@@ -24666,7 +24881,7 @@ function parseAvailableCommandsUpdate(params) {
       continue;
     }
     const description = typeof command["description"] === "string" ? command["description"].trim() || void 0 : void 0;
-    const input2 = isRecord3(command["input"]) ? command["input"] : void 0;
+    const input2 = isRecord5(command["input"]) ? command["input"] : void 0;
     const inputHint = typeof input2?.["hint"] === "string" ? input2["hint"].trim() || void 0 : void 0;
     commands.push({
       name,
@@ -24728,7 +24943,7 @@ function extractCommandFromTitle2(title) {
   return match?.[1]?.trim() || void 0;
 }
 function extractToolCallCommand(rawInput, title) {
-  if (isRecord3(rawInput)) {
+  if (isRecord5(rawInput)) {
     const directCommand = normalizeCommandValue2(rawInput["command"]);
     if (directCommand) {
       return directCommand;
@@ -24755,7 +24970,7 @@ function boundToolCallOutputText(text) {
 }
 var RAW_OUTPUT_TEXT_FIELDS = ["content", "stdout", "stderr", "output"];
 function boundToolCallRawOutput(rawOutput) {
-  if (!isRecord3(rawOutput)) {
+  if (!isRecord5(rawOutput)) {
     return rawOutput;
   }
   let changed = false;
@@ -24985,7 +25200,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(isRecord3(entry) ? entry["status"] : void 0)
+        status: normalizePlanStepStatus(isRecord5(entry) ? entry["status"] : void 0)
       }));
       if (plan.length > 0) {
         events.push({
@@ -25022,21 +25237,24 @@ function parseSessionUpdateEvent(params) {
       }
       break;
     }
-    case "agent_message_chunk": {
-      const content = isRecord3(upd["content"]) ? upd["content"] : void 0;
+    case "agent_message_chunk":
+    case "agent_thought_chunk": {
+      const content = isRecord5(upd["content"]) ? upd["content"] : void 0;
       const contentType = content?.["type"];
+      const streamKind = kind === "agent_thought_chunk" ? "reasoning_text" : "assistant_text";
       if (contentType === "text") {
         const text = typeof content?.["text"] === "string" ? content["text"] : "";
         if (text.length > 0) {
           events.push({
             _tag: "ContentDelta",
             text,
+            streamKind,
             rawPayload: params
           });
         }
         break;
       }
-      if (content && contentType !== "audio") {
+      if (streamKind === "assistant_text" && content && contentType !== "audio") {
         events.push({
           _tag: "AssistantContentBlock",
           content,
@@ -25088,16 +25306,18 @@ function normalizeModelId(value) {
   return value?.trim() || void 0;
 }
 function modelSelectionStateFromSetup(setup) {
-  const sessionModels = isRecord3(setup.models) ? setup.models : void 0;
+  const sessionModels = isRecord5(setup.models) ? setup.models : void 0;
   const modelConfigId = extractModelConfigId(setup);
   const strategy = sessionModels === void 0 && modelConfigId !== void 0 ? "config-option" : "session/set_model";
-  const configModel = modelConfigId === void 0 ? void 0 : findSessionConfigOption(setup.configOptions, modelConfigId)?.currentValue;
+  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;
   return {
     strategy,
     sessionModelsAdvertised: sessionModels !== void 0,
     modelConfigId,
-    currentModelId
+    currentModelId,
+    advertisedModelValues: strategy === "config-option" ? modelConfigOption === void 0 ? [] : collectSessionConfigOptionValues(modelConfigOption) : collectSessionModelIds(sessionModels)
   };
 }
 function createAcpExecutor(options) {
@@ -25116,8 +25336,10 @@ function createAcpExecutor(options) {
     strategy: "session/set_model",
     sessionModelsAdvertised: false,
     modelConfigId: void 0,
-    currentModelId: void 0
+    currentModelId: void 0,
+    advertisedModelValues: []
   };
+  let lastUnmatchedModelId;
   let initializeResult;
   let startResult;
   let startInFlight;
@@ -25252,6 +25474,23 @@ function createAcpExecutor(options) {
         continue;
       }
       if (event._tag === "ContentDelta") {
+        if (event.streamKind === "reasoning_text") {
+          if (event.text.trim().length === 0) {
+            continue;
+          }
+          emit(
+            makeAcpContentDeltaEvent({
+              stamp: stamp(),
+              provider: options.provider,
+              threadId: options.threadId,
+              turnId: activeTurnId,
+              text: event.text,
+              streamKind: "reasoning_text",
+              rawPayload: event.rawPayload
+            })
+          );
+          continue;
+        }
         if (event.text.trim().length === 0 && !assistantSegment.activeItemId) {
           continue;
         }
@@ -25264,6 +25503,7 @@ function createAcpExecutor(options) {
             turnId: activeTurnId,
             ...itemId ? { itemId } : {},
             text: event.text,
+            streamKind: "assistant_text",
             rawPayload: event.rawPayload
           })
         );
@@ -25424,6 +25664,12 @@ function createAcpExecutor(options) {
     const userInputOutcome = await handlePermissionAsUserInput(params);
     if (userInputOutcome !== void 0) return userInputOutcome;
     const permissionRequest = parsePermissionRequest(params);
+    if (options.autoApprove?.(permissionRequest) === true) {
+      const optionId = selectAutoApprovedAcpPermissionOption(params);
+      if (optionId !== void 0) {
+        return { outcome: { outcome: "selected", optionId } };
+      }
+    }
     const requestId = randomId();
     const outcome = await new Promise((resolve2) => {
       const pending = {
@@ -25511,36 +25757,70 @@ function createAcpExecutor(options) {
     if (requestedModelId === void 0 || requestedModelId === input2.state.currentModelId || input2.state.strategy === "session/set_model" && !input2.state.sessionModelsAdvertised || input2.state.strategy === "config-option" && input2.state.modelConfigId === void 0) {
       return input2.state;
     }
+    const value = matchAdvertisedModelValue(requestedModelId, input2.state.advertisedModelValues);
+    if (value === void 0) {
+      if (requestedModelId !== lastUnmatchedModelId) {
+        lastUnmatchedModelId = requestedModelId;
+        options.log?.info("requested model is not in the agent catalog; keeping its own model", {
+          requestedModelId,
+          currentModelId: input2.state.currentModelId,
+          advertisedModelValues: input2.state.advertisedModelValues
+        });
+      }
+      return input2.state;
+    }
+    if (value === input2.state.currentModelId) {
+      return input2.state;
+    }
     if (input2.state.strategy === "config-option") {
       await connection.request("session/set_config_option", {
         sessionId: input2.acpSessionId,
         configId: input2.state.modelConfigId,
-        value: requestedModelId
+        value
       });
     } else {
       await connection.request("session/set_model", {
         sessionId: input2.acpSessionId,
-        modelId: requestedModelId
+        modelId: value
       });
     }
     if (!isLive(input2.expectedGeneration)) {
       throw new AcpExecutorDisposedError();
     }
-    return { ...input2.state, currentModelId: requestedModelId };
+    return { ...input2.state, currentModelId: value };
+  };
+  const applyRequestedEffort = async (input2) => {
+    const requested = input2.requestedEffort?.trim();
+    if (!requested) return;
+    const configOptions = typeof input2.setup === "object" && input2.setup !== null ? input2.setup.configOptions : void 0;
+    const effort = findAcpEffortConfig(configOptions);
+    if (effort === void 0) return;
+    const matched = effort.choices.find((choice) => choice.value === requested);
+    if (matched === void 0) {
+      options.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 (!isLive(input2.expectedGeneration)) return;
+    try {
+      await connection.request("session/set_config_option", {
+        sessionId: input2.acpSessionId,
+        configId: effort.configId,
+        value: requested
+      });
+    } catch (error62) {
+      options.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)
+      });
+    }
   };
   const startOnce = async (expectedGeneration) => {
-    const initializePayload = {
-      protocolVersion: PROTOCOL_VERSION,
-      clientCapabilities: {
-        fs: {
-          readTextFile: false,
-          writeTextFile: false,
-          ...options.clientCapabilities?.fs
-        },
-        terminal: options.clientCapabilities?.terminal ?? false
-      },
-      clientInfo: options.clientInfo
-    };
+    const initializePayload = acpInitializePayload(options.clientInfo, options.clientCapabilities);
     const initialized = await connection.request(
       "initialize",
       initializePayload
@@ -25584,12 +25864,27 @@ function createAcpExecutor(options) {
       nextSessionId = created.sessionId;
       setup = created;
     }
+    const unhandledCategories = unhandledConfigCategories(
+      setup.configOptions
+    );
+    if (unhandledCategories.length > 0) {
+      options.log?.info("acp session reported config option categories we do not handle", {
+        sessionId: nextSessionId,
+        categories: unhandledCategories
+      });
+    }
     const nextModelSelectionState = await applyRequestedModel({
       state: modelSelectionStateFromSetup(setup),
       acpSessionId: nextSessionId,
       requestedModelId: options.requestedModelId,
       expectedGeneration
     });
+    await applyRequestedEffort({
+      setup,
+      acpSessionId: nextSessionId,
+      requestedEffort: options.requestedEffort,
+      expectedGeneration
+    });
     if (options.beforeApplyResult) {
       await options.beforeApplyResult();
     }
@@ -25954,6 +26249,26 @@ function createAcpExecutor(options) {
     };
     apply();
   };
+  const setNativeMode = async (modeId) => {
+    failIfDisposed();
+    const started = startResult;
+    if (started === void 0) {
+      throw new AcpExecutorRequestError("session/set_mode", "session has not started yet");
+    }
+    const configId = acpModeConfigId(started.sessionSetupResult);
+    if (configId !== void 0) {
+      await connection.request("session/set_config_option", {
+        sessionId: started.sessionId,
+        configId,
+        value: modeId
+      });
+      return;
+    }
+    await connection.request("session/set_mode", {
+      sessionId: started.sessionId,
+      modeId
+    });
+  };
   const respondToUserInput = async (requestId, answers) => {
     failIfDisposed();
     const pending = pendingUserInputs.get(requestId);
@@ -25970,7 +26285,7 @@ function createAcpExecutor(options) {
     pendingUserInputs.delete(requestId);
     pending.resolve({
       kind: "answered",
-      answers: isRecord3(answers) ? answers : {}
+      answers: isRecord5(answers) ? answers : {}
     });
   };
   const dispose = async () => {
@@ -26020,13 +26335,56 @@ function createAcpExecutor(options) {
     cancel,
     respondToRequest,
     respondToUserInput,
+    setNativeMode,
     dispose
   };
 }
 
+// ../../packages/ycodium-acp-executor/src/probe.ts
+function withProbeTimeout(promise2, timeoutMs, method) {
+  return new Promise((resolve2, reject) => {
+    const timer = setTimeout(() => {
+      reject(new Error(`ACP probe request '${method}' timed out after ${timeoutMs}ms`));
+    }, timeoutMs);
+    timer.unref?.();
+    promise2.then(
+      (value) => {
+        clearTimeout(timer);
+        resolve2(value);
+      },
+      (error62) => {
+        clearTimeout(timer);
+        reject(error62 instanceof Error ? error62 : new Error(String(error62)));
+      }
+    );
+  });
+}
+async function openAcpProbeHandshake(input2) {
+  const connection = createAcpConnection({
+    readable: input2.readable,
+    writable: input2.writable,
+    onNotification: () => void 0
+  });
+  try {
+    const initializeResult = await withProbeTimeout(
+      connection.request("initialize", acpInitializePayload(input2.clientInfo)),
+      input2.requestTimeoutMs,
+      "initialize"
+    );
+    return {
+      initializeResult,
+      request: (method, params) => withProbeTimeout(connection.request(method, params), input2.requestTimeoutMs, method),
+      close: () => connection.close()
+    };
+  } catch (error62) {
+    await connection.close().catch(() => void 0);
+    throw error62;
+  }
+}
+
 // src/config.ts
 var DSH_DEFAULT_LAUNCH_ARGS = "--profile acp";
-function isRecord4(value) {
+function isRecord6(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function readString(value) {
@@ -26039,7 +26397,7 @@ function readEnvironment(value) {
   if (!Array.isArray(value)) return {};
   const env = {};
   for (const entry of value) {
-    if (!isRecord4(entry)) continue;
+    if (!isRecord6(entry)) continue;
     const name = readTrimmed(entry["name"]);
     if (name.length === 0) continue;
     env[name] = readString(entry["value"]);
@@ -26047,7 +26405,7 @@ function readEnvironment(value) {
   return env;
 }
 function parseDshInstanceConfig(config2) {
-  if (!isRecord4(config2)) {
+  if (!isRecord6(config2)) {
     return {
       binaryPath: "",
       launchArgs: DSH_DEFAULT_LAUNCH_ARGS,
@@ -26057,7 +26415,7 @@ function parseDshInstanceConfig(config2) {
       envelopeDriver: void 0
     };
   }
-  const nested = isRecord4(config2["config"]) ? config2["config"] : void 0;
+  const nested = isRecord6(config2["config"]) ? config2["config"] : void 0;
   const settings = nested ?? config2;
   return {
     binaryPath: readTrimmed(settings["binaryPath"]),
@@ -26120,57 +26478,188 @@ function tokenizeLaunchArgs(value) {
   return tokens;
 }
 
-// src/streams.ts
-import * as NodeStream2 from "node:stream";
-function nodeStreamsFromHandle(handle) {
-  const readable = new NodeStream2.PassThrough();
-  void (async () => {
-    try {
-      for await (const chunk of handle.stdout) {
-        if (!readable.writable) return;
-        if (!readable.write(chunk)) {
-          await new Promise((resolve2) => {
-            const onDone = () => {
-              readable.off("drain", onDone);
-              readable.off("close", onDone);
-              resolve2();
-            };
-            readable.once("drain", onDone);
-            readable.once("close", onDone);
-          });
-        }
-      }
-    } catch (error62) {
-      readable.destroy(error62 instanceof Error ? error62 : new Error(String(error62)));
-      return;
-    }
-    if (readable.writable) readable.end();
-  })();
-  void (async () => {
-    for await (const _chunk of handle.stderr) {
-    }
-  })().catch(() => void 0);
-  const writable = new NodeStream2.Writable({
-    write(chunk, _encoding, callback) {
-      const bytes = typeof chunk === "string" ? Buffer.from(chunk) : chunk;
-      handle.writeStdin(bytes).then(
-        () => callback(),
-        (error62) => callback(error62 instanceof Error ? error62 : new Error(String(error62)))
-      );
-    },
-    final(callback) {
-      handle.closeStdin().then(
-        () => callback(),
-        (error62) => callback(error62 instanceof Error ? error62 : new Error(String(error62)))
-      );
-    }
+// src/probeModels.ts
+import * as NodeFS from "node:fs";
+import * as NodeOS2 from "node:os";
+import * as NodePath2 from "node:path";
+import { nodeStreamsFromHandle } from "@ycodium-ai/plugin-api/process-stdin";
+
+// src/spawnEnv.ts
+import * as NodeOS from "node:os";
+import * as NodePath from "node:path";
+import { mergeLaunchEnv, brainSlotEnvKeys } from "@ycodium-ai/plugin-api/executor";
+
+// src/permission.ts
+var DSH_NATIVE_MODES = [
+  {
+    id: "read-only",
+    name: "Read only",
+    description: "Sandboxed to reading. Asks before anything that writes or runs."
+  },
+  {
+    id: "workspace-write",
+    name: "Workspace write",
+    description: "Writes inside the workspace. Asks before stepping outside it."
+  },
+  {
+    id: "danger-full-access",
+    name: "Full access",
+    description: "No sandbox, never asks. Every command runs immediately."
+  }
+];
+var DSH_DEFAULT_NATIVE_MODE_ID = "workspace-write";
+function isDshNativeModeId(value) {
+  return DSH_NATIVE_MODES.some((mode) => mode.id === value);
+}
+function dshNativeModeReport(instanceEnvironment) {
+  const configured = instanceEnvironment["DSH_PERMISSION_MODE"]?.trim();
+  return {
+    nativeModes: DSH_NATIVE_MODES.map((mode) => ({
+      id: mode.id,
+      name: mode.name,
+      description: mode.description
+    })),
+    currentNativeModeId: configured !== void 0 && isDshNativeModeId(configured) ? configured : DSH_DEFAULT_NATIVE_MODE_ID
+  };
+}
+function dshPermissionEnv(nativeModeId) {
+  if (nativeModeId === void 0 || !isDshNativeModeId(nativeModeId)) return {};
+  return { DSH_PERMISSION_MODE: nativeModeId };
+}
+
+// src/spawnEnv.ts
+function expandHomePath(value) {
+  if (value === "~") return NodeOS.homedir();
+  if (value.startsWith("~/") || value.startsWith("~\\")) {
+    return NodePath.join(NodeOS.homedir(), value.slice(2));
+  }
+  return value;
+}
+function resolveHomePath(value) {
+  const trimmed = value.trim();
+  if (trimmed.length === 0) return "";
+  return NodePath.resolve(expandHomePath(trimmed));
+}
+function buildSpawnEnv(recipe, resolvedHomePath, launchEnv = {}, nativeModeId) {
+  const homeEnvVar = recipe.homeEnvVar.trim() || DSH_CARD.homeEnvVar;
+  const homeInjection = resolvedHomePath.length > 0 && homeEnvVar.length > 0 ? { [homeEnvVar]: resolvedHomePath } : {};
+  return mergeLaunchEnv({
+    brainSlots: brainSlotEnvKeys(DSH_CARD),
+    accountHome: homeInjection,
+    instanceTable: recipe.environment,
+    // 用户挑的档压过实例表：实例表里那一栏是这台机器的默认，输入区那一下是这一轮的
+    // 意思。铺在 `handOverrides` 这一层正是为了这个先后（见 `mergeLaunchEnv` 的层序）。
+    handOverrides: dshPermissionEnv(nativeModeId),
+    launch: launchEnv
   });
-  return { readable, writable };
+}
+
+// src/probeModels.ts
+var PROBE_REQUEST_TIMEOUT_MS = 15e3;
+function dshProbeSessionCwd(instanceId) {
+  const safe = instanceId.trim().replace(/[^A-Za-z0-9._-]/g, "-") || "instance";
+  return NodePath2.join(NodeOS2.tmpdir(), `ycodium-dsh-probe-${safe}`);
+}
+function isRecord7(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function asString3(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
+}
+function dshProbeModels(setup) {
+  if (!isRecord7(setup)) return void 0;
+  const rawOptions = setup["configOptions"];
+  const choices = acpModelChoicesFromConfigOptions(rawOptions);
+  if (choices === void 0) return void 0;
+  const models = choices.map((choice) => ({
+    slug: choice.value,
+    ...choice.name === void 0 ? {} : { name: choice.name },
+    ...choice.isDefault === true ? { isDefault: true } : {}
+  }));
+  const effort = findAcpEffortConfig(rawOptions);
+  if (effort === void 0) return models;
+  const capabilities = {
+    optionDescriptors: [
+      {
+        id: DSH_EFFORT_OPTION_ID,
+        label: effort.label || "Reasoning",
+        type: "select",
+        options: effort.choices.map((choice) => ({
+          id: choice.value,
+          label: choice.label,
+          ...choice.description === void 0 ? {} : { description: choice.description },
+          ...choice.isDefault === true ? { isDefault: true } : {}
+        }))
+      }
+    ]
+  };
+  return models.map((model) => ({ ...model, capabilities }));
+}
+var DSH_EFFORT_OPTION_ID = "reasoning";
+function findProbeSessionId(listed, probeCwd) {
+  if (!isRecord7(listed) || !Array.isArray(listed["sessions"])) return void 0;
+  for (const entry of listed["sessions"]) {
+    if (!isRecord7(entry)) continue;
+    if (asString3(entry["cwd"]) !== probeCwd) continue;
+    const sessionId = asString3(entry["sessionId"]);
+    if (sessionId !== void 0) return sessionId;
+  }
+  return void 0;
+}
+async function probeSessionSetup(handshake, probeCwd) {
+  const listed = await handshake.request("session/list", {}).catch(() => void 0);
+  const reusable = findProbeSessionId(listed, probeCwd);
+  if (reusable !== void 0) {
+    const resumed = await handshake.request("session/resume", { sessionId: reusable, cwd: probeCwd, mcpServers: [] }).catch(() => void 0);
+    if (resumed !== void 0) return resumed;
+  }
+  return handshake.request("session/new", { cwd: probeCwd, mcpServers: [] });
+}
+var failureDetail = (error62) => (error62 instanceof Error ? error62.message : String(error62)).trim() || void 0;
+async function probeDshModels(input2) {
+  const { recipe, host } = input2;
+  const probeCwd = dshProbeSessionCwd(host.instanceId);
+  try {
+    NodeFS.mkdirSync(probeCwd, { recursive: true });
+  } catch (error62) {
+    return { kind: "failed", detail: failureDetail(error62) };
+  }
+  const env = buildSpawnEnv(recipe, resolveHomePath(recipe.homePath));
+  let handle;
+  try {
+    handle = await host.process.spawn({
+      program: recipe.binaryPath,
+      args: tokenizeLaunchArgs(recipe.launchArgs),
+      cwd: probeCwd,
+      owner: { bindingId: host.bindingId },
+      ...Object.keys(env).length > 0 ? { env } : {}
+    });
+  } catch (error62) {
+    return { kind: "not-started", detail: failureDetail(error62) };
+  }
+  let handshake;
+  try {
+    const { readable, writable } = nodeStreamsFromHandle(handle);
+    handshake = await openAcpProbeHandshake({
+      readable,
+      writable,
+      clientInfo: DSH_CLIENT_INFO,
+      requestTimeoutMs: PROBE_REQUEST_TIMEOUT_MS
+    });
+    return {
+      kind: "answered",
+      models: dshProbeModels(await probeSessionSetup(handshake, probeCwd))
+    };
+  } catch (error62) {
+    return { kind: "failed", detail: failureDetail(error62) };
+  } finally {
+    await handshake?.close().catch(() => void 0);
+    await handle.kill("SIGTERM").catch(() => void 0);
+  }
 }
 
 // src/dshInstance.ts
 var RESUME_SCHEMA_VERSION = 1;
-var CLIENT_INFO = { name: "ycodium-agent-dsh", version: "0.1.0" };
 var yieldTick = () => new Promise((resolve2) => {
   setImmediate(resolve2);
 });
@@ -26206,25 +26695,6 @@ var EventBus = class {
     };
   }
 };
-function expandHomePath(value) {
-  if (value === "~") return NodeOS.homedir();
-  if (value.startsWith("~/") || value.startsWith("~\\")) {
-    return NodePath.join(NodeOS.homedir(), value.slice(2));
-  }
-  return value;
-}
-function resolveHomePath(value) {
-  const trimmed = value.trim();
-  if (trimmed.length === 0) return "";
-  return NodePath.resolve(expandHomePath(trimmed));
-}
-function compactEnv(env) {
-  const out = {};
-  for (const [key, value] of Object.entries(env)) {
-    if (value !== void 0) out[key] = value;
-  }
-  return out;
-}
 function modelIdFromSelection(selection) {
   if (typeof selection !== "object" || selection === null || Array.isArray(selection)) {
     return void 0;
@@ -26232,15 +26702,6 @@ function modelIdFromSelection(selection) {
   const model = selection["model"];
   return typeof model === "string" ? model.trim() || void 0 : void 0;
 }
-function buildSpawnEnv(recipe, launch, resolvedHomePath) {
-  const homeEnvVar = recipe.homeEnvVar.trim() || DSH_CARD.homeEnvVar;
-  const homeInjection = resolvedHomePath.length > 0 && homeEnvVar.length > 0 ? { [homeEnvVar]: resolvedHomePath } : {};
-  return {
-    ...compactEnv(launch.processEnv),
-    ...homeInjection,
-    ...recipe.environment
-  };
-}
 function nowIso() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
@@ -26270,11 +26731,25 @@ var createDshInstance = (config2, host) => {
           detail: "DeepSeek Harness program path is not configured"
         };
       }
+      const outcome = await probeDshModels({ recipe, host });
+      if (outcome.kind !== "answered") {
+        return {
+          installed: outcome.kind === "failed",
+          version: null,
+          readiness: "error",
+          auth: { status: "unknown" },
+          ...outcome.detail === void 0 ? {} : { detail: outcome.detail },
+          // 装着但握不上手时界面照样画权限格，不报档就退回宿主四档。
+          ...outcome.kind === "failed" ? dshNativeModeReport(recipe.environment) : {}
+        };
+      }
       return {
         installed: true,
         version: null,
-        readiness: "unchecked",
-        auth: { status: "unknown" }
+        readiness: "ready",
+        auth: { status: "unknown" },
+        ...outcome.models === void 0 ? {} : { models: outcome.models },
+        ...dshNativeModeReport(recipe.environment)
       };
     },
     startSession: async (input2, signal) => {
@@ -26291,7 +26766,12 @@ var createDshInstance = (config2, host) => {
         threads.delete(input2.threadId);
       }
       const resolvedHomePath = resolveHomePath(input2.launch.homePath?.trim() || recipe.homePath);
-      const env = buildSpawnEnv(recipe, input2.launch, resolvedHomePath);
+      const env = buildSpawnEnv(
+        recipe,
+        resolvedHomePath,
+        input2.launch.processEnv,
+        input2.nativeModeId
+      );
       const handle = await host.process.spawn({
         program: recipe.binaryPath,
         args: tokenizeLaunchArgs(recipe.launchArgs),
@@ -26299,7 +26779,7 @@ var createDshInstance = (config2, host) => {
         owner: { bindingId: host.bindingId },
         ...Object.keys(env).length > 0 ? { env } : {}
       });
-      const { readable, writable } = nodeStreamsFromHandle(handle);
+      const { readable, writable } = nodeStreamsFromHandle2(handle);
       const resume = input2.discardResumeCursor === true ? void 0 : parseAcpResumeCursor(input2.resumeCursor, RESUME_SCHEMA_VERSION);
       const requestedModelId = input2.launch.requestedModelId?.trim() || modelIdFromSelection(input2.modelSelection);
       const executor = createAcpExecutor({
@@ -26309,7 +26789,8 @@ var createDshInstance = (config2, host) => {
         threadId: input2.threadId,
         provider: DSH_DRIVER_KIND,
         providerInstanceId: host.instanceId,
-        clientInfo: CLIENT_INFO,
+        clientInfo: DSH_CLIENT_INFO,
+        log: host.log,
         // 该 agent 不实现 session/load，只实现 session/resume——续接重新激活
         // 持久会话而不重放记录，发 load 会卡在永远不结算的重放门上。
         resumeMethod: "session/resume",
@@ -26335,6 +26816,7 @@ var createDshInstance = (config2, host) => {
           providerInstanceId: host.instanceId,
           status: "idle",
           runtimeMode: input2.runtimeMode,
+          ...input2.nativeModeId !== void 0 && isDshNativeModeId(input2.nativeModeId) ? { nativeModeId: input2.nativeModeId } : {},
           cwd,
           threadId: input2.threadId,
           createdAt,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-dsh",
-  "version": "0.2.2092",
+  "version": "0.2.2126",
   "description": "DeepSeek Harness executor: dsh CLI over Agent Client Protocol stdio.",
   "keywords": [
     "ycodium",
@@ -21,7 +21,7 @@
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
     "ycodium-acp-executor": "0.0.0",
-    "@ycodium-ai/plugin-api": "0.2.2092",
+    "@ycodium-ai/plugin-api": "0.2.2126",
     "ycodium-acp-protocol": "0.0.0"
   },
   "ycodium": {