@elizaos/plugin-elizacloud 2.0.0-beta.1 → 2.0.11-beta.7

package/src/index.ts

@@ -1,4 +1,4 @@
-import type { IAgentRuntime, Plugin } from "@elizaos/core";
+import type { IAgentRuntime, Plugin, ProcessEnvLike } from "@elizaos/core";
 import { logger, ModelType } from "@elizaos/core";
 // Cloud providers
 import { cloudStatusProvider } from "./cloud-providers/cloud-status";
@@ -19,6 +19,7 @@ import {
   handleTextMega,
   handleTextNano,
   handleTextSmall,
+  handleTextToSpeech,
 } from "./models";
 // Cloud services
 import { CloudAuthService } from "./services/cloud-auth";
@@ -30,6 +31,7 @@ import { CloudCredentialProvider } from "./services/cloud-credential-provider";
 import { CloudManagedGatewayRelayService } from "./services/cloud-managed-gateway-relay";
 import { CloudModelRegistryService } from "./services/cloud-model-registry";
 import { createCloudApiClient } from "./utils/sdk-client";
+import { createWaifuMeteringHandler } from "./utils/waifu-metering";
 
 const TEXT_NANO_MODEL_TYPE = (ModelType.TEXT_NANO ?? "TEXT_NANO") as string;
 const TEXT_MEDIUM_MODEL_TYPE = (ModelType.TEXT_MEDIUM ?? "TEXT_MEDIUM") as string;
@@ -37,8 +39,6 @@ const TEXT_MEGA_MODEL_TYPE = (ModelType.TEXT_MEGA ?? "TEXT_MEGA") as string;
 const RESPONSE_HANDLER_MODEL_TYPE = (ModelType.RESPONSE_HANDLER ?? "RESPONSE_HANDLER") as string;
 const ACTION_PLANNER_MODEL_TYPE = (ModelType.ACTION_PLANNER ?? "ACTION_PLANNER") as string;
 
