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

推荐订阅源

月光博客
月光博客
D
Docker
腾讯CDC
J
Java Code Geeks
大猫的无限游戏
大猫的无限游戏
The Cloudflare Blog
Martin Fowler
Martin Fowler
MongoDB | Blog
MongoDB | Blog
博客园 - Franky
博客园 - 三生石上(FineUI控件)
Recent Announcements
Recent Announcements
F
Fortinet All Blogs
IT之家
IT之家
WordPress大学
WordPress大学
M
MIT News - Artificial intelligence
爱范儿
爱范儿
Microsoft Azure Blog
Microsoft Azure Blog
Vercel News
Vercel News
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
小众软件
小众软件
N
Netflix TechBlog - Medium
T
Tailwind CSS Blog
Engineering at Meta
Engineering at Meta
博客园 - 【当耐特】

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): harden app-server progress watchdog · opencla...
steipete · 2026-05-16 · via Recent Commits to openclaw:main

@@ -165,6 +165,7 @@ const CODEX_TURN_ASSISTANT_COMPLETION_IDLE_TIMEOUT_MS = 10_000;

165165

const CODEX_TURN_TERMINAL_IDLE_TIMEOUT_MS = 30 * 60_000;

166166

const CODEX_NATIVE_HOOK_RELAY_MIN_TTL_MS = 30 * 60_000;

167167

const CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS = 5 * 60_000;

168+

const CODEX_NATIVE_HOOK_RELAY_RENEW_INTERVAL_MS = 60_000;

168169

const CODEX_STEER_ALL_DEBOUNCE_MS = 500;

169170

const LOG_FIELD_MAX_LENGTH = 160;

170171

const CODEX_NATIVE_PROJECT_DOC_BASENAMES = new Set(["agents.md"]);

