deckide 3.2.0 → 3.3.1

package/bin/deckide.js

@@ -4,12 +4,14 @@ import { fileURLToPath } from 'node:url';
 import path from 'node:path';
 import os from 'node:os';
 import fs from 'node:fs';
-import { execSync } from 'node:child_process';
+import { execSync, spawn } from 'node:child_process';
 import crypto from 'node:crypto';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const dataDir = path.join(os.homedir(), '.deckide');
 const settingsFile = path.join(dataDir, 'settings.json');
+const pidFile = path.join(dataDir, 'server.pid');
+const logFile = path.join(dataDir, 'server.log');
 
 // ─── Settings helpers ───────────────────────────────────────────
 
@@ -26,6 +28,22 @@ function saveSettings(settings) {
   fs.writeFileSync(settingsFile, JSON.stringify(settings, null, 2) + '\n');
 }
 
+function getPort() {
+  return loadSettings().port || 8787;
+}
+
+function isServerRunning() {
+  const port = getPort();
+  try {
+    execSync(`curl -sf -o /dev/null http://localhost:${port}/health`, {
+      timeout: 2000, stdio: 'ignore',
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 // ─── CLI ────────────────────────────────────────────────────────
 
 const args = process.argv.slice(2);
@@ -40,32 +58,33 @@ if (command === '--version' || command === '-v') {
 
 // ── deckide help ──
 if (command === '--help' || command === '-h' || command === 'help') {
-  console.log(`
-Deck IDE - Browser-based IDE
+  console.log(`Deck IDE - Browser-based IDE
 
 Usage:
-  deckide                        Start the server
+  deckide [start]                Start server (background)
+  deckide start --fg             Start server (foreground)
+  deckide stop                   Stop server
+  deckide restart                Restart server
+  deckide status                 Show server status
+  deckide logs                   Show server logs
+
   deckide config                 Show all settings
   deckide config set <key> <val> Set a config value
   deckide config get <key>       Get a config value
   deckide config reset           Reset all settings
-  deckide auth on                Enable basic auth (interactive)
+
+  deckide auth on [user] [pass]  Enable basic auth
   deckide auth off               Disable basic auth
   deckide auth status            Show auth status
-  deckide status                 Show server status
-  deckide stop                   Stop running server
 
-Start options:
-  -p, --port <port>              Port to listen on
-  --host <host>                  Host to bind to
+Options (for start):
+  -p, --port <port>              Port (default: 8787)
+  --host <host>                  Host (default: 0.0.0.0)
   --no-open                      Don't open browser
+  --fg                           Run in foreground
 
 Config keys:
-  port                           Server port (default: 8787)
-  host                           Bind host (default: 0.0.0.0)
-  cors                           CORS origin
-  maxFileSize                    Max file size in bytes
-  trustProxy                     Trust proxy headers (true/false)
+  port, host, cors, maxFileSize, trustProxy
 `);
   process.exit(0);
 }
@@ -76,7 +95,6 @@ if (command === 'config') {
   const settings = loadSettings();
 
   if (!sub || sub === 'list') {
-    // Show all config
     if (Object.keys(settings).length === 0) {
       console.log('No custom settings. Using defaults.');
       console.log('  port: 8787');
@@ -95,33 +113,21 @@ if (command === 'config') {
 
   if (sub === 'get') {
     const key = args[2];
-    if (!key) {
-      console.error('Usage: deckide config get <key>');
-      process.exit(1);
-    }
+    if (!key) { console.error('Usage: deckide config get <key>'); process.exit(1); }
     const val = settings[key];
-    if (val === undefined) {
-      console.log(`${key}: (not set)`);
-    } else if (key === 'basicAuthPassword') {
-      console.log(`${key}: ********`);
-    } else {
-      console.log(`${key}: ${val}`);
-    }
+    if (val === undefined) console.log(`${key}: (not set)`);
+    else if (key === 'basicAuthPassword') console.log(`${key}: ********`);
+    else console.log(`${key}: ${val}`);
     process.exit(0);
   }
 
   if (sub === 'set') {
     const key = args[2];
     let value = args[3];
-    if (!key || value === undefined) {
-      console.error('Usage: deckide config set <key> <value>');
-      process.exit(1);
-    }
-    // Type coercion
+    if (!key || value === undefined) { console.error('Usage: deckide config set <key> <value>'); process.exit(1); }
     if (value === 'true') value = true;
     else if (value === 'false') value = false;
     else if (/^\d+$/.test(value)) value = parseInt(value, 10);
-
     settings[key] = value;
     saveSettings(settings);
     console.log(`${key} = ${key === 'basicAuthPassword' ? '********' : value}`);
@@ -143,7 +149,7 @@ if (command === 'auth') {
   const sub = args[1];
   const settings = loadSettings();
 
-  if (sub === 'status') {
+  if (!sub || sub === 'status') {
     if (settings.basicAuthEnabled) {
       console.log('Basic auth: enabled');
       console.log(`  user: ${settings.basicAuthUser || '(not set)'}`);
@@ -151,6 +157,11 @@ if (command === 'auth') {
     } else {
       console.log('Basic auth: disabled');
     }
+    if (!sub) {
+      console.log('\nUsage:');
+      console.log('  deckide auth on [user] [password]');
+      console.log('  deckide auth off');
+    }
     process.exit(0);
   }
 
@@ -160,58 +171,29 @@ if (command === 'auth') {
     delete settings.basicAuthPassword;
     saveSettings(settings);
     console.log('Basic auth disabled.');
+    if (isServerRunning()) console.log('Run "deckide restart" to apply.');
     process.exit(0);
   }
 
   if (sub === 'on') {
     const user = args[2];
     const password = args[3];
+    const genUser = user || 'admin';
+    const genPassword = password || crypto.randomBytes(16).toString('base64url');
 
-    if (!user || !password) {
-      // Generate random password if not provided
-      const genUser = user || 'admin';
-      const genPassword = crypto.randomBytes(16).toString('base64url');
-      settings.basicAuthEnabled = true;
-      settings.basicAuthUser = genUser;
-      settings.basicAuthPassword = genPassword;
-      saveSettings(settings);
-      console.log('Basic auth enabled.');
-      console.log(`  user: ${genUser}`);
-      console.log(`  password: ${genPassword}`);
-      console.log('');
-      console.log('Restart the server for changes to take effect.');
-      process.exit(0);
-    }
-
-    if (password.length < 8) {
+    if (password && password.length < 8) {
       console.error('Error: password must be at least 8 characters.');
       process.exit(1);
     }
 
     settings.basicAuthEnabled = true;
-    settings.basicAuthUser = user;
-    settings.basicAuthPassword = password;
+    settings.basicAuthUser = genUser;
+    settings.basicAuthPassword = genPassword;
     saveSettings(settings);
     console.log('Basic auth enabled.');
-    console.log(`  user: ${user}`);
-    console.log('Restart the server for changes to take effect.');
-    process.exit(0);
-  }
-
-  if (!sub) {
-    // Default to status
-    const enabled = settings.basicAuthEnabled;
-    if (enabled) {
-      console.log('Basic auth: enabled');
-      console.log(`  user: ${settings.basicAuthUser || '(not set)'}`);
-    } else {
-      console.log('Basic auth: disabled');
-    }
-    console.log('');
-    console.log('Usage:');
-    console.log('  deckide auth on [user] [password]  Enable auth');
-    console.log('  deckide auth off                   Disable auth');
-    console.log('  deckide auth status                Show status');
+    console.log(`  user: ${genUser}`);
+    if (!password) console.log(`  password: ${genPassword}`);
+    if (isServerRunning()) console.log('Run "deckide restart" to apply.');
     process.exit(0);
   }
 
@@ -222,108 +204,199 @@ if (command === 'auth') {
 // ── deckide status ──
 if (command === 'status') {
   const settings = loadSettings();
-  const daemonInfoPath = path.join(dataDir, 'pty-daemon.json');
+  const port = settings.port || 8787;
 
-  console.log('Deck IDE status');
-  console.log(`  data dir: ${dataDir}`);
-  console.log(`  port: ${settings.port || 8787}`);
-  console.log(`  auth: ${settings.basicAuthEnabled ? 'enabled' : 'disabled'}`);
+  console.log('Deck IDE');
+  console.log(`  data:   ${dataDir}`);
+  console.log(`  port:   ${port}`);
+  console.log(`  auth:   ${settings.basicAuthEnabled ? 'enabled' : 'disabled'}`);
 
-  // Check if server is running
-  const port = settings.port || 8787;
-  try {
-    const res = execSync(`curl -s -o /dev/null -w "%{http_code}" http://localhost:${port}/health`, {
-      timeout: 3000,
-    }).toString().trim();
-    console.log(`  server: running (port ${port})`);
-  } catch {
-    console.log('  server: not running');
+  if (isServerRunning()) {
+    console.log(`  server: \x1b[32mrunning\x1b[0m → http://localhost:${port}`);
+  } else {
+    console.log('  server: \x1b[31mstopped\x1b[0m');
   }
 
-  // Check PTY daemon
-  if (fs.existsSync(daemonInfoPath)) {
+  // Check PID file
+  if (fs.existsSync(pidFile)) {
     try {
-      const info = JSON.parse(fs.readFileSync(daemonInfoPath, 'utf-8'));
-      console.log(`  pty daemon: running (pid ${info.pid}, port ${info.port})`);
+      const pid = parseInt(fs.readFileSync(pidFile, 'utf-8').trim(), 10);
+      process.kill(pid, 0); // Check if process exists
+      console.log(`  pid:    ${pid}`);
     } catch {
-      console.log('  pty daemon: unknown');
+      // stale pid file
     }
-  } else {
-    console.log('  pty daemon: not running');
+  }
+
+  const daemonInfoPath = path.join(dataDir, 'pty-daemon.json');
+  if (fs.existsSync(daemonInfoPath)) {
+    try {
+      const info = JSON.parse(fs.readFileSync(daemonInfoPath, 'utf-8'));
+      console.log(`  pty:    pid ${info.pid}, port ${info.port}`);
+    } catch {}
   }
 
   process.exit(0);
 }
 
+// ── deckide logs ──
+if (command === 'logs') {
+  if (!fs.existsSync(logFile)) {
+    console.log('No logs found.');
+    process.exit(0);
+  }
+  const follow = args.includes('-f') || args.includes('--follow');
+  if (follow) {
+    const tail = spawn('tail', ['-f', logFile], { stdio: 'inherit' });
+    tail.on('exit', () => process.exit(0));
+  } else {
+    const lines = fs.readFileSync(logFile, 'utf-8');
+    // Show last 50 lines
+    const arr = lines.split('\n');
+    console.log(arr.slice(-51).join('\n'));
+  }
+  if (!args.includes('-f') && !args.includes('--follow')) process.exit(0);
+}
+
 // ── deckide stop ──
 if (command === 'stop') {
-  const settings = loadSettings();
-  const port = settings.port || 8787;
+  if (!isServerRunning()) {
+    console.log('Server is not running.');
+    process.exit(0);
+  }
+  const port = getPort();
   try {
-    execSync(`curl -s -X POST http://localhost:${port}/api/shutdown -H "Content-Type: application/json" -d '{"terminateDaemon":true}'`, {
-      timeout: 5000,
+    execSync(`curl -sf -X POST http://localhost:${port}/api/shutdown -H "Content-Type: application/json" -d '{"terminateDaemon":true}'`, {
+      timeout: 5000, stdio: 'ignore',
     });
+    // Clean up pid file
+    try { fs.unlinkSync(pidFile); } catch {}
     console.log('Server stopped.');
   } catch {
-    console.log('Server is not running or could not be reached.');
+    console.error('Failed to stop server.');
   }
   process.exit(0);
 }
 
-// ── deckide (start server) ──
+// ── deckide restart ──
+if (command === 'restart') {
+  if (isServerRunning()) {
+    const port = getPort();
+    try {
+      execSync(`curl -sf -X POST http://localhost:${port}/api/shutdown -H "Content-Type: application/json" -d '{"terminateDaemon":true}'`, {
+        timeout: 5000, stdio: 'ignore',
+      });
+      try { fs.unlinkSync(pidFile); } catch {}
+      console.log('Server stopped.');
+    } catch {}
+    // Wait a moment for port to free
+    await new Promise(r => setTimeout(r, 1000));
+  }
+  // Re-exec as start (background)
+  const restartArgs = ['start', ...args.slice(1)];
+  const child = spawn(process.execPath, [fileURLToPath(import.meta.url), ...restartArgs], {
+    stdio: 'inherit',
+  });
+  child.on('exit', (code) => process.exit(code));
+}
+
+// ── deckide / deckide start ──
 
 // Parse start options
-const startOptions = {
-  port: null,
-  host: null,
-  open: true,
-};
-
-for (let i = 0; i < args.length; i++) {
-  const arg = args[i];
-  if ((arg === '--port' || arg === '-p') && args[i + 1]) {
-    startOptions.port = parseInt(args[i + 1], 10);
+const isStart = command === 'start' || !command;
+if (!isStart) {
+  console.error(`Unknown command: ${command}`);
+  console.error('Run "deckide help" for usage.');
+  process.exit(1);
+}
+
+const startArgs = command === 'start' ? args.slice(1) : args;
+const startOptions = { port: null, host: null, open: true, fg: false };
+
+for (let i = 0; i < startArgs.length; i++) {
+  const arg = startArgs[i];
+  if ((arg === '--port' || arg === '-p') && startArgs[i + 1]) {
+    startOptions.port = parseInt(startArgs[i + 1], 10);
     i++;
-  } else if (arg === '--host' && args[i + 1]) {
-    startOptions.host = args[i + 1];
+  } else if (arg === '--host' && startArgs[i + 1]) {
+    startOptions.host = startArgs[i + 1];
     i++;
   } else if (arg === '--no-open') {
     startOptions.open = false;
-  } else if (arg && !arg.startsWith('-')) {
-    console.error(`Unknown command: ${arg}`);
-    console.error('Run "deckide help" for usage.');
-    process.exit(1);
+  } else if (arg === '--fg') {
+    startOptions.fg = true;
   }
 }
 
-// Load settings and apply CLI overrides
 const settings = loadSettings();
 const port = startOptions.port || settings.port || 8787;
 const host = startOptions.host || settings.host || '0.0.0.0';
 
+// Check if already running
+if (isServerRunning()) {
+  console.log(`Server is already running on http://localhost:${port}`);
+  process.exit(0);
+}
+
+// ── Background mode (default) ──
+if (!startOptions.fg) {
+  fs.mkdirSync(dataDir, { recursive: true });
+
+  const out = fs.openSync(logFile, 'a');
+  const err = fs.openSync(logFile, 'a');
+
+  const fgArgs = ['start', '--fg', '--no-open', '-p', String(port), '--host', host];
+  const child = spawn(process.execPath, [fileURLToPath(import.meta.url), ...fgArgs], {
+    detached: true,
+    stdio: ['ignore', out, err],
+    env: { ...process.env, DECKIDE_DATA_DIR: dataDir },
+  });
+
+  // Write PID file
+  fs.writeFileSync(pidFile, String(child.pid));
+  child.unref();
+
+  // Wait for server to be ready
+  const startTime = Date.now();
+  let ready = false;
+  while (Date.now() - startTime < 8000) {
+    await new Promise(r => setTimeout(r, 300));
+    if (isServerRunning()) { ready = true; break; }
+  }
+
+  if (ready) {
+    const url = `http://localhost:${port}`;
+    console.log(`Deck IDE running at ${url} (pid: ${child.pid})`);
+
+    if (startOptions.open) {
+      try {
+        if (process.platform === 'darwin') execSync(`open ${url}`);
+        else if (process.platform === 'win32') execSync(`start ${url}`);
+        else execSync(`xdg-open ${url}`);
+      } catch {}
+    }
+  } else {
+    console.error('Server failed to start. Check logs: deckide logs');
+  }
+
+  process.exit(0);
+}
+
+// ── Foreground mode (--fg) ──
 process.env.DECKIDE_DATA_DIR = dataDir;
 process.env.PORT = String(port);
 process.env.HOST = host;
 
-// Import and start the server
 const { createServer } = await import(path.join(__dirname, '..', 'dist', 'server.js'));
 await createServer();
 
-// Open browser after server starts
 if (startOptions.open) {
   const url = `http://localhost:${port}`;
   setTimeout(() => {
     try {
-      const platform = process.platform;
-      if (platform === 'darwin') {
-        execSync(`open ${url}`);
-      } else if (platform === 'win32') {
-        execSync(`start ${url}`);
-      } else {
-        execSync(`xdg-open ${url}`);
-      }
-    } catch {
-      // Silently fail if browser can't be opened
-    }
+      if (process.platform === 'darwin') execSync(`open ${url}`);
+      else if (process.platform === 'win32') execSync(`start ${url}`);
+      else execSync(`xdg-open ${url}`);
+    } catch {}
   }, 500);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deckide",
-  "version": "3.2.0",
+  "version": "3.3.1",
   "description": "Deck IDE - Browser-based IDE with terminal, file explorer, and git integration",
   "type": "module",
   "bin": {