@jingyi0605/codingns4dsh 0.2.1-beta.7 → 0.2.1-beta.9

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":"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"}

package/data/build/dist/host/cli-adapters/command-code-acp-loader.d.ts

@@ -1,8 +1,15 @@
 /**
- * Command Code ACP 自由文本兼容桥。
+ * Command Code ACP 兼容桥。
  *
  * Command Code 1.74.3 的 ACP 服务把 ask_user_question 映射成
  * session/request_permission，并且只从 outcome.optionId 还原固定选项文本。
+ *
+ * 同一份 bundle 还只把内置模型目录当作可选模型白名单：ACP 的 availableModels()
+ * 与 Agent 的 selectableModels() 都来自 catalogModels()，因此 providers.json 里
+ * 声明的 BYOK 模型（例如 mcgrox/deepseek-v4.1-flash）会在 session/set_model 时被
+ * 拒绝成 `Unknown model: ...`，而 CLI 自己的默认模型走另一条路径不受影响。这里
+ * 把 BYOK 模型补进内存中的目录，使 ACP 会话能切换并真正路由到对应提供者。
+ *
  * 这个 loader 只改写内存中的 cli.mjs，不修改用户安装的 npm 包或 Desktop
  * 目录；当上游实现已经变化时保持原模块不变。
  */

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

@@ -1 +1 @@
-{"version":3,"file":"command-code-acp-loader.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/command-code-acp-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,UAAU,aAAa;IACrB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACnD;AAED,UAAU,YAAY;IACpB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,CAAA;IACrC,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAA;IAC/B,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAChC;AAED,KAAK,QAAQ,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,YAAY,CAAC,CAAA;AAI9E,0DAA0D;AAC1D,wBAAsB,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAMzG"}
+{"version":3,"file":"command-code-acp-loader.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/command-code-acp-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,UAAU,aAAa;IACrB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACnD;AAED,UAAU,YAAY;IACpB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,CAAA;IACrC,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAA;IAC/B,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAChC;AAED,KAAK,QAAQ,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,YAAY,CAAC,CAAA;AAI9E,0DAA0D;AAC1D,wBAAsB,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAMzG"}

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

@@ -1,8 +1,15 @@
 /**
- * Command Code ACP 自由文本兼容桥。
+ * Command Code ACP 兼容桥。
  *
  * Command Code 1.74.3 的 ACP 服务把 ask_user_question 映射成
  * session/request_permission，并且只从 outcome.optionId 还原固定选项文本。
+ *
+ * 同一份 bundle 还只把内置模型目录当作可选模型白名单：ACP 的 availableModels()
+ * 与 Agent 的 selectableModels() 都来自 catalogModels()，因此 providers.json 里
+ * 声明的 BYOK 模型（例如 mcgrox/deepseek-v4.1-flash）会在 session/set_model 时被
+ * 拒绝成 `Unknown model: ...`，而 CLI 自己的默认模型走另一条路径不受影响。这里
+ * 把 BYOK 模型补进内存中的目录，使 ACP 会话能切换并真正路由到对应提供者。
+ *
  * 这个 loader 只改写内存中的 cli.mjs，不修改用户安装的 npm 包或 Desktop
  * 目录；当上游实现已经变化时保持原模块不变。
  */
