Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ EMRG is a self-evolving AI agent architecture experiment. Python implementation,
- Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
- Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
- Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
- Unit tests `npm test` (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- Unit tests `npm test` (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Auto project tracking** — Automatically detects and records working directories; project-scoped sessions
- **Rant-driven evolution** — User feedback via `/rant` drives automatic self-improvement cycles
- **Headless GitHub auth** — Non-interactive evolution auto-extracts `GH_TOKEN` from git credential store (osxkeychain / credential helper); PR comment/LGTM queries fall back to REST API (GraphQL needs `read:org` scope)
Expand DownExpand Up@@ -94,7 +94,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (674) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)

Expand Down
4 changes: 2 additions & 2 deletions README.cn.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -282,8 +282,8 @@ uv run python -m emrg # 启动 TUI
cd emrg/gui
npm ci # 安装依赖(生产模式可 --omit=dev)
npm start # 启动 GUI(自动拉起 daemon)
npm test # 运行 Node 测试(110 项:29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(110 项:29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(111 项:29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(111 项:29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
```

CI 通过 GitHub Actions 自动运行测试并检查冲突标记(`.github/workflows/test.yml`)。
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,7 @@ uv run python -m emrg # launch TUI
cd emrg/gui
npm ci # install deps (production: --omit=dev)
npm start # launch GUI (auto-starts daemon)
npm test # run Node tests (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config; integration runs in CI, local: npm run test:integration)
npm test # run Node tests (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config; integration runs in CI, local: npm run test:integration)
```

CI runs tests and checks for conflict markers automatically via GitHub Actions (`.github/workflows/test.yml`).
Expand Down
21 changes: 16 additions & 5 deletions emrg/gui/renderer/css/layout.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -251,13 +251,24 @@ body.sidebar-collapsed #app {
transition: width 0.2s cubic-bezier(.2,.8,.3,1), min-width 0.2s cubic-bezier(.2,.8,.3,1);
}
#result-panel.collapsed {
width: 0;
min-width: 0;
border-left: none;
/* 方案 A(rant 2026-08-10T14:11:18):折叠成窄条而非 0,header(含 toggle 按钮)保持可见可点 */
width: 40px;
min-width: 40px;
border-left: 1px solid var(--border);
}
#result-panel.collapsed .result-header,
#result-panel.collapsed .result-list {
display: none;
display: none; /* 只藏内容区 */
}
#result-panel.collapsed .result-header {
display: flex;
justify-content: center;
padding: var(--sp-3) 0;
}
#result-panel.collapsed .result-title {
display: none; /* 窄条只留 toggle 按钮 */
}
#result-panel.collapsed .result-toggle {
transform: rotate(180deg); /* » → « 指示可展开 */
}

