@caplets/core 0.12.0 → 0.12.2

package/dist/{tools-BlFF20vE.js → engine-BzekyZ5r.js}

@@ -1,7 +1,7 @@
 import { generatedToolInputDescriptions, operations } from "./generated-tool-input-schema.js";
 import { createRequire } from "node:module";
-import { accessSync, chmodSync, constants, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
-import minpath, { basename, delimiter, dirname, extname, isAbsolute, join, posix, relative, resolve, win32 } from "node:path";
+import { accessSync, chmodSync, constants, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, watch, writeFileSync } from "node:fs";
+import minpath, { basename, delimiter, dirname, extname, isAbsolute, join, parse, posix, relative, resolve, win32 } from "node:path";
 import minproc, { default as process$1 } from "node:process";
 import { fileURLToPath as urlToPath } from "node:url";
 import { homedir } from "node:os";
@@ -57393,4 +57393,294 @@ function backendFor(server, downstream, openapi, graphql, http, cli) {
 	};
 }
 //#endregion
-export { LoggingLevelSchema as $, assertToolsCallTaskCapability as A, CreateTaskResultSchema as B, discoverCapletFiles as C, toSafeError as D, errorResult as E, CallToolRequestSchema as F, InitializeRequestSchema as G, EmptyResultSchema as H, CallToolResultSchema as I, ListPromptsRequestSchema as J, InitializedNotificationSchema as K, CompleteRequestSchema as L, Protocol as M, mergeCapabilities as N, SERVER_ID_PATTERN as O, toJsonSchemaCompat as P, ListToolsRequestSchema as Q, CreateMessageResultSchema as R, resolveProjectConfigPath as S, CapletsError as T, ErrorCode as U, ElicitResultSchema as V, GetPromptRequestSchema as W, ListResourcesRequestSchema as X, ListResourceTemplatesRequestSchema as Y, ListRootsResultSchema as Z, parseConfig as _, __commonJSMin as _t, OpenApiManager as a, assertCompleteRequestResourceTemplate as at, resolveConfigPath as b, DownstreamManager as c, getObjectShape as ct, deleteTokenBundle as d, isSchemaOptional as dt, McpError as et, isTokenBundleExpired as f, isZ4Schema as ft, loadConfigWithSources as g, safeParseAsync$1 as gt, loadConfig as h, safeParse$1 as ht, capabilityDescription as i, assertCompleteRequestPrompt as it, AjvJsonSchemaValidator as j, assertClientRequestTaskCapability as k, runGenericOAuthFlow as l, getParseErrorMessage as lt, CliToolsManager as m, objectFromShape as mt, handleServerTool as n, SUPPORTED_PROTOCOL_VERSIONS as nt, HttpActionManager as o, ZodOptional as ot, readTokenBundle as p, normalizeObjectSchema as pt, LATEST_PROTOCOL_VERSION as q, ServerRegistry as r, SetLevelRequestSchema as rt, GraphQLManager as s, getLiteralValue as st, generatedToolInputSchema as t, ReadResourceRequestSchema as tt, runOAuthFlow as u, getSchemaDescription as ut, DEFAULT_AUTH_DIR as v, __require as vt, validateCapletFile as w, resolveProjectCapletsRoot as x, resolveCapletsRoot as y, __toESM as yt, CreateMessageResultWithToolsSchema as z };
+//#region src/engine.ts
+var CapletsEngine = class {
+	registry;
+	downstream;
+	openapi;
+	graphql;
+	http;
+	cli;
+	paths;
+	watchDebounceMs;
+	watchEnabled;
+	writeErr;
+	reloadListeners = /* @__PURE__ */ new Set();
+	watchers = [];
+	reloadTimer;
+	watcherRefreshTimer;
+	reloading;
+	pendingReload = false;
+	closed = false;
+	constructor(options = {}) {
+		this.paths = {
+			configPath: resolveConfigPath(options.configPath),
+			projectConfigPath: options.projectConfigPath ?? resolveProjectConfigPath()
+		};
+		const config = loadConfig(this.paths.configPath, this.paths.projectConfigPath);
+		this.registry = new ServerRegistry(config);
+		this.downstream = new DownstreamManager(this.registry, selectAuthOptions(options.authDir));
+		this.openapi = new OpenApiManager(this.registry, selectAuthOptions(options.authDir));
+		this.graphql = new GraphQLManager(this.registry, selectAuthOptions(options.authDir));
+		this.http = new HttpActionManager(this.registry, selectAuthOptions(options.authDir));
+		this.cli = new CliToolsManager(this.registry);
+		this.watchDebounceMs = options.watchDebounceMs ?? 250;
+		this.watchEnabled = options.watch ?? true;
+		this.writeErr = options.writeErr ?? ((value) => process.stderr.write(value));
+		if (this.watchEnabled) this.resetWatchers();
+	}
+	currentConfig() {
+		return this.registry.config;
+	}
+	enabledServers() {
+		return nextEnabledServers(this.registry.config);
+	}
+	watchedPaths() {
+		return [...new Set(watchedPaths(this.paths).map((entry) => entry.path))].sort();
+	}
+	onReload(listener) {
+		this.reloadListeners.add(listener);
+		return () => {
+			this.reloadListeners.delete(listener);
+		};
+	}
+	scheduleReload() {
+		if (this.closed) return;
+		if (this.reloadTimer) clearTimeout(this.reloadTimer);
+		this.reloadTimer = setTimeout(() => {
+			this.reloadTimer = void 0;
+			this.reload();
+		}, this.watchDebounceMs);
+	}
+	async reload() {
+		if (this.closed) return false;
+		if (this.reloading) {
+			this.pendingReload = true;
+			return await this.reloading;
+		}
+		this.reloading = this.reloadUntilSettled().finally(() => {
+			this.reloading = void 0;
+		});
+		return await this.reloading;
+	}
+	async execute(serverId, request) {
+		try {
+			return await handleServerTool(this.registry.require(serverId), request, this.registry, this.downstream, this.openapi, this.graphql, this.http, this.cli);
+		} catch (error) {
+			return errorResult(error);
+		}
+	}
+	async close() {
+		this.closed = true;
+		try {
+			if (this.reloadTimer) {
+				clearTimeout(this.reloadTimer);
+				this.reloadTimer = void 0;
+			}
+			if (this.watcherRefreshTimer) {
+				clearTimeout(this.watcherRefreshTimer);
+				this.watcherRefreshTimer = void 0;
+			}
+			if (this.reloading) await this.reloading;
+		} finally {
+			this.closeWatchers();
+			await this.downstream.close();
+			this.reloadListeners.clear();
+		}
+	}
+	async reloadOnce() {
+		if (this.closed) return false;
+		let nextConfig;
+		try {
+			nextConfig = loadConfig(this.paths.configPath, this.paths.projectConfigPath);
+		} catch (error) {
+			this.writeErr(`Caplets config reload failed; keeping last known-good config.\n`);
+			this.writeErr(`${JSON.stringify(toSafeError(error, "CONFIG_INVALID"), null, 2)}\n`);
+			return false;
+		}
+		if (this.closed) return false;
+		const previousConfig = this.registry.config;
+		const nextRegistry = new ServerRegistry(nextConfig);
+		this.registry = nextRegistry;
+		this.downstream.updateRegistry(nextRegistry);
+		this.openapi.updateRegistry(nextRegistry);
+		this.graphql.updateRegistry(nextRegistry);
+		this.http.updateRegistry(nextRegistry);
+		this.cli.updateRegistry(nextRegistry);
+		let invalidated = true;
+		try {
+			await this.invalidateChangedBackends(previousConfig, nextConfig);
+		} catch (error) {
+			invalidated = false;
+			this.writeErr(`Caplets backend invalidation failed; continuing reload.\n`);
+			this.writeErr(`${JSON.stringify(toSafeError(error, "INTERNAL_ERROR"), null, 2)}\n`);
+		}
+		if (this.closed) return false;
+		if (this.watchEnabled) this.resetWatchers();
+		this.emitReload({
+			previous: previousConfig,
+			next: nextConfig,
+			invalidated
+		});
+		return invalidated;
+	}
+	async reloadUntilSettled() {
+		let succeeded = true;
+		do {
+			this.pendingReload = false;
+			try {
+				succeeded = await this.reloadOnce() && succeeded;
+			} catch (err) {
+				this.writeErr(`Caplets reload failed.\n`);
+				this.writeErr(`${JSON.stringify(toSafeError(err, "INTERNAL_ERROR"), null, 2)}\n`);
+				succeeded = false;
+			}
+		} while (this.pendingReload && !this.closed);
+		return succeeded && !this.closed;
+	}
+	emitReload(event) {
+		for (const listener of this.reloadListeners) try {
+			listener(event);
+		} catch (error) {
+			this.writeErr(`Caplets reload listener failed.\n`);
+			this.writeErr(`${JSON.stringify(toSafeError(error, "INTERNAL_ERROR"), null, 2)}\n`);
+		}
+	}
+	async invalidateChangedBackends(previous, next) {
+		const previousCaplets = new Map(allCaplets(previous).map((server) => [server.server, server]));
+		const nextCaplets = new Map(allCaplets(next).map((server) => [server.server, server]));
+		const changedIds = new Set([...previousCaplets.keys(), ...nextCaplets.keys()]);
+		for (const serverId of changedIds) {
+			const before = previousCaplets.get(serverId);
+			const after = nextCaplets.get(serverId);
+			if (!(serializeCaplet(before) !== serializeCaplet(after))) continue;
+			if (before?.backend === "mcp") await this.downstream.closeServer(serverId);
+			if (before?.backend === "openapi" || after?.backend === "openapi" || !after) this.openapi.invalidate(serverId);
+			if (before?.backend === "graphql" || after?.backend === "graphql" || !after) this.graphql.invalidate(serverId);
+			if (before?.backend === "http" || after?.backend === "http" || !after) this.http.invalidate(serverId);
+			if (before?.backend === "cli" || after?.backend === "cli" || !after) this.cli.invalidate(serverId);
+		}
+	}
+	resetWatchers() {
+		this.closeWatchers();
+		const watched = /* @__PURE__ */ new Set();
+		for (const entry of watchedPaths(this.paths)) {
+			const watchPath = existsSync(entry.path) ? entry.path : nearestExistingParent(entry.path);
+			const watchKey = `${entry.reason}:${watchPath}`;
+			if (!watchPath || watched.has(watchKey)) continue;
+			watched.add(watchKey);
+			try {
+				this.watchers.push(...this.watchEntry(entry, watchPath));
+			} catch (error) {
+				this.writeErr(`Caplets could not watch ${entry.reason} path ${entry.path}.\n`);
+				this.writeErr(`${JSON.stringify(toSafeError(error, "SERVER_UNAVAILABLE"), null, 2)}\n`);
+			}
+		}
+	}
+	closeWatchers() {
+		for (const watcher of this.watchers) watcher.close();
+		this.watchers = [];
+	}
+	watchEntry(entry, watchPath) {
+		if (entry.reason === "caplets" && existsSync(entry.path) && isDirectory(watchPath)) return this.watchDirectoryTree(watchPath);
+		return [watch(watchPath, { persistent: true }, (eventType) => {
+			this.scheduleReload();
+			if (eventType === "rename" && entry.reason === "caplets" && existsSync(entry.path)) this.scheduleWatcherRefresh();
+		})];
+	}
+	watchDirectoryTree(root) {
+		const watchers = [];
+		const directories = discoverDirectories(root);
+		for (const directory of directories) try {
+			watchers.push(watch(directory, { persistent: true }, (eventType) => {
+				this.scheduleReload();
+				if (eventType === "rename") this.scheduleWatcherRefresh();
+			}));
+		} catch (error) {
+			for (const watcher of watchers) watcher.close();
+			throw error;
+		}
+		return watchers;
+	}
+	scheduleWatcherRefresh() {
+		if (this.closed) return;
+		if (this.watcherRefreshTimer) clearTimeout(this.watcherRefreshTimer);
+		this.watcherRefreshTimer = setTimeout(() => {
+			this.watcherRefreshTimer = void 0;
+			if (!this.closed) this.resetWatchers();
+		}, this.watchDebounceMs);
+	}
+};
+function selectAuthOptions(authDir) {
+	return authDir ? { authDir } : {};
+}
+function watchedPaths(paths) {
+	return uniqueWatchedPaths([
+		{
+			path: dirname(paths.configPath),
+			reason: "config"
+		},
+		{
+			path: dirname(paths.projectConfigPath),
+			reason: "config"
+		},
+		{
+			path: resolveCapletsRoot(paths.configPath),
+			reason: "caplets"
+		},
+		{
+			path: dirname(paths.projectConfigPath),
+			reason: "caplets"
+		}
+	]);
+}
+function uniqueWatchedPaths(entries) {
+	const seen = /* @__PURE__ */ new Set();
+	const unique = [];
+	for (const entry of entries) {
+		const key = `${entry.reason}:${entry.path}`;
+		if (seen.has(key)) continue;
+		seen.add(key);
+		unique.push(entry);
+	}
+	return unique;
+}
+function allCaplets(config) {
+	return [
+		...Object.values(config.mcpServers),
+		...Object.values(config.openapiEndpoints),
+		...Object.values(config.graphqlEndpoints),
+		...Object.values(config.httpApis),
+		...Object.values(config.cliTools)
+	];
+}
+function nextEnabledServers(config) {
+	return allCaplets(config).filter((server) => !server.disabled);
+}
+function serializeCaplet(caplet) {
+	return JSON.stringify(caplet ?? null);
+}
+function nearestExistingParent(path) {
+	let candidate = dirname(path);
+	const root = parse(candidate).root;
+	while (candidate && candidate !== root) {
+		if (existsSync(candidate)) return candidate;
+		candidate = dirname(candidate);
+	}
+	return existsSync(root) ? root : void 0;
+}
+function discoverDirectories(root) {
+	if (!isDirectory(root)) return [];
+	const directories = [root];
+	for (const entry of readdirSync(root, { withFileTypes: true })) if (entry.isDirectory()) directories.push(...discoverDirectories(join(root, entry.name)));
+	return directories;
+}
+function isDirectory(path) {
+	try {
+		return statSync(path).isDirectory();
+	} catch {
+		return false;
+	}
+}
+//#endregion
+export { assertCompleteRequestPrompt as $, CallToolRequestSchema as A, InitializeRequestSchema as B, SERVER_ID_PATTERN as C, Protocol as D, AjvJsonSchemaValidator as E, CreateTaskResultSchema as F, ListResourcesRequestSchema as G, LATEST_PROTOCOL_VERSION as H, ElicitResultSchema as I, LoggingLevelSchema as J, ListRootsResultSchema as K, EmptyResultSchema as L, CompleteRequestSchema as M, CreateMessageResultSchema as N, mergeCapabilities as O, CreateMessageResultWithToolsSchema as P, SetLevelRequestSchema as Q, ErrorCode as R, toSafeError as S, assertToolsCallTaskCapability as T, ListPromptsRequestSchema as U, InitializedNotificationSchema as V, ListResourceTemplatesRequestSchema as W, ReadResourceRequestSchema as X, McpError as Y, SUPPORTED_PROTOCOL_VERSIONS as Z, resolveProjectCapletsRoot as _, capabilityDescription as a, getSchemaDescription as at, validateCapletFile as b, deleteTokenBundle as c, normalizeObjectSchema as ct, loadConfig as d, safeParseAsync$1 as dt, assertCompleteRequestResourceTemplate as et, loadConfigWithSources as f, __commonJSMin as ft, resolveConfigPath as g, resolveCapletsRoot as h, ServerRegistry as i, getParseErrorMessage as it, CallToolResultSchema as j, toJsonSchemaCompat as k, isTokenBundleExpired as l, objectFromShape as lt, DEFAULT_AUTH_DIR as m, __toESM as mt, generatedToolInputSchema as n, getLiteralValue as nt, runGenericOAuthFlow as o, isSchemaOptional as ot, parseConfig as p, __require as pt, ListToolsRequestSchema as q, handleServerTool as r, getObjectShape as rt, runOAuthFlow as s, isZ4Schema as st, CapletsEngine as t, ZodOptional as tt, readTokenBundle as u, safeParse$1 as ut, resolveProjectConfigPath as v, assertClientRequestTaskCapability as w, CapletsError as x, discoverCapletFiles as y, GetPromptRequestSchema as z };