@@ -13,7 +20,7 @@ export async function load(url, context, nextLoad) {
     if (!url.endsWith(COMMAND_CODE_CLI_SUFFIX) || loaded.format !== 'module' || loaded.source === undefined)
         return loaded;
     const source = typeof loaded.source === 'string' ? loaded.source : new TextDecoder().decode(loaded.source);
-    const patched = patchCommandCodeAcpQuestion(source);
+    const patched = patchCommandCodeAcpByokModels(patchCommandCodeAcpQuestion(source));
     return patched === source ? loaded : { ...loaded, source: patched, shortCircuit: true };
 }
 /**
@@ -36,4 +43,40 @@ function patchCommandCodeAcpQuestion(source) {
     patched = patched.replace(questionDeclaration, `${helper}${questionDeclaration}`);
     return patched;
 }
+/** 上游 `catalogModels()` 的原始声明；命中不到说明实现已变化，保持模块不变。 */
+const CATALOG_MODELS_DECLARATION = 'function catalogModels(){return Object.values(RL).filter(e=>!e.hidden).map(e=>({id:e.id,name:e.name,description:e.description||null}))}';
+/**
+ * 注入到 bundle 的 BYOK 目录补充函数。
+ *
+ * 用 `process.getBuiltinModule` 取 fs/os，避免依赖 cli.mjs 压缩后的导入别名。
+ * 每次调用重读 providers.json，用户改完 BYOK 配置无需重启 ACP 进程；文件不存在
+ * 或解析失败时返回空数组，目录行为与上游完全一致。
+ */
+const BYOK_MODELS_HELPER = 'function codingNsByokModels(){try{' +
+    'const fs=process.getBuiltinModule("node:fs"),os=process.getBuiltinModule("node:os");' +
+    'const p=os.homedir()+"/.commandcode/providers.json";' +
+    'if(!fs.existsSync(p))return[];' +
+    'const c=JSON.parse(fs.readFileSync(p,"utf8"));' +
+    'const m=c&&"object"==typeof c.provider?c.provider:c&&"object"==typeof c.providers?c.providers:null;' +
+    'if(!m)return[];' +
+    'const out=[];' +
+    'for(const id of Object.keys(m)){const v=m[id];if(!v||"object"!=typeof v.models)continue;' +
+    'for(const name of Object.keys(v.models))out.push({id:id+"/"+name,name:id+"/"+name,description:"string"==typeof v.name?v.name:"byok"})}' +
+    'return out}catch{return[]}}';
+/** 打补丁后的 `catalogModels()`：内置目录在前，BYOK 模型去重后追加。 */
+const BYOK_MODELS_DECLARATION = BYOK_MODELS_HELPER +
+    'function catalogModels(){const a=Object.values(RL).filter(e=>!e.hidden).map(e=>({id:e.id,name:e.name,description:e.description||null}));' +
+    'for(const e of codingNsByokModels())if(!a.some(n=>n.id===e.id))a.push(e);return a}';
+/**
+ * 把 providers.json 声明的 BYOK 模型并入模型目录。
+ *
+ * `catalogModels()` 同时喂给 ACP 的 availableModels() 与 Agent 的 selectableModels()，
+ * 是唯一的校验收口；只补这一处即可让 session/set_model 与后续请求路由同时生效。
+ * 重复 id（BYOK 提供者与内置目录同名）保留内置条目，避免同一模型出现两次。
+ */
+function patchCommandCodeAcpByokModels(source) {
+    if (!source.includes(CATALOG_MODELS_DECLARATION))
+        return source;
+    return source.replace(CATALOG_MODELS_DECLARATION, BYOK_MODELS_DECLARATION);
+}
 //# sourceMappingURL=command-code-acp-loader.js.map