-type ProcessEnvLike = Record<string, string | undefined>;
-
 function getProcessEnv(): ProcessEnvLike {
   if (typeof process === "undefined") {
     return {};
@@ -56,6 +56,31 @@ export const elizaOSCloudPlugin: Plugin = {
     envKeys: ["ELIZAOS_CLOUD_API_KEY", "ELIZAOS_CLOUD_ENABLED"],
   },
 
+  // Plugin-wide registration priority. Applied to every model handler in
+  // the `models` map below. Higher numbers win the native runtime priority
+  // sort.
+  //
+  // Why 50: in `manual` routing mode (`routing-preferences.ts`) with no
+  // `preferredProvider` set for a slot, the runtime falls through to the
+  // native priority order. Putting cloud above the default-0 of other
+  // direct provider plugins (anthropic, openai, groq, elevenlabs) means
+  // Eliza Cloud wins the "user has paired Cloud but hasn't picked anything
+  // specific" case — which is the desired text-generation default.
+  //
+  // **TTS routing precedence is governed by the router-handler**
+  // (`plugin-local-inference/src/services/router-handler.ts`) at
+  // MAX_SAFE_INTEGER priority, which reads the per-slot `RoutingPolicy`
+  // (default `prefer-local`) and dispatches to local first when available.
+  // This plugin's priority does NOT control whether local TTS wins; the
+  // router does. See `plugin-local-inference/native/AGENTS.md` §1 for the
+  // canonical voice/ASR routing contract.
+  //
+  // Cloud TTS still works as a fallback when local is unavailable: the
+  // handler throws `CloudTtsUnavailableError` when cloud isn't connected
+  // and the router's per-pick retry loop falls through to the next
+  // eligible provider (local kokoro / omnivoice, plugin-elevenlabs, ...).
+  priority: 50,
+
   config: {
     ELIZAOS_CLOUD_API_KEY: env.ELIZAOS_CLOUD_API_KEY ?? null,
     ELIZAOS_CLOUD_BASE_URL: env.ELIZAOS_CLOUD_BASE_URL ?? null,
@@ -106,6 +131,14 @@ export const elizaOSCloudPlugin: Plugin = {
     initializeOpenAI(config, runtime);
   },
 
+  // ─── Runtime Event Handlers ──────────────────────────────────────────
+  // Forwards per-inference token + USD spend to waifu's burn meter when the
+  // container is provisioned as a hosted waifu agent (inactive otherwise). See
+  // utils/waifu-metering.ts for the honest-meter rationale.
+  events: {
+    MODEL_USED: [createWaifuMeteringHandler()],
+  },
+
   // ─── Cloud Services ──────────────────────────────────────────────────
   // Services are registered in dependency order:
   //   1. CloudAuthService — must start first (other services depend on it)
@@ -149,6 +182,7 @@ export const elizaOSCloudPlugin: Plugin = {
     [ModelType.RESEARCH]: handleResearch,
     [ModelType.IMAGE]: handleImageGeneration,
     [ModelType.IMAGE_DESCRIPTION]: handleImageDescription,
+    [ModelType.TEXT_TO_SPEECH]: handleTextToSpeech,
   },
 
   tests: [
@@ -299,6 +333,18 @@ export const elizaOSCloudPlugin: Plugin = {
       ],
     },
   ],
+
+  async dispose(runtime) {
+    // Stop in reverse dependency order (auth last since others depend on it).
+    await runtime.getService(CloudCredentialProvider.serviceType)?.stop();
+    await runtime.getService(CloudBackupService.serviceType)?.stop();
+    await runtime.getService(CloudBridgeService.serviceType)?.stop();
+    await runtime.getService(CloudContainerService.serviceType)?.stop();
+    await runtime.getService(CloudModelRegistryService.serviceType)?.stop();
+    await runtime.getService(CloudManagedGatewayRelayService.serviceType)?.stop();
+    await runtime.getService(CloudBootstrapServiceImpl.serviceType)?.stop();
+    await runtime.getService(CloudAuthService.serviceType)?.stop();
+  },
 };
 
 export default elizaOSCloudPlugin;
@@ -313,7 +359,17 @@ export {
 } from "./routes/cloud-routes-autonomous";
 export type { CloudConfigLike } from "./routes/cloud-routes-autonomous";
 export { handleCloudStatusRoutes } from "./routes/cloud-status-routes";
-export { runCloudOnboarding, type CloudOnboardingResult } from "./onboarding";
+export { runCloudSetup, type CloudSetupResult } from "./cloud-setup";
+export { ClackObserver } from "./cloud/clack-observer";
+export { NullCloudSetupObserver } from "./cloud/null-observer";
+export type {
+  AvailabilityResult,
+  CloudSetupObserver,
+  ConfirmPrompt,
+  ProvisionSuccessInfo,
+  SelectChoiceOption,
+  SelectChoicePrompt,
+} from "./cloud/setup-observer";
 export { CloudManager, type CloudManagerCallbacks } from "./cloud/cloud-manager";
 export {
   type CloudWalletDescriptor,
@@ -337,10 +393,26 @@ export {
   resolveCloudTtsBaseUrl,
   resolveElevenLabsApiKeyForCloudMode,
 } from "./lib/server-cloud-tts";
+export {
+  fetchCloudVoiceCatalog,
+  resetCloudVoiceCatalogCacheForTesting,
+  setCloudVoiceClientFactoryForTesting,
+  type CloudVoiceCatalogEntry,
+  type CloudVoiceClient,
+} from "./cloud-voice-catalog";
+export {
+  CloudTtsUnavailableError,
+  type CloudTextToSpeechParams,
+} from "./models/speech";
 export {
   normalizeCloudSiteUrl,
   resolveCloudApiBaseUrl,
 } from "./cloud/base-url";
+export {
+  isCloudAuthApiKeyService,
+  normalizeCloudApiKey,
+  type CloudAuthApiKeyService,
+} from "./cloud/auth-service-types";
 export { validateCloudBaseUrl } from "./cloud/validate-url";
 export * from "./plugin";
 export * from "./register-routes";

package/src/lib/cloud-connection.ts

@@ -9,7 +9,7 @@ import { validateCloudBaseUrl } from "../cloud/validate-url.js";
 import type { AgentRuntime } from "@elizaos/core";
 import { logger } from "@elizaos/core";
 import {
-  applyCanonicalOnboardingConfig,
+  applyCanonicalSetupConfig,
   type ElizaConfig,
   normalizeEnvValue,
 } from "./config-like";
@@ -608,7 +608,7 @@ export async function disconnectCloudConnection(args: {
   const nextCloud = { ...(config.cloud ?? {}) };
   delete nextCloud.apiKey;
   config.cloud = nextCloud;
-  applyCanonicalOnboardingConfig(config as ElizaConfig, {
+  applyCanonicalSetupConfig(config as ElizaConfig, {
     deploymentTarget: { runtime: "local" },
     linkedAccounts: {
       elizacloud: {
@@ -646,8 +646,6 @@ export async function disconnectCloudConnection(args: {
   }
 }
 
-export const disconnectUnifiedCloudConnection = disconnectCloudConnection;
-
 /** Matches `reason` from GET /api/cloud/status when connected via API key without CLOUD_AUTH. */
 const CLOUD_STATUS_API_KEY_ONLY_REASONS: ReadonlySet<string> = new Set([
   "api_key_present_not_authenticated",

package/src/lib/cloud-secrets.ts

@@ -1,58 +1,14 @@
 /**
  * Sealed in-process secret store for cloud credentials.
  *
- * Cloud API keys are scrubbed from process.env after login and stored
- * here so they are not visible in environment dumps, child processes,
- * or /proc/self/environ.
- *
- * This module has NO external dependencies so it can be imported by
- * any module without pulling in host-layer packages.
- */
-
-const _cloudSecrets: Record<string, string | undefined> = Object.create(null);
-
-Object.defineProperty(_cloudSecrets, Symbol.toStringTag, {
-  value: "CloudSecrets",
-  enumerable: false,
-});
-
-/**
- * Read a cloud secret without exposing it in process.env.
- * Falls back to process.env for backwards compatibility with code that
- * sets the key before this module loads (e.g. docker entrypoints).
+ * The implementation moved to `@elizaos/shared/elizacloud/cloud-secrets` so
+ * app-core and other host-layer packages can read sealed cloud secrets without
+ * reverse-importing this plugin. This module remains for backwards
+ * compatibility with plugin-internal callers.
  */
-export function getCloudSecret(
-  key: "ELIZAOS_CLOUD_API_KEY" | "ELIZAOS_CLOUD_ENABLED",
-): string | undefined {
-  return _cloudSecrets[key] ?? process.env[key];
-}
-
-/** Scrub cloud secrets from process.env and capture into the sealed store. */
-export function scrubCloudSecretsFromEnv(): void {
-  for (const key of [
-    "ELIZAOS_CLOUD_API_KEY",
-    "ELIZAOS_CLOUD_ENABLED",
-  ] as const) {
-    if (process.env[key] !== undefined) {
-      _cloudSecrets[key] = process.env[key];
-      delete process.env[key];
-    }
-  }
-}
-
-/** Clear any sealed cloud secrets after an explicit disconnect. */
-export function clearCloudSecrets(): void {
-  for (const key of [
-    "ELIZAOS_CLOUD_API_KEY",
-    "ELIZAOS_CLOUD_ENABLED",
-  ] as const) {
-    delete _cloudSecrets[key];
-  }
-}
-
-/** Reset the sealed secret store. Test-only. */
-export function _resetCloudSecretsForTesting(): void {
-  for (const key of Object.keys(_cloudSecrets)) {
-    delete _cloudSecrets[key];
-  }
-}
+export {
+  clearCloudSecrets,
+  getCloudSecret,
+  scrubCloudSecretsFromEnv,
+  _resetCloudSecretsForTesting,
+} from "@elizaos/shared";

package/src/lib/config-like.ts

@@ -115,7 +115,7 @@ function persistServiceRouting(
   }
 }
 
-export function applyCanonicalOnboardingConfig(
+export function applyCanonicalSetupConfig(
   config: MutableElizaConfig,
   args: {
     deploymentTarget?: DeploymentTargetConfig | null;

package/src/lib/credential-type-map.ts

@@ -10,7 +10,7 @@
  * entries when the cloud gains support for additional connectors; do not
  * scatter cred-type → connector logic elsewhere.
  *
- * Cloud-side endpoint convention (see cloud/apps/api/v1/eliza/<connector>/):
+ * Cloud-side endpoint convention (see packages/cloud-api/v1/eliza/<connector>/):
  *   POST /api/v1/eliza/<connector>/connect/initiate     → { authUrl }
  *   GET  /api/v1/eliza/<connector>/status               → { connected, ... }
  *
@@ -53,7 +53,7 @@ export const credTypeToConnector: ReadonlyMap<string, CredentialTypeMapping> = n
   // ─── Google ──────────────────────────────────────────────────────────
   // Cloud endpoint: /api/v1/eliza/google/{connect/initiate,status,disconnect}
   // The cloud's capability tokens are documented in
-  // cloud/apps/api/v1/eliza/google/connect/initiate/route.ts.
+  // packages/cloud-api/v1/eliza/google/connect/initiate/route.ts.
   [
     "gmailOAuth2",
     {

package/src/lib/http.ts

@@ -7,23 +7,6 @@ export interface ReadJsonBodyOptions {
   requireObject?: boolean;
 }
 
-export interface RouteRequestMeta {
-  req: http.IncomingMessage;
-  res: http.ServerResponse;
-  method: string;
-  pathname: string;
-}
-
-export interface RouteHelpers {
-  json: (res: http.ServerResponse, data: unknown, status?: number) => void;
-  error: (res: http.ServerResponse, message: string, status?: number) => void;
-  readJsonBody: <T extends object>(
-    req: http.IncomingMessage,
-    res: http.ServerResponse,
-    options?: ReadJsonBodyOptions,
-  ) => Promise<T | null>;
-}
-
 function scrubStackFields(value: unknown): unknown {
   if (value instanceof Error) {
     return { error: value.message || "Internal error" };