package/dist/index.js

@@ -1,5 +1,5 @@
-import { $ as LoggingLevelSchema, A as assertToolsCallTaskCapability, B as CreateTaskResultSchema, C as discoverCapletFiles, D as toSafeError, E as errorResult, F as CallToolRequestSchema, G as InitializeRequestSchema, H as EmptyResultSchema, I as CallToolResultSchema, J as ListPromptsRequestSchema, K as InitializedNotificationSchema, L as CompleteRequestSchema, M as Protocol, N as mergeCapabilities, O as SERVER_ID_PATTERN, P as toJsonSchemaCompat, Q as ListToolsRequestSchema, R as CreateMessageResultSchema, S as resolveProjectConfigPath, T as CapletsError, U as ErrorCode, V as ElicitResultSchema, W as GetPromptRequestSchema, X as ListResourcesRequestSchema, Y as ListResourceTemplatesRequestSchema, Z as ListRootsResultSchema, _ as parseConfig, _t as __commonJSMin, a as OpenApiManager, at as assertCompleteRequestResourceTemplate, b as resolveConfigPath, c as DownstreamManager, ct as getObjectShape, d as deleteTokenBundle, dt as isSchemaOptional, et as McpError, f as isTokenBundleExpired, ft as isZ4Schema, g as loadConfigWithSources, gt as safeParseAsync, h as loadConfig, ht as safeParse, i as capabilityDescription, it as assertCompleteRequestPrompt, j as AjvJsonSchemaValidator, k as assertClientRequestTaskCapability, l as runGenericOAuthFlow, lt as getParseErrorMessage, m as CliToolsManager, mt as objectFromShape, n as handleServerTool, nt as SUPPORTED_PROTOCOL_VERSIONS, o as HttpActionManager, ot as ZodOptional, p as readTokenBundle, pt as normalizeObjectSchema, q as LATEST_PROTOCOL_VERSION, r as ServerRegistry, rt as SetLevelRequestSchema, s as GraphQLManager, st as getLiteralValue, t as generatedToolInputSchema, tt as ReadResourceRequestSchema, u as runOAuthFlow, ut as getSchemaDescription, v as DEFAULT_AUTH_DIR, vt as __require, w as validateCapletFile, x as resolveProjectCapletsRoot, y as resolveCapletsRoot, yt as __toESM, z as CreateMessageResultWithToolsSchema } from "./tools-BlFF20vE.js";
-import { accessSync, chmodSync, closeSync, constants, cpSync, existsSync, lstatSync, mkdirSync, mkdtempSync, openSync, readFileSync, readdirSync, rmSync, statSync, watch, writeFileSync, writeSync } from "node:fs";
+import { $ as assertCompleteRequestPrompt, A as CallToolRequestSchema, B as InitializeRequestSchema, C as SERVER_ID_PATTERN, D as Protocol, E as AjvJsonSchemaValidator, F as CreateTaskResultSchema, G as ListResourcesRequestSchema, H as LATEST_PROTOCOL_VERSION, I as ElicitResultSchema, J as LoggingLevelSchema, K as ListRootsResultSchema, L as EmptyResultSchema, M as CompleteRequestSchema, N as CreateMessageResultSchema, O as mergeCapabilities, P as CreateMessageResultWithToolsSchema, Q as SetLevelRequestSchema, R as ErrorCode, S as toSafeError, T as assertToolsCallTaskCapability, U as ListPromptsRequestSchema, V as InitializedNotificationSchema, W as ListResourceTemplatesRequestSchema, X as ReadResourceRequestSchema, Y as McpError, Z as SUPPORTED_PROTOCOL_VERSIONS, _ as resolveProjectCapletsRoot, a as capabilityDescription, at as getSchemaDescription, b as validateCapletFile, c as deleteTokenBundle, ct as normalizeObjectSchema, d as loadConfig, dt as safeParseAsync, et as assertCompleteRequestResourceTemplate, f as loadConfigWithSources, ft as __commonJSMin, g as resolveConfigPath, h as resolveCapletsRoot, i as ServerRegistry, it as getParseErrorMessage, j as CallToolResultSchema, k as toJsonSchemaCompat, l as isTokenBundleExpired, lt as objectFromShape, m as DEFAULT_AUTH_DIR, mt as __toESM, n as generatedToolInputSchema, nt as getLiteralValue, o as runGenericOAuthFlow, ot as isSchemaOptional, p as parseConfig, pt as __require, q as ListToolsRequestSchema, r as handleServerTool, rt as getObjectShape, s as runOAuthFlow, st as isZ4Schema, t as CapletsEngine, tt as ZodOptional, u as readTokenBundle, ut as safeParse, v as resolveProjectConfigPath, w as assertClientRequestTaskCapability, x as CapletsError, y as discoverCapletFiles, z as GetPromptRequestSchema } from "./engine-BzekyZ5r.js";
+import { accessSync, chmodSync, closeSync, constants, cpSync, existsSync, lstatSync, mkdirSync, mkdtempSync, openSync, readFileSync, rmSync, statSync, writeFileSync, writeSync } from "node:fs";
 import { basename, dirname, join, parse, relative, resolve } from "node:path";
 import { stdin, stdout } from "node:process";
 import { tmpdir } from "node:os";
