omnikey-cli 1.0.13 → 1.0.14

package/dist/killDaemon.js

@@ -43,7 +43,7 @@ function killDaemon() {
         pids = [];
     }
     if (pids.length === 0) {
-        console.log(`No process found using port ${port}.`);
+        console.log(`No process is running on port ${port}.`);
         return;
     }
     // 3. Kill each process

package/dist/onboard.js

@@ -8,33 +8,120 @@ const inquirer_1 = __importDefault(require("inquirer"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("./utils");
+const AI_PROVIDERS = [
+    { name: 'OpenAI (gpt-4o-mini / gpt-5.1)', value: 'openai' },
+    { name: 'Anthropic — Claude (claude-haiku / claude-sonnet)', value: 'anthropic' },
+    { name: 'Google Gemini (gemini-2.5-flash / gemini-2.5-pro)', value: 'gemini' },
+];
+const SEARCH_PROVIDERS = [
+    { name: 'Skip (DuckDuckGo will be used by default — no key required)', value: 'skip' },
+    { name: 'Serper (Google Search API — serper.dev, 2,500 free/mo)', value: 'serper' },
+    { name: 'Brave Search (brave.com/search/api, 2,000 free/mo)', value: 'brave' },
+    { name: 'Tavily (tavily.com, 1,000 free/mo, optimized for AI)', value: 'tavily' },
+    { name: 'SearXNG (self-hosted, no key needed — provide your instance URL)', value: 'searxng' },
+];
+const AI_PROVIDER_KEY_ENV = {
+    openai: 'OPENAI_API_KEY',
+    anthropic: 'ANTHROPIC_API_KEY',
+    gemini: 'GEMINI_API_KEY',
+};
+const AI_PROVIDER_KEY_LABEL = {
+    openai: 'OpenAI API key (from platform.openai.com)',
+    anthropic: 'Anthropic API key (from console.anthropic.com)',
+    gemini: 'Google Gemini API key (from ai.google.dev)',
+};
 /**
- * Onboard the user by configuring their OPENAI_API_KEY and generating a .env for self-hosted use.
- * @param openAiKey Optional key provided via CLI
+ * Onboard the user by configuring their AI provider API key and generating config for self-hosted use.
  */
-async function onboard(openAiKey) {
-    let apiKey = openAiKey;
+async function onboard() {
     const configDir = (0, utils_1.getConfigDir)();
     const sqlitePath = path_1.default.join(configDir, 'omnikey-selfhosted.sqlite');
-    if (!apiKey) {
-        const answers = await inquirer_1.default.prompt([
+    // Choose AI provider
+    const { aiProvider } = await inquirer_1.default.prompt([
+        {
+            type: 'list',
+            name: 'aiProvider',
+            message: 'Select your AI provider:',
+            choices: AI_PROVIDERS,
+            default: 'openai',
+        },
+    ]);
+    const { apiKey } = await inquirer_1.default.prompt([
+        {
+            type: 'input',
+            name: 'apiKey',
+            message: `Enter your ${AI_PROVIDER_KEY_LABEL[aiProvider]}:`,
+            validate: (input) => input.trim() !== '' || 'API key cannot be empty',
+        },
+    ]);
+    // Web search provider (optional)
+    const { provider } = await inquirer_1.default.prompt([
+        {
+            type: 'list',
+            name: 'provider',
+            message: 'Select a web search provider for the AI agent (enhances research capabilities):',
+            choices: SEARCH_PROVIDERS,
+            default: 'skip',
+        },
+    ]);
+    const searchConfig = {};
+    if (provider === 'serper') {
+        const { key } = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'key',
+                message: 'Enter your Serper API key (from serper.dev):',
+                validate: (input) => input.trim() !== '' || 'API key cannot be empty',
+            },
+        ]);
+        searchConfig['SERPER_API_KEY'] = key.trim();
+    }
+    else if (provider === 'brave') {
+        const { key } = await inquirer_1.default.prompt([
             {
                 type: 'input',
-                name: 'apiKey',
-                message: 'Enter your OPENAI_API_KEY:',
+                name: 'key',
+                message: 'Enter your Brave Search API key (from brave.com/search/api):',
                 validate: (input) => input.trim() !== '' || 'API key cannot be empty',
             },
         ]);
-        apiKey = answers.apiKey;
+        searchConfig['BRAVE_SEARCH_API_KEY'] = key.trim();
+    }
+    else if (provider === 'tavily') {
+        const { key } = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'key',
+                message: 'Enter your Tavily API key (from tavily.com):',
+                validate: (input) => input.trim() !== '' || 'API key cannot be empty',
+            },
+        ]);
+        searchConfig['TAVILY_API_KEY'] = key.trim();
+    }
+    else if (provider === 'searxng') {
+        const { url } = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'url',
+                message: 'Enter your SearXNG instance URL (e.g. http://localhost:8080):',
+                validate: (input) => input.trim() !== '' || 'URL cannot be empty',
+            },
+        ]);
+        searchConfig['SEARXNG_URL'] = url.trim();
     }
