dsh-codex-subscription 1.14.0 → 1.14.2

package/README.en.md

@@ -22,12 +22,15 @@ No OpenAI API key or Codex CLI. Models, search, quota, and image generation stay
   <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/readme-hero-en.webp" width="900" alt="Your Codex subscription inside DSH: models, web search, quota and safe reset, image generation, and Fast mode">
 </p>
 
-## What's included in 1.14.0
+## What's included in 1.14.2
 
-- Built-in image viewer: a bottom toolbar, wheel zoom, drag to pan, on-image notes, copy notes, and continue editing, without another plugin.
+- GPT-6 Astra now supports model-catalog context settings: Standard preserves the catalog default, Extended uses 872K, and Custom is bounded to 128K–872K.
 
-- Fixes generated-image previews that could not open in DSH Web, so generated images can be viewed in the conversation again.
-- New and edited images now return the exact original path on the current DSH host in the tool result, so a model or Agent can read or copy the file; preview and download remain session-authorized.
+### From 1.14.1
+
+- The composer shows both 5-hour and weekly quota windows when returned by the service, so neither window is hidden.
+- Image edits validate attachment references, normalize bare SHA-256 digests, and resolve the actual attachment metadata from the current session. Paths produce an actionable error asking the model to obtain the correct reference with `read_image` and retry.
+- Location edits attach the clean source, a numbered annotation image, and coordinate instructions so the model can match each requested change to its location.
 
 ## Three-step start
 
@@ -142,6 +145,10 @@ Restart DSH manually after installation, then:
 
 The plugin can follow an existing HTTPS proxy from the process environment or operating-system proxy settings for official OpenAI and ChatGPT requests. It does not provide a proxy, relay, node list, or system-proxy configuration.
 
