@xopcai/xopc 0.0.82 → 0.0.83

package/dist/src/gateway/service.js

@@ -1,48 +1,35 @@
 import { __toCommonJS } from "../../_virtual/_rolldown/runtime.js";
 import { PACKAGE_VERSION, init_package_version } from "../package-version.js";
-import { resolveStateDir } from "../config/paths-state.js";
-import { getWorkspacePath, init_schema } from "../config/schema.js";
-import { buildSessionKey, init_session_key, parseSessionKey } from "../routing/session-key.js";
-import { getDefaultAgentId, init_resolve_route } from "../routing/resolve-route.js";
 import { getLogDir } from "../utils/logger/config.js";
 import { getLogStats } from "../utils/logger/stats.js";
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { init_paths, resolveAgentDir, resolveConfigPath, resolveCronJobsPath, resolveExtensionsDir } from "../config/paths.js";
 import { loadConfig, saveConfig } from "../config/loader.js";
-import { getModelRegistry, prewarmModelRegistry } from "../providers/model-registry.js";
+import { getDefaultAgentId, init_resolve_route } from "../routing/resolve-route.js";
+import { prewarmModelRegistry } from "../providers/model-registry.js";
 import { init_providers, providers_exports } from "../providers/index.js";
-import { createSkillConfigManager } from "../agent/skills/config.js";
-import { disposeAllSessionMcpRuntimes, retireSessionMcpRuntimeForSessionKey } from "../agent/mcp/bundle-mcp-runtime.js";
+import { disposeAllSessionMcpRuntimes } from "../agent/mcp/bundle-mcp-runtime.js";
 import "../agent/mcp/bundle-mcp-tools.js";
-import { removeSkillsLockEntry } from "../agent/skills/hub-lock.js";
-import { deleteManagedSkill, installSkillFromZip, listManagedSkillDirs } from "../agent/skills/managed-store.js";
-import { MessageBus, MessageBusShutdownError } from "../infra/bus/queue.js";
-import "../infra/bus/index.js";
 import { SessionIndex } from "../session/manager.js";
 import "../session/index.js";
 import { areExtensionsGloballyDisabled } from "../extensions/discover-extensions.js";
 import { registerClarifyBridge } from "./clarify-runtime.js";
 import { setPairingBroadcastSink } from "../channels/pairing/pairing-events.js";
 import { CHAT_CHANNEL_ORDER, getChatChannelMeta } from "../channels/registry.js";
+import { getWorkspacePath } from "../config/workspace-path-helpers.js";
 import { ExtensionLoader } from "../extensions/loader.js";
-import { listRegisteredProviders } from "../agent/skills/marketplace/registry.js";
 import { buildExtensionMetadataSnapshot } from "../extensions/extension-metadata-snapshot.js";
 import "../extensions/index.js";
+import { MessageBus, MessageBusShutdownError } from "../infra/bus/queue.js";
+import "../infra/bus/index.js";
 import { AgentService } from "../agent/service.js";
 import { ChannelManager } from "../channels/manager.js";
-import { ConfigHotReloader } from "../config/reload.js";
 import "../config/index.js";
 import { CronService } from "../cron/service.js";
 import "../cron/index.js";
 import { resolveEffectiveGatewayPort } from "./host.js";
-import { computeBundledExtensionExtensionsPatch } from "../extensions/bundled-extension-activation.js";
-import { getExtensionLockfileManager } from "../extensions/lockfile.js";
-import { installExtensionFromStoreZip, peekExtensionIdFromStoreZip } from "../extensions/install.js";
-import { AgentRunRelay } from "./agent-run-relay.js";
-import { isGatewayStrictSecurityEnabled } from "./auth-rate-limit.js";
 import { assertGatewayAuthConfigured, extractToken, resolveGatewayAuth, validateToken } from "./auth.js";
-import { ClarifyBridge } from "./clarify-bridge.js";
 import { HeartbeatService, heartbeatRunnerConfigFromConfig } from "./heartbeat/service.js";
 import "./heartbeat/index.js";
 import { wireTunnelEventsToGateway } from "../tunnel/gateway-lifecycle.js";
@@ -50,29 +37,27 @@ import { stopTailscaleExposure } from "./tailscale-lifecycle.js";
 import { getExposureManager } from "../remote-access/exposure-manager.js";
 import { sanitizeTunnelConfig } from "../tunnel/tunnel-config.js";
 import { assertGatewayAuthNotKnownWeak } from "./security/known-weak-secrets.js";
+import { buckets } from "./rate-limit/buckets.js";
+import { isGatewayStrictSecurityEnabled } from "./rate-limit/env-flags.js";
+import "./rate-limit/index.js";
 import { assertGatewayRuntimeConfig } from "./runtime-config.js";
 import { auditGatewayConfig } from "./security/audit.js";
-import { downloadExtensionStoreZipBuffer, fetchMarketplacePackageDetail, resolveExtensionZipDownloadUrl, resolveExtensionsStoreBaseUrl } from "../agent/skills/marketplace/adapters/store/store-api-client.js";
-import { getMarketplaceProviderDisplayName, resolveSkillsMarketplaceProvider } from "../agent/skills/marketplace/resolve-adapter.js";
-import { downloadFromMarketplace, getMarketplacePackageDetail, listMarketplaceCategories, listMarketplacePackages } from "../agent/skills/skills-marketplace.js";
 import { scheduleGatewayUpdateCheck } from "../infra/update-startup.js";
 import { resolveChannelConnectDeferSet } from "./resolve-channel-connect-defer.js";
 import { restartGatewayProcessWithFreshPid } from "./respawn.js";
-import { getDistinctSessionChatIds } from "./service/session-chat-ids.js";
-import { runGatewayAgent } from "./service/run-gateway-agent.js";
+import { GatewaySessionsApi } from "./service/sessions-api.js";
+import { GatewayMarketplaceService } from "./service/marketplace-service.js";
+import { GatewayConfigCoordinator } from "./service/config-coordinator.js";
+import { GatewayAgentRunner } from "./service/agent-runner.js";
 import { GatewaySseHub } from "./service/sse-hub.js";
 import { GatewayReadiness } from "./startup-readiness.js";
 import { createGatewayStartupTrace } from "./startup-trace.js";
-import { join } from "node:path";
-import { existsSync, mkdirSync, rmSync } from "node:fs";
 import crypto from "crypto";
 //#region src/gateway/service.ts
-init_schema();
 init_providers();
 init_logger();
 init_paths();
 init_package_version();
