@appkit/llamacpp-cli 1.11.0 → 1.12.1

package/src/commands/logs-all.ts

@@ -1,251 +0,0 @@
-import chalk from 'chalk';
-import Table from 'cli-table3';
-import { stateManager } from '../lib/state-manager';
-import { fileExists } from '../utils/file-utils';
-import {
-  getFileSize,
-  formatFileSize,
-  getArchivedLogInfo,
-  clearLogFile,
-  rotateLogFile,
-  deleteArchivedLogs,
-} from '../utils/log-utils';
-
-interface LogsAllOptions {
-  clear?: boolean;
-  clearArchived?: boolean;
-  clearAll?: boolean;
-  rotate?: boolean;
-}
-
-export async function logsAllCommand(options: LogsAllOptions): Promise<void> {
-  // Get all servers
-  const servers = await stateManager.getAllServers();
-
-  if (servers.length === 0) {
-    console.log(chalk.yellow('⚠️  No servers found'));
-    console.log(chalk.dim('\nCreate a server: llamacpp server create <model-filename>'));
-    return;
-  }
-
-  // Handle batch operations
-  if (options.clear || options.clearArchived || options.clearAll || options.rotate) {
-    await handleBatchOperation(servers, options);
-    return;
-  }
-
-  // Show table of log information
-  await showLogsTable(servers);
-}
-
-async function showLogsTable(servers: any[]): Promise<void> {
-  const table = new Table({
-    head: [
-      chalk.bold('Server ID'),
-      chalk.bold('Current Stderr'),
-      chalk.bold('Current Stdout'),
-      chalk.bold('Archived'),
-      chalk.bold('Total'),
-    ],
-    colWidths: [30, 18, 18, 18, 18],
-  });
-
-  let totalCurrent = 0;
-  let totalArchived = 0;
-
-  for (const server of servers) {
-    // Get current log sizes
-    const stderrSize = (await fileExists(server.stderrPath))
-      ? await getFileSize(server.stderrPath)
-      : 0;
-    const stdoutSize = (await fileExists(server.stdoutPath))
-      ? await getFileSize(server.stdoutPath)
-      : 0;
-
-    // Get archived info
-    const archivedInfo = await getArchivedLogInfo(server.id);
-
-    const currentTotal = stderrSize + stdoutSize;
-    const total = currentTotal + archivedInfo.totalSize;
-
-    totalCurrent += currentTotal;
-    totalArchived += archivedInfo.totalSize;
-
-    table.push([
-      server.id,
-      formatFileSize(stderrSize),
-      formatFileSize(stdoutSize),
-      archivedInfo.count > 0
-        ? `${formatFileSize(archivedInfo.totalSize)} (${archivedInfo.count})`
-        : formatFileSize(0),
-      formatFileSize(total),
-    ]);
-  }
-
-  console.log(chalk.bold('\nServer Logs Overview:'));
-  console.log(table.toString());
-
-  console.log(chalk.dim('\nTotals:'));
-  console.log(chalk.dim(`  Current logs: ${formatFileSize(totalCurrent)}`));
-  console.log(chalk.dim(`  Archived logs: ${formatFileSize(totalArchived)}`));
-  console.log(chalk.dim(`  Grand total: ${formatFileSize(totalCurrent + totalArchived)}`));
-
-  console.log(chalk.dim('\nBatch operations:'));
-  console.log(chalk.dim('  llamacpp logs --clear           Clear all current logs'));
-  console.log(chalk.dim('  llamacpp logs --clear-archived  Delete only archived logs'));
-  console.log(chalk.dim('  llamacpp logs --clear-all       Clear current + delete archives'));
-  console.log(chalk.dim('  llamacpp logs --rotate          Rotate all logs with timestamps'));
-}
-
-async function handleBatchOperation(
-  servers: any[],
-  options: LogsAllOptions
-): Promise<void> {
-  if (options.clearArchived) {
-    console.log(chalk.blue('🗑️  Deleting archived logs for all servers...'));
-    console.log();
-
-    let totalFreed = 0;
-    let totalFiles = 0;
-    let serversProcessed = 0;
-
-    for (const server of servers) {
-      const archivedInfo = await deleteArchivedLogs(server.id);
-
-      if (archivedInfo.count > 0) {
-        console.log(chalk.dim(`  ${server.id}: ${formatFileSize(archivedInfo.totalSize)} (${archivedInfo.count} file${archivedInfo.count !== 1 ? 's' : ''})`));
-        totalFreed += archivedInfo.totalSize;
-        totalFiles += archivedInfo.count;
-        serversProcessed++;
-      }
-    }
-
-    console.log();
-    if (serversProcessed === 0) {
-      console.log(chalk.yellow('⚠️  No archived logs found'));
-      console.log(chalk.dim('   Archived logs are created via --rotate or automatic rotation'));
-    } else {
-      console.log(chalk.green(`✅ Deleted archived logs for ${serversProcessed} server${serversProcessed !== 1 ? 's' : ''}`));
-      console.log(chalk.dim(`   Files deleted: ${totalFiles}`));
-      console.log(chalk.dim(`   Total freed: ${formatFileSize(totalFreed)}`));
-      console.log(chalk.dim(`   Current logs preserved`));
-    }
-  } else if (options.clearAll) {
-    console.log(chalk.blue('🗑️  Clearing all logs (current + archived) for all servers...'));
-    console.log();
-
-    let totalFreed = 0;
-    let serversProcessed = 0;
-
-    for (const server of servers) {
-      let serverTotal = 0;
-
-      // Clear current stderr
-      if (await fileExists(server.stderrPath)) {
-        serverTotal += await getFileSize(server.stderrPath);
-        await clearLogFile(server.stderrPath);
-      }
-
-      // Clear current stdout
-      if (await fileExists(server.stdoutPath)) {
-        serverTotal += await getFileSize(server.stdoutPath);
-        await clearLogFile(server.stdoutPath);
-      }
-
-      // Delete archived logs
-      const archivedInfo = await deleteArchivedLogs(server.id);
-      serverTotal += archivedInfo.totalSize;
-
-      if (serverTotal > 0) {
-        console.log(chalk.dim(`  ${server.id}: ${formatFileSize(serverTotal)}`));
-        totalFreed += serverTotal;
-        serversProcessed++;
-      }
-    }
-
-    console.log();
-    console.log(chalk.green(`✅ Cleared all logs for ${serversProcessed} server${serversProcessed !== 1 ? 's' : ''}`));
-    console.log(chalk.dim(`   Total freed: ${formatFileSize(totalFreed)}`));
-  } else if (options.clear) {
-    console.log(chalk.blue('🗑️  Clearing current logs for all servers...'));
-    console.log();
-
-    let totalFreed = 0;
-    let serversProcessed = 0;
-
-    for (const server of servers) {
-      let serverTotal = 0;
-
-      // Clear current stderr
-      if (await fileExists(server.stderrPath)) {
-        serverTotal += await getFileSize(server.stderrPath);
-        await clearLogFile(server.stderrPath);
-      }
-
-      // Clear current stdout
-      if (await fileExists(server.stdoutPath)) {
-        serverTotal += await getFileSize(server.stdoutPath);
-        await clearLogFile(server.stdoutPath);
-      }
-
-      if (serverTotal > 0) {
-        console.log(chalk.dim(`  ${server.id}: ${formatFileSize(serverTotal)}`));
-        totalFreed += serverTotal;
-        serversProcessed++;
-      }
-    }
-
-    console.log();
-    console.log(chalk.green(`✅ Cleared current logs for ${serversProcessed} server${serversProcessed !== 1 ? 's' : ''}`));
-    console.log(chalk.dim(`   Total freed: ${formatFileSize(totalFreed)}`));
-    console.log(chalk.dim(`   Archived logs preserved`));
-  } else if (options.rotate) {
-    console.log(chalk.blue('🔄 Rotating logs for all servers...'));
-    console.log();
-
-    let totalRotated = 0;
-    let filesRotated = 0;
-
-    for (const server of servers) {
-      const rotatedFiles: string[] = [];
-
-      // Rotate stderr if it has content
-      if (await fileExists(server.stderrPath)) {
-        const size = await getFileSize(server.stderrPath);
-        if (size > 0) {
-          try {
-            const archivedPath = await rotateLogFile(server.stderrPath);
-            rotatedFiles.push(archivedPath);
-            totalRotated += size;
-            filesRotated++;
-          } catch {
-            // Ignore empty files
-          }
-        }
-      }
-
-      // Rotate stdout if it has content
-      if (await fileExists(server.stdoutPath)) {
-        const size = await getFileSize(server.stdoutPath);
-        if (size > 0) {
-          try {
-            const archivedPath = await rotateLogFile(server.stdoutPath);
-            rotatedFiles.push(archivedPath);
-            totalRotated += size;
-            filesRotated++;
-          } catch {
-            // Ignore empty files
-          }
-        }
-      }
-
-      if (rotatedFiles.length > 0) {
-        console.log(chalk.dim(`  ${server.id}: ${rotatedFiles.length} file${rotatedFiles.length !== 1 ? 's' : ''}`));
-      }
-    }
-
-    console.log();
-    console.log(chalk.green(`✅ Rotated ${filesRotated} log file${filesRotated !== 1 ? 's' : ''}`));
-    console.log(chalk.dim(`   Total archived: ${formatFileSize(totalRotated)}`));
-  }
-}

