@fmode/studio 0.0.5 → 0.0.7

package/bin/fmode.js

@@ -4,713 +4,19 @@
  * Fmode Studio CLI Entry Point
  * npm/npx compatible entry point
  *
- * Features:
- *   - Version checking against repos.fmode.cn
- *   - Automatic binary download and caching
- *   - Process management (start/stop)
- *   - Cache clearing
- *   - Smart upgrade with version detection
+ * This is a thin router that delegates to the modular CLI structure.
+ * All command logic is now in cli/ subdirectories.
  *
  * Usage:
  *   npx @fmode/studio
  *   npx @fmode/studio start
- *   npx @fmode/studio stop
- *   npx @fmode/studio clear
- *   npx @fmode/studio upgrade
+ *   npx @fmode/studio server start
  */
 
-import { spawn, exec } from 'child_process';
-import { fileURLToPath } from 'url';
-import { dirname, join } from 'path';
-import { existsSync, mkdirSync, chmodSync, renameSync, rmSync } from 'fs';
-import { createReadStream, createWriteStream } from 'fs';
-import { pipeline } from 'stream/promises';
-import { unlink, readFile, writeFile, readdir } from 'fs/promises';
-import { promisify } from 'util';
+import { runCli } from '../cli/index.ts';
 
-const execAsync = promisify(exec);
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const rootDir = dirname(__dirname);
-
-// Configuration
-const REPOS_BASE_URL = 'https://repos.fmode.cn/x/fmode-studio';
-const MANIFEST_URL = `${REPOS_BASE_URL}/manifest.json`;
-const CACHE_DIR = join(rootDir, '.cache', 'binaries');
-const PID_DIR = join(rootDir, '.cache', 'pids');
-const PID_FILE = join(PID_DIR, 'fmode.pid');
-const LOG_DIR = join(rootDir, '.cache', 'logs');
-const LOG_FILE = join(LOG_DIR, 'fmode.log');
-
-// Platform detection
-const platform = process.platform;
-const arch = process.arch;
-
-// Map platform/arch to executable name
-function getExecutableName() {
-  const ext = platform === 'win32' ? '.exe' : '';
-
-  if (platform === 'win32' && arch === 'x64') {
-    return `fmode-win-x64${ext}`;
-  } else if (platform === 'win32' && arch === 'arm64') {
-    return `fmode-win-arm64${ext}`;
-  } else if (platform === 'linux' && arch === 'x64') {
-    return 'fmode-linux-x64';
-  } else if (platform === 'linux' && arch === 'arm64') {
-    return 'fmode-linux-arm64';
-  } else if (platform === 'darwin' && arch === 'x64') {
-    return 'fmode-macos-x64';
-  } else if (platform === 'darwin' && arch === 'arm64') {
-    return 'fmode-macos-arm64';
-  } else {
-    throw new Error(`Unsupported platform: ${platform} ${arch}`);
-  }
-}
-
-// Get local package version
-async function getLocalVersion() {
-  const packageJson = join(rootDir, 'package.json');
-  try {
-    const content = await readFile(packageJson, 'utf-8');
-    const pkg = JSON.parse(content);
-    return pkg.version;
-  } catch {
-    return null;
-  }
-}
-
-// Fetch remote manifest from repos.fmode.cn
-async function fetchRemoteManifest() {
-  try {
-    const response = await fetch(MANIFEST_URL);
-    if (!response.ok) {
-      throw new Error(`HTTP ${response.status}`);
-    }
-    return await response.json();
-  } catch (error) {
-    console.warn(`Warning: Could not fetch remote manifest: ${error.message}`);
-    return null;
-  }
-}
-
-// Compare versions (returns positive if a > b, negative if a < b, 0 if equal)
-function compareVersions(a, b) {
-  const partsA = a.split('.').map(Number);
-  const partsB = b.split('.').map(Number);
-
-  for (let i = 0; i < Math.max(partsA.length, partsB.length); i++) {
-    const partA = partsA[i] || 0;
-    const partB = partsB[i] || 0;
-    if (partA !== partB) {
-      return partA - partB;
-    }
-  }
-  return 0;
-}
-
-// Download binary from repos.fmode.cn
-async function downloadBinary(version, executableName) {
-  const url = `${REPOS_BASE_URL}/${version}/${executableName}`;
-  const tempPath = join(CACHE_DIR, `${executableName}.tmp`);
-  const finalPath = join(CACHE_DIR, executableName);
-
-  console.log(`Downloading ${url}...`);
-
-  try {
-    const response = await fetch(url);
-    if (!response.ok) {
-      throw new Error(`HTTP ${response.status}`);
-    }
-
-    // Ensure cache directory exists
-    if (!existsSync(CACHE_DIR)) {
-      mkdirSync(CACHE_DIR, { recursive: true });
-    }
-
-    // Download to temp file
-    const fileStream = createWriteStream(tempPath);
-    await pipeline(response.body, fileStream);
-
-    // Make executable (Unix-like systems)
-    if (platform !== 'win32') {
-      chmodSync(tempPath, 0o755);
-    }
-
-    // Move to final path
-    if (existsSync(finalPath)) {
-      await unlink(finalPath);
-    }
-    renameSync(tempPath, finalPath);
-
-    console.log(`Downloaded to ${finalPath}`);
-    return finalPath;
-  } catch (error) {
-    // Clean up temp file on error
-    if (existsSync(tempPath)) {
-      await unlink(tempPath).catch(() => {});
-    }
-    throw error;
-  }
-}
-
-// Get executable path (cached or bundled)
-async function getExecutablePath() {
-  const executableName = getExecutableName();
-
-  // Priority 1: Try cached binary
-  const cachedPath = join(CACHE_DIR, executableName);
-  if (existsSync(cachedPath)) {
-    return cachedPath;
-  }
-
-  // Priority 2: Try bundled binary
-  const bundledPath = join(rootDir, 'dist', 'bin', executableName);
-  if (existsSync(bundledPath)) {
-    return bundledPath;
-  }
-
-  return null;
-}
-
-// Get current binary version with timeout
-async function getBinaryVersion(executablePath) {
-  return new Promise((resolve) => {
-    let output = '';
-    let timedOut = false;
-
-    const timeout = setTimeout(() => {
-      timedOut = true;
-      child.kill();
-      resolve(null); // Timeout = version unknown
-    }, 3000);
-
-    const child = spawn(executablePath, ['-vvv'], {
-      stdio: ['ignore', 'pipe', 'pipe'],
-      env: { ...process.env }
-    });
-
-    child.stdout.on('data', (data) => {
-      output += data.toString();
-    });
-
-    child.on('exit', (code) => {
-      clearTimeout(timeout);
-      if (timedOut) return;
-
-      // Parse version from output: "@fmode/studio version x.x.x"
-      const match = output.match(/version\s+(\d+\.\d+\.\d+)/);
-      if (match) {
-        resolve(match[1]);
-      } else {
-        resolve(null);
-      }
-    });
-
-    child.on('error', () => {
-      clearTimeout(timeout);
-      resolve(null);
-    });
-  });
-}
-
-// Save PID to file
-function savePid(pid) {
-  if (!existsSync(PID_DIR)) {
-    mkdirSync(PID_DIR, { recursive: true });
-  }
-  writeFile(PID_FILE, String(pid));
-}
-
-// Read PID from file
-async function readPid() {
-  try {
-    const content = await readFile(PID_FILE, 'utf-8');
-    return parseInt(content.trim(), 10);
-  } catch {
-    return null;
-  }
-}
-
-// Check if process is running
-async function isProcessRunning(pid) {
-  try {
-    if (platform === 'win32') {
-      // Windows: 使用 tasklist 检查进程是否存在
-      const { stdout } = await execAsync(`tasklist /FI "PID eq ${pid}" /FO CSV`);
-      return stdout.includes(String(pid));
-    } else {
-      // Unix: 使用 process.kill(pid, 0) 检查
-      process.kill(pid, 0);
-      return true;
-    }
-  } catch {
-    return false;
-  }
-}
-
-// Kill process by PID
-async function killProcess(pid) {
-  try {
-    if (platform === 'win32') {
-      // Windows: 使用 taskkill 强制终止进程
-      await execAsync(`taskkill /F /PID ${pid}`);
-      return true;
-    } else {
-      // Unix: 使用 process.kill
-      process.kill(pid);
-      return true;
-    }
-  } catch {
-    return false;
-  }
-}
-
-// Find fmode processes
-async function findFmodeProcesses() {
-  try {
-    const command = platform === 'win32'
-      ? 'tasklist /FI "IMAGENAME eq fmode*" /FO CSV'
-      : 'ps aux | grep -E "fmode|fmode-win|fmode-linux|fmode-macos" | grep -v grep';
-
-    const { stdout } = await execAsync(command);
-    return stdout;
-  } catch {
-    return '';
-  }
-}
-
-// Find process by port and return PID
-async function findProcessByPort(port) {
-  try {
-    let command;
-    if (platform === 'win32') {
-      // Windows: use netstat to find PID listening on port
-      command = `netstat -ano | findstr :${port} | findstr LISTENING`;
-    } else {
-      // Unix-like: use lsof
-      command = `lsof -ti:${port}`;
-    }
-
-    const { stdout } = await execAsync(command);
-
-    if (platform === 'win32') {
-      // Parse Windows netstat output: format is "protocol local_address foreign_address state pid"
-      // Example: TCP    0.0.0.0:16666    0.0.0.0:0    LISTENING    12345
-      const lines = stdout.trim().split('\n');
-      for (const line of lines) {
-        const parts = line.trim().split(/\s+/);
-        const pid = parseInt(parts[parts.length - 1], 10);
-        if (!isNaN(pid)) {
-          return pid;
-        }
-      }
-    } else {
-      // lsof -ti returns just the PID
-      const pid = parseInt(stdout.trim(), 10);
-      if (!isNaN(pid)) {
-        return pid;
-      }
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
-
-// Get port from args (default 16666)
-function getPortFromArgs(args) {
-  const portIndex = args.indexOf('-p');
-  if (portIndex !== -1 && args[portIndex + 1]) {
-    return parseInt(args[portIndex + 1], 10);
-  }
-  const portIndex2 = args.indexOf('--port');
-  if (portIndex2 !== -1 && args[portIndex2 + 1]) {
-    return parseInt(args[portIndex2 + 1], 10);
-  }
-  return 16666; // default port
-}
-
-// Save PID with port info
-function savePidWithPort(pid, port) {
-  if (!existsSync(PID_DIR)) {
-    mkdirSync(PID_DIR, { recursive: true });
-  }
-  // Save as "pid:port" format
-  writeFile(PID_FILE, `${pid}:${port}`);
-}
-
-// Read PID and port from file
-async function readPidWithPort() {
-  try {
-    const content = await readFile(PID_FILE, 'utf-8');
-    const parts = content.trim().split(':');
-    if (parts.length === 2) {
-      return { pid: parseInt(parts[0], 10), port: parseInt(parts[1], 10) };
-    }
-    return { pid: parseInt(content.trim(), 10), port: null };
-  } catch {
-    return { pid: null, port: null };
-  }
-}
-
-// ============================================================
-// COMMAND: START
-// ============================================================
-/**
- * 启动 Fmode Studio 服务
- * 直接启动二进制文件，输出直接显示在终端
- */
-async function cmdStart(args) {
-  const executablePath = await getExecutablePath();
-
-  // If no executable, download first
-  let finalExecutablePath = executablePath;
-  if (!finalExecutablePath) {
-    console.log('No local binary found. Downloading...');
-    const manifest = await fetchRemoteManifest();
-    if (manifest && manifest.version) {
-      finalExecutablePath = await downloadBinary(manifest.version, getExecutableName());
-    }
-  }
-
-  // 如果仍然没有可执行文件，退出
-  if (!finalExecutablePath) {
-    console.error('No executable found and could not download. Please run "fmode upgrade" first.');
-    process.exit(1);
-  }
-
-  // 直接启动二进制文件，不使用 detached，让输出直接显示在终端
-  spawn(finalExecutablePath, args, {
-    stdio: 'inherit',
-    env: {
-      ...process.env,
-      FORCE_COLOR: process.env.FORCE_COLOR || '1',
-      TERM: process.env.TERM || 'xterm-256color'
-    }
-  }).on('exit', (code) => {
-    process.exit(code ?? 0);
-  });
-}
-
-// ============================================================
-// COMMAND: STOP
-// ============================================================
-async function cmdStop(args) {
-  const port = getPortFromArgs(args);
-  const { pid: savedPid, port: savedPort } = await readPidWithPort();
-
-  // First try to find process by port
-  const portPid = await findProcessByPort(port);
-
-  if (portPid && await isProcessRunning(portPid)) {
-    console.log(`Stopping Fmode Studio on port ${port} (PID: ${portPid})...`);
-    if (await killProcess(portPid)) {
-      console.log('Fmode Studio stopped.');
-      await unlink(PID_FILE).catch(() => {});
-      return;
-    } else {
-      console.error('Failed to stop Fmode Studio.');
-      process.exit(1);
-    }
-  }
-
-  // If no process found on port, check saved PID
-  if (savedPid && await isProcessRunning(savedPid)) {
-    console.log(`Stopping Fmode Studio (PID: ${savedPid})...`);
-    if (await killProcess(savedPid)) {
-      console.log('Fmode Studio stopped.');
-      await unlink(PID_FILE).catch(() => {});
-      return;
-    } else {
-      console.error('Failed to stop Fmode Studio.');
-      process.exit(1);
-    }
-  }
-
-  // Clean up stale PID file
-  if (savedPid || portPid) {
-    console.log('Process not running. Cleaning up PID file...');
-    await unlink(PID_FILE).catch(() => {});
-  }
-
-  // Try to find any fmode processes
-  console.log(`No process found on port ${port}. Searching for Fmode processes...`);
-  const processes = await findFmodeProcesses();
-
-  if (processes.trim()) {
-    console.log('\nFound Fmode processes:');
-    console.log(processes);
-    console.log('\nPlease manually kill the process or use:');
-    console.log(platform === 'win32' ? '  taskkill /F /PID <pid>' : '  kill -9 <pid>');
-  } else {
-    console.log('No Fmode Studio process found running.');
-  }
-}
-
-// ============================================================
-// COMMAND: CLEAR
-// ============================================================
-async function cmdClear() {
-  console.log('Clearing cached binaries...');
-
-  if (!existsSync(CACHE_DIR)) {
-    console.log('No cache directory found.');
-    return;
-  }
-
-  try {
-    const files = await readdir(CACHE_DIR);
-    let removedCount = 0;
-
-    for (const file of files) {
-      const filePath = join(CACHE_DIR, file);
-      try {
-        await unlink(filePath);
-        console.log(`  Removed: ${file}`);
-        removedCount++;
-      } catch (err) {
-        console.warn(`  Skipped: ${file} (${err.message})`);
-      }
-    }
-
-    console.log(`\nCleared ${removedCount} file(s).`);
-  } catch (error) {
-    console.error(`Failed to clear cache: ${error.message}`);
-    process.exit(1);
-  }
-}
-
-// ============================================================
-// COMMAND: LOG
-// ============================================================
-async function cmdLog(args) {
-  // Check for -f or --follow flag
-  const followMode = args.includes('-f') || args.includes('--follow');
-  const linesIndex = args.indexOf('-n') !== -1 ? args.indexOf('-n') : args.indexOf('--lines');
-  const numLines = linesIndex !== -1 ? parseInt(args[linesIndex + 1] || '50', 10) : 50;
-
-  if (!existsSync(LOG_FILE)) {
-    console.log('No log file found. Has the server been started?');
-    console.log(`Expected log file: ${LOG_FILE}`);
-    return;
-  }
-
-  if (followMode) {
-    // Follow mode (tail -f)
-    console.log(`Following log file: ${LOG_FILE} (Ctrl+C to exit)`);
-    console.log(`${'='.repeat(60)}\n`);
-
-    let tailCmd;
-    if (platform === 'win32') {
-      // Windows: use Get-Content with -Wait
-      tailCmd = spawn('powershell', ['-Command', `Get-Content -Path "${LOG_FILE}" -Wait -Tail 50`], {
-        stdio: 'inherit',
-        windowsHide: false // 需要窗口显示输出
-      });
-    } else {
-      // Unix: use tail -f
-      tailCmd = spawn('tail', ['-n', String(numLines), '-f', LOG_FILE], {
-        stdio: 'inherit'
-      });
-    }
-
-    tailCmd.on('error', (err) => {
-      console.log(`Follow mode not available: ${err.message}`);
-      console.log('Showing current log content:');
-      showLogContent(numLines);
-    });
-
-    // 等待 tail 进程结束（用户按 Ctrl+C）
-    await new Promise((resolve) => {
-      tailCmd.on('exit', resolve);
-    });
-  } else {
-    showLogContent(numLines);
-  }
-}
-
-async function showLogContent(numLines) {
-  const content = await readFile(LOG_FILE, 'utf-8');
-  const lines = content.split('\n');
-
-  if (lines.length <= numLines) {
-    console.log(content);
-  } else {
-    console.log(lines.slice(-numLines).join('\n'));
-  }
-}
-
-// ============================================================
-// COMMAND: UPGRADE
-// ============================================================
-async function cmdUpgrade() {
-  console.log('Checking for updates...\n');
-
-  const manifest = await fetchRemoteManifest();
-
-  if (!manifest || !manifest.version) {
-    console.log('Could not fetch remote version.');
-    return;
-  }
-
-  const remoteVersion = manifest.version;
-  console.log(`Remote version: ${remoteVersion}`);
-
-  const executablePath = await getExecutablePath();
-
-  // Case 1: No binary found
-  if (!executablePath) {
-    console.log('No binary found. Downloading latest version...');
-    await downloadBinary(remoteVersion, getExecutableName());
-    console.log('\nUpgrade complete!');
-    return;
-  }
-
-  console.log(`Local binary: ${executablePath}`);
-
-  // Case 2: Check current binary version
-  console.log('Checking local binary version...');
-  const localVersion = await getBinaryVersion(executablePath);
-
-  if (localVersion) {
-    console.log(`Local version: ${localVersion}`);
-
-    const comparison = compareVersions(remoteVersion, localVersion);
-
-    if (comparison > 0) {
-      console.log(`Update available: ${localVersion} -> ${remoteVersion}`);
-      console.log('Downloading...');
-      await downloadBinary(remoteVersion, getExecutableName());
-      console.log('\nUpgrade complete!');
-    } else if (comparison === 0) {
-      console.log('Already up to date.');
-    } else {
-      console.log('Local version is newer.');
-    }
-  } else {
-    // Timeout or error getting version - download latest
-    console.log('Could not determine local version (timeout or error)');
-    console.log('Downloading latest version to ensure compatibility...');
-    await downloadBinary(remoteVersion, getExecutableName());
-    console.log('\nUpgrade complete!');
-  }
-}
-
-// ============================================================
-// MAIN ENTRY POINT
-// ============================================================
-async function main() {
-  const args = process.argv.slice(2);
-
-  // Handle -y flag (auto-confirm)
-  const yesIndex = args.indexOf('-y');
-  if (yesIndex !== -1) {
-    args.splice(yesIndex, 1);
-  }
-
-  // Handle --version flag FIRST (before switch)
-  if (args.includes('--version') || (args.includes('-v') && !args.includes('-vvv'))) {
-    const localVersion = await getLocalVersion();
-    if (localVersion) {
-      console.log(`@fmode/studio v${localVersion}`);
-    } else {
-      console.log('@fmode/studio (version unknown)');
-    }
-    process.exit(0);
-    return;
-  }
-
-  // Handle --help flag FIRST (before switch)
-  if (args.includes('--help') || (args.includes('-h') && !args.includes('--host'))) {
-    console.log(`
-Fmode Code UI Server
-
-USAGE:
-  fmode <COMMAND> [OPTIONS]
-  npx @fmode/studio <COMMAND> [OPTIONS]
-
-COMMANDS:
-  start                    Start the Fmode Studio server (default)
-  stop                     Stop the running Fmode Studio server
-  log                      View server logs
-  clear                    Clear cached binary files
-  upgrade / update         Upgrade to the latest version
-
-OPTIONS:
-  -p, --port <PORT>        Set the server port (default: 16666)
-  -h, --host <HOST>        Set the server host (default: 0.0.0.0)
-      --help               Show this help message
-      --version, -v        Show version information
-
-LOG OPTIONS:
-  -f, --follow             Follow log output (like tail -f)
-  -n, --lines <NUM>        Number of lines to show (default: 50)
-
-EXAMPLES:
-  fmode                       # Start with default settings
-  fmode start                 # Explicitly start the server
-  fmode start --port 8080     # Start on port 8080
-  fmode --port 8080           # Start on port 8080 (same as above)
-  fmode stop                  # Stop the server
-  fmode stop --port 8080      # Stop server on port 8080
-  fmode log                   # Show recent logs
-  fmode log -f                # Follow logs in real-time
-  fmode log -n 100            # Show last 100 log lines
-  fmode clear                 # Clear cached binaries
-  fmode upgrade               # Upgrade to latest version
-
-UPGRADE MECHANISM:
-  The CLI automatically downloads the latest binary from repos.fmode.cn.
-  Use 'fmode upgrade' to manually upgrade.
-`);
-    process.exit(0);
-    return;
-  }
-
-  const command = args[0];
-
-  // Handle commands
-  switch (command) {
-    case 'start':
-      await cmdStart(args.slice(1));
-      return;
-
-    case 'stop':
-      await cmdStop(args.slice(1));
-      process.exit(0);
-      return;
-
-    case 'log':
-      await cmdLog(args.slice(1));
-      process.exit(0);
-      return;
-
-    case 'clear':
-      await cmdClear();
-      process.exit(0);
-      return;
-
-    case 'upgrade':
-      await cmdUpgrade();
-      process.exit(0);
-      return;
-
-    case 'update':
-      // Legacy command - same as upgrade
-      await cmdUpgrade();
-      process.exit(0);
-      return;
-
-    default:
-      // Default: start the server with all args (no command specified)
-      await cmdStart(args);
-      return;
-  }
-}
-
-// Run main function
-main().catch((error) => {
+// Run the CLI
+runCli().catch((error) => {
   console.error('Fatal error:', error);
   process.exit(1);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fmode/studio",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "AI PaaS IDE for Vibe Coding - Cross-platform CLI tool",
   "license": "ISC",
   "author": "Fmode Studio Team",