.result-header {
Expand Down
24 changes: 24 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ const path = require("node:path");
const vm = require("node:vm");

const RENDERER_JS = path.join(__dirname, "..", "renderer", "js");
const RENDERER_CSS = path.join(__dirname, "..", "renderer", "css");

// ── DOM mock(最小但真实:classList 操作同步到 className) ──
function makeEl(id) {
Expand DownExpand Up@@ -867,6 +868,29 @@ test("WorkBuddy P1:ResultPanel 折叠切换(⌘\ 与按钮)", async () =>
assert.ok(!els["result-panel"].classList.contains("collapsed"), "再次 toggle 应展开");
});

test("WorkBuddy P1:折叠后 toggle 按钮仍可见可点(rant 2026-08-10T14:11:18 死锁回归)", async () => {
// CSS 规则断言(沙箱无 CSS 引擎,源级验证折叠态布局语义)
const css = fs.readFileSync(path.join(RENDERER_CSS, "layout.css"), "utf8");
const start = css.indexOf("#result-panel.collapsed");
const end = css.indexOf(".result-header {", start); // 折叠规则组结束(下一个独立规则)
const block = css.slice(start, end > start ? end : start + 400);
// 折叠 = 40px 窄条(非 0 宽度)
assert.ok(/width:\s*40px/.test(block), "折叠态应为 40px 窄条,而非 width: 0(否则按钮不可点)");
assert.ok(!/width:\s*0/.test(block), "折叠态不得 width: 0");
// header 保留可见(display: flex),只藏内容区 .result-list
assert.ok(/#result-panel\.collapsed \.result-header\s*{[^}]*display:\s*flex/.test(css.replace(/\n/g, " ")), "折叠态 .result-header 应 display: flex(含 toggle 按钮)");
assert.ok(!/display:\s*none[^}]*result-header/.test(css), "折叠态不得隐藏 .result-header");
assert.ok(/#result-panel\.collapsed \.result-list\s*{[^}]*display:\s*none/.test(css.replace(/\n/g, " ")), "折叠态 .result-list 应隐藏");
// toggle 按钮折叠态旋转提示可展开
assert.ok(/#result-panel\.collapsed \.result-toggle\s*{[^}]*rotate\(180deg\)/.test(css.replace(/\n/g, " ")), "折叠态 toggle 应 rotate(180deg) 指示可展开");
// DOM 存活:折叠后 toggle 按钮仍在文档中
const { ctx } = makeSandbox();
await tick();
await vm.runInContext("ResultPanel.toggle()", ctx);
const btnStillThere = vm.runInContext('document.getElementById("result-toggle") !== null', ctx);
assert.ok(btnStillThere, "折叠后 toggle 按钮不得从 DOM 移除");
});

test("工具调用上限中断 → 系统提示可继续(对齐 TUI,跨项目教训)", async () => {
const { ctx, els } = makeSandbox({});
await tick();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
emrg: keep result-panel toggle visible when collapsed (rant 2026-08-10T14:11:18) by argszero · Pull Request #615 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ EMRG is a self-evolving AI agent architecture experiment. Python implementation,
- Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
- Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
- Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
- Unit tests `npm test` (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- Unit tests `npm test` (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Auto project tracking** — Automatically detects and records working directories; project-scoped sessions
- **Rant-driven evolution** — User feedback via `/rant` drives automatic self-improvement cycles
- **Headless GitHub auth** — Non-interactive evolution auto-extracts `GH_TOKEN` from git credential store (osxkeychain / credential helper); PR comment/LGTM queries fall back to REST API (GraphQL needs `read:org` scope)
Expand DownExpand Up@@ -94,7 +94,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (674) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)

Expand Down
4 changes: 2 additions & 2 deletions README.cn.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -282,8 +282,8 @@ uv run python -m emrg # 启动 TUI
cd emrg/gui
npm ci # 安装依赖(生产模式可 --omit=dev)
npm start # 启动 GUI(自动拉起 daemon)
npm test # 运行 Node 测试(110 项:29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(110 项:29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(111 项:29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(111 项:29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
```

CI 通过 GitHub Actions 自动运行测试并检查冲突标记(`.github/workflows/test.yml`)。
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,7 @@ uv run python -m emrg # launch TUI
cd emrg/gui
npm ci # install deps (production: --omit=dev)
npm start # launch GUI (auto-starts daemon)
npm test # run Node tests (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config; integration runs in CI, local: npm run test:integration)
npm test # run Node tests (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config; integration runs in CI, local: npm run test:integration)
```

CI runs tests and checks for conflict markers automatically via GitHub Actions (`.github/workflows/test.yml`).
Expand Down
21 changes: 16 additions & 5 deletions emrg/gui/renderer/css/layout.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -251,13 +251,24 @@ body.sidebar-collapsed #app {
transition: width 0.2s cubic-bezier(.2,.8,.3,1), min-width 0.2s cubic-bezier(.2,.8,.3,1);
}
#result-panel.collapsed {
width: 0;
min-width: 0;
border-left: none;
/* 方案 A(rant 2026-08-10T14:11:18):折叠成窄条而非 0,header(含 toggle 按钮)保持可见可点 */
width: 40px;
min-width: 40px;
border-left: 1px solid var(--border);
}
#result-panel.collapsed .result-header,
#result-panel.collapsed .result-list {
display: none;
display: none; /* 只藏内容区 */
}
#result-panel.collapsed .result-header {
display: flex;
justify-content: center;
padding: var(--sp-3) 0;
}
#result-panel.collapsed .result-title {
display: none; /* 窄条只留 toggle 按钮 */
}
#result-panel.collapsed .result-toggle {
transform: rotate(180deg); /* » → « 指示可展开 */
}

