@jingyi0605/codingns4dsh 0.2.1-beta.8 → 0.2.1-rc.2

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

@@ -1,10 +1,20 @@
 /**
- * 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
- * 目录；当上游实现已经变化时保持原模块不变。
+ * The model catalog and Magpie session patches depend only on stable function
+ * entries,
+ * not on minified catalog variable names or the complete function text. If the
+ * upstream entry point disappears, the original module is left unchanged.
  */
 interface LoaderContext {
     readonly format?: string;

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;;;;;;;;;;;;;;;;;GAiBG;AAIH,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,11 +1,22 @@
 /**
- * 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
- * 目录；当上游实现已经变化时保持原模块不变。
+ * The model catalog and Magpie session patches depend only on stable function
+ * entries,
+ * not on minified catalog variable names or the complete function text. If the
+ * upstream entry point disappears, the original module is left unchanged.
  */
+import { fileURLToPath } from 'node:url';
 const COMMAND_CODE_CLI_SUFFIX = '/dist/cli.mjs';
 /** Node ESM loader 入口；只拦截 Command Code 自己的 CLI bundle。 */
 export async function load(url, context, nextLoad) {
@@ -13,9 +24,18 @@ 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 = patchCommandCodeAcpMod(patchCommandCodeAcpMagpieSession(patchCommandCodeAcpByokModels(patchCommandCodeAcpQuestion(source))));
     return patched === source ? loaded : { ...loaded, source: patched, shortCircuit: true };
 }
+/** ACP skips the ordinary CLI action that applies --mod before host creation. */
+function patchCommandCodeAcpMod(source) {
+    const entry = 'async function runAcp(){';
+    const mod = fileURLToPath(new URL('../cli-bridge/command-code-mod.js', import.meta.url));
+    const initialize = `if(process.env.CODINGNS_DISABLE_NATIVE_AGENT==="1")setModPathsOverride([${JSON.stringify(mod)}]);`;
+    if (!source.includes('function setModPathsOverride(') || !source.includes(entry) || source.includes(initialize))
+        return source;
+    return source.replace(entry, entry + initialize);
+}
 /**
  * 把 Host 扩展回包里的 codingns/questionAnswer 读回 Command Code 的问题工具。
  * answers 同时接受数组和对象形状，兼容已经采用 Qwen 风格扩展的上游版本。
@@ -36,4 +56,139 @@ function patchCommandCodeAcpQuestion(source) {
     patched = patched.replace(questionDeclaration, `${helper}${questionDeclaration}`);
     return patched;
 }
+/**
+ * Magpie associates usage and route records through `X-Magpie-Session`.
+ * Command Code already passes its ACP session as `threadId` to the model
+ * transport, but its built-in session-header helper only handles OpenCode.
+ * Add the Magpie header for loopback OpenAI-compatible `/v1` gateways.
+ */
+function patchCommandCodeAcpMagpieSession(source) {
+    const original = 'function sessionRoutingHeaders(e){return e.threadId&&isSessionRoutedHost(e.baseURL)?Object.keys(e.headers??{}).some(e=>e.toLowerCase()===NT)?{}:{[NT]:e.threadId}:{}}';
+    if (!source.includes(original) || source.includes('codingNsMagpieBaseUrl'))
+        return source;
+    const helper = 'function codingNsMagpieBaseUrl(e){try{const t=new URL(e);return(t.hostname==="127.0.0.1"||t.hostname==="localhost"||t.hostname==="::1"||t.hostname==="[::1]")&&(/^\\/v1(?:\\/|$)/u.test(t.pathname))}catch{return false}}';
+    const replacement = `${helper}function sessionRoutingHeaders(e){const t=Object.keys(e.headers??{});if(e.threadId&&isSessionRoutedHost(e.baseURL))return t.some(e=>e.toLowerCase()===NT)?{}:{[NT]:e.threadId};return e.threadId&&codingNsMagpieBaseUrl(e.baseURL)&&!t.some(e=>e.toLowerCase()==="x-magpie-session")?{"x-magpie-session":e.threadId}:{}}`;
+    return source.replace(original, replacement);
+}
+/**
+ * Stable declaration shape for the upstream `catalogModels()` function.
+ *
+ * Command Code's minified catalog variable changed between 1.74, 1.82, and 1.84
+ * (for example RL, NL, and QD), while ACP still builds its built-in catalog here.
+ * Matching only the function entry and finding its body with balanced braces
+ * avoids updating the plugin for every bundle re-minification.
+ */
+const CATALOG_MODELS_DECLARATION = /function\s+catalogModels\s*\([^)]*\)\s*\{/u;
+/**
+ * Injected helper that supplements the bundle's BYOK model catalog.
+ *
+ * `process.getBuiltinModule` loads fs/os without depending on minified cli.mjs
+ * import aliases. The providers file is read on each call, so changing BYOK
+ * configuration does not require restarting the ACP process. Missing or invalid
+ * configuration returns an empty list and preserves the upstream catalog.
+ */
+const BYOK_MODELS_HELPER = 'function codingNsByokModels(){' +
+    'const normalize=e=>e&&typeof e.id==="string"&&e.id.trim()!==""?' +
+    '{id:e.id,name:typeof e.name==="string"&&e.name.trim()!==""?e.name:e.id,' +
+    'description:typeof e.description==="string"&&e.description.trim()!==""?e.description:"byok"}:null;' +
+    'try{if(typeof customModelListOptions==="function"){const e=customModelListOptions();' +
+    'if(Array.isArray(e)){const n=e.map(e=>normalize({...e,name:e.id})).filter(Boolean);if(n.length>0)return n}}}catch{}' +
+    'try{if(typeof getCustomProviderModelsSync==="function"){const e=getCustomProviderModelsSync();' +
+    'if(Array.isArray(e)){const n=[];for(const t of e){if(!t||typeof t.id!=="string"||!Array.isArray(t.models))continue;' +
+    'for(const e of t.models){if(!e||typeof e.id!=="string"||e.id.trim()==="")continue;' +
+    'n.push(normalize({id:t.id+"/"+e.id,name:typeof e.name==="string"?e.name:e.id,' +
+    'description:typeof t.name==="string"&&t.name.trim()!==""?t.name:"byok"}))}' +
+    '}if(n.length>0)return n}}}catch{}' +
+    'try{const fs=process.getBuiltinModule("node:fs"),os=process.getBuiltinModule("node:os"),' +
+    'home=typeof process.env.HOME==="string"&&process.env.HOME.trim()!==""?process.env.HOME:os.homedir(),' +
+    'p=home+"/.commandcode/providers.json";if(!fs.existsSync(p))return[];' +
+    'const c=JSON.parse(fs.readFileSync(p,"utf8")),m=c&&typeof c.provider==="object"&&c.provider!==null?' +
+    'c.provider:c&&typeof c.providers==="object"&&c.providers!==null?c.providers:null;if(!m)return[];' +
+    'const n=[];for(const t of Object.keys(m)){const e=m[t];' +
+    'if(!/^[a-z0-9][a-z0-9_.-]{0,63}$/u.test(t)||!e||typeof e!=="object"||e.disabled===true||e.enabled===false||' +
+    'typeof e.models!=="object"||e.models===null)continue;' +
+    'for(const r of Object.keys(e.models)){if(r.trim()!=="")n.push(normalize({id:t+"/"+r,name:t+"/"+r,' +
+    'description:typeof e.name==="string"&&e.name.trim()!==""?e.name:"byok"}))}}return n}catch{return[]}}';
+/** Patched `catalogModels()`: keep built-in entries first, then append unique BYOK models. */
+const BYOK_MODELS_WRAPPER = 'function catalogModels(...args){const a=codingNsBuiltinCatalogModels(...args);' +
+    'for(const e of codingNsByokModels())if(e&&typeof e.id==="string"&&!a.some(n=>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) {
+    const match = CATALOG_MODELS_DECLARATION.exec(source);
+    if (match === null || match.index === undefined)
+        return source;
+    const openingBrace = match.index + match[0].lastIndexOf('{');
+    const end = findJavaScriptBlockEnd(source, openingBrace);
+    if (end === null)
+        return source;
+    const original = source.slice(match.index, end);
+    const renamed = original.replace(/^function\s+catalogModels/u, 'function codingNsBuiltinCatalogModels');
+    if (renamed === original)
+        return source;
+    return `${source.slice(0, match.index)}${BYOK_MODELS_HELPER}${renamed}${BYOK_MODELS_WRAPPER}${source.slice(end)}`;
+}
+/** Find the end of a function body without interpreting braces inside literals/comments. */
+function findJavaScriptBlockEnd(source, openingBrace) {
+    let depth = 0;
+    let quote = null;
+    let escaped = false;
+    let lineComment = false;
+    let blockComment = false;
+    for (let index = openingBrace; index < source.length; index += 1) {
+        const current = source[index];
+        const next = source[index + 1];
+        if (lineComment) {
+            if (current === '\n' || current === '\r')
+                lineComment = false;
+            continue;
+        }
+        if (blockComment) {
+            if (current === '*' && next === '/') {
+                blockComment = false;
+                index += 1;
+            }
+            continue;
+        }
+        if (quote !== null) {
+            if (escaped) {
+                escaped = false;
+            }
+            else if (current === '\\') {
+                escaped = true;
+            }
+            else if (current === quote) {
+                quote = null;
+            }
+            continue;
+        }
+        if (current === '/' && next === '/') {
+            lineComment = true;
+            index += 1;
+            continue;
+        }
+        if (current === '/' && next === '*') {
+            blockComment = true;
+            index += 1;
+            continue;
+        }
+        if (current === '"' || current === "'" || current === '`') {
+            quote = current;
+            continue;
+        }
+        if (current === '{')
+            depth += 1;
+        else if (current === '}') {
+            depth -= 1;
+            if (depth === 0)
+                return index + 1;
+        }
+    }
+    return null;
+}
 //# 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":"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"}

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

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

