omnikey-cli 1.0.4 → 1.0.6

package/README.md

@@ -27,11 +27,14 @@ omnikey onboard
 # Or onboard non-interactively
 omnikey onboard --open-ai-key YOUR_KEY
 
-# Running the daemon will start the backend
+# Running the daemon will set up a launchd agent and keep the backend server running across system restarts
 omnikey daemon --port 7071
 
 # Kill the daemon
 omnikey kill-daemon --port 7071
+
+# Remove the config directory and SQLite database (and launchd agent)
+omnikey remove-config
 ```
 
 ## Development

package/backend-dist/config.js

@@ -5,6 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = void 0;
 const dotenv_1 = __importDefault(require("dotenv"));
+const path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
 dotenv_1.default.config();
 function getEnv(name, required) {
     const value = process.env[name];
@@ -33,6 +35,14 @@ function getNumberEnv(name, defaultValue) {
     }
     return parsed;
 }
+function getSqlitePath() {
+    const envPath = getEnv('SQLITE_PATH', false);
+    const homeDir = process.env.HOME || process.env.USERPROFILE || os_1.default.homedir();
+    const defaultPath = path_1.default.join(homeDir, '.omnikey', 'omnikey-selfhosted.sqlite');
+    if (!envPath)
+        return defaultPath;
+    return path_1.default.isAbsolute(envPath) ? envPath : path_1.default.join(homeDir, '.omnikey', envPath);
+}
 exports.config = {
     // Server
     logLevel: getEnv('LOG_LEVEL', false) || 'info',
@@ -42,7 +52,7 @@ exports.config = {
     // Database
     databaseUrl: getEnv('DATABASE_URL', getBooleanEnv('IS_SELF_HOSTED', false) ? false : true),
     dbLogging: getBooleanEnv('DB_LOGGING', false),
-    sqlitePath: getEnv('SQLITE_PATH', false) || 'omnikey-selfhosted.sqlite',
+    sqlitePath: getSqlitePath(),
     // Crypto
     appEncryptionKey: getEnv('APP_ENCRYPTION_KEY', false),
     // JWT / auth

package/dist/daemon.js

@@ -7,8 +7,11 @@ exports.startDaemon = startDaemon;
 const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
+const os_1 = __importDefault(require("os"));
+const child_process_2 = require("child_process");
 /**
  * Start the Omnikey API backend as a daemon on the specified port.
+ * Also creates and registers a launchd agent for persistence on macOS.
  * @param port The port to run the backend on
  */
 function startDaemon(port = 7071) {
@@ -16,7 +19,8 @@ function startDaemon(port = 7071) {
     // Path to the backend entry point (now from backend-dist)
     const backendPath = path_1.default.resolve(__dirname, '../backend-dist/index.js');
     // Read and update environment variables from ~/.omnikey/config.json
-    const configDir = path_1.default.join(process.env.HOME || process.env.USERPROFILE || '.', '.omnikey');
+    const homeDir = process.env.HOME || process.env.USERPROFILE || os_1.default.homedir();
+    const configDir = path_1.default.join(homeDir, '.omnikey');
     const configPath = path_1.default.join(configDir, 'config.json');
     let configVars = {};
     if (fs_1.default.existsSync(configPath)) {
@@ -37,7 +41,56 @@ function startDaemon(port = 7071) {
     catch (e) {
         console.error('Failed to write updated config.json:', e);
     }
-    // Spawn the backend as a detached child process with env vars from config
+    // Create launchd agent for persistence
+    const plistName = 'com.omnikey.daemon.plist';
+    const plistPath = path_1.default.join(homeDir, 'Library', 'LaunchAgents', plistName);
+    const nodePath = process.execPath;
+    const envVars = Object.entries({ ...configVars, OMNIKEY_PORT: String(port) })
+        .map(([k, v]) => `<key>${k}</key><string>${v}</string>`)
+        .join('\n');
+    const plistContent = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>com.omnikey.daemon</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>${nodePath}</string>
+    <string>${backendPath}</string>
+  </array>
+  <key>EnvironmentVariables</key>
+  <dict>
+    ${envVars}
+  </dict>
+  <key>RunAtLoad</key>
+  <true/>
+  <key>KeepAlive</key>
+  <true/>
+  <key>StandardOutPath</key>
+  <string>${path_1.default.join(configDir, 'daemon.log')}</string>
+  <key>StandardErrorPath</key>
+  <string>${path_1.default.join(configDir, 'daemon-error.log')}</string>
+  <key>WorkingDirectory</key>
+  <string>${configDir}</string>
+</dict>
+</plist>
+`;
+    // Write plist file
+    try {
+        const launchAgentsDir = path_1.default.join(homeDir, 'Library', 'LaunchAgents');
+        fs_1.default.mkdirSync(launchAgentsDir, { recursive: true });
+        fs_1.default.writeFileSync(plistPath, plistContent, 'utf-8');
+        // Load the launch agent
+        (0, child_process_2.execSync)(`launchctl unload "${plistPath}" || true`); // Unload if already loaded
+        (0, child_process_2.execSync)(`launchctl load "${plistPath}"`);
+        console.log(`Launch agent created and loaded: ${plistPath}`);
+        console.log('Omnikey daemon will auto-restart and persist across reboots.');
+    }
+    catch (e) {
+        console.error('Failed to create or load launch agent:', e);
+    }
+    // Also start the backend immediately for current session
     const child = (0, child_process_1.spawn)('node', [backendPath], {
         env: { ...process.env, ...configVars, OMNIKEY_PORT: String(port) },
         detached: true,

package/dist/index.js

@@ -5,6 +5,7 @@ const commander_1 = require("commander");
 const onboard_1 = require("./onboard");
 const daemon_1 = require("./daemon");
 const killDaemon_1 = require("./killDaemon");
+const removeConfig_1 = require("./removeConfig");
 const program = new commander_1.Command();
 program
     .name('omnikey')
@@ -33,4 +34,10 @@ program
     const port = Number(options.port) || 7071;
     (0, killDaemon_1.killDaemon)(port);
 });