.result-header {
Expand Down
24 changes: 24 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ const path = require("node:path");
const vm = require("node:vm");

const RENDERER_JS = path.join(__dirname, "..", "renderer", "js");
const RENDERER_CSS = path.join(__dirname, "..", "renderer", "css");

// ── DOM mock(最小但真实:classList 操作同步到 className) ──
function makeEl(id) {
Expand DownExpand Up@@ -867,6 +868,29 @@ test("WorkBuddy P1:ResultPanel 折叠切换(⌘\ 与按钮)", async () =>
assert.ok(!els["result-panel"].classList.contains("collapsed"), "再次 toggle 应展开");
});

test("WorkBuddy P1:折叠后 toggle 按钮仍可见可点(rant 2026-08-10T14:11:18 死锁回归)", async () => {
// CSS 规则断言(沙箱无 CSS 引擎,源级验证折叠态布局语义)
const css = fs.readFileSync(path.join(RENDERER_CSS, "layout.css"), "utf8");
const start = css.indexOf("#result-panel.collapsed");
const end = css.indexOf(".result-header {", start); // 折叠规则组结束(下一个独立规则)
const block = css.slice(start, end > start ? end : start + 400);
// 折叠 = 40px 窄条(非 0 宽度)
assert.ok(/width:\s*40px/.test(block), "折叠态应为 40px 窄条,而非 width: 0(否则按钮不可点)");
assert.ok(!/width:\s*0/.test(block), "折叠态不得 width: 0");
// header 保留可见(display: flex),只藏内容区 .result-list
assert.ok(/#result-panel\.collapsed \.result-header\s*{[^}]*display:\s*flex/.test(css.replace(/\n/g, " ")), "折叠态 .result-header 应 display: flex(含 toggle 按钮)");
assert.ok(!/display:\s*none[^}]*result-header/.test(css), "折叠态不得隐藏 .result-header");
assert.ok(/#result-panel\.collapsed \.result-list\s*{[^}]*display:\s*none/.test(css.replace(/\n/g, " ")), "折叠态 .result-list 应隐藏");
// toggle 按钮折叠态旋转提示可展开
assert.ok(/#result-panel\.collapsed \.result-toggle\s*{[^}]*rotate\(180deg\)/.test(css.replace(/\n/g, " ")), "折叠态 toggle 应 rotate(180deg) 指示可展开");
// DOM 存活:折叠后 toggle 按钮仍在文档中
const { ctx } = makeSandbox();
await tick();
await vm.runInContext("ResultPanel.toggle()", ctx);
const btnStillThere = vm.runInContext('document.getElementById("result-toggle") !== null', ctx);
assert.ok(btnStillThere, "折叠后 toggle 按钮不得从 DOM 移除");
});

test("工具调用上限中断 → 系统提示可继续(对齐 TUI,跨项目教训)", async () => {
const { ctx, els } = makeSandbox({});
await tick();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' emrg: keep result-panel toggle visible when collapsed (rant 2026-08-10T14:11:18) by argszero · Pull Request #615 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ EMRG is a self-evolving AI agent architecture experiment. Python implementation,
- Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
- Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
- Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
- Unit tests `npm test` (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- Unit tests `npm test` (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Auto project tracking** — Automatically detects and records working directories; project-scoped sessions
- **Rant-driven evolution** — User feedback via `/rant` drives automatic self-improvement cycles
- **Headless GitHub auth** — Non-interactive evolution auto-extracts `GH_TOKEN` from git credential store (osxkeychain / credential helper); PR comment/LGTM queries fall back to REST API (GraphQL needs `read:org` scope)
Expand DownExpand Up@@ -94,7 +94,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (674) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)

Expand Down
4 changes: 2 additions & 2 deletions README.cn.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -282,8 +282,8 @@ uv run python -m emrg # 启动 TUI
cd emrg/gui
npm ci # 安装依赖(生产模式可 --omit=dev)
npm start # 启动 GUI(自动拉起 daemon)
npm test # 运行 Node 测试(110 项:29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(110 项:29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(111 项:29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(111 项:29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
```

CI 通过 GitHub Actions 自动运行测试并检查冲突标记(`.github/workflows/test.yml`)。
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,7 @@ uv run python -m emrg # launch TUI
cd emrg/gui
npm ci # install deps (production: --omit=dev)
npm start # launch GUI (auto-starts daemon)
npm test # run Node tests (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config; integration runs in CI, local: npm run test:integration)
npm test # run Node tests (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config; integration runs in CI, local: npm run test:integration)
```

CI runs tests and checks for conflict markers automatically via GitHub Actions (`.github/workflows/test.yml`).
Expand Down
21 changes: 16 additions & 5 deletions emrg/gui/renderer/css/layout.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -251,13 +251,24 @@ body.sidebar-collapsed #app {
transition: width 0.2s cubic-bezier(.2,.8,.3,1), min-width 0.2s cubic-bezier(.2,.8,.3,1);
}
#result-panel.collapsed {
width: 0;
min-width: 0;
border-left: none;
/* 方案 A(rant 2026-08-10T14:11:18):折叠成窄条而非 0,header(含 toggle 按钮)保持可见可点 */
width: 40px;
min-width: 40px;
border-left: 1px solid var(--border);
}
#result-panel.collapsed .result-header,
#result-panel.collapsed .result-list {
display: none;
display: none; /* 只藏内容区 */
}
#result-panel.collapsed .result-header {
display: flex;
justify-content: center;
padding: var(--sp-3) 0;
}
#result-panel.collapsed .result-title {
display: none; /* 窄条只留 toggle 按钮 */
}
#result-panel.collapsed .result-toggle {
transform: rotate(180deg); /* » → « 指示可展开 */
}

