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

推荐订阅源

Jina AI
Jina AI
云风的 BLOG
云风的 BLOG
人人都是产品经理
人人都是产品经理
T
The Blog of Author Tim Ferriss
阮一峰的网络日志
阮一峰的网络日志
罗磊的独立博客
J
Java Code Geeks
博客园 - 聂微东
B
Blog
奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报
WordPress大学
WordPress大学
腾讯CDC
L
LangChain Blog
Apple Machine Learning Research
Apple Machine Learning Research
Microsoft Azure Blog
Microsoft Azure Blog
D
DataBreaches.Net
The GitHub Blog
The GitHub Blog
美团技术团队
博客园 - Franky
Google DeepMind News
Google DeepMind News
V
V2EX
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
月光博客
月光博客
The Cloudflare 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(followup): route CLI runtime drains through CLI runne...
hclsys · 2026-05-17 · via Recent Commits to openclaw:main

@@ -0,0 +1,164 @@

1+

import { runCliAgent } from "../../agents/cli-runner.js";

2+

import type { RunCliAgentParams } from "../../agents/cli-runner/types.js";

3+

import type { EmbeddedPiRunResult } from "../../agents/pi-embedded.js";

4+

import { emitAgentEvent, onAgentEvent } from "../../infra/agent-events.js";

5+

import {

6+

normalizeLowercaseStringOrEmpty,

7+

normalizeOptionalString,

8+

} from "../../shared/string-coerce.js";

9+10+

function shouldBridgeCliAssistantTextToReasoning(provider: string): boolean {

11+

return normalizeLowercaseStringOrEmpty(provider) === "claude-cli";

12+

}

13+14+

function createAssistantTextBridge(params: {

15+

runId: string;

16+

suppressed?: boolean;

17+

deliver?: (text: string) => Promise<void>;

18+

}) {

19+

const deliver = params.deliver;

20+

if (!deliver) {

21+

return {

22+

unsubscribe: () => undefined,

23+

drain: async (): Promise<void> => undefined,

24+

};

25+

}

26+

let lastText: string | undefined;

27+

let unsubscribed = false;

28+

let delivery = Promise.resolve();

29+

const rawUnsubscribe = onAgentEvent((evt) => {

30+

if (evt.runId !== params.runId || evt.stream !== "assistant") {

31+

return;

32+

}

33+

if (params.suppressed) {

34+

return;

35+

}

36+

const text = typeof evt.data.text === "string" ? evt.data.text : undefined;

37+

if (text === undefined || text === lastText) {

38+

return;

39+

}

40+

lastText = text;

41+

delivery = delivery.then(() => deliver(text)).catch(() => undefined);

42+

});

43+

return {

44+

unsubscribe() {

45+

if (unsubscribed) {

46+

return;

47+

}

48+

unsubscribed = true;

49+

rawUnsubscribe();

50+

},

51+

async drain(): Promise<void> {

52+

await delivery;

53+

},

54+

};

55+

}

56+57+

export async function runCliAgentWithLifecycle(params: {

58+

runId: string;

59+

provider: string;

60+

runParams: RunCliAgentParams;

61+

startedAt?: number;

62+

emitLifecycleStart?: boolean;

63+

emitLifecycleTerminal?: boolean;

64+

onAgentRunStart?: () => void;

65+

suppressAssistantBridge?: boolean;

66+

onAssistantText?: (text: string) => Promise<void>;

67+

onReasoningText?: (text: string) => Promise<void>;

68+

onErrorBeforeLifecycle?: (err: unknown) => Promise<void>;

69+

transformResult?: (result: EmbeddedPiRunResult) => EmbeddedPiRunResult;

70+

}): Promise<EmbeddedPiRunResult> {

71+

const startedAt = params.startedAt ?? Date.now();

72+

const emitLifecycleStart = params.emitLifecycleStart ?? true;

73+

const emitLifecycleTerminal = params.emitLifecycleTerminal ?? true;

74+

params.onAgentRunStart?.();

75+

if (emitLifecycleStart) {

76+

emitAgentEvent({

77+

runId: params.runId,

78+

stream: "lifecycle",

79+

data: {

80+

phase: "start",

81+

startedAt,

82+

},

83+

});

84+

}

85+

const assistantBridge = createAssistantTextBridge({

86+

runId: params.runId,

87+

suppressed: params.suppressAssistantBridge,

88+

deliver: params.onAssistantText,

89+

});

90+

const reasoningBridge = createAssistantTextBridge({

91+

runId: params.runId,

92+

suppressed: params.suppressAssistantBridge,

93+

deliver: shouldBridgeCliAssistantTextToReasoning(params.provider)

94+

? params.onReasoningText

95+

: undefined,

96+

});

97+

let lifecycleTerminalEmitted = false;

98+

try {

99+

const rawResult = await runCliAgent(params.runParams);

100+

const result = params.transformResult?.(rawResult) ?? rawResult;

101+

assistantBridge.unsubscribe();

102+

reasoningBridge.unsubscribe();

103+

await assistantBridge.drain();

104+

await reasoningBridge.drain();

105+106+

const cliText = normalizeOptionalString(result.payloads?.[0]?.text);

107+

if (cliText) {

108+

emitAgentEvent({

109+

runId: params.runId,

110+

stream: "assistant",

111+

data: { text: cliText },

112+

});

113+

}

114+115+

if (emitLifecycleTerminal) {

116+

emitAgentEvent({

117+

runId: params.runId,

118+

stream: "lifecycle",

119+

data: {

120+

phase: "end",

121+

startedAt,

122+

endedAt: Date.now(),

123+

},

124+

});

125+

lifecycleTerminalEmitted = true;

126+

}

127+

return result;

128+

} catch (err) {

129+

assistantBridge.unsubscribe();

130+

reasoningBridge.unsubscribe();

131+

await assistantBridge.drain();

132+

await reasoningBridge.drain();

133+

await params.onErrorBeforeLifecycle?.(err);

134+

if (emitLifecycleTerminal) {

135+

emitAgentEvent({

136+

runId: params.runId,

137+

stream: "lifecycle",

138+

data: {

139+

phase: "error",

140+

startedAt,

141+

endedAt: Date.now(),

142+

error: String(err),

143+

},

144+

});

145+

lifecycleTerminalEmitted = true;

146+

}

147+

throw err;

148+

} finally {

149+

assistantBridge.unsubscribe();

150+

reasoningBridge.unsubscribe();

151+

if (emitLifecycleTerminal && !lifecycleTerminalEmitted) {

152+

emitAgentEvent({

153+

runId: params.runId,

154+

stream: "lifecycle",

155+

data: {

156+

phase: "error",

157+

startedAt,

158+

endedAt: Date.now(),

159+

error: "CLI run completed without lifecycle terminal event",

160+

},

161+

});

162+

}

163+

}

164+

}