@@ -1071,6 +1072,7 @@ export async function runCodexAppServerAttempt(

10711072

let turnAttemptLastProgressAt = Date.now();

10721073

let turnAttemptLastProgressReason = "startup";

10731074

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

1075+

let nativeHookRelayLastRenewedAt = 0;

10741076

let activeAppServerTurnRequests = 0;

10751077

const activeOpenClawDynamicToolCallIds = new Set<string>();

10761078

const activeTurnItemIds = new Set<string>();

@@ -1149,12 +1151,7 @@ export async function runCodexAppServerAttempt(

11491151

};

1150115211511153

const fireTurnAttemptIdleTimeout = () => {

1152-

if (

1153-

completed ||

1154-

runAbortController.signal.aborted ||

1155-

!turnAttemptIdleWatchArmed ||

1156-

activeAppServerTurnRequests > 0

1157-

) {

1154+

if (completed || runAbortController.signal.aborted || !turnAttemptIdleWatchArmed) {

11581155

return;

11591156

}

11601157

const idleMs = Math.max(0, Date.now() - turnAttemptLastProgressAt);

@@ -1291,12 +1288,7 @@ export async function runCodexAppServerAttempt(

1291128812921289

function scheduleTurnAttemptIdleWatch() {

12931290

clearTurnAttemptIdleTimer();

1294-

if (

1295-

completed ||

1296-

runAbortController.signal.aborted ||

1297-

!turnAttemptIdleWatchArmed ||

1298-

activeAppServerTurnRequests > 0

1299-

) {

1291+

if (completed || runAbortController.signal.aborted || !turnAttemptIdleWatchArmed) {

13001292

return;

13011293

}

13021294

const elapsedMs = Math.max(0, Date.now() - turnAttemptLastProgressAt);

@@ -1327,6 +1319,28 @@ export async function runCodexAppServerAttempt(

13271319

scheduleTurnTerminalIdleWatch();

13281320

}

132913211322+

const renewNativeHookRelayForTurnProgress = () => {

1323+

if (!nativeHookRelay || options.nativeHookRelay?.ttlMs !== undefined) {

1324+

return;

1325+

}

1326+

const now = Date.now();

1327+

const renewsRecently =

1328+

now - nativeHookRelayLastRenewedAt < CODEX_NATIVE_HOOK_RELAY_RENEW_INTERVAL_MS;

1329+

const expiresSoon = now >= nativeHookRelay.expiresAtMs - CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS;

1330+

if (renewsRecently && !expiresSoon) {

1331+

return;

1332+

}

1333+

nativeHookRelayLastRenewedAt = now;

1334+

nativeHookRelay.renew(

1335+

resolveCodexNativeHookRelayTtlMs({

1336+

explicitTtlMs: undefined,

1337+

attemptTimeoutMs: turnAttemptIdleTimeoutMs,

1338+

startupTimeoutMs,

1339+

turnStartTimeoutMs: params.timeoutMs,

1340+

}),

1341+

);

1342+

};

1343+13301344

const touchTurnCompletionActivity = (

13311345

reason: string,

13321346

options?: { arm?: boolean; details?: Record<string, unknown>; attemptProgress?: boolean },

@@ -1338,6 +1352,7 @@ export async function runCodexAppServerAttempt(

13381352

turnAttemptLastProgressAt = turnCompletionLastActivityAt;

13391353

turnAttemptLastProgressReason = reason;

13401354

turnAttemptLastProgressDetails = options.details;

1355+

renewNativeHookRelayForTurnProgress();

13411356

}

13421357

emitTrustedDiagnosticEvent({

13431358

type: "run.progress",

@@ -1579,11 +1594,17 @@ export async function runCodexAppServerAttempt(

1579159415801595

const notificationCleanup = client.addNotificationHandler(enqueueNotification);

15811596

const requestCleanup = client.addRequestHandler(async (request) => {

1582-

activeAppServerTurnRequests += 1;

1583-

clearTurnCompletionIdleTimer();

1584-

disarmTurnAssistantCompletionIdleWatch();

15851597

let armCompletionWatchOnResponse = false;

15861598

let requestCountsAsTurnActivity = false;

1599+

const markCurrentTurnRequestProgress = () => {

1600+

activeAppServerTurnRequests += 1;

1601+

clearTurnCompletionIdleTimer();

1602+

disarmTurnAssistantCompletionIdleWatch();

1603+

requestCountsAsTurnActivity = true;

1604+

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

1605+

attemptProgress: true,

1606+

});

1607+

};

15871608

try {

15881609

if (request.method === "account/chatgptAuthTokens/refresh") {

15891610

return refreshCodexAppServerAuthTokens({

@@ -1598,7 +1619,7 @@ export async function runCodexAppServerAttempt(

15981619

if (request.method === "mcpServer/elicitation/request") {

15991620

if (isCurrentThreadOptionalTurnRequestParams(request.params, thread.threadId, turnId)) {

16001621

armCompletionWatchOnResponse = true;

1601-

requestCountsAsTurnActivity = true;

1622+

markCurrentTurnRequestProgress();

16021623

}

16031624

return handleCodexAppServerElicitationRequest({

16041625

requestParams: request.params,

@@ -1612,7 +1633,7 @@ export async function runCodexAppServerAttempt(

16121633

if (request.method === "item/tool/requestUserInput") {

16131634

if (isCurrentThreadTurnRequestParams(request.params, thread.threadId, turnId)) {

16141635

armCompletionWatchOnResponse = true;

1615-

requestCountsAsTurnActivity = true;

1636+

markCurrentTurnRequestProgress();

16161637

}

16171638

return userInputBridge?.handleRequest({

16181639

id: request.id,

@@ -1623,7 +1644,7 @@ export async function runCodexAppServerAttempt(

16231644

if (isCodexAppServerApprovalRequest(request.method)) {

16241645

if (isCurrentApprovalTurnRequestParams(request.params, thread.threadId, turnId)) {

16251646

armCompletionWatchOnResponse = true;

1626-

requestCountsAsTurnActivity = true;

1647+

markCurrentTurnRequestProgress();

16271648

}

16281649

return handleApprovalRequest({

16291650

method: request.method,

@@ -1641,7 +1662,7 @@ export async function runCodexAppServerAttempt(

16411662

return undefined;

16421663

}

16431664

armCompletionWatchOnResponse = true;

1644-

requestCountsAsTurnActivity = true;

1665+

markCurrentTurnRequestProgress();

16451666

turnCrossedToolHandoff = true;

16461667

activeOpenClawDynamicToolCallIds.add(call.callId);

16471668

trajectoryRecorder?.recordEvent("tool.call", {

@@ -1720,8 +1741,8 @@ export async function runCodexAppServerAttempt(

17201741

});

17211742

return response as JsonValue;

17221743

} finally {

1723-

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

17241744

if (requestCountsAsTurnActivity) {

1745+

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

17251746

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

17261747

arm: armCompletionWatchOnResponse,

17271748

attemptProgress: true,