+program
+    .command('remove-config')
+    .description('Remove the .omnikey config directory and the SQLite database from your home directory')
+    .action(() => {
+    (0, removeConfig_1.removeConfigAndDb)();
+});
 program.parseAsync(process.argv);

package/dist/onboard.js

@@ -13,7 +13,9 @@ const path_1 = __importDefault(require("path"));
  */
 async function onboard(openAiKey) {
     let apiKey = openAiKey;
-    let sqlitePath = 'omnikey-selfhosted.sqlite';
+    const homeDir = process.env.HOME || process.env.USERPROFILE || '.';
+    const configDir = path_1.default.join(homeDir, '.omnikey');
+    const sqlitePath = path_1.default.join(configDir, 'omnikey-selfhosted.sqlite');
     if (!apiKey) {
         const answers = await inquirer_1.default.prompt([
             {
@@ -22,18 +24,10 @@ async function onboard(openAiKey) {
                 message: 'Enter your OPENAI_API_KEY:',
                 validate: (input) => input.trim() !== '' || 'API key cannot be empty',
             },
-            {
-                type: 'input',
-                name: 'sqlitePath',
-                message: 'SQLite DB file path:',
-                default: 'omnikey-selfhosted.sqlite',
-            },
         ]);
         apiKey = answers.apiKey;
-        sqlitePath = answers.sqlitePath;
     }
     // Save all environment variables to ~/.omnikey/config.json
-    const configDir = path_1.default.join(process.env.HOME || process.env.USERPROFILE || '.', '.omnikey');
     const configPath = path_1.default.join(configDir, 'config.json');
     fs_1.default.mkdirSync(configDir, { recursive: true });
     const configVars = {

package/dist/removeConfig.js

@@ -0,0 +1,75 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeConfigAndDb = removeConfigAndDb;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+const child_process_1 = require("child_process");
+/**
+ * Removes the ~/.omnikey config directory and the SQLite database file specified in config.json.
+ */
+function removeConfigAndDb() {
+    const homeDir = process.env.HOME || process.env.USERPROFILE || os_1.default.homedir();
+    const configDir = path_1.default.join(homeDir, '.omnikey');
+    const configPath = path_1.default.join(configDir, 'config.json');
+    let sqlitePath = path_1.default.join(homeDir, 'omnikey-selfhosted.sqlite');
+    // Try to read SQLITE_PATH from config.json
+    if (fs_1.default.existsSync(configPath)) {
+        try {
+            const configData = JSON.parse(fs_1.default.readFileSync(configPath, 'utf-8'));
+            if (configData.SQLITE_PATH) {
+                sqlitePath = path_1.default.isAbsolute(configData.SQLITE_PATH)
+                    ? configData.SQLITE_PATH
+                    : path_1.default.join(homeDir, configData.SQLITE_PATH);
+            }
+        }
+        catch (e) {
+            console.error(`Failed to read config.json: ${e}`);
+        }
+    }
+    // Remove launchd agent if exists (macOS)
+    const plistName = 'com.omnikey.daemon.plist';
+    const plistPath = path_1.default.join(homeDir, 'Library', 'LaunchAgents', plistName);
+    if (fs_1.default.existsSync(plistPath)) {
+        try {
+            (0, child_process_1.execSync)(`launchctl unload "${plistPath}"`);
+            fs_1.default.rmSync(plistPath);
+            console.log(`Removed launchd agent: ${plistPath}`);
+        }
+        catch (e) {
+            console.error(`Failed to remove launchd agent: ${e}`);
+        }
+    }
+    else {
+        console.log(`Launchd agent does not exist: ${plistPath}`);
+    }
+    // Remove SQLite database
+    if (fs_1.default.existsSync(sqlitePath)) {
+        try {
+            fs_1.default.rmSync(sqlitePath);
+            console.log(`Removed SQLite database: ${sqlitePath}`);
+        }
+        catch (e) {
+            console.error(`Failed to remove SQLite database: ${e}`);
+        }
+    }
+    else {
+        console.log(`SQLite database does not exist: ${sqlitePath}`);
+    }
+    // Remove .omnikey directory
+    if (fs_1.default.existsSync(configDir)) {
+        try {
+            fs_1.default.rmSync(configDir, { recursive: true, force: true });
+            console.log(`Removed config directory: ${configDir}`);
+        }
+        catch (e) {
+            console.error(`Failed to remove config directory: ${e}`);
+        }
+    }
+    else {
+        console.log(`Config directory does not exist: ${configDir}`);
+    }
+}

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "CLI for onboarding users to Omnikey AI and configuring OPENAI_API_KEY. Use Yarn for install/build.",
   "engines": {
     "node": ">=14.0.0",

package/src/daemon.ts

@@ -1,9 +1,12 @@
 import { spawn } from 'child_process';
 import path from 'path';
 import fs from 'fs';
+import os from 'os';
+import { execSync } from 'child_process';
 
 /**
  * Start the Omnikey API backend as a daemon on the specified port.
+ * Also creates and registers a launchd agent for persistence on macOS.
  * @param port The port to run the backend on
  */
 export function startDaemon(port: number = 7071) {
@@ -13,7 +16,8 @@ export function startDaemon(port: number = 7071) {
   const backendPath = path.resolve(__dirname, '../backend-dist/index.js');
 
   // Read and update environment variables from ~/.omnikey/config.json
-  const configDir = path.join(process.env.HOME || process.env.USERPROFILE || '.', '.omnikey');
+  const homeDir = process.env.HOME || process.env.USERPROFILE || os.homedir();
+  const configDir = path.join(homeDir, '.omnikey');
   const configPath = path.join(configDir, 'config.json');
   let configVars: Record<string, any> = {};
   if (fs.existsSync(configPath)) {
@@ -32,7 +36,57 @@ export function startDaemon(port: number = 7071) {
   } catch (e) {
     console.error('Failed to write updated config.json:', e);
   }
-  // Spawn the backend as a detached child process with env vars from config
+
+  // Create launchd agent for persistence
+  const plistName = 'com.omnikey.daemon.plist';
+  const plistPath = path.join(homeDir, 'Library', 'LaunchAgents', plistName);
+  const nodePath = process.execPath;
+  const envVars = Object.entries({ ...configVars, OMNIKEY_PORT: String(port) })
+    .map(([k, v]) => `<key>${k}</key><string>${v}</string>`)
+    .join('\n');
+  const plistContent = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>com.omnikey.daemon</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>${nodePath}</string>
+    <string>${backendPath}</string>
+  </array>
+  <key>EnvironmentVariables</key>
+  <dict>
+    ${envVars}
+  </dict>
+  <key>RunAtLoad</key>
+  <true/>
+  <key>KeepAlive</key>
+  <true/>
+  <key>StandardOutPath</key>
+  <string>${path.join(configDir, 'daemon.log')}</string>
+  <key>StandardErrorPath</key>
+  <string>${path.join(configDir, 'daemon-error.log')}</string>
+  <key>WorkingDirectory</key>
+  <string>${configDir}</string>
+</dict>
+</plist>
+`;
+  // Write plist file
+  try {
+    const launchAgentsDir = path.join(homeDir, 'Library', 'LaunchAgents');
+    fs.mkdirSync(launchAgentsDir, { recursive: true });
+    fs.writeFileSync(plistPath, plistContent, 'utf-8');
+    // Load the launch agent
+    execSync(`launchctl unload "${plistPath}" || true`); // Unload if already loaded
+    execSync(`launchctl load "${plistPath}"`);
+    console.log(`Launch agent created and loaded: ${plistPath}`);
+    console.log('Omnikey daemon will auto-restart and persist across reboots.');
+  } catch (e) {
+    console.error('Failed to create or load launch agent:', e);
+  }
+
+  // Also start the backend immediately for current session
   const child = spawn('node', [backendPath], {
     env: { ...process.env, ...configVars, OMNIKEY_PORT: String(port) },
     detached: true,

package/src/index.ts

@@ -4,6 +4,7 @@ import { onboard } from './onboard';
 
 import { startDaemon } from './daemon';
 import { killDaemon } from './killDaemon';
+import { removeConfigAndDb } from './removeConfig';
 
 const program = new Command();
 
@@ -38,4 +39,13 @@ program
     killDaemon(port);
   });
 
+program
+  .command('remove-config')
+  .description(
+    'Remove the .omnikey config directory and the SQLite database from your home directory',
+  )
+  .action(() => {
+    removeConfigAndDb();
+  });
+
 program.parseAsync(process.argv);

package/src/onboard.ts

@@ -8,7 +8,9 @@ import path from 'path';
  */
 export async function onboard(openAiKey?: string) {
   let apiKey = openAiKey;
-  let sqlitePath = 'omnikey-selfhosted.sqlite';
+  const homeDir = process.env.HOME || process.env.USERPROFILE || '.';
+  const configDir = path.join(homeDir, '.omnikey');
+  const sqlitePath = path.join(configDir, 'omnikey-selfhosted.sqlite');
 
   if (!apiKey) {
     const answers = await inquirer.prompt([
@@ -18,19 +20,11 @@ export async function onboard(openAiKey?: string) {
         message: 'Enter your OPENAI_API_KEY:',
         validate: (input: string) => input.trim() !== '' || 'API key cannot be empty',
       },
-      {
-        type: 'input',
-        name: 'sqlitePath',
-        message: 'SQLite DB file path:',
-        default: 'omnikey-selfhosted.sqlite',
-      },
     ]);
     apiKey = answers.apiKey;
-    sqlitePath = answers.sqlitePath;
   }
 
   // Save all environment variables to ~/.omnikey/config.json
-  const configDir = path.join(process.env.HOME || process.env.USERPROFILE || '.', '.omnikey');
   const configPath = path.join(configDir, 'config.json');
   fs.mkdirSync(configDir, { recursive: true });
   const configVars = {

package/src/removeConfig.ts

@@ -0,0 +1,67 @@
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { execSync } from 'child_process';
+
+/**
+ * Removes the ~/.omnikey config directory and the SQLite database file specified in config.json.
+ */
+export function removeConfigAndDb() {
+  const homeDir = process.env.HOME || process.env.USERPROFILE || os.homedir();
+  const configDir = path.join(homeDir, '.omnikey');
+  const configPath = path.join(configDir, 'config.json');
+  let sqlitePath = path.join(homeDir, 'omnikey-selfhosted.sqlite');
+
+  // Try to read SQLITE_PATH from config.json
+  if (fs.existsSync(configPath)) {
+    try {
+      const configData = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+      if (configData.SQLITE_PATH) {
+        sqlitePath = path.isAbsolute(configData.SQLITE_PATH)
+          ? configData.SQLITE_PATH
+          : path.join(homeDir, configData.SQLITE_PATH);
+      }
+    } catch (e) {
+      console.error(`Failed to read config.json: ${e}`);
+    }
+  }
+
+  // Remove launchd agent if exists (macOS)
+  const plistName = 'com.omnikey.daemon.plist';
+  const plistPath = path.join(homeDir, 'Library', 'LaunchAgents', plistName);
+  if (fs.existsSync(plistPath)) {
+    try {
+      execSync(`launchctl unload "${plistPath}"`);
+      fs.rmSync(plistPath);
+      console.log(`Removed launchd agent: ${plistPath}`);
+    } catch (e) {
+      console.error(`Failed to remove launchd agent: ${e}`);
+    }
+  } else {
+    console.log(`Launchd agent does not exist: ${plistPath}`);
+  }
+
+  // Remove SQLite database
+  if (fs.existsSync(sqlitePath)) {
+    try {
+      fs.rmSync(sqlitePath);
+      console.log(`Removed SQLite database: ${sqlitePath}`);
+    } catch (e) {
+      console.error(`Failed to remove SQLite database: ${e}`);
+    }
+  } else {
+    console.log(`SQLite database does not exist: ${sqlitePath}`);
+  }
+
+  // Remove .omnikey directory
+  if (fs.existsSync(configDir)) {
+    try {
+      fs.rmSync(configDir, { recursive: true, force: true });
+      console.log(`Removed config directory: ${configDir}`);
+    } catch (e) {
+      console.error(`Failed to remove config directory: ${e}`);
+    }
+  } else {
+    console.log(`Config directory does not exist: ${configDir}`);
+  }
+}