@appkit/llamacpp-cli 1.11.0 → 1.12.1

package/src/commands/ps.ts

@@ -1,84 +0,0 @@
-import chalk from 'chalk';
-import Table from 'cli-table3';
-import { stateManager } from '../lib/state-manager.js';
-import { statusChecker } from '../lib/status-checker.js';
-import { formatUptime, formatBytes } from '../utils/format-utils.js';
-import { getProcessMemory } from '../utils/process-utils.js';
-import { ServerConfig } from '../types/server-config.js';
-
-const STATUS_CONFIG = {
-  running: { text: '✅ RUNNING', color: chalk.green },
-  crashed: { text: '❌ CRASHED', color: chalk.red },
-  stopped: { text: '⚠️  STOPPED', color: chalk.yellow },
-} as const;
-
-async function getServerMemory(server: ServerConfig): Promise<string> {
-  if (server.status !== 'running' || !server.pid) {
-    return '-';
-  }
-
-  const cpuMemoryBytes = await getProcessMemory(server.pid);
-  if (cpuMemoryBytes === null) {
-    return '-';
-  }
-
-  const metalMemoryBytes = server.metalMemoryMB ? server.metalMemoryMB * 1024 * 1024 : 0;
-  return formatBytes(cpuMemoryBytes + metalMemoryBytes);
-}
-
-export async function psCommand(): Promise<void> {
-  const servers = await stateManager.getAllServers();
-
-  if (servers.length === 0) {
-    console.log(chalk.yellow('No servers configured.'));
-    console.log(chalk.dim('\nCreate a server: llamacpp server create <model-filename>'));
-    return;
-  }
-
-  console.log(chalk.dim('Checking server statuses...\n'));
-  const serversWithStatus = await statusChecker.updateAllServerStatuses();
-
-  const table = new Table({
-    head: ['SERVER ID', 'MODEL', 'PORT', 'STATUS', 'PID', 'MEMORY', 'UPTIME'],
-  });
-
-  const counts = { running: 0, stopped: 0, crashed: 0 };
-
-  for (const server of serversWithStatus) {
-    const status = server.status || 'stopped';
-    const config = STATUS_CONFIG[status] || STATUS_CONFIG.stopped;
-    counts[status]++;
-
-    const uptime = server.status === 'running' && server.lastStarted
-      ? formatUptime(server.lastStarted)
-      : '-';
-
-    const memoryText = await getServerMemory(server);
-
-    table.push([
-      server.id,
-      server.modelName,
-      server.port.toString(),
-      config.color(config.text),
-      server.pid?.toString() || '-',
-      memoryText,
-      uptime,
-    ]);
-  }
-
-  console.log(table.toString());
-
-  const summary = [
-    chalk.green(`${counts.running} running`),
-    chalk.yellow(`${counts.stopped} stopped`),
-  ];
-  if (counts.crashed > 0) {
-    summary.push(chalk.red(`${counts.crashed} crashed`));
-  }
-
-  console.log(chalk.dim(`\nTotal: ${servers.length} servers (${summary.join(', ')})`));
-
-  if (counts.crashed > 0) {
-    console.log(chalk.red('\n⚠️  Some servers have crashed. Check logs with: llamacpp server logs <id> --errors'));
-  }
-}

package/src/commands/pull.ts

