Upload app.py with huggingface_hub

app.py

@@ -10,6 +10,7 @@ import asyncio
 import json
 import base64
 import logging
+import time
 import uuid
 
 import spaces
@@ -40,10 +41,18 @@ ALLOWED_BASES = [os.path.abspath(p) for p in (
     "/app", "/home/user", "/workspace", "/home/app", HOME
 )]
 
-# 斷線後 session 保留的閒置時間（沒有任何分頁接回就會被清除）
-SESSION_IDLE_TIMEOUT = 30 * 60  # 30 分鐘
+# 共用主 session：所有裝置／瀏覽器預設都接到這一個，且永不被閒置清除。
+# 沒有帶 session_id 的 /ws 連線一律接這裡；前端第一頁固定用這個，所以
+# 不同裝置、斷線數小時後都會回到同一個終端機（opencode 也還在原地跑）。
+PRIMARY_SESSION_ID = "primary"
+# 前端按「+」開新分頁時送這個 id，代表「給我一個新的獨立 session」
+NEW_SESSION_ID = "__new__"
+# 非共用分頁斷線後保留的閒置時間（沒有任何分頁接回就會被清除）
+SESSION_IDLE_TIMEOUT = int(os.environ.get("SESSION_IDLE_TIMEOUT", str(30 * 60)))
 # 每個 session 保留的畫面回放緩衝區大小上限（bytes）
 SESSION_BUFFER_MAX = 300_000
