@goodandready/dsh-opencode-provider 0.5.1 → 0.5.2

package/lib/client.js

@@ -38,6 +38,10 @@ window.__ModuleLoader__.load({
 				accountRef: "Credential ref",
 				accountSource: "Source",
 				addAccount: "Add account",
+				importAllAuth: "Import all from auth.json",
+				checkAllAccounts: "Check all accounts",
+				importedAll: "Imported all auth.json keys; review the accounts and save.",
+				accountsImported: "Imported keys",
 				removeAccount: "Remove",
 				pinAccount: "Pin",
 				activeAccount: "Pinned account",
@@ -107,6 +111,8 @@ window.__ModuleLoader__.load({
 				heatmapByHour: "By hour (all days)",
 				heatmapAllModels: "All models",
 				heatmapModel: "Model",
+				heatmapByAccount: "Account",
+				heatmapAllAccounts: "All accounts",
 				analyticsHint: "Aggregated from local session metadata by last activity. A session that switched models is counted under its last model; failures are not exposed by the projection.",
 				analyticsEmpty: "No OpenCode sessions in this window.",
 				showAll: "Show all",
@@ -144,6 +150,21 @@ window.__ModuleLoader__.load({
 				maxOutputTokens: "Output limit (empty = model default, 0 = omit)",
 				contextWindow: "Context override",
 				showSidebarQuota: "Show the quota card in the sidebar",
+				routing: "Routing",
+				routingHint: "Recent account/model choices. No prompts or keys are recorded.",
+				routingEmpty: "No routing decisions yet.",
+				routingRule: "Model rule",
+				routingSticky: "Sticky session",
+				routingPinned: "Pinned account",
+				routingDefault: "Automatic",
+				routingRotation: "Rotation",
+				routingFallback: "Quota fallback",
+				routingFailed: "Failed",
+				quotaFallbackModel: "Quota fallback model",
+				quotaFallbackModelHint: "If Go rejects with a quota error, retry once on this free model through Console/Zen.",
+				stickySession: "Sticky account per conversation",
+				stickySessionHint: "Prefer the last successful account for the same conversation; explicit model rules and pinned accounts win.",
+				off: "Off",
 				pluginUpdate: "Plugin update",
 				currentVersion: "Current version",
 				latestVersion: "Latest version",
@@ -195,6 +216,10 @@ window.__ModuleLoader__.load({
 				accountRef: "凭据引用",
 				accountSource: "来源",
 				addAccount: "添加账户",
+				importAllAuth: "从 auth.json 导入全部",
+				checkAllAccounts: "检查全部账户",
+				importedAll: "已导入 auth.json 全部密钥；请检查账户并保存。",
+				accountsImported: "已导入密钥",
 				removeAccount: "移除",
 				pinAccount: "固定",
 				activeAccount: "固定账户",
@@ -264,6 +289,8 @@ window.__ModuleLoader__.load({
 				heatmapByHour: "按小时（全部日期）",
 				heatmapAllModels: "全部模型",
 				heatmapModel: "模型",
+				heatmapByAccount: "账户",
+				heatmapAllAccounts: "全部账户",
 				analyticsHint: "按最后活动时间聚合本地会话元数据。切换过模型的会话计入最后使用的模型；本地投影不暴露失败。",
 				analyticsEmpty: "此窗口内没有 OpenCode 会话。",
 				showAll: "显示全部",
@@ -301,6 +328,21 @@ window.__ModuleLoader__.load({
 				maxOutputTokens: "输出上限（空 = 模型默认，0 = 省略）",
 				contextWindow: "上下文覆盖",
 				showSidebarQuota: "在侧边栏显示配额卡片",
+				routing: "路由",
+				routingHint: "最近使用的账户/模型选择。不会记录提示词或密钥。",
+				routingEmpty: "尚无路由决策。",
+				routingRule: "模型规则",
+				routingSticky: "会话粘性",
+				routingPinned: "固定账户",
+				routingDefault: "自动",
+				routingRotation: "轮换",
+				routingFallback: "配额回退",
+				routingFailed: "失败",
+				quotaFallbackModel: "配额回退模型",
+				quotaFallbackModelHint: "Go 返回配额错误时，通过 Console/Zen 用此免费模型重试一次。",
+				stickySession: "每个会话固定账户",
+				stickySessionHint: "同一会话优先使用上次成功的账户；显式模型规则和固定账户优先。",
+				off: "关闭",
 				pluginUpdate: "插件更新",
 				currentVersion: "当前版本",
 				latestVersion: "最新版本",
@@ -386,10 +428,13 @@ window.__ModuleLoader__.load({
 				body: JSON.stringify({ ref })
 			});
 		}
-		function importAuth(entry) {
+		function importAuth(entry, ref) {
 			return call("/dsh-opencode/auth-import", {
 				method: "POST",
-				body: JSON.stringify({ entry })
+				body: JSON.stringify(ref === void 0 ? { entry } : {
+					entry,
+					ref
+				})
 			});
 		}
 		function fetchAnalytics(days = 30) {
@@ -429,10 +474,12 @@ window.__ModuleLoader__.load({
 		function RequestHeatmapView(props) {
 			const { heatmap, t } = props;
 			const [selected, setSelected] = (0, react.useState)("all");
+			const [selectedAccount, setSelectedAccount] = (0, react.useState)("all");
 			if (heatmap === void 0) return null;
 			const models = heatmap.models ?? [];
-			const selectedModel = models.find((entry) => `${entry.provider}/${entry.model}` === selected);
-			const view = selectedModel ?? heatmap;
+			const accounts = heatmap.accounts ?? [];
+			const selectedModel = selectedAccount === "all" ? models.find((entry) => `${entry.provider}/${entry.model}` === selected) : void 0;
+			const view = accounts.find((entry) => entry.account === selectedAccount) ?? selectedModel ?? heatmap;
 			const selectedKey = selectedModel === void 0 ? "all" : selected;
 			const max = Math.max(0, ...view.grid.flat());
 			const maxHours = Math.max(0, ...view.hours);
@@ -452,10 +499,37 @@ window.__ModuleLoader__.load({
 									t("requests")
 								]
 							}),
+							accounts.length > 1 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
+								className: "oc-select",
+								value: selectedAccount,
+								title: t("heatmapByAccount"),
+								onChange: (event) => {
+									setSelectedAccount(event.target.value);
+									setSelected("all");
+								},
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("option", {
+									value: "all",
+									children: [
+										t("heatmapAllAccounts"),
+										" (",
+										heatmap.total,
+										")"
+									]
+								}), accounts.map((entry) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("option", {
+									value: entry.account,
+									children: [
+										entry.account,
+										" (",
+										entry.total,
+										")"
+									]
+								}, entry.account))]
+							}) : null,
 							models.length > 1 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
 								className: "oc-select",
 								value: selectedKey,
 								title: t("heatmapModel"),
+								disabled: selectedAccount !== "all",
 								onChange: (event) => setSelected(event.target.value),
 								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("option", {
 									value: "all",
@@ -907,6 +981,14 @@ window.__ModuleLoader__.load({
 				windows?.monthly
 			].map((window) => window?.status).find((value) => value !== void 0 && value !== "ok");
 		}
+		function routingLabel(reason, t) {
+			if (reason === "rule") return t("routingRule");
+			if (reason === "sticky") return t("routingSticky");
+			if (reason === "pinned") return t("routingPinned");
+			if (reason === "rotation") return t("routingRotation");
+			if (reason === "quota-fallback") return t("routingFallback");
+			return t("routingDefault");
+		}
 		function fillClass(value) {
 			if (value >= 90) return "oc-footFill oc-footFillBad";
 			if (value >= 75) return "oc-footFill oc-footFillWarn";
@@ -1222,6 +1304,43 @@ window.__ModuleLoader__.load({
 							})
 						]
 					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+						className: "oc-card",
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", {
+								className: "oc-card-title",
+								children: t("routing")
+							}),
+							(state?.routing ?? []).length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: "oc-hint",
+								children: t("routingEmpty")
+							}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+								className: "oc-table-scroll",
+								children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("table", {
+									className: "oc-table",
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("thead", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("tr", { children: [
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("date") }),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("accountLabel") }),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("model") }),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("routing") })
+									] }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("tbody", { children: (state?.routing ?? []).slice(0, 8).map((row) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("tr", { children: [
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: new Date(row.at).toLocaleTimeString() }),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: row.account }),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: row.model }),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("td", { children: [
+											routingLabel(row.reason, t),
+											row.fallback ? ` · ${t("routingFallback")}` : "",
+											row.ok ? "" : ` · ${t("routingFailed")}${row.error === void 0 ? "" : ` (${row.error})`}`
+										] })
+									] }, `${row.at}-${row.account}-${row.model}-${row.reason}`)) })]
+								})
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: "oc-hint",
+								children: t("routingHint")
+							})
+						]
+					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 						className: "oc-card",
 						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -1329,6 +1448,8 @@ window.__ModuleLoader__.load({
 				activeAccount: state.config.activeAccount,
 				accounts: state.config.accounts.map((account) => ({ ...account })),
 				modelAccountRules: state.config.modelAccountRules.map((rule) => ({ ...rule })),
+				quotaFallbackModel: state.config.quotaFallbackModel,
+				stickySession: state.config.stickySession,
 				visibleModels: state.config.visibleModels.length === 0 ? allIds : [...state.config.visibleModels],
 				filterModelsByPlan: state.config.filterModelsByPlan,
 				showAll: state.config.visibleModels.length === 0,
@@ -1364,6 +1485,8 @@ window.__ModuleLoader__.load({
 					pattern: rule.pattern.trim(),
 					account: rule.account.trim()
 				})).filter((rule) => rule.pattern !== "" && rule.account !== ""),
+				quotaFallbackModel: draft.quotaFallbackModel.trim(),
+				stickySession: draft.stickySession,
 				visibleModels: draft.showAll ? [] : draft.visibleModels,
 				filterModelsByPlan: draft.filterModelsByPlan,
 				modelTransports: Object.fromEntries(Object.entries(draft.modelTransports).filter(([, value]) => value !== ""))
@@ -1560,6 +1683,7 @@ window.__ModuleLoader__.load({
 			const [testModel, setTestModel] = (0, react.useState)("deepseek-v4.1-flash");
 			const [testing, setTesting] = (0, react.useState)(false);
 			const [testResult, setTestResult] = (0, react.useState)(null);
+			const [importing, setImporting] = (0, react.useState)(false);
 			const load = (0, react.useCallback)(async () => {
 				setLoading(true);
 				try {
@@ -1610,6 +1734,29 @@ window.__ModuleLoader__.load({
 					setError(caught instanceof Error ? caught.message : t("failed"));
 				}
 			};
+			const importAllAuth = async () => {
+				if (state === null || draft === null) return;
+				const refFor = (entry) => `OPENCODE_AUTH_${entry.replace(/[^A-Za-z0-9]+/g, "_").toUpperCase()}`;
+				const missing = state.auth.entries.filter((entry) => !draft.accounts.some((account) => account.label === entry || account.apiKeyEnv === refFor(entry)));
+				if (missing.length === 0) {
+					setNotice(t("importedAll"));
+					return;
+				}
+				setImporting(true);
+				setError(null);
+				try {
+					for (const entry of missing) await importAuth(entry, refFor(entry));
+					update({ accounts: [...draft.accounts, ...missing.map((entry) => ({
+						label: entry,
+						apiKeyEnv: refFor(entry)
+					}))] });
+					setNotice(t("importedAll"));
+				} catch (caught) {
+					setError(caught instanceof Error ? caught.message : t("failed"));
+				} finally {
+					setImporting(false);
+				}
+			};
 			if (loading && state === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 				className: "oc-hint",
 				children: t("loading")
@@ -2126,6 +2273,23 @@ window.__ModuleLoader__.load({
 										}] }),
 										children: t("addAccount")
 									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										className: "oc-button",
+										disabled: importing,
+										onClick: () => {
+											importAllAuth();
+										},
+										children: importing ? t("loading") : t("importAllAuth")
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										className: "oc-button",
+										onClick: () => {
+											refresh();
+										},
+										children: t("checkAllAccounts")
+									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 										className: "oc-badge",
 										children: [
@@ -2206,6 +2370,61 @@ window.__ModuleLoader__.load({
 							})
 						]
 					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+						className: "oc-card",
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", {
+								className: "oc-card-title",
+								children: t("routing")
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: "oc-hint",
+								children: t("routingHint")
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+								className: "oc-row",
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+									type: "checkbox",
+									checked: draft.stickySession,
+									onChange: (event) => update({ stickySession: event.target.checked })
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("stickySession") })]
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: "oc-hint",
+								children: t("stickySessionHint")
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+								className: "oc-field",
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "oc-label",
+										children: t("quotaFallbackModel")
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
+										className: "oc-select",
+										value: draft.quotaFallbackModel,
+										onChange: (event) => update({ quotaFallbackModel: event.target.value }),
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+											value: "",
+											children: t("off")
+										}), state.models.filter((model) => model.free).map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("option", {
+											value: model.id,
+											children: [
+												model.name,
+												" (",
+												model.id,
+												")"
+											]
+										}, model.id))]
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "oc-hint",
+										children: t("quotaFallbackModelHint")
+									})
+								]
+							})
+						]
+					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 						className: "oc-card",
 						children: [

package/lib/index.d.ts

@@ -55,6 +55,10 @@ interface Config {
   accounts?: AccountConfig[];
   /** Preferred account per model glob; other accounts remain fallbacks. */
   modelAccountRules?: ModelAccountRule[];
+  /** Free model used once when the Go quota rejects a request; empty disables it. */
+  quotaFallbackModel?: string;
+  /** Prefer the last successful account for a conversation. */
+  stickySession?: boolean;
   /** Pinned account id; empty means automatic. */
   activeAccount?: string;
   /** Show the quota card in the sidebar. */
@@ -82,6 +86,8 @@ interface ResolvedConfig {
   maxOutputTokens?: number;
   accounts: readonly AccountConfig[];
   modelAccountRules: readonly ModelAccountRule[];
+  quotaFallbackModel: string;
+  stickySession: boolean;
   activeAccount: string;
   showSidebarQuota: boolean;
   userAgent: string;
@@ -111,6 +117,17 @@ declare function createKeyPool(ctx: Context, config: () => ResolvedConfig): KeyP
 declare function createKeyResolver(ctx: Context, config: () => ResolvedConfig): KeyResolver;
 //#endregion
 //#region src/adapter.d.ts
+type RoutingReason = 'rule' | 'sticky' | 'pinned' | 'default' | 'rotation' | 'quota-fallback';
+interface RoutingTraceEntry {
+  readonly at: number;
+  readonly provider: string;
+  readonly model: string;
+  readonly account: string;
+  readonly reason: RoutingReason;
+  readonly fallback: boolean;
+  readonly ok: boolean;
+  readonly error?: string;
+}
 interface OpenCodeAdapterDeps {
   readonly config: () => ResolvedConfig;
   readonly resolveKey: KeyResolver;
@@ -118,7 +135,7 @@ interface OpenCodeAdapterDeps {
   readonly resolveAttachments?: () => AttachmentStore | undefined;
   readonly fetchImpl?: typeof fetch;
   /** Test seam; defaults to the local append-only request log. */
-  readonly recordRequest?: (provider: string, model: string, purpose?: string) => void;
+  readonly recordRequest?: (provider: string, model: string, purpose?: string, account?: string, reason?: string) => void;
   /** Test seam; defaults to ~/.dsh/storages/dsh-opencode/cooldowns.json. */
   readonly cooldownPath?: string;
   /** Receives a one-time warning when the provider tool limit drops tools. */
@@ -131,6 +148,8 @@ declare class OpenCodeAdapter extends LlmAdapter {
   private cooldownWrites;
   /** key fingerprint → cooldown deadline and the rejection that caused it. */
   private readonly cooldowns;
+  private readonly sticky;
+  private readonly routing;
   private warnedTools;
   constructor(deps: OpenCodeAdapterDeps);
   providerInfo(provider: string): LlmProviderInfo;
@@ -138,9 +157,13 @@ declare class OpenCodeAdapter extends LlmAdapter {
   listModels(provider: string, opts?: {
     unfiltered?: boolean;
   }): Promise<readonly LlmModelInfo[]>;
+  /** Recent routing decisions, newest first; no keys or prompt content. */
+  routingTrace(): readonly RoutingTraceEntry[];
   resolveModel(provider: string, model: string): Promise<LlmResolvedModelInfo>;
   stream(options: GenerateOptions): AsyncIterable<StreamChunk>;
   private run;
+  private rememberSticky;
+  private pushTrace;
   private parse;
   private send;
   private keyId;
@@ -292,6 +315,12 @@ interface ModelRequestHeatmap {
   hours: number[];
   grid: number[][];
 }
+interface AccountRequestHeatmap {
+  account: string;
+  total: number;
+  hours: number[];
+  grid: number[][];
+}
 interface RequestHeatmap {
   since: number;
   total: number;
@@ -302,6 +331,7 @@ interface RequestHeatmap {
   firstAt: number | null;
   lastAt: number | null;
   models: ModelRequestHeatmap[];
+  accounts: AccountRequestHeatmap[];
 }
 //#endregion
 //#region src/routes.d.ts