dsh-packycode-api 1.2.1 → 1.2.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 1.2.3
+
+- Fixed ordinary reference-only image edits failing with `PackyCode image mask must be a PNG smaller than 4 MB` when a model also fills the optional mask field with the same JPEG/WebP reference. Native `maskImage` and CLI `maskId` now explicitly accept `null`; the field descriptions distinguish sketch refinement from using an actual mask. Only an identical reference already resolved by the host as non-PNG is treated as a redundant non-mask. Reference bytes, edit endpoint, model and quality stay intact; real PNG masks and all distinct mask references still undergo format, size and dimension checks. Invalid mask-format errors now explain how to request editing without a mask. Added native and authenticated MCP regressions without paid calls.
+- Fixed native image results still missing from main chat in 1.2.2. DSH persists `tool/result.data.message` as a flat `ToolMessage`: the call identity is in `source.callId`, image/text parts are directly in `content`, and failure status is on the message. The gallery incorrectly looked for nested SDK `tool-result` blocks and discarded every successful native result. It now projects the actual message into the existing gallery view and retains the plugin metadata and durable image references.
+- Replaced the incorrect native fixtures with the real message structure and added a sanitized stored-session regression that fails against the published 1.2.2 parser. Added a built-client integration through real Cordis 4.0.4, DSH 0.2.0-rc.2 event/view/group and Slot registries, bound session feed and image cache, including plugin unload/reinstall and history reload. Native, nested PTC and Claude CLI image presentation each exercise the built bundle.
+- Browser comparison of the published 1.2.2 client and the corrected client with the same native ToolMessage: the old client renders zero main-chat images while the tool detail PNG loads; the corrected client renders one image with details collapsed and after history reload, with no console errors. `scripts/image-preview-check.mjs` supports `?protocol=native` or `?protocol=ptc` for focused replay. This uses a public PNG fixture without making paid API requests or changing existing sessions; it does not replace a physical Intel Mac retest.
+- Validation, 2026-10-15: 390 offline tests, both rebuilt bundles and the 1.2.3 tarball. The built host tool also passed a real local HTTP multipart replay for null and repeated non-PNG mask arguments: both requests used `/v1/images/edits`, retained the original JPEG and saved Sunburst `max` setting, and omitted the unused mask. No paid generation, existing-session rewrite or DSH restart was performed for these fixes.
+
+## 1.2.2
+
+- Fixed the remaining missing-gallery bug in 1.2.1. Real native `tool/result` and nested `tool/ptc-dispatch` records do not have `data.turn`; keying image contexts by that missing field separated image evidence from the actual `turn/end` context. Image contexts now use the tool call ID (or CLI message sequence) and obtain the owning turn and completion boundary from DSH's engine-provided Match Location. Results appear as soon as available and stay visible when history later supplies missing boundaries.
+- Removed fabricated turn/step fields from the runtime regression fixture. Added the real DSH 0.2 Chat snapshot builder and grouping to the built-client path, plus multi-turn, interleaved-session and older-page-prepend regressions. A React/ReactDOM browser replay (`scripts/image-preview-check.mjs`) reproduces the published 1.2.1 bundle showing zero main-chat images while tool details can load the PNG; the corrected build displays both native/PTC image cards with details collapsed and retains them after history reload. No new paid generation or existing-session modification is needed.
+- Validation, 2026-10-15: 381 offline tests, both bundles and the 1.2.2 tarball. Browser comparison used the published 1.2.1 client and the corrected client against the same raw native/PTC events and real DSH 0.2.0-rc.2 Chat assembly/grouping: the old client rendered zero main-chat images with a loadable tool-detail image; the new client rendered both PNGs with details collapsed and after history reload. The final browser replay uses React, ReactDOM and the JSX runtime with no console errors. The colleague's physical Intel Mac still needs an update-and-retest; no DSH process was restarted and no paid image request was made for this verification.
+
 ## 1.2.1
 
 - **Generated image visible only inside tool details.** DSH 0.2 treats custom Turn/Step nodes as foldable process content, so the chat gallery disappeared when completed work was collapsed. PTC also logs successful child images as `tool/ptc-dispatch` without root presentation metadata, which the gallery previously ignored. The gallery now recognizes this plugin's successful native/PTC/CLI results and renders a Session-level card anchored beside its owning answer, independent of process folding. Stored conversations replay the same image references; no log rewrite or paid regeneration is needed. Duplicate results for the same call are projected once. Tool instructions also tell models to use automatic image presentation instead of inventing Markdown image links to host paths or attachment IDs.

