vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 08:50:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(agents): avoid kill-recovery hook bootstrap race

Browse Source
This commit is contained in:
Vincent Koc
2026-04-12 13:18:10 +01:00
parent 48042c3875
commit f17fd735ef
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/agents/subagent-registry-run-manager.ts
View File

@@ -2,6 +2,7 @@ import { loadConfig } from "../config/config.js";
import type { OpenClawConfig } from "../config/types.openclaw.js";
import { callGateway } from "../gateway/call.js";
import { createSubsystemLogger } from "../logging/subsystem.js";
import { getGlobalHookRunner } from "../plugins/hook-runner-global.js";
import { createRunningTaskRun } from "../tasks/task-executor.js";
import { type DeliveryContext, normalizeDeliveryContext } from "../utils/delivery-context.js";
import { waitForAgentRun } from "./run-wait.js";
@@ -419,6 +420,17 @@ export function createSubagentRunManager(params: {
if (updated > 0) {
params.persist();
for (const entry of entriesByChildSessionKey.values()) {
const emitEndedHook = () =>
emitSubagentEndedHookOnce({
entry,
reason: SUBAGENT_ENDED_REASON_KILLED,
sendFarewell: true,
accountId: entry.requesterOrigin?.accountId,
outcome: SUBAGENT_ENDED_OUTCOME_KILLED,
error: reason,
inFlightRunIds: params.endedHookInFlightRunIds,
persist: () => params.persist(),
});
void persistSubagentSessionTiming(entry).catch((err) => {
log.warn("failed to persist killed subagent session timing", {
err,
@@ -435,6 +447,12 @@ export function createSubagentRunManager(params: {
cleanup: entry.cleanup,
completedAt: now,
});
if (getGlobalHookRunner()) {
void emitEndedHook().catch(() => {
// Hook failures should not break termination flow.
});
continue;
}
const cfg = params.loadConfig();
void Promise.resolve(
params.ensureRuntimePluginsLoaded({
@@ -443,18 +461,7 @@ export function createSubagentRunManager(params: {
allowGatewaySubagentBinding: true,
}),
)
.then(() =>
emitSubagentEndedHookOnce({
entry,
reason: SUBAGENT_ENDED_REASON_KILLED,
sendFarewell: true,
accountId: entry.requesterOrigin?.accountId,
outcome: SUBAGENT_ENDED_OUTCOME_KILLED,
error: reason,
inFlightRunIds: params.endedHookInFlightRunIds,
persist: () => params.persist(),
}),
)
.then(emitEndedHook)
.catch(() => {
// Hook failures should not break termination flow.
});