fix(reply): keep sessions_send delivery single-owner

steipete · steipete · commit 8ed5132486ac · 2026-06-01T03:39:04.000+01:00
diff --git a/src/agents/openclaw-tools.sessions.test.ts b/src/agents/openclaw-tools.sessions.test.ts
@@ -1481,6 +1481,7 @@ describe("sessions tools", () => {
         isStreaming: () => true,
         isCompacting: () => false,
         supportsTranscriptCommitWait: true,
+        sourceReplyDeliveryMode: "message_tool_only",
         abort: () => {},
       },
       runScopedCallerKey,
@@ -1533,6 +1534,7 @@ describe("sessions tools", () => {
       debounceMs: 0,
       deliveryTimeoutMs: 30_000,
       waitForTranscriptCommit: true,
+      sourceReplyDeliveryMode: "message_tool_only",
     });
 
     await vi.waitFor(() => {
@@ -1587,6 +1589,7 @@ describe("sessions tools", () => {
         queueMessage,
         isStreaming: () => true,
         isCompacting: () => false,
+        sourceReplyDeliveryMode: "message_tool_only",
         abort: () => {},
       },
       runScopedCallerKey,
@@ -1622,6 +1625,7 @@ describe("sessions tools", () => {
       steeringMode: "all",
       debounceMs: 0,
       deliveryTimeoutMs: 30_000,
+      sourceReplyDeliveryMode: "message_tool_only",
     });
     expect(calls.some((call) => call.method === "agent")).toBe(false);
   });
@@ -1638,6 +1642,7 @@ describe("sessions tools", () => {
         isStreaming: () => true,
         isCompacting: () => false,
         supportsTranscriptCommitWait: true,
+        sourceReplyDeliveryMode: "message_tool_only",
         abort: () => {},
       },
       runScopedCallerKey,
diff --git a/src/agents/tools/agent-step.test.ts b/src/agents/tools/agent-step.test.ts
@@ -52,13 +52,15 @@ describe("runAgentStep", () => {
           message?: string;
           sessionKey?: string;
           deliver?: boolean;
+          sourceReplyDeliveryMode?: string;
           lane?: string;
           inputProvenance?: { kind?: string; sourceTool?: string };
         }
       | undefined;
     expect(params?.message).toContain("[Inter-session message");
     expect(params?.sessionKey).toBe("agent:main:subagent:child");
     expect(params?.deliver).toBe(false);
+    expect(params?.sourceReplyDeliveryMode).toBe("message_tool_only");
     expect(params?.lane).toBe("nested:agent:main:subagent:child");
     expect(params?.inputProvenance?.kind).toBe("inter_session");
     expect(params?.inputProvenance?.sourceTool).toBe("sessions_send");
@@ -119,10 +121,11 @@ describe("runAgentStep", () => {
     expect(gatewayCalls).toStrictEqual([]);
     expect(agentCommandFromIngress).toHaveBeenCalledTimes(1);
     const ingressCalls = agentCommandFromIngress.mock.calls as unknown as Array<
-      [{ message?: string; transcriptMessage?: string }]
+      [{ message?: string; sourceReplyDeliveryMode?: string; transcriptMessage?: string }]
     >;
     const ingress = ingressCalls[0]?.[0];
     expect(ingress?.message).toContain("internal announce step");
+    expect(ingress?.sourceReplyDeliveryMode).toBe("message_tool_only");
     expect(ingress?.transcriptMessage).toBe("");
   });
 });
diff --git a/src/agents/tools/agent-step.ts b/src/agents/tools/agent-step.ts
@@ -69,6 +69,7 @@ export async function runAgentStep(params: {
       transcriptMessage: params.transcriptMessage,
       sessionKey: params.sessionKey,
       deliver: false,
+      sourceReplyDeliveryMode: "message_tool_only",
       channel,
       lane,
       runId: stepIdem,
@@ -89,6 +90,7 @@ export async function runAgentStep(params: {
       sessionKey: params.sessionKey,
       idempotencyKey: stepIdem,
       deliver: false,
+      sourceReplyDeliveryMode: "message_tool_only",
       channel,
       lane,
       extraSystemPrompt: params.extraSystemPrompt,
diff --git a/src/agents/tools/sessions-send-tool.ts b/src/agents/tools/sessions-send-tool.ts
@@ -226,11 +226,17 @@ async function startAgentRun(params: {
     const messageText =
       typeof params.sendParams.message === "string" ? params.sendParams.message : undefined;
     if (activeRunSessionId && fallbackSessionKey && messageText) {
+      const sourceReplyDeliveryMode =
+        params.sendParams.sourceReplyDeliveryMode === "automatic" ||
+        params.sendParams.sourceReplyDeliveryMode === "message_tool_only"
+          ? params.sendParams.sourceReplyDeliveryMode
+          : undefined;
       const queueOptions: EmbeddedAgentQueueMessageOptions = {
         steeringMode: "all",
         debounceMs: 0,
         deliveryTimeoutMs: params.deliveryTimeoutMs,
         waitForTranscriptCommit: true,
+        ...(sourceReplyDeliveryMode ? { sourceReplyDeliveryMode } : {}),
       };
       let queueOutcome = await queueEmbeddedAgentMessageWithOutcomeAsync(
         activeRunSessionId,
@@ -557,6 +563,7 @@ export function createSessionsSendTool(opts?: {
         sessionKey: resolvedKey,
         idempotencyKey,
         deliver: false,
+        sourceReplyDeliveryMode: "message_tool_only" as const,
         channel: INTERNAL_MESSAGE_CHANNEL,
         lane: resolveNestedAgentLaneForSession(resolvedKey),
         extraSystemPrompt: agentMessageContext,