package/README.en.md

@@ -51,7 +51,7 @@ Open the desktop application's **Plugins** page, click **Add plugin**, and enter
 dsh-packycode-api
 ```
 
-Choose the **official** install source, then click **Install**. To pin a version, enter `dsh-packycode-api@1.2.1`.
+Choose the **official** install source, then click **Install**. To pin a version, enter `dsh-packycode-api@1.2.3`.
 
 A **first install requires no DSH restart**: open **Settings → PackyCode** and add a key immediately. When updating an already loaded older version, follow the restart guidance in the **Plugin version** card.
 
@@ -70,7 +70,7 @@ Choose a model from the `PackyCode` group. `deepseek-flash`, `gpt-6.1-sol`, `gpt
 
 The **Plugins** page shows the installed state and version, and is also where you enable, disable, or uninstall.
 
-**For non-desktop profiles only:** `dsh plugin --profile <name> add dsh-packycode-api@1.2.1`. Do not use it for `desktop` — the CLI refuses it (`profile "desktop" is managed exclusively by the Electron application`).
+**For non-desktop profiles only:** `dsh plugin --profile <name> add dsh-packycode-api@1.2.3`. Do not use it for `desktop` — the CLI refuses it (`profile "desktop" is managed exclusively by the Electron application`).
 
 For a local checkout, keep the `link:` prefix: `dsh plugin --profile <name> add link:/path/to/dsh-packycode-api`. **Do not pass a bare path or `file:`** — that install copies the whole checkout, `node_modules` included, into the profile, where it then shadows the packages the DSH installation itself provides and the plugin looks uninstalled; see the FAQ. If you already installed that way, uninstall first and reinstall as above.
 

package/README.md

