@huaweidevtools/aishell-dsh-llm 0.0.1 → 0.0.2

package/README.md

@@ -2,6 +2,8 @@
 
 OpenAI-compatible LLM adapter for DSH. Registers the `aishell` provider route on `ctx.llm`, routing model calls through the aishell gateway with direct AK/SK signing.
 
+Besides the live route, the plugin declares `aishell` in the configurable-provider directory (`ctx.llm.registerConfigurableProviders`) — the directory the Models page joins with live routes, so the route shows up as a configurable provider row with its own settings address. The plugin also carries a Config schema; the settings mirror only lists namespaces whose plugin declares one, so without it the Models page would not show the row.
+
 ## How it works
 
 ```
@@ -21,6 +23,29 @@ User selects aishell/<model>
 
 No intermediate API-key exchange or config fetch — every request is signed with the user's AK/SK. The credential store (OS keyring with fingerprint + memory fallback) holds the AK/SK; this adapter only reads them.
 
+## Image input
+
+The adapter carries images for models whose gateway catalog entry lists `image` in `modalities`. A model the catalog describes as text-only never receives one: `dsh-llm` projects such an image to a stable placeholder before the adapter sees it.
+
+For an image-capable model the pipeline is:
+
+```
+harness history (durable image *references*, not bytes)
+  → prepareRequestImages: one request version per attachment, via ctx.attachments
+  → byte budget check → IMAGE_OFFLOAD_REQUIRED when over
+  → projectOffloaded: occurrences an earlier offload decision marked
+  → serialize: [handle text, base64 data URL] parts on the user message
+```
+
+Two properties are worth knowing:
+
+- **Bytes are read from the attachment service, not the block.** An image block holds an opaque `attachmentId` that is deliberately neither a path nor a URL, so the adapter resolves bytes through `ctx.attachments.readImageRequest`, which also normalizes and re-encodes to the route's target size. A deployment without that service fails image requests with `UNSUPPORTED_CONTENT` rather than sending an empty turn.
+- **Tool-result images ride a separate user turn.** OpenAI's `tool` message takes text only, so an image a tool returned is hoisted into a following `user` message — the same shape the ecosystem's OpenAI-path serializer produces.
+
+Over-budget requests fail with `IMAGE_OFFLOAD_REQUIRED` and are retried by `@deepseek-ai/dsh-compaction-image-offload`, which `dsh-base` mounts: it marks the oldest occurrences offloaded, after which they travel as placeholder text. This adapter never offloads on its own.
+
+Image token accounting uses the token meter's structural estimate — this adapter implements no `imageRequestPricing`, matching `dsh-llm-pi-ai`. Image-heavy sessions are therefore approximated rather than priced per model.
+
 ## What it does NOT touch
 
 - `ctx.credentials` — DSH's own credential provider stays `dsh-credentials-local`. User-configured models and `.credentials.yaml` keep working.
@@ -41,8 +66,13 @@ dsh plugin --profile <name> add @huaweidevtools/aishell-dsh-base
 
 | Field | Type | Default | Description |
 |---|---|---|---|
-| `baseUrl` | `string?` | `https://api.aishell.openbuildlab.com` | Chat API base URL. `/chat/completions` and `/models` are appended. |
+| `baseUrl` | `string?` | `https://api.aishell.openbuildlab.com/v1` | Chat API base URL. `/chat/completions` and `/models` are appended, so a base carrying its own path segment is signed and requested in full. |
 | `keyringService` | `string?` | `aishell-dsh` | Credential store service name. |
+| `requestImagePixelBudget` | `number?` | `4194304` | Total-pixel cap one request image is scaled into. |
+| `requestImageMaxBytes` | `number?` | `1048576` | Encoded-byte target for one request image. |
+| `maxRequestImageBytes` | `number?` | `20971520` | Accumulated base64 image bytes one request accepts before the oldest images must be offloaded. |
+
+The three image fields share `dsh-llm-pi-ai`'s defaults: the gateway publishes no image budget of its own, so the route supplies one.
 
 ## Storing credentials
 

package/lib/client.js

