@mars-sea/dsh-commandcode-provider 0.1.6 → 0.1.9

package/lib/index.js

@@ -1,7 +1,8 @@
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import z from "@deepseek-ai/schemastery";
-import { CallId, LlmAdapter, LlmError, ReasoningEffortId, assertUsableApiKey, attributionHeaders, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
+import { MAX_TIMER_DELAY_MS } from "@deepseek-ai/dsh-timeout";
+import { CallId, LlmAdapter, LlmError, ReasoningEffortId, assertUsableApiKey, attributionHeaders, errorChain, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import { launchEnvironmentOf } from "@deepseek-ai/dsh-launch-environment";
 import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
@@ -166,10 +167,69 @@ const KNOWN_EFFORTS = {
 		"max"
 	]
 };
+/**
+* Models whose Capabilities include Vision, per the official Command Code
+* model registry (`https://commandcode.ai/docs/reference/cli/models`, generated
+* from the same registry as `cmd --list-models` / the `/model` picker).
+*
+* The Provider API does not expose modality metadata, so this snapshot is the
+* source of truth for image-input gating. Command Code's own CLI falls back to
+* a client-side VISION side-call for text-only models; this adapter does not
+* reproduce that interactive feature, so images sent to a model outside this
+* list are refused loudly (`UNSUPPORTED_CONTENT`) instead of being dropped or
+* sent to a model that cannot read them.
+*
+* Keep in sync with the official registry when new models ship (see the
+* dsh-commandcode-upstream skill).
+*/
+const KNOWN_IMAGE_MODELS = /* @__PURE__ */ new Set([
+	"MiniMaxAI/MiniMax-M3",
+	"Qwen/Qwen3.6-Plus",
+	"Qwen/Qwen3.7-Flash",
+	"Qwen/Qwen3.7-Plus",
+	"Qwen/Qwen3.8-Max",
+	"claude-fable-5",
+	"claude-haiku-4-5-20251001",
+	"claude-opus-4-7",
+	"claude-opus-4-8",
+	"claude-opus-5",
+	"claude-sonnet-4-6",
+	"claude-sonnet-5",
+	"google/gemini-3.1-flash-lite",
+	"google/gemini-3.5-flash",
+	"google/gemini-3.5-flash-lite",
+	"google/gemini-3.6-flash",
+	"google/gemini-3.7-flash",
+	"gpt-5.3-codex",
+	"gpt-5.4",
+	"gpt-5.4-mini",
+	"gpt-5.5",
+	"gpt-5.6-luna",
+	"gpt-5.6-sol",
+	"gpt-5.6-terra",
+	"meta/muse-spark-1.1",
+	"meta/muse-spark-1.2",
+	"meta/muse-spark-1.2-contributor",
+	"moonshotai/Kimi-K2.5",
+	"moonshotai/Kimi-K2.6",
+	"moonshotai/Kimi-K2.7-Code",
+	"moonshotai/Kimi-K2.7-Code-Highspeed",
+	"moonshotai/Kimi-K3",
+	"sakana/fugu-ultra",
+	"stepfun/Step-3.7-Flash",
+	"thinkingmachines/inkling",
+	"thinkingmachines/inkling-small",
+	"xai/grok-4.5",
+	"xiaomi/mimo-v2.5"
+]);
 const COMMAND_CODE_CLI_VERSION = "1.26.0";
 const DEFAULT_API_BASE = "https://api.commandcode.ai";
 const DEFAULT_GENERATE_MAX_TOKENS = 64e3;
 const DEFAULT_MAX_OUTPUT_TOKENS = 65536;
+/** Head-of-request timeout: how long to wait for the first response byte. */
+const DEFAULT_REQUEST_TIMEOUT_MS = 6e4;
+/** Stream idle timeout: a generation that stalls this long is a dead connection. */
+const DEFAULT_STREAM_IDLE_TIMEOUT_MS = 12e4;
 const MODEL_CACHE_VERSION = 1;
 function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -281,7 +341,24 @@ function hasImageContent(message) {
 	const check = (blocks) => blocks.some((b) => b.type === "image" || b.type === "tool-result" && check(b.content));
 	return check(message.content);
 }
-function messagesToCC(messages) {
+/**
+* Convert one image reference to the Command Code wire format, as the official
+* CLI does: `{ type: 'image', source: { type: 'base64', media_type, data } }`.
+* Bytes come from the durable attachment service; the media type is the one
+* verified at save time.
+*/
+async function imageToCommandCode(ref, readImage) {
+	const data = await readImage(ref);
+	return {
+		type: "image",
+		source: {
+			type: "base64",
+			media_type: ref.mediaType,
+			data: Buffer.from(data).toString("base64")
+		}
+	};
+}
+async function messagesToCC(messages, readImage) {
 	const out = [];
 	const paired = pairedToolCallIds(messages);
 	for (const message of messages) {
@@ -293,7 +370,10 @@ function messagesToCC(messages) {
 					type: "text",
 					text: block.text
 				});
-				if (block.type === "image") throw new LlmError("Image input is not wired to the attachment service in this adapter yet", "UNSUPPORTED_CONTENT");
+				if (block.type === "image") {
+					if (!readImage) throw new LlmError("Image input requires the durable attachment service", "UNSUPPORTED_CONTENT");
+					parts.push(await imageToCommandCode(block.attachment, readImage));
+				}
 			}
 			out.push({
 				role: "user",
@@ -345,10 +425,12 @@ var CommandCodeAdapter = class extends LlmAdapter {
 	deps;
 	catalog = [];
 	fetchImpl;
+	resolveAttachments;
 	constructor(deps) {
 		super();
 		this.deps = deps;
 		this.fetchImpl = deps.fetchImpl ?? fetch;
+		this.resolveAttachments = deps.resolveAttachments;
 	}
 	/**
 	* Command Code is a metered subscription API: 429 (rate limit) and 5xx
@@ -382,21 +464,27 @@ var CommandCodeAdapter = class extends LlmAdapter {
 		return this.catalog;
 	}
 	async listModels(provider) {
-		return (await this.loadCatalog()).map((model) => ({
-			provider,
-			id: model.id,
-			name: `${model.name} (CC)`,
-			inputModalities: ["text"]
-		}));
+		return (await this.loadCatalog()).map((model) => {
+			const vision = KNOWN_IMAGE_MODELS.has(model.id);
+			return {
+				provider,
+				id: model.id,
+				name: `${model.name} (CC)`,
+				description: vision ? "Supports image input" : "Text only",
+				inputModalities: vision ? ["text", "image"] : ["text"]
+			};
+		});
 	}
 	async resolveModel(provider, model, signal) {
 		const entry = this.catalog.find((m) => m.id === model) ?? (await this.loadCatalog(signal)).find((m) => m.id === model);
 		const efforts = KNOWN_EFFORTS[model];
+		const vision = KNOWN_IMAGE_MODELS.has(model);
 		return {
 			provider,
 			id: model,
 			name: entry ? `${entry.name} (CC)` : model,
-			inputModalities: ["text"],
+			description: vision ? "Supports image input" : "Text only",
+			inputModalities: vision ? ["text", "image"] : ["text"],
 			...entry ? {
 				context: { contextWindow: entry.contextWindow },
 				defaultMaxTokens: Math.min(entry.maxTokens, DEFAULT_GENERATE_MAX_TOKENS)
@@ -485,7 +573,14 @@ var CommandCodeAdapter = class extends LlmAdapter {
 	}
 	async *stream(options) {
 		if (options.stop?.length) throw new LlmError("Command Code adapter does not support stop sequences", "UNSUPPORTED_OPTION");
-		if (options.messages.some(hasImageContent)) throw new LlmError("Image input is not wired to the attachment service in this adapter yet", "UNSUPPORTED_CONTENT");
+		const hasImages = options.messages.some(hasImageContent);
+		let readImage;
+		if (hasImages) {
+			if (!KNOWN_IMAGE_MODELS.has(options.model)) throw new LlmError(`Command Code model "${options.model}" does not support image input; switch to a Vision-capable model (see the model registry)`, "UNSUPPORTED_CONTENT");
+			const attachments = this.resolveAttachments?.();
+			if (attachments === void 0) throw new LlmError("Command Code image input requires the durable attachment service", "UNSUPPORTED_CONTENT");
+			readImage = (ref) => attachments.readImage(ref).then((stored) => stored.data);
+		}
 		const connection = this.deps.options();
 		const apiKey = await this.deps.resolveApiKey(connection);
 		const modelMax = this.catalog.find((m) => m.id === options.model)?.maxTokens ?? 65536;
@@ -511,7 +606,7 @@ var CommandCodeAdapter = class extends LlmAdapter {
 			skills: null,
 			params: {
 				model: options.model,
-				messages: messagesToCC(options.messages),
+				messages: await messagesToCC(options.messages, readImage),
 				tools: (options.tools ?? []).map((tool) => ({
 					type: "function",
 					name: tool.name,
@@ -541,11 +636,12 @@ var CommandCodeAdapter = class extends LlmAdapter {
 					...attributionHeaders()
 				},
 				body: JSON.stringify(body),
-				...options.signal ? { signal: options.signal } : {}
+				signal: options.signal ? AbortSignal.any([options.signal, AbortSignal.timeout(connection.requestTimeoutMs)]) : AbortSignal.timeout(connection.requestTimeoutMs)
 			});
 		} catch (error) {
 			if (options.signal?.aborted) throw error;
-			throw new LlmError(`Command Code API request to ${connection.apiBase}/alpha/generate failed`, "TRANSPORT", { cause: error });
+			if (error instanceof DOMException && error.name === "TimeoutError") throw new LlmError(`Command Code API request to ${connection.apiBase}/alpha/generate did not respond within ${connection.requestTimeoutMs}ms: ${errorChain(error)}`, "TIMEOUT", { cause: error });
+			throw new LlmError(`Command Code API request to ${connection.apiBase}/alpha/generate failed: ${errorChain(error)}`, "TRANSPORT", { cause: error });
 		}
 		if (!response.ok) {
 			const errText = await response.text().catch(() => "");
@@ -562,6 +658,21 @@ var CommandCodeAdapter = class extends LlmAdapter {
 		const reader = response.body.getReader();
 		const decoder = new TextDecoder();
 		let buffer = "";
+		let idleTimer;
+		let idleFired = false;
+		const armIdle = () => {
+			if (idleTimer !== void 0) clearTimeout(idleTimer);
+			idleTimer = setTimeout(() => {
+				idleFired = true;
+				reader.cancel().catch(() => void 0);
+			}, connection.streamIdleTimeoutMs);
+		};
+		const clearIdle = () => {
+			if (idleTimer !== void 0) {
+				clearTimeout(idleTimer);
+				idleTimer = void 0;
+			}
+		};
 		let nextIndex = 0;
 		let textIndex = -1;
 		let textContent = "";
@@ -708,14 +819,18 @@ var CommandCodeAdapter = class extends LlmAdapter {
 			let finished = false;
 			for (;;) {
 				let read;
+				armIdle();
 				try {
 					read = await reader.read();
 				} catch (error) {
 					if (options.signal?.aborted) throw error;
-					throw new LlmError(`Command Code API stream from ${connection.apiBase} failed while reading`, "TRANSPORT", { cause: error });
+					throw new LlmError(`Command Code API stream from ${connection.apiBase} failed while reading: ${errorChain(error)}`, "TRANSPORT", { cause: error });
+				} finally {
+					clearIdle();
 				}
 				const { done, value } = read;
 				if (done) {
+					if (idleFired) throw new LlmError(`Command Code API stream from ${connection.apiBase} was idle for ${connection.streamIdleTimeoutMs}ms (no events) and was treated as a dead connection`, "TIMEOUT");
 					if (buffer.trim()) for (const chunk of handleEvent(parseStreamEventLine(buffer))) yield chunk;
 					break;
 				}
@@ -741,6 +856,7 @@ var CommandCodeAdapter = class extends LlmAdapter {
 				};
 			}
 		} finally {
+			clearIdle();
 			await reader.cancel().catch(() => void 0);
 			reader.releaseLock();
 		}
@@ -844,11 +960,17 @@ function applyCommands(ctx, deps) {
 *
 * ```yaml
 * - id: llm-commandcode
-*   name: dsh-commandcode-provider
+*   name: "@mars-sea/dsh-commandcode-provider"
 *   config:
 *     apiKeyEnv: COMMANDCODE_API_KEY
 * ```
 *
+* The `name` is the full package specifier as installed in the profile's
+* node_modules: the loader imports it as a module, and pnpm links packages by
+* their true (scoped) name — a bare `dsh-commandcode-provider` fails to
+* resolve (ERR_MODULE_NOT_FOUND) and crashes the app on boot. The value must
+* be quoted in YAML: an unquoted scalar starting with `@` fails to parse.
+*
 * @module dsh-commandcode-provider
 */
 const name = "llm-commandcode";
@@ -864,7 +986,9 @@ const Config = z.object({
 	apiKey: z.string(),
 	apiBase: z.string(),
 	workingDir: z.string(),
-	modelsCachePath: z.string()
+	modelsCachePath: z.string(),
+	requestTimeoutMs: z.number().min(1).max(MAX_TIMER_DELAY_MS),
+	streamIdleTimeoutMs: z.number().min(1).max(MAX_TIMER_DELAY_MS)
 });
 /**
 * The one explicit resolve step from raw config to validated connection
@@ -877,7 +1001,9 @@ function resolveAdapterOptions(config) {
 		apiKeyEnv: credentialRef(config.apiKeyEnv ?? DEFAULT_API_KEY_ENV),
 		apiBase: config.apiBase ?? "https://api.commandcode.ai",
 		workingDir: config.workingDir ?? process.cwd(),
-		modelsCachePath: config.modelsCachePath ?? DEFAULT_MODELS_CACHE_PATH
+		modelsCachePath: config.modelsCachePath ?? DEFAULT_MODELS_CACHE_PATH,
+		requestTimeoutMs: config.requestTimeoutMs ?? 6e4,
+		streamIdleTimeoutMs: config.streamIdleTimeoutMs ?? 12e4
 	};
 }
 function apply(ctx, config) {
@@ -911,7 +1037,11 @@ function apply(ctx, config) {
 	};
 	const adapter = new CommandCodeAdapter({
 		options,
-		resolveApiKey
+		resolveApiKey,
+		resolveAttachments: () => {
+			const attachments = ctx.get("attachments");
+			return attachments === void 0 ? void 0 : attachments;
+		}
 	});
 	ctx.llm.registerConfigurableProviders([{
 		provider: PROVIDER,
@@ -931,6 +1061,6 @@ function apply(ctx, config) {
 	});
 }
 //#endregion
-export { COMMAND_CODE_CLI_VERSION, CommandCodeAdapter, Config, DEFAULT_API_BASE, DEFAULT_GENERATE_MAX_TOKENS, DEFAULT_MAX_OUTPUT_TOKENS, DEFAULT_MODELS_CACHE_PATH, KNOWN_EFFORTS, PROVIDER, apply, applyCommands, commandDefinition, inject, name, projectSlugFromPath, resolveAdapterOptions, resolveAuthFileApiKey };
+export { COMMAND_CODE_CLI_VERSION, CommandCodeAdapter, Config, DEFAULT_API_BASE, DEFAULT_GENERATE_MAX_TOKENS, DEFAULT_MAX_OUTPUT_TOKENS, DEFAULT_MODELS_CACHE_PATH, DEFAULT_REQUEST_TIMEOUT_MS, DEFAULT_STREAM_IDLE_TIMEOUT_MS, KNOWN_EFFORTS, KNOWN_IMAGE_MODELS, PROVIDER, apply, applyCommands, commandDefinition, inject, name, projectSlugFromPath, resolveAdapterOptions, resolveAuthFileApiKey };
 
 //# sourceMappingURL=index.js.map