@@ -1,44 +0,0 @@
-import chalk from 'chalk';
-import { modelDownloader } from '../lib/model-downloader';
-import { ensureModelsDirectory } from '../lib/models-dir-setup';
-
-interface PullOptions {
-  file?: string;
-}
-
-export async function pullCommand(identifier: string, options: PullOptions): Promise<void> {
-  // Parse repository identifier
-  const parsed = modelDownloader.parseHFIdentifier(identifier);
-
-  // Determine filename - from --file flag or from identifier path
-  let filename = options.file || parsed.file;
-
-  if (!filename) {
-    throw new Error(
-      'Please specify a file to download:\n\n' +
-      'Option 1: llamacpp pull owner/repo/filename.gguf\n' +
-      'Option 2: llamacpp pull owner/repo --file filename.gguf'
-    );
-  }
-
-  // Ensure filename ends with .gguf
-  if (!filename.toLowerCase().endsWith('.gguf')) {
-    filename += '.gguf';
-  }
-
-  // Ensure models directory exists (prompts user if needed)
-  const modelsDir = await ensureModelsDirectory();
-
-  // Download the model
-  try {
-    const modelPath = await modelDownloader.downloadModel(parsed.repo, filename, undefined, modelsDir);
-
-    console.log();
-    console.log(chalk.dim(`Create server: llamacpp server create ${filename}`));
-  } catch (error) {
-    if ((error as Error).message.includes('interrupted')) {
-      console.log(chalk.dim('\nDownload was interrupted. Run the same command again to retry.'));
-    }
-    throw error;
-  }
-}

package/src/commands/rm.ts

@@ -1,107 +0,0 @@
-import chalk from 'chalk';
-import * as readline from 'readline';
-import * as fs from 'fs/promises';
-import { modelScanner } from '../lib/model-scanner';
-import { stateManager } from '../lib/state-manager';
-import { launchctlManager } from '../lib/launchctl-manager';
-
-export async function rmCommand(modelIdentifier: string): Promise<void> {
-  await stateManager.initialize();
-
-  // 1. Resolve model path
-  const modelPath = await modelScanner.resolveModelPath(modelIdentifier);
-  if (!modelPath) {
-    throw new Error(`Model not found: ${modelIdentifier}\n\nRun: llamacpp ls`);
-  }
-
-  // 2. Check if any servers are using this model
-  const allServers = await stateManager.getAllServers();
-  const serversUsingModel = allServers.filter((s) => s.modelPath === modelPath);
-
-  // 3. Confirm deletion
-  console.log(chalk.yellow(`⚠️  Delete model file: ${modelPath}`));
-
-  if (serversUsingModel.length > 0) {
-    console.log(chalk.yellow(`\n   This model has ${serversUsingModel.length} server(s) configured:`));
-    for (const server of serversUsingModel) {
-      const statusColor = server.status === 'running' ? chalk.green : chalk.dim;
-      console.log(chalk.yellow(`   - ${server.id} (${statusColor(server.status)})`));
-    }
-    console.log(chalk.yellow(`\n   These servers will be removed before deleting the model.`));
-  }
-
-  console.log();
-
-  const confirmed = await confirmDeletion();
-  if (!confirmed) {
-    console.log(chalk.dim('Cancelled'));
-    return;
-  }
-
-  console.log();
-
-  // 4. Delete all servers using this model
-  if (serversUsingModel.length > 0) {
-    console.log(chalk.blue(`🗑️  Removing ${serversUsingModel.length} server(s)...\n`));
-
-    for (const server of serversUsingModel) {
-      console.log(chalk.dim(`  Removing server: ${server.id}`));
-
-      // Unload service (stops and removes from launchd)
-      try {
-        await launchctlManager.unloadService(server.plistPath);
-        if (server.status === 'running') {
-          await launchctlManager.waitForServiceStop(server.label, 5000);
-        }
-      } catch (error) {
-        console.log(chalk.yellow(`    ⚠️  Failed to unload service gracefully`));
-      }
-
-      // Delete plist
-      await launchctlManager.deletePlist(server.plistPath);
-
-      // Delete server config
-      await stateManager.deleteServerConfig(server.id);
-
-      console.log(chalk.dim(`    ✓ Server removed`));
-    }
-
-    console.log();
-  }
-
-  // 5. Delete model file
-  console.log(chalk.blue(`🗑️  Deleting model file...`));
-
-  try {
-    await fs.unlink(modelPath);
-  } catch (error) {
-    throw new Error(`Failed to delete model file: ${(error as Error).message}`);
-  }
-
-  // Success
-  console.log();
-  console.log(chalk.green('✅ Model deleted successfully'));
-
-  if (serversUsingModel.length > 0) {
-    console.log(chalk.dim(`   Removed ${serversUsingModel.length} server(s)`));
-  }
-
-  console.log(chalk.dim(`   Deleted: ${modelPath}`));
-}
-
-/**
- * Prompt user for confirmation
- */
-function confirmDeletion(): Promise<boolean> {
-  return new Promise((resolve) => {
-    const rl = readline.createInterface({
-      input: process.stdin,
-      output: process.stdout,
-    });
-
-    rl.question(chalk.yellow("   Type 'yes' to confirm: "), (answer) => {
-      rl.close();
-      resolve(answer.toLowerCase() === 'yes');
-    });
-  });
-}

