dsh-codex-subscription 2.2.11 → 2.4.0

package/lib/index.js

@@ -206,6 +206,7 @@ const DEFAULT_SEARCH_PROVIDER = SEARCH_PROVIDER_AUTO;
 const SPEED_MODE_FIELD = "speedMode";
 const SPEED_MODE_STANDARD = "standard";
 const SPEED_MODE_FAST = "fast";
+const SPEED_MODE_ULTRAFAST = "ultrafast";
 const DEFAULT_SPEED_MODE = SPEED_MODE_STANDARD;
 const OUTPUT_VERBOSITY_FIELD = "outputVerbosity";
 const OUTPUT_VERBOSITY_DEFAULT = "default";
@@ -364,7 +365,11 @@ const PREFERENCE_FIELDS = Object.freeze({
 		error: "Invalid search provider preference"
 	},
 	[SPEED_MODE_FIELD]: {
-		choices: [SPEED_MODE_STANDARD, SPEED_MODE_FAST],
+		choices: [
+			SPEED_MODE_STANDARD,
+			SPEED_MODE_FAST,
+			SPEED_MODE_ULTRAFAST
+		],
 		default: DEFAULT_SPEED_MODE,
 		error: "Invalid speed mode preference"
 	},
@@ -1200,13 +1205,18 @@ const SUPPORTED_RUNTIME_VERSIONS = Object.freeze([
 ]);
 const require = createRequire(import.meta.url);
 const execute = promisify(execFile);
+/** The DSH release this plugin is loaded into, read from the host's own LLM package. */
+function hostDshVersion(resolve = require.resolve, entry = process.argv[1]) {
+	const attempts = [() => resolve("@deepseek-ai/dsh-llm/package.json")];
+	if (typeof entry === "string" && entry) attempts.push(() => require.resolve("@deepseek-ai/dsh-llm/package.json", { paths: [dirname(entry)] }));
+	for (const attempt of attempts) try {
+		const { version } = JSON.parse(readFileSync(attempt(), "utf8"));
+		if (typeof version === "string" && /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/u.test(version)) return version;
+	} catch {}
+}
 function matchingSubagentRuntimeVersion(resolve = require.resolve) {
-	try {
-		const host = JSON.parse(readFileSync(resolve("@deepseek-ai/dsh-llm/package.json"), "utf8"));
-		return SUPPORTED_RUNTIME_VERSIONS.includes(host.version) ? host.version : void 0;
-	} catch {
-		return;
-	}
+	const version = hostDshVersion(resolve, resolve === require.resolve ? process.argv[1] : "");
+	return SUPPORTED_RUNTIME_VERSIONS.includes(version) ? version : void 0;
 }
 function inspectSubagentRuntime(resolve = require.resolve) {
 	try {
@@ -1794,7 +1804,8 @@ const sketchCommandArray = {
 				"stroke",
 				"object",
 				"layer",
-				"resize"
+				"resize",
+				"svg"
 			]
 		},
 		id: {
@@ -1858,6 +1869,10 @@ const sketchCommandArray = {
 				"clear"
 			]
 		},
+		svg: {
+			type: "string",
+			description: "op svg only: a complete <svg viewBox=\"0 0 W H\"> document (W and H equal to the canvas width and height from inspect). Imported as native editable strokes; the fastest way to draw a whole scene. Optional layer sets the target layer."
+		},
 		value: string,
 		ratio: {
 			type: "string",
@@ -1883,7 +1898,7 @@ const sketchCommandArray = {
 function createSketchAgentTool(bridge, attachments) {
 	return defineTool({
 		name: "codex_sketch",
-		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.",
+		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. Draw with the svg op whenever possible: one SVG document per stage (paths, shapes, groups, transforms; see the reference from inspect) is far faster and richer than hand-placed strokes, and still becomes native editable strokes. Use stroke commands for small edits and native text. 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",
@@ -2878,6 +2893,7 @@ function normalizeTransportEvent(event, signal) {
 //#endregion
 //#region src/pi-ai-runtime.js
 const FAST_SERVICE_TIER = "priority";
+const ULTRAFAST_SERVICE_TIER = "ultrafast";
 /** Apply the chosen detail to user and tool-result images after the provider assembles the request. */
 function withInputImageDetail(payload, detail) {
 	if (!Array.isArray(payload.input)) return payload;
@@ -2937,13 +2953,14 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 		const metadata = modelMetadata(model);
 		const requestedVerbosity = resolveOutputVerbosity();
 		const textVerbosity = supportsVerbosity(model) ? requestedVerbosity === "default" ? metadata?.defaultVerbosity ?? "medium" : requestedVerbosity : void 0;
-		const fast = resolveSpeedMode() === "fast" && (metadata?.supportsFast ?? supportsCodexFastMode(model?.id));
+		const speedMode = resolveSpeedMode();
+		const serviceTier = speedMode === "ultrafast" && metadata?.supportsUltrafast === true ? ULTRAFAST_SERVICE_TIER : speedMode === "fast" && (metadata?.supportsFast ?? supportsCodexFastMode(model?.id)) ? FAST_SERVICE_TIER : void 0;
 		const inputImageDetail = normalizeInputImageDetail(resolveInputImageDetail());
 		const onPayload = options.onPayload;
 		return {
 			...options,
 			...textVerbosity === void 0 ? {} : { textVerbosity },
-			...fast ? { serviceTier: FAST_SERVICE_TIER } : {},
+			...serviceTier === void 0 ? {} : { serviceTier },
 			async onPayload(payload, requestModel) {
 				const preferred = {
 					...payload,
@@ -2951,7 +2968,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 						...payload.text ?? {},
 						verbosity: textVerbosity
 					} },
-					...fast ? { service_tier: FAST_SERVICE_TIER } : {}
+					...serviceTier === void 0 ? {} : { service_tier: serviceTier }
 				};
 				const managed = compaction?.preparePayload(preferred, model?.contextWindow) ?? preferred;
 				const next = await onPayload?.(managed, requestModel);
@@ -2962,7 +2979,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 						...detailed.text ?? {},
 						verbosity: textVerbosity
 					} },
-					...fast ? { service_tier: FAST_SERVICE_TIER } : {}
+					...serviceTier === void 0 ? {} : { service_tier: serviceTier }
 				};
 			}
 		};
@@ -3051,7 +3068,7 @@ async function readSubscriptionCredentials(getAuth, readCredential, signal) {
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.2.11";
+const PACKAGE_VERSION = "2.4.0";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js
@@ -3114,6 +3131,7 @@ function reasoningMap(levels) {
 	return map;
 }
 const capabilityNames = (values) => [...new Set(values.filter((value) => typeof value === "string" && /^[a-z][a-z0-9_-]{0,31}$/u.test(value)))].sort().slice(0, 16);
+const speedTierIds = (value) => [...Array.isArray(value.additional_speed_tiers) ? value.additional_speed_tiers : [], ...Array.isArray(value.service_tiers) ? value.service_tiers.map((tier) => tier?.id) : []];
 function unsupportedCapabilities(value) {
 	const reasoning = capabilityNames((value.supported_reasoning_levels ?? []).map((item) => item?.effort)).filter((level) => !["none", ...LEVELS.slice(1)].includes(level));
 	const inputs = capabilityNames(Array.isArray(value.input_modalities) ? value.input_modalities : []).filter((input) => !["text", "image"].includes(input));
@@ -3122,7 +3140,8 @@ function unsupportedCapabilities(value) {
 		"default",
 		"standard",
 		"fast",
-		"priority"
+		"priority",
+		"ultrafast"
 	].includes(tier));
 	return {
 		...reasoning.length ? { reasoning } : {},
@@ -3166,7 +3185,8 @@ function visibleModel(value, displayNames, now) {
 			"medium",
 			"high"
 		].includes(value.default_verbosity) ? value.default_verbosity : void 0,
-		supportsFast: [...Array.isArray(value.additional_speed_tiers) ? value.additional_speed_tiers : [], ...Array.isArray(value.service_tiers) ? value.service_tiers.map((tier) => tier?.id) : []].some((tier) => tier === "fast" || tier === "priority")
+		supportsFast: speedTierIds(value).some((tier) => tier === "fast" || tier === "priority"),
+		supportsUltrafast: speedTierIds(value).includes("ultrafast")
 	};
 }
 function parseOfficialModelCatalog(value, now = Date.now()) {
@@ -3541,6 +3561,23 @@ 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;
+const NETWORK_REASONS = {
+	UND_ERR_HEADERS_TIMEOUT: "the image service sent no response within 5 minutes",
+	UND_ERR_BODY_TIMEOUT: "the image response stalled",
+	UND_ERR_CONNECT_TIMEOUT: "the connection to the image service timed out",
+	UND_ERR_SOCKET: "the connection closed unexpectedly",
+	ECONNRESET: "the connection was reset",
+	ETIMEDOUT: "the connection timed out",
+	ENOTFOUND: "DNS lookup failed",
+	ECONNREFUSED: "the connection was refused",
+	EAI_AGAIN: "DNS lookup failed"
+};
+function requestFailureReason(error) {
+	const code = [(error?.cause ?? error)?.code, error?.code].find((value) => typeof value === "string" && /^[A-Z][A-Z0-9_]{2,39}$/u.test(value));
+	if (code !== void 0) return `: ${NETWORK_REASONS[code] ?? "network error"} (${code})`;
+	if (error?.name === "TimeoutError") return ": the image request timed out";
+	return "";
+}
 function normalizeImageOptions(args) {
 	const quality = nonEmpty(args?.quality) ?? "auto";
 	const background = nonEmpty(args?.background) ?? "auto";
@@ -3945,7 +3982,7 @@ function createCodexImageTool(options) {
 				});
 			} catch (error) {
 				if (exec.signal.aborted) throw exec.signal.reason;
-				throw new Error(`Codex image ${editing ? "edit" : "generation"} request failed`, { cause: error });
+				throw new Error(`Codex image ${editing ? "edit" : "generation"} request failed${requestFailureReason(error)}`, { cause: error });
 			}
 			if (!response.ok) {
 				if (response.status === 401 || response.status === 403) throw new Error("ChatGPT sign-in needs to be renewed");
@@ -4632,7 +4669,8 @@ async function createSubscriptionDiagnostics({ auth, preferences, login = { phas
 		runtime: {
 			node: process.version,
 			platform: process.platform,
-			arch: process.arch
+			arch: process.arch,
+			...hostDshVersion() ? { dsh: hostDshVersion() } : {}
 		},
 		account,
 		login,
@@ -5829,6 +5867,7 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 					contextModels: Array.isArray(value?.contextModels) ? value.contextModels : [],
 					verbosityModels: Array.isArray(value?.verbosityModels) ? value.verbosityModels : [],
 					fastModels: Array.isArray(value?.fastModels) ? value.fastModels : [],
+					ultrafastModels: Array.isArray(value?.ultrafastModels) ? value.ultrafastModels : [],
 					catalogStatus: value?.catalogStatus
 				}
 			};
@@ -6100,6 +6139,7 @@ function apply(ctx, config = {}) {
 				})),
 				catalogStatus: modelCatalog.status(),
 				verbosityModels: provider.getModels().filter((model) => modelCatalog.metadata(model.id)?.supportVerbosity ?? model.id !== "gpt-5.3-codex-spark").map((model) => model.id),
+				ultrafastModels: provider.getModels().filter((model) => modelCatalog.metadata(model.id)?.supportsUltrafast === true).map((model) => model.id),
 				fastModels: provider.getModels().filter((model) => modelCatalog.metadata(model.id)?.supportsFast ?? supportsCodexFastMode(model.id)).map((model) => model.id),
 				writable: ctx.settings.writable
 			};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "2.2.11",
+  "version": "2.4.0",
   "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",