@klarkxy/dsh-plugin-kit 0.1.0 → 0.3.0

package/lib/domain.js

@@ -0,0 +1,41 @@
+//#region src/domain.ts
+/**
+* Open table-only plugin state using the host's lossless legacy bootstrap.
+* The JSON backend ignores compatibleVersions in single layout, and treats
+* unsupported/malformed legacy files as absent in per-record layout. Probe
+* an empty result so persistent settings cannot silently become defaults.
+* A populated per-record tree is authoritative; the retained legacy source
+* is an initial backup, not a current-data rollback after subsequent writes.
+*/
+async function openCompatibleDomain(open, spec) {
+	const perRecord = {
+		...spec,
+		layout: "per-record"
+	};
+	const domain = await open(perRecord);
+	let populated = false;
+	try {
+		populated = Object.keys(spec.tables).some((table) => !domain.table(table).entries().next().done);
+	} finally {
+		if (!populated) await domain.close();
+	}
+	if (populated) return domain;
+	let mismatch;
+	for (const version of /* @__PURE__ */ new Set([spec.version, ...spec.compatibleVersions ?? []])) try {
+		await (await open({
+			...spec,
+			layout: "single",
+			version,
+			compatibleVersions: []
+		})).close();
+		return open(perRecord);
+	} catch (error) {
+		if (!error || typeof error !== "object" || !("code" in error) || error.code !== "version-mismatch") throw error;
+		mismatch = error;
+	}
+	throw mismatch;
+}
+//#endregion
+export { openCompatibleDomain };
+
+//# sourceMappingURL=domain.js.map

package/lib/domain.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"domain.js","names":[],"sources":["../src/domain.ts"],"sourcesContent":["type PluginDomainSpec = {\n  version: number\n  compatibleVersions?: readonly number[]\n  layout?: 'single' | 'per-record'\n  tables: Record<string, unknown>\n  global?: never\n}\n\ntype PluginDomainHandle = {\n  table(name: string): { entries(): IterableIterator<[unknown, unknown]> }\n  close(): Promise<void>\n}\n\n/**\n * Open table-only plugin state using the host's lossless legacy bootstrap.\n * The JSON backend ignores compatibleVersions in single layout, and treats\n * unsupported/malformed legacy files as absent in per-record layout. Probe\n * an empty result so persistent settings cannot silently become defaults.\n * A populated per-record tree is authoritative; the retained legacy source\n * is an initial backup, not a current-data rollback after subsequent writes.\n */\nexport async function openCompatibleDomain<S extends PluginDomainSpec, D extends PluginDomainHandle>(\n  open: (spec: S) => Promise<D>, spec: S,\n): Promise<D> {\n  const perRecord = { ...spec, layout: 'per-record' } as S\n  const domain = await open(perRecord)\n  let populated = false\n  try {\n    populated = Object.keys(spec.tables).some(table => !domain.table(table).entries().next().done)\n  } finally {\n    if (!populated) await domain.close()\n  }\n  if (populated) return domain\n\n  let mismatch: unknown\n  for (const version of new Set([spec.version, ...spec.compatibleVersions ?? []])) {\n    try {\n      const legacy = await open({ ...spec, layout: 'single', version, compatibleVersions: [] } as S)\n      await legacy.close()\n      return open(perRecord)\n    } catch (error) {\n      if (!error || typeof error !== 'object' || !('code' in error) || error.code !== 'version-mismatch') throw error\n      mismatch = error\n    }\n  }\n  throw mismatch\n}\n"],"mappings":";;;;;;;;;AAqBA,eAAsB,qBACpB,MAA+B,MACnB;CACZ,MAAM,YAAY;EAAE,GAAG;EAAM,QAAQ;CAAa;CAClD,MAAM,SAAS,MAAM,KAAK,SAAS;CACnC,IAAI,YAAY;CAChB,IAAI;EACF,YAAY,OAAO,KAAK,KAAK,MAAM,CAAC,CAAC,MAAK,UAAS,CAAC,OAAO,MAAM,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI;CAC/F,UAAU;EACR,IAAI,CAAC,WAAW,MAAM,OAAO,MAAM;CACrC;CACA,IAAI,WAAW,OAAO;CAEtB,IAAI;CACJ,KAAK,MAAM,2BAAW,IAAI,IAAI,CAAC,KAAK,SAAS,GAAG,KAAK,sBAAsB,CAAC,CAAC,CAAC,GAC5E,IAAI;EAEF,OAAM,MADe,KAAK;GAAE,GAAG;GAAM,QAAQ;GAAU;GAAS,oBAAoB,CAAC;EAAE,CAAM,EAAA,CAChF,MAAM;EACnB,OAAO,KAAK,SAAS;CACvB,SAAS,OAAO;EACd,IAAI,CAAC,SAAS,OAAO,UAAU,YAAY,EAAE,UAAU,UAAU,MAAM,SAAS,oBAAoB,MAAM;EAC1G,WAAW;CACb;CAEF,MAAM;AACR"}

package/lib/host-rpc.d.ts

@@ -13,8 +13,27 @@ interface HostRpcContext {
     requestRejection?: (request: IncomingMessage) => number | undefined;
   };
 }
-/** Safe host RPC registration. Missing requestRejection fails closed. Result type accepts any RpcResult shape. */
-declare function registerHostRpc<R extends RpcResult = RpcResult>(ctx: HostRpcContext, channel: string, call: (endpoint: string, payload: unknown, signal: AbortSignal) => Promise<R>): () => void;
+type Rejection = {
+  status: number;
+  body?: string;
+};
+interface HostRpcTransportOptions {
+  maxBodyBytes?: number;
+  isEndpoint?: (endpoint: string) => boolean;
+  caseInsensitiveContentType?: boolean;
+  emptyBodyAsNull?: boolean;
+  beforeBody?: (request: IncomingMessage, endpoint: string) => Rejection | undefined;
+  errorBody?: (status: number, error?: unknown) => string | undefined;
+}
+interface HostRpcOptions extends HostRpcTransportOptions {
+  requirePayload?: boolean;
+}
+/** The shared authenticated HTTP boundary. Each plugin still owns its RPC envelope semantics. */
+declare function registerHostRpcTransport(ctx: HostRpcContext, channel: string, dispatch: (endpoint: string, body: unknown, signal: AbortSignal, response: ServerResponse) => void | Promise<void>, options?: HostRpcTransportOptions): () => void;
+/** Write the native Connection response envelope after a plugin has handled a request. */
+declare function sendHostRpcResponse(response: ServerResponse, rpcId: string, result: unknown, noStore?: boolean): void;
+/** Safe host RPC registration. Missing requestRejection fails closed. */
+declare function registerHostRpc<R extends RpcResult = RpcResult>(ctx: HostRpcContext, channel: string, call: (endpoint: string, payload: unknown, signal: AbortSignal) => Promise<R>, options?: HostRpcOptions): () => void;
 //#endregion
-export { HostRpcContext, registerHostRpc };
+export { HostRpcContext, HostRpcOptions, HostRpcTransportOptions, registerHostRpc, registerHostRpcTransport, sendHostRpcResponse };
 //# sourceMappingURL=host-rpc.d.ts.map

