@pure01fx/dsh-openai-codex-auth 0.11.2 → 0.12.0

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 ## Unreleased
 
+## 0.12.0
+
+### Migration
+
+- Migrated to DSH 0.1.7-rc.2 SDK
+- Updated tool message format: tool results are now role:'tool' with top-level toolCallId/isError
+- Migrated shell.run to shell.execute with result() method
+- Updated peer dependencies to 0.1.7-rc.2
+- Updated cordis to ~4.0.4
+- Preserved developer messages in HTTP/WS wire requests
+- Restored successful-result-only matched provenance in cloud context
+- Added mismatch/failed-result regressions in cloud context tests
+
+### Key Changes
+
+- Tool messages: role:'tool' with top-level toolCallId/isError (no longer tool-result content blocks)
+- Shell: execute() then .result() instead of run()
+- Developer messages: preserved in Responses API requests
+- Cloud context: requires toolCallId === source.callId and !isError
+
 ## 0.11.2
 
 - Requests the live model catalog as Codex 0.155.0 so version-gated GPT-6 Sol can be advertised; preserves dynamic account-specific discovery and routes exact Sol requests through Responses Lite when catalog metadata is unavailable. Fast remains catalog-authorized.
@@ -131,4 +151,4 @@
 - Rejects redirects for credential-bearing OAuth, Catalog, Responses, and subscription-usage requests.
 - Keeps OAuth credentials and account authority host-side, validates credential-bearing endpoint authorities, bounds request/response/replay/WebSocket state, and refuses managed/external credential mismatches.
 - Pins Host/runtime contracts to DSH rc.6 and includes synchronized JavaScript/declaration artifacts plus the complete native transport modules.
-- Keeps the package name `@pure01fx/dsh-openai-codex-auth`; a rename is intentionally deferred.
+- Keeps the package name `@pure01fx/dsh-openai-codex-auth`; a rename is intentionally deferred.

package/README.md

@@ -17,7 +17,7 @@
 
 ## 快速开始
 
-版本 `0.11.1` 明确适配 DeepSeek Harness `0.1.5-rc.1`，SDK peers/runtime helpers 精确锁定该版本；不声明兼容旧 SDK。旧 DSH `0.1.1-rc.2` profile 应保留原插件 `0.10.0`，升级时在独立 profile 安装新版插件并保留原 profile/锁文件以便回滚。无需迁移账号文件或浏览器隐藏列表；`dsh.engines` 仅作兼容性说明，不当作宿主硬门禁。
+版本 `0.12.0` 明确适配 DeepSeek Harness `0.1.7-rc.2`，SDK peers/runtime helpers 精确锁定该版本；不声明兼容旧 SDK。旧 DSH `0.1.5-rc.1` profile 应保留原插件 `0.11.2`，升级时在独立 profile 安装新版插件并保留原 profile/锁文件以便回滚。无需迁移账号文件或浏览器隐藏列表；`dsh.engines` 仅作兼容性说明，不当作宿主硬门禁。
 
 本版本通过真实目标 LLM/tools 服务与本地 HTTP/SSE/WebSocket 回放、错误/取消回归；模型隐藏覆盖真实目录/catalog/store 的投影更新、重连和重新加载。验证命令为 `pnpm typecheck && pnpm build && pnpm test`；当前版本未执行线上 OAuth/付费模型验收。
 
@@ -356,4 +356,4 @@ node --check client.js
 
 ## License
 
-[MIT](./LICENSE)
+[MIT](./LICENSE)

package/lib/cloud-context.js

