From c8a4067166b2bd341f5c1b67bc0e6600fafe18c8 Mon Sep 17 00:00:00 2001 From: EMRG Evolution Date: Mon, 10 Aug 2026 18:12:14 +0800 Subject: [PATCH] =?UTF-8?q?emrg:=20GUI=20open-sessions=20sidebar=20+=20gui?= =?UTF-8?q?=5Fstate=20restore=20=E2=80=94=20P4=20slice=202=20(GUI=20multi-?= =?UTF-8?q?session=20rant=20P4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Agent.md | 4 +- README.cn.md | 2 +- README.md | 2 +- emrg/gui/main.js | 64 ++++++++++++++ emrg/gui/renderer/css/layout.css | 12 +++ emrg/gui/renderer/index.html | 3 + emrg/gui/renderer/js/app.js | 105 +++++++++++++++++++++- emrg/gui/renderer/js/i18n.js | 10 +++ emrg/gui/renderer/js/sidebar.js | 45 +++++++++- emrg/gui/test/renderer.smoke.test.js | 125 ++++++++++++++++++++++++++- 10 files changed, 357 insertions(+), 15 deletions(-) diff --git a/Agent.md b/Agent.md index bdc0ca75..0a02ef06 100644 --- a/Agent.md +++ b/Agent.md @@ -66,7 +66,7 @@ EMRG is a self-evolving AI agent architecture experiment. Python implementation, - Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand) - Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端" - Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout) - - Unit tests `npm test` (163: 43 daemon_client + 17 conn-manager + 22 app-commands + 46 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config + 7 gui-state); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py` + - Unit tests `npm test` (167: 43 daemon_client + 17 conn-manager + 22 app-commands + 50 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config + 7 gui-state); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py` - **Auto project tracking** — Automatically detects and records working directories; project-scoped sessions - **Rant-driven evolution** — User feedback via `/rant` drives automatic self-improvement cycles - **Headless GitHub auth** — Non-interactive evolution auto-extracts `GH_TOKEN` from git credential store (osxkeychain / credential helper); PR comment/LGTM queries fall back to REST API (GraphQL needs `read:org` scope) @@ -94,7 +94,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg ``` Python: `uv run pytest tests/ -v` (680) — import check: `uv run python -c "from emrg.client.app import run_client"` -GUI: `cd emrg/gui && npm test` (163: 43 daemon_client + 17 conn-manager + 22 app-commands + 46 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config + 7 gui-state) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js` +GUI: `cd emrg/gui && npm test` (167: 43 daemon_client + 17 conn-manager + 22 app-commands + 50 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config + 7 gui-state) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js` CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文) Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发：Actions outage 会整段丢弃 push 事件，dispatch 走 API 路径不受影响) diff --git a/README.cn.md b/README.cn.md index deb81441..e979c555 100644 --- a/README.cn.md +++ b/README.cn.md @@ -282,7 +282,7 @@ uv run python -m emrg # 启动 TUI cd emrg/gui npm ci # 安装依赖（生产模式可 --omit=dev） npm start # 启动 GUI（自动拉起 daemon） -npm test # 运行 Node 测试（163 项：43 daemon_client + 17 conn-manager + 22 app-commands + 46 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config + 7 gui-state；集成测试在 CI 跑，本地可 npm run test:integration） +npm test # 运行 Node 测试（167 项：43 daemon_client + 17 conn-manager + 22 app-commands + 50 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config + 7 gui-state；集成测试在 CI 跑，本地可 npm run test:integration） ``` CI 通过 GitHub Actions 自动运行测试并检查冲突标记（`.github/workflows/test.yml`）。 diff --git a/README.md b/README.md index d2a1cec0..e8b09cec 100644 --- a/README.md +++ b/README.md @@ -281,7 +281,7 @@ uv run python -m emrg # launch TUI cd emrg/gui npm ci # install deps (production: --omit=dev) npm start # launch GUI (auto-starts daemon) -npm test # run Node tests (163: 43 daemon_client + 17 conn-manager + 22 app-commands + 46 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config + 7 gui-state; integration runs in CI, local: npm run test:integration) +npm test # run Node tests (167: 43 daemon_client + 17 conn-manager + 22 app-commands + 50 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config + 7 gui-state; integration runs in CI, local: npm run test:integration) ``` CI runs tests and checks for conflict markers automatically via GitHub Actions (`.github/workflows/test.yml`). diff --git a/emrg/gui/main.js b/emrg/gui/main.js index f36f64e5..edd0036f 100644 --- a/emrg/gui/main.js +++ b/emrg/gui/main.js @@ -251,6 +251,8 @@ vision = false await ensureConnected(); const pong = await waitForPong(); const sessions = await listSessions(); + // P4 slice 2：启动恢复打开会话（gui_state.json → 重开连接 + resume 重订阅） + await restoreOpenSessions(sessions); return { config_exists: true, api_key_configured: true, @@ -261,6 +263,8 @@ vision = false evolution_count: pong?.evolution_count ?? 0, // G19：init 透传演化计数（waitForPong 已消耗 pong） version: APP_VERSION, // WorkBuddy P3：版本号随 package.json 走（此前 renderer 硬编码 v0.2.7） sessions, + open_sessions: openSessionsList(), + active_sid: currentSessionId, // P4 slice 2：恢复后的激活会话（renderer 直接采用） }; }); @@ -325,6 +329,7 @@ vision = false connManager?.close(sessionId); // P2：删除会话 → 关闭该会话连接（若打开） openSessions.delete(sessionId); // P4：删除（删数据）→ 一并移出打开会话簿记 schedulePersistGuiState(); + broadcastOpenSessions(); return { ok: true }; }); @@ -358,6 +363,7 @@ vision = false // P4：新会话在首条消息前不建连接（sendMessage 自动 open）——此处仅标记激活 // 并刷新持久化（activeSid 前进；openSessions 条目随 openSession 落簿记） schedulePersistGuiState(); + broadcastOpenSessions(); return { session_id: sid }; }); @@ -719,6 +725,7 @@ vision = false projectPath, lastActive: new Date().toISOString(), }); + broadcastOpenSessions(); } // 激活会话变化（切换/新会话/发送）→ 更新 lastActive + activeSid → 防抖写盘 @@ -727,6 +734,7 @@ vision = false openSessions.get(sid).lastActive = new Date().toISOString(); } schedulePersistGuiState(); + broadcastOpenSessions(); } function schedulePersistGuiState() { @@ -756,6 +764,61 @@ vision = false } } + // 读盘 + 清洗（启动恢复用；损坏/缺失 → 空） + function readGuiState() { + try { + const p = guiStatePath(os.homedir()); + if (!fs.existsSync(p)) return { openSessions: [], activeSid: null }; + const raw = JSON.parse(fs.readFileSync(p, "utf8")); + return { + openSessions: sanitizeOpenSessions(raw.openSessions || []), + activeSid: raw.activeSid || null, + }; + } catch (e) { + logger.warn(`[gui] gui_state.json read failed: ${e.message}`); + return { openSessions: [], activeSid: null }; + } + } + + // P4 slice 2：启动恢复——gui_state.json 中的打开会话（上限 20）逐个重开连接 + + // resume 重订阅；activeSid 失效 → 第一个有效；失效条目跳过 + 重写盘。 + async function restoreOpenSessions(sessions) { + const { openSessions: saved, activeSid } = readGuiState(); + const validSids = new Set((sessions || []).map((s) => s.session_id)); + let restored = 0; + for (const entry of saved) { + if (restored >= 20) break; // 恢复上限（sanitize 已守，双保险） + if (!validSids.has(entry.sid)) continue; // 失效条目跳过 + try { + await openSession(entry.sid, entry.projectPath); // resume 重订阅 + restored += 1; + } catch (e) { + logger.warn(`[gui] restore session ${entry.sid} failed: ${e.message}`); + openSessions.delete(entry.sid); // 失效 → 移除 + } + } + // activeSid：优先恢复原激活；失效 → 第一个有效 + if (openSessions.has(activeSid)) { + currentSessionId = activeSid; + } else if (openSessions.size > 0) { + currentSessionId = openSessionsList()[0].sid; + } + if (currentSessionId) { + win?.setTitle(`EMRG — ${currentSessionId}`); + } + schedulePersistGuiState(); // 失效条目剔除后重写盘 + broadcastOpenSessions(); + return restored; + } + + // 通知 renderer 打开会话列表变化（侧边栏数据源，slice 2） + function broadcastOpenSessions() { + sendToRenderer("open_sessions", { + openSessions: openSessionsList(), + activeSid: currentSessionId, + }); + } + // 关闭会话（保留磁盘数据）：断连 + 移除 + 持久化。P4 slice 2 侧边栏"关闭"入口用。 async function closeSession(sid) { const entry = openSessions.get(sid); @@ -763,6 +826,7 @@ vision = false openSessions.delete(sid); schedulePersistGuiState(); if (currentSessionId === sid) currentSessionId = null; // 关闭激活会话 → 无激活 + broadcastOpenSessions(); return { ok: true, closed: !!entry }; } diff --git a/emrg/gui/renderer/css/layout.css b/emrg/gui/renderer/css/layout.css index 2490b483..b9d5a0c1 100644 --- a/emrg/gui/renderer/css/layout.css +++ b/emrg/gui/renderer/css/layout.css @@ -94,6 +94,18 @@ letter-spacing: 0.02em; } +/* P4 slice 2：打开会话区（跨项目 tab）——紧贴新对话按钮，视觉轻量 */ +#open-sessions { + padding-bottom: var(--sp-1); + border-bottom: 1px solid var(--border); + margin-bottom: var(--sp-1); + max-height: 40%; + overflow-y: auto; +} +.open-sessions-label { + padding-top: var(--sp-2); +} + .sidebar-footer { display: flex; align-items: center; diff --git a/emrg/gui/renderer/index.html b/emrg/gui/renderer/index.html index d6341d0a..2284e9f4 100644 --- a/emrg/gui/renderer/index.html +++ b/emrg/gui/renderer/index.html @@ -25,6 +25,9 @@
边工作边学习，越用越懂你
+ + +
diff --git a/emrg/gui/renderer/js/app.js b/emrg/gui/renderer/js/app.js index 1a3906ce..fcf8dcc6 100644 --- a/emrg/gui/renderer/js/app.js +++ b/emrg/gui/renderer/js/app.js @@ -19,6 +19,8 @@ const App = (() => { // （defineProperty getter/setter → sidState(sessionId)），既有调用点零改动； // 事件按 sid 路由时操作对应条目（后台会话的 done 不误清激活会话的 busy）。 sessionsBySid: new Map(), // sid → { busy, ownStreamRequestId, mode, autoScroll } + // P4 slice 2（rant 15:07:19）：跨项目打开的会话（侧边栏数据源，main 广播） + openSessions: [], // [{ sid, projectName, projectPath, lastActive }]，lastActive 倒序 apiKeyConfigured: false, configExists: false, projectDir: "", @@ -91,11 +93,22 @@ const App = (() => { if (init.sessions && init.sessions.length > 0) { state.sessions = init.sessions; Sidebar.render(init.sessions); - const current = init.sessions.find((s) => s.session_id === state.sessionId); - if (current) { - Sidebar.highlight(state.sessionId); + // P4 slice 2：main 恢复的打开会话 + 激活会话（跳过 switchSession 的 IPC 往返） + state.openSessions = init.open_sessions || []; + Sidebar.renderOpenSessions(state.openSessions); + const restoredSid = init.active_sid; + if (restoredSid && init.sessions.some((s) => s.session_id === restoredSid)) { + state.sessionId = restoredSid; + activateSessionView(restoredSid); + updateEmptyState(); + Sidebar.highlight(restoredSid); } else { - await switchSession(init.sessions[0].session_id, { silent: true }); + const current = init.sessions.find((s) => s.session_id === state.sessionId); + if (current) { + Sidebar.highlight(state.sessionId); + } else { + await switchSession(init.sessions[0].session_id, { silent: true }); + } } } else { await newSession(); @@ -667,6 +680,83 @@ const App = (() => { } catch { /* 忽略 */ } } + // ── P4 slice 2：打开会话（跨项目侧边栏） ─────────── + // 关闭 = 断开连接 + 移出列表，**保留磁盘数据**（与删除区分：关闭留数据/删除删数据） + async function closeOpenSession(sid) { + if (state.busy && state.sessionId === sid) { + Chat.addSystemMessage(EMRG_Copy.COPY.sessionBusy); + return; + } + try { + await window.emrg.closeSession({ sessionId: sid }); + Chat.unregisterContainer(sid); // 释放容器（若已打开） + const view = [...$("chat-view").children].find((c) => c.dataset?.sid === sid); + if (view) view.remove(); + if (state.sessionId === sid) { + // 关闭激活会话 → 切到剩余打开会话中最近激活的，否则新建 + const remaining = state.openSessions.filter((s) => s.sid !== sid); + if (remaining.length > 0) { + await switchSession(remaining[0].sid, { silent: true }); + } else { + await newSession(); + } + } + } catch (e) { + Chat.addSystemMessage(_t("app.closeFailed", { msg: e.message })); + } + } + + // 打开会话右键菜单：关闭（留数据）/ 重命名 / 删除（删数据，确认） + function showOpenSessionsMenu(item, entry) { + const menu = $("ctx-menu"); + menu.innerHTML = ""; + const mk = (label, danger, action) => { + const b = el("button", { class: "ctx-item" + (danger ? " danger" : "") }, label); + b.addEventListener("click", () => { + hideCtxMenu(); + action(); + }); + menu.appendChild(b); + }; + const cur = state.sessions.find((s) => s.session_id === entry.sid); + const title = (cur && cur.title) || entry.sid; + mk(_t("app.closeSession"), false, () => closeOpenSession(entry.sid)); + mk(_t("app.rename"), false, () => Dialogs.showRename(entry.sid, title)); + mk(_t("app.deleteConv"), true, () => Dialogs.showConfirm(EMRG_Copy.COPY.deleteConfirmTitle, EMRG_Copy.COPY.deleteConfirmBody, { + okText: _t("dlg.delete"), + danger: true, + onOk: () => deleteSession(entry.sid), + })); + menu.hidden = false; + const rect = item.getBoundingClientRect(); + menu.style.left = Math.min(rect.right, window.innerWidth - 160) + "px"; + menu.style.top = Math.min(rect.bottom, window.innerHeight - 80) + "px"; + const btns = menu.querySelectorAll(".ctx-item"); + let idx = btns.length ? 0 : -1; + const setActive = (i) => { + if (i < 0 || i >= btns.length) return; + idx = i; + btns.forEach((b, j) => b.classList.toggle("active", j === idx)); + }; + setActive(0); + _ctxMenuKeyHandler = (ev) => { + if (ev.key === "ArrowDown") { + ev.preventDefault(); + setActive((idx + 1) % btns.length); + } else if (ev.key === "ArrowUp") { + ev.preventDefault(); + setActive((idx - 1 + btns.length) % btns.length); + } else if (ev.key === "Enter") { + ev.preventDefault(); + if (idx >= 0) btns[idx].click(); + } else if (ev.key === "Escape") { + ev.preventDefault(); + hideCtxMenu(); + } + }; + document.addEventListener("keydown", _ctxMenuKeyHandler); + } + // ── 右键菜单（重命名 / 删除） ─────────── function showConvMenu(item, sid, title) { // 设计 §3.2：右键菜单 = 重命名 / 删除（删除有友好确认） @@ -1077,6 +1167,11 @@ const App = (() => { state.sessions = data.sessions || []; Sidebar.render(data.sessions || []); break; + case "open_sessions": + // P4 slice 2：main 广播打开会话列表变化 → 刷新侧边栏打开会话区 + state.openSessions = data.openSessions || []; + Sidebar.renderOpenSessions(state.openSessions); + break; case "disconnected": // P3 finalize：断连按 sid 隔离——后台会话断连不影响全局 UI（无横幅/红点）， // 仅激活会话（或无 sid 的单会话过渡期）断连显示全局横幅 + 红点。 @@ -1347,6 +1442,8 @@ const App = (() => { switchSession, newSession, deleteSession, + closeOpenSession, // P4 slice 2：关闭打开会话（保留数据） + showOpenSessionsMenu, // P4 slice 2：打开会话右键菜单 activateSessionView, // P3 slice 2：激活会话容器（display 切换；导出供测试） refreshSessions, showConvMenu, diff --git a/emrg/gui/renderer/js/i18n.js b/emrg/gui/renderer/js/i18n.js index e8103c3e..8a39114b 100644 --- a/emrg/gui/renderer/js/i18n.js +++ b/emrg/gui/renderer/js/i18n.js @@ -294,6 +294,11 @@ const I18N = (() => { "app.deleteFailed": "删除失败了：{msg}", "app.rename": "✏️ 重命名", "app.deleteConv": "🗑 删除对话", + "app.closeSession": "❌ 关闭会话（保留数据）", + "app.closeFailed": "关闭会话失败了：{msg}", + "sidebar.openSessions": "打开的会话", + "sidebar.noOpenSessions": "暂无打开的会话", + "sidebar.openSessionOf": "{project} / {title}", "app.noModels": "还没有配置模型", "app.goSettings": "去设置添加", "app.modelSwitchFailed": "切换模型失败了：{msg}", @@ -587,6 +592,11 @@ const I18N = (() => { "app.deleteFailed": "Delete failed: {msg}", "app.rename": "✏️ Rename", "app.deleteConv": "🗑 Delete conversation", + "app.closeSession": "❌ Close session (keep data)", + "app.closeFailed": "Failed to close session: {msg}", + "sidebar.openSessions": "Open sessions", + "sidebar.noOpenSessions": "No open sessions", + "sidebar.openSessionOf": "{project} / {title}", "app.noModels": "No models configured", "app.goSettings": "Add in Settings", "app.modelSwitchFailed": "Failed to switch model: {msg}", diff --git a/emrg/gui/renderer/js/sidebar.js b/emrg/gui/renderer/js/sidebar.js index 05911799..595416c4 100644 --- a/emrg/gui/renderer/js/sidebar.js +++ b/emrg/gui/renderer/js/sidebar.js @@ -6,6 +6,40 @@ const Sidebar = (() => { let sessions = []; + let openSessions = []; + + /** + * P4 slice 2：渲染跨项目打开会话区（侧边栏顶部）。 + * 条目 = 项目名 / 会话标题（lastActive 倒序，main 已排序）；激活高亮； + * 点击 → 切换；右键 → 关闭（保留数据）/ 重命名 / 删除。 + */ + function renderOpenSessions(list) { + openSessions = list || []; + const nav = $("open-sessions"); + const label = $("open-sessions-label"); + if (!nav) return; + nav.innerHTML = ""; + if (!openSessions.length) { + if (label) label.hidden = true; + return; + } + if (label) label.hidden = false; + const known = (App.state && App.state.sessions) || []; + for (const entry of openSessions) { + const cur = known.find((s) => s.session_id === entry.sid) || {}; + const title = cur.title || entry.sid; // G27：title 优先 + const item = el("div", { class: "conv-item open-session-item" }); + item.dataset.sid = entry.sid; + item.appendChild(el("span", { class: "conv-title" }, _t("sidebar.openSessionOf", { project: entry.projectName || "", title }))); + item.addEventListener("click", () => App.switchSession(entry.sid)); + item.addEventListener("contextmenu", (e) => { + e.preventDefault(); + App.showOpenSessionsMenu(item, entry); + }); + nav.appendChild(item); + } + highlight(App.state.sessionId); + } /** 渲染分组对话列表 */ function render(list) { @@ -46,10 +80,13 @@ const Sidebar = (() => { highlight(App.state.sessionId); } - /** 高亮当前对话 */ + /** 高亮当前对话（含打开会话区） */ function highlight(sid) { - for (const item of $("conv-list").querySelectorAll(".conv-item")) { - item.classList.toggle("active", item.dataset.sid === sid); + for (const nav of [$("conv-list"), $("open-sessions")]) { + if (!nav) continue; + for (const item of nav.querySelectorAll(".conv-item")) { + item.classList.toggle("active", item.dataset.sid === sid); + } } } @@ -101,7 +138,7 @@ const Sidebar = (() => { } init(); // 模块级绑定一次 - return { render, highlight, clearFocus }; + return { render, renderOpenSessions, highlight, clearFocus }; })(); window.EMRG_Sidebar = Sidebar; diff --git a/emrg/gui/test/renderer.smoke.test.js b/emrg/gui/test/renderer.smoke.test.js index 29d05bf5..e23705f4 100644 --- a/emrg/gui/test/renderer.smoke.test.js +++ b/emrg/gui/test/renderer.smoke.test.js @@ -30,7 +30,13 @@ function makeEl(id) { _set() { node._cls = new Set((node.className || "").split(/\s+/).filter(Boolean)); }, add(c) { node.classList._set(); node._cls.add(c); node._update(); }, remove(c) { node.classList._set(); node._cls.delete(c); node._update(); }, - toggle(c) { node.classList._set(); node._cls.has(c) ? node._cls.delete(c) : node._cls.add(c); node._update(); }, + // 忠实 DOM：toggle(c, force)——force 指定时按 force 加/删（sidebar highlight 依赖） + toggle(c, force) { + node.classList._set(); + const want = force === undefined ? !node._cls.has(c) : !!force; + if (want) node._cls.add(c); else node._cls.delete(c); + node._update(); + }, contains(c) { return (node.className || "").split(/\s+/).includes(c); }, }, _update() { node.className = [...node._cls].join(" "); }, @@ -66,7 +72,19 @@ function makeEl(id) { } return null; }, - querySelectorAll() { return []; }, + querySelectorAll(sel) { + // P4 s2：类选择器 DFS 收集（sidebar highlight 用 ".conv-item"） + if (!sel || !sel.startsWith(".")) return []; + const cls = sel.slice(1); + const out = []; + const stack = [...(this.children || [])]; + while (stack.length) { + const n = stack.shift(); + if ((n.className || "").split(/\s+/).includes(cls)) out.push(n); + stack.push(...(n.children || [])); + } + return out; + }, closest() { return null; }, showModal() { this.open = true; }, close() { this.open = false; }, @@ -87,7 +105,7 @@ function makeEl(id) { } const ELEMENT_IDS = [ - "chat-view", "input", "send-btn", "stop-btn", "conv-list", "status-dot", "settings-btn", + "chat-view", "input", "send-btn", "stop-btn", "conv-list", "open-sessions", "open-sessions-label", "status-dot", "settings-btn", "conn-banner", "empty-state", "model-switcher", "model-switcher-label", "brand-star", "new-chat-btn", "settings-dialog", "settings-cancel", "settings-save", "set-api-key", "set-base-url", "set-project-dir", "set-model", "pick-dir-btn", "theme-options", "welcome-dialog", "welcome-api-key", "welcome-base-url", @@ -1216,3 +1234,104 @@ test("P3 fin: 未注册容器 sid 断连不打标；切到断线会话提示重 }); + +// ── P4 slice 2（rant 15:07:19）：跨项目打开会话侧边栏 + gui_state 恢复 ── + +test("P4 s2: open_sessions 事件 → 渲染打开会话区（项目名/标题 + 激活高亮）", async () => { + const { ctx, els } = makeSandbox({}); + await tick(); + await vm.runInContext( + 'App.state.sessionId = "sess-b";' + + 'App.state.sessions = [{ session_id: "sess-a", title: "Alpha" }, { session_id: "sess-b", title: "Beta" }];' + + 'App.handleEvent({ type: "open_sessions", data: { openSessions: [' + // main 已按 lastActive 倒序 + ' { sid: "sess-b", projectName: "proj-b", projectPath: "/b", lastActive: "t2" },' + + ' { sid: "sess-a", projectName: "proj-a", projectPath: "/a", lastActive: "t1" }' + + '] } });', + ctx + ); + const nav = els["open-sessions"]; + assert.strictEqual(nav.children.length, 2, "two open-session items rendered"); + const titleSpan0 = nav.children[0].children[0] || nav.children[0]; + assert.ok((titleSpan0.textContent || "").includes("proj-b"), "entry shows project name"); + assert.ok((titleSpan0.textContent || "").includes("Beta"), "entry shows session title"); + // 激活高亮：sess-b active + assert.strictEqual(nav.children[0].classList.contains("active"), true, "active open-session highlighted"); + assert.strictEqual(nav.children[1].classList.contains("active"), false, "inactive not highlighted"); + // 空列表 → 隐藏 label + await vm.runInContext('App.handleEvent({ type: "open_sessions", data: { openSessions: [] } });', ctx); + assert.strictEqual(els["open-sessions-label"].hidden, true, "label hidden when no open sessions"); +}); + +test("P4 s2: closeOpenSession 关闭激活会话 → 切到剩余打开会话 + 容器释放", async () => { + let closed = null; + const { ctx, els } = makeSandbox({ + closeSession: async (p) => { closed = p; return { ok: true, closed: true }; }, + }); + await tick(); + await vm.runInContext( + 'App.state.sessionId = "sess-a";' + + 'App.state.sessions = [{ session_id: "sess-a" }, { session_id: "sess-b" }];' + + 'App.state.openSessions = [' + + ' { sid: "sess-a", projectName: "pa", projectPath: "/a", lastActive: "t2" },' + + ' { sid: "sess-b", projectName: "pb", projectPath: "/b", lastActive: "t1" }' + + '];' + + 'App.activateSessionView("sess-a");' + + 'App.activateSessionView("sess-b");', + ctx + ); + await vm.runInContext('App.closeOpenSession("sess-a");', ctx); + await tick(); + assert.strictEqual(closed && closed.sessionId, "sess-a", "closeSession IPC called with sid"); + assert.strictEqual( + els["chat-view"].children.some((c) => c.dataset && c.dataset.sid === "sess-a"), + false, + "closed session container removed from wrapper" + ); + assert.strictEqual(ctx.App.state.sessionId, "sess-b", "switched to remaining open session"); +}); + +test("P4 s2: closeOpenSession 非激活会话 → 不切换激活指针", async () => { + let closed = null; + const { ctx } = makeSandbox({ + closeSession: async (p) => { closed = p; return { ok: true, closed: true }; }, + }); + await tick(); + await vm.runInContext( + 'App.state.sessionId = "sess-a";' + + 'App.state.sessions = [{ session_id: "sess-a" }, { session_id: "sess-b" }];' + + 'App.state.openSessions = [' + + ' { sid: "sess-a", projectName: "pa", projectPath: "/a", lastActive: "t2" },' + + ' { sid: "sess-b", projectName: "pb", projectPath: "/b", lastActive: "t1" }' + + '];' + + 'App.activateSessionView("sess-a");', + ctx + ); + await vm.runInContext('App.closeOpenSession("sess-b");', ctx); + await tick(); + assert.strictEqual(ctx.App.state.sessionId, "sess-a", "active session untouched when closing bg session"); +}); + +test("P4 s2: boot init 携带 open_sessions + active_sid → 采用恢复的激活会话", async () => { + const { ctx, els } = makeSandbox({ + init: async () => ({ + config_exists: true, + api_key_configured: true, + project_dir: "/tmp", + project_dir_valid: true, + server_id: "srv", + model: "m", + evolution_count: 0, + sessions: [{ session_id: "sess-r", title: "Restored" }], + open_sessions: [{ sid: "sess-r", projectName: "proj", projectPath: "/p", lastActive: "t" }], + active_sid: "sess-r", + }), + }); + await tick(); + await ctx.App.boot(); + await tick(); + assert.strictEqual(ctx.App.state.sessionId, "sess-r", "restored active sid adopted without switchSession IPC"); + assert.strictEqual(ctx.App.state.openSessions.length, 1, "open sessions populated"); + const va = ctx.EMRG_Chat.chatContainer("sess-r"); + assert.strictEqual(va.classList.contains("active"), true, "restored session view activated"); + assert.strictEqual(els["input"].disabled, false, "composer enabled after boot"); +});