github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-18 05:07:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(node-host): dedupe exec finished event emission

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-15 13:35:37 +00:00
parent 80e5aebf6a
commit 18342b0a5b
1 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/node-host/invoke.ts
View File

@@ -336,6 +336,39 @@ function buildExecEventPayload(payload: ExecEventPayload): ExecEventPayload {
return { ...payload, output: text };
}
async function sendExecFinishedEvent(params: {
client: GatewayClient;
sessionKey: string;
runId: string;
cmdText: string;
result: {
stdout?: string;
stderr?: string;
error?: string | null;
exitCode?: number | null;
timedOut?: boolean;
success?: boolean;
};
}) {
const combined = [params.result.stdout, params.result.stderr, params.result.error]
.filter(Boolean)
.join("\n");
await sendNodeEvent(
params.client,
"exec.finished",
buildExecEventPayload({
sessionKey: params.sessionKey,
runId: params.runId,
host: "node",
command: params.cmdText,
exitCode: params.result.exitCode ?? undefined,
timedOut: params.result.timedOut,
success: params.result.success,
output: combined,
}),
);
}
async function runViaMacAppExecHost(params: {
approvals: ReturnType<typeof resolveExecApprovals>;
request: ExecHostRequest;
@@ -624,21 +657,7 @@ export async function handleInvoke(
return;
} else {
const result: ExecHostRunResult = response.payload;
const combined = [result.stdout, result.stderr, result.error].filter(Boolean).join("\n");
await sendNodeEvent(
client,
"exec.finished",
buildExecEventPayload({
sessionKey,
runId,
host: "node",
command: cmdText,
exitCode: result.exitCode,
timedOut: result.timedOut,
success: result.success,
output: combined,
}),
);
await sendExecFinishedEvent({ client, sessionKey, runId, cmdText, result });
await sendInvokeResult(client, frame, {
ok: true,
payloadJSON: JSON.stringify(result),
@@ -790,21 +809,7 @@ export async function handleInvoke(
result.stdout = `${result.stdout}\n${suffix}`;
}
}
const combined = [result.stdout, result.stderr, result.error].filter(Boolean).join("\n");
await sendNodeEvent(
client,
"exec.finished",
buildExecEventPayload({
sessionKey,
runId,
host: "node",
command: cmdText,
exitCode: result.exitCode,
timedOut: result.timedOut,
success: result.success,
output: combined,
}),
);
await sendExecFinishedEvent({ client, sessionKey, runId, cmdText, result });
await sendInvokeResult(client, frame, {
ok: true,