.result-header {
Expand Down
24 changes: 24 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ const path = require("node:path");
const vm = require("node:vm");

const RENDERER_JS = path.join(__dirname, "..", "renderer", "js");
const RENDERER_CSS = path.join(__dirname, "..", "renderer", "css");

// ── DOM mock(最小但真实:classList 操作同步到 className) ──
function makeEl(id) {
Expand DownExpand Up@@ -867,6 +868,29 @@ test("WorkBuddy P1:ResultPanel 折叠切换(⌘\ 与按钮)", async () =>
assert.ok(!els["result-panel"].classList.contains("collapsed"), "再次 toggle 应展开");
});

test("WorkBuddy P1:折叠后 toggle 按钮仍可见可点(rant 2026-08-10T14:11:18 死锁回归)", async () => {
// CSS 规则断言(沙箱无 CSS 引擎,源级验证折叠态布局语义)
const css = fs.readFileSync(path.join(RENDERER_CSS, "layout.css"), "utf8");
const start = css.indexOf("#result-panel.collapsed");
const end = css.indexOf(".result-header {", start); // 折叠规则组结束(下一个独立规则)
const block = css.slice(start, end > start ? end : start + 400);
// 折叠 = 40px 窄条(非 0 宽度)
assert.ok(/width:\s*40px/.test(block), "折叠态应为 40px 窄条,而非 width: 0(否则按钮不可点)");
assert.ok(!/width:\s*0/.test(block), "折叠态不得 width: 0");
// header 保留可见(display: flex),只藏内容区 .result-list
assert.ok(/#result-panel\.collapsed \.result-header\s*{[^}]*display:\s*flex/.test(css.replace(/\n/g, " ")), "折叠态 .result-header 应 display: flex(含 toggle 按钮)");
assert.ok(!/display:\s*none[^}]*result-header/.test(css), "折叠态不得隐藏 .result-header");
assert.ok(/#result-panel\.collapsed \.result-list\s*{[^}]*display:\s*none/.test(css.replace(/\n/g, " ")), "折叠态 .result-list 应隐藏");
// toggle 按钮折叠态旋转提示可展开
assert.ok(/#result-panel\.collapsed \.result-toggle\s*{[^}]*rotate\(180deg\)/.test(css.replace(/\n/g, " ")), "折叠态 toggle 应 rotate(180deg) 指示可展开");
// DOM 存活:折叠后 toggle 按钮仍在文档中
const { ctx } = makeSandbox();
await tick();
await vm.runInContext("ResultPanel.toggle()", ctx);
const btnStillThere = vm.runInContext('document.getElementById("result-toggle") !== null', ctx);
assert.ok(btnStillThere, "折叠后 toggle 按钮不得从 DOM 移除");
});

test("工具调用上限中断 → 系统提示可继续(对齐 TUI,跨项目教训)", async () => {
const { ctx, els } = makeSandbox({});
await tick();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' emrg: keep result-panel toggle visible when collapsed (rant 2026-08-10T14:11:18) by argszero · Pull Request #615 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ EMRG is a self-evolving AI agent architecture experiment. Python implementation,
- Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
- Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
- Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
- Unit tests `npm test` (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- Unit tests `npm test` (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Auto project tracking** — Automatically detects and records working directories; project-scoped sessions
- **Rant-driven evolution** — User feedback via `/rant` drives automatic self-improvement cycles
- **Headless GitHub auth** — Non-interactive evolution auto-extracts `GH_TOKEN` from git credential store (osxkeychain / credential helper); PR comment/LGTM queries fall back to REST API (GraphQL needs `read:org` scope)
Expand DownExpand Up@@ -94,7 +94,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (674) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)

Expand Down
4 changes: 2 additions & 2 deletions README.cn.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -282,8 +282,8 @@ uv run python -m emrg # 启动 TUI
cd emrg/gui
npm ci # 安装依赖(生产模式可 --omit=dev)
npm start # 启动 GUI(自动拉起 daemon)
npm test # 运行 Node 测试(110 项:29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(110 项:29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(111 项:29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(111 项:29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
```

CI 通过 GitHub Actions 自动运行测试并检查冲突标记(`.github/workflows/test.yml`)。
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,7 @@ uv run python -m emrg # launch TUI
cd emrg/gui
npm ci # install deps (production: --omit=dev)
npm start # launch GUI (auto-starts daemon)
npm test # run Node tests (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config; integration runs in CI, local: npm run test:integration)
npm test # run Node tests (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config; integration runs in CI, local: npm run test:integration)
```

CI runs tests and checks for conflict markers automatically via GitHub Actions (`.github/workflows/test.yml`).
Expand Down
21 changes: 16 additions & 5 deletions emrg/gui/renderer/css/layout.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -251,13 +251,24 @@ body.sidebar-collapsed #app {
transition: width 0.2s cubic-bezier(.2,.8,.3,1), min-width 0.2s cubic-bezier(.2,.8,.3,1);
}
#result-panel.collapsed {
width: 0;
min-width: 0;
border-left: none;
/* 方案 A(rant 2026-08-10T14:11:18):折叠成窄条而非 0,header(含 toggle 按钮)保持可见可点 */
width: 40px;
min-width: 40px;
border-left: 1px solid var(--border);
}
#result-panel.collapsed .result-header,
#result-panel.collapsed .result-list {
display: none;
display: none; /* 只藏内容区 */
}
#result-panel.collapsed .result-header {
display: flex;
justify-content: center;
padding: var(--sp-3) 0;
}
#result-panel.collapsed .result-title {
display: none; /* 窄条只留 toggle 按钮 */
}
#result-panel.collapsed .result-toggle {
transform: rotate(180deg); /* » → « 指示可展开 */
}

