@appkit/llamacpp-cli 2.0.0 → 2.1.0

package/dist/lib/label-migration.js

@@ -0,0 +1,458 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.labelMigration = exports.LabelMigration = void 0;
+const path = __importStar(require("path"));
+const fs = __importStar(require("fs/promises"));
+const chalk_1 = __importDefault(require("chalk"));
+const state_manager_1 = require("./state-manager");
+const router_manager_1 = require("./router-manager");
+const admin_manager_1 = require("./admin-manager");
+const launchctl_manager_1 = require("./launchctl-manager");
+const file_utils_1 = require("../utils/file-utils");
+const OLD_LABEL_PREFIX = 'com.llama.';
+const NEW_LABEL_PREFIX = 'studio.appkit.llamacpp-cli.';
+const MIGRATION_MARKER = '.label-migration-done';
+const BACKUP_FILE = '.migration-backup.json';
+class LabelMigration {
+    constructor() {
+        this.configDir = (0, file_utils_1.getConfigDir)();
+        this.launchAgentsDir = (0, file_utils_1.getLaunchAgentsDir)();
+        this.markerPath = path.join(this.configDir, MIGRATION_MARKER);
+        this.backupPath = path.join(this.configDir, BACKUP_FILE);
+    }
+    /**
+     * Check if migration is needed
+     */
+    async needsMigration() {
+        // If marker exists, migration already done
+        if (await (0, file_utils_1.fileExists)(this.markerPath)) {
+            return false;
+        }
+        // Check if any configs have old labels
+        const oldLabels = await this.detectOldLabels();
+        return oldLabels.length > 0;
+    }
+    /**
+     * Detect services with old labels
+     */
+    async detectOldLabels() {
+        const oldLabels = [];
+        // Check server configs
+        const servers = await state_manager_1.stateManager.getAllServers();
+        for (const server of servers) {
+            if (server.label.startsWith(OLD_LABEL_PREFIX)) {
+                oldLabels.push(server.label);
+            }
+        }
+        // Check router config
+        const routerStatus = await router_manager_1.routerManager.getStatus();
+        if (routerStatus?.config.label.startsWith(OLD_LABEL_PREFIX)) {
+            oldLabels.push(routerStatus.config.label);
+        }
+        // Check admin config
+        const adminStatus = await admin_manager_1.adminManager.getStatus();
+        if (adminStatus?.config.label.startsWith(OLD_LABEL_PREFIX)) {
+            oldLabels.push(adminStatus.config.label);
+        }
+        return oldLabels;
+    }
+    /**
+     * Create backup of current state
+     */
+    async createBackup() {
+        const servers = await state_manager_1.stateManager.getAllServers();
+        const routerStatus = await router_manager_1.routerManager.getStatus();
+        const adminStatus = await admin_manager_1.adminManager.getStatus();
+        // Detect running services
+        const runningServices = [];
+        for (const server of servers) {
+            const status = await launchctl_manager_1.launchctlManager.getServiceStatus(server.label);
+            if (status.isRunning) {
+                runningServices.push(server.label);
+            }
+        }
+        if (routerStatus?.status.isRunning) {
+            runningServices.push(routerStatus.config.label);
+        }
+        if (adminStatus?.status.isRunning) {
+            runningServices.push(adminStatus.config.label);
+        }
+        const backup = {
+            timestamp: new Date().toISOString(),
+            servers,
+            router: routerStatus?.config || null,
+            admin: adminStatus?.config || null,
+            runningServices,
+        };
+        await (0, file_utils_1.writeJsonAtomic)(this.backupPath, backup);
+    }
+    /**
+     * Migrate a single server
+     */
+    async migrateServer(server, wasRunning) {
+        // Stop if running
+        if (wasRunning) {
+            try {
+                await launchctl_manager_1.launchctlManager.unloadService(server.plistPath);
+                await launchctl_manager_1.launchctlManager.waitForServiceStop(server.label, 5000);
+            }
+            catch (error) {
+                // Service might already be stopped
+            }
+        }
+        // Delete old plist
+        try {
+            await fs.unlink(server.plistPath);
+        }
+        catch (error) {
+            // File might not exist
+        }
+        // Update config with new label
+        const newLabel = server.label.replace(OLD_LABEL_PREFIX, NEW_LABEL_PREFIX);
+        const newPlistPath = path.join(this.launchAgentsDir, `${newLabel}.plist`);
+        const updatedConfig = {
+            ...server,
+            label: newLabel,
+            plistPath: newPlistPath,
+        };
+        // Save updated config
+        await state_manager_1.stateManager.saveServerConfig(updatedConfig);
+        // Generate new plist
+        await launchctl_manager_1.launchctlManager.createPlist(updatedConfig);
+        // Restart if was running
+        if (wasRunning) {
+            await launchctl_manager_1.launchctlManager.loadService(newPlistPath);
+            await launchctl_manager_1.launchctlManager.startService(newLabel);
+            // Model servers need more time to load models into memory (15s vs 5s for router/admin)
+            const started = await launchctl_manager_1.launchctlManager.waitForServiceStart(newLabel, 15000);
+            if (!started) {
+                throw new Error(`Failed to start server ${server.id} after migration`);
+            }
+            // Update status in config
+            const status = await launchctl_manager_1.launchctlManager.getServiceStatus(newLabel);
+            await state_manager_1.stateManager.updateServerConfig(server.id, {
+                status: 'running',
+                pid: status.pid || undefined,
+            });
+        }
+    }
+    /**
+     * Migrate router service
+     */
+    async migrateRouter(wasRunning) {
+        const routerStatus = await router_manager_1.routerManager.getStatus();
+        if (!routerStatus)
+            return;
+        const router = routerStatus.config;
+        // Stop if running
+        if (wasRunning) {
+            try {
+                await router_manager_1.routerManager.unloadService(router.plistPath);
+                await router_manager_1.routerManager.waitForServiceStop(router.label, 5000);
+            }
+            catch (error) {
+                // Service might already be stopped
+            }
+        }
+        // Delete old plist
+        try {
+            await fs.unlink(router.plistPath);
+        }
+        catch (error) {
+            // File might not exist
+        }
+        // Update config with new label
+        const newLabel = 'studio.appkit.llamacpp-cli.router';
+        const newPlistPath = path.join(this.launchAgentsDir, `${newLabel}.plist`);
+        const updatedConfig = {
+            ...router,
+            label: newLabel,
+            plistPath: newPlistPath,
+        };
+        // Save updated config
+        await router_manager_1.routerManager.saveConfig(updatedConfig);
+        // Generate new plist
+        await router_manager_1.routerManager.createPlist(updatedConfig);
+        // Restart if was running
+        if (wasRunning) {
+            await router_manager_1.routerManager.loadService(newPlistPath);
+            await router_manager_1.routerManager.startService(newLabel);
+            const started = await router_manager_1.routerManager.waitForServiceStart(newLabel, 5000);
+            if (!started) {
+                throw new Error('Failed to start router after migration');
+            }
+            // Update status in config
+            const status = await router_manager_1.routerManager.getServiceStatus(newLabel);
+            await router_manager_1.routerManager.updateConfig({
+                status: 'running',
+                pid: status.pid || undefined,
+            });
+        }
+    }
+    /**
+     * Migrate admin service
+     */
+    async migrateAdmin(wasRunning) {
+        const adminStatus = await admin_manager_1.adminManager.getStatus();
+        if (!adminStatus)
+            return;
+        const admin = adminStatus.config;
+        // Stop if running
+        if (wasRunning) {
+            try {
+                await admin_manager_1.adminManager.unloadService(admin.plistPath);
+                await admin_manager_1.adminManager.waitForServiceStop(admin.label, 5000);
+            }
+            catch (error) {
+                // Service might already be stopped
+            }
+        }
+        // Delete old plist
+        try {
+            await fs.unlink(admin.plistPath);
+        }
+        catch (error) {
+            // File might not exist
+        }
+        // Update config with new label
+        const newLabel = 'studio.appkit.llamacpp-cli.admin';
+        const newPlistPath = path.join(this.launchAgentsDir, `${newLabel}.plist`);
+        const updatedConfig = {
+            ...admin,
+            label: newLabel,
+            plistPath: newPlistPath,
+        };
+        // Save updated config
+        await admin_manager_1.adminManager.saveConfig(updatedConfig);
+        // Generate new plist
+        await admin_manager_1.adminManager.createPlist(updatedConfig);
+        // Restart if was running
+        if (wasRunning) {
+            await admin_manager_1.adminManager.loadService(newPlistPath);
+            await admin_manager_1.adminManager.startService(newLabel);
+            const started = await admin_manager_1.adminManager.waitForServiceStart(newLabel, 5000);
+            if (!started) {
+                throw new Error('Failed to start admin service after migration');
+            }
+            // Update status in config
+            const status = await admin_manager_1.adminManager.getServiceStatus(newLabel);
+            await admin_manager_1.adminManager.updateConfig({
+                status: 'running',
+                pid: status.pid || undefined,
+            });
+        }
+    }
+    /**
+     * Migrate all services
+     */
+    async migrateAll(onProgress) {
+        const failedServices = [];
+        try {
+            // Create backup
+            onProgress?.('Creating backup...', 0, 1);
+            await this.createBackup();
+            // Load backup to get running services
+            const backup = await (0, file_utils_1.readJson)(this.backupPath);
+            // Count total services to migrate
+            const totalServices = backup.servers.length +
+                (backup.router ? 1 : 0) +
+                (backup.admin ? 1 : 0);
+            let current = 0;
+            // Migrate servers
+            for (const server of backup.servers) {
+                try {
+                    const wasRunning = backup.runningServices.includes(server.label);
+                    onProgress?.(`Migrating server: ${server.id}`, ++current, totalServices);
+                    await this.migrateServer(server, wasRunning);
+                }
+                catch (error) {
+                    failedServices.push(server.label);
+                    console.error(chalk_1.default.red(`Failed to migrate server ${server.id}:`), error);
+                }
+            }
+            // Migrate router
+            if (backup.router) {
+                try {
+                    const wasRunning = backup.runningServices.includes(backup.router.label);
+                    onProgress?.('Migrating router', ++current, totalServices);
+                    await this.migrateRouter(wasRunning);
+                }
+                catch (error) {
+                    failedServices.push(backup.router.label);
+                    console.error(chalk_1.default.red('Failed to migrate router:'), error);
+                }
+            }
+            // Migrate admin
+            if (backup.admin) {
+                try {
+                    const wasRunning = backup.runningServices.includes(backup.admin.label);
+                    onProgress?.('Migrating admin', ++current, totalServices);
+                    await this.migrateAdmin(wasRunning);
+                }
+                catch (error) {
+                    failedServices.push(backup.admin.label);
+                    console.error(chalk_1.default.red('Failed to migrate admin:'), error);
+                }
+            }
+            // If any service failed, rollback
+            if (failedServices.length > 0) {
+                onProgress?.('Migration failed, rolling back...', 0, 1);
+                await this.rollback();
+                return {
+                    success: false,
+                    migratedCount: totalServices - failedServices.length,
+                    failedServices,
+                    error: `Failed to migrate ${failedServices.length} service(s)`,
+                };
+            }
+            // Mark migration complete
+            await fs.writeFile(this.markerPath, new Date().toISOString());
+            return {
+                success: true,
+                migratedCount: totalServices,
+                failedServices: [],
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                migratedCount: 0,
+                failedServices,
+                error: error.message,
+            };
+        }
+    }
+    /**
+     * Rollback migration
+     */
+    async rollback() {
+        if (!(await (0, file_utils_1.fileExists)(this.backupPath))) {
+            throw new Error('No backup found to rollback');
+        }
+        const backup = await (0, file_utils_1.readJson)(this.backupPath);
+        // Restore server configs
+        for (const server of backup.servers) {
+            const newLabel = server.label.replace(OLD_LABEL_PREFIX, NEW_LABEL_PREFIX);
+            const newPlistPath = path.join(this.launchAgentsDir, `${newLabel}.plist`);
+            // Stop new service
+            try {
+                await launchctl_manager_1.launchctlManager.unloadService(newPlistPath);
+                await fs.unlink(newPlistPath);
+            }
+            catch (error) {
+                // Ignore errors
+            }
+            // Restore old config
+            await state_manager_1.stateManager.saveServerConfig(server);
+            // Recreate old plist
+            await launchctl_manager_1.launchctlManager.createPlist(server);
+            // Restart if was running
+            if (backup.runningServices.includes(server.label)) {
+                await launchctl_manager_1.launchctlManager.loadService(server.plistPath);
+                await launchctl_manager_1.launchctlManager.startService(server.label);
+            }
+        }
+        // Restore router
+        if (backup.router) {
+            const newLabel = 'studio.appkit.llamacpp-cli.router';
+            const newPlistPath = path.join(this.launchAgentsDir, `${newLabel}.plist`);
+            // Stop new service
+            try {
+                await router_manager_1.routerManager.unloadService(newPlistPath);
+                await fs.unlink(newPlistPath);
+            }
+            catch (error) {
+                // Ignore errors
+            }
+            // Restore old config
+            await router_manager_1.routerManager.saveConfig(backup.router);
+            // Recreate old plist
+            await router_manager_1.routerManager.createPlist(backup.router);
+            // Restart if was running
+            if (backup.runningServices.includes(backup.router.label)) {
+                await router_manager_1.routerManager.loadService(backup.router.plistPath);
+                await router_manager_1.routerManager.startService(backup.router.label);
+            }
+        }
+        // Restore admin
+        if (backup.admin) {
+            const newLabel = 'studio.appkit.llamacpp-cli.admin';
+            const newPlistPath = path.join(this.launchAgentsDir, `${newLabel}.plist`);
+            // Stop new service
+            try {
+                await admin_manager_1.adminManager.unloadService(newPlistPath);
+                await fs.unlink(newPlistPath);
+            }
+            catch (error) {
+                // Ignore errors
+            }
+            // Restore old config
+            await admin_manager_1.adminManager.saveConfig(backup.admin);
+            // Recreate old plist
+            await admin_manager_1.adminManager.createPlist(backup.admin);
+            // Restart if was running
+            if (backup.runningServices.includes(backup.admin.label)) {
+                await admin_manager_1.adminManager.loadService(backup.admin.plistPath);
+                await admin_manager_1.adminManager.startService(backup.admin.label);
+            }
+        }
+        console.log(chalk_1.default.green('✓ Rollback complete'));
+    }
+    /**
+     * Get backup info if exists
+     */
+    async getBackupInfo() {
+        if (!(await (0, file_utils_1.fileExists)(this.backupPath))) {
+            return null;
+        }
+        return await (0, file_utils_1.readJson)(this.backupPath);
+    }
+    /**
+     * Delete backup file
+     */
+    async deleteBackup() {
+        if (await (0, file_utils_1.fileExists)(this.backupPath)) {
+            await fs.unlink(this.backupPath);
+        }
+    }
+}
+exports.LabelMigration = LabelMigration;
+// Export singleton instance
+exports.labelMigration = new LabelMigration();
+//# sourceMappingURL=label-migration.js.map

