@vymalo/opencode-lightbridge 0.17.0 → 0.18.0

package/dist/opencode.js

@@ -1,51 +1,19 @@
 import { hostname } from "node:os";
 import { join } from "node:path";
-import { createJsonConsoleLogger, DEFAULT_LOG_LEVEL, LOG_LEVEL_PRIORITY } from "@vymalo/opencode-auth-core/lib";
-import { buildResource, createProviders, deferredAttribute, describeError, fromOpenCodeLogLevel, installTracePropagation, readVcsInfo, resolveOtelConfig, TelemetryRecorder } from "@vymalo/opencode-core-otel";
-import { applyResponsesApiOptions, mergeDiscoveredModels, ProviderModelSyncEngine, resolveProviderNpm } from "@vymalo/opencode-provider-sync/lib";
+import { Plugin } from "@opencode/plugin/effect";
+import { defaultTextMapSetter } from "@opentelemetry/api";
+import { W3CTraceContextPropagator } from "@opentelemetry/core";
+import { buildResource, createProviders, deferredAttribute, describeError, readVcsInfo, registerExitHandlers, resolveOtelConfig, TelemetryRecorder } from "@vymalo/opencode-core-otel";
+import { applyResponsesApiSettings, mergeDiscoveredModels, propagateCachedBearer, ProviderModelSyncEngine, resolveCachedBearer, resolveProviderPackage, upsertManagedProvider } from "@vymalo/opencode-provider-sync/lib";
+import { Effect, Stream } from "effect";
 import { hasOAuth2Conflict, needsProjectToken, parseLightbridgeOptions } from "./config.js";
+import { captureHostContext, createEffectLogger, DEFAULT_LOG_LEVEL, resolveLogLevel, runInHost } from "./logging.js";
+import { adaptContext, adaptPermission, adaptPrompt, adaptToolAfter, adaptToolBefore, OtelEventAdapter } from "./otel-adapter.js";
 import { LightbridgeRuntime, ROOT_CACHE_NAMESPACE, ROOT_CACHE_SEGMENT } from "./plugin.js";
