fix(gateway): propagate AbortController signal on HTTP client disconnect by Lellansin · Pull Request #54388 · openclaw/openclaw

Lellansin · 2026-03-25T09:22:05Z

Summary

Problem: The /v1/chat/completions and /v1/responses HTTP endpoints do not cancel the underlying agent execution when a client disconnects. The close handler only sets a closed flag and unsubscribes from agent events, but never aborts the in-flight LLM call.
Why it matters: When an HTTP client disconnects mid-request, the backend continues running the full LLM turn, wasting tokens, compute, and holding resources unnecessarily.
What changed: Created an AbortController in each handler (both streaming and non-streaming paths) and pass abortController.signal through to agentCommandFromIngress. On client disconnect (res.on("close")), the controller is aborted, which propagates cancellation to the agent runtime via the existing abortSignal plumbing (acpManager.runTurn({ signal })). Used res.on("close") instead of req.on("close") because the request body is fully consumed by handleGatewayPostJsonEndpoint before the abort listener is registered, and IncomingMessage auto-destroys after EOF in modern Node.js.
What did NOT change (scope boundary): No changes to the agent runtime, ACP manager, WebSocket handlers, or any other endpoint. The AbortSignal infrastructure was already in place; this PR only wires it into the two HTTP endpoints that were missing it.

Change Type (select all)

Scope (select all touched areas)

Linked Issue/PR

Related: The WebSocket chat handler (src/gateway/server-methods/chat.ts) already implements this pattern correctly; this PR brings HTTP endpoints to parity.
This PR fixes a bug or regression

Root Cause / Regression History (if applicable)

Root cause: The /v1/chat/completions and /v1/responses HTTP handlers were originally implemented without AbortController integration. The abortSignal parameter on AgentCommandOpts existed but was never wired in from these HTTP code paths.
Missing detection / guardrail: No tests verified that client disconnection propagated an abort signal to the agent command layer for HTTP endpoints.
Prior context: The WebSocket chat handler (server-methods/chat.ts:1367) was implemented with proper abort support from the start; the HTTP endpoints were added later without this consideration.
Why this regressed now: This was never implemented, not a regression from a prior change.
If unknown, what was ruled out: N/A.

Regression Test Plan (if applicable)

Coverage level that should have caught this:
- Unit test
- Seam / integration test
- End-to-end test
- Existing coverage already sufficient
Target test or file: src/gateway/openai-http.test.ts, src/gateway/openresponses-http.test.ts
Scenario the test should lock in: When an HTTP client disconnects mid-request (both streaming and non-streaming), the abortSignal passed to agentCommandFromIngress must transition to aborted state.
Why this is the smallest reliable guardrail: The tests mock the agent command to observe the abort signal directly, using http.request + req.destroy() to simulate client disconnection. This isolates the exact behavior without requiring a full agent runtime.
Existing test that already covers this (if any): None for HTTP; WebSocket abort tests exist in server.chat.gateway-server-chat-b.test.ts.
If no new test is added, why not: N/A — 4 new tests added.

User-visible / Behavior Changes

When an HTTP client disconnects from /v1/chat/completions or /v1/responses (streaming or non-streaming), the backend now cancels the in-flight LLM call instead of letting it run to completion. This reduces wasted tokens and frees resources faster.

Security Impact (required)

New permissions/capabilities? No
Secrets/tokens handling changed? No
New/changed network calls? No
Command/tool execution surface changed? No
Data access scope changed? No

Repro + Verification

Environment

OS: macOS
Runtime/container: Node 22+ / pnpm
Model/provider: Any (mock in tests)
Integration/channel (if any): HTTP gateway endpoints
Relevant config (redacted): default local test config

Steps

Start the gateway with HTTP endpoints enabled.
Send a streaming or non-streaming request to /v1/chat/completions or /v1/responses.
Disconnect the client before the response completes.

Expected

The agent command receives an aborted signal and stops processing.

Actual

Before fix: the agent command continues running to completion, wasting resources.
After fix: matches expected.

Evidence

Failing test/log before + passing after
Trace/log snippets
Screenshot/recording
Perf numbers (if relevant)

