@aion0/forge 0.2.26 → 0.2.28

package/app/globals.css

@@ -11,6 +11,33 @@
   --green: #22c55e;
   --yellow: #eab308;
   --red: #ef4444;
+  /* Terminal */
+  --term-bg: #1a1a2e;
+  --term-bar: #12122a;
+  --term-border: #2a2a4a;
+  --term-fg: #e0e0e0;
+  --term-cursor: #7c5bf0;
+  --term-dim: #555;
+}
+
+[data-theme="light"] {
+  --bg-primary: #ffffff;
+  --bg-secondary: #f5f5f5;
+  --bg-tertiary: #e8e8e8;
+  --border: #d4d4d4;
+  --text-primary: #1a1a1a;
+  --text-secondary: #666;
+  --accent: #2563eb;
+  --green: #16a34a;
+  --yellow: #ca8a04;
+  --red: #dc2626;
+  /* Terminal */
+  --term-bg: #fafafa;
+  --term-bar: #f0f0f0;
+  --term-border: #d0d0d0;
+  --term-fg: #1a1a1a;
+  --term-cursor: #2563eb;
+  --term-dim: #999;
 }
 
 body {
@@ -23,4 +50,3 @@ body {
 ::-webkit-scrollbar { width: 6px; }
 ::-webkit-scrollbar-track { background: var(--bg-primary); }
 ::-webkit-scrollbar-thumb { background: var(--border); border-radius: 3px; }
-

package/app/login/page.tsx

@@ -12,6 +12,9 @@ export default function LoginPage() {
   useEffect(() => {
     const host = window.location.hostname;
     setIsRemote(!['localhost', '127.0.0.1'].includes(host));
+    // Restore theme
+    const saved = localStorage.getItem('forge-theme');
+    if (saved === 'light') document.documentElement.setAttribute('data-theme', 'light');
   }, []);
 
   const handleLocal = async (e: React.FormEvent) => {

package/components/Dashboard.tsx

@@ -54,8 +54,26 @@ export default function Dashboard({ user }: { user: any }) {
   const [notifications, setNotifications] = useState<any[]>([]);
   const [unreadCount, setUnreadCount] = useState(0);
   const [showNotifications, setShowNotifications] = useState(false);
+  const [showUserMenu, setShowUserMenu] = useState(false);
+  const [theme, setTheme] = useState<'dark' | 'light'>('dark');
   const terminalRef = useRef<WebTerminalHandle>(null);
 
+  // Theme: load from localStorage + apply
+  useEffect(() => {
+    const saved = localStorage.getItem('forge-theme') as 'dark' | 'light' | null;
+    if (saved) {
+      setTheme(saved);
+      document.documentElement.setAttribute('data-theme', saved === 'light' ? 'light' : '');
+    }
+  }, []);
+
+  const toggleTheme = () => {
+    const next = theme === 'dark' ? 'light' : 'dark';
+    setTheme(next);
+    document.documentElement.setAttribute('data-theme', next === 'light' ? 'light' : '');
+    localStorage.setItem('forge-theme', next);
+  };
+
   // Version check (on mount + every 10 min)
   useEffect(() => {
     const check = () => fetch('/api/version').then(r => r.json()).then(setVersionInfo).catch(() => {});
@@ -228,11 +246,11 @@ export default function Dashboard({ user }: { user: any }) {
             </span>
           )}
         </div>
-        <div className="flex items-center gap-3">
+        <div className="flex items-center gap-2.5">
           {viewMode === 'tasks' && (
             <button
               onClick={() => setShowNewTask(true)}
-              className="text-xs px-3 py-1 bg-[var(--accent)] text-white rounded hover:opacity-90"
+              className="text-[10px] px-2.5 py-1 bg-[var(--accent)] text-white rounded hover:opacity-90"
             >
               + New Task
             </button>
@@ -242,24 +260,24 @@ export default function Dashboard({ user }: { user: any }) {
             <span className="text-[10px] text-[var(--text-secondary)] flex items-center gap-1" title={`${onlineCount.total} online${onlineCount.remote > 0 ? `, ${onlineCount.remote} remote` : ''}`}>
               <span className="text-green-500">●</span>
               {onlineCount.total}
-              {onlineCount.remote > 0 && (
-                <span className="text-[var(--accent)]">({onlineCount.remote} remote)</span>
-              )}
             </span>
           )}
+          {/* Alerts */}
           <div className="relative">
             <button
-              onClick={() => { setShowNotifications(v => !v); }}
-              className="text-xs text-[var(--text-secondary)] hover:text-[var(--text-primary)] relative"
+              onClick={() => { setShowNotifications(v => !v); setShowUserMenu(false); }}
+              className="text-[10px] text-[var(--text-secondary)] hover:text-[var(--text-primary)] relative px-1"
             >
               Alerts
               {unreadCount > 0 && (
-                <span className="absolute -top-1.5 -right-2.5 min-w-[14px] h-[14px] rounded-full bg-[var(--red)] text-[8px] text-white flex items-center justify-center px-1 font-bold">
+                <span className="absolute -top-1.5 -right-1.5 min-w-[14px] h-[14px] rounded-full bg-[var(--red)] text-[8px] text-white flex items-center justify-center px-1 font-bold">
                   {unreadCount > 99 ? '99+' : unreadCount}
                 </span>
               )}
             </button>
             {showNotifications && (
+              <>
+              <div className="fixed inset-0 z-40" onClick={() => setShowNotifications(false)} />
               <div className="absolute right-0 top-8 w-[360px] max-h-[480px] bg-[var(--bg-secondary)] border border-[var(--border)] rounded-lg shadow-xl z-50 flex flex-col">
                 <div className="flex items-center justify-between px-3 py-2 border-b border-[var(--border)]">
                   <span className="text-xs font-bold text-[var(--text-primary)]">Notifications</span>
@@ -352,27 +370,44 @@ export default function Dashboard({ user }: { user: any }) {
                   )}
                 </div>
               </div>
+              </>
+            )}
+          </div>
+          {/* User menu */}
+          <div className="relative">
+            <button
+              onClick={() => { setShowUserMenu(v => !v); setShowNotifications(false); }}
+              className="text-[10px] text-[var(--text-secondary)] hover:text-[var(--text-primary)] flex items-center gap-1 px-1"
+            >
+              {user?.name || 'local'} <span className="text-[8px]">▾</span>
+            </button>
+            {showUserMenu && (
+              <>
+                <div className="fixed inset-0 z-40" onClick={() => setShowUserMenu(false)} />
+                <div className="absolute right-0 top-8 w-[140px] bg-[var(--bg-secondary)] border border-[var(--border)] rounded-lg shadow-xl z-50 py-1">
+                  <button
+                    onClick={() => { setShowMonitor(true); setShowUserMenu(false); }}
+                    className="w-full text-left text-[11px] px-3 py-1.5 text-[var(--text-secondary)] hover:text-[var(--text-primary)] hover:bg-[var(--bg-tertiary)]"
+                  >
+                    Monitor
+                  </button>
+                  <button
+                    onClick={() => { setShowSettings(true); setShowUserMenu(false); }}
+                    className="w-full text-left text-[11px] px-3 py-1.5 text-[var(--text-secondary)] hover:text-[var(--text-primary)] hover:bg-[var(--bg-tertiary)]"
+                  >
+                    Settings
+                  </button>
+                  <div className="border-t border-[var(--border)] my-1" />
+                  <button
+                    onClick={() => signOut({ callbackUrl: '/login' })}
+                    className="w-full text-left text-[11px] px-3 py-1.5 text-[var(--text-secondary)] hover:text-[var(--red)] hover:bg-[var(--bg-tertiary)]"
+                  >
+                    Logout
+                  </button>
+                </div>
+              </>
             )}
           </div>
-          <button
-            onClick={() => setShowMonitor(true)}
-            className="text-xs text-[var(--text-secondary)] hover:text-[var(--text-primary)]"
-          >
-            Monitor
-          </button>
-          <button
-            onClick={() => setShowSettings(true)}
-            className="text-xs text-[var(--text-secondary)] hover:text-[var(--text-primary)]"
-          >
-            Settings
-          </button>
-          <span className="text-xs text-[var(--text-secondary)]">{user?.name || 'local'}</span>
-          <button
-            onClick={() => signOut({ callbackUrl: '/login' })}
-            className="text-xs text-[var(--text-secondary)] hover:text-[var(--red)]"
-          >
-            Logout
-          </button>
         </div>
       </header>
 

package/components/DocTerminal.tsx

@@ -35,6 +35,8 @@ export default function DocTerminal({ docRoot }: { docRoot: string }) {
     if (!containerRef.current) return;
 
     let disposed = false;
+    const cs = getComputedStyle(document.documentElement);
+    const tv = (name: string) => cs.getPropertyValue(name).trim();
     const term = new Terminal({
       cursorBlink: true,
       fontSize: 13,
@@ -42,10 +44,10 @@ export default function DocTerminal({ docRoot }: { docRoot: string }) {
       scrollback: 5000,
       logger: { trace: () => {}, debug: () => {}, info: () => {}, warn: () => {}, error: () => {} },
       theme: {
-        background: '#1a1a2e',
-        foreground: '#e0e0e0',
-        cursor: '#7c5bf0',
-        selectionBackground: '#7c5bf066',
+        background: tv('--term-bg') || '#1a1a2e',
+        foreground: tv('--term-fg') || '#e0e0e0',
+        cursor: tv('--term-cursor') || '#7c5bf0',
+        selectionBackground: (tv('--term-cursor') || '#7c5bf0') + '44',
       },
     });
     const fit = new FitAddon();

package/components/WebTerminal.tsx

@@ -434,9 +434,9 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
   const detachedCount = tmuxSessions.filter(s => !usedSessions.includes(s.name)).length;
 
   return (
-    <div className="h-full w-full flex-1 flex flex-col bg-[#1a1a2e] overflow-hidden">
+    <div className="h-full w-full flex-1 flex flex-col bg-[var(--term-bg)] overflow-hidden">
       {/* Tab bar + toolbar */}
-      <div className="flex items-center bg-[#12122a] border-b border-[#2a2a4a] shrink-0">
+      <div className="flex items-center bg-[var(--term-bar)] border-b border-[var(--term-border)] shrink-0">
         {/* Tabs */}
         <div className="flex items-center overflow-x-auto">
           {tabs.map(tab => (
@@ -463,10 +463,10 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
                 }
               }}
               onDragEnd={() => { dragTabRef.current = null; }}
-              className={`flex items-center gap-1 px-3 py-1 text-[11px] cursor-pointer border-r border-[#2a2a4a] select-none ${
+              className={`flex items-center gap-1 px-3 py-1 text-[11px] cursor-pointer border-r border-[var(--term-border)] select-none ${
                 tab.id === activeTabId
-                  ? 'bg-[#1a1a2e] text-white'
-                  : 'text-gray-500 hover:text-gray-300 hover:bg-[#1a1a2e]/50'
+                  ? 'bg-[var(--term-bg)] text-white'
+                  : 'text-gray-500 hover:text-gray-300 hover:bg-[var(--term-bg)]/50'
               }`}
               onClick={() => setActiveTabId(tab.id)}
             >
@@ -481,7 +481,7 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
                     if (e.key === 'Escape') setEditingTabId(null);
                   }}
                   onClick={(e) => e.stopPropagation()}
-                  className="bg-transparent border border-[#4a4a6a] rounded px-1 text-[11px] text-white outline-none w-20"
+                  className="bg-transparent border border-[var(--term-border)] rounded px-1 text-[11px] text-white outline-none w-20"
                 />
               ) : (
                 <span
@@ -506,8 +506,18 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
             </div>
           ))}
           <button
-            onClick={() => setShowNewTabModal(true)}
-            className="px-2 py-1 text-[11px] text-gray-500 hover:text-white hover:bg-[#2a2a4a]"
+            onClick={() => {
+              setShowNewTabModal(true);
+              // Refresh projects list when opening modal
+              fetch('/api/projects').then(r => r.json())
+                .then((p: { name: string; path: string; root: string }[]) => {
+                  if (!Array.isArray(p)) return;
+                  setAllProjects(p);
+                  setProjectRoots([...new Set(p.map(proj => proj.root))]);
+                })
+                .catch(() => {});
+            }}
+            className="px-2 py-1 text-[11px] text-gray-500 hover:text-white hover:bg-[var(--term-border)]"
             title="New tab"
           >
             +
@@ -517,15 +527,15 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
         {/* Toolbar */}
         <div className="flex items-center gap-1 px-2 ml-auto">
           <span className="text-[9px] text-gray-600 mr-2">Shift+drag to copy</span>
-          <button onClick={() => onSplit('vertical')} className="text-[10px] px-2 py-0.5 text-gray-400 hover:text-white hover:bg-[#2a2a4a] rounded">
+          <button onClick={() => onSplit('vertical')} className="text-[10px] px-2 py-0.5 text-gray-400 hover:text-white hover:bg-[var(--term-border)] rounded">
             Split Right
           </button>
-          <button onClick={() => onSplit('horizontal')} className="text-[10px] px-2 py-0.5 text-gray-400 hover:text-white hover:bg-[#2a2a4a] rounded">
+          <button onClick={() => onSplit('horizontal')} className="text-[10px] px-2 py-0.5 text-gray-400 hover:text-white hover:bg-[var(--term-border)] rounded">
             Split Down
           </button>
           <button
             onClick={() => { refreshSessions(); setShowSessionPicker(v => !v); }}
-            className={`text-[10px] px-2 py-0.5 rounded relative ${showSessionPicker ? 'text-white bg-[#7c5bf0]/30' : 'text-gray-400 hover:text-white hover:bg-[#2a2a4a]'}`}
+            className={`text-[10px] px-2 py-0.5 rounded relative ${showSessionPicker ? 'text-white bg-[#7c5bf0]/30' : 'text-gray-400 hover:text-white hover:bg-[var(--term-border)]'}`}
           >
             Sessions
             {detachedCount > 0 && (
@@ -559,7 +569,7 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
             </button>
           )}
           {activeTab && countTerminals(activeTab.tree) > 1 && (
-            <button onClick={onClosePane} className="text-[10px] px-2 py-0.5 text-gray-400 hover:text-red-400 hover:bg-[#2a2a4a] rounded">
+            <button onClick={onClosePane} className="text-[10px] px-2 py-0.5 text-gray-400 hover:text-red-400 hover:bg-[var(--term-border)] rounded">
               Close Pane
             </button>
           )}
@@ -568,7 +578,7 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
 
       {/* Session management panel */}
       {showSessionPicker && (
-        <div className="bg-[#0e0e20] border-b border-[#2a2a4a] px-3 py-2 shrink-0 max-h-48 overflow-y-auto">
+        <div className="bg-[var(--term-bar)] border-b border-[var(--term-border)] px-3 py-2 shrink-0 max-h-48 overflow-y-auto">
           <div className="flex items-center justify-between mb-2">
             <span className="text-[10px] text-gray-400 font-semibold uppercase">Tmux Sessions</span>
             <button
@@ -583,7 +593,7 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
           ) : (
             <table className="w-full text-[10px]">
               <thead>
-                <tr className="text-gray-500 text-left border-b border-[#2a2a4a]">
+                <tr className="text-gray-500 text-left border-b border-[var(--term-border)]">
                   <th className="py-1 pr-3 font-medium">Session</th>
                   <th className="py-1 pr-3 font-medium">Created</th>
                   <th className="py-1 pr-3 font-medium">Status</th>
@@ -595,7 +605,7 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
                   const inUse = usedSessions.includes(s.name);
                   const savedLabel = sessionLabelsRef.current[s.name];
                   return (
-                    <tr key={s.name} className="border-b border-[#2a2a4a]/50 hover:bg-[#1a1a2e]">
+                    <tr key={s.name} className="border-b border-[var(--term-border)]/50 hover:bg-[var(--term-bg)]">
                       <td className="py-1.5 pr-3 text-gray-300">
                         {savedLabel ? (
                           <><span>{savedLabel}</span> <span className="font-mono text-gray-600 text-[9px]">{s.name.replace('mw-', '')}</span></>
@@ -654,22 +664,22 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
       {/* New tab modal */}
       {showNewTabModal && (
         <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50" onClick={() => { setShowNewTabModal(false); setExpandedRoot(null); }}>
-          <div className="bg-[#1a1a2e] border border-[#2a2a4a] rounded-lg shadow-xl w-[350px] max-h-[70vh] flex flex-col" onClick={e => e.stopPropagation()}>
-            <div className="px-4 py-3 border-b border-[#2a2a4a]">
+          <div className="bg-[var(--term-bg)] border border-[var(--term-border)] rounded-lg shadow-xl w-[350px] max-h-[70vh] flex flex-col" onClick={e => e.stopPropagation()}>
+            <div className="px-4 py-3 border-b border-[var(--term-border)]">
               <h3 className="text-sm font-semibold text-white">New Tab</h3>
             </div>
             <div className="flex-1 overflow-y-auto p-2">
               {/* Plain terminal */}
               <button
                 onClick={() => { addTab(); setShowNewTabModal(false); setExpandedRoot(null); }}
-                className="w-full text-left px-3 py-2 rounded hover:bg-[#2a2a4a] text-[12px] text-gray-300 flex items-center gap-2"
+                className="w-full text-left px-3 py-2 rounded hover:bg-[var(--term-border)] text-[12px] text-gray-300 flex items-center gap-2"
               >
                 <span className="text-gray-500">▸</span> Terminal
               </button>
 
               {/* Project roots */}
               {projectRoots.length > 0 && (
-                <div className="mt-2 pt-2 border-t border-[#2a2a4a]">
+                <div className="mt-2 pt-2 border-t border-[var(--term-border)]">
                   <div className="px-3 py-1 text-[9px] text-gray-500 uppercase">Claude in Project</div>
                   {projectRoots.map(root => {
                     const rootName = root.split('/').pop() || root;
@@ -679,7 +689,7 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
                       <div key={root}>
                         <button
                           onClick={() => setExpandedRoot(isExpanded ? null : root)}
-                          className="w-full text-left px-3 py-2 rounded hover:bg-[#2a2a4a] text-[12px] text-gray-300 flex items-center gap-2"
+                          className="w-full text-left px-3 py-2 rounded hover:bg-[var(--term-border)] text-[12px] text-gray-300 flex items-center gap-2"
                         >
                           <span className="text-gray-500 text-[10px] w-3">{isExpanded ? '▾' : '▸'}</span>
                           <span>{rootName}</span>
@@ -690,8 +700,26 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
                             {rootProjects.map(p => (
                               <button
                                 key={p.path}
-                                onClick={() => { addTab(p.path); setShowNewTabModal(false); setExpandedRoot(null); }}
-                                className="w-full text-left px-3 py-1.5 rounded hover:bg-[#2a2a4a] text-[11px] text-gray-300 flex items-center gap-2 truncate"
+                                onClick={async () => {
+                                  setShowNewTabModal(false); setExpandedRoot(null);
+                                  // Pre-check sessions before creating tab
+                                  let hasSession = false;
+                                  try {
+                                    const sRes = await fetch(`/api/claude-sessions/${encodeURIComponent(p.name)}`);
+                                    const sData = await sRes.json();
+                                    hasSession = Array.isArray(sData) ? sData.length > 0 : (Array.isArray(sData.sessions) && sData.sessions.length > 0);
+                                  } catch {}
+                                  const skipFlag = skipPermissions ? ' --dangerously-skip-permissions' : '';
+                                  const resumeFlag = hasSession ? ' --resume' : '';
+                                  const tree = makeTerminal(undefined, p.path);
+                                  const paneId = firstTerminalId(tree);
+                                  pendingCommands.set(paneId, `cd "${p.path}" && claude${resumeFlag}${skipFlag}\n`);
+                                  const tabNum = tabs.length + 1;
+                                  const newTab: TabState = { id: nextId++, label: p.name || `Terminal ${tabNum}`, tree, ratios: {}, activeId: paneId, projectPath: p.path };
+                                  setTabs(prev => [...prev, newTab]);
+                                  setActiveTabId(newTab.id);
+                                }}
+                                className="w-full text-left px-3 py-1.5 rounded hover:bg-[var(--term-border)] text-[11px] text-gray-300 flex items-center gap-2 truncate"
                                 title={p.path}
                               >
                                 <span className="text-gray-600 text-[10px]">↳</span> {p.name}
@@ -708,7 +736,7 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
                 </div>
               )}
             </div>
-            <div className="px-4 py-2 border-t border-[#2a2a4a]">
+            <div className="px-4 py-2 border-t border-[var(--term-border)]">
               <button
                 onClick={() => { setShowNewTabModal(false); setExpandedRoot(null); }}
                 className="w-full text-center text-[11px] text-gray-500 hover:text-gray-300 py-1"
@@ -723,7 +751,7 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
       {/* Close confirmation dialog */}
       {closeConfirm && (
         <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50" onClick={() => setCloseConfirm(null)}>
-          <div className="bg-[#1a1a2e] border border-[#2a2a4a] rounded-lg p-4 shadow-xl max-w-sm" onClick={(e) => e.stopPropagation()}>
+          <div className="bg-[var(--term-bg)] border border-[var(--term-border)] rounded-lg p-4 shadow-xl max-w-sm" onClick={(e) => e.stopPropagation()}>
             <h3 className="text-sm font-semibold text-white mb-2">Close Tab</h3>
             <p className="text-xs text-gray-400 mb-1">
               This tab has {closeConfirm.sessions.length} active session{closeConfirm.sessions.length > 1 ? 's' : ''}:
@@ -950,17 +978,46 @@ const MemoTerminalPane = memo(function TerminalPane({
 
     let disposed = false; // guard against post-cleanup writes (React Strict Mode)
 
+    // Read terminal theme from CSS variables
+    const cs = getComputedStyle(document.documentElement);
+    const tv = (name: string) => cs.getPropertyValue(name).trim();
+    const termBg = tv('--term-bg') || '#1a1a2e';
+    const termFg = tv('--term-fg') || '#e0e0e0';
+    const termCursor = tv('--term-cursor') || '#7c5bf0';
+    const isLight = document.documentElement.getAttribute('data-theme') === 'light';
+
     const term = new Terminal({
       cursorBlink: true,
       fontSize: 13,
       fontFamily: 'Menlo, Monaco, "Courier New", monospace',
       scrollback: 10000,
       logger: { trace: () => {}, debug: () => {}, info: () => {}, warn: () => {}, error: () => {} },
-      theme: {
-        background: '#1a1a2e',
-        foreground: '#e0e0e0',
-        cursor: '#7c5bf0',
-        selectionBackground: '#7c5bf066',
+      theme: isLight ? {
+        background: termBg,
+        foreground: termFg,
+        cursor: termCursor,
+        selectionBackground: termCursor + '44',
+        black: '#1a1a1a',
+        red: '#d32f2f',
+        green: '#388e3c',
+        yellow: '#f57f17',
+        blue: '#1976d2',
+        magenta: '#7b1fa2',
+        cyan: '#0097a7',
+        white: '#424242',
+        brightBlack: '#757575',
+        brightRed: '#e53935',
+        brightGreen: '#43a047',
+        brightYellow: '#f9a825',
+        brightBlue: '#1e88e5',
+        brightMagenta: '#8e24aa',
+        brightCyan: '#00acc1',
+        brightWhite: '#1a1a1a',
+      } : {
+        background: termBg,
+        foreground: termFg,
+        cursor: termCursor,
+        selectionBackground: termCursor + '66',
         black: '#1a1a2e',
         red: '#ff6b6b',
         green: '#69db7c',
@@ -1061,13 +1118,13 @@ const MemoTerminalPane = memo(function TerminalPane({
             createRetries = 0;
             reconnectAttempts = 0;
             onSessionConnected(id, msg.sessionName);
-            // Auto-run claude --resume for project tabs on new session
-            if (isNewlyCreated && projectPathRef.current) {
+            // Auto-run claude for project tabs (only if no pendingCommand already set)
+            if (isNewlyCreated && projectPathRef.current && !pendingCommands.has(id)) {
               isNewlyCreated = false;
               setTimeout(() => {
                 if (!disposed && ws?.readyState === WebSocket.OPEN) {
                   const skipFlag = skipPermRef.current ? ' --dangerously-skip-permissions' : '';
-                  ws.send(JSON.stringify({ type: 'input', data: `cd "${projectPathRef.current}" && claude --resume${skipFlag}\n` }));
+                  ws.send(JSON.stringify({ type: 'input', data: `cd "${projectPathRef.current}" && claude${skipFlag}\n` }));
                 }
               }, 300);
             }

package/package.json

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