@elizaos/agent 2.0.0-alpha.173 → 2.0.0-alpha.192

package/packages/agent/src/api/server.js

@@ -14,16 +14,25 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     return path;
 };
 import crypto from "node:crypto";
-import { lookup as dnsLookup } from "node:dns/promises";
 import fs from "node:fs";
 import http from "node:http";
 import { createRequire } from "node:module";
+function tokenMatches(expected, provided) {
+    const expectedBuf = Buffer.from(expected);
+    const providedBuf = Buffer.from(provided);
+    return (expectedBuf.length === providedBuf.length &&
+        crypto.timingSafeEqual(expectedBuf, providedBuf));
+}
 const MAX_BODY_BYTES = 1024 * 1024; // 1 MB
-import net from "node:net";
 import os from "node:os";
 import path from "node:path";
+// Discord local routes extracted to @elizaos/plugin-discord (setup-routes.ts)
+import { DropService, handleDropRoutes } from "@elizaos/app-elizamaker";
 import { handleKnowledgeRoutes } from "@elizaos/app-knowledge/routes";
+import { handleWebsiteBlockerRoutes } from "@elizaos/app-lifeops/routes/website-blocker-routes";
+import { TxService } from "@elizaos/app-steward/api/tx-service";
 import { wireCoordinatorBridgesWhenReady } from "@elizaos/app-task-coordinator/api/coordinator-wiring";
+import { routeTaskAgentTextToConnector } from "@elizaos/app-task-coordinator/api/task-agent-message-routing";
 // Phase 2 extraction: LifeOps routes → app-lifeops/src/routes/plugin.ts (lifeopsPlugin)
 // import { handleWalletTradeExecuteRoute } from "./wallet-trade-routes.js";
 // import {
@@ -35,20 +44,19 @@ import { wireCoordinatorBridgesWhenReady } from "@elizaos/app-task-coordinator/a
 import { handleTrainingRoutes } from "@elizaos/app-training/routes/training";
 import { handleTrajectoryRoute } from "@elizaos/app-training/routes/trajectory";
 import { ChannelType, createMessageMemory, logger, stringToUuid, } from "@elizaos/core";
+import { resolveApiBindHost, resolveServerOnlyPort, } from "@elizaos/shared/runtime-env";
 import { WebSocketServer } from "ws";
 import { getGlobalAwarenessRegistry } from "../awareness/registry.js";
 import { CharacterSchema } from "../config/character-schema.js";
 import { loadElizaConfig, saveElizaConfig, } from "../config/config.js";
 import { resolveModelsCacheDir, resolveStateDir } from "../config/paths.js";
 import { isStreamingDestinationConfigured } from "../config/plugin-auto-enable.js";
-import { isNullOriginAllowed, resolveAllowedHosts, resolveAllowedOrigins, resolveApiBindHost, resolveApiSecurityConfig, resolveApiToken, resolveServerOnlyPort, setApiToken, stripOptionalHostPort, } from "../config/runtime-env.js";
-import { ONBOARDING_CLOUD_PROVIDER_OPTIONS, ONBOARDING_PROVIDER_CATALOG, } from "../contracts/onboarding.js";
 import { createIntegrationTelemetrySpan } from "../diagnostics/integration-observability.js";
 import { resolveDefaultAgentWorkspaceDir } from "../providers/workspace.js";
 import { getAgentEventService, } from "../runtime/agent-event-service.js";
 import { classifyRegistryPluginRelease } from "../runtime/release-plugin-policy.js";
 import { AUDIT_EVENT_TYPES, AUDIT_SEVERITIES, getAuditFeedSize, queryAuditFeed, subscribeAuditFeed, } from "../security/audit-log.js";
-import { isBlockedPrivateOrLinkLocalIp, isLoopbackHost, normalizeHostLike, } from "../security/network-policy.js";
+import { isLoopbackHost, } from "../security/network-policy.js";
 import { AgentExportError, estimateExportSize, exportAgent, importAgent, } from "../services/agent-export.js";
 import { AppManager } from "../services/app-manager.js";
 import { registerClientChatSendHandler } from "../services/client-chat-sender.js";
@@ -58,6 +66,7 @@ import { ensurePrivyWalletsForCustomUser, isPrivyWalletProvisioningEnabled, } fr
 // signal-pairing: SignalPairingSession, sanitizeAccountId, signalLogout extracted to @elizaos/plugin-signal
 import { signalAuthExists } from "../services/signal-pairing.js";
 import { streamManager } from "../services/stream-manager.js";
+import { clearTelegramAccountAuthState, clearTelegramAccountSession, TelegramAccountAuthSession, telegramAccountAuthStateExists, telegramAccountSessionExists, } from "../services/telegram-account-auth.js";
 // Telegram account auth: moved to @elizaos/plugin-telegram (account-setup-routes + account-auth-service).
 // WhatsApp pairing: route handlers moved to @elizaos/plugin-whatsapp.
 import { executeTriggerTask, getTriggerHealthSnapshot, getTriggerLimit, listTriggerTasks, readTriggerConfig, readTriggerRuns, TRIGGER_TASK_NAME, TRIGGER_TASK_TAGS, taskToTriggerSummary, triggersFeatureEnabled, } from "../triggers/runtime.js";
@@ -89,18 +98,16 @@ import { handleConfigRoutes } from "./config-routes.js";
 import { ConnectorHealthMonitor } from "./connector-health.js";
 import { handleConnectorRoutes } from "./connector-routes.js";
 import { handleConversationRoutes } from "./conversation-routes.js";
+import { handleCuratedSkillsRoutes } from "./curated-skills-routes.js";
 import { handleDatabaseRoute } from "./database.js";
 import { handleDiagnosticsRoutes } from "./diagnostics-routes.js";
-// Discord local routes extracted to @elizaos/plugin-discord (setup-routes.ts)
-import { handleDropRoutes } from "./drop-routes.js";
-import { DropService } from "./drop-service.js";
 import { handleHealthRoutes } from "./health-routes.js";
 import { readJsonBody as parseJsonBody, readRequestBody, sendJson, sendJsonError, } from "./http-helpers.js";
 // iMessage routes extracted to @elizaos/plugin-imessage setup-routes.ts (Plugin.routes)
 // import { handleIMessageRoute } from "./imessage-routes.js";
 import { handleInboxRoute } from "./inbox-routes.js";
 import { handleMcpRoutes } from "./mcp-routes.js";
-import { pushWithBatchEvict, sweepExpiredEntries } from "./memory-bounds.js";
+import { pushWithBatchEvict } from "./memory-bounds.js";
 import { handleMemoryRoutes } from "./memory-routes.js";
 import { handleMiscRoutes } from "./misc-routes.js";
 import { handleModelsRoutes } from "./models-routes.js";
@@ -115,28 +122,22 @@ import { RegistryService } from "./registry-service.js";
 import { handleRelationshipsRoutes } from "./relationships-routes.js";
 import { tryHandleRuntimePluginRoute } from "./runtime-plugin-routes.js";
 import { handleSandboxRoute } from "./sandbox-routes.js";
-import { cloneWithoutBlockedObjectKeys, decodePathComponent, getErrorMessage, hasBlockedObjectKeyDeep, hasPersistedOnboardingState, isUuidLike, patchTouchesProviderSelection, resolveAppUserName, } from "./server-helpers.js";
+import { cloneWithoutBlockedObjectKeys, decodePathComponent, getErrorMessage, hasPersistedOnboardingState, isUuidLike, patchTouchesProviderSelection, resolveAppUserName, } from "./server-helpers.js";
 // signal-routes: handleSignalRoute dispatch extracted to @elizaos/plugin-signal (setup-routes.ts)
 import { applySignalQrOverride } from "./signal-routes.js";
 import { discoverSkills } from "./skill-discovery-helpers.js";
 import { handleSkillsRoutes } from "./skills-routes.js";
 import { handleSubscriptionRoutes } from "./subscription-routes.js";
-import { routeTaskAgentTextToConnector } from "./task-agent-message-routing.js";
+import { handleTelegramAccountRoute } from "./telegram-account-routes.js";
 import { handleTriggerRoutes } from "./trigger-routes.js";
 import { handleTtsRoutes } from "./tts-routes.js";
-import { TxService } from "./tx-service.js";
 import { handleUpdateRoutes } from "./update-routes.js";
-import { 
-// Balance/import/generate helpers moved to @elizaos/app-steward plugin routes.
-// fetchEvmBalances, fetchSolanaBalances, fetchSolanaNativeBalanceViaRpc,
-// generateWalletForChain, importWallet, validatePrivateKey,
-generateWalletKeys, getWalletAddresses, initStewardWalletCache, setSolanaWalletEnv, } from "./wallet.js";
+import { getWalletAddresses, initStewardWalletCache, } from "./wallet.js";
 // Wallet dispatch moved to @elizaos/app-steward plugin routes.
 // import { handleWalletBscRoutes } from "./wallet-bsc-routes.js";
 import { EVM_PLUGIN_PACKAGE, resolveWalletAutomationMode as resolveAgentAutomationModeFromConfig, resolveWalletCapabilityStatus, } from "./wallet-capability.js";
 import { handleWalletRoutes } from "./wallet-routes.js";
 import { resolveWalletRpcReadiness } from "./wallet-rpc.js";
-import { handleWebsiteBlockerRoutes } from "./website-blocker-routes.js";
 // handleWhatsAppRoute moved to @elizaos/plugin-whatsapp setup-routes.
 // applyWhatsAppQrOverride is still used by plugin-status routes.
 import { applyWhatsAppQrOverride } from "./whatsapp-routes.js";