package/data/build/dist/host/cli-adapters/command-code-acp-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-code-acp-loader.js","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/command-code-acp-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAgBH,MAAM,uBAAuB,GAAG,eAAe,CAAA;AAE/C,0DAA0D;AAC1D,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,GAAW,EAAE,OAAsB,EAAE,QAAkB;IAChF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAC3C,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,uBAAuB,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS;QAAE,OAAO,MAAM,CAAA;IACtH,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAC1G,MAAM,OAAO,GAAG,2BAA2B,CAAC,MAAM,CAAC,CAAA;IACnD,OAAO,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,CAAA;AACzF,CAAC;AAED;;;GAGG;AACH,SAAS,2BAA2B,CAAC,MAAc;IACjD,MAAM,mBAAmB,GAAG,sCAAsC,CAAA;IAClE,MAAM,eAAe,GAAG,qEAAqE,CAAA;IAC7F,MAAM,cAAc,GAAG,yHAAyH,CAAA;IAChJ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC;QAAE,OAAO,MAAM,CAAA;IAEjI,MAAM,MAAM,GAAG,6eAA6e,CAAA;IAC5f,MAAM,mBAAmB,GAAG,qHAAqH,CAAA;IACjJ,MAAM,kBAAkB,GAAG,gLAAgL,CAAA;IAC3M,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAA;IAClE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;IAC7D,mDAAmD;IACnD,qDAAqD;IACrD,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,mBAAmB,EAAE,GAAG,MAAM,GAAG,mBAAmB,EAAE,CAAC,CAAA;IACjF,OAAO,OAAO,CAAA;AAChB,CAAC"}
+{"version":3,"file":"command-code-acp-loader.js","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/command-code-acp-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAgBH,MAAM,uBAAuB,GAAG,eAAe,CAAA;AAE/C,0DAA0D;AAC1D,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,GAAW,EAAE,OAAsB,EAAE,QAAkB;IAChF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAC3C,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,uBAAuB,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS;QAAE,OAAO,MAAM,CAAA;IACtH,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAC1G,MAAM,OAAO,GAAG,6BAA6B,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC,CAAA;IAClF,OAAO,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,CAAA;AACzF,CAAC;AAED;;;GAGG;AACH,SAAS,2BAA2B,CAAC,MAAc;IACjD,MAAM,mBAAmB,GAAG,sCAAsC,CAAA;IAClE,MAAM,eAAe,GAAG,qEAAqE,CAAA;IAC7F,MAAM,cAAc,GAAG,yHAAyH,CAAA;IAChJ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC;QAAE,OAAO,MAAM,CAAA;IAEjI,MAAM,MAAM,GAAG,6eAA6e,CAAA;IAC5f,MAAM,mBAAmB,GAAG,qHAAqH,CAAA;IACjJ,MAAM,kBAAkB,GAAG,gLAAgL,CAAA;IAC3M,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAA;IAClE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;IAC7D,mDAAmD;IACnD,qDAAqD;IACrD,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,mBAAmB,EAAE,GAAG,MAAM,GAAG,mBAAmB,EAAE,CAAC,CAAA;IACjF,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,qDAAqD;AACrD,MAAM,0BAA0B,GAC9B,yIAAyI,CAAA;AAE3I;;;;;;GAMG;AACH,MAAM,kBAAkB,GACtB,oCAAoC;IACpC,sFAAsF;IACtF,sDAAsD;IACtD,gCAAgC;IAChC,gDAAgD;IAChD,qGAAqG;IACrG,iBAAiB;IACjB,eAAe;IACf,0FAA0F;IAC1F,wIAAwI;IACxI,6BAA6B,CAAA;AAE/B,mDAAmD;AACnD,MAAM,uBAAuB,GAC3B,kBAAkB;IAClB,0IAA0I;IAC1I,oFAAoF,CAAA;AAEtF;;;;;;GAMG;AACH,SAAS,6BAA6B,CAAC,MAAc;IACnD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,0BAA0B,CAAC;QAAE,OAAO,MAAM,CAAA;IAC/D,OAAO,MAAM,CAAC,OAAO,CAAC,0BAA0B,EAAE,uBAAuB,CAAC,CAAA;AAC5E,CAAC"}

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

@@ -35,8 +35,14 @@ export declare class CommandCodeDriver implements CodingNsCliDriver {
         readonly protocol: 'command' | 'acp';
         readonly capabilities: readonly CodingNsCliCapability[];
     };