@@ -0,0 +1,221 @@
+window.__ModuleLoader__.load({ id: "@huaweidevtools/aishell-dsh-llm", factory: (require) => {
+"use strict";
+var module = { exports: {} }; var exports = module.exports;
+//#region rolldown:runtime
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
+
+//#endregion
+const __deepseek_ai_dsh_client_store = __toESM(require("@deepseek-ai/dsh-client-store"));
+const react = __toESM(require("react"));
+const react_jsx_runtime = __toESM(require("react/jsx-runtime"));
+
+//#region src/client/ProviderCard.tsx
+/**
+* Render the aishell family's card extension.
+*
+* The parent renders this inside the host editor's card (below its fallback
+* hint), so the visual style follows the surrounding card rather than opening
+* a panel of its own: one readiness line and one catalog list, no buttons —
+* the host card's Cancel stays the only control. Readiness folds the
+* credential fact into a single conclusion (the question this page asks is
+* "can I use this provider", not "what are my credentials"); details and
+* management of credentials belong to the AI Shell settings section, which
+* the unconfigured hint names.
+*/
+/**
+* What an empty catalog means, and therefore what the card says about it.
+*
+* An empty model list has two unrelated causes that look identical on the
+* wire: the gateway returned nothing, or the request was never signed because
+* no credentials are stored. Only the second one is actionable, and it is the
+* state every new user starts in — so it has to name the place to fix it.
+*
+* Extracted from the render so the branch is testable without a DOM: the
+* repo's client-side tests cover pure logic, not components.
+*
+* @param catalog - the route body, or `undefined` while it is still loading.
+* @returns the text to show, which the caller renders as-is.
+*/
+function catalogStatusText(catalog) {
+	if (catalog === void 0) return "获取中…";
+	if (catalog.models.length > 0) return "";
+	return catalog.credentialsPresent ? "网关未返回任何模型" : "需要凭据才能获取（凭据在 设置 → AI Shell 中配置）";
+}
+function AishellProviderCard(props) {
+	const status = props.useCredentials((snapshot) => snapshot);
+	const [catalog, setCatalog] = (0, react.useState)(void 0);
+	const [catalogError, setCatalogError] = (0, react.useState)(void 0);
+	(0, react.useEffect)(() => {
+		let cancelled = false;
+		fetch(MODELS_ROUTE).then(async (response) => {
+			if (!response.ok) throw new Error(`HTTP ${response.status}`);
+			return response.json();
+		}).then((body) => {
+			if (!cancelled) {
+				setCatalog(body);
+				setCatalogError(void 0);
+			}
+		}).catch((error) => {
+			if (!cancelled) setCatalogError(error instanceof Error ? error.message : String(error));
+		});
+		return () => {
+			cancelled = true;
+		};
+	}, []);
+	const configured = status.credentialsStored;
+	const readinessStyle = {
+		display: "flex",
+		alignItems: "center",
+		gap: 8,
+		fontSize: 12,
+		lineHeight: "18px",
+		fontWeight: 500,
+		color: "var(--dsw-alias-label-secondary)"
+	};
+	const readinessTextStyle = {
+		fontWeight: 400,
+		color: configured ? "var(--dsw-alias-label-primary)" : "var(--dsw-alias-label-tertiary)"
+	};
+	const rowStyle = {
+		display: "flex",
+		flexDirection: "column",
+		gap: 2
+	};
+	const catalogLabelStyle = {
+		fontSize: 12,
+		lineHeight: "18px",
+		fontWeight: 500,
+		color: "var(--dsw-alias-label-secondary)"
+	};
+	const valueStyle = {
+		fontSize: 12,
+		lineHeight: "18px",
+		color: "var(--dsw-alias-label-tertiary)"
+	};
+	const sectionStyle = {
+		display: "flex",
+		flexDirection: "column",
+		gap: 10,
+		borderTop: "0.5px solid var(--dsw-alias-border-l4)",
+		marginTop: 12,
+		paddingTop: 12
+	};
+	const modelStyle = {
+		display: "flex",
+		alignItems: "center",
+		gap: 8,
+		fontSize: 13,
+		lineHeight: "20px",
+		color: "var(--dsw-alias-label-primary)"
+	};
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+		style: sectionStyle,
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+			style: readinessStyle,
+			children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				style: {
+					width: 6,
+					height: 6,
+					borderRadius: "50%",
+					flex: "none",
+					background: configured ? "var(--dsw-alias-state-success-primary)" : "var(--dsw-alias-state-warn-label)"
+				},
+				"aria-hidden": "true"
+			}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				style: readinessTextStyle,
+				children: configured ? "已就绪 — 凭据已验证，可直接对话" : "未就绪 — 凭据未配置（在 设置 → AI Shell 中保存 AK/SK）"
+			})]
+		}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+			style: rowStyle,
+			children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				style: catalogLabelStyle,
+				children: "模型目录（来自 aishell 网关，只读）"
+			}), catalogError !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+				style: valueStyle,
+				children: ["目录获取失败：", catalogError]
+			}) : catalog === void 0 || catalog.models.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				style: valueStyle,
+				children: catalogStatusText(catalog)
+			}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
+				style: {
+					margin: 0,
+					padding: 0,
+					listStyle: "none",
+					display: "flex",
+					flexDirection: "column",
+					gap: 4
+				},
+				children: catalog.models.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", {
+					style: modelStyle,
+					children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							"aria-hidden": "true",
+							children: "·"
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: model.id }),
+						model.inputModalities.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+							style: {
+								fontSize: 11,
+								color: "var(--dsw-alias-label-quaternary)"
+							},
+							children: [model.inputModalities.join(" / "), " 输入"]
+						}) : null
+					]
+				}, model.id))
+			})]
+		})]
+	});
+}
+/**
+* Host route, written document-relative like the credential routes the
+* sibling plugin uses: the served index carries `<base href="./">`, so the
+* request lands on the same origin that serves the page — which carries the
+* browser-session cookie the route's authentication fence requires.
+*/
+const MODELS_ROUTE = "api/aishell/models";
+
+//#endregion
+//#region src/client/index.ts
+/** The settings namespace aishell-credentials owns (the card reads its status). */
+const AISHELL_CREDENTIALS_NS = "aishell-client-credentials";
+/** Required services. */
+const inject = ["slots", "configForms"];
+function apply(ctx) {
+	const form = ctx.configForms.get(AISHELL_CREDENTIALS_NS);
+	const status = (0, __deepseek_ai_dsh_client_store.createSnapshotStore)({ credentialsStored: false });
+	const derive = () => {
+		status.set({ credentialsStored: form.getSnapshot().value?.credentialsStored === true });
+	};
+	ctx.effect(() => form.subscribe(derive), "aishell-llm: credential presence for the models card");
+	derive();
+	ctx.effect(() => ctx.configForms.whileServed([AISHELL_CREDENTIALS_NS], () => ctx.slots.inject("settings.models.provider-card", () => ctx.slots.register({
+		name: "settings.models.provider-card",
+		key: "aishell-llm",
+		inject: () => ({ hooks: { credentials: status } })
+	}, AishellProviderCard))), "aishell-llm: models page provider card");
+}
+
+//#endregion
+exports.apply = apply
+exports.inject = inject
+return module.exports; } });
+//# sourceMappingURL=client.js.map