emrg: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe)#1044

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 27, 2026
Merged

emrg: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe) #1044

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
bc332c3
emrg: connect — never delete a healthy daemon's token in cleanup_serv…
Aug 27, 2026
e83ec09
emrg: connect — never delete a healthy daemon's token in cleanup_serv…
Aug 27, 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
2 changes: 1 addition & 1 deletion Agent.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1126) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1127) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (93: 45 daemon_client + 20 conn-manager + 8 integration + 6 build-config + 7 gui-state + 3 preload-api + 4 boot-contract) — syntax: `node --check main.js preload.js daemon_client.js`
Renderer: `cd emrg/gui/renderer && npm run typecheck && npm test` (445: 5 snapshot-store + 9 utils + 3 ErrorBoundary + 2 App smoke + 11 commands + 4 copywriting + 11 i18n + 11 markdown + 15 transcript + 7 TranscriptView + 15 history + 22 composer + 14 Composer + 12 sidebar + 17 Sidebar + 9 fileTree + 9 FileTree + 16 resultPanel + 8 ResultPanel + 29 workspaceView + 8 WorkspaceView + 10 dialog + 6 Dialog + 9 ConfirmDialog + 9 RenameDialog + 10 dialogLists + 3 HelpDialog + 9 MemoryDialog + 6 SkillsDialog + 9 openSession + 6 WelcomeDialog + 8 OpenSessionDialog + 7 NewSessionDialog + 7 rewind + 8 RewindDialog + 7 GithubDeviceDialog + 14 daemonBridge + 7 DaemonBridgeProvider + 24 Shell + 15 DialogHost + 19 SettingsPanel + 6 TaskFormDialog + 5 RantDialog + 4 vendorMarkdown) + `npm run build` → `renderer/dist/`
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 上下文)
Expand Down
18 changes: 17 additions & 1 deletion emrg/connect.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,23 @@ async def connect_to_server():


def cleanup_server() -> None:
"""Remove the daemon auth token file on shutdown."""
"""Remove the daemon auth token file on shutdown.

⚠️ Guards against deleting a HEALTHY daemon's token (rant 2026-08-27T14:48:50):
a mis-triggered spawn cleanup (start_daemon / _start_daemon_background run this
unconditionally) must never remove the token of a daemon that is actually
listening on the fixed port — the fixed port is the single-instance ground
truth, and a transient TCP probe miss while a daemon is alive caused the token
to be deleted and the doomed spawn (EADDRINUSE suicide) never rewrote it.

Only delete when the fixed-port probe confirms NO daemon is accepting
connections. A fresh daemon start rewrites the token atomically
(_assert_token_file / atomic_write_bytes), so a stale token from a crashed
daemon is harmless on the next successful start.
"""
if is_server_running_sync():
logger.debug("daemon still listening on the fixed port — keeping token file")
return
port_path = Path(get_server_path())
if port_path.exists():
port_path.unlink()
Expand Down
22 changes: 21 additions & 1 deletion tests/test_connect.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,9 @@ def test_is_exception(self):

class TestCleanupServer:
def test_removes_token_file(self, monkeypatch, tmp_path):
"""Removes the token file if present."""
"""Removes the token file if present (no daemon listening → deletion ok)."""
monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
port_file = tmp_path / f"{CONNECT_ID}.token"
port_file.write_text("token", encoding="utf-8")

Expand All@@ -42,12 +43,14 @@ def test_removes_token_file(self, monkeypatch, tmp_path):
def test_noop_when_absent(self, monkeypatch, tmp_path):
"""Does nothing when the token file doesn't exist."""
monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)

cleanup_server() # must not raise

def test_leaves_other_files(self, monkeypatch, tmp_path):
"""Only removes the token file, not other config files."""
monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
other = tmp_path / "config.toml"
other.write_text("x", encoding="utf-8")
port_file = tmp_path / f"{CONNECT_ID}.token"
Expand All@@ -58,6 +61,23 @@ def test_leaves_other_files(self, monkeypatch, tmp_path):
assert other.exists()
assert not port_file.exists()

def test_keeps_token_when_daemon_listening(self, monkeypatch, tmp_path):
"""rant 2026-08-27T14:48:50 — never delete a HEALTHY daemon's token.

A mis-triggered spawn cleanup (start_daemon / _start_daemon_background run
cleanup_server() unconditionally) must not remove the token of a daemon
that is actually listening on the fixed port. The doomed spawn (EADDRINUSE
suicide) would never rewrite it → token-missing window for new connections.
"""
monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: True)
port_file = tmp_path / f"{CONNECT_ID}.token"
port_file.write_text("token", encoding="utf-8")

cleanup_server()

assert port_file.exists(), "token must survive when a daemon is listening"


