@vymalo/opencode-otel 0.12.0 → 0.14.0

package/dist/opencode.js

@@ -1,141 +1,184 @@
 import { hostname } from "node:os";
 import { resolveOtelConfig } from "./config.js";
+import { deferredAttribute } from "./deferred.js";
 import { createJsonConsoleLogger, DEFAULT_LOG_LEVEL, fromOpenCodeLogLevel, LOG_LEVEL_PRIORITY } from "./logging.js";
 import { installTracePropagation } from "./propagation.js";
 import { buildResource, createProviders, describeError } from "./providers.js";
 import { TelemetryRecorder } from "./recorder.js";
+import { readVcsInfo } from "./vcs.js";
 const PLUGIN_SERVICE_NAME = "opencode-otel-plugin";
 /**
- * Pipe plugin logs through OpenCode's `client.app.log` so they show up in the
- * host's structured log stream, with the JSON console as a reliable fallback.
- * Mirrors the rest of the suite.
- *
- * Note this is the plugin's *own* diagnostic logging — entirely separate from
- * the OTLP logs signal it exports.
- */
+* Pipe plugin logs through OpenCode's `client.app.log` so they show up in the
+* host's structured log stream, with the JSON console as a reliable fallback.
+* Mirrors the rest of the suite.
+*
+* Note this is the plugin's *own* diagnostic logging — entirely separate from
+* the OTLP logs signal it exports.
+*/
 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 || level === "warn" || level === "error") {
-            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 */
-        });
-    };
-    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)
-    };
+	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 || level === "warn" || level === "error") {
+			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 */
+		});
+	};
+	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)
+	};
 }
 /**
- * Drain buffered telemetry on process exit. The plugin API has no dispose hook,
- * so without this a short CLI invocation loses everything still in a batch
- * processor. Handlers are registered once and never keep the loop alive.
- */
-function registerExitHandlers(providers, logger) {
-    let done = false;
-    const drain = () => {
-        if (done) {
-            return;
-        }
-        done = true;
-        void providers.shutdown().catch((error) => {
-            logger.warn("otel_shutdown_failed", { error: describeError(error) });
-        });
-    };
-    process.once("beforeExit", drain);
-    process.once("SIGINT", drain);
-    process.once("SIGTERM", drain);
+* Drain buffered telemetry on process exit. The plugin API has no dispose hook,
+* so without this a short CLI invocation loses everything still in a batch
+* processor. Handlers are registered once and never keep the loop alive.
+*/
+function registerExitHandlers(providers, logger, deferred) {
+	let done = false;
+	const drain = () => {
+		if (done) {
+			return;
+		}
+		done = true;
+		// Settle any still-pending resource attribute first. Exporters await those
+		// promises, and their timers are `unref`'d — so on `beforeExit` the timer
+		// may never fire and the shutdown would hang, losing everything buffered.
+		for (const attribute of deferred) {
+			attribute.abandon();
+		}
+		void providers.shutdown().catch((error) => {
+			logger.warn("otel_shutdown_failed", { error: describeError(error) });
+		});
+	};
+	process.once("beforeExit", drain);
+	process.once("SIGINT", drain);
+	process.once("SIGTERM", drain);
 }
 export function createOtelPlugin(factoryOptions = {}) {
-    return async (input, pluginOptions) => {
-        let currentLogLevel = DEFAULT_LOG_LEVEL;
-        const logger = factoryOptions.logger ?? createOpenCodeLogger(input.client, () => currentLogLevel);
-        const config = resolveOtelConfig(pluginOptions, factoryOptions.env ?? process.env);
-        if (!config.active) {
-            // No endpoint and no explicit exporter means the plugin was installed but
-            // never configured — cost nothing rather than half-initializing.
-            logger.info("otel_plugin_inactive", {
-                enabled: config.enabled,
-                reason: config.enabled ? "no_exporter_configured" : "disabled"
-            });
-            return {
-                config: async (hostConfig) => {
-                    currentLogLevel = fromOpenCodeLogLevel(hostConfig.logLevel) ?? DEFAULT_LOG_LEVEL;
-                }
-            };
-        }
-        const resource = buildResource(config, {
-            version: factoryOptions.hostInfo?.version,
-            hostname: factoryOptions.hostInfo?.hostname ?? safeHostname(),
-            projectName: input.project?.id,
-            directory: input.directory,
-            worktree: input.worktree
-        });
-        const providers = createProviders(config, resource, logger, factoryOptions.exporters);
-        const recorder = new TelemetryRecorder({
-            providers,
-            config,
-            logger,
-            now: factoryOptions.now
-        });
-        if (factoryOptions.registerProcessHandlers !== false) {
-            registerExitHandlers(providers, logger);
-        }
-        logger.info("otel_plugin_enabled", {
-            serviceName: config.serviceName,
-            exporters: config.exporters,
-            endpoint: config.endpoint,
-            includeSessionId: config.includeSessionId,
-            filteredTools: [...config.filteredTools]
-        });
-        return {
-            config: async (hostConfig) => {
-                currentLogLevel = fromOpenCodeLogLevel(hostConfig.logLevel) ?? DEFAULT_LOG_LEVEL;
-                if (config.propagateTraceContext) {
-                    const wrapped = installTracePropagation(hostConfig, {
-                        getContext: () => recorder.currentChatContext(),
-                        logger
-                    });
-                    logger.debug("otel_trace_propagation_ready", { providerCount: wrapped });
-                }
-            },
-            event: async ({ event }) => {
-                recorder.onEvent(event);
-            },
-            "chat.message": async (chatInput, chatOutput) => {
-                recorder.onChatMessage(chatInput, chatOutput);
-            },
-            "tool.execute.before": async (toolInput) => {
-                recorder.onToolBefore(toolInput);
-            },
-            "tool.execute.after": async (toolInput, toolOutput) => {
-                recorder.onToolAfter(toolInput, toolOutput);
-            }
-        };
-    };
+	return async (input, pluginOptions) => {
+		let currentLogLevel = DEFAULT_LOG_LEVEL;
+		const logger = factoryOptions.logger ?? createOpenCodeLogger(input.client, () => currentLogLevel);
+		const config = resolveOtelConfig(pluginOptions, factoryOptions.env ?? process.env);
+		if (!config.active) {
+			// No endpoint and no explicit exporter means the plugin was installed but
+			// never configured — cost nothing rather than half-initializing.
+			logger.info("otel_plugin_inactive", {
+				enabled: config.enabled,
+				reason: config.enabled ? "no_exporter_configured" : "disabled"
+			});
+			return { config: async (hostConfig) => {
+				currentLogLevel = fromOpenCodeLogLevel(hostConfig.logLevel) ?? DEFAULT_LOG_LEVEL;
+			} };
+		}
+		// `service.version` and the git branch only ever reach a plugin as events
+		// (`installation.updated` / `vcs.branch.updated`), which arrive after the
+		// resource is built. Deferred attributes bridge that, with a bounded wait
+		// so a host that never emits them cannot stall the first export.
+		const version = deferredAttribute(factoryOptions.deferredTimeoutMs);
+		const branch = deferredAttribute(factoryOptions.deferredTimeoutMs);
+		if (factoryOptions.hostInfo?.version) {
+			version.settle(factoryOptions.hostInfo.version);
+		}
+		// Read the checkout straight off disk. This is both richer and more
+		// reliable than waiting for `vcs.branch.updated`: it arrives before the
+		// first export instead of racing the deferral window, and it carries the
+		// remote and revision, which no event reports at all. The event stays as a
+		// fallback — `settle` keeps the first value, so whichever lands first wins.
+		const vcs = config.collectVcs ? await readVcsInfo(input.worktree ?? input.directory).catch(() => ({})) : {};
+		if (vcs.ref) {
+			branch.settle(vcs.ref);
+		}
+		const resource = buildResource(config, {
+			version: version.value,
+			hostname: factoryOptions.hostInfo?.hostname ?? safeHostname(),
+			projectName: input.project?.id,
+			directory: input.directory,
+			worktree: input.worktree,
+			branch: branch.value,
+			vcs
+		});
+		const providers = createProviders(config, resource, logger, factoryOptions.exporters);
+		const recorder = new TelemetryRecorder({
+			providers,
+			config,
+			logger,
+			now: factoryOptions.now,
+			resourceSinks: {
+				version: (value) => version.settle(value),
+				branch: (value) => branch.settle(value)
+			}
+		});
+		if (factoryOptions.registerProcessHandlers !== false) {
+			registerExitHandlers(providers, logger, [version, branch]);
+		}
+		logger.info("otel_plugin_enabled", {
+			serviceName: config.serviceName,
+			exporters: config.exporters,
+			endpoint: config.endpoint,
+			includeSessionId: config.includeSessionId,
+			filteredTools: [...config.filteredTools]
+		});
+		return {
+			config: async (hostConfig) => {
+				currentLogLevel = fromOpenCodeLogLevel(hostConfig.logLevel) ?? DEFAULT_LOG_LEVEL;
+				if (config.propagateTraceContext) {
+					const wrapped = installTracePropagation(hostConfig, {
+						getContext: () => recorder.currentChatContext(),
+						logger
+					});
+					logger.debug("otel_trace_propagation_ready", { providerCount: wrapped });
+				}
+			},
+			event: async ({ event }) => {
+				recorder.onEvent(event);
+			},
+			"chat.message": async (chatInput, chatOutput) => {
+				recorder.onChatMessage(chatInput, chatOutput);
+			},
+			"tool.execute.before": async (toolInput) => {
+				recorder.onToolBefore(toolInput);
+			},
+			"tool.execute.after": async (toolInput, toolOutput) => {
+				recorder.onToolAfter(toolInput, toolOutput);
+			},
+			"chat.params": async (paramsInput, paramsOutput) => {
+				recorder.onChatParams(paramsInput, paramsOutput);
+			},
+			"permission.ask": async (permissionInput, permissionOutput) => {
+				recorder.onPermissionAsk(permissionInput, permissionOutput);
+			},
+			"experimental.text.complete": async (textInput, textOutput) => {
+				recorder.onTextComplete(textInput, textOutput);
+			},
+			"experimental.compaction.autocontinue": async (compactionInput, compactionOutput) => {
+				recorder.onCompactionAutocontinue(compactionInput, compactionOutput);
+			}
+		};
+	};
 }
 function safeHostname() {
-    try {
-        return hostname() || undefined;
-    }
-    catch {
-        return undefined;
-    }
+	try {
+		return hostname() || undefined;
+	} catch {
+		return undefined;
+	}
 }
 export const OpencodeOtelPlugin = createOtelPlugin();
 export default OpencodeOtelPlugin;
+
 //# sourceMappingURL=opencode.js.map

package/dist/opencode.js.map

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

package/dist/propagation.d.ts

@@ -1,22 +1,22 @@
 import type { Context } from "@opentelemetry/api";
 import type { Logger } from "./logging.js";
 export interface ProviderConfigLike {
-    options?: Record<string, unknown>;
+	options?: Record<string, unknown>;
 }
 export interface PropagationConfigInput {
-    provider?: Record<string, ProviderConfigLike | undefined>;
+	provider?: Record<string, ProviderConfigLike | undefined>;
 }
 /**
- * Wrap every provider's `options.fetch` so outgoing model requests carry W3C
- * trace context, joining an OpenCode session and its gateway-side spans into
- * one trace.
- *
- * This is the same interception seam `@vymalo/opencode-ratelimit` uses — and it
- * composes the same way: the existing fetch is captured at install time and
- * delegated to, so stacking the two plugins in either order works.
- */
+* Wrap every provider's `options.fetch` so outgoing model requests carry W3C
+* trace context, joining an OpenCode session and its gateway-side spans into
+* one trace.
+*
+* This is the same interception seam `@vymalo/opencode-ratelimit` uses — and it
+* composes the same way: the existing fetch is captured at install time and
+* delegated to, so stacking the two plugins in either order works.
+*/
 export declare function installTracePropagation(input: PropagationConfigInput, deps: {
-    getContext: () => Context | undefined;
-    logger: Logger;
-    fetchImpl?: typeof fetch;
+	getContext: () => Context | undefined;
+	logger: Logger;
+	fetchImpl?: typeof fetch;
 }): number;

package/dist/propagation.js

@@ -2,54 +2,56 @@ import { defaultTextMapSetter } from "@opentelemetry/api";
 import { W3CTraceContextPropagator } from "@opentelemetry/core";
 const propagator = new W3CTraceContextPropagator();
 /**
- * Wrap every provider's `options.fetch` so outgoing model requests carry W3C
- * trace context, joining an OpenCode session and its gateway-side spans into
- * one trace.
- *
- * This is the same interception seam `@vymalo/opencode-ratelimit` uses — and it
- * composes the same way: the existing fetch is captured at install time and
- * delegated to, so stacking the two plugins in either order works.
- */
+* Wrap every provider's `options.fetch` so outgoing model requests carry W3C
+* trace context, joining an OpenCode session and its gateway-side spans into
+* one trace.
+*
+* This is the same interception seam `@vymalo/opencode-ratelimit` uses — and it
+* composes the same way: the existing fetch is captured at install time and
+* delegated to, so stacking the two plugins in either order works.
+*/
 export function installTracePropagation(input, deps) {
-    const providers = input.provider;
-    if (!providers) {
-        return 0;
-    }
-    let wrapped = 0;
-    for (const [providerId, providerConfig] of Object.entries(providers)) {
-        if (!providerConfig) {
-            continue;
-        }
-        const options = (providerConfig.options ??= {});
-        const delegate = typeof options.fetch === "function"
-            ? options.fetch
-            : (deps.fetchImpl ?? globalThis.fetch);
-        if (typeof delegate !== "function") {
-            continue;
-        }
-        options.fetch = async (input_, init) => {
-            const context = deps.getContext();
-            if (!context) {
-                return delegate(input_, init);
-            }
-            const carrier = {};
-            propagator.inject(context, carrier, defaultTextMapSetter);
-            if (Object.keys(carrier).length === 0) {
-                return delegate(input_, init);
-            }
-            const headers = new Headers(init?.headers ?? {});
-            // Never clobber an upstream traceparent — if something already set one,
-            // it knows more about the request than we do.
-            for (const [key, value] of Object.entries(carrier)) {
-                if (!headers.has(key)) {
-                    headers.set(key, value);
-                }
-            }
-            return delegate(input_, { ...init, headers });
-        };
-        wrapped += 1;
-        deps.logger.trace("otel_trace_propagation_installed", { providerId });
-    }
-    return wrapped;
+	const providers = input.provider;
+	if (!providers) {
+		return 0;
+	}
+	let wrapped = 0;
+	for (const [providerId, providerConfig] of Object.entries(providers)) {
+		if (!providerConfig) {
+			continue;
+		}
+		const options = providerConfig.options ??= {};
+		const delegate = typeof options.fetch === "function" ? options.fetch : deps.fetchImpl ?? globalThis.fetch;
+		if (typeof delegate !== "function") {
+			continue;
+		}
+		options.fetch = async (input_, init) => {
+			const context = deps.getContext();
+			if (!context) {
+				return delegate(input_, init);
+			}
+			const carrier = {};
+			propagator.inject(context, carrier, defaultTextMapSetter);
+			if (Object.keys(carrier).length === 0) {
+				return delegate(input_, init);
+			}
+			const headers = new Headers(init?.headers ?? {});
+			// Never clobber an upstream traceparent — if something already set one,
+			// it knows more about the request than we do.
+			for (const [key, value] of Object.entries(carrier)) {
+				if (!headers.has(key)) {
+					headers.set(key, value);
+				}
+			}
+			return delegate(input_, {
+				...init,
+				headers
+			});
+		};
+		wrapped += 1;
+		deps.logger.trace("otel_trace_propagation_installed", { providerId });
+	}
+	return wrapped;
 }
+
 //# sourceMappingURL=propagation.js.map

package/dist/propagation.js.map

@@ -1 +1 @@
-{"version":3,"file":"propagation.js","sourceRoot":"","sources":["../src/propagation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAYhE,MAAM,UAAU,GAAG,IAAI,yBAAyB,EAAE,CAAC;AAEnD;;;;;;;;GAQG;AACH,MAAM,UAAU,uBAAuB,CACrC,KAA6B,EAC7B,IAAyF;IAEzF,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC;IACjC,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,CAAC,CAAC;IACX,CAAC;IAED,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,KAAK,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QACrE,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,SAAS;QACX,CAAC;QACD,MAAM,OAAO,GAAG,CAAC,cAAc,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC;QAChD,MAAM,QAAQ,GACZ,OAAO,OAAO,CAAC,KAAK,KAAK,UAAU;YACjC,CAAC,CAAE,OAAO,CAAC,KAAsB;YACjC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE,CAAC;YACnC,SAAS;QACX,CAAC;QAED,OAAO,CAAC,KAAK,GAAG,KAAK,EACnB,MAAmC,EACnC,IAAkC,EACf,EAAE;YACrB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YAClC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAChC,CAAC;YACD,MAAM,OAAO,GAA2B,EAAE,CAAC;YAC3C,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;YAC1D,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACtC,OAAO,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAChC,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;YACjD,wEAAwE;YACxE,8CAA8C;YAC9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtB,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBAC1B,CAAC;YACH,CAAC;YACD,OAAO,QAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAChD,CAAC,CAAC;QACF,OAAO,IAAI,CAAC,CAAC;QACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"mappings":"AACA,SAAS,4BAA4B;AACrC,SAAS,iCAAiC;AAY1C,MAAM,aAAa,IAAI,0BAA0B;;;;;;;;;;AAWjD,OAAO,SAAS,wBACd,OACA,MACQ;CACR,MAAM,YAAY,MAAM;CACxB,IAAI,CAAC,WAAW;EACd,OAAO;CACT;CAEA,IAAI,UAAU;CACd,KAAK,MAAM,CAAC,YAAY,mBAAmB,OAAO,QAAQ,SAAS,GAAG;EACpE,IAAI,CAAC,gBAAgB;GACnB;EACF;EACA,MAAM,UAAW,eAAe,YAAY,CAAC;EAC7C,MAAM,WACJ,OAAO,QAAQ,UAAU,aACpB,QAAQ,QACR,KAAK,aAAa,WAAW;EACpC,IAAI,OAAO,aAAa,YAAY;GAClC;EACF;EAEA,QAAQ,QAAQ,OACd,QACA,SACsB;GACtB,MAAM,UAAU,KAAK,WAAW;GAChC,IAAI,CAAC,SAAS;IACZ,OAAO,SAAS,QAAQ,IAAI;GAC9B;GACA,MAAM,UAAkC,CAAC;GACzC,WAAW,OAAO,SAAS,SAAS,oBAAoB;GACxD,IAAI,OAAO,KAAK,OAAO,CAAC,CAAC,WAAW,GAAG;IACrC,OAAO,SAAS,QAAQ,IAAI;GAC9B;GACA,MAAM,UAAU,IAAI,QAAQ,MAAM,WAAW,CAAC,CAAC;;;GAG/C,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,OAAO,GAAG;IAClD,IAAI,CAAC,QAAQ,IAAI,GAAG,GAAG;KACrB,QAAQ,IAAI,KAAK,KAAK;IACxB;GACF;GACA,OAAO,SAAS,QAAQ;IAAE,GAAG;IAAM;GAAQ,CAAC;EAC9C;EACA,WAAW;EACX,KAAK,OAAO,MAAM,oCAAoC,EAAE,WAAW,CAAC;CACtE;CAEA,OAAO;AACT","names":[],"sources":["../src/propagation.ts"],"version":3,"file":"propagation.js","sourceRoot":""}

package/dist/providers.d.ts

@@ -1,55 +1,66 @@
 import type { Logger as OtelLogger } from "@opentelemetry/api-logs";
-import { type Resource } from "@opentelemetry/resources";
+import { type MaybePromise, type Resource } from "@opentelemetry/resources";
 import { type LogRecordExporter } from "@opentelemetry/sdk-logs";
 import { type PushMetricExporter } from "@opentelemetry/sdk-metrics";
 import { type SpanExporter } from "@opentelemetry/sdk-trace";
 import type { Tracer } from "@opentelemetry/api";
 import type { Meter } from "@opentelemetry/api";
 import type { Logger } from "./logging.js";
+import { type TokenSource } from "./token-source.js";
+import type { VcsInfo } from "./vcs.js";
 import type { ResolvedOtelConfig } from "./types.js";
 /**
- * The three provider handles the recorder needs, plus lifecycle. `undefined`
- * for a signal whose exporter is `none` — the recorder no-ops on it rather
- * than branching on config everywhere.
- */
+* The three provider handles the recorder needs, plus lifecycle. `undefined`
+* for a signal whose exporter is `none` — the recorder no-ops on it rather
+* than branching on config everywhere.
+*/
 export interface TelemetryProviders {
-    tracer?: Tracer;
-    meter?: Meter;
-    otelLogger?: OtelLogger;
-    /** Push everything buffered. Called on `session.idle` and on process exit. */
-    forceFlush(): Promise<void>;
-    /** Flush and tear down. */
-    shutdown(): Promise<void>;
+	tracer?: Tracer;
+	meter?: Meter;
+	otelLogger?: OtelLogger;
+	/** Push everything buffered. Called on `session.idle` and on process exit. */
+	forceFlush(): Promise<void>;
+	/** Flush and tear down. */
+	shutdown(): Promise<void>;
 }
 /**
- * Exporter factories, injectable so tests can substitute in-memory exporters
- * without reaching the network or constructing real OTLP clients.
- */
+* Exporter factories, injectable so tests can substitute in-memory exporters
+* without reaching the network or constructing real OTLP clients.
+*/
 export interface ExporterFactories {
-    trace?: (config: ResolvedOtelConfig) => SpanExporter | undefined;
-    metric?: (config: ResolvedOtelConfig) => PushMetricExporter | undefined;
-    log?: (config: ResolvedOtelConfig) => LogRecordExporter | undefined;
+	trace?: (config: ResolvedOtelConfig, tokenSource?: TokenSource) => SpanExporter | undefined;
+	metric?: (config: ResolvedOtelConfig, tokenSource?: TokenSource) => PushMetricExporter | undefined;
+	log?: (config: ResolvedOtelConfig, tokenSource?: TokenSource) => LogRecordExporter | undefined;
 }
 /**
- * Build the resource every signal is stamped with.
- *
- * Deliberately identifies the **machine and the project**, never the developer:
- * no git author email, no account id. An operator who wants per-person
- * attribution adds it explicitly via `resourceAttributes` /
- * `OTEL_RESOURCE_ATTRIBUTES`, which keeps that choice visible in config.
- */
+* Build the resource every signal is stamped with.
+*
+* Deliberately identifies the **machine and the project**, never the developer:
+* no git author email, no account id. An operator who wants per-person
+* attribution adds it explicitly via `resourceAttributes` /
+* `OTEL_RESOURCE_ATTRIBUTES`, which keeps that choice visible in config.
+*/
 export declare function buildResource(config: ResolvedOtelConfig, context: {
-    version?: string;
-    hostname?: string;
-    projectName?: string;
-    directory?: string;
-    worktree?: string;
-    branch?: string;
+	/**
+	* May be a promise: OpenCode reports the host version as an
+	* `installation.updated` *event*, after the resource is already built. The
+	* OTel resource API awaits promise-valued attributes before the first
+	* export — see `deferred.ts` for why the deferral is always bounded.
+	*/
+	version?: MaybePromise<string | undefined>;
+	hostname?: string;
+	projectName?: string;
+	directory?: string;
+	worktree?: string;
+	/** May be a promise, for the same reason as `version` (`vcs.branch.updated`). */
+	branch?: MaybePromise<string | undefined>;
+	/** Repository metadata read off disk — see `vcs.ts`. */
+	vcs?: VcsInfo;
 }): Resource;
 /**
- * Construct the enabled providers. Each signal is independent: a failure to
- * build one leaves the others running, because partial telemetry is strictly
- * better than an exception escaping into the host's plugin loader.
- */
+* Construct the enabled providers. Each signal is independent: a failure to
+* build one leaves the others running, because partial telemetry is strictly
+* better than an exception escaping into the host's plugin loader.
+*/
 export declare function createProviders(config: ResolvedOtelConfig, resource: Resource, logger: Logger, factories?: ExporterFactories): TelemetryProviders;
 export declare function describeError(error: unknown): string;