package/src/commands/logs.ts

@@ -1,321 +0,0 @@
-import chalk from 'chalk';
-import { spawn } from 'child_process';
-import * as readline from 'readline';
-import * as fs from 'fs';
-import { stateManager } from '../lib/state-manager';
-import { fileExists } from '../utils/file-utils';
-import { execCommand } from '../utils/process-utils';
-import { logParser } from '../utils/log-parser';
-import {
-  getFileSize,
-  formatFileSize,
-  rotateLogFile,
-  clearLogFile,
-  getArchivedLogInfo,
-  deleteArchivedLogs,
-} from '../utils/log-utils';
-
-interface LogsOptions {
-  follow?: boolean;
-  lines?: number;
-  errors?: boolean;
-  verbose?: boolean;
-  http?: boolean;
-  stdout?: boolean;
-  filter?: string;
-  clear?: boolean;
-  rotate?: boolean;
-  clearArchived?: boolean;
-  clearAll?: boolean;
-}
-
-export async function logsCommand(identifier: string, options: LogsOptions): Promise<void> {
-  // Find server
-  const server = await stateManager.findServer(identifier);
-  if (!server) {
-    throw new Error(`Server not found: ${identifier}\n\nUse: llamacpp ps`);
-  }
-
-  // Determine log file (default to stderr where verbose logs go)
-  const logPath = options.stdout ? server.stdoutPath : server.stderrPath;
-  const logType = options.stdout ? 'stdout' : 'stderr';
-
-  // Handle --clear-archived option (deletes only archived logs)
-  if (options.clearArchived) {
-    const archivedInfo = await deleteArchivedLogs(server.id);
-
-    if (archivedInfo.count === 0) {
-      console.log(chalk.yellow(`⚠️  No archived logs found for ${server.modelName}`));
-      console.log(chalk.dim(`   Archived logs are created via --rotate or automatic rotation`));
-      return;
-    }
-
-    console.log(chalk.green(`✅ Deleted archived logs for ${server.modelName}`));
-    console.log(chalk.dim(`   Files deleted: ${archivedInfo.count}`));
-    console.log(chalk.dim(`   Space freed: ${formatFileSize(archivedInfo.totalSize)}`));
-    console.log(chalk.dim(`   Current logs preserved`));
-    return;
-  }
-
-  // Handle --clear-all option (clears both current and archived logs)
-  if (options.clearAll) {
-    let totalFreed = 0;
-    let currentSize = 0;
-    let archivedSize = 0;
-
-    // Clear current stderr
-    if (await fileExists(server.stderrPath)) {
-      currentSize += await getFileSize(server.stderrPath);
-      await clearLogFile(server.stderrPath);
-    }
-
-    // Clear current stdout
-    if (await fileExists(server.stdoutPath)) {
-      currentSize += await getFileSize(server.stdoutPath);
-      await clearLogFile(server.stdoutPath);
-    }
-
-    // Delete all archived logs
-    const archivedInfo = await deleteArchivedLogs(server.id);
-    archivedSize = archivedInfo.totalSize;
-
-    totalFreed = currentSize + archivedSize;
-
-    console.log(chalk.green(`✅ Cleared all logs for ${server.modelName}`));
-    if (currentSize > 0) {
-      console.log(chalk.dim(`   Current logs: ${formatFileSize(currentSize)}`));
-    }
-    if (archivedSize > 0) {
-      console.log(chalk.dim(`   Archived logs: ${formatFileSize(archivedSize)} (${archivedInfo.count} file${archivedInfo.count > 1 ? 's' : ''})`));
-    }
-    console.log(chalk.dim(`   Total freed: ${formatFileSize(totalFreed)}`));
-    return;
-  }
-
-  // Handle --clear option
-  if (options.clear) {
-    if (!(await fileExists(logPath))) {
-      console.log(chalk.yellow(`⚠️  No ${logType} found for ${server.modelName}`));
-      console.log(chalk.dim(`   Log file does not exist: ${logPath}`));
-      return;
-    }
-
-    const sizeBefore = await getFileSize(logPath);
-    await clearLogFile(logPath);
-
-    console.log(chalk.green(`✅ Cleared ${logType} for ${server.modelName}`));
-    console.log(chalk.dim(`   Freed: ${formatFileSize(sizeBefore)}`));
-    console.log(chalk.dim(`   ${logPath}`));
-    return;
-  }
-
-  // Handle --rotate option
-  if (options.rotate) {
-    if (!(await fileExists(logPath))) {
-      console.log(chalk.yellow(`⚠️  No ${logType} found for ${server.modelName}`));
-      console.log(chalk.dim(`   Log file does not exist: ${logPath}`));
-      return;
-    }
-
-    try {
-      const archivedPath = await rotateLogFile(logPath);
-      const size = await getFileSize(archivedPath);
-
-      console.log(chalk.green(`✅ Rotated ${logType} for ${server.modelName}`));
-      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;
-  }
-
-  // Check if log file exists
-  if (!(await fileExists(logPath))) {
-    console.log(chalk.yellow(`⚠️  No ${logType} found for ${server.modelName}`));
-    console.log(chalk.dim(`   Log file does not exist: ${logPath}`));
-    return;
-  }
-
-  // Determine filter pattern and mode
-  let filterPattern: string | null = null;
-  let filterDesc = '';
-  let useCompactMode = false;
-
-  if (options.verbose) {
-    // Show everything (no filter)
-    filterDesc = ' (all messages)';
-  } else if (options.errors) {
-    // Show only errors
-    filterPattern = 'error|Error|ERROR|failed|Failed|FAILED';
-    filterDesc = ' (errors only)';
-  } else if (options.http) {
-    // Full HTTP JSON logs
-    filterPattern = 'log_server_r';
-    filterDesc = ' (HTTP JSON)';
-  } else if (options.filter) {
-    // Custom filter
-    filterPattern = options.filter;
-    filterDesc = ` (filter: ${options.filter})`;
-  } else {
-    // Default: Compact one-liner format
-    filterPattern = 'log_server_r';
-    filterDesc = ' (compact)';
-    useCompactMode = true;
-  }
-
-  console.log(chalk.blue(`📋 Logs for ${server.modelName} (${logType}${filterDesc})`));
-  console.log(chalk.dim(`   ${logPath}`));
-
-  // Show log size information
-  const currentSize = await getFileSize(logPath);
-  const archivedInfo = await getArchivedLogInfo(server.id);
-
-  if (archivedInfo.count > 0) {
-    console.log(chalk.dim(`   Current: ${formatFileSize(currentSize)} | Archived: ${formatFileSize(archivedInfo.totalSize)} (${archivedInfo.count} file${archivedInfo.count > 1 ? 's' : ''})`));
-  } else {
-    console.log(chalk.dim(`   Current: ${formatFileSize(currentSize)}`));
-  }
-
-  // Show subtle note if verbose logging is not enabled
-  if (!server.verbose && !options.verbose && !options.errors && !options.http && !options.filter) {
-    console.log(chalk.dim(`   verbosity is disabled`));
-  }
-  console.log();
-
-  if (options.follow) {
-    // Follow logs in real-time with optional filtering
-    if (useCompactMode) {
-      // Compact mode with follow: parse lines in real-time
-      const tailProcess = spawn('tail', ['-f', logPath]);
-      const rl = readline.createInterface({
-        input: tailProcess.stdout,
-        crlfDelay: Infinity,
-      });
-
-      rl.on('line', (line) => {
-        if (line.includes('log_server_r')) {
-          logParser.processLine(line, (compactLine) => {
-            console.log(compactLine);
-          });
-        }
-      });
-
-      // Handle Ctrl+C gracefully
-      process.on('SIGINT', () => {
-        tailProcess.kill();
-        rl.close();
-        console.log();
-        process.exit(0);
-      });
-
-      tailProcess.on('exit', () => {
-        process.exit(0);
-      });
-    } else if (filterPattern) {
-      // Use tail piped to grep for filtering
-      const grepProcess = spawn('sh', ['-c', `tail -f "${logPath}" | grep --line-buffered -E "${filterPattern}"`], {
-        stdio: 'inherit',
-      });
-
-      // Handle Ctrl+C gracefully
-      process.on('SIGINT', () => {
-        grepProcess.kill();
-        console.log();
-        process.exit(0);
-      });
-
-      grepProcess.on('exit', () => {
-        process.exit(0);
-      });
-    } else {
-      // No filter, just tail
-      const tail = spawn('tail', ['-f', logPath], {
-        stdio: 'inherit',
-      });
-
-      process.on('SIGINT', () => {
-        tail.kill();
-        console.log();
-        process.exit(0);
-      });
-
-      tail.on('exit', () => {
-        process.exit(0);
-      });
-    }
-  } else {
-    // Show last N lines with optional filtering
-    const lines = options.lines || 50;
-
-    if (useCompactMode) {
-      // Compact mode: read file and parse
-      try {
-        // Use large multiplier to account for verbose debug output between requests
-        // Add || true to prevent grep from failing when no matches found
-        const command = `tail -n ${lines * 100} "${logPath}" | grep -E "log_server_r" || true`;
-        const output = await execCommand(command);
-        const logLines = output.split('\n').filter((l) => l.trim());
-
-        if (logLines.length === 0) {
-          console.log(chalk.dim('No HTTP request logs in compact format.'));
-          console.log(chalk.dim('The server may be starting up, or only simple GET requests have been made.'));
-          console.log(chalk.dim('\nTip: Use --http to see raw HTTP logs, or --verbose for all server logs.'));
-          return;
-        }
-
-        const compactLines: string[] = [];
-        for (const line of logLines) {
-          logParser.processLine(line, (compactLine) => {
-            compactLines.push(compactLine);
-          });
-        }
-
-        // Flush any remaining buffered logs (handles simple format)
-        logParser.flush((compactLine) => {
-          compactLines.push(compactLine);
-        });
-
-        // Check if we got any parsed output
-        if (compactLines.length === 0) {
-          console.log(chalk.dim('HTTP request logs found, but could not parse in compact format.'));
-          console.log(chalk.dim('This usually happens with simple GET requests (health checks, slots, etc.).'));
-          console.log(chalk.dim('\nTip: Use --http to see raw HTTP logs instead.'));
-          return;
-        }
-
-        // Show only the last N compact lines
-        const limitedLines = compactLines.slice(-lines);
-        limitedLines.forEach((line) => console.log(line));
-      } catch (error) {
-        throw new Error(`Failed to read logs: ${(error as Error).message}`);
-      }
-    } else {
-      // Regular filtering
-      try {
-        let command: string;
-
-        if (filterPattern) {
-          // Use tail piped to grep
-          // Add || true to prevent grep from failing when no matches found
-          command = `tail -n ${lines} "${logPath}" | grep -E "${filterPattern}" || true`;
-        } else {
-          // No filter
-          command = `tail -n ${lines} "${logPath}"`;
-        }
-
-        const output = await execCommand(command);
-
-        if (filterPattern && output.trim() === '') {
-          console.log(chalk.dim(`No logs matching pattern: ${filterPattern}`));
-          console.log(chalk.dim('\nTip: Try --verbose to see all logs, or adjust your filter pattern.'));
-          return;
-        }
-
-        console.log(output);
-      } catch (error) {
-        throw new Error(`Failed to read logs: ${(error as Error).message}`);
-      }
-    }
-  }
-}

package/src/commands/monitor.ts

@@ -1,110 +0,0 @@
-import chalk from 'chalk';
-import blessed from 'blessed';
-import { stateManager } from '../lib/state-manager.js';
-import { createMonitorUI } from '../tui/MonitorApp.js';
-import { createMultiServerMonitorUI } from '../tui/MultiServerMonitorApp.js';
-
-export async function monitorCommand(identifier?: string): Promise<void> {
-  // Initialize state manager
-  await stateManager.initialize();
-
-  // Get all servers
-  const allServers = await stateManager.getAllServers();
-  if (allServers.length === 0) {
-    throw new Error(
-      `No servers configured.\n\n` +
-        `Create a server first: llamacpp server create <model>`
-    );
-  }
-
-  // Create blessed screen
-  const screen = blessed.screen({
-    smartCSR: true,
-    title: 'llama.cpp Server Monitor',
-  });
-
-  // Determine which UI to launch
-  if (identifier) {
-    // User specified a server - single server mode
-    const server = await stateManager.findServer(identifier);
-    if (!server) {
-      screen.destroy();
-      throw new Error(
-        `Server not found: ${identifier}\n\n` +
-          `Use: llamacpp ps (to list servers)\n` +
-          `Or create a new server: llamacpp server create <model>`
-      );
-    }
-
-    // Update server status to reflect actual launchctl state
-    const { statusChecker } = await import('../lib/status-checker.js');
-    const status = await statusChecker.checkServer(server);
-    server.status = status.isRunning ? 'running' : 'stopped';
-    server.pid = status.pid || undefined;
-
-    // Check if server is running
-    if (server.status !== 'running') {
-      screen.destroy();
-      throw new Error(
-        `Server ${server.modelName} is not running.\n\n` +
-          `Start it first: llamacpp server start ${server.id}`
-      );
-    }
-
-    // Launch single-server TUI
-    await createMonitorUI(screen, server);
-  } else if (allServers.length === 1) {
-    // Only one server - single server mode
-    const server = allServers[0];
-
-    // Update server status to reflect actual launchctl state
-    const { statusChecker } = await import('../lib/status-checker.js');
-    const status = await statusChecker.checkServer(server);
-    server.status = status.isRunning ? 'running' : 'stopped';
-    server.pid = status.pid || undefined;
-
-    // Check if server is running
-    if (server.status !== 'running') {
-      screen.destroy();
-      throw new Error(
-        `Server ${server.modelName} is not running.\n\n` +
-          `Start it first: llamacpp server start ${server.id}`
-      );
-    }
-
-    // Launch single-server TUI
-    await createMonitorUI(screen, server);
-  } else {
-    // Multiple servers - multi-server mode
-    // Update all server statuses to reflect actual launchctl state
-    const { statusChecker } = await import('../lib/status-checker.js');
-    for (const server of allServers) {
-      const status = await statusChecker.checkServer(server);
-      server.status = status.isRunning ? 'running' : 'stopped';
-      server.pid = status.pid || undefined;
-    }
-
-    // Filter to only running servers for monitoring
-    const runningServers = allServers.filter(s => s.status === 'running');
-
-    if (runningServers.length === 0) {
-      screen.destroy();
-      throw new Error(
-        `No servers are currently running.\n\n` +
-          `Start a server first:\n` +
-          allServers
-            .map((s) => `  llamacpp server start ${s.id}  # ${s.modelName}`)
-            .join('\n')
-      );
-    }
-
-    // Launch multi-server TUI (pass all servers so we can see stopped ones too)
-    await createMultiServerMonitorUI(screen, allServers);
-  }
-
-  // Render the screen
-  screen.render();
-
-  // Note: TUI functions handle their own key events and exit directly
-  // The process will stay alive until user presses Q/Ctrl+C
-}