@ycodium-ai/agent-dsh 0.2.2936 → 0.2.2942

package/dist/index.js

@@ -7427,7 +7427,9 @@ var DSH_CARD = {
     //
     // 改这一位要连着 `packages/contracts` 那张表一起改（`executorRegistry.test.ts`
     // 的防漂移闸把两边钉成同值）。
-    runtimeModeSwitch: "in-session"
+    runtimeModeSwitch: "in-session",
+    // 打断后 CLI 在同一秒停掉工具并报失败。
+    confirmsToolTermination: true
   },
   // 凭据由 CLI 自己保管在它 home 里，宿主不读 token。
   credentialSources: [],
@@ -31644,6 +31646,230 @@ var UnboundedEventStream = class {
   }
 };
 
+// ../../packages/ycodium-acp-executor/src/util.ts
+function isRecord3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function asTrimmedString(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
+
+// ../../packages/ycodium-acp-executor/src/tool-presentation.ts
+function normalizeCommandValue(value) {
+  const direct = asTrimmedString(value);
+  if (direct) {
+    return direct;
+  }
+  if (!Array.isArray(value)) {
+    return void 0;
+  }
+  const parts = [];
+  for (const entry of value) {
+    const part = asTrimmedString(entry);
+    if (part !== void 0) {
+      parts.push(part);
+    }
+  }
+  return parts.length > 0 ? parts.join(" ") : void 0;
+}
+function stripTrailingExitCode(value) {
+  const trimmed = value?.trim();
+  if (!trimmed) {
+    return void 0;
+  }
+  const match = /^(?<output>[\s\S]*?)(?:\s*<exited with exit code \d+>)\s*$/iu.exec(trimmed);
+  const output2 = match?.groups?.output?.trim() ?? trimmed;
+  return output2.length > 0 ? output2 : void 0;
+}
+function extractCommandFromTitle(title) {
+  if (!title) {
+    return void 0;
+  }
+  const backtickMatch = /`([^`]+)`/u.exec(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 candidates = [
+    normalizeCommandValue(item?.["command"]),
+    normalizeCommandValue(itemInput?.["command"]),
+    normalizeCommandValue(itemResult?.["command"]),
+    normalizeCommandValue(data?.["command"]),
+    normalizeCommandValue(dataInput?.["command"]),
+    normalizeCommandValue(rawInput?.["command"])
+  ];
+  const direct = candidates.find((candidate) => candidate !== void 0);
+  if (direct) {
+    return direct;
+  }
+  const executable = asTrimmedString(rawInput?.["executable"]);
+  const args = normalizeCommandValue(rawInput?.["args"]);
+  if (executable && args) {
+    return `${executable} ${args}`;
+  }
+  if (executable) {
+    return executable;
+  }
+  return extractCommandFromTitle(title);
+}
+function maybePathLike(value) {
+  if (!value) {
+    return void 0;
+  }
+  if (value.includes("/") || value.includes("\\") || value.startsWith(".") || /\.(?:[a-z0-9]{1,12})$/iu.test(value)) {
+    return value;
+  }
+  return void 0;
+}
+function collectPaths(value, paths, seen, depth) {
+  if (depth > 4 || paths.length >= 8) {
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const entry of value) {
+      collectPaths(entry, paths, seen, depth + 1);
+      if (paths.length >= 8) {
+        return;
+      }
+    }
+    return;
+  }
+  if (!isRecord3(value)) {
+    return;
+  }
+  for (const key of ["path", "filePath", "relativePath", "filename", "newPath", "oldPath"]) {
+    const candidate = maybePathLike(asTrimmedString(value[key]));
+    if (!candidate || seen.has(candidate)) {
+      continue;
+    }
+    seen.add(candidate);
+    paths.push(candidate);
+    if (paths.length >= 8) {
+      return;
+    }
+  }
+  for (const nestedKey of ["locations", "item", "input", "result", "rawInput", "data", "changes"]) {
+    if (!(nestedKey in value)) {
+      continue;
+    }
+    collectPaths(value[nestedKey], paths, seen, depth + 1);
+    if (paths.length >= 8) {
+      return;
+    }
+  }
+}
+function extractPrimaryPath(data) {
+  const paths = [];
+  collectPaths(data, paths, /* @__PURE__ */ new Set(), 0);
+  return paths[0];
+}
+function normalizeEquivalentValue(value) {
+  const trimmed = asTrimmedString(value);
+  if (!trimmed) {
+    return void 0;
+  }
+  return trimmed.replace(/\s+/gu, " ").replace(/\s+(?:complete|completed|started)\s*$/iu, "").trim();
+}
+function isEquivalent(left, right) {
+  const normalizedLeft = normalizeEquivalentValue(left)?.toLowerCase();
+  const normalizedRight = normalizeEquivalentValue(right)?.toLowerCase();
+  return normalizedLeft !== void 0 && normalizedLeft === normalizedRight;
+}
+function classifyToolAction(input2) {
+  const itemType = input2.itemType ?? void 0;
+  const kind = asTrimmedString(input2.data?.["kind"])?.toLowerCase();
+  const title = asTrimmedString(input2.title)?.toLowerCase();
+  if (itemType === "command_execution" || kind === "execute" || title === "terminal") {
+    return "command";
+  }
+  if (kind === "read" || title === "read file") {
+    return "read";
+  }
+  if (itemType === "file_change" || kind === "edit" || kind === "move" || kind === "delete" || kind === "write") {
+    return "file_change";
+  }
+  if (itemType === "web_search" || kind === "search" || title === "find" || title === "grep") {
+    return "search";
+  }
+  return "other";
+}
+function canonicalItemTypeFromAcpToolKind(kind) {
+  switch (kind) {
+    case "execute":
+      return "command_execution";
+    case "edit":
+    case "delete":
+    case "move":
+      return "file_change";
+    case "search":
+    case "fetch":
+      return "web_search";
+    default:
+      return "dynamic_tool_call";
+  }
+}
+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 command = extractToolCommand(data, title);
+  const primaryPath = extractPrimaryPath(data);
+  const action = classifyToolAction({
+    itemType: input2.itemType,
+    title,
+    data
+  });
+  if (action === "command") {
+    return {
+      summary: "Ran command",
+      ...command ? { detail: command } : {}
+    };
+  }
+  if (action === "read") {
+    if (primaryPath) {
+      return {
+        summary: "Read file",
+        detail: primaryPath
+      };
+    }
+    return {
+      summary: "Read file"
+    };
+  }
+  if (action === "file_change") {
+    return {
+      summary: "Changed files",
+      ...primaryPath ? { detail: primaryPath } : {}
+    };
+  }
+  if (action === "search") {
+    const rawInput = isRecord3(data?.["rawInput"]) ? data["rawInput"] : void 0;
+    const query = asTrimmedString(rawInput?.["query"]) ?? asTrimmedString(rawInput?.["pattern"]) ?? asTrimmedString(rawInput?.["searchTerm"]);
+    return {
+      summary: "Searched files",
+      ...query ? { detail: query } : {}
+    };
+  }
+  if (detail && !isEquivalent(detail, title) && !isEquivalent(detail, fallbackSummary)) {
+    return {
+      summary: title ?? fallbackSummary,
+      detail
+    };
+  }
+  return {
+    summary: title ?? fallbackSummary
+  };
+}
+
 // ../../packages/ycodium-acp-executor/src/events.ts
 function canonicalRequestTypeFromAcpKind(kind) {
   switch (kind) {
@@ -31699,21 +31925,6 @@ function fileChangesFromAcpPermission(permissionRequest) {
   }) : [];
   return paths.length > 0 ? paths.map((path) => ({ path, omitted: "unavailable" })) : void 0;
 }
-function canonicalItemTypeFromAcpToolKind(kind) {
-  switch (kind) {
-    case "execute":
-      return "command_execution";
-    case "edit":
-    case "delete":
-    case "move":
-      return "file_change";
-    case "search":
-    case "fetch":
-      return "web_search";
-    default:
-      return "dynamic_tool_call";
-  }
-}
 function runtimeItemStatusFromAcpToolStatus(status) {
   switch (status) {
     case "pending":
@@ -31785,6 +31996,7 @@ function makeAcpPlanUpdatedEvent(input2) {
 }
 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,
@@ -31797,7 +32009,7 @@ function makeAcpToolCallEvent(input2) {
       ...runtimeStatus ? { status: runtimeStatus } : {},
       ...input2.toolCall.title ? { title: input2.toolCall.title } : {},
       ...input2.toolCall.detail ? { detail: input2.toolCall.detail } : {},
-      ...Object.keys(input2.toolCall.data).length > 0 ? { data: input2.toolCall.data } : {}
+      ...Object.keys(data).length > 0 ? { data } : {}
     },
     raw: {
       source: "acp.jsonrpc",
@@ -31841,7 +32053,7 @@ function makeAcpContentDeltaEvent(input2) {
 }
 
 // ../../packages/ycodium-acp-executor/src/config-options.ts
-function isRecord3(value) {
+function isRecord4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function asString(value) {
@@ -31860,7 +32072,7 @@ function flattenChoices(rawOptions, currentValue) {
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   const push = (entry) => {
-    if (!isRecord3(entry)) return;
+    if (!isRecord4(entry)) return;
     const value = asString(entry["value"]);
     if (value === void 0 || seen.has(value)) return;
     seen.add(value);
@@ -31875,7 +32087,7 @@ function flattenChoices(rawOptions, currentValue) {
     });
   };
   for (const entry of rawOptions) {
-    if (isRecord3(entry) && Array.isArray(entry["options"])) {
+    if (isRecord4(entry) && Array.isArray(entry["options"])) {
       for (const nested of entry["options"]) push(nested);
       continue;
     }
@@ -31885,7 +32097,7 @@ function flattenChoices(rawOptions, currentValue) {
 }
 function findAcpEffortConfig(configOptions) {
   if (!Array.isArray(configOptions)) return void 0;
-  const candidates = configOptions.filter(isRecord3).filter((option) => normalizedField(option, "type") === "select").filter(looksLikeEffortOption);
+  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;
@@ -31901,7 +32113,7 @@ function findAcpEffortConfig(configOptions) {
 }
 function acpModelChoicesFromConfigOptions(configOptions) {
   if (!Array.isArray(configOptions)) return void 0;
-  const records = configOptions.filter(isRecord3);
+  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"
   );
@@ -31911,18 +32123,18 @@ function acpModelChoicesFromConfigOptions(configOptions) {
 }
 
 // ../../packages/ycodium-acp-executor/src/runtime-mode.ts
-function isRecord4(value) {
+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 (!isRecord4(setup)) return void 0;
+  if (!isRecord5(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 (!isRecord5(option)) continue;
     if (asString2(option["category"])?.trim().toLowerCase() !== "mode") continue;
     const id = asString2(option["id"])?.trim();
     if (id) return id;
@@ -32035,215 +32247,6 @@ var Mutex = class {
   }
 };
 
-// ../../packages/ycodium-acp-executor/src/util.ts
-function isRecord5(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function asTrimmedString(value) {
-  if (typeof value !== "string") {
-    return void 0;
-  }
-  const trimmed = value.trim();
-  return trimmed.length > 0 ? trimmed : void 0;
-}
-
-// ../../packages/ycodium-acp-executor/src/tool-presentation.ts
-function normalizeCommandValue(value) {
-  const direct = asTrimmedString(value);
-  if (direct) {
-    return direct;
-  }
-  if (!Array.isArray(value)) {
-    return void 0;
-  }
-  const parts = [];
-  for (const entry of value) {
-    const part = asTrimmedString(entry);
-    if (part !== void 0) {
-      parts.push(part);
-    }
-  }
-  return parts.length > 0 ? parts.join(" ") : void 0;
-}
-function stripTrailingExitCode(value) {
-  const trimmed = value?.trim();
-  if (!trimmed) {
-    return void 0;
-  }
-  const match = /^(?<output>[\s\S]*?)(?:\s*<exited with exit code \d+>)\s*$/iu.exec(trimmed);
-  const output2 = match?.groups?.output?.trim() ?? trimmed;
-  return output2.length > 0 ? output2 : void 0;
-}
-function extractCommandFromTitle(title) {
-  if (!title) {
-    return void 0;
-  }
-  const backtickMatch = /`([^`]+)`/u.exec(title);
-  return backtickMatch?.[1]?.trim() || void 0;
-}
-function extractToolCommand(data, title) {
-  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"]),
-    normalizeCommandValue(itemResult?.["command"]),
-    normalizeCommandValue(data?.["command"]),
-    normalizeCommandValue(dataInput?.["command"]),
-    normalizeCommandValue(rawInput?.["command"])
-  ];
-  const direct = candidates.find((candidate) => candidate !== void 0);
-  if (direct) {
-    return direct;
-  }
-  const executable = asTrimmedString(rawInput?.["executable"]);
-  const args = normalizeCommandValue(rawInput?.["args"]);
-  if (executable && args) {
-    return `${executable} ${args}`;
-  }
-  if (executable) {
-    return executable;
-  }
-  return extractCommandFromTitle(title);
-}
-function maybePathLike(value) {
-  if (!value) {
-    return void 0;
-  }
-  if (value.includes("/") || value.includes("\\") || value.startsWith(".") || /\.(?:[a-z0-9]{1,12})$/iu.test(value)) {
-    return value;
-  }
-  return void 0;
-}
-function collectPaths(value, paths, seen, depth) {
-  if (depth > 4 || paths.length >= 8) {
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const entry of value) {
-      collectPaths(entry, paths, seen, depth + 1);
-      if (paths.length >= 8) {
-        return;
-      }
-    }
-    return;
-  }
-  if (!isRecord5(value)) {
-    return;
-  }
-  for (const key of ["path", "filePath", "relativePath", "filename", "newPath", "oldPath"]) {
-    const candidate = maybePathLike(asTrimmedString(value[key]));
-    if (!candidate || seen.has(candidate)) {
-      continue;
-    }
-    seen.add(candidate);
-    paths.push(candidate);
-    if (paths.length >= 8) {
-      return;
-    }
-  }
-  for (const nestedKey of ["locations", "item", "input", "result", "rawInput", "data", "changes"]) {
-    if (!(nestedKey in value)) {
-      continue;
-    }
-    collectPaths(value[nestedKey], paths, seen, depth + 1);
-    if (paths.length >= 8) {
-      return;
-    }
-  }
-}
-function extractPrimaryPath(data) {
-  const paths = [];
-  collectPaths(data, paths, /* @__PURE__ */ new Set(), 0);
-  return paths[0];
-}
-function normalizeEquivalentValue(value) {
-  const trimmed = asTrimmedString(value);
-  if (!trimmed) {
-    return void 0;
-  }
-  return trimmed.replace(/\s+/gu, " ").replace(/\s+(?:complete|completed|started)\s*$/iu, "").trim();
-}
-function isEquivalent(left, right) {
-  const normalizedLeft = normalizeEquivalentValue(left)?.toLowerCase();
-  const normalizedRight = normalizeEquivalentValue(right)?.toLowerCase();
-  return normalizedLeft !== void 0 && normalizedLeft === normalizedRight;
-}
-function classifyToolAction(input2) {
-  const itemType = input2.itemType ?? void 0;
-  const kind = asTrimmedString(input2.data?.["kind"])?.toLowerCase();
-  const title = asTrimmedString(input2.title)?.toLowerCase();
-  if (itemType === "command_execution" || kind === "execute" || title === "terminal") {
-    return "command";
-  }
-  if (kind === "read" || title === "read file") {
-    return "read";
-  }
-  if (itemType === "file_change" || kind === "edit" || kind === "move" || kind === "delete" || kind === "write") {
-    return "file_change";
-  }
-  if (itemType === "web_search" || kind === "search" || title === "find" || title === "grep") {
-    return "search";
-  }
-  return "other";
-}
-function deriveToolActivityPresentation(input2) {
-  const title = asTrimmedString(input2.title);
-  const detail = stripTrailingExitCode(asTrimmedString(input2.detail));
-  const fallbackSummary = asTrimmedString(input2.fallbackSummary) ?? "Tool";
-  const data = isRecord5(input2.data) ? input2.data : void 0;
-  const command = extractToolCommand(data, title);
-  const primaryPath = extractPrimaryPath(data);
-  const action = classifyToolAction({
-    itemType: input2.itemType,
-    title,
-    data
-  });
-  if (action === "command") {
-    return {
-      summary: "Ran command",
-      ...command ? { detail: command } : {}
-    };
-  }
-  if (action === "read") {
-    if (primaryPath) {
-      return {
-        summary: "Read file",
-        detail: primaryPath
-      };
-    }
-    return {
-      summary: "Read file"
-    };
-  }
-  if (action === "file_change") {
-    return {
-      summary: "Changed files",
-      ...primaryPath ? { detail: primaryPath } : {}
-    };
-  }
-  if (action === "search") {
-    const rawInput = isRecord5(data?.["rawInput"]) ? data["rawInput"] : void 0;
-    const query = asTrimmedString(rawInput?.["query"]) ?? asTrimmedString(rawInput?.["pattern"]) ?? asTrimmedString(rawInput?.["searchTerm"]);
-    return {
-      summary: "Searched files",
-      ...query ? { detail: query } : {}
-    };
-  }
-  if (detail && !isEquivalent(detail, title) && !isEquivalent(detail, fallbackSummary)) {
-    return {
-      summary: title ?? fallbackSummary,
-      detail
-    };
-  }
-  return {
-    summary: title ?? fallbackSummary
-  };
-}
-
 // ../../packages/ycodium-acp-executor/src/runtime-model.ts
 function extractModelConfigId(sessionResponse) {
   const configOptions = sessionResponse.configOptions;
@@ -32274,11 +32277,11 @@ function collectSessionConfigOptionValues(configOption) {
   );
 }
 function collectSessionModelIds(models) {
-  if (!isRecord5(models) || !Array.isArray(models["availableModels"])) {
+  if (!isRecord3(models) || !Array.isArray(models["availableModels"])) {
     return [];
   }
   return models["availableModels"].flatMap(
-    (model) => isRecord5(model) && typeof model["modelId"] === "string" ? [model["modelId"]] : []
+    (model) => isRecord3(model) && typeof model["modelId"] === "string" ? [model["modelId"]] : []
   );
 }
 function catalogModelLastSegment(value) {
@@ -32350,7 +32353,7 @@ function parseAvailableCommandsUpdate(params) {
   }
   const commands = [];
   for (const command of availableCommands) {
-    if (!isRecord5(command)) {
+    if (!isRecord3(command)) {
       continue;
     }
     const name = typeof command["name"] === "string" ? command["name"].trim() : "";
@@ -32358,7 +32361,7 @@ function parseAvailableCommandsUpdate(params) {
       continue;
     }
     const description = typeof command["description"] === "string" ? command["description"].trim() || void 0 : void 0;
-    const input2 = isRecord5(command["input"]) ? command["input"] : void 0;
+    const input2 = isRecord3(command["input"]) ? command["input"] : void 0;
     const inputHint = typeof input2?.["hint"] === "string" ? input2["hint"].trim() || void 0 : void 0;
     commands.push({
       name,
@@ -32420,7 +32423,7 @@ function extractCommandFromTitle2(title) {
   return match?.[1]?.trim() || void 0;
 }
 function extractToolCallCommand(rawInput, title) {
-  if (isRecord5(rawInput)) {
+  if (isRecord3(rawInput)) {
     const directCommand = normalizeCommandValue2(rawInput["command"]);
     if (directCommand) {
       return directCommand;
@@ -32447,7 +32450,7 @@ function boundToolCallOutputText(text) {
 }
 var RAW_OUTPUT_TEXT_FIELDS = ["content", "stdout", "stderr", "output"];
 function boundToolCallRawOutput(rawOutput) {
-  if (!isRecord5(rawOutput)) {
+  if (!isRecord3(rawOutput)) {
     return rawOutput;
   }
   let changed = false;
@@ -32505,21 +32508,6 @@ function extractTextContentFromToolCallContent(content) {
 function normalizeToolKind(kind) {
   return typeof kind === "string" && kind.trim().length > 0 ? kind.trim() : void 0;
 }
-function canonicalItemTypeFromAcpToolKind2(kind) {
-  switch (kind) {
-    case "execute":
-      return "command_execution";
-    case "edit":
-    case "delete":
-    case "move":
-      return "file_change";
-    case "search":
-    case "fetch":
-      return "web_search";
-    default:
-      return "dynamic_tool_call";
-  }
-}
 function makeToolCallState(input2, options) {
   const toolCallId = typeof input2.toolCallId === "string" ? input2.toolCallId.trim() : "";
   if (!toolCallId) {
@@ -32535,6 +32523,10 @@ function makeToolCallState(input2, options) {
   if (kind) {
     data["kind"] = kind;
   }
+  const name = readAcpText(input2, "name");
+  if (name) {
+    data["name"] = name;
+  }
   if (command) {
     data["command"] = command;
   }
@@ -32553,7 +32545,7 @@ function makeToolCallState(input2, options) {
   const fallbackDetail = command ?? normalizedTitle ?? textContent;
   const hasPresentationSeed = title !== void 0 || kind !== void 0 || command !== void 0 || normalizedTitle !== void 0 || textContent !== void 0;
   const presentation = hasPresentationSeed ? deriveToolActivityPresentation({
-    itemType: canonicalItemTypeFromAcpToolKind2(kind),
+    itemType: canonicalItemTypeFromAcpToolKind(kind),
     title,
     detail: fallbackDetail,
     data,
@@ -32659,7 +32651,7 @@ function readAcpText(source, key) {
 }
 function textFromContentBlocks(blocks) {
   const parts = blocks.flatMap(
-    (block) => isRecord5(block) && block["type"] === "text" && typeof block["text"] === "string" ? [block["text"]] : []
+    (block) => isRecord3(block) && block["type"] === "text" && typeof block["text"] === "string" ? [block["text"]] : []
   );
   const joined = parts.join("");
   return joined.trim().length > 0 ? joined : void 0;
@@ -32684,7 +32676,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(isRecord5(entry) ? entry["status"] : void 0)
+        status: normalizePlanStepStatus(isRecord3(entry) ? entry["status"] : void 0)
       }));
       if (plan.length > 0) {
         events.push({
@@ -32702,6 +32694,7 @@ function parseSessionUpdateEvent(params) {
       const toolCall = makeToolCallState(
         {
           toolCallId: upd["toolCallId"],
+          name: upd["name"],
           title: typeof upd["title"] === "string" ? upd["title"] : void 0,
           kind: upd["kind"],
           status: upd["status"],
@@ -32723,7 +32716,7 @@ function parseSessionUpdateEvent(params) {
     }
     case "agent_message_chunk":
     case "agent_thought_chunk": {
-      const content = isRecord5(upd["content"]) ? upd["content"] : void 0;
+      const content = isRecord3(upd["content"]) ? upd["content"] : void 0;
       const contentType = content?.["type"];
       const streamKind = kind === "agent_thought_chunk" ? "reasoning_text" : "assistant_text";
       if (contentType === "text") {
@@ -32763,7 +32756,7 @@ function parseSessionUpdateEvent(params) {
     }
     case "compaction_summary_chunk": {
       const compactionId = readAcpText(upd, "compactionId");
-      const content = isRecord5(upd["content"]) ? upd["content"] : void 0;
+      const content = isRecord3(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 });
@@ -32795,7 +32788,7 @@ function normalizeModelId(value) {
   return value?.trim() || void 0;
 }
 function modelSelectionStateFromSetup(setup) {
-  const sessionModels = isRecord5(setup.models) ? setup.models : void 0;
+  const sessionModels = isRecord3(setup.models) ? setup.models : void 0;
   const modelConfigId = extractModelConfigId(setup);
   const strategy = sessionModels === void 0 && modelConfigId !== void 0 ? "config-option" : "session/set_model";
   const modelConfigOption = modelConfigId === void 0 ? void 0 : findSessionConfigOption(setup.configOptions, modelConfigId);
@@ -34040,7 +34033,7 @@ function createAcpExecutor(options) {
     pendingUserInputs.delete(requestId);
     pending.resolve({
       kind: "answered",
-      answers: isRecord5(answers) ? answers : {}
+      answers: isRecord3(answers) ? answers : {}
     });
   };
   const dispose = async () => {

package/package.json

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