@aion0/forge 0.3.0 → 0.3.2

package/bin/forge-server.mjs

@@ -54,7 +54,8 @@ if (process.argv.includes('--version') || process.argv.includes('-v')) {
 }
 
 const isDev = process.argv.includes('--dev');
-const isBackground = process.argv.includes('--background');
+const isForeground = process.argv.includes('--foreground');
+const isBackground = !isForeground && !isDev; // default background unless --foreground or --dev
 const isStop = process.argv.includes('--stop');
 const isRestart = process.argv.includes('--restart');
 const isRebuild = process.argv.includes('--rebuild');
@@ -62,13 +63,47 @@ const resetTerminal = process.argv.includes('--reset-terminal');
 const resetPassword = process.argv.includes('--reset-password');
 
 const webPort = parseInt(getArg('--port')) || 3000;
-const terminalPort = parseInt(getArg('--terminal-port')) || 3001;
-const DATA_DIR = getArg('--dir')?.replace(/^~/, homedir()) || join(homedir(), '.forge');
+const terminalPort = parseInt(getArg('--terminal-port')) || (webPort + 1);
+const DATA_DIR = getArg('--dir')?.replace(/^~/, homedir()) || join(homedir(), '.forge', 'data');
 
 const PID_FILE = join(DATA_DIR, 'forge.pid');
 const LOG_FILE = join(DATA_DIR, 'forge.log');
 
 process.chdir(ROOT);
+
+// ── Migrate old layout (~/.forge/*) to new (~/.forge/data/*) ──
+if (!getArg('--dir')) {
+  const oldSettings = join(homedir(), '.forge', 'settings.yaml');
+  const newSettings = join(DATA_DIR, 'settings.yaml');
+  if (existsSync(oldSettings) && !existsSync(newSettings)) {
+    console.log('[forge] Migrating data from ~/.forge/ to ~/.forge/data/...');
+    mkdirSync(DATA_DIR, { recursive: true });
+    const migrateFiles = ['settings.yaml', '.encrypt-key', '.env.local', 'session-code.json', 'terminal-state.json', 'tunnel-state.json', 'preview.json', 'forge.pid', 'forge.log'];
+    for (const f of migrateFiles) {
+      const src = join(homedir(), '.forge', f);
+      const dest = join(DATA_DIR, f);
+      if (existsSync(src) && !existsSync(dest)) {
+        try { const { copyFileSync } = await import('node:fs'); copyFileSync(src, dest); console.log(`  ${f}`); } catch {}
+      }
+    }
+    // data.db → workflow.db
+    const oldDb = join(homedir(), '.forge', 'data.db');
+    const newDb = join(DATA_DIR, 'workflow.db');
+    if (existsSync(oldDb) && !existsSync(newDb)) {
+      try { const { copyFileSync } = await import('node:fs'); copyFileSync(oldDb, newDb); console.log('  data.db → workflow.db'); } catch {}
+    }
+    // Migrate directories
+    for (const d of ['flows', 'pipelines']) {
+      const src = join(homedir(), '.forge', d);
+      const dest = join(DATA_DIR, d);
+      if (existsSync(src) && !existsSync(dest)) {
+        try { const { renameSync } = await import('node:fs'); renameSync(src, dest); console.log(`  ${d}/`); } catch {}
+      }
+    }
+    console.log('[forge] Migration complete.');
+  }
+}
+
 mkdirSync(DATA_DIR, { recursive: true });
 
 // ── Load <data-dir>/.env.local ──