class TestIsServerRunningSync:
"""Probes the FIXED daemon port (rant 2026-08-19T08:05:21) — no token-file
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: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe)#1044

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 27, 2026
 Merged


emrg: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe)
#1044
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
bc332c3

emrg: connect — never delete a healthy daemon's token in cleanup_serv…

Aug 27, 2026
e83ec09

emrg: connect — never delete a healthy daemon's token in cleanup_serv…

Aug 27, 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


2 changes: 1 addition & 1 deletion
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1126) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1127) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (93: 45 daemon_client + 20 conn-manager + 8 integration + 6 build-config + 7 gui-state + 3 preload-api + 4 boot-contract) — syntax: `node --check main.js preload.js daemon_client.js`
Renderer: `cd emrg/gui/renderer && npm run typecheck && npm test` (445: 5 snapshot-store + 9 utils + 3 ErrorBoundary + 2 App smoke + 11 commands + 4 copywriting + 11 i18n + 11 markdown + 15 transcript + 7 TranscriptView + 15 history + 22 composer + 14 Composer + 12 sidebar + 17 Sidebar + 9 fileTree + 9 FileTree + 16 resultPanel + 8 ResultPanel + 29 workspaceView + 8 WorkspaceView + 10 dialog + 6 Dialog + 9 ConfirmDialog + 9 RenameDialog + 10 dialogLists + 3 HelpDialog + 9 MemoryDialog + 6 SkillsDialog + 9 openSession + 6 WelcomeDialog + 8 OpenSessionDialog + 7 NewSessionDialog + 7 rewind + 8 RewindDialog + 7 GithubDeviceDialog + 14 daemonBridge + 7 DaemonBridgeProvider + 24 Shell + 15 DialogHost + 19 SettingsPanel + 6 TaskFormDialog + 5 RantDialog + 4 vendorMarkdown) + `npm run build` → `renderer/dist/`
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 上下文)
Expand Down

18 changes: 17 additions & 1 deletion
emrg/connect.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,23 @@ async def connect_to_server():


def cleanup_server() -> None:
 """Remove the daemon auth token file on shutdown."""
 """Remove the daemon auth token file on shutdown.

 ⚠️ Guards against deleting a HEALTHY daemon's token (rant 2026-08-27T14:48:50):
 a mis-triggered spawn cleanup (start_daemon / _start_daemon_background run this
 unconditionally) must never remove the token of a daemon that is actually
 listening on the fixed port — the fixed port is the single-instance ground
 truth, and a transient TCP probe miss while a daemon is alive caused the token
 to be deleted and the doomed spawn (EADDRINUSE suicide) never rewrote it.

 Only delete when the fixed-port probe confirms NO daemon is accepting
 connections. A fresh daemon start rewrites the token atomically
 (_assert_token_file / atomic_write_bytes), so a stale token from a crashed
 daemon is harmless on the next successful start.
 """
 if is_server_running_sync():
 logger.debug("daemon still listening on the fixed port — keeping token file")
 return
 port_path = Path(get_server_path())
 if port_path.exists():
 port_path.unlink()
Expand Down

22 changes: 21 additions & 1 deletion
tests/test_connect.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,9 @@ def test_is_exception(self):

class TestCleanupServer:
 def test_removes_token_file(self, monkeypatch, tmp_path):
 """Removes the token file if present."""
 """Removes the token file if present (no daemon listening → deletion ok)."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
 port_file = tmp_path / f"{CONNECT_ID}.token"
 port_file.write_text("token", encoding="utf-8")

Expand All@@ -42,12 +43,14 @@ def test_removes_token_file(self, monkeypatch, tmp_path):
 def test_noop_when_absent(self, monkeypatch, tmp_path):
 """Does nothing when the token file doesn't exist."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)

 cleanup_server() # must not raise

 def test_leaves_other_files(self, monkeypatch, tmp_path):
 """Only removes the token file, not other config files."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
 other = tmp_path / "config.toml"
 other.write_text("x", encoding="utf-8")
 port_file = tmp_path / f"{CONNECT_ID}.token"
Expand All@@ -58,6 +61,23 @@ def test_leaves_other_files(self, monkeypatch, tmp_path):
 assert other.exists()
 assert not port_file.exists()

 def test_keeps_token_when_daemon_listening(self, monkeypatch, tmp_path):
 """rant 2026-08-27T14:48:50 — never delete a HEALTHY daemon's token.

 A mis-triggered spawn cleanup (start_daemon / _start_daemon_background run
 cleanup_server() unconditionally) must not remove the token of a daemon
 that is actually listening on the fixed port. The doomed spawn (EADDRINUSE
 suicide) would never rewrite it → token-missing window for new connections.
 """
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: True)
 port_file = tmp_path / f"{CONNECT_ID}.token"
 port_file.write_text("token", encoding="utf-8")

 cleanup_server()

 assert port_file.exists(), "token must survive when a daemon is listening"