-    /** 驱动自己维护 Provider turn 边界，Host 可以把工具边界映射为 DSH step。 */
-    readonly supportsSegmentedTurns = true;
+    /**
+     * print 回合由驱动自己维护 Provider turn 边界；ACP 回合的整个 agent 循环跑在
+     * 一个 `session/prompt` 里，驱动无法在中间结束 llm/stream，只能交给 Registry
+     * 在工具完成后挂起同一个迭代器分步。
+     */
+    get supportsSegmentedTurns(): boolean;
+    /** ACP 回合由 Registry 按工具边界挂起并续读同一个迭代器。 */
+    get supportsToolStepSplitting(): boolean;
     private readonly homeDirectory;
     private readonly binaries;
     private readonly runSpawnSync;

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":"AAEA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAKrD,OAAO,KAAK,EACV,uBAAuB,EACvB,kBAAkB,EAElB,+BAA+B,EAC/B,6BAA6B,EAC7B,qBAAqB,EACrB,0BAA0B,EAC1B,yBAAyB,EACzB,oBAAoB,EACrB,MAAM,uCAAuC,CAAA;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,4BAA4B,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAA;AAWjH,OAAO,EAGL,KAAK,uBAAuB,EAC5B,KAAK,2BAA2B,EAChC,KAAK,yBAAyB,EAC9B,KAAK,sBAAsB,EAC3B,KAAK,8BAA8B,EACnC,KAAK,uBAAuB,EAC5B,KAAK,yBAAyB,EAC9B,KAAK,qBAAqB,EAC1B,KAAK,uBAAuB,EAC5B,KAAK,8BAA8B,EACnC,KAAK,4BAA4B,EACjC,KAAK,6BAA6B,EAClC,KAAK,2BAA2B,EAChC,KAAK,yBAAyB,EAC/B,MAAM,2BAA2B,CAAA;AAqNlC,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;IAC/B,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACrC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,SAAS,CAAA;IACrC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAA;IAC7B,wEAAwE;IACxE,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,gDAAgD;IAChD,QAAQ,CAAC,uBAAuB,CAAC,EAAE,MAAM,CAAA;IACzC,yBAAyB;IACzB,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IACpC,6DAA6D;IAC7D,QAAQ,CAAC,UAAU,CAAC,EAAE,yBAAyB,CAAC,YAAY,CAAC,CAAA;IAC7D,gDAAgD;IAChD,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAC7B;AAiCD;;;;;;;;;GASG;AACH,qBAAa,iBAAkB,YAAW,iBAAiB;IACzD,QAAQ,CAAC,UAAU,EAAE;QACnB,QAAQ,CAAC,EAAE,EAAE,cAAc,CAAA;QAC3B,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAA;QAC7B,QAAQ,CAAC,QAAQ,EAAE,SAAS,GAAG,KAAK,CAAA;QACpC,QAAQ,CAAC,YAAY,EAAE,SAAS,qBAAqB,EAAE,CAAA;KACxD,CAAA;IACD;;;;OAIG;IACH,IAAI,sBAAsB,IAAI,OAAO,CAAwC;IAC7E,yCAAyC;IACzC,IAAI,yBAAyB,IAAI,OAAO,CAAwC;IAChF,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkB;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAc;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAQ;IAChD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAQ;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA0B;IACpD,QAAQ,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,+BAA+B,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAClH,QAAQ,CAAC,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,6BAA6B,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC9G,iDAAiD;IACjD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsD;IACpF,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,iBAAiB,CAAgD;IACzE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkC;IAC5D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqC;gBAE/C,OAAO,GAAE,wBAA6B;IAwElD,qDAAqD;IACrD,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,yBAAyB,EAAE,CAAC;IAIpF,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAInF,2DAA2D;IACrD,UAAU,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,SAAS,0BAA0B,EAAE,CAAC;IASlG,yDAAyD;YAC3C,iBAAiB;IAe/B,OAAO,CAAC,gBAAgB;IAQxB,YAAY,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE;QAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAI9H,aAAa,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,8BAA8B,CAAC;IAItG,WAAW,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,4BAA4B,CAAC;IAInH,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,GAAE,2BAAuC,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAI7L,uBAAuB,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,GAAE,2BAAuC,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAInM,gBAAgB,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,QAAQ,EAAE,SAAS,yBAAyB,EAAE,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,8BAA8B;IAI7Q,gBAAgB,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIjF,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIlG,yBAAyB,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAA;KAAE,CAAC;IAIvK,aAAa,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E,gBAAgB,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,GAAG,IAAI,CAAC;IAIzG,gBAAgB,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,GAAG,IAAI,CAAC;IAIzG,WAAW,CAAC,iBAAiB,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,UAAU,EAAE,SAAS,GAAG,SAAS,CAAC;QAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIxN,MAAM,IAAI,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAOzF,UAAU,IAAI,OAAO,CAAC,uBAAuB,CAAC;IA+CpD,kDAAkD;YACpC,qBAAqB;IAkB7B,YAAY,CAAC,KAAK,EAAE,4BAA4B,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAwDxF,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,aAAa,CAAC,kBAAkB,CAAC;IAqClF,OAAO,IAAI,IAAI;IAUf,iDAAiD;IACjD,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAK7C,2CAA2C;IAC3C,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,SAAS;IAuDjB;;;;;;;;OAQG;YACW,eAAe;IAqD7B,8CAA8C;IAC9C,OAAO,CAAC,YAAY;IAyBpB,OAAO,CAAC,aAAa;IA6BrB,uCAAuC;IACjC,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUjD,mCAAmC;IACnC,OAAO,CAAC,mBAAmB;IAc3B,4CAA4C;YAC9B,WAAW;YA2FV,WAAW;IA4D1B,OAAO,CAAC,WAAW;CAapB"}

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

