dsh-acp-enhanced 0.3.1 → 0.3.2

package/README-zh.md

@@ -26,7 +26,8 @@ ACP 线上。
 
 ### Zed 深度集成
 
-- **工具卡片**：展开可见每次调用的完整参数与结果预览（`rawInput` / `rawOutput`），
+- **工具卡片**：折叠态即显示一行摘要——`Read <路径>`、执行的命令、`Search: <模式>`、
+  `Fetch: <URL>` 等；展开可见每次调用的完整参数与结果预览（`rawInput` / `rawOutput`），
   按工具类型渲染图标
 - **Zed 文件与终端**：`zed_read_text_file` / `zed_write_text_file` / `zed_terminal` 把
   文件编辑放进 Zed 的"编辑文件"区（diff + 接受/拒绝）、命令跑在 Zed 真实终端

package/README.md

@@ -29,8 +29,10 @@ over the ACP wire.
 
 ### Zed deep integration
 
-- **Tool cards**: expand to see each call's full arguments and result preview
-  (`rawInput` / `rawOutput`), with per-kind icons
+- **Tool cards**: one-line summary in the collapsed header — `Read <path>`, the
+  executed command, `Search: <pattern>`, `Fetch: <url>`, etc. — with the full
+  arguments and result preview (`rawInput` / `rawOutput`) one click away, plus
+  per-kind icons
 - **Zed files & terminal**: `zed_read_text_file` / `zed_write_text_file` / `zed_terminal`
   put file edits into Zed's "edited files" area (diff + accept/reject) and commands into a
   real Zed terminal

package/lib/index.js

@@ -103,6 +103,138 @@ function parseToolArguments(raw) {
   }
 }
 
