emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34)#912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
argszero merged 2 commits into from
Aug 21, 2026
Merged

emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34) #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b699b5
emrg: GUI daemon heartbeat — periodic liveness probe + active reconne…
Aug 21, 2026
6f597ba
Merge branch 'master' of github.com:argszero/emrg into feature/gui-da…
argszero Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Agent.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
- 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` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- Unit tests `npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
- Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
- Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + 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 路径不受影响)

Expand Down
43 changes: 41 additions & 2 deletions emrg/gui/main.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,11 @@ function main() {
// （对称 TUI app.py _throttle_warned，PR #594）。成功连接后复位。
let daemonStoppedNotified = false;
let stopping = false;
// Rant 2026-08-21T12:44:34：定时探活心跳——daemon 级 disconnected 事件此前无人
// 监听（grep 证实），断连只能靠 ws close 被动通知；心跳每 15s ping 一次，
// 无 pong 或连接已断 → 主动 scheduleReconnect（指数退避已有）。
let heartbeatTimer = null;
const HEARTBEAT_MS = 15_000;
// P4（rant 15:07:19）：跨项目打开的会话状态——sid → {projectName, projectPath,
// lastActive}。写盘防抖 1s（打开/关闭/切换时更新，镜像 rant 设计）。
let openSessions = new Map();
Expand DownExpand Up@@ -1053,6 +1058,7 @@ vision = false
cancelReconnect();
reconnectDelayMs = 1000; // 退避复位
daemonStoppedNotified = false; // 节流提示复位（下个生命周期可再提示）
startHeartbeat(); // rant 2026-08-21T12:44:34：定时探活（断连主动重连）
sendToRenderer("status", { connected: true });
} catch (e) {
const dm = connManager.daemonConn();
Expand All@@ -1077,6 +1083,7 @@ vision = false
// 时 daemon 连接不可用"的初始/空闲场景）。
function scheduleReconnect() {
if (stopping || reconnectTimer) return;
stopHeartbeat(); // 重连期间不再心跳（心跳失败路径会再调本函数，防叠）
const delay = reconnectDelayMs;
reconnectDelayMs = Math.min(reconnectDelayMs * 2, MAX_RECONNECT_DELAY_MS); // 指数退避
reconnectTimer = setTimeout(async () => {
Expand All@@ -1100,8 +1107,8 @@ vision = false
if (reconnectTimer) { clearTimeout(reconnectTimer); reconnectTimer = null; }
}

async function waitForPong(timeoutMs = 3000) {
const conn = activeConn();
async function waitForPong(timeoutMs = 3000, connOverride = null) {
const conn = connOverride || activeConn();
if (!conn || !conn.connected) return null; // 未连接 → 直接超时语义（不抛）
return new Promise((resolve) => {
const off = conn.onEvent((type, data) => {
Expand All@@ -1116,6 +1123,37 @@ vision = false
});
}

// ── 心跳探活（rant 2026-08-21T12:44:34）─────────────────────
function startHeartbeat() {
if (heartbeatTimer || stopping) return;
heartbeatTimer = setInterval(() => { _heartbeatTick(); }, HEARTBEAT_MS);
logger.info(`[gui] heartbeat started (every ${HEARTBEAT_MS / 1000}s)`);
}

function stopHeartbeat() {
if (heartbeatTimer) { clearInterval(heartbeatTimer); heartbeatTimer = null; }
}

async function _heartbeatTick() {
if (stopping) { stopHeartbeat(); return; }
const conn = connManager?.daemonConn();
if (!conn) return;
if (!conn.connected) {
// daemon 级断连无人监听（旧缺陷）→ 心跳主动补触发重连
logger.warn("[gui] heartbeat: daemon connection dropped — scheduling reconnect");
stopHeartbeat();
scheduleReconnect();
return;
}
const pong = await waitForPong(3000, conn);
if (!pong) {
logger.warn("[gui] heartbeat: no pong from daemon — scheduling reconnect");
stopHeartbeat();
try { conn.close(); } catch { /* ignore */ }
scheduleReconnect();
}
}

async function listSessions(cwd = DEFAULT_CWD) {
try {
const frame = await requireConn().sendCommandAndWait("list_sessions", { cwd }, 5000);
Expand DownExpand Up@@ -1252,6 +1290,7 @@ vision = false
app.on("window-all-closed", () => {
stopping = true;
cancelReconnect();
stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器
persistGuiStateNow(); // P4：退出前冲刷未落盘的打开会话状态（防抖 timer 取消）
connManager?.closeAll(); // P2：关闭全部会话连接 + daemon 级连接
// P2.3：窗口关闭自动销毁子 view（R5-⑤ 无需手动清理）；复位状态防二次使用
Expand Down
13 changes: 13 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -787,6 +787,19 @@ test("rant 18:30:57：版本变化 → 升级横幅出现 + 重启按钮触发 r
assert.ok(preloadSrc.includes("restartDaemon"), "preload 应暴露 restartDaemon");
});

test("rant 12:44:34: main.js 心跳探活已接入（断连主动重连）", async () => {
const GUI_DIR = path.join(__dirname, "..");
const mainSrc = fs.readFileSync(path.join(GUI_DIR, "main.js"), "utf8");
assert.ok(mainSrc.includes("HEARTBEAT_MS"), "应有心跳间隔常量");
assert.ok(mainSrc.includes("function startHeartbeat"), "应有 startHeartbeat");
assert.ok(mainSrc.includes("function stopHeartbeat"), "应有 stopHeartbeat");
assert.ok(mainSrc.includes("function _heartbeatTick"), "应有心跳 tick");
assert.ok(mainSrc.includes("waitForPong"), "心跳复用 waitForPong 探测");
assert.ok(mainSrc.includes("scheduleReconnect"), "无 pong/连接断开 → 触发重连");
assert.ok(mainSrc.includes("startHeartbeat(); // rant 2026-08-21T12:44:34"), "连接成功后启动心跳");
assert.ok(mainSrc.includes("stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器"), "窗口关闭清理心跳");
});

test("右键菜单：重命名对话框 → renameSession 调用（设计 §3.2）", async () => {
let renamed = null;
const { ctx, els } = makeSandbox({
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34)#912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

argszero
merged 2 commits into

from

Aug 21, 2026
 Merged


emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34)
#912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2b699b5

emrg: GUI daemon heartbeat — periodic liveness probe + active reconne…

Aug 21, 2026
6f597ba

Merge branch 'master' of github.com:argszero/emrg into feature/gui-da…


argszero Aug 21, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
 - 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` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
 - Unit tests `npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
 - Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
 - Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + 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 路径不受影响)

Expand Down

43 changes: 41 additions & 2 deletions
emrg/gui/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,11 @@ function main() {
 // （对称 TUI app.py _throttle_warned，PR #594）。成功连接后复位。
 let daemonStoppedNotified = false;
 let stopping = false;
 // Rant 2026-08-21T12:44:34：定时探活心跳——daemon 级 disconnected 事件此前无人
 // 监听（grep 证实），断连只能靠 ws close 被动通知；心跳每 15s ping 一次，
 // 无 pong 或连接已断 → 主动 scheduleReconnect（指数退避已有）。
 let heartbeatTimer = null;
 const HEARTBEAT_MS = 15_000;
 // P4（rant 15:07:19）：跨项目打开的会话状态——sid → {projectName, projectPath,
 // lastActive}。写盘防抖 1s（打开/关闭/切换时更新，镜像 rant 设计）。
 let openSessions = new Map();
Expand DownExpand Up@@ -1053,6 +1058,7 @@ vision = false
 cancelReconnect();
 reconnectDelayMs = 1000; // 退避复位
 daemonStoppedNotified = false; // 节流提示复位（下个生命周期可再提示）
 startHeartbeat(); // rant 2026-08-21T12:44:34：定时探活（断连主动重连）
 sendToRenderer("status", { connected: true });
 } catch (e) {
 const dm = connManager.daemonConn();
Expand All@@ -1077,6 +1083,7 @@ vision = false
 // 时 daemon 连接不可用"的初始/空闲场景）。
 function scheduleReconnect() {
 if (stopping || reconnectTimer) return;
 stopHeartbeat(); // 重连期间不再心跳（心跳失败路径会再调本函数，防叠）
 const delay = reconnectDelayMs;
 reconnectDelayMs = Math.min(reconnectDelayMs * 2, MAX_RECONNECT_DELAY_MS); // 指数退避
 reconnectTimer = setTimeout(async () => {
Expand All@@ -1100,8 +1107,8 @@ vision = false
 if (reconnectTimer) { clearTimeout(reconnectTimer); reconnectTimer = null; }
 }

 async function waitForPong(timeoutMs = 3000) {
 const conn = activeConn();
 async function waitForPong(timeoutMs = 3000, connOverride = null) {
 const conn = connOverride || activeConn();
 if (!conn || !conn.connected) return null; // 未连接 → 直接超时语义（不抛）
 return new Promise((resolve) => {
 const off = conn.onEvent((type, data) => {
Expand All@@ -1116,6 +1123,37 @@ vision = false
 });
 }

 // ── 心跳探活（rant 2026-08-21T12:44:34）─────────────────────
 function startHeartbeat() {
 if (heartbeatTimer || stopping) return;
 heartbeatTimer = setInterval(() => { _heartbeatTick(); }, HEARTBEAT_MS);
 logger.info(`[gui] heartbeat started (every ${HEARTBEAT_MS / 1000}s)`);
 }

 function stopHeartbeat() {
 if (heartbeatTimer) { clearInterval(heartbeatTimer); heartbeatTimer = null; }
 }

 async function _heartbeatTick() {
 if (stopping) { stopHeartbeat(); return; }
 const conn = connManager?.daemonConn();
 if (!conn) return;
 if (!conn.connected) {
 // daemon 级断连无人监听（旧缺陷）→ 心跳主动补触发重连
 logger.warn("[gui] heartbeat: daemon connection dropped — scheduling reconnect");
 stopHeartbeat();
 scheduleReconnect();
 return;
 }
 const pong = await waitForPong(3000, conn);
 if (!pong) {
 logger.warn("[gui] heartbeat: no pong from daemon — scheduling reconnect");
 stopHeartbeat();
 try { conn.close(); } catch { /* ignore */ }
 scheduleReconnect();
 }
 }

 async function listSessions(cwd = DEFAULT_CWD) {
 try {
 const frame = await requireConn().sendCommandAndWait("list_sessions", { cwd }, 5000);
Expand DownExpand Up@@ -1252,6 +1290,7 @@ vision = false
 app.on("window-all-closed", () => {
 stopping = true;
 cancelReconnect();
 stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器
 persistGuiStateNow(); // P4：退出前冲刷未落盘的打开会话状态（防抖 timer 取消）
 connManager?.closeAll(); // P2：关闭全部会话连接 + daemon 级连接
 // P2.3：窗口关闭自动销毁子 view（R5-⑤ 无需手动清理）；复位状态防二次使用
Expand Down

13 changes: 13 additions & 0 deletions
emrg/gui/test/renderer.smoke.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -787,6 +787,19 @@ test("rant 18:30:57：版本变化 → 升级横幅出现 + 重启按钮触发 r
 assert.ok(preloadSrc.includes("restartDaemon"), "preload 应暴露 restartDaemon");
});

test("rant 12:44:34: main.js 心跳探活已接入（断连主动重连）", async () => {
 const GUI_DIR = path.join(__dirname, "..");
 const mainSrc = fs.readFileSync(path.join(GUI_DIR, "main.js"), "utf8");
 assert.ok(mainSrc.includes("HEARTBEAT_MS"), "应有心跳间隔常量");
 assert.ok(mainSrc.includes("function startHeartbeat"), "应有 startHeartbeat");
 assert.ok(mainSrc.includes("function stopHeartbeat"), "应有 stopHeartbeat");
 assert.ok(mainSrc.includes("function _heartbeatTick"), "应有心跳 tick");
 assert.ok(mainSrc.includes("waitForPong"), "心跳复用 waitForPong 探测");
 assert.ok(mainSrc.includes("scheduleReconnect"), "无 pong/连接断开 → 触发重连");
 assert.ok(mainSrc.includes("startHeartbeat(); // rant 2026-08-21T12:44:34"), "连接成功后启动心跳");
 assert.ok(mainSrc.includes("stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器"), "窗口关闭清理心跳");
});

test("右键菜单：重命名对话框 → renameSession 调用（设计 §3.2）", async () => {
 let renamed = null;
 const { ctx, els } = makeSandbox({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34)#912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

argszero
merged 2 commits into

from

Aug 21, 2026
 Merged


emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34)
#912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2b699b5

emrg: GUI daemon heartbeat — periodic liveness probe + active reconne…

Aug 21, 2026
6f597ba

Merge branch 'master' of github.com:argszero/emrg into feature/gui-da…


argszero Aug 21, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
 - 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` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
 - Unit tests `npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
 - Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
 - Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + 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 路径不受影响)

Expand Down

43 changes: 41 additions & 2 deletions
emrg/gui/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,11 @@ function main() {
 // （对称 TUI app.py _throttle_warned，PR #594）。成功连接后复位。
 let daemonStoppedNotified = false;
 let stopping = false;
 // Rant 2026-08-21T12:44:34：定时探活心跳——daemon 级 disconnected 事件此前无人
 // 监听（grep 证实），断连只能靠 ws close 被动通知；心跳每 15s ping 一次，
 // 无 pong 或连接已断 → 主动 scheduleReconnect（指数退避已有）。
 let heartbeatTimer = null;
 const HEARTBEAT_MS = 15_000;
 // P4（rant 15:07:19）：跨项目打开的会话状态——sid → {projectName, projectPath,
 // lastActive}。写盘防抖 1s（打开/关闭/切换时更新，镜像 rant 设计）。
 let openSessions = new Map();
Expand DownExpand Up@@ -1053,6 +1058,7 @@ vision = false
 cancelReconnect();
 reconnectDelayMs = 1000; // 退避复位
 daemonStoppedNotified = false; // 节流提示复位（下个生命周期可再提示）
 startHeartbeat(); // rant 2026-08-21T12:44:34：定时探活（断连主动重连）
 sendToRenderer("status", { connected: true });
 } catch (e) {
 const dm = connManager.daemonConn();
Expand All@@ -1077,6 +1083,7 @@ vision = false
 // 时 daemon 连接不可用"的初始/空闲场景）。
 function scheduleReconnect() {
 if (stopping || reconnectTimer) return;
 stopHeartbeat(); // 重连期间不再心跳（心跳失败路径会再调本函数，防叠）
 const delay = reconnectDelayMs;
 reconnectDelayMs = Math.min(reconnectDelayMs * 2, MAX_RECONNECT_DELAY_MS); // 指数退避
 reconnectTimer = setTimeout(async () => {
Expand All@@ -1100,8 +1107,8 @@ vision = false
 if (reconnectTimer) { clearTimeout(reconnectTimer); reconnectTimer = null; }
 }

 async function waitForPong(timeoutMs = 3000) {
 const conn = activeConn();
 async function waitForPong(timeoutMs = 3000, connOverride = null) {
 const conn = connOverride || activeConn();
 if (!conn || !conn.connected) return null; // 未连接 → 直接超时语义（不抛）
 return new Promise((resolve) => {
 const off = conn.onEvent((type, data) => {
Expand All@@ -1116,6 +1123,37 @@ vision = false
 });
 }

 // ── 心跳探活（rant 2026-08-21T12:44:34）─────────────────────
 function startHeartbeat() {
 if (heartbeatTimer || stopping) return;
 heartbeatTimer = setInterval(() => { _heartbeatTick(); }, HEARTBEAT_MS);
 logger.info(`[gui] heartbeat started (every ${HEARTBEAT_MS / 1000}s)`);
 }

 function stopHeartbeat() {
 if (heartbeatTimer) { clearInterval(heartbeatTimer); heartbeatTimer = null; }
 }

 async function _heartbeatTick() {
 if (stopping) { stopHeartbeat(); return; }
 const conn = connManager?.daemonConn();
 if (!conn) return;
 if (!conn.connected) {
 // daemon 级断连无人监听（旧缺陷）→ 心跳主动补触发重连
 logger.warn("[gui] heartbeat: daemon connection dropped — scheduling reconnect");
 stopHeartbeat();
 scheduleReconnect();
 return;
 }
 const pong = await waitForPong(3000, conn);
 if (!pong) {
 logger.warn("[gui] heartbeat: no pong from daemon — scheduling reconnect");
 stopHeartbeat();
 try { conn.close(); } catch { /* ignore */ }
 scheduleReconnect();
 }
 }

 async function listSessions(cwd = DEFAULT_CWD) {
 try {
 const frame = await requireConn().sendCommandAndWait("list_sessions", { cwd }, 5000);
Expand DownExpand Up@@ -1252,6 +1290,7 @@ vision = false
 app.on("window-all-closed", () => {
 stopping = true;
 cancelReconnect();
 stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器
 persistGuiStateNow(); // P4：退出前冲刷未落盘的打开会话状态（防抖 timer 取消）
 connManager?.closeAll(); // P2：关闭全部会话连接 + daemon 级连接
 // P2.3：窗口关闭自动销毁子 view（R5-⑤ 无需手动清理）；复位状态防二次使用
Expand Down

13 changes: 13 additions & 0 deletions
emrg/gui/test/renderer.smoke.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -787,6 +787,19 @@ test("rant 18:30:57：版本变化 → 升级横幅出现 + 重启按钮触发 r
 assert.ok(preloadSrc.includes("restartDaemon"), "preload 应暴露 restartDaemon");
});

test("rant 12:44:34: main.js 心跳探活已接入（断连主动重连）", async () => {
 const GUI_DIR = path.join(__dirname, "..");
 const mainSrc = fs.readFileSync(path.join(GUI_DIR, "main.js"), "utf8");
 assert.ok(mainSrc.includes("HEARTBEAT_MS"), "应有心跳间隔常量");
 assert.ok(mainSrc.includes("function startHeartbeat"), "应有 startHeartbeat");
 assert.ok(mainSrc.includes("function stopHeartbeat"), "应有 stopHeartbeat");
 assert.ok(mainSrc.includes("function _heartbeatTick"), "应有心跳 tick");
 assert.ok(mainSrc.includes("waitForPong"), "心跳复用 waitForPong 探测");
 assert.ok(mainSrc.includes("scheduleReconnect"), "无 pong/连接断开 → 触发重连");
 assert.ok(mainSrc.includes("startHeartbeat(); // rant 2026-08-21T12:44:34"), "连接成功后启动心跳");
 assert.ok(mainSrc.includes("stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器"), "窗口关闭清理心跳");
});

test("右键菜单：重命名对话框 → renameSession 调用（设计 §3.2）", async () => {
 let renamed = null;
 const { ctx, els } = makeSandbox({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34)#912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

argszero
merged 2 commits into

from

Aug 21, 2026
 Merged


emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34)
#912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2b699b5

emrg: GUI daemon heartbeat — periodic liveness probe + active reconne…

Aug 21, 2026
6f597ba

Merge branch 'master' of github.com:argszero/emrg into feature/gui-da…


argszero Aug 21, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
 - 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` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
 - Unit tests `npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
 - Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
 - Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + 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 路径不受影响)

Expand Down

43 changes: 41 additions & 2 deletions
emrg/gui/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,11 @@ function main() {
 // （对称 TUI app.py _throttle_warned，PR #594）。成功连接后复位。
 let daemonStoppedNotified = false;
 let stopping = false;
 // Rant 2026-08-21T12:44:34：定时探活心跳——daemon 级 disconnected 事件此前无人
 // 监听（grep 证实），断连只能靠 ws close 被动通知；心跳每 15s ping 一次，
 // 无 pong 或连接已断 → 主动 scheduleReconnect（指数退避已有）。
 let heartbeatTimer = null;
 const HEARTBEAT_MS = 15_000;
 // P4（rant 15:07:19）：跨项目打开的会话状态——sid → {projectName, projectPath,
 // lastActive}。写盘防抖 1s（打开/关闭/切换时更新，镜像 rant 设计）。
 let openSessions = new Map();
Expand DownExpand Up@@ -1053,6 +1058,7 @@ vision = false
 cancelReconnect();
 reconnectDelayMs = 1000; // 退避复位
 daemonStoppedNotified = false; // 节流提示复位（下个生命周期可再提示）
 startHeartbeat(); // rant 2026-08-21T12:44:34：定时探活（断连主动重连）
 sendToRenderer("status", { connected: true });
 } catch (e) {
 const dm = connManager.daemonConn();
Expand All@@ -1077,6 +1083,7 @@ vision = false
 // 时 daemon 连接不可用"的初始/空闲场景）。
 function scheduleReconnect() {
 if (stopping || reconnectTimer) return;
 stopHeartbeat(); // 重连期间不再心跳（心跳失败路径会再调本函数，防叠）
 const delay = reconnectDelayMs;
 reconnectDelayMs = Math.min(reconnectDelayMs * 2, MAX_RECONNECT_DELAY_MS); // 指数退避
 reconnectTimer = setTimeout(async () => {
Expand All@@ -1100,8 +1107,8 @@ vision = false
 if (reconnectTimer) { clearTimeout(reconnectTimer); reconnectTimer = null; }
 }

 async function waitForPong(timeoutMs = 3000) {
 const conn = activeConn();
 async function waitForPong(timeoutMs = 3000, connOverride = null) {
 const conn = connOverride || activeConn();
 if (!conn || !conn.connected) return null; // 未连接 → 直接超时语义（不抛）
 return new Promise((resolve) => {
 const off = conn.onEvent((type, data) => {
Expand All@@ -1116,6 +1123,37 @@ vision = false
 });
 }

 // ── 心跳探活（rant 2026-08-21T12:44:34）─────────────────────
 function startHeartbeat() {
 if (heartbeatTimer || stopping) return;
 heartbeatTimer = setInterval(() => { _heartbeatTick(); }, HEARTBEAT_MS);
 logger.info(`[gui] heartbeat started (every ${HEARTBEAT_MS / 1000}s)`);
 }

 function stopHeartbeat() {
 if (heartbeatTimer) { clearInterval(heartbeatTimer); heartbeatTimer = null; }
 }

 async function _heartbeatTick() {
 if (stopping) { stopHeartbeat(); return; }
 const conn = connManager?.daemonConn();
 if (!conn) return;
 if (!conn.connected) {
 // daemon 级断连无人监听（旧缺陷）→ 心跳主动补触发重连
 logger.warn("[gui] heartbeat: daemon connection dropped — scheduling reconnect");
 stopHeartbeat();
 scheduleReconnect();
 return;
 }
 const pong = await waitForPong(3000, conn);
 if (!pong) {
 logger.warn("[gui] heartbeat: no pong from daemon — scheduling reconnect");
 stopHeartbeat();
 try { conn.close(); } catch { /* ignore */ }
 scheduleReconnect();
 }
 }

 async function listSessions(cwd = DEFAULT_CWD) {
 try {
 const frame = await requireConn().sendCommandAndWait("list_sessions", { cwd }, 5000);
Expand DownExpand Up@@ -1252,6 +1290,7 @@ vision = false
 app.on("window-all-closed", () => {
 stopping = true;
 cancelReconnect();
 stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器
 persistGuiStateNow(); // P4：退出前冲刷未落盘的打开会话状态（防抖 timer 取消）
 connManager?.closeAll(); // P2：关闭全部会话连接 + daemon 级连接
 // P2.3：窗口关闭自动销毁子 view（R5-⑤ 无需手动清理）；复位状态防二次使用
Expand Down

13 changes: 13 additions & 0 deletions
emrg/gui/test/renderer.smoke.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -787,6 +787,19 @@ test("rant 18:30:57：版本变化 → 升级横幅出现 + 重启按钮触发 r
 assert.ok(preloadSrc.includes("restartDaemon"), "preload 应暴露 restartDaemon");
});

test("rant 12:44:34: main.js 心跳探活已接入（断连主动重连）", async () => {
 const GUI_DIR = path.join(__dirname, "..");
 const mainSrc = fs.readFileSync(path.join(GUI_DIR, "main.js"), "utf8");
 assert.ok(mainSrc.includes("HEARTBEAT_MS"), "应有心跳间隔常量");
 assert.ok(mainSrc.includes("function startHeartbeat"), "应有 startHeartbeat");
 assert.ok(mainSrc.includes("function stopHeartbeat"), "应有 stopHeartbeat");
 assert.ok(mainSrc.includes("function _heartbeatTick"), "应有心跳 tick");
 assert.ok(mainSrc.includes("waitForPong"), "心跳复用 waitForPong 探测");
 assert.ok(mainSrc.includes("scheduleReconnect"), "无 pong/连接断开 → 触发重连");
 assert.ok(mainSrc.includes("startHeartbeat(); // rant 2026-08-21T12:44:34"), "连接成功后启动心跳");
 assert.ok(mainSrc.includes("stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器"), "窗口关闭清理心跳");
});

test("右键菜单：重命名对话框 → renameSession 调用（设计 §3.2）", async () => {
 let renamed = null;
 const { ctx, els } = makeSandbox({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34)#912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

argszero
merged 2 commits into

from

Aug 21, 2026
 Merged


emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34)
#912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2b699b5

emrg: GUI daemon heartbeat — periodic liveness probe + active reconne…

Aug 21, 2026
6f597ba

Merge branch 'master' of github.com:argszero/emrg into feature/gui-da…


argszero Aug 21, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
 - 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` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
 - Unit tests `npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
 - Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
 - Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + 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 路径不受影响)

Expand Down

43 changes: 41 additions & 2 deletions
emrg/gui/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,11 @@ function main() {
 // （对称 TUI app.py _throttle_warned，PR #594）。成功连接后复位。
 let daemonStoppedNotified = false;
 let stopping = false;
 // Rant 2026-08-21T12:44:34：定时探活心跳——daemon 级 disconnected 事件此前无人
 // 监听（grep 证实），断连只能靠 ws close 被动通知；心跳每 15s ping 一次，
 // 无 pong 或连接已断 → 主动 scheduleReconnect（指数退避已有）。
 let heartbeatTimer = null;
 const HEARTBEAT_MS = 15_000;
 // P4（rant 15:07:19）：跨项目打开的会话状态——sid → {projectName, projectPath,
 // lastActive}。写盘防抖 1s（打开/关闭/切换时更新，镜像 rant 设计）。
 let openSessions = new Map();
Expand DownExpand Up@@ -1053,6 +1058,7 @@ vision = false
 cancelReconnect();
 reconnectDelayMs = 1000; // 退避复位
 daemonStoppedNotified = false; // 节流提示复位（下个生命周期可再提示）
 startHeartbeat(); // rant 2026-08-21T12:44:34：定时探活（断连主动重连）
 sendToRenderer("status", { connected: true });
 } catch (e) {
 const dm = connManager.daemonConn();
Expand All@@ -1077,6 +1083,7 @@ vision = false
 // 时 daemon 连接不可用"的初始/空闲场景）。
 function scheduleReconnect() {
 if (stopping || reconnectTimer) return;
 stopHeartbeat(); // 重连期间不再心跳（心跳失败路径会再调本函数，防叠）
 const delay = reconnectDelayMs;
 reconnectDelayMs = Math.min(reconnectDelayMs * 2, MAX_RECONNECT_DELAY_MS); // 指数退避
 reconnectTimer = setTimeout(async () => {
Expand All@@ -1100,8 +1107,8 @@ vision = false
 if (reconnectTimer) { clearTimeout(reconnectTimer); reconnectTimer = null; }
 }

 async function waitForPong(timeoutMs = 3000) {
 const conn = activeConn();
 async function waitForPong(timeoutMs = 3000, connOverride = null) {
 const conn = connOverride || activeConn();
 if (!conn || !conn.connected) return null; // 未连接 → 直接超时语义（不抛）
 return new Promise((resolve) => {
 const off = conn.onEvent((type, data) => {
Expand All@@ -1116,6 +1123,37 @@ vision = false
 });
 }

 // ── 心跳探活（rant 2026-08-21T12:44:34）─────────────────────
 function startHeartbeat() {
 if (heartbeatTimer || stopping) return;
 heartbeatTimer = setInterval(() => { _heartbeatTick(); }, HEARTBEAT_MS);
 logger.info(`[gui] heartbeat started (every ${HEARTBEAT_MS / 1000}s)`);
 }

 function stopHeartbeat() {
 if (heartbeatTimer) { clearInterval(heartbeatTimer); heartbeatTimer = null; }
 }

 async function _heartbeatTick() {
 if (stopping) { stopHeartbeat(); return; }
 const conn = connManager?.daemonConn();
 if (!conn) return;
 if (!conn.connected) {
 // daemon 级断连无人监听（旧缺陷）→ 心跳主动补触发重连
 logger.warn("[gui] heartbeat: daemon connection dropped — scheduling reconnect");
 stopHeartbeat();
 scheduleReconnect();
 return;
 }
 const pong = await waitForPong(3000, conn);
 if (!pong) {
 logger.warn("[gui] heartbeat: no pong from daemon — scheduling reconnect");
 stopHeartbeat();
 try { conn.close(); } catch { /* ignore */ }
 scheduleReconnect();
 }
 }

 async function listSessions(cwd = DEFAULT_CWD) {
 try {
 const frame = await requireConn().sendCommandAndWait("list_sessions", { cwd }, 5000);
Expand DownExpand Up@@ -1252,6 +1290,7 @@ vision = false
 app.on("window-all-closed", () => {
 stopping = true;
 cancelReconnect();
 stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器
 persistGuiStateNow(); // P4：退出前冲刷未落盘的打开会话状态（防抖 timer 取消）
 connManager?.closeAll(); // P2：关闭全部会话连接 + daemon 级连接
 // P2.3：窗口关闭自动销毁子 view（R5-⑤ 无需手动清理）；复位状态防二次使用
Expand Down

13 changes: 13 additions & 0 deletions
emrg/gui/test/renderer.smoke.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -787,6 +787,19 @@ test("rant 18:30:57：版本变化 → 升级横幅出现 + 重启按钮触发 r
 assert.ok(preloadSrc.includes("restartDaemon"), "preload 应暴露 restartDaemon");
});

test("rant 12:44:34: main.js 心跳探活已接入（断连主动重连）", async () => {
 const GUI_DIR = path.join(__dirname, "..");
 const mainSrc = fs.readFileSync(path.join(GUI_DIR, "main.js"), "utf8");
 assert.ok(mainSrc.includes("HEARTBEAT_MS"), "应有心跳间隔常量");
 assert.ok(mainSrc.includes("function startHeartbeat"), "应有 startHeartbeat");
 assert.ok(mainSrc.includes("function stopHeartbeat"), "应有 stopHeartbeat");
 assert.ok(mainSrc.includes("function _heartbeatTick"), "应有心跳 tick");
 assert.ok(mainSrc.includes("waitForPong"), "心跳复用 waitForPong 探测");
 assert.ok(mainSrc.includes("scheduleReconnect"), "无 pong/连接断开 → 触发重连");
 assert.ok(mainSrc.includes("startHeartbeat(); // rant 2026-08-21T12:44:34"), "连接成功后启动心跳");
 assert.ok(mainSrc.includes("stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器"), "窗口关闭清理心跳");
});

test("右键菜单：重命名对话框 → renameSession 调用（设计 §3.2）", async () => {
 let renamed = null;
 const { ctx, els } = makeSandbox({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34)#912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

argszero
merged 2 commits into

from

Aug 21, 2026
 Merged


emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34)
#912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2b699b5

emrg: GUI daemon heartbeat — periodic liveness probe + active reconne…

Aug 21, 2026
6f597ba

Merge branch 'master' of github.com:argszero/emrg into feature/gui-da…


argszero Aug 21, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
 - 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` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
 - Unit tests `npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
 - Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
 - Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + 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 路径不受影响)

Expand Down

43 changes: 41 additions & 2 deletions
emrg/gui/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,11 @@ function main() {
 // （对称 TUI app.py _throttle_warned，PR #594）。成功连接后复位。
 let daemonStoppedNotified = false;
 let stopping = false;
 // Rant 2026-08-21T12:44:34：定时探活心跳——daemon 级 disconnected 事件此前无人
 // 监听（grep 证实），断连只能靠 ws close 被动通知；心跳每 15s ping 一次，
 // 无 pong 或连接已断 → 主动 scheduleReconnect（指数退避已有）。
 let heartbeatTimer = null;
 const HEARTBEAT_MS = 15_000;
 // P4（rant 15:07:19）：跨项目打开的会话状态——sid → {projectName, projectPath,
 // lastActive}。写盘防抖 1s（打开/关闭/切换时更新，镜像 rant 设计）。
 let openSessions = new Map();
Expand DownExpand Up@@ -1053,6 +1058,7 @@ vision = false
 cancelReconnect();
 reconnectDelayMs = 1000; // 退避复位
 daemonStoppedNotified = false; // 节流提示复位（下个生命周期可再提示）
 startHeartbeat(); // rant 2026-08-21T12:44:34：定时探活（断连主动重连）
 sendToRenderer("status", { connected: true });
 } catch (e) {
 const dm = connManager.daemonConn();
Expand All@@ -1077,6 +1083,7 @@ vision = false
 // 时 daemon 连接不可用"的初始/空闲场景）。
 function scheduleReconnect() {
 if (stopping || reconnectTimer) return;
 stopHeartbeat(); // 重连期间不再心跳（心跳失败路径会再调本函数，防叠）
 const delay = reconnectDelayMs;
 reconnectDelayMs = Math.min(reconnectDelayMs * 2, MAX_RECONNECT_DELAY_MS); // 指数退避
 reconnectTimer = setTimeout(async () => {
Expand All@@ -1100,8 +1107,8 @@ vision = false
 if (reconnectTimer) { clearTimeout(reconnectTimer); reconnectTimer = null; }
 }

 async function waitForPong(timeoutMs = 3000) {
 const conn = activeConn();
 async function waitForPong(timeoutMs = 3000, connOverride = null) {
 const conn = connOverride || activeConn();
 if (!conn || !conn.connected) return null; // 未连接 → 直接超时语义（不抛）
 return new Promise((resolve) => {
 const off = conn.onEvent((type, data) => {
Expand All@@ -1116,6 +1123,37 @@ vision = false
 });
 }

 // ── 心跳探活（rant 2026-08-21T12:44:34）─────────────────────
 function startHeartbeat() {
 if (heartbeatTimer || stopping) return;
 heartbeatTimer = setInterval(() => { _heartbeatTick(); }, HEARTBEAT_MS);
 logger.info(`[gui] heartbeat started (every ${HEARTBEAT_MS / 1000}s)`);
 }

 function stopHeartbeat() {
 if (heartbeatTimer) { clearInterval(heartbeatTimer); heartbeatTimer = null; }
 }

 async function _heartbeatTick() {
 if (stopping) { stopHeartbeat(); return; }
 const conn = connManager?.daemonConn();
 if (!conn) return;
 if (!conn.connected) {
 // daemon 级断连无人监听（旧缺陷）→ 心跳主动补触发重连
 logger.warn("[gui] heartbeat: daemon connection dropped — scheduling reconnect");
 stopHeartbeat();
 scheduleReconnect();
 return;
 }
 const pong = await waitForPong(3000, conn);
 if (!pong) {
 logger.warn("[gui] heartbeat: no pong from daemon — scheduling reconnect");
 stopHeartbeat();
 try { conn.close(); } catch { /* ignore */ }
 scheduleReconnect();
 }
 }

 async function listSessions(cwd = DEFAULT_CWD) {
 try {
 const frame = await requireConn().sendCommandAndWait("list_sessions", { cwd }, 5000);
Expand DownExpand Up@@ -1252,6 +1290,7 @@ vision = false
 app.on("window-all-closed", () => {
 stopping = true;
 cancelReconnect();
 stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器
 persistGuiStateNow(); // P4：退出前冲刷未落盘的打开会话状态（防抖 timer 取消）
 connManager?.closeAll(); // P2：关闭全部会话连接 + daemon 级连接
 // P2.3：窗口关闭自动销毁子 view（R5-⑤ 无需手动清理）；复位状态防二次使用
Expand Down

13 changes: 13 additions & 0 deletions
emrg/gui/test/renderer.smoke.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -787,6 +787,19 @@ test("rant 18:30:57：版本变化 → 升级横幅出现 + 重启按钮触发 r
 assert.ok(preloadSrc.includes("restartDaemon"), "preload 应暴露 restartDaemon");
});

test("rant 12:44:34: main.js 心跳探活已接入（断连主动重连）", async () => {
 const GUI_DIR = path.join(__dirname, "..");
 const mainSrc = fs.readFileSync(path.join(GUI_DIR, "main.js"), "utf8");
 assert.ok(mainSrc.includes("HEARTBEAT_MS"), "应有心跳间隔常量");
 assert.ok(mainSrc.includes("function startHeartbeat"), "应有 startHeartbeat");
 assert.ok(mainSrc.includes("function stopHeartbeat"), "应有 stopHeartbeat");
 assert.ok(mainSrc.includes("function _heartbeatTick"), "应有心跳 tick");
 assert.ok(mainSrc.includes("waitForPong"), "心跳复用 waitForPong 探测");
 assert.ok(mainSrc.includes("scheduleReconnect"), "无 pong/连接断开 → 触发重连");
 assert.ok(mainSrc.includes("startHeartbeat(); // rant 2026-08-21T12:44:34"), "连接成功后启动心跳");
 assert.ok(mainSrc.includes("stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器"), "窗口关闭清理心跳");
});

test("右键菜单：重命名对话框 → renameSession 调用（设计 §3.2）", async () => {
 let renamed = null;
 const { ctx, els } = makeSandbox({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34)#912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

argszero
merged 2 commits into

from

Aug 21, 2026
 Merged


emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34)
#912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2b699b5

emrg: GUI daemon heartbeat — periodic liveness probe + active reconne…

Aug 21, 2026
6f597ba

Merge branch 'master' of github.com:argszero/emrg into feature/gui-da…


argszero Aug 21, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
 - 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` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
 - Unit tests `npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
 - Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
 - Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + 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 路径不受影响)

Expand Down

43 changes: 41 additions & 2 deletions
emrg/gui/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,11 @@ function main() {
 // （对称 TUI app.py _throttle_warned，PR #594）。成功连接后复位。
 let daemonStoppedNotified = false;
 let stopping = false;
 // Rant 2026-08-21T12:44:34：定时探活心跳——daemon 级 disconnected 事件此前无人
 // 监听（grep 证实），断连只能靠 ws close 被动通知；心跳每 15s ping 一次，
 // 无 pong 或连接已断 → 主动 scheduleReconnect（指数退避已有）。
 let heartbeatTimer = null;
 const HEARTBEAT_MS = 15_000;
 // P4（rant 15:07:19）：跨项目打开的会话状态——sid → {projectName, projectPath,
 // lastActive}。写盘防抖 1s（打开/关闭/切换时更新，镜像 rant 设计）。
 let openSessions = new Map();
Expand DownExpand Up@@ -1053,6 +1058,7 @@ vision = false
 cancelReconnect();
 reconnectDelayMs = 1000; // 退避复位
 daemonStoppedNotified = false; // 节流提示复位（下个生命周期可再提示）
 startHeartbeat(); // rant 2026-08-21T12:44:34：定时探活（断连主动重连）
 sendToRenderer("status", { connected: true });
 } catch (e) {
 const dm = connManager.daemonConn();
Expand All@@ -1077,6 +1083,7 @@ vision = false
 // 时 daemon 连接不可用"的初始/空闲场景）。
 function scheduleReconnect() {
 if (stopping || reconnectTimer) return;
 stopHeartbeat(); // 重连期间不再心跳（心跳失败路径会再调本函数，防叠）
 const delay = reconnectDelayMs;
 reconnectDelayMs = Math.min(reconnectDelayMs * 2, MAX_RECONNECT_DELAY_MS); // 指数退避
 reconnectTimer = setTimeout(async () => {
Expand All@@ -1100,8 +1107,8 @@ vision = false
 if (reconnectTimer) { clearTimeout(reconnectTimer); reconnectTimer = null; }
 }

 async function waitForPong(timeoutMs = 3000) {
 const conn = activeConn();
 async function waitForPong(timeoutMs = 3000, connOverride = null) {
 const conn = connOverride || activeConn();
 if (!conn || !conn.connected) return null; // 未连接 → 直接超时语义（不抛）
 return new Promise((resolve) => {
 const off = conn.onEvent((type, data) => {
Expand All@@ -1116,6 +1123,37 @@ vision = false
 });
 }

 // ── 心跳探活（rant 2026-08-21T12:44:34）─────────────────────
 function startHeartbeat() {
 if (heartbeatTimer || stopping) return;
 heartbeatTimer = setInterval(() => { _heartbeatTick(); }, HEARTBEAT_MS);
 logger.info(`[gui] heartbeat started (every ${HEARTBEAT_MS / 1000}s)`);
 }

 function stopHeartbeat() {
 if (heartbeatTimer) { clearInterval(heartbeatTimer); heartbeatTimer = null; }
 }

 async function _heartbeatTick() {
 if (stopping) { stopHeartbeat(); return; }
 const conn = connManager?.daemonConn();
 if (!conn) return;
 if (!conn.connected) {
 // daemon 级断连无人监听（旧缺陷）→ 心跳主动补触发重连
 logger.warn("[gui] heartbeat: daemon connection dropped — scheduling reconnect");
 stopHeartbeat();
 scheduleReconnect();
 return;
 }
 const pong = await waitForPong(3000, conn);
 if (!pong) {
 logger.warn("[gui] heartbeat: no pong from daemon — scheduling reconnect");
 stopHeartbeat();
 try { conn.close(); } catch { /* ignore */ }
 scheduleReconnect();
 }
 }

 async function listSessions(cwd = DEFAULT_CWD) {
 try {
 const frame = await requireConn().sendCommandAndWait("list_sessions", { cwd }, 5000);
Expand DownExpand Up@@ -1252,6 +1290,7 @@ vision = false
 app.on("window-all-closed", () => {
 stopping = true;
 cancelReconnect();
 stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器
 persistGuiStateNow(); // P4：退出前冲刷未落盘的打开会话状态（防抖 timer 取消）
 connManager?.closeAll(); // P2：关闭全部会话连接 + daemon 级连接
 // P2.3：窗口关闭自动销毁子 view（R5-⑤ 无需手动清理）；复位状态防二次使用
Expand Down

13 changes: 13 additions & 0 deletions
emrg/gui/test/renderer.smoke.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -787,6 +787,19 @@ test("rant 18:30:57：版本变化 → 升级横幅出现 + 重启按钮触发 r
 assert.ok(preloadSrc.includes("restartDaemon"), "preload 应暴露 restartDaemon");
});

test("rant 12:44:34: main.js 心跳探活已接入（断连主动重连）", async () => {
 const GUI_DIR = path.join(__dirname, "..");
 const mainSrc = fs.readFileSync(path.join(GUI_DIR, "main.js"), "utf8");
 assert.ok(mainSrc.includes("HEARTBEAT_MS"), "应有心跳间隔常量");
 assert.ok(mainSrc.includes("function startHeartbeat"), "应有 startHeartbeat");
 assert.ok(mainSrc.includes("function stopHeartbeat"), "应有 stopHeartbeat");
 assert.ok(mainSrc.includes("function _heartbeatTick"), "应有心跳 tick");
 assert.ok(mainSrc.includes("waitForPong"), "心跳复用 waitForPong 探测");
 assert.ok(mainSrc.includes("scheduleReconnect"), "无 pong/连接断开 → 触发重连");
 assert.ok(mainSrc.includes("startHeartbeat(); // rant 2026-08-21T12:44:34"), "连接成功后启动心跳");
 assert.ok(mainSrc.includes("stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器"), "窗口关闭清理心跳");
});

test("右键菜单：重命名对话框 → renameSession 调用（设计 §3.2）", async () => {
 let renamed = null;
 const { ctx, els } = makeSandbox({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34)#912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

argszero
merged 2 commits into

from

Aug 21, 2026
 Merged


emrg: GUI daemon heartbeat — periodic liveness probe + active reconnect (rant 2026-08-21T12:44:34)
#912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2b699b5

emrg: GUI daemon heartbeat — periodic liveness probe + active reconne…

Aug 21, 2026
6f597ba

Merge branch 'master' of github.com:argszero/emrg into feature/gui-da…


argszero Aug 21, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
 - 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` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
 - Unit tests `npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
 - Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
 - Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (255: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (256: 45 daemon_client + 19 conn-manager + 22 app-commands + 127 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + 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 路径不受影响)

Expand Down

43 changes: 41 additions & 2 deletions
emrg/gui/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,11 @@ function main() {
 // （对称 TUI app.py _throttle_warned，PR #594）。成功连接后复位。
 let daemonStoppedNotified = false;
 let stopping = false;
 // Rant 2026-08-21T12:44:34：定时探活心跳——daemon 级 disconnected 事件此前无人
 // 监听（grep 证实），断连只能靠 ws close 被动通知；心跳每 15s ping 一次，
 // 无 pong 或连接已断 → 主动 scheduleReconnect（指数退避已有）。
 let heartbeatTimer = null;
 const HEARTBEAT_MS = 15_000;
 // P4（rant 15:07:19）：跨项目打开的会话状态——sid → {projectName, projectPath,
 // lastActive}。写盘防抖 1s（打开/关闭/切换时更新，镜像 rant 设计）。
 let openSessions = new Map();
Expand DownExpand Up@@ -1053,6 +1058,7 @@ vision = false
 cancelReconnect();
 reconnectDelayMs = 1000; // 退避复位
 daemonStoppedNotified = false; // 节流提示复位（下个生命周期可再提示）
 startHeartbeat(); // rant 2026-08-21T12:44:34：定时探活（断连主动重连）
 sendToRenderer("status", { connected: true });
 } catch (e) {
 const dm = connManager.daemonConn();
Expand All@@ -1077,6 +1083,7 @@ vision = false
 // 时 daemon 连接不可用"的初始/空闲场景）。
 function scheduleReconnect() {
 if (stopping || reconnectTimer) return;
 stopHeartbeat(); // 重连期间不再心跳（心跳失败路径会再调本函数，防叠）
 const delay = reconnectDelayMs;
 reconnectDelayMs = Math.min(reconnectDelayMs * 2, MAX_RECONNECT_DELAY_MS); // 指数退避
 reconnectTimer = setTimeout(async () => {
Expand All@@ -1100,8 +1107,8 @@ vision = false
 if (reconnectTimer) { clearTimeout(reconnectTimer); reconnectTimer = null; }
 }

 async function waitForPong(timeoutMs = 3000) {
 const conn = activeConn();
 async function waitForPong(timeoutMs = 3000, connOverride = null) {
 const conn = connOverride || activeConn();
 if (!conn || !conn.connected) return null; // 未连接 → 直接超时语义（不抛）
 return new Promise((resolve) => {
 const off = conn.onEvent((type, data) => {
Expand All@@ -1116,6 +1123,37 @@ vision = false
 });
 }

 // ── 心跳探活（rant 2026-08-21T12:44:34）─────────────────────
 function startHeartbeat() {
 if (heartbeatTimer || stopping) return;
 heartbeatTimer = setInterval(() => { _heartbeatTick(); }, HEARTBEAT_MS);
 logger.info(`[gui] heartbeat started (every ${HEARTBEAT_MS / 1000}s)`);
 }

 function stopHeartbeat() {
 if (heartbeatTimer) { clearInterval(heartbeatTimer); heartbeatTimer = null; }
 }

 async function _heartbeatTick() {
 if (stopping) { stopHeartbeat(); return; }
 const conn = connManager?.daemonConn();
 if (!conn) return;
 if (!conn.connected) {
 // daemon 级断连无人监听（旧缺陷）→ 心跳主动补触发重连
 logger.warn("[gui] heartbeat: daemon connection dropped — scheduling reconnect");
 stopHeartbeat();
 scheduleReconnect();
 return;
 }
 const pong = await waitForPong(3000, conn);
 if (!pong) {
 logger.warn("[gui] heartbeat: no pong from daemon — scheduling reconnect");
 stopHeartbeat();
 try { conn.close(); } catch { /* ignore */ }
 scheduleReconnect();
 }
 }

 async function listSessions(cwd = DEFAULT_CWD) {
 try {
 const frame = await requireConn().sendCommandAndWait("list_sessions", { cwd }, 5000);
Expand DownExpand Up@@ -1252,6 +1290,7 @@ vision = false
 app.on("window-all-closed", () => {
 stopping = true;
 cancelReconnect();
 stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器
 persistGuiStateNow(); // P4：退出前冲刷未落盘的打开会话状态（防抖 timer 取消）
 connManager?.closeAll(); // P2：关闭全部会话连接 + daemon 级连接
 // P2.3：窗口关闭自动销毁子 view（R5-⑤ 无需手动清理）；复位状态防二次使用
Expand Down

13 changes: 13 additions & 0 deletions
emrg/gui/test/renderer.smoke.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -787,6 +787,19 @@ test("rant 18:30:57：版本变化 → 升级横幅出现 + 重启按钮触发 r
 assert.ok(preloadSrc.includes("restartDaemon"), "preload 应暴露 restartDaemon");
});

test("rant 12:44:34: main.js 心跳探活已接入（断连主动重连）", async () => {
 const GUI_DIR = path.join(__dirname, "..");
 const mainSrc = fs.readFileSync(path.join(GUI_DIR, "main.js"), "utf8");
 assert.ok(mainSrc.includes("HEARTBEAT_MS"), "应有心跳间隔常量");
 assert.ok(mainSrc.includes("function startHeartbeat"), "应有 startHeartbeat");
 assert.ok(mainSrc.includes("function stopHeartbeat"), "应有 stopHeartbeat");
 assert.ok(mainSrc.includes("function _heartbeatTick"), "应有心跳 tick");
 assert.ok(mainSrc.includes("waitForPong"), "心跳复用 waitForPong 探测");
 assert.ok(mainSrc.includes("scheduleReconnect"), "无 pong/连接断开 → 触发重连");
 assert.ok(mainSrc.includes("startHeartbeat(); // rant 2026-08-21T12:44:34"), "连接成功后启动心跳");
 assert.ok(mainSrc.includes("stopHeartbeat(); // rant 2026-08-21T12:44:34：退出清理心跳定时器"), "窗口关闭清理心跳");
});

test("右键菜单：重命名对话框 → renameSession 调用（设计 §3.2）", async () => {
 let renamed = null;
 const { ctx, els } = makeSandbox({
Expand Down
Loading