@@ -108,21 +143,29 @@ if (!isStop) {
 
     const readline = await import('node:readline');
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    const ask = (q) => new Promise(resolve => rl.question(q, resolve));
+    const ask = (q) => new Promise((resolve, reject) => {
+      rl.question(q, resolve);
+      rl.once('close', () => reject(new Error('cancelled')));
+    });
 
     let pw = '';
-    while (true) {
-      pw = await ask('  Enter admin password: ');
-      if (!pw || pw.length < 4) {
-        console.log('  Password must be at least 4 characters');
-        continue;
-      }
-      const confirm = await ask('  Confirm password: ');
-      if (pw !== confirm) {
-        console.log('  Passwords do not match, try again');
-        continue;
+    try {
+      while (true) {
+        pw = await ask('  Enter admin password: ');
+        if (!pw || pw.length < 4) {
+          console.log('  Password must be at least 4 characters');
+          continue;
+        }
+        const confirm = await ask('  Confirm password: ');
+        if (pw !== confirm) {
+          console.log('  Passwords do not match, try again');
+          continue;
+        }
+        break;
       }
-      break;
+    } catch {
+      console.log('\n[forge] Cancelled');
+      process.exit(0);
     }
     rl.close();
 
@@ -170,27 +213,34 @@ const protectedPids = new Set();
 
 function cleanupOrphans() {
   try {
-    const out = execSync("ps aux | grep -E 'telegram-standalone|terminal-standalone|next-server|next start|next dev' | grep -v grep | awk '{print $2}'", {
-      encoding: 'utf-8', timeout: 5000, stdio: ['pipe', 'pipe', 'pipe'],
-    }).trim();
-    if (out) {
-      const myPid = String(process.pid);
-      for (const pid of out.split('\n').filter(Boolean)) {
-        const p = pid.trim();
-        if (p === myPid) continue;
-        if (protectedPids.has(p)) continue; // don't kill processes we just started
-        try { process.kill(parseInt(p), 'SIGTERM'); } catch {}
-      }
-      setTimeout(() => {
-        for (const pid of out.split('\n').filter(Boolean)) {
+    // Only kill processes on OUR ports, not other instances
+    for (const port of [webPort, terminalPort]) {
+      try {
+        const pids = execSync(`lsof -ti:${port}`, { encoding: 'utf-8', timeout: 5000, stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+        const myPid = String(process.pid);
+        for (const pid of pids.split('\n').filter(Boolean)) {
           const p = pid.trim();
-          if (p === myPid) continue;
-          if (protectedPids.has(p)) continue;
-          try { process.kill(parseInt(p), 'SIGKILL'); } catch {}
+          if (p === myPid || protectedPids.has(p)) continue;
+          try { process.kill(parseInt(p), 'SIGTERM'); } catch {}
         }
-      }, 2000);
-      console.log('[forge] Cleaned up orphan processes');
+      } catch {}
     }
+    // Kill standalone processes that belong to this instance (match by FORGE_DATA_DIR)
+    try {
+      const out = execSync(`ps aux | grep -E 'telegram-standalone|terminal-standalone' | grep -v grep`, {
+        encoding: 'utf-8', timeout: 5000, stdio: ['pipe', 'pipe', 'pipe'],
+      }).trim();
+      if (out) {
+        const myPid = String(process.pid);
+        for (const line of out.split('\n').filter(Boolean)) {
+          // Only kill if it matches our DATA_DIR or port
+          if (!line.includes(DATA_DIR) && !line.includes(`PORT=${webPort}`) && !line.includes(`TERMINAL_PORT=${terminalPort}`)) continue;
+          const pid = line.trim().split(/\s+/)[1];
+          if (pid === myPid || protectedPids.has(pid)) continue;
+          try { process.kill(parseInt(pid), 'SIGTERM'); } catch {}
+        }
+      }
+    } catch {}
   } catch {}
 }
 

package/cli/mw.ts

@@ -73,6 +73,18 @@ async function main() {
     process.exit(0);
   }
 
+  if (cmd === '--reset-password') {
+    // Shortcut: delegate to forge-server.mjs --reset-password
+    const { execSync } = await import('node:child_process');
+    const { join, dirname } = await import('node:path');
+    const { fileURLToPath } = await import('node:url');
+    const serverScript = join(dirname(fileURLToPath(import.meta.url)), '..', 'bin', 'forge-server.mjs');
+    try {
+      execSync(`node ${serverScript} --reset-password`, { stdio: 'inherit' });
+    } catch {}
+    process.exit(0);
+  }
+
   switch (cmd) {
     case 'task':
     case 't': {
@@ -349,24 +361,30 @@ async function main() {
       break;
     }
 
-    case 'password':
-    case 'pw': {
+    case 'tunnel_code':
+    case 'tcode': {
       const { readFileSync, existsSync } = await import('node:fs');
-      const { homedir } = await import('node:os');
       const { join } = await import('node:path');
-      const dataDir = process.env.FORGE_DATA_DIR || join(homedir(), '.forge');
+      const { getDataDir: _gdd } = await import('../lib/dirs');
+      const dataDir = _gdd();
       const codeFile = join(dataDir, 'session-code.json');
       try {
         if (existsSync(codeFile)) {
           const data = JSON.parse(readFileSync(codeFile, 'utf-8'));
           if (data.code) {
-            console.log(`Session code: ${data.code} (for remote login 2FA)`);
+            console.log(`Session code: ${data.code}`);
+          } else {
+            console.log('No session code. Start tunnel first.');
           }
+        } else {
+          console.log('No session code. Start tunnel first.');
         }
       } catch {}
-      console.log('Admin password: configured in Settings → Admin Password');
-      console.log('Local login: admin password only');
-      console.log('Remote login: admin password + session code');
+      // Also show tunnel URL if running
+      try {
+        const tunnelState = JSON.parse(readFileSync(join(dataDir, 'tunnel-state.json'), 'utf-8'));
+        if (tunnelState.url) console.log(`Tunnel URL: ${tunnelState.url}`);
+      } catch {}
       break;
     }
 
@@ -553,7 +571,7 @@ Shortcuts: t=task, ls=tasks, w=watch, s=status, l=log, f=flows, p=projects, pw=p
   }
 }
 
-const skipUpdateCheck = ['upgrade', 'uninstall', '--version', '-v'];
+const skipUpdateCheck = ['upgrade', 'uninstall', '--version', '-v', '--reset-password'];
 main().then(() => { if (!skipUpdateCheck.includes(cmd)) return checkForUpdate(); }).catch(err => {
   console.error(err.message);
   process.exit(1);

package/components/Dashboard.tsx

@@ -84,6 +84,20 @@ export default function Dashboard({ user }: { user: any }) {
   }, []);
   useEffect(() => { refreshDisplayName(); }, [refreshDisplayName]);
 
+  // Listen for open-terminal events from ProjectManager
+  useEffect(() => {
+    const handler = (e: Event) => {
+      const { projectPath, projectName } = (e as CustomEvent).detail;
+      setViewMode('terminal');
+      // Give terminal time to render, then trigger open
+      setTimeout(() => {
+        terminalRef.current?.openProjectTerminal?.(projectPath, projectName);
+      }, 300);
+    };
+    window.addEventListener('forge:open-terminal', handler);
+    return () => window.removeEventListener('forge:open-terminal', handler);
+  }, []);
+
   // Version check (on mount + every 10 min)
   useEffect(() => {
     const check = () => fetch('/api/version').then(r => r.json()).then(setVersionInfo).catch(() => {});