From 6c5224fb6fdedb0b49c3b9d4079a7bd12ed1c1d7 Mon Sep 17 00:00:00 2001 From: WebUp Cloud Date: Sat, 7 Nov 2026 18:48:36 +0800 Subject: [PATCH] Follow the latest task logs while reading the tail --- .../run/webup/platform/TaskController.java | 5 +- docs/API.md | 2 +- frontend/src/views/Develop.vue | 54 +++++++++++++++++-- 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/run/webup/platform/TaskController.java b/backend/src/main/java/run/webup/platform/TaskController.java index a6ac0d0..d0a04d3 100644 --- a/backend/src/main/java/run/webup/platform/TaskController.java +++ b/backend/src/main/java/run/webup/platform/TaskController.java @@ -68,8 +68,9 @@ public class TaskController { @AuthenticationPrincipal SecurityConfig.Identity who, @PathVariable UUID id) { tasks.find(id, who.id()); return db.queryForList( - "SELECT * FROM ai_task_steps WHERE task_id=? AND event NOT IN" - + " ('AUTO_SETTLEMENT','MANUAL_SETTLEMENT') ORDER BY created_at,id LIMIT 1000", + "SELECT * FROM (SELECT * FROM ai_task_steps WHERE task_id=? AND event NOT IN" + + " ('AUTO_SETTLEMENT','MANUAL_SETTLEMENT') ORDER BY created_at DESC,id DESC LIMIT" + + " 1000) AS recent ORDER BY created_at,id", id); } diff --git a/docs/API.md b/docs/API.md index 2c1db08..a812e3b 100644 --- a/docs/API.md +++ b/docs/API.md @@ -104,7 +104,7 @@ | --- | --- | --- | | GET / POST | `/api/tasks` | 本人最近 100 条 / 创建并预留预算 | | GET | `/api/tasks/{id}` | 本人任务、预算与消费,不返回租约令牌 | -| GET | `/api/tasks/{id}/events` | 本人任务事件(最多 1000 条) | +| GET | `/api/tasks/{id}/events` | 本人最近 1000 条任务事件,按时间从早到晚返回 | | GET | `/api/tasks/{id}/messages` | 本人持久化消息与工具上下文 | | POST | `/api/tasks/{id}/pause` | 暂停新的调用,保留剩余预算 | | POST | `/api/tasks/{id}/resume` | PAUSED 任务重新入队 | diff --git a/frontend/src/views/Develop.vue b/frontend/src/views/Develop.vue index 365d319..7735e58 100644 --- a/frontend/src/views/Develop.vue +++ b/frontend/src/views/Develop.vue @@ -19,6 +19,40 @@ const fileBusy = ref(false), fileError = ref(""); let fileGeneration = 0; let fileTaskSignature = ""; +const logPanel = ref(null); +const followLogs = ref(true); +let logRequest = 0; +let appliedLogRequest = 0; + +function scrollLogsToLatest() { + followLogs.value = true; + const panel = logPanel.value; + if (panel) panel.scrollTop = panel.scrollHeight; +} + +function trackLogScroll() { + const panel = logPanel.value; + if (panel) + followLogs.value = + panel.scrollHeight - panel.scrollTop - panel.clientHeight <= 24; +} + +watch( + [() => selected.value?.id, () => events.value.at(-1)?.id], + ([id], [previousId]) => { + if (id !== previousId || followLogs.value) scrollLogsToLatest(); + }, + { flush: "post" }, +); + +function selectTask(task: any) { + if (task.id !== selected.value?.id) { + events.value = []; + followLogs.value = true; + appliedLogRequest = ++logRequest; + } + selected.value = task; +} const execution = ref({ ready: false, state: "CHECKING", @@ -77,11 +111,13 @@ async function load() { } const id = selected.value?.id; if (id) { + const request = ++logRequest; const [task, log] = await Promise.all([ api("/tasks/" + id), api("/tasks/" + id + "/events"), ]); - if (selected.value?.id === id) { + if (selected.value?.id === id && request > appliedLogRequest) { + appliedLogRequest = request; const changed = selected.value.status !== task.status || events.value.at(-1)?.id !== log.at(-1)?.id; @@ -102,8 +138,7 @@ async function load() { } } async function select(t: any) { - selected.value = t; - events.value = []; + selectTask(t); form.projectId = t.project_id; await load(); } @@ -115,7 +150,7 @@ async function start() { busy.value = true; error.value = ""; try { - selected.value = await api("/tasks", { method: "POST", body: body(form) }); + selectTask(await api("/tasks", { method: "POST", body: body(form) })); form.idempotencyKey = crypto.randomUUID(); success.value = "执行服务已连接,任务已提交并预留预算。"; await load(); @@ -515,7 +550,13 @@ onUnmounted(() => clearInterval(timer));
{{ selected.error }}
-
+
{{ new Date(e.created_at).toLocaleTimeString() }} · @@ -525,6 +566,9 @@ onUnmounted(() => clearInterval(timer));

等待任务事件

+