package/src/commands/router/config.ts

@@ -1,116 +0,0 @@
-import chalk from 'chalk';
-import { routerManager } from '../../lib/router-manager';
-
-interface ConfigOptions {
-  port?: number;
-  host?: string;
-  timeout?: number;
-  healthInterval?: number;
-  verbose?: boolean;
-  restart?: boolean;
-}
-
-export async function routerConfigCommand(options: ConfigOptions): Promise<void> {
-  try {
-    // Check if router exists
-    const config = await routerManager.loadConfig();
-    if (!config) {
-      throw new Error('Router configuration not found. Use "llamacpp router start" to create it.');
-    }
-
-    // Check if any options were provided
-    const hasOptions = options.port || options.host || options.timeout || options.healthInterval || options.verbose !== undefined;
-    if (!hasOptions) {
-      throw new Error('No configuration options provided. Use --port, --host, --timeout, --health-interval, or --verbose');
-    }
-
-    const isRunning = config.status === 'running';
-
-    // Warn if running and no restart flag
-    if (isRunning && !options.restart) {
-      console.log(chalk.yellow('⚠️  Router is running. Changes will take effect after restart.'));
-      console.log(chalk.dim('   Use --restart flag to apply changes immediately.\n'));
-    }
-
-    // Prepare updates
-    const updates: any = {};
-    const changes: string[] = [];
-
-    if (options.port !== undefined) {
-      changes.push(`Port: ${config.port} → ${options.port}`);
-      updates.port = options.port;
-    }
-
-    if (options.host !== undefined) {
-      changes.push(`Host: ${config.host} → ${options.host}`);
-      updates.host = options.host;
-    }
-
-    if (options.timeout !== undefined) {
-      changes.push(`Request Timeout: ${config.requestTimeout}ms → ${options.timeout}ms`);
-      updates.requestTimeout = options.timeout;
-    }
-
-    if (options.healthInterval !== undefined) {
-      changes.push(`Health Check Interval: ${config.healthCheckInterval}ms → ${options.healthInterval}ms`);
-      updates.healthCheckInterval = options.healthInterval;
-    }
-
-    if (options.verbose !== undefined) {
-      const verboseStr = (val: boolean) => val ? 'enabled' : 'disabled';
-      changes.push(`Verbose Logging: ${verboseStr(config.verbose)} → ${verboseStr(options.verbose)}`);
-      updates.verbose = options.verbose;
-    }
-
-    // Display changes
-    console.log(chalk.blue('📝 Configuration changes:'));
-    console.log();
-    changes.forEach(change => {
-      console.log(chalk.dim(`  ${change}`));
-    });
-    console.log();
-
-    // Apply changes
-    if (isRunning && options.restart) {
-      console.log(chalk.blue('⏹️  Stopping router...'));
-      await routerManager.stop();
-    }
-
-    // Update config
-    await routerManager.updateConfig(updates);
-
-    // Regenerate plist if port or host changed
-    if (options.port !== undefined || options.host !== undefined) {
-      const updatedConfig = await routerManager.loadConfig();
-      if (updatedConfig) {
-        await routerManager.createPlist(updatedConfig);
-      }
-    }
-
-    // Restart if requested
-    if (isRunning && options.restart) {
-      console.log(chalk.blue('▶️  Starting router...'));
-      await routerManager.start();
-
-      const finalConfig = await routerManager.loadConfig();
-      console.log();
-      console.log(chalk.green('✅ Router restarted with new configuration'));
-      console.log();
-      console.log(chalk.dim(`Endpoint: http://${finalConfig?.host}:${finalConfig?.port}`));
-    } else {
-      console.log(chalk.green('✅ Configuration updated'));
-
-      if (isRunning) {
-        console.log();
-        console.log(chalk.yellow('⚠️  Restart required to apply changes:'));
-        console.log(chalk.dim('   llamacpp router restart'));
-      } else {
-        console.log();
-        console.log(chalk.dim('Start router to use new configuration:'));
-        console.log(chalk.dim('  llamacpp router start'));
-      }
-    }
-  } catch (error) {
-    throw new Error(`Failed to update router configuration: ${(error as Error).message}`);
-  }
-}