@@ -1314,142 +1314,48 @@ const EMPTY_COMPLETION_RESULT = { completion: {
 } };
 //#endregion
 //#region package.json
-var version = "0.12.0";
+var version = "0.12.2";
 //#endregion
 //#region src/runtime.ts
 var CapletsRuntime = class {
 	server;
-	registry;
-	downstream;
-	openapi;
-	graphql;
-	http;
-	cli;
+	engine;
 	tools = /* @__PURE__ */ new Map();
-	paths;
-	watchDebounceMs;
-	writeErr;
-	watchers = [];
-	reloadTimer;
-	watcherRefreshTimer;
-	reloading;
-	pendingReload = false;
-	closed = false;
+	unsubscribeReload;
 	constructor(options = {}) {
-		this.paths = {
-			configPath: resolveConfigPath(options.configPath),
-			projectConfigPath: options.projectConfigPath ?? resolveProjectConfigPath()
-		};
-		const config = loadConfig(this.paths.configPath, this.paths.projectConfigPath);
-		this.registry = new ServerRegistry(config);
-		this.downstream = new DownstreamManager(this.registry, selectAuthOptions(options.authDir));
-		this.openapi = new OpenApiManager(this.registry, selectAuthOptions(options.authDir));
-		this.graphql = new GraphQLManager(this.registry, selectAuthOptions(options.authDir));
-		this.http = new HttpActionManager(this.registry, selectAuthOptions(options.authDir));
-		this.cli = new CliToolsManager(this.registry);
+		this.engine = new CapletsEngine(engineOptions(options));
 		this.server = options.server ?? new McpServer({
 			name: "caplets",
 			version
 		});
-		this.watchDebounceMs = options.watchDebounceMs ?? 250;
-		this.writeErr = options.writeErr ?? ((value) => process.stderr.write(value));
-		this.reconcileTools(void 0, config);
-		this.resetWatchers();
+		this.unsubscribeReload = this.engine.onReload(({ previous, next }) => this.reconcileTools(previous, next));
+		this.reconcileTools(void 0, this.engine.currentConfig());
 	}
 	async connect(transport) {
 		await this.server.connect(transport);
 	}
 	scheduleReload() {
-		if (this.closed) return;
-		if (this.reloadTimer) clearTimeout(this.reloadTimer);
-		this.reloadTimer = setTimeout(() => {
-			this.reloadTimer = void 0;
-			this.reload();
-		}, this.watchDebounceMs);
+		this.engine.scheduleReload();
 	}
 	async reload() {
-		if (this.closed) return false;
-		if (this.reloading) {
-			this.pendingReload = true;
-			return await this.reloading;
-		}
-		this.reloading = this.reloadUntilSettled().finally(() => {
-			this.reloading = void 0;
-		});
-		return await this.reloading;
+		return await this.engine.reload();
 	}
 	async close() {
-		this.closed = true;
+		this.unsubscribeReload();
 		try {
-			if (this.reloadTimer) {
-				clearTimeout(this.reloadTimer);
-				this.reloadTimer = void 0;
-			}
-			if (this.watcherRefreshTimer) {
-				clearTimeout(this.watcherRefreshTimer);
-				this.watcherRefreshTimer = void 0;
-			}
-			if (this.reloading) await this.reloading;
+			await this.engine.close();
 		} finally {
-			this.closeWatchers();
-			await this.downstream.close();
 			await this.server.close();
 		}
 	}
 	currentConfig() {
-		return this.registry.config;
+		return this.engine.currentConfig();
 	}
 	registeredToolIds() {
 		return [...this.tools.keys()].sort();
 	}
 	watchedPaths() {
-		return [...new Set(watchedPaths(this.paths).map((entry) => entry.path))].sort();
-	}
-	async reloadOnce() {
-		if (this.closed) return false;
-		let nextConfig;
-		try {
-			nextConfig = loadConfig(this.paths.configPath, this.paths.projectConfigPath);
-		} catch (error) {
-			this.writeErr(`Caplets config reload failed; keeping last known-good config.\n`);
-			this.writeErr(`${JSON.stringify(toSafeError(error, "CONFIG_INVALID"), null, 2)}\n`);
-			return false;
-		}
-		if (this.closed) return false;
-		const previousConfig = this.registry.config;
-		const nextRegistry = new ServerRegistry(nextConfig);
-		this.registry = nextRegistry;
-		this.downstream.updateRegistry(nextRegistry);
-		this.openapi.updateRegistry(nextRegistry);
-		this.graphql.updateRegistry(nextRegistry);
-		this.http.updateRegistry(nextRegistry);
-		this.cli.updateRegistry(nextRegistry);
-		let invalidated = true;
-		try {
-			await this.invalidateChangedBackends(previousConfig, nextConfig);
-		} catch (error) {
-			invalidated = false;
-			this.writeErr(`Caplets backend invalidation failed; continuing reload.\n`);
-			this.writeErr(`${JSON.stringify(toSafeError(error, "INTERNAL_ERROR"), null, 2)}\n`);
-		}
-		if (this.closed) return false;
-		this.reconcileTools(previousConfig, nextConfig);
-		this.resetWatchers();
-		return invalidated;
-	}
-	async reloadUntilSettled() {
-		let succeeded = true;
-		do {
-			this.pendingReload = false;
-			try {
-				succeeded = await this.reloadOnce() && succeeded;
-			} catch (err) {
-				this.writeErr(`Caplets reload failed.\n`);
-				this.writeErr(`${JSON.stringify(toSafeError(err, "INTERNAL_ERROR"), null, 2)}\n`);
-				succeeded = false;
-			}
-		} while (this.pendingReload && !this.closed);
-		return succeeded && !this.closed;
+		return this.engine.watchedPaths();
 	}
 	reconcileTools(previous, next) {
 		const enabled = new Map(nextEnabledServers(next).map((server) => [server.server, server]));
@@ -1481,122 +1387,17 @@ var CapletsRuntime = class {
 		}, async (request) => this.handleTool(caplet.server, request));
 	}
 	async handleTool(serverId, request) {
-		try {
-			return await handleServerTool(this.registry.require(serverId), request, this.registry, this.downstream, this.openapi, this.graphql, this.http, this.cli);
-		} catch (error) {
-			return errorResult(error);
-		}
-	}
-	async invalidateChangedBackends(previous, next) {
-		const previousCaplets = new Map(allCaplets$1(previous).map((server) => [server.server, server]));
-		const nextCaplets = new Map(allCaplets$1(next).map((server) => [server.server, server]));
-		const changedIds = new Set([...previousCaplets.keys(), ...nextCaplets.keys()]);
-		for (const serverId of changedIds) {
-			const before = previousCaplets.get(serverId);
-			const after = nextCaplets.get(serverId);
-			if (!(serializeCaplet(before) !== serializeCaplet(after))) continue;
-			if (before?.backend === "mcp") await this.downstream.closeServer(serverId);
-			if (before?.backend === "openapi" || after?.backend === "openapi" || !after) this.openapi.invalidate(serverId);
-			if (before?.backend === "graphql" || after?.backend === "graphql" || !after) this.graphql.invalidate(serverId);
-			if (before?.backend === "http" || after?.backend === "http" || !after) this.http.invalidate(serverId);
-			if (before?.backend === "cli" || after?.backend === "cli" || !after) this.cli.invalidate(serverId);
-		}
-	}
-	resetWatchers() {
-		this.closeWatchers();
-		const watched = /* @__PURE__ */ new Set();
-		for (const entry of watchedPaths(this.paths)) {
-			const watchPath = existsSync(entry.path) ? entry.path : nearestExistingParent$1(entry.path);
-			const watchKey = `${entry.reason}:${watchPath}`;
-			if (!watchPath || watched.has(watchKey)) continue;
-			watched.add(watchKey);
-			try {
-				this.watchers.push(...this.watchEntry(entry, watchPath));
-			} catch (error) {
-				this.writeErr(`Caplets could not watch ${entry.reason} path ${entry.path}.\n`);
-				this.writeErr(`${JSON.stringify(toSafeError(error, "SERVER_UNAVAILABLE"), null, 2)}\n`);
-			}
-		}
-	}
-	closeWatchers() {
-		for (const watcher of this.watchers) watcher.close();
-		this.watchers = [];
-	}
-	watchEntry(entry, watchPath) {
-		if (entry.reason === "caplets" && existsSync(entry.path) && isDirectory(watchPath)) return this.watchDirectoryTree(watchPath);
-		return [watch(watchPath, { persistent: true }, (eventType) => {
-			this.scheduleReload();
-			if (eventType === "rename" && entry.reason === "caplets" && existsSync(entry.path)) this.scheduleWatcherRefresh();
-		})];
-	}
-	watchDirectoryTree(root) {
-		const watchers = [];
-		const directories = discoverDirectories(root);
-		for (const directory of directories) try {
-			watchers.push(watch(directory, { persistent: true }, (eventType) => {
-				this.scheduleReload();
-				if (eventType === "rename") this.scheduleWatcherRefresh();
-			}));
-		} catch (error) {
-			for (const watcher of watchers) watcher.close();
-			throw error;
-		}
-		return watchers;
-	}
-	scheduleWatcherRefresh() {
-		if (this.closed) return;
-		if (this.watcherRefreshTimer) clearTimeout(this.watcherRefreshTimer);
-		this.watcherRefreshTimer = setTimeout(() => {
-			this.watcherRefreshTimer = void 0;
-			if (!this.closed) this.resetWatchers();
-		}, this.watchDebounceMs);
+		return await this.engine.execute(serverId, request);
 	}
 };