@@ -14,7 +14,7 @@ import { commandCodeNativeAgentArgs, commandCodeNativeAgentEnvironment, subagent
 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';
+import { CommandCodeHistory, CommandCodeUsageTail, } from './command-code-history.js';
 const WINDOWS = process.platform === 'win32';
 const COMMAND_CODE_BINARIES = WINDOWS
     ? ['command-code', 'commandcode', 'cmdc']
@@ -196,8 +196,14 @@ function commandCodePermissionArgs(permission) {
  */
 export class CommandCodeDriver {
     descriptor;
-    /** 驱动自己维护 Provider turn 边界，Host 可以把工具边界映射为 DSH step。 */
-    supportsSegmentedTurns = true;
+    /**
+     * print 回合由驱动自己维护 Provider turn 边界；ACP 回合的整个 agent 循环跑在
+     * 一个 `session/prompt` 里，驱动无法在中间结束 llm/stream，只能交给 Registry
+     * 在工具完成后挂起同一个迭代器分步。
+     */
+    get supportsSegmentedTurns() { return this.acpDriver === undefined; }
+    /** ACP 回合由 Registry 按工具边界挂起并续读同一个迭代器。 */
+    get supportsToolStepSplitting() { return this.acpDriver !== undefined; }
     homeDirectory;
     binaries;
     runSpawnSync;
@@ -229,6 +235,10 @@ export class CommandCodeDriver {
         const acpCapabilities = [...legacyCapabilities, 'permission', 'questions'];
         this.descriptor = { id: 'command-code', name: 'Command Code', protocol: options.enableAcp === true ? 'acp' : 'command', capabilities: options.enableAcp === true ? acpCapabilities : legacyCapabilities };
         if (options.enableAcp === true) {
+            // ACP 只在 prompt 结束时给出整轮累计用量。这里按 canonical transcript 的增量
+            // 把每次模型请求的用量单独交给驱动，ContextMeter 才不会把整轮累计（实测
+            // 17.6M）当成当前上下文占用。
+            const usageTail = new CommandCodeUsageTail(this.homeDirectory);
             this.acpDriver = new AcpCliDriver({
                 binaries: this.binaries,
                 spawnSync: this.runSpawnSync,
@@ -245,6 +255,25 @@ export class CommandCodeDriver {
                 readQuestionRequest: readCommandCodeQuestionRequest,
                 decidePermission: commandCodeAcpPermissionDecision,
                 enrichUsage: enrichCommandCodeUsage,
+                stepUsage: {
+                    begin: (input, providerSessionId) => {
+                        usageTail.begin(providerSessionId, input.cwd ?? process.cwd());
+                    },
+                    take: (input, providerSessionId) => {
+                        const delta = usageTail.take(providerSessionId, input.cwd ?? process.cwd());
+                        if (delta === null)
+                            return null;
+                        // 只给原始四桶：上下文窗口与占用由 ACP 驱动合并 Provider 的 usage_update
+                        // 之后再补齐，避免这里先把 contextTokens 写成请求规模、盖掉真实占用。
+                        const usage = usageChunk({
+                            inputTokens: delta.inputTokens,
+                            outputTokens: delta.outputTokens,
+                            cacheReadTokens: delta.cacheReadTokens,
+                            cacheWriteTokens: delta.cacheWriteTokens,
+                        });
+                        return usage?.type === 'usage' ? usage : null;
+                    },
+                },
                 probeReason: 'Command Code ACP 不公开可安全读取的会话索引',
             });
             this.respondPermission = (sessionId, response) => this.acpDriver.respondPermission(sessionId, response);