@goodandready/dsh-opencode-provider 0.5.1 → 0.5.3

package/lib/index.js

@@ -17,7 +17,7 @@ const DEFAULT_GO_API_BASE = "https://opencode.ai/inference/go";
 const DEFAULT_GO_ZEN_BASE = "https://opencode.ai/zen/go/v1";
 const DEFAULT_USAGE_URL = "https://opencode.ai/zen/go/v1/usage";
 const DEFAULT_AUTH_ENTRY = "opencode-go";
-const DEFAULT_USER_AGENT = "dsh-opencode-provider/0.5.0";
+const DEFAULT_USER_AGENT = "dsh-opencode-provider/0.5.3";
 const DEFAULT_CONTEXT_WINDOW = 262144;
 const DEFAULT_MAX_TOKENS = 32768;
 const DEFAULT_GENERATE_MAX_TOKENS = 32768;
@@ -56,6 +56,8 @@ const Config = z.object({
 		pattern: z.string(),
 		account: z.string()
 	})).default([])),
+	quotaFallbackModel: markVolatile(z.string().default("")),
+	stickySession: markVolatile(z.boolean().default(true)),
 	activeAccount: markVolatile(z.string().default("")),
 	showSidebarQuota: markVolatile(z.boolean().default(false)),
 	userAgent: markVolatile(z.string().default(DEFAULT_USER_AGENT))
