@vymalo/opencode-lightbridge 0.17.0 → 0.18.0

package/README.md

@@ -31,30 +31,36 @@ npm install @vymalo/opencode-lightbridge
 ```jsonc
 // opencode.json
 {
-  "plugin": [
-    ["@vymalo/opencode-lightbridge", {
-      "auth": {
-        "id": "lightbridge",
-        "issuer": "https://authz.example.com/realms/lightbridge",
-        "clientId": "opencode-cli",
-        "scopes": ["openid", "offline_access"],
-        "authFlow": "device_code"
-      },
-      "gateway": {
-        "providers": ["gateway"],
-        "exchange": false
-      },
-      "otel": {
-        "endpoint": "http://localhost:4318"
-      },
-      "register": {
-        "baseURL": "https://gateway.example.com/v1"
+  "plugins": [
+    {
+      "package": "@vymalo/opencode-lightbridge",
+      "options": {
+        "auth": {
+          "id": "lightbridge",
+          "issuer": "https://authz.example.com/realms/lightbridge",
+          "clientId": "opencode-cli",
+          "scopes": ["openid", "offline_access"],
+          "authFlow": "device_code"
+        },
+        "gateway": {
+          "providers": ["gateway"],
+          "exchange": false
+        },
+        "otel": {
+          "endpoint": "http://localhost:4318"
+        },
+        "register": {
+          "baseURL": "https://gateway.example.com/v1"
+        }
       }
-    }]
+    }
   ]
 }
 ```
 