+    // skip/duckduckgo: no config needed, DuckDuckGo is used automatically as the free fallback
     // Save all environment variables to ~/.omnikey/config.json
     const configPath = (0, utils_1.getConfigPath)();
     fs_1.default.mkdirSync(configDir, { recursive: true });
     const configVars = {
-        OPENAI_API_KEY: apiKey,
+        AI_PROVIDER: aiProvider,
+        [AI_PROVIDER_KEY_ENV[aiProvider]]: apiKey,
         IS_SELF_HOSTED: true,
         SQLITE_PATH: sqlitePath,
+        ...searchConfig,
     };
     fs_1.default.writeFileSync(configPath, JSON.stringify(configVars, null, 2));
+    const providerLabel = SEARCH_PROVIDERS.find((p) => p.value === provider)?.name ?? provider;
+    console.log(`\nWeb search provider: ${providerLabel}`);
     console.log(`Environment variables saved to ${configPath}. You can edit this file to update your configuration.`);
 }

package/dist/removeConfig.js

@@ -66,48 +66,56 @@ function killPersistenceAgent() {
     }
 }
 /**
- * Removes the ~/.omnikey config directory and the SQLite database file specified in config.json.
+ * Removes the ~/.omnikey config directory and optionally the SQLite database file.
+ * @param includeDb - When true, also removes the SQLite database file.
  */
