@aion0/forge 0.2.31 → 0.2.33

package/app/login/page.tsx

@@ -8,6 +8,7 @@ export default function LoginPage() {
   const [sessionCode, setSessionCode] = useState('');
   const [error, setError] = useState('');
   const [isRemote, setIsRemote] = useState(false);
+  const [showHelp, setShowHelp] = useState(false);
 
   useEffect(() => {
     const host = window.location.hostname;
@@ -76,6 +77,21 @@ export default function LoginPage() {
               Session code is generated when tunnel starts. Use /tunnel_code in Telegram to get it.
             </p>
           )}
+          <div className="text-center">
+            <button
+              type="button"
+              onClick={() => setShowHelp(v => !v)}
+              className="text-[10px] text-[var(--text-secondary)] hover:text-[var(--text-primary)]"
+            >
+              Forgot password?
+            </button>
+            {showHelp && (
+              <p className="text-[10px] text-[var(--text-secondary)] mt-1 bg-[var(--bg-tertiary)] rounded p-2">
+                Run in terminal:<br />
+                <code className="text-[var(--accent)]">forge server start --reset-password</code>
+              </p>
+            )}
+          </div>
         </form>
 
       </div>

package/bin/forge-server.mjs

@@ -59,6 +59,7 @@ const isStop = process.argv.includes('--stop');
 const isRestart = process.argv.includes('--restart');
 const isRebuild = process.argv.includes('--rebuild');
 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;
@@ -89,6 +90,67 @@ process.env.PORT = String(webPort);
 process.env.TERMINAL_PORT = String(terminalPort);
 process.env.FORGE_DATA_DIR = DATA_DIR;
 
+// ── Password setup (first run or --reset-password) ──
+if (!isStop) {
+  const YAML = await import('yaml');
+  const settingsFile = join(DATA_DIR, 'settings.yaml');
+  let settings = {};
+  try { settings = YAML.parse(readFileSync(settingsFile, 'utf-8')) || {}; } catch {}
+
+  const hasPassword = !!settings.telegramTunnelPassword;
+
+  if (resetPassword || !hasPassword) {
+    if (resetPassword) {
+      console.log('[forge] Password reset requested');
+    } else {
+      console.log('[forge] First run — please set an admin password');
+    }
+
+    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));
+
+    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;
+      }
+      break;
+    }
+    rl.close();
+
+    // Encrypt and save
+    const crypto = await import('node:crypto');
+    const KEY_FILE = join(DATA_DIR, '.encrypt-key');
+    let encKey;
+    if (existsSync(KEY_FILE)) {
+      encKey = Buffer.from(readFileSync(KEY_FILE, 'utf-8').trim(), 'hex');
+    } else {
+      encKey = crypto.randomBytes(32);
+      writeFileSync(KEY_FILE, encKey.toString('hex'), { mode: 0o600 });
+    }
+    const iv = crypto.randomBytes(12);
+    const cipher = crypto.createCipheriv('aes-256-gcm', encKey, iv);
+    const encrypted = Buffer.concat([cipher.update(pw, 'utf-8'), cipher.final()]);
+    const tag = cipher.getAuthTag();
+    settings.telegramTunnelPassword = `enc:${iv.toString('base64')}.${tag.toString('base64')}.${encrypted.toString('base64')}`;
+    if (!existsSync(dirname(settingsFile))) mkdirSync(dirname(settingsFile), { recursive: true });
+    writeFileSync(settingsFile, YAML.stringify(settings), 'utf-8');
+    console.log('[forge] Admin password saved');
+
+    if (resetPassword && !isDev && !isBackground && !isRestart) {
+      process.exit(0);
+    }
+  }
+}
+
 // ── Reset terminal server (kill port + tmux sessions) ──
 if (resetTerminal) {
   console.log(`[forge] Resetting terminal server (port ${terminalPort})...`);

package/components/SettingsModal.tsx

@@ -795,6 +795,9 @@ export default function SettingsModal({ onClose }: { onClose: () => void }) {
             isSet={!!secretStatus.telegramTunnelPassword}
             onEdit={() => setEditingSecret({ field: 'telegramTunnelPassword', label: 'Admin Password' })}
           />
+          <p className="text-[9px] text-[var(--text-secondary)]">
+            Forgot? Run: <code className="text-[var(--accent)]">forge server start --reset-password</code>
+          </p>
         </div>
 
         {/* Actions */}

package/components/WebTerminal.tsx

@@ -35,7 +35,7 @@ interface TabState {
   tree: SplitNode;
   ratios: Record<number, number>;
   activeId: number;
-  projectPath?: string;  // If set, auto-run claude --resume in this dir on session create
+  projectPath?: string;
 }
 
 // ─── Layout persistence ──────────────────────────────────────
@@ -187,9 +187,32 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
 
   // Restore shared state from server after mount
   useEffect(() => {
-    loadSharedState().then(saved => {
+    // Fetch settings for skipPermissions
+    fetch('/api/settings').then(r => r.json())
+      .then((s: any) => { if (s.skipPermissions) setSkipPermissions(true); })
+      .catch(() => {});
+    // Load state + projects together, then patch missing projectPath
+    Promise.all([
+      loadSharedState(),
+      fetch('/api/projects').then(r => r.json()).catch(() => []),
+    ]).then(([saved, projects]) => {
+      const projList: { name: string; path: string; root: string }[] = Array.isArray(projects) ? projects : [];
+      setAllProjects(projList);
+      setProjectRoots([...new Set(projList.map(p => p.root))]);
+
       if (saved && saved.tabs.length > 0) {
         initNextIdFromTabs(saved.tabs);
+        // Patch missing projectPath by matching tab label to project name
+        for (const tab of saved.tabs) {
+          if (!tab.projectPath) {
+            const match = projList.find(p => p.name.toLowerCase() === tab.label.toLowerCase());
+            if (match) {
+              tab.projectPath = match.path;
+              // Also patch tree node
+              if (tab.tree.type === 'terminal') tab.tree.projectPath = match.path;
+            }
+          }
+        }
         setTabs(saved.tabs);
         setActiveTabId(saved.activeTabId);
         sessionLabelsRef.current = saved.sessionLabels || {};
@@ -197,27 +220,24 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
       }
       setHydrated(true);
     });
-    // Fetch settings for skipPermissions
-    fetch('/api/settings').then(r => r.json())
-      .then((s: any) => { if (s.skipPermissions) setSkipPermissions(true); })
-      .catch(() => {});
-    // Fetch projects and derive roots
-    fetch('/api/projects').then(r => r.json())
-      .then((p: { name: string; path: string; root: string }[]) => {
-        if (!Array.isArray(p)) return;
-        setAllProjects(p);
-        const roots = [...new Set(p.map(proj => proj.root))];
-        setProjectRoots(roots);
-      })
-      .catch(() => {});
   }, []);
 
   // Persist to server on changes (debounced, only after hydration)
   const saveTimerRef = useRef(0);
   useEffect(() => {
     if (!hydrated) return;
-    // Sync session labels ref
-    const labels = { ...sessionLabelsRef.current };
+    // Collect all active session names from current tabs
+    const activeSessionNames = new Set<string>();
+    for (const tab of tabs) {
+      for (const sn of collectSessionNames(tab.tree)) {
+        activeSessionNames.add(sn);
+      }
+    }
+    // Only keep labels for active sessions (clean up stale entries)
+    const labels: Record<string, string> = {};
+    for (const sn of activeSessionNames) {
+      labels[sn] = sessionLabelsRef.current[sn] || '';
+    }
     for (const tab of tabs) {
       for (const sn of collectSessionNames(tab.tree)) {
         labels[sn] = tab.label;

package/lib/terminal-standalone.ts

@@ -53,7 +53,17 @@ function loadTerminalState(): unknown {
 function saveTerminalState(data: unknown): void {
   try {
     mkdirSync(STATE_DIR, { recursive: true });
-    writeFileSync(STATE_FILE, JSON.stringify(data, null, 2));
+    const json = JSON.stringify(data, null, 2);
+    writeFileSync(STATE_FILE, json);
+    // Debug: check if projectPath is being saved
+    const parsed = JSON.parse(json);
+    if (parsed.tabs) {
+      for (const t of parsed.tabs) {
+        if (t.projectPath || t.tree?.projectPath) {
+          console.log(`[terminal] Saved tab "${t.label}" with projectPath: tab=${t.projectPath} tree=${t.tree?.projectPath}`);
+        }
+      }
+    }
   } catch (e) {
     console.error('[terminal] Failed to save state:', e);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aion0/forge",
-  "version": "0.2.31",
+  "version": "0.2.33",
   "description": "Unified AI workflow platform — multi-model task orchestration, persistent sessions, web terminal, remote access",
   "type": "module",
   "scripts": {