@tonk/cli 0.2.6 → 0.2.7

package/dist/commands/worker.js

@@ -0,0 +1,527 @@
+import { Command } from 'commander';
+import chalk from 'chalk';
+import fs from 'node:fs';
+import path from 'node:path';
+import * as YAML from 'yaml';
+import Table from 'cli-table3';
+import inquirer from 'inquirer';
+import { TonkWorkerManager } from '../lib/workerManager.js';
+export const workerCommand = new Command('worker')
+    .description('Manage Tonk workers')
+    .action(async () => {
+    // Display help when no subcommand is provided
+    workerCommand.help();
+});
+workerCommand
+    .command('inspect <id>')
+    .description('Inspect a specific worker')
+    .option('-s, --start', 'Start the worker')
+    .option('-S, --stop', 'Stop the worker')
+    .option('-c, --config <path>', 'Path to worker configuration file')
+    .option('-p, --ping', 'Ping the worker to check its status')
+    .action(async (id, options) => {
+    try {
+        // Create worker manager
+        const workerManager = new TonkWorkerManager();
+        // Get worker
+        const worker = await workerManager.get(id);
+        if (!worker) {
+            console.error(chalk.red(`Worker with ID '${id}' not found.`));
+            return;
+        }
+        // If no options provided, show worker details
+        if (!options.start && !options.stop && !options.config && !options.ping) {
+            displayWorkerDetails(worker);
+            return;
+        }
+        // Handle ping option
+        if (options.ping) {
+            console.log(chalk.blue(`Pinging worker '${worker.name}' at ${worker.endpoint}...`));
+            // Check worker health
+            const isHealthy = await workerManager.checkHealth(id);
+            if (isHealthy) {
+                console.log(chalk.green(`Worker '${worker.name}' is active!`));
+            }
+            else {
+                console.log(chalk.red(`Worker '${worker.name}' is not responding.`));
+            }
+            return;
+        }
+        // Handle start option
+        if (options.start) {
+            console.log(chalk.blue(`Starting worker '${worker.name}'...`));
+            await workerManager.start(id);
+            console.log(chalk.green(`Worker '${worker.name}' started successfully!`));
+            return;
+        }
+        // Handle stop option
+        if (options.stop) {
+            console.log(chalk.blue(`Stopping worker '${worker.name}'...`));
+            await workerManager.stop(id);
+            console.log(chalk.green(`Worker '${worker.name}' stopped successfully!`));
+            return;
+        }
+        // Handle config option
+        if (options.config) {
+            await updateWorkerConfig(workerManager, worker.id, options.config);
+        }
+    }
+    catch (error) {
+        console.error(chalk.red('Failed to manage worker:'), error);
+    }
+});
+workerCommand
+    .command('ls')
+    .description('List all registered workers')
+    .action(async () => {
+    try {
+        // Create worker manager
+        const workerManager = new TonkWorkerManager();
+        // Get all workers
+        const workers = await workerManager.list();
+        if (workers.length === 0) {
+            console.log(chalk.yellow('No workers registered yet.'));
+            console.log(chalk.blue(`Use '${chalk.bold('tonk worker register')}' to register a worker.`));
+            return;
+        }
+        // Create a table for display
+        const table = new Table({
+            head: [
+                chalk.cyan('ID'),
+                chalk.cyan('Name'),
+                chalk.cyan('Type'),
+                chalk.cyan('Endpoint'),
+                chalk.cyan('Protocol'),
+                chalk.cyan('Status'),
+                chalk.cyan('Last Seen'),
+            ],
+            colWidths: [24, 20, 10, 30, 10, 10, 20],
+        });
+        // Add workers to table
+        workers.forEach(worker => {
+            const lastSeen = worker.status.lastSeen
+                ? new Date(worker.status.lastSeen).toLocaleString()
+                : 'Never';
+            table.push([
+                worker.id,
+                worker.name,
+                worker.config.type || 'custom',
+                worker.endpoint,
+                worker.protocol,
+                worker.status.active
+                    ? chalk.green('Active')
+                    : chalk.yellow('Inactive'),
+                lastSeen,
+            ]);
+        });
+        console.log(chalk.bold(`Registered Workers (${workers.length}):`));
+        console.log(table.toString());
+        console.log(chalk.blue(`\nUse '${chalk.bold('tonk worker inspect <id>')}' to view details of a specific worker.`));
+    }
+    catch (error) {
+        console.error(chalk.red('Failed to list workers:'), error);
+    }
+});
+workerCommand
+    .command('rm <id>')
+    .description('Remove a registered worker')
+    .action(async (id) => {
+    try {
+        // Create worker manager
+        const workerManager = new TonkWorkerManager();
+        // Get worker
+        const worker = await workerManager.get(id);
+        if (!worker) {
+            console.error(chalk.red(`Worker with ID '${id}' not found.`));
+            return;
+        }
+        // Remove worker
+        await workerManager.remove(id);
+        console.log(chalk.green(`Worker '${worker.name}' (${id}) removed successfully.`));
+    }
+    catch (error) {
+        console.error(chalk.red('Failed to remove worker:'), error);
+    }
+});
+workerCommand
+    .command('ping <id>')
+    .description('Ping a worker to check its status')
+    .action(async (id) => {
+    try {
+        // Create worker manager
+        const workerManager = new TonkWorkerManager();
+        // Get worker
+        const worker = await workerManager.get(id);
+        if (!worker) {
+            console.error(chalk.red(`Worker with ID '${id}' not found.`));
+            return;
+        }
+        console.log(chalk.blue(`Pinging worker '${worker.name}' at ${worker.endpoint}...`));
+        // Check worker health
+        const isHealthy = await workerManager.checkHealth(id);
+        if (isHealthy) {
+            console.log(chalk.green(`Worker '${worker.name}' is active!`));
+        }
+        else {
+            console.log(chalk.red(`Worker '${worker.name}' is not responding.`));
+        }
+    }
+    catch (error) {
+        console.error(chalk.red('Failed to ping worker:'), error);
+    }
+});
+workerCommand
+    .command('start <id>')
+    .description('Start a worker')
+    .action(async (id) => {
+    try {
+        // Create worker manager
+        const workerManager = new TonkWorkerManager();
+        // Get worker
+        const worker = await workerManager.get(id);
+        if (!worker) {
+            console.error(chalk.red(`Worker with ID '${id}' not found.`));
+            return;
+        }
+        console.log(chalk.blue(`Starting worker '${worker.name}'...`));
+        await workerManager.start(id);
+        console.log(chalk.green(`Worker '${worker.name}' started successfully!`));
+    }
+    catch (error) {
+        console.error(chalk.red('Failed to start worker:'), error);
+    }
+});
+workerCommand
+    .command('stop <id>')
+    .description('Stop a worker')
+    .action(async (id) => {
+    try {
+        // Create worker manager
+        const workerManager = new TonkWorkerManager();
+        // Get worker
+        const worker = await workerManager.get(id);
+        if (!worker) {
+            console.error(chalk.red(`Worker with ID '${id}' not found.`));
+            return;
+        }
+        console.log(chalk.blue(`Stopping worker '${worker.name}'...`));
+        await workerManager.stop(id);
+        console.log(chalk.green(`Worker '${worker.name}' stopped successfully!`));
+    }
+    catch (error) {
+        console.error(chalk.red('Failed to stop worker:'), error);
+    }
+});
+workerCommand
+    .command('logs <id>')
+    .description('View logs for a worker')
+    .option('-f, --follow', 'Follow log output')
+    .option('-l, --lines <n>', 'Number of lines to show', '100')
+    .option('-e, --error', 'Show only error logs')
+    .option('-o, --out', 'Show only standard output logs')
+    .action(async (id, options) => {
+    try {
+        // Create worker manager
+        const workerManager = new TonkWorkerManager();
+        // Get worker
+        const worker = await workerManager.get(id);
+        if (!worker) {
+            console.error(chalk.red(`Worker with ID '${id}' not found.`));
+            return;
+        }
+        console.log(chalk.blue(`Fetching logs for worker '${worker.name}'...`));
+        const { spawn } = await import('node:child_process');
+        try {
+            // Build the PM2 logs command arguments
+            const args = ['logs', worker.id];
+            // Add options
+            if (options.lines) {
+                args.push('--lines', options.lines);
+            }
+            if (options.error) {
+                args.push('--err');
+            }
+            else if (options.out) {
+                args.push('--out');
+            }
+            // Always use --raw to get cleaner output
+            args.push('--raw');
+            // For non-follow mode, we'll use --lines and then kill the process after a short delay
+            if (!options.follow) {
+                console.log(chalk.blue(`Showing last ${options.lines || '100'} lines of logs...`));
+                const child = spawn('pm2', args, {
+                    stdio: 'inherit',
+                });
+                // Kill the process after a short delay to get just the initial output
+                setTimeout(() => {
+                    child.kill('SIGINT');
+                }, 1000);
+                // Wait for the child process to exit
+                await new Promise(resolve => {
+                    child.on('exit', resolve);
+                });
+                console.log(chalk.blue('\nUse -f or --follow to stream logs in real-time'));
+            }
+            else {
+                // For follow mode
+                console.log(chalk.blue('Streaming logs in real-time. Press Ctrl+C to exit.'));
+                const child = spawn('pm2', args, {
+                    stdio: 'inherit',
+                });
+                // Handle process exit
+                process.on('SIGINT', () => {
+                    child.kill();
+                    process.exit(0);
+                });
+                // Wait for the child process to exit
+                await new Promise(resolve => {
+                    child.on('exit', resolve);
+                });
+            }
+        }
+        catch (error) {
+            console.error(chalk.red('Failed to fetch logs:'), error);
+        }
+    }
+    catch (error) {
+        console.error(chalk.red('Failed to fetch worker logs:'), error);
+    }
+});
+workerCommand
+    .command('register')
+    .description('Register a worker with Tonk')
+    .argument('[dir]', 'Path to worker directory (defaults to current directory)')
+    .action(async (dir = '.') => {
+    try {
+        // Find the worker.yaml file
+        const workerDir = await findWorkerRoot(dir);
+        if (!workerDir) {
+            console.error(chalk.red(`No worker.yaml file found in ${path.resolve(dir)} or its parent directories.`));
+            console.log(chalk.yellow('Make sure you are in a valid worker directory or specify the path to one.'));
+            return;
+        }
+        console.log(chalk.blue(`Found worker directory at: ${workerDir}`));
+        // Read the worker.yaml file
+        const workerYamlPath = path.join(workerDir, 'worker.yaml');
+        const workerConfig = await readWorkerConfig(workerYamlPath);
+        if (!workerConfig) {
+            console.error(chalk.red(`Failed to parse worker.yaml file at ${workerYamlPath}`));
+            return;
+        }
+        // Create worker manager
+        const workerManager = new TonkWorkerManager();
+        // Register worker using the YAML config
+        const worker = await workerManager.registerFromYamlConfig(workerConfig);
+        console.log(chalk.green(`Worker '${worker.name}' registered successfully!`));
+        console.log(chalk.cyan('Worker ID:'), chalk.bold(worker.id));
+        console.log(chalk.cyan('Endpoint:'), chalk.bold(worker.endpoint));
+        console.log(chalk.cyan('Protocol:'), chalk.bold(worker.protocol));
+        console.log(chalk.cyan('Status:'), worker.status.active ? chalk.green('Active') : chalk.yellow('Inactive'));
+        if (Object.keys(worker.env).length > 0) {
+            console.log(chalk.cyan('Environment Variables:'));
+            Object.entries(worker.env).forEach(([key, value]) => {
+                console.log(`  ${key}=${value}`);
+            });
+        }
+    }
+    catch (error) {
+        console.error(chalk.red('Failed to register worker:'), error);
+    }
+});
+workerCommand
+    .command('init')
+    .description('Initialise a new worker configuration file')
+    .option('-d, --dir <directory>', 'Directory to create the configuration file in', '.')
+    .option('-n, --name <n>', 'Name of the worker')
+    .option('-p, --port <port>', 'Port number for the worker', '5555')
+    .action(async (options) => {
+    try {
+        // Prompt for missing options
+        const answers = await promptForMissingOptions(options);
+        const mergedOptions = { ...options, ...answers };
+        // Create the directory if it doesn't exist
+        const targetDir = path.resolve(mergedOptions.dir);
+        if (!fs.existsSync(targetDir)) {
+            fs.mkdirSync(targetDir, { recursive: true });
+            console.log(chalk.blue(`Created directory: ${targetDir}`));
+        }
+        // Generate the YAML content
+        const yamlContent = generateYamlContent(mergedOptions);
+        // Write the YAML file
+        const yamlPath = path.join(targetDir, 'worker.yaml');
+        fs.writeFileSync(yamlPath, yamlContent);
+        console.log(chalk.green(`Worker configuration file created at: ${yamlPath}`));
+        console.log(chalk.blue(`\nYou can now register this worker with:`));
+        console.log(chalk.cyan(`  tonk worker register ${targetDir}`));
+    }
+    catch (error) {
+        console.error(chalk.red('Failed to initialise worker configuration:'), error);
+    }
+});
+// Helper function to display worker details
+function displayWorkerDetails(worker) {
+    console.log(chalk.bold(`Worker Details: ${worker.name}`));
+    console.log(chalk.cyan('ID:'), worker.id);
+    console.log(chalk.cyan('Name:'), worker.name);
+    console.log(chalk.cyan('Description:'), worker.description || '(No description)');
+    console.log(chalk.cyan('Type:'), worker.config.type || 'custom');
+    console.log(chalk.cyan('Endpoint:'), worker.endpoint);
+    console.log(chalk.cyan('Protocol:'), worker.protocol);
+    console.log(chalk.cyan('Status:'), worker.status.active ? chalk.green('Active') : chalk.yellow('Inactive'));
+    if (worker.status.lastSeen) {
+        console.log(chalk.cyan('Last Seen:'), new Date(worker.status.lastSeen).toLocaleString());
+    }
+    else {
+        console.log(chalk.cyan('Last Seen:'), 'Never');
+    }
+    console.log(chalk.cyan('Created:'), new Date(worker.createdAt).toLocaleString());
+    console.log(chalk.cyan('Updated:'), new Date(worker.updatedAt).toLocaleString());
+    if (Object.keys(worker.env).length > 0) {
+        console.log(chalk.cyan('\nEnvironment Variables:'));
+        Object.entries(worker.env).forEach(([key, value]) => {
+            console.log(`  ${key}=${value}`);
+        });
+    }
+    if (Object.keys(worker.config).length > 0) {
+        console.log(chalk.cyan('\nConfiguration:'));
+        console.log(JSON.stringify(worker.config, null, 2));
+    }
+}
+// Helper function to update worker configuration
+async function updateWorkerConfig(workerManager, id, configPath) {
+    try {
+        // Check if config file exists
+        if (!fs.existsSync(configPath)) {
+            console.error(chalk.red(`Configuration file not found: ${configPath}`));
+            return;
+        }
+        // Read config file
+        const configContent = fs.readFileSync(configPath, 'utf-8');
+        let config;
+        try {
+            config = JSON.parse(configContent);
+        }
+        catch (error) {
+            console.error(chalk.red('Invalid JSON in configuration file:'), error);
+            return;
+        }
+        // Get worker
+        const worker = await workerManager.get(id);
+        if (!worker) {
+            console.error(chalk.red(`Worker with ID '${id}' not found.`));
+            return;
+        }
+        // Update worker config
+        await workerManager.update(id, {
+            config: { ...worker.config, ...config },
+        });
+        console.log(chalk.green(`Worker '${worker.name}' configuration updated successfully!`));
+    }
+    catch (error) {
+        console.error(chalk.red('Failed to update worker configuration:'), error);
+    }
+}
+/**
+ * Find the worker root directory by looking for worker.yaml
+ * Searches in the given directory and parent directories
+ */
+async function findWorkerRoot(startDir) {
+    try {
+        let currentDir = path.resolve(startDir);
+        const rootDir = path.parse(currentDir).root;
+        // Search up to the root directory
+        while (currentDir !== rootDir) {
+            const workerYamlPath = path.join(currentDir, 'worker.yaml');
+            if (fs.existsSync(workerYamlPath)) {
+                return currentDir;
+            }
+            // Move up one directory
+            const parentDir = path.dirname(currentDir);
+            // If we've reached the root, stop searching
+            if (parentDir === currentDir) {
+                break;
+            }
+            currentDir = parentDir;
+        }
+        return null;
+    }
+    catch (error) {
+        console.error('Error finding worker root:', error);
+        return null;
+    }
+}
+/**
+ * Read and parse the worker.yaml file
+ */
+async function readWorkerConfig(configPath) {
+    try {
+        if (!fs.existsSync(configPath)) {
+            return null;
+        }
+        const fileContent = fs.readFileSync(configPath, 'utf-8');
+        return YAML.parse(fileContent);
+    }
+    catch (error) {
+        console.error('Error reading worker config:', error);
+        return null;
+    }
+}
+// Helper function to prompt for missing options (for init command)
+async function promptForMissingOptions(options) {
+    const questions = [];
+    if (!options.name) {
+        questions.push({
+            type: 'input',
+            name: 'name',
+            message: 'Enter worker name:',
+            validate: (input) => input.trim() !== '' ? true : 'Name is required',
+        });
+    }
+    if (!options.port) {
+        questions.push({
+            type: 'input',
+            name: 'port',
+            message: 'Enter port number for the worker:',
+            default: '5555',
+            validate: (input) => /^\d+$/.test(input) ? true : 'Port must be a number',
+        });
+    }
+    return inquirer.prompt(questions);
+}
+// Helper function to generate YAML content (for init command)
+function generateYamlContent(options) {
+    const port = options.port || '5555';
+    return `# Worker Configuration
+
+# Worker Information
+name: ${options.name}
+description: Tonk worker
+version: 1.0.0
+
+# Connection Details
+endpoint: http://localhost:${port}/tonk
+protocol: http
+
+# Health Check Configuration
+healthCheck:
+  endpoint: http://localhost:${port}/health
+  method: GET
+  interval: 30000
+  timeout: 5000
+
+# Process Management
+process:
+  script: ./dist/index.js
+  cwd: ./
+  instances: 1
+  autorestart: true
+  watch: false
+  max_memory_restart: 500M
+  env:
+    NODE_ENV: production
+
+# Additional Configuration
+config: {}
+`;
+}
+//# sourceMappingURL=worker.js.map

