furyhawk/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-07-21 10:16:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(agents): move heartbeat wrapper to its owner

Browse Source
This commit is contained in:
Vincent Koc
2026-07-13 21:50:21 +02:00
parent 6d299f383c
commit 3bdcfaf980
3 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/agents/embedded-agent-runner/run/attempt-tool-catalog.ts
+1 -36
View File
@@ -2,11 +2,7 @@
* Prepares the attempt-local tool catalog, schema projection, and diagnostics.
*/
import type { DiagnosticTraceContext } from "../../../infra/diagnostic-trace-context.js";
import { copyPluginToolMeta } from "../../../plugins/tools.js";
import { copyBeforeToolCallHookMarker } from "../../agent-tools.before-tool-call.js";
import { resolveToolLoopDetectionConfig } from "../../agent-tools.js";
import { copyChannelAgentToolMeta } from "../../channel-tools.js";
import { copyCodeModeControlToolIdentity } from "../../code-mode-control-tools.js";
import {
applyCodeModeCatalog,
CODE_MODE_EXEC_TOOL_NAME,
@@ -30,49 +26,18 @@ import {
TOOL_SEARCH_RAW_TOOL_NAME,
type ToolSearchCatalogToolExecutor,
} from "../../tool-search.js";
import { copyToolTerminalPresentation } from "../../tool-terminal-presentation.js";
import type { AnyAgentTool } from "../../tools/common.js";
import { log } from "../logger.js";
import type { prepareEmbeddedAttemptBundleTools } from "./attempt-bundle-tools.js";
import { collectAttemptExplicitToolAllowlistSources } from "./attempt-tool-allowlist.js";
import type { prepareEmbeddedAttemptToolBase } from "./attempt-tool-base-prepare.js";
import { buildToolSearchRunPlan } from "./attempt.tool-search-run-plan.js";
import { notifyToolActivity } from "./tool-activity-heartbeat.js";
import { wrapEmbeddedAttemptToolWithActivity } from "./tool-activity-heartbeat.js";
import type { EmbeddedRunAttemptParams } from "./types.js";
type PreparedToolBase = ReturnType<typeof prepareEmbeddedAttemptToolBase>;
type PreparedBundleTools = Awaited<ReturnType<typeof prepareEmbeddedAttemptBundleTools>>;
type ProviderRuntimeHandle = Parameters<typeof logAgentRuntimeToolDiagnostics>[0]["runtimeHandle"];
export function wrapEmbeddedAttemptToolWithActivity<T extends AnyAgentTool>(
tool: T,
runId: string,
): T {
const originalExecute = tool.execute;
const wrappedTool = {
...tool,
execute: (async (...args: Parameters<typeof originalExecute>) => {
// Long-running tools keep the attempt's idle watchdog alive.
const interval = setInterval(() => notifyToolActivity(runId), 60_000);
interval.unref?.();
try {
notifyToolActivity(runId);
return await originalExecute(...args);
} finally {
clearInterval(interval);
notifyToolActivity(runId);
}
}) as typeof originalExecute,
} as T;
// Tool metadata lives in identity-keyed WeakMaps, so object spread is insufficient.
copyPluginToolMeta(tool, wrappedTool);
copyChannelAgentToolMeta(tool, wrappedTool);
copyBeforeToolCallHookMarker(tool, wrappedTool);
copyToolTerminalPresentation(tool, wrappedTool);
copyCodeModeControlToolIdentity(tool, wrappedTool);
return wrappedTool;
}
export function prepareEmbeddedAttemptToolCatalog(input: {
attempt: EmbeddedRunAttemptParams;
preparedToolBase: PreparedToolBase;
src/agents/embedded-agent-runner/run/tool-activity-heartbeat.test.ts
+1 -1
View File
@@ -6,12 +6,12 @@ import {
getToolTerminalPresentation,
setToolTerminalPresentation,
} from "../../tool-terminal-presentation.js";
import { wrapEmbeddedAttemptToolWithActivity } from "./attempt-tool-catalog.js";
import {
clearToolActivityRun,
getLastToolActivityMs,
notifyToolActivity,
onToolActivity,
wrapEmbeddedAttemptToolWithActivity,
} from "./tool-activity-heartbeat.js";
const RUN = "test-run";
src/agents/embedded-agent-runner/run/tool-activity-heartbeat.ts
+38 -1
View File
@@ -1,6 +1,43 @@
export {
import { copyPluginToolMeta } from "../../../plugins/tools.js";
import {
clearToolActivityRun,
getLastToolActivityMs,
notifyToolActivity,
onToolActivity,
} from "../../../shared/tool-activity-heartbeat.js";
import { copyBeforeToolCallHookMarker } from "../../agent-tools.before-tool-call.js";
import { copyChannelAgentToolMeta } from "../../channel-tools.js";
import { copyCodeModeControlToolIdentity } from "../../code-mode-control-tools.js";
import { copyToolTerminalPresentation } from "../../tool-terminal-presentation.js";
import type { AnyAgentTool } from "../../tools/common.js";
export { clearToolActivityRun, getLastToolActivityMs, notifyToolActivity, onToolActivity };
export function wrapEmbeddedAttemptToolWithActivity<T extends AnyAgentTool>(
tool: T,
runId: string,
): T {
const originalExecute = tool.execute;
const wrappedTool = {
...tool,
execute: (async (...args: Parameters<typeof originalExecute>) => {
// Long-running tools keep the attempt's idle watchdog alive.
const interval = setInterval(() => notifyToolActivity(runId), 60_000);
interval.unref?.();
try {
notifyToolActivity(runId);
return await originalExecute(...args);
} finally {
clearInterval(interval);
notifyToolActivity(runId);
}
}) as typeof originalExecute,
} as T;
// Tool metadata lives in identity-keyed WeakMaps, so object spread is insufficient.
copyPluginToolMeta(tool, wrappedTool);
copyChannelAgentToolMeta(tool, wrappedTool);
copyBeforeToolCallHookMarker(tool, wrappedTool);
copyToolTerminalPresentation(tool, wrappedTool);
copyCodeModeControlToolIdentity(tool, wrappedTool);
return wrappedTool;
}