@@ -10,11 +10,11 @@ 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 { commandCodeNativeAgentArgs, commandCodeNativeAgentEnvironment, subagentBridgeActive } from '../cli-bridge/injections.js';
+import { commandCodeNativeAgentArgs, commandCodeNativeAgentEnvironment, subagentBridgeActive, teamBridgeToken } 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';
+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);
@@ -677,7 +706,7 @@ export class CommandCodeDriver {
     buildTurnArgs(input, turn) {
         // 续跑沿用同一个 Provider 会话，只把输入换成续跑提示；不能再次写入历史，
         // 否则会把 CLI 已经落盘的进度覆盖成空会话。
-        const prompt = turn.attempt > 1 ? this.autoContinuePrompt : promptWithAttachmentPaths(input.prompt, input.attachments ?? []);
+        const prompt = turn.attempt > 1 ? this.autoContinuePrompt : promptWithAttachmentPaths(input.prompt, input.attachments ?? [], input.translationLanguage);
         const args = turn.transcriptPath !== undefined && turn.attempt === 1
             ? ['--session', turn.transcriptPath, '-p', prompt, '--output-format', 'json', '--skip-onboarding', '--max-turns', String(this.maxTurns)]
             : turn.providerSessionId !== undefined
@@ -1962,9 +1991,12 @@ function commandCodeAcpPermissionDecision(message, input) {
     const permission = input.permission;
     const canWrite = input.plan !== true
         && (permission?.sandboxMode === 'workspace-write' || permission?.sandboxMode === 'danger-full-access');
-    // 只识别插件自己的两个入口，不能把全部 MCP/自定义工具或显式风险请求放行。
+    // 只识别插件自己的桥接入口，不能把全部 MCP/自定义工具或显式风险请求放行。
     if (canWrite && metadata.risk === undefined && subagentBridgeActive(input.sessionId)
-        && (toolName === 'agent_subagent' || toolName === 'mcp__codingns__agent_subagent'))
+        && (toolName === 'agent_subagent' || toolName === 'mcp__codingns__agent_subagent'
+            || toolName === 'web_search' || toolName === 'mcp__codingns__web_search'
+            || toolName === 'web_fetch' || toolName === 'mcp__codingns__web_fetch'
+            || toolName === 'agent_team' && teamBridgeToken(input.sessionId) !== undefined))
         return 'allow';
     // never 允许已有授权范围内的工作，但不允许把剩余审批升级成交互弹窗。
     return permission?.approvalPolicy === 'never' ? 'reject' : undefined;