+If you also run `@vymalo/opencode-oauth2`, list it **before** lightbridge: lightbridge detects an
+oauth2-managed provider id from the `settings.oauth2` marker oauth2 stamps on the provider record.
+
 - **`auth`** (required) — the one IdP login, an `AuthServerConfigInput` (same shape as
   `opencode-oauth2`/`opencode-repo-auth`'s per-provider auth block). `auth.id` also doubles as the
   OpenCode provider id `register` uses and the shared cache identity (see below).
@@ -106,3 +112,37 @@ for the full reasoning.
 ## License
 
 MIT
+
+## Migrating from v1
+
+`0.18.0` targets the OpenCode **v2** plugin API; `0.17.x` was the last v1 release. See
+[ADR-0019](https://github.com/ADORSYS-GIS/lightbridge-opencode-toolbeit/blob/main/docs/adr/0019-opencode-v2-cutover.md)
+for why there is no dual-support build.
+
+| v1 | v2 |
+| --- | --- |
+| `"plugin": [["@vymalo/opencode-lightbridge", { ... }]]` | `"plugins": [{ "package": "@vymalo/opencode-lightbridge", "options": { ... } }]` |
+| `config.provider[<auth.id>]` registered by `register` | provider editor: `package: "aisdk:@ai-sdk/openai-compatible"`, `settings.baseURL` |
+| `chat.headers` (gateway bearer) | `session.hook("model.request")` |
+| OTEL observers (`event`, `chat.message`, `tool.execute.*`, …) | `event.subscribe` + `prompt` / `context` / `tool` / `permission` hooks |
+| trace propagation via `options.fetch` | `session.hook("http.request")` |
+| host `config.logLevel` | `options.logLevel`, else `OPENCODE_LOG_LEVEL` |
+| oauth2 collision via `pluginConfig` / `options.oauth2` | `settings.oauth2` marker on the provider record |
+
+The `auth`, `gateway`, `otel` and `register` option blocks are unchanged, as is every event name
+except where listed below.
+
+### Behaviour changes in v2
+
+- **Gateway failures now refuse the request.** A failed token resolution used to leave the request
+  to go out bearer-less (the gateway 401'd); it now dies the hook so a stale stamped `Authorization`
+  cannot ride along (`lightbridge_gateway_no_bearer`, now `warn`).
+- **List oauth2 before lightbridge** so the oauth2 collision marker is visible on the first pass.
+- **`session.diff`, `todo.updated` and `command.executed` are no longer observed** (no v2 mapping):
+  the lines-of-code metric and `opencode.file_edited` event stop being produced.
+- `experimental.compaction.autocontinue` is gone with no v2 equivalent.
+- `./lib` drops `oauth2ManagedProviderIds` and `OpenCodeConfigLike`; `hasOAuth2Conflict` now takes
+  a provider editor.
+
+The full list is in
+[`docs/lightbridge.md`](https://github.com/ADORSYS-GIS/lightbridge-opencode-toolbeit/blob/main/docs/lightbridge.md#behaviour-changes-in-v2).

package/dist/config.d.ts

@@ -47,7 +47,7 @@ export interface LightbridgeRegisterOptions {
 	syncIntervalMinutes?: number;
 	/**
 	* Route inference through the OpenAI Responses API instead of Chat
-	* Completions — see `@vymalo/opencode-provider-sync`'s `resolveProviderNpm`.
+	* Completions — see `@vymalo/opencode-provider-sync`'s `resolveProviderPackage`.
 	*/
 	responseApi?: boolean;
 }
@@ -99,20 +99,23 @@ export declare function parseLightbridgeOptions(raw: unknown): ParsedLightbridge
 * `ProviderModelSyncEngine`, not `LightbridgeRuntime`.
 */
 export declare function needsProjectToken(options: ParsedLightbridgeOptions): boolean;
-export interface OpenCodeConfigLike {
-	provider?: unknown;
-	pluginConfig?: unknown;
+/** The slice of a `ProviderEditor` the collision guard reads. */
+export interface ProviderLookup {
+	get(id: string): {
+		readonly provider: {
+			readonly settings?: unknown;
+		};
+	} | undefined;
 }
 /**
-* Provider ids managed by `@vymalo/opencode-oauth2` via its
-* `pluginConfig.oauth2ModelSync.servers` channel.
+* Whether `providerId` is (also) managed by `@vymalo/opencode-oauth2`, judged
+* from the provider record's `settings.oauth2` / `settings.oauth2ModelSync`
+* block. Used by lightbridge's `register` module to skip registering or owning
+* a provider oauth2 already claims (logged at `debug`).
+*
+* Order-sensitive: oauth2 stamps its marker inside its own provider transform,
+* so oauth2 must be listed BEFORE lightbridge in `plugin` for lightbridge to
+* see it on the first pass. A later pass (oauth2's own `provider.reload()`)
+* still detects it and lightbridge then stands its engine down.
 */
-export declare function oauth2ManagedProviderIds(config: OpenCodeConfigLike): Set<string>;
-/**
-* Whether `providerId` is (also) managed by `@vymalo/opencode-oauth2` —
-* either via that provider's own `options.oauth2` / `options.oauth2ModelSync`
-* block, or via the `pluginConfig.oauth2ModelSync.servers` channel. Used by
-* lightbridge's `register` module to skip registering/owning a provider
-* oauth2 already claims (logged at `debug` — see `opencode.ts`).
-*/
-export declare function hasOAuth2Conflict(config: OpenCodeConfigLike, providerId: string): boolean;
+export declare function hasOAuth2Conflict(editor: ProviderLookup, providerId: string): boolean;

package/dist/config.js

@@ -124,47 +124,28 @@ export function needsProjectToken(options) {
 //
 // If a developer configures BOTH `@vymalo/opencode-oauth2` and lightbridge's
 // `register` block against the SAME OpenCode provider id, they must not both
-// register/own it — mirrors `@vymalo/opencode-repo-auth`'s
-// `hasOAuth2Conflict`/`oauth2ManagedProviderIds` (which defers to oauth2 the
-// same way). Kept as a lightbridge-local copy rather than a shared import:
-// each consumer's own config-key literals are intentionally NOT centralized
+// register/own it. v1 read oauth2's private `pluginConfig` off the shared
+// config object; v2 plugins cannot see each other's options, so the signal is
+// the provider RECORD: oauth2 stamps `settings.oauth2` (a user block, or the
+// marker `{ managed: true, source: "options.servers" }`) on every provider it
+// manages. Kept as a lightbridge-local literal rather than a shared import:
+// each consumer's own settings-key literals are intentionally NOT centralized
 // (see `@vymalo/opencode-provider-sync`'s `opencode-helpers.ts` module doc).
-const OAUTH2_OPTION_KEYS = ["oauth2", "oauth2ModelSync"];
+const OAUTH2_SETTINGS_KEYS = ["oauth2", "oauth2ModelSync"];
 /**
-* Provider ids managed by `@vymalo/opencode-oauth2` via its
-* `pluginConfig.oauth2ModelSync.servers` channel.
+* Whether `providerId` is (also) managed by `@vymalo/opencode-oauth2`, judged
+* from the provider record's `settings.oauth2` / `settings.oauth2ModelSync`
+* block. Used by lightbridge's `register` module to skip registering or owning
+* a provider oauth2 already claims (logged at `debug`).
+*
+* Order-sensitive: oauth2 stamps its marker inside its own provider transform,
+* so oauth2 must be listed BEFORE lightbridge in `plugin` for lightbridge to
+* see it on the first pass. A later pass (oauth2's own `provider.reload()`)
+* still detects it and lightbridge then stands its engine down.
 */
-export function oauth2ManagedProviderIds(config) {
-	const ids = new Set();
-	const pluginConfig = isRecord(config.pluginConfig) ? config.pluginConfig : undefined;
-	const oauth2ModelSync = isRecord(pluginConfig?.oauth2ModelSync) ? pluginConfig?.oauth2ModelSync : undefined;
-	const servers = oauth2ModelSync?.servers;
-	if (Array.isArray(servers)) {
-		for (const raw of servers) {
-			const entry = isRecord(raw) ? raw : undefined;
-			const id = typeof entry?.id === "string" ? entry.id : undefined;
-			if (id) {
-				ids.add(id);
-			}
-		}
-	}
-	return ids;
-}
-/**
-* Whether `providerId` is (also) managed by `@vymalo/opencode-oauth2` —
-* either via that provider's own `options.oauth2` / `options.oauth2ModelSync`
-* block, or via the `pluginConfig.oauth2ModelSync.servers` channel. Used by
-* lightbridge's `register` module to skip registering/owning a provider
-* oauth2 already claims (logged at `debug` — see `opencode.ts`).
-*/
-export function hasOAuth2Conflict(config, providerId) {
-	const providers = isRecord(config.provider) ? config.provider : undefined;
-	const providerEntry = providers ? providers[providerId] : undefined;
-	const providerOptions = isRecord(providerEntry) && isRecord(providerEntry.options) ? providerEntry.options : undefined;
-	if (providerOptions && OAUTH2_OPTION_KEYS.some((key) => isRecord(providerOptions[key]))) {
-		return true;
-	}
-	return oauth2ManagedProviderIds(config).has(providerId);
+export function hasOAuth2Conflict(editor, providerId) {
+	const settings = editor.get(providerId)?.provider.settings;
+	return isRecord(settings) && OAUTH2_SETTINGS_KEYS.some((key) => isRecord(settings[key]));
 }
 
 //# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -1 +1 @@
-{"mappings":"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","names":[],"sources":["../src/config.ts"],"version":3,"file":"config.js","sourceRoot":""}
+{"mappings":"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","names":[],"sources":["../src/config.ts"],"version":3,"file":"config.js","sourceRoot":""}

package/dist/lib.d.ts

@@ -1,4 +1,4 @@
-export { createLightbridgePlugin, LightbridgePlugin, type LightbridgePluginFactoryOptions } from "./opencode.js";
+export { createLightbridgePlugin, LightbridgePlugin, PLUGIN_ID, type LightbridgePluginFactoryOptions, type LightbridgeRegisterHandle } from "./opencode.js";
 export { LightbridgeRuntime, LIGHTBRIDGE_IDENTITY, DEFAULT_CACHE_NAMESPACE, DEFAULT_PROJECT_KEY, ROOT_CACHE_NAMESPACE, ROOT_CACHE_SEGMENT, lightbridgeCacheDir, rootCacheDir, type LightbridgeRuntimeFactory, type LightbridgeRuntimeLike, type LightbridgeRuntimeOptions } from "./plugin.js";
-export { hasOAuth2Conflict, needsProjectToken, oauth2ManagedProviderIds, parseLightbridgeOptions, type LightbridgeGatewayOptions, type LightbridgeOptions, type LightbridgeRegisterOptions, type OpenCodeConfigLike, type ParsedLightbridgeOptions } from "./config.js";
+export { hasOAuth2Conflict, needsProjectToken, parseLightbridgeOptions, type LightbridgeGatewayOptions, type LightbridgeOptions, type LightbridgeRegisterOptions, type ParsedLightbridgeOptions, type ProviderLookup } from "./config.js";
 export { migrateRootTokenIfNeeded } from "./migration.js";

package/dist/lib.js

@@ -1,6 +1,6 @@
-export { createLightbridgePlugin, LightbridgePlugin } from "./opencode.js";
+export { createLightbridgePlugin, LightbridgePlugin, PLUGIN_ID } from "./opencode.js";
 export { LightbridgeRuntime, LIGHTBRIDGE_IDENTITY, DEFAULT_CACHE_NAMESPACE, DEFAULT_PROJECT_KEY, ROOT_CACHE_NAMESPACE, ROOT_CACHE_SEGMENT, lightbridgeCacheDir, rootCacheDir } from "./plugin.js";
-export { hasOAuth2Conflict, needsProjectToken, oauth2ManagedProviderIds, parseLightbridgeOptions } from "./config.js";
+export { hasOAuth2Conflict, needsProjectToken, parseLightbridgeOptions } from "./config.js";
 export { migrateRootTokenIfNeeded } from "./migration.js";
 
 //# sourceMappingURL=lib.js.map

package/dist/lib.js.map

@@ -1 +1 @@
-{"mappings":"AAAA,SACE,yBACA,yBAEK;AAEP,SACE,oBACA,sBACA,yBACA,qBACA,sBACA,oBACA,qBACA,oBAIK;AAEP,SACE,mBACA,mBACA,0BACA,+BAMK;AAEP,SAAS,gCAAgC","names":[],"sources":["../src/lib.ts"],"version":3,"file":"lib.js","sourceRoot":""}
+{"mappings":"AAAA,SACE,yBACA,mBACA,iBAGK;AAEP,SACE,oBACA,sBACA,yBACA,qBACA,sBACA,oBACA,qBACA,oBAIK;AAEP,SACE,mBACA,mBACA,+BAMK;AAEP,SAAS,gCAAgC","names":[],"sources":["../src/lib.ts"],"version":3,"file":"lib.js","sourceRoot":""}

package/dist/logging.d.ts

@@ -0,0 +1,44 @@
+import { createJsonConsoleLogger, LOG_LEVEL_PRIORITY, type LogFields, type Logger, type LogLevel } from "@vymalo/opencode-auth-core/lib";
+import { type Context as EffectContext, Effect } from "effect";
+import { DEFAULT_LOG_LEVEL } from "@vymalo/opencode-auth-core/lib";
+export { createJsonConsoleLogger, DEFAULT_LOG_LEVEL, LOG_LEVEL_PRIORITY };
+export type { LogFields, Logger, LogLevel };
+/**
+* Capture the host's Effect context from inside the plugin's own fiber. The
+* returned value is what {@link createEffectLogger} (and {@link runInHost})
+* needs to put a record on the host's logger rather than on a default one.
+*
+* OpenCode installs its file logger as a `Logger.layer(...)` on the runtime
+* that runs plugin setup, and Effect carries loggers as fiber-level references
+* — so the context captured here is the only route to that sink. A bare
+* `Effect.runFork` would log to Effect's default logger (the terminal) instead,
+* which is exactly what ADR-0014 forbids.
+*/
+export declare const captureHostContext: Effect.Effect<EffectContext.Context<never>>;
+/**
+* Structured logger that writes through the host's Effect logger — the v2
+* replacement for v1's `client.app.log`.
+*
+* ADR-0014 (no plugin writes to the user's TUI) is preserved: OpenCode's own
+* logger is a `Logger.toFile` sink over the shared `opencode-<channel>.log`,
+* so records land in the host log stream and never on the terminal. The event
+* name becomes the log message and `fields` become log annotations.
+*
+* Host-side severity filtering is Effect's job (`OPENCODE_LOG_LEVEL`); the
+* `getMinLevel` gate here is only this plugin's own `logLevel` option, applied
+* before the record is built so a filtered-out call costs nothing.
+*/
+export declare function createEffectLogger(context: EffectContext.Context<never>, getMinLevel: () => LogLevel): Logger;
+/**
+* Run an Effect from a detached callback (a timer, a promise continuation)
+* inside the captured host context, so anything it logs reaches the host
+* logger instead of Effect's default one (ADR-0014).
+*/
+export declare function runInHost(context: EffectContext.Context<never>, effect: Effect.Effect<void>): Promise<void>;
+/**
+* Resolve this plugin's log level from its own `logLevel` option, falling back
+* to the host's `OPENCODE_LOG_LEVEL` env var. v2 gives plugins no `config`
+* object, so the v1 `config.logLevel` channel is gone. Replaces v1's
+* `fromOpenCodeLogLevel`.
+*/
+export declare function resolveLogLevel(value: unknown): LogLevel | undefined;

package/dist/logging.js

@@ -0,0 +1,100 @@
+import { createJsonConsoleLogger, LOG_LEVEL_PRIORITY } from "@vymalo/opencode-auth-core/lib";
+import { Effect } from "effect";
+import { DEFAULT_LOG_LEVEL } from "@vymalo/opencode-auth-core/lib";
+export { createJsonConsoleLogger, DEFAULT_LOG_LEVEL, LOG_LEVEL_PRIORITY };
+function redactFields(fields) {
+	if (!fields) {
+		return undefined;
+	}
+	const redacted = {};
+	for (const [key, value] of Object.entries(fields)) {
+		if (/token|secret|password|authorization/i.test(key)) {
+			redacted[key] = "[redacted]";
+			continue;
+		}
+		redacted[key] = value;
+	}
+	return redacted;
+}
+/**
+* Capture the host's Effect context from inside the plugin's own fiber. The
+* returned value is what {@link createEffectLogger} (and {@link runInHost})
+* needs to put a record on the host's logger rather than on a default one.
+*
+* OpenCode installs its file logger as a `Logger.layer(...)` on the runtime
+* that runs plugin setup, and Effect carries loggers as fiber-level references
+* — so the context captured here is the only route to that sink. A bare
+* `Effect.runFork` would log to Effect's default logger (the terminal) instead,
+* which is exactly what ADR-0014 forbids.
+*/
+export const captureHostContext = Effect.withFiber((fiber) => Effect.succeed(fiber.context));
+/**
+* Structured logger that writes through the host's Effect logger — the v2
+* replacement for v1's `client.app.log`.
+*
+* ADR-0014 (no plugin writes to the user's TUI) is preserved: OpenCode's own
+* logger is a `Logger.toFile` sink over the shared `opencode-<channel>.log`,
+* so records land in the host log stream and never on the terminal. The event
+* name becomes the log message and `fields` become log annotations.
+*
+* Host-side severity filtering is Effect's job (`OPENCODE_LOG_LEVEL`); the
+* `getMinLevel` gate here is only this plugin's own `logLevel` option, applied
+* before the record is built so a filtered-out call costs nothing.
+*/
+export function createEffectLogger(context, getMinLevel) {
+	// `VYMALO_PLUGIN_CONSOLE_LOG=1` mirrors to stdout for local debugging. Off by
+	// default precisely because stdout is the user's terminal (ADR-0014).
+	const consoleAll = /^(1|true|yes|on)$/i.test(process.env.VYMALO_PLUGIN_CONSOLE_LOG ?? "");
+	const fallback = createJsonConsoleLogger("trace");
+	const write = (level, event, fields) => {
+		if (LOG_LEVEL_PRIORITY[level] < LOG_LEVEL_PRIORITY[getMinLevel()]) {
+			return;
+		}
+		if (consoleAll) {
+			fallback[level](event, fields);
+		}
+		const redacted = redactFields(fields);
+		// Effect has no `trace` severity below `debug`; fold the most-verbose tier
+		// onto debug, as the v1 adapter did for the host log API (ADR-0008).
+		const record = level === "trace" || level === "debug" ? Effect.logDebug(event) : level === "info" ? Effect.logInfo(event) : level === "warn" ? Effect.logWarning(event) : Effect.logError(event);
+		const annotated = redacted ? Effect.annotateLogs(record, redacted) : record;
+		Effect.runFork(Effect.provideContext(annotated, context));
+	};
+	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)
+	};
+}
+/**
+* Run an Effect from a detached callback (a timer, a promise continuation)
+* inside the captured host context, so anything it logs reaches the host
+* logger instead of Effect's default one (ADR-0014).
+*/
+export function runInHost(context, effect) {
+	return Effect.runPromise(Effect.provideContext(effect, context));
+}
+/**
+* Resolve this plugin's log level from its own `logLevel` option, falling back
+* to the host's `OPENCODE_LOG_LEVEL` env var. v2 gives plugins no `config`
+* object, so the v1 `config.logLevel` channel is gone. Replaces v1's
+* `fromOpenCodeLogLevel`.
+*/
+export function resolveLogLevel(value) {
+	if (typeof value !== "string") {
+		return undefined;
+	}
+	switch (value.toUpperCase()) {
+		// DEBUG unlocks the most-verbose `trace` tier (host has no finer level).
+		case "DEBUG":
+		case "TRACE": return "trace";
+		case "INFO": return "info";
+		case "WARN": return "warn";
+		case "ERROR": return "error";
+		default: return undefined;
+	}
+}
+
+//# sourceMappingURL=logging.js.map

package/dist/logging.js.map

@@ -0,0 +1 @@
+{"mappings":"AAAA,SACE,yBACA,0BAIK;AACP,SAAwC,cAAc;AAEtD,SAAS,yBAAyB;AAElC,SAAS,yBAAyB,mBAAmB;AAGrD,SAAS,aAAa,QAA2C;CAC/D,IAAI,CAAC,QAAQ;EACX,OAAO;CACT;CACA,MAAM,WAAsB,CAAC;CAC7B,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,MAAM,GAAG;EACjD,IAAI,uCAAuC,KAAK,GAAG,GAAG;GACpD,SAAS,OAAO;GAChB;EACF;EACA,SAAS,OAAO;CAClB;CACA,OAAO;AACT;;;;;;;;;;;;AAaA,OAAO,MAAM,qBAAkE,OAAO,WACnF,UAAU,OAAO,QAAQ,MAAM,OAAO,CACzC;;;;;;;;;;;;;;AAeA,OAAO,SAAS,mBACd,SACA,aACQ;;;CAGR,MAAM,aAAa,qBAAqB,KAAK,QAAQ,IAAI,6BAA6B,EAAE;CACxF,MAAM,WAAW,wBAAwB,OAAO;CAEhD,MAAM,SAAS,OAAiB,OAAe,WAA6B;EAC1E,IAAI,mBAAmB,SAAS,mBAAmB,YAAY,IAAI;GACjE;EACF;EACA,IAAI,YAAY;GACd,SAAS,MAAM,CAAC,OAAO,MAAM;EAC/B;EAEA,MAAM,WAAW,aAAa,MAAM;;;EAGpC,MAAM,SACJ,UAAU,WAAW,UAAU,UAC3B,OAAO,SAAS,KAAK,IACrB,UAAU,SACR,OAAO,QAAQ,KAAK,IACpB,UAAU,SACR,OAAO,WAAW,KAAK,IACvB,OAAO,SAAS,KAAK;EAE/B,MAAM,YAAY,WAAW,OAAO,aAAa,QAAQ,QAAQ,IAAI;EACrE,OAAO,QAAQ,OAAO,eAAe,WAAW,OAAO,CAAC;CAC1D;CAEA,OAAO;EACL,QAAQ,OAAO,WAAW,MAAM,SAAS,OAAO,MAAM;EACtD,QAAQ,OAAO,WAAW,MAAM,SAAS,OAAO,MAAM;EACtD,OAAO,OAAO,WAAW,MAAM,QAAQ,OAAO,MAAM;EACpD,OAAO,OAAO,WAAW,MAAM,QAAQ,OAAO,MAAM;EACpD,QAAQ,OAAO,WAAW,MAAM,SAAS,OAAO,MAAM;CACxD;AACF;;;;;;AAOA,OAAO,SAAS,UACd,SACA,QACe;CACf,OAAO,OAAO,WAAW,OAAO,eAAe,QAAQ,OAAO,CAAC;AACjE;;;;;;;AAQA,OAAO,SAAS,gBAAgB,OAAsC;CACpE,IAAI,OAAO,UAAU,UAAU;EAC7B,OAAO;CACT;CACA,QAAQ,MAAM,YAAY,GAA1B;;EAEE,KAAK;EACL,KAAK,SACH,OAAO;EACT,KAAK,QACH,OAAO;EACT,KAAK,QACH,OAAO;EACT,KAAK,SACH,OAAO;EACT,SACE,OAAO;CACX;AACF","names":[],"sources":["../src/logging.ts"],"version":3,"file":"logging.js","sourceRoot":""}

package/dist/opencode.d.ts

@@ -1,9 +1,19 @@
-import type { Hooks, Plugin } from "@opencode-ai/plugin";
-import { type Logger } from "@vymalo/opencode-auth-core/lib";
+import { Plugin } from "@opencode/plugin/effect";
 import { type EnvSource, type ExporterFactories } from "@vymalo/opencode-core-otel";
+import { ProviderModelSyncEngine } from "@vymalo/opencode-provider-sync/lib";
+import { type Logger } from "./logging.js";
 import { type LightbridgeRuntimeFactory } from "./plugin.js";
-type OpenCodeConfig = Parameters<NonNullable<Hooks["config"]>>[0];
+/** Stable plugin id. v2 requires one and keys storage/registrations by it. */
+export declare const PLUGIN_ID = "vymalo.lightbridge";
+/** Test/embedder handle onto the `register` module's background engine. */
+export interface LightbridgeRegisterHandle {
+	/** Resolves once every queued engine build + warmup (and its reload) has finished. */
+	settled(): Promise<void>;
+	/** The current engine, or `undefined` before it is ready / after a collision stand-down. */
+	engine(): ProviderModelSyncEngine | undefined;
+}
 export interface LightbridgePluginFactoryOptions {
+	/** Override the logger (tests). Defaults to the host's Effect logger. */
 	logger?: Logger;
 	/** Shared-runtime HTTP client (auth-core `TokenRuntime`). Tests only. */
 	fetchImpl?: typeof fetch;
@@ -17,13 +27,15 @@ export interface LightbridgePluginFactoryOptions {
 	* neither module ever touches the network.
 	*/
 	runtimeFactory?: LightbridgeRuntimeFactory;
+	/** Observe the `register` module's background engine (tests). */
+	onRegister?: (handle: LightbridgeRegisterHandle) => void;
 	/** Injected environment; defaults to `process.env`. */
 	env?: EnvSource;
 	/** Substitute exporters (tests use in-memory ones). */
 	exporters?: ExporterFactories;
 	/** Injectable clock; defaults to `Date.now`. */
 	now?: () => number;
-	/** Skip `beforeExit`/`SIGINT`/`SIGTERM` registration (tests). */
+	/** Skip the `beforeExit`/`SIGINT`/`SIGTERM` exit handlers (tests). See ADR-0018. */
 	registerProcessHandlers?: boolean;
 	/** Override the resolved host metadata (hostname, version) for tests. */
 	hostInfo?: {
@@ -34,16 +46,22 @@ export interface LightbridgePluginFactoryOptions {
 	deferredTimeoutMs?: number;
 }
 /**
-* 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 declare function createLightbridgePlugin(factoryOptions?: LightbridgePluginFactoryOptions): Plugin;
-export declare const LightbridgePlugin: Plugin;
+export declare function createLightbridgePlugin(factoryOptions?: LightbridgePluginFactoryOptions): Plugin.Plugin;
+export declare const LightbridgePlugin: Plugin.Plugin;
 export default LightbridgePlugin;
-export type { OpenCodeConfig };