-function removeConfigAndDb() {
+function removeConfigAndDb(includeDb = false) {
     const homeDir = (0, utils_1.getHomeDir)();
     const configDir = (0, utils_1.getConfigDir)();
     const configData = (0, utils_1.readConfig)();
-    let sqlitePath = path_1.default.join(homeDir, 'omnikey-selfhosted.sqlite');
-    if (configData.SQLITE_PATH) {
-        sqlitePath = path_1.default.isAbsolute(configData.SQLITE_PATH)
-            ? configData.SQLITE_PATH
-            : path_1.default.join(homeDir, configData.SQLITE_PATH);
-    }
     // Remove platform-appropriate persistence agent
     killPersistenceAgent();
-    // Remove SQLite database
-    if (fs_1.default.existsSync(sqlitePath)) {
-        const maxAttempts = utils_1.isWindows ? 5 : 1;
-        let removed = false;
-        for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-            try {
-                fs_1.default.rmSync(sqlitePath);
-                console.log(`Removed SQLite database: ${sqlitePath}`);
-                removed = true;
-                break;
-            }
-            catch (e) {
-                if (utils_1.isWindows && attempt < maxAttempts && (e.code === 'EBUSY' || e.code === 'EPERM' || e.code === 'EACCES')) {
-                    // File may still be locked by the daemon — wait ~1s and retry
-                    (0, child_process_1.execSync)(`ping -n 2 127.0.0.1 > nul`, { stdio: 'pipe' });
-                }
-                else {
-                    console.error(`Failed to remove SQLite database: ${e}`);
+    // Remove SQLite database only when --db flag is passed
+    if (includeDb) {
+        let sqlitePath = path_1.default.join(homeDir, 'omnikey-selfhosted.sqlite');
+        if (configData.SQLITE_PATH) {
+            sqlitePath = path_1.default.isAbsolute(configData.SQLITE_PATH)
+                ? configData.SQLITE_PATH
+                : path_1.default.join(homeDir, configData.SQLITE_PATH);
+        }
+        if (fs_1.default.existsSync(sqlitePath)) {
+            const maxAttempts = utils_1.isWindows ? 5 : 1;
+            let removed = false;
+            for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+                try {
+                    fs_1.default.rmSync(sqlitePath);
+                    console.log(`Removed SQLite database: ${sqlitePath}`);
+                    removed = true;
                     break;
                 }
+                catch (e) {
+                    if (utils_1.isWindows &&
+                        attempt < maxAttempts &&
+                        (e.code === 'EBUSY' || e.code === 'EPERM' || e.code === 'EACCES')) {
+                        // File may still be locked by the daemon — wait ~1s and retry
+                        (0, child_process_1.execSync)(`ping -n 2 127.0.0.1 > nul`, { stdio: 'pipe' });
+                    }
+                    else {
+                        console.error(`Failed to remove SQLite database: ${e}`);
+                        break;
+                    }
+                }
+            }
+            if (!removed && utils_1.isWindows) {
+                console.error(`Failed to remove SQLite database after ${maxAttempts} attempts: ${sqlitePath}`);
             }
         }
-        if (!removed && utils_1.isWindows) {
-            console.error(`Failed to remove SQLite database after ${maxAttempts} attempts: ${sqlitePath}`);
+        else {
+            console.log(`SQLite database does not exist: ${sqlitePath}`);
         }
     }
     else {
-        console.log(`SQLite database does not exist: ${sqlitePath}`);
+        console.log('Skipping SQLite database removal (use --db to remove it).');
     }
     // Remove .omnikey directory
     if (fs_1.default.existsSync(configDir)) {

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "CLI for onboarding users to Omnikey AI and configuring OPENAI_API_KEY. Use Yarn for install/build.",
   "engines": {
     "node": ">=14.0.0",
@@ -36,6 +36,8 @@
     "express": "^4.21.2",
     "jsonwebtoken": "^9.0.3",
     "openai": "^6.16.0",
+    "@anthropic-ai/sdk": "^0.80.0",
+    "@google/genai": "^1.46.0",
     "pg": "^8.18.0",
     "pg-hstore": "^2.3.4",
     "sequelize": "^6.37.7",

package/src/daemon.ts

@@ -2,7 +2,14 @@ import { spawn } from 'child_process';
 import path from 'path';
 import fs from 'fs';
 import { execSync } from 'child_process';
-import { isWindows, getHomeDir, getConfigDir, getConfigPath, readConfig, initLogFiles } from './utils';
+import {
+  isWindows,
+  getHomeDir,
+  getConfigDir,
+  getConfigPath,
+  readConfig,
+  initLogFiles,
+} from './utils';
 
 /**
  * Start the Omnikey API backend as a daemon on the specified port.
@@ -29,7 +36,15 @@ export function startDaemon(port: number = 7071) {
   const errorLogPath = path.join(configDir, 'daemon-error.log');
 
   if (isWindows) {
-    startDaemonWindows({ port, configDir, configVars, nodePath, backendPath, logPath, errorLogPath });
+    startDaemonWindows({
+      port,
+      configDir,
+      configVars,
+      nodePath,
+      backendPath,
+      logPath,
+      errorLogPath,
+    });
   } else {
     startDaemonMacOS({ port, configDir, configVars, nodePath, backendPath, logPath, errorLogPath });
   }
@@ -148,8 +163,8 @@ function startDaemonMacOS(opts: DaemonOptions) {
   }
 
   const { out, err } = initLogFiles(logPath, errorLogPath);
-  const child = spawn('node', [backendPath], {
-    env: { ...configVars, OMNIKEY_PORT: String(port) },
+  const child = spawn(nodePath, [backendPath], {
+    env: { ...process.env, ...configVars, OMNIKEY_PORT: String(port) },
     detached: true,
     stdio: ['ignore', out, err],
   });

package/src/index.ts

@@ -17,10 +17,9 @@ program
 
 program
   .command('onboard')
-  .description('Onboard and configure your OPENAI_API_KEY')
-  .option('--open-ai-key <key>', 'Your OpenAI API Key')
-  .action(async (options) => {
-    await onboard(options.openAiKey || options.openAiKey || options['open-ai-key']);
+  .description('Onboard and configure your AI provider')
+  .action(async () => {
+    await onboard();
   });
 
 program
@@ -41,11 +40,10 @@ program
 
 program
   .command('remove-config')
-  .description(
-    'Remove the .omnikey config directory and the SQLite database from your home directory',
-  )
-  .action(() => {
-    removeConfigAndDb();
+  .description('Remove the omnikey config. Pass --db to also remove the SQLite database.')
+  .option('--db', 'Also remove the SQLite database')
+  .action((options) => {
+    removeConfigAndDb(!!options.db);
   });
 
 // Add status command

package/src/killDaemon.ts

@@ -41,7 +41,7 @@ export function killDaemon() {
   }
 
   if (pids.length === 0) {
-    console.log(`No process found using port ${port}.`);
+    console.log(`No process is running on port ${port}.`);
     return;
   }
 

package/src/onboard.ts

@@ -3,36 +3,129 @@ import fs from 'fs';
 import path from 'path';
 import { getConfigDir, getConfigPath } from './utils';
 
+const AI_PROVIDERS = [
+  { name: 'OpenAI (gpt-4o-mini / gpt-5.1)', value: 'openai' },
+  { name: 'Anthropic — Claude (claude-haiku / claude-sonnet)', value: 'anthropic' },
+  { name: 'Google Gemini (gemini-2.5-flash / gemini-2.5-pro)', value: 'gemini' },
+];
+
+const SEARCH_PROVIDERS = [
+  { name: 'Skip (DuckDuckGo will be used by default — no key required)', value: 'skip' },
+  { name: 'Serper (Google Search API — serper.dev, 2,500 free/mo)', value: 'serper' },
+  { name: 'Brave Search (brave.com/search/api, 2,000 free/mo)', value: 'brave' },
+  { name: 'Tavily (tavily.com, 1,000 free/mo, optimized for AI)', value: 'tavily' },
+  { name: 'SearXNG (self-hosted, no key needed — provide your instance URL)', value: 'searxng' },
+];
+
+const AI_PROVIDER_KEY_ENV: Record<string, string> = {
+  openai: 'OPENAI_API_KEY',
+  anthropic: 'ANTHROPIC_API_KEY',
+  gemini: 'GEMINI_API_KEY',
+};
+
+const AI_PROVIDER_KEY_LABEL: Record<string, string> = {
+  openai: 'OpenAI API key (from platform.openai.com)',
+  anthropic: 'Anthropic API key (from console.anthropic.com)',
+  gemini: 'Google Gemini API key (from ai.google.dev)',
+};
+
 /**
- * Onboard the user by configuring their OPENAI_API_KEY and generating a .env for self-hosted use.
- * @param openAiKey Optional key provided via CLI
+ * Onboard the user by configuring their AI provider API key and generating config for self-hosted use.
  */
-export async function onboard(openAiKey?: string) {
-  let apiKey = openAiKey;
+export async function onboard() {
   const configDir = getConfigDir();
   const sqlitePath = path.join(configDir, 'omnikey-selfhosted.sqlite');
 
-  if (!apiKey) {
-    const answers = await inquirer.prompt([
+  // Choose AI provider
+  const { aiProvider } = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'aiProvider',
+      message: 'Select your AI provider:',
+      choices: AI_PROVIDERS,
+      default: 'openai',
+    },
+  ]);
+
+  const { apiKey } = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'apiKey',
+      message: `Enter your ${AI_PROVIDER_KEY_LABEL[aiProvider]}:`,
+      validate: (input: string) => input.trim() !== '' || 'API key cannot be empty',
+    },
+  ]);
+
+  // Web search provider (optional)
+  const { provider } = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'provider',
+      message: 'Select a web search provider for the AI agent (enhances research capabilities):',
+      choices: SEARCH_PROVIDERS,
+      default: 'skip',
+    },
+  ]);
+
+  const searchConfig: Record<string, string> = {};
+
+  if (provider === 'serper') {
+    const { key } = await inquirer.prompt([
       {
         type: 'input',
-        name: 'apiKey',
-        message: 'Enter your OPENAI_API_KEY:',
+        name: 'key',
+        message: 'Enter your Serper API key (from serper.dev):',
         validate: (input: string) => input.trim() !== '' || 'API key cannot be empty',
       },
     ]);
-    apiKey = answers.apiKey;
+    searchConfig['SERPER_API_KEY'] = key.trim();
+  } else if (provider === 'brave') {
+    const { key } = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'key',
+        message: 'Enter your Brave Search API key (from brave.com/search/api):',
+        validate: (input: string) => input.trim() !== '' || 'API key cannot be empty',
+      },
+    ]);
+    searchConfig['BRAVE_SEARCH_API_KEY'] = key.trim();
+  } else if (provider === 'tavily') {
+    const { key } = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'key',
+        message: 'Enter your Tavily API key (from tavily.com):',
+        validate: (input: string) => input.trim() !== '' || 'API key cannot be empty',
+      },
+    ]);
+    searchConfig['TAVILY_API_KEY'] = key.trim();
+  } else if (provider === 'searxng') {
+    const { url } = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'url',
+        message: 'Enter your SearXNG instance URL (e.g. http://localhost:8080):',
+        validate: (input: string) => input.trim() !== '' || 'URL cannot be empty',
+      },
+    ]);
+    searchConfig['SEARXNG_URL'] = url.trim();
   }
