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

推荐订阅源

P
Proofpoint News Feed
云风的 BLOG
云风的 BLOG
Apple Machine Learning Research
Apple Machine Learning Research
Hugging Face - Blog
Hugging Face - Blog
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
Google DeepMind News
Google DeepMind News
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
雷峰网
雷峰网
B
Blog
月光博客
月光博客
博客园 - 【当耐特】
WordPress大学
WordPress大学
Microsoft Azure Blog
Microsoft Azure Blog
I
InfoQ
The GitHub Blog
The GitHub Blog
Engineering at Meta
Engineering at Meta
Jina AI
Jina AI
博客园 - Franky
MyScale Blog
MyScale Blog
H
Hackread – Cybersecurity News, Data Breaches, AI and More
Last Week in AI
Last Week in AI
B
Blog RSS Feed
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): honor terminal turn results · openclaw/openclaw...
steipete · 2026-05-17 · via Recent Commits to openclaw:main

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

55

type AcpRuntime,

66

type AcpRuntimeCapabilities,

77

type AcpRuntimeDoctorReport,

8+

type AcpRuntimeEvent,

89

type AcpRuntimeStatus,

910

} from "openclaw/plugin-sdk/acp-runtime-backend";

1011

import type { OpenClawPluginService, OpenClawPluginServiceContext } from "openclaw/plugin-sdk/core";

@@ -23,6 +24,9 @@ type AcpxRuntimeLike = AcpRuntime & {

2324

doctor?(): Promise<AcpRuntimeDoctorReport>;

2425

isHealthy(): boolean;

2526

};

27+

type AcpRuntimeTurnInput = Parameters<AcpRuntime["runTurn"]>[0];

28+

type AcpRuntimeTurn = ReturnType<NonNullable<AcpRuntime["startTurn"]>>;

29+

type AcpRuntimeTurnResult = Awaited<AcpRuntimeTurn["result"]>;

26302731