Local verification commands:

pnpm test -- src/gateway/openai-http.test.ts (6/6 passed)
pnpm test -- src/gateway/openresponses-http.test.ts (14/14 passed)
pnpm format (clean)

Human Verification (required)

Verified scenarios: streaming and non-streaming abort propagation for both /v1/chat/completions and /v1/responses; all pre-existing tests still pass.
Edge cases checked: res.on("close") vs req.on("close") — verified that req.on("close") does NOT fire reliably after body consumption in modern Node.js due to IncomingMessage auto-destroy; switched to res.on("close") which fires when the underlying TCP connection closes.
What you did not verify: full pnpm test suite run; live integration with real LLM provider.

Review Conversations

I replied to or resolved every bot review conversation I addressed in this PR.
I left unresolved only the conversations that still need reviewer or maintainer judgment.

Compatibility / Migration

Backward compatible? Yes
Config/env changes? No
Migration needed? No

Failure Recovery (if this breaks)

How to disable/revert this change quickly: Revert this commit; the abort signal is simply ignored if not passed.
Files/config to restore: src/gateway/openai-http.ts, src/gateway/openresponses-http.ts.
Known bad symptoms reviewers should watch for: If res.on("close") fires prematurely (before response is sent), it could abort requests that should complete. This would manifest as incomplete or missing responses.

Risks and Mitigations

Risk: res.on("close") might fire after a successful response is fully sent, calling abortController.abort() on an already-completed operation.
- Mitigation: Aborting an already-completed AbortController is a no-op. The agent command has already returned by that point, so the signal is harmless.

greptile-apps · 2026-03-25T09:26:48Z

Greptile Summary

This PR wires AbortController into the /v1/chat/completions and /v1/responses HTTP endpoints so that client disconnection cancels in-flight LLM calls, bringing these handlers to parity with the existing WebSocket path.\n\nKey changes:\n- Creates an AbortController per request in both handleOpenAiHttpRequest and handleOpenResponsesHttpRequest\n- Passes abortController.signal through to agentCommandFromIngress / runResponsesAgentCommand via the existing abortSignal plumbing\n- Switches from req.on(\"close\") to res.on(\"close\") — well-justified: IncomingMessage auto-destroys after body consumption, while ServerResponse reliably fires close on TCP disconnect\n- In the streaming paths, the !closed guard on the close handler correctly prevents a spurious abort when the connection closes after a normal res.end() call\n- In the non-streaming paths, a post-await abortController.signal.aborted check avoids sending a response body to a disconnected client\n- Four new integration-style tests cover streaming and non-streaming disconnects for both endpoints

Confidence Score: 5/5

Safe to merge — the change is strictly additive abort wiring with no behavioral impact on the happy path.

The implementation is logically correct: the closed flag in streaming paths prevents spurious abort on normal completion, the post-await abort checks cleanly suppress responses to disconnected clients, and aborting an already-completed controller is a documented no-op. The res.on("close") choice over req.on("close") is well-justified and matches the existing WebSocket pattern. Four targeted tests verify all abort-propagation scenarios. No changes to the agent runtime, ACP manager, or WebSocket paths.

No files require special attention.

_{Reviews (3): Last reviewed commit: "fix: use correct 'close' event name for ..." | Re-trigger Greptile}

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: cfc88cdc57

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3434550b83

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0ff718e5fb

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2a653d3262

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Lellansin · 2026-03-25T15:07:06Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 82941d8d1b

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Lellansin · 2026-03-26T01:32:05Z

@codex review

chatgpt-codex-connector · 2026-03-26T01:36:31Z

Codex Review: Didn't find any major issues. 🚀

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

obviyus · 2026-04-07T05:41:25Z

Pushed a small follow-up directly to the PR branch.

What changed:

switched HTTP disconnect watching to the underlying socket close path
shared that logic in one helper instead of duplicating it in both handlers
removed the extra explanatory comment churn around the old res.on("close") branches

Why:

the real thing we care about here is connection lifetime, not response-object lifetime
this keeps the abort wiring simpler and makes both /v1/chat/completions and /v1/responses use the same disconnect model

Commit: 732c33dd0c

Abort running agent commands when the HTTP client disconnects for both /v1/chat/completions and /v1/responses endpoints. - Listen on res "close" instead of req "close" (the request body is already consumed so IncomingMessage auto-destroys before we get here). - Non-streaming: guard with !signal.aborted so the abort fires on genuine disconnects; a spurious abort after sendJson is harmless. - Streaming: guard with !closed so normal res.end() completions do not abort post-turn work still in flight. - Skip error logging and response writes when the signal is already aborted. Made-with: Cursor

…equests Updated the event listener for client disconnects to use the correct name and enhanced error handling logic. The changes ensure that abort signals are properly checked before logging errors and returning responses, preventing unnecessary operations on aborted requests. Made-with: Cursor

obviyus

Reviewed latest changes; landing now.

obviyus · 2026-04-07T05:47:12Z

Landed on main.

Landed source commit: 7313421
Merge commit: aad3bbe

Thanks @Lellansin.

@Lellansin

…thanks @Lellansin) * fix: abort in-flight HTTP requests on client disconnect Abort running agent commands when the HTTP client disconnects for both /v1/chat/completions and /v1/responses endpoints. - Listen on res "close" instead of req "close" (the request body is already consumed so IncomingMessage auto-destroys before we get here). - Non-streaming: guard with !signal.aborted so the abort fires on genuine disconnects; a spurious abort after sendJson is harmless. - Streaming: guard with !closed so normal res.end() completions do not abort post-turn work still in flight. - Skip error logging and response writes when the signal is already aborted. Made-with: Cursor * fix: correct event listener name and improve error handling in HTTP requests Updated the event listener for client disconnects to use the correct name and enhanced error handling logic. The changes ensure that abort signals are properly checked before logging errors and returning responses, preventing unnecessary operations on aborted requests. Made-with: Cursor * fix: use correct 'close' event name for non-streaming disconnect handler * fix: watch socket close for HTTP aborts --------- Co-authored-by: 冰森 <dingheng.huang@urbanic.com> Co-authored-by: Ayaan Zaidi <hi@obviy.us>

