hansjone/oclaw
1
0
Fork 0
mirror of https://github.com/hansjone/oclaw.git synced 2026-10-09 03:30:48 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Dedupe WhatsApp access pending and cap execManagedNe per turn.

Browse source 
Reuse open pending requests without re-notifying admins, clarify already-waiting replies, and block further CLI after 4 calls or 2 failures in the same turn.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-08-10 23:25:09 +08:00
parent d8bc08ee0d
commit 28a5f2586c
6 changed files with 332 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

39
runtime/application/gateway/whatsapp_inbound_access.py
View file

@ -461,15 +461,29 @@ def handle_whatsapp_access(
)
return None
pending_id = store.create_whatsapp_access_pending(
tenant_id=tenant_id,
account_id=account_id,
external_user_id=raw_jid,
push_name=push_name,
phone=phone,
request_text=text,
)
if pending_id:
pending_id = ""
already_pending = False
finder = getattr(store, "find_open_whatsapp_access_pending", None)
if callable(finder):
existing = finder(
tenant_id=tenant_id,
account_id=account_id,
external_user_id=raw_jid,
phone=phone,
)
if isinstance(existing, dict) and str(existing.get("id") or "").strip():
pending_id = str(existing.get("id") or "").strip()
already_pending = True
if not pending_id:
pending_id = store.create_whatsapp_access_pending(
tenant_id=tenant_id,
account_id=account_id,
external_user_id=raw_jid,
push_name=push_name,
phone=phone,
request_text=text,
) or ""
if pending_id and not already_pending:
_notify_admins(
store,
tenant_id=tenant_id,
@ -500,12 +514,17 @@ def handle_whatsapp_access(
{
"channel": "whatsapp",
"chat_id": inbound.external_chat_id,
"text": denied_reply_text(lang=lang, pending_id=str(pending_id or "")),
"text": denied_reply_text(
lang=lang,
pending_id=str(pending_id or ""),
already_pending=already_pending,
),
"attachments": [],
"metadata": reply_meta,
}
],
"whatsapp_access": "denied",
"whatsapp_access_already_pending": bool(already_pending),
}