@mars-sea/dsh-commandcode-provider 0.10.5 → 0.10.6

package/CHANGELOG.md

@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.10.6] - 2026-09-12
+
+### Fixed
+- **Thinking models no longer fail every tool-loop turn with `The reasoning_content in the thinking mode must be passed back to the API`** ([#34](https://github.com/Mars-Sea/dsh-commandcode-provider/issues/34)). On the `/alpha/generate` transport the adapter ported the pi plugin's behavior of dropping historical reasoning blocks, on the theory that private reasoning must not leak into later turns — but the official CLI does the opposite (`toWireMessages`, command-code@1.53.1, converts every `thinking` block into a `{ type: 'reasoning', text }` part of the assistant message), and the provider rebuilds its DeepSeek request from those parts: an assistant turn whose tool calls arrive without their reasoning is rejected outright. The failure was the whole turn, on every iteration after the first tool call, so a Go-plan or fallback-transport session was unusable with a thinking model. Reasoning is now replayed in content order on the CLI transport, and the Provider API transport keeps passing it back as `reasoning_content` as before.
+
+- **A tool whose parameter schema has no object root no longer kills the turn** ([#35](https://github.com/Mars-Sea/dsh-commandcode-provider/issues/35)). The gateway validates the root of every function schema and refuses the entire request otherwise (`Invalid schema for function 'x': schema must be a JSON Schema of 'type: "object"', got 'type: null'`). The harness's own tool builder always declares that root, so the offending schema comes from a tool registered outside it — a plugin's or MCP bridge's hand-written schema (a type-less `{ properties, required }`), an empty one, or a generator's root `$ref`. Choosing a strict model (e.g. `deepseek/deepseek-v4.1-flash`) then failed the turn no matter which tool the model wanted to call: one badly declared tool poisoned the request for all of them. Both bodies now pass every schema through `toolParametersSchema()`: an object-rooted schema is untouched, a type-less object-shaped one gains `type: 'object'`, a `["object","null"]` union is collapsed, a root `$ref` is inlined from its local `$defs`/`definitions`, an `allOf`/`anyOf`/`oneOf` root is flattened into one object (branch properties unioned; `required` kept only where every alternative demands it), and a non-object root degrades to a permissive free-form object rather than failing the request. Only the root is rewritten and every path returns a copy, so the caller's (possibly deep-frozen) schema is never mutated.
+
+- **Reading several images in one turn no longer makes the conversation unusable** ([#33](https://github.com/Mars-Sea/dsh-commandcode-provider/pull/33)). When one assistant turn issued parallel tool calls whose results each carried an image (two `read_image` calls, say), both transports emitted each image carrier as a user message directly after its own tool result, so a user message sat between the two tool messages. The gateway requires an assistant's tool blocks to be answered consecutively and rejected the request with HTTP 400 (`An assistant message with 'tool_calls' must be followed by tool messages responding to each 'tool_call_id'`); because that history is replayed on every later turn, the conversation could not continue on this provider at all — a retry did not help and only switching provider or model worked. The carriers are now buffered and flushed once the whole tool group has been emitted, so parallel results stay adjacent (`assistant → tool → tool → user → user`) on both the CLI and the Provider API transport. A single-call turn keeps the shape from [#30](https://github.com/Mars-Sea/dsh-commandcode-provider/issues/30). Because those carriers now travel as a group, each one names the tool call it came out of (`Attached image(s) from tool result (call-a):`) — every `read_image` result renders the same envelope text, so without that the notes would be identical and the only thing tying an image to its own result would be position.
+
+- **A user message that converts to nothing is now dropped by both transports.** The CLI transport emitted it as `{ role: 'user', content: [] }` while the Provider API transport skipped it, so the same conversation could be assembled two different ways — and an empty content array is a shape the gateway has no reason to accept. Both now skip a user message that produced no text and no image (including one whose only blocks are ones this adapter does not put on the wire). An image carried out of a tool result is still flushed before the skip, so a pending image is never lost with the message.
+
+### Changed
+- **Synced with the official command-code@1.53.1 CLI** (2026-09-12, four CLI-local items: default compaction model set to DeepSeek V4.1 Flash in `/config`, a BYOK reasoning-effort fix, and two `/usage` summary-line changes — Extra Credits shown separately, the `$X left` field removed). `COMMAND_CODE_CLI_VERSION` is now `1.53.1`. Static inspection of both bundles finds no data or protocol drift: the `/alpha/generate` request body, both endpoints, the per-model effort map, the subscription plan maps, every plan tier, every deal, and the peak/off-peak membership and schedule are unchanged, and the catalog still serves the same 69 models (`gpt-6-astra` remains a CLI/pricing/docs-only model, absent from the public Provider catalog, as before). The one bundle difference is upstream-internal: `gpt-5.6-terra` and `gpt-5.6-luna` are now routed through vercel-ai-gateway instead of openrouter, with the same efforts, modalities and 1.05M context. The BYOK fix renames the CLI's own `providers.json` option key from `reasoning_effort` to `reasoningEffort` — a CLI-side BYOK channel, not the Command Code API contract this plugin speaks.
+- **`npm run typecheck` now checks the test suite too.** `tsconfig.json` included only `src`, so `tests/` was never type-checked — `tsx` strips types without checking them, which is why a test file could reference an undeclared type for months and still pass. Every test file type-checks now, and CI's existing `typecheck` step covers them from here on. No shipped behavior changed: this is the quality gate catching up with the suite.
+
 ## [0.10.5] - 2026-09-11
 
 ### Added

package/README.md

@@ -52,7 +52,7 @@ Pick the release line that matches your DeepSeek Harness version:
 **pnpm 11 holds back new releases.** Its `minimumReleaseAge` defaults to 1440 minutes, so a version published less than a day ago is skipped and `@latest` resolves to the *previous* release — silently, with a success exit code. To install a release from the last 24 hours, name it exactly:
 
 ```sh
-dsh plugin --profile web add @mars-sea/dsh-commandcode-provider@0.10.5
+dsh plugin --profile web add @mars-sea/dsh-commandcode-provider@0.10.6
 ```
 
 The same applies to every profile you install into, including the terminal UI below.
@@ -71,7 +71,7 @@ dsh plugin --profile web update @mars-sea/dsh-commandcode-provider@0.9.1      #
 Each profile updates separately — the terminal UI owns its own plugin list (see below):
 
 ```sh
-dsh plugin --profile dsh-tui update @mars-sea/dsh-commandcode-provider@0.10.5
+dsh plugin --profile dsh-tui update @mars-sea/dsh-commandcode-provider@0.10.6
 ```
 
 To move to a version published less than 24 hours ago, name it exactly as in Install above; pnpm 11's age gate resolves `@latest` to the previous release instead.
@@ -100,7 +100,7 @@ After restart, enter your API key in **Settings → Command Code** and save; **S
 The plugin also works under a terminal front door. **Each dsh profile owns its own plugin list**, so the web install above does not reach the terminal — add the plugin to the `dsh-tui` profile as well:
 
 ```sh
-dsh plugin --profile dsh-tui add @mars-sea/dsh-commandcode-provider@0.10.5
+dsh plugin --profile dsh-tui add @mars-sea/dsh-commandcode-provider@0.10.6
 ```
 
 Pin the exact version here. For the first 24 hours after a release, a bare package name (or `@latest`) is silently resolved to the previous one: the install succeeds, but the profile gets the older build — which is how a fresh terminal install ends up with no **`/settings` → Command Code** page and no `commandcode` models at all.
@@ -217,7 +217,8 @@ When your deployment's dsh shell mounts the web capability (`@deepseek-ai/dsh-we
 - **Image input is model-gated** — only Vision models accept images; text-only models refuse them.
 - Switching to a text-only model in an image-bearing session is rejected by dsh — pick a model marked *`Image`* or remove the images first.
 - **No `stop` sequences** — requests carrying one fail.
-- On the legacy `/alpha/generate` transport, reasoning blocks are not replayed into later turns; on the `/provider/v1/chat/completions` transport, historical reasoning is passed back as `reasoning_content` so tool-calling loops can keep their chain of thought. Only tool calls with a paired tool result are replayed on both transports.
+- Historical reasoning is replayed on both transports so a tool-calling loop keeps its chain of thought: `/provider/v1/chat/completions` passes it back as `reasoning_content`, and `/alpha/generate` carries it as a `reasoning` block inside the rebuilt assistant turn (the shape the official CLI sends) — a DeepSeek thinking-mode tool loop is rejected without it. Only tool calls with a paired tool result are replayed on either transport.
+- Every tool's parameter schema is normalized to the object root the provider requires, so a tool declared without one (a third-party plugin's hand-written schema, an MCP server's own `inputSchema`, a generated root `$ref`) no longer fails the whole turn with `schema must be a JSON Schema of 'type: "object"'`.
 - The model catalog is browsable without a key; chat requests need one.
 
 ## Permissions & privacy

package/README.zh-CN.md

@@ -50,7 +50,7 @@
 **pnpm 11 会拦下刚发布的新版本。** 它的 `minimumReleaseAge` 默认为 1440 分钟，发布不足一天的版本会被跳过，`@latest` 解析到**上一个**版本 —— 而且是静默的，命令照样以成功退出。想装 24 小时内发布的版本，必须写精确版本号：
 
 ```sh
-dsh plugin --profile web add @mars-sea/dsh-commandcode-provider@0.10.5
+dsh plugin --profile web add @mars-sea/dsh-commandcode-provider@0.10.6
 ```
 
 这一点对每个 profile 都成立，包括下面的终端界面。
@@ -69,7 +69,7 @@ dsh plugin --profile web update @mars-sea/dsh-commandcode-provider@0.9.1      #
 每个 profile 各自更新 —— 终端界面有独立的插件列表（见下文）：
 
 ```sh
-dsh plugin --profile dsh-tui update @mars-sea/dsh-commandcode-provider@0.10.5
+dsh plugin --profile dsh-tui update @mars-sea/dsh-commandcode-provider@0.10.6
 ```
 
 要更新到发布不足 24 小时的版本，和上面的安装一样写精确版本号；pnpm 11 的年龄门禁会把 `@latest` 解析成上一个版本。
@@ -98,7 +98,7 @@ cmd login        # macOS/Linux；Windows 原生版：cmdc login
 插件同样支持终端前端。**每个 dsh profile 有独立的插件列表**，所以上面那条 Web 安装命令不会装到终端里 —— 还要把插件装进 `dsh-tui` profile：
 
 ```sh
-dsh plugin --profile dsh-tui add @mars-sea/dsh-commandcode-provider@0.10.5
+dsh plugin --profile dsh-tui add @mars-sea/dsh-commandcode-provider@0.10.6
 ```
 
 这里请写精确版本号。新版本发布后的 24 小时内，只写包名（或 `@latest`）会被静默解析到上一个版本 —— 安装命令照样成功，但 profile 里拿到的是旧版本，结果就是全新的终端安装里既没有 **`/settings` → Command Code** 页面，也看不到任何 `commandcode` 模型。

package/lib/client.js

@@ -2051,7 +2051,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region package.json
-		var version = "0.10.5";
+		var version = "0.10.6";
 		var repository = {
 			"type": "git",
 			"url": "git+https://github.com/Mars-Sea/dsh-commandcode-provider.git"

package/lib/index.d.ts

@@ -7,7 +7,7 @@ import { Context } from "@deepseek-ai/cordis";
 import { AttachmentStore } from "@deepseek-ai/dsh-attachment";
 import { CommandDefinition } from "@deepseek-ai/dsh-commands";
 //#region src/adapter.d.ts
-declare const COMMAND_CODE_CLI_VERSION = "1.53.0";
+declare const COMMAND_CODE_CLI_VERSION = "1.53.1";
 declare const DEFAULT_API_BASE = "https://api.commandcode.ai";
 declare const DEFAULT_GENERATE_MAX_TOKENS = 64000;
 declare const DEFAULT_MAX_OUTPUT_TOKENS = 65536;

package/lib/index.js

@@ -1024,7 +1024,7 @@ function capabilityDescription(modelId, contextWindow, now = Date.now()) {
 * and API key or subscription, and Command Code's terms apply.
 *
 * Wire protocol (reverse-engineered by the pi plugin, command-code@1.28.4;
-* re-verified against command-code@1.53.0 — endpoints, request shape, and
+* re-verified against command-code@1.53.1 — endpoints, request shape, and
 * stream events unchanged):
 *   POST {apiBase}/alpha/generate
 *   body: { config, memory, taste, skills, params: { model, messages, tools,
@@ -1037,7 +1037,7 @@ function capabilityDescription(modelId, contextWindow, now = Date.now()) {
 * per-request options thunk and an API-key resolver from the plugin entry
 * (src/index.ts), so a settings change reaches the very next request.
 */
-const COMMAND_CODE_CLI_VERSION = "1.53.0";
+const COMMAND_CODE_CLI_VERSION = "1.53.1";
 const DEFAULT_API_BASE = "https://api.commandcode.ai";
 const DEFAULT_GENERATE_MAX_TOKENS = 64e3;
 const DEFAULT_MAX_OUTPUT_TOKENS = 65536;
@@ -1105,6 +1105,124 @@ function recordOrEmpty(value) {
 	} catch {}
 	return {};
 }
+/** How deep a root `$ref` / combinator chain is followed while normalizing. */
+const SCHEMA_NORMALIZE_MAX_DEPTH = 4;
+/**
+* Whether a type-less node is object-shaped enough to be one with the type
+* declared: `properties`/`required`/`additionalProperties` only make sense on
+* an object, and a schema carrying them was meant to be one.
+*/
+function isObjectShaped(node) {
+	return isRecord(node.properties) || isRecord(node.patternProperties) || Array.isArray(node.required) || node.additionalProperties !== void 0;
+}
+/** The `required` names of one schema node, ignoring malformed entries. */
+function requiredNames(node) {
+	return Array.isArray(node.required) ? node.required.filter((name) => typeof name === "string") : [];
+}
+/** Resolve a local `#/...` pointer inside the schema that carried it. */
+function resolveLocalRef(root, ref) {
+	if (!ref.startsWith("#/")) return void 0;
+	let node = root;
+	for (const rawSegment of ref.slice(2).split("/")) {
+		const segment = rawSegment.replace(/~1/g, "/").replace(/~0/g, "~");
+		if (!isRecord(node)) return void 0;
+		node = node[segment];
+	}
+	return isRecord(node) ? node : void 0;
+}
+/**
+* Flatten a type-less combinator node into one object schema, so the model
+* still sees the branch fields instead of an argument-free tool. `allOf`
+* branches must all hold, so their `required` entries are all kept; `anyOf` /
+* `oneOf` branches are alternatives, so only a name required by every branch
+* survives. Returns undefined when no branch describes an object.
+*/
+function mergeCombinatorBranches(node, depth) {
+	if (depth >= SCHEMA_NORMALIZE_MAX_DEPTH) return void 0;
+	const properties = {};
+	const required = /* @__PURE__ */ new Set();
+	const alternatives = [];
+	let sawBranch = false;
+	for (const key of [
+		"allOf",
+		"anyOf",
+		"oneOf"
+	]) {
+		const branches = node[key];
+		if (!Array.isArray(branches)) continue;
+		const objectBranches = [];
+		for (const branch of branches) {
+			if (!isRecord(branch)) continue;
+			objectBranches.push(toolParametersSchema(branch, depth + 1));
+		}
+		if (objectBranches.length === 0) continue;
+		sawBranch = true;
+		const names = objectBranches.map(requiredNames);
+		if (key === "allOf") for (const name of names.flat()) required.add(name);
+		else if (names.length > 0) alternatives.push(names[0].filter((name) => names.every((list) => list.includes(name))));
+		for (const branch of objectBranches) {
+			const branchProperties = isRecord(branch.properties) ? branch.properties : {};
+			for (const [name, schema] of Object.entries(branchProperties)) if (!(name in properties)) properties[name] = schema;
+		}
+	}
+	if (!sawBranch) return void 0;
+	for (const group of alternatives) for (const name of group) required.add(name);
+	const merged = {
+		type: "object",
+		properties
+	};
+	if (required.size > 0) merged.required = [...required];
+	if (node.additionalProperties !== void 0) merged.additionalProperties = node.additionalProperties;
+	for (const key of ["description", "title"]) if (node[key] !== void 0) merged[key] = node[key];
+	return merged;
+}
+/**
+* Normalize one tool's parameters schema to an object-rooted JSON Schema.
+* A schema that already declares an object root is passed through untouched;
+* a type-less object-shaped one gains the type; a root `$ref` or combinator is
+* resolved/merged; anything else (an array/scalar root, or no schema at all)
+* degrades to a permissive free-form object, because a request the provider
+* refuses helps no one and the tool's own description is still in the prompt.
+*/
+function toolParametersSchema(parameters, depth = 0) {
+	if (!isRecord(parameters)) return {
+		type: "object",
+		properties: {},
+		additionalProperties: true
+	};
+	if (parameters.type === "object") return parameters;
+	if (Array.isArray(parameters.type) && parameters.type.includes("object")) return {
+		...parameters,
+		type: "object"
+	};
+	if (parameters.type === void 0 || parameters.type === null) {
+		if (typeof parameters.$ref === "string" && depth < SCHEMA_NORMALIZE_MAX_DEPTH) {
+			const target = resolveLocalRef(parameters, parameters.$ref);
+			if (target !== void 0) {
+				const { $ref: _ref, ...rest } = parameters;
+				return toolParametersSchema({
+					...target,
+					...rest
+				}, depth + 1);
+			}
+		}
+		if (isObjectShaped(parameters)) return {
+			...parameters,
+			type: "object"
+		};
+		const merged = mergeCombinatorBranches(parameters, depth);
+		if (merged !== void 0) return merged;
+		if (typeof parameters.$ref === "string") return {
+			...parameters,
+			type: "object"
+		};
+	}
+	return {
+		type: "object",
+		properties: {},
+		additionalProperties: true
+	};
+}
 function projectSlugFromPath(pathName) {
 	return pathName.toLowerCase().replace(/^[a-z]:/i, "").replace(/[^a-z0-9]+/g, "-").replace(/^-+|(?<!-)-+$/g, "") || "project";
 }
@@ -1281,23 +1399,33 @@ function toolResultTextForWire(media) {
 	return media.text || (media.images.length > 0 ? "(image returned; see the attached image)" : "");
 }
 /** Leading line of the user message that carries a tool result's images. */
-const TOOL_RESULT_IMAGE_TEXT = "Attached image(s) from tool result:";
+const TOOL_RESULT_IMAGE_TEXT = "Attached image(s) from tool result";
 /**
 * The model-visible note introducing the images carried out of one tool
 * result. Neither transport merges them back into the tool result, so this
 * line is what tells the model the image it is about to see belongs to the
 * tool it just ran rather than to the user; it also leads the part list,
-* because an image-first content array is what some gateways reject. Count and
-* pixel dimensions are appended when the tool's own text does not already
-* state them (a result that returns the image and nothing else).
+* because an image-first content array is what some gateways reject.
+*
+* The note names the tool call the image came out of, because a turn's
+* carriers are emitted as a group after the whole tool group (issue #33):
+* position alone would have to carry the association, and every `read_image`
+* result renders the same envelope text, so two parallel calls would produce
+* two identical notes. The id is the WIRE id — the one the model saw on the
+* `tool-call` it issued and on the tool message just above — so an overlong
+* cross-provider id is named by the alias that replaced it, not by the
+* harness-side id the model never saw.
+*
+* Count and pixel dimensions are appended when the tool's own text does not
+* already state them (a result that returns the image and nothing else).
 */
-function toolResultImageNote(media) {
+function toolResultImageNote(media, toolCallId) {
+	const lead = `${TOOL_RESULT_IMAGE_TEXT} (${toolCallId}):`;
 	const first = media.images[0];
-	if (first === void 0) return TOOL_RESULT_IMAGE_TEXT;
+	if (first === void 0) return lead;
 	const dimensions = `${first.width}x${first.height} px`;
-	if (first.width <= 0 || first.height <= 0 || media.text.includes(dimensions)) return TOOL_RESULT_IMAGE_TEXT;
-	const count = media.images.length > 1 ? `${media.images.length} images, ` : "";
-	return `${TOOL_RESULT_IMAGE_TEXT} ${count}${dimensions}`;
+	if (first.width <= 0 || first.height <= 0 || media.text.includes(dimensions)) return lead;
+	return `${lead} ${media.images.length > 1 ? `${media.images.length} images, ` : ""}${dimensions}`;
 }
 function hasImageContent(message) {
 	const check = (blocks) => blocks.some((b) => b.type === "image" || b.type === "tool-result" && check(b.content));
@@ -1324,9 +1452,15 @@ async function messagesToCC(messages, readImage) {
 	const out = [];
 	const { ids: paired, names: toolNames } = pairedToolCalls(messages);
 	const wireIds = wireToolCallIds(paired);
+	const pendingImages = [];
+	const flushPendingImages = () => {
+		for (const message of pendingImages) out.push(message);
+		pendingImages.length = 0;
+	};
 	for (const message of messages) {
 		if (message.role === "system") continue;
 		if (message.role === "user" && message.source.kind !== "tool") {
+			flushPendingImages();
 			const parts = [];
 			for (const block of message.content) {
 				if (block.type === "text") parts.push({
@@ -1338,6 +1472,7 @@ async function messagesToCC(messages, readImage) {
 					parts.push(await imageToCommandCode(block.attachment, readImage));
 				}
 			}
+			if (parts.length === 0) continue;
 			out.push({
 				role: "user",
 				content: parts
@@ -1345,11 +1480,16 @@ async function messagesToCC(messages, readImage) {
 			continue;
 		}
 		if (message.role === "assistant") {
+			flushPendingImages();
 			const parts = [];
 			for (const block of message.content) if (block.type === "text") parts.push({
 				type: "text",
 				text: block.text
 			});
+			else if (block.type === "reasoning") parts.push({
+				type: "reasoning",
+				text: block.text
+			});
 			else if (block.type === "tool-call" && paired.has(block.id)) parts.push({
 				type: "tool-call",
 				toolCallId: wireIds.get(block.id) ?? block.id,
@@ -1366,11 +1506,12 @@ async function messagesToCC(messages, readImage) {
 			const block = message.content[0];
 			if (!block || block.type !== "tool-result" || !paired.has(block.toolCallId)) continue;
 			const media = toolResultMedia(block);
+			const wireToolCallId = wireIds.get(block.toolCallId) ?? block.toolCallId;
 			out.push({
 				role: "tool",
 				content: [{
 					type: "tool-result",
-					toolCallId: wireIds.get(block.toolCallId) ?? block.toolCallId,
+					toolCallId: wireToolCallId,
 					toolName: toolNames.get(block.toolCallId) || "unknown",
 					output: block.isError ? {
 						type: "error-text",
@@ -1385,16 +1526,17 @@ async function messagesToCC(messages, readImage) {
 				if (!readImage) throw new LlmError("Image input requires the durable attachment service", "UNSUPPORTED_CONTENT");
 				const carried = [{
 					type: "text",
-					text: toolResultImageNote(media)
+					text: toolResultImageNote(media, wireToolCallId)
 				}];
 				for (const attachment of media.images) carried.push(await imageToCommandCode(attachment, readImage));
-				out.push({
+				pendingImages.push({
 					role: "user",
 					content: carried
 				});
 			}
 		}
 	}
+	flushPendingImages();
 	return out;
 }
 /**
@@ -1422,9 +1564,15 @@ async function messagesToOpenAI(messages, readImage) {
 	const out = [];
 	const { ids: paired } = pairedToolCalls(messages);
 	const wireIds = wireToolCallIds(paired);
+	const pendingImages = [];
+	const flushPendingImages = () => {
+		for (const message of pendingImages) out.push(message);
+		pendingImages.length = 0;
+	};
 	for (const message of messages) {
 		if (message.role === "system") continue;
 		if (message.role === "user" && message.source.kind !== "tool") {
+			flushPendingImages();
 			const parts = [];
 			for (const block of message.content) {
 				if (block.type === "text") parts.push({
@@ -1448,6 +1596,7 @@ async function messagesToOpenAI(messages, readImage) {
 			continue;
 		}
 		if (message.role === "assistant") {
+			flushPendingImages();
 			const text = message.content.filter((block) => block.type === "text").map((block) => block.text).join("");
 			const reasoning = message.content.filter((block) => block.type === "reasoning").map((block) => block.text).join("");
 			const toolCalls = message.content.filter((block) => block.type === "tool-call" && paired.has(block.id)).map((block) => ({
@@ -1472,25 +1621,27 @@ async function messagesToOpenAI(messages, readImage) {
 			const block = message.content[0];
 			if (!block || block.type !== "tool-result" || !paired.has(block.toolCallId)) continue;
 			const media = toolResultMedia(block);
+			const wireToolCallId = wireIds.get(block.toolCallId) ?? block.toolCallId;
 			out.push({
 				role: "tool",
-				tool_call_id: wireIds.get(block.toolCallId) ?? block.toolCallId,
+				tool_call_id: wireToolCallId,
 				content: toolResultTextForWire(media)
 			});
 			if (media.images.length > 0) {
 				if (!readImage) throw new LlmError("Image input requires the durable attachment service", "UNSUPPORTED_CONTENT");
 				const carried = [{
 					type: "text",
-					text: toolResultImageNote(media)
+					text: toolResultImageNote(media, wireToolCallId)
 				}];
 				for (const attachment of media.images) carried.push(await imageToOpenAI(attachment, readImage));
-				out.push({
+				pendingImages.push({
 					role: "user",
 					content: carried
 				});
 			}
 		}
 	}
+	flushPendingImages();
 	return out;
 }
 /** Account endpoints fetched by one `getUsage()` run (see the classification there). */
@@ -1595,7 +1746,7 @@ async function buildCliBody(options, connection, facts) {
 				type: "function",
 				name: tool.name,
 				description: tool.description,
-				input_schema: tool.parameters
+				input_schema: toolParametersSchema(tool.parameters)
 			})),
 			system: facts.systemText,
 			max_tokens: facts.maxTokens,
@@ -1617,7 +1768,7 @@ async function buildOpenAIBody(options, facts) {
 		function: {
 			name: tool.name,
 			description: tool.description,
-			parameters: tool.parameters
+			parameters: toolParametersSchema(tool.parameters)
 		}
 	}));
 	return {