package/lib/host-rpc.js

@@ -1,95 +1,114 @@
 //#region src/host-rpc.ts
-/** Safe host RPC registration. Missing requestRejection fails closed. Result type accepts any RpcResult shape. */
-function registerHostRpc(ctx, channel, call) {
+/** The shared authenticated HTTP boundary. Each plugin still owns its RPC envelope semantics. */
+function registerHostRpcTransport(ctx, channel, dispatch, options = {}) {
+	const bodyLimit = options.maxBodyBytes ?? 65536;
+	if (!Number.isSafeInteger(bodyLimit) || bodyLimit <= 0) throw new Error("Invalid RPC body limit");
+	const isEndpoint = options.isEndpoint ?? ((endpoint) => /^[a-z.]+$/.test(endpoint));
 	return ctx.webServer.register({
 		kind: "prefix",
 		path: channel,
 		handler: async (req, res) => {
-			if (!ctx.connection.requestRejection) {
-				res.writeHead(503);
-				res.end();
-				return;
-			}
-			const rejection = ctx.connection.requestRejection(req);
-			if (rejection !== void 0) {
-				res.writeHead(rejection);
-				res.end();
-				return;
-			}
-			const pathname = new URL(req.url ?? "/", "http://dsh.internal").pathname;
-			const endpoint = pathname.startsWith(`${channel}/`) ? pathname.slice(channel.length + 1) : "";
-			if (req.method !== "POST" || !/^[a-z.]+$/.test(endpoint)) {
-				res.writeHead(404);
-				res.end();
-				return;
-			}
-			if (String(req.headers["content-type"] ?? "").split(";")[0]?.trim() !== "application/json") {
-				res.writeHead(415);
-				res.end();
-				return;
-			}
-			const controller = new AbortController();
-			res.on("close", () => {
-				if (!res.writableEnded) controller.abort();
-			});
+			const reject = (status, error, override) => {
+				if (res.destroyed) return;
+				if (status === 413) res.writeHead(status, { connection: "close" });
+				else res.writeHead(status);
+				res.end(override ?? options.errorBody?.(status, error) ?? (status === 500 ? "rpc request failed" : ""));
+			};
 			try {
+				if (typeof ctx.connection.requestRejection !== "function") {
+					reject(503);
+					return;
+				}
+				const rejection = ctx.connection.requestRejection(req);
+				if (rejection !== void 0) {
+					reject(rejection);
+					return;
+				}
+				const pathname = new URL(req.url ?? "/", "http://dsh.internal").pathname;
+				const endpoint = pathname.startsWith(`${channel}/`) ? pathname.slice(channel.length + 1) : "";
+				if (req.method !== "POST" || !isEndpoint(endpoint)) {
+					reject(404);
+					return;
+				}
+				const contentType = String(req.headers["content-type"] ?? "").split(";", 1)[0]?.trim();
+				if ((options.caseInsensitiveContentType ? contentType.toLowerCase() : contentType) !== "application/json") {
+					reject(415);
+					return;
+				}
+				const guarded = options.beforeBody?.(req, endpoint);
+				if (guarded) {
+					reject(guarded.status, void 0, guarded.body);
+					return;
+				}
+				const controller = new AbortController();
+				res.on("close", () => {
+					if (!res.writableEnded) controller.abort();
+				});
 				const chunks = [];
 				let size = 0;
 				for await (const chunk of req) {
 					const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
 					size += buffer.length;
-					if (size > 65536) {
-						res.writeHead(413, { connection: "close" });
-						res.end();
+					if (size > bodyLimit) {
+						reject(413);
 						req.destroy();
 						return;
 					}
 					chunks.push(buffer);
 				}
-				let request;
+				let body;
 				try {
-					const parsed = JSON.parse(Buffer.concat(chunks).toString("utf8"));
-					if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) throw new Error();
-					request = parsed;
+					body = JSON.parse(Buffer.concat(chunks).toString("utf8") || (options.emptyBodyAsNull ? "null" : ""));
 				} catch {
-					res.writeHead(400);
-					res.end();
-					return;
-				}
-				if (request.type !== "client-request" || request.method !== endpoint || typeof request.rpcId !== "string") {
-					res.writeHead(400);
-					res.end();
+					reject(400);
 					return;
 				}
-				const raw = await call(endpoint, request.payload, controller.signal);
-				const result = raw.ok ? raw : {
-					...raw,
-					error: {
-						details: {},
-						...raw.error
-					}
-				};
-				if (!res.destroyed) {
-					res.writeHead(200, {
-						"content-type": "application/json",
-						"cache-control": "no-store"
-					});
-					res.end(JSON.stringify({
-						type: "server-response",
-						rpcId: request.rpcId,
-						result
-					}));
-				}
-			} catch {
-				if (!res.destroyed) {
-					res.writeHead(500);
-					res.end("rpc request failed");
-				}
+				await dispatch(endpoint, body, controller.signal, res);
+			} catch (error) {
+				reject(500, error);
 			}
 		}
 	});
 }
+/** Write the native Connection response envelope after a plugin has handled a request. */
+function sendHostRpcResponse(response, rpcId, result, noStore = true) {
+	if (response.destroyed) return;
+	response.writeHead(200, {
+		"content-type": "application/json",
+		...noStore ? { "cache-control": "no-store" } : {}
+	});
+	response.end(JSON.stringify({
+		type: "server-response",
+		rpcId,
+		result
+	}));
+}
+/** Safe host RPC registration. Missing requestRejection fails closed. */
+function registerHostRpc(ctx, channel, call, options = {}) {
+	return registerHostRpcTransport(ctx, channel, async (endpoint, body, signal, res) => {
+		if (!body || typeof body !== "object" || Array.isArray(body)) {
+			res.writeHead(400);
+			res.end();
+			return;
+		}
+		const request = body;
+		if (request.type !== "client-request" || request.method !== endpoint || typeof request.rpcId !== "string" || options.requirePayload && !Object.hasOwn(request, "payload")) {
+			res.writeHead(400);
+			res.end();
+			return;
+		}
+		const raw = await call(endpoint, request.payload, signal);
+		const result = raw.ok ? raw : {
+			...raw,
+			error: {
+				details: {},
+				...raw.error
+			}
+		};
+		sendHostRpcResponse(res, request.rpcId, result);
+	}, options);
+}
 //#endregion
-export { registerHostRpc };
+export { registerHostRpc, registerHostRpcTransport, sendHostRpcResponse };
 
 //# sourceMappingURL=host-rpc.js.map

package/lib/host-rpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"host-rpc.js","names":[],"sources":["../src/host-rpc.ts"],"sourcesContent":["import type { IncomingMessage, ServerResponse } from 'node:http'\nimport type { RpcResult } from './contracts.ts'\n\nexport interface HostRpcContext {\n  webServer: { register(route: { kind: 'prefix'; path: string; handler(req: IncomingMessage, res: ServerResponse): void | Promise<void> }): () => void }\n  connection: { requestRejection?: (request: IncomingMessage) => number | undefined }\n}\n\n/** Safe host RPC registration. Missing requestRejection fails closed. Result type accepts any RpcResult shape. */\nexport function registerHostRpc<R extends RpcResult = RpcResult>(\n  ctx: HostRpcContext,\n  channel: string,\n  call: (endpoint: string, payload: unknown, signal: AbortSignal) => Promise<R>,\n): () => void {\n  return ctx.webServer.register({ kind: 'prefix', path: channel, handler: async (req, res) => {\n    // Require the host's origin/auth policy. Missing policy must not expose settings.\n    if (!ctx.connection.requestRejection) { res.writeHead(503); res.end(); return }\n    const rejection = ctx.connection.requestRejection(req)\n    if (rejection !== undefined) { res.writeHead(rejection); res.end(); return }\n    const pathname = new URL(req.url ?? '/', 'http://dsh.internal').pathname\n    const endpoint = pathname.startsWith(`${channel}/`) ? pathname.slice(channel.length + 1) : ''\n    if (req.method !== 'POST' || !/^[a-z.]+$/.test(endpoint)) { res.writeHead(404); res.end(); return }\n    if (String(req.headers['content-type'] ?? '').split(';')[0]?.trim() !== 'application/json') {\n      res.writeHead(415); res.end(); return\n    }\n    const controller = new AbortController()\n    res.on('close', () => { if (!res.writableEnded) controller.abort() })\n    try {\n      const chunks: Buffer[] = []\n      let size = 0\n      for await (const chunk of req) {\n        const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)\n        size += buffer.length\n        if (size > 64 * 1024) { res.writeHead(413, { connection: 'close' }); res.end(); req.destroy(); return }\n        chunks.push(buffer)\n      }\n      let request: Record<string, unknown>\n      try {\n        const parsed: unknown = JSON.parse(Buffer.concat(chunks).toString('utf8'))\n        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) throw new Error()\n        request = parsed as Record<string, unknown>\n      } catch { res.writeHead(400); res.end(); return }\n      if (request.type !== 'client-request' || request.method !== endpoint || typeof request.rpcId !== 'string') {\n        res.writeHead(400); res.end(); return\n      }\n      const raw = await call(endpoint, request.payload, controller.signal)\n      const result = raw.ok ? raw : { ...raw, error: { details: {}, ...raw.error } }\n      if (!res.destroyed) {\n        res.writeHead(200, { 'content-type': 'application/json', 'cache-control': 'no-store' })\n        res.end(JSON.stringify({ type: 'server-response', rpcId: request.rpcId, result }))\n      }\n    } catch {\n      if (!res.destroyed) { res.writeHead(500); res.end('rpc request failed') }\n    }\n  } })\n}\n"],"mappings":";;AASA,SAAgB,gBACd,KACA,SACA,MACY;CACZ,OAAO,IAAI,UAAU,SAAS;EAAE,MAAM;EAAU,MAAM;EAAS,SAAS,OAAO,KAAK,QAAQ;GAE1F,IAAI,CAAC,IAAI,WAAW,kBAAkB;IAAE,IAAI,UAAU,GAAG;IAAG,IAAI,IAAI;IAAG;GAAO;GAC9E,MAAM,YAAY,IAAI,WAAW,iBAAiB,GAAG;GACrD,IAAI,cAAc,KAAA,GAAW;IAAE,IAAI,UAAU,SAAS;IAAG,IAAI,IAAI;IAAG;GAAO;GAC3E,MAAM,WAAW,IAAI,IAAI,IAAI,OAAO,KAAK,qBAAqB,CAAC,CAAC;GAChE,MAAM,WAAW,SAAS,WAAW,GAAG,QAAQ,EAAE,IAAI,SAAS,MAAM,QAAQ,SAAS,CAAC,IAAI;GAC3F,IAAI,IAAI,WAAW,UAAU,CAAC,YAAY,KAAK,QAAQ,GAAG;IAAE,IAAI,UAAU,GAAG;IAAG,IAAI,IAAI;IAAG;GAAO;GAClG,IAAI,OAAO,IAAI,QAAQ,mBAAmB,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,MAAM,oBAAoB;IAC1F,IAAI,UAAU,GAAG;IAAG,IAAI,IAAI;IAAG;GACjC;GACA,MAAM,aAAa,IAAI,gBAAgB;GACvC,IAAI,GAAG,eAAe;IAAE,IAAI,CAAC,IAAI,eAAe,WAAW,MAAM;GAAE,CAAC;GACpE,IAAI;IACF,MAAM,SAAmB,CAAC;IAC1B,IAAI,OAAO;IACX,WAAW,MAAM,SAAS,KAAK;KAC7B,MAAM,SAAS,OAAO,SAAS,KAAK,IAAI,QAAQ,OAAO,KAAK,KAAK;KACjE,QAAQ,OAAO;KACf,IAAI,OAAO,OAAW;MAAE,IAAI,UAAU,KAAK,EAAE,YAAY,QAAQ,CAAC;MAAG,IAAI,IAAI;MAAG,IAAI,QAAQ;MAAG;KAAO;KACtG,OAAO,KAAK,MAAM;IACpB;IACA,IAAI;IACJ,IAAI;KACF,MAAM,SAAkB,KAAK,MAAM,OAAO,OAAO,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC;KACzE,IAAI,CAAC,UAAU,OAAO,WAAW,YAAY,MAAM,QAAQ,MAAM,GAAG,MAAM,IAAI,MAAM;KACpF,UAAU;IACZ,QAAQ;KAAE,IAAI,UAAU,GAAG;KAAG,IAAI,IAAI;KAAG;IAAO;IAChD,IAAI,QAAQ,SAAS,oBAAoB,QAAQ,WAAW,YAAY,OAAO,QAAQ,UAAU,UAAU;KACzG,IAAI,UAAU,GAAG;KAAG,IAAI,IAAI;KAAG;IACjC;IACA,MAAM,MAAM,MAAM,KAAK,UAAU,QAAQ,SAAS,WAAW,MAAM;IACnE,MAAM,SAAS,IAAI,KAAK,MAAM;KAAE,GAAG;KAAK,OAAO;MAAE,SAAS,CAAC;MAAG,GAAG,IAAI;KAAM;IAAE;IAC7E,IAAI,CAAC,IAAI,WAAW;KAClB,IAAI,UAAU,KAAK;MAAE,gBAAgB;MAAoB,iBAAiB;KAAW,CAAC;KACtF,IAAI,IAAI,KAAK,UAAU;MAAE,MAAM;MAAmB,OAAO,QAAQ;MAAO;KAAO,CAAC,CAAC;IACnF;GACF,QAAQ;IACN,IAAI,CAAC,IAAI,WAAW;KAAE,IAAI,UAAU,GAAG;KAAG,IAAI,IAAI,oBAAoB;IAAE;GAC1E;EACF;CAAE,CAAC;AACL"}
+{"version":3,"file":"host-rpc.js","names":[],"sources":["../src/host-rpc.ts"],"sourcesContent":["import type { IncomingMessage, ServerResponse } from 'node:http'\nimport type { RpcResult } from './contracts.ts'\n\nexport interface HostRpcContext {\n  webServer: { register(route: { kind: 'prefix'; path: string; handler(req: IncomingMessage, res: ServerResponse): void | Promise<void> }): () => void }\n  connection: { requestRejection?: (request: IncomingMessage) => number | undefined }\n}\n\ntype Rejection = { status: number; body?: string }\n\nexport interface HostRpcTransportOptions {\n  maxBodyBytes?: number\n  isEndpoint?: (endpoint: string) => boolean\n  caseInsensitiveContentType?: boolean\n  emptyBodyAsNull?: boolean\n  beforeBody?: (request: IncomingMessage, endpoint: string) => Rejection | undefined\n  errorBody?: (status: number, error?: unknown) => string | undefined\n}\n\nexport interface HostRpcOptions extends HostRpcTransportOptions {\n  requirePayload?: boolean\n}\n\n/** The shared authenticated HTTP boundary. Each plugin still owns its RPC envelope semantics. */\nexport function registerHostRpcTransport(\n  ctx: HostRpcContext,\n  channel: string,\n  dispatch: (endpoint: string, body: unknown, signal: AbortSignal, response: ServerResponse) => void | Promise<void>,\n  options: HostRpcTransportOptions = {},\n): () => void {\n  const bodyLimit = options.maxBodyBytes ?? 64 * 1024\n  if (!Number.isSafeInteger(bodyLimit) || bodyLimit <= 0) throw new Error('Invalid RPC body limit')\n  const isEndpoint = options.isEndpoint ?? ((endpoint: string) => /^[a-z.]+$/.test(endpoint))\n  return ctx.webServer.register({ kind: 'prefix', path: channel, handler: async (req, res) => {\n    const reject = (status: number, error?: unknown, override?: string) => {\n      if (res.destroyed) return\n      if (status === 413) res.writeHead(status, { connection: 'close' })\n      else res.writeHead(status)\n      res.end(override ?? options.errorBody?.(status, error) ?? (status === 500 ? 'rpc request failed' : ''))\n    }\n    try {\n      // Host admission always runs before plugin-specific checks or body reads.\n      if (typeof ctx.connection.requestRejection !== 'function') { reject(503); return }\n      const rejection = ctx.connection.requestRejection(req)\n      if (rejection !== undefined) { reject(rejection); return }\n      const pathname = new URL(req.url ?? '/', 'http://dsh.internal').pathname\n      const endpoint = pathname.startsWith(`${channel}/`) ? pathname.slice(channel.length + 1) : ''\n      if (req.method !== 'POST' || !isEndpoint(endpoint)) { reject(404); return }\n      const contentType = String(req.headers['content-type'] ?? '').split(';', 1)[0]?.trim()\n      if ((options.caseInsensitiveContentType ? contentType.toLowerCase() : contentType) !== 'application/json') {\n        reject(415); return\n      }\n      const guarded = options.beforeBody?.(req, endpoint)\n      if (guarded) { reject(guarded.status, undefined, guarded.body); return }\n\n      const controller = new AbortController()\n      res.on('close', () => { if (!res.writableEnded) controller.abort() })\n      const chunks: Buffer[] = []\n      let size = 0\n      for await (const chunk of req) {\n        const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)\n        size += buffer.length\n        if (size > bodyLimit) { reject(413); req.destroy(); return }\n        chunks.push(buffer)\n      }\n      let body: unknown\n      try { body = JSON.parse(Buffer.concat(chunks).toString('utf8') || (options.emptyBodyAsNull ? 'null' : '')) }\n      catch { reject(400); return }\n      await dispatch(endpoint, body, controller.signal, res)\n    } catch (error) {\n      reject(500, error)\n    }\n  } })\n}\n\n/** Write the native Connection response envelope after a plugin has handled a request. */\nexport function sendHostRpcResponse(response: ServerResponse, rpcId: string, result: unknown, noStore = true): void {\n  if (response.destroyed) return\n  response.writeHead(200, { 'content-type': 'application/json', ...(noStore ? { 'cache-control': 'no-store' } : {}) })\n  response.end(JSON.stringify({ type: 'server-response', rpcId, result }))\n}\n\n/** Safe host RPC registration. Missing requestRejection fails closed. */\nexport function registerHostRpc<R extends RpcResult = RpcResult>(\n  ctx: HostRpcContext,\n  channel: string,\n  call: (endpoint: string, payload: unknown, signal: AbortSignal) => Promise<R>,\n  options: HostRpcOptions = {},\n): () => void {\n  return registerHostRpcTransport(ctx, channel, async (endpoint, body, signal, res) => {\n    if (!body || typeof body !== 'object' || Array.isArray(body)) { res.writeHead(400); res.end(); return }\n    const request = body as Record<string, unknown>\n    if (request.type !== 'client-request' || request.method !== endpoint || typeof request.rpcId !== 'string'\n      || (options.requirePayload && !Object.hasOwn(request, 'payload'))) {\n      res.writeHead(400); res.end(); return\n    }\n    const raw = await call(endpoint, request.payload, signal)\n    const result = raw.ok ? raw : { ...raw, error: { details: {}, ...raw.error } }\n    sendHostRpcResponse(res, request.rpcId, result)\n  }, options)\n}\n"],"mappings":"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"}

