@appkit/llamacpp-cli 1.11.0 → 1.12.0

package/src/commands/admin/config.ts

@@ -0,0 +1,121 @@
+import chalk from 'chalk';
+import { adminManager } from '../../lib/admin-manager';
+
+interface ConfigOptions {
+  port?: number;
+  host?: string;
+  regenerateKey?: boolean;
+  verbose?: boolean;
+  restart?: boolean;
+}
+
+export async function adminConfigCommand(options: ConfigOptions): Promise<void> {
+  try {
+    const result = await adminManager.getStatus();
+
+    if (!result) {
+      console.error(chalk.red('✗ Admin service is not configured'));
+      console.log(chalk.gray('\nRun: llamacpp admin start'));
+      process.exit(1);
+    }
+
+    const { config, status } = result;
+
+    // Check if any options were provided
+    const hasChanges = options.port || options.host || options.regenerateKey !== undefined || options.verbose !== undefined;
+    if (!hasChanges) {
+      console.error(chalk.red('✗ No configuration options provided'));
+      console.log(chalk.gray('\nAvailable options:'));
+      console.log(chalk.gray('  --port <port>         Change port'));
+      console.log(chalk.gray('  --host <host>         Change host'));
+      console.log(chalk.gray('  --regenerate-key      Generate new API key'));
+      console.log(chalk.gray('  --verbose             Enable verbose logging'));
+      console.log(chalk.gray('  --restart             Restart after config change'));
+      process.exit(1);
+    }
+
+    // Display what will change
+    console.log(chalk.bold('Configuration Changes:'));
+    console.log();
+
+    const updates: Partial<typeof config> = {};
+
+    if (options.port !== undefined) {
+      console.log(chalk.bold('  Port:    '), chalk.gray(config.port.toString()), chalk.gray('→'), chalk.cyan(options.port.toString()));
+      updates.port = options.port;
+    }
+
+    if (options.host !== undefined) {
+      console.log(chalk.bold('  Host:    '), chalk.gray(config.host), chalk.gray('→'), chalk.cyan(options.host));
+      updates.host = options.host;
+
+      // Warn if binding to non-localhost
+      if (options.host !== '127.0.0.1' && options.host !== 'localhost') {
+        console.log();
+        console.log(chalk.yellow('  ⚠ Warning: Binding to non-localhost address exposes admin API to network'));
+        console.log(chalk.yellow('  ⚠ Ensure your firewall is properly configured'));
+      }
+    }
+
+    if (options.verbose !== undefined) {
+      console.log(chalk.bold('  Verbose: '), chalk.gray(config.verbose ? 'enabled' : 'disabled'), chalk.gray('→'), chalk.cyan(options.verbose ? 'enabled' : 'disabled'));
+      updates.verbose = options.verbose;
+    }
+
+    let newApiKey: string | undefined;
+    if (options.regenerateKey) {
+      newApiKey = await adminManager.regenerateApiKey();
+      console.log(chalk.bold('  API Key: '), chalk.gray('*********************'), chalk.gray('→'), chalk.yellow(newApiKey));
+    }
+
+    console.log();
+
+    // Check if restart is needed
+    const isRunning = status.isRunning;
+    const needsRestart = isRunning && (options.port !== undefined || options.host !== undefined);
+
+    if (needsRestart && !options.restart) {
+      console.log(chalk.yellow('⚠ Admin service is running. Changes require restart.'));
+      console.log(chalk.gray('  Add --restart flag to restart automatically\n'));
+    }
+
+    // Apply changes
+    if (Object.keys(updates).length > 0) {
+      await adminManager.updateConfig(updates);
+    }
+
+    // Restart if requested and needed
+    if (options.restart && needsRestart) {
+      console.log(chalk.blue('🔄 Restarting admin service...\n'));
+
+      // Regenerate plist with new config
+      const updatedConfig = await adminManager.loadConfig();
+      if (updatedConfig) {
+        await adminManager.createPlist(updatedConfig);
+      }
+
+      await adminManager.restart();
+
+      console.log(chalk.green('✓ Admin service restarted successfully'));
+    } else {
+      console.log(chalk.green('✓ Configuration updated'));
+
+      if (needsRestart && !options.restart) {
+        console.log(chalk.gray('\nRestart with: llamacpp admin restart'));
+      }
+    }
+
+    console.log();
+
+    // Show new API key prominently if regenerated
+    if (newApiKey) {
+      console.log(chalk.bold('New API Key:'), chalk.yellow(newApiKey));
+      console.log(chalk.gray('Store this key securely - it cannot be retrieved later'));
+      console.log();
+    }
+  } catch (error) {
+    console.error(chalk.red('✗ Failed to update admin configuration'));
+    console.error(chalk.gray((error as Error).message));
+    process.exit(1);
+  }
+}