@@ -148,9 +149,12 @@ export { buildChatAttachments, buildUserMessages, buildWalletActionNotExecutedRe
 import { getInventoryProviderOptions, getModelOptions, getOrFetchAllProviders, getOrFetchProvider, paramKeyToCategory, providerCachePath, readProviderCache, } from "./model-provider-helpers.js";
 import { AGENT_EVENT_ALLOWED_STREAMS, aggregateSecrets, BLOCKED_ENV_KEYS, CONFIG_WRITE_ALLOWED_TOP_KEYS, discoverInstalledPlugins, discoverPluginsFromManifest, getReleaseBundledPluginIds, maskValue, } from "./plugin-discovery-helpers.js";
 const nodeRequire = createRequire(import.meta.url);
+// Dynamic import (not require) because the plugin is ESM-only and bun's
+// createRequire cannot load ESM packages. Top-level await is settled before
+// any consumer reads the binding.
 let agentOrchestratorCompat = null;
 try {
-    agentOrchestratorCompat = nodeRequire("@elizaos/plugin-agent-orchestrator");
+    agentOrchestratorCompat = await import("@elizaos/plugin-agent-orchestrator");
 }
 catch {
     agentOrchestratorCompat = null;
@@ -452,7 +456,9 @@ function isModuleResolutionFailure(err) {
         return false;
     }
     const code = "code" in err ? err.code : undefined;
-    if (code === "MODULE_NOT_FOUND" || code === "ERR_MODULE_NOT_FOUND") {
+    if (code === "MODULE_NOT_FOUND" ||
+        code === "ERR_MODULE_NOT_FOUND" ||
+        code === "ERR_PACKAGE_PATH_NOT_EXPORTED") {
         return true;
     }
     if (!("message" in err) || typeof err.message !== "string") {
@@ -460,7 +466,8 @@ function isModuleResolutionFailure(err) {
     }
     return (err.message.includes("Cannot find module") ||
         err.message.includes("Cannot find package") ||
-        err.message.includes("ERR_MODULE_NOT_FOUND"));
+        err.message.includes("ERR_MODULE_NOT_FOUND") ||
+        err.message.includes('is not defined by "exports"'));
 }
 function isWalletBridgeImportFailure(err) {
     if (isModuleResolutionFailure(err)) {
@@ -497,587 +504,23 @@ function parseBoundedLimit(rawLimit, fallback = 15) {
         fallback,
     });
 }
+// Config redaction, skill validation extracted to server-helpers-config.ts
+// isBlockedObjectKey, redactDeep, redactConfigSecrets, isRedactedSecretValue,
+// stripRedactedPlaceholderValuesDeep imported from server-helpers-config.ts above.
+// isBlockedObjectKey alias for local usage:
+const isBlockedObjectKey = isBlockedObjectKeyFromConfig;
+// MCP validation helpers extracted to server-helpers-mcp.ts
+import { resolveMcpServersRejection as _resolveMcpServersRejection, validateMcpServerConfig as _validateMcpServerConfig, } from "./server-helpers-mcp.js";
+export { resolveMcpServersRejection, validateMcpServerConfig, } from "./server-helpers-mcp.js";
+const validateMcpServerConfig = _validateMcpServerConfig;
+const resolveMcpServersRejection = _resolveMcpServersRejection;
 // ---------------------------------------------------------------------------
-// Config redaction
-// ---------------------------------------------------------------------------
-/**
- * Key patterns that indicate a value is sensitive and must be redacted.
- * Matches against the property key at unknown nesting depth.  Aligned with
- * SENSITIVE_PATTERNS in src/config/schema.ts so every field the UI marks
- * as sensitive is also redacted in the API response.
- *
- * RESIDUAL RISK: Key-based redaction is heuristic — secrets stored under
- * generic keys (e.g. "value", "data", "config") will not be caught.  A
- * stronger approach would be either (a) schema-level `sensitive: true`
- * annotations that drive redaction, or (b) an allowlist that only exposes
- * known-safe fields and strips everything else.  Both require deeper
- * changes to the config schema infrastructure.
- */
-const SENSITIVE_KEY_RE = /password|secret|api.?key|private.?key|seed.?phrase|authorization|connection.?string|credential|(?<!max)tokens?$/i;
-function isBlockedObjectKey(key) {
-    return (key === "__proto__" ||
-        key === "constructor" ||
-        key === "prototype" ||
-        // Block config include directives — if an API caller embeds "$include"
-        // inside a config patch, the next loadElizaConfig() → resolveConfigIncludes
-        // pass would read arbitrary local files and merge them into the config.
-        key === "$include");
-}
-// hasBlockedObjectKeyDeep and cloneWithoutBlockedObjectKeys imported in the consolidated import at the top
-/**
- * Replace unknown non-empty value with "[REDACTED]".  For arrays, each string
- * element is individually redacted; for objects, all string leaves are
- * redacted.  Non-string primitives (booleans, numbers) are replaced with
- * the string "[REDACTED]" to avoid leaking e.g. numeric PINs.
- */
-function redactValue(val) {
-    if (val === null || val === undefined)
-        return val;
-    if (typeof val === "string")
-        return val.length > 0 ? "[REDACTED]" : "";
-    if (typeof val === "number" || typeof val === "boolean")
-        return "[REDACTED]";
-    if (Array.isArray(val))
-        return val.map(redactValue);
-    if (typeof val === "object") {
-        const out = {};
-        for (const [k, v] of Object.entries(val)) {
-            out[k] = redactValue(v);
-        }
-        return out;
-    }
-    return "[REDACTED]";
-}
-/**
- * Recursively walk a JSON-safe value.  For every object property whose key
- * matches SENSITIVE_KEY_RE, redact the **entire value** regardless of type
- * (string, array, nested object).  This prevents leaks when secrets are
- * stored as arrays (e.g. `apiKeys: ["sk-1","sk-2"]`) or objects.
- * Returns a deep copy — the original is never mutated.
- */
-function redactDeep(val) {
-    if (val === null || val === undefined)
-        return val;
-    if (Array.isArray(val))
-        return val.map(redactDeep);
-    if (typeof val === "object") {
-        const out = {};
-        for (const [key, child] of Object.entries(val)) {
-            if (SENSITIVE_KEY_RE.test(key)) {
-                out[key] = redactValue(child);
-            }
-            else {
-                out[key] = redactDeep(child);
-            }
-        }
-        return out;
-    }
-    return val;
-}
-/**
- * Return a deep copy of the config with every sensitive value replaced by
- * "[REDACTED]".  Uses a recursive walk so that ANY future config field
- * whose key matches the sensitive pattern is automatically covered —
- * no manual enumeration required.
- */
-function redactConfigSecrets(config) {
-    return redactDeep(config);
-}
-function isRedactedSecretValue(value) {
-    return (typeof value === "string" && value.trim().toUpperCase() === "[REDACTED]");
-}
-/** Remove UI round-trip placeholders so GET /api/config → PUT never persists "[REDACTED]". */
-function stripRedactedPlaceholderValuesDeep(value) {
-    if (value === null || typeof value !== "object")
-        return;
-    if (Array.isArray(value)) {
-        for (const item of value) {
-            stripRedactedPlaceholderValuesDeep(item);
-        }
-        return;
-    }
-    const obj = value;
-    for (const key of Object.keys(obj)) {
-        const v = obj[key];
-        if (isRedactedSecretValue(v)) {
-            delete obj[key];
-        }
-        else if (v !== null && typeof v === "object") {
-            stripRedactedPlaceholderValuesDeep(v);
-        }
-    }
-}
-// ---------------------------------------------------------------------------
-// Skill-ID path-traversal guard
+// Onboarding / config helpers — extracted to server-helpers-config.ts
 // ---------------------------------------------------------------------------
-/**
- * Validate that a user-supplied skill ID is safe to use in filesystem paths.
- * Rejects IDs containing path separators, ".." sequences, or unknown characters
- * outside the safe set used by the marketplace (`safeName()` in
- * skill-marketplace.ts).  Returns `null` and sends a 400 response if the
- * ID is invalid.
- */
-const SAFE_SKILL_ID_RE = /^[a-zA-Z0-9._-]+$/;
-function _validateSkillId(skillId, res) {
-    if (!skillId ||
-        !SAFE_SKILL_ID_RE.test(skillId) ||
-        skillId === "." ||
-        skillId.includes("..")) {
-        const safeDisplay = skillId.slice(0, 80).replace(/[^\x20-\x7e]/g, "?");
-        error(res, `Invalid skill ID: "${safeDisplay}"`, 400);
-        return null;
-    }
-    return skillId;
-}
-const ALLOWED_MCP_CONFIG_TYPES = new Set([
-    "stdio",
-    "http",
-    "streamable-http",
-    "sse",
-]);
-const ALLOWED_MCP_COMMANDS = new Set([
-    "npx",
-    "node",
-    "bun",
-    "bunx",
-    "deno",
-    "python",
-    "python3",
-    "uvx",
-    "uv",
-    "docker",
-    "podman",
-]);
-const BLOCKED_MCP_ENV_KEYS = new Set([
-    "LD_PRELOAD",
-    "LD_LIBRARY_PATH",
-    "DYLD_INSERT_LIBRARIES",
-    "DYLD_LIBRARY_PATH",
-    "NODE_OPTIONS",
-    "NODE_EXTRA_CA_CERTS",
-    "NODE_TLS_REJECT_UNAUTHORIZED",
-    "HTTP_PROXY",
-    "HTTPS_PROXY",
-    "ALL_PROXY",
-    "NO_PROXY",
-    "NODE_PATH",
-    "SSL_CERT_FILE",
-    "SSL_CERT_DIR",
-    "CURL_CA_BUNDLE",
-    "PATH",
-    "HOME",
-    "SHELL",
-]);
-const INTERPRETER_MCP_COMMANDS = new Set([
-    "node",
-    "bun",
-    "deno",
-    "python",
-    "python3",
-    "uv",
-]);
-const PACKAGE_RUNNER_MCP_COMMANDS = new Set(["npx", "bunx", "uvx"]);
-const CONTAINER_MCP_COMMANDS = new Set(["docker", "podman"]);
-const BLOCKED_INTERPRETER_FLAGS = new Set([
-    "-e",
-    "--eval",
-    "-p",
-    "--print",
-    "-r",
-    "--require",
-    "--import",
-    "--loader",
-    "--experimental-loader",
-    "--preload",
-    "-c",
-    "-m",
-    // V8 inspector — opens an unauthenticated debug port (default 9229) that
-    // allows arbitrary code execution via Chrome DevTools Protocol.  If bound
-    // to 0.0.0.0, any network peer can connect → RCE without any token.
-    "--inspect",
-    "--inspect-brk",
-    "--inspect-wait",
-    "--inspect-port",
-    "--inspect-publish-uid",
-    // Policy / diagnostics file access
-    "--experimental-policy",
-    "--diagnostic-dir",
-]);
-const BLOCKED_PACKAGE_RUNNER_FLAGS = new Set(["-c", "--call", "-e", "--eval"]);
-const BLOCKED_CONTAINER_FLAGS = new Set([
-    "--privileged",
-    "-v",
-    "--volume",
-    "--mount",
-    "--cap-add",
-    "--security-opt",
-    "--pid",
-    "--network",
-    "--device",
-    "--ipc",
-    "--uts",
-    "--userns",
-    "--cgroupns",
-]);
-const BLOCKED_DENO_SUBCOMMANDS = new Set(["eval"]);
-const BLOCKED_MCP_REMOTE_HOST_LITERALS = new Set([
-    "localhost",
-    "metadata.google.internal",
-]);
-function normalizeMcpCommand(command) {
-    const baseName = command.replace(/\\/g, "/").split("/").pop() ?? "";
-    return baseName.replace(/\.(exe|cmd|bat)$/i, "").toLowerCase();
-}
-function hasBlockedFlag(args, blockedFlags) {
-    for (const arg of args) {
-        const trimmed = arg.trim();
-        for (const flag of blockedFlags) {
-            if (trimmed === flag || trimmed.startsWith(`${flag}=`)) {
-                return flag;
-            }
-            // Block attached short-option forms like -cpayload or -epayload.
-            if (/^-[A-Za-z]$/.test(flag) &&
-                trimmed.startsWith(flag) &&
-                trimmed.length > flag.length) {
-                return flag;
-            }
-        }
-    }
-    return null;
-}
-function firstPositionalArg(args) {
-    for (const arg of args) {
-        const trimmed = arg.trim();
-        if (!trimmed || trimmed === "--" || trimmed.startsWith("-"))
-            continue;
-        return trimmed.toLowerCase();
-    }
-    return null;
-}
-async function resolveMcpRemoteUrlRejection(rawUrl) {
-    let parsed;
-    try {
-        parsed = new URL(rawUrl);
-    }
-    catch {
-        return "URL must be a valid absolute URL";
-    }
-    if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
-        return "URL must use http:// or https://";
-    }
-    const hostname = normalizeHostLike(parsed.hostname);
-    if (!hostname)
-        return "URL hostname is required";
-    if (BLOCKED_MCP_REMOTE_HOST_LITERALS.has(hostname) ||
-        hostname.endsWith(".localhost") ||
-        hostname.endsWith(".local")) {
-        return `URL host "${hostname}" is blocked for security reasons`;
-    }
-    if (net.isIP(hostname)) {
-        if (isBlockedPrivateOrLinkLocalIp(hostname)) {
-            return `URL host "${hostname}" is blocked for security reasons`;
-        }
-        return null;
-    }
-    let addresses;
-    try {
-        const resolved = await dnsLookup(hostname, { all: true });
-        addresses = Array.isArray(resolved) ? resolved : [resolved];
-    }
-    catch {
-        return `Could not resolve URL host "${hostname}"`;
-    }
-    if (addresses.length === 0) {
-        return `Could not resolve URL host "${hostname}"`;
-    }
-    for (const entry of addresses) {
-        if (isBlockedPrivateOrLinkLocalIp(entry.address)) {
-            return `URL host "${hostname}" resolves to blocked address ${entry.address}`;
-        }
-    }
-    return null;
-}
-export async function validateMcpServerConfig(config) {
-    const configType = config.type;
-    if (typeof configType !== "string" ||
-        !ALLOWED_MCP_CONFIG_TYPES.has(configType)) {
-        return `Invalid config type. Must be one of: ${[...ALLOWED_MCP_CONFIG_TYPES].join(", ")}`;
-    }
-    if (configType === "stdio") {
-        const command = typeof config.command === "string" ? config.command.trim() : "";
-        if (!command) {
-            return "Command is required for stdio servers";
-        }
-        if (!/^[A-Za-z0-9._-]+$/.test(command)) {
-            return "Command must be a bare executable name without path separators";
-        }
-        const normalizedCommand = normalizeMcpCommand(command);
-        if (!ALLOWED_MCP_COMMANDS.has(normalizedCommand)) {
-            return (`Command "${command}" is not allowed. ` +
-                `Allowed commands: ${[...ALLOWED_MCP_COMMANDS].join(", ")}`);
-        }
-        if (config.args !== undefined) {
-            if (!Array.isArray(config.args)) {
-                return "args must be an array of strings";
-            }
-            for (const arg of config.args) {
-                if (typeof arg !== "string") {
-                    return "Each arg must be a string";
-                }
-            }
-            const args = config.args;
-            if (INTERPRETER_MCP_COMMANDS.has(normalizedCommand)) {
-                const blocked = hasBlockedFlag(args, BLOCKED_INTERPRETER_FLAGS);
-                if (blocked) {
-                    return `Flag "${blocked}" is not allowed for ${normalizedCommand} MCP servers`;
-                }
-            }
-            if (PACKAGE_RUNNER_MCP_COMMANDS.has(normalizedCommand)) {
-                const blocked = hasBlockedFlag(args, BLOCKED_PACKAGE_RUNNER_FLAGS);
-                if (blocked) {
-                    return `Flag "${blocked}" is not allowed for ${normalizedCommand} MCP servers`;
-                }
-            }
-            if (CONTAINER_MCP_COMMANDS.has(normalizedCommand)) {
-                const blocked = hasBlockedFlag(args, BLOCKED_CONTAINER_FLAGS);
-                if (blocked) {
-                    return `Flag "${blocked}" is not allowed for ${normalizedCommand} MCP servers`;
-                }
-            }
-            if (normalizedCommand === "deno") {
-                const subcommand = firstPositionalArg(args);
-                if (subcommand && BLOCKED_DENO_SUBCOMMANDS.has(subcommand)) {
-                    return `Subcommand "${subcommand}" is not allowed for deno MCP servers`;
-                }
-            }
-        }
-    }
-    else {
-        const url = typeof config.url === "string" ? config.url.trim() : "";
-        if (!url) {
-            return "URL is required for remote servers";
-        }
-        const urlRejection = await resolveMcpRemoteUrlRejection(url);
-        if (urlRejection)
-            return urlRejection;
-    }
-    if (config.env !== undefined) {
-        if (typeof config.env !== "object" ||
-            config.env === null ||
-            Array.isArray(config.env)) {
-            return "env must be a plain object of string key-value pairs";
-        }
-        for (const [key, value] of Object.entries(config.env)) {
-            if (isBlockedObjectKey(key)) {
-                return `env key "${key}" is blocked for security reasons`;
-            }
-            if (typeof value !== "string") {
-                return `env.${key} must be a string`;
-            }
-            if (BLOCKED_MCP_ENV_KEYS.has(key.toUpperCase())) {
-                return `env variable "${key}" is not allowed for security reasons`;
-            }
-        }
-    }
-    if (config.cwd !== undefined && typeof config.cwd !== "string") {
-        return "cwd must be a string";
-    }
-    if (config.timeoutInMillis !== undefined) {
-        if (typeof config.timeoutInMillis !== "number" ||
-            !Number.isFinite(config.timeoutInMillis) ||
-            config.timeoutInMillis < 0) {
-            return "timeoutInMillis must be a non-negative number";
-        }
-    }
-    return null;
-}
-export async function resolveMcpServersRejection(servers) {
-    for (const [serverName, serverConfig] of Object.entries(servers)) {
-        if (isBlockedObjectKey(serverName)) {
-            return `Invalid server name: "${serverName}"`;
-        }
-        if (!serverConfig ||
-            typeof serverConfig !== "object" ||
-            Array.isArray(serverConfig)) {
-            return `Server "${serverName}" config must be a JSON object`;
-        }
-        if (hasBlockedObjectKeyDeep(serverConfig)) {
-            return `Server "${serverName}" contains blocked object keys`;
-        }
-        const configError = await validateMcpServerConfig(serverConfig);
-        if (configError) {
-            return `Server "${serverName}": ${configError}`;
-        }
-    }
-    return null;
-}
-// ---------------------------------------------------------------------------
-// Onboarding helpers
-// ---------------------------------------------------------------------------
-// Use shared presets for full parity between CLI and GUI onboarding.
-import { getDefaultStylePreset, getStylePresets, normalizeCharacterLanguage, resolveStylePresetByAvatarIndex, } from "../onboarding-presets.js";
+import { getStylePresets, normalizeCharacterLanguage, resolveStylePresetByAvatarIndex, } from "@elizaos/shared/onboarding-presets";
 import { pickRandomNames } from "../runtime/onboarding-names.js";
-const DEFAULT_ELEVENLABS_TTS_MODEL = "eleven_flash_v2_5";
-const ELEVENLABS_VOICE_ID_BY_PRESET = {
-    rachel: "21m00Tcm4TlvDq8ikWAM",
-    sarah: "EXAVITQu4vr4xnSDxMaL",
-    matilda: "XrExE9yKIg1WjnnlVkGX",
-    lily: "pFZP5JQG7iQjIQuC4Bku",
-    alice: "Xb7hH8MSUJpSbSDYk0k2",
-    brian: "nPczCjzI2devNBz1zQrb",
-    adam: "pNInz6obpgDQGcFmaJgB",
-    josh: "TxGEqnHWrfWFTfGW9XjX",
-    daniel: "onwK4e9ZLuTAKqWW03F9",
-    liam: "TX3LPaxmHKxFdv7VOQHJ",
-    gigi: "jBpfuIE2acCO8z3wKNLl",
-    mimi: "zrHiDhphv9ZnVXBqCLjz",
-    dorothy: "ThT5KcBeYPX3keUQqHPh",
-    glinda: "z9fAnlkpzviPz146aGWa",
-    charlotte: "XB0fDUnXU5powFXDhCwa",
-    callum: "N2lVS1w4EtoT3dr4eOWO",
-    momo: "n7Wi4g1bhpw4Bs8HK5ph",
-    yuki: "4tRn1lSkEn13EVTuqb0g",
-    rin: "cNYrMw9glwJZXR8RwbuR",
-    kei: "eadgjmk4R4uojdsheG9t",
-    jin: "6IwYbsNENZgAB1dtBZDp",
-    satoshi: "7cOBG34AiHrAzs842Rdi",
-    ryu: "QzTKubutNn9TjrB7Xb2Q",
-};
-function readUiLanguageHeader(req) {
-    if (!req) {
-        return undefined;
-    }
-    const header = req.headers["x-eliza-ui-language"] ?? req.headers["x-eliza-ui-language"];
-    if (Array.isArray(header)) {
-        return header.find((value) => value.trim())?.trim();
-    }
-    return typeof header === "string" && header.trim()
-        ? header.trim()
-        : undefined;
-}
-function resolveConfiguredCharacterLanguage(config, req) {
-    const uiLanguage = readUiLanguageHeader(req) ??
-        config?.ui?.language;
-    return normalizeCharacterLanguage(uiLanguage);
-}
-function resolveOnboardingStylePreset(body, language) {
-    const presets = getStylePresets(language);
-    const requestedPresetId = typeof body.presetId === "string" ? body.presetId.trim() : "";
-    if (requestedPresetId) {
-        const byId = presets.find((preset) => preset.id === requestedPresetId);
-        if (byId)
-            return byId;
-    }
-    if (typeof body.avatarIndex === "number" &&
-        Number.isFinite(body.avatarIndex)) {
-        const byAvatar = presets.find((preset) => preset.avatarIndex === Number(body.avatarIndex));
-        if (byAvatar)
-            return byAvatar;
-    }
-    const requestedName = typeof body.name === "string" ? body.name.trim() : "";
-    if (requestedName) {
-        const byName = presets.find((preset) => preset.name === requestedName);
-        if (byName)
-            return byName;
-    }
-    return getDefaultStylePreset(language);
-}
-function applyOnboardingVoicePreset(config, body, language) {
-    const elevenLabsApiKey = process.env.ELEVENLABS_API_KEY?.trim();
-    if (!elevenLabsApiKey) {
-        return;
-    }
-    const stylePreset = resolveOnboardingStylePreset(body, language);
-    const voicePresetId = stylePreset?.voicePresetId?.trim();
-    if (!voicePresetId) {
-        return;
-    }
-    const voiceId = ELEVENLABS_VOICE_ID_BY_PRESET[voicePresetId];
-    if (!voiceId) {
-        return;
-    }
-    if (!config.messages || typeof config.messages !== "object") {
-        config.messages = {};
-    }
-    const messages = config.messages;
-    const existingTts = messages.tts && typeof messages.tts === "object"
-        ? messages.tts
-        : {};
-    const existingElevenlabs = existingTts.elevenlabs && typeof existingTts.elevenlabs === "object"
-        ? existingTts.elevenlabs
-        : {};
-    messages.tts = {
-        ...existingTts,
-        provider: "elevenlabs",
-        elevenlabs: {
-            ...existingElevenlabs,
-            voiceId,
-            modelId: typeof existingElevenlabs.modelId === "string" &&
-                existingElevenlabs.modelId.trim()
-                ? existingElevenlabs.modelId.trim()
-                : DEFAULT_ELEVENLABS_TTS_MODEL,
-        },
-    };
-}
-function resolveDefaultAgentName(config, req) {
-    const configuredName = config?.ui?.assistant?.name?.trim() ??
-        config?.agents?.list?.[0]?.name?.trim();
-    if (configuredName) {
-        return configuredName;
-    }
-    return getDefaultStylePreset(resolveConfiguredCharacterLanguage(config, req))
-        .name;
-}
-function getProviderOptions() {
-    return ONBOARDING_PROVIDER_CATALOG.map((provider) => ({
-        id: provider.id,
-        name: provider.name,
-        envKey: provider.envKey,
-        pluginName: provider.pluginName,
-        keyPrefix: provider.keyPrefix,
-        description: provider.description,
-    }));
-}
-function getCloudProviderOptions() {
-    return ONBOARDING_CLOUD_PROVIDER_OPTIONS.map((provider) => ({
-        id: provider.id,
-        name: provider.name,
-        description: provider.description,
-    }));
-}
-function ensureWalletKeysInEnvAndConfig(config) {
-    const missingEvm = typeof process.env.EVM_PRIVATE_KEY !== "string" ||
-        !process.env.EVM_PRIVATE_KEY.trim();
-    const missingSolana = typeof process.env.SOLANA_PRIVATE_KEY !== "string" ||
-        !process.env.SOLANA_PRIVATE_KEY.trim();
-    if (!missingEvm && !missingSolana) {
-        return false;
-    }
-    try {
-        const walletKeys = generateWalletKeys();
-        if (!config.env ||
-            typeof config.env !== "object" ||
-            Array.isArray(config.env)) {
-            config.env = {};
-        }
-        const envConfig = config.env;
-        if (missingEvm) {
-            envConfig.EVM_PRIVATE_KEY = walletKeys.evmPrivateKey;
-            process.env.EVM_PRIVATE_KEY = walletKeys.evmPrivateKey;
-            logger.info(`[eliza-api] Generated EVM wallet: ${walletKeys.evmAddress}`);
-        }
-        if (missingSolana) {
-            envConfig.SOLANA_PRIVATE_KEY = walletKeys.solanaPrivateKey;
-            setSolanaWalletEnv(walletKeys.solanaPrivateKey);
-            logger.info(`[eliza-api] Generated Solana wallet: ${walletKeys.solanaAddress}`);
-        }
-        return true;
-    }
-    catch (err) {
-        logger.warn(`[eliza-api] Failed to generate wallet keys: ${err instanceof Error ? err.message : String(err)}`);
-        return false;
-    }
-}
+import { applyOnboardingVoicePreset, ensureWalletKeysInEnvAndConfig, getCloudProviderOptions, getProviderOptions, isBlockedObjectKey as isBlockedObjectKeyFromConfig, isRedactedSecretValue, isSafeResetStateDir, readUiLanguageHeader, redactConfigSecrets, redactDeep, resolveConfiguredCharacterLanguage, resolveDefaultAgentName, stripRedactedPlaceholderValuesDeep, } from "./server-helpers-config.js";
+export { isSafeResetStateDir } from "./server-helpers-config.js";
 // ---------------------------------------------------------------------------
 // Trade permission helpers (exported for use by awareness contributors)
 // ---------------------------------------------------------------------------
@@ -1188,281 +631,17 @@ function buildPluginEvmDiagnosticEntry(state) {
         ],
     };
 }