+/** Collapse whitespace and bound a string to one display line (Zed shows the
+ *  tool-call header from the title, truncating overflow with an ellipsis). */
+function clipOneLine(text, max) {
+  const oneLine = String(text).replace(/\s+/g, ' ').trim()
+  return oneLine.length > max ? `${oneLine.slice(0, max)}…` : oneLine
+}
+
+/** Escape markdown-significant characters so a dynamic title fragment (path,
+ *  pattern, URL, query) renders literally inside Zed's markdown label. Zed
+ *  applies no escaping to `other`/`read`/`search`/`fetch`/`think` kinds — it
+ *  only escapes `edit` itself — so the bridge must keep emphasis/code/link
+ *  syntax from being interpreted. Execute-kind titles render as plain text
+ *  and are never escaped. */
+function mdEscape(text) {
+  return String(text).replace(/([\\*_`[\]<>])/g, '\\$1')
+}
+
+/**
+ * One-line human-readable summary of a tool call for the ACP `title` field.
+ * Zed renders this as the collapsed tool-call header, so a bare tool name
+ * ("read", "bash") hides what actually happened until the card is expanded.
+ * Mirror Zed's own native-agent titles (`Read <path>`, `Fetch <url>`,
+ * `Search: <pattern>`, and the raw command for terminal tools) with the
+ * detail escaped and bounded to one line.
+ */
+function toolCallTitle(name, argumentsValue) {
+  const obj = argumentsValue !== null && typeof argumentsValue === 'object' && !Array.isArray(argumentsValue)
+    ? argumentsValue
+    : {}
+  const str = (key) => (typeof obj[key] === 'string' ? obj[key].trim() : undefined)
+  const num = (key) => {
+    const value = obj[key]
+    if (typeof value === 'number' && Number.isFinite(value)) return value
+    if (typeof value === 'string' && value.trim() !== '' && Number.isFinite(Number(value))) {
+      return Number(value)
+    }
+    return undefined
+  }
+  const stringField = (value, key) => (
+    typeof value === 'object' && value !== null && typeof value[key] === 'string' ? value[key].trim() : undefined
+  )
+
+  // Execute-kind tools (plain-text label): show the command itself.
+  if (name === 'zed_terminal' || /bash|shell|exec|run_code|execute|terminal/.test(name)) {
+    // Only zed_terminal maps to kind 'execute' (Zed renders its label as plain
+    // text); local executors like bash/run_code are kind 'other' and render as
+    // markdown, so their command must be escaped to stay literal.
+    const literal = (text) => (name === 'zed_terminal' ? text : mdEscape(text))
+    const command = str('command') ?? str('cmd') ?? str('script')
+    if (command) return clipOneLine(literal(command), 100)
+    const argv = obj.args
+    if (Array.isArray(argv) && argv.length > 0) return clipOneLine(literal(argv.map(String).join(' ')), 100)
+    const cwd = str('cwd')
+    if (cwd) return clipOneLine(literal(`Run in ${cwd}`), 100)
+  }
+
+  // File-content tools: `Read <path>` (incl. line range when present).
+  if (/read|cat|show|view/.test(name)) {
+    const path = str('path') ?? str('file_path') ?? str('filePath') ?? str('file')
+    if (path) {
+      const range = [num('line') ?? num('offset'), num('limit')].filter((value) => value !== undefined)
+      const suffix = range.length === 2 && Number.isFinite(range[0]) && Number.isFinite(range[1]) && range[1] > 0
+        ? ` (lines ${range[0]}-${range[0] + range[1] - 1})`
+        : range.length === 1 && Number.isFinite(range[0]) && range[0] > 1
+          ? ` (from line ${range[0]})`
+          : ''
+      return clipOneLine(`Read ${mdEscape(path)}${suffix}`, 120)
+    }
+  }
+
+  // File-modifying tools: `Write <path>` / `Edit <path>`.
+  if (/write|edit|patch|apply/.test(name)) {
+    const path = str('path') ?? str('file_path') ?? str('filePath') ?? str('file') ?? str('target')
+    if (path) return clipOneLine(`Write ${mdEscape(path)}`, 120)
+  }
+
+  // Content search: `Search: <pattern>`.
+  if (/grep|rg|content_search|search_text/.test(name)) {
+    const pattern = str('pattern') ?? str('regex') ?? str('query')
+    if (pattern) return clipOneLine(`Search: ${mdEscape(pattern)}`, 120)
+  }
+
+  // Path search: `Find: <pattern>`.
+  if (/glob|find/.test(name)) {
+    const pattern = str('pattern') ?? str('query') ?? str('path')
+    if (pattern) return clipOneLine(`Find: ${mdEscape(pattern)}`, 120)
+  }
+
+  // Network fetch: `Fetch: <url>`.
+  if (/fetch|http/.test(name)) {
+    const url = str('url') ?? str('uri') ?? str('endpoint')
+    if (url) return clipOneLine(`Fetch: ${mdEscape(url)}`, 120)
+  }
+
+  // Generic web/data search: `Search: <query>`.
+  if (/search/.test(name)) {
+    const query = str('query') ?? str('q') ?? str('keyword') ?? str('keywords')
+    if (query) return clipOneLine(`Search: ${mdEscape(query)}`, 120)
+  }
+
+  // User questions: `Ask: <first question>`.
+  if (/ask|question|elicit/.test(name) && Array.isArray(obj.questions)) {
+    const first = obj.questions[0]
+    const text = typeof first === 'object' && first !== null
+      ? stringField(first, 'question') ?? stringField(first, 'header') ?? ''
+      : String(first ?? '')
+    if (text.trim().length > 0) return clipOneLine(`Ask: ${mdEscape(text)}`, 120)
+  }
+
+  // Subagents / delegated work: show the objective.
+  if (/spawn_agent|subagent|spawn|delegate|task /.test(name)) {
+    const description = str('description') ?? str('objective') ?? str('prompt')
+    if (description) return clipOneLine(mdEscape(description), 100)
+  }
+
+  // MCP tools: inline a single string-valued field (mirrors Zed's own MCP
+  // primary-argument heuristic); otherwise fall back to the tool name.
+  if (name.startsWith('mcp__')) {
+    const strings = Object.entries(obj)
+      .filter(([key, value]) => typeof value === 'string' && value.trim().length > 0)
+    if (strings.length === 1) {
+      return clipOneLine(mdEscape(strings[0][1].trim()), 120)
+    }
+    if (strings.length > 1) {
+      const [key, value] = strings[0]
+      return clipOneLine(`${key}=${mdEscape(value)}`, 120)
+    }
+  }
+
+  return name
+}
+
 /** Extract a bounded text preview of a dsh tool result for ACP rawOutput. */
 function resultPreview(event) {
   if (event.data.error !== undefined) {
@@ -237,14 +369,18 @@ export function apply(ctx, config) {
         case 'tool/call': {
           record.toolStats.lastCallAt = Date.now()
           record.toolStats.lastName = event.data.name
+          const parsedArgs = parseToolArguments(event.data.arguments)
           notify({
             sessionId: session.header.id,
             update: {
               sessionUpdate: 'tool_call',
               toolCallId: event.data.callId,
-              title: event.data.name,
+              // A one-line summary (not just the tool name) so Zed's collapsed
+              // header shows what the call is doing — which file is read, which
+              // command runs, what is searched — before expanding the card.
+              title: toolCallTitle(event.data.name, parsedArgs),
               kind: toolKindFor(event.data.name),
-              rawInput: parseToolArguments(event.data.arguments),
+              rawInput: parsedArgs,
               _meta: {
                 turn: event.data.turn,
                 step: event.data.step,
@@ -1260,13 +1396,14 @@ export function apply(ctx, config) {
             }
             break
           }
-          case 'tool/call':
+          case 'tool/call': {
+            const parsedArgs = parseToolArguments(event.data.arguments)
             await notifyNow(record, {
               sessionUpdate: 'tool_call',
               toolCallId: event.data.callId,
-              title: event.data.name,
+              title: toolCallTitle(event.data.name, parsedArgs),
               kind: toolKindFor(event.data.name),
-              rawInput: parseToolArguments(event.data.arguments),
+              rawInput: parsedArgs,
               _meta: {
                 turn: event.data.turn,
                 step: event.data.step,
@@ -1275,6 +1412,7 @@ export function apply(ctx, config) {
               },
             })
             break
+          }
           case 'tool/result': {
             const preview = resultPreview(event)
             const callId = event.data.message?.content?.[0]?.toolCallId ?? event.data.callId

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-acp-enhanced",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Enhanced ACP server for DeepSeek Harness: block-level streaming, usage/stat telemetry (cache hit rate, token speed, input/output tokens, context length, turns, tool timing), model & reasoning-effort switching, and permission-preset control over the ACP wire (Zed-friendly)",
   "keywords": [
     "dsh",