@@ -141,6 +143,8 @@ function resolveConfig(config) {
 		...typeof config.maxOutputTokens === "number" && Number.isInteger(config.maxOutputTokens) && config.maxOutputTokens >= 0 ? { maxOutputTokens: config.maxOutputTokens } : {},
 		accounts: Array.isArray(config.accounts) ? config.accounts : [],
 		modelAccountRules: modelAccountRuleList(config.modelAccountRules),
+		quotaFallbackModel: typeof config.quotaFallbackModel === "string" ? config.quotaFallbackModel.trim() : "",
+		stickySession: config.stickySession !== false,
 		activeAccount: typeof config.activeAccount === "string" ? config.activeAccount : "",
 		showSidebarQuota: config.showSidebarQuota === true,
 		userAgent: typeof config.userAgent === "string" && config.userAgent !== "" ? config.userAgent : DEFAULT_USER_AGENT
@@ -1242,6 +1246,17 @@ function offloadPlaceholder(ref) {
 	return `[image omitted: ${ref.name ?? ref.attachmentId}]`;
 }
 //#endregion
+//#region src/files.ts
+/**
+* Model-facing handle for a file when the adapter receives a raw FileBlock.
+* The harness normally projects files to text with an execution-world path
+* before dispatch; this is the safe fallback for direct adapter calls.
+*/
+function filePlaceholder(ref) {
+	const digest = String(ref.attachmentId).slice(7, 15);
+	return `[File ${JSON.stringify(ref.name)} (${ref.bytes} bytes, sha256:${digest}) was uploaded, but the current execution environment cannot access a readable path. Report that limitation if its contents are needed; do not claim to have read it.]`;
+}
+//#endregion
 //#region src/tool-schema.ts
 /**
 * Normalize a tool's parameters schema to the object root the gateway
@@ -1354,7 +1369,7 @@ function textOnly$3(content) {
 	const parts = [];
 	for (const block of content) if (block.type === "text") parts.push(block.text);
 	else if (block.type === "image") parts.push(offloadPlaceholder(block.attachment));
-	else if (block.type === "file") parts.push("[file omitted: tool-result files are not supported]");
+	else if (block.type === "file") parts.push(filePlaceholder(block.attachment));
 	return parts.join("");
 }
 function userContent(content, images) {
@@ -1386,7 +1401,10 @@ function userContent(content, images) {
 			type: "image_url",
 			image_url: { url: image.dataUrl }
 		});
-	} else if (block.type === "file") throw new LlmError("llm-opencode: file attachments are not supported yet.", "UNSUPPORTED_CONTENT");
+	} else if (block.type === "file") parts.push({
+		type: "text",
+		text: filePlaceholder(block.attachment)
+	});
 	if (!hasImage) return parts.map((part) => part.type === "text" ? part.text : "").join("");
 	return parts;
 }
@@ -1506,22 +1524,26 @@ function requestLogPath() {
 	return join(home, "storages", "dsh-opencode", "requests.jsonl");
 }
 let queue = Promise.resolve();
-let directoryReady = false;
+let readyDirectory = "";
 let appends = 0;
-function recordRequest(provider, model, at = Date.now(), purpose) {
+function recordRequest(provider, model, at = Date.now(), purpose, account, reason) {
 	const line = `${JSON.stringify({
 		at,
 		provider,
 		model,
-		...purpose === void 0 ? {} : { purpose }
+		...purpose === void 0 ? {} : { purpose },
+		...account === void 0 ? {} : { account },
+		...reason === void 0 ? {} : { reason }
 	})}\n`;
 	queue = queue.then(async () => {
 		try {
-			if (!directoryReady) {
-				await mkdir(dirname(requestLogPath()), { recursive: true });
-				directoryReady = true;
+			const path = requestLogPath();
+			const directory = dirname(path);
+			if (readyDirectory !== directory) {
+				await mkdir(directory, { recursive: true });
+				readyDirectory = directory;
 			}
-			await appendFile(requestLogPath(), line, "utf8");
+			await appendFile(path, line, "utf8");
 			appends += 1;
 			if (appends % COMPACT_EVERY === 0) await compactRequestLog();
 		} catch {}
@@ -1542,6 +1564,7 @@ async function readRequestHeatmap(days, now = Date.now()) {
 	const hours = Array.from({ length: 24 }, () => 0);
 	const grid = Array.from({ length: 7 }, () => Array.from({ length: 24 }, () => 0));
 	const models = /* @__PURE__ */ new Map();
+	const accounts = /* @__PURE__ */ new Map();
 	const seen = /* @__PURE__ */ new Set();
 	let total = 0;
 	let firstAt = null;
@@ -1557,7 +1580,8 @@ async function readRequestHeatmap(days, now = Date.now()) {
 			grid,
 			firstAt,
 			lastAt,
-			models: []
+			models: [],
+			accounts: []
 		};
 	}
 	for (const line of text.split("\n")) {
@@ -1575,7 +1599,8 @@ async function readRequestHeatmap(days, now = Date.now()) {
 		if (purpose === "session-title" || purpose === "compaction") continue;
 		const provider = typeof parsed.provider === "string" ? parsed.provider : "";
 		const model = typeof parsed.model === "string" ? parsed.model : "";
-		const key = `${at}|${provider}|${model}`;
+		const account = typeof parsed.account === "string" && parsed.account !== "" ? parsed.account : "unknown";
+		const key = `${at}|${provider}|${model}|${account}`;
 		if (seen.has(key)) continue;
 		seen.add(key);
 		const date = new Date(at);
@@ -1602,6 +1627,20 @@ async function readRequestHeatmap(days, now = Date.now()) {
 			const modelRow = entry.grid[day];
 			if (modelRow !== void 0) modelRow[hour] = (modelRow[hour] ?? 0) + 1;
 		}
+		let accountEntry = accounts.get(account);
+		if (accountEntry === void 0) {
+			accountEntry = {
+				account,
+				total: 0,
+				hours: Array.from({ length: 24 }, () => 0),
+				grid: Array.from({ length: 7 }, () => Array.from({ length: 24 }, () => 0))
+			};
+			accounts.set(account, accountEntry);
+		}
+		accountEntry.total += 1;
+		accountEntry.hours[hour] = (accountEntry.hours[hour] ?? 0) + 1;
+		const accountRow = accountEntry.grid[day];
+		if (accountRow !== void 0) accountRow[hour] = (accountRow[hour] ?? 0) + 1;
 		total += 1;
 		if (firstAt === null || at < firstAt) firstAt = at;
 		if (lastAt === null || at > lastAt) lastAt = at;
@@ -1613,7 +1652,8 @@ async function readRequestHeatmap(days, now = Date.now()) {
 		grid,
 		firstAt,
 		lastAt,
-		models: [...models.values()].sort((a, b) => b.total - a.total || a.model.localeCompare(b.model))
+		models: [...models.values()].sort((a, b) => b.total - a.total || a.model.localeCompare(b.model)),
+		accounts: [...accounts.values()].sort((a, b) => b.total - a.total || a.account.localeCompare(b.account))
 	};
 }
 //#endregion
@@ -1775,7 +1815,7 @@ function textOnly$2(content) {
 	const parts = [];
 	for (const block of content) if (block.type === "text") parts.push(block.text);
 	else if (block.type === "image") parts.push(offloadPlaceholder(block.attachment));
-	else if (block.type === "file") parts.push("[file omitted: tool-result files are not supported]");
+	else if (block.type === "file") parts.push(filePlaceholder(block.attachment));
 	return parts.join("");
 }
 function contentParts(content, images) {
@@ -1810,7 +1850,10 @@ function contentParts(content, images) {
 				data: image.base64
 			}
 		});