.result-header {
Expand Down
24 changes: 24 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ const path = require("node:path");
const vm = require("node:vm");

const RENDERER_JS = path.join(__dirname, "..", "renderer", "js");
const RENDERER_CSS = path.join(__dirname, "..", "renderer", "css");

// ── DOM mock(最小但真实:classList 操作同步到 className) ──
function makeEl(id) {
Expand DownExpand Up@@ -867,6 +868,29 @@ test("WorkBuddy P1:ResultPanel 折叠切换(⌘\ 与按钮)", async () =>
assert.ok(!els["result-panel"].classList.contains("collapsed"), "再次 toggle 应展开");
});

test("WorkBuddy P1:折叠后 toggle 按钮仍可见可点(rant 2026-08-10T14:11:18 死锁回归)", async () => {
// CSS 规则断言(沙箱无 CSS 引擎,源级验证折叠态布局语义)
const css = fs.readFileSync(path.join(RENDERER_CSS, "layout.css"), "utf8");
const start = css.indexOf("#result-panel.collapsed");
const end = css.indexOf(".result-header {", start); // 折叠规则组结束(下一个独立规则)
const block = css.slice(start, end > start ? end : start + 400);
// 折叠 = 40px 窄条(非 0 宽度)
assert.ok(/width:\s*40px/.test(block), "折叠态应为 40px 窄条,而非 width: 0(否则按钮不可点)");
assert.ok(!/width:\s*0/.test(block), "折叠态不得 width: 0");
// header 保留可见(display: flex),只藏内容区 .result-list
assert.ok(/#result-panel\.collapsed \.result-header\s*{[^}]*display:\s*flex/.test(css.replace(/\n/g, " ")), "折叠态 .result-header 应 display: flex(含 toggle 按钮)");
assert.ok(!/display:\s*none[^}]*result-header/.test(css), "折叠态不得隐藏 .result-header");
assert.ok(/#result-panel\.collapsed \.result-list\s*{[^}]*display:\s*none/.test(css.replace(/\n/g, " ")), "折叠态 .result-list 应隐藏");
// toggle 按钮折叠态旋转提示可展开
assert.ok(/#result-panel\.collapsed \.result-toggle\s*{[^}]*rotate\(180deg\)/.test(css.replace(/\n/g, " ")), "折叠态 toggle 应 rotate(180deg) 指示可展开");
// DOM 存活:折叠后 toggle 按钮仍在文档中
const { ctx } = makeSandbox();
await tick();
await vm.runInContext("ResultPanel.toggle()", ctx);
const btnStillThere = vm.runInContext('document.getElementById("result-toggle") !== null', ctx);
assert.ok(btnStillThere, "折叠后 toggle 按钮不得从 DOM 移除");
});

test("工具调用上限中断 → 系统提示可继续(对齐 TUI,跨项目教训)", async () => {
const { ctx, els } = makeSandbox({});
await tick();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' emrg: keep result-panel toggle visible when collapsed (rant 2026-08-10T14:11:18) by argszero · Pull Request #615 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ EMRG is a self-evolving AI agent architecture experiment. Python implementation,
- Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
- Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
- Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
- Unit tests `npm test` (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- Unit tests `npm test` (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Auto project tracking** — Automatically detects and records working directories; project-scoped sessions
- **Rant-driven evolution** — User feedback via `/rant` drives automatic self-improvement cycles
- **Headless GitHub auth** — Non-interactive evolution auto-extracts `GH_TOKEN` from git credential store (osxkeychain / credential helper); PR comment/LGTM queries fall back to REST API (GraphQL needs `read:org` scope)
Expand DownExpand Up@@ -94,7 +94,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (674) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)

Expand Down
4 changes: 2 additions & 2 deletions README.cn.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -282,8 +282,8 @@ uv run python -m emrg # 启动 TUI
cd emrg/gui
npm ci # 安装依赖(生产模式可 --omit=dev)
npm start # 启动 GUI(自动拉起 daemon)
npm test # 运行 Node 测试(110 项:29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(110 项:29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(111 项:29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(111 项:29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
```

CI 通过 GitHub Actions 自动运行测试并检查冲突标记(`.github/workflows/test.yml`)。
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,7 @@ uv run python -m emrg # launch TUI
cd emrg/gui
npm ci # install deps (production: --omit=dev)
npm start # launch GUI (auto-starts daemon)
npm test # run Node tests (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config; integration runs in CI, local: npm run test:integration)
npm test # run Node tests (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config; integration runs in CI, local: npm run test:integration)
```

CI runs tests and checks for conflict markers automatically via GitHub Actions (`.github/workflows/test.yml`).
Expand Down
21 changes: 16 additions & 5 deletions emrg/gui/renderer/css/layout.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -251,13 +251,24 @@ body.sidebar-collapsed #app {
transition: width 0.2s cubic-bezier(.2,.8,.3,1), min-width 0.2s cubic-bezier(.2,.8,.3,1);
}
#result-panel.collapsed {
width: 0;
min-width: 0;
border-left: none;
/* 方案 A(rant 2026-08-10T14:11:18):折叠成窄条而非 0,header(含 toggle 按钮)保持可见可点 */
width: 40px;
min-width: 40px;
border-left: 1px solid var(--border);
}
#result-panel.collapsed .result-header,
#result-panel.collapsed .result-list {
display: none;
display: none; /* 只藏内容区 */
}
#result-panel.collapsed .result-header {
display: flex;
justify-content: center;
padding: var(--sp-3) 0;
}
#result-panel.collapsed .result-title {
display: none; /* 窄条只留 toggle 按钮 */
}
#result-panel.collapsed .result-toggle {
transform: rotate(180deg); /* » → « 指示可展开 */
}