-// "send" alone is too broad — "send a slack message" shouldn't trigger wallet
-// mode.  Require "send" to appear near a crypto/wallet keyword within 40 chars.
-const _WALLET_CHAT_INTENT_RE = /\b(wallet|privy|onchain|on-chain|address|balance|swap|trade|transfer|token|bnb|t?bnb|eth|sol)\b|(?:\bsend\b(?=[\s\S]{0,40}\b(?:token|eth|sol|t?bnb|wallet|crypto|coin)\b))/i;
-// WALLET_EXECUTION_INTENT_RE, WALLET_PROGRESS_ONLY_RE, isWalletActionRequiredIntent
-// moved to server-helpers.ts; re-exported above.
-// Keep private regex constants here for wallet intent fallback code that stays in server.ts.
-// isWalletActionRequiredIntent, WALLET_EXECUTION_INTENT_RE, WALLET_PROGRESS_ONLY_RE
-// imported in the consolidated import at the top
-const _WALLET_IDENTITY_INTENT_RE = /\b(wallet\s*address|address)\b/i;
-const _WALLET_ACTION_REQUIRED_INTENT_RE = /\b(balance|portfolio|holdings|funds|swap|trade|transfer|send|buy|sell|execute|approve)\b/i;
-const _WALLET_PROGRESS_PREFIX_RE = /^\s*(?:let me|i(?:'ll| will)|checking|fetching|looking up|pulling|one moment|just a second|hold on)[\s\S]{0,120}?(?:now|\.{3}|…)?\s*/i;
-const EVM_ADDRESS_CAPTURE_RE = /\b0x[a-fA-F0-9]{40}\b/g;
-const DECIMAL_AMOUNT_CAPTURE_RE = /\b(\d+(?:\.\d+)?)\b/;
-const SEND_NATIVE_ASSET_RE = /\b(?:t?bnb|bnb|eth|usdt|usdc|busd|dai|weth|wbtc)\b/i;
-const SWAP_ROUTE_PROVIDER_RE = /\b(pancakeswap-v2|0x|auto)\b/i;
-function normalizeWalletAssetSymbol(asset) {
-    const normalized = asset.trim().toUpperCase();
-    if (normalized === "TBNB")
-        return "BNB";
-    return normalized;
-}
-function resolveWalletDrillTokenAddress() {
-    if (process.env.NODE_ENV === "production" && !process.env.VITEST) {
-        return null;
-    }
-    const raw = process.env.WALLET_DRILL_TOKEN_ADDRESS?.trim();
-    return raw && /^0x[a-fA-F0-9]{40}$/.test(raw) ? raw : null;
-}
-function buildWalletParameterFailureReply(actionName, reason) {
-    const walletNetwork = process.env.ELIZA_WALLET_NETWORK?.trim().toLowerCase() === "testnet"
-        ? "BSC testnet"
-        : "BSC";
-    return [
-        `Action: ${actionName}`,
-        `Chain: ${walletNetwork}`,
-        "Executed: false",
-        `Reason: ${reason}`,
-    ].join("\n");
-}
-function inferTransferFallbackAction(prompt) {
-    if (!/\b(send|transfer|pay)\b/i.test(prompt))
-        return null;
-    const recipient = prompt.match(EVM_ADDRESS_CAPTURE_RE)?.[0];
-    if (!recipient) {
-        return {
-            errorText: buildWalletParameterFailureReply("TRANSFER_TOKEN", "I need a recipient EVM address to send funds."),
-        };
-    }
-    const amount = prompt.match(DECIMAL_AMOUNT_CAPTURE_RE)?.[1];
-    if (!amount) {
-        return {
-            errorText: buildWalletParameterFailureReply("TRANSFER_TOKEN", "I need a positive transfer amount."),
-        };
-    }
-    const assetMatch = prompt.match(SEND_NATIVE_ASSET_RE)?.[0];
-    if (!assetMatch) {
-        return {
-            errorText: buildWalletParameterFailureReply("TRANSFER_TOKEN", "I need an asset symbol such as BNB, USDT, or USDC."),
-        };
-    }
-    return {
-        action: {
-            name: "TRANSFER_TOKEN",
-            parameters: {
-                toAddress: recipient,
-                amount,
-                assetSymbol: normalizeWalletAssetSymbol(assetMatch),
-            },
-        },
-    };
-}
-function inferTradeSide(prompt) {
-    if (/\bsell\b/i.test(prompt))
-        return "sell";
-    if (/\b(buy|swap|trade)\b/i.test(prompt))
-        return "buy";
-    return null;
-}
-function inferTradeFallbackAction(prompt) {
-    if (!/\b(swap|trade|buy|sell)\b/i.test(prompt))
-        return null;
-    const side = inferTradeSide(prompt);
-    if (!side) {
-        return {
-            errorText: buildWalletParameterFailureReply("EXECUTE_TRADE", 'I need a trade side ("buy" or "sell").'),
-        };
-    }
-    const amount = prompt.match(DECIMAL_AMOUNT_CAPTURE_RE)?.[1];
-    if (!amount) {
-        return {
-            errorText: buildWalletParameterFailureReply("EXECUTE_TRADE", "I need a positive trade amount."),
-        };
-    }
-    const addresses = prompt.match(EVM_ADDRESS_CAPTURE_RE) ?? [];
-    const drillTokenAddress = resolveWalletDrillTokenAddress();
-    const tokenAddress = addresses[0] ?? drillTokenAddress;
-    if (!tokenAddress) {
-        return {
-            errorText: buildWalletParameterFailureReply("EXECUTE_TRADE", drillTokenAddress === null &&
-                process.env.NODE_ENV === "production" &&
-                !process.env.VITEST
-                ? "I need a target token contract address in the prompt."
-                : "I need a target token address. Set WALLET_DRILL_TOKEN_ADDRESS or include the token contract address in the prompt."),
-        };
-    }
-    const routeProvider = prompt.match(SWAP_ROUTE_PROVIDER_RE)?.[1]?.toLowerCase() ??
-        "pancakeswap-v2";
-    return {
-        action: {
-            name: "EXECUTE_TRADE",
-            parameters: {
-                side,
-                amount,
-                tokenAddress,
-                routeProvider,
-            },
-        },
-    };
-}
-export function inferWalletExecutionFallback(prompt) {
-    return (inferTransferFallbackAction(prompt) ?? inferTradeFallbackAction(prompt));
-}
-export function hasUsableWalletFallbackParams(action) {
-    const parameters = action.parameters ?? {};
-    if (action.name === "TRANSFER_TOKEN") {
-        return (typeof parameters.toAddress === "string" &&
-            /^0x[a-fA-F0-9]{40}$/.test(parameters.toAddress) &&
-            typeof parameters.amount === "string" &&
-            parameters.amount.trim().length > 0 &&
-            typeof parameters.assetSymbol === "string" &&
-            parameters.assetSymbol.trim().length > 0);
-    }
-    if (action.name === "EXECUTE_TRADE") {
-        return ((parameters.side === "buy" || parameters.side === "sell") &&
-            typeof parameters.amount === "string" &&
-            parameters.amount.trim().length > 0 &&
-            typeof parameters.tokenAddress === "string" &&
-            /^0x[a-fA-F0-9]{40}$/.test(parameters.tokenAddress));
-    }
-    return true;
-}
-// buildWalletActionNotExecutedReply and trimWalletProgressPrefix moved to server-helpers.ts;
-// re-exported above
-// buildWalletActionNotExecutedReply, trimWalletProgressPrefix imported in the consolidated import at the top
-// ── Plugin config intent detection ──────────────────────────────────
-// Matches: "set up telegram", "configure discord plugin", "connect slack",
-// "help me with the openai plugin", etc.
-const PLUGIN_CONFIG_RE = /\b(?:set\s*up|configure|connect|enable|install|setup)\b.*?\b(telegram|discord|twitter|slack|anthropic|openai|openrouter|groq|google|gemini|deepseek|mistral|together|grok|zai|ollama)\b|\b(telegram|discord|twitter|slack|anthropic|openai|openrouter|groq|google|gemini|deepseek|mistral|together|grok|zai|ollama)\b.*?\b(?:plugin|connector|set\s*up|configure|connect|enable|setup)\b/i;
-const PLUGIN_PARAMS = {
-    telegram: [
-        {
-            key: "TELEGRAM_BOT_TOKEN",
-            label: "Bot Token (from @BotFather)",
-            secret: true,
-        },
-    ],
-    discord: [
-        { key: "DISCORD_API_TOKEN", label: "Bot Token", secret: true },
-        {
-            key: "DISCORD_APPLICATION_ID",
-            label: "Application ID (optional, auto-resolved when omitted)",
-            secret: false,
-        },
-    ],
-    twitter: [
-        { key: "TWITTER_USERNAME", label: "Username", secret: false },
-        { key: "TWITTER_PASSWORD", label: "Password", secret: true },
-        { key: "TWITTER_EMAIL", label: "Email", secret: false },
-    ],
-    slack: [
-        { key: "SLACK_APP_TOKEN", label: "App Token", secret: true },
-        { key: "SLACK_BOT_TOKEN", label: "Bot Token", secret: true },
-        { key: "SLACK_SIGNING_SECRET", label: "Signing Secret", secret: true },
-    ],
-    anthropic: [
-        {
-            key: "ANTHROPIC_API_KEY",
-            label: "API Key (console.anthropic.com)",
-            secret: true,
-        },
-    ],
-    openai: [
-        {
-            key: "OPENAI_API_KEY",
-            label: "API Key (platform.openai.com)",
-            secret: true,
-        },
-    ],
-    openrouter: [
-        {
-            key: "OPENROUTER_API_KEY",
-            label: "API Key (openrouter.ai)",
-            secret: true,
-        },
-    ],
-    groq: [
-        { key: "GROQ_API_KEY", label: "API Key (console.groq.com)", secret: true },
-    ],
-    google: [
-        { key: "GOOGLE_GENERATIVE_AI_API_KEY", label: "API Key", secret: true },
-    ],
-    gemini: [
-        { key: "GOOGLE_GENERATIVE_AI_API_KEY", label: "API Key", secret: true },
-    ],
-    deepseek: [{ key: "DEEPSEEK_API_KEY", label: "API Key", secret: true }],
-    mistral: [{ key: "MISTRAL_API_KEY", label: "API Key", secret: true }],
-    together: [{ key: "TOGETHER_API_KEY", label: "API Key", secret: true }],
-    grok: [{ key: "XAI_API_KEY", label: "API Key", secret: true }],
-    zai: [{ key: "ZAI_API_KEY", label: "API Key", secret: true }],
-    ollama: [
-        {
-            key: "OLLAMA_BASE_URL",
-            label: "Ollama URL (e.g. http://localhost:11434)",
-            secret: false,
-        },
-    ],
-};
-export async function resolvePluginConfigReply(prompt, _state) {
-    const match = prompt.match(PLUGIN_CONFIG_RE);
-    if (!match)
-        return null;
-    const pluginName = (match[1] || match[2]).toLowerCase();
-    const params = PLUGIN_PARAMS[pluginName];
-    if (!params)
-        return null;
-    const displayName = pluginName.charAt(0).toUpperCase() + pluginName.slice(1);
-    const elements = {};
-    const fieldIds = [];
-    const state = { pluginId: pluginName };
-    elements.title = {
-        type: "Heading",
-        props: { level: 3, text: `Configure ${displayName}` },
-    };
-    elements.sep = { type: "Separator", props: {} };
-    for (const param of params) {
-        const fid = `f_${param.key}`;
-        fieldIds.push(fid);
-        state[`config.${param.key}`] = "";
-        elements[fid] = {
-            type: "Input",
-            props: {
-                label: param.label,
-                placeholder: param.key,
-                statePath: `config.${param.key}`,
-                type: param.secret ? "password" : "text",
-                className: "font-mono text-xs",
-            },
-        };
-    }
-    elements.fields = { type: "Stack", props: { gap: "3", children: fieldIds } };
-    elements.saveBtn = {
-        type: "Button",
-        props: {
-            text: "Save & Enable",
-            variant: "default",
-            className: "font-semibold",
-            on: {
-                press: { action: "plugin:save", params: { pluginId: pluginName } },
-            },
-        },
-    };
-    elements.actions = {
-        type: "Stack",
-        props: { direction: "row", gap: "2", children: ["saveBtn"] },
-    };
-    elements.root = {
-        type: "Card",
-        props: {
-            children: ["title", "sep", "fields", "actions"],
-            className: "p-4 space-y-3",
-        },
-    };
-    const spec = JSON.stringify({ version: 1, root: "root", elements, state });
-    return `here's the config form for ${displayName} — fill in your credentials and hit save:\n\n\`\`\`json-render\n${spec}\n\`\`\``;
-}
+// Wallet intent/export helpers extracted to server-helpers-wallet.ts
+import { hasUsableWalletFallbackParams as _hasUsableWalletFallbackParams, inferWalletExecutionFallback as _inferWalletExecutionFallback, resolveWalletExportRejection as _resolveWalletExportRejection, } from "./server-helpers-wallet.js";
+export { hasUsableWalletFallbackParams, inferWalletExecutionFallback, resolveWalletExportRejection, } from "./server-helpers-wallet.js";
+const inferWalletExecutionFallback = _inferWalletExecutionFallback;
+const hasUsableWalletFallbackParams = _hasUsableWalletFallbackParams;
+const resolveWalletExportRejection = _resolveWalletExportRejection;
+// Plugin config helpers extracted to server-helpers-plugin.ts
+import { resolvePluginConfigMutationRejections as _resolvePluginConfigMutationRejections, resolvePluginConfigReply as _resolvePluginConfigReply, } from "./server-helpers-plugin.js";
+export { resolvePluginConfigMutationRejections, resolvePluginConfigReply, } from "./server-helpers-plugin.js";
+const resolvePluginConfigReply = _resolvePluginConfigReply;
+const resolvePluginConfigMutationRejections = _resolvePluginConfigMutationRejections;
 async function resolveTrainingServiceCtor() {
     const candidates = [
         "../services/training-service",
@@ -1498,503 +677,48 @@ export function resolveMcpTerminalAuthorizationRejection(req, servers, body) {
     }
     return resolveTerminalRunRejection(req, body);
 }
-const LOCAL_ORIGIN_RE = /^https?:\/\/(localhost|127\.0\.0\.1|\[::1\]|\[0:0:0:0:0:0:0:1\])(:\d+)?$/i;
-const APP_ORIGIN_RE = /^(capacitor|capacitor-electron|app|tauri|file|electrobun):\/\/.*$/i;
-/**
- * Hostname allowlist for DNS rebinding protection.
- * Requests with a Host header that doesn't match a known loopback name are
- * rejected before CORS / auth processing.  This prevents a malicious page
- * from rebinding its DNS to 127.0.0.1 and reading the unauthenticated API.
- */
-const LOCAL_HOST_RE = /^(localhost|127\.0\.0\.1|\[?::1\]?|\[?0:0:0:0:0:0:0:1\]?|::ffff:127\.0\.0\.1)$/;
-/** Wildcard bind addresses that listen on all interfaces. */
-const WILDCARD_BIND_RE = /^(0\.0\.0\.0|::|0:0:0:0:0:0:0:0)$/;
-export function isAllowedHost(req) {
-    const raw = req.headers.host;
-    if (!raw)
-        return true; // No Host header → non-browser client (e.g. curl)
-    let hostname;
-    const trimmed = raw.trim().toLowerCase();
-    if (!trimmed)
-        return true;
-    if (trimmed.startsWith("[")) {
-        // Bracketed IPv6: [::1]:31337 → ::1
-        const close = trimmed.indexOf("]");
-        hostname = close > 0 ? trimmed.slice(1, close) : trimmed.slice(1);
-    }
-    else if ((trimmed.match(/:/g) || []).length >= 2) {
-        // Bare IPv6 (multiple colons, no brackets): ::1 → ::1
-        hostname = trimmed;
-    }
-    else {
-        // IPv4 or hostname: localhost:31337 → localhost
-        hostname = stripOptionalHostPort(trimmed);
-    }
-    if (!hostname)
-        return true;
-    const bindHost = resolveApiBindHost(process.env).toLowerCase();
-    // When binding on all interfaces (0.0.0.0 / ::), any Host is acceptable —
-    // ensureApiTokenForBindHost already enforces a token for non-loopback binds.
-    if (WILDCARD_BIND_RE.test(stripOptionalHostPort(bindHost))) {
-        return true;
-    }
-    // Allow the exact configured bind hostname.
-    if (bindHost && hostname === stripOptionalHostPort(bindHost)) {
-        return true;
-    }
-    for (const allowedHost of resolveAllowedHosts(process.env)) {
-        if (stripOptionalHostPort(allowedHost).toLowerCase() === hostname) {
-            return true;
-        }
-    }
-    return LOCAL_HOST_RE.test(hostname);
-}
-export function resolveCorsOrigin(origin) {
-    if (!origin)
-        return null;
-    const trimmed = origin.trim();
-    if (!trimmed)
-        return null;
-    // Cloud-provisioned containers default to allowing all origins so the
-    // browser web UI can reach the agent API without extra config.
-    if (process.env.ELIZA_CLOUD_PROVISIONED === "1") {
-        return trimmed;
-    }
-    // When bound to a wildcard address, allow any origin. Non-loopback binds still
-    // require an explicit token, so this only relaxes the browser origin check.
-    const bindHost = resolveApiBindHost(process.env).toLowerCase();
-    if (WILDCARD_BIND_RE.test(stripOptionalHostPort(bindHost)))
-        return trimmed;
-    // Explicit allowlist via env (comma-separated)
-    const allow = resolveAllowedOrigins(process.env);
-    if (allow.includes(trimmed)) {
-        return trimmed;
-    }
-    if (LOCAL_ORIGIN_RE.test(trimmed))
-        return trimmed;
-    if (APP_ORIGIN_RE.test(trimmed))
-        return trimmed;
-    if (trimmed === "null" || trimmed === "file://") {
-        if (isNullOriginAllowed(process.env)) {
-            return "null";
-        }
-    }
-    return null;
-}
-function isBrowserCompanionExtensionOrigin(origin) {
-    if (!origin) {
-        return false;
-    }
-    const trimmed = origin.trim();
-    return (/^chrome-extension:\/\/[a-z]{32}$/i.test(trimmed) ||
-        /^moz-extension:\/\/[0-9a-f-]+$/i.test(trimmed) ||
-        /^safari-web-extension:\/\/[A-Za-z0-9.-]+$/i.test(trimmed));
-}
-function applyCors(req, res, pathname) {
-    const origin = typeof req.headers.origin === "string" ? req.headers.origin : undefined;
-    const allowBrowserCompanionOrigin = pathname.startsWith("/api/lifeops/browser/companions/") &&
-        isBrowserCompanionExtensionOrigin(origin);
-    const allowed = allowBrowserCompanionOrigin
-        ? (origin?.trim() ?? null)
-        : resolveCorsOrigin(origin);
-    if (origin && !allowed)
-        return false;
-    if (allowed) {
-        res.setHeader("Access-Control-Allow-Origin", allowed);
-        res.setHeader("Vary", "Origin");
-        res.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
-        res.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization, X-Eliza-Token, X-Api-Key, X-Eliza-Export-Token, X-Eliza-Client-Id, X-Eliza-Terminal-Token, X-Eliza-UI-Language, X-Eliza-Browser-Companion-Id");
-    }
-    // Security headers
-    res.setHeader("X-Content-Type-Options", "nosniff");
-    res.setHeader("X-Frame-Options", "DENY");
-    res.setHeader("X-XSS-Protection", "1; mode=block");
-    res.setHeader("Referrer-Policy", "strict-origin-when-cross-origin");
-    return true;
-}
-const PAIRING_TTL_MS = 10 * 60 * 1000;
-const PAIRING_WINDOW_MS = 10 * 60 * 1000;
-const PAIRING_MAX_ATTEMPTS = 5;
-const PAIRING_ALPHABET = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
-let pairingCode = null;
+// Auth, CORS, pairing, terminal, WebSocket auth helpers extracted to server-helpers-auth.ts
+import { applyCors as _applyCors, clearPairing as _clearPairing, ensureApiTokenForBindHost as _ensureApiTokenForBindHost, ensurePairingCode as _ensurePairingCode, extractAuthToken as _extractAuthToken, getConfiguredApiToken as _getConfiguredApiToken, getPairingExpiresAt as _getPairingExpiresAt, isAllowedHost as _isAllowedHost, isAuthorized as _isAuthorized, isSharedTerminalClientId as _isSharedTerminalClientId, isWebSocketAuthorized as _isWebSocketAuthorized, normalizePairingCode as _normalizePairingCode, normalizeWsClientId as _normalizeWsClientId, pairingEnabled as _pairingEnabled, rateLimitPairing as _rateLimitPairing, rejectWebSocketUpgrade as _rejectWebSocketUpgrade, resolveCorsOrigin as _resolveCorsOrigin, resolveTerminalRunClientId as _resolveTerminalRunClientId, resolveTerminalRunRejection as _resolveTerminalRunRejection, resolveWebSocketUpgradeRejection as _resolveWebSocketUpgradeRejection, } from "./server-helpers-auth.js";
+export { ensureApiTokenForBindHost, extractAuthToken, isAllowedHost, isAuthorized, normalizeWsClientId, resolveCorsOrigin, resolveTerminalRunClientId, resolveTerminalRunRejection, resolveWebSocketUpgradeRejection, } from "./server-helpers-auth.js";
+const isAllowedHost = _isAllowedHost;
+const resolveCorsOrigin = _resolveCorsOrigin;
+const applyCors = _applyCors;
+const extractAuthToken = _extractAuthToken;
+const isAuthorized = _isAuthorized;
+const ensureApiTokenForBindHost = _ensureApiTokenForBindHost;
+const normalizeWsClientId = _normalizeWsClientId;
+const resolveTerminalRunClientId = _resolveTerminalRunClientId;
+const isSharedTerminalClientId = _isSharedTerminalClientId;
+const resolveTerminalRunRejection = _resolveTerminalRunRejection;
+const resolveWebSocketUpgradeRejection = _resolveWebSocketUpgradeRejection;
+const rejectWebSocketUpgrade = _rejectWebSocketUpgrade;
+const isWebSocketAuthorized = _isWebSocketAuthorized;
+const getConfiguredApiToken = _getConfiguredApiToken;
+const pairingEnabled = _pairingEnabled;
+const ensurePairingCode = _ensurePairingCode;
+const normalizePairingCode = _normalizePairingCode;
+const rateLimitPairing = _rateLimitPairing;
+const getPairingExpiresAt = _getPairingExpiresAt;
+const clearPairing = _clearPairing;
 /** Guard against concurrent provider switch requests (P0 §3). */
 let providerSwitchInProgress = false;
-let pairingExpiresAt = 0;
-const pairingAttempts = new Map();
-function pairingEnabled() {
-    return (Boolean(getConfiguredApiToken()) &&
-        process.env.ELIZA_PAIRING_DISABLED !== "1");
-}
-function normalizePairingCode(code) {
-    return code.replace(/[^a-zA-Z0-9]/g, "").toUpperCase();
-}
-function generatePairingCode() {
-    const bytes = crypto.randomBytes(8);
-    let raw = "";
-    for (let i = 0; i < bytes.length; i++) {
-        raw += PAIRING_ALPHABET[bytes[i] % PAIRING_ALPHABET.length];
-    }
-    return `${raw.slice(0, 4)}-${raw.slice(4, 8)}`;
-}
-function ensurePairingCode() {
-    if (!pairingEnabled())
-        return null;
-    const now = Date.now();
-    if (!pairingCode || now > pairingExpiresAt) {
-        pairingCode = generatePairingCode();
-        pairingExpiresAt = now + PAIRING_TTL_MS;
-        logger.warn(`[eliza-api] Pairing code: ${pairingCode} (valid for 10 minutes)`);
-    }
-    return pairingCode;
-}
-function rateLimitPairing(ip) {
-    const key = ip ?? "unknown";
-    const now = Date.now();
-    // Lazy sweep: evict expired entries when map grows beyond 100
-    sweepExpiredEntries(pairingAttempts, now, 100);
-    const current = pairingAttempts.get(key);
-    if (!current || now > current.resetAt) {
-        pairingAttempts.set(key, { count: 1, resetAt: now + PAIRING_WINDOW_MS });
-        return true;
-    }
-    if (current.count >= PAIRING_MAX_ATTEMPTS)
-        return false;
-    current.count += 1;
-    return true;
-}
-export function extractAuthToken(req) {
-    const auth = typeof req.headers.authorization === "string"
-        ? req.headers.authorization.trim()
-        : "";
-    if (auth) {
-        const match = /^Bearer\s+(.+)$/i.exec(auth);
-        if (match?.[1])
-            return match[1].trim();
-    }
-    const header = (typeof req.headers["x-eliza-token"] === "string" &&
-        req.headers["x-eliza-token"]) ||
-        (typeof req.headers["x-eliza-token"] === "string" &&
-            req.headers["x-eliza-token"]) ||
-        (typeof req.headers["x-api-key"] === "string" && req.headers["x-api-key"]);
-    if (typeof header === "string" && header.trim())
-        return header.trim();
-    return null;
-}
-const SAFE_WS_CLIENT_ID_RE = /^[A-Za-z0-9._-]{1,128}$/;
-export function normalizeWsClientId(value) {
-    if (typeof value !== "string")
-        return null;
-    const trimmed = value.trim();
-    if (!trimmed)
-        return null;
-    if (!SAFE_WS_CLIENT_ID_RE.test(trimmed))
-        return null;
-    return trimmed;
-}
-function firstHeaderValue(value) {
-    if (typeof value === "string")
-        return value;
-    if (Array.isArray(value) && typeof value[0] === "string")
-        return value[0];
-    return null;
-}
-export function resolveTerminalRunClientId(req, body) {
-    const headerClientId = normalizeWsClientId(firstHeaderValue(req.headers["x-eliza-client-id"]));
-    if (headerClientId)
-        return headerClientId;
-    return normalizeWsClientId(body?.clientId);
-}
-const SHARED_TERMINAL_CLIENT_IDS = new Set([
-    "runtime-terminal-action",
-    "runtime-shell-action",
-]);
-function isSharedTerminalClientId(clientId) {
-    return SHARED_TERMINAL_CLIENT_IDS.has(clientId);
-}
-function tokenMatches(expected, provided) {
-    const a = Buffer.from(expected, "utf8");
-    const b = Buffer.from(provided, "utf8");
-    if (a.length !== b.length)
-        return false;
-    return crypto.timingSafeEqual(a, b);
-}
-function getConfiguredApiToken() {
-    return resolveApiToken(process.env) ?? undefined;
-}
-function isLoopbackBindHost(host) {
-    let normalized = host.trim().toLowerCase();
-    if (!normalized)
-        return true;
-    // Allow users to provide full URLs by mistake (e.g. http://localhost:2138)
-    if (normalized.startsWith("http://") || normalized.startsWith("https://")) {
-        try {
-            const parsed = new URL(normalized);
-            normalized = parsed.hostname.toLowerCase();
-        }
-        catch {
-            // Fall through and parse as raw host value.
-        }
-    }
-    // [::1]:2138 -> ::1
-    const bracketedIpv6 = /^\[([^\]]+)\](?::\d+)?$/.exec(normalized);
-    if (bracketedIpv6?.[1]) {
-        normalized = bracketedIpv6[1];
-    }
-    else {
-        // localhost:2138 -> localhost, 127.0.0.1:2138 -> 127.0.0.1
-        const singleColonHostPort = /^([^:]+):(\d+)$/.exec(normalized);
-        if (singleColonHostPort?.[1]) {
-            normalized = singleColonHostPort[1];
-        }
-    }
-    normalized = normalized.replace(/^\[|\]$/g, "");
-    if (!normalized)
-        return true;
-    if (normalized === "localhost" ||
-        normalized === "::1" ||
-        normalized === "0:0:0:0:0:0:0:1" ||
-        normalized === "::ffff:127.0.0.1") {
-        return true;
-    }
-    if (normalized.startsWith("127."))
-        return true;
-    return false;
-}
-export function ensureApiTokenForBindHost(host) {
-    const { disableAutoApiToken } = resolveApiSecurityConfig(process.env);
-    const token = getConfiguredApiToken();
-    if (token)
-        return;
-    const cloudProvisioned = isCloudProvisionedContainer();
-    // Cloud-provisioned containers must never run without an inbound API token
-    // (isAuthorized rejects all requests when no token + cloud flag is set).
-    // Override the disable flag for cloud containers so they always get a
-    // fallback token rather than dead-locking into 401 on every request.
-    if (disableAutoApiToken && !cloudProvisioned) {
-        return;
-    }
-    if (!cloudProvisioned && isLoopbackBindHost(host))
-        return;
-    const generated = crypto.randomBytes(32).toString("hex");
-    setApiToken(process.env, generated);
-    if (cloudProvisioned) {
-        logger.warn("[eliza-api] Steward-managed cloud container started without ELIZA_API_TOKEN/ELIZA_API_TOKEN; generated a temporary inbound API token for this process.");
-    }
-    else {
-        logger.warn(`[eliza-api] ELIZA_API_BIND/ELIZA_API_BIND=${host} is non-loopback and ELIZA_API_TOKEN/ELIZA_API_TOKEN is unset.`);
-    }
-    const tokenFingerprint = `${generated.slice(0, 4)}...${generated.slice(-4)}`;
-    logger.warn(`[eliza-api] Generated temporary API token (${tokenFingerprint}) for this process. Set ELIZA_API_TOKEN or ELIZA_API_TOKEN explicitly to override.`);
-}
-export function isAuthorized(req) {
-    const expected = getConfiguredApiToken();
-    if (!expected)
-        return !isCloudProvisionedContainer();
-    const provided = extractAuthToken(req);
-    if (!provided)
-        return false;
-    return tokenMatches(expected, provided);
-}
-export function resolvePluginConfigMutationRejections(pluginParams, config) {
-    const allowedParamKeys = new Set(pluginParams.map((p) => p.key.toUpperCase().trim()));
-    const rejections = [];
-    for (const key of Object.keys(config)) {
-        const normalized = key.toUpperCase().trim();
-        if (!allowedParamKeys.has(normalized)) {
-            rejections.push({
-                field: key,
-                message: `${key} is not a declared config key for this plugin`,
-            });
-            continue;
-        }
-        if (BLOCKED_ENV_KEYS.has(normalized)) {
-            rejections.push({
-                field: key,
-                message: `${key} is blocked for security reasons`,
-            });
-        }
-    }
-    return rejections;
-}
-export function resolveWalletExportRejection(req, body) {
-    if (!body.confirm) {
-        return {
-            status: 403,
-            reason: 'Export requires explicit confirmation. Send { "confirm": true } in the request body.',
-        };
-    }
-    const expected = process.env.ELIZA_WALLET_EXPORT_TOKEN?.trim() ||
-        process.env.ELIZA_WALLET_EXPORT_TOKEN?.trim();
-    if (!expected) {
-        return {
-            status: 403,
-            reason: "Wallet export is disabled. Set ELIZA_WALLET_EXPORT_TOKEN (or ELIZA_WALLET_EXPORT_TOKEN) to enable secure exports.",
-        };
-    }
-    const headerToken = typeof req.headers["x-eliza-export-token"] === "string"
-        ? req.headers["x-eliza-export-token"].trim()
-        : "";
-    const bodyToken = typeof body.exportToken === "string" ? body.exportToken.trim() : "";
-    const provided = headerToken || bodyToken;
-    if (!provided) {
-        return {
-            status: 401,
-            reason: "Missing export token. Provide X-Eliza-Export-Token header or exportToken in request body.",
-        };
-    }
-    if (!tokenMatches(expected, provided)) {
-        return { status: 401, reason: "Invalid export token." };
-    }
-    return null;
-}
-export function resolveTerminalRunRejection(req, body) {
-    const expected = process.env.ELIZA_TERMINAL_RUN_TOKEN?.trim();
-    const apiTokenEnabled = Boolean(getConfiguredApiToken());
-    // Compatibility mode: local loopback sessions without API token keep
-    // existing behavior unless an explicit terminal token is configured.
-    if (!expected && !apiTokenEnabled) {
-        return null;
-    }
-    if (!expected) {
-        return {
-            status: 403,
-            reason: "Terminal run is disabled for token-authenticated API sessions. Set ELIZA_TERMINAL_RUN_TOKEN to enable command execution.",
-        };
-    }
-    const headerToken = typeof req.headers["x-eliza-terminal-token"] === "string"
-        ? req.headers["x-eliza-terminal-token"].trim()
-        : "";
-    const bodyToken = typeof body.terminalToken === "string" ? body.terminalToken.trim() : "";
-    const provided = headerToken || bodyToken;
-    if (!provided) {
-        return {
-            status: 401,
-            reason: "Missing terminal token. Provide X-Eliza-Terminal-Token header or terminalToken in request body.",
-        };
-    }
-    if (!tokenMatches(expected, provided)) {
-        return {
-            status: 401,
-            reason: "Invalid terminal token.",
-        };
-    }
-    return null;
-}
-function extractWsQueryToken(url) {
-    const allowQueryToken = process.env.ELIZA_ALLOW_WS_QUERY_TOKEN === "1";
-    if (!allowQueryToken)
-        return null;
-    const token = url.searchParams.get("token") ??
-        url.searchParams.get("apiKey") ??
-        url.searchParams.get("api_key");
-    return token?.trim() || null;
-}
-function hasWsQueryToken(url) {
-    return (url.searchParams.has("token") ||
-        url.searchParams.has("apiKey") ||
-        url.searchParams.has("api_key"));
-}
-function extractWebSocketHandshakeToken(request, url) {
-    const headerToken = extractAuthToken(request);
-    if (headerToken)
-        return headerToken;
-    return extractWsQueryToken(url);
-}
-function isWebSocketAuthorized(request, url) {
-    const expected = getConfiguredApiToken();
-    if (!expected)
-        return !isCloudProvisionedContainer();
-    const handshakeToken = extractWebSocketHandshakeToken(request, url);
-    if (!handshakeToken)
-        return false;
-    return tokenMatches(expected, handshakeToken);
-}
-export function resolveWebSocketUpgradeRejection(req, wsUrl) {
-    if (wsUrl.pathname !== "/ws") {
-        return { status: 404, reason: "Not found" };
-    }
-    const origin = typeof req.headers.origin === "string" ? req.headers.origin : undefined;
-    const allowedOrigin = resolveCorsOrigin(origin);
-    if (origin && !allowedOrigin) {
-        return { status: 403, reason: "Origin not allowed" };
-    }
-    const expected = getConfiguredApiToken();
-    if (!expected) {
-        return isCloudProvisionedContainer()
-            ? { status: 401, reason: "Unauthorized" }
-            : null;
-    }
-    if (process.env.ELIZA_ALLOW_WS_QUERY_TOKEN !== "1" &&
-        hasWsQueryToken(wsUrl)) {
-        return { status: 401, reason: "Unauthorized" };
-    }
-    const handshakeToken = extractWebSocketHandshakeToken(req, wsUrl);
-    if (handshakeToken && !tokenMatches(expected, handshakeToken)) {
-        return { status: 401, reason: "Unauthorized" };
-    }
-    // Cloud containers must authenticate at the handshake level because there is
-    // no trusted upstream proxy handling auth for the WebSocket path.
-    if (!handshakeToken && isCloudProvisionedContainer()) {
-        return { status: 401, reason: "Unauthorized" };
-    }
-    return null;
-}
-const RESET_STATE_ALLOWED_SEGMENTS = new Set([
-    ".eliza",
-    "eliza",
-    ".eliza",
-    "eliza",
-]);
-function hasAllowedResetSegment(resolvedState) {
-    return resolvedState
-        .split(path.sep)
-        .some((segment) => RESET_STATE_ALLOWED_SEGMENTS.has(segment.trim().toLowerCase()));
-}
-export function isSafeResetStateDir(resolvedState, homeDir) {
-    const normalizedState = path.resolve(resolvedState);
-    const normalizedHome = path.resolve(homeDir);
-    const parsedRoot = path.parse(normalizedState).root;
-    if (normalizedState === parsedRoot)
-        return false;
-    if (normalizedState === normalizedHome)
-        return false;
-    const relativeToHome = path.relative(normalizedHome, normalizedState);
-    const isUnderHome = relativeToHome.length > 0 &&
-        !relativeToHome.startsWith("..") &&
-        !path.isAbsolute(relativeToHome);
-    if (!isUnderHome)
-        return false;
-    return hasAllowedResetSegment(normalizedState);
-}
-// persistConversationRoomTitle imported in the consolidated import at the top
-function rejectWebSocketUpgrade(socket, statusCode, message) {
-    const statusText = statusCode === 401
-        ? "Unauthorized"
-        : statusCode === 403
-            ? "Forbidden"
-            : statusCode === 404
-                ? "Not Found"
-                : "Bad Request";
-    const body = `${message}\n`;
-    socket.write(`HTTP/1.1 ${statusCode} ${statusText}\r\n` +
-        "Connection: close\r\n" +
-        "Content-Type: text/plain; charset=utf-8\r\n" +
-        `Content-Length: ${Buffer.byteLength(body)}\r\n` +
-        "\r\n" +
-        body, () => socket.end());
-}
+// PluginConfigMutationRejection, resolvePluginConfigMutationRejections,
+// WalletExportRejection, resolveWalletExportRejection
+// extracted to server-helpers-plugin.ts and server-helpers-wallet.ts respectively.
+// Re-exported above.
+// Terminal/WS/state-dir helpers extracted to server-helpers-auth.ts; re-exported above.
 // decodePathComponent imported in the consolidated import at the top
 // Workbench task/todo helpers — extracted to workbench-helpers.ts
 import { asObject, normalizeTags, parseNullableNumber, readTaskCompleted, readTaskMetadata, toWorkbenchTask, toWorkbenchTodo, WORKBENCH_TASK_TAG, WORKBENCH_TODO_TAG, } from "./workbench-helpers.js";
 const _WORKBENCH_TASK_TAG = WORKBENCH_TASK_TAG;
 const _WORKBENCH_TODO_TAG = WORKBENCH_TODO_TAG;
 // (workbench helpers moved to workbench-helpers.ts)
-// ── Autonomy → User message routing ──────────────────────────────────
-/**
- * Route non-conversation text output to the user's active conversation.
- * Stores the message as a Memory in the conversation room and broadcasts
- * a `proactive-message` WS event to the frontend.
- */
+// ── Autonomy / swarm / coding-agent helpers — extracted to server-helpers-swarm.ts ──
+import { routeAutonomyTextToUser as _routeAutonomyTextToUser } from "./server-helpers-swarm.js";
+export { routeAutonomyTextToUser } from "./server-helpers-swarm.js";
+const routeAutonomyTextToUser = _routeAutonomyTextToUser;
+// The full autonomy/swarm/coordinator/PTY bridge implementations are now in
+// server-helpers-swarm.ts. Only a compat stub remains for type checking.
 const CHAT_SUPPRESSED_AUTONOMY_SOURCES = new Set([
     "lifeops-reminder",
     "lifeops-workflow",
@@ -2002,7 +726,7 @@ const CHAT_SUPPRESSED_AUTONOMY_SOURCES = new Set([
     "proactive-gn",
     "proactive-nudge",
 ]);
-export async function routeAutonomyTextToUser(state, responseText, source = "autonomy") {
+async function _routeAutonomyTextToUserCompat(state, responseText, source = "autonomy") {
     const runtime = state.runtime;
     if (!runtime)
         return;
@@ -2137,19 +861,28 @@ function wireCodingAgentWsBridge(st) {
  * persisted message in the conversation.
  */
 function wireCodingAgentSwarmSynthesis(st) {
-    // Same rationale as wireCodingAgentChatBridge: synthesis is generated
-    // from task metadata (originalTask = user's text), not from the
-    // subagent's actual output. The task-progress-streamer + jsonl watcher
-    // deliver the real answer. Install a no-op callback so the upstream
-    // wiring check considers this bridge wired.
+    // The task-progress-streamer was removed from this tree but the callback
+    // was left as a no-op, so subagent completions never reached the user.
+    // Invoke handleSwarmSynthesis directly so the synthesis LLM routes the
+    // final answer back to the conversation. The task jsonl is already the
+    // source of truth for per-task completionSummary.
     if (!st.runtime)
         return false;
     const coordinator = getCoordinatorFromRuntime(st.runtime);
     if (!coordinator?.setSwarmCompleteCallback)
         return false;
-    coordinator.setSwarmCompleteCallback(async () => {
-        // Deliberately no-op — synthesis happens via the streamer instead.
+    coordinator.setSwarmCompleteCallback(async (payload) => {
+        await handleSwarmSynthesis(st, payload);
     });
+    // Same wiring path — install the task heartbeat so sessions running past
+    // 45s emit periodic "still working" pings that report the subagent's
+    // current tool activity. Synthesis delivers the final answer; heartbeat
+    // just tells the user the task is alive and moving.
+    const ptyService = st.runtime.getService("PTY_SERVICE");
+    if (ptyService) {
+        installTaskHeartbeat(st.runtime, ptyService);
+        logger.info("[task-heartbeat] installed");
+    }
     return true;
 }
 /**
@@ -2167,23 +900,38 @@ export async function handleSwarmSynthesis(st, payload, routeMessage = (text, so
         return;
     }
     logger.info(`[swarm-synthesis] Generating synthesis for ${payload.total} tasks (${payload.completed} completed, ${payload.stopped} stopped, ${payload.errored} errored)`);
-    const resultText = await buildSynthesisResultText(payload);
-    logger.info("[swarm-synthesis] Synthesis generated, routing to user");
-    await routeMessage(resultText, "swarm_synthesis");
-    await routeSynthesisToConnector(runtime, resultText);
+    const resultText = await buildSynthesisResultText(payload, runtime);
+    logger.info(`[swarm-synthesis] Synthesis generated (${resultText.length} chars), routing to user — preview: ${resultText.slice(0, 200).replace(/\n/g, " | ")}`);
+    // Route back to the originating chat channel via the roomId captured on
+    // the incoming user message (propagated through the task payload).
+    const roomId = payload.tasks.find((t) => t.roomId)?.roomId ?? null;
+    // Discord's per-message limit is 2000 chars. Deliver long answers as
+    // sequential chunks so the subagent's full output reaches the user.
+    for (const chunk of chunkForDiscord(resultText, 1900)) {
+        await routeMessage(chunk, "swarm_synthesis");
+        await routeSynthesisToConnector(runtime, chunk, roomId);
+    }
+}
+async function buildSynthesisResultText(payload, runtime) {
+    const parts = await Promise.all(payload.tasks.map((task) => buildTaskLine(task, runtime)));
+    if (parts.length === 1)
+        return parts[0];
+    return `done — ${parts.length} tasks:\n${parts.map((p) => `• ${p}`).join("\n")}`;
 }
 /**
- * Build the user-facing result message from swarm task data.
- * For port-bound tasks, verifies the server is actually listening.
- * No LLM call required — task data already has what we need.
+ * Deliver the subagent's actual final answer — the last end_turn assistant
+ * text from its session jsonl. Trust the agent to already have produced
+ * a coherent response; synthesis does not rewrite or trim it. Falls back
+ * to completionSummary, then a port-status check, then the original
+ * prompt text when no jsonl is available.
  */
-async function buildSynthesisResultText(payload) {
-    const parts = await Promise.all(payload.tasks.map(buildTaskResultLine));
-    return parts.length === 1
-        ? `done — ${parts[0]}`
-        : `done — ${payload.total} tasks:\n${parts.map((p) => `• ${p}`).join("\n")}`;
-}
-async function buildTaskResultLine(task) {
+async function buildTaskLine(task, runtime) {
+    const workdir = task.workdir ?? resolveSessionWorkdir(runtime, task.sessionId);
+    if (workdir) {
+        const assistantText = await readLastAssistantTextFromJsonl(workdir);
+        if (assistantText)
+            return assistantText;
+    }
     if (task.completionSummary)
         return task.completionSummary;
     const portMatch = task.originalTask.match(/port\s+(\d+)/i);
@@ -2196,6 +944,10 @@ async function buildTaskResultLine(task) {
     }
     return `built the files but server isn't running on port ${port} yet`;
 }
+function resolveSessionWorkdir(runtime, sessionId) {
+    const ptyService = runtime.getService("PTY_SERVICE");
+    return ptyService?.getSession?.(sessionId)?.workdir ?? null;
+}
 async function isPortServing(port) {
     try {
         const res = await fetch(`http://localhost:${port}/`, {
@@ -2212,15 +964,17 @@ async function isPortServing(port) {
  * via the runtime's registered send handler. Uses the source room ID stored
  * on the coordinator when the task was created.
  */
-async function routeSynthesisToConnector(runtime, resultText) {
-    const coordinator = getCoordinatorFromRuntime(runtime);
-    const sourceRoomId = coordinator?.sourceRoomId;
-    if (!sourceRoomId)
+async function routeSynthesisToConnector(runtime, resultText, roomId) {
+    if (!roomId) {
+        logger.debug("[swarm-synthesis] No roomId available — cannot route to connector");
         return;
+    }
     try {
-        const room = await runtime.getRoom(sourceRoomId);
-        if (!room?.source)
+        const room = await runtime.getRoom(roomId);
+        if (!room?.source) {
+            logger.debug(`[swarm-synthesis] Room ${roomId} has no source connector — cannot route`);
             return;
+        }
         await runtime.sendMessageToTarget({
             source: room.source,
             roomId: room.id,
@@ -2230,9 +984,11 @@ async function routeSynthesisToConnector(runtime, resultText) {
         logger.info(`[swarm-synthesis] Routed result to ${room.source} room ${room.id}`);
     }
     catch (err) {
-        logger.debug(`[swarm-synthesis] Connector routing failed: ${err}`);
+        logger.warn(`[swarm-synthesis] Connector routing failed: ${err}`);
     }
 }
+import { chunkForDiscord, readLastAssistantTextFromJsonl, } from "../runtime/subagent-output.js";
+import { installTaskHeartbeat } from "../runtime/task-heartbeat.js";
 // ── Parse Action Block from Eliza's Response ─────────────────────────
 import { parseActionBlock, stripActionBlockFromDisplay, } from "./parse-action-block.js";
 // ── Coordinator Event Routing ───────────────────────────────────────────
@@ -2586,7 +1342,7 @@ async function handleCodingAgentsFallback(runtime, pathname, method, req, res) {
                     break;
                 }
             }
-            const { normalizePreflightAuth } = await import("./coding-agents-preflight-normalize");
+            const { normalizePreflightAuth } = await import("@elizaos/app-task-coordinator/api/coding-agents-preflight-normalize");
             const normalized = rows.flatMap((item) => {
                 if (!item || typeof item !== "object")
                     return [];
@@ -2881,7 +1637,7 @@ async function handleCodingAgentsFallback(runtime, pathname, method, req, res) {
             else {
                 // Whitelist + URL-scheme-validate before forwarding to the
                 // browser. See `coding-agents-auth-sanitize.ts` for rationale.
-                const { sanitizeAuthResult } = await import("./coding-agents-auth-sanitize");
+                const { sanitizeAuthResult } = await import("@elizaos/app-task-coordinator/api/coding-agents-auth-sanitize");
                 json(res, sanitizeAuthResult(triggered));
             }
         }
@@ -3131,11 +1887,8 @@ async function handleRequest(req, res, state, ctx) {
         ensurePairingCode,
         normalizePairingCode,
         rateLimitPairing,
-        getPairingExpiresAt: () => pairingExpiresAt,
-        clearPairing: () => {
-            pairingCode = null;
-            pairingExpiresAt = 0;
-        },
+        getPairingExpiresAt,
+        clearPairing,
     })) {
         return;
     }
@@ -3219,17 +1972,17 @@ async function handleRequest(req, res, state, ctx) {
         readJsonBody,
         json,
         error,
-        executeTriggerTask: executeTriggerTask,
+        executeTriggerTask,
         getTriggerHealthSnapshot,
-        getTriggerLimit: getTriggerLimit,
-        listTriggerTasks: listTriggerTasks,
+        getTriggerLimit,
+        listTriggerTasks,
         readTriggerConfig,
         readTriggerRuns,
-        taskToTriggerSummary: taskToTriggerSummary,
+        taskToTriggerSummary,
         triggersFeatureEnabled,
-        buildTriggerConfig: buildTriggerConfig,
-        buildTriggerMetadata: buildTriggerMetadata,
-        normalizeTriggerDraft: normalizeTriggerDraft,
+        buildTriggerConfig,
+        buildTriggerMetadata,
+        normalizeTriggerDraft,
         DISABLED_TRIGGER_INTERVAL_MS,
         TRIGGER_TASK_NAME,
         TRIGGER_TASK_TAGS: [...TRIGGER_TASK_TAGS],
@@ -3446,7 +2199,23 @@ async function handleRequest(req, res, state, ctx) {
     }
     // ═══════════════════════════════════════════════════════════════════════
     // Skills routes (extracted to skills-routes.ts)
+    // Curated-skills routes live at /api/skills/curated/* and must be dispatched
+    // before the generic skills routes (which reject "/" in skill IDs).
     // ═══════════════════════════════════════════════════════════════════════
+    if (pathname.startsWith("/api/skills/curated")) {
+        if (await handleCuratedSkillsRoutes({
+            req,
+            res,
+            method,
+            pathname,
+            url,
+            json,
+            error,
+            readJsonBody,
+        })) {
+            return;
+        }
+    }
     if (pathname.startsWith("/api/skills")) {
         if (await handleSkillsRoutes({
             req,
@@ -3479,7 +2248,22 @@ async function handleRequest(req, res, state, ctx) {
         auditEventTypes: AUDIT_EVENT_TYPES,
         auditSeverities: AUDIT_SEVERITIES,
         getAuditFeedSize,
-        queryAuditFeed: (query) => queryAuditFeed(query),
+        queryAuditFeed: (query) => queryAuditFeed({
+            type: AUDIT_EVENT_TYPES.includes(query.type ?? "")
+                ? query.type
+                : undefined,
+            severity: AUDIT_SEVERITIES.includes(query.severity ?? "")
+                ? query.severity
+                : undefined,
+            sinceMs: query.sinceMs,
+            limit: query.limit,
+        }).map((entry) => ({
+            timestamp: entry.timestamp,
+            type: entry.type,
+            summary: entry.summary,
+            severity: entry.severity,
+            metadata: entry.metadata,
+        })),
         subscribeAuditFeed,
     })) {
         return;
@@ -3667,9 +2451,31 @@ async function handleRequest(req, res, state, ctx) {
     }
     // Telegram setup routes: now handled by @elizaos/plugin-telegram via
     // runtime plugin routes (rawPath: true). See plugin-telegram/src/setup-routes.ts.
-    // Telegram account routes (/api/telegram-account/*): now handled by
-    // @elizaos/plugin-telegram via runtime plugin routes (rawPath: true).
-    // See plugin-telegram/src/account-setup-routes.ts.
+    // ── Telegram account routes (/api/telegram-account/*) ────────────────
+    if (pathname.startsWith("/api/telegram-account")) {
+        const routeState = {
+            config: state.config,
+            saveConfig: () => saveElizaConfig(state.config),
+            runtime: state.runtime
+                ? {
+                    getService: (type) => state.runtime.getService(type),
+                    getSetting: (key) => state.runtime.getSetting(key),
+                }
+                : undefined,
+            telegramAccountAuthSession: state.telegramAccountAuthSession,
+        };
+        const handled = await handleTelegramAccountRoute(req, res, pathname, method, routeState, { json, error, readJsonBody }, {
+            createAuthSession: (options) => new TelegramAccountAuthSession(options),
+            authStateExists: telegramAccountAuthStateExists,
+            sessionExists: telegramAccountSessionExists,
+            clearAuthState: clearTelegramAccountAuthState,
+            clearSession: clearTelegramAccountSession,
+        });
+        state.telegramAccountAuthSession =
+            routeState.telegramAccountAuthSession ?? null;
+        if (handled)
+            return;
+    }
     // ── Discord Local routes (/api/discord-local/*) — extracted to @elizaos/plugin-discord (setup-routes.ts) ──
     // ── Signal routes (/api/signal/*) — extracted to @elizaos/plugin-signal (setup-routes.ts) ──
     // ── Restart ──────────────────────────────────────────────────────────
@@ -4005,7 +2811,29 @@ async function handleRequest(req, res, state, ctx) {
         method,
         pathname,
         url,
-        appManager: state.appManager,
+        appManager: {
+            listAvailable: (pluginManager) => state.appManager.listAvailable(pluginManager),
+            search: (pluginManager, query, limit) => state.appManager.search(pluginManager, query, limit),
+            listInstalled: (pluginManager) => state.appManager.listInstalled(pluginManager),
+            listRuns: (runtime) => state.appManager.listRuns(runtime && typeof runtime === "object"
+                ? runtime
+                : null),
+            getRun: (runId, runtime) => state.appManager.getRun(runId, runtime && typeof runtime === "object"
+                ? runtime
+                : null),
+            attachRun: (runId, runtime) => state.appManager.attachRun(runId, runtime && typeof runtime === "object"
+                ? runtime
+                : null),
+            detachRun: (runId) => state.appManager.detachRun(runId),
+            launch: (pluginManager, name, onProgress, runtime) => state.appManager.launch(pluginManager, name, onProgress, runtime && typeof runtime === "object"
+                ? runtime
+                : null),
+            stop: (pluginManager, name, runId, runtime) => state.appManager.stop(pluginManager, name, runId, runtime && typeof runtime === "object"
+                ? runtime
+                : null),
+            recordHeartbeat: (runId) => state.appManager.recordHeartbeat(runId),
+            getInfo: (pluginManager, name) => state.appManager.getInfo(pluginManager, name),
+        },
         getPluginManager: () => getPluginManagerForState(state),
         parseBoundedLimit,
         readJsonBody,
@@ -4309,6 +3137,13 @@ export async function startApiServer(opts) {
     if (state.runtime) {
         // AppManager doesn't need a runtime reference — it just installs plugins
     }
+    // Start the periodic stale-run sweeper that stops app runs whose UI
+    // heartbeat has gone silent (e.g. the user closed the tab without
+    // pressing Stop). Without this, plugins that own a setInterval — like
+    // the Defense-of-the-Agents game loop — would tick forever after the
+    // browser disappeared. The sweeper invokes the same `stopRun` route
+    // hook the Stop button uses so plugins have one shutdown path.
+    state.appManager.startStaleRunSweeper(() => state.runtime);
     const addLog = (level, message, source = "system", tags = []) => {
         let resolvedSource = source;
         if (source === "auto" || source === "system") {
@@ -4362,7 +3197,8 @@ export async function startApiServer(opts) {
      * Returns true if patching was performed, false if already patched.
      */
     const patchLogger = (target, defaultSource, defaultTags) => {
-        if (target[PATCHED_MARKER]) {
+        const patchedTarget = target;
+        if (patchedTarget[PATCHED_MARKER]) {
             return false;
         }
         for (const lvl of LEVELS) {
@@ -4400,7 +3236,7 @@ export async function startApiServer(opts) {
             };
             target[lvl] = patched;
         }
-        target[PATCHED_MARKER] = true;
+        patchedTarget[PATCHED_MARKER] = true;
         return true;
     };
     // 1) Patch the global @elizaos/core logger — this captures ALL log calls
@@ -5062,8 +3898,7 @@ export async function startApiServer(opts) {
                 }
                 state.conversations.set(convId, {
                     id: convId,
-                    title: room.name ||
-                        "Chat",
+                    title: room.name || "Chat",
                     roomId: room.id,
                     createdAt: updatedAt,
                     updatedAt,
@@ -5095,7 +3930,9 @@ export async function startApiServer(opts) {
     const overlayDbCharacter = async (rt, st) => {
         try {
             const dbAgent = await rt.getAgent(rt.agentId);
-            const agentRecord = dbAgent;
+            const agentRecord = dbAgent && typeof dbAgent === "object" && !Array.isArray(dbAgent)
+                ? Object.fromEntries(Object.entries(dbAgent))
+                : null;
             const saved = agentRecord?.character;
             if (!saved || typeof saved !== "object")
                 return;
@@ -5237,20 +4074,9 @@ export async function startApiServer(opts) {
             resolve({
                 port: actualPort,
                 close: async () => await new Promise((r) => {
-                    const closeAllConnections = server.closeAllConnections;
-                    const closeIdleConnections = server.closeIdleConnections;
-                    const resolved = { done: false };
-                    const finalize = () => {
-                        if (!resolved.done) {
-                            resolved.done = true;
-                            r();
-                        }
-                    };
-                    const closeTimeout = setTimeout(() => {
-                        clearTimeout(closeTimeout);
-                        finalize();
-                    }, 5_000);
                     void (async () => {
+                        const closeAllConnections = server.closeAllConnections;
+                        const closeIdleConnections = server.closeIdleConnections;
                         clearInterval(statusInterval);
                         if (state.connectorHealthMonitor) {
                             state.connectorHealthMonitor.stop();
@@ -5270,13 +4096,49 @@ export async function startApiServer(opts) {
                             }
                         }
                         wsClients.clear();
-                        // WhatsApp pairing session cleanup now handled by
-                        // @elizaos/plugin-whatsapp (stopAllPairingSessions).
-                        // Signal pairing session cleanup now handled by
-                        // @elizaos/plugin-signal (setup-routes module state).
-                        // Telegram account auth session cleanup now handled by
-                        // @elizaos/plugin-telegram (stopTelegramAccountAuthSession).
+                        // Clean up WhatsApp pairing sessions
+                        if (state.whatsappPairingSessions) {
+                            for (const s of state.whatsappPairingSessions.values()) {
+                                try {
+                                    s.stop();
+                                }
+                                catch {
+                                    /* non-fatal */
+                                }
+                            }
+                            state.whatsappPairingSessions.clear();
+                        }
+                        // Clean up Signal pairing sessions
+                        if (state.signalPairingSessions) {
+                            for (const s of state.signalPairingSessions.values()) {
+                                try {
+                                    s.stop();
+                                }
+                                catch {
+                                    /* non-fatal */
+                                }
+                            }
+                            state.signalPairingSessions.clear();
+                        }
+                        if (state.telegramAccountAuthSession) {
+                            try {
+                                await state.telegramAccountAuthSession.stop();
+                            }
+                            catch {
+                                /* non-fatal */
+                            }
+                            state.telegramAccountAuthSession = null;
+                        }
                         wss.close();
+                        const closeTimeout = setTimeout(() => r(), 5_000);
+                        const resolved = { done: false };
+                        const finalize = () => {
+                            if (!resolved.done) {
+                                resolved.done = true;
+                                clearTimeout(closeTimeout);
+                                r();
+                            }
+                        };
                         if (typeof closeAllConnections === "function") {
                             try {
                                 closeAllConnections();
@@ -5294,7 +4156,7 @@ export async function startApiServer(opts) {
                             }
                         }
                         server.close(finalize);
-                    })().catch(() => finalize());
+                    })();
                 }),
                 updateRuntime,
                 updateStartup,