package/src/commands/router/logs.ts

@@ -1,256 +0,0 @@
-import chalk from 'chalk';
-import { spawn } from 'child_process';
-import * as readline from 'readline';
-import * as fs from 'fs';
-import { routerManager } from '../../lib/router-manager';
-import { fileExists } from '../../utils/file-utils';
-import {
-  getFileSize,
-  formatFileSize,
-  rotateLogFile,
-  clearLogFile,
-} from '../../utils/log-utils';
-
-interface RouterLogsOptions {
-  follow?: boolean;
-  lines?: number;
-  stderr?: boolean;  // View system logs (stderr) instead of activity logs (stdout)
-  verbose?: boolean;
-  clear?: boolean;
-  rotate?: boolean;
-  clearAll?: boolean;
-}
-
-export async function routerLogsCommand(options: RouterLogsOptions): Promise<void> {
-  // Load router config
-  const config = await routerManager.loadConfig();
-  if (!config) {
-    throw new Error('Router configuration not found. Use "llamacpp router start" to create it.');
-  }
-
-  // Determine log file (default to stdout for activity logs, stderr for system logs)
-  const logPath = options.stderr ? config.stderrPath : config.stdoutPath;
-  const logType = options.stderr ? 'system' : 'activity';
-
-  // Also check for verbose JSON log file if --verbose flag is used
-  const verboseLogPath = '/Users/dweaver/.llamacpp/logs/router.log';
-  const useVerboseLog = options.verbose && (await fileExists(verboseLogPath));
-
-  // Handle --clear-all option (clears both stderr and stdout)
-  if (options.clearAll) {
-    let totalFreed = 0;
-
-    // Clear stderr
-    if (await fileExists(config.stderrPath)) {
-      totalFreed += await getFileSize(config.stderrPath);
-      await clearLogFile(config.stderrPath);
-    }
-
-    // Clear stdout
-    if (await fileExists(config.stdoutPath)) {
-      totalFreed += await getFileSize(config.stdoutPath);
-      await clearLogFile(config.stdoutPath);
-    }
-
-    // Clear verbose log file
-    if (await fileExists(verboseLogPath)) {
-      totalFreed += await getFileSize(verboseLogPath);
-      await clearLogFile(verboseLogPath);
-    }
-
-    console.log(chalk.green('✅ Cleared all router logs'));
-    console.log(chalk.dim(`   Total freed: ${formatFileSize(totalFreed)}`));
-    return;
-  }
-
-  // Handle --clear option
-  if (options.clear) {
-    const targetPath = useVerboseLog ? verboseLogPath : logPath;
-
-    if (!(await fileExists(targetPath))) {
-      console.log(chalk.yellow(`⚠️  No ${useVerboseLog ? 'verbose log' : logType} found for router`));
-      console.log(chalk.dim(`   Log file does not exist: ${targetPath}`));
-      return;
-    }
-
-    const sizeBefore = await getFileSize(targetPath);
-    await clearLogFile(targetPath);
-
-    console.log(chalk.green(`✅ Cleared router ${useVerboseLog ? 'verbose log' : logType}`));
-    console.log(chalk.dim(`   Freed: ${formatFileSize(sizeBefore)}`));
-    console.log(chalk.dim(`   ${targetPath}`));
-    return;
-  }
-
-  // Handle --rotate option
-  if (options.rotate) {
-    const targetPath = useVerboseLog ? verboseLogPath : logPath;
-
-    if (!(await fileExists(targetPath))) {
-      console.log(chalk.yellow(`⚠️  No ${useVerboseLog ? 'verbose log' : logType} found for router`));
-      console.log(chalk.dim(`   Log file does not exist: ${targetPath}`));
-      return;
-    }
-
-    try {
-      const archivedPath = await rotateLogFile(targetPath);
-      const size = await getFileSize(archivedPath);
-
-      console.log(chalk.green(`✅ Rotated router ${useVerboseLog ? 'verbose log' : logType}`));
-      console.log(chalk.dim(`   Archived: ${formatFileSize(size)}`));
-      console.log(chalk.dim(`   → ${archivedPath}`));
-    } catch (error) {
-      throw new Error(`Failed to rotate log: ${(error as Error).message}`);
-    }
-    return;
-  }
-
-  // Determine which log to display
-  const displayPath = useVerboseLog ? verboseLogPath : logPath;
-  const displayType = useVerboseLog ? 'verbose JSON log' : logType;
-
-  // Check if log file exists
-  if (!(await fileExists(displayPath))) {
-    console.log(chalk.yellow(`⚠️  No ${displayType} found for router`));
-    console.log(chalk.dim(`   Log file does not exist: ${displayPath}`));
-
-    if (useVerboseLog) {
-      console.log();
-      console.log(chalk.dim('   Verbose logging is disabled. Enable with:'));
-      console.log(chalk.dim('   llamacpp router config --verbose true --restart'));
-    }
-    return;
-  }
-
-  console.log(chalk.blue(`📋 Router logs (${displayType})`));
-  console.log(chalk.dim(`   ${displayPath}`));
-
-  // Show log size information
-  const currentSize = await getFileSize(displayPath);
-  console.log(chalk.dim(`   Size: ${formatFileSize(currentSize)}`));
-
-  if (!useVerboseLog && config.verbose) {
-    console.log(chalk.dim(`   Verbose logging is enabled (use --verbose to view JSON log)`));
-  } else if (!useVerboseLog && !config.verbose) {
-    console.log(chalk.dim(`   Verbose logging is disabled`));
-  }
-
-  console.log();
-
-  if (options.follow) {
-    // Follow logs in real-time
-    if (useVerboseLog) {
-      // Pretty-print JSON logs
-      const tailProcess = spawn('tail', ['-f', displayPath]);
-      const rl = readline.createInterface({
-        input: tailProcess.stdout,
-        crlfDelay: Infinity,
-      });
-
-      rl.on('line', (line) => {
-        try {
-          const entry = JSON.parse(line);
-          // Format timestamp
-          const timestamp = new Date(entry.timestamp).toLocaleTimeString();
-          // Color code status
-          const statusColor = entry.status === 'success' ? chalk.green : chalk.red;
-
-          console.log(
-            chalk.dim(`[${timestamp}]`),
-            statusColor(entry.statusCode),
-            entry.method,
-            entry.endpoint,
-            '→',
-            chalk.cyan(entry.model),
-            chalk.dim(`(${entry.backend || 'N/A'})`),
-            chalk.yellow(`${entry.durationMs}ms`)
-          );
-          if (entry.prompt) {
-            console.log(chalk.dim(`  Prompt: "${entry.prompt}"`));
-          }
-          if (entry.error) {
-            console.log(chalk.red(`  Error: ${entry.error}`));
-          }
-        } catch {
-          // Not JSON, just print raw line
-          console.log(line);
-        }
-      });
-
-      tailProcess.on('close', () => {
-        process.exit(0);
-      });
-
-      // Handle Ctrl+C gracefully
-      process.on('SIGINT', () => {
-        tailProcess.kill();
-        process.exit(0);
-      });
-    } else {
-      // Standard tail for stderr/stdout
-      const tailProcess = spawn('tail', ['-f', displayPath]);
-      tailProcess.stdout.pipe(process.stdout);
-      tailProcess.stderr.pipe(process.stderr);
-
-      tailProcess.on('close', () => {
-        process.exit(0);
-      });
-
-      // Handle Ctrl+C gracefully
-      process.on('SIGINT', () => {
-        tailProcess.kill();
-        process.exit(0);
-      });
-    }
-  } else {
-    // Show last N lines (default 50)
-    const linesToShow = options.lines || 50;
-
-    if (useVerboseLog) {
-      // Pretty-print JSON logs
-      const lines = fs.readFileSync(displayPath, 'utf-8')
-        .split('\n')
-        .filter(line => line.trim())
-        .slice(-linesToShow);
-
-      for (const line of lines) {
-        try {
-          const entry = JSON.parse(line);
-          // Format timestamp
-          const timestamp = new Date(entry.timestamp).toLocaleTimeString();
-          // Color code status
-          const statusColor = entry.status === 'success' ? chalk.green : chalk.red;
-
-          console.log(
-            chalk.dim(`[${timestamp}]`),
-            statusColor(entry.statusCode),
-            entry.method,
-            entry.endpoint,
-            '→',
-            chalk.cyan(entry.model),
-            chalk.dim(`(${entry.backend || 'N/A'})`),
-            chalk.yellow(`${entry.durationMs}ms`)
-          );
-          if (entry.prompt) {
-            console.log(chalk.dim(`  Prompt: "${entry.prompt}"`));
-          }
-          if (entry.error) {
-            console.log(chalk.red(`  Error: ${entry.error}`));
-          }
-        } catch {
-          // Not JSON, just print raw line
-          console.log(line);
-        }
-      }
-    } else {
-      // Standard tail for stderr/stdout
-      const { execSync } = require('child_process');
-      try {
-        const output = execSync(`tail -n ${linesToShow} "${displayPath}"`, { encoding: 'utf-8' });
-        process.stdout.write(output);
-      } catch (error) {
-        throw new Error(`Failed to read log file: ${(error as Error).message}`);
-      }
-    }
-  }
-}