.result-header {
Expand Down
24 changes: 24 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ const path = require("node:path");
const vm = require("node:vm");

const RENDERER_JS = path.join(__dirname, "..", "renderer", "js");
const RENDERER_CSS = path.join(__dirname, "..", "renderer", "css");

// ── DOM mock(最小但真实:classList 操作同步到 className) ──
function makeEl(id) {
Expand DownExpand Up@@ -867,6 +868,29 @@ test("WorkBuddy P1:ResultPanel 折叠切换(⌘\ 与按钮)", async () =>
assert.ok(!els["result-panel"].classList.contains("collapsed"), "再次 toggle 应展开");
});

test("WorkBuddy P1:折叠后 toggle 按钮仍可见可点(rant 2026-08-10T14:11:18 死锁回归)", async () => {
// CSS 规则断言(沙箱无 CSS 引擎,源级验证折叠态布局语义)
const css = fs.readFileSync(path.join(RENDERER_CSS, "layout.css"), "utf8");
const start = css.indexOf("#result-panel.collapsed");
const end = css.indexOf(".result-header {", start); // 折叠规则组结束(下一个独立规则)
const block = css.slice(start, end > start ? end : start + 400);
// 折叠 = 40px 窄条(非 0 宽度)
assert.ok(/width:\s*40px/.test(block), "折叠态应为 40px 窄条,而非 width: 0(否则按钮不可点)");
assert.ok(!/width:\s*0/.test(block), "折叠态不得 width: 0");
// header 保留可见(display: flex),只藏内容区 .result-list
assert.ok(/#result-panel\.collapsed \.result-header\s*{[^}]*display:\s*flex/.test(css.replace(/\n/g, " ")), "折叠态 .result-header 应 display: flex(含 toggle 按钮)");
assert.ok(!/display:\s*none[^}]*result-header/.test(css), "折叠态不得隐藏 .result-header");
assert.ok(/#result-panel\.collapsed \.result-list\s*{[^}]*display:\s*none/.test(css.replace(/\n/g, " ")), "折叠态 .result-list 应隐藏");
// toggle 按钮折叠态旋转提示可展开
assert.ok(/#result-panel\.collapsed \.result-toggle\s*{[^}]*rotate\(180deg\)/.test(css.replace(/\n/g, " ")), "折叠态 toggle 应 rotate(180deg) 指示可展开");
// DOM 存活:折叠后 toggle 按钮仍在文档中
const { ctx } = makeSandbox();
await tick();
await vm.runInContext("ResultPanel.toggle()", ctx);
const btnStillThere = vm.runInContext('document.getElementById("result-toggle") !== null', ctx);
assert.ok(btnStillThere, "折叠后 toggle 按钮不得从 DOM 移除");
});

test("工具调用上限中断 → 系统提示可继续(对齐 TUI,跨项目教训)", async () => {
const { ctx, els } = makeSandbox({});
await tick();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' emrg: keep result-panel toggle visible when collapsed (rant 2026-08-10T14:11:18) by argszero · Pull Request #615 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ EMRG is a self-evolving AI agent architecture experiment. Python implementation,
- Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
- Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
- Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
- Unit tests `npm test` (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- Unit tests `npm test` (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Auto project tracking** — Automatically detects and records working directories; project-scoped sessions
- **Rant-driven evolution** — User feedback via `/rant` drives automatic self-improvement cycles
- **Headless GitHub auth** — Non-interactive evolution auto-extracts `GH_TOKEN` from git credential store (osxkeychain / credential helper); PR comment/LGTM queries fall back to REST API (GraphQL needs `read:org` scope)
Expand DownExpand Up@@ -94,7 +94,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (674) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)

Expand Down
4 changes: 2 additions & 2 deletions README.cn.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -282,8 +282,8 @@ uv run python -m emrg # 启动 TUI
cd emrg/gui
npm ci # 安装依赖(生产模式可 --omit=dev)
npm start # 启动 GUI(自动拉起 daemon)
npm test # 运行 Node 测试(110 项:29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(110 项:29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(111 项:29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(111 项:29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
```

CI 通过 GitHub Actions 自动运行测试并检查冲突标记(`.github/workflows/test.yml`)。
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,7 @@ uv run python -m emrg # launch TUI
cd emrg/gui
npm ci # install deps (production: --omit=dev)
npm start # launch GUI (auto-starts daemon)
npm test # run Node tests (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config; integration runs in CI, local: npm run test:integration)
npm test # run Node tests (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config; integration runs in CI, local: npm run test:integration)
```

CI runs tests and checks for conflict markers automatically via GitHub Actions (`.github/workflows/test.yml`).
Expand Down
21 changes: 16 additions & 5 deletions emrg/gui/renderer/css/layout.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -251,13 +251,24 @@ body.sidebar-collapsed #app {
transition: width 0.2s cubic-bezier(.2,.8,.3,1), min-width 0.2s cubic-bezier(.2,.8,.3,1);
}
#result-panel.collapsed {
width: 0;
min-width: 0;
border-left: none;
/* 方案 A(rant 2026-08-10T14:11:18):折叠成窄条而非 0,header(含 toggle 按钮)保持可见可点 */
width: 40px;
min-width: 40px;
border-left: 1px solid var(--border);
}
#result-panel.collapsed .result-header,
#result-panel.collapsed .result-list {
display: none;
display: none; /* 只藏内容区 */
}
#result-panel.collapsed .result-header {
display: flex;
justify-content: center;
padding: var(--sp-3) 0;
}
#result-panel.collapsed .result-title {
display: none; /* 窄条只留 toggle 按钮 */
}
#result-panel.collapsed .result-toggle {
transform: rotate(180deg); /* » → « 指示可展开 */
}