package/dist/lib/label-migration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"label-migration.js","sourceRoot":"","sources":["../../src/lib/label-migration.ts"],"names":[],"mappings":"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"}

package/dist/lib/launchctl-manager.d.ts

@@ -6,6 +6,15 @@ export interface ServiceStatus {
     lastExitReason?: string;
 }
 export declare class LaunchctlManager {
+    /**
+     * Check if plist needs updating (old format without wrapper)
+     */
+    needsPlistUpdate(plistPath: string): Promise<boolean>;
+    /**
+     * Get the path to the wrapper script
+     * Handles both development (src/) and production (dist/) scenarios
+     */
+    private getWrapperPath;
     /**
      * Generate plist XML content for a server
      */

package/dist/lib/launchctl-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"launchctl-manager.d.ts","sourceRoot":"","sources":["../../src/lib/launchctl-manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAItD,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,OAAO,CAAC;IACnB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,gBAAgB;IAC3B;;OAEG;IACH,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM;IAqE3C;;OAEG;IACG,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;OAEG;IACG,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMnD;;OAEG;IACG,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD;;OAEG;IACG,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQrD;;OAEG;IACG,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD;;OAEG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C;;OAEG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IA4C7D;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAOzB;;OAEG;IACG,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,SAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAY5E;;OAEG;IACG,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,SAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAW5E;AAGD,eAAO,MAAM,gBAAgB,kBAAyB,CAAC"}
+{"version":3,"file":"launchctl-manager.d.ts","sourceRoot":"","sources":["../../src/lib/launchctl-manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAItD,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,OAAO,CAAC;IACnB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,gBAAgB;IAC3B;;OAEG;IACG,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgB3D;;;OAGG;IACH,OAAO,CAAC,cAAc;IAiBtB;;OAEG;IACH,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM;IA2F3C;;OAEG;IACG,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;OAEG;IACG,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMnD;;OAEG;IACG,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD;;OAEG;IACG,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQrD;;OAEG;IACG,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD;;OAEG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C;;OAEG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IA4C7D;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAOzB;;OAEG;IACG,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,SAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAY5E;;OAEG;IACG,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,SAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAW5E;AAGD,eAAO,MAAM,gBAAgB,kBAAyB,CAAC"}

package/dist/lib/launchctl-manager.js

@@ -34,39 +34,82 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.launchctlManager = exports.LaunchctlManager = void 0;
+const path = __importStar(require("path"));
 const fs = __importStar(require("fs/promises"));
 const process_utils_1 = require("../utils/process-utils");
 const file_utils_1 = require("../utils/file-utils");
 class LaunchctlManager {
+    /**
+     * Check if plist needs updating (old format without wrapper)
+     */
+    async needsPlistUpdate(plistPath) {
+        try {
+            const plistContent = await fs.readFile(plistPath, 'utf-8');
+            // Check if it uses the wrapper (new format) or node directly (old format)
+            const hasWrapper = plistContent.includes('/launchers/llamacpp-server');
+            const hasProcessType = plistContent.includes('<key>ProcessType</key>');
+            // Needs update if missing wrapper or ProcessType
+            return !hasWrapper || !hasProcessType;
+        }
+        catch (error) {
+            // If plist doesn't exist or can't be read, it needs to be created
+            return true;
+        }
+    }
+    /**
+     * Get the path to the wrapper script
+     * Handles both development (src/) and production (dist/) scenarios
+     */
+    getWrapperPath() {
+        // Try relative to current module location (works for both dev and prod)
+        let wrapperPath = path.join(__dirname, '..', 'launchers', 'llamacpp-server');
+        if (require('fs').existsSync(wrapperPath)) {
+            return wrapperPath;
+        }
+        // Try from the CLI binary location (global install)
+        const binPath = process.argv[1];
+        wrapperPath = path.join(path.dirname(binPath), '..', 'launchers', 'llamacpp-server');
+        if (require('fs').existsSync(wrapperPath)) {
+            return wrapperPath;
+        }
+        throw new Error('Could not locate llamacpp-server wrapper script');
+    }
     /**
      * Generate plist XML content for a server
      */
     generatePlist(config) {
-        // 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(),
+        // Get path to wrapper script
+        const wrapperPath = this.getWrapperPath();
+        // Get node executable path (for wrapper to use)
+        const nodePath = process.execPath;
+        // Build arguments for llamacpp internal server-wrapper command
+        // First arg to wrapper is node path, then comes our CLI arguments
+        const wrapperArgs = [
+            wrapperPath,
+            nodePath, // Wrapper needs this to find node
+            'internal',
+            'server-wrapper',
+            '--http-log-path', config.httpLogPath,
         ];
+        // Add verbose flag if enabled
+        if (config.verbose) {
+            wrapperArgs.push('--verbose');
+        }
+        // Add llama-server arguments
+        wrapperArgs.push('--', '--model', config.modelPath, '--host', config.host, '--port', config.port.toString(), '--threads', config.threads.toString(), '--ctx-size', config.ctxSize.toString(), '--gpu-layers', config.gpuLayers === -1 ? 'all' : config.gpuLayers.toString());
         // Add flags
         if (config.embeddings)
-            args.push('--embeddings');
+            wrapperArgs.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');
-        }
+            wrapperArgs.push('--jinja');
+        // Always enable verbose logging (so HTTP logs are generated)
+        wrapperArgs.push('--log-verbose');
         // Add custom flags
         if (config.customFlags && config.customFlags.length > 0) {
-            args.push(...config.customFlags);
+            wrapperArgs.push(...config.customFlags);
         }
-        // Generate XML array elements
-        const argsXml = args.map(arg => `      <string>${arg}</string>`).join('\n');
+        // Build ProgramArguments array for plist (wrapper handles node execution)
+        const programArguments = wrapperArgs.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">
@@ -77,7 +120,7 @@ class LaunchctlManager {
 
     <key>ProgramArguments</key>
     <array>
-${argsXml}
+${programArguments}
     </array>
 
     <key>RunAtLoad</key>
@@ -100,6 +143,9 @@ ${argsXml}
     <key>WorkingDirectory</key>
     <string>/tmp</string>
 
+    <key>ProcessType</key>
+    <string>Background</string>
+
     <key>ThrottleInterval</key>
     <integer>10</integer>
   </dict>

package/dist/lib/launchctl-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"launchctl-manager.js","sourceRoot":"","sources":["../../src/lib/launchctl-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAkC;AAElC,0DAAgE;AAChE,oDAAkE;AASlE,MAAa,gBAAgB;IAC3B;;OAEG;IACH,aAAa,CAAC,MAAoB;QAChC,gCAAgC;QAChC,MAAM,IAAI,GAAG;YACX,gCAAgC;YAChC,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,QAAQ,EAAE,MAAM,CAAC,IAAI;YACrB,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE;YAChC,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;YACtC,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;YACvC,cAAc,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;SAC5C,CAAC;QAEF,YAAY;QACZ,IAAI,MAAM,CAAC,UAAU;YAAE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACjD,IAAI,MAAM,CAAC,KAAK;YAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEvC,+EAA+E;QAC/E,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC7B,CAAC;QAED,mBAAmB;QACnB,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;QACnC,CAAC;QAED,8BAA8B;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,iBAAiB,GAAG,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE5E,OAAO;;;;;;cAMG,MAAM,CAAC,KAAK;;;;EAIxB,OAAO;;;;;;;;;;;;;;;cAeK,MAAM,CAAC,UAAU;;;cAGjB,MAAM,CAAC,UAAU;;;;;;;;;CAS9B,CAAC;IACA,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CAAC,MAAoB;QACpC,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,IAAA,4BAAe,EAAC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACxD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CAAC,SAAiB;QACjC,IAAI,MAAM,IAAA,uBAAU,EAAC,SAAS,CAAC,EAAE,CAAC;YAChC,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CAAC,SAAiB;QACjC,MAAM,IAAA,2BAAW,EAAC,mBAAmB,SAAS,GAAG,CAAC,CAAC;IACrD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa,CAAC,SAAiB;QACnC,IAAI,CAAC;YACH,MAAM,IAAA,2BAAW,EAAC,qBAAqB,SAAS,GAAG,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,yCAAyC;QAC3C,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY,CAAC,KAAa;QAC9B,MAAM,IAAA,2BAAW,EAAC,mBAAmB,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CAAC,KAAa;QAC7B,MAAM,IAAA,2BAAW,EAAC,kBAAkB,KAAK,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB,CAAC,KAAa;QAClC,IAAI,CAAC;YACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,yBAAS,EAAC,yBAAyB,KAAK,EAAE,CAAC,CAAC;YACrE,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAExC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAChC,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;oBACtB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBAC/B,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBACpC,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBAErC,wBAAwB;oBACxB,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;wBAC3B,MAAM,GAAG,GAAG,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;wBACzD,MAAM,QAAQ,GAAG,WAAW,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;wBACxE,MAAM,SAAS,GAAG,GAAG,KAAK,IAAI,CAAC;wBAE/B,OAAO;4BACL,SAAS;4BACT,GAAG;4BACH,QAAQ;4BACR,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC;yBACjD,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YAED,oBAAoB;YACpB,OAAO;gBACL,SAAS,EAAE,KAAK;gBAChB,GAAG,EAAE,IAAI;gBACT,QAAQ,EAAE,IAAI;aACf,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,kCAAkC;YAClC,OAAO;gBACL,SAAS,EAAE,KAAK;gBAChB,GAAG,EAAE,IAAI;gBACT,QAAQ,EAAE,IAAI;aACf,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;OAEG;IACK,iBAAiB,CAAC,IAAmB;QAC3C,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAClD,IAAI,IAAI,KAAK,CAAC,CAAC;YAAE,OAAO,wBAAwB,CAAC;QACjD,IAAI,IAAI,KAAK,CAAC,EAAE;YAAE,OAAO,sBAAsB,CAAC;QAChD,OAAO,cAAc,IAAI,EAAE,CAAC;IAC9B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,mBAAmB,CAAC,KAAa,EAAE,SAAS,GAAG,IAAI;QACvD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,SAAS,EAAE,CAAC;YAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAClD,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;gBACrB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,kBAAkB,CAAC,KAAa,EAAE,SAAS,GAAG,IAAI;QACtD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,SAAS,EAAE,CAAC;YAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAClD,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;gBACtB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAhND,4CAgNC;AAED,4BAA4B;AACf,QAAA,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"launchctl-manager.js","sourceRoot":"","sources":["../../src/lib/launchctl-manager.ts"],"names":[],"mappings":"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"}