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

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();