package/dist/commands/worker.js.map

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

package/dist/lib/workerManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workerManager.d.ts","sourceRoot":"","sources":["../../src/lib/workerManager.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EACN,aAAa,EACb,yBAAyB,EAC1B,MAAM,oBAAoB,CAAC;AAM5B;;GAEG;AACH,qBAAa,iBAAkB,YAAW,aAAa;IACrD,OAAO,CAAC,WAAW,CAAS;;IAc5B;;OAEG;IACG,QAAQ,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC;IA8CnE;;OAEG;IACG,sBAAsB,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAiC9D;;OAEG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAW7C;;;;OAIG;IACG,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgBhE;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAgB/B;;OAEG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAqBnE;;OAEG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAoC1C;;;OAGG;IACG,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA0JzC;;OAEG;IACG,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqCxC;;OAEG;IACG,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqD/C;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAMxB;;OAEG;IACH,OAAO,CAAC,eAAe;CA0BxB"}
+{"version":3,"file":"workerManager.d.ts","sourceRoot":"","sources":["../../src/lib/workerManager.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EACN,aAAa,EACb,yBAAyB,EAC1B,MAAM,oBAAoB,CAAC;AAM5B;;GAEG;AACH,qBAAa,iBAAkB,YAAW,aAAa;IACrD,OAAO,CAAC,WAAW,CAAS;;IAc5B;;OAEG;IACG,QAAQ,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC;IA8CnE;;OAEG;IACG,sBAAsB,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAiC9D;;OAEG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAW7C;;;;OAIG;IACG,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgBhE;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAgB/B;;OAEG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAqBnE;;OAEG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAoC1C;;;OAGG;IACG,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAuHzC;;OAEG;IACG,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqCxC;;OAEG;IACG,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqD/C;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAgBxB;;OAEG;IACH,OAAO,CAAC,eAAe;CA0BxB"}

package/dist/lib/workerManager.js

@@ -224,43 +224,16 @@ export class TonkWorkerManager {
                 const errorLogConfig = `--error ${path.join(logDir, `${worker.id}-error.log`)}`;
                 // Handle different worker types
                 if (worker.config.type === 'npm') {
-                    // For npm-based workers, we need to find the entry point
+                    // For npm-based workers, we directly use the package name as the command
                     const packageName = worker.name;
+                    // Strip scope from package name for display purposes (e.g., @tonk/worker -> worker)
+                    const commandName = packageName.replace(/^@[^/]+\//, '');
                     try {
-                        // Get the package's bin entry point
-                        const { stdout: binInfo } = await execAsync(`npm bin -g`);
-                        const binPath = binInfo.trim();
-                        const executablePath = path.join(binPath, packageName);
-                        // Check if the executable exists
-                        if (fs.existsSync(executablePath)) {
-                            // Start the npm package with PM2
-                            const startCmd = `${envVars} pm2 start ${executablePath} --name ${worker.id} ${logConfig} ${errorLogConfig}`;
-                            await execAsync(startCmd);
-                        }
-                        else {
-                            // Try to find the main entry point
-                            const { stdout: packageInfo } = await execAsync(`npm list -g ${packageName} --json`);
-                            const packageData = JSON.parse(packageInfo);
-                            if (packageData.dependencies &&
-                                packageData.dependencies[packageName]) {
-                                const packagePath = packageData.dependencies[packageName].path;
-                                const packageJsonPath = path.join(packagePath, 'package.json');
-                                if (fs.existsSync(packageJsonPath)) {
-                                    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
-                                    const mainScript = packageJson.main || 'index.js';
-                                    const scriptPath = path.join(packagePath, mainScript);
-                                    // Start the npm package with PM2
-                                    const startCmd = `cd ${packagePath} && ${envVars} pm2 start ${scriptPath} --name ${worker.id} ${logConfig} ${errorLogConfig}`;
-                                    await execAsync(startCmd);
-                                }
-                                else {
-                                    throw new Error(`Could not find package.json for ${packageName}`);
-                                }
-                            }
-                            else {
-                                throw new Error(`Could not find installed package ${packageName}`);
-                            }
-                        }
+                        // Start the npm package with PM2 using the package name as the command
+                        // and 'start' as the argument
+                        const startCmd = `${envVars} pm2 start "${commandName} start" --name ${worker.id} ${logConfig} ${errorLogConfig}`;
+                        await execAsync(startCmd);
+                        console.log(`Started npm worker '${packageName}' with command: ${commandName} start`);
                     }
                     catch (error) {
                         console.error(`Error starting npm worker:`, error);
@@ -396,7 +369,14 @@ export class TonkWorkerManager {
      * Generate a worker ID
      */
     generateWorkerId(name) {
-        const normalizedName = name.toLowerCase().replace(/[^a-z0-9]/g, '-');
+        // Normalize the name: lowercase and replace non-alphanumeric chars with hyphens
+        let normalizedName = name.toLowerCase().replace(/[^a-z0-9]/g, '-');
+        // Ensure the name doesn't start with a hyphen (would cause issues with PM2)
+        normalizedName = normalizedName.replace(/^-+/, '');
+        // If after normalization the name is empty, use a default prefix
+        if (!normalizedName) {
+            normalizedName = 'worker';
+        }
         const timestamp = Date.now().toString(36);
         return `${normalizedName}-${timestamp}`;
     }