pi-mega-compact 0.20.50 → 0.20.51

package/extensions/dashboard-client/src/tabs/SetupTab/CustomEndpointSection.tsx

@@ -25,10 +25,21 @@ interface CustomEndpointSectionProps {
 		embedder: "ollama" | "llama" | "trigram" | "custom" | "onnx",
 		url?: string,
 		apiKey?: string,
+		dim?: string,
+		headers?: string,
+		allowRemote?: boolean,
 	) => void;
 	configuring: string | null;
 	/** ENC-1a surface active — true when the new setup-status fields are present. */
 	inputEnabled: boolean;
+	/** Server-reported "key is set" marker (the key itself is never returned). */
+	apiKeySet: boolean;
+	/** ENC-1b: the persisted `embeddingDim` value (numeric string), or undefined. One-shot seed. */
+	embeddingDim: string | undefined;
+	/** ENC-1b: server-reported "headers are set" marker (the raw JSON is never returned). */
+	embeddingHeadersSet: boolean;
+	/** ENC-1b: the persisted allow-remote flag, or undefined. One-shot seed. */
+	allowRemoteEmbedder: boolean | undefined;
 	configureResult: SetupConfigureResponse | null;
 	configureError: string | null;
 }
@@ -39,12 +50,36 @@ export default function CustomEndpointSection({
 	applyEmbedder,
 	configuring,
 	inputEnabled,
+	apiKeySet,
+	embeddingDim,
+	embeddingHeadersSet,
+	allowRemoteEmbedder,
 	configureResult,
 	configureError,
 }: CustomEndpointSectionProps): React.ReactElement {
 	// The API key is intentionally local-only state: it always renders blank and
 	// is never seeded from the persisted value (the server never returns it).
 	const [customApiKey, setCustomApiKey] = useState("");
+	// ENC-1b: the embedding dim, seeded once from the persisted value (never
+	// re-seeded after a poll so the user's in-flight edits survive the 5s poll).
+	const [dim, setDim] = useState("");
+	const [dimSeeded, setDimSeeded] = useState(false);
+	// ENC-1b: the headers JSON is local-only, write-only state: NEVER prefilled,
+	// never seeded, never shown back — the server persists it verbatim and only
+	// ever reports its presence via `embeddingHeadersSet`.
+	const [headers, setHeaders] = useState("");
+	// ENC-1b: allow-remote toggle, seeded once from the persisted flag.
+	const [allowRemote, setAllowRemote] = useState(false);
+	const [allowRemoteSeeded, setAllowRemoteSeeded] = useState(false);
+
+	if (inputEnabled && !dimSeeded && typeof embeddingDim === "string") {
+		setDim(embeddingDim);
+		setDimSeeded(true);
+	}
+	if (inputEnabled && !allowRemoteSeeded && typeof allowRemoteEmbedder === "boolean") {
+		setAllowRemote(allowRemoteEmbedder);
+		setAllowRemoteSeeded(true);
+	}
 
 	return (
 		<div style={styles.section}>
@@ -93,14 +128,100 @@ export default function CustomEndpointSection({
 						}}
 					/>
 				)}
+				{inputEnabled && apiKeySet && (
+					<span
+						style={{
+							fontSize: "0.75rem",
+							color: "#81c784",
+							border: "1px solid #2a4e2a",
+							borderRadius: "4px",
+							padding: "0.15rem 0.45rem",
+						}}
+					>
+						API key saved
+					</span>
+				)}
+				{inputEnabled && embeddingHeadersSet && (
+					<span
+						style={{
+							fontSize: "0.75rem",
+							color: "#81c784",
+							border: "1px solid #2a4e2a",
+							borderRadius: "4px",
+							padding: "0.15rem 0.45rem",
+						}}
+					>
+						Headers saved
+					</span>
+				)}
 				<button
 					style={{ ...styles.button, opacity: customUrl ? 1 : 0.4 }}
-					onClick={() => applyEmbedder("custom", customUrl, customApiKey)}
+					onClick={() =>
+						applyEmbedder("custom", customUrl, customApiKey, dim, headers, allowRemote)
+					}
 					disabled={!customUrl || configuring !== null}
 				>
 					{configuring === "custom" ? "Writing..." : "Use Custom URL"}
 				</button>
 			</div>