-	} else if (block.type === "file") throw new LlmError("llm-opencode: file attachments are not supported yet.", "UNSUPPORTED_CONTENT");
+	} else if (block.type === "file") parts.push({
+		type: "text",
+		text: filePlaceholder(block.attachment)
+	});
 	return parts.length === 0 ? [{
 		type: "text",
 		text: ""
@@ -2151,7 +2194,7 @@ function textOnly$1(content) {
 	const parts = [];
 	for (const block of content) if (block.type === "text") parts.push(block.text);
 	else if (block.type === "image") parts.push(offloadPlaceholder(block.attachment));
-	else if (block.type === "file") parts.push("[file omitted: tool-result files are not supported]");
+	else if (block.type === "file") parts.push(filePlaceholder(block.attachment));
 	return parts.join("");
 }
 function imageParts(block, images) {
@@ -2171,7 +2214,7 @@ function userParts$1(content, images) {
 	for (const block of content) if (block.type === "text") {
 		if (block.text !== "") parts.push({ text: block.text });
 	} else if (block.type === "image") parts.push(...imageParts(block, images));
-	else if (block.type === "file") throw new LlmError("llm-opencode: file attachments are not supported yet.", "UNSUPPORTED_CONTENT");
+	else if (block.type === "file") parts.push({ text: filePlaceholder(block.attachment) });
 	return parts.length === 0 ? [{ text: "" }] : parts;
 }
 function replayMeta(message) {
@@ -2691,7 +2734,7 @@ function textOnly(content) {
 	const parts = [];
 	for (const block of content) if (block.type === "text") parts.push(block.text);
 	else if (block.type === "image") parts.push(offloadPlaceholder(block.attachment));
-	else if (block.type === "file") parts.push("[file omitted: tool-result files are not supported]");
+	else if (block.type === "file") parts.push(filePlaceholder(block.attachment));
 	return parts.join("");
 }
 function userParts(content, images) {
@@ -2722,7 +2765,10 @@ function userParts(content, images) {
 			type: "input_image",
 			image_url: image.dataUrl
 		});
-	} else if (block.type === "file") throw new LlmError("llm-opencode: file attachments are not supported yet.", "UNSUPPORTED_CONTENT");
+	} else if (block.type === "file") parts.push({
+		type: "input_text",
+		text: filePlaceholder(block.attachment)
+	});
 	return parts.length === 0 ? [{
 		type: "input_text",
 		text: ""
@@ -2997,6 +3043,8 @@ var OpenCodeAdapter = class extends LlmAdapter {
 	cooldownWrites = Promise.resolve();
 	/** key fingerprint → cooldown deadline and the rejection that caused it. */
 	cooldowns = /* @__PURE__ */ new Map();
+	sticky = /* @__PURE__ */ new Map();
+	routing = [];
 	warnedTools = false;
 	constructor(deps) {
 		super();
@@ -3048,6 +3096,10 @@ var OpenCodeAdapter = class extends LlmAdapter {
 			};
 		});
 	}
+	/** Recent routing decisions, newest first; no keys or prompt content. */
+	routingTrace() {
+		return [...this.routing];
+	}
 	async resolveModel(provider, model) {
 		const config = this.deps.config();
 		const meta = effectiveModel(model, config);
@@ -3067,14 +3119,31 @@ var OpenCodeAdapter = class extends LlmAdapter {
 		};
 	}
 	stream(options) {
-		return this.run(options);
+		return this.run(options, false);
 	}
-	async *run(options) {
-		(this.deps.recordRequest ?? ((provider, model, purpose) => recordRequest(provider, model, Date.now(), purpose)))(options.provider, options.model, options.purpose);
+	async *run(options, fallback) {
+		const record = this.deps.recordRequest ?? ((provider, model, purpose, account, reason) => recordRequest(provider, model, Date.now(), purpose, account, reason));
 		const config = this.deps.config();
 		const model = effectiveModel(options.model, config);
-		const keys = orderKeysForModel(this.deps.resolveKeys !== void 0 ? await this.deps.resolveKeys(options.provider) : [await this.deps.resolveKey(options.provider)], options.model, config.modelAccountRules);
 		const sessionId = openCodeSessionId(options);
+		const rawKeys = orderKeysForModel(this.deps.resolveKeys !== void 0 ? await this.deps.resolveKeys(options.provider) : [await this.deps.resolveKey(options.provider)], options.model, config.modelAccountRules);
+		const rule = matchModelAccount(options.model, config.modelAccountRules);
+		let keys = rawKeys;
+		let reason = rule === void 0 ? "default" : "rule";
+		if (fallback) reason = "quota-fallback";
+		else if (config.activeAccount !== "") reason = "pinned";
+		else if (config.stickySession && rule === void 0) {
+			const previous = this.sticky.get(sessionId);
+			if (previous !== void 0) {
+				const preferred = rawKeys.find((entry) => this.keyId(entry.key) === previous.fingerprint);
+				if (preferred !== void 0) {
+					keys = [preferred, ...rawKeys.filter((entry) => entry !== preferred)];
+					reason = "sticky";
+				}
+			}
+		}
+		const initial = keys.find((entry) => fallback || !this.coolingDown(entry.key)) ?? keys[0];
+		if (initial !== void 0) record(options.provider, options.model, options.purpose, initial.label ?? "default", reason);
 		const url = endpointFor(options.provider, model.transport, options.model, config);
 		let images;
 		if (hasImages(options)) {
@@ -3096,8 +3165,11 @@ var OpenCodeAdapter = class extends LlmAdapter {
 		}
 		const body = model.transport === "openai-chat" ? buildChatBody(bodyOptions, model, config, images) : model.transport === "anthropic" ? buildAnthropicBody(bodyOptions, model, config, images) : model.transport === "openai-responses" ? buildResponsesBody(bodyOptions, model, config, images) : buildGoogleBody(bodyOptions, model, config, images);
 		let lastError;
+		let lastAccount = initial?.label ?? "default";
 		for (const [index, entry] of keys.entries()) {
-			if (this.coolingDown(entry.key)) continue;
+			if (!fallback && this.coolingDown(entry.key)) continue;
+			lastAccount = entry.label ?? "default";
+			const attemptReason = index === 0 ? reason : "rotation";
 			let started = false;
 			let responseFailure = false;
 			try {
@@ -3108,12 +3180,22 @@ var OpenCodeAdapter = class extends LlmAdapter {
 					lastError = error;
 					const canRotate = index < keys.length - 1;
 					if (error.code === "INVALID_CREDENTIAL" || error.code === "RATE_LIMIT" || error.code === "QUOTA") {
-						this.markCooldown(entry.key, response.status, response.headers, error.code);
+						if (!fallback) this.markCooldown(entry.key, response.status, response.headers, error.code);
 						responseFailure = true;
 						if (canRotate) continue;
 					}
 					throw error;
 				}
+				this.rememberSticky(sessionId, options, entry);
+				this.pushTrace({
+					at: Date.now(),
+					provider: options.provider,
+					model: options.model,
+					account: entry.label ?? "default",
+					reason: attemptReason,
+					fallback,
+					ok: true
+				});
 				for await (const chunk of this.parse(response, model.transport, config, options.signal)) {
 					started = true;
 					yield chunk;
@@ -3124,11 +3206,53 @@ var OpenCodeAdapter = class extends LlmAdapter {
 				const classified = error instanceof LlmError ? error : new LlmError(error instanceof Error ? error.message : "OpenCode request failed", "TRANSPORT", { cause: error });
 				lastError = classified;
 				const transient = this.isTransient(classified);
-				if (transient && !responseFailure) this.markCooldown(entry.key, 0);
-				if (!(index < keys.length - 1 && transient)) throw classified;
+				if (transient && !responseFailure && !fallback) this.markCooldown(entry.key, 0);
+				if (!(index < keys.length - 1 && transient)) {
+					if (!fallback && config.quotaFallbackModel !== "" && options.provider === "opencode-go" && classified.code === "QUOTA") break;
+					throw classified;
+				}
 			}
 		}
-		throw lastError ?? new LlmError("llm-opencode: every configured account is cooling down after provider rejections", "RATE_LIMIT");
+		const finalError = lastError ?? new LlmError("llm-opencode: every configured account is cooling down after provider rejections", "RATE_LIMIT");
+		this.pushTrace({
+			at: Date.now(),
+			provider: options.provider,
+			model: options.model,
+			account: lastAccount,
+			reason,
+			fallback,
+			ok: false,
+			error: finalError.code
+		});
+		if (!fallback && config.quotaFallbackModel !== "" && options.provider === "opencode-go" && (lastError === void 0 || lastError.code === "QUOTA")) try {
+			yield* this.run({
+				...options,
+				provider: "opencode",
+				model: config.quotaFallbackModel
+			}, true);
+			return;
+		} catch {
+			throw finalError;
+		}
+		throw finalError;
+	}
+	rememberSticky(sessionId, options, entry) {
+		if (!this.deps.config().stickySession) return;
+		if (!this.sticky.has(sessionId) && this.sticky.size >= 500) {
+			const oldest = this.sticky.keys().next().value;
+			if (oldest !== void 0) this.sticky.delete(oldest);
+		}
+		this.sticky.set(sessionId, {
+			fingerprint: this.keyId(entry.key),
+			label: entry.label ?? "default",
+			provider: options.provider,
+			model: options.model,
+			at: Date.now()
+		});
+	}
+	pushTrace(entry) {
+		this.routing.unshift(entry);
+		if (this.routing.length > 20) this.routing.length = 20;
 	}
 	parse(response, transport, config, signal) {
 		if (transport === "anthropic") return parseAnthropicStream(response, config.streamIdleTimeoutMs, signal);
@@ -4165,6 +4289,8 @@ function publicConfig(config) {
 			pattern: rule.pattern,
 			account: rule.account
 		})),
+		quotaFallbackModel: config.quotaFallbackModel,
+		stickySession: config.stickySession,
 		activeAccount: config.activeAccount,
 		showSidebarQuota: config.showSidebarQuota,
 		userAgent: config.userAgent
@@ -4349,6 +4475,8 @@ function configOps(patch) {
 	if ("maxOutputTokens" in patch) set("maxOutputTokens", patch.maxOutputTokens);
 	if ("accounts" in patch) set("accounts", cleanAccounts(patch.accounts));
 	if ("modelAccountRules" in patch) set("modelAccountRules", cleanModelAccountRules(patch.modelAccountRules));
+	if ("quotaFallbackModel" in patch) set("quotaFallbackModel", patch.quotaFallbackModel);
+	if ("stickySession" in patch) set("stickySession", patch.stickySession === true);
 	if ("activeAccount" in patch) set("activeAccount", patch.activeAccount);
 	if ("showSidebarQuota" in patch) set("showSidebarQuota", patch.showSidebarQuota === true);
 	if ("userAgent" in patch) set("userAgent", patch.userAgent);
@@ -4451,6 +4579,7 @@ async function buildState(ctx, deps) {
 		accounts,
 		models,
 		usage: usage ?? null,
+		routing: deps.adapter.routingTrace(),
 		auth: {
 			entry: config.openCodeAuthEntry,
 			hasStoredKey: await readOpenCodeAuthKey(config.openCodeAuthEntry) !== void 0,
@@ -4608,15 +4737,17 @@ function applyRoutes(ctx, web, deps) {
 		try {
 			const body = await readJson(req);
 			const entry = typeof body.entry === "string" && body.entry.trim() !== "" ? body.entry.trim() : deps.config().openCodeAuthEntry;
+			const ref = typeof body.ref === "string" && body.ref.trim() !== "" ? body.ref.trim() : deps.config().apiKeyEnv;
 			const key = await readOpenCodeAuthKey(entry);
 			if (key === void 0) {
 				json(res, 404, { error: `no key in auth.json entry "${entry}"` });
 				return;
 			}
-			await credentials.set(credentialRef(deps.config().apiKeyEnv), key);
+			await credentials.set(credentialRef(ref), key);
 			json(res, 200, {
 				ok: true,
-				entry
+				entry,
+				ref
 			});
 		} catch (error) {
 			json(res, 500, { error: error instanceof Error ? error.message : "import failed" });
@@ -4805,6 +4936,27 @@ function buildOpenCodeTuiSection(deps) {
 					value: text.trim() === "true"
 				})
 			},
+			{
+				path: ["quotaFallbackModel"],
+				group: "models",
+				kind: "text",
+				label: "Quota fallback model",
+				hint: "Free model id used once after a Go quota error; empty disables it.",
+				format: () => deps.quotaFallbackModel(),
+				parse: setOrClear
+			},
+			{
+				path: ["stickySession"],
+				group: "advanced",
+				kind: "boolean",
+				label: "Sticky account per conversation",
+				hint: "Prefer the last successful account for the same conversation.",
+				format: (value) => String(value === void 0 ? deps.stickySession() : value !== false),
+				parse: (text) => ({
+					kind: "set",
+					value: text.trim() === "true"
+				})
+			},
 			{
 				path: ["activeAccount"],
 				group: "advanced",
@@ -4874,7 +5026,9 @@ function applyOpenCodeTuiSettings(ctx, deps) {
 		accounts: deps.accountSlots().map((slot) => [slot.id, slot.label]),
 		visibleModels: deps.visibleModels(),
 		activeAccount: deps.activeAccount(),
-		filterModelsByPlan: deps.filterModelsByPlan()
+		filterModelsByPlan: deps.filterModelsByPlan(),
+		quotaFallbackModel: deps.quotaFallbackModel(),
+		stickySession: deps.stickySession()
 	});
 	let lastSignature = signature();
 	const refresh = () => {
@@ -5053,7 +5207,9 @@ function apply(ctx, config) {
 			}))],
 			visibleModels: () => current().visibleModels,
 			activeAccount: () => current().activeAccount,
-			filterModelsByPlan: () => current().filterModelsByPlan
+			filterModelsByPlan: () => current().filterModelsByPlan,
+			quotaFallbackModel: () => current().quotaFallbackModel,
+			stickySession: () => current().stickySession
 		});
 	});
 	ctx.inject(["webServer"], (webCtx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-opencode-provider",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "OpenCode / OpenCode Go LLM provider plugin for DeepSeek Harness (dsh).",
   "license": "MIT",
   "type": "module",