package/lib/index.d.ts

@@ -1,4 +1,5 @@
-import { AiFeatureScope, AiPolicy, AiServices, AuxiliaryRequest, AuxiliaryResult, CHAT_EVENTS_SLOT, ContextKnowledge, EvidenceRef, KnowledgeKind, KnowledgeScope, MemoryMutationOptions, MemoryQuery, MemoryRecord, MemoryService, ModelRole, ModelRoute, ModelTarget, NewMemoryRecord, ProcedureKnowledge, ProducerMessageSource, ProducerSourceKind, PurposeSpec, ResolvedRoute, RpcResult, SubagentSessionLike, TaskCheckpoint, TaskContract, UsageReceipt, isSubagentSession, producerMessageSource, projectIdFromCwd } from "./contracts.js";
+import { CHAT_EVENTS_SLOT, CREATOR_PRESET_ID, ContextKnowledge, DshWebManagementDescriptor, EvidenceRef, KnowledgeKind, KnowledgeScope, MODEL_SETTINGS_CHANGES_REMOTE, MemoryMutationOptions, MemoryQuery, MemoryRecord, MemoryService, ModelRoute, NewMemoryRecord, ProcedureKnowledge, ProducerMessageSource, ProducerSourceKind, RpcResult, SubagentSessionLike, TaskCheckpoint, TaskContract, WEB_PROVIDER_AVAILABILITY_EVENT, isSubagentSession, producerMessageSource, projectIdFromCwd } from "./contracts.js";
+import { openCompatibleDomain } from "./domain.js";
 import { HostRpcContext, registerHostRpc } from "./host-rpc.js";
 import { FeatureModelRoute, LlmTextCaller, callLlmText, resolveFeatureModel } from "./llm-call.js";
