@klarkxy/dsh-model-picker 0.1.0 → 0.1.1

package/lib/client.inner.cjs

@@ -1070,6 +1070,281 @@ var EffortPreference = class {
 	}
 };
 //#endregion
+//#region ../dsh-plugin-kit/src/log-shared.ts
+const PLUGIN_LOG_LEVELS = [
+	"debug",
+	"info",
+	"warn",
+	"error",
+	"fault"
+];
+const DEFAULT_PLUGIN_LOG_LEVEL = "info";
+const PLUGIN_LOG_MAX_MESSAGE_CHARS = 16e3;
+const SOURCE_RE = /^[a-z][a-z0-9-]{0,63}$/;
+const EVENT_RE = /^[a-z][a-z0-9._-]{0,127}$/;
+const CONTEXT_KEY_RE = /^[a-zA-Z][a-zA-Z0-9._-]{0,63}$/;
+const SECRET_KEY_RE = /(?:api[_-]?key|access[_-]?token|refresh[_-]?token|bearer|authorization|cookie|set[_-]?cookie|nonce|credential|private[_-]?key|password|secret|app[_-]?secret|client[_-]?secret|z_c0|d_c0)$/i;
+const CHAT_PAYLOAD_RE = /"role"\s*:\s*"(?:system|user|assistant|tool)"|"(?:messages|content|prompt|input_text|input_image|image_url)"\s*:\s*[\[{"']/i;
+const CREDENTIAL_BODY_RE = /-----BEGIN (?:RSA |EC |OPENSSH |PRIVATE )?PRIVATE KEY-----|"type"\s*:\s*"service_account"|credentials\.json|\.dsh[/\\](?:credentials|auth)/i;
+const AUTH_HEADER_RE = /\b(Authorization|Proxy-Authorization|Cookie|Set-Cookie)\s*:\s*[^\r\n]*/gi;
+const BEARER_RE = /\bBearer\s+[A-Za-z0-9._\-+=/]{8,}/g;
+const SECRET_FIELD_RE = /(["']?(?:api[_-]?key|access[_-]?token|refresh[_-]?token|token|bearer|authorization|cookie|set-cookie|nonce|credential|private[_-]?key|password|secret|app[_-]?secret|client[_-]?secret|password|z_c0|d_c0)["']?\s*[:=]\s*)(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[^\s,&;}]+)/gi;
+const SECRET_QUERY_RE = /([?&](?:token|api[_-]?key|key|secret|password|bootstrap|code|sig|signature|credential|password)=)[^\s&#"']+/gi;
+const URL_CREDENTIAL_RE = /\b(https?:\/\/)[^\s/:@]+:[^\s/@]+@/gi;
+const BOOTSTRAP_RE = /\/bootstrap\/[^\s"'?&#]+/gi;
+const KNOWN_TOKEN_RE = /\b(?:sk-[A-Za-z0-9_-]{10,}|gh[pousr]_[A-Za-z0-9_]{16,}|github_pat_[A-Za-z0-9_]{20,}|tvly-[A-Za-z0-9_-]{10,}|AKIA[0-9A-Z]{16})\b/g;
+const PATH_RE = /(?:[A-Za-z]:\\|\\\\)[^\s"'`<>|]+|(?:\/(?:home|Users|tmp|var|root)\/|~\/)[^\s"'`<>|]+/g;
+function isPluginLogLevel(value) {
+	return typeof value === "string" && PLUGIN_LOG_LEVELS.includes(value);
+}
+function pluginLogLevelEnabled(level, minimum) {
+	return PLUGIN_LOG_LEVELS.indexOf(level) >= PLUGIN_LOG_LEVELS.indexOf(minimum);
+}
+function normalizePluginLogSource(raw) {
+	const stripped = String(raw || "").trim().replace(/^@[^/]+\//, "").toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "");
+	const bounded = (/^[a-z]/.test(stripped) ? stripped : `p-${stripped}`).slice(0, 64).replace(/-+$/g, "");
+	return SOURCE_RE.test(bounded) ? bounded : "dsh-plugin";
+}
+function normalizePluginLogEvent(raw) {
+	const cleaned = String(raw || "").trim().toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^[^a-z]+/, "").slice(0, 128);
+	return EVENT_RE.test(cleaned) ? cleaned : "plugin.event";
+}
+/**
+* Parse a level specification like `debug` or `dsh-zhihu=debug,dsh-dot:warn,info`.
+* Source-specific rules win over a bare fallback level.
+*/
+function parsePluginLogLevel(spec, source, fallback = DEFAULT_PLUGIN_LOG_LEVEL) {
+	if (!spec || typeof spec !== "string") return fallback;
+	const normalizedSource = source ? normalizePluginLogSource(source) : void 0;
+	let wildcard;
+	for (const token of spec.split(",").map((part) => part.trim()).filter(Boolean)) {
+		const lowered = token.toLowerCase();
+		if (isPluginLogLevel(lowered)) {
+			wildcard = lowered;
+			continue;
+		}
+		const match = /^([^=:]+)[=:]([a-z]+)$/i.exec(token);
+		if (!match) continue;
+		const target = match[1].trim();
+		const candidate = match[2].trim().toLowerCase();
+		if (!isPluginLogLevel(candidate)) continue;
+		if (target === "*") {
+			wildcard = candidate;
+			continue;
+		}
+		if (normalizedSource && normalizePluginLogSource(target) === normalizedSource) return candidate;
+	}
+	return wildcard ?? fallback;
+}
+function sanitizePluginLogText(text, maxChars = PLUGIN_LOG_MAX_MESSAGE_CHARS) {
+	if (!text) return "";
+	if (CREDENTIAL_BODY_RE.test(text)) return "[omitted credential material]";
+	if (CHAT_PAYLOAD_RE.test(text)) return "[omitted chat payload]";
+	return truncateLogText(text.replace(AUTH_HEADER_RE, "$1: [redacted]").replace(BEARER_RE, "Bearer [redacted]").replace(SECRET_FIELD_RE, (full, prefix) => {
+		const value = full.slice(prefix.length);
+		if (value.startsWith("\"")) return `${prefix}"[redacted]"`;
+		if (value.startsWith("'")) return `${prefix}'[redacted]'`;
+		return `${prefix}[redacted]`;
+	}).replace(SECRET_QUERY_RE, "$1[redacted]").replace(URL_CREDENTIAL_RE, "$1[redacted]@").replace(BOOTSTRAP_RE, "/bootstrap/[redacted]").replace(KNOWN_TOKEN_RE, "[redacted]").replace(PATH_RE, "[path]"), maxChars);
+}
+function sanitizePluginLogContext(input) {
+	if (!input) return void 0;
+	const output = {};
+	for (const [key, value] of Object.entries(input).slice(0, 32)) {
+		if (value === void 0 || !CONTEXT_KEY_RE.test(key)) continue;
+		if (typeof value === "number" && !Number.isFinite(value)) continue;
+		if (SECRET_KEY_RE.test(key)) {
+			output[key] = "[redacted]";
+			continue;
+		}
+		output[key] = typeof value === "string" ? sanitizePluginLogText(value, 1e3) : value;
+	}
+	if (!Object.keys(output).length) return void 0;
+	if (JSON.stringify(output).length <= 8e3) return output;
+	return {
+		omitted: true,
+		reason: "Diagnostic context exceeded its size limit."
+	};
+}
+function sanitizePluginLogError(error) {
+	if (error === void 0) return void 0;
+	const row = error && typeof error === "object" ? error : {};
+	const rawMessage = typeof row.message === "string" ? row.message : String(error);
+	const result = {
+		name: typeof row.name === "string" && row.name.trim() ? sanitizePluginLogText(row.name.trim(), 100) : "Error",
+		message: sanitizePluginLogText(rawMessage) || "Unknown error"
+	};
+	if (typeof row.stack === "string" && row.stack.trim()) result.stack = sanitizePluginLogText(row.stack, 24e3);
+	if (typeof row.code === "string" && /^[A-Za-z0-9_./:-]{1,100}$/.test(row.code)) result.code = sanitizePluginLogText(row.code, 100);
+	else if (typeof row.code === "number" && Number.isFinite(row.code)) result.code = String(row.code);
+	return result;
+}
+function mergePluginLogContext(base, extra) {
+	if (!base) return extra;
+	if (!extra) return base;
+	return {
+		...base,
+		...extra
+	};
+}
+function buildPluginLogEntry(input, meta) {
+	const entry = {
+		version: 1,
+		at: meta.at.toISOString(),
+		level: isPluginLogLevel(input.level) ? input.level : "info",
+		source: normalizePluginLogSource(meta.source),
+		surface: meta.surface,
+		...meta.profile ? { profile: meta.profile } : {},
+		event: normalizePluginLogEvent(input.event),
+		message: sanitizePluginLogText(input.message || "No diagnostic message was provided.", PLUGIN_LOG_MAX_MESSAGE_CHARS),
+		...meta.pid !== void 0 ? { pid: meta.pid } : {}
+	};
+	const context = sanitizePluginLogContext(mergePluginLogContext(meta.correlation, input.context));
+	if (context) entry.context = context;
+	const error = sanitizePluginLogError(input.error);
+	if (error) entry.error = error;
+	return entry;
+}
+function createChildPluginLogger(parent, bound) {
+	return {
+		get source() {
+			return parent.source;
+		},
+		get file() {
+			return parent.file;
+		},
+		get lastWriteError() {
+			return parent.lastWriteError;
+		},
+		debug: (event, message, context) => parent.debug(event, message, mergePluginLogContext(bound, context)),
+		info: (event, message, context) => parent.info(event, message, mergePluginLogContext(bound, context)),
+		warn: (event, message, error, context) => parent.warn(event, message, error, mergePluginLogContext(bound, context)),
+		error: (event, message, error, context) => parent.error(event, message, error, mergePluginLogContext(bound, context)),
+		fault: (event, message, error, context) => parent.fault(event, message, error, mergePluginLogContext(bound, context)),
+		write: (input) => parent.write({
+			...input,
+			context: mergePluginLogContext(bound, input.context)
+		}),
+		child: (next) => createChildPluginLogger(parent, mergePluginLogContext(bound, next) ?? {})
+	};
+}
+function truncateLogText(text, maxChars) {
+	if (text.length <= maxChars) return text;
+	const marker = "[truncated]\n";
+	if (maxChars <= 12) return text.slice(0, Math.max(0, maxChars));
+	return `${marker}${text.slice(-(maxChars - 12))}`;
+}
+//#endregion
+//#region ../dsh-plugin-kit/src/client-logger.ts
+const CLIENT_PLUGIN_LOG_GLOBAL = "__KLARKXY_PLUGIN_LOGS__";
+function readStorageFlag(key) {
+	try {
+		const value = (globalThis.window?.localStorage)?.getItem?.(key);
+		return typeof value === "string" && value.trim() ? value.trim() : void 0;
+	} catch {
+		return;
+	}
+}
+function sharedClientBuffer(limit) {
+	const carrier = globalThis;
+	if (!Array.isArray(carrier["__KLARKXY_PLUGIN_LOGS__"])) try {
+		carrier[CLIENT_PLUGIN_LOG_GLOBAL] = [];
+	} catch {
+		return [];
+	}
+	const list = carrier[CLIENT_PLUGIN_LOG_GLOBAL];
+	const overflow = list.length - limit;
+	if (overflow > 0) list.splice(0, overflow);
+	return list;
+}
+function createClientPluginLogger(source, ctx, options = {}) {
+	const normalized = normalizePluginLogSource(source);
+	const now = options.now ?? (() => /* @__PURE__ */ new Date());
+	const limit = Math.max(10, options.bufferLimit ?? 500);
+	const browserCtx = ctx && typeof ctx === "object" ? ctx : void 0;
+	const resolveMinimum = () => {
+		if (options.minimumLevel) return options.minimumLevel;
+		return parsePluginLogLevel(readStorageFlag("dsh-plugin-log-level"), normalized, DEFAULT_PLUGIN_LOG_LEVEL);
+	};
+	const logger = {
+		source: normalized,
+		file: null,
+		lastWriteError: null,
+		debug: (event, message, context) => logger.write({
+			level: "debug",
+			event,
+			message,
+			...context ? { context } : {}
+		}),
+		info: (event, message, context) => logger.write({
+			level: "info",
+			event,
+			message,
+			...context ? { context } : {}
+		}),
+		warn: (event, message, error, context) => logger.write({
+			level: "warn",
+			event,
+			message,
+			...error !== void 0 ? { error } : {},
+			...context ? { context } : {}
+		}),
+		error: (event, message, error, context) => logger.write({
+			level: "error",
+			event,
+			message,
+			...error !== void 0 ? { error } : {},
+			...context ? { context } : {}
+		}),
+		fault: (event, message, error, context) => logger.write({
+			level: "fault",
+			event,
+			message,
+			...error !== void 0 ? { error } : {},
+			...context ? { context } : {}
+		}),
+		child: (context) => createChildPluginLogger(logger, context),
+		write(input) {
+			try {
+				if (!pluginLogLevelEnabled(input.level, resolveMinimum())) return false;
+				const entry = buildPluginLogEntry(input, {
+					at: now(),
+					source: normalized,
+					surface: "client"
+				});
+				const buffer = sharedClientBuffer(limit);
+				buffer.push(entry);
+				const overflow = buffer.length - limit;
+				if (overflow > 0) buffer.splice(0, overflow);
+				if (options.forwardToHostLogger !== false && browserCtx?.logger) {
+					const summary = sanitizePluginLogText(`${normalized} [${entry.event}]: ${entry.message}`, 500);
+					if (entry.level === "warn" && typeof browserCtx.logger.warn === "function") browserCtx.logger.warn(summary);
+					else if ((entry.level === "error" || entry.level === "fault") && typeof browserCtx.logger.error === "function") browserCtx.logger.error(summary);
+				}
+				if (readStorageFlag("dsh-plugin-log-console") === "1") {
+					const con = globalThis.console;
+					(entry.level === "debug" ? con?.debug : entry.level === "info" ? con?.info : entry.level === "warn" ? con?.warn : con?.error)?.call(con, `[${normalized}] ${entry.event}: ${entry.message}`, entry);
+				}
+				return true;
+			} catch {
+				return false;
+			}
+		}
+	};
+	return logger;
+}
+function installClientPluginLogger(ctx, source, options = {}) {
+	const logger = createClientPluginLogger(source, ctx, options);
+	logger.info("client.loaded", "Client plugin initialized.", options.loadedContext);
+	const browserCtx = ctx && typeof ctx === "object" ? ctx : void 0;
+	if (typeof browserCtx?.effect === "function") try {
+		browserCtx.effect(() => () => {
+			logger.debug("client.disposed", "Client plugin disposed.");
+		}, `${logger.source}.client-logger`);
+	} catch {}
+	return logger;
+}
+//#endregion
 //#region src/client.tsx
 /**
 * Model picker, browser half.
@@ -1621,7 +1896,7 @@ function ModelMenuFallback(props) {
 * follow the default. Memory updates strictly on `result.ok === true`; a
 * failure leaves the remembered route untouched. Exported for the wiring spec.
 */
-function createPreferredSelect(directory, preference) {
+function createPreferredSelect(directory, preference, logger) {
 	return async (selection) => {
 		const state = directory.store.getSnapshot();
 		const current = state.current;
@@ -1636,11 +1911,22 @@ function createPreferredSelect(directory, preference) {
 			};
 		}
 		const result = await directory.select(final);
-		if (result?.ok === true) preference.remember(final, final.reasoningEffort);
+		if (result?.ok === true) {
+			preference.remember(final, final.reasoningEffort);
+			logger?.debug("model.selected", "Applied model selection.", {
+				provider: final.provider,
+				model: final.model,
+				effort: final.reasoningEffort ?? null
+			});
+		} else if (result && result.ok === false) logger?.warn("model.select-rejected", "Model selection failed.", void 0, {
+			provider: final.provider,
+			model: final.model
+		});
 		return result;
 	};
 }
 function apply(ctx) {
+	const logger = installClientPluginLogger(ctx, "@klarkxy/dsh-model-picker");
 	const preference = new EffortPreference();
 	ctx.effect(() => {
 		const zh = ctx.locale?.register(NS, "zh", dictZh);
@@ -1683,12 +1969,15 @@ function apply(ctx) {
 						available: true,
 						directory: directory.store,
 						load: () => {
-							directory.load().catch(() => {});
+							directory.load().catch((error) => {
+								logger.warn("directory.load-failed", "Model directory load failed.", error, { sessionId });
+							});
 						},
 						resolveText: (text) => ctx.locale?.resolveText(text) ?? String(text),
-						select: createPreferredSelect(directory, preference)
+						select: createPreferredSelect(directory, preference, logger)
 					};
-				} catch {
+				} catch (error) {
+					logger.warn("directory.unavailable", "Could not resolve model directory for session.", error, { sessionId });
 					return unavailable;
 				}
 			}