class TestIsServerRunningSync:
 """Probes the FIXED daemon port (rant 2026-08-19T08:05:21) — no token-file
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: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe)#1044

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 27, 2026
 Merged


emrg: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe)
#1044
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
bc332c3

emrg: connect — never delete a healthy daemon's token in cleanup_serv…

Aug 27, 2026
e83ec09

emrg: connect — never delete a healthy daemon's token in cleanup_serv…

Aug 27, 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


2 changes: 1 addition & 1 deletion
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1126) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1127) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (93: 45 daemon_client + 20 conn-manager + 8 integration + 6 build-config + 7 gui-state + 3 preload-api + 4 boot-contract) — syntax: `node --check main.js preload.js daemon_client.js`
Renderer: `cd emrg/gui/renderer && npm run typecheck && npm test` (445: 5 snapshot-store + 9 utils + 3 ErrorBoundary + 2 App smoke + 11 commands + 4 copywriting + 11 i18n + 11 markdown + 15 transcript + 7 TranscriptView + 15 history + 22 composer + 14 Composer + 12 sidebar + 17 Sidebar + 9 fileTree + 9 FileTree + 16 resultPanel + 8 ResultPanel + 29 workspaceView + 8 WorkspaceView + 10 dialog + 6 Dialog + 9 ConfirmDialog + 9 RenameDialog + 10 dialogLists + 3 HelpDialog + 9 MemoryDialog + 6 SkillsDialog + 9 openSession + 6 WelcomeDialog + 8 OpenSessionDialog + 7 NewSessionDialog + 7 rewind + 8 RewindDialog + 7 GithubDeviceDialog + 14 daemonBridge + 7 DaemonBridgeProvider + 24 Shell + 15 DialogHost + 19 SettingsPanel + 6 TaskFormDialog + 5 RantDialog + 4 vendorMarkdown) + `npm run build` → `renderer/dist/`
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 上下文)
Expand Down

18 changes: 17 additions & 1 deletion
emrg/connect.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,23 @@ async def connect_to_server():


def cleanup_server() -> None:
 """Remove the daemon auth token file on shutdown."""
 """Remove the daemon auth token file on shutdown.

 ⚠️ Guards against deleting a HEALTHY daemon's token (rant 2026-08-27T14:48:50):
 a mis-triggered spawn cleanup (start_daemon / _start_daemon_background run this
 unconditionally) must never remove the token of a daemon that is actually
 listening on the fixed port — the fixed port is the single-instance ground
 truth, and a transient TCP probe miss while a daemon is alive caused the token
 to be deleted and the doomed spawn (EADDRINUSE suicide) never rewrote it.

 Only delete when the fixed-port probe confirms NO daemon is accepting
 connections. A fresh daemon start rewrites the token atomically
 (_assert_token_file / atomic_write_bytes), so a stale token from a crashed
 daemon is harmless on the next successful start.
 """
 if is_server_running_sync():
 logger.debug("daemon still listening on the fixed port — keeping token file")
 return
 port_path = Path(get_server_path())
 if port_path.exists():
 port_path.unlink()
Expand Down

22 changes: 21 additions & 1 deletion
tests/test_connect.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,9 @@ def test_is_exception(self):

class TestCleanupServer:
 def test_removes_token_file(self, monkeypatch, tmp_path):
 """Removes the token file if present."""
 """Removes the token file if present (no daemon listening → deletion ok)."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
 port_file = tmp_path / f"{CONNECT_ID}.token"
 port_file.write_text("token", encoding="utf-8")

Expand All@@ -42,12 +43,14 @@ def test_removes_token_file(self, monkeypatch, tmp_path):
 def test_noop_when_absent(self, monkeypatch, tmp_path):
 """Does nothing when the token file doesn't exist."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)

 cleanup_server() # must not raise

 def test_leaves_other_files(self, monkeypatch, tmp_path):
 """Only removes the token file, not other config files."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
 other = tmp_path / "config.toml"
 other.write_text("x", encoding="utf-8")
 port_file = tmp_path / f"{CONNECT_ID}.token"
Expand All@@ -58,6 +61,23 @@ def test_leaves_other_files(self, monkeypatch, tmp_path):
 assert other.exists()
 assert not port_file.exists()

 def test_keeps_token_when_daemon_listening(self, monkeypatch, tmp_path):
 """rant 2026-08-27T14:48:50 — never delete a HEALTHY daemon's token.

 A mis-triggered spawn cleanup (start_daemon / _start_daemon_background run
 cleanup_server() unconditionally) must not remove the token of a daemon
 that is actually listening on the fixed port. The doomed spawn (EADDRINUSE
 suicide) would never rewrite it → token-missing window for new connections.
 """
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: True)
 port_file = tmp_path / f"{CONNECT_ID}.token"
 port_file.write_text("token", encoding="utf-8")

 cleanup_server()

 assert port_file.exists(), "token must survive when a daemon is listening"