+  // skip/duckduckgo: no config needed, DuckDuckGo is used automatically as the free fallback
 
   // Save all environment variables to ~/.omnikey/config.json
   const configPath = getConfigPath();
   fs.mkdirSync(configDir, { recursive: true });
   const configVars = {
-    OPENAI_API_KEY: apiKey,
+    AI_PROVIDER: aiProvider,
+    [AI_PROVIDER_KEY_ENV[aiProvider]]: apiKey,
     IS_SELF_HOSTED: true,
     SQLITE_PATH: sqlitePath,
+    ...searchConfig,
   };
   fs.writeFileSync(configPath, JSON.stringify(configVars, null, 2));
+
+  const providerLabel = SEARCH_PROVIDERS.find((p) => p.value === provider)?.name ?? provider;
+  console.log(`\nWeb search provider: ${providerLabel}`);
   console.log(
     `Environment variables saved to ${configPath}. You can edit this file to update your configuration.`,
   );

package/src/removeConfig.ts

@@ -56,48 +56,59 @@ export function killPersistenceAgent() {
 }
 
 /**
- * Removes the ~/.omnikey config directory and the SQLite database file specified in config.json.
+ * Removes the ~/.omnikey config directory and optionally the SQLite database file.
+ * @param includeDb - When true, also removes the SQLite database file.
  */