package/src/commands/router/restart.ts

@@ -1,36 +0,0 @@
-import chalk from 'chalk';
-import { routerManager } from '../../lib/router-manager';
-
-export async function routerRestartCommand(): Promise<void> {
-  console.log(chalk.blue('🔄 Restarting router...'));
-
-  try {
-    // Check if router exists
-    const config = await routerManager.loadConfig();
-    if (!config) {
-      throw new Error('Router configuration not found. Use "llamacpp router start" to create it.');
-    }
-
-    // Restart router
-    await routerManager.restart();
-
-    // Get updated config
-    const updatedConfig = await routerManager.loadConfig();
-    if (!updatedConfig) {
-      throw new Error('Failed to load router configuration after restart');
-    }
-
-    // Display success
-    console.log();
-    console.log(chalk.green('✅ Router restarted successfully!'));
-    console.log();
-    console.log(chalk.dim(`Endpoint: http://${updatedConfig.host}:${updatedConfig.port}`));
-    console.log();
-    console.log(chalk.dim('Quick commands:'));
-    console.log(chalk.dim('  Status: llamacpp router status'));
-    console.log(chalk.dim('  Stop:   llamacpp router stop'));
-    console.log(chalk.dim(`  Logs:   tail -f ${updatedConfig.stderrPath}`));
-  } catch (error) {
-    throw new Error(`Failed to restart router: ${(error as Error).message}`);
-  }
-}