+### GPT-6 Astra context
+
+When the official model catalog exposes GPT-6 Astra, Standard preserves the catalog window, Extended uses 872000 tokens, and Custom accepts 128000–872000 tokens (initially 272000). This limit follows the [official Codex model catalog](https://github.com/openai/codex/blob/6af345407d9c2a568da9d01b6c4b81a9e61495c0/codex-rs/models-manager/models.json#L33-L34), not the API model's total context capacity. These settings only adjust DSH's local context budget; they do not grant model access or guarantee an account's server-side capacity. Actual availability remains subject to the service.
+
 ### Composer quota
 
 <p align="center">
@@ -149,8 +156,8 @@ The plugin can follow an existing HTTPS proxy from the process environment or op
 </p>
 
 Choose Off, Percent, Progress bar, or Beta Runway in Settings. The compact display appears only for a selected Codex model. Runway is opt-in and estimates pace only from official remaining-percentage observations. It needs at least three samples; sustained high use usually produces a range in 5–10 minutes, while low use takes longer or reports a stable state. Non-sensitive observations from the last 24 hours are kept locally so calibration can continue after restart; a quota reset, account switch, or disabling the feature starts a new calibration period.
-Standard Codex uses the lowest remaining window returned by the service; Spark uses its independent quota. The plugin does not hard-code a
-“5-hour + weekly” layout or invent Credits and spending caps that the service did not return.
+The composer shows each returned quota window with its duration. When Plus returns both five-hour and weekly limits, both are visible. Spark keeps its independent quota. Accounts with only a weekly window still show only that window; the plugin does not invent a
+five-hour limit, Credits, or spending caps that the service did not return.
 
 ### Safe quota reset
 
@@ -162,11 +169,11 @@ clicks are single-flight, and an uncertain network result is never retried autom
 
 ### Image generation and editing (Beta)
 
-A basic viewer derived from `dsh-image-viewer` is now built in, with no extra installation required. If `dsh-image-viewer` is installed, its unified preview still takes priority; otherwise, or if it declines, the built-in viewer opens. You can zoom, pan, fit, add region notes, and download the image. The standard **Download** action retrieves the permission- and integrity-checked exact original by default; only legacy sessions without an exact original fall back to the conversation preview.
+A basic viewer derived from `dsh-image-viewer` is now built in, with no extra installation required. Plugin-generated image cards use the built-in viewer to keep annotation and continue-editing actions available. You can zoom, pan, fit, add region notes, and download the image. The standard **Download** action retrieves the permission- and integrity-checked exact original by default; only legacy sessions without an exact original fall back to the conversation preview.
 
 New and edited images return the exact original path on the current DSH host in the tool result, so a model or Agent can read or copy the file. The path is on the host running DSH, not a browser download link; original downloads remain session-authorized. Uninstalling the plugin does not delete generated originals.
 
-**Continue editing in composer** attaches exactly the image you opened and writes the region notes into the draft without sending it. Press **Enter** to save and collapse a region note; use **Shift+Enter** for a new line. Notes remain available when the same image is reopened during the current DSH page session.
+**Continue editing in composer** does not send automatically. With annotations, it attaches the clean source and a numbered location-reference image, and includes matching numbers, coordinates, notes, and instructions to exclude the markers from the result. Without annotations, it attaches only the opened image. Every marker needs a note; reference preparation failures stop the handoff. Press **Enter** to save and collapse a region note; use **Shift+Enter** for a new line. Notes remain available when the same image is reopened during the current DSH page session.
 
 A new image request does not silently include earlier images. GPT Image 2 can take longer than a normal text turn, and detailed text, exact composition, or repeated-character consistency may still need another pass.
 

package/README.md

@@ -23,12 +23,15 @@
   <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/readme-hero.webp" width="900" alt="Codex 订阅直接用在 DSH：订阅模型、联网搜索、额度与安全重置、图片生成和高速模式">
 </p>
 
-## 1.14.0 重点变化
+## 1.14.2 重点变化
 
-- 内置图片查看器：无需额外安装插件，即可使用底部工具栏、滚轮缩放、拖动、图上备注、复制备注和继续编辑。
+- GPT-6 Astra 支持模型目录上下文设置：标准模式保留目录默认值，扩展模式使用 872K，自定义模式限制为 128K–872K。
 
-- 修复 DSH Web 中生成图片预览无法打开的问题，生成图片可以继续在会话中查看。
-- 新生成或编辑的图片会在工具结果中返回当前 DSH 主机上的原图路径，方便模型或 Agent 读取或复制；预览和下载仍按会话权限处理。
+### 1.14.1 更新回顾
+
+- 输入框同时显示服务端返回的 5 小时与每周额度，避免其中一个额度窗口被隐藏。
+- 图片编辑会检查附件引用，自动补全裸 SHA-256，并从当前会话取回真实附件元数据；误填路径时提示模型通过 `read_image` 获取正确引用并重试。
+- 部位修改会同时附上干净原图、编号标注图和坐标说明，让模型能够对应每条修改要求。
 
 ## 三步开始
 
@@ -143,14 +146,18 @@ dsh --profile web --dump-config
 
 对于 OpenAI 与 ChatGPT 官方请求，插件可以沿用进程环境或操作系统中已有的 HTTPS 代理。插件本身不提供代理、转发服务、节点列表，也不会修改系统代理设置。
 
+### GPT-6 Astra 上下文
+
+当官方模型目录提供 GPT-6 Astra 时，标准模式保留目录默认窗口；扩展模式使用 872000 Token，自定义模式可设置 128000–872000 Token（初始值为 272000）。该上限依据 [Codex 官方模型目录](https://github.com/openai/codex/blob/6af345407d9c2a568da9d01b6c4b81a9e61495c0/codex-rs/models-manager/models.json#L33-L34)，不是 API 模型的总上下文容量。这些设置只调整 DSH 的本地上下文预算，不授予模型访问权限，也不保证账号的服务端容量；实际可用性以服务端为准。
+
 ### 输入框额度
 
 <p align="center">
   <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/composer-quota.png" width="800" alt="中文 DSH 输入框内的 Codex 剩余额度进度条">
 </p>
 
-可在设置中选择关闭、百分比、进度条或 Beta 续航预测；紧凑额度只在选择 Codex 模型时显示。续航预测仅在用户主动选择后，根据官方剩余百分比估算当前消耗速度。它至少需要 3 个样本；持续高消耗时通常 5–10 分钟即可给出范围，消耗较低时会延长观察或显示稳定。最近 24 小时的无敏感信息观测会保存在本机，重启后可以继续校准；额度重置、账号切换或关闭功能会开启新的校准周期。普通 Codex 使用服务端返回窗口中剩余最少的一项，
-Spark 使用独立额度。插件不会写死“5 小时 + 每周”，也不会虚构服务端没有返回的 Credits 或消费上限。
+可在设置中选择关闭、百分比、进度条或 Beta 续航预测；紧凑额度只在选择 Codex 模型时显示。续航预测仅在用户主动选择后，根据官方剩余百分比估算当前消耗速度。它至少需要 3 个样本；持续高消耗时通常 5–10 分钟即可给出范围，消耗较低时会延长观察或显示稳定。最近 24 小时的无敏感信息观测会保存在本机，重启后可以继续校准；额度重置、账号切换或关闭功能会开启新的校准周期。输入框分别显示服务端返回的各额度窗口，并标明窗口时长：Plus 返回 5 小时和每周额度时，两项都会显示。
+Spark 使用独立额度。只返回每周额度的账号仍只显示每周，不会虚构 5 小时窗口、Credits 或消费上限。
 
 ### 安全使用额度重置
 
@@ -160,11 +167,11 @@ ChatGPT 返回可用重置卡时，设置页会把每张卡分别显示为紧凑
 
 ### 图片生成与编辑（Beta）
 
-订阅插件已内置基于 `dsh-image-viewer` 的基础查看器，无需额外安装。若已安装 `dsh-image-viewer`，仍优先使用它的统一预览；没有该服务或其拒绝打开时，自动使用内置查看器。你可以缩放、拖动、适合窗口、添加区域备注并下载图片。标准“下载”默认获取经过权限与完整性校验的精确原图；旧会话没有精确原图时才下载会话预览图。
+订阅插件已内置基于 `dsh-image-viewer` 的基础查看器，无需额外安装。插件生成图片的工具卡片使用内置查看器，确保标注和继续编辑功能可用。你可以缩放、拖动、适合窗口、添加区域备注并下载图片。标准“下载”默认获取经过权限与完整性校验的精确原图；旧会话没有精确原图时才下载会话预览图。
 
 新生成或编辑的图片会在工具结果中返回当前 DSH 主机上的原图路径，模型或 Agent 可以读取或复制该文件。该路径位于运行 DSH 的主机，并非浏览器下载链接；原图下载仍按会话授权。卸载插件不会删除已生成的原图。
 
-点击“在输入框中继续编辑”只附上当前打开的图片，并把部位标注写入草稿，不会自动发送。按 Enter 保存并收起备注，Shift+Enter 换行；在当前 DSH 页面重新打开同一张图片时，备注仍会保留。
+点击“在输入框中继续编辑”不会自动发送。有标注时会附上干净源图和带编号标记的定位参考图，草稿包含对应编号、坐标、备注，以及不得把标记绘入成品的说明；没有标注时只附上当前图片。每个标记必须填写备注，参考图准备失败时会中止回填。按 Enter 保存并收起备注，Shift+Enter 换行；在当前 DSH 页面重新打开同一张图片时，备注仍会保留。
 
 新的图片请求不会静默带入历史图片。GPT Image 2 可能比文本回复耗时更长，复杂文字、精确构图和连续角色一致性也可能需要再次调整。
 

package/lib/client.js

@@ -49,14 +49,193 @@ window.__ModuleLoader__.load({
 		const ForwardRef = /*#__PURE__*/ react.forwardRef(BoltIcon);
 		//#endregion
 		//#region src/image-edit.js
-		function buildImageEditDraft({ prompt = "", annotations = [], translate }) {
+		const isRecord = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+		const validCoordinate = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 && value <= 1;
+		const cleanNote = (value) => typeof value === "string" ? value.trim() : "";
+		const coordinateError = (number) => {
+			const error = /* @__PURE__ */ new Error(`Annotation ${number} must have finite x and y coordinates between 0 and 1`);
+			error.code = "ANNOTATION_INVALID";
+			return error;
+		};
+		/**
+		* Validate the annotation contract shared by the draft builder and the
+		* reference-image renderer. Annotation numbers are their array positions so
+		* that they stay aligned with the pins shown to the user.
+		*/
+		function normalizeImageEditAnnotations(annotations, { requireNotes = false } = {}) {
+			if (!Array.isArray(annotations)) throw new TypeError("annotations must be an array");
+			return annotations.map((annotation, index) => {
+				const number = index + 1;
+				const note = cleanNote(annotation?.note);
+				if (requireNotes && note === "") {
+					const error = /* @__PURE__ */ new Error(`Annotation ${number} is missing a note; describe what should change`);
+					error.code = "ANNOTATION_INVALID";
+					throw error;
+				}
+				if (!isRecord(annotation) || !validCoordinate(annotation.x) || !validCoordinate(annotation.y)) throw coordinateError(number);
+				return {
+					number,
+					x: annotation.x,
+					y: annotation.y,
+					note
+				};
+			});
+		}
+		const formatPercent = (value) => {
+			return `${Number((value * 100).toFixed(2))}%`;
+		};
+		const formatPixel = (value) => {
+			const rounded = Number(value.toFixed(2));
+			return String(rounded);
+		};
+		const withNames = (value, sourceName, referenceName) => String(value).replaceAll("{sourceName}", sourceName).replaceAll("{referenceName}", referenceName);
+		const positiveImageDimension = (value) => Number.isSafeInteger(value) && value > 0;
+		function buildImageEditDraft({ prompt = "", annotations = [], translate, width, height, sourceName = "source.png", referenceName = "annotated-reference.png" }) {
 			if (typeof translate !== "function") throw new TypeError("translate must be a function");
-			const notes = annotations.map((annotation, index) => ({
-				number: index + 1,
-				note: typeof annotation?.note === "string" ? annotation.note.trim() : ""
-			})).filter((annotation) => annotation.note !== "").map((annotation) => String(annotation.number) + ". " + annotation.note);
-			const base = prompt.trim() === "" ? translate("imageEditDefault") : prompt.trim();
-			return notes.length === 0 ? base : base + "\n\n" + translate("imageRegionNotes") + "\n" + notes.join("\n");
+			const base = typeof prompt === "string" && prompt.trim() !== "" ? prompt.trim() : translate("imageEditDefault");
+			if (!Array.isArray(annotations)) throw new TypeError("annotations must be an array");
+			if (annotations.length === 0) return base;
+			const hasWidth = width !== void 0;
+			if (hasWidth !== (height !== void 0) || hasWidth && (!positiveImageDimension(width) || !positiveImageDimension(height))) throw new Error("width and height must be positive integers when provided");
+			const normalized = normalizeImageEditAnnotations(annotations, { requireNotes: true });
+			const source = typeof sourceName === "string" && sourceName.trim() !== "" ? sourceName.trim() : "source.png";
+			const reference = typeof referenceName === "string" && referenceName.trim() !== "" ? referenceName.trim() : "annotated-reference.png";
+			const guide = withNames(translate("imageEditReferenceGuide"), source, reference);
+			const location = translate("imageEditLocation");
+			const notes = normalized.map(({ number, x, y, note }) => {
+				const pixels = hasWidth ? ` (pixel x=${formatPixel(x * Math.max(0, width - 1))} of ${width}, y=${formatPixel(y * Math.max(0, height - 1))} of ${height})` : "";
+				return `${number}. ${location}: x=${formatPercent(x)} (normalized ${x}), y=${formatPercent(y)} (normalized ${y})${pixels}; ${note}`;
+			});
+			return [
+				base,
+				"",
+				guide,
+				"",
+				translate("imageRegionNotes"),
+				...notes
+			].join("\n");
+		}
+		//#endregion
+		//#region src/image-edit-reference.js
+		const TWO_PI = Math.PI * 2;
+		const PIN_FILL = "#e11d48";
+		const PIN_OUTER_STROKE = "#111827";
+		const PIN_INNER_STROKE = "#ffffff";
+		const finiteDimension = (value) => Number.isSafeInteger(value) && value > 0;
+		const clamp$1 = (value, min, max) => Math.min(max, Math.max(min, value));
+		const clampCenter = (value, size, edge) => {
+			const margin = Math.min(edge, size / 2);
+			return clamp$1(value, margin, size - margin);
+		};
+		function getBitmapFactory(options) {
+			const factory = options?.createImageBitmap ?? options?.bitmapFactory ?? globalThis.createImageBitmap;
+			if (typeof factory !== "function") throw new Error("createImageBitmap is not available");
+			return factory;
+		}
+		function getCanvasFactory(options) {
+			const injected = options?.createCanvas ?? options?.canvasFactory;
+			if (typeof injected === "function") return injected;
+			const document = globalThis.document;
+			if (document !== void 0 && typeof document.createElement === "function") return (width, height) => {
+				const canvas = document.createElement("canvas");
+				canvas.width = width;
+				canvas.height = height;
+				return canvas;
+			};
+			throw new Error("A canvas factory is not available");
+		}
+		function drawPin(context, number, x, y, width, height) {
+			const label = String(number);
+			const fontSize = Math.max(12, Math.min(40, Math.round(Math.min(width, height) * .03)));
+			const radius = Math.max(12, fontSize * .8, fontSize * (.3 * label.length + .35));
+			const outerStroke = Math.max(2, Math.min(4, radius * .25));
+			const innerStroke = Math.max(1, Math.min(2, radius * .13));
+			const edge = radius + outerStroke + 2;
+			const targetX = x * Math.max(0, width - 1);
+			const targetY = y * Math.max(0, height - 1);
+			const centerX = clampCenter(targetX, width, edge);
+			const centerY = clampCenter(targetY, height, edge);
+			context.save?.();
+			if ((centerX !== targetX || centerY !== targetY) && typeof context.moveTo === "function" && typeof context.lineTo === "function") {
+				context.beginPath();
+				context.moveTo(targetX, targetY);
+				context.lineTo(centerX, centerY);
+				context.lineWidth = outerStroke * 2;
+				context.strokeStyle = PIN_OUTER_STROKE;
+				context.stroke();
+				context.beginPath();
+				context.moveTo(targetX, targetY);
+				context.lineTo(centerX, centerY);
+				context.lineWidth = innerStroke;
+				context.strokeStyle = PIN_INNER_STROKE;
+				context.stroke();
+			}
+			context.beginPath();
+			context.arc(centerX, centerY, radius, 0, TWO_PI);
+			context.fillStyle = PIN_FILL;
+			context.fill();
+			context.lineWidth = outerStroke;
+			context.strokeStyle = PIN_OUTER_STROKE;
+			context.stroke();
+			context.lineWidth = innerStroke;
+			context.strokeStyle = PIN_INNER_STROKE;
+			context.stroke();
+			context.font = `700 ${fontSize}px sans-serif`;
+			context.fillStyle = PIN_INNER_STROKE;
+			context.textAlign = "center";
+			context.textBaseline = "middle";
+			context.fillText(label, centerX, centerY);
+			context.restore?.();
+		}
+		function encodePng(canvas) {
+			if (typeof canvas?.toBlob !== "function") throw new Error("Canvas PNG encoding is not available");
+			return new Promise((resolve, reject) => {
+				let settled = false;
+				const finish = (callback, value) => {
+					if (settled) return;
+					settled = true;
+					callback(value);
+				};
+				try {
+					canvas.toBlob((value) => {
+						if (value === null || value === void 0) finish(reject, /* @__PURE__ */ new Error("Canvas failed to encode the annotation reference as PNG"));
+						else finish(resolve, value);
+					}, "image/png");
+				} catch (error) {
+					finish(reject, error);
+				}
+			});
+		}
+		/**
+		* Create the second image sent with an annotated edit. It contains the clean
+		* source plus numbered pins, with no note text. `options` is intentionally
+		* injectable so the rendering path can be exercised without a browser:
+		* `{ createImageBitmap, createCanvas }`.
+		*/
+		async function createAnnotatedImageReference(blob, annotations, options = {}) {
+			const normalized = normalizeImageEditAnnotations(annotations);
+			const createImageBitmap = getBitmapFactory(options);
+			const createCanvas = getCanvasFactory(options);
+			const bitmap = await createImageBitmap(blob);
+			try {
+				const width = bitmap?.width;
+				const height = bitmap?.height;
+				if (!finiteDimension(width) || !finiteDimension(height)) throw new Error("The source image has invalid dimensions");
+				if (Math.min(width, height) < 64) throw new Error("The source image is too small for readable annotation pins");
+				const canvas = await createCanvas(width, height);
+				if (canvas === null || canvas === void 0) throw new Error("Canvas factory returned no canvas");
+				canvas.width = width;
+				canvas.height = height;
+				const context = canvas.getContext?.("2d");
+				if (context === null || context === void 0) throw new Error("Canvas 2D context is not available");
+				context.clearRect?.(0, 0, width, height);
+				context.drawImage?.(bitmap, 0, 0, width, height);
+				if (typeof context.drawImage !== "function") throw new Error("Canvas 2D context cannot draw the source image");
+				for (const annotation of normalized) drawPin(context, annotation.number, annotation.x, annotation.y, width, height);
+				return await encodePng(canvas);
+			} finally {
+				if (typeof bitmap?.close === "function") bitmap.close();
+			}
 		}
 		const ORIGINAL_IMAGE_ID_PATTERN = /^img_[0-9a-f]{32}$/u;
 		const positiveInteger = (value) => Number.isSafeInteger(value) && value > 0;
@@ -723,9 +902,8 @@ window.__ModuleLoader__.load({
 		/**
 		* Local image viewer state for subscription-generated images.
 		*
-		* This deliberately stays private to the subscription client. An installed
-		* native image viewer can take the request first, while this service provides
-		* the same baseline experience when that optional plugin is absent.
+		* This stays private to subscription image cards, which need annotation and
+		* edit actions that a host's generic native viewer may not implement.
 		*/
 		var SubscriptionImageViewerService = class {
 			#listeners = /* @__PURE__ */ new Set();
@@ -809,19 +987,22 @@ window.__ModuleLoader__.load({
 			"gpt-5.4": "customContextGpt54",
 			"gpt-5.4-mini": "customContextGpt54Mini",
 			"gpt-5.5": "customContextGpt55",
-			"gpt-5.6": "customContextGpt56"
+			"gpt-5.6": "customContextGpt56",
+			"gpt-6-astra": "customContextGpt6Astra"
 		});
 		const CUSTOM_CONTEXT_MODEL_CAPS = Object.freeze({
 			"gpt-5.4": 1e6,
 			"gpt-5.4-mini": 4e5,
 			"gpt-5.5": 1e6,
-			"gpt-5.6": 1e6
+			"gpt-5.6": 1e6,
+			"gpt-6-astra": 872e3
 		});
 		const CUSTOM_CONTEXT_MODEL_DEFAULTS = Object.freeze({
 			"gpt-5.4": 272e3,
 			"gpt-5.4-mini": 272e3,
 			"gpt-5.5": 272e3,
-			"gpt-5.6": 272e3
+			"gpt-5.6": 272e3,
+			"gpt-6-astra": 272e3
 		});
 		const normalizeSearchProvider = (value) => [
 			"auto",
@@ -865,16 +1046,13 @@ window.__ModuleLoader__.load({
 			if (/\bspark\b/u.test(normalized(model))) return /\bspark\b/u.test(normalized(`${limit?.id ?? ""} ${limit?.name ?? ""}`));
 			return limit?.id === "codex";
 		};
-		function selectModelQuota(usage, model) {
-			const windows = Array.isArray(usage?.rateLimits) ? usage.rateLimits.filter((limit) => limitMatchesModel(limit, model) && Array.isArray(limit.windows)).flatMap((limit) => limit.windows).filter(isDisplayableWindow) : [];
-			if (windows.length === 0) return void 0;
-			const selected = windows.reduce((lowest, candidate) => candidate.remainingPercent < lowest.remainingPercent ? candidate : lowest);
-			return {
+		function selectModelQuotaWindows(usage, model) {
+			return (Array.isArray(usage?.rateLimits) ? usage.rateLimits.filter((limit) => limitMatchesModel(limit, model) && Array.isArray(limit.windows)).flatMap((limit) => limit.windows).filter(isDisplayableWindow) : []).map((selected) => ({
 				remainingPercent: selected.remainingPercent,
 				windowSeconds: selected.windowSeconds,
 				...Number.isSafeInteger(selected.resetsAt) ? { resetsAt: selected.resetsAt } : {},
 				...selected.forecast === void 0 ? {} : { forecast: selected.forecast }
-			};
+			})).sort((a, b) => a.windowSeconds - b.windowSeconds);
 		}
 		//#endregion
 		//#region src/login-progress.js
@@ -1078,6 +1256,8 @@ window.__ModuleLoader__.load({
 		const QUICK_QUOTA_REFRESH_EVENT = "dsh-codex-subscription:refresh-quick-quota";
 		const QUICK_QUOTA_REFRESH_MS = 6e4;
 		const zh = {
+			imageEditLocation: "位置",
+			imageEditReferenceGuide: "本次编辑的干净源图为「{sourceName}」，编号定位参考图为「{referenceName}」。坐标以图片左上角为原点，x 向右、y 向下，百分比相对于整张图片。请查看这两张图片，将它们同时作为编辑工具的参考图，并在工具提示词中完整保留下方编号、位置和修改要求。只修改源图中对应位置的内容；定位参考图上的编号、圆点和引线仅用于定位，不得绘入最终结果。若无法读取两张图片或确定位置，请说明问题，不要猜测或忽略标注。",
 			nav: "Codex 订阅",
 			title: "Codex 订阅",
 			connected: "已登录",
@@ -1184,7 +1364,7 @@ window.__ModuleLoader__.load({
 			contextStandard: "标准",
 			contextStandardHint: "使用模型目录默认值；官方 Agent 预设会自动管理上下文。",
 			contextExtended: "扩展",
-			contextExtendedHint: "按模型使用 400K 或 1M；超过 272K 后可能消耗更多额度。",
+			contextExtendedHint: "按模型使用已审核的扩展预算（Astra：872K）；实际可用性由服务端决定。",
 			contextCustom: "自定义",
 			contextCustomHint: "输入完整 Token 数值；较低数值会让官方 Agent 预设更早压缩上下文。",
 			contextTokens: "Token 上限",
@@ -1267,10 +1447,12 @@ window.__ModuleLoader__.load({
 			imageRegionNotes: "部位修改：",
 			imageEdit: "在输入框中继续编辑",
 			imageEditPreparing: "正在添加到输入框…",
-			imageEditFailed: "无法把图片添加到输入框。",
+			imageEditFailed: "回填失败：请填写每个标记的备注，并确认输入框可接收图片后重试。",
 			imageRemoveAnnotation: "删除标注"
 		};
 		const en = {
+			imageEditLocation: "Location",
+			imageEditReferenceGuide: "The clean source for this edit is \"{sourceName}\"; \"{referenceName}\" is the numbered location reference. Coordinates start at the top-left, x increases rightward and y downward; percentages refer to the whole image. Inspect both images and pass both as references to the image-editing tool. Preserve every number, position and requested change below in the tool prompt. Edit the corresponding content in the clean source; numbers, dots and leader lines on the location reference are guidance only and must not appear in the final result. If either image cannot be read or a location is unclear, explain the problem instead of guessing or ignoring annotations.",
 			nav: "Codex",
 			title: "Codex subscription",
 			connected: "Signed in",
@@ -1377,7 +1559,7 @@ window.__ModuleLoader__.load({
 			contextStandard: "Standard",
 			contextStandardHint: "Use the model catalog default; official agent presets manage context automatically.",
 			contextExtended: "Extended",
-			contextExtendedHint: "Uses 400K or 1M by model; usage above 272K may consume more quota.",
+			contextExtendedHint: "Uses each model's audited extended budget (Astra: 872K); availability depends on the service.",
 			contextCustom: "Custom",
 			contextCustomHint: "Enter the full token count; lower values make official agent presets compact sooner.",
 			contextTokens: "Token limit",
@@ -1460,7 +1642,7 @@ window.__ModuleLoader__.load({
 			imageRegionNotes: "Region changes:",
 			imageEdit: "Continue editing in composer",
 			imageEditPreparing: "Adding to composer…",
-			imageEditFailed: "Could not add the image to the composer.",
+			imageEditFailed: "Handoff failed. Add a note to every marker and ensure the composer accepts images, then retry.",
 			imageRemoveAnnotation: "Remove note"
 		};
 		const STYLE = `
@@ -1497,7 +1679,7 @@ window.__ModuleLoader__.load({
 .codexSubscriptionCreditRows{display:flex;flex-direction:column;gap:6px}.codexSubscriptionResetMeta{display:flex;min-width:0;flex-direction:column;gap:1px}.codexSubscriptionResetBalance{display:flex;flex-direction:column;gap:8px}.codexSubscriptionResetCard{display:flex;align-items:center;justify-content:space-between;gap:10px;min-width:0;padding:9px 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:9px;background:var(--dsw-alias-bg-module-platform)}.codexSubscriptionResetCard .codexSubscriptionResetMeta{flex:1}.codexSubscriptionResetCard strong{overflow:hidden;font-size:12px;line-height:18px;font-weight:500;text-overflow:ellipsis;white-space:nowrap}.codexSubscriptionResetCard .codexSubscriptionActions{flex:0 0 auto}.codexSubscriptionResetCard .codexSubscriptionResetUse{min-height:28px;padding:0 10px}.codexSubscriptionResetBalance .codexSubscriptionActions{justify-content:flex-start}.codexSubscriptionResetFlow{display:flex;flex-direction:column;gap:10px;border-top:1px solid var(--dsw-alias-border-l2);padding-top:10px}.codexSubscriptionResetFlow h4{margin:0;font-size:13px;line-height:20px;font-weight:500}.codexSubscriptionResetWarning{font-size:12px;line-height:18px;color:var(--dsw-alias-label-secondary)}.codexSubscriptionResetExpiry{font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}.codexSubscriptionResetCheck{display:flex;align-items:flex-start;gap:8px;padding:9px 10px;border-radius:8px;background:var(--dsw-alias-bg-module-platform);font-size:12px;line-height:18px;color:var(--dsw-alias-label-primary);cursor:pointer}.codexSubscriptionResetCheck input{margin:3px 0 0;accent-color:var(--dsw-alias-label-primary)}.codexSubscriptionResetFinal{border-color:var(--dsw-alias-state-error-primary)!important;color:var(--dsw-alias-state-error-primary)!important}.codexSubscriptionResetResult{font-size:12px;line-height:18px;color:var(--dsw-alias-state-success-primary)}
 .codexSubscriptionResetUse:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.codexSubscriptionResetUse:focus-visible{outline:2px solid var(--dsw-alias-border-l3);outline-offset:1px}
 .codexSubscriptionSpendLimit{display:flex;flex-direction:column;gap:8px}.codexSubscriptionSpendTop{display:flex;align-items:baseline;justify-content:space-between;gap:12px}.codexSubscriptionSpendTop strong{font:600 16px/22px ui-monospace,SFMono-Regular,Consolas,monospace;font-variant-numeric:tabular-nums}.codexSubscriptionSpendLimit progress{width:100%;height:6px;border:0;border-radius:999px;overflow:hidden;background:var(--dsw-alias-border-l3);accent-color:var(--dsw-alias-brand-primary,#3964fe);-webkit-appearance:none;appearance:none}.codexSubscriptionSpendLimit progress::-webkit-progress-bar{background:var(--dsw-alias-border-l3);border-radius:999px}.codexSubscriptionSpendLimit progress::-webkit-progress-value{background:var(--dsw-alias-brand-primary,#3964fe);border-radius:999px}.codexSubscriptionSpendLimit progress::-moz-progress-bar{background:var(--dsw-alias-brand-primary,#3964fe);border-radius:999px}
-.codexComposerQuota{display:inline-flex;align-items:center;flex:0 0 auto;height:28px;box-sizing:border-box;padding:0;color:var(--dsw-alias-label-secondary);font-family:inherit;font-size:12px;line-height:20px;font-weight:500;font-variant-numeric:tabular-nums;white-space:nowrap;user-select:none}.codexComposerQuotaBar{display:block;width:40px;height:4px;border:0;border-radius:999px;overflow:hidden;background:var(--dsw-alias-border-l3);accent-color:var(--dsw-alias-label-secondary);-webkit-appearance:none;appearance:none}.codexComposerQuotaBar::-webkit-progress-bar{background:var(--dsw-alias-border-l3);border-radius:999px}.codexComposerQuotaBar::-webkit-progress-value{background:var(--dsw-alias-label-secondary);border-radius:999px}.codexComposerQuotaBar::-moz-progress-bar{background:var(--dsw-alias-label-secondary);border-radius:999px}
+.codexComposerQuotaWindows{display:inline-flex;align-items:center;gap:10px;flex-wrap:wrap}.codexComposerQuota{display:inline-flex;align-items:center;gap:5px;flex:0 0 auto;height:28px;box-sizing:border-box;padding:0;color:var(--dsw-alias-label-secondary);font-family:inherit;font-size:12px;line-height:20px;font-weight:500;font-variant-numeric:tabular-nums;white-space:nowrap;user-select:none}.codexComposerQuotaBar{display:block;width:40px;height:4px;border:0;border-radius:999px;overflow:hidden;background:var(--dsw-alias-border-l3);accent-color:var(--dsw-alias-label-secondary);-webkit-appearance:none;appearance:none}.codexComposerQuotaBar::-webkit-progress-bar{background:var(--dsw-alias-border-l3);border-radius:999px}.codexComposerQuotaBar::-webkit-progress-value{background:var(--dsw-alias-label-secondary);border-radius:999px}.codexComposerQuotaBar::-moz-progress-bar{background:var(--dsw-alias-label-secondary);border-radius:999px}
 .codexModelSelect{position:relative;min-width:0}.codexModelSelectTrigger{display:flex;align-items:center;gap:4px;min-width:0;max-width:min(360px,45cqw);height:28px;padding:0 4px 0 8px;border:0;border-radius:24px;outline:0;background:transparent;color:var(--dsw-alias-label-secondary);font-size:13px;font-weight:500;line-height:20px;cursor:pointer}.codexModelSelectTrigger:hover:not(:disabled),.codexModelSelectTrigger[aria-expanded=true]{background:var(--dsw-alias-interactive-bg-hover)}.codexModelSelectTrigger:focus-visible{box-shadow:0 0 0 2px var(--dsw-alias-border-l3)}.codexModelSelectTrigger:disabled{color:var(--dsw-alias-label-dimmed);cursor:default}.codexModelSelectBolt{display:block;flex:none;width:14px;height:14px;color:var(--dsw-alias-label-primary)}.codexModelSelectLabel{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.codexModelSelectEffort{flex:none;color:var(--dsw-alias-label-caption)}.codexModelSelectChevron{flex:none;color:var(--dsw-alias-label-caption);transition:transform 120ms}.codexModelSelectTrigger[aria-expanded=true] .codexModelSelectChevron{transform:rotate(180deg)}
 .codexModelSelectMenu,.codexModelSelectSubmenu{position:absolute;z-index:30;box-sizing:border-box;width:max-content;min-width:min(240px,calc(100vw - 32px));max-width:min(420px,calc(100vw - 32px));max-height:min(360px,calc(100vh - 96px));padding:4px;border:1px solid var(--dsw-alias-border-inverted);border-radius:12px;background:var(--dsw-specific-menu);box-shadow:var(--dsw-shadow-lv3);color:var(--dsw-alias-label-primary);overflow:hidden}.codexModelSelectMenu{right:0;bottom:calc(100% + 8px)}.codexModelSelectSubmenu{right:calc(100% + 8px);bottom:0;min-width:min(230px,calc(100vw - 32px))}.codexModelSelectCell{display:flex;align-items:center;gap:8px;width:100%;min-width:100%;height:40px;box-sizing:border-box;padding:0 10px;border:0;border-radius:10px;background:transparent;color:inherit;font-size:14px;line-height:22px;text-align:left;cursor:pointer}.codexModelSelectCell:hover,.codexModelSelectCell:focus-visible,.codexModelSelectCell[data-open=true]{background:var(--dsw-alias-interactive-bg-hover);outline:0}.codexModelSelectCell:disabled{color:var(--dsw-alias-label-dimmed);cursor:default}.codexModelSelectCellLabel{flex:none;white-space:nowrap}.codexModelSelectCellValue{flex:auto;min-width:0;overflow:hidden;color:var(--dsw-alias-label-tertiary);text-align:right;text-overflow:ellipsis;white-space:nowrap}.codexModelSelectCellChevron{flex:none;color:var(--dsw-alias-label-tertiary)}.codexModelSelectGroups{min-height:0;max-height:352px;overflow-y:auto}.codexModelSelectGroup+.codexModelSelectGroup{margin-top:4px}.codexModelSelectGroupTitle{position:sticky;top:0;z-index:1;padding:5px 8px 3px;background:var(--dsw-specific-menu);color:var(--dsw-alias-label-tertiary);font-size:12px;font-weight:500;line-height:18px}.codexModelSelectOption{display:flex;align-items:center;gap:8px;width:100%;min-width:100%;min-height:38px;box-sizing:border-box;padding:6px 8px;border:0;border-radius:10px;outline:0;background:transparent;color:inherit;text-align:left;cursor:pointer}.codexModelSelectOption:hover:not(:disabled),.codexModelSelectOption:focus-visible{background:var(--dsw-alias-interactive-bg-hover)}.codexModelSelectOption:disabled{color:var(--dsw-alias-label-dimmed);cursor:default}.codexModelSelectOptionCopy{display:flex;flex:1;min-width:0;flex-direction:column}.codexModelSelectOptionName{overflow:hidden;color:inherit;font-size:14px;font-weight:500;line-height:20px;text-overflow:ellipsis;white-space:nowrap}.codexModelSelectOptionDescription{overflow:hidden;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px;text-overflow:ellipsis;white-space:nowrap}.codexModelSelectCheck{display:grid;place-items:center;flex:0 0 18px;color:var(--dsw-alias-label-primary)}.codexModelSelectStatus,.codexModelSelectEmpty{padding:10px;color:var(--dsw-alias-label-tertiary);font-size:13px;line-height:20px}.codexModelSelectError,.codexModelSelectWarning{display:flex;align-items:flex-start;justify-content:space-between;gap:8px;margin-bottom:4px;padding:7px 8px;border-radius:8px;background:var(--dsw-alias-interactive-bg-hover-danger);color:var(--dsw-alias-state-error-primary);font-size:12px;line-height:18px}.codexModelSelectWarning{background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-state-warn-label)}.codexModelSelectRetry{flex:none;padding:0;border:0;background:transparent;color:inherit;font:inherit;font-weight:600;cursor:pointer}
 .codexModelSelectMenu{overflow:visible}
@@ -1649,18 +1831,27 @@ window.__ModuleLoader__.load({
 							pendingLabel: t("imageEditPreparing"),
 							errorLabel: t("imageEditFailed"),
 							closeOnSuccess: true,
-							onInvoke: ({ annotations }) => attachForEdit(src, downloadName, buildImageEditDraft({
-								annotations,
-								translate: t
-							}))
+							onInvoke: ({ annotations = [] }) => {
+								const imageKey = String(attachment.attachmentId ?? "image").replace(/[^a-zA-Z0-9_-]/g, "_");
+								const sourceName = annotations.length === 0 ? downloadName : `codex-edit-${imageKey}-source.png`;
+								const referenceName = `codex-edit-${imageKey}-annotations.png`;
+								return attachForEdit(src, sourceName, buildImageEditDraft({
+									annotations,
+									translate: t,
+									width: attachment.width,
+									height: attachment.height,
+									sourceName,
+									referenceName
+								}), annotations, referenceName);
+							}
 						}]
 					}],
 					opener: triggerRef.current,
 					source: "codex-generated",
 					annotations: true
 				};
-				if ((getImageViewer?.())?.open?.(request) === true) return;
-				getInternalImageViewer?.()?.open?.(request);
+				if (getInternalImageViewer?.()?.open?.(request) === true) return;
+				(getImageViewer?.())?.open?.(request);
 			};
 			if (error) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 				type: "button",
@@ -1780,7 +1971,7 @@ window.__ModuleLoader__.load({
 							return;
 						}
 						const usage = unwrap(await rpc.call(CHANNEL, "usage", { force: false }));
-						if (live) setQuota(selectModelQuota(usage, model));
+						if (live) setQuota(selectModelQuotaWindows(usage, model));
 					} catch {
 						if (live) setQuota(void 0);
 					} finally {
@@ -2053,8 +2244,19 @@ window.__ModuleLoader__.load({
 			const codex = current?.provider === "openai-codex";
 			const quotaEnabled = preferenceSnapshot.status === "ready" && preferenceSnapshot.quickQuotaMode !== "off" && codex;
 			const forecastMode = preferenceSnapshot.quickQuotaMode === QUICK_QUOTA_MODE_FORECAST;
-			const quota = useQuickQuota(rpc, quotaEnabled, current?.model);
-			if (!quotaEnabled || quota === void 0) return null;
+			const quotas = useQuickQuota(rpc, quotaEnabled, current?.model);
+			if (!quotaEnabled || quotas === void 0 || quotas.length === 0) return null;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				className: "codexComposerQuotaWindows",
+				children: quotas.map((quota, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CodexComposerQuotaWindow, {
+					quota,
+					mode: preferenceSnapshot.quickQuotaMode,
+					forecastMode,
+					t
+				}, `${quota.windowSeconds}-${index}`))
+			});
+		}
+		function CodexComposerQuotaWindow({ quota, mode, forecastMode, t }) {
 			const value = Math.round(Number(quota.remainingPercent) * 10) / 10;
 			const display = percent(value);
 			const forecast = forecastMode ? quota.forecast : void 0;
@@ -2063,17 +2265,20 @@ window.__ModuleLoader__.load({
 				value: display,
 				duration
 			});
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+			const content = mode === "bar" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("progress", {
+				className: "codexComposerQuotaBar",
+				max: 100,
+				value,
+				"aria-hidden": "true"
+			}) : forecast?.status === "calibrating" ? `${display}% · ${t("quickQuotaForecastCalibrating")}` : forecast?.status === "idle" ? `${display}% · ${t("quickQuotaForecastIdle")}` : forecast?.status === "ready" && forecast.survivesReset ? `${display}% · ${t("quickQuotaForecastUntilReset")}` : forecastMode && duration !== void 0 ? `${display}% · ≈${duration}` : `${display}%`;
+			const durationLabel = windowLabel(quota.windowSeconds, t);
+			const accessibleLabel = `${durationLabel}: ${label}`;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 				className: "codexComposerQuota",
 				role: "status",
-				"aria-label": label,
-				title: label,
-				children: preferenceSnapshot.quickQuotaMode === "bar" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("progress", {
-					className: "codexComposerQuotaBar",
-					max: 100,
-					value,
-					"aria-hidden": "true"
-				}) : forecast?.status === "calibrating" ? `${display}% · ${t("quickQuotaForecastCalibrating")}` : forecast?.status === "idle" ? `${display}% · ${t("quickQuotaForecastIdle")}` : forecast?.status === "ready" && forecast.survivesReset ? `${display}% · ${t("quickQuotaForecastUntilReset")}` : forecastMode && duration !== void 0 ? `${display}% · ≈${duration}` : `${display}%`
+				"aria-label": accessibleLabel,
+				title: accessibleLabel,
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: durationLabel }), content]
 			});
 		}
 		function CodexModelSelect({ locked, available, directory, load, select, preference, t }) {
@@ -3358,13 +3563,18 @@ window.__ModuleLoader__.load({
 						}
 					},
 					getInternalImageViewer: () => imageViewer,
-					attachForEdit: async (src, filename, draft) => {
+					attachForEdit: async (src, filename, draft, annotations = [], referenceName) => {
 						const actx = sessions.scope(sessionId);
 						if (actx === void 0 || typeof conversation.createDraftImages !== "function" || conversation.input?.for === void 0) throw new Error("This DSH version does not provide the image composer bridge");
 						const response = await fetch(src);
 						if (!response.ok) throw new Error("Could not read generated image");
 						const blob = await response.blob();
-						const created = conversation.createDraftImages([new File([blob], filename, { type: blob.type || "image/png" })]);
+						const files = [new File([blob], filename, { type: blob.type || "image/png" })];
+						if (annotations.length > 0) {
+							const reference = await createAnnotatedImageReference(blob, annotations);
+							files.push(new File([reference], referenceName, { type: "image/png" }));
+						}
+						const created = conversation.createDraftImages(files);
 						const input = conversation.input.for(actx);
 						if (!input.addImages(created.map((item) => item.id))) {
 							conversation.releaseDraftImages(created);

package/lib/index.js

@@ -1123,19 +1123,22 @@ const CUSTOM_CONTEXT_MODEL_FIELDS = Object.freeze({
 	"gpt-5.4": "customContextGpt54",
 	"gpt-5.4-mini": "customContextGpt54Mini",
 	"gpt-5.5": "customContextGpt55",
-	"gpt-5.6": "customContextGpt56"
+	"gpt-5.6": "customContextGpt56",
+	"gpt-6-astra": "customContextGpt6Astra"
 });
 const CUSTOM_CONTEXT_MODEL_CAPS = Object.freeze({
 	"gpt-5.4": 1e6,
 	"gpt-5.4-mini": 4e5,
 	"gpt-5.5": 1e6,
-	"gpt-5.6": 1e6
+	"gpt-5.6": 1e6,
+	"gpt-6-astra": 872e3
 });
 const CUSTOM_CONTEXT_MODEL_DEFAULTS = Object.freeze({
 	"gpt-5.4": 272e3,
 	"gpt-5.4-mini": 272e3,
 	"gpt-5.5": 272e3,
-	"gpt-5.6": 272e3
+	"gpt-5.6": 272e3,
+	"gpt-6-astra": 272e3
 });
 const normalizeOutputVerbosity = (value) => [
 	"default",
@@ -1213,7 +1216,8 @@ const EXTENDED_CONTEXT_WINDOWS = Object.freeze({
 	"gpt-5.5": 1e6,
 	"gpt-5.6-luna": 1e6,
 	"gpt-5.6-sol": 1e6,
-	"gpt-5.6-terra": 1e6
+	"gpt-5.6-terra": 1e6,
+	"gpt-6-astra": CUSTOM_CONTEXT_MODEL_CAPS["gpt-6-astra"]
 });
 function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, resolveOutputVerbosity = () => OUTPUT_VERBOSITY_DEFAULT, resolveContextMode = () => void 0, resolveCustomContextWindow = () => void 0, catalog, runNetwork = (_area, operation) => operation() } = {}) {
 	const provider = createOpenAICodexProvider();
@@ -1265,10 +1269,13 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 		const maximum = EXTENDED_CONTEXT_WINDOWS[model.id];
 		const mode = resolveContextMode();
 		if (maximum === void 0 || !["extended", "custom"].includes(mode)) return model;
-		if (mode === "extended") return {
-			...model,
-			contextWindow: Math.max(model.contextWindow, maximum)
-		};
+		if (mode === "extended") {
+			const contextWindow = model.id === "gpt-6-astra" ? maximum : Math.max(model.contextWindow, maximum);
+			return {
+				...model,
+				contextWindow
+			};
+		}
 		const requested = normalizeCustomContextWindow(resolveCustomContextWindow(customContextModelKey(model.id)), maximum);
 		return {
 			...model,
@@ -1303,7 +1310,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "1.14.0";
+const PACKAGE_VERSION = "1.14.2";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js
@@ -1637,6 +1644,10 @@ const PNG_SIGNATURE = Buffer.from([
 	26,
 	10
 ]);
+const FULL_ATTACHMENT_ID = /^sha256:[0-9a-f]{64}$/u;
+const BARE_ATTACHMENT_DIGEST = /^[0-9a-f]{64}$/iu;
+const PATH_LIKE_ATTACHMENT_ID = /[\\/]/u;
+const FILE_NAME_ATTACHMENT_ID = /\.[A-Za-z0-9]{1,16}$/u;
 const record$2 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 const nonEmpty = (value) => typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
 function normalizeImageOptions(args) {
@@ -1706,22 +1717,63 @@ function decodeCodexPng(value, maximumBytes) {
 	return new Uint8Array(data);
 }
 function imageReference(value) {
+	const originalDimensions = record$2(value.originalDimensions) ? {
+		width: value.originalDimensions.width,
+		height: value.originalDimensions.height
+	} : void 0;
 	return {
 		attachmentId: value.attachmentId,
 		mediaType: value.mediaType,
 		bytes: value.bytes,
 		width: value.width,
 		height: value.height,
-		...value.name === void 0 ? {} : { name: value.name }
+		...value.name === void 0 ? {} : { name: value.name },
+		...originalDimensions === void 0 ? {} : { originalDimensions }
 	};
 }
+function normalizeAttachmentId(value) {
+	if (typeof value !== "string") return void 0;
+	if (FULL_ATTACHMENT_ID.test(value)) return value;
+	const bare = BARE_ATTACHMENT_DIGEST.exec(value);
+	return bare === null ? void 0 : `sha256:${bare[0].toLowerCase()}`;
+}
+function invalidAttachmentId(value) {
+	const attachmentId = value?.attachmentId;
+	if (typeof attachmentId === "string" && (PATH_LIKE_ATTACHMENT_ID.test(attachmentId) || FILE_NAME_ATTACHMENT_ID.test(attachmentId))) throw new Error("referenceImages attachmentId is a file path or filename; call read_image on that file and retry with its complete sha256:<64 lowercase hex> attachment reference. Do not omit referenceImages or fall back to new image generation.");
+	throw new Error("referenceImages attachmentId must be sha256:<64 lowercase hex> copied from an image block or read_image result. Do not omit referenceImages or fall back to new image generation.");
+}
 function referenceOf(value, attachments) {
-	if (!record$2(value) || typeof value.attachmentId !== "string" || value.attachmentId.length === 0 || value.attachmentId.length > 256 || !attachments.imageLimits.mediaTypes.includes(value.mediaType) || !Number.isSafeInteger(value.bytes) || value.bytes <= 0 || !Number.isSafeInteger(value.width) || value.width <= 0 || !Number.isSafeInteger(value.height) || value.height <= 0 || value.name !== void 0 && (typeof value.name !== "string" || value.name.length > 256)) throw new Error("referenceImages contains an invalid image reference");
-	return imageReference(value);
+	const attachmentId = normalizeAttachmentId(value?.attachmentId);
+	if (attachmentId === void 0) invalidAttachmentId(value);
+	if (!record$2(value) || !attachments.imageLimits.mediaTypes.includes(value.mediaType) || !Number.isSafeInteger(value.bytes) || value.bytes <= 0 || !Number.isSafeInteger(value.width) || value.width <= 0 || !Number.isSafeInteger(value.height) || value.height <= 0 || value.name !== void 0 && (typeof value.name !== "string" || value.name.length > 256) || value.originalDimensions !== void 0 && (!record$2(value.originalDimensions) || !Number.isSafeInteger(value.originalDimensions.width) || value.originalDimensions.width <= 0 || !Number.isSafeInteger(value.originalDimensions.height) || value.originalDimensions.height <= 0)) throw new Error("referenceImages contains an invalid image reference");
+	return imageReference({
+		...value,
+		attachmentId
+	});
+}
+function sessionImageReferences(messages) {
+	const references = /* @__PURE__ */ new Map();
+	const visit = (content) => {
+		if (!Array.isArray(content)) return;
+		for (const block of content) if (block?.type === "image" && record$2(block.attachment)) {
+			const id = normalizeAttachmentId(block.attachment.attachmentId);
+			if (id !== void 0) references.set(id, block.attachment);
+		} else if (block?.type === "tool-result") visit(block.content);
+	};
+	for (const message of messages ?? []) visit(message?.content);
+	return references;
 }
-async function editImages(values, attachments, signal) {
+async function editImages(values, attachments, signal, messages) {
 	if (!Array.isArray(values) || values.length === 0 || values.length > MAX_REFERENCE_IMAGES) throw new Error(`referenceImages must contain between 1 and ${MAX_REFERENCE_IMAGES} images`);
-	const references = values.map((value) => referenceOf(value, attachments));
+	const available = messages === void 0 ? void 0 : sessionImageReferences(messages);
+	const references = values.map((value) => {
+		const id = normalizeAttachmentId(value?.attachmentId);
+		if (id === void 0) invalidAttachmentId(value);
+		if (available === void 0) return referenceOf(value, attachments);
+		const selected = available.get(id);
+		if (selected === void 0) throw new Error("The selected image attachment cannot be found in the current session. Call read_image on the intended image and retry with its returned reference. Do not omit referenceImages or substitute another image.");
+		return referenceOf(selected, attachments);
+	});
 	if (new Set(references.map((value) => value.attachmentId)).size !== references.length) throw new Error("referenceImages must not contain duplicates");
 	const images = [];
 	let totalBytes = 0;
@@ -1774,7 +1826,21 @@ function imageOutputSchema() {
 						type: "integer",
 						required: true
 					},
-					name: { type: "string" }
+					name: { type: "string" },
+					originalDimensions: {
+						type: "object",
+						additionalProperties: false,
+						properties: {
+							width: {
+								type: "integer",
+								required: true
+							},
+							height: {
+								type: "integer",
+								required: true
+							}
+						}
+					}
 				}
 			},
 			original: {
@@ -1841,7 +1907,7 @@ function createCodexImageTool(options) {
 	const attachments = options.attachments;
 	return defineTool({
 		name: CODEX_IMAGE_TOOL_NAME,
-		description: "Create a new image or explicitly edit selected prior images using the signed-in Codex subscription. Omit referenceImages for a completely new image. Include only the exact prior image references the user asked to edit; never assume every image in the conversation is a reference.",
+		description: "Create a new image or explicitly edit selected prior images using the signed-in Codex subscription. Omit referenceImages only for a completely new image. For an edit, copy each complete image reference from the session image block or read_image result, including attachmentId in the exact form sha256:<64 lowercase hex>; never use a workspace path, absolute path, or filename, and do not omit the references to turn an edit into text-to-image generation. A bare 64-character hex digest is accepted and normalized to sha256:<64 lowercase hex>. If a reference is unavailable, call read_image and retry with its returned reference. Include only the exact prior image references the user asked to edit; never assume every image in the conversation is a reference. For annotation-guided edits, include both the named clean source and its numbered location reference, and preserve the numbered coordinates and requested changes in the prompt. The location-reference markers are guidance only and must not appear in the result. If those references cannot be identified, do not substitute unrelated images or silently ignore the annotations.",
 		parameters: {
 			prompt: {
 				type: "string",
@@ -1873,14 +1939,15 @@ function createCodexImageTool(options) {
 			},
 			referenceImages: {
 				type: "array",
-				description: "Optional explicit references to 1-5 prior images to edit. Omit for a new image.",
+				description: "Optional explicit references to 1-5 prior images to edit. Copy each complete reference from the session image block or read_image result. Omit only for a new image; an invalid reference must be fixed and retried rather than omitted.",
 				items: {
 					type: "object",
 					additionalProperties: false,
 					properties: {
 						attachmentId: {
 							type: "string",
-							required: true
+							required: true,
+							description: "Copy the complete attachmentId from the image block or read_image result: sha256:<64 lowercase hex>. Never pass a workspace path, absolute path, or filename. A bare 64-character hex digest is accepted and normalized to sha256:<64 lowercase hex>."
 						},
 						mediaType: {
 							type: "string",
@@ -1898,7 +1965,21 @@ function createCodexImageTool(options) {
 							type: "integer",
 							required: true
 						},
-						name: { type: "string" }
+						name: { type: "string" },
+						originalDimensions: {
+							type: "object",
+							additionalProperties: false,
+							properties: {
+								width: {
+									type: "integer",
+									required: true
+								},
+								height: {
+									type: "integer",
+									required: true
+								}
+							}
+						}
 					}
 				}
 			}
@@ -1926,7 +2007,8 @@ function createCodexImageTool(options) {
 			if (!attachments.imageLimits.mediaTypes.includes("image/png")) throw new Error("This DSH installation does not accept PNG image attachments");
 			const maximumBytes = Math.min(attachments.imageLimits.maxImageBytes, attachments.imageLimits.maxMessageImageBytes);
 			const editing = args.referenceImages !== void 0;
-			const images = editing ? await editImages(args.referenceImages, attachments, exec.signal) : void 0;
+			const sessionMessages = editing && typeof options.getSessionMessages === "function" ? await options.getSessionMessages(exec.agent?.id) : void 0;
+			const images = editing ? await editImages(args.referenceImages, attachments, exec.signal, sessionMessages ?? (options.getSessionMessages ? [] : void 0)) : void 0;
 			let response;
 			try {
 				response = await fetchImage(editing ? CODEX_IMAGE_EDIT_URL : CODEX_IMAGE_GENERATION_URL, {
@@ -3304,6 +3386,7 @@ function apply(ctx) {
 		getAuth: resolveAuth,
 		readCredential: (options) => store.read(PROVIDER, options),
 		attachments: ctx.attachments,
+		getSessionMessages: (sessionId) => ctx.get?.("sessions")?.get?.(sessionId)?.deriveMessages?.() ?? [],
 		originalImages,
 		fetch: (input, init) => network.fetch("image", input, init)
 	}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "1.14.0",
+  "version": "1.14.2",
   "description": "Use ChatGPT and Codex subscriptions in DeepSeek Harness with OAuth, quota, safe resets, web search, images, and Fast mode",
   "type": "module",
   "main": "./lib/index.js",