package/src/commands/admin/logs.ts

@@ -0,0 +1,91 @@
+import chalk from 'chalk';
+import { spawn } from 'child_process';
+import * as fs from 'fs/promises';
+import { adminManager } from '../../lib/admin-manager';
+import { fileExists } from '../../utils/file-utils';
+
+interface LogsOptions {
+  stdout?: boolean;
+  stderr?: boolean;
+  follow?: boolean;
+  clear?: boolean;
+  lines?: number;
+}
+
+export async function adminLogsCommand(options: LogsOptions): Promise<void> {
+  try {
+    const result = await adminManager.getStatus();
+
+    if (!result) {
+      console.error(chalk.red('✗ Admin service is not configured'));
+      console.log(chalk.gray('\nRun: llamacpp admin start'));
+      process.exit(1);
+    }
+
+    const { config } = result;
+
+    // Default to stdout if neither specified
+    const showStdout = options.stdout || (!options.stdout && !options.stderr);
+    const showStderr = options.stderr || (!options.stdout && !options.stderr);
+
+    // Handle clear operation
+    if (options.clear) {
+      if (showStdout && (await fileExists(config.stdoutPath))) {
+        await fs.writeFile(config.stdoutPath, '');
+        console.log(chalk.green('✓ Cleared stdout log'));
+      }
+      if (showStderr && (await fileExists(config.stderrPath))) {
+        await fs.writeFile(config.stderrPath, '');
+        console.log(chalk.green('✓ Cleared stderr log'));
+      }
+      return;
+    }
+
+    // Determine which logs to show
+    const logPaths: string[] = [];
+    if (showStdout) logPaths.push(config.stdoutPath);
+    if (showStderr) logPaths.push(config.stderrPath);
+
+    // Check if log files exist
+    for (const logPath of logPaths) {
+      if (!(await fileExists(logPath))) {
+        console.log(chalk.yellow(`Log file does not exist: ${logPath}`));
+        console.log(chalk.gray('No logs available yet'));
+        return;
+      }
+    }
+
+    // Follow mode (tail -f)
+    if (options.follow) {
+      console.log(chalk.blue(`📋 Following admin logs (Ctrl+C to exit)\n`));
+
+      const tailArgs = ['-f', ...logPaths];
+      const tail = spawn('tail', tailArgs, { stdio: 'inherit' });
+
+      // Handle Ctrl+C gracefully
+      process.on('SIGINT', () => {
+        tail.kill();
+        console.log(chalk.gray('\n\nStopped following logs'));
+        process.exit(0);
+      });
+
+      tail.on('exit', (code) => {
+        process.exit(code || 0);
+      });
+    } else {
+      // Static mode (tail -n)
+      const lines = options.lines || 100;
+      const tailArgs = ['-n', lines.toString(), ...logPaths];
+
+      const tail = spawn('tail', tailArgs, { stdio: 'inherit' });
+
+      tail.on('exit', (code) => {
+        process.exit(code || 0);
+      });
+    }
+  } catch (error) {
+    console.error(chalk.red('✗ Failed to read admin logs'));
+    console.error(chalk.gray((error as Error).message));
+    process.exit(1);
+  }
+}

package/src/commands/admin/restart.ts

