dsh-plugin-core 0.29.1 → 0.30.0

package/dist/session/mirror/GenericCommandCard.d.ts

@@ -6,8 +6,57 @@ export declare const classifyTool: (name: string) => Variant;
 export declare const toolTitleKey: (name: string) => UtilMessageKey;
 /** 官方 deriveSummary（tool client.js:221-233）。 */
 export declare function deriveSummary(variant: Variant, argsRaw: string): string;
+/** 官方 readCallLine（tool client.js:432-436）：read 的 offset（1 起）就是落点行，参数非法则无行。 */
+export declare function readCallLine(name: string, argsRaw: string): number | undefined;
 /** 官方 formatToolBody（tool client.js:255-264）：通用展开体的输入正文。 */
 export declare function formatToolBody(variant: Variant, argsRaw: string): string | null;
+/** 搜索结果卡两面（官方 searchCardModel 的返回；recovery = 截断时的完整结果正文）。 */
+interface SearchFace {
+    card: {
+        kind: 'matches';
+        files: SearchFile[];
+        total: number;
+        truncated: boolean;
+    } | {
+        kind: 'paths';
+        paths: string[];
+        total: number;
+        truncated: boolean;
+    };
+    recovery?: string;
+}
+interface SearchFile {
+    path: string;
+    matches: {
+        lineNumber: number;
+        line: string;
+    }[];
+}
+/**
+ * 官方 searchCardModel（tool client.js:632-667）：结算成功 + meta.{truncated,total} 齐全才出卡，
+ * 否则落回 ioCard 兜底（与官方 generic 路径一致）。
+ */
+export declare function searchCardModel(name: string, argsRaw: string, output: string, meta: unknown, isError: boolean, settled: boolean): SearchFace | null;
+/** 网页卡两面（官方 webCardModel 直接返回的可展开体形状）。 */
+type WebFace = {
+    kind: 'search';
+    answer?: string;
+    sources: WebSource[];
+    truncated: boolean;
+} | {
+    kind: 'fetch';
+    url: string;
+    statusCode: number;
+    truncated: boolean;
+};
+interface WebSource {
+    url: string;
+    title?: string;
+    snippet?: string;
+    publishedAt?: string;
+}
+/** 官方 webCardModel（tool client.js:1070-1094）。 */
+export declare function webCardModel(name: string, argsRaw: string, meta: unknown, isError: boolean, settled: boolean): WebFace | null;
 /** 终端卡规格（官方 localizeTerminalCardModel 的 card 面；send 的命令/描述在组件侧词典化）。 */
 export interface TerminalFace {
     command: string;
@@ -75,8 +124,13 @@ export declare function GenericCommandCard(props: {
     phase?: 'preparing' | 'start';
     /** root.error.code === 'interrupted' ⇒ 官方 stopped 态。 */
     interrupted?: boolean;
-    /** 统一 openFile 入口：read/write/edit 摘要路径渲染成官方 fileLink。 */
-    onOpenFile?: (path: string) => void;
+    /** root.error.code（ASK_CANCELLED / ASK_ABORTED / …）。 */
+    errorCode?: string;
+    /** 统一 openFile 入口：read/write/edit 摘要路径渲染成官方 fileLink（read 带 offset 落点行）。 */
+    onOpenFile?: (path: string, options?: {
+        line?: number;
+    }) => void;
     t: Translate;
 }): ReturnType<typeof h>;
+export {};
 //# sourceMappingURL=GenericCommandCard.d.ts.map

package/dist/session/mirror/GenericCommandCard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GenericCommandCard.d.ts","sourceRoot":"","sources":["../../../src/session/mirror/GenericCommandCard.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GenericCommandCard.d.ts","sourceRoot":"","sources":["../../../src/session/mirror/GenericCommandCard.ts"],"names":[],"mappings":"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"}

package/dist/session/mirror/GenericCommandCard.js

@@ -3,15 +3,21 @@
 // 本文件名沿用历史，实际镜像 GenericToolCard + ToolRow 一套）。
 // 展开体分发链照官方 ToolRow（lib/client.js:1598-1688）：
 //   TerminalBlock（bash/pwsh/terminal_send，maxLines:∞）→ DiffBlock（write/edit，maxLines:9）
-//   → ReadBlock（read，maxLines:8 = 头 4 + 尾 4，中间「… 其余 N 行」）→ 兜底 ioCard 灰框（输入/分隔/输出）。
+//   → ReadBlock（read，maxLines:8 = 头 4 + 尾 4，中间「… 其余 N 行」）
+//   → SearchBlock（grep/glob，maxLines:8 + 截断 recovery 正文）→ WebBlock（web_search/web_fetch）
+//   → ToolDetails（goal/schedule 两族）→ 兜底 ioCard 灰框（输入/分隔/输出）。
+//   ask_user_question 走 AskQuestionCard，插在整条链之前。
 // 数据模型照官方 models/*（行号为 lib/client.js）：toolRowModel 273、diffCardModel 534、
 //   readCardModel 421、terminalCardModel 929、parseExitStatus 903、hasSpillNotice 692；
 // 摘要与五态同构：state = preparing|running|ok|error|stopped（成功结算但退出码非 0 ⇒ error，1767）；
 //   summary = [generic? 工具名, deriveSummary]，终端卡优先 description；error 态摘要 = 输出首行。
 import { Fragment, createElement as h, useMemo, useState } from 'react';
-import { DiffBlock, DisclosureRow, IconApiOutlineRegular, IconBrowseOutlineRegular, IconCodeOutlineRegular, IconEditOutlineRegular, IconSearchOutlineRegular, IconSparkleRegular, ReadBlock, TerminalBlock, TextShimmer, diffTotals, } from '../../ui/official.js';
+import { DiffBlock, DisclosureRow, IconApiOutlineRegular, IconBrowseOutlineRegular, IconCodeOutlineRegular, IconEditOutlineRegular, IconSearchOutlineRegular, IconSparkleRegular, ReadBlock, SearchBlock, TerminalBlock, TextShimmer, WebBlock, diffTotals, } from '../../ui/official.js';
 import { officialClass } from '../official-classes.js';
 import { CodeViewer } from '../../ui/CodeViewer.js';
+import { markdownLabels } from '../../explorer/preview/md-labels.js';
+import { AskQuestionCardView, askCardModel } from './AskCard.js';
+import { ToolDetailsView, detailsCardModel, detailsSummary } from './ToolDetails.js';
 /** 官方 TOOL_VARIANTS（tool client.js:83-100，cordis_* 一并保留）。 */
 const TOOL_VARIANTS = {
     bash: 'bash',
@@ -43,12 +49,56 @@ const VARIANT_TITLE_KEYS = {
     others: 'toolTitleGeneric',
 };
 const TOOL_TITLE_KEYS = {
-    pwsh: 'toolTitleBash',
+    pwsh: 'toolTitlePwsh',
     read_image: 'toolTitleReadImage',
     grep: 'toolTitleGrep',
     glob: 'toolTitleGlob',
     web_search: 'toolTitleWebSearch',
     web_fetch: 'toolTitleWebFetch',
+    todo_write: 'toolTitleTodo',
+    ask_user_question: 'toolTitleAsk',
+    cordis_package_inspect: 'toolTitleInspect',
+    cordis_runtime_inspect: 'toolTitleInspect',
+    cordis_run: 'toolTitleRunCordis',
+    cordis_stop: 'toolTitleStopCordis',
+    cordis_undefine: 'toolTitleRemoveCordis',
+    cordis_inspect_list: 'toolTitleInspectProviders',
+    cordis_inspect_query: 'toolTitleQueryRuntime',
+    cordis_inspect_self: 'toolTitleInspectPlugins',
+    create_goal: 'toolTitleCreateGoal',
+    get_goal: 'toolTitleGetGoal',
+    update_goal: 'toolTitleUpdateGoal',
+    schedule_create: 'toolTitleCreateSchedule',
+    schedule_list: 'toolTitleListSchedules',
+    schedule_delete: 'toolTitleDeleteSchedule',
+    schedule_update: 'toolTitleUpdateSchedule',
+    workflow: 'toolTitleWorkflow',
+    ralph: 'toolTitleRalph',
+    session_event_read: 'toolTitleReadEvent',
+    session_event_search: 'toolTitleSearchEvents',
+    session_event_trace: 'toolTitleTraceEvent',
+    session_search: 'toolTitleSearchSessions',
+    session_trace: 'toolTitleTraceSession',
+    list_subagent_models: 'toolTitleListModels',
+    subagent: 'toolTitleSubagent',
+    list_agents: 'toolTitleListAgents',
+    send_message: 'toolTitleSendMessage',
+    interrupt_agent: 'toolTitleInterruptAgent',
+    job_list: 'toolTitleListJobs',
+    job_output: 'toolTitleReadJob',
+    job_kill: 'toolTitleKillJob',
+    terminal_open: 'toolTitleOpenTerminal',
+    terminal_read: 'toolTitleReadTerminal',
+    terminal_list: 'toolTitleListTerminals',
+    terminal_signal: 'toolTitleSignalTerminal',
+    terminal_close: 'toolTitleCloseTerminal',
+    lsp: 'toolTitleLsp',
+    spawn_teammate: 'toolTitleSpawnTeammate',
+    team_task_create: 'toolTitleCreateTeamTask',
+    team_task_get: 'toolTitleGetTeamTask',
+    team_task_update: 'toolTitleUpdateTeamTask',
+    team_task_list: 'toolTitleListTeamTasks',
+    wait_agent: 'toolTitleWaitAgent',
 };
 export const toolTitleKey = (name) => TOOL_TITLE_KEYS[name] ?? VARIANT_TITLE_KEYS[classifyTool(name)];
 /** 官方 VARIANT_ICONS（tool client.js:1749-1757，size 14）。 */
@@ -123,6 +173,22 @@ function deriveFilePath(variant, argsRaw) {
     const picked = pickString(parsed, ['path', 'file_path']);
     return picked === undefined ? undefined : firstLine(picked);
 }
+/** 官方 readCallLine（tool client.js:432-436）：read 的 offset（1 起）就是落点行，参数非法则无行。 */
+export function readCallLine(name, argsRaw) {
+    if (name !== 'read')
+        return undefined;
+    const parsed = parseArgs(argsRaw);
+    if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed))
+        return undefined;
+    const { file_path, offset, limit } = parsed;
+    if (typeof file_path !== 'string' || file_path.trim() === '')
+        return undefined;
+    if (offset !== undefined && !positiveInteger(offset))
+        return undefined;
+    if (limit !== undefined && !positiveInteger(limit))
+        return undefined;
+    return positiveInteger(offset) ? offset : undefined;
+}
 /** 官方 formatToolBody（tool client.js:255-264）：通用展开体的输入正文。 */
 export function formatToolBody(variant, argsRaw) {
     if (argsRaw === '')
@@ -284,6 +350,164 @@ function readCardModel(name, argsRaw, output, meta, isError, settled) {
         return null;
     return face;
 }
+/** 官方 validInclude（tool client.js:590-597）：逗号分隔的多 pattern include 不收。 */
+function validInclude(include) {
+    if (include.trim() === '' || include.startsWith('!'))
+        return false;
+    let braceDepth = 0;
+    for (const character of include) {
+        if (character === '{')
+            braceDepth += 1;
+        else if (character === '}')
+            braceDepth = Math.max(0, braceDepth - 1);
+        else if (character === ',' && braceDepth === 0)
+            return false;
+    }
+    return true;
+}
+/** 官方 validSearchCall（tool client.js:575-589）。 */
+function validSearchCall(name, argsRaw) {
+    if (name !== 'grep' && name !== 'glob')
+        return null;
+    const parsed = parseArgs(argsRaw);
+    if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed))
+        return null;
+    const { pattern, path, include } = parsed;
+    if (typeof pattern !== 'string')
+        return null;
+    if (name === 'grep' && pattern === '')
+        return null;
+    if (name === 'glob' && pattern.trim() === '')
+        return null;
+    if (path !== undefined && (typeof path !== 'string' || path.trim() === ''))
+        return null;
+    if (name === 'grep' && include !== undefined && (typeof include !== 'string' || !validInclude(include)))
+        return null;
+    return name;
+}
+/** 官方 searchFiles（tool client.js:598-622）：meta.files 收窄。 */
+function searchFiles(value) {
+    if (!Array.isArray(value))
+        return null;
+    const files = [];
+    for (const file of value) {
+        if (typeof file !== 'object' || file === null || Array.isArray(file))
+            return null;
+        const { path, matches } = file;
+        if (typeof path !== 'string' || !Array.isArray(matches))
+            return null;
+        const narrowed = [];
+        for (const match of matches) {
+            if (typeof match !== 'object' || match === null || Array.isArray(match))
+                return null;
+            const { lineNumber, line } = match;
+            if (typeof lineNumber !== 'number' || !Number.isInteger(lineNumber) || lineNumber < 1)
+                return null;
+            if (typeof line !== 'string')
+                return null;
+            narrowed.push({ lineNumber, line });
+        }
+        files.push({ path, matches: narrowed });
+    }
+    return files;
+}
+/**
+ * 官方 searchCardModel（tool client.js:632-667）：结算成功 + meta.{truncated,total} 齐全才出卡，
+ * 否则落回 ioCard 兜底（与官方 generic 路径一致）。
+ */
+export function searchCardModel(name, argsRaw, output, meta, isError, settled) {
+    if (!settled || isError)
+        return null;
+    const tool = validSearchCall(name, argsRaw);
+    if (tool === null)
+        return null;
+    if (typeof meta !== 'object' || meta === null || Array.isArray(meta))
+        return null;
+    const m = meta;
+    if (typeof m.truncated !== 'boolean')
+        return null;
+    if (typeof m.total !== 'number' || !Number.isInteger(m.total) || m.total < 0)
+        return null;
+    const common = { total: m.total, truncated: m.truncated };
+    // 官方 recovery = flattenContent(block.content)：截断时把完整正文摊在卡下方。
+    const recovery = m.truncated && output !== '' ? output : undefined;
+    if (tool === 'grep') {
+        if (m.shape !== 'matches')
+            return null;
+        const files = searchFiles(m.files);
+        return files === null ? null : { card: { kind: 'matches', files, ...common }, ...(recovery === undefined ? {} : { recovery }) };
+    }
+    if (m.shape !== 'paths' || !Array.isArray(m.paths))
+        return null;
+    if (!m.paths.every(path => typeof path === 'string'))
+        return null;
+    return { card: { kind: 'paths', paths: [...m.paths], ...common }, ...(recovery === undefined ? {} : { recovery }) };
+}
+/** 官方 validWebCall（tool client.js:1024-1045）。 */
+function validWebCall(name, argsRaw) {
+    if (name !== 'web_search' && name !== 'web_fetch')
+        return null;
+    const parsed = parseArgs(argsRaw);
+    if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed))
+        return null;
+    const args = parsed;
+    if (name === 'web_search') {
+        const { queries } = args;
+        if (!Array.isArray(queries) || queries.length === 0)
+            return null;
+        return queries.every(query => typeof query === 'string' && query.trim() !== '') ? name : null;
+    }
+    const { url } = args;
+    return typeof url === 'string' && url.trim() !== '' ? name : null;
+}
+/** 官方 webSources（tool client.js:1046-1064）：meta.sources 收窄（可选字段缺省即不带）。 */
+function webSources(value) {
+    if (!Array.isArray(value))
+        return null;
+    const sources = [];
+    for (const source of value) {
+        if (typeof source !== 'object' || source === null || Array.isArray(source))
+            return null;
+        const { url, title, snippet, publishedAt } = source;
+        if (typeof url !== 'string')
+            return null;
+        if (title !== undefined && typeof title !== 'string')
+            return null;
+        if (snippet !== undefined && typeof snippet !== 'string')
+            return null;
+        if (publishedAt !== undefined && typeof publishedAt !== 'string')
+            return null;
+        sources.push({
+            url,
+            ...(title === undefined ? {} : { title }),
+            ...(snippet === undefined ? {} : { snippet }),
+            ...(publishedAt === undefined ? {} : { publishedAt }),
+        });
+    }
+    return sources;
+}
+/** 官方 webCardModel（tool client.js:1070-1094）。 */
+export function webCardModel(name, argsRaw, meta, isError, settled) {
+    if (!settled || isError)
+        return null;
+    const tool = validWebCall(name, argsRaw);
+    if (tool === null || typeof meta !== 'object' || meta === null || Array.isArray(meta))
+        return null;
+    const m = meta;
+    if (typeof m.truncated !== 'boolean')
+        return null;
+    if (tool === 'web_search') {
+        const sources = webSources(m.sources);
+        if (sources === null || (m.answer !== undefined && typeof m.answer !== 'string'))
+            return null;
+        return { kind: 'search', ...(typeof m.answer === 'string' ? { answer: m.answer } : {}), sources, truncated: m.truncated };
+    }
+    if (typeof m.url !== 'string')
+        return null;
+    if (typeof m.statusCode !== 'number' || !Number.isInteger(m.statusCode))
+        return null;
+    return { kind: 'fetch', url: m.url, statusCode: m.statusCode, truncated: m.truncated };
+}
 /** 官方 shellCall（tool client.js:831-855）：无 description = persistent（结算走 generic）。 */
 export function shellCall(name, args) {
     if (name !== 'bash' && name !== 'pwsh')
@@ -403,6 +627,31 @@ function contentKilobytes(argsRaw) {
     }
     return any ? Math.ceil(chars / 1024) : null;
 }