.result-header {
Expand Down
24 changes: 24 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ const path = require("node:path");
const vm = require("node:vm");

const RENDERER_JS = path.join(__dirname, "..", "renderer", "js");
const RENDERER_CSS = path.join(__dirname, "..", "renderer", "css");

// ── DOM mock(最小但真实:classList 操作同步到 className) ──
function makeEl(id) {
Expand DownExpand Up@@ -867,6 +868,29 @@ test("WorkBuddy P1:ResultPanel 折叠切换(⌘\ 与按钮)", async () =>
assert.ok(!els["result-panel"].classList.contains("collapsed"), "再次 toggle 应展开");
});

test("WorkBuddy P1:折叠后 toggle 按钮仍可见可点(rant 2026-08-10T14:11:18 死锁回归)", async () => {
// CSS 规则断言(沙箱无 CSS 引擎,源级验证折叠态布局语义)
const css = fs.readFileSync(path.join(RENDERER_CSS, "layout.css"), "utf8");
const start = css.indexOf("#result-panel.collapsed");
const end = css.indexOf(".result-header {", start); // 折叠规则组结束(下一个独立规则)
const block = css.slice(start, end > start ? end : start + 400);
// 折叠 = 40px 窄条(非 0 宽度)
assert.ok(/width:\s*40px/.test(block), "折叠态应为 40px 窄条,而非 width: 0(否则按钮不可点)");
assert.ok(!/width:\s*0/.test(block), "折叠态不得 width: 0");
// header 保留可见(display: flex),只藏内容区 .result-list
assert.ok(/#result-panel\.collapsed \.result-header\s*{[^}]*display:\s*flex/.test(css.replace(/\n/g, " ")), "折叠态 .result-header 应 display: flex(含 toggle 按钮)");
assert.ok(!/display:\s*none[^}]*result-header/.test(css), "折叠态不得隐藏 .result-header");
assert.ok(/#result-panel\.collapsed \.result-list\s*{[^}]*display:\s*none/.test(css.replace(/\n/g, " ")), "折叠态 .result-list 应隐藏");
// toggle 按钮折叠态旋转提示可展开
assert.ok(/#result-panel\.collapsed \.result-toggle\s*{[^}]*rotate\(180deg\)/.test(css.replace(/\n/g, " ")), "折叠态 toggle 应 rotate(180deg) 指示可展开");
// DOM 存活:折叠后 toggle 按钮仍在文档中
const { ctx } = makeSandbox();
await tick();
await vm.runInContext("ResultPanel.toggle()", ctx);
const btnStillThere = vm.runInContext('document.getElementById("result-toggle") !== null', ctx);
assert.ok(btnStillThere, "折叠后 toggle 按钮不得从 DOM 移除");
});

test("工具调用上限中断 → 系统提示可继续(对齐 TUI,跨项目教训)", async () => {
const { ctx, els } = makeSandbox({});
await tick();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); emrg: keep result-panel toggle visible when collapsed (rant 2026-08-10T14:11:18) by argszero · Pull Request #615 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ EMRG is a self-evolving AI agent architecture experiment. Python implementation,
- Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
- Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
- Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
- Unit tests `npm test` (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- Unit tests `npm test` (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Auto project tracking** — Automatically detects and records working directories; project-scoped sessions
- **Rant-driven evolution** — User feedback via `/rant` drives automatic self-improvement cycles
- **Headless GitHub auth** — Non-interactive evolution auto-extracts `GH_TOKEN` from git credential store (osxkeychain / credential helper); PR comment/LGTM queries fall back to REST API (GraphQL needs `read:org` scope)
Expand DownExpand Up@@ -94,7 +94,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (674) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)

Expand Down
4 changes: 2 additions & 2 deletions README.cn.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -282,8 +282,8 @@ uv run python -m emrg # 启动 TUI
cd emrg/gui
npm ci # 安装依赖(生产模式可 --omit=dev)
npm start # 启动 GUI(自动拉起 daemon)
npm test # 运行 Node 测试(110 项:29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(110 项:29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(111 项:29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
npm test # 运行 Node 测试(111 项:29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config;集成测试在 CI 跑,本地可 npm run test:integration)
```

CI 通过 GitHub Actions 自动运行测试并检查冲突标记(`.github/workflows/test.yml`)。
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,7 @@ uv run python -m emrg # launch TUI
cd emrg/gui
npm ci # install deps (production: --omit=dev)
npm start # launch GUI (auto-starts daemon)
npm test # run Node tests (110: 29 daemon_client + 22 app-commands + 31 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config; integration runs in CI, local: npm run test:integration)
npm test # run Node tests (111: 29 daemon_client + 22 app-commands + 32 renderer smoke + 15 i18n + 7 integration + 3 commands + 3 build-config; integration runs in CI, local: npm run test:integration)
```

CI runs tests and checks for conflict markers automatically via GitHub Actions (`.github/workflows/test.yml`).
Expand Down
21 changes: 16 additions & 5 deletions emrg/gui/renderer/css/layout.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -251,13 +251,24 @@ body.sidebar-collapsed #app {
transition: width 0.2s cubic-bezier(.2,.8,.3,1), min-width 0.2s cubic-bezier(.2,.8,.3,1);
}
#result-panel.collapsed {
width: 0;
min-width: 0;
border-left: none;
/* 方案 A(rant 2026-08-10T14:11:18):折叠成窄条而非 0,header(含 toggle 按钮)保持可见可点 */
width: 40px;
min-width: 40px;
border-left: 1px solid var(--border);
}
#result-panel.collapsed .result-header,
#result-panel.collapsed .result-list {
display: none;
display: none; /* 只藏内容区 */
}
#result-panel.collapsed .result-header {
display: flex;
justify-content: center;
padding: var(--sp-3) 0;
}
#result-panel.collapsed .result-title {
display: none; /* 窄条只留 toggle 按钮 */
}
#result-panel.collapsed .result-toggle {
transform: rotate(180deg); /* » → « 指示可展开 */
}