+			{inputEnabled && (
+				<div style={{ marginTop: "0.75rem" }}>
+					<div style={{ marginBottom: "0.5rem" }}>
+						<label style={{ ...styles.label, display: "block", marginBottom: "0.25rem" }}>
+							Embedding dim (optional)
+						</label>
+						<input
+							type="number"
+							min={1}
+							placeholder="e.g. 384"
+							value={dim}
+							onChange={(e) => setDim(e.target.value)}
+							style={{
+								width: "200px",
+								background: "#12122a",
+								color: "#e0e0e0",
+								border: "1px solid #2a2a4e",
+								borderRadius: "6px",
+								padding: "0.4rem 0.6rem",
+								fontSize: "0.85rem",
+								fontFamily: "monospace",
+							}}
+						/>
+					</div>
+					<div style={{ marginBottom: "0.5rem" }}>
+						<label style={{ ...styles.label, display: "block", marginBottom: "0.25rem" }}>
+							Embedding headers (JSON, write-only — never re-displayed)
+						</label>
+						<textarea
+							placeholder={'{"Authorization": "Bearer ..."}'}
+							value={headers}
+							onChange={(e) => setHeaders(e.target.value)}
+							aria-label="Embedding headers JSON (write-only — never re-displayed)"
+							rows={2}
+							style={{
+								width: "100%",
+								background: "#12122a",
+								color: "#e0e0e0",
+								border: "1px solid #2a2a4e",
+								borderRadius: "6px",
+								padding: "0.4rem 0.6rem",
+								fontSize: "0.85rem",
+								fontFamily: "monospace",
+								resize: "vertical",
+							}}
+						/>
+					</div>
+					<label style={{ display: "flex", alignItems: "center", gap: "0.5rem", fontSize: "0.85rem" }}>
+						<input
+							type="checkbox"
+							checked={allowRemote}
+							onChange={(e) => setAllowRemote(e.target.checked)}
+							aria-label="Allow remote embedder (skips loopback-only check)"
+						/>
+						Allow remote embedder (skips loopback-only check)
+					</label>
+				</div>
+			)}
 			{configureError !== null && (
 				<p style={{ color: "#f44336", fontSize: "0.85rem", marginTop: "0.5rem" }}>
 					Configure error: {configureError}

package/extensions/dashboard-client/src/tabs/SetupTab/EmbedderSetup.tsx

@@ -16,7 +16,7 @@ import EmbedderHealthCard from "./EmbedderHealthCard";
 import SettingsPanel from "./SettingsPanel";
 import CustomEndpointSection from "./CustomEndpointSection";
 import { styles } from "./EmbedderSetupStyles";
-import { embedderLabel, trigramWarning, detectBadge } from "./EmbedderSetupHelpers";
+import { detectBadge, CurrentConfigSection } from "./EmbedderSetupHelpers";
 
 export default function EmbedderSetup(): React.ReactElement {
 	const [status, setStatus] = useState<SetupStatusResponse | null>(null);
@@ -28,6 +28,10 @@ export default function EmbedderSetup(): React.ReactElement {
 	const [configResult, setConfigResult] = useState<SetupConfigureResponse | null>(null);
 	const [configError, setConfigError] = useState<string | null>(null);
 	const [customUrl, setCustomUrl] = useState("");
+	// True once the URL field has been seeded from the persisted endpoint URL —
+	// seeding runs only on the first status load that carries the field so the
+	// user's in-flight edits are never clobbered by a poll refresh.
+	const [customUrlSeeded, setCustomUrlSeeded] = useState(false);
 
 	const loadStatus = useCallback(() => {
 		fetchSetupStatus()
@@ -37,22 +41,43 @@ export default function EmbedderSetup(): React.ReactElement {
 			);
 	}, []);
 
-	const applyEmbedder = useCallback((embedder: "ollama" | "llama" | "trigram" | "custom" | "onnx", url?: string, apiKey?: string) => {
-		setConfiguring(embedder);
-		setConfigError(null);
-		setConfigResult(null);
-		// ENC-1a: optional custom-endpoint URL + bearer key ride on the setup-configure POST (additive; flag-off ignores them).
-		configureEmbedder({ embedder, url, embeddingEndpointUrl: url, embeddingApiKey: apiKey })
-			.then((r) => {
-				setConfigResult(r);
-				setConfiguring(null);
-				loadStatus();
+	const applyEmbedder = useCallback(
+		(
+			embedder: "ollama" | "llama" | "trigram" | "custom" | "onnx",
+			url?: string,
+			apiKey?: string,
+			dim?: string,
+			headers?: string,
+			allowRemote?: boolean,
+		) => {
+			setConfiguring(embedder);
+			setConfigError(null);
+			setConfigResult(null);
+			// ENC-1a: optional custom-endpoint URL + bearer key ride on the setup-configure POST (additive; flag-off ignores them).
+			// ENC-1b: the dim / headers / allow-remote fields are forwarded additively, gated on the same
+			// `embeddingHeadersSet` presence marker the aggregator/server uses (no separate client env read).
+			const enc1bOn = "embeddingHeadersSet" in (status ?? {});
+			configureEmbedder({
+				embedder,
+				url,
+				embeddingEndpointUrl: url,
+				embeddingApiKey: apiKey,
+				...(enc1bOn
+					? { embeddingDim: dim, embeddingHeaders: headers, allowRemoteEmbedder: allowRemote }
+					: {}),
 			})
-			.catch((e: unknown) => {
-				setConfigError(e instanceof Error ? e.message : String(e));
-				setConfiguring(null);
-			});
-	}, [loadStatus]);
+				.then((r) => {
+					setConfigResult(r);
+					setConfiguring(null);
+					loadStatus();
+				})
+				.catch((e: unknown) => {
+					setConfigError(e instanceof Error ? e.message : String(e));
+					setConfiguring(null);
+				});
+		},
+		[loadStatus, status],
+	);
 
 	const runDetect = useCallback(() => {
 		setRunningDetect(true);
@@ -72,6 +97,17 @@ export default function EmbedderSetup(): React.ReactElement {
 		loadStatus();
 	}, [loadStatus]);
 
+	// Seed the custom-endpoint URL field once from the persisted
+	// `embeddingEndpointUrl` (ENC-1a). Later poll refreshes do NOT re-seed —
+	// only the first load, so typed edits survive the 5s status poll.
+	useEffect(() => {
+		if (customUrlSeeded) return;
+		if (status && typeof status.embeddingEndpointUrl === "string" && status.embeddingEndpointUrl.length > 0) {
+			setCustomUrl(status.embeddingEndpointUrl);
+			setCustomUrlSeeded(true);
+		}
+	}, [status, customUrlSeeded]);
+
 	// Poll status every 5s — the same cadence the Setup Cortex sub-tab uses
 	// (see useSetupCortexPoll) so the embedder + cortex sub-tabs share one poll
 	// contract (VC9D consolidation). Detection is memoized server-side, so the
@@ -99,69 +135,7 @@ export default function EmbedderSetup(): React.ReactElement {
 			<EmbedderHealthCard />
 
 			{/* Current Config Section */}
-			<div style={styles.section}>
-				<h3 style={styles.sectionTitle}>Current Embedder Configuration</h3>
-				{statusError && (
-					<p style={{ color: "#f44336", fontSize: "0.85rem" }}>
-						Error: {statusError}
-					</p>
-				)}
-				{status && (
-					<>
-						<div style={styles.row}>
-							<span style={styles.label}>Active Embedder:</span>
-							<span style={styles.value}>
-								{embedderLabel(status.currentEmbedder)}
-							</span>
-						</div>
-						{"configuredEmbedder" in status && status.configuredEmbedder !== status.currentEmbedder && (
-							<div style={styles.warning}>
-								<strong>Configured but not active:</strong>{" "}
-								{embedderLabel(status.configuredEmbedder)} is configured in
-								.mega-compact.env but not yet loaded.{" "}
-								<strong>Restart pi</strong> to activate it.
-								{status.configuredUrl && (
-									<> ({status.configuredUrl})</>
-								)}
-							</div>
-						)}
-						{"restartRequired" in status && status.restartRequired && (
-							<div style={{ ...styles.row, color: "#ff9800" }}>
-								<span style={styles.label}>Status:</span>
-								<span style={styles.value}>
-									Restart required to activate the configured embedder
-								</span>
-							</div>
-						)}
-						<div style={styles.row}>
-							<span style={styles.label}>Embedding URL:</span>
-							<span style={styles.value}>
-								{status.embeddingUrl ?? (
-									<span style={{ color: "#888" }}>not set</span>
-								)}
-							</span>
-						</div>
-						<div style={styles.row}>
-							<span style={styles.label}>Embed Cache:</span>
-							<span style={styles.value}>
-								{status.embedCache ?? (
-									<span style={{ color: "#888" }}>not set</span>
-								)}
-							</span>
-						</div>
-						<div style={styles.row}>
-							<span style={styles.label}>MiniLM:</span>
-							<span style={styles.value}>{status.minilm ? "enabled" : "disabled"}</span>
-						</div>
-						{trigramWarning(status)}
-					</>
-				)}
-				{!status && !statusError && (
-					<p style={{ color: "#888", fontSize: "0.85rem" }}>
-						Loading configuration...
-					</p>
-				)}
-			</div>
+			<CurrentConfigSection status={status} statusError={statusError} />
 
 			{/* Detection Section */}
 			<div style={styles.section}>
@@ -324,6 +298,10 @@ export default function EmbedderSetup(): React.ReactElement {
 				applyEmbedder={applyEmbedder}
 				configuring={configuring}
 				inputEnabled={status !== null && "embeddingApiKeySet" in status}
+				apiKeySet={status?.embeddingApiKeySet === true}
+				embeddingDim={status?.embeddingDim}
+				embeddingHeadersSet={status?.embeddingHeadersSet === true}
+				allowRemoteEmbedder={status?.allowRemoteEmbedder}
 				configureResult={configResult}
 				configureError={configError}
 			/>

package/extensions/dashboard-client/src/tabs/SetupTab/EmbedderSetupHelpers.tsx

@@ -48,3 +48,78 @@ export function detectBadge(installed: boolean): React.ReactElement {
 		</span>
 	);
 }
+
+/** The "Current Embedder Configuration" readout block. */
+export function CurrentConfigSection({
+	status,
+	statusError,
+}: {
+	status: SetupStatusResponse | null;
+	statusError: string | null;
+}): React.ReactElement {
+	return (
+		<div style={styles.section}>
+			<h3 style={styles.sectionTitle}>Current Embedder Configuration</h3>
+			{statusError && (
+				<p style={{ color: "#f44336", fontSize: "0.85rem" }}>
+					Error: {statusError}
+				</p>
+			)}
+			{status && (
+				<>
+					<div style={styles.row}>
+						<span style={styles.label}>Active Embedder:</span>
+						<span style={styles.value}>
+							{embedderLabel(status.currentEmbedder)}
+						</span>
+					</div>
+					{"configuredEmbedder" in status && status.configuredEmbedder !== status.currentEmbedder && (
+						<div style={styles.warning}>
+							<strong>Configured but not active:</strong>{" "}
+							{embedderLabel(status.configuredEmbedder)} is configured in
+							.mega-compact.env but not yet loaded.{" "}
+							<strong>Restart pi</strong> to activate it.
+							{status.configuredUrl && (
+								<> ({status.configuredUrl})</>
+							)}
+						</div>
+					)}
+					{"restartRequired" in status && status.restartRequired && (
+						<div style={{ ...styles.row, color: "#ff9800" }}>
+							<span style={styles.label}>Status:</span>
+							<span style={styles.value}>
+								Restart required to activate the configured embedder
+							</span>
+						</div>
+					)}
+					<div style={styles.row}>
+						<span style={styles.label}>Embedding URL:</span>
+						<span style={styles.value}>
+							{status.embeddingUrl ?? (
+								<span style={{ color: "#888" }}>not set</span>
+							)}
+						</span>
+					</div>
+					<div style={styles.row}>
+						<span style={styles.label}>Embed Cache:</span>
+						<span style={styles.value}>
+							{status.embedCache ?? (
+								<span style={{ color: "#888" }}>not set</span>
+							)}
+						</span>
+					</div>
+					<div style={styles.row}>
+						<span style={styles.label}>MiniLM:</span>
+						<span style={styles.value}>{status.minilm ? "enabled" : "disabled"}</span>
+					</div>
+					{trigramWarning(status)}
+				</>
+			)}
+			{!status && !statusError && (
+				<p style={{ color: "#888", fontSize: "0.85rem" }}>
+					Loading configuration...
+				</p>
+			)}
+		</div>
+	);
+}

package/extensions/dashboard-server/api-contracts/setup.ts

@@ -33,6 +33,28 @@ export interface SetupStatusResponse {
   /** ENC-1a: whether an external embedder API key is configured. The raw key is
    *  NEVER returned — only this boolean presence marker (additive, flag-gated). */
   readonly embeddingApiKeySet?: boolean;
+  /** ENC-1b: the persisted `MEGACOMPACT_EMBEDDING_DIM` value as its numeric
+   *  string, when one is configured (additive, flag-gated). */
+  readonly embeddingDim?: string;
+  /** ENC-1b: whether `MEGACOMPACT_EMBEDDING_HEADERS` is configured. The raw
+   *  headers JSON is NEVER returned — only this boolean presence marker
+   *  (additive, flag-gated, redaction mirrors embeddingApiKeySet). */
+  readonly embeddingHeadersSet?: boolean;
+  /** ENC-1b: whether `MEGACOMPACT_ALLOW_REMOTE_EMBEDDER` is set (default off —
+   *  a deliberate escape hatch that skips the loopback-only check; additive,
+   *  flag-gated). */
+  readonly allowRemoteEmbedder?: boolean;
+  /** ENC-1b: whether `MEGACOMPACT_ENCODER_NATIVE=1` is set, i.e. the operator
+   *  opted into the onnxruntime-node native backend (additive, flag-gated). */
+  readonly encoderNativeOptIn?: boolean;
+  /** ENC-1b: the current effective ONNX runtime backend, computed live through
+   *  the existing `selectRuntimeBackend`. `modeB` (flag-off / no runtime) is
+   *  projected to `wasm` for display (additive, flag-gated). */
+  readonly encoderBackend?: "wasm" | "native";
+  /** ENC-1b: the runtime's own demotion reason when the effective backend
+   *  falls back (e.g. native selected but onnxruntime-node absent / darwin-x64
+   *  demoted), surfaced verbatim; null when no demotion (additive, flag-gated). */
+  readonly encoderDemotionReason?: string | null;
 }
 
 /**
@@ -84,6 +106,19 @@ export interface SetupConfigureRequest {
   /** ENC-1a: external embedder API key, persisted to the per-repo
    *  `.mega-compact.env` only — never returned by any GET (additive, flag-gated). */
   readonly embeddingApiKey?: string;
+  /** ENC-1b: persisted `MEGACOMPACT_EMBEDDING_DIM` as a positive integer string
+   *  within `ENC_1B_MAX_EMBEDDING_DIM` (validated; additive, flag-gated). */
+  readonly embeddingDim?: string;
+  /** ENC-1b: persisted `MEGACOMPACT_EMBEDDING_HEADERS` JSON object string
+   *  (secret-bearing — written verbatim, NEVER echoed back; validated to parse
+   *  as a JSON object; additive, flag-gated). */
+  readonly embeddingHeaders?: string;
+  /** ENC-1b: opt in to `MEGACOMPACT_ALLOW_REMOTE_EMBEDDER` (default off — a
+   *  deliberate escape hatch; additive, flag-gated). */
+  readonly allowRemoteEmbedder?: boolean;
+  /** ENC-1b: opt in to `MEGACOMPACT_ENCODER_NATIVE` (onnxruntime-node native
+   *  backend; additive, flag-gated). */
+  readonly encoderNativeOptIn?: boolean;
 }
 
 /** Response for POST /api/setup-configure. */

package/extensions/dashboard-server/routes-rag-settings-vector-cortex.ts

@@ -300,5 +300,11 @@ export const VECTOR_CORTEX_SETTINGS: SettingGroup = {
 			"ENC-1a adds a Settings-visible field pair for the external embedder endpoint URL + optional Bearer API key, persisted by the setup-configure writer branch to the per-repo .mega-compact.env (MEGACOMPACT_EMBEDDING_URL / MEGACOMPACT_EMBEDDING_KEY). The GET status route echoes the endpoint URL and reports embeddingApiKeySet as a boolean ONLY — the raw key is never returned. OFF = no new GET fields, no writer branch, no new Settings text rows (byte-identical ENC-0g predecessor).",
 			true,
 		),
+		boolDirect(
+			"MEGACOMPACT_ENC_1B",
+			"ENC-1b ONNX runtime backend + embedder API settings",
+			"ENC-1b completes the embedder API Settings surface (dim / headers / allow-remote persisted to the per-repo .mega-compact.env) and surfaces the ONNX runtime selection knob (MEGACOMPACT_ENCODER_NATIVE) as a toggle plus the current effective backend + demotion reason. OFF = no new GET fields, no writer branch, no new Settings rows or toggle (byte-identical ENC-1a predecessor).",
+			true,
+		),
 	],
 };