class TestIsServerRunningSync:
 """Probes the FIXED daemon port (rant 2026-08-19T08:05:21) — no token-file
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: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe)#1044

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 27, 2026
 Merged


emrg: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe)
#1044
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
bc332c3

emrg: connect — never delete a healthy daemon's token in cleanup_serv…

Aug 27, 2026
e83ec09

emrg: connect — never delete a healthy daemon's token in cleanup_serv…

Aug 27, 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


2 changes: 1 addition & 1 deletion
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1126) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1127) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (93: 45 daemon_client + 20 conn-manager + 8 integration + 6 build-config + 7 gui-state + 3 preload-api + 4 boot-contract) — syntax: `node --check main.js preload.js daemon_client.js`
Renderer: `cd emrg/gui/renderer && npm run typecheck && npm test` (445: 5 snapshot-store + 9 utils + 3 ErrorBoundary + 2 App smoke + 11 commands + 4 copywriting + 11 i18n + 11 markdown + 15 transcript + 7 TranscriptView + 15 history + 22 composer + 14 Composer + 12 sidebar + 17 Sidebar + 9 fileTree + 9 FileTree + 16 resultPanel + 8 ResultPanel + 29 workspaceView + 8 WorkspaceView + 10 dialog + 6 Dialog + 9 ConfirmDialog + 9 RenameDialog + 10 dialogLists + 3 HelpDialog + 9 MemoryDialog + 6 SkillsDialog + 9 openSession + 6 WelcomeDialog + 8 OpenSessionDialog + 7 NewSessionDialog + 7 rewind + 8 RewindDialog + 7 GithubDeviceDialog + 14 daemonBridge + 7 DaemonBridgeProvider + 24 Shell + 15 DialogHost + 19 SettingsPanel + 6 TaskFormDialog + 5 RantDialog + 4 vendorMarkdown) + `npm run build` → `renderer/dist/`
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 上下文)
Expand Down

18 changes: 17 additions & 1 deletion
emrg/connect.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,23 @@ async def connect_to_server():


def cleanup_server() -> None:
 """Remove the daemon auth token file on shutdown."""
 """Remove the daemon auth token file on shutdown.

 ⚠️ Guards against deleting a HEALTHY daemon's token (rant 2026-08-27T14:48:50):
 a mis-triggered spawn cleanup (start_daemon / _start_daemon_background run this
 unconditionally) must never remove the token of a daemon that is actually
 listening on the fixed port — the fixed port is the single-instance ground
 truth, and a transient TCP probe miss while a daemon is alive caused the token
 to be deleted and the doomed spawn (EADDRINUSE suicide) never rewrote it.

 Only delete when the fixed-port probe confirms NO daemon is accepting
 connections. A fresh daemon start rewrites the token atomically
 (_assert_token_file / atomic_write_bytes), so a stale token from a crashed
 daemon is harmless on the next successful start.
 """
 if is_server_running_sync():
 logger.debug("daemon still listening on the fixed port — keeping token file")
 return
 port_path = Path(get_server_path())
 if port_path.exists():
 port_path.unlink()
Expand Down

22 changes: 21 additions & 1 deletion
tests/test_connect.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,9 @@ def test_is_exception(self):

class TestCleanupServer:
 def test_removes_token_file(self, monkeypatch, tmp_path):
 """Removes the token file if present."""
 """Removes the token file if present (no daemon listening → deletion ok)."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
 port_file = tmp_path / f"{CONNECT_ID}.token"
 port_file.write_text("token", encoding="utf-8")

Expand All@@ -42,12 +43,14 @@ def test_removes_token_file(self, monkeypatch, tmp_path):
 def test_noop_when_absent(self, monkeypatch, tmp_path):
 """Does nothing when the token file doesn't exist."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)

 cleanup_server() # must not raise

 def test_leaves_other_files(self, monkeypatch, tmp_path):
 """Only removes the token file, not other config files."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
 other = tmp_path / "config.toml"
 other.write_text("x", encoding="utf-8")
 port_file = tmp_path / f"{CONNECT_ID}.token"
Expand All@@ -58,6 +61,23 @@ def test_leaves_other_files(self, monkeypatch, tmp_path):
 assert other.exists()
 assert not port_file.exists()

 def test_keeps_token_when_daemon_listening(self, monkeypatch, tmp_path):
 """rant 2026-08-27T14:48:50 — never delete a HEALTHY daemon's token.

 A mis-triggered spawn cleanup (start_daemon / _start_daemon_background run
 cleanup_server() unconditionally) must not remove the token of a daemon
 that is actually listening on the fixed port. The doomed spawn (EADDRINUSE
 suicide) would never rewrite it → token-missing window for new connections.
 """
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: True)
 port_file = tmp_path / f"{CONNECT_ID}.token"
 port_file.write_text("token", encoding="utf-8")

 cleanup_server()

 assert port_file.exists(), "token must survive when a daemon is listening"