.result-header {
Expand Down
24 changes: 24 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ const path = require("node:path");
const vm = require("node:vm");

const RENDERER_JS = path.join(__dirname, "..", "renderer", "js");
const RENDERER_CSS = path.join(__dirname, "..", "renderer", "css");

// ── DOM mock(最小但真实:classList 操作同步到 className) ──
function makeEl(id) {
Expand DownExpand Up@@ -867,6 +868,29 @@ test("WorkBuddy P1:ResultPanel 折叠切换(⌘\ 与按钮)", async () =>
assert.ok(!els["result-panel"].classList.contains("collapsed"), "再次 toggle 应展开");
});

test("WorkBuddy P1:折叠后 toggle 按钮仍可见可点(rant 2026-08-10T14:11:18 死锁回归)", async () => {
// CSS 规则断言(沙箱无 CSS 引擎,源级验证折叠态布局语义)
const css = fs.readFileSync(path.join(RENDERER_CSS, "layout.css"), "utf8");
const start = css.indexOf("#result-panel.collapsed");
const end = css.indexOf(".result-header {", start); // 折叠规则组结束(下一个独立规则)
const block = css.slice(start, end > start ? end : start + 400);
// 折叠 = 40px 窄条(非 0 宽度)
assert.ok(/width:\s*40px/.test(block), "折叠态应为 40px 窄条,而非 width: 0(否则按钮不可点)");
assert.ok(!/width:\s*0/.test(block), "折叠态不得 width: 0");
// header 保留可见(display: flex),只藏内容区 .result-list
assert.ok(/#result-panel\.collapsed \.result-header\s*{[^}]*display:\s*flex/.test(css.replace(/\n/g, " ")), "折叠态 .result-header 应 display: flex(含 toggle 按钮)");
assert.ok(!/display:\s*none[^}]*result-header/.test(css), "折叠态不得隐藏 .result-header");
assert.ok(/#result-panel\.collapsed \.result-list\s*{[^}]*display:\s*none/.test(css.replace(/\n/g, " ")), "折叠态 .result-list 应隐藏");
// toggle 按钮折叠态旋转提示可展开
assert.ok(/#result-panel\.collapsed \.result-toggle\s*{[^}]*rotate\(180deg\)/.test(css.replace(/\n/g, " ")), "折叠态 toggle 应 rotate(180deg) 指示可展开");
// DOM 存活:折叠后 toggle 按钮仍在文档中
const { ctx } = makeSandbox();
await tick();
await vm.runInContext("ResultPanel.toggle()", ctx);
const btnStillThere = vm.runInContext('document.getElementById("result-toggle") !== null', ctx);
assert.ok(btnStillThere, "折叠后 toggle 按钮不得从 DOM 移除");
});

test("工具调用上限中断 → 系统提示可继续(对齐 TUI,跨项目教训)", async () => {
const { ctx, els } = makeSandbox({});
await tick();
Expand Down
Loading