@jingyi0605/codingns4dsh 0.2.1-beta.6 → 0.2.1-beta.8

package/data/build/dist/host/cli-adapters/codex-file-citations.js

@@ -0,0 +1,271 @@
+import { fromMarkdown } from 'mdast-util-from-markdown';
+const CITATION_PREFIX = ':codex-file-citation{';
+const FILE_LINK_URI_SCHEMES = new Set(['about', 'blob', 'data', 'file', 'ftp', 'http', 'https', 'mailto', 'ssh', 'tel', 'urn', 'vscode', 'ws', 'wss']);
+/** Codex 引用按正文 item 暂存，不能将半条指令提前追加到 DSH 的增量日志。 */
+export class CodexFileCitationNormalizer {
+    markdown = new MarkdownFileLinkNormalizer();
+    pending = '';
+    message;
+    *push(chunk) {
+        for (const citation of this.pushCitation(chunk))
+            yield* this.markdown.push(citation);
+    }
+    *flush() {
+        for (const citation of this.flushCitations())
+            yield* this.markdown.push(citation);
+        yield* this.markdown.flush();
+    }
+    *pushCitation(chunk) {
+        if (chunk.type !== 'text-delta') {
+            // 用量和推理可以穿插在正文 delta 之间，不代表正文 item 已经结束。
+            if (chunk.type !== 'usage' && chunk.type !== 'reasoning-delta' && chunk.type !== 'reasoning-snapshot')
+                yield* this.flushCitations();
+            yield chunk;
+            return;
+        }
+        if (this.message?.messageId !== chunk.messageId)
+            yield* this.flushCitations();
+        this.message = chunk;
+        this.pending += chunk.text;
+        let text = '';
+        while (this.pending !== '') {
+            const start = this.pending.indexOf(CITATION_PREFIX);
+            if (start < 0) {
+                // 只保留可能是下一条指令开头的后缀；普通正文立即输出。
+                let retained = Math.min(this.pending.length, CITATION_PREFIX.length - 1);
+                while (retained > 0 && !CITATION_PREFIX.startsWith(this.pending.slice(-retained)))
+                    retained -= 1;
+                text += this.pending.slice(0, this.pending.length - retained);
+                this.pending = retained === 0 ? '' : this.pending.slice(-retained);
+                break;
+            }
+            text += this.pending.slice(0, start);
+            this.pending = this.pending.slice(start);
+            const end = citationEnd(this.pending);
+            if (end < 0)
+                break;
+            const citation = this.pending.slice(0, end + 1);
+            text += citationLink(citation);
+            this.pending = this.pending.slice(end + 1);
+        }
+        if (text !== '')
+            yield { ...chunk, text };
+    }
+    /** 消息、工具、step 和终态边界原样结算未闭合指令，保留所属 messageId。 */
+    *flushCitations() {
+        const text = this.pending;
+        this.pending = '';
+        if (text !== '' && this.message !== undefined)
+            yield { ...this.message, text };
+        this.message = undefined;
+    }
+}
+/** 保留整条消息的 Markdown 上下文，只追加已确定的前缀，不能回写已发出的 delta。 */
+class MarkdownFileLinkNormalizer {
+    source = '';
+    emitted = 0;
+    message;
+    *push(chunk) {
+        if (chunk.type !== 'text-delta') {
+            if (chunk.type !== 'usage' && chunk.type !== 'reasoning-delta' && chunk.type !== 'reasoning-snapshot')
+                yield* this.flush();
+            yield chunk;
+            return;
+        }
+        if (this.message?.messageId !== chunk.messageId)
+            yield* this.flush();
+        this.message = chunk;
+        const settled = this.emitted === this.source.length;
+        this.source += chunk.text;
+        // 已确定的上下文中，普通文字不改变链接/代码语法，无需重新解析整条消息。
+        if (settled && !/[\[\]()`~\r\n]/u.test(chunk.text)) {
+            this.emitted = this.source.length;
+            yield chunk;
+            return;
+        }
+        yield* this.drain(false);
+    }
+    *flush() {
+        yield* this.drain(true);
+        this.source = '';
+        this.emitted = 0;
+        this.message = undefined;
+    }
+    *drain(final) {
+        if (this.message === undefined || this.emitted === this.source.length)
+            return;
+        const replacements = [];
+        let safeEnd = this.source.length;
+        const visit = (node) => {
+            const start = node.position?.start.offset;
+            const end = node.position?.end.offset;
+            if (start === undefined || end === undefined || end <= this.emitted)
+                return;
+            if (node.type === 'link') {
+                const labelEnd = node.children.at(-1)?.position?.end.offset ?? start + 1;
+                const separator = this.source.indexOf('](', labelEnd);
+                // 自动链接没有 ](；仅处理显式 Markdown 文件链接，保留标签、标题和括号。
+                if (this.source[start] === '[' && separator >= start && separator < end) {
+                    let targetStart = separator + 2;
+                    while (/\s/u.test(this.source[targetStart] ?? ''))
+                        targetStart += 1;
+                    const angle = this.source[targetStart] === '<';
+                    const pathStart = targetStart + (angle ? 1 : 0);
+                    let pathEnd = pathStart;
+                    let depth = 0;
+                    for (; pathEnd < end; pathEnd += 1) {
+                        const character = this.source[pathEnd];
+                        if (character === '\\') {
+                            pathEnd += 1;
+                            continue;
+                        }
+                        if (angle) {
+                            if (character === '>')
+                                break;
+                        }
+                        else {
+                            if (/\s/u.test(character) || (character === ')' && depth === 0))
+                                break;
+                            if (character === '(')
+                                depth += 1;
+                            else if (character === ')')
+                                depth -= 1;
+                        }
+                    }
+                    const target = this.source.slice(pathStart, pathEnd);
+                    const normalized = fileLineTarget(target);
+                    if (normalized !== target)
+                        replacements.push({ start: pathStart, end: pathEnd, text: normalized });
+                }
+                return;
+            }
+            if (node.type === 'code') {
+                // 未收到换行前，``` 仍可能变成普通行内文本（例如随后出现另一组反引号）。
+                if (!final && !this.source.slice(start, end).includes('\n'))
+                    safeEnd = Math.min(safeEnd, start);
+                return;
+            }
+            if (node.type === 'inlineCode' || node.type === 'html' || node.type === 'image')
+                return;
+            if (node.type === 'text' && !final) {
+                // 未闭合的标签或代码跨度可能在后续分片中包住链接，必须等语法确定后再输出。
+                for (let index = Math.max(start, this.emitted); index < end; index += 1) {
+                    const character = this.source[index];
+                    if (character === '\\') {
+                        index += 1;
+                        continue;
+                    }
+                    if (character === '[') {
+                        const close = this.source.indexOf(']', index + 1);
+                        if (close >= 0 && close + 1 < this.source.length && this.source[close + 1] !== '(')
+                            continue;
+                    }
+                    const pendingFence = character === '~'
+                        && /^ {0,3}~*$/u.test(this.source.slice(this.source.lastIndexOf('\n', index - 1) + 1, index))
+                        && /^~*$/u.test(this.source.slice(index));
+                    if (character === '`' || character === '[' || pendingFence) {
+                        safeEnd = Math.min(safeEnd, index);
+                        break;
+                    }
+                }
+            }
+            if ('children' in node)
+                for (const child of node.children)
+                    visit(child);
+        };
+        visit(fromMarkdown(this.source));
+        safeEnd = Math.max(safeEnd, this.emitted);
+        let cursor = this.emitted;
+        let text = '';
+        for (const replacement of replacements) {
+            if (replacement.start < cursor || replacement.end > safeEnd)
+                continue;
+            text += this.source.slice(cursor, replacement.start) + replacement.text;
+            cursor = replacement.end;
+        }
+        text += this.source.slice(cursor, safeEnd);
+        this.emitted = safeEnd;
+        if (text !== '')
+            yield { ...this.message, text };
+    }
+}
+function fileLineTarget(target) {
+    const match = /:([1-9]\d*)(?:-([1-9]\d*))?$/u.exec(target);
+    if (match === null || !Number.isSafeInteger(Number(match[1])))
+        return target;
+    const path = target.slice(0, match.index);
+    const start = Number(match[1]);
+    const end = match[2] === undefined ? undefined : Number(match[2]);
+    if (end !== undefined && (!Number.isSafeInteger(end) || end < start))
+        return target;
+    // 裸盘符加数字仍是 Windows 路径片段，不把它误当成无扩展名文件。
+    if (/^[a-z]:[1-9]\d*(?:-[1-9]\d*)?$/iu.test(target))
+        return target;
+    // Windows 盘符不属于 URI scheme；常见 URI 即使没有 // 也必须原样保留。
+    const scheme = /^([a-z][\w+.-]*):/iu.exec(target)?.[1]?.toLowerCase();
+    if (scheme !== undefined && !/^[a-z]:[/\\]/iu.test(target) && FILE_LINK_URI_SCHEMES.has(scheme))
+        return target;
+    if (/^[/\\]{2}/u.test(path) || /:\d+$/u.test(path))
+        return target;
+    if (/[?#\u0000-\u001f\u007f]/u.test(path))
+        return target;
+    return `${path}#L${match[1]}${end === undefined ? '' : `-L${match[2]}`}`;
+}
+/** 引号里的花括号属于路径或属性，不能提前截断指令。 */
+function citationEnd(text) {
+    let quote = '';
+    for (let index = CITATION_PREFIX.length; index < text.length; index += 1) {
+        const character = text[index];
+        if (quote !== '') {
+            if (character === '\\' && (text[index + 1] === quote || text[index + 1] === '\\'))
+                index += 1;
+            else if (character === quote)
+                quote = '';
+        }
+        else if (character === '"' || character === "'")
+            quote = character;
+        else if (character === '}')
+            return index;
+    }
+    return -1;
+}
+function citationLink(citation) {
+    const attributes = citation.slice(CITATION_PREFIX.length, -1);
+    const values = new Map();
+    // 保留 Windows 路径的字面反斜杠，不按 JSON 转义解释 \n、\t 等路径片段。
+    const pattern = /\s*([\w-]+)\s*=\s*(?:"((?:\\.|[^"\\])*)"|'((?:\\.|[^'\\])*)'|([^\s"']+))/gu;
+    let consumed = 0;
+    for (const match of attributes.matchAll(pattern)) {
+        if (match.index !== consumed || values.has(match[1]))
+            return citation;
+        consumed = match.index + match[0].length;
+        values.set(match[1], match[2] ?? match[3] ?? match[4]);
+    }
+    if (attributes.slice(consumed).trim() !== '')
+        return citation;
+    const path = values.get('path');
+    const purpose = values.get('purpose');
+    if (values.get('mode') === 'live' || (purpose !== 'output' && purpose !== 'source') || path === undefined || path.trim() === '')
+        return citation;
+    // 盘符不是 URI scheme；live 标识及真正的 URI 都不能作为本地文件打开。
+    if (/^[a-z][\w+.-]*:/iu.test(path) && !/^[a-z]:[/\\]/iu.test(path))
+        return citation;
+    if (/[\u0000-\u001f\u007f]/u.test(path) || /^[/\\]{2}/u.test(path))
+        return citation;
+    // DSH Markdown 的 openFile delegate 接收本地路径，并沿当前会话路由到 Host。
+    // 对路径逐段编码，避免空格、#、? 和 % 被误作 Markdown 或 URI 分隔符。
+    const normalized = path.replace(/\\/gu, '/').replace(/^\/(?=[a-z]:\/)/iu, '');
+    let target = normalized.split('/').map((segment) => encodeURIComponent(segment).replace(/%3A/giu, ':')).join('/');
+    const start = values.get('line_start');
+    const end = values.get('line_end');
+    if (start !== undefined && /^[1-9]\d*$/u.test(start) && Number.isSafeInteger(Number(start))) {
+        target += `#L${start}`;
+        if (end !== undefined && /^[1-9]\d*$/u.test(end) && Number.isSafeInteger(Number(end)) && Number(end) >= Number(start))
+            target += `-L${end}`;
+    }
+    const label = path.replace(/[\\`*_[\]<>&]/gu, '\\$&');
+    // 完整属性作为 Markdown title 保留下来，包括 purpose、行号和额外引用信息。
+    const title = attributes.replace(/[\\"&]/gu, '\\$&');
+    return `[${label}](<${target}> "${title}")`;
+}
+//# sourceMappingURL=codex-file-citations.js.map

package/data/build/dist/host/cli-adapters/codex-file-citations.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-file-citations.js","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/codex-file-citations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAGvD,MAAM,eAAe,GAAG,uBAAuB,CAAA;AAC/C,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;AAGtJ,kDAAkD;AAClD,MAAM,OAAO,2BAA2B;IACrB,QAAQ,GAAG,IAAI,0BAA0B,EAAE,CAAA;IACpD,OAAO,GAAG,EAAE,CAAA;IACZ,OAAO,CAAuB;IAEtC,CAAC,IAAI,CAAC,KAAyB;QAC7B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;YAAE,KAAK,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACtF,CAAC;IAED,CAAC,KAAK;QACJ,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,cAAc,EAAE;YAAE,KAAK,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACjF,KAAK,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;IAC9B,CAAC;IAEO,CAAC,YAAY,CAAC,KAAyB;QAC7C,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YAChC,yCAAyC;YACzC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB;gBAAE,KAAK,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,CAAA;YACnI,MAAM,KAAK,CAAA;YACX,OAAM;QACR,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,EAAE,SAAS,KAAK,KAAK,CAAC,SAAS;YAAE,KAAK,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,CAAA;QAC7E,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACpB,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC,IAAI,CAAA;QAC1B,IAAI,IAAI,GAAG,EAAE,CAAA;QACb,OAAO,IAAI,CAAC,OAAO,KAAK,EAAE,EAAE,CAAC;YAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;YACnD,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBACd,6BAA6B;gBAC7B,IAAI,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;gBACxE,OAAO,QAAQ,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC;oBAAE,QAAQ,IAAI,CAAC,CAAA;gBAChG,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,CAAA;gBAC7D,IAAI,CAAC,OAAO,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAA;gBAClE,MAAK;YACP,CAAC;YACD,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;YACpC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACxC,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACrC,IAAI,GAAG,GAAG,CAAC;gBAAE,MAAK;YAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAA;YAC/C,IAAI,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAA;YAC9B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAA;QAC5C,CAAC;QACD,IAAI,IAAI,KAAK,EAAE;YAAE,MAAM,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,CAAA;IAC3C,CAAC;IAED,gDAAgD;IACxC,CAAC,cAAc;QACrB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAA;QACzB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAA;QACjB,IAAI,IAAI,KAAK,EAAE,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS;YAAE,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAA;QAC9E,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;IAC1B,CAAC;CACF;AAED,qDAAqD;AACrD,MAAM,0BAA0B;IACtB,MAAM,GAAG,EAAE,CAAA;IACX,OAAO,GAAG,CAAC,CAAA;IACX,OAAO,CAAuB;IAEtC,CAAC,IAAI,CAAC,KAAyB;QAC7B,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YAChC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB;gBAAE,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAA;YAC1H,MAAM,KAAK,CAAA;YACX,OAAM;QACR,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,EAAE,SAAS,KAAK,KAAK,CAAC,SAAS;YAAE,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAA;QACpE,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;QACnD,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAA;QACzB,sCAAsC;QACtC,IAAI,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;YACjC,MAAM,KAAK,CAAA;YACX,OAAM;QACR,CAAC;QACD,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAC1B,CAAC;IAED,CAAC,KAAK;QACJ,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACvB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAA;QAChB,IAAI,CAAC,OAAO,GAAG,CAAC,CAAA;QAChB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;IAC1B,CAAC;IAEO,CAAC,KAAK,CAAC,KAAc;QAC3B,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,OAAM;QAC7E,MAAM,YAAY,GAAwD,EAAE,CAAA;QAC5E,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;QAChC,MAAM,KAAK,GAAG,CAAC,IAAW,EAAQ,EAAE;YAClC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAA;YACzC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAA;YACrC,IAAI,KAAK,KAAK,SAAS,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO;gBAAE,OAAM;YAC3E,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,IAAI,KAAK,GAAG,CAAC,CAAA;gBACxE,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;gBACrD,4CAA4C;gBAC5C,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,SAAS,IAAI,KAAK,IAAI,SAAS,GAAG,GAAG,EAAE,CAAC;oBACxE,IAAI,WAAW,GAAG,SAAS,GAAG,CAAC,CAAA;oBAC/B,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;wBAAE,WAAW,IAAI,CAAC,CAAA;oBACnE,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,GAAG,CAAA;oBAC9C,MAAM,SAAS,GAAG,WAAW,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;oBAC/C,IAAI,OAAO,GAAG,SAAS,CAAA;oBACvB,IAAI,KAAK,GAAG,CAAC,CAAA;oBACb,OAAO,OAAO,GAAG,GAAG,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC;wBACnC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAE,CAAA;wBACvC,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;4BAAC,OAAO,IAAI,CAAC,CAAC;4BAAC,SAAQ;wBAAC,CAAC;wBAClD,IAAI,KAAK,EAAE,CAAC;4BACV,IAAI,SAAS,KAAK,GAAG;gCAAE,MAAK;wBAC9B,CAAC;6BAAM,CAAC;4BACN,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,KAAK,GAAG,IAAI,KAAK,KAAK,CAAC,CAAC;gCAAE,MAAK;4BACtE,IAAI,SAAS,KAAK,GAAG;gCAAE,KAAK,IAAI,CAAC,CAAA;iCAC5B,IAAI,SAAS,KAAK,GAAG;gCAAE,KAAK,IAAI,CAAC,CAAA;wBACxC,CAAC;oBACH,CAAC;oBACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;oBACpD,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;oBACzC,IAAI,UAAU,KAAK,MAAM;wBAAE,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAA;gBACpG,CAAC;gBACD,OAAM;YACR,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACzB,wCAAwC;gBACxC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAAE,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;gBAC/F,OAAM;YACR,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;gBAAE,OAAM;YACvF,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnC,uCAAuC;gBACvC,KAAK,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,GAAG,GAAG,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;oBACxE,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAE,CAAA;oBACrC,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;wBAAC,KAAK,IAAI,CAAC,CAAC;wBAAC,SAAQ;oBAAC,CAAC;oBAChD,IAAI,SAAS,KAAK,GAAG,EAAE,CAAC;wBACtB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA;wBACjD,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,GAAG;4BAAE,SAAQ;oBAC9F,CAAC;oBACD,MAAM,YAAY,GAAG,SAAS,KAAK,GAAG;2BACjC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;2BAC1F,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;oBAC3C,IAAI,SAAS,KAAK,GAAG,IAAI,SAAS,KAAK,GAAG,IAAI,YAAY,EAAE,CAAC;wBAC3D,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;wBAClC,MAAK;oBACP,CAAC;gBACH,CAAC;YACH,CAAC;YACD,IAAI,UAAU,IAAI,IAAI;gBAAE,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ;oBAAE,KAAK,CAAC,KAAK,CAAC,CAAA;QACzE,CAAC,CAAA;QACD,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QAChC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QACzC,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAA;QACzB,IAAI,IAAI,GAAG,EAAE,CAAA;QACb,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACvC,IAAI,WAAW,CAAC,KAAK,GAAG,MAAM,IAAI,WAAW,CAAC,GAAG,GAAG,OAAO;gBAAE,SAAQ;YACrE,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,IAAI,CAAA;YACvE,MAAM,GAAG,WAAW,CAAC,GAAG,CAAA;QAC1B,CAAC;QACD,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,IAAI,KAAK,EAAE;YAAE,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAA;IAClD,CAAC;CACF;AAED,SAAS,cAAc,CAAC,MAAc;IACpC,MAAM,KAAK,GAAG,+BAA+B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC1D,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAAE,OAAO,MAAM,CAAA;IAC5E,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IACzC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IACjE,IAAI,GAAG,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,KAAK,CAAC;QAAE,OAAO,MAAM,CAAA;IACnF,sCAAsC;IACtC,IAAI,kCAAkC,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAA;IAClE,mDAAmD;IACnD,MAAM,MAAM,GAAG,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAA;IACrE,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAA;IAC9G,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,MAAM,CAAA;IACjE,IAAI,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,MAAM,CAAA;IACxD,OAAO,GAAG,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;AAC1E,CAAC;AAED,+BAA+B;AAC/B,SAAS,WAAW,CAAC,IAAY;IAC/B,IAAI,KAAK,GAAG,EAAE,CAAA;IACd,KAAK,IAAI,KAAK,GAAG,eAAe,CAAC,MAAM,EAAE,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACzE,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAE,CAAA;QAC9B,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;YACjB,IAAI,SAAS,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC;gBAAE,KAAK,IAAI,CAAC,CAAA;iBACxF,IAAI,SAAS,KAAK,KAAK;gBAAE,KAAK,GAAG,EAAE,CAAA;QAC1C,CAAC;aAAM,IAAI,SAAS,KAAK,GAAG,IAAI,SAAS,KAAK,GAAG;YAAE,KAAK,GAAG,SAAS,CAAA;aAC/D,IAAI,SAAS,KAAK,GAAG;YAAE,OAAO,KAAK,CAAA;IAC1C,CAAC;IACD,OAAO,CAAC,CAAC,CAAA;AACX,CAAC;AAED,SAAS,YAAY,CAAC,QAAgB;IACpC,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAA;IAC7D,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAA;IACxC,gDAAgD;IAChD,MAAM,OAAO,GAAG,4EAA4E,CAAA;IAC5F,IAAI,QAAQ,GAAG,CAAC,CAAA;IAChB,KAAK,MAAM,KAAK,IAAI,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACjD,IAAI,KAAK,CAAC,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC;YAAE,OAAO,QAAQ,CAAA;QACtE,QAAQ,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;QACxC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAE,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAE,CAAC,CAAA;IAC1D,CAAC;IACD,IAAI,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,OAAO,QAAQ,CAAA;IAC7D,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC/B,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IACrC,IAAI,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,MAAM,IAAI,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,QAAQ,CAAC,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,OAAO,QAAQ,CAAA;IAChJ,+CAA+C;IAC/C,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,QAAQ,CAAA;IACnF,IAAI,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,QAAQ,CAAA;IACnF,0DAA0D;IAC1D,+CAA+C;IAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAA;IAC7E,IAAI,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACjH,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;IACtC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAClC,IAAI,KAAK,KAAK,SAAS,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC5F,MAAM,IAAI,KAAK,KAAK,EAAE,CAAA;QACtB,IAAI,GAAG,KAAK,SAAS,IAAI,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,KAAK,GAAG,EAAE,CAAA;IAC7I,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAA;IACrD,mDAAmD;IACnD,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;IACpD,OAAO,IAAI,KAAK,MAAM,MAAM,MAAM,KAAK,IAAI,CAAA;AAC7C,CAAC"}

package/data/build/dist/host/cli-adapters/command-code-driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-code-driver.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/command-code-driver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command-code-driver.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/command-code-driver.ts"],"names":[],"mappings":"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"}

package/data/build/dist/host/cli-adapters/command-code-driver.js

@@ -10,9 +10,10 @@ import { usageChunk } from './rpc-driver-utils.js';
 import { commandEnvironment, terminateChildProcess } from './process-utils.js';
 import { prepareAttachmentPaths, promptWithAttachmentPaths } from './attachment-utils.js';
 import { parseSkillFrontmatter } from './skill-filesystem.js';
-import { commandCodeBridgeArgs, commandCodeBridgeEnvironment } from '../cli-bridge/injections.js';
+import { commandCodeNativeAgentArgs, commandCodeNativeAgentEnvironment, subagentBridgeActive } from '../cli-bridge/injections.js';
 import { getSubagentBridge } from '../cli-bridge/bridge-holder.js';
 import { AcpCliDriver } from './acp-cli-driver.js';
+import { knownCommandCodeContextWindow } from './model-catalog.js';
 import { CommandCodeHistory, } from './command-code-history.js';
 const WINDOWS = process.platform === 'win32';
 const COMMAND_CODE_BINARIES = WINDOWS
@@ -24,6 +25,7 @@ const CATALOG_EFFORTS = new Map([
     ['deepseek/deepseek-v4-pro', ['high', 'max']],
     ['deepseek/deepseek-v4-flash', ['high', 'max']],
     ['deepseek/deepseek-v4.1-flash', ['low', 'high', 'max']],
+    ['deepseek/deepseek-v4.1', ['low', 'high', 'max']],
     ['deepseek/deepseek-v4-flash-fast', ['low', 'high', 'max']],
     ['moonshotai/kimi-k3', ['low', 'high', 'max']],
     ['moonshotai/kimi-k2.7-code', []],
@@ -176,7 +178,7 @@ const COMMAND_CODE_INTERRUPT_GRACE_MS = 1_500;
 function commandCodePermissionArgs(permission) {
     if (permission?.sandboxMode === 'danger-full-access' && permission.approvalPolicy === 'never')
         return ['--yolo'];
-    if (permission?.sandboxMode === 'workspace-write' && permission.approvalPolicy === 'never')
+    if (permission?.sandboxMode === 'workspace-write')
         return ['--permission-mode', 'accept-edits'];
     if (permission?.sandboxMode === 'read-only')
         return ['--plan'];
@@ -236,10 +238,13 @@ export class CommandCodeDriver {
                 runtimeModelSelection: false,
                 configureSession: configureCommandCodeAcpSession,
                 sessionEnvironment: commandCodeAcpEnvironment(),
+                sessionEnvironmentForInput: (input) => commandCodeNativeAgentEnvironment(input.sessionId, 'command-code'),
                 id: 'command-code',
                 name: 'Command Code',
                 capabilities: acpCapabilities,
                 readQuestionRequest: readCommandCodeQuestionRequest,
+                decidePermission: commandCodeAcpPermissionDecision,
+                enrichUsage: enrichCommandCodeUsage,
                 probeReason: 'Command Code ACP 不公开可安全读取的会话索引',
             });
             this.respondPermission = (sessionId, response) => this.acpDriver.respondPermission(sessionId, response);
@@ -612,7 +617,7 @@ export class CommandCodeDriver {
                 // 自动续跑是同一个 DSH 运行里的下一段；消息序号必须跨尝试连续，
                 // 否则新进程会从 command-code-message-1 重新编号，公共投影层会把它
                 // 当成同一条消息继续追加，而不是开启新段。
-                const state = createStreamState(() => turn.aborted, turn.messageSequence, turn.providerSessionId ?? null, turn.sessionId);
+                const state = createStreamState(() => turn.aborted, turn.messageSequence, turn.providerSessionId ?? null, turn.sessionId, input.splitToolSteps === true);
                 const child = this.spawnAttempt(turn, input, binary);
                 const code = await this.readAttempt(turn, child, state);
                 turn.messageSequence = state.messageSequence;
@@ -650,7 +655,7 @@ export class CommandCodeDriver {
     /** 启动一次 CLI 尝试；首次写入 transcript，续跑沿用同一会话文件。 */
     spawnAttempt(turn, input, binary) {
         const args = this.buildTurnArgs(input, turn);
-        const bridgeEnvironment = commandCodeBridgeEnvironment(input.sessionId, this.descriptor.id);
+        const bridgeEnvironment = commandCodeNativeAgentEnvironment(input.sessionId, this.descriptor.id);
         const child = this.runSpawn(binary, args, {
             cwd: input.cwd ?? process.cwd(),
             env: { ...(this.cachedEnvironment ?? commandEnvironment(binary)), ...(input.runtimeEnv ?? {}), ...bridgeEnvironment },
@@ -691,8 +696,9 @@ export class CommandCodeDriver {
         }
         for (const path of turn.skillPaths)
             args.push('--skill', path);
-        // 子代理托管开启时加载桥接 mod：内建 agent 调用会被转投成 DSH 原生子会话。
-        args.push(...commandCodeBridgeArgs(input.sessionId));
+        // 每次启动都加载屏蔽 Mod：父会话转投 DSH，子会话仅禁用嵌套 agent；桥接
+        // 不可用时由 Mod 明确阻断，不能回退到 Command Code 原生子代理。
+        args.push(...commandCodeNativeAgentArgs(input.sessionId));
         for (const directory of new Set((input.attachments ?? []).map((attachment) => dirname(attachment.path))))
             args.push('--add-dir', directory);
         if (input.modelId && input.modelId !== 'provider-default')
@@ -849,6 +855,15 @@ export class CommandCodeDriver {
             }
             // 一个 `-p` 运行会在同一进程里连续跑多个 agent turn。把新 assistant 消息的
             // 首个正文留给下一次 llm/stream，当前流只返回边界，确保 DSH 先创建新 step。
+            if (segmented && chunk.type === 'step-boundary') {
+                // 解析层已经把下一条 Provider 消息留在队列中；清掉旧消息身份，避免
+                // 续段后的首个正文再次被误判成一个额外边界。
+                turn.currentMessageId = undefined;
+                turn.sawCompletedTool = false;
+                suspend();
+                yield chunk;
+                return;
+            }
             if (segmented
                 && (chunk.type === 'text-delta' || chunk.type === 'reasoning-delta')
                 && chunk.messageId !== undefined) {
@@ -889,15 +904,32 @@ export class CommandCodeDriver {
         // 首轮 transcript 已经是 canonical 文件，必须保留给下一轮 --resume 及冷恢复。
     }
 }
-function createStreamState(aborted, messageSequence = 0, sessionId = null, bridgeSessionId = '') {
+function enrichCommandCodeUsage(event, input) {
+    const contextWindow = event.contextWindow ?? knownCommandCodeContextWindow(input.modelId);
+    if (contextWindow === undefined || contextWindow <= 0)
+        return event;
+    const contextTokens = event.contextTokens ?? (event.inputTokens > 0 ? event.inputTokens : undefined);
+    return {
+        ...event,
+        contextWindow,
+        ...(contextTokens === undefined ? {} : { contextTokens }),
+        ...(event.contextUsageRatio !== undefined || contextTokens === undefined
+            ? {}
+            : { contextUsageRatio: Number(Math.min(1, contextTokens / contextWindow).toFixed(6)) }),
+    };
+}
+function createStreamState(aborted, messageSequence = 0, sessionId = null, bridgeSessionId = '', splitToolSteps = false) {
     return {
         messageSequence,
         messageId: null,
         emittedText: '',
         emittedReasoning: '',
         sawText: false,
+        sawCompletedTool: false,
+        splitToolSteps,
         perRequestUsageSeen: false,
         turnUsageSeen: false,
+        pendingMessageUsage: null,
         sessionId,
         bridgeSessionId,
         aborted,
@@ -968,13 +1000,24 @@ function commandCodeEventChunks(event, state) {
             break;
         case 'turn_start':
         case 'turn-start':
+            if (state.splitToolSteps)
+                emitPendingMessageUsage(chunks, state);
+            if (state.splitToolSteps && state.sawCompletedTool)
+                chunks.push({ type: 'step-boundary' });
             beginMessage(state);
+            state.sawCompletedTool = false;
             break;
         case 'message_start':
         case 'message-start':
             // 正常一轮只有一个模型请求；没有 turn_start 的旧版本由这里补消息身份。
-            if (state.messageId === null)
+            if (state.messageId === null) {
+                if (state.splitToolSteps)
+                    emitPendingMessageUsage(chunks, state);
+                if (state.splitToolSteps && state.sawCompletedTool)
+                    chunks.push({ type: 'step-boundary' });
                 beginMessage(state);
+                state.sawCompletedTool = false;
+            }
             break;
         case 'text_delta':
         case 'text-delta': {
@@ -1004,11 +1047,13 @@ function commandCodeEventChunks(event, state) {
         case 'message-end':
             // 只补齐增量流没有覆盖到的正文，避免累计快照被重复追加。
             appendContentFallback(chunks, event.content ?? recordValue(event.message)?.content, state);
+            captureMessageUsage(event, state);
             break;
         case 'model_request_end':
         case 'model-request-end': {
-            const usage = usageChunk(recordValue(event.usage));
+            const usage = usageChunkFromEvent(event);
             if (usage !== null) {
+                state.pendingMessageUsage = null;
                 state.perRequestUsageSeen = true;
                 state.turnUsageSeen = true;
                 chunks.push(usage);
@@ -1019,8 +1064,9 @@ function commandCodeEventChunks(event, state) {
         case 'turn-end': {
             // 旧版本可能只在 turn_end 带 usage；与 model_request_end 去重，不重复结算。
             if (!state.turnUsageSeen) {
-                const usage = usageChunk(recordValue(event.usage));
+                const usage = usageChunkFromEvent(event) ?? (state.splitToolSteps ? state.pendingMessageUsage : null);
                 if (usage !== null) {
+                    state.pendingMessageUsage = null;
                     state.perRequestUsageSeen = true;
                     state.turnUsageSeen = true;
                     chunks.push(usage);
@@ -1030,6 +1076,8 @@ function commandCodeEventChunks(event, state) {
         }
         case 'run_end':
         case 'run-end':
+            if (state.splitToolSteps && !state.turnUsageSeen)
+                emitPendingMessageUsage(chunks, state, event);
             if (!state.sawText) {
                 const finalText = readFinalText(event);
                 if (finalText) {
@@ -1053,10 +1101,16 @@ function commandCodeEventChunks(event, state) {
         case 'result': {
             if (state.terminalEmitted)
                 break;
-            if (!state.perRequestUsageSeen) {
-                const usage = usageChunk(recordValue(event.usage));
-                if (usage !== null)
+            const resultUsage = usageChunkFromEvent(event);
+            if (state.splitToolSteps && state.pendingMessageUsage !== null)
+                emitPendingMessageUsage(chunks, state);
+            else if (!state.turnUsageSeen) {
+                const usage = resultUsage ?? state.pendingMessageUsage;
+                if (usage !== null) {
+                    state.perRequestUsageSeen = true;
+                    state.turnUsageSeen = true;
                     chunks.push(usage);
+                }
             }
             if (!state.sawText) {
                 const finalText = readFinalText(event);
@@ -1098,6 +1152,18 @@ function commandCodeEventChunks(event, state) {
             break;
     }
     if (isToolStart(type)) {
+        // 某些版本只在 message/message_update 上携带 usage，工具开始即表示该
+        // assistant 消息已经结束；先结算最后一份快照，避免工具 step 没有 usage。
+        if (state.splitToolSteps)
+            emitPendingMessageUsage(chunks, state, event);
+        // 某些 Command Code 版本对“只有工具调用的 assistant 消息”不发送
+        // turn_start/message_start。上一个工具已经完成时，下一次工具开始就是
+        // 明确的消息边界；同一消息里的并行工具不会命中此分支，因为它们之间
+        // 还没有 completed 结果。
+        if (state.splitToolSteps && state.sawCompletedTool) {
+            chunks.push({ type: 'step-boundary' });
+            state.sawCompletedTool = false;
+        }
         const tool = readToolChunk(event, type === 'tool_queued' || type === 'tool_started' ? 'started' : 'running');
         if (tool !== null)
             chunks.push(tool);
@@ -1124,10 +1190,41 @@ function commandCodeEventChunks(event, state) {
             // turn_start/message_start，也要让公共投影层看到消息身份切换。
             if (tool.status === 'completed' || tool.status === 'failed')
                 resetMessageIdentity(state);
+            if (tool.status === 'completed' || tool.status === 'failed')
+                state.sawCompletedTool = true;
         }
     }
+    if (type === 'message' || type === 'message_update' || type === 'message-update')
+        captureMessageUsage(event, state);
     return chunks;
 }
+/** 从所有 Command Code 事件形状读取 usage；message 快照可能嵌套在 message 内。 */
+function usageChunkFromEvent(event) {
+    const result = recordValue(event.result);
+    const message = recordValue(event.message);
+    const usage = usageChunk(recordValue(event.usage) ?? recordValue(message?.usage) ?? recordValue(result?.usage));
+    return usage?.type === 'usage' ? usage : null;
+}
+/** 暂存消息累计快照，只保留同一请求最后一次值，避免重复结算。 */
+function captureMessageUsage(event, state) {
+    if (state.turnUsageSeen)
+        return;
+    const usage = usageChunkFromEvent(event);
+    if (usage !== null)
+        state.pendingMessageUsage = usage;
+}
+/** 在消息、工具或回合边界结算消息快照。 */
+function emitPendingMessageUsage(chunks, state, event) {
+    if (state.turnUsageSeen)
+        return;
+    const usage = state.pendingMessageUsage ?? (event === undefined ? null : usageChunkFromEvent(event));
+    if (usage === null)
+        return;
+    state.pendingMessageUsage = null;
+    state.perRequestUsageSeen = true;
+    state.turnUsageSeen = true;
+    chunks.push(usage);
+}
 function readFinalText(event) {
     const result = recordValue(event.result);
     return textValue(event.finalText
@@ -1805,7 +1902,10 @@ catch {
 } }
 /** 保留启动选择作为进程复用条件；ACP 的实际会话状态由原生协议显式设置。 */
 function commandCodeAcpArgs(input) {
-    const args = ['acp', ...commandCodePermissionArgs(input.permission)];
+    // Command Code 的全局 --mod 必须放在 acp 子命令之前；放到 acp 之后会被
+    // Commander 当成 ACP 子命令参数而拒绝。该参数无论桥接状态都必须存在，确保
+    // 启动阶段就屏蔽原生 agent。
+    const args = [...commandCodeNativeAgentArgs(input.sessionId), 'acp', ...commandCodePermissionArgs(input.permission)];
     if (input.plan === true && !args.includes('--plan'))
         args.push('--plan');
     if (input.enableAskUserQuestion === true || input.runtimeEnv?.CMD_TOOLS_ASK_USER_QUESTION_ENABLE === 'true') {
@@ -1841,14 +1941,34 @@ function commandCodeAcpMode(input) {
     const permission = input.permission;
     if (input.plan === true || permission?.sandboxMode === 'read-only')
         return 'plan';
+    // 工作区内写入已经由沙箱模式授权；ask 只表示需要审批时可以询问，不能把
+    // 每次普通编辑都降级到 default。auto-accept 仍由 CLI 检查越界与风险操作。
+    if (permission?.sandboxMode === 'workspace-write')
+        return 'auto-accept';
     if (permission?.approvalPolicy !== 'never')
         return 'default';
     if (permission.sandboxMode === 'danger-full-access')
         return 'bypass';
-    if (permission.sandboxMode === 'workspace-write')
-        return 'auto-accept';
     return 'default';
 }
+/** 托管委派由 DSH 桥接校验目标授权，不能再交给 CLI 对每次调用重复审批。 */
+function commandCodeAcpPermissionDecision(message, input) {
+    if (message.method !== 'session/request_permission')
+        return undefined;
+    const params = isRecord(message.params) ? message.params : {};
+    const tool = isRecord(params.toolCall) ? params.toolCall : {};
+    const toolName = firstToolText(tool.name, tool.toolName, tool.tool_name, tool.title);
+    const metadata = isRecord(params._meta) ? params._meta : {};
+    const permission = input.permission;
+    const canWrite = input.plan !== true
+        && (permission?.sandboxMode === 'workspace-write' || permission?.sandboxMode === 'danger-full-access');
+    // 只识别插件自己的两个入口，不能把全部 MCP/自定义工具或显式风险请求放行。
+    if (canWrite && metadata.risk === undefined && subagentBridgeActive(input.sessionId)
+        && (toolName === 'agent_subagent' || toolName === 'mcp__codingns__agent_subagent'))
+        return 'allow';
+    // never 允许已有授权范围内的工作，但不允许把剩余审批升级成交互弹窗。
+    return permission?.approvalPolicy === 'never' ? 'reject' : undefined;
+}
 /** Command Code 将 ask_user_question 编译成 `session/request_permission`。 */
 function readCommandCodeQuestionRequest(message) {
     const method = message.method?.toLowerCase();