惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

IT之家
IT之家
Engineering at Meta
Engineering at Meta
腾讯CDC
宝玉的分享
宝玉的分享
H
Help Net Security
I
InfoQ
博客园 - Franky
The GitHub Blog
The GitHub Blog
奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报
H
Hackread – Cybersecurity News, Data Breaches, AI and More
Microsoft Security Blog
Microsoft Security Blog
M
MIT News - Artificial intelligence
博客园_首页
美团技术团队
Recent Announcements
Recent Announcements
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
雷峰网
雷峰网
The Cloudflare Blog
博客园 - 司徒正美
Vercel News
Vercel News
MyScale Blog
MyScale Blog
人人都是产品经理
人人都是产品经理
爱范儿
爱范儿
月光博客
月光博客

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(codex): accept abort markers without request response...
steipete · 2026-05-11 · via Recent Commits to openclaw:main

@@ -888,7 +888,6 @@ export async function runCodexAppServerAttempt(

888888

let turnCompletionLastActivityReason = "startup";

889889

let turnCompletionLastActivityDetails: Record<string, unknown> | undefined;

890890

let activeAppServerTurnRequests = 0;

891-

let sawTurnScopedRequestResponse = false;

892891893892

const clearTurnCompletionIdleTimer = () => {

894893

if (turnCompletionIdleTimer) {

@@ -1149,9 +1148,7 @@ export async function runCodexAppServerAttempt(

11491148

// See openclaw/openclaw#67996.

11501149

const isTurnCompletion = notification.method === "turn/completed" && isCurrentTurnNotification;

11511150

const isTurnAbortMarker =

1152-

isCurrentTurnNotification &&

1153-

sawTurnScopedRequestResponse &&

1154-

isCodexTurnAbortMarkerNotification(notification);

1151+

isCurrentTurnNotification && isCodexTurnAbortMarkerNotification(notification);

11551152

const isTurnTerminal = isTurnCompletion || isTurnAbortMarker;

11561153

try {

11571154

await projector.handleNotification(notification);

@@ -1314,9 +1311,6 @@ export async function runCodexAppServerAttempt(

13141311

return response as JsonValue;

13151312

} finally {

13161313

activeAppServerTurnRequests = Math.max(0, activeAppServerTurnRequests - 1);

1317-

if (armCompletionWatchOnResponse) {

1318-

sawTurnScopedRequestResponse = true;

1319-

}

13201314

touchTurnCompletionActivity(`request:${request.method}:response`, {

13211315

arm: armCompletionWatchOnResponse,

13221316

});

@@ -2356,6 +2350,13 @@ function readNestedTurnId(record: JsonObject): string | undefined {

23562350

return isJsonObject(turn) ? readString(turn, "id") : undefined;

23572351

}

235823522353+

const CODEX_TURN_ABORT_MARKER_START = "<turn_aborted>";

2354+

const CODEX_TURN_ABORT_MARKER_END = "</turn_aborted>";

2355+

const CODEX_INTERRUPTED_USER_GUIDANCE =

2356+

"The user interrupted the previous turn on purpose. Any running unified exec processes may still be running in the background. If any tools/commands were aborted, they may have partially executed.";

2357+

const CODEX_INTERRUPTED_DEVELOPER_GUIDANCE =

2358+

"The previous turn was interrupted on purpose. Any running unified exec processes may still be running in the background. If any tools/commands were aborted, they may have partially executed.";

2359+23592360

function isCodexTurnAbortMarkerNotification(notification: CodexServerNotification): boolean {

23602361

if (notification.method !== "rawResponseItem/completed" || !isJsonObject(notification.params)) {

23612362

return false;

@@ -2366,7 +2367,23 @@ function isCodexTurnAbortMarkerNotification(notification: CodexServerNotificatio

23662367

return false;

23672368

}

23682369

const text = extractRawResponseItemText(item).trim();

2369-

return text.startsWith("<turn_aborted>") && text.includes("</turn_aborted>");

2370+

const markerBody = readCodexTurnAbortMarkerBody(text);

2371+

return (

2372+

markerBody === CODEX_INTERRUPTED_USER_GUIDANCE ||

2373+

markerBody === CODEX_INTERRUPTED_DEVELOPER_GUIDANCE

2374+

);

2375+

}

2376+2377+

function readCodexTurnAbortMarkerBody(text: string): string | undefined {

2378+

if (

2379+

!text.startsWith(CODEX_TURN_ABORT_MARKER_START) ||

2380+

!text.endsWith(CODEX_TURN_ABORT_MARKER_END)

2381+

) {

2382+

return undefined;

2383+

}

2384+

return text

2385+

.slice(CODEX_TURN_ABORT_MARKER_START.length, -CODEX_TURN_ABORT_MARKER_END.length)

2386+

.trim();

23702387

}

2371238823722389

function extractRawResponseItemText(item: JsonObject): string {