@@ -51,7 +51,7 @@
 dsh-packycode-api
 ```
 
-在**安装源**中选择**官方源**，然后点击**安装**。需要固定版本时填入 `dsh-packycode-api@1.2.1`。
+在**安装源**中选择**官方源**，然后点击**安装**。需要固定版本时填入 `dsh-packycode-api@1.2.3`。
 
 首次安装后**无需重启 DSH**，可直接打开**设置 → PackyCode** 添加 Key。更新已加载的旧版时，按「插件版本」卡片的重启提示操作。
 
@@ -70,7 +70,7 @@ dsh-packycode-api
 
 桌面应用的**插件**页可以看到已安装状态与版本，也可以在那里启用、停用或卸载。
 
-**仅用于非 desktop profile：** `dsh plugin --profile <name> add dsh-packycode-api@1.2.1`。不要对 `desktop` 使用它 —— CLI 会直接拒绝（`profile "desktop" is managed exclusively by the Electron application`）。
+**仅用于非 desktop profile：** `dsh plugin --profile <name> add dsh-packycode-api@1.2.3`。不要对 `desktop` 使用它 —— CLI 会直接拒绝（`profile "desktop" is managed exclusively by the Electron application`）。
 
 本地开发要加 `link:` 前缀：`dsh plugin --profile <name> add link:/path/to/dsh-packycode-api`。**不要直接写路径（或 `file:`）** —— 那样的安装会把整个仓库目录（连同 `node_modules`）复制进 profile，之后它会在 profile 内部挡住 DSH 自带的包，插件看起来像没装，见「常见问题」。已经那样装过的话，先卸载再按上面的方式重装。
 

package/docs/research/image-api.md

@@ -32,6 +32,8 @@ Multipart 使用 `image`（单图）或重复的 `image[]`（多图），最多
 
 官方资料存在一个明确差异：`CreateImageEditRequest.mask` 要求 **小于 4 MB**；指南的 Mask requirements 则写图与 mask 格式、尺寸一致且小于 50 MB。实现建议采用更严格的 PNG mask <4 MB，并在需要 mask 时使用相同尺寸的 PNG 输入，直到实际网关验证更宽限制；不要把指南的 50 MB 直接当作 mask 已确认上限。[OpenAPI mask schema](https://github.com/openai/openai-openapi/blob/main/openapi.json)、[指南 Mask requirements](https://developers.openai.com/api/docs/guides/image-generation#mask-requirements)
 
+2026-10-15 再核对：[官方编辑 API 参考](https://developers.openai.com/api/reference/python/resources/images/methods/edit)仍将 `mask` 列为可选 PNG、与输入同尺寸且 <4 MB。用户随后报告“完善草图”触发同样的 mask 校验，并确认仅上传原图，没有单独遮罩。当前本机没有该报错会话的调用参数；离线回放可用“JPEG/WebP 参考图又被模型重复填到 mask 字段”复现完全相同的报错，不能据此声称已取得同事设备的原始参数。工具现支持 `maskImage: null` / CLI `maskId: null` 明确表示无遮罩，并只兼容宿主已验证的同一个非 PNG 参考附件被重复填入 mask 的情况。真实 PNG mask 和不同附件的 mask 保留原有检查；没有放宽 4 MB 限制，没有把编辑换成生图，也没有新增付费重试。
+
 JSON 编辑的字段为 `images: [{ image_url: "…" }]` 或 `images: [{ file_id: "…" }]`，每项二选一；`image_url` 可为完整 URL 或 data URL。JSON 的可选 mask 同样为图片引用对象。这是官方额外能力，不能据此假定 PackyCode 也支持它。[官方 OpenAPI：EditImageBodyJsonParam / ImageRefParam](https://github.com/openai/openai-openapi/blob/main/openapi.json)
 
 `gpt-image-2` 必须省略 `input_fidelity`，其图片输入始终按高保真处理。当前通用 schema 只明确为 GPT Image 1 / 1.5 声明可调 high/low，没有明确说明 2.5 两款可调；本次集成建议三款均省略此字段，不推断 2.5 的未记载行为。[官方高保真说明](https://developers.openai.com/api/docs/guides/image-generation#image-input-fidelity)、[官方 OpenAPI：InputFidelity](https://github.com/openai/openai-openapi/blob/main/openapi.json)

package/lib/client.js

@@ -496,10 +496,18 @@ window.__ModuleLoader__.load({
 		const IMAGE_TOOLS = /* @__PURE__ */ new Set(["packycode_image_generate", "claude_code"]);
 		const hasImage = (content) => Array.isArray(content) && content.some((part) => part.type === "image" && part.attachment);
 		function successfulImages(event) {
-			if (event?.type === "tool/result" && event.data?.meta?.kind === "packycode-image") return (event.data.message?.content ?? []).filter((block) => block.type === "tool-result" && !block.isError && hasImage(block.content)).map((block) => ({
-				...block,
-				meta: event.data.meta
-			}));
+			if (event?.type === "tool/result" && event.data?.meta?.kind === "packycode-image") {
+				const message = event.data.message;
+				const toolCallId = message?.source?.callId;
+				if (message?.source?.kind !== "tool" || typeof toolCallId !== "string" || toolCallId === "" || message.isError === true || !hasImage(message.content)) return [];
+				return [{
+					type: "tool-result",
+					toolCallId,
+					content: message.content,
+					isError: false,
+					meta: event.data.meta
+				}];
+			}
 			if (event?.type === "tool/ptc-dispatch" && IMAGE_TOOLS.has(event.data?.name) && event.data.isError === false && typeof event.data.subCallId === "string" && hasImage(event.data.content)) return [{
 				type: "tool-result",
 				toolCallId: event.data.subCallId,
@@ -518,23 +526,26 @@ window.__ModuleLoader__.load({
 			kind: IMAGE_CHAT_KIND,
 			target: "chat",
 			match(event) {
-				return event.type === "turn/end" || successfulImages(event).length > 0 ? {
-					id: String(event.data.turn),
+				const images = successfulImages(event);
+				if (images.length === 0) return null;
+				const id = event.type === "assistant/message" ? `cli:${event.seq}` : event.data?.subCallId ?? event.data?.message?.source?.callId ?? images[0].toolCallId ?? `event:${event.seq}`;
+				return {
+					id: String(id),
 					role: "update"
-				} : null;
+				};
 			},
-			start: () => void 0,
-			update: (context) => context.state,
+			start: () => ({}),
+			update: (context) => context.state ?? {},
 			buildViewNode(context) {
-				const finished = context.matches.find((match) => match.event.type === "turn/end");
-				if (finished === void 0) return null;
 				const results = context.matches.filter((match) => successfulImages(match.event).length > 0);
 				if (results.length === 0) return null;
+				const turn = (results.find((match) => match.location?.kind === "turn" || match.location?.kind === "step")?.location)?.turn;
+				const finished = turn?.end;
 				const blocks = [...new Map(results.flatMap(({ event }) => successfulImages(event).map((block) => [block.toolCallId, {
 					...block,
 					kind: "tool-result"
 				}]))).values()];
-				const answerSeq = finished.location.turn?.steps?.at(-1)?.data.get("assistant-step")?.finalNode?.seq;
+				const answerSeq = turn?.steps?.at(-1)?.data.get("assistant-step")?.finalNode?.seq;
 				const lastImageSeq = Math.max(...results.map((match) => match.event.seq));
 				return {
 					key: context.key,
@@ -543,9 +554,9 @@ window.__ModuleLoader__.load({
 					target: "chat",
 					location: { kind: "session" },
 					visibility: "visible",
-					anchorSeq: answerSeq > lastImageSeq ? answerSeq + .025 : finished.event.seq - .025,
+					anchorSeq: answerSeq > lastImageSeq ? answerSeq + .025 : finished === void 0 ? lastImageSeq + .025 : finished.seq - .025,
 					data: {
-						turn: finished.event.data.turn,
+						...turn === void 0 ? {} : { turn: turn.turn },
 						blocks
 					}
 				};

package/lib/index.js

@@ -4547,9 +4547,10 @@ const SIGNATURE = "89504e470d0a1a0a";
 const ATTACHMENT_ID$1 = /^sha256:[0-9a-f]{64}$/u;
 var ImageRequestError = class extends Error {};
 const nonempty = (value) => typeof value === "string" && value.trim() !== "" ? value.trim() : void 0;
-/** Some model calls fill unused object fields with a zero-valued reference. */
+/** Explicit absence, including zero-valued placeholders filled by some models. */
 function emptyMaskReference(value) {
-	return value !== null && typeof value === "object" && (value.attachmentId === "" || value.attachmentId === `sha256:${"0".repeat(64)}`) && value.bytes === 0 && value.width === 0 && value.height === 0 && (value.name === void 0 || value.name === "") && (value.originalDimensions === void 0 || value.originalDimensions.width === 0 && value.originalDimensions.height === 0);
+	if (value === null) return true;
+	return value !== void 0 && typeof value === "object" && (value.attachmentId === "" || value.attachmentId === `sha256:${"0".repeat(64)}`) && value.bytes === 0 && value.width === 0 && value.height === 0 && (value.name === void 0 || value.name === "") && (value.originalDimensions === void 0 || value.originalDimensions.width === 0 && value.originalDimensions.height === 0);
 }
 /** A bounded reader applies to both successful payloads and error envelopes. */
 async function readJson(response, maximum, signal) {
@@ -4657,7 +4658,8 @@ function createPackyCodeImageClient({ resolveKey, getHost, fetchImpl = ambientFe
 				body.append("image[]", new Blob([image.data], { type: image.mediaType }), `reference-${index + 1}.${extension}`);
 			}
 			if (mask !== void 0) {
-				if (mask.mediaType !== "image/png" || !(mask.data instanceof Uint8Array) || mask.data.byteLength >= 4 * 1024 * 1024) throw new ImageRequestError("PackyCode image mask must be a PNG smaller than 4 MB");
+				if (mask.mediaType !== "image/png") throw new ImageRequestError("PackyCode maskImage must be a separate PNG mask, not an ordinary reference image; omit maskImage or set it to null for edits without a mask");
+				if (!(mask.data instanceof Uint8Array) || mask.data.byteLength === 0 || mask.data.byteLength >= 4 * 1024 * 1024) throw new ImageRequestError("PackyCode image mask must be a PNG smaller than 4 MB");
 				const dimensions = pngDimensions(mask.data);
 				if (dimensions.width !== images[0].width || dimensions.height !== images[0].height) throw new ImageRequestError("PackyCode image mask must match the first reference image dimensions");
 				body.append("mask", new Blob([mask.data], { type: "image/png" }), "mask.png");
@@ -4872,8 +4874,8 @@ function createPackyCodeImageTool({ client, attachments, getPreference, getSessi
 				description: "1-16 complete attachment references for editing. Omit or use [] for a new image. Paths and unrelated images are not accepted; never drop real references after an edit fails."
 			},
 			maskImage: {
-				...referenceSchema,
-				description: "Omit for new images and edits without a mask. Never invent a reference. Optional PNG mask from this session, matching the first reference and under 4 MB; alpha=0 marks the area to edit."
+				oneOf: [{ type: "null" }, referenceSchema],
+				description: "Omit or use null for new images and ordinary reference-image edits, including refining a sketch. Only supply an actual PNG mask provided for masking, matching the first reference and under 4 MB; alpha=0 marks the area to edit. Do not copy an ordinary reference into this field or invent a mask."
 			}
 		},
 		output: {
@@ -4906,7 +4908,9 @@ function createPackyCodeImageTool({ client, attachments, getPreference, getSessi
 				throw new ImageRequestError("PackyCode could not read the current session image references");
 			}
 			const images = editing ? await readReferences(args.referenceImages, attachments, messages, signal) : void 0;
-			const masks = maskImage === void 0 ? void 0 : await readReferences([maskImage], attachments, messages, signal);
+			const repeatedIndex = maskImage === void 0 ? -1 : args.referenceImages.findIndex((ref) => ref.attachmentId === maskImage.attachmentId);
+			const repeatedNonPng = repeatedIndex >= 0 && images[repeatedIndex].mediaType !== "image/png";
+			const masks = maskImage === void 0 || repeatedNonPng ? void 0 : await readReferences([maskImage], attachments, messages, signal);
 			if (!getPreference().imageEnabled) throw new ImageRequestError("PackyCode images are disabled in settings");
 			const result = await client.request({
 				...args,
@@ -5026,9 +5030,11 @@ const MCP_IMAGE_SCHEMA = Object.freeze({
 			description: "For edits use image handles from the session image catalog or a previous successful result in this run. Omit or [] for generation. Never invent handles or substitute files/URLs."
 		},
 		maskId: {
-			type: "string",
-			pattern: "^image_[1-9][0-9]*$",
-			description: "Optional session image handle for a PNG mask, matching the first reference. Omit when there is no mask."
+			oneOf: [{ type: "null" }, {
+				type: "string",
+				pattern: "^image_[1-9][0-9]*$"
+			}],
+			description: "Omit or use null for ordinary reference-image editing, including sketch refinement. Only use an actual PNG mask provided for masking, matching the first reference; never reuse an ordinary reference as a mask."
 		}
 	},
 	required: ["prompt"]
@@ -5086,7 +5092,8 @@ function createClaudeImageService({ sessionId, messages, client, attachments, ge
 		if (!Array.isArray(ids) || ids.length > 16 || new Set(ids).size !== ids.length || ids.some((id) => !references.has(id))) invalid("Use 1-16 distinct image handles from this run’s session catalog for an edit.");
 		if (value.operation === "edit" && ids.length === 0) invalid("Image edits require referenceIds; an edit will not be replaced with generation.");
 		if (value.operation === "generate" && ids.length > 0) invalid("Image generation cannot include referenceIds; use edit.");
-		if (value.maskId !== void 0 && (!references.has(value.maskId) || ids.length === 0)) invalid("A mask requires references and a valid session image handle.");
+		const maskId = value.maskId ?? void 0;
+		if (maskId !== void 0 && (!references.has(maskId) || ids.length === 0)) invalid("A mask requires references and a valid session image handle.");
 		const preference = getPreference();
 		const model = value.model === void 0 || value.model === "settings" ? preference.imageModel : value.model;
 		const quality = value.quality === void 0 || value.quality === "settings" ? preference.imageQuality : value.quality;
@@ -5099,7 +5106,7 @@ function createClaudeImageService({ sessionId, messages, client, attachments, ge
 		} catch (error) {
 			invalid(error.message);
 		}
-		const { referenceIds: _ids, maskId, ...args } = value;
+		const { referenceIds: _ids, maskId: _maskId, ...args } = value;
 		return {
 			...args,
 			model,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-packycode-api",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Use PackyCode API keys in DeepSeek Harness with multi-protocol models, image generation and editing, separate key rings, and balance display",
   "type": "module",
   "main": "./lib/index.js",
@@ -99,6 +99,7 @@
     "@earendil-works/pi-ai": "0.85.1",
     "packycode-host-v020-fixture": "file:tests/fixtures/host-v020",
     "react": "18.3.1",
+    "react-dom": "18.3.1",
     "tsdown": "0.22.2",
     "yaml": "2.9.1"
   },