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

Isolate WhatsApp group turns by speaker and clarify SQL scope denials.

Browse source 
Always tag group senders, inject group-focus system hints, label queued follow-ups by speaker, and mark insufficient_scope failures as non-retryable with a user-facing hint.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-08-10 23:11:41 +08:00
parent d2693d1c63
commit e91e4fe773
9 changed files with 167 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

20
runtime/application/gateway/channel_turn_gate.py
View file

@ -30,16 +30,30 @@ def merge_channel_pending_jobs(jobs: list[dict[str, Any]]) -> dict[str, Any]:
lang = str(rows[-1].get("lang") or "").strip().lower()
if lang.startswith("zh"):
header = "处理上一问期间又收到多条跟进，请一并回答："
header = "处理上一问期间又收到多条跟进，请按发言人分别回答："
else:
header = "Several follow-up questions arrived while the previous request was still running. Please answer them together:"
header = (
"Several follow-up questions arrived while the previous request was still running. "
"Answer each item for its own sender:"
)
parts: list[str] = []
attachments: list[dict[str, Any]] = []
for idx, job in enumerate(rows, start=1):
text = str(job.get("user_text") or "").strip()
md = job.get("msg_metadata") if isinstance(job.get("msg_metadata"), dict) else {}
sender = str(
md.get("group_sender_label")
or md.get("push_name")
or md.get("group_sender_id")
or md.get("external_user_id")
or ""
).strip()
if text:
parts.append(f"{idx}) {text}")
if sender and not text.lstrip().startswith(("[Sender:", "[发言:")):
parts.append(f"{idx}) [{sender}] {text}")
else:
parts.append(f"{idx}) {text}")
for att in job.get("attachments") or []:
if isinstance(att, dict):
attachments.append(att)

35
runtime/application/gateway/inbound_service.py
View file

@ -1376,6 +1376,7 @@ def process_inbound_payload(payload: dict[str, Any]) -> dict[str, Any]:
tenant_id=str(tenant_id or ""),
account_id=wa_acct,
quoted_ctx=quoted_ctx,
lang=lang,
)
if not user_text and gw_attachments:
user_text = (
@ -1388,6 +1389,17 @@ def process_inbound_payload(payload: dict[str, Any]) -> dict[str, Any]:
from runtime.types import StandardMessage
from runtime.application.gateway.channel_turn_gate import get_channel_turn_gate
raw_meta = (
meta_for_inbound.get("raw")
if isinstance(meta_for_inbound.get("raw"), dict)
else {}
)
sender_label = str(
raw_meta.get("pushName")
or meta_for_inbound.get("push_name")
or inbound.external_user_id
or ""
).strip()
msg_metadata = {
"tenant_id": tenant_id,
"user_id": user_id,
@ -1400,6 +1412,9 @@ def process_inbound_payload(payload: dict[str, Any]) -> dict[str, Any]:
"external_user_id": inbound.external_user_id,
"external_chat_id": inbound.external_chat_id,
"group_sender_id": inbound.external_user_id,
"group_sender_label": sender_label,
"push_name": sender_label,
"group_session_scope": group_policy.session_scope,
"mentioned_jids": mention_jids_for_ctx,
"mention_names": mention_names_for_ctx,
"raw_inbound_text": raw_user_text,
@ -1436,12 +1451,20 @@ def process_inbound_payload(payload: dict[str, Any]) -> dict[str, Any]:
busy_meta = build_whatsapp_group_progress_metadata(
inbound=inbound
)
busy_text = (
"还在处理上一条请求，这条会排队合并处理。"
if str(lang or "").startswith("zh")
else "Still working on your previous request; "
"I'll merge this follow-up next."
)
if str(lang or "").startswith("zh"):
busy_text = (
"本会话还有请求在处理，你这条已排队，完成后会继续回答。"
if bool(getattr(inbound, "is_group", False))
else "还在处理上一条请求，这条会排队合并处理。"
)
else:
busy_text = (
"Still working on an earlier request in this chat; "
"your message is queued and will be answered next."
if bool(getattr(inbound, "is_group", False))
else "Still working on your previous request; "
"I'll merge this follow-up next."
)
_enqueue_whatsapp_inbound_reply(
store,
inbound=inbound,