class TestIsServerRunningSync:
 """Probes the FIXED daemon port (rant 2026-08-19T08:05:21) — no token-file
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: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe)#1044

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 27, 2026
 Merged


emrg: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe)
#1044
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
bc332c3

emrg: connect — never delete a healthy daemon's token in cleanup_serv…

Aug 27, 2026
e83ec09

emrg: connect — never delete a healthy daemon's token in cleanup_serv…

Aug 27, 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


2 changes: 1 addition & 1 deletion
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1126) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1127) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (93: 45 daemon_client + 20 conn-manager + 8 integration + 6 build-config + 7 gui-state + 3 preload-api + 4 boot-contract) — syntax: `node --check main.js preload.js daemon_client.js`
Renderer: `cd emrg/gui/renderer && npm run typecheck && npm test` (445: 5 snapshot-store + 9 utils + 3 ErrorBoundary + 2 App smoke + 11 commands + 4 copywriting + 11 i18n + 11 markdown + 15 transcript + 7 TranscriptView + 15 history + 22 composer + 14 Composer + 12 sidebar + 17 Sidebar + 9 fileTree + 9 FileTree + 16 resultPanel + 8 ResultPanel + 29 workspaceView + 8 WorkspaceView + 10 dialog + 6 Dialog + 9 ConfirmDialog + 9 RenameDialog + 10 dialogLists + 3 HelpDialog + 9 MemoryDialog + 6 SkillsDialog + 9 openSession + 6 WelcomeDialog + 8 OpenSessionDialog + 7 NewSessionDialog + 7 rewind + 8 RewindDialog + 7 GithubDeviceDialog + 14 daemonBridge + 7 DaemonBridgeProvider + 24 Shell + 15 DialogHost + 19 SettingsPanel + 6 TaskFormDialog + 5 RantDialog + 4 vendorMarkdown) + `npm run build` → `renderer/dist/`
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 上下文)
Expand Down

18 changes: 17 additions & 1 deletion
emrg/connect.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,23 @@ async def connect_to_server():


def cleanup_server() -> None:
 """Remove the daemon auth token file on shutdown."""
 """Remove the daemon auth token file on shutdown.

 ⚠️ Guards against deleting a HEALTHY daemon's token (rant 2026-08-27T14:48:50):
 a mis-triggered spawn cleanup (start_daemon / _start_daemon_background run this
 unconditionally) must never remove the token of a daemon that is actually
 listening on the fixed port — the fixed port is the single-instance ground
 truth, and a transient TCP probe miss while a daemon is alive caused the token
 to be deleted and the doomed spawn (EADDRINUSE suicide) never rewrote it.

 Only delete when the fixed-port probe confirms NO daemon is accepting
 connections. A fresh daemon start rewrites the token atomically
 (_assert_token_file / atomic_write_bytes), so a stale token from a crashed
 daemon is harmless on the next successful start.
 """
 if is_server_running_sync():
 logger.debug("daemon still listening on the fixed port — keeping token file")
 return
 port_path = Path(get_server_path())
 if port_path.exists():
 port_path.unlink()
Expand Down

22 changes: 21 additions & 1 deletion
tests/test_connect.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,9 @@ def test_is_exception(self):

class TestCleanupServer:
 def test_removes_token_file(self, monkeypatch, tmp_path):
 """Removes the token file if present."""
 """Removes the token file if present (no daemon listening → deletion ok)."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
 port_file = tmp_path / f"{CONNECT_ID}.token"
 port_file.write_text("token", encoding="utf-8")

Expand All@@ -42,12 +43,14 @@ def test_removes_token_file(self, monkeypatch, tmp_path):
 def test_noop_when_absent(self, monkeypatch, tmp_path):
 """Does nothing when the token file doesn't exist."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)

 cleanup_server() # must not raise

 def test_leaves_other_files(self, monkeypatch, tmp_path):
 """Only removes the token file, not other config files."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
 other = tmp_path / "config.toml"
 other.write_text("x", encoding="utf-8")
 port_file = tmp_path / f"{CONNECT_ID}.token"
Expand All@@ -58,6 +61,23 @@ def test_leaves_other_files(self, monkeypatch, tmp_path):
 assert other.exists()
 assert not port_file.exists()

 def test_keeps_token_when_daemon_listening(self, monkeypatch, tmp_path):
 """rant 2026-08-27T14:48:50 — never delete a HEALTHY daemon's token.

 A mis-triggered spawn cleanup (start_daemon / _start_daemon_background run
 cleanup_server() unconditionally) must not remove the token of a daemon
 that is actually listening on the fixed port. The doomed spawn (EADDRINUSE
 suicide) would never rewrite it → token-missing window for new connections.
 """
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: True)
 port_file = tmp_path / f"{CONNECT_ID}.token"
 port_file.write_text("token", encoding="utf-8")

 cleanup_server()

 assert port_file.exists(), "token must survive when a daemon is listening"