-export function removeConfigAndDb() {
+export function removeConfigAndDb(includeDb = false) {
   const homeDir = getHomeDir();
   const configDir = getConfigDir();
   const configData = readConfig();
 
-  let sqlitePath = path.join(homeDir, 'omnikey-selfhosted.sqlite');
-  if (configData.SQLITE_PATH) {
-    sqlitePath = path.isAbsolute(configData.SQLITE_PATH)
-      ? configData.SQLITE_PATH
-      : path.join(homeDir, configData.SQLITE_PATH);
-  }
-
   // Remove platform-appropriate persistence agent
   killPersistenceAgent();
 
-  // Remove SQLite database
-  if (fs.existsSync(sqlitePath)) {
-    const maxAttempts = isWindows ? 5 : 1;
-    let removed = false;
-    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-      try {
-        fs.rmSync(sqlitePath);
-        console.log(`Removed SQLite database: ${sqlitePath}`);
-        removed = true;
-        break;
-      } catch (e: any) {
-        if (isWindows && attempt < maxAttempts && (e.code === 'EBUSY' || e.code === 'EPERM' || e.code === 'EACCES')) {
-          // File may still be locked by the daemon — wait ~1s and retry
-          execSync(`ping -n 2 127.0.0.1 > nul`, { stdio: 'pipe' });
-        } else {
-          console.error(`Failed to remove SQLite database: ${e}`);
+  // Remove SQLite database only when --db flag is passed
+  if (includeDb) {
+    let sqlitePath = path.join(homeDir, 'omnikey-selfhosted.sqlite');
+    if (configData.SQLITE_PATH) {
+      sqlitePath = path.isAbsolute(configData.SQLITE_PATH)
+        ? configData.SQLITE_PATH
+        : path.join(homeDir, configData.SQLITE_PATH);
+    }
+
+    if (fs.existsSync(sqlitePath)) {
+      const maxAttempts = isWindows ? 5 : 1;
+      let removed = false;
+      for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+        try {
+          fs.rmSync(sqlitePath);
+          console.log(`Removed SQLite database: ${sqlitePath}`);
+          removed = true;
           break;
+        } catch (e: any) {
+          if (
+            isWindows &&
+            attempt < maxAttempts &&
+            (e.code === 'EBUSY' || e.code === 'EPERM' || e.code === 'EACCES')
+          ) {
+            // File may still be locked by the daemon — wait ~1s and retry
+            execSync(`ping -n 2 127.0.0.1 > nul`, { stdio: 'pipe' });
+          } else {
+            console.error(`Failed to remove SQLite database: ${e}`);
+            break;
+          }
         }
       }
-    }
-    if (!removed && isWindows) {
-      console.error(`Failed to remove SQLite database after ${maxAttempts} attempts: ${sqlitePath}`);
+      if (!removed && isWindows) {
+        console.error(
+          `Failed to remove SQLite database after ${maxAttempts} attempts: ${sqlitePath}`,
+        );
+      }
+    } else {
+      console.log(`SQLite database does not exist: ${sqlitePath}`);
     }
   } else {
-    console.log(`SQLite database does not exist: ${sqlitePath}`);
+    console.log('Skipping SQLite database removal (use --db to remove it).');
   }
 
   // Remove .omnikey directory