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

推荐订阅源

aimingoo的专栏
aimingoo的专栏
Engineering at Meta
Engineering at Meta
有赞技术团队
有赞技术团队
博客园_首页
Apple Machine Learning Research
Apple Machine Learning Research
Vercel News
Vercel News
G
Google Developers Blog
Blog — PlanetScale
Blog — PlanetScale
IT之家
IT之家
MongoDB | Blog
MongoDB | Blog
Y
Y Combinator Blog
B
Blog
The GitHub Blog
The GitHub Blog
M
MIT News - Artificial intelligence
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
Stack Overflow Blog
Stack Overflow Blog
C
Check Point Blog
Microsoft Azure Blog
Microsoft Azure Blog
D
DataBreaches.Net
I
InfoQ
Recent Announcements
Recent Announcements
阮一峰的网络日志
阮一峰的网络日志
腾讯CDC
H
Help Net Security

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(acp): recover stale persistent sessions by structured...
amersheeny · 2026-06-23 · via Recent Commits to openclaw:main
11

/** Tests ACP turn terminal results and detached-task progress outcomes. */

2+

import type { AcpRuntimeEvent } from "@openclaw/acp-core/runtime/types";

23

import { describe, expect, it, vi } from "vitest";

34

import {

45

requireTaskByRunId,

@@ -955,17 +956,19 @@ describe("AcpSessionManager turn results", () => {

955956

}

956957

});

957958958-

