omnikey-cli 1.0.16 → 1.0.18

package/src/removeConfig.ts

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { execSync } from 'child_process';
+import { execSync, execFileSync } from 'child_process';
 import { isWindows, getHomeDir, getConfigDir, readConfig } from './utils';
 
 export function killLaunchdAgent() {
@@ -20,28 +20,38 @@ export function killLaunchdAgent() {
 }
 
 export function killWindowsTask() {
-  const taskName = 'OmnikeyDaemon';
-  try {
-    execSync(`schtasks /end /tn "${taskName}"`, { stdio: 'pipe' });
-  } catch {
-    // Task may not be running — that's fine
-  }
+  const serviceName = 'OmnikeyDaemon';
+
+  // Try NSSM first (current implementation)
+  let nssmPath: string | null = null;
   try {
-    execSync(`schtasks /delete /tn "${taskName}" /f`, { stdio: 'pipe' });
-    console.log(`Removed Windows Task Scheduler task: ${taskName}`);
-  } catch {
-    console.log(`Windows Task Scheduler task does not exist: ${taskName}`);
-  }
+    nssmPath = execSync('where nssm', { stdio: 'pipe' }).toString().trim().split('\n')[0].trim();
+  } catch { /* NSSM not installed */ }
 
-  // Also remove the wrapper script
-  const wrapperPath = path.join(getConfigDir(), 'start-daemon.cmd');
-  if (fs.existsSync(wrapperPath)) {
+  if (nssmPath) {
+    try { execFileSync(nssmPath, ['stop', serviceName], { stdio: 'pipe' }); } catch { /* not running */ }
+    try {
+      execFileSync(nssmPath, ['remove', serviceName, 'confirm'], { stdio: 'pipe' });
+      console.log(`Removed NSSM service: ${serviceName}`);
+    } catch {
+      console.log(`NSSM service does not exist: ${serviceName}`);
+    }
+  } else {
+    // Fallback: remove legacy Task Scheduler task from previous installs
+    try { execSync(`schtasks /end /tn "${serviceName}"`, { stdio: 'pipe' }); } catch { /* not running */ }
     try {
-      fs.rmSync(wrapperPath);
+      execSync(`schtasks /delete /tn "${serviceName}" /f`, { stdio: 'pipe' });
+      console.log(`Removed Windows Task Scheduler task: ${serviceName}`);
     } catch {
-      // Ignore
+      console.log(`Windows Task Scheduler task does not exist: ${serviceName}`);
     }
   }
+
+  // Remove legacy wrapper script if present
+  const wrapperPath = path.join(getConfigDir(), 'start-daemon.cmd');
+  if (fs.existsSync(wrapperPath)) {
+    try { fs.rmSync(wrapperPath); } catch { /* ignore */ }
+  }
 }
 
 /**
@@ -111,13 +121,21 @@ export function removeConfigAndDb(includeDb = false) {
     console.log('Skipping SQLite database removal (use --db to remove it).');
   }
 
-  // Remove .omnikey directory
+  // Remove all files/folders inside .omnikey except the SQLite database
   if (fs.existsSync(configDir)) {
     try {
-      fs.rmSync(configDir, { recursive: true, force: true });
-      console.log(`Removed config directory: ${configDir}`);
+      const entries = fs.readdirSync(configDir);
+      for (const entry of entries) {
+        if (entry.endsWith('.sqlite')) {
+          continue;
+        }
+        const entryPath = path.join(configDir, entry);
+        fs.rmSync(entryPath, { recursive: true, force: true });
+        console.log(`Removed: ${entryPath}`);
+      }
+      console.log(`Cleared config directory (SQLite preserved): ${configDir}`);
     } catch (e) {
-      console.error(`Failed to remove config directory: ${e}`);
+      console.error(`Failed to clear config directory: ${e}`);
     }
   } else {
     console.log(`Config directory does not exist: ${configDir}`);

package/src/setConfig.ts

@@ -0,0 +1,16 @@
+import fs from 'fs';
+import { readConfig, getConfigPath, getConfigDir } from './utils';
+
+export function setConfig(key: string, value: string) {
+  const configDir = getConfigDir();
+  const configPath = getConfigPath();
+
+  if (!fs.existsSync(configDir)) {
+    fs.mkdirSync(configDir, { recursive: true });
+  }
+
+  const config = readConfig();
+  config[key] = value;
+  fs.writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf-8');
+  console.log(`Set ${key} in ${configPath}`);
+}

package/src/showConfig.ts

@@ -0,0 +1,47 @@
+import fs from 'fs';
+import { readConfig, getConfigPath, getConfigDir } from './utils';
+
+const API_KEY_FIELDS = [
+  'OPENAI_API_KEY',
+  'ANTHROPIC_API_KEY',
+  'GEMINI_API_KEY',
+  'SERPER_API_KEY',
+  'BRAVE_SEARCH_API_KEY',
+  'TAVILY_API_KEY',
+];
+
+function maskSecret(value: string): string {
+  if (value.length <= 8) return '****';
+  return value.slice(0, 4) + '****' + value.slice(-4);
+}
+
+export function showConfig() {
+  const configPath = getConfigPath();
+  const configDir = getConfigDir();
+
+  if (!fs.existsSync(configPath)) {
+    console.log('No configuration found. Run `omnikey onboard` to get started.');
+    return;
+  }
+
+  const config = readConfig();
+  const keys = Object.keys(config);
+
+  if (keys.length === 0) {
+    console.log('Configuration file exists but is empty.');
+    return;
+  }
+
+  console.log(`Config file: ${configPath}\n`);
+  console.log('Current configuration:');
+  console.log('─'.repeat(50));
+
+  for (const key of keys) {
+    const raw = String(config[key]);
+    const display = API_KEY_FIELDS.includes(key) ? maskSecret(raw) : raw;
+    console.log(`  ${key}: ${display}`);
+  }
+
+  console.log('─'.repeat(50));
+  console.log(`\nConfig directory: ${configDir}`);
+}