-const PLUGIN_SERVICE_NAME = "opencode-lightbridge-plugin";
-/**
-* Pipe plugin logs through OpenCode's `client.app.log`, JSON console as
-* fallback. Mirrors every other plugin in the suite.
-*
-* This plugin mutates the session (gateway bearer injection, OTEL export), so
-* it might seem like a warn/error printed to the terminal would be actionable
-* developer feedback. It is not: no plugin in this suite may write to the
-* user's TUI (ADR-0014, superseding ADR-0013's narrower per-plugin scope).
-* Every record still reaches `client.app.log` at its true level, so the
-* diagnostic is always persisted to OpenCode's own log — just not on the
-* developer's screen. Set `VYMALO_PLUGIN_CONSOLE_LOG=1` (`consoleAll` below)
-* to opt back into the console mirror for every level.
-*/
-function createOpenCodeLogger(client, getMinLevel) {
-	const fallback = createJsonConsoleLogger("debug");
-	const consoleAll = /^(1|true|yes|on)$/i.test(process.env.VYMALO_PLUGIN_CONSOLE_LOG ?? "");
-	const write = (level, event, fields) => {
-		if (LOG_LEVEL_PRIORITY[level] < LOG_LEVEL_PRIORITY[getMinLevel()]) {
-			return;
-		}
-		if (consoleAll) {
-			fallback[level](event, fields);
-		}
-		const hostLevel = level === "trace" ? "debug" : level;
-		void client.app.log({ body: {
-			service: PLUGIN_SERVICE_NAME,
-			level: hostLevel,
-			message: event,
-			extra: fields
-		} }).catch(() => {
-			// best-effort forwarding; console logger is the reliable fallback.
-		});
-	};
-	return {
-		trace: (event, fields) => write("trace", event, fields),
-		debug: (event, fields) => write("debug", event, fields),
-		info: (event, fields) => write("info", event, fields),
-		warn: (event, fields) => write("warn", event, fields),
-		error: (event, fields) => write("error", event, fields)
-	};
+/** Stable plugin id. v2 requires one and keys storage/registrations by it. */
+export const PLUGIN_ID = "vymalo.lightbridge";
+function errorMessage(error) {
+	return error instanceof Error ? error.message : String(error);
 }
 function safeHostname() {
 	try {
@@ -55,30 +23,6 @@ function safeHostname() {
 	}
 }
 /**
-* Drain buffered telemetry on process exit — same rationale as
-* `@vymalo/opencode-otel`'s `registerExitHandlers`: the plugin API has no
-* dispose hook, so without this a short CLI invocation loses everything still
-* in a batch processor.
-*/
-function registerExitHandlers(providers, logger, deferred) {
-	let done = false;
-	const drain = () => {
-		if (done) {
-			return;
-		}
-		done = true;
-		for (const attribute of deferred) {
-			attribute.abandon();
-		}
-		void providers.shutdown().catch((error) => {
-			logger.warn("lightbridge_otel_shutdown_failed", { error: describeError(error) });
-		});
-	};
-	process.once("beforeExit", drain);
-	process.once("SIGINT", drain);
-	process.once("SIGTERM", drain);
-}
-/**
 * Build the umbrella's `TokenSource` for `createProviders`'s 5th argument: an
 * async factory over the SHARED runtime, superseding otel's standalone
 * `tokenCommand` path entirely (ADR-0012 — one credential, not two seams).
@@ -111,27 +55,6 @@ function createRuntimeTokenSource(runtime) {
 	};
 }
 /**
-* Build the gateway's `chat.headers` hook: inject the shared project bearer
-* on `gateway.providers` only, fail closed on any exchange error (mirrors
-* `@vymalo/opencode-repo-auth`'s `chat.headers`).
-*/
-function createGatewayChatHeaders(providers, runtime, logger) {
-	return async (input, output) => {
-		const providerId = input.model?.providerID ?? input.provider?.info?.id;
-		if (!providerId || !providers.has(providerId)) {
-			logger.trace("lightbridge_gateway_chat_headers_skipped", { providerId });
-			return;
-		}
-		try {
-			const token = await runtime.getProjectToken({ interactive: true });
-			output.headers.Authorization = `${token.tokenType || "Bearer"} ${token.accessToken}`;
-			logger.trace("lightbridge_gateway_bearer_injected", { providerId });
-		} catch {
-			logger.trace("lightbridge_gateway_no_bearer", { providerId });
-		}
-	};
-}
-/**
 * Translate `auth` (already-validated `AuthServerConfig`) + `register` into
 * the ONE `ProviderServerConfig` the shared `ProviderModelSyncEngine` needs
 * (ADR-0017 requirement 1 — "everything oauth2 does"). `auth.id` is the
@@ -160,68 +83,26 @@ function buildRegisterServerConfig(auth, register) {
 		tokenExchangeAudience: auth.tokenExchangeAudience
 	};
 }
+function asSettings(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : {};
+}
 /**
-* The `register` module (ADR-0017 requirement 1): register `auth`'s IdP as an
-* OpenCode provider and keep `config.provider[<auth.id>].models` in sync via
-* the SAME `ProviderModelSyncEngine` `@vymalo/opencode-oauth2` uses — built
-* ONCE (register's config is fixed at plugin-construction time, unlike
-* oauth2's, which is re-derived from the host config on every `config` hook),
-* then merged into the host config on every `config` hook call so a later
-* OpenCode config pass still sees the discovered models.
-*
-* Guard (requirement 4a): if `auth.id` is ALSO managed by
-* `@vymalo/opencode-oauth2` in this same host config, lightbridge must not
-* also register/own it — skip entirely (never construct the engine, never
-* touch `config.provider[id]`), logged at `debug` (ADR-0014: nothing reaches
-* the terminal), and fail safe (the gateway/OTEL bearer still works via
-* `LightbridgeRuntime`'s own lightweight, read/refresh-only participation in
-* the same shared cache file). The double-scheduling guard (requirement 4b —
-* two engine instances in one process ticking the same cache file) is
-* enforced generically inside `ProviderModelSyncEngine.start()` itself.
+* Resolve the one registered provider's name/package/settings from
+* `register` and hand them to provider-sync's `upsertManagedProvider`, which
+* owns the add-or-update-in-place behaviour.
 */
-async function applyRegisterModule(hostConfig, register, auth, state, logger, factoryOptions) {
-	const providerId = auth.id;
-	if (!state.engine && hasOAuth2Conflict(hostConfig, providerId)) {
-		if (!state.skippedForConflict) {
-			state.skippedForConflict = true;
-			logger.debug("lightbridge_register_skipped_oauth2_conflict", { providerId });
-		}
-		return;
-	}
-	if (!state.engine) {
-		state.engine = new ProviderModelSyncEngine({
-			servers: [buildRegisterServerConfig(auth, register)],
-			cacheNamespace: ROOT_CACHE_NAMESPACE
-		}, {
-			logger,
-			fetchImpl: factoryOptions.fetchImpl,
-			onAuthorizationUrl: factoryOptions.onAuthorizationUrl,
-			cacheDir: factoryOptions.cacheDir ? join(factoryOptions.cacheDir, ROOT_CACHE_SEGMENT, ROOT_CACHE_NAMESPACE) : undefined,
-			cacheNamespaceSegment: ROOT_CACHE_SEGMENT,
-			serviceLabel: "opencode-lightbridge"
-		});
-	}
-	if (!state.started) {
-		await state.engine.initialize();
-		await state.engine.start({ warmup: true });
-		state.started = true;
-	}
-	const providers = hostConfig.provider ??= {};
-	const providerConfig = providers[providerId] ??= {};
-	const providerOptions = providerConfig.options ?? {};
-	providerConfig.npm = resolveProviderNpm(register.responseApi);
-	providerConfig.name = providerConfig.name ?? register.name ?? providerId;
-	providerConfig.options = applyResponsesApiOptions({
-		...providerOptions,
-		baseURL: register.baseURL
-	}, register.responseApi, providerId, logger);
-	const models = state.engine.getServerModels(providerId);
-	if (models.length > 0) {
-		mergeDiscoveredModels(providerConfig, models);
-	}
-	logger.trace("lightbridge_register_config_applied", {
-		providerId,
-		modelCount: models.length
+function upsertRegisteredProvider(editor, providerId, register, logger) {
+	const existing = editor.get(providerId)?.provider;
+	// `Provider.Info.name` is required, so a provider declared without a name
+	// reads back as its own id — treat that as "unset" and let `register.name` win.
+	const existingName = existing && existing.name !== providerId ? existing.name : undefined;
+	upsertManagedProvider(editor, providerId, {
+		name: existingName ?? register.name ?? providerId,
+		package: resolveProviderPackage(register.responseApi),
+		settings: applyResponsesApiSettings({
+			...asSettings(existing?.settings),
+			baseURL: register.baseURL
+		}, register.responseApi, providerId, logger)
 	});
 }
 /**
@@ -245,25 +126,25 @@ function warnIfTokenCommandConfigIgnored(otel, env, logger) {
 /**
 * Build the OTEL module: resource, providers (with the runtime-backed
 * `TokenSource` when a shared runtime is available), recorder and exit
-* handlers. Mirrors `@vymalo/opencode-otel`'s `createOtelPlugin` orchestration
-* verbatim, minus the standalone `tokenCommand` seam.
+* handlers. Mirrors `@vymalo/opencode-otel`'s orchestration verbatim, minus
+* the standalone `tokenCommand` seam.
 */
-async function buildOtelModule(input, otelConfig, logger, factoryOptions, runtime) {
+async function buildOtelModule(location, otelConfig, logger, factoryOptions, runtime) {
 	const version = deferredAttribute(factoryOptions.deferredTimeoutMs);
 	const branch = deferredAttribute(factoryOptions.deferredTimeoutMs);
 	if (factoryOptions.hostInfo?.version) {
 		version.settle(factoryOptions.hostInfo.version);
 	}
-	const vcs = otelConfig.collectVcs ? await readVcsInfo(input.worktree ?? input.directory).catch(() => ({})) : {};
+	const vcs = otelConfig.collectVcs ? await readVcsInfo(location.directory).catch(() => ({})) : {};
 	if (vcs.ref) {
 		branch.settle(vcs.ref);
 	}
 	const resource = buildResource(otelConfig, {
 		version: version.value,
 		hostname: factoryOptions.hostInfo?.hostname ?? safeHostname(),
-		projectName: input.project?.id,
-		directory: input.directory,
-		worktree: input.worktree,
+		projectName: location.projectId,
+		directory: location.directory,
+		worktree: location.directory,
 		branch: branch.value,
 		vcs
 	});
@@ -280,7 +161,8 @@ async function buildOtelModule(input, otelConfig, logger, factoryOptions, runtim
 		}
 	});
 	if (factoryOptions.registerProcessHandlers !== false) {
-		registerExitHandlers(providers, logger, [version, branch]);
+		// Flush on exit, and hand the default signal action back (ADR-0018).
+		registerExitHandlers(providers, logger, [version, branch], { eventPrefix: "lightbridge_otel" });
 	}
 	logger.info("lightbridge_otel_enabled", {
 		serviceName: otelConfig.serviceName,
@@ -290,133 +172,306 @@ async function buildOtelModule(input, otelConfig, logger, factoryOptions, runtim
 	});
 	return {
 		config: otelConfig,
-		recorder
-	};
-}
-function registerOtelHooks(hooks, otel) {
-	const { recorder } = otel;
-	hooks.event = async ({ event }) => {
-		recorder.onEvent(event);
-	};
-	hooks["chat.message"] = async (chatInput, chatOutput) => {
-		recorder.onChatMessage(chatInput, chatOutput);
-	};
-	hooks["tool.execute.before"] = async (toolInput) => {
-		recorder.onToolBefore(toolInput);
-	};
-	hooks["tool.execute.after"] = async (toolInput, toolOutput) => {
-		recorder.onToolAfter(toolInput, toolOutput);
-	};
-	hooks["chat.params"] = async (paramsInput, paramsOutput) => {
-		recorder.onChatParams(paramsInput, paramsOutput);
-	};
-	hooks["permission.ask"] = async (permissionInput, permissionOutput) => {
-		recorder.onPermissionAsk(permissionInput, permissionOutput);
-	};
-	hooks["experimental.text.complete"] = async (textInput, textOutput) => {
-		recorder.onTextComplete(textInput, textOutput);
-	};
-	hooks["experimental.compaction.autocontinue"] = async (compactionInput, compactionOutput) => {
-		recorder.onCompactionAutocontinue(compactionInput, compactionOutput);
+		recorder,
+		version
 	};
 }
+const propagator = new W3CTraceContextPropagator();
+/**
+* Subscribe to the host event stream and drive the recorder. Only the event
+* types the adapter understands are requested.
+*/
+const OTEL_EVENT_TYPES = [
+	"session.created",
+	"session.deleted",
+	"session.step.started",
+	"session.step.ended",
+	"session.step.failed",
+	"session.text.ended",
+	"session.retry.scheduled",
+	"session.compaction.ended",
+	"session.execution.succeeded",
+	"session.execution.failed",
+	"session.execution.interrupted",
+	"permission.asked",
+	"permission.replied",
+	"vcs.branch.updated",
+	"installation.updated"
+];
 /**
-* Create the `@vymalo/opencode-lightbridge` umbrella plugin (ADR-0012): ONE
-* shared `TokenRuntime`, built once from `auth`, drives both the gateway
-* bearer (`gateway`) and the OTEL export credential (`otel`) — each module
-* activates independently, and an `auth`-only config is a valid, inert
-* plugin. `config` runs both modules' config-time logic (host log level +
-* OTEL trace propagation); `chat.headers` is the gateway injector;
-* `event`/`chat.message`/`tool.execute.*`/`chat.params`/`permission.ask`/
-* `experimental.*` are the OTEL observers.
+* Create the `@vymalo/opencode-lightbridge` umbrella plugin (ADR-0012,
+* ADR-0017) for the OpenCode v2 plugin API (ADR-0019): ONE shared
+* `TokenRuntime`, built once from `auth`, drives both the gateway bearer
+* (`gateway`) and the OTEL export credential (`otel`) — each module activates
+* independently, and an `auth`-only config is a valid, inert plugin.
+*
+*  - `register`: `provider.transform` registers the provider and merges the
+*    discovered models and cached bearer; a queued background build runs the
+*    `ProviderModelSyncEngine` and calls `provider.reload()` (the transform is
+*    synchronous and cheap by contract — same shape as oauth2).
+*  - `gateway`: `session.hook("model.request")` injects the shared bearer and
+*    fails closed by dying the request when no bearer can be produced.
+*  - `otel`: `event.subscribe` + `prompt`/`context`/`tool`/`permission` hooks
+*    feed the recorder through `otel-adapter.ts`; `http.request` carries W3C
+*    trace context.
 */
 export function createLightbridgePlugin(factoryOptions = {}) {
-	return async (input, pluginOptions) => {
-		let currentLogLevel = DEFAULT_LOG_LEVEL;
-		const logger = factoryOptions.logger ?? createOpenCodeLogger(input.client, () => currentLogLevel);
-		let parsed;
-		try {
-			parsed = parseLightbridgeOptions(pluginOptions);
-		} catch (error) {
-			// A malformed config must not take down every other plugin's load —
-			// log and return inert hooks rather than throwing out of the factory.
-			logger.error("lightbridge_config_invalid", { error: describeError(error) });
-			return { config: async (hostConfig) => {
-				currentLogLevel = fromOpenCodeLogLevel(hostConfig.logLevel) ?? DEFAULT_LOG_LEVEL;
-			} };
-		}
-		const wantsProjectToken = needsProjectToken(parsed);
-		if (wantsProjectToken && !parsed.projectId) {
-			// `projectId` is fully optional — the exchange omits `project_id` and the
-			// backend mints a token for the caller's default project (ADR-0012).
-			logger.info("lightbridge_default_project", {
-				gateway: Boolean(parsed.gateway),
-				otel: Boolean(parsed.otel)
-			});
-		}
-		// The ONE shared runtime (ADR-0012) — constructed exactly once whenever a
-		// module (gateway/otel) needs a token, reused by both the gateway injector
-		// and the OTEL token source below. `projectId` is optional (undefined →
-		// default project). `undefined` runtime only for an auth-only config.
-		const buildRuntime = factoryOptions.runtimeFactory ?? ((auth, pid, options) => new LightbridgeRuntime(auth, pid, options));
-		const sharedRuntime = wantsProjectToken ? buildRuntime(parsed.auth, parsed.projectId, {
-			logger,
-			fetchImpl: factoryOptions.fetchImpl,
-			onAuthorizationUrl: factoryOptions.onAuthorizationUrl,
-			cacheDir: factoryOptions.cacheDir,
-			tokenExpirySkewMs: factoryOptions.tokenExpirySkewMs,
-			exchange: parsed.gateway?.exchange ?? false
-		}) : undefined;
-		const hooks = {};
-		// ---- register module (ADR-0017 requirement 1) ----
-		const registerState = {
-			started: false,
-			skippedForConflict: false
-		};
-		// ---- gateway module ----
-		// `sharedRuntime` is always defined here: it is built whenever `gateway`
-		// or `otel` is configured (`wantsProjectToken`).
-		if (parsed.gateway && sharedRuntime) {
-			hooks["chat.headers"] = createGatewayChatHeaders(new Set(parsed.gateway.providers), sharedRuntime, logger);
-		}
-		// ---- otel module ----
-		let otel;
-		if (parsed.otel) {
-			const otelConfig = resolveOtelConfig(parsed.otel, factoryOptions.env ?? process.env);
-			if (otelConfig.active) {
-				warnIfTokenCommandConfigIgnored(parsed.otel, factoryOptions.env ?? process.env, logger);
-				otel = await buildOtelModule(input, otelConfig, logger, factoryOptions, sharedRuntime);
-				registerOtelHooks(hooks, otel);
-			} else {
-				logger.info("lightbridge_otel_inactive", {
-					enabled: otelConfig.enabled,
-					reason: otelConfig.enabled ? "no_exporter_configured" : "disabled"
+	return Plugin.define({
+		id: PLUGIN_ID,
+		effect: Effect.fn(function* (ctx) {
+			// v2 gives plugins no `config` object: this plugin's own `logLevel`
+			// option, then the host's `OPENCODE_LOG_LEVEL`.
+			const logLevel = resolveLogLevel(ctx.options.logLevel) ?? resolveLogLevel(process.env.OPENCODE_LOG_LEVEL) ?? DEFAULT_LOG_LEVEL;
+			// Captured INSIDE the plugin's own Effect so records reach the host's file
+			// logger and not the terminal (ADR-0014 / ADR-0019).
+			const hostContext = yield* captureHostContext;
+			const logger = factoryOptions.logger ?? createEffectLogger(hostContext, () => logLevel);
+			let parsed;
+			try {
+				parsed = parseLightbridgeOptions(ctx.options);
+			} catch (error) {
+				// A malformed config must not take down every other plugin's load —
+				// log and register nothing rather than throwing out of the plugin.
+				logger.error("lightbridge_config_invalid", { error: describeError(error) });
+				return;
+			}
+			const wantsProjectToken = needsProjectToken(parsed);
+			if (wantsProjectToken && !parsed.projectId) {
+				// `projectId` is fully optional — the exchange omits `project_id` and the
+				// backend mints a token for the caller's default project (ADR-0012).
+				logger.info("lightbridge_default_project", {
+					gateway: Boolean(parsed.gateway),
+					otel: Boolean(parsed.otel)
 				});
 			}
-		}
-		hooks.config = async (hostConfig) => {
-			currentLogLevel = fromOpenCodeLogLevel(hostConfig.logLevel) ?? DEFAULT_LOG_LEVEL;
+			// The ONE shared runtime (ADR-0012) — constructed exactly once whenever a
+			// module (gateway/otel) needs a token, reused by both the gateway injector
+			// and the OTEL token source below. `undefined` only for a register/auth-only
+			// config.
+			const buildRuntime = factoryOptions.runtimeFactory ?? ((auth, pid, options) => new LightbridgeRuntime(auth, pid, options));
+			const sharedRuntime = wantsProjectToken ? buildRuntime(parsed.auth, parsed.projectId, {
+				logger,
+				fetchImpl: factoryOptions.fetchImpl,
+				onAuthorizationUrl: factoryOptions.onAuthorizationUrl,
+				cacheDir: factoryOptions.cacheDir,
+				tokenExpirySkewMs: factoryOptions.tokenExpirySkewMs,
+				exchange: parsed.gateway?.exchange ?? false
+			}) : undefined;
+			const reloadProviders = () => runInHost(hostContext, ctx.provider.reload());
+			// ---- register module (ADR-0017 requirement 1) ----
+			let engine;
+			let registerChain = Promise.resolve();
+			// A build has been queued for the current non-collision stretch.
+			let registerQueued = false;
+			// oauth2 owns the provider id: register must neither build nor run an engine.
+			let registerSuppressed = false;
+			let skipLogged = false;
+			let registerBearer;
+			const stamped = new Map();
+			const stopEngine = () => {
+				engine?.stop();
+				engine = undefined;
+				registerBearer = undefined;
+			};
+			const buildRegisterEngine = async (register) => {
+				// The collision may have been detected after this build was queued.
+				if (registerSuppressed) {
+					return;
+				}
+				const next = new ProviderModelSyncEngine({
+					servers: [buildRegisterServerConfig(parsed.auth, register)],
+					cacheNamespace: ROOT_CACHE_NAMESPACE
+				}, {
+					logger,
+					fetchImpl: factoryOptions.fetchImpl,
+					onAuthorizationUrl: factoryOptions.onAuthorizationUrl,
+					cacheDir: factoryOptions.cacheDir ? join(factoryOptions.cacheDir, ROOT_CACHE_SEGMENT, ROOT_CACHE_NAMESPACE) : undefined,
+					cacheNamespaceSegment: ROOT_CACHE_SEGMENT,
+					serviceLabel: "opencode-lightbridge"
+				});
+				await next.initialize();
+				if (registerSuppressed) {
+					return;
+				}
+				await next.start({ warmup: true });
+				if (registerSuppressed) {
+					// oauth2 claimed the id while we warmed up: release our scheduler slot.
+					next.stop();
+					return;
+				}
+				engine = next;
+				registerBearer = await resolveCachedBearer(parsed.auth.id, next, logger);
+				// Models and bearer are now known: ask the host to re-run transforms.
+				await reloadProviders();
+			};
 			if (parsed.register) {
-				await applyRegisterModule(hostConfig, parsed.register, parsed.auth, registerState, logger, factoryOptions);
+				const register = parsed.register;
+				const providerId = parsed.auth.id;
+				factoryOptions.onRegister?.({
+					async settled() {
+						let current;
+						do {
+							current = registerChain;
+							await current;
+						} while (current !== registerChain);
+					},
+					engine: () => engine
+				});
+				yield* ctx.provider.transform((editor) => {
+					if (hasOAuth2Conflict(editor, providerId)) {
+						registerSuppressed = true;
+						registerQueued = false;
+						stopEngine();
+						if (!skipLogged) {
+							skipLogged = true;
+							logger.debug("lightbridge_register_skipped_oauth2_conflict", { providerId });
+						}
+						return;
+					}
+					registerSuppressed = false;
+					upsertRegisteredProvider(editor, providerId, register, logger);
+					let modelCount = 0;
+					if (engine) {
+						try {
+							const models = engine.getServerModels(providerId);
+							modelCount = models.length;
+							if (models.length > 0) {
+								mergeDiscoveredModels(editor, providerId, models);
+							}
+						} catch {}
+					}
+					propagateCachedBearer(editor, providerId, registerBearer, logger, stamped);
+					logger.trace("lightbridge_register_config_applied", {
+						providerId,
+						modelCount
+					});
+					if (!registerQueued) {
+						registerQueued = true;
+						registerChain = registerChain.then(() => buildRegisterEngine(register)).catch((error) => {
+							// A failed build must not wedge the queue; a later distinct pass retries.
+							registerQueued = false;
+							logger.error("lightbridge_register_build_failed", { error: errorMessage(error) });
+						});
+					}
+				});
 			}
-			if (otel?.config.propagateTraceContext) {
-				const activeOtel = otel;
-				const wrapped = installTracePropagation(hostConfig, {
-					getContext: () => activeOtel.recorder.currentChatContext(),
-					logger
+			// ---- gateway module ----
+			// `sharedRuntime` is always defined here: it is built whenever `gateway`
+			// or `otel` is configured (`wantsProjectToken`).
+			if (parsed.gateway && sharedRuntime) {
+				const providers = new Set(parsed.gateway.providers);
+				const runtime = sharedRuntime;
+				// `gateway` never stamps a bearer onto the provider record, so a stale
+				// value cannot ride out of the record. It can still coexist with a
+				// `register` stamp (the raw IdP token) or an oauth2 stamp for the same
+				// provider; to keep that from leaking through when this module's own
+				// token (notably the RFC 8693 exchange, a remote call) cannot be
+				// produced, a failure here kills the request rather than leaving the
+				// stamped header in place — the same fail-closed mechanism oauth2 uses.
+				yield* ctx.session.hook("model.request", (event) => {
+					const providerId = event.model.providerID;
+					if (!providers.has(providerId)) {
+						logger.trace("lightbridge_gateway_model_request_skipped", { providerId });
+						return Effect.void;
+					}
+					return Effect.tryPromise({
+						try: async () => {
+							const token = await runtime.getProjectToken({ interactive: true });
+							// Header names are case-insensitive: drop any variant already set
+							// (a stamped record header, the placeholder key's, a lowercase copy).
+							for (const key of Object.keys(event.headers)) {
+								if (key.toLowerCase() === "authorization") {
+									delete event.headers[key];
+								}
+							}
+							event.headers.Authorization = `${token.tokenType || "Bearer"} ${token.accessToken}`;
+							logger.trace("lightbridge_gateway_bearer_injected", { providerId });
+						},
+						catch: (error) => error
+					}).pipe(Effect.tapError((error) => Effect.sync(() => logger.warn("lightbridge_gateway_no_bearer", {
+						providerId,
+						error: errorMessage(error)
+					}))), Effect.orDie);
 				});
-				logger.debug("lightbridge_otel_trace_propagation_ready", { providerCount: wrapped });
 			}
-		};
-		logger.info("lightbridge_plugin_ready", {
-			gateway: Boolean(hooks["chat.headers"]),
-			exchange: parsed.gateway?.exchange ?? false,
-			otel: Boolean(otel),
-			register: Boolean(parsed.register),
-			projectId: parsed.projectId ?? (wantsProjectToken ? "(default)" : undefined)
-		});
-		return hooks;
-	};
+			// ---- otel module ----
+			let otel;
+			if (parsed.otel) {
+				const env = factoryOptions.env ?? process.env;
+				const otelConfig = resolveOtelConfig(parsed.otel, env);
+				if (otelConfig.active) {
+					warnIfTokenCommandConfigIgnored(parsed.otel, env, logger);
+					const built = yield* Effect.promise(() => buildOtelModule({
+						directory: ctx.location.directory,
+						projectId: ctx.location.project?.id
+					}, otelConfig, logger, factoryOptions, sharedRuntime));
+					otel = built;
+					const { recorder } = built;
+					const adapter = new OtelEventAdapter(recorder, factoryOptions.now);
+					yield* Effect.forkScoped(Stream.runForEach(ctx.event.subscribe({ types: OTEL_EVENT_TYPES }), (event) => Effect.sync(() => adapter.handle(event))).pipe(Effect.tapError((error) => Effect.sync(() => logger.warn("lightbridge_otel_event_stream_failed", { error: errorMessage(error) }))), Effect.ignore));
+					yield* ctx.session.hook("prompt", (event) => Effect.sync(() => {
+						const [input, output] = adaptPrompt(event);
+						recorder.onChatMessage(input, output);
+					}));
+					yield* ctx.session.hook("context", (event) => Effect.sync(() => {
+						const [input, output] = adaptContext(event);
+						recorder.onChatParams(input, output);
+					}));
+					yield* ctx.tool.hook("execute.before", (event) => Effect.sync(() => recorder.onToolBefore(adaptToolBefore(event))));
+					yield* ctx.tool.hook("execute.after", (event) => Effect.sync(() => {
+						const [input, output] = adaptToolAfter({
+							tool: event.tool,
+							sessionID: event.sessionID,
+							id: event.id,
+							status: event.status,
+							result: event.status === "completed" ? event.result : undefined
+						});
+						recorder.onToolAfter(input, output);
+					}));
+					yield* ctx.permission.hook("evaluate", (event) => Effect.sync(() => {
+						const [input, output] = adaptPermission(event);
+						recorder.onPermissionAsk(input, output);
+					}));
+					if (otelConfig.propagateTraceContext) {
+						// v1 wrapped `provider.options.fetch`; `Provider.Info` has no `fetch`,
+						// so the trace context rides the outgoing request instead.
+						yield* ctx.session.hook("http.request", (event) => Effect.sync(() => {
+							const context = recorder.currentChatContext();
+							if (!context) {
+								return;
+							}
+							const carrier = {};
+							propagator.inject(context, carrier, defaultTextMapSetter);
+							for (const [key, value] of Object.entries(carrier)) {
+								// Never clobber an upstream traceparent.
+								if (!event.request.headers.has(key)) {
+									event.request.headers.set(key, value);
+								}
+							}
+						}));
+						logger.debug("lightbridge_otel_trace_propagation_ready", {});
+					}
+				} else {
+					logger.info("lightbridge_otel_inactive", {
+						enabled: otelConfig.enabled,
+						reason: otelConfig.enabled ? "no_exporter_configured" : "disabled"
+					});
+				}
+			}
+			yield* Effect.addFinalizer(() => Effect.sync(() => {
+				stopEngine();
+				// A real shutdown signal from the host: drain the exporters.
+				otel?.recorder.onEvent({ type: "server.instance.disposed" });
+			}));
+			logger.info("lightbridge_plugin_ready", {
+				gateway: Boolean(parsed.gateway && sharedRuntime),
+				exchange: parsed.gateway?.exchange ?? false,
+				otel: Boolean(otel),
+				register: Boolean(parsed.register),
+				projectId: parsed.projectId ?? (wantsProjectToken ? "(default)" : undefined)
+			});
+		})
+	});
 }
 export const LightbridgePlugin = createLightbridgePlugin();
 export default LightbridgePlugin;