fix(agents): avoid duplicate runtime event prompts

vincentkoc · vincentkoc · commit 36cee42c1ef6 · 2026-06-10T16:36:58.000+09:00
diff --git a/src/agents/embedded-agent-runner/run/runtime-context-prompt.test.ts b/src/agents/embedded-agent-runner/run/runtime-context-prompt.test.ts
@@ -159,6 +159,24 @@ describe("runtime context prompt submission", () => {
     });
   });
 
+  it("does not duplicate implicit runtime context in a hook-expanded model prompt", () => {
+    const effectivePrompt = "exec completed (abc123, code 0) :: output text";
+    const transcriptPrompt = "[OpenClaw heartbeat poll]";
+
+    expect(
+      resolveRuntimeContextPromptParts({
+        effectivePrompt,
+        transcriptPrompt,
+        modelPrompt: ["hook prefix", effectivePrompt, "hook suffix"].join("\n\n"),
+        unmatchedTranscriptMode: "runtime-context",
+      }),
+    ).toEqual({
+      prompt: transcriptPrompt,
+      modelPrompt: ["hook prefix", transcriptPrompt, "hook suffix"].join("\n\n"),
+      runtimeContext: effectivePrompt,
+    });
+  });
+
   it("does not treat unmatched user prompt text as implicit runtime context", () => {
     const effectivePrompt = ["media note", "reply hint", "user body"].join("\n\n");
 
diff --git a/src/agents/embedded-agent-runner/run/runtime-context-prompt.ts b/src/agents/embedded-agent-runner/run/runtime-context-prompt.ts
@@ -76,6 +76,18 @@ function removeLastPromptOccurrence(text: string, prompt: string): string | null
     .trim();
 }
 
+function replaceLastPromptOccurrence(
+  text: string,
+  prompt: string,
+  replacement: string,
+): string | null {
+  const index = text.lastIndexOf(prompt);
+  if (index === -1) {
+    return null;
+  }
+  return `${text.slice(0, index)}${replacement}${text.slice(index + prompt.length)}`;
+}
+
 /**
  * Separates user-authored prompt text from hidden runtime context. Transcript
  * prompt stays user-visible; model prompt may carry runtime-only additions that
@@ -99,7 +111,7 @@ export function resolveRuntimeContextPromptParts(params: {
       : shouldExtractInternalRuntimeContext
         ? extractInternalRuntimeContext(params.modelPrompt)
         : { text: params.modelPrompt };
-  const modelPromptText = modelPrompt?.text ?? transcriptPrompt ?? extracted.text;
+  let modelPromptText = modelPrompt?.text ?? transcriptPrompt ?? extracted.text;
   const prompt = transcriptPrompt ?? extracted.text;
   if (!prompt.trim() && params.emptyTranscriptMode === "model-prompt") {
     return {
@@ -128,6 +140,11 @@ export function resolveRuntimeContextPromptParts(params: {
     params.unmatchedTranscriptMode === "runtime-context" && hiddenRuntimeContext === undefined
       ? extracted.text.trim()
       : undefined;
+  if (implicitRuntimeContext && modelPrompt && transcriptPrompt !== undefined) {
+    modelPromptText =
+      replaceLastPromptOccurrence(modelPrompt.text, extracted.text, transcriptPrompt) ??
+      modelPromptText;
+  }
   const runtimeContext =
     [hiddenRuntimeContext, implicitRuntimeContext, extracted.runtimeContext]
       .filter((value): value is string => Boolean(value?.trim()))
