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

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

Expand Down
29 changes: 29 additions & 0 deletions emrg/gui/renderer/css/components.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -996,6 +996,35 @@ dialog::backdrop {
font-variant-numeric: tabular-nums; /* 倒计时走秒不抖动 */
}

/* rant 2026-08-18T10:45:52:任务行"上次执行"元信息(运行时间/摘要/降频标识) */
.task-meta {
flex-basis: 100%;
display: flex;
align-items: center;
gap: 6px;
font-size: var(--fs-aux);
color: var(--text-3);
min-width: 0;
flex-wrap: wrap;
}
.task-meta-item {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.task-meta-summary {
max-width: 60%;
color: var(--text-2);
}
.task-saturation-badge {
background: var(--warn-soft, var(--bg-soft));
color: var(--warn, var(--text-3));
font-size: 10px;
padding: 1px 6px;
border-radius: 8px;
border: 1px solid var(--warn-soft, var(--border));
}

/* rant 09:17:45:提示词编辑器 Monaco 挂载容器(长提示词 300px 起步) */
.monaco-host {
width: 100%;
Expand Down
30 changes: 30 additions & 0 deletions emrg/gui/renderer/js/dialogs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,19 @@ const Dialogs = (() => {
return `${h}h${String(m).padStart(2, "0")}m`;
}

// rant 2026-08-18T10:45:52:相对时间显示("5m ago" / "3h ago" / 日期)——
// 用于任务行"上次运行"元信息。ISO 时间戳解析失败时回退为原文。
function formatRelativeTime(isoStr) {
if (!isoStr) return "";
const t = Date.parse(isoStr);
if (Number.isNaN(t)) return String(isoStr);
const diffSec = Math.max(0, Math.floor((Date.now() - t) / 1000));
if (diffSec < 60) return `${diffSec}s ago`;
if (diffSec < 3600) return `${Math.floor(diffSec / 60)}m ago`;
if (diffSec < 86400) return `${Math.floor(diffSec / 3600)}h ago`;
return `${Math.floor(diffSec / 86400)}d ago`;
}

function updateTaskCountdowns() {
let expired = false;
for (const e of taskCountdowns) {
Expand DownExpand Up@@ -726,6 +739,23 @@ const Dialogs = (() => {
if (t.interval != null) hints.push(_t("app.taskInterval", { n: t.interval ?? "-" }));
if (t.enabled === false) hints.push(_t("app.taskDisabled"));
row.appendChild(el("span", { class: "task-hint" }, hints.join(" · ")));
// rant 2026-08-18T10:45:52:上次执行维度 —— 最近一次运行时间 + 摘要 + 降频(saturation)标识。
// 数据来自 daemon list_tasks → handler.status()(last_run_at/last_cycle_summary/saturation)。
const meta = el("div", { class: "task-meta" });
if (t.last_run_at) {
const runTxt = el("span", { class: "task-meta-item" }, _t("app.taskLastRun", { n: formatRelativeTime(t.last_run_at) }));
meta.appendChild(runTxt);
if (t.last_cycle_summary) {
meta.appendChild(el("span", { class: "task-meta-item task-meta-summary" }, _t("app.taskLastRunSummary", { n: t.last_cycle_summary })));
}
} else {
meta.appendChild(el("span", { class: "task-meta-item" }, _t("app.taskNoRunYet")));
}
const sat = (t.saturation && typeof t.saturation === "object") ? t.saturation : null;
if (sat && sat.empty_cycles > 0 && sat.heartbeat_active) {
meta.appendChild(el("span", { class: "task-badge task-saturation-badge" }, _t("app.taskSaturation", { n: sat.empty_cycles, m: formatCountdown(sat.heartbeat_interval) })));
}
row.appendChild(meta);
const actions = el("span", { class: "task-actions" });
// 触发(复用 /trigger 语义;rant 09:23:10:running 时给 info 反馈而非假成功)
const trigBtn = el("button", { type: "button", class: "model-action-btn", title: _t("settings.taskTrigger") }, _t("settings.taskTrigger"));
Expand Down
8 changes: 8 additions & 0 deletions emrg/gui/renderer/js/i18n.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,10 @@ const I18N = (() => {
"app.triggered": "已触发任务 {n}。",
"app.taskRunning": "任务 {n} 正在运行中(无法重复触发)",
"app.taskRunningBadge": "运行中",
"app.taskLastRun": "上次运行:{n}",
"app.taskLastRunSummary": "干了:{n}",
"app.taskNoRunYet": "尚未运行",
"app.taskSaturation": "空转 {n} 轮,降频至 {m}s heartbeat",
"app.deletedSwitch": "这个对话已被删除,已帮你切到最近的对话。",
"app.switched": "已切换对话。",
"app.sessionDisconnected": "该会话连接已断开,正在自动重连…",
Expand DownExpand Up@@ -828,6 +832,10 @@ const I18N = (() => {
"app.triggered": "Task {n} triggered.",
"app.taskRunning": "Task {n} is running (cannot re-trigger)",
"app.taskRunningBadge": "running",
"app.taskLastRun": "last run: {n}",
"app.taskLastRunSummary": "did: {n}",
"app.taskNoRunYet": "never ran",
"app.taskSaturation": "{n} empty cycles, throttled to {m}s heartbeat",
"app.deletedSwitch": "This conversation was deleted — switched to the most recent one.",
"app.switched": "Conversation switched.",
"app.sessionDisconnected": "This session's connection is lost — reconnecting automatically…",
Expand Down
33 changes: 33 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2839,6 +2839,39 @@ test("rant 10:36:39:倒计时生命周期 —— 渲染启动 interval、离
assert.strictEqual(win2._intervalCount || 0, s2, "全 running 无倒计时 → 不启动 interval");
});

test("rant 10:45:52:任务行显示上次执行元信息 + 降频标识", async () => {
const nowMs = 1_700_000_000_000;
const { ctx, win } = makeSandbox({
listTasks: async () => [
{ name: "with-run", type: "evolution", running: false, interval: 1800,
next_run_in_seconds: 43,
last_run_at: new Date(nowMs - 5 * 60_000).toISOString(),
last_cycle_summary: "tools-executed=24, cycle-complete",
saturation: { empty_cycles: 3, threshold: 5, heartbeat_interval: 7200, heartbeat_active: true } },
{ name: "never-run", type: "evolution", running: false, interval: 3600,
next_run_in_seconds: null, enabled: true, last_run_at: null, last_cycle_summary: null,
saturation: { empty_cycles: 0, threshold: 5, heartbeat_interval: 7200, heartbeat_active: false } },
],
listProjects: async () => [],
});
win.Date = class extends Date { static now() { return nowMs; } };
await tick();
await vm.runInContext("App.openTasksPanel()", ctx);
await tick();
const rows = vm.runInContext(`Array.from(document.getElementById("task-list").children).map((r) => {
const name = r.querySelector(".task-name").textContent;
const meta = r.querySelector(".task-meta");
const metaText = meta ? Array.from(meta.querySelectorAll(".task-meta-item")).map((e) => e.textContent).join("|") : "";
const satText = meta && meta.querySelector(".task-saturation-badge") ? meta.querySelector(".task-saturation-badge").textContent : "";
return name + " => " + metaText + " ## " + satText;
})`, ctx);
assert.ok(rows[0].includes("上次运行:5m ago"), `运行时间相对显示:${rows[0]}`);
assert.ok(rows[0].includes("干了:tools-executed=24, cycle-complete"), `执行摘要:${rows[0]}`);
assert.ok(rows[0].includes("空转 3 轮"), `降频徽标:${rows[0]}`);
assert.ok(rows[1].includes("尚未运行"), `未运行提示:${rows[1]}`);
assert.ok(!rows[1].includes("空转"), `无降频时无徽标:${rows[1]}`);
});

test("rant 2026-08-14T15:41:52:快速点击添加任务 —— 元数据未加载完也填充下拉 + 保存成功", async () => {
let created = null;
const { ctx, els } = makeSandbox({
Expand Down
21 changes: 21 additions & 0 deletions emrg/server/scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,11 +743,32 @@ def status(self) -> dict:
remaining = None
if self._next_run_at is not None:
remaining = max(0, int(self._next_run_at - time.time()))
# rant 2026-08-18T10:45:52: expose the LAST-execution dimension so the
# GUI tasks panel can show when a task last ran, what it did, and
# whether it is being throttled (saturation). All data is in-memory /
# on disk already — no extra I/O beyond the in-memory evolutions list.
last_run_at: str | None = None
last_cycle_summary: str | None = None
if self.evolutions:
last = self.evolutions[-1]
last_run_at = last.timestamp
# brief summary: tools-executed / cycle-complete etc. from impact
parts = [str(i) for i in last.impact if i]
last_cycle_summary = ", ".join(parts[:3]) if parts else None
saturation = {
"empty_cycles": self._empty_cycles,
"threshold": self._saturation_threshold(),
"heartbeat_interval": self._heartbeat_interval(),
"heartbeat_active": self._saturation_heartbeat_active(),
}
return {
"name": self.name,
"running": self._cycle_running,
"next_run_in_seconds": remaining,
"interval": self.interval,
"last_run_at": last_run_at,
"last_cycle_summary": last_cycle_summary,
"saturation": saturation,
}

def _remote_advanced(self) -> bool:
Expand Down
30 changes: 30 additions & 0 deletions tests/test_scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,6 +490,36 @@ def test_evolution_handler_stop():
assert handler._running is False


def test_evolution_handler_status_last_run_fields():
"""status() exposes last-run + saturation (rant 2026-08-18T10:45:52)."""
from emrg.protocol import EvolutionLog
handler = TaskHandler(
name="test", config={}, interval=60,
identity=InstanceIdentity(),
)
# no evolutions yet → null last-run fields, saturation defaults
st = handler.status()
assert st["name"] == "test"
assert st["last_run_at"] is None
assert st["last_cycle_summary"] is None
assert st["saturation"]["empty_cycles"] == 0
assert "threshold" in st["saturation"]
assert "heartbeat_interval" in st["saturation"]
assert "heartbeat_active" in st["saturation"]
# after one evolution → last-run populated from the latest log
handler.evolutions.append(EvolutionLog(
timestamp="2026-08-18T10:00:00",
trigger="evolution-test-ts",
impact=["tools-executed=24", "cycle-complete"],
operations=["llm-reflection", "tool-execution"],
))
handler._empty_cycles = 3
st = handler.status()
assert st["last_run_at"] == "2026-08-18T10:00:00"
assert st["last_cycle_summary"] == "tools-executed=24, cycle-complete"
assert st["saturation"]["empty_cycles"] == 3


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

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

Expand Down
29 changes: 29 additions & 0 deletions emrg/gui/renderer/css/components.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -996,6 +996,35 @@ dialog::backdrop {
font-variant-numeric: tabular-nums; /* 倒计时走秒不抖动 */
}

/* rant 2026-08-18T10:45:52:任务行"上次执行"元信息(运行时间/摘要/降频标识) */
.task-meta {
flex-basis: 100%;
display: flex;
align-items: center;
gap: 6px;
font-size: var(--fs-aux);
color: var(--text-3);
min-width: 0;
flex-wrap: wrap;
}
.task-meta-item {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.task-meta-summary {
max-width: 60%;
color: var(--text-2);
}
.task-saturation-badge {
background: var(--warn-soft, var(--bg-soft));
color: var(--warn, var(--text-3));
font-size: 10px;
padding: 1px 6px;
border-radius: 8px;
border: 1px solid var(--warn-soft, var(--border));
}

/* rant 09:17:45:提示词编辑器 Monaco 挂载容器(长提示词 300px 起步) */
.monaco-host {
width: 100%;
Expand Down
30 changes: 30 additions & 0 deletions emrg/gui/renderer/js/dialogs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,19 @@ const Dialogs = (() => {
return `${h}h${String(m).padStart(2, "0")}m`;
}

// rant 2026-08-18T10:45:52:相对时间显示("5m ago" / "3h ago" / 日期)——
// 用于任务行"上次运行"元信息。ISO 时间戳解析失败时回退为原文。
function formatRelativeTime(isoStr) {
if (!isoStr) return "";
const t = Date.parse(isoStr);
if (Number.isNaN(t)) return String(isoStr);
const diffSec = Math.max(0, Math.floor((Date.now() - t) / 1000));
if (diffSec < 60) return `${diffSec}s ago`;
if (diffSec < 3600) return `${Math.floor(diffSec / 60)}m ago`;
if (diffSec < 86400) return `${Math.floor(diffSec / 3600)}h ago`;
return `${Math.floor(diffSec / 86400)}d ago`;
}

function updateTaskCountdowns() {
let expired = false;
for (const e of taskCountdowns) {
Expand DownExpand Up@@ -726,6 +739,23 @@ const Dialogs = (() => {
if (t.interval != null) hints.push(_t("app.taskInterval", { n: t.interval ?? "-" }));
if (t.enabled === false) hints.push(_t("app.taskDisabled"));
row.appendChild(el("span", { class: "task-hint" }, hints.join(" · ")));
// rant 2026-08-18T10:45:52:上次执行维度 —— 最近一次运行时间 + 摘要 + 降频(saturation)标识。
// 数据来自 daemon list_tasks → handler.status()(last_run_at/last_cycle_summary/saturation)。
const meta = el("div", { class: "task-meta" });
if (t.last_run_at) {
const runTxt = el("span", { class: "task-meta-item" }, _t("app.taskLastRun", { n: formatRelativeTime(t.last_run_at) }));
meta.appendChild(runTxt);
if (t.last_cycle_summary) {
meta.appendChild(el("span", { class: "task-meta-item task-meta-summary" }, _t("app.taskLastRunSummary", { n: t.last_cycle_summary })));
}
} else {
meta.appendChild(el("span", { class: "task-meta-item" }, _t("app.taskNoRunYet")));
}
const sat = (t.saturation && typeof t.saturation === "object") ? t.saturation : null;
if (sat && sat.empty_cycles > 0 && sat.heartbeat_active) {
meta.appendChild(el("span", { class: "task-badge task-saturation-badge" }, _t("app.taskSaturation", { n: sat.empty_cycles, m: formatCountdown(sat.heartbeat_interval) })));
}
row.appendChild(meta);
const actions = el("span", { class: "task-actions" });
// 触发(复用 /trigger 语义;rant 09:23:10:running 时给 info 反馈而非假成功)
const trigBtn = el("button", { type: "button", class: "model-action-btn", title: _t("settings.taskTrigger") }, _t("settings.taskTrigger"));
Expand Down
8 changes: 8 additions & 0 deletions emrg/gui/renderer/js/i18n.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,10 @@ const I18N = (() => {
"app.triggered": "已触发任务 {n}。",
"app.taskRunning": "任务 {n} 正在运行中(无法重复触发)",
"app.taskRunningBadge": "运行中",
"app.taskLastRun": "上次运行:{n}",
"app.taskLastRunSummary": "干了:{n}",
"app.taskNoRunYet": "尚未运行",
"app.taskSaturation": "空转 {n} 轮,降频至 {m}s heartbeat",
"app.deletedSwitch": "这个对话已被删除,已帮你切到最近的对话。",
"app.switched": "已切换对话。",
"app.sessionDisconnected": "该会话连接已断开,正在自动重连…",
Expand DownExpand Up@@ -828,6 +832,10 @@ const I18N = (() => {
"app.triggered": "Task {n} triggered.",
"app.taskRunning": "Task {n} is running (cannot re-trigger)",
"app.taskRunningBadge": "running",
"app.taskLastRun": "last run: {n}",
"app.taskLastRunSummary": "did: {n}",
"app.taskNoRunYet": "never ran",
"app.taskSaturation": "{n} empty cycles, throttled to {m}s heartbeat",
"app.deletedSwitch": "This conversation was deleted — switched to the most recent one.",
"app.switched": "Conversation switched.",
"app.sessionDisconnected": "This session's connection is lost — reconnecting automatically…",
Expand Down
33 changes: 33 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2839,6 +2839,39 @@ test("rant 10:36:39:倒计时生命周期 —— 渲染启动 interval、离
assert.strictEqual(win2._intervalCount || 0, s2, "全 running 无倒计时 → 不启动 interval");
});

test("rant 10:45:52:任务行显示上次执行元信息 + 降频标识", async () => {
const nowMs = 1_700_000_000_000;
const { ctx, win } = makeSandbox({
listTasks: async () => [
{ name: "with-run", type: "evolution", running: false, interval: 1800,
next_run_in_seconds: 43,
last_run_at: new Date(nowMs - 5 * 60_000).toISOString(),
last_cycle_summary: "tools-executed=24, cycle-complete",
saturation: { empty_cycles: 3, threshold: 5, heartbeat_interval: 7200, heartbeat_active: true } },
{ name: "never-run", type: "evolution", running: false, interval: 3600,
next_run_in_seconds: null, enabled: true, last_run_at: null, last_cycle_summary: null,
saturation: { empty_cycles: 0, threshold: 5, heartbeat_interval: 7200, heartbeat_active: false } },
],
listProjects: async () => [],
});
win.Date = class extends Date { static now() { return nowMs; } };
await tick();
await vm.runInContext("App.openTasksPanel()", ctx);
await tick();
const rows = vm.runInContext(`Array.from(document.getElementById("task-list").children).map((r) => {
const name = r.querySelector(".task-name").textContent;
const meta = r.querySelector(".task-meta");
const metaText = meta ? Array.from(meta.querySelectorAll(".task-meta-item")).map((e) => e.textContent).join("|") : "";
const satText = meta && meta.querySelector(".task-saturation-badge") ? meta.querySelector(".task-saturation-badge").textContent : "";
return name + " => " + metaText + " ## " + satText;
})`, ctx);
assert.ok(rows[0].includes("上次运行:5m ago"), `运行时间相对显示:${rows[0]}`);
assert.ok(rows[0].includes("干了:tools-executed=24, cycle-complete"), `执行摘要:${rows[0]}`);
assert.ok(rows[0].includes("空转 3 轮"), `降频徽标:${rows[0]}`);
assert.ok(rows[1].includes("尚未运行"), `未运行提示:${rows[1]}`);
assert.ok(!rows[1].includes("空转"), `无降频时无徽标:${rows[1]}`);
});

test("rant 2026-08-14T15:41:52:快速点击添加任务 —— 元数据未加载完也填充下拉 + 保存成功", async () => {
let created = null;
const { ctx, els } = makeSandbox({
Expand Down
21 changes: 21 additions & 0 deletions emrg/server/scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,11 +743,32 @@ def status(self) -> dict:
remaining = None
if self._next_run_at is not None:
remaining = max(0, int(self._next_run_at - time.time()))
# rant 2026-08-18T10:45:52: expose the LAST-execution dimension so the
# GUI tasks panel can show when a task last ran, what it did, and
# whether it is being throttled (saturation). All data is in-memory /
# on disk already — no extra I/O beyond the in-memory evolutions list.
last_run_at: str | None = None
last_cycle_summary: str | None = None
if self.evolutions:
last = self.evolutions[-1]
last_run_at = last.timestamp
# brief summary: tools-executed / cycle-complete etc. from impact
parts = [str(i) for i in last.impact if i]
last_cycle_summary = ", ".join(parts[:3]) if parts else None
saturation = {
"empty_cycles": self._empty_cycles,
"threshold": self._saturation_threshold(),
"heartbeat_interval": self._heartbeat_interval(),
"heartbeat_active": self._saturation_heartbeat_active(),
}
return {
"name": self.name,
"running": self._cycle_running,
"next_run_in_seconds": remaining,
"interval": self.interval,
"last_run_at": last_run_at,
"last_cycle_summary": last_cycle_summary,
"saturation": saturation,
}

def _remote_advanced(self) -> bool:
Expand Down
30 changes: 30 additions & 0 deletions tests/test_scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,6 +490,36 @@ def test_evolution_handler_stop():
assert handler._running is False


def test_evolution_handler_status_last_run_fields():
"""status() exposes last-run + saturation (rant 2026-08-18T10:45:52)."""
from emrg.protocol import EvolutionLog
handler = TaskHandler(
name="test", config={}, interval=60,
identity=InstanceIdentity(),
)
# no evolutions yet → null last-run fields, saturation defaults
st = handler.status()
assert st["name"] == "test"
assert st["last_run_at"] is None
assert st["last_cycle_summary"] is None
assert st["saturation"]["empty_cycles"] == 0
assert "threshold" in st["saturation"]
assert "heartbeat_interval" in st["saturation"]
assert "heartbeat_active" in st["saturation"]
# after one evolution → last-run populated from the latest log
handler.evolutions.append(EvolutionLog(
timestamp="2026-08-18T10:00:00",
trigger="evolution-test-ts",
impact=["tools-executed=24", "cycle-complete"],
operations=["llm-reflection", "tool-execution"],
))
handler._empty_cycles = 3
st = handler.status()
assert st["last_run_at"] == "2026-08-18T10:00:00"
assert st["last_cycle_summary"] == "tools-executed=24, cycle-complete"
assert st["saturation"]["empty_cycles"] == 3


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

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

Expand Down
29 changes: 29 additions & 0 deletions emrg/gui/renderer/css/components.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -996,6 +996,35 @@ dialog::backdrop {
font-variant-numeric: tabular-nums; /* 倒计时走秒不抖动 */
}

/* rant 2026-08-18T10:45:52:任务行"上次执行"元信息(运行时间/摘要/降频标识) */
.task-meta {
flex-basis: 100%;
display: flex;
align-items: center;
gap: 6px;
font-size: var(--fs-aux);
color: var(--text-3);
min-width: 0;
flex-wrap: wrap;
}
.task-meta-item {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.task-meta-summary {
max-width: 60%;
color: var(--text-2);
}
.task-saturation-badge {
background: var(--warn-soft, var(--bg-soft));
color: var(--warn, var(--text-3));
font-size: 10px;
padding: 1px 6px;
border-radius: 8px;
border: 1px solid var(--warn-soft, var(--border));
}

/* rant 09:17:45:提示词编辑器 Monaco 挂载容器(长提示词 300px 起步) */
.monaco-host {
width: 100%;
Expand Down
30 changes: 30 additions & 0 deletions emrg/gui/renderer/js/dialogs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,19 @@ const Dialogs = (() => {
return `${h}h${String(m).padStart(2, "0")}m`;
}

// rant 2026-08-18T10:45:52:相对时间显示("5m ago" / "3h ago" / 日期)——
// 用于任务行"上次运行"元信息。ISO 时间戳解析失败时回退为原文。
function formatRelativeTime(isoStr) {
if (!isoStr) return "";
const t = Date.parse(isoStr);
if (Number.isNaN(t)) return String(isoStr);
const diffSec = Math.max(0, Math.floor((Date.now() - t) / 1000));
if (diffSec < 60) return `${diffSec}s ago`;
if (diffSec < 3600) return `${Math.floor(diffSec / 60)}m ago`;
if (diffSec < 86400) return `${Math.floor(diffSec / 3600)}h ago`;
return `${Math.floor(diffSec / 86400)}d ago`;
}

function updateTaskCountdowns() {
let expired = false;
for (const e of taskCountdowns) {
Expand DownExpand Up@@ -726,6 +739,23 @@ const Dialogs = (() => {
if (t.interval != null) hints.push(_t("app.taskInterval", { n: t.interval ?? "-" }));
if (t.enabled === false) hints.push(_t("app.taskDisabled"));
row.appendChild(el("span", { class: "task-hint" }, hints.join(" · ")));
// rant 2026-08-18T10:45:52:上次执行维度 —— 最近一次运行时间 + 摘要 + 降频(saturation)标识。
// 数据来自 daemon list_tasks → handler.status()(last_run_at/last_cycle_summary/saturation)。
const meta = el("div", { class: "task-meta" });
if (t.last_run_at) {
const runTxt = el("span", { class: "task-meta-item" }, _t("app.taskLastRun", { n: formatRelativeTime(t.last_run_at) }));
meta.appendChild(runTxt);
if (t.last_cycle_summary) {
meta.appendChild(el("span", { class: "task-meta-item task-meta-summary" }, _t("app.taskLastRunSummary", { n: t.last_cycle_summary })));
}
} else {
meta.appendChild(el("span", { class: "task-meta-item" }, _t("app.taskNoRunYet")));
}
const sat = (t.saturation && typeof t.saturation === "object") ? t.saturation : null;
if (sat && sat.empty_cycles > 0 && sat.heartbeat_active) {
meta.appendChild(el("span", { class: "task-badge task-saturation-badge" }, _t("app.taskSaturation", { n: sat.empty_cycles, m: formatCountdown(sat.heartbeat_interval) })));
}
row.appendChild(meta);
const actions = el("span", { class: "task-actions" });
// 触发(复用 /trigger 语义;rant 09:23:10:running 时给 info 反馈而非假成功)
const trigBtn = el("button", { type: "button", class: "model-action-btn", title: _t("settings.taskTrigger") }, _t("settings.taskTrigger"));
Expand Down
8 changes: 8 additions & 0 deletions emrg/gui/renderer/js/i18n.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,10 @@ const I18N = (() => {
"app.triggered": "已触发任务 {n}。",
"app.taskRunning": "任务 {n} 正在运行中(无法重复触发)",
"app.taskRunningBadge": "运行中",
"app.taskLastRun": "上次运行:{n}",
"app.taskLastRunSummary": "干了:{n}",
"app.taskNoRunYet": "尚未运行",
"app.taskSaturation": "空转 {n} 轮,降频至 {m}s heartbeat",
"app.deletedSwitch": "这个对话已被删除,已帮你切到最近的对话。",
"app.switched": "已切换对话。",
"app.sessionDisconnected": "该会话连接已断开,正在自动重连…",
Expand DownExpand Up@@ -828,6 +832,10 @@ const I18N = (() => {
"app.triggered": "Task {n} triggered.",
"app.taskRunning": "Task {n} is running (cannot re-trigger)",
"app.taskRunningBadge": "running",
"app.taskLastRun": "last run: {n}",
"app.taskLastRunSummary": "did: {n}",
"app.taskNoRunYet": "never ran",
"app.taskSaturation": "{n} empty cycles, throttled to {m}s heartbeat",
"app.deletedSwitch": "This conversation was deleted — switched to the most recent one.",
"app.switched": "Conversation switched.",
"app.sessionDisconnected": "This session's connection is lost — reconnecting automatically…",
Expand Down
33 changes: 33 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2839,6 +2839,39 @@ test("rant 10:36:39:倒计时生命周期 —— 渲染启动 interval、离
assert.strictEqual(win2._intervalCount || 0, s2, "全 running 无倒计时 → 不启动 interval");
});

test("rant 10:45:52:任务行显示上次执行元信息 + 降频标识", async () => {
const nowMs = 1_700_000_000_000;
const { ctx, win } = makeSandbox({
listTasks: async () => [
{ name: "with-run", type: "evolution", running: false, interval: 1800,
next_run_in_seconds: 43,
last_run_at: new Date(nowMs - 5 * 60_000).toISOString(),
last_cycle_summary: "tools-executed=24, cycle-complete",
saturation: { empty_cycles: 3, threshold: 5, heartbeat_interval: 7200, heartbeat_active: true } },
{ name: "never-run", type: "evolution", running: false, interval: 3600,
next_run_in_seconds: null, enabled: true, last_run_at: null, last_cycle_summary: null,
saturation: { empty_cycles: 0, threshold: 5, heartbeat_interval: 7200, heartbeat_active: false } },
],
listProjects: async () => [],
});
win.Date = class extends Date { static now() { return nowMs; } };
await tick();
await vm.runInContext("App.openTasksPanel()", ctx);
await tick();
const rows = vm.runInContext(`Array.from(document.getElementById("task-list").children).map((r) => {
const name = r.querySelector(".task-name").textContent;
const meta = r.querySelector(".task-meta");
const metaText = meta ? Array.from(meta.querySelectorAll(".task-meta-item")).map((e) => e.textContent).join("|") : "";
const satText = meta && meta.querySelector(".task-saturation-badge") ? meta.querySelector(".task-saturation-badge").textContent : "";
return name + " => " + metaText + " ## " + satText;
})`, ctx);
assert.ok(rows[0].includes("上次运行:5m ago"), `运行时间相对显示:${rows[0]}`);
assert.ok(rows[0].includes("干了:tools-executed=24, cycle-complete"), `执行摘要:${rows[0]}`);
assert.ok(rows[0].includes("空转 3 轮"), `降频徽标:${rows[0]}`);
assert.ok(rows[1].includes("尚未运行"), `未运行提示:${rows[1]}`);
assert.ok(!rows[1].includes("空转"), `无降频时无徽标:${rows[1]}`);
});

test("rant 2026-08-14T15:41:52:快速点击添加任务 —— 元数据未加载完也填充下拉 + 保存成功", async () => {
let created = null;
const { ctx, els } = makeSandbox({
Expand Down
21 changes: 21 additions & 0 deletions emrg/server/scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,11 +743,32 @@ def status(self) -> dict:
remaining = None
if self._next_run_at is not None:
remaining = max(0, int(self._next_run_at - time.time()))
# rant 2026-08-18T10:45:52: expose the LAST-execution dimension so the
# GUI tasks panel can show when a task last ran, what it did, and
# whether it is being throttled (saturation). All data is in-memory /
# on disk already — no extra I/O beyond the in-memory evolutions list.
last_run_at: str | None = None
last_cycle_summary: str | None = None
if self.evolutions:
last = self.evolutions[-1]
last_run_at = last.timestamp
# brief summary: tools-executed / cycle-complete etc. from impact
parts = [str(i) for i in last.impact if i]
last_cycle_summary = ", ".join(parts[:3]) if parts else None
saturation = {
"empty_cycles": self._empty_cycles,
"threshold": self._saturation_threshold(),
"heartbeat_interval": self._heartbeat_interval(),
"heartbeat_active": self._saturation_heartbeat_active(),
}
return {
"name": self.name,
"running": self._cycle_running,
"next_run_in_seconds": remaining,
"interval": self.interval,
"last_run_at": last_run_at,
"last_cycle_summary": last_cycle_summary,
"saturation": saturation,
}

def _remote_advanced(self) -> bool:
Expand Down
30 changes: 30 additions & 0 deletions tests/test_scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,6 +490,36 @@ def test_evolution_handler_stop():
assert handler._running is False


def test_evolution_handler_status_last_run_fields():
"""status() exposes last-run + saturation (rant 2026-08-18T10:45:52)."""
from emrg.protocol import EvolutionLog
handler = TaskHandler(
name="test", config={}, interval=60,
identity=InstanceIdentity(),
)
# no evolutions yet → null last-run fields, saturation defaults
st = handler.status()
assert st["name"] == "test"
assert st["last_run_at"] is None
assert st["last_cycle_summary"] is None
assert st["saturation"]["empty_cycles"] == 0
assert "threshold" in st["saturation"]
assert "heartbeat_interval" in st["saturation"]
assert "heartbeat_active" in st["saturation"]
# after one evolution → last-run populated from the latest log
handler.evolutions.append(EvolutionLog(
timestamp="2026-08-18T10:00:00",
trigger="evolution-test-ts",
impact=["tools-executed=24", "cycle-complete"],
operations=["llm-reflection", "tool-execution"],
))
handler._empty_cycles = 3
st = handler.status()
assert st["last_run_at"] == "2026-08-18T10:00:00"
assert st["last_cycle_summary"] == "tools-executed=24, cycle-complete"
assert st["saturation"]["empty_cycles"] == 3


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

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

Expand Down
29 changes: 29 additions & 0 deletions emrg/gui/renderer/css/components.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -996,6 +996,35 @@ dialog::backdrop {
font-variant-numeric: tabular-nums; /* 倒计时走秒不抖动 */
}

/* rant 2026-08-18T10:45:52:任务行"上次执行"元信息(运行时间/摘要/降频标识) */
.task-meta {
flex-basis: 100%;
display: flex;
align-items: center;
gap: 6px;
font-size: var(--fs-aux);
color: var(--text-3);
min-width: 0;
flex-wrap: wrap;
}
.task-meta-item {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.task-meta-summary {
max-width: 60%;
color: var(--text-2);
}
.task-saturation-badge {
background: var(--warn-soft, var(--bg-soft));
color: var(--warn, var(--text-3));
font-size: 10px;
padding: 1px 6px;
border-radius: 8px;
border: 1px solid var(--warn-soft, var(--border));
}

/* rant 09:17:45:提示词编辑器 Monaco 挂载容器(长提示词 300px 起步) */
.monaco-host {
width: 100%;
Expand Down
30 changes: 30 additions & 0 deletions emrg/gui/renderer/js/dialogs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,19 @@ const Dialogs = (() => {
return `${h}h${String(m).padStart(2, "0")}m`;
}

// rant 2026-08-18T10:45:52:相对时间显示("5m ago" / "3h ago" / 日期)——
// 用于任务行"上次运行"元信息。ISO 时间戳解析失败时回退为原文。
function formatRelativeTime(isoStr) {
if (!isoStr) return "";
const t = Date.parse(isoStr);
if (Number.isNaN(t)) return String(isoStr);
const diffSec = Math.max(0, Math.floor((Date.now() - t) / 1000));
if (diffSec < 60) return `${diffSec}s ago`;
if (diffSec < 3600) return `${Math.floor(diffSec / 60)}m ago`;
if (diffSec < 86400) return `${Math.floor(diffSec / 3600)}h ago`;
return `${Math.floor(diffSec / 86400)}d ago`;
}

function updateTaskCountdowns() {
let expired = false;
for (const e of taskCountdowns) {
Expand DownExpand Up@@ -726,6 +739,23 @@ const Dialogs = (() => {
if (t.interval != null) hints.push(_t("app.taskInterval", { n: t.interval ?? "-" }));
if (t.enabled === false) hints.push(_t("app.taskDisabled"));
row.appendChild(el("span", { class: "task-hint" }, hints.join(" · ")));
// rant 2026-08-18T10:45:52:上次执行维度 —— 最近一次运行时间 + 摘要 + 降频(saturation)标识。
// 数据来自 daemon list_tasks → handler.status()(last_run_at/last_cycle_summary/saturation)。
const meta = el("div", { class: "task-meta" });
if (t.last_run_at) {
const runTxt = el("span", { class: "task-meta-item" }, _t("app.taskLastRun", { n: formatRelativeTime(t.last_run_at) }));
meta.appendChild(runTxt);
if (t.last_cycle_summary) {
meta.appendChild(el("span", { class: "task-meta-item task-meta-summary" }, _t("app.taskLastRunSummary", { n: t.last_cycle_summary })));
}
} else {
meta.appendChild(el("span", { class: "task-meta-item" }, _t("app.taskNoRunYet")));
}
const sat = (t.saturation && typeof t.saturation === "object") ? t.saturation : null;
if (sat && sat.empty_cycles > 0 && sat.heartbeat_active) {
meta.appendChild(el("span", { class: "task-badge task-saturation-badge" }, _t("app.taskSaturation", { n: sat.empty_cycles, m: formatCountdown(sat.heartbeat_interval) })));
}
row.appendChild(meta);
const actions = el("span", { class: "task-actions" });
// 触发(复用 /trigger 语义;rant 09:23:10:running 时给 info 反馈而非假成功)
const trigBtn = el("button", { type: "button", class: "model-action-btn", title: _t("settings.taskTrigger") }, _t("settings.taskTrigger"));
Expand Down
8 changes: 8 additions & 0 deletions emrg/gui/renderer/js/i18n.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,10 @@ const I18N = (() => {
"app.triggered": "已触发任务 {n}。",
"app.taskRunning": "任务 {n} 正在运行中(无法重复触发)",
"app.taskRunningBadge": "运行中",
"app.taskLastRun": "上次运行:{n}",
"app.taskLastRunSummary": "干了:{n}",
"app.taskNoRunYet": "尚未运行",
"app.taskSaturation": "空转 {n} 轮,降频至 {m}s heartbeat",
"app.deletedSwitch": "这个对话已被删除,已帮你切到最近的对话。",
"app.switched": "已切换对话。",
"app.sessionDisconnected": "该会话连接已断开,正在自动重连…",
Expand DownExpand Up@@ -828,6 +832,10 @@ const I18N = (() => {
"app.triggered": "Task {n} triggered.",
"app.taskRunning": "Task {n} is running (cannot re-trigger)",
"app.taskRunningBadge": "running",
"app.taskLastRun": "last run: {n}",
"app.taskLastRunSummary": "did: {n}",
"app.taskNoRunYet": "never ran",
"app.taskSaturation": "{n} empty cycles, throttled to {m}s heartbeat",
"app.deletedSwitch": "This conversation was deleted — switched to the most recent one.",
"app.switched": "Conversation switched.",
"app.sessionDisconnected": "This session's connection is lost — reconnecting automatically…",
Expand Down
33 changes: 33 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2839,6 +2839,39 @@ test("rant 10:36:39:倒计时生命周期 —— 渲染启动 interval、离
assert.strictEqual(win2._intervalCount || 0, s2, "全 running 无倒计时 → 不启动 interval");
});

test("rant 10:45:52:任务行显示上次执行元信息 + 降频标识", async () => {
const nowMs = 1_700_000_000_000;
const { ctx, win } = makeSandbox({
listTasks: async () => [
{ name: "with-run", type: "evolution", running: false, interval: 1800,
next_run_in_seconds: 43,
last_run_at: new Date(nowMs - 5 * 60_000).toISOString(),
last_cycle_summary: "tools-executed=24, cycle-complete",
saturation: { empty_cycles: 3, threshold: 5, heartbeat_interval: 7200, heartbeat_active: true } },
{ name: "never-run", type: "evolution", running: false, interval: 3600,
next_run_in_seconds: null, enabled: true, last_run_at: null, last_cycle_summary: null,
saturation: { empty_cycles: 0, threshold: 5, heartbeat_interval: 7200, heartbeat_active: false } },
],
listProjects: async () => [],
});
win.Date = class extends Date { static now() { return nowMs; } };
await tick();
await vm.runInContext("App.openTasksPanel()", ctx);
await tick();
const rows = vm.runInContext(`Array.from(document.getElementById("task-list").children).map((r) => {
const name = r.querySelector(".task-name").textContent;
const meta = r.querySelector(".task-meta");
const metaText = meta ? Array.from(meta.querySelectorAll(".task-meta-item")).map((e) => e.textContent).join("|") : "";
const satText = meta && meta.querySelector(".task-saturation-badge") ? meta.querySelector(".task-saturation-badge").textContent : "";
return name + " => " + metaText + " ## " + satText;
})`, ctx);
assert.ok(rows[0].includes("上次运行:5m ago"), `运行时间相对显示:${rows[0]}`);
assert.ok(rows[0].includes("干了:tools-executed=24, cycle-complete"), `执行摘要:${rows[0]}`);
assert.ok(rows[0].includes("空转 3 轮"), `降频徽标:${rows[0]}`);
assert.ok(rows[1].includes("尚未运行"), `未运行提示:${rows[1]}`);
assert.ok(!rows[1].includes("空转"), `无降频时无徽标:${rows[1]}`);
});

test("rant 2026-08-14T15:41:52:快速点击添加任务 —— 元数据未加载完也填充下拉 + 保存成功", async () => {
let created = null;
const { ctx, els } = makeSandbox({
Expand Down
21 changes: 21 additions & 0 deletions emrg/server/scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,11 +743,32 @@ def status(self) -> dict:
remaining = None
if self._next_run_at is not None:
remaining = max(0, int(self._next_run_at - time.time()))
# rant 2026-08-18T10:45:52: expose the LAST-execution dimension so the
# GUI tasks panel can show when a task last ran, what it did, and
# whether it is being throttled (saturation). All data is in-memory /
# on disk already — no extra I/O beyond the in-memory evolutions list.
last_run_at: str | None = None
last_cycle_summary: str | None = None
if self.evolutions:
last = self.evolutions[-1]
last_run_at = last.timestamp
# brief summary: tools-executed / cycle-complete etc. from impact
parts = [str(i) for i in last.impact if i]
last_cycle_summary = ", ".join(parts[:3]) if parts else None
saturation = {
"empty_cycles": self._empty_cycles,
"threshold": self._saturation_threshold(),
"heartbeat_interval": self._heartbeat_interval(),
"heartbeat_active": self._saturation_heartbeat_active(),
}
return {
"name": self.name,
"running": self._cycle_running,
"next_run_in_seconds": remaining,
"interval": self.interval,
"last_run_at": last_run_at,
"last_cycle_summary": last_cycle_summary,
"saturation": saturation,
}

def _remote_advanced(self) -> bool:
Expand Down
30 changes: 30 additions & 0 deletions tests/test_scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,6 +490,36 @@ def test_evolution_handler_stop():
assert handler._running is False


def test_evolution_handler_status_last_run_fields():
"""status() exposes last-run + saturation (rant 2026-08-18T10:45:52)."""
from emrg.protocol import EvolutionLog
handler = TaskHandler(
name="test", config={}, interval=60,
identity=InstanceIdentity(),
)
# no evolutions yet → null last-run fields, saturation defaults
st = handler.status()
assert st["name"] == "test"
assert st["last_run_at"] is None
assert st["last_cycle_summary"] is None
assert st["saturation"]["empty_cycles"] == 0
assert "threshold" in st["saturation"]
assert "heartbeat_interval" in st["saturation"]
assert "heartbeat_active" in st["saturation"]
# after one evolution → last-run populated from the latest log
handler.evolutions.append(EvolutionLog(
timestamp="2026-08-18T10:00:00",
trigger="evolution-test-ts",
impact=["tools-executed=24", "cycle-complete"],
operations=["llm-reflection", "tool-execution"],
))
handler._empty_cycles = 3
st = handler.status()
assert st["last_run_at"] == "2026-08-18T10:00:00"
assert st["last_cycle_summary"] == "tools-executed=24, cycle-complete"
assert st["saturation"]["empty_cycles"] == 3


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

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

Expand Down
29 changes: 29 additions & 0 deletions emrg/gui/renderer/css/components.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -996,6 +996,35 @@ dialog::backdrop {
font-variant-numeric: tabular-nums; /* 倒计时走秒不抖动 */
}

/* rant 2026-08-18T10:45:52:任务行"上次执行"元信息(运行时间/摘要/降频标识) */
.task-meta {
flex-basis: 100%;
display: flex;
align-items: center;
gap: 6px;
font-size: var(--fs-aux);
color: var(--text-3);
min-width: 0;
flex-wrap: wrap;
}
.task-meta-item {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.task-meta-summary {
max-width: 60%;
color: var(--text-2);
}
.task-saturation-badge {
background: var(--warn-soft, var(--bg-soft));
color: var(--warn, var(--text-3));
font-size: 10px;
padding: 1px 6px;
border-radius: 8px;
border: 1px solid var(--warn-soft, var(--border));
}

/* rant 09:17:45:提示词编辑器 Monaco 挂载容器(长提示词 300px 起步) */
.monaco-host {
width: 100%;
Expand Down
30 changes: 30 additions & 0 deletions emrg/gui/renderer/js/dialogs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,19 @@ const Dialogs = (() => {
return `${h}h${String(m).padStart(2, "0")}m`;
}

// rant 2026-08-18T10:45:52:相对时间显示("5m ago" / "3h ago" / 日期)——
// 用于任务行"上次运行"元信息。ISO 时间戳解析失败时回退为原文。
function formatRelativeTime(isoStr) {
if (!isoStr) return "";
const t = Date.parse(isoStr);
if (Number.isNaN(t)) return String(isoStr);
const diffSec = Math.max(0, Math.floor((Date.now() - t) / 1000));
if (diffSec < 60) return `${diffSec}s ago`;
if (diffSec < 3600) return `${Math.floor(diffSec / 60)}m ago`;
if (diffSec < 86400) return `${Math.floor(diffSec / 3600)}h ago`;
return `${Math.floor(diffSec / 86400)}d ago`;
}

function updateTaskCountdowns() {
let expired = false;
for (const e of taskCountdowns) {
Expand DownExpand Up@@ -726,6 +739,23 @@ const Dialogs = (() => {
if (t.interval != null) hints.push(_t("app.taskInterval", { n: t.interval ?? "-" }));
if (t.enabled === false) hints.push(_t("app.taskDisabled"));
row.appendChild(el("span", { class: "task-hint" }, hints.join(" · ")));
// rant 2026-08-18T10:45:52:上次执行维度 —— 最近一次运行时间 + 摘要 + 降频(saturation)标识。
// 数据来自 daemon list_tasks → handler.status()(last_run_at/last_cycle_summary/saturation)。
const meta = el("div", { class: "task-meta" });
if (t.last_run_at) {
const runTxt = el("span", { class: "task-meta-item" }, _t("app.taskLastRun", { n: formatRelativeTime(t.last_run_at) }));
meta.appendChild(runTxt);
if (t.last_cycle_summary) {
meta.appendChild(el("span", { class: "task-meta-item task-meta-summary" }, _t("app.taskLastRunSummary", { n: t.last_cycle_summary })));
}
} else {
meta.appendChild(el("span", { class: "task-meta-item" }, _t("app.taskNoRunYet")));
}
const sat = (t.saturation && typeof t.saturation === "object") ? t.saturation : null;
if (sat && sat.empty_cycles > 0 && sat.heartbeat_active) {
meta.appendChild(el("span", { class: "task-badge task-saturation-badge" }, _t("app.taskSaturation", { n: sat.empty_cycles, m: formatCountdown(sat.heartbeat_interval) })));
}
row.appendChild(meta);
const actions = el("span", { class: "task-actions" });
// 触发(复用 /trigger 语义;rant 09:23:10:running 时给 info 反馈而非假成功)
const trigBtn = el("button", { type: "button", class: "model-action-btn", title: _t("settings.taskTrigger") }, _t("settings.taskTrigger"));
Expand Down
8 changes: 8 additions & 0 deletions emrg/gui/renderer/js/i18n.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,10 @@ const I18N = (() => {
"app.triggered": "已触发任务 {n}。",
"app.taskRunning": "任务 {n} 正在运行中(无法重复触发)",
"app.taskRunningBadge": "运行中",
"app.taskLastRun": "上次运行:{n}",
"app.taskLastRunSummary": "干了:{n}",
"app.taskNoRunYet": "尚未运行",
"app.taskSaturation": "空转 {n} 轮,降频至 {m}s heartbeat",
"app.deletedSwitch": "这个对话已被删除,已帮你切到最近的对话。",
"app.switched": "已切换对话。",
"app.sessionDisconnected": "该会话连接已断开,正在自动重连…",
Expand DownExpand Up@@ -828,6 +832,10 @@ const I18N = (() => {
"app.triggered": "Task {n} triggered.",
"app.taskRunning": "Task {n} is running (cannot re-trigger)",
"app.taskRunningBadge": "running",
"app.taskLastRun": "last run: {n}",
"app.taskLastRunSummary": "did: {n}",
"app.taskNoRunYet": "never ran",
"app.taskSaturation": "{n} empty cycles, throttled to {m}s heartbeat",
"app.deletedSwitch": "This conversation was deleted — switched to the most recent one.",
"app.switched": "Conversation switched.",
"app.sessionDisconnected": "This session's connection is lost — reconnecting automatically…",
Expand Down
33 changes: 33 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2839,6 +2839,39 @@ test("rant 10:36:39:倒计时生命周期 —— 渲染启动 interval、离
assert.strictEqual(win2._intervalCount || 0, s2, "全 running 无倒计时 → 不启动 interval");
});

test("rant 10:45:52:任务行显示上次执行元信息 + 降频标识", async () => {
const nowMs = 1_700_000_000_000;
const { ctx, win } = makeSandbox({
listTasks: async () => [
{ name: "with-run", type: "evolution", running: false, interval: 1800,
next_run_in_seconds: 43,
last_run_at: new Date(nowMs - 5 * 60_000).toISOString(),
last_cycle_summary: "tools-executed=24, cycle-complete",
saturation: { empty_cycles: 3, threshold: 5, heartbeat_interval: 7200, heartbeat_active: true } },
{ name: "never-run", type: "evolution", running: false, interval: 3600,
next_run_in_seconds: null, enabled: true, last_run_at: null, last_cycle_summary: null,
saturation: { empty_cycles: 0, threshold: 5, heartbeat_interval: 7200, heartbeat_active: false } },
],
listProjects: async () => [],
});
win.Date = class extends Date { static now() { return nowMs; } };
await tick();
await vm.runInContext("App.openTasksPanel()", ctx);
await tick();
const rows = vm.runInContext(`Array.from(document.getElementById("task-list").children).map((r) => {
const name = r.querySelector(".task-name").textContent;
const meta = r.querySelector(".task-meta");
const metaText = meta ? Array.from(meta.querySelectorAll(".task-meta-item")).map((e) => e.textContent).join("|") : "";
const satText = meta && meta.querySelector(".task-saturation-badge") ? meta.querySelector(".task-saturation-badge").textContent : "";
return name + " => " + metaText + " ## " + satText;
})`, ctx);
assert.ok(rows[0].includes("上次运行:5m ago"), `运行时间相对显示:${rows[0]}`);
assert.ok(rows[0].includes("干了:tools-executed=24, cycle-complete"), `执行摘要:${rows[0]}`);
assert.ok(rows[0].includes("空转 3 轮"), `降频徽标:${rows[0]}`);
assert.ok(rows[1].includes("尚未运行"), `未运行提示:${rows[1]}`);
assert.ok(!rows[1].includes("空转"), `无降频时无徽标:${rows[1]}`);
});

test("rant 2026-08-14T15:41:52:快速点击添加任务 —— 元数据未加载完也填充下拉 + 保存成功", async () => {
let created = null;
const { ctx, els } = makeSandbox({
Expand Down
21 changes: 21 additions & 0 deletions emrg/server/scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,11 +743,32 @@ def status(self) -> dict:
remaining = None
if self._next_run_at is not None:
remaining = max(0, int(self._next_run_at - time.time()))
# rant 2026-08-18T10:45:52: expose the LAST-execution dimension so the
# GUI tasks panel can show when a task last ran, what it did, and
# whether it is being throttled (saturation). All data is in-memory /
# on disk already — no extra I/O beyond the in-memory evolutions list.
last_run_at: str | None = None
last_cycle_summary: str | None = None
if self.evolutions:
last = self.evolutions[-1]
last_run_at = last.timestamp
# brief summary: tools-executed / cycle-complete etc. from impact
parts = [str(i) for i in last.impact if i]
last_cycle_summary = ", ".join(parts[:3]) if parts else None
saturation = {
"empty_cycles": self._empty_cycles,
"threshold": self._saturation_threshold(),
"heartbeat_interval": self._heartbeat_interval(),
"heartbeat_active": self._saturation_heartbeat_active(),
}
return {
"name": self.name,
"running": self._cycle_running,
"next_run_in_seconds": remaining,
"interval": self.interval,
"last_run_at": last_run_at,
"last_cycle_summary": last_cycle_summary,
"saturation": saturation,
}

def _remote_advanced(self) -> bool:
Expand Down
30 changes: 30 additions & 0 deletions tests/test_scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,6 +490,36 @@ def test_evolution_handler_stop():
assert handler._running is False


def test_evolution_handler_status_last_run_fields():
"""status() exposes last-run + saturation (rant 2026-08-18T10:45:52)."""
from emrg.protocol import EvolutionLog
handler = TaskHandler(
name="test", config={}, interval=60,
identity=InstanceIdentity(),
)
# no evolutions yet → null last-run fields, saturation defaults
st = handler.status()
assert st["name"] == "test"
assert st["last_run_at"] is None
assert st["last_cycle_summary"] is None
assert st["saturation"]["empty_cycles"] == 0
assert "threshold" in st["saturation"]
assert "heartbeat_interval" in st["saturation"]
assert "heartbeat_active" in st["saturation"]
# after one evolution → last-run populated from the latest log
handler.evolutions.append(EvolutionLog(
timestamp="2026-08-18T10:00:00",
trigger="evolution-test-ts",
impact=["tools-executed=24", "cycle-complete"],
operations=["llm-reflection", "tool-execution"],
))
handler._empty_cycles = 3
st = handler.status()
assert st["last_run_at"] == "2026-08-18T10:00:00"
assert st["last_cycle_summary"] == "tools-executed=24, cycle-complete"
assert st["saturation"]["empty_cycles"] == 3


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

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

Expand Down
29 changes: 29 additions & 0 deletions emrg/gui/renderer/css/components.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -996,6 +996,35 @@ dialog::backdrop {
font-variant-numeric: tabular-nums; /* 倒计时走秒不抖动 */
}

/* rant 2026-08-18T10:45:52:任务行"上次执行"元信息(运行时间/摘要/降频标识) */
.task-meta {
flex-basis: 100%;
display: flex;
align-items: center;
gap: 6px;
font-size: var(--fs-aux);
color: var(--text-3);
min-width: 0;
flex-wrap: wrap;
}
.task-meta-item {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.task-meta-summary {
max-width: 60%;
color: var(--text-2);
}
.task-saturation-badge {
background: var(--warn-soft, var(--bg-soft));
color: var(--warn, var(--text-3));
font-size: 10px;
padding: 1px 6px;
border-radius: 8px;
border: 1px solid var(--warn-soft, var(--border));
}

/* rant 09:17:45:提示词编辑器 Monaco 挂载容器(长提示词 300px 起步) */
.monaco-host {
width: 100%;
Expand Down
30 changes: 30 additions & 0 deletions emrg/gui/renderer/js/dialogs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,19 @@ const Dialogs = (() => {
return `${h}h${String(m).padStart(2, "0")}m`;
}

// rant 2026-08-18T10:45:52:相对时间显示("5m ago" / "3h ago" / 日期)——
// 用于任务行"上次运行"元信息。ISO 时间戳解析失败时回退为原文。
function formatRelativeTime(isoStr) {
if (!isoStr) return "";
const t = Date.parse(isoStr);
if (Number.isNaN(t)) return String(isoStr);
const diffSec = Math.max(0, Math.floor((Date.now() - t) / 1000));
if (diffSec < 60) return `${diffSec}s ago`;
if (diffSec < 3600) return `${Math.floor(diffSec / 60)}m ago`;
if (diffSec < 86400) return `${Math.floor(diffSec / 3600)}h ago`;
return `${Math.floor(diffSec / 86400)}d ago`;
}

function updateTaskCountdowns() {
let expired = false;
for (const e of taskCountdowns) {
Expand DownExpand Up@@ -726,6 +739,23 @@ const Dialogs = (() => {
if (t.interval != null) hints.push(_t("app.taskInterval", { n: t.interval ?? "-" }));
if (t.enabled === false) hints.push(_t("app.taskDisabled"));
row.appendChild(el("span", { class: "task-hint" }, hints.join(" · ")));
// rant 2026-08-18T10:45:52:上次执行维度 —— 最近一次运行时间 + 摘要 + 降频(saturation)标识。
// 数据来自 daemon list_tasks → handler.status()(last_run_at/last_cycle_summary/saturation)。
const meta = el("div", { class: "task-meta" });
if (t.last_run_at) {
const runTxt = el("span", { class: "task-meta-item" }, _t("app.taskLastRun", { n: formatRelativeTime(t.last_run_at) }));
meta.appendChild(runTxt);
if (t.last_cycle_summary) {
meta.appendChild(el("span", { class: "task-meta-item task-meta-summary" }, _t("app.taskLastRunSummary", { n: t.last_cycle_summary })));
}
} else {
meta.appendChild(el("span", { class: "task-meta-item" }, _t("app.taskNoRunYet")));
}
const sat = (t.saturation && typeof t.saturation === "object") ? t.saturation : null;
if (sat && sat.empty_cycles > 0 && sat.heartbeat_active) {
meta.appendChild(el("span", { class: "task-badge task-saturation-badge" }, _t("app.taskSaturation", { n: sat.empty_cycles, m: formatCountdown(sat.heartbeat_interval) })));
}
row.appendChild(meta);
const actions = el("span", { class: "task-actions" });
// 触发(复用 /trigger 语义;rant 09:23:10:running 时给 info 反馈而非假成功)
const trigBtn = el("button", { type: "button", class: "model-action-btn", title: _t("settings.taskTrigger") }, _t("settings.taskTrigger"));
Expand Down
8 changes: 8 additions & 0 deletions emrg/gui/renderer/js/i18n.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,10 @@ const I18N = (() => {
"app.triggered": "已触发任务 {n}。",
"app.taskRunning": "任务 {n} 正在运行中(无法重复触发)",
"app.taskRunningBadge": "运行中",
"app.taskLastRun": "上次运行:{n}",
"app.taskLastRunSummary": "干了:{n}",
"app.taskNoRunYet": "尚未运行",
"app.taskSaturation": "空转 {n} 轮,降频至 {m}s heartbeat",
"app.deletedSwitch": "这个对话已被删除,已帮你切到最近的对话。",
"app.switched": "已切换对话。",
"app.sessionDisconnected": "该会话连接已断开,正在自动重连…",
Expand DownExpand Up@@ -828,6 +832,10 @@ const I18N = (() => {
"app.triggered": "Task {n} triggered.",
"app.taskRunning": "Task {n} is running (cannot re-trigger)",
"app.taskRunningBadge": "running",
"app.taskLastRun": "last run: {n}",
"app.taskLastRunSummary": "did: {n}",
"app.taskNoRunYet": "never ran",
"app.taskSaturation": "{n} empty cycles, throttled to {m}s heartbeat",
"app.deletedSwitch": "This conversation was deleted — switched to the most recent one.",
"app.switched": "Conversation switched.",
"app.sessionDisconnected": "This session's connection is lost — reconnecting automatically…",
Expand Down
33 changes: 33 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2839,6 +2839,39 @@ test("rant 10:36:39:倒计时生命周期 —— 渲染启动 interval、离
assert.strictEqual(win2._intervalCount || 0, s2, "全 running 无倒计时 → 不启动 interval");
});

test("rant 10:45:52:任务行显示上次执行元信息 + 降频标识", async () => {
const nowMs = 1_700_000_000_000;
const { ctx, win } = makeSandbox({
listTasks: async () => [
{ name: "with-run", type: "evolution", running: false, interval: 1800,
next_run_in_seconds: 43,
last_run_at: new Date(nowMs - 5 * 60_000).toISOString(),
last_cycle_summary: "tools-executed=24, cycle-complete",
saturation: { empty_cycles: 3, threshold: 5, heartbeat_interval: 7200, heartbeat_active: true } },
{ name: "never-run", type: "evolution", running: false, interval: 3600,
next_run_in_seconds: null, enabled: true, last_run_at: null, last_cycle_summary: null,
saturation: { empty_cycles: 0, threshold: 5, heartbeat_interval: 7200, heartbeat_active: false } },
],
listProjects: async () => [],
});
win.Date = class extends Date { static now() { return nowMs; } };
await tick();
await vm.runInContext("App.openTasksPanel()", ctx);
await tick();
const rows = vm.runInContext(`Array.from(document.getElementById("task-list").children).map((r) => {
const name = r.querySelector(".task-name").textContent;
const meta = r.querySelector(".task-meta");
const metaText = meta ? Array.from(meta.querySelectorAll(".task-meta-item")).map((e) => e.textContent).join("|") : "";
const satText = meta && meta.querySelector(".task-saturation-badge") ? meta.querySelector(".task-saturation-badge").textContent : "";
return name + " => " + metaText + " ## " + satText;
})`, ctx);
assert.ok(rows[0].includes("上次运行:5m ago"), `运行时间相对显示:${rows[0]}`);
assert.ok(rows[0].includes("干了:tools-executed=24, cycle-complete"), `执行摘要:${rows[0]}`);
assert.ok(rows[0].includes("空转 3 轮"), `降频徽标:${rows[0]}`);
assert.ok(rows[1].includes("尚未运行"), `未运行提示:${rows[1]}`);
assert.ok(!rows[1].includes("空转"), `无降频时无徽标:${rows[1]}`);
});

test("rant 2026-08-14T15:41:52:快速点击添加任务 —— 元数据未加载完也填充下拉 + 保存成功", async () => {
let created = null;
const { ctx, els } = makeSandbox({
Expand Down
21 changes: 21 additions & 0 deletions emrg/server/scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,11 +743,32 @@ def status(self) -> dict:
remaining = None
if self._next_run_at is not None:
remaining = max(0, int(self._next_run_at - time.time()))
# rant 2026-08-18T10:45:52: expose the LAST-execution dimension so the
# GUI tasks panel can show when a task last ran, what it did, and
# whether it is being throttled (saturation). All data is in-memory /
# on disk already — no extra I/O beyond the in-memory evolutions list.
last_run_at: str | None = None
last_cycle_summary: str | None = None
if self.evolutions:
last = self.evolutions[-1]
last_run_at = last.timestamp
# brief summary: tools-executed / cycle-complete etc. from impact
parts = [str(i) for i in last.impact if i]
last_cycle_summary = ", ".join(parts[:3]) if parts else None
saturation = {
"empty_cycles": self._empty_cycles,
"threshold": self._saturation_threshold(),
"heartbeat_interval": self._heartbeat_interval(),
"heartbeat_active": self._saturation_heartbeat_active(),
}
return {
"name": self.name,
"running": self._cycle_running,
"next_run_in_seconds": remaining,
"interval": self.interval,
"last_run_at": last_run_at,
"last_cycle_summary": last_cycle_summary,
"saturation": saturation,
}

def _remote_advanced(self) -> bool:
Expand Down
30 changes: 30 additions & 0 deletions tests/test_scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,6 +490,36 @@ def test_evolution_handler_stop():
assert handler._running is False


def test_evolution_handler_status_last_run_fields():
"""status() exposes last-run + saturation (rant 2026-08-18T10:45:52)."""
from emrg.protocol import EvolutionLog
handler = TaskHandler(
name="test", config={}, interval=60,
identity=InstanceIdentity(),
)
# no evolutions yet → null last-run fields, saturation defaults
st = handler.status()
assert st["name"] == "test"
assert st["last_run_at"] is None
assert st["last_cycle_summary"] is None
assert st["saturation"]["empty_cycles"] == 0
assert "threshold" in st["saturation"]
assert "heartbeat_interval" in st["saturation"]
assert "heartbeat_active" in st["saturation"]
# after one evolution → last-run populated from the latest log
handler.evolutions.append(EvolutionLog(
timestamp="2026-08-18T10:00:00",
trigger="evolution-test-ts",
impact=["tools-executed=24", "cycle-complete"],
operations=["llm-reflection", "tool-execution"],
))
handler._empty_cycles = 3
st = handler.status()
assert st["last_run_at"] == "2026-08-18T10:00:00"
assert st["last_cycle_summary"] == "tools-executed=24, cycle-complete"
assert st["saturation"]["empty_cycles"] == 3


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

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

Expand Down
29 changes: 29 additions & 0 deletions emrg/gui/renderer/css/components.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -996,6 +996,35 @@ dialog::backdrop {
font-variant-numeric: tabular-nums; /* 倒计时走秒不抖动 */
}

/* rant 2026-08-18T10:45:52:任务行"上次执行"元信息(运行时间/摘要/降频标识) */
.task-meta {
flex-basis: 100%;
display: flex;
align-items: center;
gap: 6px;
font-size: var(--fs-aux);
color: var(--text-3);
min-width: 0;
flex-wrap: wrap;
}
.task-meta-item {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.task-meta-summary {
max-width: 60%;
color: var(--text-2);
}
.task-saturation-badge {
background: var(--warn-soft, var(--bg-soft));
color: var(--warn, var(--text-3));
font-size: 10px;
padding: 1px 6px;
border-radius: 8px;
border: 1px solid var(--warn-soft, var(--border));
}

/* rant 09:17:45:提示词编辑器 Monaco 挂载容器(长提示词 300px 起步) */
.monaco-host {
width: 100%;
Expand Down
30 changes: 30 additions & 0 deletions emrg/gui/renderer/js/dialogs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,19 @@ const Dialogs = (() => {
return `${h}h${String(m).padStart(2, "0")}m`;
}

// rant 2026-08-18T10:45:52:相对时间显示("5m ago" / "3h ago" / 日期)——
// 用于任务行"上次运行"元信息。ISO 时间戳解析失败时回退为原文。
function formatRelativeTime(isoStr) {
if (!isoStr) return "";
const t = Date.parse(isoStr);
if (Number.isNaN(t)) return String(isoStr);
const diffSec = Math.max(0, Math.floor((Date.now() - t) / 1000));
if (diffSec < 60) return `${diffSec}s ago`;
if (diffSec < 3600) return `${Math.floor(diffSec / 60)}m ago`;
if (diffSec < 86400) return `${Math.floor(diffSec / 3600)}h ago`;
return `${Math.floor(diffSec / 86400)}d ago`;
}

function updateTaskCountdowns() {
let expired = false;
for (const e of taskCountdowns) {
Expand DownExpand Up@@ -726,6 +739,23 @@ const Dialogs = (() => {
if (t.interval != null) hints.push(_t("app.taskInterval", { n: t.interval ?? "-" }));
if (t.enabled === false) hints.push(_t("app.taskDisabled"));
row.appendChild(el("span", { class: "task-hint" }, hints.join(" · ")));
// rant 2026-08-18T10:45:52:上次执行维度 —— 最近一次运行时间 + 摘要 + 降频(saturation)标识。
// 数据来自 daemon list_tasks → handler.status()(last_run_at/last_cycle_summary/saturation)。
const meta = el("div", { class: "task-meta" });
if (t.last_run_at) {
const runTxt = el("span", { class: "task-meta-item" }, _t("app.taskLastRun", { n: formatRelativeTime(t.last_run_at) }));
meta.appendChild(runTxt);
if (t.last_cycle_summary) {
meta.appendChild(el("span", { class: "task-meta-item task-meta-summary" }, _t("app.taskLastRunSummary", { n: t.last_cycle_summary })));
}
} else {
meta.appendChild(el("span", { class: "task-meta-item" }, _t("app.taskNoRunYet")));
}
const sat = (t.saturation && typeof t.saturation === "object") ? t.saturation : null;
if (sat && sat.empty_cycles > 0 && sat.heartbeat_active) {
meta.appendChild(el("span", { class: "task-badge task-saturation-badge" }, _t("app.taskSaturation", { n: sat.empty_cycles, m: formatCountdown(sat.heartbeat_interval) })));
}
row.appendChild(meta);
const actions = el("span", { class: "task-actions" });
// 触发(复用 /trigger 语义;rant 09:23:10:running 时给 info 反馈而非假成功)
const trigBtn = el("button", { type: "button", class: "model-action-btn", title: _t("settings.taskTrigger") }, _t("settings.taskTrigger"));
Expand Down
8 changes: 8 additions & 0 deletions emrg/gui/renderer/js/i18n.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,10 @@ const I18N = (() => {
"app.triggered": "已触发任务 {n}。",
"app.taskRunning": "任务 {n} 正在运行中(无法重复触发)",
"app.taskRunningBadge": "运行中",
"app.taskLastRun": "上次运行:{n}",
"app.taskLastRunSummary": "干了:{n}",
"app.taskNoRunYet": "尚未运行",
"app.taskSaturation": "空转 {n} 轮,降频至 {m}s heartbeat",
"app.deletedSwitch": "这个对话已被删除,已帮你切到最近的对话。",
"app.switched": "已切换对话。",
"app.sessionDisconnected": "该会话连接已断开,正在自动重连…",
Expand DownExpand Up@@ -828,6 +832,10 @@ const I18N = (() => {
"app.triggered": "Task {n} triggered.",
"app.taskRunning": "Task {n} is running (cannot re-trigger)",
"app.taskRunningBadge": "running",
"app.taskLastRun": "last run: {n}",
"app.taskLastRunSummary": "did: {n}",
"app.taskNoRunYet": "never ran",
"app.taskSaturation": "{n} empty cycles, throttled to {m}s heartbeat",
"app.deletedSwitch": "This conversation was deleted — switched to the most recent one.",
"app.switched": "Conversation switched.",
"app.sessionDisconnected": "This session's connection is lost — reconnecting automatically…",
Expand Down
33 changes: 33 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2839,6 +2839,39 @@ test("rant 10:36:39:倒计时生命周期 —— 渲染启动 interval、离
assert.strictEqual(win2._intervalCount || 0, s2, "全 running 无倒计时 → 不启动 interval");
});

test("rant 10:45:52:任务行显示上次执行元信息 + 降频标识", async () => {
const nowMs = 1_700_000_000_000;
const { ctx, win } = makeSandbox({
listTasks: async () => [
{ name: "with-run", type: "evolution", running: false, interval: 1800,
next_run_in_seconds: 43,
last_run_at: new Date(nowMs - 5 * 60_000).toISOString(),
last_cycle_summary: "tools-executed=24, cycle-complete",
saturation: { empty_cycles: 3, threshold: 5, heartbeat_interval: 7200, heartbeat_active: true } },
{ name: "never-run", type: "evolution", running: false, interval: 3600,
next_run_in_seconds: null, enabled: true, last_run_at: null, last_cycle_summary: null,
saturation: { empty_cycles: 0, threshold: 5, heartbeat_interval: 7200, heartbeat_active: false } },
],
listProjects: async () => [],
});
win.Date = class extends Date { static now() { return nowMs; } };
await tick();
await vm.runInContext("App.openTasksPanel()", ctx);
await tick();
const rows = vm.runInContext(`Array.from(document.getElementById("task-list").children).map((r) => {
const name = r.querySelector(".task-name").textContent;
const meta = r.querySelector(".task-meta");
const metaText = meta ? Array.from(meta.querySelectorAll(".task-meta-item")).map((e) => e.textContent).join("|") : "";
const satText = meta && meta.querySelector(".task-saturation-badge") ? meta.querySelector(".task-saturation-badge").textContent : "";
return name + " => " + metaText + " ## " + satText;
})`, ctx);
assert.ok(rows[0].includes("上次运行:5m ago"), `运行时间相对显示:${rows[0]}`);
assert.ok(rows[0].includes("干了:tools-executed=24, cycle-complete"), `执行摘要:${rows[0]}`);
assert.ok(rows[0].includes("空转 3 轮"), `降频徽标:${rows[0]}`);
assert.ok(rows[1].includes("尚未运行"), `未运行提示:${rows[1]}`);
assert.ok(!rows[1].includes("空转"), `无降频时无徽标:${rows[1]}`);
});

test("rant 2026-08-14T15:41:52:快速点击添加任务 —— 元数据未加载完也填充下拉 + 保存成功", async () => {
let created = null;
const { ctx, els } = makeSandbox({
Expand Down
21 changes: 21 additions & 0 deletions emrg/server/scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,11 +743,32 @@ def status(self) -> dict:
remaining = None
if self._next_run_at is not None:
remaining = max(0, int(self._next_run_at - time.time()))
# rant 2026-08-18T10:45:52: expose the LAST-execution dimension so the
# GUI tasks panel can show when a task last ran, what it did, and
# whether it is being throttled (saturation). All data is in-memory /
# on disk already — no extra I/O beyond the in-memory evolutions list.
last_run_at: str | None = None
last_cycle_summary: str | None = None
if self.evolutions:
last = self.evolutions[-1]
last_run_at = last.timestamp
# brief summary: tools-executed / cycle-complete etc. from impact
parts = [str(i) for i in last.impact if i]
last_cycle_summary = ", ".join(parts[:3]) if parts else None
saturation = {
"empty_cycles": self._empty_cycles,
"threshold": self._saturation_threshold(),
"heartbeat_interval": self._heartbeat_interval(),
"heartbeat_active": self._saturation_heartbeat_active(),
}
return {
"name": self.name,
"running": self._cycle_running,
"next_run_in_seconds": remaining,
"interval": self.interval,
"last_run_at": last_run_at,
"last_cycle_summary": last_cycle_summary,
"saturation": saturation,
}

def _remote_advanced(self) -> bool:
Expand Down
30 changes: 30 additions & 0 deletions tests/test_scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,6 +490,36 @@ def test_evolution_handler_stop():
assert handler._running is False


def test_evolution_handler_status_last_run_fields():
"""status() exposes last-run + saturation (rant 2026-08-18T10:45:52)."""
from emrg.protocol import EvolutionLog
handler = TaskHandler(
name="test", config={}, interval=60,
identity=InstanceIdentity(),
)
# no evolutions yet → null last-run fields, saturation defaults
st = handler.status()
assert st["name"] == "test"
assert st["last_run_at"] is None
assert st["last_cycle_summary"] is None
assert st["saturation"]["empty_cycles"] == 0
assert "threshold" in st["saturation"]
assert "heartbeat_interval" in st["saturation"]
assert "heartbeat_active" in st["saturation"]
# after one evolution → last-run populated from the latest log
handler.evolutions.append(EvolutionLog(
timestamp="2026-08-18T10:00:00",
trigger="evolution-test-ts",
impact=["tools-executed=24", "cycle-complete"],
operations=["llm-reflection", "tool-execution"],
))
handler._empty_cycles = 3
st = handler.status()
assert st["last_run_at"] == "2026-08-18T10:00:00"
assert st["last_cycle_summary"] == "tools-executed=24, cycle-complete"
assert st["saturation"]["empty_cycles"] == 3


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

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

Expand Down
29 changes: 29 additions & 0 deletions emrg/gui/renderer/css/components.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -996,6 +996,35 @@ dialog::backdrop {
font-variant-numeric: tabular-nums; /* 倒计时走秒不抖动 */
}

/* rant 2026-08-18T10:45:52:任务行"上次执行"元信息(运行时间/摘要/降频标识) */
.task-meta {
flex-basis: 100%;
display: flex;
align-items: center;
gap: 6px;
font-size: var(--fs-aux);
color: var(--text-3);
min-width: 0;
flex-wrap: wrap;
}
.task-meta-item {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.task-meta-summary {
max-width: 60%;
color: var(--text-2);
}
.task-saturation-badge {
background: var(--warn-soft, var(--bg-soft));
color: var(--warn, var(--text-3));
font-size: 10px;
padding: 1px 6px;
border-radius: 8px;
border: 1px solid var(--warn-soft, var(--border));
}

/* rant 09:17:45:提示词编辑器 Monaco 挂载容器(长提示词 300px 起步) */
.monaco-host {
width: 100%;
Expand Down
30 changes: 30 additions & 0 deletions emrg/gui/renderer/js/dialogs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,19 @@ const Dialogs = (() => {
return `${h}h${String(m).padStart(2, "0")}m`;
}

// rant 2026-08-18T10:45:52:相对时间显示("5m ago" / "3h ago" / 日期)——
// 用于任务行"上次运行"元信息。ISO 时间戳解析失败时回退为原文。
function formatRelativeTime(isoStr) {
if (!isoStr) return "";
const t = Date.parse(isoStr);
if (Number.isNaN(t)) return String(isoStr);
const diffSec = Math.max(0, Math.floor((Date.now() - t) / 1000));
if (diffSec < 60) return `${diffSec}s ago`;
if (diffSec < 3600) return `${Math.floor(diffSec / 60)}m ago`;
if (diffSec < 86400) return `${Math.floor(diffSec / 3600)}h ago`;
return `${Math.floor(diffSec / 86400)}d ago`;
}

function updateTaskCountdowns() {
let expired = false;
for (const e of taskCountdowns) {
Expand DownExpand Up@@ -726,6 +739,23 @@ const Dialogs = (() => {
if (t.interval != null) hints.push(_t("app.taskInterval", { n: t.interval ?? "-" }));
if (t.enabled === false) hints.push(_t("app.taskDisabled"));
row.appendChild(el("span", { class: "task-hint" }, hints.join(" · ")));
// rant 2026-08-18T10:45:52:上次执行维度 —— 最近一次运行时间 + 摘要 + 降频(saturation)标识。
// 数据来自 daemon list_tasks → handler.status()(last_run_at/last_cycle_summary/saturation)。
const meta = el("div", { class: "task-meta" });
if (t.last_run_at) {
const runTxt = el("span", { class: "task-meta-item" }, _t("app.taskLastRun", { n: formatRelativeTime(t.last_run_at) }));
meta.appendChild(runTxt);
if (t.last_cycle_summary) {
meta.appendChild(el("span", { class: "task-meta-item task-meta-summary" }, _t("app.taskLastRunSummary", { n: t.last_cycle_summary })));
}
} else {
meta.appendChild(el("span", { class: "task-meta-item" }, _t("app.taskNoRunYet")));
}
const sat = (t.saturation && typeof t.saturation === "object") ? t.saturation : null;
if (sat && sat.empty_cycles > 0 && sat.heartbeat_active) {
meta.appendChild(el("span", { class: "task-badge task-saturation-badge" }, _t("app.taskSaturation", { n: sat.empty_cycles, m: formatCountdown(sat.heartbeat_interval) })));
}
row.appendChild(meta);
const actions = el("span", { class: "task-actions" });
// 触发(复用 /trigger 语义;rant 09:23:10:running 时给 info 反馈而非假成功)
const trigBtn = el("button", { type: "button", class: "model-action-btn", title: _t("settings.taskTrigger") }, _t("settings.taskTrigger"));
Expand Down
8 changes: 8 additions & 0 deletions emrg/gui/renderer/js/i18n.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,10 @@ const I18N = (() => {
"app.triggered": "已触发任务 {n}。",
"app.taskRunning": "任务 {n} 正在运行中(无法重复触发)",
"app.taskRunningBadge": "运行中",
"app.taskLastRun": "上次运行:{n}",
"app.taskLastRunSummary": "干了:{n}",
"app.taskNoRunYet": "尚未运行",
"app.taskSaturation": "空转 {n} 轮,降频至 {m}s heartbeat",
"app.deletedSwitch": "这个对话已被删除,已帮你切到最近的对话。",
"app.switched": "已切换对话。",
"app.sessionDisconnected": "该会话连接已断开,正在自动重连…",
Expand DownExpand Up@@ -828,6 +832,10 @@ const I18N = (() => {
"app.triggered": "Task {n} triggered.",
"app.taskRunning": "Task {n} is running (cannot re-trigger)",
"app.taskRunningBadge": "running",
"app.taskLastRun": "last run: {n}",
"app.taskLastRunSummary": "did: {n}",
"app.taskNoRunYet": "never ran",
"app.taskSaturation": "{n} empty cycles, throttled to {m}s heartbeat",
"app.deletedSwitch": "This conversation was deleted — switched to the most recent one.",
"app.switched": "Conversation switched.",
"app.sessionDisconnected": "This session's connection is lost — reconnecting automatically…",
Expand Down
33 changes: 33 additions & 0 deletions emrg/gui/test/renderer.smoke.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2839,6 +2839,39 @@ test("rant 10:36:39:倒计时生命周期 —— 渲染启动 interval、离
assert.strictEqual(win2._intervalCount || 0, s2, "全 running 无倒计时 → 不启动 interval");
});

test("rant 10:45:52:任务行显示上次执行元信息 + 降频标识", async () => {
const nowMs = 1_700_000_000_000;
const { ctx, win } = makeSandbox({
listTasks: async () => [
{ name: "with-run", type: "evolution", running: false, interval: 1800,
next_run_in_seconds: 43,
last_run_at: new Date(nowMs - 5 * 60_000).toISOString(),
last_cycle_summary: "tools-executed=24, cycle-complete",
saturation: { empty_cycles: 3, threshold: 5, heartbeat_interval: 7200, heartbeat_active: true } },
{ name: "never-run", type: "evolution", running: false, interval: 3600,
next_run_in_seconds: null, enabled: true, last_run_at: null, last_cycle_summary: null,
saturation: { empty_cycles: 0, threshold: 5, heartbeat_interval: 7200, heartbeat_active: false } },
],
listProjects: async () => [],
});
win.Date = class extends Date { static now() { return nowMs; } };
await tick();
await vm.runInContext("App.openTasksPanel()", ctx);
await tick();
const rows = vm.runInContext(`Array.from(document.getElementById("task-list").children).map((r) => {
const name = r.querySelector(".task-name").textContent;
const meta = r.querySelector(".task-meta");
const metaText = meta ? Array.from(meta.querySelectorAll(".task-meta-item")).map((e) => e.textContent).join("|") : "";
const satText = meta && meta.querySelector(".task-saturation-badge") ? meta.querySelector(".task-saturation-badge").textContent : "";
return name + " => " + metaText + " ## " + satText;
})`, ctx);
assert.ok(rows[0].includes("上次运行:5m ago"), `运行时间相对显示:${rows[0]}`);
assert.ok(rows[0].includes("干了:tools-executed=24, cycle-complete"), `执行摘要:${rows[0]}`);
assert.ok(rows[0].includes("空转 3 轮"), `降频徽标:${rows[0]}`);
assert.ok(rows[1].includes("尚未运行"), `未运行提示:${rows[1]}`);
assert.ok(!rows[1].includes("空转"), `无降频时无徽标:${rows[1]}`);
});

test("rant 2026-08-14T15:41:52:快速点击添加任务 —— 元数据未加载完也填充下拉 + 保存成功", async () => {
let created = null;
const { ctx, els } = makeSandbox({
Expand Down
21 changes: 21 additions & 0 deletions emrg/server/scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -743,11 +743,32 @@ def status(self) -> dict:
remaining = None
if self._next_run_at is not None:
remaining = max(0, int(self._next_run_at - time.time()))
# rant 2026-08-18T10:45:52: expose the LAST-execution dimension so the
# GUI tasks panel can show when a task last ran, what it did, and
# whether it is being throttled (saturation). All data is in-memory /
# on disk already — no extra I/O beyond the in-memory evolutions list.
last_run_at: str | None = None
last_cycle_summary: str | None = None
if self.evolutions:
last = self.evolutions[-1]
last_run_at = last.timestamp
# brief summary: tools-executed / cycle-complete etc. from impact
parts = [str(i) for i in last.impact if i]
last_cycle_summary = ", ".join(parts[:3]) if parts else None
saturation = {
"empty_cycles": self._empty_cycles,
"threshold": self._saturation_threshold(),
"heartbeat_interval": self._heartbeat_interval(),
"heartbeat_active": self._saturation_heartbeat_active(),
}
return {
"name": self.name,
"running": self._cycle_running,
"next_run_in_seconds": remaining,
"interval": self.interval,
"last_run_at": last_run_at,
"last_cycle_summary": last_cycle_summary,
"saturation": saturation,
}

def _remote_advanced(self) -> bool:
Expand Down
30 changes: 30 additions & 0 deletions tests/test_scheduler.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,6 +490,36 @@ def test_evolution_handler_stop():
assert handler._running is False


def test_evolution_handler_status_last_run_fields():
"""status() exposes last-run + saturation (rant 2026-08-18T10:45:52)."""
from emrg.protocol import EvolutionLog
handler = TaskHandler(
name="test", config={}, interval=60,
identity=InstanceIdentity(),
)
# no evolutions yet → null last-run fields, saturation defaults
st = handler.status()
assert st["name"] == "test"
assert st["last_run_at"] is None
assert st["last_cycle_summary"] is None
assert st["saturation"]["empty_cycles"] == 0
assert "threshold" in st["saturation"]
assert "heartbeat_interval" in st["saturation"]
assert "heartbeat_active" in st["saturation"]
# after one evolution → last-run populated from the latest log
handler.evolutions.append(EvolutionLog(
timestamp="2026-08-18T10:00:00",
trigger="evolution-test-ts",
impact=["tools-executed=24", "cycle-complete"],
operations=["llm-reflection", "tool-execution"],
))
handler._empty_cycles = 3
st = handler.status()
assert st["last_run_at"] == "2026-08-18T10:00:00"
assert st["last_cycle_summary"] == "tools-executed=24, cycle-complete"
assert st["saturation"]["empty_cycles"] == 3


def test_evolution_handler_default_owner():
"""When no git remote is detectable, falls back to EMRG defaults."""
handler = TaskHandler(
Expand Down
Loading