class TestIsServerRunningSync:
 """Probes the FIXED daemon port (rant 2026-08-19T08:05:21) — no token-file
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: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe)#1044

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 27, 2026
 Merged


emrg: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe)
#1044
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
bc332c3

emrg: connect — never delete a healthy daemon's token in cleanup_serv…

Aug 27, 2026
e83ec09

emrg: connect — never delete a healthy daemon's token in cleanup_serv…

Aug 27, 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


2 changes: 1 addition & 1 deletion
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1126) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1127) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (93: 45 daemon_client + 20 conn-manager + 8 integration + 6 build-config + 7 gui-state + 3 preload-api + 4 boot-contract) — syntax: `node --check main.js preload.js daemon_client.js`
Renderer: `cd emrg/gui/renderer && npm run typecheck && npm test` (445: 5 snapshot-store + 9 utils + 3 ErrorBoundary + 2 App smoke + 11 commands + 4 copywriting + 11 i18n + 11 markdown + 15 transcript + 7 TranscriptView + 15 history + 22 composer + 14 Composer + 12 sidebar + 17 Sidebar + 9 fileTree + 9 FileTree + 16 resultPanel + 8 ResultPanel + 29 workspaceView + 8 WorkspaceView + 10 dialog + 6 Dialog + 9 ConfirmDialog + 9 RenameDialog + 10 dialogLists + 3 HelpDialog + 9 MemoryDialog + 6 SkillsDialog + 9 openSession + 6 WelcomeDialog + 8 OpenSessionDialog + 7 NewSessionDialog + 7 rewind + 8 RewindDialog + 7 GithubDeviceDialog + 14 daemonBridge + 7 DaemonBridgeProvider + 24 Shell + 15 DialogHost + 19 SettingsPanel + 6 TaskFormDialog + 5 RantDialog + 4 vendorMarkdown) + `npm run build` → `renderer/dist/`
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 上下文)
Expand Down

18 changes: 17 additions & 1 deletion
emrg/connect.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,23 @@ async def connect_to_server():


def cleanup_server() -> None:
 """Remove the daemon auth token file on shutdown."""
 """Remove the daemon auth token file on shutdown.

 ⚠️ Guards against deleting a HEALTHY daemon's token (rant 2026-08-27T14:48:50):
 a mis-triggered spawn cleanup (start_daemon / _start_daemon_background run this
 unconditionally) must never remove the token of a daemon that is actually
 listening on the fixed port — the fixed port is the single-instance ground
 truth, and a transient TCP probe miss while a daemon is alive caused the token
 to be deleted and the doomed spawn (EADDRINUSE suicide) never rewrote it.

 Only delete when the fixed-port probe confirms NO daemon is accepting
 connections. A fresh daemon start rewrites the token atomically
 (_assert_token_file / atomic_write_bytes), so a stale token from a crashed
 daemon is harmless on the next successful start.
 """
 if is_server_running_sync():
 logger.debug("daemon still listening on the fixed port — keeping token file")
 return
 port_path = Path(get_server_path())
 if port_path.exists():
 port_path.unlink()
Expand Down

22 changes: 21 additions & 1 deletion
tests/test_connect.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,9 @@ def test_is_exception(self):

class TestCleanupServer:
 def test_removes_token_file(self, monkeypatch, tmp_path):
 """Removes the token file if present."""
 """Removes the token file if present (no daemon listening → deletion ok)."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
 port_file = tmp_path / f"{CONNECT_ID}.token"
 port_file.write_text("token", encoding="utf-8")

Expand All@@ -42,12 +43,14 @@ def test_removes_token_file(self, monkeypatch, tmp_path):
 def test_noop_when_absent(self, monkeypatch, tmp_path):
 """Does nothing when the token file doesn't exist."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)

 cleanup_server() # must not raise

 def test_leaves_other_files(self, monkeypatch, tmp_path):
 """Only removes the token file, not other config files."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
 other = tmp_path / "config.toml"
 other.write_text("x", encoding="utf-8")
 port_file = tmp_path / f"{CONNECT_ID}.token"
Expand All@@ -58,6 +61,23 @@ def test_leaves_other_files(self, monkeypatch, tmp_path):
 assert other.exists()
 assert not port_file.exists()

 def test_keeps_token_when_daemon_listening(self, monkeypatch, tmp_path):
 """rant 2026-08-27T14:48:50 — never delete a HEALTHY daemon's token.

 A mis-triggered spawn cleanup (start_daemon / _start_daemon_background run
 cleanup_server() unconditionally) must not remove the token of a daemon
 that is actually listening on the fixed port. The doomed spawn (EADDRINUSE
 suicide) would never rewrite it → token-missing window for new connections.
 """
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: True)
 port_file = tmp_path / f"{CONNECT_ID}.token"
 port_file.write_text("token", encoding="utf-8")

 cleanup_server()

 assert port_file.exists(), "token must survive when a daemon is listening"


