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

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

@@ -1,11 +1,17 @@
 import { spawn, spawnSync } from 'node:child_process';
 import type { CodingNsAgentEvent, CodingNsAgentQuestionResponse, CodingNsCliModelCatalog, CodingNsAgentPermissionResponse, CodingNsCliTurnInput, CodingNsCliSkillDescriptor, CodingNsCliSkillListInput } from '../../shared/contracts/cli-adapter.js';
 import type { CodingNsCliDriver, CodingNsCliSessionProbeInput, CodingNsCliSessionProbeResult } from './driver.js';
+import { type CodexComputerUseMode, type CodexComputerUseServerConfig } from '../cli-bridge/injections.js';
 export interface CodexAppServerDriverOptions {
     readonly binaries?: readonly string[];
     readonly sessionRoots?: readonly string[];
     readonly spawnSync?: typeof spawnSync;
     readonly spawn?: typeof spawn;
+    /** Computer Use 运行时策略；生产 Feature 使用 auto，受限部署可显式关闭。 */
+    readonly computerUse?: CodexComputerUseMode;
+    /** 注入测试或受控部署提供的官方 cua_repl 配置。 */
+    readonly computerUseConfig?: CodexComputerUseServerConfig;
+    readonly codexHome?: string;
 }
 /** Codex app-server 的 JSON-RPC 驱动，Host 只暴露统一文本流，不暴露线程和 token。 */
 export declare class CodexAppServerDriver implements CodingNsCliDriver {
@@ -13,7 +19,7 @@ export declare class CodexAppServerDriver implements CodingNsCliDriver {
         readonly id: "codex";
         readonly name: "Codex";
         readonly protocol: "json-rpc";
-        readonly capabilities: readonly ["models", "skills", "stream", "resume", "interrupt", "tool-events", "reasoning", "usage", "permission", "questions", "steer"];
+        readonly capabilities: readonly ["models", "skills", "stream", "resume", "interrupt", "tool-events", "reasoning", "usage", "permission", "questions", "steer", "computer-use"];
     };
     readonly supportsSegmentedTurns = true;
     private readonly binaries;
@@ -22,6 +28,8 @@ export declare class CodexAppServerDriver implements CodingNsCliDriver {
     private readonly sessionRoots;
     /** Codex 配置根目录；`config.toml` 与 `auth.json` 都位于这里。 */
     private readonly codexHome;
+    private readonly computerUseMode;
+    private readonly computerUseConfig;
     private cachedBinary;
     private readonly processes;
     private readonly sessions;
@@ -55,6 +63,7 @@ export declare class CodexAppServerDriver implements CodingNsCliDriver {
      */
     listSkills(input: CodingNsCliSkillListInput): Promise<readonly CodingNsCliSkillDescriptor[]>;
     executeTurn(input: CodingNsCliTurnInput): AsyncIterable<CodingNsAgentEvent>;
+    private executeRawTurn;
     /**
      * 将一个 Codex turn 按 assistant item 切成多个 DSH step。
      *
@@ -111,6 +120,7 @@ export declare class CodexAppServerDriver implements CodingNsCliDriver {
     /** 回传 requestUserInput 的结构化回答。 */
     respondQuestion(sessionId: string, response: CodingNsAgentQuestionResponse): void;
     dispose(): void;
+    private appServerArgs;
     private getSession;
 }
 //# sourceMappingURL=codex-driver.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"codex-driver.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/codex-driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAKrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,uBAAuB,EAA0B,+BAA+B,EAA0B,oBAAoB,EAAE,0BAA0B,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAA;AACrS,OAAO,KAAK,EAAE,iBAAiB,EAAE,4BAA4B,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAA;AASjH,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACrC,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACzC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,SAAS,CAAA;IACrC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAA;CAC9B;AAoID,iEAAiE;AACjE,qBAAa,oBAAqB,YAAW,iBAAiB;IAC5D,QAAQ,CAAC,UAAU;;;;;MAAuN;IAG1O,QAAQ,CAAC,sBAAsB,QAAO;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,YAAY,CAAmB;IAChD,qDAAqD;IACrD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4B;IACtD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;gBAE/C,OAAO,GAAE,2BAAgC;IASrD;;;;;;;;;;;;OAYG;IACH,kBAAkB,IAAI,MAAM,GAAG,SAAS;IAWlC,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;IAMzF,UAAU,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAoC9C,YAAY,CAAC,KAAK,EAAE,4BAA4B,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAW/F;;;;;OAKG;IACG,UAAU,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,SAAS,0BAA0B,EAAE,CAAC;IAe3F,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,aAAa,CAAC,kBAAkB,CAAC;IAiIlF;;;;;OAKG;YACY,oBAAoB;YAuDrB,kBAAkB;YA0EjB,cAAc;IAoE7B,OAAO,CAAC,kBAAkB;IAQ1B;;;;;;;;OAQG;YACW,gBAAgB;IAmB9B;;;;;;;;;;OAUG;YACW,sBAAsB;IAoBpC,2CAA2C;YAC7B,qBAAqB;IAQnC,qDAAqD;YACvC,SAAS;IAWvB,uEAAuE;YACzD,kBAAkB;YAiBlB,mBAAmB;IAiBjC,sEAAsE;YACxD,aAAa;YAgBb,iBAAiB;IAyF/B,iCAAiC;IAC3B,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAe7D,yCAAyC;IACnC,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjD;;;OAGG;IACH,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAM7C,iCAAiC;IACjC,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,+BAA+B,GAAG,IAAI;IAuBrF,kCAAkC;IAClC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,6BAA6B,GAAG,IAAI;IAQjF,OAAO,IAAI,IAAI;YAcD,UAAU;CAuEzB"}
+{"version":3,"file":"codex-driver.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/codex-driver.ts"],"names":[],"mappings":"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"}

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

@@ -9,20 +9,18 @@ import { CODEX_CATALOG, isProviderDefaultModel } from './model-catalog.js';
 import { probeStoredSession, readFirstJsonRecord } from './session-probe.js';
 import { firstToolText, normalizeToolStatus, serializeToolValue } from './tool-observation.js';
 import { isQuestionEvent, questionAnswersRecord, readAgentQuestions } from './interaction-events.js';
-import { codexBridgeArgs, codexBridgeDeveloperInstructions } from '../cli-bridge/injections.js';
+import { codexBridgeArgs, codexBridgeDeveloperInstructions, codexComputerUseLaunchSettings } from '../cli-bridge/injections.js';
+import { CodexFileCitationNormalizer } from './codex-file-citations.js';
 // 只有 Provider 已明确报告超过窗口时才主动压缩；接近上限仍交给 Codex
 // 自身的 auto-compact，避免对正常的高占用回合重复发起压缩。
 const CODEX_COMPACTION_THRESHOLD = 1;
 const CODEX_COMPACTION_TIMEOUT_MS = 60_000;
-// Codex CLI 默认会启用 computer_use；DSH 没有对应的桌面控制宿主，必须在
-// app-server 进程启动时关闭该 feature，避免模型进入无法完成的控制回合。
-const CODEX_APP_SERVER_ARGS = [
+const CODEX_APP_SERVER_BASE_ARGS = [
     // 原生 request_permissions 默认关闭。必须在插件进程内启用，模型才能主动
     // 发出 item/permissions/requestApproval，而不是靠试写文件碰沙箱边界。
     // 用配置覆盖而非 --enable：旧版会忽略未知 feature 配置，保留原命令审批通道。
     '-c', 'features.request_permissions_tool=true',
     'app-server',
-    '--disable', 'computer_use',
     // Codex 默认关闭 request_user_input；不开启时模型只能把“提问”写成普通文本，
     // app-server 不会发出 item/tool/requestUserInput，DSH 也就没有问题事件可投影。
     '--enable', 'default_mode_request_user_input',
@@ -49,6 +47,7 @@ const CODEX_QUESTION_DEVELOPER_INSTRUCTIONS = [
  */
 const CODEX_PERMISSION_DEVELOPER_INSTRUCTIONS = [
     'CodingNS 通过 DSH 原生审批面板处理权限申请，权限边界和审批策略以当前回合的运行时上下文为准。',
+    'Computer Use 只在 macOS 官方 cua_repl 运行时可用，需要系统为运行时授予屏幕录制和辅助功能权限；权限不足时如实报告失败，不要反复重试或改用命令工具绕过拒绝。',
     '操作需要额外权限且当前审批策略允许交互时，优先调用原生 request_permissions 工具，申请完成任务所需的最小文件或网络权限，并等待结构化审批结果。',
     '用户要求主动触发或验证权限申请时，应自行选择当前允许范围之外的最小权限并调用 request_permissions；工作区、/tmp、/private/tmp 和 TMPDIR 可能已可写，在这些目录执行普通写入不等于发起审批。',
     '只有当前工具列表没有 request_permissions 时，才使用原生命令工具的 require_escalated 审批通道；工具参数和目标路径由你确定，不要要求用户编写提权命令。',
@@ -58,7 +57,7 @@ const CODEX_PERMISSION_DEVELOPER_INSTRUCTIONS = [
 ].join('\n');
 /** Codex app-server 的 JSON-RPC 驱动，Host 只暴露统一文本流，不暴露线程和 token。 */
 export class CodexAppServerDriver {
-    descriptor = { id: 'codex', name: 'Codex', protocol: 'json-rpc', capabilities: ['models', 'skills', 'stream', 'resume', 'interrupt', 'tool-events', 'reasoning', 'usage', 'permission', 'questions', 'steer'] };
+    descriptor = { id: 'codex', name: 'Codex', protocol: 'json-rpc', capabilities: ['models', 'skills', 'stream', 'resume', 'interrupt', 'tool-events', 'reasoning', 'usage', 'permission', 'questions', 'steer', 'computer-use'] };
     // Codex 一个 Provider turn 可能同时包含多个工具调用。只有 assistant item
     // 切换后才分段，不能在每个工具完成后注入下一 step。
     supportsSegmentedTurns = true;
@@ -68,6 +67,8 @@ export class CodexAppServerDriver {
     sessionRoots;
     /** Codex 配置根目录；`config.toml` 与 `auth.json` 都位于这里。 */
     codexHome;
+    computerUseMode;
+    computerUseConfig;
     cachedBinary = null;
     processes = new Set();
     sessions = new Map();
@@ -75,8 +76,12 @@ export class CodexAppServerDriver {
         this.binaries = options.binaries ?? ['codex'];
         this.runSpawnSync = options.spawnSync ?? spawnSync;
         this.runSpawn = options.spawn ?? spawn;
-        const codexHome = process.env.CODEX_HOME ?? join(homedir(), '.codex');
+        const codexHome = options.codexHome ?? process.env.CODEX_HOME ?? join(homedir(), '.codex');
         this.codexHome = codexHome;
+        // 直接构造驱动时保持旧的安全默认值；正式 Feature 显式传入 auto，避免测试
+        // 或第三方嵌入在没有桌面宿主时意外启动 CUA 运行时。
+        this.computerUseMode = options.computerUse ?? 'disabled';
+        this.computerUseConfig = options.computerUseConfig;
         this.sessionRoots = options.sessionRoots ?? [join(codexHome, 'sessions'), join(codexHome, 'archived_sessions')];
     }
     /**
@@ -113,7 +118,9 @@ export class CodexAppServerDriver {
         const command = this.cachedBinary ?? (await this.detect()).command;
         if (command === null)
             return emptyCatalog();
-        const rpc = new JsonRpcProcess({ command, args: CODEX_APP_SERVER_ARGS, explicitWindowsShell: true, spawn: this.runSpawn });
+        // 模型目录查询不需要启动桌面运行时；否则每次刷新模型都会唤起 CUA 服务，
+        // 还可能在没有系统权限时把一个与模型无关的失败带进目录查询。
+        const rpc = new JsonRpcProcess({ command, args: this.appServerArgs(false), explicitWindowsShell: true, spawn: this.runSpawn });
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), 12_000);
         try {
@@ -181,6 +188,12 @@ export class CodexAppServerDriver {
         return [...session.skills.values()].map(({ path: _path, ...descriptor }) => descriptor);
     }
     async *executeTurn(input) {
+        const citations = new CodexFileCitationNormalizer();
+        for await (const chunk of this.executeRawTurn(input))
+            yield* citations.push(chunk);
+        yield* citations.flush();
+    }
+    async *executeRawTurn(input) {
         const command = this.cachedBinary ?? (await this.detect()).command;
         if (command === null)
             throw new Error('Codex 未安装');
@@ -285,7 +298,7 @@ export class CodexAppServerDriver {
                 if (responseTerminal !== null)
                     onNotification(responseTerminal);
                 for await (const message of eventQueue.iterable) {
-                    const rawChunk = codexMessageToChunk(message);
+                    const rawChunk = codexMessageToChunk(message, input.cwd);
                     if (rawChunk === null)
                         continue;
                     for (const chunk of expandCodexCompactionChunk(session, rawChunk)) {
@@ -502,7 +515,7 @@ export class CodexAppServerDriver {
                 }
                 if (input.signal?.aborted)
                     throw new Error('请求已取消');
-                chunk = codexMessageToChunk(next.value);
+                chunk = codexMessageToChunk(next.value, input.cwd);
             }
             if (chunk === null)
                 continue;
@@ -873,6 +886,16 @@ export class CodexAppServerDriver {
         this.processes.clear();
         this.cachedBinary = null;
     }
+    appServerArgs(includeComputerUse = true) {
+        const computerUse = codexComputerUseLaunchSettings(includeComputerUse ? this.computerUseMode : 'disabled', includeComputerUse ? this.computerUseConfig : undefined, this.codexHome);
+        return [
+            ...CODEX_APP_SERVER_BASE_ARGS.slice(0, 2),
+            ...computerUse.args,
+            ...CODEX_APP_SERVER_BASE_ARGS.slice(2, 3),
+            ...(computerUse.enabled ? ['--enable', 'computer_use'] : ['--disable', 'computer_use']),
+            ...CODEX_APP_SERVER_BASE_ARGS.slice(3),
+        ];
+    }
     async getSession(input, command) {
         const previous = this.sessions.get(input.sessionId);
         if (previous !== undefined && previous.cwd === input.cwd)
@@ -884,7 +907,7 @@ export class CodexAppServerDriver {
         const bridgeArgs = codexBridgeArgs(input.sessionId, this.descriptor.id);
         // Codex 的 `-c` 覆盖项必须与 app-server 的其余启动参数放在同一侧；
         // 统一置于子命令前，避免不同版本对全局/子命令参数的解析差异。
-        const rpc = new JsonRpcProcess({ command, args: [...bridgeArgs, ...CODEX_APP_SERVER_ARGS], cwd: input.cwd, explicitWindowsShell: true, spawn: this.runSpawn });
+        const rpc = new JsonRpcProcess({ command, args: [...bridgeArgs, ...this.appServerArgs()], cwd: input.cwd, explicitWindowsShell: true, spawn: this.runSpawn });
         const session = {
             rpc,
             cwd: input.cwd,
@@ -1174,7 +1197,7 @@ function summarizeCodexAuth(auth) {
     const accountId = tokens !== undefined && typeof tokens.account_id === 'string' ? tokens.account_id : '';
     return `${mode}|apiKey=${hasApiKey}|tokens=${hasTokens}|account=${accountId}`;
 }
-function codexMessageToChunk(message) {
+function codexMessageToChunk(message, cwd) {
     const params = isRecord(message.params) ? message.params : message;
     const item = isRecord(params.item) ? params.item : params;
     const method = typeof message.method === 'string' ? message.method : '';
@@ -1213,6 +1236,9 @@ function codexMessageToChunk(message) {
         const compactionId = readTurnId(message);
         return { type: 'context-compaction', phase: 'end', ...(compactionId === null ? {} : { compactionId }) };
     }
+    const imageArtifact = codexImageArtifact(method, type, params, item, cwd);
+    if (imageArtifact !== null)
+        return imageArtifact;
     if (isQuestionEvent(`${method} ${type}`)) {
         const requestId = readRequestId(message) ?? readRequestId(params);
         const questions = readAgentQuestions(params.questions ?? item.questions ?? params);
@@ -1248,7 +1274,12 @@ function codexMessageToChunk(message) {
         return text ? { type: 'reasoning-delta', text, ...(messageId === undefined ? {} : { messageId }) } : null;
     }
     if (isCodexToolEvent(method, type)) {
-        const name = firstToolText(isFileChangeType(type) ? 'edit_file' : undefined, item.name, item.toolName, item.tool, item.command !== undefined ? 'command_execution' : undefined, type);
+        const mcpToolName = type.replace(/[_-]/gu, '').toLowerCase() === 'mcptoolcall'
+            ? firstToolText(item.server, item.tool) === undefined
+                ? undefined
+                : `${firstToolText(item.server) ?? 'mcp'}.${firstToolText(item.tool) ?? 'tool'}`
+            : undefined;
+        const name = firstToolText(isFileChangeType(type) ? 'edit_file' : undefined, mcpToolName, item.name, item.toolName, item.tool, item.command !== undefined ? 'command_execution' : undefined, type);
         const callId = firstToolText(item.callId, item.call_id, item.toolCallId, item.id, params.itemId);
         const agentId = firstToolText(item.agentId, item.agent_id, type.includes('agent') || type.includes('collab') ? item.id : undefined);
         const input = serializeToolValue(isFileChangeType(type) ? fileChangeToolInput(item) : item.arguments ?? item.input ?? item.command);
@@ -1266,7 +1297,7 @@ function codexMessageToChunk(message) {
             ...(callId ? { callId } : {}),
             ...(input !== undefined ? { input } : {}),
             ...(failed
-                ? { error: explicitError ?? output ?? `exit code ${String(item.exitCode ?? item.exit_code)}` }
+                ? { error: explicitError ?? output ?? '工具执行失败' }
                 : output === undefined ? {} : { output }),
             ...(!failed && output !== undefined ? { outputMode: 'snapshot' } : {}),
             ...(agentId ? { agentId } : {}),
@@ -1275,6 +1306,41 @@ function codexMessageToChunk(message) {
     }
     return codexUsageChunk(params);
 }
+/**
+ * Codex image_gen 在不同版本有两种结果：旧版提供 saved_path，新版扩展可能只
+ * 提供 image_generation_end.result 的 base64 PNG。两者都在 Host 内转成附件，不能
+ * 把 result 放进普通工具文本，也不能让 Client 读取 Provider 的原始路径。
+ */
+function codexImageArtifact(method, type, params, item, cwd) {
+    const marker = `${method} ${type} ${firstToolText(item.name, item.toolName, item.tool) ?? ''}`.toLowerCase();
+    if (!/(?:image[_/-]?generation|image[_/-]?gen|imagegeneration)/u.test(marker))
+        return null;
+    const rawPath = firstToolText(item.saved_path, item.savedPath, item.output_path, item.outputPath, item.image_path, item.imagePath, params.saved_path, params.savedPath);
+    const path = rawPath === undefined ? undefined : resolve(cwd ?? process.cwd(), rawPath);
+    const data = codexImageData(item.result ?? params.result ?? item.image ?? params.image);
+    if (path === undefined && data === undefined)
+        return null;
+    return {
+        type: 'image-artifact',
+        ...(path === undefined ? {} : { path }),
+        ...(data === undefined ? {} : { data }),
+        ...(data === undefined ? {} : { mediaType: 'image/png' }),
+        ...(path === undefined ? {} : { name: basename(path) }),
+    };
+}
+function codexImageData(value) {
+    if (typeof value === 'string') {
+        const candidate = value.trim();
+        if (/^data:image\/[A-Za-z0-9.+-]+;base64,[A-Za-z0-9+/=]+$/u.test(candidate))
+            return candidate;
+        if (candidate.length >= 128 && candidate.length % 4 === 0 && /^[A-Za-z0-9+/]*={0,2}$/u.test(candidate))
+            return candidate;
+        return undefined;
+    }
+    if (!isRecord(value))
+        return undefined;
+    return codexImageData(value.b64_json ?? value.base64 ?? value.data ?? value.image_url ?? value.url);
+}
 /** 判断分段续流是否带来了新的真实用户插话。 */
 function isCodexSteeringInput(input) {
     if (input.resumeSegmentedTurn !== true || input.prompt.trim() === '')