Update file-manager/app.py

file-manager/app.py

@@ -154,7 +154,7 @@ def term_page():
     <script src="https://cdn.jsdelivr.net/npm/xterm@5.3.0/lib/xterm.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.8.0/lib/xterm-addon-fit.js"></script>
     <script>
-      let term, fit, current = null, cursor = 0, pollTimer = null;
+      let term, fit, current = null, cursor = 0, polling = false;
 
       function initTerm(){
         document.getElementById('term').innerHTML = '';
@@ -163,9 +163,12 @@ def term_page():
         term.loadAddon(fit);
         term.open(document.getElementById('term'));
         fit.fit();
+        // FIX 1: only SEND the keystroke; never echo locally.
+        // The PTY (bash) echoes it back through the poll, so echoing here = duplicates.
         term.onData(d => {
           if(!current) return;
-          fetch('/fm/term_in', {method:'POST', headers:{'Content-Type':'application/json'},
+          fetch('/fm/term_in', {method:'POST',
+            headers:{'Content-Type':'application/json'},
             body: JSON.stringify({name: current, data: d})});
         });
       }
@@ -179,45 +182,60 @@ def term_page():
         names.forEach(n => {
           const t = document.createElement('span');
           t.className = 'tab' + (n===current ? ' active':'');
-          t.textContent = n + '  ✕';
-          t.onclick = (e) => { attach(n); };
-          // click the ✕ area to close
-          t.oncontextmenu = (e)=>{ e.preventDefault(); closeSession(n); };
+
+          const label = document.createElement('span');
+          label.textContent = n + ' ';
+          label.onclick = () => attach(n);
+
+          // FIX 3: explicit close button, separate from tab-switch click
+          const x = document.createElement('span');
+          x.textContent = '✕';
+          x.style.marginLeft = '8px';
+          x.style.color = '#F43256';
+          x.onclick = (e) => { e.stopPropagation(); closeSession(n); };
+
+          t.appendChild(label);
+          t.appendChild(x);
           wrap.appendChild(t);
         });
         const add = document.createElement('span');
         add.className = 'tab'; add.textContent = '＋ New';
         add.onclick = newSession;
         wrap.appendChild(add);
-        // if current session vanished, attach to first available
+
+        // if the current session vanished, drop it (poll will stop touching it)
         if(current && !names.includes(current)){ current = null; }
+        // auto-attach to first session only if nothing is currently attached
         if(!current && names.length){ attach(names[0]); }
       }
 
       async function attach(name){
+        if(current === name){ return; }   // already attached, don't re-stack
         current = name; cursor = 0;
         initTerm();
         // replay full scrollback so you see what happened while away
         const r = await fetch('/fm/term_snapshot?name=' + encodeURIComponent(name));
         const j = await r.json();
+        if(j.gone){ current = null; refreshTabs(); return; }
         term.write(j.data); cursor = j.cursor;
         refreshTabs();
         startPoll();
       }
 
+      // FIX 2: single guarded poll loop — never stack multiple loops (that duplicated output)
       function startPoll(){
-        if(pollTimer) clearTimeout(pollTimer);
+        if(polling) return;
+        polling = true;
         async function poll(){
           if(current){
             try{
               const r = await fetch('/fm/term_out?name=' + encodeURIComponent(current) + '&cursor=' + cursor);
               const j = await r.json();
-              if(j.gone){ current = null; refreshTabs(); return; }
-              if(j.data) term.write(j.data);
-              cursor = j.cursor;
+              if(j.gone){ current = null; refreshTabs(); }
+              else { if(j.data) term.write(j.data); cursor = j.cursor; }
             }catch(e){}
           }
-          pollTimer = setTimeout(poll, 200);
+          setTimeout(poll, 200);
         }
         poll();
       }
@@ -230,10 +248,11 @@ def term_page():
       }
 
       async function closeSession(name){
-        await fetch('/fm/term_close', {method:'POST', headers:{'Content-Type':'application/json'},
+        await fetch('/fm/term_close', {method:'POST',
+          headers:{'Content-Type':'application/json'},
           body: JSON.stringify({name})});
-        if(current===name) current=null;
-        refreshTabs();
+        if(current === name){ current = null; }
+        await refreshTabs();
       }
 
       // boot
@@ -259,8 +278,8 @@ def term_close():
     name = request.get_json(force=True).get("name")
     sh = _shells.get(name)
     if sh:
-        sh.kill()
-        del _shells[name]
+        sh.kill()                 # SIGKILL the bash process
+        _shells.pop(name, None)   # remove from the session list
     return Response(json.dumps({"ok": True}), mimetype="application/json")
 
 @app.route("/term_snapshot")