@Lellansin

…thanks @Lellansin) * fix: abort in-flight HTTP requests on client disconnect Abort running agent commands when the HTTP client disconnects for both /v1/chat/completions and /v1/responses endpoints. - Listen on res "close" instead of req "close" (the request body is already consumed so IncomingMessage auto-destroys before we get here). - Non-streaming: guard with !signal.aborted so the abort fires on genuine disconnects; a spurious abort after sendJson is harmless. - Streaming: guard with !closed so normal res.end() completions do not abort post-turn work still in flight. - Skip error logging and response writes when the signal is already aborted. Made-with: Cursor * fix: correct event listener name and improve error handling in HTTP requests Updated the event listener for client disconnects to use the correct name and enhanced error handling logic. The changes ensure that abort signals are properly checked before logging errors and returning responses, preventing unnecessary operations on aborted requests. Made-with: Cursor * fix: use correct 'close' event name for non-streaming disconnect handler * fix: watch socket close for HTTP aborts --------- Co-authored-by: 冰森 <dingheng.huang@urbanic.com> Co-authored-by: Ayaan Zaidi <hi@obviy.us>

@Lellansin

…thanks @Lellansin) * fix: abort in-flight HTTP requests on client disconnect Abort running agent commands when the HTTP client disconnects for both /v1/chat/completions and /v1/responses endpoints. - Listen on res "close" instead of req "close" (the request body is already consumed so IncomingMessage auto-destroys before we get here). - Non-streaming: guard with !signal.aborted so the abort fires on genuine disconnects; a spurious abort after sendJson is harmless. - Streaming: guard with !closed so normal res.end() completions do not abort post-turn work still in flight. - Skip error logging and response writes when the signal is already aborted. Made-with: Cursor * fix: correct event listener name and improve error handling in HTTP requests Updated the event listener for client disconnects to use the correct name and enhanced error handling logic. The changes ensure that abort signals are properly checked before logging errors and returning responses, preventing unnecessary operations on aborted requests. Made-with: Cursor * fix: use correct 'close' event name for non-streaming disconnect handler * fix: watch socket close for HTTP aborts --------- Co-authored-by: 冰森 <dingheng.huang@urbanic.com> Co-authored-by: Ayaan Zaidi <hi@obviy.us>

