dsh-codex-subscription 2.1.0-beta.2 → 2.1.0-beta.4

package/lib/index.js

@@ -60,7 +60,8 @@ const IMAGE_FEATURE_DEFAULTS = Object.freeze({
 	imageViewer: true,
 	imageAnnotations: true,
 	imageSketch: false,
-	imageSketchAgent: false
+	imageSketchAgent: false,
+	imageSketchAgentPreview: false
 });
 function readImageFeatures(value = {}) {
 	return Object.fromEntries(Object.entries(IMAGE_FEATURE_DEFAULTS).map(([key, fallback]) => [key, typeof value?.[key] === "boolean" ? value[key] : fallback]));
@@ -350,6 +351,7 @@ const RPC_ENDPOINTS = Object.freeze([
 	"image/original/chunk",
 	"sketch/connect",
 	"sketch/poll",
+	"sketch/claim",
 	"sketch/result",
 	"sketch/disconnect"
 ]);
@@ -435,7 +437,8 @@ function createSketchAgentBridge({ enabled, now = Date.now, timeoutMs = 2e4 }) {
 					const entry = {
 						token: randomUUID(),
 						seen: now(),
-						tasks: /* @__PURE__ */ new Map()
+						tasks: /* @__PURE__ */ new Map(),
+						cancelled: []
 					};
 					sessions.set(payload.sessionId, entry);
 					return {
@@ -446,15 +449,25 @@ function createSketchAgentBridge({ enabled, now = Date.now, timeoutMs = 2e4 }) {
 				const entry = find(payload);
 				if (endpoint === "sketch/poll") return {
 					ok: true,
-					value: [...entry.tasks].filter(([, t]) => !t.delivered).map(([id, t]) => {
+					value: [...entry.cancelled.splice(0).map((id) => ({
+						id,
+						cancelled: true
+					})), ...[...entry.tasks].filter(([, t]) => !t.delivered).map(([id, t]) => {
 						t.delivered = true;
 						return {
 							id,
 							request: t.request,
 							expiresAt: t.expiresAt
 						};
-					})
+					})]
 				};
+				if (endpoint === "sketch/claim") {
+					const task = entry.tasks.get(payload.id);
+					return {
+						ok: true,
+						value: Boolean(task && task.delivered && task.expiresAt > now())
+					};
+				}
 				if (endpoint === "sketch/disconnect") {
 					fail(entry, "Sketch board closed");
 					sessions.delete(payload.sessionId);
@@ -500,8 +513,15 @@ function createSketchAgentBridge({ enabled, now = Date.now, timeoutMs = 2e4 }) {
 					entry.tasks.delete(id);
 					callback(value);
 				};
-				const abort = () => finish(reject, Error("Sketch operation interrupted; inspect before retrying"));
-				const timer = setTimeout(() => finish(reject, Error("Sketch response timed out; inspect before retrying")), timeoutMs);
+				const cancel = (message) => {
+					if (entry.tasks.get(id)?.delivered) {
+						entry.cancelled.push(id);
+						if (entry.cancelled.length > 32) entry.cancelled.shift();
+					}
+					finish(reject, Error(message));
+				};
+				const abort = () => cancel("Sketch operation interrupted; inspect recentRequests before retrying");
+				const timer = setTimeout(() => cancel("Sketch response timed out; inspect recentRequests before retrying"), timeoutMs);
 				entry.tasks.set(id, {
 					request,
 					expiresAt: now() + timeoutMs,
@@ -520,11 +540,109 @@ function createSketchAgentBridge({ enabled, now = Date.now, timeoutMs = 2e4 }) {
 	};
 }
 //#endregion
+//#region src/sketch-command-schema.js
+const number = { type: "number" };
+const string = { type: "string" };
+const object = (properties) => ({
+	type: "object",
+	additionalProperties: false,
+	properties
+});
+const style = {
+	color: string,
+	width: number,
+	opacity: number,
+	fill: { type: "boolean" },
+	text: string,
+	points: {
+		type: "array",
+		items: object({
+			x: {
+				...number,
+				required: true
+			},
+			y: {
+				...number,
+				required: true
+			}
+		})
+	}
+};
+const sketchCommandArray = {
+	type: "array",
+	items: object({
+		op: {
+			type: "string",
+			required: true,
+			enum: [
+				"stroke",
+				"object",
+				"layer",
+				"resize"
+			]
+		},
+		id: {
+			oneOf: [{ type: "string" }, { type: "integer" }],
+			description: "Object string ID; layer commands use integer IDs."
+		},
+		layer: { type: "integer" },
+		shape: {
+			type: "string",
+			enum: [
+				"pen",
+				"line",
+				"arrow",
+				"text",
+				"rectangle",
+				"circle",
+				"ellipse",
+				"polygon",
+				"bezier",
+				"eraser"
+			]
+		},
+		...style,
+		action: {
+			type: "string",
+			enum: [
+				"update",
+				"duplicate",
+				"delete",
+				"add",
+				"select",
+				"rename",
+				"visible",
+				"up",
+				"down",
+				"clear"
+			]
+		},
+		value: string,
+		ratio: {
+			type: "string",
+			enum: [
+				"1:1",
+				"4:3",
+				"3:4",
+				"16:9",
+				"9:16"
+			]
+		},
+		patch: object(style),
+		transform: object({
+			dx: number,
+			dy: number,
+			scaleX: number,
+			scaleY: number
+		})
+	})
+};
+//#endregion
 //#region src/sketch-agent-tool.js
 function createSketchAgentTool(bridge, attachments) {
 	return defineTool({
 		name: "codex_sketch",
-		description: "Edit the sketch board in this session using native editable strokes and layers. Only use when asked to draw or edit a sketch. Start with inspect for the documentId, revision and command reference. Apply atomic batches, preview between stages, and save the finished draft. Never generates AI images, sends messages or attaches images automatically. Inspect automatically opens the board in the currently viewed session. Do not ask the user to open it first. If the session is not visible in DSH, ask them to switch to it. On timeout inspect before retrying; reuse the exact requestId only for the same request.",
+		description: "Edit the sketch board in this session using native editable strokes and layers. Use for @sketch requests and explicit follow-up edits to that drawing. The toolbar pen button is for manual drawing; do not require the user to open it. Start with inspect for the runId, documentId, revision and command reference. Apply atomic batches, preview between stages, and call finish to save the finished draft and release the editing lock. save is only a checkpoint. finish returns an image only when the user enables experimental preview feedback. Closing the board does not stop drawing. If the user stops drawing, do not retry. Never generates AI images, sends messages or attaches images automatically. Inspect automatically opens the board in the currently viewed session. Do not ask the user to open it first. If the session is not visible in DSH, ask them to switch to it. On timeout inspect before retrying; reuse the exact requestId only for the same request.",
 		parameters: {
 			action: {
 				type: "string",
@@ -533,28 +651,45 @@ function createSketchAgentTool(bridge, attachments) {
 					"inspect",
 					"apply",
 					"preview",
-					"save"
+					"save",
+					"finish"
 				]
 			},
+			runId: {
+				type: "string",
+				description: "From inspect; required for all other actions. Never reuse a stopped run."
+			},
 			documentId: {
 				type: "string",
 				description: "From inspect; required except for inspect."
 			},
 			revision: {
 				type: "integer",
-				description: "From latest response; required for apply/save."
+				description: "From latest response; required for apply/save/finish."
 			},
 			requestId: {
 				type: "string",
-				description: "Unique id for apply/save; exact retries are deduplicated."
+				description: "Unique id for apply/save/finish; exact retries are deduplicated. After timeout inspect recentRequests before repeating a write."
 			},
 			commands: {
-				type: "string",
-				description: "JSON array of native commands described by inspect. Required for apply."
+				oneOf: [sketchCommandArray, { type: "string" }],
+				description: "Prefer a native command array. Legacy JSON string also accepted. Required for apply. Use named objects and update existing IDs; use Bezier for curves, not hundreds of pen points."
 			},
 			name: {
 				type: "string",
-				description: "Draft name for save."
+				description: "Draft name for save/finish."
+			},
+			offset: {
+				type: "integer",
+				description: "inspect only: object list offset, default 0. Follow nextOffset for further pages."
+			},
+			objectId: {
+				type: "string",
+				description: "inspect only: return full editable geometry for this object, in layer (defaults to active layer)."
+			},
+			layer: {
+				type: "integer",
+				description: "inspect only: layer containing objectId."
 			}
 		},
 		timeoutMs: 25e3,
@@ -564,9 +699,10 @@ function createSketchAgentTool(bridge, attachments) {
 			if (typeof sessionId !== "string") throw Error("A session-owned sketch call is required");
 			const request = { ...args };
 			if (args.action === "apply") try {
-				request.commands = JSON.parse(args.commands);
+				request.commands = typeof args.commands === "string" ? JSON.parse(args.commands) : args.commands;
+				if (!Array.isArray(request.commands)) throw Error();
 			} catch {
-				throw Error("commands must be a JSON array");
+				throw Error("commands must be a native array or JSON array string");
 			}
 			const value = await bridge.request(sessionId, request, exec.signal);
 			if (value.png) {
@@ -1835,7 +1971,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 Object.freeze(["0.82.1", "0.85.1"]);
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.1.0-beta.2";
+const PACKAGE_VERSION = "2.1.0-beta.4";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js
@@ -2498,7 +2634,7 @@ function createCodexImageTool(options) {
 	const attachments = options.attachments;
 	return defineTool({
 		name: CODEX_IMAGE_TOOL_NAME,
-		description: "Generate or edit images only when the user asks for image output, not when merely discussing images. Uses the signed-in Codex subscription. For a new image, omit referenceImages. For edits, copy complete references only for the images the user selected; obtain missing references using read_image. Never substitute paths, unrelated images, or text-only generation for an edit. For numbered annotations, include the clean source and location-reference image, preserve the requested changes and coordinates in the prompt, and remove guidance markers from the result. If the intended references cannot be identified, ask rather than guessing.",
+		description: "Generate or edit images only when the user asks for image output, not when merely discussing images. Uses the signed-in Codex subscription. For a new image, omit referenceImages. For edits, copy attachmentId only from the selected session image block; the host supplies its metadata. Never call read_image for an attachmentId or attachment filename. Use read_image only for an actual local file whose reference is not already in the conversation. Never substitute paths, unrelated images, or text-only generation for an edit. For numbered annotations, include the clean source and location-reference image, preserve the requested changes and coordinates in the prompt, and remove guidance markers from the result. If the intended references cannot be identified, ask rather than guessing.",
 		parameters: {
 			model: {
 				type: "string",
@@ -2537,7 +2673,7 @@ function createCodexImageTool(options) {
 			},
 			referenceImages: {
 				type: "array",
-				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.",
+				description: "Optional references to 1-5 selected images. For session images provide only attachmentId; the host resolves trusted metadata. Omit only for a new image; never drop an invalid reference to bypass editing.",
 				items: {
 					type: "object",
 					additionalProperties: false,
@@ -2549,19 +2685,19 @@ function createCodexImageTool(options) {
 						},
 						mediaType: {
 							type: "string",
-							required: true
+							...typeof options.getSessionMessages !== "function" ? { required: true } : {}
 						},
 						bytes: {
 							type: "integer",
-							required: true
+							...typeof options.getSessionMessages !== "function" ? { required: true } : {}
 						},
 						width: {
 							type: "integer",
-							required: true
+							...typeof options.getSessionMessages !== "function" ? { required: true } : {}
 						},
 						height: {
 							type: "integer",
-							required: true
+							...typeof options.getSessionMessages !== "function" ? { required: true } : {}
 						},
 						name: { type: "string" },
 						originalDimensions: {
@@ -2570,11 +2706,11 @@ function createCodexImageTool(options) {
 							properties: {
 								width: {
 									type: "integer",
-									required: true
+									...typeof options.getSessionMessages !== "function" ? { required: true } : {}
 								},
 								height: {
 									type: "integer",
-									required: true
+									...typeof options.getSessionMessages !== "function" ? { required: true } : {}
 								}
 							}
 						}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "2.1.0-beta.2",
+  "version": "2.1.0-beta.4",
   "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",