@@ -0,0 +1,26 @@
+import chalk from 'chalk';
+import { adminManager } from '../../lib/admin-manager';
+
+export async function adminRestartCommand(): Promise<void> {
+  try {
+    console.log(chalk.blue('🔄 Restarting admin service...\n'));
+
+    await adminManager.restart();
+
+    const result = await adminManager.getStatus();
+    if (!result) {
+      throw new Error('Failed to retrieve admin status after restart');
+    }
+
+    const { config, status } = result;
+
+    console.log(chalk.green('✓ Admin service restarted successfully\n'));
+    console.log(chalk.bold('  Endpoint:'), chalk.cyan(`http://${config.host}:${config.port}`));
+    console.log(chalk.bold('  PID:     '), status.pid);
+    console.log();
+  } catch (error) {
+    console.error(chalk.red('✗ Failed to restart admin service'));
+    console.error(chalk.gray((error as Error).message));
+    process.exit(1);
+  }
+}

package/src/commands/admin/start.ts

@@ -0,0 +1,27 @@
+import chalk from 'chalk';
+import { adminManager } from '../../lib/admin-manager';
+
+export async function adminStartCommand(): Promise<void> {
+  try {
+    console.log(chalk.blue('🚀 Starting admin service...\n'));
+
+    await adminManager.start();
+
+    const result = await adminManager.getStatus();
+    if (!result) {
+      throw new Error('Failed to retrieve admin status after start');
+    }
+
+    const { config, status } = result;
+
+    console.log(chalk.green('✓ Admin service started successfully\n'));
+    console.log(chalk.bold('  Endpoint:'), chalk.cyan(`http://${config.host}:${config.port}`));
+    console.log(chalk.bold('  API Key: '), chalk.yellow(config.apiKey), chalk.gray('(use for authentication)'));
+    console.log(chalk.bold('  PID:     '), status.pid);
+    console.log();
+  } catch (error) {
+    console.error(chalk.red('✗ Failed to start admin service'));
+    console.error(chalk.gray((error as Error).message));
+    process.exit(1);
+  }
+}

package/src/commands/admin/status.ts

@@ -0,0 +1,84 @@
+import chalk from 'chalk';
+import { adminManager } from '../../lib/admin-manager';
+
+function formatUptime(lastStarted: string): string {
+  const start = new Date(lastStarted).getTime();
+  const now = Date.now();
+  const uptimeSeconds = Math.floor((now - start) / 1000);
+
+  const hours = Math.floor(uptimeSeconds / 3600);
+  const minutes = Math.floor((uptimeSeconds % 3600) / 60);
+
+  if (hours > 0) {
+    return `${hours}h ${minutes}m`;
+  }
+  return `${minutes}m`;
+}
+
+export async function adminStatusCommand(): Promise<void> {
+  try {
+    const result = await adminManager.getStatus();
+
+    if (!result) {
+      console.log(chalk.yellow('Admin service is not configured'));
+      console.log(chalk.gray('\nRun: llamacpp admin start'));
+      return;
+    }
+
+    const { config, status } = result;
+
+    console.log(chalk.bold.underline('Admin Service Status'));
+    console.log();
+
+    // Status
+    if (status.isRunning) {
+      console.log(chalk.bold('  Status:   '), chalk.green('● RUNNING'));
+      console.log(chalk.bold('  PID:      '), status.pid);
+      if (config.lastStarted) {
+        console.log(chalk.bold('  Uptime:   '), formatUptime(config.lastStarted));
+      }
+    } else {
+      console.log(chalk.bold('  Status:   '), chalk.gray('○ STOPPED'));
+      if (status.lastExitReason) {
+        console.log(chalk.bold('  Last Exit:'), chalk.yellow(status.lastExitReason));
+      }
+    }
+
+    console.log(chalk.bold('  Port:     '), config.port);
+    console.log(chalk.bold('  Host:     '), config.host);
+    console.log(chalk.bold('  API Key:  '), chalk.yellow(config.apiKey));
+    console.log();
+
+    // Endpoints
+    if (status.isRunning) {
+      console.log(chalk.bold('  Endpoints:'));
+      console.log(chalk.bold('    Health:  '), chalk.cyan(`GET  http://${config.host}:${config.port}/health`));
+      console.log(chalk.bold('    Servers: '), chalk.cyan(`GET  http://${config.host}:${config.port}/api/servers`));
+      console.log(chalk.bold('    Models:  '), chalk.cyan(`GET  http://${config.host}:${config.port}/api/models`));
+      console.log();
+    }
+
+    // Configuration
+    console.log(chalk.bold('  Configuration:'));
+    console.log(chalk.bold('    Config:  '), chalk.gray(config.plistPath.replace(process.env.HOME || '', '~')));
+    console.log(chalk.bold('    Plist:   '), chalk.gray(config.plistPath.replace(process.env.HOME || '', '~')));
+    console.log(chalk.bold('    Logs:    '), chalk.gray(config.stdoutPath.replace('.stdout', '.{stdout,stderr}').replace(process.env.HOME || '', '~')));
+    console.log();
+
+    // Quick commands
+    console.log(chalk.bold('  Quick Commands:'));
+    if (status.isRunning) {
+      console.log(chalk.bold('    Stop:    '), chalk.gray('llamacpp admin stop'));
+      console.log(chalk.bold('    Restart: '), chalk.gray('llamacpp admin restart'));
+      console.log(chalk.bold('    Logs:    '), chalk.gray('llamacpp admin logs --follow'));
+    } else {
+      console.log(chalk.bold('    Start:   '), chalk.gray('llamacpp admin start'));
+      console.log(chalk.bold('    Logs:    '), chalk.gray('llamacpp admin logs'));
+    }
+    console.log();
+  } catch (error) {
+    console.error(chalk.red('✗ Failed to get admin status'));
+    console.error(chalk.gray((error as Error).message));
+    process.exit(1);
+  }
+}