-export { type AiFeatureScope, type AiPolicy, type AiServices, type AuxiliaryRequest, type AuxiliaryResult, CHAT_EVENTS_SLOT, type ContextKnowledge, type EvidenceRef, type FeatureModelRoute, type HostRpcContext, type KnowledgeKind, type KnowledgeScope, type LlmTextCaller, type MemoryMutationOptions, type MemoryQuery, type MemoryRecord, type MemoryService, type ModelRole, type ModelRoute, type ModelTarget, type NewMemoryRecord, type ProcedureKnowledge, type ProducerMessageSource, type ProducerSourceKind, type PurposeSpec, type ResolvedRoute, type RpcResult, type SubagentSessionLike, type TaskCheckpoint, type TaskContract, type UsageReceipt, callLlmText, type isSubagentSession, producerMessageSource, projectIdFromCwd, registerHostRpc, resolveFeatureModel };
+export { CHAT_EVENTS_SLOT, type CREATOR_PRESET_ID, type ContextKnowledge, type DshWebManagementDescriptor, type EvidenceRef, type FeatureModelRoute, type HostRpcContext, type KnowledgeKind, type KnowledgeScope, type LlmTextCaller, type MODEL_SETTINGS_CHANGES_REMOTE, type MemoryMutationOptions, type MemoryQuery, type MemoryRecord, type MemoryService, type ModelRoute, type NewMemoryRecord, type ProcedureKnowledge, type ProducerMessageSource, type ProducerSourceKind, type RpcResult, type SubagentSessionLike, type TaskCheckpoint, type TaskContract, type WEB_PROVIDER_AVAILABILITY_EVENT, callLlmText, type isSubagentSession, openCompatibleDomain, producerMessageSource, projectIdFromCwd, registerHostRpc, resolveFeatureModel };

