Skip to content

Agent Zero AI framework

fix: queue duplicate message

keyboardstaff75248049c3d4
diff --git a/plugins/plugin_scan/api/plugin_scan_queue.py b/plugins/plugin_scan/api/plugin_scan_queue.py
index ad0daa656..64e1bda2c 100644
--- a/plugins/plugin_scan/api/plugin_scan_queue.py
+++ b/plugins/plugin_scan/api/plugin_scan_queue.py
@@ -1,20 +1,26 @@
from agent import AgentContext
from python.helpers.api import ApiHandler, Input, Output, Request, Response
+from python.helpers import message_queue as mq
class PluginScanQueue(ApiHandler):
- """Set progress to 'Queued' without starting the agent or logging the prompt."""
+ """Log the scan prompt into a chat. Optionally set progress to 'Queued'."""
async def process(self, input: Input, request: Request) -> Output:
ctxid: str = input.get("context", "")
+ text: str = input.get("text", "")
+ queued: bool = input.get("queued", False)
- if not ctxid:
- return Response("Missing 'context'.", 400)
+ if not ctxid or not text:
+ return Response("Missing 'context' or 'text'.", 400)
context = AgentContext.get(ctxid)
if context is None:
return Response(f"Context {ctxid} not found.", 404)
- context.log.set_progress("icon://hourglass_empty Queued - waiting for another scan to finish", 0, True)
+ mq.log_user_message(context, text, [])
+
+ if queued:
+ context.log.set_progress("icon://hourglass_empty Queued - waiting for another scan to finish", 0, True)
return {"ok": True, "context": ctxid}
diff --git a/plugins/plugin_scan/api/plugin_scan_start.py b/plugins/plugin_scan/api/plugin_scan_start.py
new file mode 100644
index 000000000..df7e85559
--- /dev/null
+++ b/plugins/plugin_scan/api/plugin_scan_start.py
@@ -0,0 +1,21 @@
+from agent import AgentContext, UserMessage
+from python.helpers.api import ApiHandler, Input, Output, Request, Response
+
+
+class PluginScanStart(ApiHandler):
+ """Start the agent on a context whose user message was already logged by the queue API."""
+
+ async def process(self, input: Input, request: Request) -> Output:
+ ctxid: str = input.get("context", "")
+ text: str = input.get("text", "")
+
+ if not ctxid or not text:
+ return Response("Missing 'context' or 'text'.", 400)
+
+ context = AgentContext.get(ctxid)
+ if context is None:
+ return Response(f"Context {ctxid} not found.", 404)
+
+ context.communicate(UserMessage(text, []))
+
+ return {"ok": True, "context": ctxid}
diff --git a/plugins/plugin_scan/webui/plugin-scan-store.js b/plugins/plugin_scan/webui/plugin-scan-store.js
index dfaf37410..4feed93a7 100644
--- a/plugins/plugin_scan/webui/plugin-scan-store.js
+++ b/plugins/plugin_scan/webui/plugin-scan-store.js
@@ -165,12 +165,15 @@ export const store = createStore("pluginScan", {
if (_running) {
try {
- await api.callJsonApi("/plugins/plugin_scan/plugin_scan_queue", { context: ctxId });
+ await api.callJsonApi("/plugins/plugin_scan/plugin_scan_queue", { context: ctxId, text: capturedPrompt, queued: true });
} catch { /* best-effort */ }
_queue.push({ gen, ctxId, prompt: capturedPrompt });
this.queued = true;
this.scanning = false;
} else {
+ try {
+ await api.callJsonApi("/plugins/plugin_scan/plugin_scan_queue", { context: ctxId, text: capturedPrompt });
+ } catch { /* best-effort */ }
this.queued = false;
this.scanning = true;
this._runNext(gen, ctxId, capturedPrompt);
@@ -181,7 +184,7 @@ export const store = createStore("pluginScan", {
async _runNext(gen, ctxId, prompt) {
_running = { gen, ctxId };
try {
- await api.callJsonApi("/message_async", { text: prompt, context: ctxId });
+ await api.callJsonApi("/plugins/plugin_scan/plugin_scan_start", { text: prompt, context: ctxId });
await this._pollLoop(gen, ctxId);
} catch (/** @type {any} */ e) {
if (gen === _pollGen) {