@mars-sea/dsh-commandcode-provider 0.2.2 → 0.2.4

package/lib/index.d.ts

@@ -102,7 +102,7 @@ declare const DEFAULT_MAX_OUTPUT_TOKENS = 65536;
 /** Head-of-request timeout: how long to wait for the first response byte. */
 declare const DEFAULT_REQUEST_TIMEOUT_MS = 60000;
 /** Stream idle timeout: a generation that stalls this long is a dead connection. */
-declare const DEFAULT_STREAM_IDLE_TIMEOUT_MS = 120000;
+declare const DEFAULT_STREAM_IDLE_TIMEOUT_MS = 300000;
 /**
  * Official display label for a model's minimum plan, or undefined for models
  * outside the snapshot (e.g. future catalog additions).
@@ -140,9 +140,13 @@ interface CommandCodeConnectionOptions {
   workingDir: string;
   /** Model catalog cache path. */
   modelsCachePath: string;
-  /** Milliseconds to wait for the generate response's first byte (default 60s). */
+  /**
+   * Milliseconds to wait for generate response headers / first byte (default 60s).
+   * Must not bound the subsequent body stream — long generations are gated by
+   * {@link streamIdleTimeoutMs} and the caller AbortSignal instead.
+   */
   requestTimeoutMs: number;
-  /** Milliseconds a stream may stall before it is treated as a dead connection (default 120s). */
+  /** Milliseconds a stream may stall before it is treated as a dead connection (default 300s). */
   streamIdleTimeoutMs: number;
 }
 /**
@@ -276,7 +280,7 @@ interface Config {
   modelsCachePath?: string;
   /** Milliseconds to wait for the generate response's first byte; defaults to 60s. */
   requestTimeoutMs?: number;
-  /** Milliseconds a stream may stall before being treated as a dead connection; defaults to 120s. */
+  /** Milliseconds a stream may stall before being treated as a dead connection; defaults to 300s. */
   streamIdleTimeoutMs?: number;
 }
 declare const Config: z<Config>;

package/lib/index.js