@@ -14,16 +14,6 @@ export function chooseCloudModel(params, models) {
 export function visibleCloudImages(messages) {
     const images = [];
     const calls = new Set();
-    const visit = (blocks, depth = 0) => {
-        if (depth > 16)
-            return;
-        for (const block of blocks) {
-            if (block.type === 'image')
-                images.push(block.attachment);
-            else if (block.type === 'tool-result' && !block.isError && calls.has(block.toolCallId))
-                visit(block.content, depth + 1);
-        }
-    };
     for (const message of messages) {
         if (message.role === 'assistant') {
             for (const block of message.content)
@@ -36,10 +26,16 @@ export function visibleCloudImages(messages) {
                 if (block.type === 'image')
                     images.push(block.attachment);
         }
-        else if (message.role === 'user' && message.source.kind === 'tool' && calls.has(message.source.callId)) {
+        else if (message.role === 'tool' && message.source.kind === 'tool') {
+            // Require successful result with matching callId and earlier matching call
+            if (message.isError || message.toolCallId !== message.source.callId)
+                continue;
+            if (!calls.has(message.source.callId))
+                continue;
+            // Tool messages with images in their content
             for (const block of message.content)
-                if (block.type === 'tool-result' && block.toolCallId === message.source.callId && !block.isError)
-                    visit(block.content);
+                if (block.type === 'image')
+                    images.push(block.attachment);
         }
     }
     return images;

package/lib/cloud-media.d.ts

@@ -24,7 +24,7 @@ export interface ResolvedCloudImage {
 export declare function resolveImageSources(value: ImageSelection, deps: MediaSourceDependencies): Promise<ResolvedCloudImage[]>;
 export interface MediaOutputDependencies {
     fs: Pick<FileSystem, 'resolve' | 'processPath' | 'contains'>;
-    shell: Pick<ShellExecutor, 'resolve' | 'run' | 'sandboxMode'>;
+    shell: Pick<ShellExecutor, 'resolve' | 'execute' | 'sandboxMode'>;
     /** Resolve from the calling session with the public sandboxPolicy service. */
     policy: SandboxExecutionPolicy;
     attachments: Pick<AttachmentStore, 'validateImage' | 'saveImage'>;

package/lib/cloud-media.js

@@ -92,11 +92,12 @@ export async function saveImageOutputs(response, deps) {
         if (!deps.fs.contains(workspace, target))
             throw new Error('Original image target escapes caller workspace');
         const path = deps.fs.processPath(target);
-        const outcome = await deps.shell.run(deps.shell.resolve({
+        const execution = await deps.shell.execute(deps.shell.resolve({
             command: 'node -e ' + quote(WRITE_ORIGINAL) + ' -- ' + quote(path),
             stdin: Buffer.from(image.data).toString('base64'), workdir: deps.fs.processPath(workspace),
             sandboxPolicy: deps.policy, signal: deps.signal, timeoutMs: 30_000, stdoutMaxBytes: 1024,
         }));
+        const outcome = await execution.result();
         if (outcome.sandbox?.denied || outcome.sandbox?.runnerFailed || outcome.exitCode !== 0 || outcome.aborted || outcome.timedOut)
             throw new Error('Original image write failed under caller filesystem policy');
         const attachment = await deps.attachments.saveImage({ data: image.data, mediaType: image.mediaType, name });

package/lib/cloud-web-tool.js

@@ -124,12 +124,11 @@ function checkReferences(args, messages, id, recent) {
             for (const block of message.content)
                 if (block.type === 'tool-call')
                     calls.set(block.id, block.name);
-        if (message.source.kind !== 'tool' || !['codex_web', 'run_code'].includes(calls.get(message.source.callId) ?? ''))
+        if (message.role !== 'tool' || message.isError || message.source.kind !== 'tool'
+            || message.toolCallId !== message.source.callId
+            || !['codex_web', 'run_code'].includes(calls.get(message.toolCallId) ?? ''))
             continue;
-        for (const block of message.content)
-            if (block.type === 'tool-result' && block.toolCallId === message.source.callId && !block.isError) {
-                outputs.push(block.content.filter(part => part.type === 'text').map(part => part.text).join('\n'));
-            }
+        outputs.push(message.content.filter(block => block.type === 'text').map(block => block.text).join('\n'));
     }
     outputs.push(...recent);
     for (const ref of refs) {

package/lib/native-http.js

@@ -122,28 +122,29 @@ async function resolveImage(block, options, signal) {
         ...stored.detail === undefined ? {} : { detail: stored.detail },
     };
 }
-async function resolveToolResult(block, options, signal) {
-    const content = [];
-    for (const part of block.content) {
-        throwIfAborted(signal);
-        if (part.type === 'text')
-            content.push(part);
-        else if (part.type === 'image')
-            content.push(await resolveImage(part, options, signal));
-        else {
-            throw fixedFailure('native Codex tool output contains an unsupported content block', 'UNSUPPORTED');
-        }
-    }
-    return {
-        type: 'tool-result',
-        toolCallId: block.toolCallId,
-        content,
-        ...block.isError === undefined ? {} : { isError: block.isError },
-    };
-}
 async function resolveMessages(generation, options) {
     const messages = [];
     for (const message of generation.messages) {
+        if (message.role === 'tool') {
+            const content = [];
+            for (const block of message.content) {
+                throwIfAborted(generation.signal);
+                if (block.type === 'text')
+                    content.push(block);
+                else if (block.type === 'image')
+                    content.push(await resolveImage(block, options, generation.signal));
+                else {
+                    throw fixedFailure('native Codex tool output contains an unsupported content block', 'UNSUPPORTED');
+                }
+            }
+            messages.push({
+                role: 'tool',
+                content,
+                toolCallId: message.toolCallId,
+                ...message.isError !== undefined ? { isError: message.isError } : {},
+            });
+            continue;
+        }
         const content = [];
         const source = message.source;
         const sourceKind = source?.kind;
@@ -177,12 +178,6 @@ async function resolveMessages(generation, options) {
                     // A settlement copies the child's assistant output into user-role context.
                     // Its tool calls belong to the child and must not become parent wire calls.
                     break;
-                case 'tool-result':
-                    if (message.role !== 'user') {
-                        throw fixedFailure('native Codex tool results require user messages', 'INVALID_ARGS');
-                    }
-                    content.push(await resolveToolResult(block, options, generation.signal));
-                    break;
                 default:
                     throw fixedFailure('native Codex request contains an unsupported content block', 'UNSUPPORTED');
             }
@@ -191,6 +186,7 @@ async function resolveMessages(generation, options) {
             && source.replayState !== undefined && hasNativeCodexReplayKind(source.replayState)
             ? { provider: source.provider, model: source.model, replayState: source.replayState }
             : undefined;
+        // Developer messages are preserved for the Responses API
         messages.push({
             role: message.role,
             content,

package/lib/native-websocket.js

@@ -98,7 +98,8 @@ function sessionKey(generation, routingId) {
 function turnKey(generation) {
     for (let index = generation.messages.length - 1; index >= 0; index--) {
         const message = generation.messages[index];
-        if (message?.source.kind === 'user') {
+        // RequestUserInput doesn't have source or id
+        if (message && 'source' in message && message.source?.kind === 'user' && 'id' in message) {
             return createHash('sha256').update(String(message.id)).digest('base64url');
         }
     }

package/lib/responses.d.ts

@@ -9,18 +9,14 @@ export interface ResolvedImagePart {
     dataBase64: string;
     detail?: CodexImageDetail;
 }
-export interface ResolvedToolResultPart {
-    type: 'tool-result';
-    toolCallId: ToolCallId;
-    content: readonly ResolvedContentPart[];
-    isError?: boolean;
-}
 export type ResolvedContentPart = Exclude<ContentBlock, {
-    type: 'image' | 'tool-result';
-}> | ResolvedImagePart | ResolvedToolResultPart;
+    type: 'image';
+}> | ResolvedImagePart;
 export interface ResolvedMessage {
-    role: 'system' | 'user' | 'assistant';
+    role: 'system' | 'user' | 'assistant' | 'tool' | 'developer';
     content: readonly ResolvedContentPart[];
+    toolCallId?: ToolCallId;
+    isError?: boolean;
     replaySource?: NativeCodexReplaySource;
 }
 export interface ResponsesRequestInput {

package/lib/responses.js

@@ -26,12 +26,12 @@ function imageItem(image) {
     return { type: 'input_image', image_url: `data:${image.mediaType};base64,${image.dataBase64}`,
         ...image.detail === undefined ? {} : { detail: image.detail } };
 }
-function toolOutput(block) {
-    const images = block.content.some(part => part.type === 'image');
+function toolOutput(content) {
+    const images = content.some(part => part.type === 'image');
     if (!images) {
-        return block.content.map(part => part.type === 'text' ? part.text : '').join('');
+        return content.map(part => part.type === 'text' ? part.text : '').join('');
     }
-    return block.content.map((part) => {
+    return content.map((part) => {
         if (part.type === 'text')
             return { type: 'input_text', text: part.text };
         if (part.type === 'image' && 'dataBase64' in part)
@@ -67,6 +67,29 @@ export function toResponsesInput(messages, system) {
             input.push({ type: 'message', role: message.role, content });
             content = [];
         };
+        // Handle tool messages separately - they have no content blocks, just top-level fields
+        if (message.role === 'tool') {
+            if (message.toolCallId === undefined) {
+                throw fixedError('native Codex tool message requires toolCallId', 'INVALID_ARGS');
+            }
+            input.push({
+                type: 'function_call_output',
+                call_id: String(message.toolCallId),
+                output: toolOutput(message.content),
+                ...message.isError === true ? { is_error: true } : {},
+            });
+            continue;
+        }
+        // Handle developer messages - map to developer role in Responses API
+        if (message.role === 'developer') {
+            for (const block of message.content) {
+                if (block.type === 'text') {
+                    content.push({ type: 'input_text', text: block.text });
+                }
+            }
+            flush();
+            continue;
+        }
         for (const block of message.content) {
             if (message.role === 'system') {
                 if (block.type === 'text')
@@ -89,18 +112,15 @@ export function toResponsesInput(messages, system) {
                     content.push(imageItem(block));
                     break;
                 case 'tool-call':
+                    if (message.role !== 'assistant') {
+                        throw fixedError('native Codex tool calls require assistant messages', 'INVALID_ARGS');
+                    }
                     flush();
                     input.push({
                         type: 'function_call', call_id: String(block.id),
                         name: block.name, arguments: block.arguments,
                     });
                     break;
-                case 'tool-result':
-                    flush();
-                    input.push({
-                        type: 'function_call_output', call_id: String(block.toolCallId), output: toolOutput(block),
-                    });
-                    break;
                 case 'reasoning':
                     break; // Visible reasoning is never replayed; M4 may add encrypted items.
                 default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pure01fx/dsh-openai-codex-auth",
-  "version": "0.11.2",
+  "version": "0.12.0",
   "description": "Native ChatGPT Codex provider, device-code-first login, and same-origin Web integration for DeepSeek Harness",
   "license": "MIT",
   "publishConfig": {
@@ -88,9 +88,15 @@
     "LICENSE",
     "CODEX-COMPATIBILITY.md"
   ],
+  "scripts": {
+    "build": "tsc",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "prepack": "pnpm build"
+  },
   "dsh": {
     "engines": {
-      "dsh": "0.1.5-rc.1"
+      "dsh": "0.1.7-rc.2"
     },
     "bundle": {
       "patch": "./cordis.patch.yml"
@@ -106,20 +112,20 @@
     }
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-attachment": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-credentials": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-fs": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-host-webserver": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-llm": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-sandbox": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-sandbox-policy": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-shell": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-tools": "0.1.5-rc.1"
+    "@deepseek-ai/cordis": "~4.0.4",
+    "@deepseek-ai/dsh-attachment": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-credentials": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-fs": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-sandbox": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-sandbox-policy": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-shell": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-tools": "0.1.7-rc.2"
   },
   "dependencies": {
-    "@deepseek-ai/dsh-atomic-write": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-home-paths": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-atomic-write": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-home-paths": "0.1.7-rc.2",
     "@deepseek-ai/schemastery": "^3.18.1",
     "https-proxy-agent": "7.0.6",
     "image-size": "^2.0.2",
@@ -127,29 +133,32 @@
     "ws": "8.21.3"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-web-frontend": "0.1.5-rc.1",
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-attachment": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-attachment-local": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-credentials": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-fs": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-host-webserver": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-llm": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-sandbox": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-sandbox-policy": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-scope": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-session": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-shell": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-system-prompt": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-tools": "0.1.5-rc.1",
+    "@deepseek-ai/cordis": "~4.0.4",
+    "@deepseek-ai/dsh-agent": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-attachment": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-attachment-local": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-store": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-credentials": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-fs": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-sandbox": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-sandbox-policy": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-scope": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-shell": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-system-prompt": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-tools": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-web-frontend": "0.1.7-rc.2",
     "@types/node": "^22.20.0",
     "@types/proxy-from-env": "1.0.4",
     "@types/ws": "8.18.1",
+    "immer": "10.1.1",
     "sharp": "^0.35.4",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.8"
+    "vitest": "^4.1.8",
+    "zustand": "4.4.7"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/dsh-tools": {
@@ -170,10 +179,5 @@
     "@deepseek-ai/dsh-sandbox-policy": {
       "optional": true
     }
-  },
-  "scripts": {
-    "build": "tsc",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run"
   }
 }