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

推荐订阅源

The GitHub Blog
The GitHub Blog
Engineering at Meta
Engineering at Meta
博客园 - 聂微东
博客园 - Franky
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
雷峰网
雷峰网
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
L
LangChain Blog
WordPress大学
WordPress大学
H
Help Net Security
H
Hackread – Cybersecurity News, Data Breaches, AI and More
Y
Y Combinator Blog
Blog — PlanetScale
Blog — PlanetScale
MyScale Blog
MyScale Blog
IT之家
IT之家
酷 壳 – CoolShell
酷 壳 – CoolShell
罗磊的独立博客
奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报
有赞技术团队
有赞技术团队
Apple Machine Learning Research
Apple Machine Learning Research
云风的 BLOG
云风的 BLOG
博客园 - 【当耐特】
P
Proofpoint News Feed
D
DataBreaches.Net

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
refactor(logging): share stuck recovery session refs · op...
steipete · 2026-05-31 · via Recent Commits to openclaw:main
Original file line numberDiff line numberDiff line change

@@ -5,6 +5,7 @@ import {

55

recoveryOutcomeClearsQueuedSessionState,

66

recoveryOutcomeMutatesSessionState,

77

recoveryOutcomeReleasedCount,

8+

resolveStuckSessionRecoveryRef,

89

type StuckSessionRecoveryOutcome,

910

type StuckSessionRecoveryRequest,

1011

} from "./diagnostic-session-recovery.js";

@@ -61,19 +62,7 @@ function emitSessionRecoveryCompleted(params: {

6162

}

6263
6364

function recoveryRequestKey(request: StuckSessionRecoveryRequest): string | undefined {

64-

const ref = request.sessionKey?.trim() || request.sessionId?.trim();

65-

if (!ref) {

66-

return undefined;

67-

}

68-

// In-flight dedup must collapse concurrent recoveries for the same logical

69-

// session, so it uses the same granularity as the runtime's recoveryKey

70-

// (ref only). Mixing stateGeneration into the key lets a generation bump

71-

// during the in-flight window (queued message during abort/drain await) pass

72-

// the same session through as a distinct request, emitting a duplicate

73-

// session.recovery.requested event while the runtime still skips it as

74-

// already_in_flight. Staleness is validated separately via stateGeneration

75-

// in applyRecoveryOutcomeToDiagnosticState and the runtime stale check.

76-

return ref;

65+

return resolveStuckSessionRecoveryRef(request);

7766

}

7867
7968

function isRecoveryPromiseLike(

Original file line numberDiff line numberDiff line change

@@ -30,6 +30,14 @@ export type StuckSessionRecoveryRequest = {

3030

staleActiveProgressAbortMs?: number;

3131

};

3232
33+

export function resolveStuckSessionRecoveryRef(

34+

params: Pick<StuckSessionRecoveryRequest, "sessionId" | "sessionKey">,

35+

): string | undefined {

36+

// In-flight recovery gates must key by logical session only; generation is

37+

// stale-state evidence, not concurrency identity.

38+

return params.sessionKey?.trim() || params.sessionId?.trim() || undefined;

39+

}

40+
3341

type DiagnosticSessionRecoveryBaseOutcome = {

3442

sessionId?: string;

3543

sessionKey?: string;

Original file line numberDiff line numberDiff line change

@@ -17,6 +17,7 @@ import {

1717

} from "./diagnostic-session-context.js";

1818

import {

1919

formatRecoveryOutcome,

20+

resolveStuckSessionRecoveryRef,

2021

type StuckSessionRecoveryOutcome,

2122

type StuckSessionRecoveryRequest,

2223

} from "./diagnostic-session-recovery.js";

@@ -52,10 +53,6 @@ function isActiveRunProgressStale(params: {

5253

return typeof lastProgressAgeMs === "number" && lastProgressAgeMs >= params.staleAbortMs;

5354

}

5455
55-

function recoveryKey(params: StuckSessionRecoveryParams): string | undefined {

56-

return params.sessionKey?.trim() || params.sessionId?.trim() || undefined;

57-

}

58-
5956

function formatRecoveryContext(

6057

params: StuckSessionRecoveryParams,

6158

extra?: { activeSessionId?: string; lane?: string; activeCount?: number; queuedCount?: number },

@@ -84,7 +81,7 @@ function formatRecoveryContext(

8481

export async function recoverStuckDiagnosticSession(

8582

params: StuckSessionRecoveryParams,

8683

): Promise<StuckSessionRecoveryOutcome> {

87-

const key = recoveryKey(params);

84+

const key = resolveStuckSessionRecoveryRef(params);

8885

if (!key || recoveriesInFlight.has(key)) {

8986

return {

9087

status: "skipped",

@@ -133,8 +130,7 @@ export async function recoverStuckDiagnosticSession(

133130

fileActiveWorkSessionId ??

134131

params.sessionId)

135132

: (fileActiveWorkSessionId ?? params.sessionId);

136-

const laneKey = params.sessionKey?.trim() || params.sessionId?.trim();

137-

const sessionLane = laneKey ? resolveEmbeddedSessionLane(laneKey) : null;

133+

const sessionLane = key ? resolveEmbeddedSessionLane(key) : null;

138134

let aborted = false;

139135

let drained = true;

140136

let forceCleared = false;