wilfredwake 1.0.4 → 1.0.6

package/bin/cli.js

@@ -14,6 +14,7 @@
 
 import { Command } from 'commander';
 import chalk from 'chalk';
+import fs from 'fs';
 import { initCommand } from '../src/cli/commands/init.js';
 import { statusCommand } from '../src/cli/commands/status.js';
 import { wakeCommand } from '../src/cli/commands/wake.js';
@@ -30,7 +31,16 @@ program
   .description(
     chalk.cyan('🌅 CLI Tool for Multi-Developer Development Environment Wake & Status Management')
   )
-  .version('1.0.0')
+  .version(
+    (() => {
+      try {
+        const pkg = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url)));
+        return pkg.version || '0.0.0';
+      } catch (e) {
+        return '0.0.0';
+      }
+    })()
+  )
   .usage(chalk.yellow('[command] [options]'));
 
 // ═══════════════════════════════════════════════════════════════
@@ -59,7 +69,7 @@ program
 program
   .command('status [service]')
   .description(chalk.green('Check status of all services or a specific service'))
-  .option('-e, --env <environment>', 'Environment (dev, staging, prod)', 'dev')
+  .option('-e, --env <environment>', 'Environment (dev, staging, prod)')
   .option('-f, --format <format>', 'Output format (table, json)', 'table')
   .action(statusCommand);
 
@@ -72,7 +82,7 @@ program
 program
   .command('wake [target]')
   .description(chalk.blue('Wake services on demand (all, <service>, or <group>)'))
-  .option('-e, --env <environment>', 'Environment (dev, staging, prod)', 'dev')
+  .option('-e, --env <environment>', 'Environment (dev, staging, prod)')
   .option('--no-wait', 'Don\'t wait for services to be ready')
   .option('--timeout <seconds>', 'Timeout for service readiness', '300')
   .action(wakeCommand);
@@ -85,7 +95,7 @@ program
 program
   .command('health [service]')
   .description(chalk.cyan('Check health status of services'))
-  .option('-e, --env <environment>', 'Environment (dev, staging, prod)', 'dev')
+  .option('-e, --env <environment>', 'Environment (dev, staging, prod)')
   .action(healthCommand);
 
 // ═══════════════════════════════════════════════════════════════

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wilfredwake",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "CLI Tool for Multi-Developer Development Environment Wake & Status Management",
   "type": "module",
   "main": "index.js",

package/src/cli/commands/status.js

@@ -126,14 +126,14 @@ function _displayTableStatus(services, environment) {
     const lastWoken = service.lastWakeTime
       ? new Date(service.lastWakeTime).toLocaleString()
       : 'Never';
-
     const cells = [
       chalk.cyan(service.name.padEnd(20)),
       statusColor(service.status.toUpperCase().padEnd(20)),
       chalk.yellow(lastWoken.padEnd(20)),
-      chalk.gray(service.url.substring(0, 20).padEnd(20)),
+      chalk.gray((service.url || '').substring(0, 20).padEnd(20)),
     ];
     console.log(format.tableRow(cells));
+    console.log(''); // Extra spacing between rows for clarity
   });
 
   console.log(''); // Spacing
@@ -158,23 +158,16 @@ function _displaySummary(services) {
 
   const stats = {
     total: services.length,
-    ready: services.filter(s => s.status === 'ready').length,
-    sleeping: services.filter(s => s.status === 'sleeping').length,
+    live: services.filter(s => s.status === 'live').length,
+    dead: services.filter(s => s.status === 'dead').length,
     waking: services.filter(s => s.status === 'waking').length,
     failed: services.filter(s => s.status === 'failed').length,
+    unknown: services.filter(s => s.status === 'unknown').length,
   };
 
   console.log(chalk.magentaBright.bold('Summary'));
   console.log(
-    `  ${colors.status.ready('✓')} Ready: ${colors.status.ready(
-      stats.ready
-    )} | ${colors.status.sleeping('⚫')} Sleeping: ${colors.status.sleeping(
-      stats.sleeping
-    )} | ${colors.status.waking('⟳')} Waking: ${colors.status.waking(
-      stats.waking
-    )} | ${colors.status.failed('✗')} Failed: ${colors.status.failed(
-      stats.failed
-    )}`
+    `  ${colors.status.live('✓')} Live: ${colors.status.live(stats.live)} | ${colors.status.dead('⚫')} Dead: ${colors.status.dead(stats.dead)} | ${colors.status.waking('⟳')} Waking: ${colors.status.waking(stats.waking)} | ${colors.status.failed('✗')} Failed: ${colors.status.failed(stats.failed)} | ${colors.status.unknown('?')} Unknown: ${colors.status.unknown(stats.unknown)}`
   );
   console.log(`  Total: ${stats.total} services\n`);
 }

package/src/orchestrator/orchestrator.js

@@ -283,16 +283,13 @@ export class Orchestrator {
       // ═══════════════════════════════════════════════════════════════
       // DETERMINE STATE FROM STATUS CODE
       // ═══════════════════════════════════════════════════════════════
-      let state = ServiceState.UNKNOWN;
-
-      if (response.status < 300) {
-        state = ServiceState.LIVE;  // Changed from READY
-      } else if (response.status === 503) {
-        state = ServiceState.DEAD;  // Changed from SLEEPING
-      } else if (response.status >= 500) {
+      // Consider any HTTP response (2xx/3xx/4xx/5xx) as evidence the
+      // service is responsive — treat as LIVE. Only mark FAILED for
+      // server errors (5xx). This follows "mark as woken when any
+      // response is received" behavior.
+      let state = ServiceState.LIVE;
+      if (response.status >= 500) {
         state = ServiceState.FAILED;
-      } else if (response.status >= 400) {
-        state = ServiceState.UNKNOWN;
       }
 
       this._logTimestamp(

package/src/orchestrator/registry.js

@@ -85,7 +85,8 @@ export class ServiceRegistry {
    */
   getServices(environment = 'dev') {
     const env = this.registry?.services?.[environment] || {};
-    return Object.values(env);
+    // Return service objects augmented with their name for downstream code
+    return Object.entries(env).map(([name, svc]) => ({ name, ...svc }));
   }
 
   /**
@@ -95,7 +96,9 @@ export class ServiceRegistry {
    * @returns {Object|null} Service definition
    */
   getService(serviceName, environment = 'dev') {
-    return this.registry?.services?.[environment]?.[serviceName] || null;
+    const svc = this.registry?.services?.[environment]?.[serviceName] || null;
+    if (!svc) return null;
+    return { name: serviceName, ...svc };
   }
 
   /**
@@ -125,8 +128,8 @@ export class ServiceRegistry {
     // RESOLVE TARGET SERVICES
     // ═══════════════════════════════════════════════════════════════
     if (target === 'all') {
-      // Wake all services
-      targetServices = Object.values(services);
+      // Wake all services (services is already an array of named objects)
+      targetServices = services;
     } else if (Array.isArray(target)) {
       // Wake specified services
       targetServices = target