@ycodium-ai/agent-dsh 0.2.2974 → 0.2.2978

package/README.md

@@ -29,6 +29,13 @@ Facts:
   `$DSH_HOME/.credentials.yaml` `refs.DEEPSEEK_API_KEY`, then `$DSH_HOME/.env`. A `DEEPSEEK_BASE_URL` that is
   not `api.deepseek.com` reports `customEndpoint` and sends nothing. No `readTokenUsage`: DSH's ACP reply
   carries no usage and its session log (`session.v4.jsonl.zstd`) has no per-event timestamps.
+- User stop: `ExecutorInstance.openCommandProcesses` lists the shell tool calls still running in the
+  turn (`title` `bash` / `pwsh`, not `run_in_background`) with an exact argv check for each, so the
+  host can confirm the command's process ended and end what DSH left behind. The process shapes are
+  the ones measured with dsh 0.1.5-rc.2 and 0.2.0-rc.2 on Windows 10 and Ubuntu 22.04
+  (`src/openCommands.ts`); a release that wraps commands differently is simply not recognised and the
+  UI says the command may still be running. macOS and a Linux machine where DSH uses a systemd user
+  scope have not been measured.
 - Manifest permission is `{ kind: "executor" }`.
 - Session model switching is `unsupported` on the card: the plugin does not switch
   models inside a running session.

package/dist/index.js

@@ -66,7 +66,7 @@ var require_identity = __commonJS({
         }
       return false;
     }
