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

Make Chat abort actually stop the agent turn.

Browse source 
Wire should_stop from aborted runs, snapshot abort before clearing flags so finals are not emitted after stop, and keep fail-path turn_uuid aligned for bubble splitting.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-07-23 10:16:07 +08:00
parent 23ecce4755
commit 3cdf550298
7 changed files with 450 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

40
interfaces/gateway/server_methods/chat.py
View file

@ -51,18 +51,40 @@ def _chat_abort_handler(opts: dict[str, Any]) -> None:
_bad(respond, "invalid chat.abort params")
return
run_id = params.get("runId")
if not isinstance(run_id, str) or not run_id.strip():
_bad(respond, "invalid chat.abort params: runId required")
session_key = params.get("sessionKey") or params.get("key")
rid = run_id.strip() if isinstance(run_id, str) and run_id.strip() else ""
sid = session_key.strip() if isinstance(session_key, str) and session_key.strip() else ""
if not rid and not sid:
_bad(respond, "invalid chat.abort params: runId or sessionKey required")
return
aborted = False
aborted_run_ids: list[str] = []
if isinstance(context, dict):
abort_fn = context.get("abort_chat_run")
if callable(abort_fn):
try:
aborted = bool(abort_fn(run_id.strip()))
except Exception:
aborted = False
_ok(respond, {"runId": run_id.strip(), "aborted": aborted})
if rid:
abort_fn = context.get("abort_chat_run")
if callable(abort_fn):
try:
aborted = bool(abort_fn(rid))
if aborted:
aborted_run_ids = [rid]
except Exception:
aborted = False
if not aborted and sid:
abort_session_fn = context.get("abort_chat_session")
if callable(abort_session_fn):
try:
aborted = bool(abort_session_fn(sid))
except Exception:
aborted = False
_ok(
respond,
{
"runId": rid,
"sessionKey": sid,
"aborted": aborted,
"abortedRunIds": aborted_run_ids,
},
)
def _chat_send_handler(opts: dict[str, Any]) -> None: