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 number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
- Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
- Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
- Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
- Unit tests `npm test` (241: 44 daemon_client + 19 conn-manager + 22 app-commands + 117 renderer smoke + 15 i18n + 7 integration + 3 commands + 5 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- Unit tests `npm test` (242: 44 daemon_client + 19 conn-manager + 22 app-commands + 118 renderer smoke + 15 i18n + 7 integration + 3 commands + 5 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
- Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
- Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand Down Expand Up @@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (801) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (241: 44 daemon_client + 19 conn-manager + 22 app-commands + 117 renderer smoke + 15 i18n + 7 integration + 3 commands + 5 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (242: 44 daemon_client + 19 conn-manager + 22 app-commands + 118 renderer smoke + 15 i18n + 7 integration + 3 commands + 5 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)

Expand Down
8 changes: 8 additions & 0 deletions emrg/gui/renderer/css/layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,14 @@
color: var(--text-3);
}

/* rant 21:49:51:面板视图标题(设置/Rant/项目/任务面板统一) */
.workspace-view-title {
font-size: var(--fs-title);
font-weight: 600;
color: var(--text-1);
margin: 0 0 var(--sp-3);
}

/* rant 14:10:14 P2:设置面板 tab(模型服务/工作目录/GitHub/外观/语言/关于) */
.panel-tabs {
display: flex;
Expand Down
4 changes: 2 additions & 2 deletions emrg/gui/renderer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<nav id="conv-list"></nav>
<div class="sidebar-footer">
<span id="status-dot" class="status-dot gray" title="连接状态" data-i18n-title="sidebar.statusTitle"></span>
<button id="settings-btn" class="btn btn-ghost" style="margin-left:auto;padding:6px 12px;min-height:30px;" data-i18n="sidebar.settings">设置</button>
</div>
</aside>

Expand Down Expand Up @@ -159,7 +158,8 @@
</div>
</section>
<section class="workspace-view" id="panel-settings" data-view="settings">
<!-- rant 14:10:14 P2:设置改为面板,6 tab(模型服务/工作目录/GitHub/外观/语言/关于) -->
<!-- rant 21:49:51:设置面板加标题(对齐 Rant/项目/任务面板);rant 14:10:14 P2:设置改为面板,6 tab -->
<h2 class="workspace-view-title" data-i18n="settings.title">设置</h2>
<div class="panel-tabs" id="settings-tabs" role="tablist">
<button type="button" class="panel-tab active" id="settings-tab-model" data-settings-tab="model" data-i18n="settings.groupModel">模型服务</button>
<button type="button" class="panel-tab" id="settings-tab-workdir" data-settings-tab="workdir" data-i18n="settings.groupWorkdir">工作目录</button>
Expand Down
4 changes: 0 additions & 4 deletions emrg/gui/renderer/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1595,10 +1595,6 @@ const App = (() => {
Dialogs.initOpenSessionDialog(); // P5:打开会话对话框绑定
Dialogs.initNewSessionDialog(); // P5 slice 2:新建会话对话框绑定
$("open-session-new-session")?.addEventListener("click", () => Dialogs.showNewSessionDialog()); // P5 slice 2:打开弹窗 → 新建会话
$("settings-btn").addEventListener("click", () => {
loadEvolutionSummary(); // WorkBuddy P3(#502):打开设置时加载最近改进
Dialogs.showSettings();
});
Dialogs.initLangButtons(); // rant 21:19:设置语言选择器
$("settings-cancel").addEventListener("click", () => switchView("settings")); // P2:取消=关闭设置视图
$("settings-save").addEventListener("click", Dialogs.saveSettings);
Expand Down
2 changes: 0 additions & 2 deletions emrg/gui/renderer/js/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ const I18N = (() => {
"sidebar.newChatTitle": "新对话 (⌘N)",
"sidebar.openChat": "打开会话",
"sidebar.openChatTitle": "打开会话(跨项目)",
"sidebar.settings": "设置",
"sidebar.statusTitle": "连接状态",
"sidebar.backToBottom": "回到底部",

Expand Down Expand Up @@ -445,7 +444,6 @@ const I18N = (() => {
"sidebar.newChatTitle": "New chat (⌘N)",
"sidebar.openChat": "Open session",
"sidebar.openChatTitle": "Open session (cross-project)",
"sidebar.settings": "Settings",
"sidebar.statusTitle": "Connection status",
"sidebar.backToBottom": "Back to bottom",

Expand Down
20 changes: 20 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2964,3 +2964,23 @@ test("rant 14:10:14 P4:rant 面板列表(状态徽标 + 筛选)+ 详情展
assert.ok(sent, "sendRant 应被调用");
assert.strictEqual(sent.message, "希望支持 X");
});

test("rant 21:49:51 settings panel title + sidebar settings-btn removed", async () => {
const htmlSrc = fs.readFileSync(path.join(__dirname, "..", "renderer", "index.html"), "utf-8");
// 设置面板应有标题(对齐 Rant/项目/任务面板 .workspace-view-title)
const settingsSection = htmlSrc.match(/id="panel-settings"([\s\S]*?)(?:<section|<\/section>)/);
assert.ok(settingsSection, "index.html 应有设置面板 section");
assert.ok(settingsSection[1].includes('class="workspace-view-title" data-i18n="settings.title"'),
"设置面板应有 .workspace-view-title 标题(data-i18n=settings.title)");
// 侧边栏底部 settings-btn 已删除(与导航 ⚙ 重复入口),status-dot 保留
const footer = htmlSrc.match(/class="sidebar-footer"([\s\S]*?)<\/div>/);
assert.ok(footer, "index.html 应有 sidebar-footer");
assert.ok(!footer[1].includes("settings-btn"), "sidebar-footer 不应再有 settings-btn");
assert.ok(footer[1].includes("status-dot"), "sidebar-footer 应保留 status-dot(连接状态指示)");
// 对应 JS 绑定已删除
const appSrc = fs.readFileSync(path.join(__dirname, "..", "renderer", "js", "app.js"), "utf-8");
assert.ok(!appSrc.includes('$("settings-btn")'), "app.js 不应再有 settings-btn 绑定");
// i18n 无孤儿 sidebar.settings
const i18nSrc = fs.readFileSync(path.join(__dirname, "..", "renderer", "js", "i18n.js"), "utf-8");
assert.ok(!i18nSrc.includes('"sidebar.settings"'), "i18n 不应再有 sidebar.settings 孤儿键");
});
Loading