@appkit/llamacpp-cli 1.11.0 → 1.12.1

package/src/lib/history-manager.ts

@@ -1,172 +0,0 @@
-import { mkdir, readFile, writeFile, access, rename } from 'fs/promises';
-import { join } from 'path';
-import { homedir } from 'os';
-import { ServerMetrics, SystemMetrics } from '../types/monitor-types.js';
-import { HistoryData, HistorySnapshot, TIME_WINDOW_HOURS, TimeWindow } from '../types/history-types.js';
-
-export class HistoryManager {
-  private serverId: string;
-  private historyDir: string;
-  private historyPath: string;
-  private readonly MAX_AGE_MS = 24 * 60 * 60 * 1000; // 24 hours
-
-  constructor(serverId: string) {
-    this.serverId = serverId;
-    this.historyDir = join(homedir(), '.llamacpp', 'history');
-    this.historyPath = join(this.historyDir, `${serverId}.json`);
-  }
-
-  /**
-   * Append a new snapshot to history (with auto-pruning)
-   */
-  async appendSnapshot(serverMetrics: ServerMetrics, systemMetrics?: SystemMetrics): Promise<void> {
-    try {
-      // Ensure history directory exists
-      await mkdir(this.historyDir, { recursive: true });
-
-      // Load existing history
-      const historyData = await this.loadHistoryData();
-
-      // Create new snapshot
-      const snapshot: HistorySnapshot = {
-        timestamp: Date.now(),
-        server: {
-          healthy: serverMetrics.healthy,
-          uptime: serverMetrics.uptime,
-          activeSlots: serverMetrics.activeSlots,
-          idleSlots: serverMetrics.idleSlots,
-          totalSlots: serverMetrics.totalSlots,
-          avgPromptSpeed: serverMetrics.avgPromptSpeed,
-          avgGenerateSpeed: serverMetrics.avgGenerateSpeed,
-          processMemory: serverMetrics.processMemory,
-          processCpuUsage: serverMetrics.processCpuUsage,
-        },
-        system: systemMetrics ? {
-          gpuUsage: systemMetrics.gpuUsage,
-          cpuUsage: systemMetrics.cpuUsage,
-          aneUsage: systemMetrics.aneUsage,
-          temperature: systemMetrics.temperature,
-          memoryUsed: systemMetrics.memoryUsed,
-          memoryTotal: systemMetrics.memoryTotal,
-        } : undefined,
-      };
-
-      // Append new snapshot
-      historyData.snapshots.push(snapshot);
-
-      // Prune old snapshots (keep only last 24h)
-      historyData.snapshots = this.pruneOldSnapshots(historyData.snapshots, this.MAX_AGE_MS);
-
-      // Atomic write: write to temp file in same directory, then rename
-      // This prevents read collisions during concurrent access
-      // IMPORTANT: temp file MUST be in same directory as destination for rename to work across filesystems
-      const tempPath = join(this.historyDir, `.${this.serverId}-${Date.now()}.tmp`);
-      await writeFile(tempPath, JSON.stringify(historyData, null, 2), 'utf-8');
-      await rename(tempPath, this.historyPath);
-    } catch (error) {
-      // Silent failure - don't interrupt monitoring
-      // Don't throw - just return silently to avoid polluting console
-      return;
-    }
-  }
-
-  /**
-   * Load all snapshots within specified time window
-   */
-  async loadHistory(windowHours: number): Promise<HistorySnapshot[]> {
-    // Retry logic for file I/O collisions during concurrent read/write
-    const maxRetries = 3;
-    let lastError: Error | null = null;
-
-    for (let attempt = 0; attempt < maxRetries; attempt++) {
-      try {
-        const historyData = await this.loadHistoryData();
-        return this.filterByTimeWindow(historyData.snapshots, windowHours);
-      } catch (error) {
-        lastError = error as Error;
-        // Wait briefly before retry (exponential backoff)
-        if (attempt < maxRetries - 1) {
-          await new Promise(resolve => setTimeout(resolve, 50 * Math.pow(2, attempt)));
-        }
-      }
-    }
-
-    // All retries failed - throw error so it can be handled upstream
-    throw new Error(`Failed to load history after ${maxRetries} attempts: ${lastError?.message || 'Unknown error'}`);
-  }
-
-  /**
-   * Load history for specific time window type
-   */
-  async loadHistoryByWindow(window: TimeWindow): Promise<HistorySnapshot[]> {
-    return this.loadHistory(TIME_WINDOW_HOURS[window]);
-  }
-
-  /**
-   * Get file path for server history
-   */
-  getHistoryPath(): string {
-    return this.historyPath;
-  }
-
-  /**
-   * Check if history file exists
-   */
-  async hasHistory(): Promise<boolean> {
-    try {
-      await access(this.historyPath);
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  /**
-   * Clear all history for server
-   */
-  async clearHistory(): Promise<void> {
-    const emptyHistory: HistoryData = {
-      serverId: this.serverId,
-      snapshots: [],
-    };
-
-    await mkdir(this.historyDir, { recursive: true });
-
-    // Atomic write - temp file in same directory as destination
-    const tempPath = join(this.historyDir, `.${this.serverId}-${Date.now()}.tmp`);
-    await writeFile(tempPath, JSON.stringify(emptyHistory, null, 2), 'utf-8');
-    await rename(tempPath, this.historyPath);
-  }
-
-  /**
-   * Load full history data from file
-   */
-  private async loadHistoryData(): Promise<HistoryData> {
-    try {
-      const content = await readFile(this.historyPath, 'utf-8');
-      return JSON.parse(content) as HistoryData;
-    } catch (error) {
-      // File doesn't exist or is corrupted, return empty history
-      return {
-        serverId: this.serverId,
-        snapshots: [],
-      };
-    }
-  }
-
-  /**
-   * Prune snapshots older than maxAge
-   */
-  private pruneOldSnapshots(snapshots: HistorySnapshot[], maxAgeMs: number): HistorySnapshot[] {
-    const cutoff = Date.now() - maxAgeMs;
-    return snapshots.filter(s => s.timestamp >= cutoff);
-  }
-
-  /**
-   * Filter snapshots by time window
-   */
-  private filterByTimeWindow(snapshots: HistorySnapshot[], windowHours: number): HistorySnapshot[] {
-    const cutoff = Date.now() - (windowHours * 60 * 60 * 1000);
-    return snapshots.filter(s => s.timestamp >= cutoff);
-  }
-}

package/src/lib/launchctl-manager.ts

@@ -1,225 +0,0 @@
-import * as path from 'path';
-import * as fs from 'fs/promises';
-import { ServerConfig } from '../types/server-config';
-import { execCommand, execAsync } from '../utils/process-utils';
-import { writeFileAtomic, fileExists } from '../utils/file-utils';
-
-export interface ServiceStatus {
-  isRunning: boolean;
-  pid: number | null;
-  exitCode: number | null;
-  lastExitReason?: string;
-}
-
-export class LaunchctlManager {
-  /**
-   * Generate plist XML content for a server
-   */
-  generatePlist(config: ServerConfig): string {
-    // Build program arguments array
-    const args = [
-      '/opt/homebrew/bin/llama-server',
-      '--model', config.modelPath,
-      '--host', config.host,
-      '--port', config.port.toString(),
-      '--threads', config.threads.toString(),
-      '--ctx-size', config.ctxSize.toString(),
-      '--gpu-layers', config.gpuLayers.toString(),
-    ];
-
-    // Add flags
-    if (config.embeddings) args.push('--embeddings');
-    if (config.jinja) args.push('--jinja');
-
-    // Conditionally enable verbose HTTP logging for detailed request/response info
-    if (config.verbose) {
-      args.push('--log-verbose');
-    }
-
-    // Add custom flags
-    if (config.customFlags && config.customFlags.length > 0) {
-      args.push(...config.customFlags);
-    }
-
-    // Generate XML array elements
-    const argsXml = args.map(arg => `      <string>${arg}</string>`).join('\n');
-
-    return `<?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>${config.label}</string>
-
-    <key>ProgramArguments</key>
-    <array>
-${argsXml}
-    </array>
-
-    <key>RunAtLoad</key>
-    <false/>
-
-    <key>KeepAlive</key>
-    <dict>
-      <key>Crashed</key>
-      <true/>
-      <key>SuccessfulExit</key>
-      <false/>
-    </dict>
-
-    <key>StandardOutPath</key>
-    <string>${config.stdoutPath}</string>
-
-    <key>StandardErrorPath</key>
-    <string>${config.stderrPath}</string>
-
-    <key>WorkingDirectory</key>
-    <string>/tmp</string>
-
-    <key>ThrottleInterval</key>
-    <integer>10</integer>
-  </dict>
-</plist>
-`;
-  }
-
-  /**
-   * Create and write plist file
-   */
-  async createPlist(config: ServerConfig): Promise<void> {
-    const plistContent = this.generatePlist(config);
-    await writeFileAtomic(config.plistPath, plistContent);
-  }
-
-  /**
-   * Delete plist file
-   */
-  async deletePlist(plistPath: string): Promise<void> {
-    if (await fileExists(plistPath)) {
-      await fs.unlink(plistPath);
-    }
-  }
-
-  /**
-   * Load service (register with launchctl)
-   */
-  async loadService(plistPath: string): Promise<void> {
-    await execCommand(`launchctl load "${plistPath}"`);
-  }
-
-  /**
-   * Unload service (unregister from launchctl)
-   */
-  async unloadService(plistPath: string): Promise<void> {
-    try {
-      await execCommand(`launchctl unload "${plistPath}"`);
-    } catch (error) {
-      // Ignore errors if service is not loaded
-    }
-  }
-
-  /**
-   * Start service
-   */
-  async startService(label: string): Promise<void> {
-    await execCommand(`launchctl start ${label}`);
-  }
-
-  /**
-   * Stop service
-   */
-  async stopService(label: string): Promise<void> {
-    await execCommand(`launchctl stop ${label}`);
-  }
-
-  /**
-   * Get service status from launchctl
-   */
-  async getServiceStatus(label: string): Promise<ServiceStatus> {
-    try {
-      const { stdout } = await execAsync(`launchctl list | grep ${label}`);
-      const lines = stdout.trim().split('\n');
-
-      for (const line of lines) {
-        const parts = line.split(/\s+/);
-        if (parts.length >= 3) {
-          const pidStr = parts[0].trim();
-          const exitCodeStr = parts[1].trim();
-          const serviceLabel = parts[2].trim();
-
-          // Match the exact label
-          if (serviceLabel === label) {
-            const pid = pidStr !== '-' ? parseInt(pidStr, 10) : null;
-            const exitCode = exitCodeStr !== '-' ? parseInt(exitCodeStr, 10) : null;
-            const isRunning = pid !== null;
-
-            return {
-              isRunning,
-              pid,
-              exitCode,
-              lastExitReason: this.interpretExitCode(exitCode),
-            };
-          }
-        }
-      }
-
-      // Service not found
-      return {
-        isRunning: false,
-        pid: null,
-        exitCode: null,
-      };
-    } catch (error) {
-      // Service not found or not loaded
-      return {
-        isRunning: false,
-        pid: null,
-        exitCode: null,
-      };
-    }
-  }
-
-  /**
-   * Interpret exit code to human-readable reason
-   */
-  private interpretExitCode(code: number | null): string | undefined {
-    if (code === null || code === 0) return undefined;
-    if (code === -9) return 'Force killed (SIGKILL)';
-    if (code === -15) return 'Terminated (SIGTERM)';
-    return `Exit code: ${code}`;
-  }
-
-  /**
-   * Wait for service to start (with timeout)
-   */
-  async waitForServiceStart(label: string, timeoutMs = 5000): Promise<boolean> {
-    const startTime = Date.now();
-    while (Date.now() - startTime < timeoutMs) {
-      const status = await this.getServiceStatus(label);
-      if (status.isRunning) {
-        return true;
-      }
-      await new Promise((resolve) => setTimeout(resolve, 500));
-    }
-    return false;
-  }
-
-  /**
-   * Wait for service to stop (with timeout)
-   */
-  async waitForServiceStop(label: string, timeoutMs = 5000): Promise<boolean> {
-    const startTime = Date.now();
-    while (Date.now() - startTime < timeoutMs) {
-      const status = await this.getServiceStatus(label);
-      if (!status.isRunning) {
-        return true;
-      }
-      await new Promise((resolve) => setTimeout(resolve, 500));
-    }
-    return false;
-  }
-}
-
-// Export singleton instance
-export const launchctlManager = new LaunchctlManager();

package/src/lib/metrics-aggregator.ts

@@ -1,257 +0,0 @@
-import { ServerConfig } from '../types/server-config.js';
-import { ServerMetrics, SlotInfo, MonitorData } from '../types/monitor-types.js';
-import { statusChecker } from './status-checker.js';
-import { systemCollector } from './system-collector.js';
-import { getProcessMemory, getProcessCpu } from '../utils/process-utils.js';
-
-/**
- * Aggregates metrics from llama.cpp server API endpoints
- * Combines server health, slot status, and model properties
- */
-export class MetricsAggregator {
-  private serverUrl: string;
-  private timeout: number;
-  private previousSlots: Map<number, { n_decoded: number; timestamp: number }> = new Map();
-
-  constructor(server: ServerConfig, timeout: number = 5000) {
-    // Handle null host (legacy configs) by defaulting to 127.0.0.1
-    const host = server.host || '127.0.0.1';
-    this.serverUrl = `http://${host}:${server.port}`;
-    this.timeout = timeout;
-  }
-
-  /**
-   * Fetch data from llama.cpp API with timeout
-   */
-  private async fetchWithTimeout(
-    endpoint: string,
-    customTimeout?: number
-  ): Promise<any | null> {
-    try {
-      const controller = new AbortController();
-      const timeoutMs = customTimeout ?? this.timeout;
-      const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
-
-      const response = await fetch(`${this.serverUrl}${endpoint}`, {
-        signal: controller.signal,
-      });
-
-      clearTimeout(timeoutId);
-
-      if (!response.ok) {
-        return null;
-      }
-
-      return await response.json();
-    } catch (err) {
-      // Network error, timeout, or parse error
-      return null;
-    }
-  }
-
-  /**
-   * Get server health status
-   */
-  private async getHealth(): Promise<boolean> {
-    const health = await this.fetchWithTimeout('/health');
-    return health !== null && health.status === 'ok';
-  }
-
-  /**
-   * Get server properties (model info, context size, etc.)
-   */
-  private async getProps(): Promise<any> {
-    return await this.fetchWithTimeout('/props');
-  }
-
-  /**
-   * Get active slots information with calculated tok/s
-   */
-  private async getSlots(): Promise<SlotInfo[]> {
-    const data = await this.fetchWithTimeout('/slots');
-    if (!data || !Array.isArray(data)) {
-      return [];
-    }
-
-    const now = Date.now();
-
-    return data.map((slot: any) => {
-      const slotId = slot.id;
-      const n_decoded = slot.next_token?.[0]?.n_decoded || 0;
-      const isProcessing = slot.is_processing;
-
-      // Calculate tokens per second by comparing with previous poll
-      let predicted_per_second: number | undefined;
-
-      if (isProcessing && n_decoded > 0) {
-        const previous = this.previousSlots.get(slotId);
-
-        if (previous && previous.n_decoded < n_decoded) {
-          const tokensGenerated = n_decoded - previous.n_decoded;
-          const timeElapsed = (now - previous.timestamp) / 1000; // Convert to seconds
-
-          if (timeElapsed > 0) {
-            predicted_per_second = tokensGenerated / timeElapsed;
-          }
-        }
-
-        // Store current state for next comparison
-        this.previousSlots.set(slotId, { n_decoded, timestamp: now });
-      } else if (!isProcessing) {
-        // Clear history when slot becomes idle
-        this.previousSlots.delete(slotId);
-      }
-
-      return {
-        id: slotId,
-        state: isProcessing ? 'processing' : 'idle',
-        n_prompt_tokens: slot.n_prompt_tokens,
-        n_decoded,
-        n_ctx: slot.n_ctx || 0,
-        timings: predicted_per_second
-          ? {
-              prompt_n: 0,
-              prompt_ms: 0,
-              prompt_per_token_ms: 0,
-              prompt_per_second: 0,
-              predicted_n: n_decoded,
-              predicted_ms: 0,
-              predicted_per_token_ms: 0,
-              predicted_per_second,
-            }
-          : undefined,
-      };
-    });
-  }
-
-  /**
-   * Aggregate all server metrics
-   * @param server - Server configuration
-   * @param processMemory - Optional pre-fetched process memory (for batch collection)
-   * @param processCpuUsage - Optional pre-fetched process CPU usage (for batch collection)
-   */
-  async collectServerMetrics(
-    server: ServerConfig,
-    processMemory?: number | null,
-    processCpuUsage?: number | null
-  ): Promise<ServerMetrics> {
-    const now = Date.now();
-
-    // Check basic server status first
-    const status = await statusChecker.checkServer(server);
-
-    // Calculate uptime if server is running and has lastStarted
-    let uptime: string | undefined;
-    if (status.isRunning && server.lastStarted) {
-      const startTime = new Date(server.lastStarted).getTime();
-      const uptimeSeconds = Math.floor((now - startTime) / 1000);
-      const hours = Math.floor(uptimeSeconds / 3600);
-      const minutes = Math.floor((uptimeSeconds % 3600) / 60);
-      const seconds = uptimeSeconds % 60;
-      uptime = `${hours}h ${minutes}m ${seconds}s`;
-    }
-
-    // If server not running, return minimal data
-    if (!status.isRunning) {
-      return {
-        server,
-        healthy: false,
-        modelLoaded: false,
-        modelName: server.modelName,
-        contextSize: server.ctxSize,
-        totalSlots: 0,
-        activeSlots: 0,
-        idleSlots: 0,
-        slots: [],
-        timestamp: now,
-        stale: false,
-      };
-    }
-
-    // Fetch detailed metrics in parallel
-    // If processMemory/CPU were pre-fetched (batch mode), use them; otherwise fetch individually
-    const [healthy, props, slots, fetchedMemory, fetchedCpu] = await Promise.all([
-      this.getHealth(),
-      this.getProps(),
-      this.getSlots(),
-      processMemory !== undefined
-        ? Promise.resolve(processMemory)
-        : (server.pid ? getProcessMemory(server.pid) : Promise.resolve(null)),
-      processCpuUsage !== undefined
-        ? Promise.resolve(processCpuUsage)
-        : (server.pid ? getProcessCpu(server.pid) : Promise.resolve(null)),
-    ]);
-
-    // Calculate slot statistics
-    const activeSlots = slots.filter((s) => s.state === 'processing').length;
-    const idleSlots = slots.filter((s) => s.state === 'idle').length;
-    const totalSlots = props?.total_slots || slots.length;
-
-    // Calculate average speeds (only from processing slots)
-    const processingSlots = slots.filter((s) => s.state === 'processing' && s.timings);
-
-    const avgPromptSpeed =
-      processingSlots.length > 0
-        ? processingSlots.reduce(
-            (sum, s) => sum + (s.timings?.prompt_per_second || 0),
-            0
-          ) / processingSlots.length
-        : undefined;
-
-    const avgGenerateSpeed =
-      processingSlots.length > 0
-        ? processingSlots.reduce(
-            (sum, s) => sum + (s.timings?.predicted_per_second || 0),
-            0
-          ) / processingSlots.length
-        : undefined;
-
-    // Calculate total memory (CPU + Metal GPU memory if available)
-    let totalMemory = fetchedMemory ?? undefined;
-    if (totalMemory !== undefined && server.metalMemoryMB) {
-      // Add Metal memory (convert MB to bytes)
-      totalMemory += server.metalMemoryMB * 1024 * 1024;
-    }
-
-    return {
-      server,
-      healthy,
-      uptime,
-      modelLoaded: props !== null,
-      modelName: server.modelName,
-      contextSize: props?.default_generation_settings?.n_ctx || server.ctxSize,
-      totalSlots,
-      activeSlots,
-      idleSlots,
-      slots,
-      avgPromptSpeed,
-      avgGenerateSpeed,
-      processMemory: totalMemory,
-      processCpuUsage: fetchedCpu ?? undefined,
-      timestamp: now,
-      stale: false,
-    };
-  }
-
-  /**
-   * Collect complete monitoring data (server + system metrics)
-   */
-  async collectMonitorData(
-    server: ServerConfig,
-    updateInterval: number = 2000
-  ): Promise<MonitorData> {
-    // Collect server and system metrics in parallel
-    const [serverMetrics, systemMetrics] = await Promise.all([
-      this.collectServerMetrics(server),
-      systemCollector.collectSystemMetrics(),
-    ]);
-
-    return {
-      server: serverMetrics,
-      system: systemMetrics,
-      lastUpdated: new Date(),
-      updateInterval,
-      consecutiveFailures: 0,
-    };
-  }
-}