refactor(message): keep read fallback policy at call site (#108930)

steipete · web-flow · commit 122c6e4439cf · 2026-07-16T04:21:40.000-07:00
diff --git a/src/infra/outbound/channel-selection.test.ts b/src/infra/outbound/channel-selection.test.ts
@@ -276,40 +276,6 @@ describe("resolveMessageChannelSelection", () => {
     });
   });
 
-  it("rejects an explicit unknown channel instead of using the tool context", async () => {
-    await expect(
-      expectResolvedSelection({
-        cfg: {} as never,
-        channel: "channel:C123",
-        fallbackChannel: "beta",
-        requireExplicitChannelAvailable: true,
-      }),
-    ).rejects.toThrow("Unknown channel: channel:c123");
-  });
-
-  it("rejects an explicit unavailable channel instead of using the tool context", async () => {
-    const cfg = {} as never;
-    mocks.resolveOutboundChannelPlugin.mockImplementation(({ channel }: { channel: string }) =>
-      channel === "beta" ? { id: "beta" } : undefined,
-    );
-
-    await expect(
-      expectResolvedSelection({
-        cfg,
-        channel: "alpha",
-        fallbackChannel: "beta",
-        requireExplicitChannelAvailable: true,
-      }),
-    ).rejects.toThrow("Channel is unavailable: alpha");
-
-    expect(mocks.resolveOutboundChannelPlugin).toHaveBeenCalledTimes(1);
-    expect(mocks.resolveOutboundChannelPlugin).toHaveBeenCalledWith({
-      channel: "alpha",
-      cfg,
-      allowBootstrap: true,
-    });
-  });
-
   it.each([
     {
       params: { cfg: {} as never, channel: "channel:C123", fallbackChannel: "not-a-channel" },
diff --git a/src/infra/outbound/channel-selection.ts b/src/infra/outbound/channel-selection.ts
@@ -219,34 +219,28 @@ export async function resolveMessageChannelSelection(params: {
   cfg: OpenClawConfig;
   channel?: string | null;
   fallbackChannel?: string | null;
-  requireExplicitChannelAvailable?: boolean;
 }): Promise<{
   channel: MessageChannelId;
   configured: MessageChannelId[];
   source: MessageChannelSelectionSource;
 }> {
   const normalized = normalizeMessageChannel(params.channel);
   if (normalized) {
-    if (params.requireExplicitChannelAvailable && !isKnownChannel(normalized)) {
-      throw new Error(`Unknown channel: ${normalized}`);
-    }
     const availableExplicit = resolveAvailableKnownChannel({
       cfg: params.cfg,
       value: normalized,
     });
     if (!availableExplicit) {
-      if (!params.requireExplicitChannelAvailable) {
-        const fallback = resolveAvailableKnownChannel({
-          cfg: params.cfg,
-          value: params.fallbackChannel,
-        });
-        if (fallback) {
-          return {
-            channel: fallback,
-            configured: [],
-            source: "tool-context-fallback",
-          };
-        }
+      const fallback = resolveAvailableKnownChannel({
+        cfg: params.cfg,
+        value: params.fallbackChannel,
+      });
+      if (fallback) {
+        return {
+          channel: fallback,
+          configured: [],
+          source: "tool-context-fallback",
+        };
       }
       if (!isKnownChannel(normalized)) {
         throw new Error(`Unknown channel: ${normalized}`);
diff --git a/src/infra/outbound/message-action-runner.ts b/src/infra/outbound/message-action-runner.ts
@@ -403,11 +403,15 @@ async function resolveChannel(
   toolContext?: { currentChannelProvider?: string },
   action?: ChannelMessageActionName,
 ) {
+  const channel = readStringParam(params, "channel");
+  // Explicit reads must never switch to the source conversation when their
+  // requested provider is unknown or unavailable.
+  const fallbackChannel =
+    action === "read" && channel ? undefined : toolContext?.currentChannelProvider;
   const selection = await resolveMessageChannelSelection({
     cfg,
-    channel: readStringParam(params, "channel"),
-    fallbackChannel: toolContext?.currentChannelProvider,
-    requireExplicitChannelAvailable: action === "read",
+    channel,
+    fallbackChannel,
   });
   if (selection.source === "tool-context-fallback") {
     params.channel = selection.channel;