package/src/commands/admin/stop.ts

@@ -0,0 +1,16 @@
+import chalk from 'chalk';
+import { adminManager } from '../../lib/admin-manager';
+
+export async function adminStopCommand(): Promise<void> {
+  try {
+    console.log(chalk.blue('⏸  Stopping admin service...\n'));
+
+    await adminManager.stop();
+
+    console.log(chalk.green('✓ Admin service stopped successfully'));
+  } catch (error) {
+    console.error(chalk.red('✗ Failed to stop admin service'));
+    console.error(chalk.gray((error as Error).message));
+    process.exit(1);
+  }
+}

package/src/commands/logs.ts

@@ -27,6 +27,7 @@ interface LogsOptions {
   rotate?: boolean;
   clearArchived?: boolean;
   clearAll?: boolean;
+  includeHealth?: boolean;
 }
 
 export async function logsCommand(identifier: string, options: LogsOptions): Promise<void> {
@@ -142,6 +143,9 @@ export async function logsCommand(identifier: string, options: LogsOptions): Pro
   let filterDesc = '';
   let useCompactMode = false;
 
+  // Whether to include health check requests (filtered by default)
+  const includeHealth = options.includeHealth ?? false;
+
   if (options.verbose) {
     // Show everything (no filter)
     filterDesc = ' (all messages)';
@@ -195,7 +199,15 @@ export async function logsCommand(identifier: string, options: LogsOptions): Pro
 
       rl.on('line', (line) => {
         if (line.includes('log_server_r')) {
+          // Skip health check requests unless --include-health is set
+          if (!includeHealth && logParser.isHealthCheckRequest(line)) {
+            return;
+          }
           logParser.processLine(line, (compactLine) => {
+            // Double-check the parsed line for health checks (in case buffered)
+            if (!includeHealth && logParser.isHealthCheckRequest(compactLine)) {
+              return;
+            }
             console.log(compactLine);
           });
         }
@@ -266,13 +278,25 @@ export async function logsCommand(identifier: string, options: LogsOptions): Pro
 
         const compactLines: string[] = [];
         for (const line of logLines) {
+          // Skip health check requests unless --include-health is set
+          if (!includeHealth && logParser.isHealthCheckRequest(line)) {
+            continue;
+          }
           logParser.processLine(line, (compactLine) => {
+            // Double-check the parsed line for health checks (in case buffered)
+            if (!includeHealth && logParser.isHealthCheckRequest(compactLine)) {
+              return;
+            }
             compactLines.push(compactLine);
           });
         }
 
         // Flush any remaining buffered logs (handles simple format)
         logParser.flush((compactLine) => {
+          // Filter health checks from flushed lines too
+          if (!includeHealth && logParser.isHealthCheckRequest(compactLine)) {
+            return;
+          }
           compactLines.push(compactLine);
         });