package/lib/index.js

@@ -1,4 +1,5 @@
 import { CHAT_EVENTS_SLOT, producerMessageSource, projectIdFromCwd } from "./contracts.js";
 import { registerHostRpc } from "./host-rpc.js";
+import { openCompatibleDomain } from "./domain.js";
 import { callLlmText, resolveFeatureModel } from "./llm-call.js";
-export { CHAT_EVENTS_SLOT, callLlmText, producerMessageSource, projectIdFromCwd, registerHostRpc, resolveFeatureModel };
+export { CHAT_EVENTS_SLOT, callLlmText, openCompatibleDomain, producerMessageSource, projectIdFromCwd, registerHostRpc, resolveFeatureModel };

package/lib/llm-call.d.ts

@@ -27,7 +27,11 @@ interface LlmTextResult {
   inputTokens?: number;
   outputTokens?: number;
 }
-/** Plugin selection first; otherwise the live session model, then the host default. */
+/**
+ * Plugin selection first; otherwise the live session model, then the host default.
+ * Cordis callers must declare agents, sessionProjections and agentDefaultModel
+ * in their inject list so the fallback reads use the caller's live services.
+ */
 declare function resolveFeatureModel(host: unknown, saved: FeatureModelRoute | undefined, sessionId?: string): FeatureModelRoute | undefined;
 /** One native model call. No retry, timeout policy, or provider queue. */
 declare function callLlmText(llm: LlmTextCaller, request: LlmTextRequest): Promise<LlmTextResult>;

package/lib/llm-call.js

@@ -14,7 +14,11 @@ function routeOf(value) {
 		model: value.model.trim()
 	};
 }