+# 本機測試時可跳過 opencode / 編輯器安裝
+SKIP_INSTALL = os.environ.get("WEBTERM_SKIP_INSTALL", "") == "1"
 # ──────────────────────────── Frontend ────────────────────────────
 HTML_PAGE = r"""<!DOCTYPE html>
 <html lang="zh-TW">
@@ -227,6 +236,9 @@ function connect(tabObj) {
       if (m.type === 'session') {
         // 伺服器告訴我們這條連線對應的 session id：記住它，下次斷線/重整才能接回同一個終端機
         tabObj.sessionId = m.id;
+        tabObj.shared = !!m.primary;
+        const titleEl = tabObj.el.querySelector('.tab-title');
+        if (titleEl) titleEl.textContent = `終端機 ${tabObj.id}${tabObj.shared ? '（共用）' : ''}`;
         if (m.reattached) setAppStatus(`終端機 ${tabObj.id} 已接回原工作階段`, 'success');
         saveTabs();
       } else if (m.type === 'output') {
@@ -259,13 +271,13 @@ function connect(tabObj) {
   ws.onerror = () => ws.close();
 }
 
-function createTab(type = 'terminal', sessionId = null) {
+function createTab(type = 'terminal', sessionId = null, shared = false) {
   const id = ++cnt;
 
   const el = document.createElement('div');
   el.className = 'tab';
   el.dataset.id = id;
-  el.innerHTML = `<span class="status-dot"></span><span>終端機 ${id}</span><span class="x">&times;</span>`;
+  el.innerHTML = `<span class="status-dot"></span><span class="tab-title">終端機 ${id}${shared ? '（共用）' : ''}</span><span class="x">&times;</span>`;
   bar.insertBefore(el, copyBtn);
 
   const wrap = document.createElement('div');
@@ -287,7 +299,7 @@ function createTab(type = 'terminal', sessionId = null) {
   term.open(wrap);
   fit.fit();
 
-  const obj = {id, type: 'terminal', el, wrap, term, fit, ws: null, closed: false, currentDir: '~', sessionId: sessionId || null};
+  const obj = {id, type: 'terminal', el, wrap, term, fit, ws: null, closed: false, currentDir: '~', sessionId: sessionId || null, shared: !!shared};
   tabs.push(obj);
   connect(obj);
   saveTabs();
@@ -339,7 +351,7 @@ function closeTab(id) {
   if (activeId === id) activate(tabs[Math.min(i, tabs.length - 1)].id);
 }
 
-addBtn.onclick = () => createTab();
+addBtn.onclick = () => createTab('terminal', '__new__');
 
 copyBtn.onclick = async () => {
   const t = activeTab();
@@ -563,7 +575,7 @@ window.addEventListener('resize', () => tabs.forEach(t => {
 }));
 
 document.addEventListener('keydown', e => {
-  if (e.ctrlKey && e.shiftKey && e.key === 'T') { e.preventDefault(); createTab(); }
+  if (e.ctrlKey && e.shiftKey && e.key === 'T') { e.preventDefault(); createTab('terminal', '__new__'); }
   if (e.ctrlKey && e.shiftKey && e.key === 'W') { e.preventDefault(); if (activeId) closeTab(activeId); }
 });
 
@@ -572,8 +584,16 @@ document.addEventListener('keydown', e => {
   const saved = loadTabs();
   const savedCnt = parseInt(localStorage.getItem('webterm_cnt') || '0', 10);
   if (savedCnt) cnt = savedCnt;
-  const savedTerminal = saved && saved[0];
-  createTab('terminal', savedTerminal ? savedTerminal.sessionId : null);
+  // 第一頁固定不帶 session_id：伺服器會接到「共用主 session」。
+  // 如此一來不同裝置／不同瀏覽器、甚至斷線數小時後，都會回到同一個終端機，
+  // 不會再開一個新的 bash 把原本的 opencode 留在背景。
+  createTab('terminal', null, true);
+  // 這台裝置額外開的分頁才用 localStorage 還原（非共用）。
+  if (saved && saved.length > 1) {
+    saved.slice(1).forEach(t => {
+      if (t && t.type === 'terminal') createTab('terminal', t.sessionId || null, false);
+    });
+  }
 })();
 </script>
 </body>
@@ -634,6 +654,27 @@ async def download_route(path: str):
     return FileResponse(safe, filename=os.path.basename(safe))
 
 
+@app.get("/api/sessions")
+async def api_sessions():
+    """列出目前伺服器上的終端機工作階段（除錯／���認跨裝置是否共用）。"""
+    now = time.time()
+    async with SESSIONS_LOCK:
+        items = [{
+            "id": s.id,
+            "primary": s.id == PRIMARY_SESSION_ID,
+            "persistent": s.persistent,
+            "pid": s.pid,
+            "cols": s.cols,
+            "rows": s.rows,
+            "subscribers": len(s.subscribers),
+            "created_at": round(s.created_at, 3),
+            "last_active": round(s.last_active, 3),
+            "idle_seconds": round(now - s.last_active, 3),
+            "buffer_bytes": len(s.buffer),
+        } for s in SESSIONS.values()]
+    return {"primary": PRIMARY_SESSION_ID, "idle_timeout": SESSION_IDLE_TIMEOUT, "sessions": items}
+
+
 # ──────────────────────────── 背景安裝任務 ────────────────────────────
 
 async def _run(cmd, cwd=None, env=None):
@@ -821,6 +862,9 @@ def dummy_gpu():
 @app.on_event("startup")
 async def startup_event():
     dummy_gpu()
+    if SKIP_INSTALL:
+        log.info("WEBTERM_SKIP_INSTALL=1：跳過 opencode / 編輯器安裝")
+        return
     # 安裝 OpenCode 後清除使用者層級設定，使用 OpenCode 預設值。
     await install_opencode()
     reset_opencode_config()
@@ -841,18 +885,23 @@ SESSIONS_LOCK = asyncio.Lock()
 
 
 class TerminalSession:
-    def __init__(self, session_id: str, pid: int, fd: int, cols: int = 120, rows: int = 30):
+    def __init__(self, session_id: str, pid: int, fd: int, cols: int = 120, rows: int = 30,
+                 persistent: bool = False):
         self.id = session_id
         self.pid = pid
         self.fd = fd
         self.cols = cols
         self.rows = rows
+        self.persistent = persistent          # 共用主 session：永不被閒置清除
+        self.created_at = time.time()
+        self.last_active = self.created_at
         self.buffer = bytearray()  # 畫面回放緩衝區，供重連時還原終端機畫面
         self.subscribers: dict[int, asyncio.Queue] = {}
         self._next_sub_id = 0
         self.cleanup_task: asyncio.Task | None = None
 
     def add_subscriber(self):
+        self.last_active = time.time()
         sid = self._next_sub_id
         self._next_sub_id += 1
         q: asyncio.Queue = asyncio.Queue()
@@ -864,15 +913,18 @@ class TerminalSession:
 
     def remove_subscriber(self, sid: int, loop: asyncio.AbstractEventLoop):
         self.subscribers.pop(sid, None)
-        if not self.subscribers:
+        self.last_active = time.time()
+        if not self.subscribers and not self.persistent:
             self.cleanup_task = loop.create_task(self._schedule_cleanup(loop))
 
     async def _schedule_cleanup(self, loop: asyncio.AbstractEventLoop):
+        if self.persistent:
+            return
         try:
             await asyncio.sleep(SESSION_IDLE_TIMEOUT)
         except asyncio.CancelledError:
             return
-        if not self.subscribers:
+        if not self.subscribers and not self.persistent:
             log.info("session %s 閒置超過 %ds 無人接回，清除", self.id, SESSION_IDLE_TIMEOUT)
             await kill_session(self.id, loop)
 
@@ -918,11 +970,12 @@ def _fork_shell():
     return pid, fd
 
 
-async def create_session(cols: int = 120, rows: int = 30) -> TerminalSession:
+async def create_session(cols: int = 120, rows: int = 30, session_id: str | None = None,
+                         persistent: bool = False) -> TerminalSession:
     pid, fd = _fork_shell()
 
-    session_id = uuid.uuid4().hex[:12]
-    sess = TerminalSession(session_id, pid, fd, cols, rows)
+    session_id = session_id or uuid.uuid4().hex[:12]
+    sess = TerminalSession(session_id, pid, fd, cols, rows, persistent=persistent)
 
     _set_winsize(fd, cols, rows)
     fl = fcntl.fcntl(fd, fcntl.F_GETFL)
@@ -952,6 +1005,20 @@ async def create_session(cols: int = 120, rows: int = 30) -> TerminalSession:
     return sess
 
 
+PRIMARY_LOCK = asyncio.Lock()
+
+
+async def get_or_create_primary(cols: int = 120, rows: int = 30) -> tuple[TerminalSession, bool]:
+    """回傳（共用主 session, 是否為接回）。所有沒指定 session_id 的連線都走這裡。"""
+    async with PRIMARY_LOCK:
+        sess = SESSIONS.get(PRIMARY_SESSION_ID)
+        if sess is not None:
+            return sess, True
+        sess = await create_session(cols, rows, session_id=PRIMARY_SESSION_ID, persistent=True)
+        log.info("已建立共用主 session（id=%s）", PRIMARY_SESSION_ID)
+        return sess, False
+
+
 async def _reap_process(pid: int, loop: asyncio.AbstractEventLoop):
     """非阻塞地終止並回收子行程。"""
     for sig in (signal.SIGTERM, signal.SIGKILL):
@@ -1010,8 +1077,21 @@ async def terminal_ws(websocket: WebSocket):
     except ValueError:
         cols, rows = 120, 30
 
-    sess = SESSIONS.get(requested_id) if requested_id else None
-    reattached = sess is not None
+    # 共用主 session：
+    #   * 沒有帶 session_id（新裝置／新瀏覽器）→ 接到 primary
+    #   * session_id=__new__（按 + 開新分頁）→ 建立獨立的新 session
+    #   * 帶 primary 但伺服器沒有（例如 app 重啟）→ 重建 primary
+    #   * 其他 id 且找不到 → 建立一般的暫時 session
+    if not requested_id:
+        sess, reattached = await get_or_create_primary(cols, rows)
+    elif requested_id == NEW_SESSION_ID:
+        sess, reattached = None, False
+    else:
+        sess = SESSIONS.get(requested_id)
+        reattached = sess is not None
+        if sess is None and requested_id == PRIMARY_SESSION_ID:
+            sess = await create_session(cols, rows, session_id=PRIMARY_SESSION_ID, persistent=True)
+            reattached = False
 
     if sess is None:
         try:
@@ -1025,14 +1105,18 @@ async def terminal_ws(websocket: WebSocket):
             return
 
     # 告知前端這次連線對應的 session id，讓前端存起來，日後斷線重連 / 重新整理都能接回同一個
-    await websocket.send_text(json.dumps({"type": "session", "id": sess.id, "reattached": reattached}))
+    await websocket.send_text(json.dumps({
+        "type": "session", "id": sess.id, "reattached": reattached,
+        "primary": sess.id == PRIMARY_SESSION_ID,
+    }))
 
     if reattached:
         if sess.buffer:
             try:
+                # 先清畫面再回放，避免新裝置接到半個畫面
                 await websocket.send_text(json.dumps({
                     "type": "output",
-                    "data": bytes(sess.buffer).decode("utf-8", errors="replace"),
+                    "data": "\x1b[2J\x1b[3J\x1b[H" + bytes(sess.buffer).decode("utf-8", errors="replace"),
                 }))
             except Exception:
                 pass
@@ -1043,7 +1127,7 @@ async def terminal_ws(websocket: WebSocket):
             }))
         except Exception:
             pass
-    elif requested_id:
+    elif requested_id and requested_id not in (PRIMARY_SESSION_ID, NEW_SESSION_ID):
         # 前端要求接回某個 session，但伺服器已找不到（逾時被清除或伺服器重啟過）
         try:
             await websocket.send_text(json.dumps({
@@ -1055,6 +1139,14 @@ async def terminal_ws(websocket: WebSocket):
 
     sub_id, queue = sess.add_subscriber()
 
+    if reattached:
+        # 觸發 SIGWINCH，讓 TUI（opencode 等）重畫目前畫面；新裝置才不會只看到殘缺的回放
+        try:
+            _set_winsize(sess.fd, sess.cols, max(1, sess.rows - 1))
+            _set_winsize(sess.fd, sess.cols, sess.rows)
+        except Exception:
+            pass
+
     async def _pty_to_ws():
         while True:
             chunk = await queue.get()
@@ -1116,8 +1208,15 @@ async def terminal_ws(websocket: WebSocket):
                     }))
 
             elif mtype == "kill":
-                # 使用者主動關閉這個分頁：真正終止此 session（不再保留供重連）
-                await kill_session(sess.id, loop)
+                # 關閉分頁只終止「非共用」的 session；共用主 session 只解除訂閱，
+                # 這樣其他裝置接回來時 opencode 還在原地跑。
+                if sess.id == PRIMARY_SESSION_ID:
+                    await websocket.send_text(json.dumps({
+                        "type": "system",
+                        "data": "\r\n\x1b[33m[ℹ️ 共用終端機不會因關閉分頁而終止，已保留工作階段]\x1b[0m\r\n",
+                    }))
+                else:
+                    await kill_session(sess.id, loop)
                 break
 
     except (WebSocketDisconnect, RuntimeError):