class TestIsServerRunningSync:
 """Probes the FIXED daemon port (rant 2026-08-19T08:05:21) — no token-file
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: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe)#1044

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 27, 2026
 Merged


emrg: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe)
#1044
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
bc332c3

emrg: connect — never delete a healthy daemon's token in cleanup_serv…

Aug 27, 2026
e83ec09

emrg: connect — never delete a healthy daemon's token in cleanup_serv…

Aug 27, 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


2 changes: 1 addition & 1 deletion
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1126) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1127) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (93: 45 daemon_client + 20 conn-manager + 8 integration + 6 build-config + 7 gui-state + 3 preload-api + 4 boot-contract) — syntax: `node --check main.js preload.js daemon_client.js`
Renderer: `cd emrg/gui/renderer && npm run typecheck && npm test` (445: 5 snapshot-store + 9 utils + 3 ErrorBoundary + 2 App smoke + 11 commands + 4 copywriting + 11 i18n + 11 markdown + 15 transcript + 7 TranscriptView + 15 history + 22 composer + 14 Composer + 12 sidebar + 17 Sidebar + 9 fileTree + 9 FileTree + 16 resultPanel + 8 ResultPanel + 29 workspaceView + 8 WorkspaceView + 10 dialog + 6 Dialog + 9 ConfirmDialog + 9 RenameDialog + 10 dialogLists + 3 HelpDialog + 9 MemoryDialog + 6 SkillsDialog + 9 openSession + 6 WelcomeDialog + 8 OpenSessionDialog + 7 NewSessionDialog + 7 rewind + 8 RewindDialog + 7 GithubDeviceDialog + 14 daemonBridge + 7 DaemonBridgeProvider + 24 Shell + 15 DialogHost + 19 SettingsPanel + 6 TaskFormDialog + 5 RantDialog + 4 vendorMarkdown) + `npm run build` → `renderer/dist/`
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 上下文)
Expand Down

18 changes: 17 additions & 1 deletion
emrg/connect.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,23 @@ async def connect_to_server():


def cleanup_server() -> None:
 """Remove the daemon auth token file on shutdown."""
 """Remove the daemon auth token file on shutdown.

 ⚠️ Guards against deleting a HEALTHY daemon's token (rant 2026-08-27T14:48:50):
 a mis-triggered spawn cleanup (start_daemon / _start_daemon_background run this
 unconditionally) must never remove the token of a daemon that is actually
 listening on the fixed port — the fixed port is the single-instance ground
 truth, and a transient TCP probe miss while a daemon is alive caused the token
 to be deleted and the doomed spawn (EADDRINUSE suicide) never rewrote it.

 Only delete when the fixed-port probe confirms NO daemon is accepting
 connections. A fresh daemon start rewrites the token atomically
 (_assert_token_file / atomic_write_bytes), so a stale token from a crashed
 daemon is harmless on the next successful start.
 """
 if is_server_running_sync():
 logger.debug("daemon still listening on the fixed port — keeping token file")
 return
 port_path = Path(get_server_path())
 if port_path.exists():
 port_path.unlink()
Expand Down

22 changes: 21 additions & 1 deletion
tests/test_connect.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,9 @@ def test_is_exception(self):

class TestCleanupServer:
 def test_removes_token_file(self, monkeypatch, tmp_path):
 """Removes the token file if present."""
 """Removes the token file if present (no daemon listening → deletion ok)."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
 port_file = tmp_path / f"{CONNECT_ID}.token"
 port_file.write_text("token", encoding="utf-8")

Expand All@@ -42,12 +43,14 @@ def test_removes_token_file(self, monkeypatch, tmp_path):
 def test_noop_when_absent(self, monkeypatch, tmp_path):
 """Does nothing when the token file doesn't exist."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)

 cleanup_server() # must not raise

 def test_leaves_other_files(self, monkeypatch, tmp_path):
 """Only removes the token file, not other config files."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
 other = tmp_path / "config.toml"
 other.write_text("x", encoding="utf-8")
 port_file = tmp_path / f"{CONNECT_ID}.token"
Expand All@@ -58,6 +61,23 @@ def test_leaves_other_files(self, monkeypatch, tmp_path):
 assert other.exists()
 assert not port_file.exists()

 def test_keeps_token_when_daemon_listening(self, monkeypatch, tmp_path):
 """rant 2026-08-27T14:48:50 — never delete a HEALTHY daemon's token.

 A mis-triggered spawn cleanup (start_daemon / _start_daemon_background run
 cleanup_server() unconditionally) must not remove the token of a daemon
 that is actually listening on the fixed port. The doomed spawn (EADDRINUSE
 suicide) would never rewrite it → token-missing window for new connections.
 """
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: True)
 port_file = tmp_path / f"{CONNECT_ID}.token"
 port_file.write_text("token", encoding="utf-8")

 cleanup_server()

 assert port_file.exists(), "token must survive when a daemon is listening"