@@ -383,7 +383,7 @@ 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 DEFAULT_STREAM_IDLE_TIMEOUT_MS = 3e5;
 const MODEL_CACHE_VERSION = 1;
 function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -446,6 +446,23 @@ function stringValue(value) {
 function numberValue(value) {
 	return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
+function booleanValue(value) {
+	return typeof value === "boolean" ? value : void 0;
+}
+/**
+* Terminal stream-error markers from the official CLI (`Xw` in command-code's
+* cli.mjs): these always mean "retrying cannot succeed", so the adapter must
+* not classify them as transient server errors.
+*/
+const TERMINAL_STREAM_ERROR_MARKERS = [
+	"premium_credits_exhausted",
+	"model_not_in_plan",
+	"insufficient credits"
+];
+function hasTerminalStreamMarker(message) {
+	const lower = message.toLowerCase();
+	return TERMINAL_STREAM_ERROR_MARKERS.some((marker) => lower.includes(marker));
+}
 function recordOrEmpty(value) {
 	if (isRecord(value)) return value;
 	if (typeof value === "string") try {
@@ -827,6 +844,19 @@ var CommandCodeAdapter = class extends LlmAdapter {
 			},
 			threadId: randomUUID()
 		};
+		const connectAbort = new AbortController();
+		let connectTimedOut = false;
+		const connectTimer = setTimeout(() => {
+			connectTimedOut = true;
+			connectAbort.abort(new DOMException(`Command Code API request to ${connection.apiBase}/alpha/generate did not respond within ${connection.requestTimeoutMs}ms`, "TimeoutError"));
+		}, connection.requestTimeoutMs);
+		const onCallerAbort = () => {
+			connectAbort.abort(options.signal?.reason);
+		};
+		if (options.signal) {
+			if (options.signal.aborted) onCallerAbort();
+			else options.signal.addEventListener("abort", onCallerAbort, { once: true });
+		}
 		let response;
 		try {
 			response = await this.fetchImpl(`${connection.apiBase}/alpha/generate`, {
@@ -842,14 +872,18 @@ var CommandCodeAdapter = class extends LlmAdapter {
 					...attributionHeaders()
 				},
 				body: JSON.stringify(body),
-				signal: options.signal ? AbortSignal.any([options.signal, AbortSignal.timeout(connection.requestTimeoutMs)]) : AbortSignal.timeout(connection.requestTimeoutMs)
+				signal: connectAbort.signal
 			});
+			clearTimeout(connectTimer);
 		} catch (error) {
+			clearTimeout(connectTimer);
+			if (options.signal) options.signal.removeEventListener("abort", onCallerAbort);
 			if (options.signal?.aborted) throw 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 });
+			if (connectTimedOut || 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) {
+			if (options.signal) options.signal.removeEventListener("abort", onCallerAbort);
 			const errText = await response.text().catch(() => "");
 			let providerCode;
 			try {
@@ -860,7 +894,10 @@ var CommandCodeAdapter = class extends LlmAdapter {
 			if (response.status === 401) throw new LlmError(`Command Code API error 401 (${detail}): the API key is missing or invalid — check the key stored for COMMANDCODE_API_KEY (Models page) or the auth file`, "INVALID_CREDENTIAL", { status: 401 });
 			throw new LlmError(`Command Code API error ${response.status}${detail === `HTTP ${response.status}` ? "" : ` (${detail})`}: ${errText.slice(0, 500)}`, response.status === 429 ? "RATE_LIMIT" : "PROVIDER_HTTP_ERROR", { status: response.status });
 		}
-		if (!response.body) throw new LlmError("Command Code API returned no response body", "PROVIDER_PROTOCOL_ERROR");
+		if (!response.body) {
+			if (options.signal) options.signal.removeEventListener("abort", onCallerAbort);
+			throw new LlmError("Command Code API returned no response body", "PROVIDER_PROTOCOL_ERROR");
+		}
 		const reader = response.body.getReader();
 		const decoder = new TextDecoder();
 		let buffer = "";
@@ -1015,8 +1052,14 @@ var CommandCodeAdapter = class extends LlmAdapter {
 					break;
 				}
 				case "error": {
+					const err = isRecord(event.error) ? event.error : void 0;
 					const detail = isRecord(event.error) ? stringValue(event.error.message) ?? JSON.stringify(event.error) : stringValue(event.error) ?? stringValue(event.message) ?? "Stream error";
-					throw new LlmError(`Command Code stream error: ${detail}`, "PROVIDER_STREAM_ERROR");
+					const statusCode = err ? numberValue(err.statusCode) : void 0;
+					const isRetryable = err ? booleanValue(err.isRetryable) : void 0;
+					const retryableStatus = statusCode !== void 0 && (statusCode === 429 || statusCode >= 500);
+					const terminal = hasTerminalStreamMarker(detail);
+					if (!(isRetryable === true || (statusCode !== void 0 ? retryableStatus : isRetryable !== false && !terminal))) throw new LlmError(`Command Code stream error: ${detail}`, "PROVIDER_STREAM_ERROR", statusCode !== void 0 ? { status: statusCode } : void 0);
+					throw new LlmError(`Command Code stream error: ${detail}`, "SERVER", statusCode !== void 0 ? { status: statusCode } : void 0);
 				}
 			}
 			return chunks;
@@ -1063,6 +1106,7 @@ var CommandCodeAdapter = class extends LlmAdapter {
 			}
 		} finally {
 			clearIdle();
+			if (options.signal) options.signal.removeEventListener("abort", onCallerAbort);
 			await reader.cancel().catch(() => void 0);
 			reader.releaseLock();
 		}
@@ -1209,7 +1253,7 @@ function resolveAdapterOptions(config) {
 		workingDir: config.workingDir ?? process.cwd(),
 		modelsCachePath: config.modelsCachePath ?? DEFAULT_MODELS_CACHE_PATH,
 		requestTimeoutMs: config.requestTimeoutMs ?? 6e4,
-		streamIdleTimeoutMs: config.streamIdleTimeoutMs ?? 12e4
+		streamIdleTimeoutMs: config.streamIdleTimeoutMs ?? 3e5
 	};
 }
 function apply(ctx, config) {