it("retries once with a fresh persistent session after an early missing-session turn failure", async () => {

959+

// Drives a thread-bound persistent ACP session whose first turn fails because

960+

// the backend can no longer resume the stale session id, then a clean second

961+

// turn. Returns observers so each case can assert whether the manager

962+

// discarded the stale identity and retried fresh (#87830).

963+

function setupStaleResumeScenario(firstTurn: () => AsyncIterable<AcpRuntimeEvent>) {

959964

const runtimeState = createRuntime();

960965

hoisted.requireAcpRuntimeBackendMock.mockReturnValue({

961966

id: "acpx",

962967

runtime: runtimeState.runtime,

963968

});

964969

const sessionKey = "agent:claude:acp:binding:discord:default:retry-no-session";

965970

let currentMeta: SessionAcpMeta = {

966-

...readySessionMeta({

967-

agent: "claude",

968-

}),

971+

...readySessionMeta({ agent: "claude" }),

969972

runtimeSessionName: sessionKey,

970973

identity: {

971974

state: "resolved",

@@ -976,11 +979,7 @@ describe("AcpSessionManager turn results", () => {

976979

};

977980

hoisted.readAcpSessionEntryMock.mockImplementation((paramsUnknown: unknown) => {

978981

const key = (paramsUnknown as { sessionKey?: string }).sessionKey ?? sessionKey;

979-

return {

980-

sessionKey: key,

981-

storeSessionKey: key,

982-

acp: currentMeta,

983-

};

982+

return { sessionKey: key, storeSessionKey: key, acp: currentMeta };

984983

});

985984

hoisted.upsertAcpSessionMetaMock.mockImplementation(async (paramsUnknown: unknown) => {

986985

const params = paramsUnknown as {

@@ -993,11 +992,7 @@ describe("AcpSessionManager turn results", () => {

993992

if (next) {

994993

currentMeta = next;

995994

}

996-

return {

997-

sessionId: "session-1",

998-

updatedAt: Date.now(),

999-

acp: currentMeta,

1000-

};

995+

return { sessionId: "session-1", updatedAt: Date.now(), acp: currentMeta };

1001996

});

1002997

runtimeState.ensureSession.mockImplementation(async (inputUnknown: unknown) => {

1003998

const input = inputUnknown as {

@@ -1018,44 +1013,90 @@ describe("AcpSessionManager turn results", () => {

10181013

details: { status: "alive" },

10191014

});

10201015

runtimeState.runTurn

1021-

.mockImplementationOnce(async function* () {

1022-

yield {

1023-

type: "error" as const,

1024-

code: "NO_SESSION",

1025-

message:

1026-

"Persistent ACP session acpx-sid-stale could not be resumed: Resource not found: acpx-sid-stale",

1027-

};

1028-

})

1016+

.mockImplementationOnce(firstTurn)

10291017

.mockImplementationOnce(async function* () {

10301018

yield { type: "done" as const };

10311019

});

1032-10331020

const manager = new AcpSessionManager();

1034-

await expect(

1021+

const runTurn = () =>

10351022

manager.runTurn({

10361023

cfg: baseCfg,

10371024

sessionKey,

10381025

text: "do work",

10391026

mode: "prompt",

10401027

requestId: "run-no-session",

1041-

}),

1042-

).resolves.toBeUndefined();

1028+

});

1029+

return { runtimeState, sessionKey, runTurn, getMeta: () => currentMeta };

1030+

}

104310311044-

expect(runtimeState.prepareFreshSession).toHaveBeenCalledWith({

1045-

sessionKey,

1032+

function expectFreshRetry(scenario: ReturnType<typeof setupStaleResumeScenario>) {

1033+

expect(scenario.runtimeState.prepareFreshSession).toHaveBeenCalledWith({

1034+

sessionKey: scenario.sessionKey,

10461035

});

1047-

expect(runtimeState.ensureSession).toHaveBeenCalledTimes(2);

1048-

expectRecordFields(mockCallArg(runtimeState.ensureSession), {

1049-

sessionKey,

1036+

expect(scenario.runtimeState.ensureSession).toHaveBeenCalledTimes(2);

1037+

expectRecordFields(mockCallArg(scenario.runtimeState.ensureSession), {

1038+

sessionKey: scenario.sessionKey,

10501039

resumeSessionId: "acpx-sid-stale",

10511040

});

1052-

const retryInput = mockCallArg(runtimeState.ensureSession, 1);

1053-

expect(retryInput.resumeSessionId).toBeUndefined();

1054-

expect(currentMeta.identity?.acpxSessionId).toBe("acpx-sid-fresh");

1055-

expect(currentMeta.identity?.state).toBe("resolved");

1041+

expect(mockCallArg(scenario.runtimeState.ensureSession, 1).resumeSessionId).toBeUndefined();

1042+

expect(scenario.getMeta().identity?.acpxSessionId).toBe("acpx-sid-fresh");

1043+

expect(scenario.getMeta().identity?.state).toBe("resolved");

10561044

const states = extractStatesFromUpserts();

10571045

expect(states).toContain("running");

10581046

expect(states).toContain("idle");

10591047

expect(states).not.toContain("error");

1048+

}

1049+1050+

// The structured SESSION_RESUME_REQUIRED detail code drives recovery

1051+

// regardless of the backend's human-readable reason. Claude reports

1052+

// "Resource not found"; Kiro reports "Internal error" (RequestError -32603) —

1053+

// both must discard the stale persistent id and retry fresh (#87830).

1054+

it.each([

1055+

["Resource not found", "Resource not found: acpx-sid-stale"],

1056+

["Internal error (Kiro RequestError -32603)", "Internal error"],

1057+

])(

1058+

"retries with a fresh persistent session on a resume-required error: %s",

1059+

async (_label, reason) => {

1060+

const scenario = setupStaleResumeScenario(async function* () {

1061+

yield {

1062+

type: "error" as const,

1063+

code: "NO_SESSION",

1064+

detailCode: "SESSION_RESUME_REQUIRED",

1065+

message: `Persistent ACP session acpx-sid-stale could not be resumed: ${reason}`,

1066+

};

1067+

});

1068+

await expect(scenario.runTurn()).resolves.toBeUndefined();

1069+

expectFreshRetry(scenario);

1070+

},

1071+

);

1072+1073+

it("recovers when the resume-required error is wrapped as a thrown cause", async () => {

1074+

const scenario = setupStaleResumeScenario(

1075+

// eslint-disable-next-line require-yield -- an async generator that only throws is a valid empty stream.

1076+

async function* () {

1077+

const error = new Error(

1078+

"Persistent ACP session acpx-sid-stale could not be resumed: Internal error",

1079+

) as Error & { detailCode?: string };

1080+

error.detailCode = "SESSION_RESUME_REQUIRED";

1081+

throw error;

1082+

},

1083+

);

1084+

await expect(scenario.runTurn()).resolves.toBeUndefined();

1085+

expectFreshRetry(scenario);

1086+

});

1087+1088+

it("does not retry a generic Internal error that is not a resume-required failure", async () => {

1089+

const scenario = setupStaleResumeScenario(async function* () {

1090+

// No SESSION_RESUME_REQUIRED detail code: a generic backend failure must

1091+

// surface, not silently discard the persistent session and retry.

1092+

yield {

1093+

type: "error" as const,

1094+

code: "ACP_TURN_FAILED",

1095+

message: "Internal error",

1096+

};

1097+

});

1098+

await expect(scenario.runTurn()).rejects.toThrow();

1099+

expect(scenario.runtimeState.prepareFreshSession).not.toHaveBeenCalled();

1100+

expect(scenario.runtimeState.ensureSession).toHaveBeenCalledTimes(1);

10601101

});

10611102

});