type DeferredServiceState = {

2832

ctx: OpenClawPluginServiceContext | null;

@@ -43,6 +47,157 @@ function shouldRunStartupProbe(env: NodeJS.ProcessEnv = process.env): boolean {

4347

return env[ENABLE_STARTUP_PROBE_ENV] !== "0" && env[SKIP_RUNTIME_PROBE_ENV] !== "1";

4448

}

454950+

function createDeferredResult<T>() {

51+

let resolve!: (value: T) => void;

52+

let reject!: (error: unknown) => void;

53+

const promise = new Promise<T>((resolvePromise, rejectPromise) => {

54+

resolve = resolvePromise;

55+

reject = rejectPromise;

56+

});

57+

return { promise, resolve, reject };

58+

}

59+60+

class LegacyRunTurnEventQueue {

61+

private readonly items: AcpRuntimeEvent[] = [];

62+

private readonly waits: Array<{

63+

resolve: (value: AcpRuntimeEvent | null) => void;

64+

reject: (error: unknown) => void;

65+

}> = [];

66+

private closed = false;

67+

private error: unknown;

68+69+

push(item: AcpRuntimeEvent): void {

70+

if (this.closed) {

71+

return;

72+

}

73+

const waiter = this.waits.shift();

74+

if (waiter) {

75+

waiter.resolve(item);

76+

return;

77+

}

78+

this.items.push(item);

79+

}

80+81+

clear(): void {

82+

this.items.length = 0;

83+

}

84+85+

close(): void {

86+

if (this.closed) {

87+

return;

88+

}

89+

this.closed = true;

90+

for (const waiter of this.waits.splice(0)) {

91+

waiter.resolve(null);

92+

}

93+

}

94+95+

fail(error: unknown): void {

96+

if (this.closed) {

97+

return;

98+

}

99+

this.error = error;

100+

this.closed = true;

101+

for (const waiter of this.waits.splice(0)) {

102+

waiter.reject(error);

103+

}

104+

}

105+106+

private async next(): Promise<AcpRuntimeEvent | null> {

107+

const item = this.items.shift();

108+

if (item) {

109+

return item;

110+

}

111+

if (this.error) {

112+

throw this.error;

113+

}

114+

if (this.closed) {

115+

return null;

116+

}

117+

return await new Promise<AcpRuntimeEvent | null>((resolve, reject) => {

118+

this.waits.push({ resolve, reject });

119+

});

120+

}

121+122+

async *iterate(): AsyncIterable<AcpRuntimeEvent> {

123+

for (;;) {

124+

const item = await this.next();

125+

if (!item) {

126+

return;

127+

}

128+

yield item;

129+

}

130+

}

131+

}

132+133+

function legacyRunTurnAsStartTurn(runtime: AcpRuntime, input: AcpRuntimeTurnInput): AcpRuntimeTurn {

134+

const result = createDeferredResult<AcpRuntimeTurnResult>();

135+

result.promise.catch(() => {});

136+

const queue = new LegacyRunTurnEventQueue();

137+

let resultSettled = false;

138+

const settleResult = (next: AcpRuntimeTurnResult) => {

139+

if (resultSettled) {

140+

return;

141+

}

142+

resultSettled = true;

143+

result.resolve(next);

144+

};

145+

void (async () => {

146+

try {

147+

for await (const event of runtime.runTurn(input)) {

148+

if (event.type === "done") {

149+

settleResult({

150+

status: "completed",

151+

...(event.stopReason ? { stopReason: event.stopReason } : {}),

152+

});

153+

continue;

154+

}

155+

if (event.type === "error") {

156+

settleResult({

157+

status: "failed",

158+

error: {

159+

message: event.message,

160+

...(event.code ? { code: event.code } : {}),

161+

...(event.detailCode ? { detailCode: event.detailCode } : {}),

162+

...(event.retryable === undefined ? {} : { retryable: event.retryable }),

163+

},

164+

});

165+

continue;

166+

}

167+

queue.push(event);

168+

}

169+

settleResult({

170+

status: "failed",

171+

error: {

172+

code: "ACP_TURN_FAILED",

173+

message: "ACP turn ended without a terminal done event.",

174+

},

175+

});

176+

} catch (error) {

177+

result.reject(error);

178+

queue.fail(error);

179+

return;

180+

}

181+

queue.close();

182+

})();

183+

return {

184+

requestId: input.requestId,

185+

events: queue.iterate(),

186+

result: result.promise,

187+

async cancel(inputArgs) {

188+

await runtime.cancel({ handle: input.handle, reason: inputArgs?.reason });

189+

},

190+

async closeStream() {

191+

queue.clear();

192+

queue.close();

193+

},

194+

};

195+

}

196+197+

function startRuntimeTurn(runtime: AcpRuntime, input: AcpRuntimeTurnInput): AcpRuntimeTurn {

198+

return runtime.startTurn?.(input) ?? legacyRunTurnAsStartTurn(runtime, input);

199+

}

200+46201

async function startRealService(state: DeferredServiceState): Promise<AcpxRuntimeLike> {

47202

if (state.realRuntime) {

48203

return state.realRuntime;

@@ -70,6 +225,26 @@ function createDeferredRuntime(state: DeferredServiceState): AcpxRuntimeLike {

70225

async ensureSession(input) {

71226

return await (await startRealService(state)).ensureSession(input);

72227

},

228+

startTurn(input) {

229+

const turnPromise = startRealService(state).then((runtime) =>

230+

startRuntimeTurn(runtime, input),

231+

);

232+

return {

233+

requestId: input.requestId,

234+

events: {

235+

async *[Symbol.asyncIterator]() {

236+

yield* (await turnPromise).events;

237+

},

238+

},

239+

result: turnPromise.then((turn) => turn.result),

240+

cancel(inputArgs) {

241+

return turnPromise.then((turn) => turn.cancel(inputArgs));

242+

},

243+

closeStream(inputArgs) {

244+

return turnPromise.then((turn) => turn.closeStream(inputArgs));

245+

},

246+

};

247+

},

73248

async *runTurn(input) {

74249

yield* (await startRealService(state)).runTurn(input);

75250

},