-init_session_key();
 init_resolve_route();
 const log = createLogger("GatewayService");
 var GatewayService = class {
@@ -91,17 +76,11 @@ var GatewayService = class {
 	heartbeatService = null;
 	sessionIndex;
 	running = false;
-	configReloader = null;
-	/** In-flight coalesced apply after PATCH/save (Telegram `getMe` must not block HTTP). */
-	channelReloadFlushPromise = null;
-	channelReloadPending = false;
 	startTime = Date.now();
 	workspacePath;
+	configCoordinator;
 	auth;
 	sse = new GatewaySseHub();
-	runRelay = new AgentRunRelay();
-	/** Per-run abort for webchat (POST /api/agent/abort or client disconnect). */
-	runAbortControllers = /* @__PURE__ */ new Map();
 	stopGatewayUpdateCheck = null;
 	/** When set (e.g. by `GatewayServer`), `triggerGatewayProcessRestart` can stop HTTP then exit. */
 	gatewayShutdownForRestart = null;
@@ -111,9 +90,27 @@ var GatewayService = class {
 	lastChannelConnectDeferSource = "off";
 	readiness = new GatewayReadiness();
 	startupTrace = null;
-	clarifyBridge = new ClarifyBridge();
-	/** Maps webchat session key → active `runId` for `clarify` tool routing. */
-	activeWebchatRunBySession = /* @__PURE__ */ new Map();
+	/**
+	* Webchat agent invocation surface (`runAgent`, `abortAgentRun`, `steer*`,
+	* `submitClarifyResponse`, clarify-bridge dispatch). Owns the
+	* `activeWebchatRunBySession` + `runAbortControllers` maps.
+	*/
+	agentRunner;
+	/** Read-only alias re-exported from `agentRunner.runRelay` for legacy callers. */
+	get runRelay() {
+		return this.agentRunner.runRelay;
+	}
+	/**
+	* Session CRUD / search / compaction / tag-archive-pin / stats — the gateway
+	* REST surface for sessions. Routes should depend on this narrow service
+	* rather than the full GatewayService composition root.
+	*/
+	sessions;
+	/**
+	* Skills + extensions marketplace surface (browse / install / uninstall) plus
+	* local-only managed-skill ops. Routes depend on this narrow service.
+	*/
+	marketplace;
 	constructor(serviceConfig = {}) {
 		this.serviceConfig = serviceConfig;
 		this.bus = new MessageBus();
@@ -166,6 +163,44 @@ var GatewayService = class {
 		this.initializeExtensionLoader();
 		this.sessionIndex = new SessionIndex({ config: this.config });
 		this.cronService = new CronService({ filePath: resolveCronJobsPath() });
+		this.agentRunner = new GatewayAgentRunner({
+			bus: this.bus,
+			sessionIndex: this.sessionIndex,
+			getAgentService: () => this.ensureAgentService(),
+			getChannelManager: () => this.channelManager,
+			getConfig: () => this.config,
+			emit: (type, payload) => this.sse.emit(type, payload)
+		});
+		this.sessions = new GatewaySessionsApi({
+			sessionIndex: this.sessionIndex,
+			getAgentService: () => this.ensureAgentService(),
+			getActiveWebchatRunId: (sk) => this.agentRunner.getActiveRunId(sk)
+		});
+		this.marketplace = new GatewayMarketplaceService({
+			getConfig: () => this.config,
+			getAgentService: () => this.ensureAgentService(),
+			getExtensionLoader: () => this.extensionLoader,
+			getChannelManager: () => this.channelManager,
+			saveConfig: (cfg) => this.saveConfig(cfg),
+			emit: (type, payload) => this.emit(type, payload)
+		});
+		this.configCoordinator = new GatewayConfigCoordinator({
+			configPath: this.configPath,
+			bus: this.bus,
+			enableHotReload: this.serviceConfig.enableHotReload !== false,
+			getConfig: () => this.config,
+			setConfig: (next) => {
+				this.config = next;
+			},
+			getAgentService: () => this.ensureAgentService(),
+			getChannelManager: () => this.channelManager,
+			getCronService: () => this.cronService,
+			getHeartbeatService: () => this.heartbeatService,
+			getExtensionLoader: () => this.extensionLoader,
+			reconcileBrowserExtensionServer: () => this.reconcileBrowserExtensionServer(),
+			getChannelsStatus: () => this.getChannelsStatus(),
+			emit: (type, payload) => this.emit(type, payload)
+		});
 	}
 	/** Lazy AgentService — constructed on first use or during `start()`. */
 	get agentService() {
@@ -188,24 +223,13 @@ var GatewayService = class {
 			},
 			extensionRegistry: this.extensionLoader?.getRegistry(),
 			getCronService: () => cronRef.service,
-			gatewayClarify: { requestClarification: (sessionKey, request) => {
-				const runId = this.activeWebchatRunBySession.get(sessionKey);
-				const publishSse = runId ? (e) => {
-					this._agentService.enqueueWebchatSseEvent(sessionKey, e);
-				} : void 0;
-				const deliver = parseSessionKey(sessionKey)?.source === "telegram" ? async (ctx) => {
-					await this.deliverTelegramClarify(ctx);
-				} : void 0;
-				if (!runId && !deliver) return Promise.reject(/* @__PURE__ */ new Error("Clarify is not available for this session (use webchat, Telegram, or CLI)"));
-				return this.clarifyBridge.startRequest({
-					sessionKey,
-					runId,
-					relay: this.runRelay,
-					publishSse,
-					request,
-					deliver
-				});
-			} }
+			gatewayClarify: { requestClarification: (sessionKey, request) => this.agentRunner.requestClarification({
+				sessionKey,
+				request,
+				publishSseFor: (_runId) => (e) => {
+					this._agentService.turnDispatcher.enqueueWebchatSseEvent(sessionKey, e);
+				}
+			}) }
 		});
 		this._agentService.setChannelManager(this.channelManager);
 		this.channelManager.setSessionModelHooks({
@@ -220,17 +244,17 @@ var GatewayService = class {
 			getDefaultCronAgentId: () => getDefaultAgentId(this.config)
 		});
 		cronRef.service = this.cronService;
-		this._agentService.setPersistentGoalWebchatContinuationScheduler((sessionKey, message) => {
+		this._agentService.persistentGoals.setWebchatContinuationScheduler((sessionKey, message) => {
 			const scheduleWhenIdle = () => {
 				if (this._agentService.getInboundTurnDepth(sessionKey) > 0) {
 					setTimeout(scheduleWhenIdle, 50);
 					return;
 				}
-				if (this.activeWebchatRunBySession.has(sessionKey)) {
+				if (this.agentRunner.hasActiveRun(sessionKey)) {
 					setTimeout(scheduleWhenIdle, 50);
 					return;
 				}
-				this.drainScheduledWebchatContinuation(sessionKey, message);
+				this.agentRunner.drainScheduledWebchatContinuation(sessionKey, message);
 			};
 			queueMicrotask(scheduleWhenIdle);
 		});
@@ -247,11 +271,20 @@ var GatewayService = class {
 		});
 		return this.heartbeatService;
 	}
-	/** Hermes-style: after HTTP sets a goal, enqueue the goal text as the next user turn. */
 	enqueueWebchatPersistentGoalKickoff(sessionKey, goalText) {
-		queueMicrotask(() => {
-			this.drainScheduledWebchatContinuation(sessionKey, goalText);
-		});
+		this.agentRunner.enqueueWebchatPersistentGoalKickoff(sessionKey, goalText);
+	}
+	runAgent(...args) {
+		return this.agentRunner.runAgent(...args);
+	}
+	abortAgentRun(runId) {
+		return this.agentRunner.abortAgentRun(runId);
+	}
+	steerWebchatAgent(chatId, message) {
+		return this.agentRunner.steerWebchatAgent(chatId, message);
+	}
+	submitClarifyResponse(requestId, answer) {
+		return this.agentRunner.submitClarifyResponse(requestId, answer);
 	}
 	initializeExtensionLoader() {
 		try {
@@ -345,11 +378,11 @@ var GatewayService = class {
 		this.startupTrace = createGatewayStartupTrace();
 		this.readiness.markStarting(this.startTime);
 		const trace = this.startupTrace;
-		registerClarifyBridge(this.clarifyBridge);
+		registerClarifyBridge(this.agentRunner.getClarifyBridge());
 		this.ensureAgentService();
 		this.channelManager.setOutboundHooks({
-			runMessageSending: (to, content, channel) => this.agentService.invokeOutboundMessageSending(to, content, channel),
-			runMessageSent: (to, content, success, error, channel) => this.agentService.invokeOutboundMessageSent(to, content, success, error, channel)
+			runMessageSending: (to, content, channel) => this.agentService.outboundCoordinator.invokeOutboundMessageSending(to, content, channel),
+			runMessageSent: (to, content, success, error, channel) => this.agentService.outboundCoordinator.invokeOutboundMessageSent(to, content, success, error, channel)
 		});
 		this.channelManager.enableOutboundPersistence(resolveAgentDir(this.config, getDefaultAgentId(this.config)));
 		if (this.extensionLoader) this.extensionLoader.setRuntimeContext({
@@ -357,7 +390,7 @@ var GatewayService = class {
 			sessionManager: this.sessionIndex,
 			scheduleWebchatContinuation: (sessionKey, continuationMessage) => {
 				queueMicrotask(() => {
-					this.drainScheduledWebchatContinuation(sessionKey, continuationMessage);
+					this.agentRunner.drainScheduledWebchatContinuation(sessionKey, continuationMessage);
 				});
 			}
 		});
@@ -440,7 +473,7 @@ var GatewayService = class {
 		if (this.serviceConfig.deferChannelConnectUntilAfterHttp !== true) this.startOutboundProcessor().catch((err) => {
 			log.error({ err }, "Outbound processor error");
 		});
-		if (this.serviceConfig.enableHotReload !== false) this.setupConfigReloader();
+		if (this.serviceConfig.enableHotReload !== false) this.configCoordinator.startHotReloader();
 		this.stopGatewayUpdateCheck = scheduleGatewayUpdateCheck({
 			config: this.config,
 			onUpdateAvailableChange: (update) => {
@@ -543,14 +576,7 @@ var GatewayService = class {
 			this.stopGatewayUpdateCheck();
 			this.stopGatewayUpdateCheck = null;
 		}
-		if (this.configReloader) {
-			await this.configReloader.stop();
-			this.configReloader = null;
-		}
-		if (this.channelReloadFlushPromise) {
-			await this.channelReloadFlushPromise.catch(() => {});
-			this.channelReloadFlushPromise = null;
-		}
+		await this.configCoordinator.stopHotReloader();
 		this.heartbeatService?.stop();
 		if (this.browserExtensionRelease) {
 			await this.browserExtensionRelease();
@@ -559,7 +585,7 @@ var GatewayService = class {
 		this.browserExtensionProvider = null;
 		this.browserExtensionBindKey = null;
 		registerClarifyBridge(null);
-		this.clarifyBridge.dispose();
+		this.agentRunner.disposeClarifyBridge();
 		await disposeAllSessionMcpRuntimes().catch((err) => {
 			log.warn({ err }, "MCP runtime shutdown failed");
 		});
@@ -571,6 +597,7 @@ var GatewayService = class {
 		this.lastChannelConnectDeferSource = "off";
 		await this.channelManager.stop();
 		await this.cronService.stop();
+		buckets.destroyAll();
 		log.debug("Gateway service stopped");
 	}
 	/** Start the browser extension WS server when backend is 'extension'. */
@@ -664,457 +691,26 @@ var GatewayService = class {
 			await new Promise((resolve) => setTimeout(resolve, 1e3));
 		}
 	}
-	/**
-	* Setup config hot reload using ConfigHotReloader
-	*/
-	setupConfigReloader() {
-		this.configReloader = new ConfigHotReloader(this.configPath, this.config, {
-			onModelsReload: (newConfig) => this.handleModelsReload(newConfig),
-			onAgentDefaultsReload: (newConfig) => this.handleAgentDefaultsReload(newConfig),
-			onChannelsReload: (newConfig) => this.handleChannelsReload(newConfig),
-			onCronReload: (newConfig) => this.handleCronReload(newConfig),
-			onHeartbeatReload: (newConfig) => this.handleHeartbeatReload(newConfig),
-			onToolsReload: (newConfig) => this.handleToolsReload(newConfig),
-			onMcpReload: (newConfig) => this.handleMcpReload(newConfig),
-			onExtensionsReload: async (newConfig, changedPaths) => {
-				await this.handleExtensionsReload(newConfig, changedPaths);
-			},
-			onFullRestart: (newConfig) => {
-				log.warn({
-					requiresProcessRestart: true,
-					hint: "Restart the gateway process (hot reload cannot apply this change)."
-				}, "Config reload: full gateway restart required — see prior \"restartPaths\" info log");
-				this.config = newConfig;
-				this.emit("config.reload", {
-					section: "full",
-					requiresRestart: true
-				});
-			}
-		}, {
-			debounceMs: 300,
-			enabled: this.serviceConfig.enableHotReload !== false
-		});
-		this.configReloader.start();
-	}
-	/**
-	* Handle models config hot reload
-	*/
-	handleModelsReload(newConfig) {
-		log.debug("Reloading models config...");
-		this.config = newConfig;
-		getModelRegistry().refresh();
-		this.emit("config.reload", { section: "models" });
-		log.debug("Models config reloaded");
-	}
-	/**
-	* Handle agent defaults config hot reload
-	*/
-	handleAgentDefaultsReload(newConfig) {
-		log.debug("Reloading agent defaults...");
-		this.config = newConfig;
-		this.agentService.applyAgentDefaultsFromConfig(newConfig);
-		this.reconcileBrowserExtensionServer();
-		this.emit("config.reload", { section: "agents" });
-		log.debug("Agent defaults reloaded");
-	}
-	/**
-	* Apply `latest.channels` to every registered channel plugin (Telegram, Weixin, extensions).
-	* Single runtime path for: file watcher hot reload, API saves, and Weixin QR follow-up.
-	*/
-	async handleChannelsReload(newConfig) {
-		log.debug("Reloading channels config...");
-		this.config = newConfig;
-		await this.channelManager.updateConfig(newConfig);
-		this.emit("config.reload", { section: "channels" });
-		this.emit("channels.status", { channels: this.getChannelsStatus() });
-		log.debug("Channels config reloaded");
-	}
-	/**
-	* Apply channel plugins for the latest persisted `this.config` without blocking `saveConfig` HTTP handlers.
-	* Coalesces rapid saves so Telegram/Weixin do not stop/start repeatedly.
-	*/
-	scheduleChannelPluginsAfterPersist() {
-		this.channelReloadPending = true;
-		if (this.channelReloadFlushPromise) return;
-		this.channelReloadFlushPromise = (async () => {
-			try {
-				while (this.channelReloadPending) {
-					this.channelReloadPending = false;
-					await this.handleChannelsReload(this.config);
-				}
-			} catch (err) {
-				const em = err instanceof Error ? err.message : String(err);
-				log.error({
-					err,
-					errorMessage: em
-				}, `Channel reload after persist failed: ${em}`);
-			} finally {
-				this.channelReloadFlushPromise = null;
-				if (this.channelReloadPending) this.scheduleChannelPluginsAfterPersist();
-			}
-		})();
-	}
-	/**
-	* Handle cron config hot reload
-	*/
-	handleCronReload(newConfig) {
-		log.debug("Reloading cron config...");
-		this.config = newConfig;
-		this.cronService.updateConfig(newConfig);
-		this.emit("config.reload", { section: "cron" });
-		log.debug("Cron config reloaded");
-	}
-	/**
-	* Handle heartbeat config hot reload
-	*/
-	handleHeartbeatReload(newConfig) {
-		log.debug("Reloading heartbeat config...");
-		this.config = newConfig;
-		this.heartbeatService?.updateConfig(newConfig);
-		this.emit("config.reload", { section: "heartbeat" });
-		log.debug("Heartbeat config reloaded");
-	}
-	/**
-	* Apply `gateway.heartbeat` from current config after PATCH /api/config (and when hot reload is off).
-	* File watcher uses `handleHeartbeatReload` with the same effect when paths match.
-	*/
 	reloadHeartbeatFromCurrentConfig() {
-		this.handleHeartbeatReload(this.config);
-	}
-	/**
-	* Handle tools config hot reload
-	*/
-	handleToolsReload(newConfig) {
-		log.debug("Reloading tools config...");
-		this.config = newConfig;
-		this.emit("config.reload", { section: "tools" });
-		log.debug("Tools config reloaded");
-	}
-	handleMcpReload(newConfig) {
-		log.debug("Reloading MCP config...");
-		this.config = newConfig;
-		disposeAllSessionMcpRuntimes().catch((err) => {
-			log.warn({ err }, "MCP runtime dispose on config reload failed");
-		});
-		this.emit("config.reload", { section: "mcp" });
-		log.debug("MCP config reloaded");
-	}
-	/**
-	* Dispatch config hot reload to extensions that registered `registerReload`, matching changed paths.
-	*/
-	async handleExtensionsReload(newConfig, changedPaths) {
-		this.config = newConfig;
-		this.extensionLoader?.setConfig(this.config);
-		if (!this.extensionLoader) {
-			this.emit("config.reload", {
-				section: "extensions",
-				source: "extension-reload",
-				changedPaths
-			});
-			return;
-		}
-		const matchingRegs = this.extensionLoader.getRegistry().getMatchingReloadRegistrations(changedPaths);
-		if (matchingRegs.length === 0) {
-			log.debug({ changedPaths }, "No extension reload handlers matched");
-			this.emit("config.reload", {
-				section: "extensions",
-				source: "extension-reload",
-				changedPaths
-			});
-			return;
-		}
-		for (const reg of matchingRegs) {
-			const relevantPaths = changedPaths.filter((p) => reg.configPrefixes.length === 0 || reg.configPrefixes.some((prefix) => p === prefix || p.startsWith(`${prefix}.`)));
-			log.info({
-				extensionId: reg.extensionId,
-				relevantPaths
-			}, "Calling extension reload handler");
-			try {
-				const result = await reg.handler(newConfig, relevantPaths);
-				if (result.success) log.info({ extensionId: reg.extensionId }, "Extension reload succeeded");
-				else log.warn({
-					extensionId: reg.extensionId,
-					error: result.error
-				}, `Extension reload reported failure: ${result.error ?? "unknown"}`);
-			} catch (err) {
-				const errorMessage = err instanceof Error ? err.message : String(err);
-				log.error({
-					err,
-					extensionId: reg.extensionId,
-					errorMessage
-				}, `Extension reload handler threw: ${errorMessage}`);
-			}
-		}
-		this.emit("config.reload", {
-			section: "extensions",
-			source: "extension-reload",
-			changedPaths
-		});
-	}
-	/**
-	* Reload configuration from disk (manual trigger)
-	*/
-	async reloadConfig() {
-		if (!this.configReloader) return {
-			reloaded: false,
-			error: "Config reloader not initialized"
-		};
-		const result = await this.configReloader.triggerReload();
-		return {
-			reloaded: result.success,
-			error: result.error
-		};
+		this.configCoordinator.reloadHeartbeatFromCurrentConfig();
 	}
-	/**
-	* After Weixin QR login: token files may change without a `channels.weixin` JSON diff, so run the same
-	* channel apply as an API save, then force Weixin long-poll restart (see `reloadMonitorsWithConfig`).
-	*/
-	async afterWeixinCredentialsPersisted() {
-		const next = loadConfig(this.configPath);
-		this.config = next;
-		this.agentService.applyAgentDefaultsFromConfig(next);
-		this.configReloader?.syncCurrentConfig(next);
-		await this.handleChannelsReload(next);
-		const { weixinPlugin } = await import("../channels/weixin/index.js");
-		await weixinPlugin.reloadMonitorsWithConfig(this.config, this.bus);
-		log.info("Weixin monitors restarted after credential login");
-	}
-	/**
-	* After Feishu WebUI QR setup: `channels.feishu` was written directly to disk; reload into memory
-	* and apply channel plugins (same baseline as PATCH /api/config).
-	*/
-	async afterFeishuCredentialsPersisted() {
-		const next = loadConfig(this.configPath);
-		this.config = next;
-		this.agentService.applyAgentDefaultsFromConfig(next);
-		this.configReloader?.syncCurrentConfig(next);
-		await this.handleChannelsReload(next);
-		log.info("Feishu config applied after QR setup");
+	reloadConfig() {
+		return this.configCoordinator.reloadConfig();
 	}
-	/**
-	* Persist and replace `this.config` with the validated file contents so runtime matches disk
-	* (PATCH merge objects can drift from Zod-normalized output).
-	*/
-	async writeConfigAndReloadFromDisk(configToWrite) {
-		await saveConfig(configToWrite, this.configPath);
-		this.config = loadConfig(this.configPath);
-		if (sanitizeTunnelConfig(this.config)) await saveConfig(this.config, this.configPath);
-		this.agentService.applyAgentDefaultsFromConfig(this.config);
-		await this.reconcileBrowserExtensionServer();
-		await this.agentService.reconcileDreamingNow().catch((err) => {
-			const em = err instanceof Error ? err.message : String(err);
-			log.warn({
-				err,
-				errorMessage: em
-			}, `Dreaming cron reconcile after save failed: ${em}`);
-		});
-		this.configReloader?.syncCurrentConfig(this.config);
-	}
-	async saveConfig(config) {
-		try {
-			await this.writeConfigAndReloadFromDisk(config);
-			this.scheduleChannelPluginsAfterPersist();
-			return { saved: true };
-		} catch (err) {
-			const error = err instanceof Error ? err.message : String(err);
-			log.error({ error }, "Failed to save config");
-			return {
-				saved: false,
-				error
-			};
-		}
-	}
-	/**
-	* App store (phase 1): persist `extensions.enabled` / `extensions.disabled` for a bundled extension.
-	* Marketplace-only extensions hot-load on enable; disable still needs a gateway restart to unload.
-	*/
-	async setBundledExtensionActivationTarget(extensionId, wanted) {
-		const loader = this.extensionLoader;
-		if (!loader) return {
-			ok: false,
-			error: "Extension loader unavailable",
-			requiresGatewayRestart: false
-		};
-		const id = extensionId.trim();
-		if (!id) return {
-			ok: false,
-			error: "Invalid extension id",
-			requiresGatewayRestart: false
-		};
-		const patch = computeBundledExtensionExtensionsPatch(loader, this.config, id, wanted);
-		if (patch.ok === false) return {
-			ok: false,
-			error: patch.error,
-			requiresGatewayRestart: false
-		};
-		const newConfig = {
-			...this.config,
-			extensions: patch.extensions
-		};
-		const saved = await this.saveConfig(newConfig);
-		if (!saved.saved) return {
-			ok: false,
-			error: saved.error ?? "Failed to save config",
-			requiresGatewayRestart: false
-		};
-		loader.setConfig(this.config);
-		let requiresGatewayRestart = true;
-		if (wanted) try {
-			loader.invalidateManifestCache();
-			await loader.loadByActivationPlan();
-			requiresGatewayRestart = false;
-		} catch (err) {
-			const em = err instanceof Error ? err.message : String(err);
-			log.warn({
-				err,
-				extensionId: id,
-				errorMessage: em
-			}, `Extension hot-load after bundled activation failed: ${em}`);
-			requiresGatewayRestart = true;
-		}
-		this.emit("config.reload", {
-			section: "extensions",
-			source: "bundled-activation"
-		});
-		return {
-			ok: true,
-			requiresGatewayRestart
-		};
-	}
-	/**
-	* Update configuration and persist to disk
-	*/
-	async updateConfig(updates) {
-		try {
-			log.debug("Updating configuration...");
-			this.config = {
-				...this.config,
-				...updates
-			};
-			await this.writeConfigAndReloadFromDisk(this.config);
-			this.scheduleChannelPluginsAfterPersist();
-			log.debug("Configuration updated successfully");
-			return { updated: true };
-		} catch (err) {
-			const error = err instanceof Error ? err.message : String(err);
-			log.error({ error }, "Failed to update config");
-			return {
-				updated: false,
-				error
-			};
-		}
-	}
-	/**
-	* Run agent with a message and stream events.
-	* `runOptions.signal` — When set (e.g. client disconnect), aborts in-flight generation and persists partial output.
-	*/
-	async *runAgent(message, channel, chatId, attachments, thinking, runOptions) {
-		const iter = runGatewayAgent({
-			config: this.config,
-			agentService: this.agentService,
-			bus: this.bus,
-			runRelay: this.runRelay,
-			runAbortControllers: this.runAbortControllers,
-			activeWebchatRunBySession: this.activeWebchatRunBySession,
-			sessionIndex: this.sessionIndex,
-			emit: (type, payload) => this.sse.emit(type, payload)
-		}, message, channel, chatId, attachments, thinking, runOptions);
-		let step = await iter.next();
-		while (!step.done) {
-			yield step.value;
-			step = await iter.next();
-		}
-		return step.value;
-	}
-	/** Abort an in-flight webchat agent run (matches `runId` from SSE `status`). */
-	abortAgentRun(runId) {
-		this.clarifyBridge.cancelForRun(runId);
-		const keysToMark = [];
-		for (const [sk, id] of this.activeWebchatRunBySession) if (id === runId) keysToMark.push(sk);
-		for (const sk of keysToMark) this.activeWebchatRunBySession.delete(sk);
-		const relaySk = this.runRelay.getSessionKey(runId);
-		if (relaySk && !keysToMark.includes(relaySk)) keysToMark.push(relaySk);
-		const c = this.runAbortControllers.get(runId);
-		if (!c) return false;
-		const cutoffTs = Date.now();
-		for (const sk of keysToMark) {
-			this.sessionIndex.updateSessionMetadata(sk, { abortCutoffTimestamp: cutoffTs }).catch(() => {});
-			this.sessionIndex.appendTranscriptContextEntry(sk, {
-				text: "Webchat agent run aborted",
-				data: {
-					runId,
-					abortCutoffTimestamp: cutoffTs
-				}
-			}).catch(() => {});
-		}
-		c.abort();
-		for (const sk of keysToMark) import("../agent/embedded/runs.js").then(({ abortEmbeddedRun }) => abortEmbeddedRun(sk));
-		return true;
+	afterWeixinCredentialsPersisted() {
+		return this.configCoordinator.afterWeixinCredentialsPersisted();
 	}
-	/** Background drain for extension-initiated webchat turns (`scheduleWebchatContinuation`). */
-	async drainScheduledWebchatContinuation(sessionKey, message) {
-		try {
-			const gen = this.runAgent(message, "webchat", sessionKey, void 0, void 0, { clientCreatedAtMs: Date.now() });
-			for await (const _ of gen);
-		} catch (err) {
-			log.warn({
-				err,
-				sessionKey
-			}, "Scheduled webchat continuation failed");
-		}
+	afterFeishuCredentialsPersisted() {
+		return this.configCoordinator.afterFeishuCredentialsPersisted();
 	}
-	/**
-	* Queue steering text for an active webchat run (`Agent.steer` / tool-boundary injection).
-	* `chatId` is the same as `POST /api/agent` body (`sessionKey` or legacy peer id).
-	*/
-	async steerWebchatAgent(chatId, message) {
-		const trimmed = message.trim();
-		if (!trimmed) return {
-			ok: false,
-			code: "BAD_REQUEST"
-		};
-		const sessionKey = parseSessionKey(chatId) ? chatId : buildSessionKey({
-			agentId: getDefaultAgentId(this.config),
-			source: "webchat",
-			accountId: "default",
-			peerKind: "direct",
-			peerId: chatId
-		});
-		if (!this.activeWebchatRunBySession.has(sessionKey)) return {
-			ok: false,
-			code: "NO_ACTIVE_RUN"
-		};
-		if (!await this.agentService.steerWebchatSession(sessionKey, trimmed)) return {
-			ok: false,
-			code: "STEER_FAILED"
-		};
-		return { ok: true };
+	saveConfig(config) {
+		return this.configCoordinator.saveConfig(config);
 	}
-	async deliverTelegramClarify(ctx) {
-		const parsed = parseSessionKey(ctx.sessionKey);
-		if (!parsed || parsed.source !== "telegram") return;
-		let body = ctx.request.question;
-		if (ctx.request.default) body += `\n\nDefault if unsure: ${ctx.request.default}`;
-		const choices = ctx.request.choices;
-		const buttonRows = choices && choices.length >= 2 ? choices.map((c, i) => [{
-			text: c.length > 64 ? `${c.slice(0, 61)}…` : c,
-			callback_data: `clarify:${ctx.requestId}:${i}`
-		}]) : void 0;
-		if (!buttonRows) body += "\n\nReply with your answer in this chat.";
-		await this.channelManager.send({
-			channel: "telegram",
-			chat_id: parsed.peerId,
-			content: body,
-			metadata: {
-				accountId: parsed.accountId,
-				...parsed.threadId ? { threadId: parsed.threadId } : {}
-			},
-			buttons: buttonRows
-		});
+	setBundledExtensionActivationTarget(extensionId, wanted) {
+		return this.configCoordinator.setBundledExtensionActivationTarget(extensionId, wanted);
 	}
-	/** Deliver a user's answer to a pending `clarify` tool call. */
-	submitClarifyResponse(requestId, answer) {
-		return this.clarifyBridge.handleResponse(requestId, answer);
+	updateConfig(updates) {
+		return this.configCoordinator.updateConfig(updates);
 	}
 	/**
 	* Send message through a channel
@@ -1315,199 +911,6 @@ var GatewayService = class {
 	get cronServiceInstance() {
 		return this.cronService;
 	}
-	getSkillsApi(lang) {
-		return {
-			catalog: this.agentService.getSkillCatalog(lang),
-			managed: listManagedSkillDirs()
-		};
-	}
-	getSkillMarkdownSource(skillName, lang) {
-		return this.agentService.getSkillMarkdownSource(skillName, lang);
-	}
-	deleteManagedSkill(skillId) {
-		removeSkillsLockEntry(skillId);
-		deleteManagedSkill(skillId);
-		this.agentService.refreshSkillsAfterDiskChange();
-	}
-	installManagedSkillZip(buffer, opts) {
-		const result = installSkillFromZip(buffer, opts);
-		removeSkillsLockEntry(result.skillId);
-		this.agentService.refreshSkillsAfterDiskChange();
-		return result;
-	}
-	async fetchSkillsMarketplaceCatalog(params, provider) {
-		return listMarketplacePackages(this.config, params, provider);
-	}
-	async fetchSkillsMarketplaceCategories(provider) {
-		return listMarketplaceCategories(this.config, provider);
-	}
-	async fetchSkillsMarketplacePackageDetail(packageName, provider) {
-		return getMarketplacePackageDetail(this.config, packageName, provider);
-	}
-	async installSkillFromMarketplace(opts) {
-		const { buffer, skillId } = await downloadFromMarketplace(this.config, opts.name, opts.version, opts.provider);
-		return this.installManagedSkillZip(buffer, {
-			skillId,
-			overwrite: opts.overwrite ?? false
-		});
-	}
-	/**
-	* xopc-store extension package preview (type must be `extension`).
-	*/
-	async fetchExtensionMarketplacePackageDetail(packageName) {
-		const detail = await fetchMarketplacePackageDetail(resolveExtensionsStoreBaseUrl(this.config), packageName.trim());
-		if (detail.type !== "extension") throw new Error(`Package "${packageName}" is not an extension (store type: ${detail.type}).`);
-		return detail;
-	}
-	mergeExtensionEnabledIntoConfig(extensionId) {
-		const id = extensionId.trim();
-		const prevExt = this.config.extensions;
-		const baseExt = prevExt && typeof prevExt === "object" && !Array.isArray(prevExt) ? { ...prevExt } : {};
-		const enabledRaw = baseExt.enabled;
-		const enabled = Array.isArray(enabledRaw) ? [...enabledRaw.filter((x) => typeof x === "string")] : [];
-		if (!enabled.includes(id)) enabled.push(id);
-		const disabledRaw = baseExt.disabled;
-		const nextExt = {
-			...baseExt,
-			enabled
-		};
-		if (Array.isArray(disabledRaw)) {
-			const next = disabledRaw.filter((x) => typeof x === "string" && x !== id);
-			if (next.length > 0) nextExt.disabled = next;
-			else delete nextExt.disabled;
-		}
-		return {
-			...this.config,
-			extensions: nextExt
-		};
-	}
-	mergeExtensionRemovedFromEnabledConfig(extensionId) {
-		const id = extensionId.trim();
-		const prevExt = this.config.extensions;
-		const baseExt = prevExt && typeof prevExt === "object" && !Array.isArray(prevExt) ? { ...prevExt } : {};
-		const enabledRaw = baseExt.enabled;
-		const enabled = Array.isArray(enabledRaw) ? enabledRaw.filter((x) => typeof x === "string" && x !== id) : [];
-		return {
-			...this.config,
-			extensions: {
-				...baseExt,
-				enabled
-			}
-		};
-	}
-	/**
-	* Install an extension from xopc-store into the global extensions directory (`~/.xopc/extensions`),
-	* append its id to `extensions.enabled`, refresh the loader, and emit `config.reload`.
-	*/
-	async installExtensionFromMarketplace(opts) {
-		const packageName = opts.name.trim();
-		if (!packageName) throw new Error("Package name is required");
-		const storeBase = resolveExtensionsStoreBaseUrl(this.config);
-		const targetDir = resolveExtensionsDir();
-		mkdirSync(targetDir, { recursive: true });
-		const { downloadUrl, version } = await resolveExtensionZipDownloadUrl(storeBase, packageName, opts.version);
-		const buf = await downloadExtensionStoreZipBuffer(storeBase, downloadUrl);
-		if (opts.overwrite) {
-			const peekId = peekExtensionIdFromStoreZip(buf);
-			if (peekId && existsSync(join(targetDir, peekId))) rmSync(join(targetDir, peekId), {
-				recursive: true,
-				force: true
-			});
-		}
-		const result = await installExtensionFromStoreZip(buf, targetDir);
-		if (!result.ok || !result.extensionId) throw new Error(result.error ?? "Extension install failed");
-		await getExtensionLockfileManager().upsert(result.extensionId, {
-			name: result.extensionId,
-			version,
-			resolved: packageName,
-			source: "store"
-		});
-		const nextConfig = this.mergeExtensionEnabledIntoConfig(result.extensionId);
-		const saved = await this.saveConfig(nextConfig);
-		if (!saved.saved) throw new Error(saved.error ?? "Failed to save config after extension install");
-		const channelIdsBefore = new Set(this.channelManager.getAllPlugins().map((p) => p.id));
-		let requiresGatewayRestart = false;
-		try {
-			if (this.extensionLoader) {
-				this.extensionLoader.invalidateManifestCache();
-				await this.extensionLoader.loadByActivationPlan();
-				const reg = this.extensionLoader.getRegistry();
-				for (const p of reg.channelPlugins) if (!channelIdsBefore.has(p.id)) {
-					requiresGatewayRestart = true;
-					break;
-				}
-			}
-		} catch (err) {
-			const em = err instanceof Error ? err.message : String(err);
-			log.warn({
-				err,
-				errorMessage: em
-			}, `Extension loader refresh after marketplace install failed: ${em}`);
-			requiresGatewayRestart = true;
-		}
-		this.emit("config.reload", {
-			section: "extensions",
-			source: "marketplace-install"
-		});
-		return {
-			extensionId: result.extensionId,
-			version,
-			requiresGatewayRestart
-		};
-	}
-	/**
-	* Remove a user-installed (global or per-agent extensions dir) extension from disk and config.
-	*/
-	async uninstallUserExtension(extensionId) {
-		const id = extensionId.trim();
-		if (!id) throw new Error("extensionId is required");
-		const loader = this.extensionLoader;
-		if (!loader) throw new Error("Extensions unavailable");
-		const ext = loader.discoverExtensions().find((e) => e.id === id);
-		if (!ext) throw new Error(`Extension not found: ${id}`);
-		if (ext.source === "bundled") throw new Error("Built-in extensions cannot be uninstalled from the marketplace UI");
-		if (existsSync(ext.path)) rmSync(ext.path, {
-			recursive: true,
-			force: true
-		});
-		await getExtensionLockfileManager().remove(id);
-		const nextConfig = this.mergeExtensionRemovedFromEnabledConfig(id);
-		const saved = await this.saveConfig(nextConfig);
-		if (!saved.saved) throw new Error(saved.error ?? "Failed to save config after extension uninstall");
-		try {
-			loader.invalidateManifestCache();
-			await loader.loadByActivationPlan();
-		} catch (err) {
-			const em = err instanceof Error ? err.message : String(err);
-			log.warn({
-				err,
-				errorMessage: em
-			}, `Extension loader refresh after uninstall failed: ${em}`);
-		}
-		this.emit("config.reload", {
-			section: "extensions",
-			source: "marketplace-uninstall"
-		});
-		return { requiresGatewayRestart: true };
-	}
-	getSkillsMarketplaceProvider() {
-		const provider = resolveSkillsMarketplaceProvider(this.config);
-		return {
-			provider,
-			displayName: getMarketplaceProviderDisplayName(provider)
-		};
-	}
-	/** All registered marketplace providers (built-in + extension-contributed). */
-	getSkillsMarketplaceProviders() {
-		return listRegisteredProviders();
-	}
-	reloadSkillsFromDisk() {
-		this.agentService.refreshSkillsAfterDiskChange();
-	}
-	patchSkillEnabled(skillName, enabled) {
-		createSkillConfigManager(resolveStateDir()).setSkillEnabled(skillName, enabled);
-		this.agentService.refreshSkillsAfterSkillConfigChange();
-	}
 	get sessionIndexInstance() {
 		return this.sessionIndex;
 	}
@@ -1515,206 +918,21 @@ var GatewayService = class {
 	get sessionManagerInstance() {
 		return this.sessionIndex;
 	}
-	async getSessionAgentConfig(sessionKey) {
-		return this.agentService.getSessionAgentConfig(sessionKey);
-	}
-	/** Resolved markdown workspace for a session (after hydration / mkdir). Used by workspace file API when `sessionKey` is passed. */
-	async getEffectiveWorkspacePathForSession(sessionKey) {
-		return this.agentService.getEffectiveWorkspacePathForSession(sessionKey);
-	}
-	async patchSessionAgentConfig(sessionKey, body) {
-		return this.agentService.patchSessionAgentConfig(sessionKey, body);
-	}
-	/**
-	* Process a message directly through the agent (for CLI mode)
-	*/
+	/** Process a message directly through the agent (for CLI mode). */
 	async processDirect(content, sessionKey = "cli:direct") {
-		return this.agentService.processDirect(content, sessionKey);
+		return this.agentService.turnDispatcher.processDirect(content, sessionKey);
 	}
-	/**
-	* Subscribe to server-pushed events.
-	* Returns a cleanup function to unsubscribe.
-	*/
 	subscribe(sessionId, listener) {
 		return this.sse.subscribe(sessionId, listener);
 	}
-	/**
-	* Emit an event to all subscribers.
-	*/
 	emit(type, payload) {
 		this.sse.emit(type, payload);
 	}
-	/**
-	* Get events since a given event id (for Last-Event-ID reconnection).
-	*/
+	/** Replay events since `lastEventId` for SSE reconnection. */
 	getEventsSince(sessionId, lastEventId) {
 		return this.sse.getEventsSince(sessionId, lastEventId);
 	}
 	/**
-	* List sessions with query filters
-	*/
-	async listSessions(query) {
-		return this.sessionIndex.listSessions(query);
-	}
-	/**
-	* List all subagent sessions.
-	* Subagent sessions have keys starting with 'subagent:'.
-	*/
-	async listSubagents(query) {
-		return this.sessionIndex.listSubagents(query);
-	}
-	/**
-	* Get a single session by key
-	*/
-	async getSession(key, options) {
-		return this.sessionIndex.getSession(key, options);
-	}
-	/** Read-only: in-flight webchat agent run for this session key, if any. */
-	getSessionActiveRun(sessionKey) {
-		const key = sessionKey.trim();
-		if (!key) return { active: false };
-		const runId = this.activeWebchatRunBySession.get(key)?.trim();
-		if (!runId) return { active: false };
-		return {
-			active: true,
-			runId
-		};
-	}
-	async getSessionMessagePage(key, options) {
-		return this.sessionIndex.getSessionMessagePage(key, options);
-	}
-	/**
-	* Partial session metadata update (OpenClaw-style sessions.patch subset).
-	*/
-	async patchSession(key, body) {
-		return this.sessionIndex.patchSession(key, body);
-	}
-	async listSessionCompactionCheckpoints(key) {
-		return this.sessionIndex.listCompactionCheckpoints(key);
-	}
-	async getSessionCompactionCheckpoint(key, checkpointId) {
-		return this.sessionIndex.getCompactionCheckpointDetail(key, checkpointId);
-	}
-	async restoreSessionCompactionCheckpoint(key, checkpointId) {
-		await this.sessionIndex.restoreCompactionCheckpoint(key, checkpointId);
-		this.agentService.evictSessionAgent(key);
-	}
-	async runSessionCompaction(key, options) {
-		const result = await this.agentService.compactSession(key, options);
-		if (result.compacted) this.sessionIndex.appendTranscriptContextEntry(key, {
-			text: "Session transcript compacted",
-			data: {
-				firstKeptIndex: result.firstKeptIndex,
-				tokensBefore: result.tokensBefore,
-				tokensAfter: result.tokensAfter,
-				summaryPreview: result.summary.slice(0, 500)
-			}
-		}).catch(() => {});
-		return result;
-	}
-	/**
-	* Delete a session
-	*/
-	async deleteSession(key) {
-		const result = await this.sessionIndex.deleteSession(key);
-		if (result) {
-			this.agentService.evictSessionAgent(key);
-			await retireSessionMcpRuntimeForSessionKey({
-				sessionKey: key,
-				reason: "session-delete"
-			});
-		}
-		return { deleted: result };
-	}
-	/**
-	* Delete multiple sessions
-	*/
-	async deleteSessions(keys) {
-		return this.sessionIndex.deleteSessions(keys);
-	}
-	/**
-	* Rename a session
-	*/
-	async renameSession(key, name) {
-		await this.sessionIndex.renameSession(key, name);
-		return { renamed: true };
-	}
-	/**
-	* Tag a session
-	*/
-	async tagSession(key, tags) {
-		await this.sessionIndex.tagSession(key, tags);
-		return { tagged: true };
-	}
-	/**
-	* Remove tags from a session
-	*/
-	async untagSession(key, tags) {
-		await this.sessionIndex.untagSession(key, tags);
-		return { untagged: true };
-	}
-	/**
-	* Archive a session
-	*/
-	async archiveSession(key) {
-		await this.sessionIndex.archiveSession(key);
-		return { archived: true };
-	}
-	/**
-	* Unarchive a session
-	*/
-	async unarchiveSession(key) {
-		await this.sessionIndex.unarchiveSession(key);
-		return { unarchived: true };
-	}
-	/**
-	* Pin a session
-	*/
-	async pinSession(key) {
-		await this.sessionIndex.pinSession(key);
-		return { pinned: true };
-	}
-	/**
-	* Unpin a session
-	*/
-	async unpinSession(key) {
-		await this.sessionIndex.unpinSession(key);
-		return { unpinned: true };
-	}
-	/**
-	* Search sessions
-	*/
-	async searchSessions(query) {
-		return this.sessionIndex.searchSessions(query);
-	}
-	/**
-	* Search within a session
-	*/
-	async searchInSession(key, keyword) {
-		return this.sessionIndex.searchInSession(key, keyword);
-	}
-	/**
-	* Export a session
-	*/
-	async exportSession(key, format) {
-		return { content: await this.sessionIndex.exportSession(key, format) };
-	}
-	/**
-	* Get session statistics
-	*/
-	async getSessionStats() {
-		return this.sessionIndex.getStats();
-	}
-	/**
-	* Get unique chat IDs from sessions, grouped by channel
-	* Returns a list of channel/chatId pairs for cron job configuration.
-	* `chatId` is the session-store routing suffix (unique per bot account + peer).
-	* When `routing` exists, `peerId` is the platform id (e.g. Telegram numeric chat id).
-	*/
-	async getSessionChatIds(channel) {
-		return getDistinctSessionChatIds(this.sessionIndex, channel);
-	}
-	/**
 	* Validate authentication token from request headers.
 	* Returns true if auth is disabled (mode: 'none') or token is valid.
 	*/
@@ -1758,7 +976,7 @@ var GatewayService = class {
 				}
 			}
 		};
-		await this.writeConfigAndReloadFromDisk(this.config);
+		await this.saveConfig(this.config);
 		log.info({ tokenPreview: `${newToken.slice(0, 8)}...` }, "Gateway token refreshed");
 		return newToken;
 	}