fix(channels): avoid unnecessary bootstrap during message sends

Kaspre · Kaspre · commit 522d01a45b72 · 2026-05-21T13:05:24.000-04:00
diff --git a/src/infra/outbound/channel-resolution.test.ts b/src/infra/outbound/channel-resolution.test.ts
@@ -121,6 +121,22 @@ describe("outbound channel resolution", () => {
     expect(resolveRuntimePluginRegistryMock).not.toHaveBeenCalled();
   });
 
+  it("returns a bundled plugin without bootstrapping", async () => {
+    const plugin = { id: "alpha" };
+    getLoadedChannelPluginMock.mockReturnValue(undefined);
+    getChannelPluginMock.mockReturnValue(plugin);
+    const channelResolution = await importChannelResolution("bundled-plugin");
+
+    expect(
+      channelResolution.resolveOutboundChannelPlugin({
+        channel: "alpha",
+        cfg: {} as never,
+        allowBootstrap: true,
+      }),
+    ).toBe(plugin);
+    expect(resolveRuntimePluginRegistryMock).not.toHaveBeenCalled();
+  });
+
   it("falls back to the active registry when getChannelPlugin misses", async () => {
     const plugin = { id: "alpha" };
     getChannelPluginMock.mockReturnValue(undefined);
diff --git a/src/infra/outbound/channel-resolution.ts b/src/infra/outbound/channel-resolution.ts
@@ -192,8 +192,13 @@ export function resolveOutboundChannelPlugin(params: {
     return directCurrent;
   }
 
+  const bundledCurrent = resolve();
+  if (bundledCurrent) {
+    return bundledCurrent;
+  }
+
   if (params.allowBootstrap !== true) {
-    return resolve();
+    return undefined;
   }
 
   maybeBootstrapChannelPlugin({ channel: normalized, cfg: params.cfg });
diff --git a/src/infra/outbound/channel-selection.ts b/src/infra/outbound/channel-selection.ts
@@ -49,14 +49,13 @@ function resolveAvailableKnownChannel(params: {
   if (!normalized) {
     return undefined;
   }
-  // Pass `allowBootstrap: true` so the in-agent message tool path resolves
-  // outbound channels in processes where channel adapters have not been
-  // eagerly loaded (e.g. `openclaw agent --local`). In gateway context where
-  // the channel plugin is already loaded, this is a no-op fast path. Without
-  // it, `resolveOutboundChannelPlugin` falls through to `getChannelPlugin`
-  // (metadata-only) and `resolveAvailableKnownChannel` treats the channel as
-  // unavailable, surfacing as the recurring "Channel is unavailable" error
-  // on `--local`-routed dispatches that the CLI send-path could deliver to.
+  // Pass `allowBootstrap: true` so the in-agent message tool path can resolve
+  // outbound channels in processes where external channel adapters have not
+  // been eagerly loaded (e.g. `openclaw agent --local`). Already-loaded and
+  // bundled plugins still resolve through side-effect-free fast paths first.
+  // Without the bootstrap fallback, official external channels can surface as
+  // the recurring "Channel is unavailable" error on `--local`-routed
+  // dispatches that the CLI send-path could deliver to.
   // Adjacent to #77254 (cron-announce / final-reply paths); this closes the
   // remaining in-agent caller in the same family.
   return resolveOutboundChannelPlugin({

Original file line number	Diff line number	Diff line change
`@@ -192,8 +192,13 @@ export function resolveOutboundChannelPlugin(params: {`
`192`	`192`	`return directCurrent;`
`193`	`193`	`}`
`194`	`194`
	`195`	`+ const bundledCurrent = resolve();`
	`196`	`+ if (bundledCurrent) {`
	`197`	`+ return bundledCurrent;`
	`198`	`+ }`
	`199`	`+`
`195`	`200`	`if (params.allowBootstrap !== true) {`
`196`		`- return resolve();`
	`201`	`+ return undefined;`
`197`	`202`	`}`
`198`	`203`
`199`	`204`	`maybeBootstrapChannelPlugin({ channel: normalized, cfg: params.cfg });`