@elizaos/cli 1.2.3 → 1.2.5

package/dist/{chunk-2XI6N7KN.js → chunk-JR4V32X7.js}

@@ -2,17 +2,24 @@
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-import {
-  setupProjectEnvironment
-} from "./chunk-ZWDXDKSA.js";
 import {
   buildProjectWithSpinner,
   copyTemplate,
   createTask,
+  ensureElizaDir,
   getDisplayDirectory,
   installDependenciesWithSpinner,
-  runTasks
-} from "./chunk-PSSTO76B.js";
+  installPluginWithSpinner,
+  promptAndStoreAnthropicKey,
+  promptAndStoreGoogleKey,
+  promptAndStoreOllamaConfig,
+  promptAndStoreOllamaEmbeddingConfig,
+  promptAndStoreOpenAIKey,
+  promptAndStoreOpenRouterKey,
+  promptAndStorePostgresUrl,
+  runTasks,
+  setupPgLite
+} from "./chunk-X5K7QYAH.js";
 
 // src/characters/eliza.ts
 var baseCharacter = {
@@ -199,19 +206,19 @@ function getElizaCharacter() {
     // Core plugins first
     "@elizaos/plugin-sql",
     // Text-only plugins (no embedding support)
-    ...!!process.env.ANTHROPIC_API_KEY ? ["@elizaos/plugin-anthropic"] : [],
-    ...!!process.env.OPENROUTER_API_KEY ? ["@elizaos/plugin-openrouter"] : [],
-    // Embedding-capable plugins last (lowest priority for embedding fallback)
-    ...!!process.env.OPENAI_API_KEY ? ["@elizaos/plugin-openai"] : [],
-    ...!!process.env.OLLAMA_API_ENDPOINT ? ["@elizaos/plugin-ollama"] : [],
-    ...!!process.env.GOOGLE_GENERATIVE_AI_API_KEY ? ["@elizaos/plugin-google-genai"] : [],
-    ...!process.env.GOOGLE_GENERATIVE_AI_API_KEY && !process.env.OLLAMA_API_ENDPOINT && !process.env.OPENAI_API_KEY ? ["@elizaos/plugin-local-ai"] : [],
+    ...process.env.ANTHROPIC_API_KEY?.trim() ? ["@elizaos/plugin-anthropic"] : [],
+    ...process.env.OPENROUTER_API_KEY?.trim() ? ["@elizaos/plugin-openrouter"] : [],
+    // Embedding-capable plugins (before platform plugins per documented order)
+    ...process.env.OPENAI_API_KEY?.trim() ? ["@elizaos/plugin-openai"] : [],
+    ...process.env.GOOGLE_GENERATIVE_AI_API_KEY?.trim() ? ["@elizaos/plugin-google-genai"] : [],
     // Platform plugins
-    ...process.env.DISCORD_API_TOKEN ? ["@elizaos/plugin-discord"] : [],
-    ...process.env.TWITTER_API_KEY && process.env.TWITTER_API_SECRET_KEY && process.env.TWITTER_ACCESS_TOKEN && process.env.TWITTER_ACCESS_TOKEN_SECRET ? ["@elizaos/plugin-twitter"] : [],
-    ...process.env.TELEGRAM_BOT_TOKEN ? ["@elizaos/plugin-telegram"] : [],
+    ...process.env.DISCORD_API_TOKEN?.trim() ? ["@elizaos/plugin-discord"] : [],
+    ...process.env.TWITTER_API_KEY?.trim() && process.env.TWITTER_API_SECRET_KEY?.trim() && process.env.TWITTER_ACCESS_TOKEN?.trim() && process.env.TWITTER_ACCESS_TOKEN_SECRET?.trim() ? ["@elizaos/plugin-twitter"] : [],
+    ...process.env.TELEGRAM_BOT_TOKEN?.trim() ? ["@elizaos/plugin-telegram"] : [],
     // Bootstrap plugin
-    ...!process.env.IGNORE_BOOTSTRAP ? ["@elizaos/plugin-bootstrap"] : []
+    ...!process.env.IGNORE_BOOTSTRAP ? ["@elizaos/plugin-bootstrap"] : [],
+    // Always include Ollama as ultimate fallback for local AI
+    "@elizaos/plugin-ollama"
   ];
   return {
     ...baseCharacter,
@@ -221,7 +228,7 @@ function getElizaCharacter() {
 
 // src/commands/create/actions/creators.ts
 import { join } from "path";
-import fs2 from "fs/promises";
+import fs3 from "fs/promises";
 import * as clack2 from "@clack/prompts";
 import colors from "yoctocolors";
 
@@ -331,9 +338,9 @@ import * as clack from "@clack/prompts";
 function getAvailableAIModels() {
   return [
     {
-      title: "Local AI",
+      title: "Local AI (Ollama)",
       value: "local",
-      description: "Local models, no API required"
+      description: "Local models via Ollama, no API required"
     },
     {
       title: "OpenAI",
@@ -350,11 +357,6 @@ function getAvailableAIModels() {
       value: "openrouter",
       description: "Access multiple AI models"
     },
-    {
-      title: "Ollama",
-      value: "ollama",
-      description: "Self-hosted models"
-    },
     {
       title: "Google Generative AI",
       value: "google",
@@ -413,20 +415,15 @@ async function selectAIModel() {
 function getAvailableEmbeddingModels() {
   return [
     {
-      title: "Local AI",
+      title: "Local AI (Ollama)",
       value: "local",
-      description: "Local embeddings, no API required"
+      description: "Local embeddings via Ollama, no API required"
     },
     {
       title: "OpenAI",
       value: "openai",
       description: "OpenAI text-embedding-ada-002"
     },
-    {
-      title: "Ollama",
-      value: "ollama",
-      description: "Self-hosted embedding models"
-    },
     {
       title: "Google Generative AI",
       value: "google",
@@ -452,12 +449,317 @@ async function selectEmbeddingModel() {
   return embeddingModel;
 }
 
+// src/commands/create/actions/setup.ts
+import { existsSync as existsSync2 } from "fs";
+import fs2 from "fs/promises";
+async function createProjectDirectories(targetDir) {
+  await ensureElizaDir(targetDir);
+}
+async function setupAIModelConfig(aiModel, envFilePath, isNonInteractive = false) {
+  try {
+    switch (aiModel) {
+      case "local": {
+        if (isNonInteractive) {
+          let content = "";
+          if (existsSync2(envFilePath)) {
+            content = await fs2.readFile(envFilePath, "utf8");
+          }
+          if (content && !content.endsWith("\n")) {
+            content += "\n";
+          }
+          content += "\n# Local AI Configuration (using Ollama)\n";
+          content += "OLLAMA_API_ENDPOINT=http://localhost:11434\n";
+          content += "OLLAMA_MODEL=gemma3\n";
+          content += "OLLAMA_EMBEDDING_MODEL=nomic-embed-text\n";
+          content += "USE_OLLAMA_TEXT_MODELS=true\n";
+          content += "# Make sure Ollama is installed and running: https://ollama.ai/\n";
+          content += "# Pull models with: ollama pull gemma3 && ollama pull nomic-embed-text\n";
+          await fs2.writeFile(envFilePath, content, "utf8");
+        } else {
+          await promptAndStoreOllamaConfig(envFilePath);
+          await promptAndStoreOllamaEmbeddingConfig(envFilePath);
+        }
+        break;
+      }
+      case "openai": {
+        if (isNonInteractive) {
+          let content = "";
+          if (existsSync2(envFilePath)) {
+            content = await fs2.readFile(envFilePath, "utf8");
+          }
+          if (content && !content.endsWith("\n")) {
+            content += "\n";
+          }
+          content += "\n# AI Model Configuration\n";
+          content += "# OpenAI Configuration\n";
+          content += "OPENAI_API_KEY=your_openai_api_key_here\n";
+          content += "# Get your API key from: https://platform.openai.com/api-keys\n";
+          await fs2.writeFile(envFilePath, content, "utf8");
+        } else {
+          await promptAndStoreOpenAIKey(envFilePath);
+        }
+        break;
+      }
+      case "claude": {
+        if (isNonInteractive) {
+          let content = "";
+          if (existsSync2(envFilePath)) {
+            content = await fs2.readFile(envFilePath, "utf8");
+          }
+          if (content && !content.endsWith("\n")) {
+            content += "\n";
+          }
+          content += "\n# AI Model Configuration\n";
+          content += "# Anthropic API Configuration\n";
+          content += "ANTHROPIC_API_KEY=your_anthropic_api_key_here\n";
+          content += "# Get your API key from: https://console.anthropic.com/\n";
+          await fs2.writeFile(envFilePath, content, "utf8");
+        } else {
+          await promptAndStoreAnthropicKey(envFilePath);
+        }
+        break;
+      }
+      case "openrouter": {
+        if (isNonInteractive) {
+          let content = "";
+          if (existsSync2(envFilePath)) {
+            content = await fs2.readFile(envFilePath, "utf8");
+          }
+          if (content && !content.endsWith("\n")) {
+            content += "\n";
+          }
+          content += "\n# AI Model Configuration\n";
+          content += "# OpenRouter Configuration\n";
+          content += "OPENROUTER_API_KEY=your_openrouter_api_key_here\n";
+          content += "# Get your API key from: https://openrouter.ai/keys\n";
+          await fs2.writeFile(envFilePath, content, "utf8");
+        } else {
+          await promptAndStoreOpenRouterKey(envFilePath);
+        }
+        break;
+      }
+      case "ollama": {
+        if (isNonInteractive) {
+          let content = "";
+          if (existsSync2(envFilePath)) {
+            content = await fs2.readFile(envFilePath, "utf8");
+          }
+          if (content && !content.endsWith("\n")) {
+            content += "\n";
+          }
+          content += "\n# AI Model Configuration\n";
+          content += "# Ollama Configuration\n";
+          content += "OLLAMA_API_ENDPOINT=http://localhost:11434\n";
+          content += "OLLAMA_MODEL=gemma3\n";
+          content += "USE_OLLAMA_TEXT_MODELS=true\n";
+          content += "# Make sure Ollama is installed and running: https://ollama.ai/\n";
+          await fs2.writeFile(envFilePath, content, "utf8");
+        } else {
+          await promptAndStoreOllamaConfig(envFilePath);
+        }
+        break;
+      }
+      case "google": {
+        if (isNonInteractive) {
+          let content = "";
+          if (existsSync2(envFilePath)) {
+            content = await fs2.readFile(envFilePath, "utf8");
+          }
+          if (content && !content.endsWith("\n")) {
+            content += "\n";
+          }
+          content += "\n# AI Model Configuration\n";
+          content += "# Google Generative AI Configuration\n";
+          content += "GOOGLE_GENERATIVE_AI_API_KEY=your_google_api_key_here\n";
+          content += "# Get your API key from: https://aistudio.google.com/apikey\n";
+          await fs2.writeFile(envFilePath, content, "utf8");
+        } else {
+          await promptAndStoreGoogleKey(envFilePath);
+        }
+        break;
+      }
+      default:
+        console.warn(`Unknown AI model: ${aiModel}, skipping configuration`);
+        return;
+    }
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : "Unknown error";
+    console.error(`Failed to set up AI model configuration: ${errorMessage}`);
+  }
+}
+function hasValidApiKey(content, keyName) {
+  const regex = new RegExp(`^${keyName}=(.+)$`, "m");
+  const match = content.match(regex);
+  if (!match) return false;
+  const value = match[1].trim();
+  return value !== "" && !value.includes("your_") && !value.includes("_here") && !value.includes("PLACEHOLDER") && !value.includes("placeholder");
+}
+async function setupEmbeddingModelConfig(embeddingModel, envFilePath, isNonInteractive = false) {
+  try {
+    let content = "";
+    if (existsSync2(envFilePath)) {
+      content = await fs2.readFile(envFilePath, "utf8");
+    }
+    if (content && !content.endsWith("\n")) {
+      content += "\n";
+    }
+    switch (embeddingModel) {
+      case "local": {
+        content += "\n# Embedding Model Configuration (Fallback)\n";
+        content += "# Using local embeddings - no additional configuration needed\n";
+        await fs2.writeFile(envFilePath, content, "utf8");
+        break;
+      }
+      case "openai": {
+        if (!hasValidApiKey(content, "OPENAI_API_KEY")) {
+          if (isNonInteractive) {
+            if (!content.includes("OPENAI_API_KEY=")) {
+              content += "\n# Embedding Model Configuration (Fallback)\n";
+              content += "# OpenAI Embeddings Configuration\n";
+              content += "OPENAI_API_KEY=your_openai_api_key_here\n";
+              content += "# Get your API key from: https://platform.openai.com/api-keys\n";
+            }
+            await fs2.writeFile(envFilePath, content, "utf8");
+          } else {
+            await promptAndStoreOpenAIKey(envFilePath);
+          }
+        }
+        break;
+      }
+      case "ollama": {
+        if (!hasValidApiKey(content, "OLLAMA_API_ENDPOINT")) {
+          if (isNonInteractive) {
+            if (!content.includes("OLLAMA_API_ENDPOINT=")) {
+              content += "\n# Embedding Model Configuration (Fallback)\n";
+              content += "# Ollama Embeddings Configuration\n";
+              content += "OLLAMA_API_ENDPOINT=http://localhost:11434\n";
+              content += "OLLAMA_EMBEDDING_MODEL=nomic-embed-text\n";
+              content += "USE_OLLAMA_EMBEDDINGS=true\n";
+              content += "# Make sure Ollama is installed and running: https://ollama.ai/\n";
+            }
+            await fs2.writeFile(envFilePath, content, "utf8");
+          } else {
+            await promptAndStoreOllamaEmbeddingConfig(envFilePath);
+          }
+        } else {
+          if (isNonInteractive) {
+            if (!content.includes("OLLAMA_EMBEDDING_MODEL")) {
+              content += "OLLAMA_EMBEDDING_MODEL=nomic-embed-text\n";
+            }
+            if (!content.includes("USE_OLLAMA_EMBEDDINGS")) {
+              content += "USE_OLLAMA_EMBEDDINGS=true\n";
+            }
+            await fs2.writeFile(envFilePath, content, "utf8");
+          } else {
+            await promptAndStoreOllamaEmbeddingConfig(envFilePath);
+          }
+        }
+        break;
+      }
+      case "google": {
+        if (!hasValidApiKey(content, "GOOGLE_GENERATIVE_AI_API_KEY")) {
+          if (isNonInteractive) {
+            if (!content.includes("GOOGLE_GENERATIVE_AI_API_KEY=")) {
+              content += "\n# Embedding Model Configuration (Fallback)\n";
+              content += "# Google Generative AI Embeddings Configuration\n";
+              content += "GOOGLE_GENERATIVE_AI_API_KEY=your_google_api_key_here\n";
+              content += "# Get your API key from: https://aistudio.google.com/apikey\n";
+            }
+            await fs2.writeFile(envFilePath, content, "utf8");
+          } else {
+            await promptAndStoreGoogleKey(envFilePath);
+          }
+        }
+        break;
+      }
+      default:
+        console.warn(`Unknown embedding model: ${embeddingModel}, skipping configuration`);
+        return;
+    }
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : "Unknown error";
+    console.error(`Failed to set up embedding model configuration: ${errorMessage}`);
+  }
+}
+function resolveModelToPlugin(modelName) {
+  const modelToPlugin = {
+    openai: "openai",
+    claude: "anthropic",
+    anthropic: "anthropic",
+    openrouter: "openrouter",
+    ollama: "ollama",
+    google: "google-genai"
+  };
+  return modelToPlugin[modelName] || null;
+}
+async function installModelPlugin(modelName, targetDir, purpose = "") {
+  const pluginName = resolveModelToPlugin(modelName);
+  if (!pluginName) {
+    return;
+  }
+  await installPluginWithSpinner(pluginName, targetDir, purpose);
+}
+async function setupProjectEnvironment(targetDir, database, aiModel, embeddingModel, isNonInteractive = false) {
+  await createProjectDirectories(targetDir);
+  const envFilePath = `${targetDir}/.env`;
+  if (database === "postgres") {
+    if (!isNonInteractive) {
+      await promptAndStorePostgresUrl(envFilePath);
+    }
+  } else if (database === "pglite") {
+    await setupPgLite(void 0, `${targetDir}/.env`, targetDir);
+  }
+  if (!isNonInteractive) {
+    await setupAIModelConfig(aiModel, envFilePath, isNonInteractive);
+    if (embeddingModel) {
+      await setupEmbeddingModelConfig(embeddingModel, envFilePath, isNonInteractive);
+    }
+  }
+  const envContent = existsSync2(envFilePath) ? await fs2.readFile(envFilePath, "utf8") : "";
+  if (!hasValidApiKey(envContent, "OLLAMA_API_ENDPOINT")) {
+    await setupEmbeddingModelConfig("ollama", envFilePath, true);
+  }
+  if (aiModel === "local") {
+    await installModelPlugin("ollama", targetDir, "for local AI");
+  } else {
+    await installModelPlugin(aiModel, targetDir);
+    if (aiModel !== "ollama") {
+      await installModelPlugin("ollama", targetDir, "as fallback");
+    }
+  }
+  if (embeddingModel && embeddingModel !== "local") {
+    const aiPluginName = resolveModelToPlugin(aiModel);
+    const embeddingPluginName = resolveModelToPlugin(embeddingModel);
+    if (embeddingPluginName && embeddingPluginName !== aiPluginName) {
+      await installModelPlugin(embeddingModel, targetDir, "for embeddings");
+    }
+  }
+}
+
 // src/commands/create/actions/creators.ts
-import { existsSync as existsSync2, rmSync } from "fs";
+import { existsSync as existsSync3, rmSync } from "fs";
+async function handleInteractiveConfiguration(targetDir, database, aiModel, embeddingModel) {
+  const envFilePath = `${targetDir}/.env`;
+  if (database === "postgres") {
+    await promptAndStorePostgresUrl(envFilePath);
+  }
+  if (aiModel !== "local" || embeddingModel) {
+    if (aiModel !== "local") {
+      await setupAIModelConfig(aiModel, envFilePath, false);
+    }
+    if (embeddingModel) {
+      await setupEmbeddingModelConfig(embeddingModel, envFilePath, false);
+    }
+  }
+  const envContent = existsSync3(envFilePath) ? await fs3.readFile(envFilePath, "utf8") : "";
+  if (!hasValidApiKey(envContent, "OLLAMA_API_ENDPOINT")) {
+    await setupEmbeddingModelConfig("ollama", envFilePath, false);
+  }
+}
 async function withCleanupOnInterrupt(targetDir, displayName, fn) {
-  const directoryExistedBefore = existsSync2(targetDir);
+  const directoryExistedBefore = existsSync3(targetDir);
   const cleanup = () => {
-    if (!directoryExistedBefore && existsSync2(targetDir)) {
+    if (!directoryExistedBefore && existsSync3(targetDir)) {
       console.info(colors.red(`
 
 Interrupted! Cleaning up ${displayName}...`));
@@ -488,7 +790,7 @@ Interrupted! Cleaning up ${displayName}...`));
     process.removeListener("exit", cleanup);
     process.removeListener("SIGINT", sigintHandler);
     process.removeListener("SIGTERM", sigtermHandler);
-    if (!directoryExistedBefore && existsSync2(targetDir)) {
+    if (!directoryExistedBefore && existsSync3(targetDir)) {
       try {
         console.info(colors.red(`
 Cleaning up due to error...`));
@@ -549,7 +851,7 @@ Next steps:`);
 async function createAgent(agentName, targetDir, isNonInteractive = false) {
   const agentFilePath = join(targetDir, `${agentName}.json`);
   try {
-    await fs2.access(agentFilePath);
+    await fs3.access(agentFilePath);
     throw new Error(`Agent file ${agentFilePath} already exists`);
   } catch (error) {
     if (error.code !== "ENOENT") {
@@ -574,7 +876,7 @@ async function createAgent(agentName, targetDir, isNonInteractive = false) {
       `${agentName} is knowledgeable, creative, and always eager to help users with their questions and tasks.`
     ]
   };
-  await fs2.writeFile(agentFilePath, JSON.stringify(agentCharacter, null, 2));
+  await fs3.writeFile(agentFilePath, JSON.stringify(agentCharacter, null, 2));
   console.info(`
 ${colors.green("\u2713")} Agent "${agentName}" created successfully!`);
   console.info(`Agent character created successfully at: ${agentFilePath}`);
@@ -603,22 +905,9 @@ async function createTEEProject(projectName, targetDir, database, aiModel, embed
     }
   }
   await withCleanupOnInterrupt(teeTargetDir, projectName, async () => {
-    await fs2.mkdir(teeTargetDir, { recursive: true });
+    await fs3.mkdir(teeTargetDir, { recursive: true });
     if (!isNonInteractive) {
-      const { setupAIModelConfig, setupEmbeddingModelConfig } = await import("./setup-UQOWDHFN.js");
-      const { promptAndStorePostgresUrl } = await import("./utils-DTW3XU6O.js");
-      const envFilePath = `${teeTargetDir}/.env`;
-      if (database === "postgres") {
-        await promptAndStorePostgresUrl(envFilePath);
-      }
-      if (aiModel !== "local" || embeddingModel) {
-        if (aiModel !== "local") {
-          await setupAIModelConfig(aiModel, envFilePath, false);
-        }
-        if (embeddingModel) {
-          await setupEmbeddingModelConfig(embeddingModel, envFilePath, false);
-        }
-      }
+      await handleInteractiveConfiguration(teeTargetDir, database, aiModel, embeddingModel);
     }
     await runTasks([
       createTask(
@@ -663,23 +952,10 @@ async function createProject(projectName, targetDir, database, aiModel, embeddin
   }
   const createFn = async () => {
     if (projectName !== ".") {
-      await fs2.mkdir(projectTargetDir, { recursive: true });
+      await fs3.mkdir(projectTargetDir, { recursive: true });
     }
     if (!isNonInteractive) {
-      const { setupAIModelConfig, setupEmbeddingModelConfig } = await import("./setup-UQOWDHFN.js");
-      const { promptAndStorePostgresUrl } = await import("./utils-DTW3XU6O.js");
-      const envFilePath = `${projectTargetDir}/.env`;
-      if (database === "postgres") {
-        await promptAndStorePostgresUrl(envFilePath);
-      }
-      if (aiModel !== "local" || embeddingModel) {
-        if (aiModel !== "local") {
-          await setupAIModelConfig(aiModel, envFilePath, false);
-        }
-        if (embeddingModel) {
-          await setupEmbeddingModelConfig(embeddingModel, envFilePath, false);
-        }
-      }
+      await handleInteractiveConfiguration(projectTargetDir, database, aiModel, embeddingModel);
     }
     await runTasks([
       createTask(
@@ -721,6 +997,11 @@ export {
   selectAIModel,
   selectEmbeddingModel,
   getElizaCharacter,
+  createProjectDirectories,
+  setupAIModelConfig,
+  hasValidApiKey,
+  setupEmbeddingModelConfig,
+  setupProjectEnvironment,
   createPlugin,
   createAgent,
   createTEEProject,