-    function isNode(node2) {
+    function isNode2(node2) {
       if (node2 && typeof node2 === "object")
         switch (node2[NODE_TYPE]) {
           case ALIAS:
@@ -90,7 +90,7 @@ var require_identity = __commonJS({
     exports.isCollection = isCollection;
     exports.isDocument = isDocument;
     exports.isMap = isMap;
-    exports.isNode = isNode;
+    exports.isNode = isNode2;
     exports.isPair = isPair;
     exports.isScalar = isScalar;
     exports.isSeq = isSeq;
@@ -31868,383 +31868,6 @@ function deriveToolActivityPresentation(input2) {
   };
 }
 
-// ../../packages/ycodium-acp-executor/src/events.ts
-function canonicalRequestTypeFromAcpKind(kind) {
-  switch (kind) {
-    case "execute":
-      return "exec_command_approval";
-    case "read":
-      return "file_read_approval";
-    case "edit":
-    case "delete":
-    case "move":
-      return "file_change_approval";
-    case "fetch":
-      return "web_fetch_approval";
-    case "search":
-      return "web_search_approval";
-    default:
-      return "dynamic_tool_call";
-  }
-}
-function fileChangesFromAcpPermission(permissionRequest) {
-  const content = permissionRequest.toolCall?.data["content"];
-  const changes = Array.isArray(content) ? content.flatMap((entry) => {
-    if (entry === null || typeof entry !== "object") {
-      return [];
-    }
-    const block = entry;
-    if (block["type"] !== "diff" || typeof block["path"] !== "string" || typeof block["newText"] !== "string") {
-      return [];
-    }
-    const oldText = typeof block["oldText"] === "string" ? block["oldText"] : void 0;
-    return [
-      {
-        path: block["path"],
-        changeKind: oldText === void 0 ? "add" : "modify",
-        content: {
-          kind: "replace",
-          ...oldText !== void 0 ? { oldText } : {},
-          newText: block["newText"]
-        }
-      }
-    ];
-  }) : [];
-  if (changes.length > 0) {
-    return changes;
-  }
-  if (canonicalRequestTypeFromAcpKind(permissionRequest.kind) !== "file_change_approval") {
-    return void 0;
-  }
-  const locations = permissionRequest.toolCall?.data["locations"];
-  const paths = Array.isArray(locations) ? locations.flatMap((entry) => {
-    const path = entry?.["path"];
-    return typeof path === "string" && path.trim().length > 0 ? [path] : [];
-  }) : [];
-  return paths.length > 0 ? paths.map((path) => ({ path, omitted: "unavailable" })) : void 0;
-}
-function runtimeItemStatusFromAcpToolStatus(status) {
-  switch (status) {
-    case "pending":
-    case "inProgress":
-      return "inProgress";
-    case "completed":
-      return "completed";
-    case "failed":
-      return "failed";
-    default:
-      return void 0;
-  }
-}
-function makeAcpRequestOpenedEvent(input2) {
-  const requestType = canonicalRequestTypeFromAcpKind(input2.permissionRequest.kind);
-  const toolName = requestType === "dynamic_tool_call" ? input2.permissionRequest.toolCall?.title : void 0;
-  return {
-    type: "request.opened",
-    ...input2.stamp,
-    provider: input2.provider,
-    threadId: input2.threadId,
-    ...input2.turnId !== void 0 ? { turnId: input2.turnId } : {},
-    requestId: input2.requestId,
-    payload: {
-      requestType,
-      detail: input2.detail,
-      ...toolName ? { toolName } : {},
-      args: input2.args,
-      ...input2.options ? { options: input2.options } : {},
-      ...input2.fileChanges ? { fileChanges: input2.fileChanges } : {},
-      declineReasonRelay: "queued"
-    },
-    raw: {
-      source: input2.source,
-      method: input2.method,
-      payload: input2.rawPayload
-    }
-  };
-}
-function makeAcpRequestResolvedEvent(input2) {
-  return {
-    type: "request.resolved",
-    ...input2.stamp,
-    provider: input2.provider,
-    threadId: input2.threadId,
-    ...input2.turnId !== void 0 ? { turnId: input2.turnId } : {},
-    requestId: input2.requestId,
-    payload: {
-      requestType: canonicalRequestTypeFromAcpKind(input2.permissionRequest.kind),
-      decision: input2.decision,
-      ...input2.reason ? { reason: input2.reason } : {}
-    }
-  };
-}
-function makeAcpPlanUpdatedEvent(input2) {
-  return {
-    type: "turn.plan.updated",
-    ...input2.stamp,
-    provider: input2.provider,
-    threadId: input2.threadId,
-    ...input2.turnId !== void 0 ? { turnId: input2.turnId } : {},
-    payload: input2.payload,
-    raw: {
-      source: input2.source,
-      method: input2.method,
-      payload: input2.rawPayload
-    }
-  };
-}
-function makeAcpToolCallEvent(input2) {
-  const runtimeStatus = runtimeItemStatusFromAcpToolStatus(input2.toolCall.status);
-  const { data } = input2.toolCall;
-  return {
-    type: input2.toolCall.status === "completed" || input2.toolCall.status === "failed" ? "item.completed" : "item.updated",
-    ...input2.stamp,
-    provider: input2.provider,
-    threadId: input2.threadId,
-    ...input2.turnId !== void 0 ? { turnId: input2.turnId } : {},
-    itemId: input2.toolCall.toolCallId,
-    payload: {
-      itemType: canonicalItemTypeFromAcpToolKind(input2.toolCall.kind),
-      ...runtimeStatus ? { status: runtimeStatus } : {},
-      ...input2.toolCall.title ? { title: input2.toolCall.title } : {},
-      ...input2.toolCall.detail ? { detail: input2.toolCall.detail } : {},
-      ...Object.keys(data).length > 0 ? { data } : {}
-    },
-    raw: {
-      source: "acp.jsonrpc",
-      method: "session/update",
-      payload: input2.rawPayload
-    }
-  };
-}
-function makeAcpAssistantItemEvent(input2) {
-  return {
-    type: input2.lifecycle,
-    ...input2.stamp,
-    provider: input2.provider,
-    threadId: input2.threadId,
-    ...input2.turnId !== void 0 ? { turnId: input2.turnId } : {},
-    itemId: input2.itemId,
-    payload: {
-      itemType: "assistant_message",
-      status: input2.lifecycle === "item.completed" ? "completed" : "inProgress"
-    }
-  };
-}
-function makeAcpContentDeltaEvent(input2) {
-  return {
-    type: "content.delta",
-    ...input2.stamp,
-    provider: input2.provider,
-    threadId: input2.threadId,
-    ...input2.turnId !== void 0 ? { turnId: input2.turnId } : {},
-    ...input2.itemId ? { itemId: input2.itemId } : {},
-    payload: {
-      streamKind: input2.streamKind ?? "assistant_text",
-      delta: input2.text
-    },
-    raw: {
-      source: "acp.jsonrpc",
-      method: "session/update",
-      payload: input2.rawPayload
-    }
-  };
-}
-
-// ../../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
-  };
-}
-function acpModelChoicesFromConfigOptions(configOptions) {
-  if (!Array.isArray(configOptions)) return void 0;
-  const records = configOptions.filter(isRecord4);
-  const modelOption = records.find((option) => normalizedField(option, "category") === "model") ?? records.find(
-    (option) => normalizedField(option, "id") === "model" && normalizedField(option, "type") === "select"
-  );
-  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 isRecord5(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function asString2(value) {
-  return typeof value === "string" ? value : void 0;
-}
-function acpModeConfigId(setup) {
-  if (!isRecord5(setup)) return void 0;
-  const configOptions = setup["configOptions"];
-  if (!Array.isArray(configOptions)) return void 0;
-  for (const option of configOptions) {
-    if (!isRecord5(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;
-  waiters = [];
-  get isLocked() {
-    return this.locked;
-  }
-  acquire() {
-    if (!this.locked) {
-      this.locked = true;
-      return Promise.resolve();
-    }
-    return new Promise((resolve2) => {
-      this.waiters.push(resolve2);
-    });
-  }
-  tryAcquire() {
-    if (this.locked) {
-      return false;
-    }
-    this.locked = true;
-    return true;
-  }
-  release() {
-    const next = this.waiters.shift();
-    if (next) {
-      next();
-      return;
-    }
-    this.locked = false;
-  }
-  async runExclusive(fn) {
-    await this.acquire();
-    try {
-      return await fn();
-    } finally {
-      this.release();
-    }
-  }
-};
-
 // ../../packages/ycodium-acp-executor/src/runtime-model.ts
 function extractModelConfigId(sessionResponse) {
   const configOptions = sessionResponse.configOptions;
@@ -32781,6 +32404,424 @@ function filterMcpServersByAgentCapabilities(mcpServers, agentCapabilities) {
   });
 }
 
+// ../../packages/ycodium-acp-executor/src/events.ts
+function canonicalRequestTypeFromAcpKind(kind) {
+  switch (kind) {
+    case "execute":
+      return "exec_command_approval";
+    case "read":
+      return "file_read_approval";
+    case "edit":
+    case "delete":
+    case "move":
+      return "file_change_approval";
+    case "fetch":
+      return "web_fetch_approval";
+    case "search":
+      return "web_search_approval";
+    default:
+      return "dynamic_tool_call";
+  }
+}
+function fileChangesFromAcpPermission(permissionRequest) {
+  const content = permissionRequest.toolCall?.data["content"];
+  const changes = Array.isArray(content) ? content.flatMap((entry) => {
+    if (entry === null || typeof entry !== "object") {
+      return [];
+    }
+    const block = entry;
+    if (block["type"] !== "diff" || typeof block["path"] !== "string" || typeof block["newText"] !== "string") {
+      return [];
+    }
+    const oldText = typeof block["oldText"] === "string" ? block["oldText"] : void 0;
+    return [
+      {
+        path: block["path"],
+        changeKind: oldText === void 0 ? "add" : "modify",
+        content: {
+          kind: "replace",
+          ...oldText !== void 0 ? { oldText } : {},
+          newText: block["newText"]
+        }
+      }
+    ];
+  }) : [];
+  if (changes.length > 0) {
+    return changes;
+  }
+  if (canonicalRequestTypeFromAcpKind(permissionRequest.kind) !== "file_change_approval") {
+    return void 0;
+  }
+  const locations = permissionRequest.toolCall?.data["locations"];
+  const paths = Array.isArray(locations) ? locations.flatMap((entry) => {
+    const path = entry?.["path"];
+    return typeof path === "string" && path.trim().length > 0 ? [path] : [];
+  }) : [];
+  return paths.length > 0 ? paths.map((path) => ({ path, omitted: "unavailable" })) : void 0;
+}
+function runtimeItemStatusFromAcpToolStatus(status) {
+  switch (status) {
+    case "pending":
+    case "inProgress":
+      return "inProgress";
+    case "completed":
+      return "completed";
+    case "failed":
+      return "failed";
+    default:
+      return void 0;
+  }
+}
+function makeAcpRequestOpenedEvent(input2) {
+  const requestType = canonicalRequestTypeFromAcpKind(input2.permissionRequest.kind);
+  const toolName = requestType === "dynamic_tool_call" ? input2.permissionRequest.toolCall?.title : void 0;
+  return {
+    type: "request.opened",
+    ...input2.stamp,
+    provider: input2.provider,
+    threadId: input2.threadId,
+    ...input2.turnId !== void 0 ? { turnId: input2.turnId } : {},
+    requestId: input2.requestId,
+    payload: {
+      requestType,
+      detail: input2.detail,
+      ...toolName ? { toolName } : {},
+      args: input2.args,
+      ...input2.options ? { options: input2.options } : {},
+      ...input2.fileChanges ? { fileChanges: input2.fileChanges } : {},
+      declineReasonRelay: "queued"
+    },
+    raw: {
+      source: input2.source,
+      method: input2.method,
+      payload: input2.rawPayload
+    }
+  };
+}
+function makeAcpRequestResolvedEvent(input2) {
+  return {
+    type: "request.resolved",
+    ...input2.stamp,
+    provider: input2.provider,
+    threadId: input2.threadId,
+    ...input2.turnId !== void 0 ? { turnId: input2.turnId } : {},
+    requestId: input2.requestId,
+    payload: {
+      requestType: canonicalRequestTypeFromAcpKind(input2.permissionRequest.kind),
+      decision: input2.decision,
+      ...input2.reason ? { reason: input2.reason } : {}
+    }
+  };
+}
+function makeAcpPlanUpdatedEvent(input2) {
+  return {
+    type: "turn.plan.updated",
+    ...input2.stamp,
+    provider: input2.provider,
+    threadId: input2.threadId,
+    ...input2.turnId !== void 0 ? { turnId: input2.turnId } : {},
+    payload: input2.payload,
+    raw: {
+      source: input2.source,
+      method: input2.method,
+      payload: input2.rawPayload
+    }
+  };
+}
+function makeAcpToolCallEvent(input2) {
+  const runtimeStatus = runtimeItemStatusFromAcpToolStatus(input2.toolCall.status);
+  const { data } = input2.toolCall;
+  return {
+    type: input2.toolCall.status === "completed" || input2.toolCall.status === "failed" ? "item.completed" : "item.updated",
+    ...input2.stamp,
+    provider: input2.provider,
+    threadId: input2.threadId,
+    ...input2.turnId !== void 0 ? { turnId: input2.turnId } : {},
+    itemId: input2.toolCall.toolCallId,
+    payload: {
+      itemType: canonicalItemTypeFromAcpToolKind(input2.toolCall.kind),
+      ...runtimeStatus ? { status: runtimeStatus } : {},
+      ...input2.toolCall.title ? { title: input2.toolCall.title } : {},
+      ...input2.toolCall.detail ? { detail: input2.toolCall.detail } : {},
+      ...Object.keys(data).length > 0 ? { data } : {}
+    },
+    raw: {
+      source: "acp.jsonrpc",
+      method: "session/update",
+      payload: input2.rawPayload
+    }
+  };
+}
+function makeAcpAssistantItemEvent(input2) {
+  return {
+    type: input2.lifecycle,
+    ...input2.stamp,
+    provider: input2.provider,
+    threadId: input2.threadId,
+    ...input2.turnId !== void 0 ? { turnId: input2.turnId } : {},
+    itemId: input2.itemId,
+    payload: {
+      itemType: "assistant_message",
+      status: input2.lifecycle === "item.completed" ? "completed" : "inProgress"
+    }
+  };
+}
+function makeAcpContentDeltaEvent(input2) {
+  return {
+    type: "content.delta",
+    ...input2.stamp,
+    provider: input2.provider,
+    threadId: input2.threadId,
+    ...input2.turnId !== void 0 ? { turnId: input2.turnId } : {},
+    ...input2.itemId ? { itemId: input2.itemId } : {},
+    payload: {
+      streamKind: input2.streamKind ?? "assistant_text",
+      delta: input2.text
+    },
+    raw: {
+      source: "acp.jsonrpc",
+      method: "session/update",
+      payload: input2.rawPayload
+    }
+  };
+}
+function retainToolCallUpdate(toolCalls, next, seen) {
+  const tracked = toolCalls.get(next.toolCallId);
+  const previous = tracked?.state;
+  const nextToolCall = mergeToolCallState(previous, next);
+  const decision = decideToolCallUpdateEmission({
+    previous,
+    next: nextToolCall,
+    lastEmittedDetailLength: tracked?.lastEmittedDetailLength,
+    skippedSinceEmit: tracked?.skippedSinceEmit ?? 0
+  });
+  if (nextToolCall.status === "completed" || nextToolCall.status === "failed") {
+    toolCalls.delete(nextToolCall.toolCallId);
+  } else {
+    toolCalls.set(nextToolCall.toolCallId, {
+      state: nextToolCall,
+      lastEmittedDetailLength: decision.emit ? nextToolCall.detail?.length : tracked?.lastEmittedDetailLength,
+      skippedSinceEmit: decision.skippedSinceEmit,
+      turnId: tracked === void 0 ? seen.turnId : tracked.turnId,
+      startedAtMs: tracked?.startedAtMs ?? (nextToolCall.status === "inProgress" ? seen.nowMs() : void 0),
+      rawTitle: typeof seen.rawTitle === "string" ? seen.rawTitle : tracked?.rawTitle
+    });
+  }
+  return { nextToolCall, decision };
+}
+
+// ../../packages/ycodium-acp-executor/src/openCommands.ts
+function readOpenToolCalls(toolCalls, turnId) {
+  const running = [];
+  for (const tracked of toolCalls.values()) {
+    if (tracked.turnId !== turnId || tracked.startedAtMs === void 0) continue;
+    running.push({
+      toolCallId: tracked.state.toolCallId,
+      turnId: tracked.turnId,
+      startedAtMs: tracked.startedAtMs,
+      kind: tracked.state.kind,
+      title: tracked.rawTitle,
+      rawInput: tracked.state.data["rawInput"]
+    });
+  }
+  return running;
+}
+
+// ../../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
+  };
+}
+function acpModelChoicesFromConfigOptions(configOptions) {
+  if (!Array.isArray(configOptions)) return void 0;
+  const records = configOptions.filter(isRecord4);
+  const modelOption = records.find((option) => normalizedField(option, "category") === "model") ?? records.find(
+    (option) => normalizedField(option, "id") === "model" && normalizedField(option, "type") === "select"
+  );
+  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 isRecord5(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function asString2(value) {
+  return typeof value === "string" ? value : void 0;
+}
+function acpModeConfigId(setup) {
+  if (!isRecord5(setup)) return void 0;
+  const configOptions = setup["configOptions"];
+  if (!Array.isArray(configOptions)) return void 0;
+  for (const option of configOptions) {
+    if (!isRecord5(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;
+  waiters = [];
+  get isLocked() {
+    return this.locked;
+  }
+  acquire() {
+    if (!this.locked) {
+      this.locked = true;
+      return Promise.resolve();
+    }
+    return new Promise((resolve2) => {
+      this.waiters.push(resolve2);
+    });
+  }
+  tryAcquire() {
+    if (this.locked) {
+      return false;
+    }
+    this.locked = true;
+    return true;
+  }
+  release() {
+    const next = this.waiters.shift();
+    if (next) {
+      next();
+      return;
+    }
+    this.locked = false;
+  }
+  async runExclusive(fn) {
+    await this.acquire();
+    try {
+      return await fn();
+    } finally {
+      this.release();
+    }
+  }
+};
+
 // ../../packages/ycodium-acp-executor/src/model-selection.ts
 function normalizeModelId(value) {
   return value?.trim() || void 0;
@@ -33038,24 +33079,11 @@ function createAcpExecutor(options) {
     }
     for (const event of parsed.events) {
       if (event._tag === "ToolCallUpdated") {
-        const tracked = toolCalls.get(event.toolCall.toolCallId);
-        const previous = tracked?.state;
-        const nextToolCall = mergeToolCallState(previous, event.toolCall);
-        const decision = decideToolCallUpdateEmission({
-          previous,
-          next: nextToolCall,
-          lastEmittedDetailLength: tracked?.lastEmittedDetailLength,
-          skippedSinceEmit: tracked?.skippedSinceEmit ?? 0
+        const { nextToolCall, decision } = retainToolCallUpdate(toolCalls, event.toolCall, {
+          turnId: activeTurnId,
+          rawTitle: params.update.title,
+          nowMs
         });
-        if (nextToolCall.status === "completed" || nextToolCall.status === "failed") {
-          toolCalls.delete(nextToolCall.toolCallId);
-        } else {
-          toolCalls.set(nextToolCall.toolCallId, {
-            state: nextToolCall,
-            lastEmittedDetailLength: decision.emit ? nextToolCall.detail?.length : tracked?.lastEmittedDetailLength,
-            skippedSinceEmit: decision.skippedSinceEmit
-          });
-        }
         const hookResult = hooks.onToolCallUpdated?.({
           toolCallId: nextToolCall.toolCallId,
           status: nextToolCall.status,
@@ -34083,6 +34111,7 @@ function createAcpExecutor(options) {
     respondToUserInput,
     setNativeMode,
     compact,
+    openToolCalls: () => readOpenToolCalls(toolCalls, activeTurnId),
     dispose
   };
 }
@@ -34412,17 +34441,21 @@ async function ensureDshSkillOverlay(skillsDir, tempRoot = NodeOS2.tmpdir()) {
   });
   return file2;
 }
-function spawnDsh(host, launch, prefix, suffix = []) {
-  return host.process.spawn({
+async function spawnDsh(host, launch, prefix, suffix = []) {
+  const spawned = {
     program: launch.program,
     args: [...prefix, ...launch.args, ...suffix],
-    cwd: launch.cwd,
+    cwd: launch.cwd
+  };
+  const handle = await host.process.spawn({
+    ...spawned,
     owner: { bindingId: host.bindingId },
     ...Object.keys(launch.env).length > 0 ? { env: launch.env } : {}
   });
+  return { handle, spawned };
 }
 async function overlayTakesEffect(input2) {
-  const handle = await spawnDsh(
+  const { handle } = await spawnDsh(
     input2.host,
     input2.launch,
     ["--patch", input2.overlay],
@@ -34770,6 +34803,112 @@ async function probeDshVersion(input2) {
   });
 }
 
+// src/openCommands.ts
+import {
+  isPowerShellExecutableName,
+  posixShellCommandMatches,
+  sameArgv
+} from "@ycodium-ai/plugin-api/executor";
+var WINDOWS_POWERSHELL_PREFIX = "[Console]::OutputEncoding = [System.Text.UTF8Encoding]::new($false); $OutputEncoding = [System.Text.UTF8Encoding]::new($false); ";
+var WINDOWS_POWERSHELL_FLAGS = ["-NoLogo", "-NoProfile", "-NonInteractive", "-Command"];
+var NODE_EXECUTABLES = /* @__PURE__ */ new Set(["node", "node.exe"]);
+var SHELL_TOOL_TITLES = /* @__PURE__ */ new Set(["bash", "pwsh"]);
+var isDshShellToolTitle = (title) => SHELL_TOOL_TITLES.has(title);
+var slashed = (path) => path.replaceAll("\\", "/").replace(/\/{2,}/g, "/");
+var basename = (path) => {
+  const normalized = slashed(path);
+  return normalized.slice(normalized.lastIndexOf("/") + 1);
+};
+var isNode = (program) => NODE_EXECUTABLES.has(basename(program).toLowerCase());
+var endsWithPath = (path, suffix) => slashed(path).toLowerCase().endsWith(suffix);
+var SUBPROCESS_RUNNER = "/@deepseek-ai/dsh-subprocess-local/lib/runner.js";
+var SANDBOX_RUNNER = "/@deepseek-ai/dsh-sandbox-windows-acl/lib/runner.js";
+var DSH_ENTRY = "/@deepseek-ai/dsh/lib/bin.js";
+var sameWindowsDirectory = (left, right) => {
+  const trimmed = (path) => slashed(path).replace(/\/+$/, "").toLowerCase();
+  return trimmed(left) === trimmed(right);
+};
+var TEMP_DIRECTORY = /^dsh-[A-Za-z0-9]{6}$/;
+var WINDOWS_ABSOLUTE_PATH = /^[A-Za-z]:[\\/]/;
+var SID = /^S-1-\d+(-\d+)+$/;
+function windowsShellMatches(argv, command) {
+  const [shell, ...rest] = argv;
+  if (shell === void 0 || !isPowerShellExecutableName(basename(shell))) return false;
+  return sameArgv(rest, [...WINDOWS_POWERSHELL_FLAGS, WINDOWS_POWERSHELL_PREFIX + command]);
+}
+function unwrapWindowsSandbox(argv, cwd) {
+  const [node2, runner, workspaceFlag, workspace, tempFlag, temp, modeFlag, mode, ...rest] = argv;
+  if (node2 === void 0 || runner === void 0) return void 0;
+  if (!isNode(node2) || !endsWithPath(runner, SANDBOX_RUNNER)) return void 0;
+  if (workspaceFlag !== "--workspace" || !sameWindowsDirectory(workspace ?? "", cwd)) {
+    return void 0;
+  }
+  if (tempFlag !== "--temp" || temp === void 0 || modeFlag !== "--mode") return void 0;
+  if (mode === "read-only") {
+    const [separator2, ...shell2] = rest;
+    return WINDOWS_ABSOLUTE_PATH.test(temp) && separator2 === "--" ? shell2 : void 0;
+  }
+  if (mode !== "workspace-write" || !TEMP_DIRECTORY.test(basename(temp))) return void 0;
+  const [writeFlag, writeSid, tempWriteFlag, tempWriteSid, separator, ...shell] = rest;
+  if (writeFlag !== "--write-sid" || !SID.test(writeSid ?? "")) return void 0;
+  if (tempWriteFlag !== "--temp-write-sid" || !SID.test(tempWriteSid ?? "")) return void 0;
+  return separator === "--" ? shell : void 0;
+}
+function windowsCommandMatches(argv, command, cwd) {
+  const [node2, runner, separator, ...inner] = argv;
+  if (node2 === void 0 || runner === void 0 || separator !== "--") return false;
+  if (!isNode(node2) || !endsWithPath(runner, SUBPROCESS_RUNNER)) return false;
+  return windowsShellMatches(unwrapWindowsSandbox(inner, cwd) ?? inner, command);
+}
+function dshCommandMatcher(input2) {
+  return (argv, platform) => {
+    if (platform === "win32") {
+      return input2.title === "pwsh" && windowsCommandMatches(argv, input2.command, input2.cwd);
+    }
+    if (input2.title !== "bash") return false;
+    const first = argv[0] ?? "";
+    const shell = argv.length === 3 && basename(first) === "bash" ? first : "bash";
+    return posixShellCommandMatches({ shell, script: input2.command }, argv);
+  };
+}
+function dshSessionProcessMatcher(program, args) {
+  return (argv, platform) => {
+    const [node2, entry, ...rest] = argv;
+    if (node2 === void 0 || entry === void 0 || !isNode(node2)) return false;
+    if (!sameArgv(rest, args)) return false;
+    if (platform === "win32") return endsWithPath(entry, DSH_ENTRY);
+    return basename(entry) === basename(program);
+  };
+}
+var commandOf = (call) => {
+  if (call.title === void 0 || !isDshShellToolTitle(call.title)) return void 0;
+  const rawInput = call.rawInput;
+  if (typeof rawInput !== "object" || rawInput === null) return void 0;
+  const input2 = rawInput;
+  if (input2["run_in_background"] === true) return void 0;
+  const command = input2["command"];
+  return typeof command === "string" && command.trim() !== "" ? command : void 0;
+};
+function dshOpenCommands(session) {
+  const commands = session.openToolCalls.flatMap((call) => {
+    const command = commandOf(call);
+    if (command === void 0 || call.title === void 0) return [];
+    return [
+      {
+        toolCallId: call.toolCallId,
+        startedAtMs: call.startedAtMs,
+        matches: dshCommandMatcher({ title: call.title, command, cwd: session.cwd })
+      }
+    ];
+  });
+  if (commands.length === 0) return void 0;
+  return {
+    rootPid: session.rootPid,
+    sessionProcess: dshSessionProcessMatcher(session.program, session.args),
+    commands
+  };
+}
+
 // src/dshInstance.ts
 var RESUME_SCHEMA_VERSION = 1;
 var yieldTick = () => new Promise((resolve2) => {
@@ -34898,7 +35037,7 @@ var createDshInstance = (config2, host) => {
         launch,
         verified: skillOverlayChecks
       });
-      const handle = await spawnDsh(host, launch, skillArgs);
+      const { handle, spawned } = await spawnDsh(host, launch, skillArgs);
       const { readable, writable, stderrTail } = nodeStreamsFromHandle2(handle);
       const resume = input2.discardResumeCursor === true ? void 0 : parseAcpResumeCursor(input2.resumeCursor, RESUME_SCHEMA_VERSION);
       const requestedModelId = modelIdFromSelection(input2.modelSelection);
@@ -34965,7 +35104,8 @@ var createDshInstance = (config2, host) => {
           turns: [],
           executor,
           handle,
-          forwarding
+          forwarding,
+          spawned
         });
         host.log.info("session started", {
           threadId: input2.threadId,
@@ -35011,6 +35151,15 @@ var createDshInstance = (config2, host) => {
       await booked.executor.cancel(turnId);
       await yieldTick();
     },
+    openCommandProcesses: async (threadId) => {
+      const booked = threads.get(threadId);
+      if (booked === void 0) return void 0;
+      return dshOpenCommands({
+        rootPid: booked.handle.pid,
+        ...booked.spawned,
+        openToolCalls: booked.executor.openToolCalls()
+      });
+    },
     respondToRequest: async (threadId, requestId, decision, reason) => {
       const booked = requireThread(threadId);
       await booked.executor.respondToRequest(
@@ -35074,7 +35223,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-dsh",
-  apiVersion: 3,
+  apiVersion: 5,
   executors,
   activate(ctx) {
     ctx.log.info("dsh executor ready");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-dsh",
-  "version": "0.2.2974",
+  "version": "0.2.2978",
   "description": "DeepSeek Harness executor: dsh CLI over Agent Client Protocol stdio.",
   "keywords": [
     "ycodium",
@@ -22,8 +22,8 @@
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
     "yaml": "^2.9.0",
-    "@ycodium-ai/plugin-api": "0.2.2974",
-    "ycodium-acp-executor": "0.2.2974",
+    "@ycodium-ai/plugin-api": "0.2.2978",
+    "ycodium-acp-executor": "0.2.2978",
     "ycodium-executor-testing": "0.0.0"
   },
   "ycodium": {