+/** 官方 todo 行摘要（tool client.js:4480-4503）：done/total + 首个 in_progress 内容，
+ *  多条并行 in_progress ⇒ 额外条数走 summarySuffix「+N」。 */
+function todoSummary(argsRaw, t) {
+    if (argsRaw === '')
+        return null;
+    let parsed;
+    try {
+        parsed = JSON.parse(argsRaw);
+    }
+    catch {
+        return null;
+    }
+    if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed))
+        return null;
+    const todos = parsed.todos;
+    if (!Array.isArray(todos) || !todos.every(item => typeof item === 'object' && item !== null))
+        return null;
+    const list = todos;
+    const done = list.filter(item => item.status === 'completed').length;
+    const active = list.filter(item => item.status === 'in_progress');
+    const first = active[0]?.content;
+    const named = typeof first === 'string' && first.trim() !== '';
+    const head = t('todoCompleted', { done, total: list.length });
+    return { text: named ? `${head} · ${first}` : head, extra: named ? active.length - 1 : 0 };
+}
 /** 词典：代码工具栏（官方 codeToolbarLabels，tool client.js:1098-1104）。 */
 const codeToolbarLabels = (t) => ({
     codeLabel: t('codeBlockLabel'),
@@ -430,6 +679,30 @@ const readLabels = (t) => ({
     collapse: t('collapseLabel'),
     expand: (count) => t('readExpandRest', { count }),
 });
+/** 官方 searchBlockLabels（tool client.js:1222-1240）。 */
+const searchLabels = (t) => ({
+    pathsSummary: (shown, total, truncated) => truncated
+        ? t('searchPathsTruncated', { shown, total })
+        : t('searchPaths', { shown }),
+    matchesSummary: (shown, total, files, truncated) => truncated
+        ? t('searchMatchesTruncated', { shown, total, files })
+        : t('searchMatches', { shown, files }),
+    copy: t('copyLabel'),
+    copied: t('copiedLabel'),
+    noResults: t('searchNoResults'),
+    collapseAria: t('searchCollapseAria'),
+    expandAria: (count) => t('searchExpandAria', { count }),
+    collapse: t('collapseLabel'),
+    expand: (count) => t('searchExpandRest', { count }),
+});
+/** 官方 webBlockLabels（tool client.js:1247-1255）；markdown 复用 core 的 MarkdownText 文案。 */
+const webLabels = (t) => ({
+    noResults: t('webNoResults'),
+    sourcesTruncated: t('webSourcesTruncated'),
+    http: t('webHttp'),
+    contentTruncated: t('webContentTruncated'),
+    markdown: markdownLabels(),
+});
 /** 官方 terminalBlockLabels（tool client.js:708-737 的键面）。 */
 export const terminalLabels = (t) => ({
     // 官方 terminalBlockLabels（ui-tool terminal-card-model.ts）：commandLine 是**函数**，
@@ -465,7 +738,7 @@ export function ExitCodeBadge({ label }) {
  * 折叠行 = 图标 + 标题 [+ 分隔点 + 摘要（文件路径链接化）+ 后缀]；展开体按官方分发链。
  */
 export function GenericCommandCard(props) {
-    const { name, argsRaw, output, isError, meta, settled = true, phase, interrupted, onOpenFile, t } = props;
+    const { name, argsRaw, output, isError, meta, settled = true, phase, interrupted, errorCode, onOpenFile, t } = props;
     const [expanded, setExpanded] = useState(false);
     const variant = classifyTool(name);
     const titleKey = toolTitleKey(name);
@@ -475,6 +748,10 @@ export function GenericCommandCard(props) {
     const terminalFace = useMemo(() => terminalCardModel(name, argsRaw, output, isError, settled), [name, argsRaw, output, isError, settled]);
     const read = useMemo(() => readCardModel(name, argsRaw, output, meta, isError, settled), [name, argsRaw, output, meta, isError, settled]);
     const diffs = useMemo(() => diffCardModel(name, argsRaw, meta, isError, settled), [name, argsRaw, meta, isError, settled]);
+    const search = useMemo(() => searchCardModel(name, argsRaw, output, meta, isError, settled), [name, argsRaw, output, meta, isError, settled]);
+    const web = useMemo(() => webCardModel(name, argsRaw, meta, isError, settled), [name, argsRaw, meta, isError, settled]);
+    const ask = useMemo(() => askCardModel(name, argsRaw, output, errorCode, settled, t), [name, argsRaw, output, errorCode, settled, t]);
+    const details = useMemo(() => detailsCardModel(name, argsRaw, output, settled, isError, t), [name, argsRaw, output, settled, isError, t]);
     // 终端卡展开体（官方 localizeTerminalCardModel：send 命令空 = （发送输入），描述 = 终端 {sessionId}）。
     const terminal = useMemo(() => {
         if (terminalFace === null)
@@ -486,13 +763,17 @@ export function GenericCommandCard(props) {
     // 官方 terminalFailed（tool client.js:763-766）：成功结算但退出码非 0 / 有信号 ⇒ 整行 error。
     const failedTerminal = terminal !== null && terminal.running !== true
         && ((terminal.exitCode !== undefined && terminal.exitCode !== 0) || terminal.signal !== undefined);
-    const rowState = state === 'ok' && failedTerminal ? 'error' : state;
+    // 官方 AskQuestionRow 强制态（2298-2316）：取消 ⇒ ok、中断 ⇒ stopped，优先于 error。
+    const rowState = ask?.state ?? (state === 'ok' && failedTerminal ? 'error' : state);
     const running = rowState === 'running' || rowState === 'preparing';
     // 摘要（官方 toolRowModel 273-295 + ToolRow 1527-1528）：generic 标题补工具名；
     // 终端卡优先 description；error 态摘要 = 输出首行。
     const generic = titleKey === 'toolTitleGeneric';
     const base = argsRaw === '' ? '' : deriveSummary(variant, argsRaw);
     const plainSummary = [generic ? name : '', base].filter(Boolean).join(' · ');
+    const todoInfo = name === 'todo_write' ? todoSummary(argsRaw, t) : null;
+    const detailsText = details === null ? undefined : detailsSummary(details);
+    const normalSummary = ask !== null ? ask.summary : detailsText ?? (todoInfo !== null ? todoInfo.text : terminal?.description ?? plainSummary);
     const errorSummary = rowState === 'error' && output !== '' ? firstLine(output) : null;
     // 官方 terminalExitLabel（tool client.js:801-809）：已失败前台命令才出退出码徽章。
     const exitLabel = failedTerminal
@@ -502,17 +783,28 @@ export function GenericCommandCard(props) {
                 ? t('terminalNoExitCode')
                 : t('terminalExitCode', { code: terminal.exitCode })
         : null;
-    const summaryText = (rowState === 'error' && exitLabel === null ? errorSummary ?? (terminal?.description ?? plainSummary) : null) ?? terminal?.description ?? plainSummary;
+    const summaryText = (rowState === 'error' && exitLabel === null ? errorSummary ?? normalSummary : null) ?? normalSummary;
     // 官方 ToolRow 两个独立后缀槽（1600-1602）：summarySuffix（edit/write 内容 KB）与 diffStat（+N -M）。
     const totals = diffs === null ? null : diffTotals(diffs);
     const settledWithCue = rowState === 'error' || rowState === 'stopped';
     const kilobytes = variant === 'edit' || variant === 'write' ? contentKilobytes(argsRaw) : null;
-    const summarySuffix = settledWithCue || kilobytes === null || summaryText === '' ? null : t('toolPreparingContent', { kilobytes });
+    const summarySuffix = settledWithCue
+        ? null
+        : todoInfo !== null
+            ? (todoInfo.extra > 0 ? `+${todoInfo.extra}` : null)
+            : (kilobytes === null || summaryText === '' ? null : t('toolPreparingContent', { kilobytes }));
     const diffStatTotals = settledWithCue ? null : totals;
     // 官方 fileLink（1536-1545）：read/write/edit 摘要路径 + onOpenFile + 非 error/stopped ⇒ 链接钮。
     const filePath = argsRaw === '' ? undefined : deriveFilePath(variant, argsRaw);
+    // 官方 readCallLine（tool client.js:432-436）：read 的 offset 就是落点行，链接可带过去。
+    const filePathLine = filePath === undefined ? undefined : readCallLine(name, argsRaw);
     const openFile = filePath !== undefined && onOpenFile !== undefined && !settledWithCue
-        ? () => { onOpenFile(filePath); }
+        ? () => {
+            if (filePathLine === undefined)
+                onOpenFile(filePath);
+            else
+                onOpenFile(filePath, { line: filePathLine });
+        }
         : undefined;
     // 官方 linkHref（tool client.js:1100-1110）：web_fetch 且 args.url 为 http(s) ⇒ 摘要外链。
     const linkHref = (() => {
@@ -533,14 +825,21 @@ export function GenericCommandCard(props) {
         }
     })();
     // 展开体（官方 1514-1550）：input/output/card 三源；bodyText 仅展开且无专属卡时格式化。
-    const inputRaw = argsRaw === '' ? null : argsRaw;
+    // 官方 singleFile（1876/1885）：摘要已是文件路径链接的工具（read）不再摊原始输入 JSON。
+    const inputRaw = argsRaw === '' || filePath !== undefined ? null : argsRaw;
     const outputText = output === '' ? null : output;
-    const card = terminal !== null ? 'terminal' : diffs !== null ? 'diff' : read !== null ? 'read' : null;
+    const card = terminal !== null ? 'terminal' : diffs !== null ? 'diff' : read !== null ? 'read' : search !== null ? 'search' : web !== null ? 'web' : details !== null ? 'details' : null;
     const bodyText = expanded && card === null && inputRaw !== null ? formatToolBody(variant, inputRaw) : null;
     const cardBody = variant === 'code' ? null : bodyText;
     const expandable = rowState !== 'preparing' && (inputRaw !== null || outputText !== null || card !== null);
     const open = expanded && expandable;
-    const blockLabels = useMemo(() => ({ diff: diffLabels(t), read: readLabels(t), terminal: terminalLabels(t) }), [t]);
+    const blockLabels = useMemo(() => ({
+        diff: diffLabels(t),
+        read: readLabels(t),
+        search: searchLabels(t),
+        web: webLabels(t),
+        terminal: terminalLabels(t),
+    }), [t]);
     const statusText = rowState === 'preparing' ? t('rowPreparing')
         : rowState === 'running' ? t('rowRunning')
             : rowState === 'error' ? t('rowFailed')
@@ -573,41 +872,56 @@ export function GenericCommandCard(props) {
             active: running,
         }, h('span', { className: officialClass('ToolRow', 'diffAdded') ?? '' }, `+${diffStatTotals.added}`), ' ', h('span', { className: officialClass('ToolRow', 'diffRemoved') ?? '' }, `-${diffStatTotals.removed}`))
         : null);
-    const expandedContent = open ? h('div', { className: officialClass('ToolRow', 'bodyWrap') ?? '' }, terminal !== null
-        ? h(TerminalBlock, {
-            command: terminal.command,
-            cwd: terminal.cwd,
-            output: terminal.output,
-            exitCode: terminal.exitCode,
-            signal: terminal.signal,
-            running: terminal.running,
-            maxLines: Infinity,
-            labels: blockLabels.terminal,
-            className: officialClass('ToolRow', 'terminalBody') ?? '',
-        })
-        : diffs !== null
-            ? h(DiffBlock, { diffs, labels: blockLabels.diff, maxLines: 9, className: officialClass('ToolRow', 'diffBody') ?? '' })
-            : read !== null
-                ? h(ReadBlock, {
-                    label: read.label,
-                    lines: read.lines,
-                    totalLines: read.totalLines,
-                    lang: read.lang,
-                    labels: blockLabels.read,
-                    maxLines: 8,
-                    className: officialClass('ToolRow', 'readBody') ?? '',
-                })
-                : h(Fragment, null, variant === 'code' && bodyText !== null
-                    ? h('div', { className: officialClass('ToolRow', 'bodyScroll') ?? '' }, h(CodeViewer, {
-                        text: bodyText,
-                        path: 'tool-code.ts',
-                        t,
-                        className: officialClass('ToolRow', 'codeBody') ?? '',
-                        height: 'auto',
-                        style: { height: 'auto' },
-                    }))
-                    : null, (cardBody !== null || outputText !== null) && h('div', { className: officialClass('ToolRow', 'ioCard') ?? '' }, cardBody !== null && h('div', { className: officialClass('ToolRow', 'ioSection') ?? '' }, h('span', { className: officialClass('ToolRow', 'ioLabel') ?? '' }, t('toolInputLabel')), h('span', { className: officialClass('ToolRow', 'ioText') ?? '' }, cardBody)), cardBody !== null && outputText !== null
-                    && h('span', { className: officialClass('ToolRow', 'ioDivider') ?? '', 'aria-hidden': true }), outputText !== null && h('div', { className: officialClass('ToolRow', 'ioSection') ?? '' }, h('span', { className: officialClass('ToolRow', 'ioLabel') ?? '' }, t('toolOutputLabel')), h('span', { className: officialClass('ToolRow', 'ioText') ?? '', 'data-error': rowState === 'error' || undefined }, outputText))))) : undefined;
+    const expandedContent = open ? h('div', { className: officialClass('ToolRow', 'bodyWrap') ?? '' }, ask?.card !== undefined
+        ? h(AskQuestionCardView, { card: ask.card })
+        : terminal !== null
+            ? h(TerminalBlock, {
+                command: terminal.command,
+                cwd: terminal.cwd,
+                output: terminal.output,
+                exitCode: terminal.exitCode,
+                signal: terminal.signal,
+                running: terminal.running,
+                maxLines: Infinity,
+                labels: blockLabels.terminal,
+                className: officialClass('ToolRow', 'terminalBody') ?? '',
+            })
+            : diffs !== null
+                ? h(DiffBlock, { diffs, labels: blockLabels.diff, maxLines: 9, className: officialClass('ToolRow', 'diffBody') ?? '' })
+                : read !== null
+                    ? h(ReadBlock, {
+                        label: read.label,
+                        lines: read.lines,
+                        totalLines: read.totalLines,
+                        lang: read.lang,
+                        labels: blockLabels.read,
+                        maxLines: 8,
+                        className: officialClass('ToolRow', 'readBody') ?? '',
+                    })
+                    : search !== null
+                        ? h(Fragment, null, h(SearchBlock, {
+                            ...search.card,
+                            labels: blockLabels.search,
+                            maxLines: 8,
+                            className: officialClass('ToolRow', 'searchBody') ?? '',
+                        }), search.recovery !== undefined
+                            ? h('div', { className: officialClass('ToolRow', 'searchRecovery') ?? '' }, search.recovery)
+                            : null)
+                        : web !== null
+                            ? h(WebBlock, { ...web, labels: blockLabels.web, className: officialClass('ToolRow', 'webBody') ?? '' })
+                            : details !== null
+                                ? h(ToolDetailsView, { model: details, t, onOpenFile })
+                                : h(Fragment, null, variant === 'code' && bodyText !== null
+                                    ? h('div', { className: officialClass('ToolRow', 'bodyScroll') ?? '' }, h(CodeViewer, {
+                                        text: bodyText,
+                                        path: 'tool-code.ts',
+                                        t,
+                                        className: officialClass('ToolRow', 'codeBody') ?? '',
+                                        height: 'auto',
+                                        style: { height: 'auto' },
+                                    }))
+                                    : null, (cardBody !== null || outputText !== null) && h('div', { className: officialClass('ToolRow', 'ioCard') ?? '' }, cardBody !== null && h('div', { className: officialClass('ToolRow', 'ioSection') ?? '' }, h('span', { className: officialClass('ToolRow', 'ioLabel') ?? '' }, t('toolInputLabel')), h('span', { className: officialClass('ToolRow', 'ioText') ?? '' }, cardBody)), cardBody !== null && outputText !== null
+                                    && h('span', { className: officialClass('ToolRow', 'ioDivider') ?? '', 'aria-hidden': true }), outputText !== null && h('div', { className: officialClass('ToolRow', 'ioSection') ?? '' }, h('span', { className: officialClass('ToolRow', 'ioLabel') ?? '' }, t('toolOutputLabel')), h('span', { className: officialClass('ToolRow', 'ioText') ?? '', 'data-error': rowState === 'error' || undefined }, outputText))))) : undefined;
     return h('div', {
         className: officialClass('ToolRow', 'root') ?? '',
         'data-variant': variant,