class TestIsServerRunningSync:
 """Probes the FIXED daemon port (rant 2026-08-19T08:05:21) — no token-file
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: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe)#1044

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 27, 2026
 Merged


emrg: connect — never delete a healthy daemon's token in cleanup_server (guard on fixed-port probe)
#1044
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
bc332c3

emrg: connect — never delete a healthy daemon's token in cleanup_serv…

Aug 27, 2026
e83ec09

emrg: connect — never delete a healthy daemon's token in cleanup_serv…

Aug 27, 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


2 changes: 1 addition & 1 deletion
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1126) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (1127) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (93: 45 daemon_client + 20 conn-manager + 8 integration + 6 build-config + 7 gui-state + 3 preload-api + 4 boot-contract) — syntax: `node --check main.js preload.js daemon_client.js`
Renderer: `cd emrg/gui/renderer && npm run typecheck && npm test` (445: 5 snapshot-store + 9 utils + 3 ErrorBoundary + 2 App smoke + 11 commands + 4 copywriting + 11 i18n + 11 markdown + 15 transcript + 7 TranscriptView + 15 history + 22 composer + 14 Composer + 12 sidebar + 17 Sidebar + 9 fileTree + 9 FileTree + 16 resultPanel + 8 ResultPanel + 29 workspaceView + 8 WorkspaceView + 10 dialog + 6 Dialog + 9 ConfirmDialog + 9 RenameDialog + 10 dialogLists + 3 HelpDialog + 9 MemoryDialog + 6 SkillsDialog + 9 openSession + 6 WelcomeDialog + 8 OpenSessionDialog + 7 NewSessionDialog + 7 rewind + 8 RewindDialog + 7 GithubDeviceDialog + 14 daemonBridge + 7 DaemonBridgeProvider + 24 Shell + 15 DialogHost + 19 SettingsPanel + 6 TaskFormDialog + 5 RantDialog + 4 vendorMarkdown) + `npm run build` → `renderer/dist/`
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 上下文)
Expand Down

18 changes: 17 additions & 1 deletion
emrg/connect.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,23 @@ async def connect_to_server():


def cleanup_server() -> None:
 """Remove the daemon auth token file on shutdown."""
 """Remove the daemon auth token file on shutdown.

 ⚠️ Guards against deleting a HEALTHY daemon's token (rant 2026-08-27T14:48:50):
 a mis-triggered spawn cleanup (start_daemon / _start_daemon_background run this
 unconditionally) must never remove the token of a daemon that is actually
 listening on the fixed port — the fixed port is the single-instance ground
 truth, and a transient TCP probe miss while a daemon is alive caused the token
 to be deleted and the doomed spawn (EADDRINUSE suicide) never rewrote it.

 Only delete when the fixed-port probe confirms NO daemon is accepting
 connections. A fresh daemon start rewrites the token atomically
 (_assert_token_file / atomic_write_bytes), so a stale token from a crashed
 daemon is harmless on the next successful start.
 """
 if is_server_running_sync():
 logger.debug("daemon still listening on the fixed port — keeping token file")
 return
 port_path = Path(get_server_path())
 if port_path.exists():
 port_path.unlink()
Expand Down

22 changes: 21 additions & 1 deletion
tests/test_connect.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,9 @@ def test_is_exception(self):

class TestCleanupServer:
 def test_removes_token_file(self, monkeypatch, tmp_path):
 """Removes the token file if present."""
 """Removes the token file if present (no daemon listening → deletion ok)."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
 port_file = tmp_path / f"{CONNECT_ID}.token"
 port_file.write_text("token", encoding="utf-8")

Expand All@@ -42,12 +43,14 @@ def test_removes_token_file(self, monkeypatch, tmp_path):
 def test_noop_when_absent(self, monkeypatch, tmp_path):
 """Does nothing when the token file doesn't exist."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)

 cleanup_server() # must not raise

 def test_leaves_other_files(self, monkeypatch, tmp_path):
 """Only removes the token file, not other config files."""
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: False)
 other = tmp_path / "config.toml"
 other.write_text("x", encoding="utf-8")
 port_file = tmp_path / f"{CONNECT_ID}.token"
Expand All@@ -58,6 +61,23 @@ def test_leaves_other_files(self, monkeypatch, tmp_path):
 assert other.exists()
 assert not port_file.exists()

 def test_keeps_token_when_daemon_listening(self, monkeypatch, tmp_path):
 """rant 2026-08-27T14:48:50 — never delete a HEALTHY daemon's token.

 A mis-triggered spawn cleanup (start_daemon / _start_daemon_background run
 cleanup_server() unconditionally) must not remove the token of a daemon
 that is actually listening on the fixed port. The doomed spawn (EADDRINUSE
 suicide) would never rewrite it → token-missing window for new connections.
 """
 monkeypatch.setattr("emrg.connect.config_dir", lambda: tmp_path)
 monkeypatch.setattr("emrg.connect.is_server_running_sync", lambda: True)
 port_file = tmp_path / f"{CONNECT_ID}.token"
 port_file.write_text("token", encoding="utf-8")

 cleanup_server()

 assert port_file.exists(), "token must survive when a daemon is listening"


class TestIsServerRunningSync:
 """Probes the FIXED daemon port (rant 2026-08-19T08:05:21) — no token-file
Expand Down
Loading