-function selectAuthOptions(authDir) {
-	return authDir ? { authDir } : {};
-}
-function watchedPaths(paths) {
-	return uniqueWatchedPaths([
-		{
-			path: dirname(paths.configPath),
-			reason: "config"
-		},
-		{
-			path: dirname(paths.projectConfigPath),
-			reason: "config"
-		},
-		{
-			path: resolveCapletsRoot(paths.configPath),
-			reason: "caplets"
-		},
-		{
-			path: dirname(paths.projectConfigPath),
-			reason: "caplets"
-		}
-	]);
-}
-function uniqueWatchedPaths(entries) {
-	const seen = /* @__PURE__ */ new Set();
-	const unique = [];
-	for (const entry of entries) {
-		const key = `${entry.reason}:${entry.path}`;
-		if (seen.has(key)) continue;
-		seen.add(key);
-		unique.push(entry);
-	}
-	return unique;
-}
-function allCaplets$1(config) {
+function nextEnabledServers(config) {
 	return [
 		...Object.values(config.mcpServers),
 		...Object.values(config.openapiEndpoints),
 		...Object.values(config.graphqlEndpoints),
 		...Object.values(config.httpApis),
 		...Object.values(config.cliTools)
-	];
-}
-function nextEnabledServers(config) {
-	return allCaplets$1(config).filter((server) => !server.disabled);
+	].filter((server) => !server.disabled);
 }
 function capletById(config, serverId) {
 	return config.mcpServers[serverId] ?? config.openapiEndpoints[serverId] ?? config.graphqlEndpoints[serverId] ?? config.httpApis[serverId] ?? config.cliTools[serverId];
@@ -1604,27 +1405,14 @@ function capletById(config, serverId) {
 function serializeCaplet(caplet) {
 	return JSON.stringify(caplet ?? null);
 }
-function nearestExistingParent$1(path) {
-	let candidate = dirname(path);
-	const root = parse(candidate).root;
-	while (candidate && candidate !== root) {
-		if (existsSync(candidate)) return candidate;
-		candidate = dirname(candidate);
-	}
-	return existsSync(root) ? root : void 0;
-}
-function discoverDirectories(root) {
-	if (!isDirectory(root)) return [];
-	const directories = [root];
-	for (const entry of readdirSync(root, { withFileTypes: true })) if (entry.isDirectory()) directories.push(...discoverDirectories(`${root}/${entry.name}`));
-	return directories;
-}
-function isDirectory(path) {
-	try {
-		return statSync(path).isDirectory();
-	} catch {
-		return false;
-	}
+function engineOptions(options) {
+	const engineOptions = {};
+	if (options.configPath !== void 0) engineOptions.configPath = options.configPath;
+	if (options.projectConfigPath !== void 0) engineOptions.projectConfigPath = options.projectConfigPath;
+	if (options.authDir !== void 0) engineOptions.authDir = options.authDir;
+	if (options.watchDebounceMs !== void 0) engineOptions.watchDebounceMs = options.watchDebounceMs;
+	if (options.writeErr !== void 0) engineOptions.writeErr = options.writeErr;
+	return engineOptions;
 }
 //#endregion
 //#region ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/error.js
@@ -5535,7 +5323,7 @@ function createProgram(io = {}) {
 	const writeOut = io.writeOut ?? ((value) => process.stdout.write(value));
 	const writeErr = io.writeErr ?? ((value) => process.stderr.write(value));
 	const program = new Command();
-	program.name("caplets").description("Progressive-disclosure gateway for MCP servers.").version(version).exitOverride().configureOutput({
+	program.name("caplets").description("Progressive-disclosure gateway for MCP servers.").version(io.version ?? version).exitOverride().configureOutput({
 		writeOut,
 		writeErr,
 		outputError: (value, write) => write(value)

package/dist/native.js

@@ -1,4 +1,4 @@
-import { E as errorResult, S as resolveProjectConfigPath, a as OpenApiManager, b as resolveConfigPath, c as DownstreamManager, h as loadConfig, i as capabilityDescription, m as CliToolsManager, n as handleServerTool, o as HttpActionManager, r as ServerRegistry, s as GraphQLManager, t as generatedToolInputSchema } from "./tools-BlFF20vE.js";
+import { a as capabilityDescription, n as generatedToolInputSchema, t as CapletsEngine } from "./engine-BzekyZ5r.js";
 import { generatedToolInputJsonSchema } from "./generated-tool-input-schema.js";
 //#region src/native/tools.ts
 function nativeCapletToolName(capletId) {
@@ -46,27 +46,12 @@ function createNativeCapletsService(options = {}) {
 	return new DefaultNativeCapletsService(options);
 }
 var DefaultNativeCapletsService = class {
-	config;
-	registry;
-	downstream;
-	openapi;
-	graphql;
-	http;
-	cli;
+	engine;
 	constructor(options) {
-		const configPath = resolveConfigPath(options.configPath);
-		const projectConfigPath = options.projectConfigPath ?? resolveProjectConfigPath();
-		this.config = loadConfig(configPath, projectConfigPath);
-		this.registry = new ServerRegistry(this.config);
-		const authOptions = options.authDir ? { authDir: options.authDir } : void 0;
-		this.downstream = new DownstreamManager(this.registry, authOptions);
-		this.openapi = new OpenApiManager(this.registry, authOptions);
-		this.graphql = new GraphQLManager(this.registry, authOptions);
-		this.http = new HttpActionManager(this.registry, authOptions);
-		this.cli = new CliToolsManager(this.registry);
+		this.engine = new CapletsEngine(options);
 	}
 	listTools() {
-		return this.registry.enabledServers().map((caplet) => {
+		return this.engine.enabledServers().map((caplet) => {
 			const toolName = nativeCapletToolName(caplet.server);
 			return {
 				caplet: caplet.server,
@@ -78,14 +63,16 @@ var DefaultNativeCapletsService = class {
 		});
 	}
 	async execute(capletId, request) {
-		try {
-			return await handleServerTool(this.registry.require(capletId), request, this.registry, this.downstream, this.openapi, this.graphql, this.http, this.cli);
-		} catch (error) {
-			return errorResult(error);
-		}
+		return await this.engine.execute(capletId, request);
+	}
+	async reload() {
+		return await this.engine.reload();
+	}
+	onToolsChanged(listener) {
+		return this.engine.onReload(() => listener(this.listTools()));
 	}
 	async close() {
-		await this.downstream.close();
+		await this.engine.close();
 	}
 };
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caplets/core",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "Core runtime library for Caplets progressive disclosure gateways.",
   "keywords": [
     "caplets",