-/** Plugin selection first; otherwise the live session model, then the host default. */
+/**
+* Plugin selection first; otherwise the live session model, then the host default.
+* Cordis callers must declare agents, sessionProjections and agentDefaultModel
+* in their inject list so the fallback reads use the caller's live services.
+*/
 function resolveFeatureModel(host, saved, sessionId) {
 	const explicit = routeOf(saved);
 	if (explicit) return explicit;

package/lib/llm-call.js.map

@@ -1 +1 @@
-{"version":3,"file":"llm-call.js","names":[],"sources":["../src/llm-call.ts"],"sourcesContent":["import {\n  BlockAssembler, ReasoningEffortId, createUserMessage,\n  type GenerateOptions, type LlmRuntime, type StreamChunk,\n} from '@deepseek-ai/dsh-llm'\nimport { producerMessageSource, type ModelRoute } from './contracts.ts'\n\n/** A feature's own saved model. Empty means the host default chat model. */\nexport interface FeatureModelRoute {\n  readonly provider: string\n  readonly model: string\n  readonly reasoningEffort?: string\n}\n\nexport type LlmTextCaller = Pick<LlmRuntime, 'prepareCall' | 'resolveCallConfig'>\n\nexport interface LlmTextRequest {\n  plugin: string\n  route: FeatureModelRoute\n  system: string\n  text: string\n  maxTokens: number\n  signal: AbortSignal\n  sessionId?: string\n  /** Auxiliary-call marker adapters may special-case (e.g. disable thinking for titles). */\n  purpose?: GenerateOptions['purpose']\n  /** Rechecked before the call returns text. A false result discards the output. */\n  isCurrent?: () => boolean\n}\n\nexport interface LlmTextResult {\n  text: string\n  provider: string\n  model: string\n  inputTokens?: number\n  outputTokens?: number\n}\n\ntype SessionModelsHost = {\n  agents?: { get(sessionId: string): { session?: { requestHeader?: () => { config?: ModelRoute; adapterDefaults?: { reasoningEffort?: unknown } } | undefined } } | undefined }\n  sessionProjections?: { stateOf(session: unknown, key: string): { pending?: ModelRoute | null } | undefined }\n  agentDefaultModel?: { currentSelection(): ModelRoute | undefined }\n}\n\nfunction routeOf(value: { provider?: unknown; model?: unknown; reasoningEffort?: unknown } | undefined): FeatureModelRoute | undefined {\n  if (typeof value?.provider !== 'string' || !value.provider.trim()) return undefined\n  if (typeof value.model !== 'string' || !value.model.trim()) return undefined\n  const effort = typeof value.reasoningEffort === 'string' ? value.reasoningEffort.trim() : ''\n  return effort\n    ? { provider: value.provider.trim(), model: value.model.trim(), reasoningEffort: effort }\n    : { provider: value.provider.trim(), model: value.model.trim() }\n}\n\n/** Plugin selection first; otherwise the live session model, then the host default. */\nexport function resolveFeatureModel(host: unknown, saved: FeatureModelRoute | undefined, sessionId?: string): FeatureModelRoute | undefined {\n  const explicit = routeOf(saved)\n  if (explicit) return explicit\n  const face = host as SessionModelsHost | undefined\n  if (sessionId && face?.agents && face.sessionProjections) {\n    const session = face.agents.get(sessionId)?.session\n    if (session) {\n      try {\n        const pending = face.sessionProjections.stateOf(session, 'modelSelection')?.pending\n        const selected = routeOf(pending ?? undefined)\n        if (selected) return selected\n      } catch { /* fall through to the recorded route */ }\n      const header = session.requestHeader?.()\n      const recorded = header?.config\n      if (recorded) {\n        const selected = header?.adapterDefaults?.reasoningEffort === true\n          ? { provider: recorded.provider, model: recorded.model }\n          : recorded\n        const route = routeOf(selected)\n        if (route) return route\n      }\n    }\n  }\n  return routeOf(face?.agentDefaultModel?.currentSelection())\n}\n\nfunction joinText(assembler: BlockAssembler): string {\n  return assembler.blocks()\n    .filter((block): block is { type: 'text'; text: string } => block.type === 'text')\n    .map(block => block.text)\n    .join('')\n}\n\nasync function readStream(stream: AsyncIterable<StreamChunk>, signal: AbortSignal, live: () => boolean): Promise<BlockAssembler> {\n  const assembler = new BlockAssembler()\n  const iterator = stream[Symbol.asyncIterator]()\n  try {\n    while (live()) {\n      if (signal.aborted) break\n      const item = await iterator.next()\n      if (item.done) break\n      assembler.push(item.value)\n    }\n  } finally {\n    try { const closing = iterator.return?.(); if (closing) void closing.catch(() => {}) } catch { /* producer ignored abort */ }\n  }\n  return assembler\n}\n\n/** One native model call. No retry, timeout policy, or provider queue. */\nexport async function callLlmText(llm: LlmTextCaller, request: LlmTextRequest): Promise<LlmTextResult> {\n  request.signal.throwIfAborted()\n  const live = () => request.isCurrent?.() !== false && !request.signal.aborted\n  if (!live()) throw Object.assign(new Error('调用已取消。'), { name: 'AbortError' })\n  const effort = request.route.reasoningEffort?.trim()\n  const prepared = await llm.prepareCall({\n    provider: request.route.provider,\n    model: request.route.model,\n    ...(effort ? { reasoningEffort: ReasoningEffortId(effort) } : {}),\n    maxTokens: request.maxTokens,\n  }, request.signal)\n  if (!live()) throw Object.assign(new Error('调用已取消。'), { name: 'AbortError' })\n  const options: GenerateOptions = {\n    provider: prepared.config.provider,\n    model: prepared.config.model,\n    ...(prepared.config.reasoningEffort ? { reasoningEffort: prepared.config.reasoningEffort } : {}),\n    ...(prepared.config.maxTokens !== undefined ? { maxTokens: Math.min(request.maxTokens, prepared.config.maxTokens) } : { maxTokens: request.maxTokens }),\n    ...(prepared.config.temperature !== undefined ? { temperature: prepared.config.temperature } : {}),\n    ...(prepared.config.stop ? { stop: [...prepared.config.stop] } : {}),\n    system: request.system,\n    messages: [createUserMessage({\n      source: producerMessageSource(request.plugin),\n      content: [{ type: 'text', text: request.text }],\n    })],\n    signal: request.signal,\n    ...(request.purpose ? { purpose: request.purpose } : {}),\n    ...(request.sessionId ? { sessionId: request.sessionId as GenerateOptions['sessionId'] } : {}),\n  }\n  const assembler = await readStream(prepared.stream(options), request.signal, live)\n  if (request.signal.aborted || assembler.finish.kind === 'aborted') {\n    throw Object.assign(new Error('调用已取消。'), { name: 'AbortError' })\n  }\n  if (!live()) throw Object.assign(new Error('调用已取消。'), { name: 'AbortError' })\n  if (assembler.finish.kind === 'error') {\n    const code = assembler.finish.failure.code\n    throw Object.assign(new Error(assembler.finish.failure.message || '模型调用失败。'), { code })\n  }\n  if (assembler.blocks().some(block => block.type === 'tool-call') || assembler.finish.kind === 'tool-calls') {\n    throw new Error('这次调用不使用工具。')\n  }\n  if (assembler.finish.kind !== 'stop') throw new Error('模型调用未完成。')\n  return {\n    text: joinText(assembler),\n    provider: prepared.config.provider,\n    model: prepared.config.model,\n    ...(assembler.usage ? { inputTokens: assembler.usage.inputTokens, outputTokens: assembler.usage.outputTokens } : {}),\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"llm-call.js","names":[],"sources":["../src/llm-call.ts"],"sourcesContent":["import {\n  BlockAssembler, ReasoningEffortId, createUserMessage,\n  type GenerateOptions, type LlmRuntime, type StreamChunk,\n} from '@deepseek-ai/dsh-llm'\nimport { producerMessageSource, type ModelRoute } from './contracts.ts'\n\n/** A feature's own saved model. Empty means the host default chat model. */\nexport interface FeatureModelRoute {\n  readonly provider: string\n  readonly model: string\n  readonly reasoningEffort?: string\n}\n\nexport type LlmTextCaller = Pick<LlmRuntime, 'prepareCall' | 'resolveCallConfig'>\n\nexport interface LlmTextRequest {\n  plugin: string\n  route: FeatureModelRoute\n  system: string\n  text: string\n  maxTokens: number\n  signal: AbortSignal\n  sessionId?: string\n  /** Auxiliary-call marker adapters may special-case (e.g. disable thinking for titles). */\n  purpose?: GenerateOptions['purpose']\n  /** Rechecked before the call returns text. A false result discards the output. */\n  isCurrent?: () => boolean\n}\n\nexport interface LlmTextResult {\n  text: string\n  provider: string\n  model: string\n  inputTokens?: number\n  outputTokens?: number\n}\n\ntype SessionModelsHost = {\n  agents?: { get(sessionId: string): { session?: { requestHeader?: () => { config?: ModelRoute; adapterDefaults?: { reasoningEffort?: unknown } } | undefined } } | undefined }\n  sessionProjections?: { stateOf(session: unknown, key: string): { pending?: ModelRoute | null } | undefined }\n  agentDefaultModel?: { currentSelection(): ModelRoute | undefined }\n}\n\nfunction routeOf(value: { provider?: unknown; model?: unknown; reasoningEffort?: unknown } | undefined): FeatureModelRoute | undefined {\n  if (typeof value?.provider !== 'string' || !value.provider.trim()) return undefined\n  if (typeof value.model !== 'string' || !value.model.trim()) return undefined\n  const effort = typeof value.reasoningEffort === 'string' ? value.reasoningEffort.trim() : ''\n  return effort\n    ? { provider: value.provider.trim(), model: value.model.trim(), reasoningEffort: effort }\n    : { provider: value.provider.trim(), model: value.model.trim() }\n}\n\n/**\n * Plugin selection first; otherwise the live session model, then the host default.\n * Cordis callers must declare agents, sessionProjections and agentDefaultModel\n * in their inject list so the fallback reads use the caller's live services.\n */\nexport function resolveFeatureModel(host: unknown, saved: FeatureModelRoute | undefined, sessionId?: string): FeatureModelRoute | undefined {\n  const explicit = routeOf(saved)\n  if (explicit) return explicit\n  const face = host as SessionModelsHost | undefined\n  if (sessionId && face?.agents && face.sessionProjections) {\n    const session = face.agents.get(sessionId)?.session\n    if (session) {\n      try {\n        const pending = face.sessionProjections.stateOf(session, 'modelSelection')?.pending\n        const selected = routeOf(pending ?? undefined)\n        if (selected) return selected\n      } catch { /* fall through to the recorded route */ }\n      const header = session.requestHeader?.()\n      const recorded = header?.config\n      if (recorded) {\n        const selected = header?.adapterDefaults?.reasoningEffort === true\n          ? { provider: recorded.provider, model: recorded.model }\n          : recorded\n        const route = routeOf(selected)\n        if (route) return route\n      }\n    }\n  }\n  return routeOf(face?.agentDefaultModel?.currentSelection())\n}\n\nfunction joinText(assembler: BlockAssembler): string {\n  return assembler.blocks()\n    .filter((block): block is { type: 'text'; text: string } => block.type === 'text')\n    .map(block => block.text)\n    .join('')\n}\n\nasync function readStream(stream: AsyncIterable<StreamChunk>, signal: AbortSignal, live: () => boolean): Promise<BlockAssembler> {\n  const assembler = new BlockAssembler()\n  const iterator = stream[Symbol.asyncIterator]()\n  try {\n    while (live()) {\n      if (signal.aborted) break\n      const item = await iterator.next()\n      if (item.done) break\n      assembler.push(item.value)\n    }\n  } finally {\n    try { const closing = iterator.return?.(); if (closing) void closing.catch(() => {}) } catch { /* producer ignored abort */ }\n  }\n  return assembler\n}\n\n/** One native model call. No retry, timeout policy, or provider queue. */\nexport async function callLlmText(llm: LlmTextCaller, request: LlmTextRequest): Promise<LlmTextResult> {\n  request.signal.throwIfAborted()\n  const live = () => request.isCurrent?.() !== false && !request.signal.aborted\n  if (!live()) throw Object.assign(new Error('调用已取消。'), { name: 'AbortError' })\n  const effort = request.route.reasoningEffort?.trim()\n  const prepared = await llm.prepareCall({\n    provider: request.route.provider,\n    model: request.route.model,\n    ...(effort ? { reasoningEffort: ReasoningEffortId(effort) } : {}),\n    maxTokens: request.maxTokens,\n  }, request.signal)\n  if (!live()) throw Object.assign(new Error('调用已取消。'), { name: 'AbortError' })\n  const options: GenerateOptions = {\n    provider: prepared.config.provider,\n    model: prepared.config.model,\n    ...(prepared.config.reasoningEffort ? { reasoningEffort: prepared.config.reasoningEffort } : {}),\n    ...(prepared.config.maxTokens !== undefined ? { maxTokens: Math.min(request.maxTokens, prepared.config.maxTokens) } : { maxTokens: request.maxTokens }),\n    ...(prepared.config.temperature !== undefined ? { temperature: prepared.config.temperature } : {}),\n    ...(prepared.config.stop ? { stop: [...prepared.config.stop] } : {}),\n    system: request.system,\n    messages: [createUserMessage({\n      source: producerMessageSource(request.plugin),\n      content: [{ type: 'text', text: request.text }],\n    })],\n    signal: request.signal,\n    ...(request.purpose ? { purpose: request.purpose } : {}),\n    ...(request.sessionId ? { sessionId: request.sessionId as GenerateOptions['sessionId'] } : {}),\n  }\n  const assembler = await readStream(prepared.stream(options), request.signal, live)\n  if (request.signal.aborted || assembler.finish.kind === 'aborted') {\n    throw Object.assign(new Error('调用已取消。'), { name: 'AbortError' })\n  }\n  if (!live()) throw Object.assign(new Error('调用已取消。'), { name: 'AbortError' })\n  if (assembler.finish.kind === 'error') {\n    const code = assembler.finish.failure.code\n    throw Object.assign(new Error(assembler.finish.failure.message || '模型调用失败。'), { code })\n  }\n  if (assembler.blocks().some(block => block.type === 'tool-call') || assembler.finish.kind === 'tool-calls') {\n    throw new Error('这次调用不使用工具。')\n  }\n  if (assembler.finish.kind !== 'stop') throw new Error('模型调用未完成。')\n  return {\n    text: joinText(assembler),\n    provider: prepared.config.provider,\n    model: prepared.config.model,\n    ...(assembler.usage ? { inputTokens: assembler.usage.inputTokens, outputTokens: assembler.usage.outputTokens } : {}),\n  }\n}\n"],"mappings":"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"}

package/lib/model-menu.d.ts

@@ -1,42 +1,9 @@
-import { ModelRoute } from "./contracts.js";
+import { ModelCatalogClient, ModelCatalogClient as ModelCatalogClient$1, ModelMenuChoice, ModelMenuChoice as ModelMenuChoice$1, ModelMenuGroup, ModelRoute, groupModelMenuChoices, knownModelFromChoices, modelMenuEffortLabel, modelMenuEffortOptions, modelMenuShortName, modelRouteKey as modelMenuChoiceKey, modelRouteOverride as modelMenuOverride, normalizeModelRoute as normalizeModelMenuRoute, parseModelMenuChoices, parseModelRouteKey as parseModelMenuChoiceKey } from "@klarkxy/dsh-model-route";
 //#region src/model-menu.d.ts
-/** One selectable model. `efforts` are the advertised reasoning efforts. */
-interface ModelMenuChoice {
-  readonly provider: string;
-  readonly model: string;
-  readonly label: string;
-  readonly efforts: ReadonlyArray<{
-    id: string;
-    name: string;
-  }>;
-}
 /** The stored selection. Empty provider/model means "follow the default". */
 type ModelMenuRoute = ModelRoute;
-/** The catalog face this helper needs; stays structural so hosts may add more. */
-interface ModelCatalogClient {
-  readonly remote?: {
-    readonly session?: {
-      readonly modelCatalog?: () => Promise<unknown>;
-    };
-  };
-}
-declare function modelMenuChoiceKey(provider: string, model: string): string;
-declare function parseModelMenuChoiceKey(value: string): {
-  provider: string;
-  model: string;
-} | undefined;
-/** Parse the host session catalog into flat choices, keeping a saved route selectable. */
-declare function parseModelMenuChoices(value: unknown, bound?: ModelMenuRoute): ModelMenuChoice[];
-/** An empty saved route means no explicit model. */
-declare function modelMenuOverride(route: ModelMenuRoute | undefined): ModelRoute | undefined;
-declare function normalizeModelMenuRoute(value: unknown): ModelMenuRoute;
 /** Load the host catalog once per mount and republish whenever it answers. */
-declare function useModelMenuChoices(client: ModelCatalogClient, bound?: ModelMenuRoute): ModelMenuChoice[];
-/** Reasoning-effort options for one choice; the saved value stays selectable. */
-declare function modelMenuEffortOptions(choice: ModelMenuChoice | undefined, current?: string): Array<{
-  id: string;
-  name: string;
-}>;
+declare function useModelMenuChoices(client: ModelCatalogClient$1, bound?: ModelMenuRoute): ModelMenuChoice$1[];
 //#endregion
-export { ModelCatalogClient, ModelMenuChoice, ModelMenuRoute, modelMenuChoiceKey, modelMenuEffortOptions, modelMenuOverride, normalizeModelMenuRoute, parseModelMenuChoiceKey, parseModelMenuChoices, useModelMenuChoices };
+export { type ModelCatalogClient, type ModelMenuChoice, type ModelMenuGroup, ModelMenuRoute, groupModelMenuChoices, knownModelFromChoices, modelMenuChoiceKey, modelMenuEffortLabel, modelMenuEffortOptions, modelMenuOverride, modelMenuShortName, normalizeModelMenuRoute, parseModelMenuChoiceKey, parseModelMenuChoices, useModelMenuChoices };
 //# sourceMappingURL=model-menu.d.ts.map

package/lib/model-menu.js

@@ -1,118 +1,18 @@
 import { useEffect, useState } from "react";
+import { groupModelMenuChoices, knownModelFromChoices, modelMenuEffortLabel, modelMenuEffortOptions, modelMenuShortName, modelRouteKey as modelMenuChoiceKey, modelRouteOverride as modelMenuOverride, normalizeModelRoute as normalizeModelMenuRoute, parseModelMenuChoices, parseModelMenuChoices as parseModelMenuChoices$1, parseModelRouteKey as parseModelMenuChoiceKey } from "@klarkxy/dsh-model-route";
 //#region src/model-menu.ts
 /**
 * Shared plugin-page model menu.
 *
-* A feature plugin's own settings row exposes a model select. An empty
-* selection means the host default chat model for that feature's own call.
-*
-* Browser-safe and React-optional: pure helpers live here so hosts and clients
-* share one catalog contract without bundling React into the host build.
+* Everything lives in @klarkxy/dsh-model-route: the pure contract (route
+* values, schema marker, catalog parsing, menu grouping) in its core entry,
+* and the ModelMenu popover component in its `./ui` browser entry. This entry
+* re-exports the core so existing plugin-kit consumers keep working, and adds
+* the React catalog hook on top. It must stay free of any ui-primitives
+* import so host-side and node-test consumers never load the component
+* bundle — the popover component and its styles live in
+* `@klarkxy/dsh-model-route/ui`.
 */
-const KEY_SEPARATOR = "";
-function modelMenuChoiceKey(provider, model) {
-	return provider && model ? `${provider}${KEY_SEPARATOR}${model}` : "";
-}
-function parseModelMenuChoiceKey(value) {
-	const index = value.indexOf(KEY_SEPARATOR);
-	if (index <= 0) return void 0;
-	const provider = value.slice(0, index);
-	const model = value.slice(index + 1);
-	if (!provider || !model) return void 0;
-	return {
-		provider,
-		model
-	};
-}
-function asRecord(value) {
-	return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
-}
-function asText(value) {
-	return typeof value === "string" && value.trim() ? value.trim() : void 0;
-}
-function parseEffort(value) {
-	const row = asRecord(value);
-	const id = row ? asText(row.id) : void 0;
-	if (!id) return void 0;
-	return {
-		id,
-		name: row ? asText(row.name) ?? id : id
-	};
-}
-/** Parse the host session catalog into flat choices, keeping a saved route selectable. */
-function parseModelMenuChoices(value, bound) {
-	const envelope = asRecord(value);
-	const root = (envelope && envelope.ok === true ? asRecord(envelope.value) : void 0) ?? envelope ?? {};
-	const groups = Array.isArray(root.groups) ? root.groups : [];
-	const choices = [];
-	for (const group of groups) {
-		const groupRow = asRecord(group);
-		const provider = groupRow ? asText(groupRow.id) : void 0;
-		if (!provider || !groupRow || !Array.isArray(groupRow.models)) continue;
-		const providerName = asText(groupRow.name) ?? provider;
-		for (const entry of groupRow.models) {
-			const modelRow = asRecord(entry);
-			const model = modelRow ? asText(modelRow.id) : void 0;
-			if (!model || !modelRow) continue;
-			const name = asText(modelRow.name) ?? model;
-			const reasoning = asRecord(modelRow.reasoning);
-			const efforts = reasoning && Array.isArray(reasoning.efforts) ? reasoning.efforts.flatMap((effort) => {
-				const parsed = parseEffort(effort);
-				return parsed ? [parsed] : [];
-			}) : [];
-			choices.push({
-				provider,
-				model,
-				label: `${providerName} / ${name}`,
-				efforts
-			});
-		}
-	}
-	if (bound?.provider && bound.model && !choices.some((item) => item.provider === bound.provider && item.model === bound.model)) choices.push({
-		provider: bound.provider,
-		model: bound.model,
-		label: `${bound.provider} / ${bound.model}`,
-		efforts: []
-	});
-	return choices;
-}
-/** An empty saved route means no explicit model. */
-function modelMenuOverride(route) {
-	const provider = route?.provider?.trim();
-	const model = route?.model?.trim();
-	if (!provider || !model) return void 0;
-	const effort = route?.reasoningEffort?.trim();
-	return effort ? {
-		provider,
-		model,
-		reasoningEffort: effort
-	} : {
-		provider,
-		model
-	};
-}
-function normalizeModelMenuRoute(value) {
-	const row = asRecord(value);
-	if (!row) return {
-		provider: "",
-		model: ""
-	};
-	const provider = asText(row.provider) ?? "";
-	const model = asText(row.model) ?? "";
-	const effort = asText(row.reasoningEffort);
-	if (!provider || !model || provider.length > 250 || model.length > 250) return {
-		provider: "",
-		model: ""
-	};
-	return effort && effort.length <= 80 ? {
-		provider,
-		model,
-		reasoningEffort: effort
-	} : {
-		provider,
-		model
-	};
-}
 /** Load the host catalog once per mount and republish whenever it answers. */
 function useModelMenuChoices(client, bound) {
 	const [choices, setChoices] = useState([]);
@@ -121,7 +21,7 @@ function useModelMenuChoices(client, bound) {
 		let live = true;
 		const load = () => {
 			client.remote?.session?.modelCatalog?.()?.then((value) => {
-				if (live) setChoices(parseModelMenuChoices(value, bound));
+				if (live) setChoices(parseModelMenuChoices$1(value, bound));
 			}).catch(() => {
 				if (live) setChoices([]);
 			});
@@ -137,16 +37,7 @@ function useModelMenuChoices(client, bound) {
 	]);
 	return choices;
 }
-/** Reasoning-effort options for one choice; the saved value stays selectable. */
-function modelMenuEffortOptions(choice, current) {
-	const listed = (choice?.efforts ?? []).map((item) => ({ ...item }));
-	if (current && !listed.some((item) => item.id === current)) listed.push({
-		id: current,
-		name: current
-	});
-	return listed;
-}
 //#endregion
-export { modelMenuChoiceKey, modelMenuEffortOptions, modelMenuOverride, normalizeModelMenuRoute, parseModelMenuChoiceKey, parseModelMenuChoices, useModelMenuChoices };
+export { groupModelMenuChoices, knownModelFromChoices, modelMenuChoiceKey, modelMenuEffortLabel, modelMenuEffortOptions, modelMenuOverride, modelMenuShortName, normalizeModelMenuRoute, parseModelMenuChoiceKey, parseModelMenuChoices, useModelMenuChoices };
 
 //# sourceMappingURL=model-menu.js.map