openclaw-barnacle Bot added gateway Gateway runtime size: M labels Mar 25, 2026

chatgpt-codex-connector Bot reviewed Mar 25, 2026

View reviewed changes

Comment thread src/gateway/openai-http.ts Outdated

chatgpt-codex-connector Bot reviewed Mar 25, 2026

View reviewed changes

Comment thread src/gateway/openai-http.ts Outdated

chatgpt-codex-connector Bot reviewed Mar 25, 2026

View reviewed changes

Comment thread src/gateway/openresponses-http.ts Outdated

Comment thread src/gateway/openresponses-http.ts Outdated

Lellansin force-pushed the feat/chat-completions-cancel branch 2 times, most recently from 2ca816b to 2a653d3 Compare March 25, 2026 12:52

chatgpt-codex-connector Bot reviewed Mar 25, 2026

View reviewed changes

Comment thread src/gateway/openai-http.ts Outdated

chatgpt-codex-connector Bot reviewed Mar 25, 2026

View reviewed changes

Comment thread src/gateway/openai-http.ts Outdated

Lellansin marked this pull request as draft March 25, 2026 15:10

Lellansin marked this pull request as ready for review March 26, 2026 01:36

Lellansin marked this pull request as draft March 26, 2026 06:07

Lellansin marked this pull request as ready for review March 26, 2026 06:07

Lellansin requested a review from a team as a code owner April 2, 2026 09:10

Lellansin force-pushed the feat/chat-completions-cancel branch from 6a5ef52 to 6b9d87b Compare April 2, 2026 09:20

openclaw-barnacle Bot removed the channel: discord Channel integration: discord label Apr 2, 2026

simonusa mentioned this pull request Apr 6, 2026

fix(gateway): abort HTTP agent runs on client disconnect #61742

Closed

8 tasks

obviyus self-assigned this Apr 7, 2026

冰森 and others added 4 commits April 7, 2026 11:12

fix: use correct 'close' event name for non-streaming disconnect handler

17bd3a9

fix: watch socket close for HTTP aborts

7313421

obviyus force-pushed the feat/chat-completions-cancel branch from 732c33d to 7313421 Compare April 7, 2026 05:44

obviyus approved these changes Apr 7, 2026

View reviewed changes

obviyus merged commit aad3bbe into openclaw:main Apr 7, 2026
8 checks passed

simonusa mentioned this pull request Apr 7, 2026

fix(agents): distinguish terminal aborts from retryable failures (#60388) #62682

Open

3 tasks

github-actions Bot mentioned this pull request Apr 8, 2026

Update ghcr.io/openclaw/openclaw Docker tag to v2026.4.8 claytono/infra#1923

Merged

1 task

BingqingLyu mentioned this pull request Apr 28, 2026

fix(agents): distinguish terminal aborts from retryable failures (#60388) BingqingLyu/openclaw#2114

Open

3 tasks

Uh oh!

Conversation

Lellansin commented Mar 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Change Type (select all)

Scope (select all touched areas)

Linked Issue/PR

Root Cause / Regression History (if applicable)

Regression Test Plan (if applicable)

User-visible / Behavior Changes

Security Impact (required)

Repro + Verification

Environment

Steps

Expected

Actual

Evidence

Human Verification (required)

Review Conversations

Compatibility / Migration

Failure Recovery (if this breaks)

Risks and Mitigations

Uh oh!

greptile-apps Bot commented Mar 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Greptile Summary

Confidence Score: 5/5

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Lellansin commented Mar 25, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Lellansin commented Mar 26, 2026

Uh oh!

chatgpt-codex-connector Bot commented Mar 26, 2026

Uh oh!

obviyus commented Apr 7, 2026

Uh oh!

obviyus left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

obviyus commented Apr 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Lellansin commented Mar 25, 2026 •

edited

Loading

greptile-apps Bot commented Mar 25, 2026 •

edited

Loading