refactor(messaging): persist session registry state as plans

ci/test-file-size-budget.json

@@ -5,13 +5,13 @@
     "nemoclaw/src/commands/migration-state.test.ts": 1566,
     "src/lib/inference/nim.test.ts": 2068,
     "src/lib/onboard/preflight.test.ts": 1905,
-    "test/channels-add-preset.test.ts": 1872,
+    "test/channels-add-preset.test.ts": 1866,
     "test/generate-openclaw-config.test.ts": 2091,
     "test/install-preflight.test.ts": 4396,
     "test/nemoclaw-start.test.ts": 5289,
     "test/onboard-messaging.test.ts": 2097,
     "test/onboard-selection.test.ts": 6922,
-    "test/onboard.test.ts": 4874,
-    "test/policies.test.ts": 2763
+    "test/onboard.test.ts": 4873,
+    "test/policies.test.ts": 2756
   }
 }

src/lib/actions/inference-route-api.test.ts

@@ -39,9 +39,7 @@ function session(overrides: Partial<Session> = {}): Session {
     routerCredentialHash: null,
     webSearchConfig: null,
     policyPresets: null,
-    messagingChannels: null,
-    messagingChannelConfig: null,
-    disabledChannels: null,
+    messagingPlan: null,
     migratedLegacyValueHashes: null,
     hermesToolGateways: null,
     gpuPassthrough: false,

src/lib/actions/inference-set.test.ts

@@ -77,9 +77,7 @@ function baseSession(overrides: Partial<Session> = {}): Session {
     routerCredentialHash: null,
     webSearchConfig: null,
     policyPresets: null,
-    messagingChannels: null,
-    messagingChannelConfig: null,
-    disabledChannels: null,
+    messagingPlan: null,
     migratedLegacyValueHashes: null,
     hermesToolGateways: null,
     gpuPassthrough: false,

src/lib/actions/sandbox/channel-status.test.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { describe, expect, it, vi } from "vitest";
+import { makeMessagingState } from "../../../../test/helpers/messaging-plan-fixtures";
 
 // The orchestrator transitively pulls in policy/index.ts and agent/defs.ts,
 // both of which require runner.ts via CJS; runner.ts uses `require()` calls
@@ -15,6 +16,14 @@ vi.mock("../../policy", () => ({
 
 vi.mock("../../state/registry", () => ({
   getSandbox: vi.fn(),
+  getConfiguredMessagingChannelsFromEntry: vi.fn((entry?: SandboxEntry | null) =>
+    (entry?.messaging?.plan.channels ?? [])
+      .filter((channel) => channel.configured)
+      .map((channel) => channel.channelId),
+  ),
+  getDisabledMessagingChannelsFromEntry: vi.fn((entry?: SandboxEntry | null) =>
+    entry?.messaging?.plan.disabledChannels ? [...entry.messaging.plan.disabledChannels] : [],
+  ),
 }));
 
 vi.mock("../../agent/defs", () => ({
@@ -104,15 +113,11 @@ function fakeAgent(name: "openclaw" | "hermes" = "openclaw"): AgentDefinition {
   } as unknown as AgentDefinition;
 }
 
-function entry(
-  messagingChannels: string[] = ["whatsapp"],
-  disabledChannels: string[] = [],
-): SandboxEntry {
+function entry(channelIds: string[] = ["whatsapp"], disabledChannels: string[] = []): SandboxEntry {
   return {
     name: "alpha",
     agent: "openclaw",
-    messagingChannels,
-    disabledChannels,
+    messaging: makeMessagingState("alpha", channelIds, disabledChannels),
   } as SandboxEntry;
 }
 
@@ -434,7 +439,7 @@ describe("showSandboxChannelStatus (whatsapp)", () => {
     expect(capturedCmd as unknown as string).toMatch(/pgrep -fa/);
   });
 
-  it("skips the deep probe and reports paused state when WhatsApp is in disabledChannels", async () => {
+  it("skips the deep probe and reports paused state when WhatsApp is disabled in the plan", async () => {
     // Regression guard: `channels stop whatsapp` deliberately drops the
     // bridge and preset until the operator runs `channels start`. The
     // status command should reflect that rather than probing a torn-down

src/lib/actions/sandbox/channel-status.ts

@@ -353,7 +353,9 @@ function buildWhatsappProbeInput(
   }
 
   const entry = deps.getSandbox(sandboxName);
-  const channelEnabledInRegistry = (entry?.messagingChannels ?? []).includes("whatsapp");
+  const channelEnabledInRegistry = registry
+    .getConfiguredMessagingChannelsFromEntry(entry)
+    .includes("whatsapp");
 
   const appliedPresets = deps.getAppliedPresets(sandboxName);
   const presetInRegistry = appliedPresets.includes("whatsapp");
@@ -440,8 +442,8 @@ function buildBasicChannelReport(
   deps: Required<StatusDeps>,
 ): ChannelStatusReport {
   const entry = deps.getSandbox(sandboxName);
-  const enabled = (entry?.messagingChannels ?? []).includes(channelName);
-  const disabled = (entry?.disabledChannels ?? []).includes(channelName);
+  const enabled = registry.getConfiguredMessagingChannelsFromEntry(entry).includes(channelName);
+  const disabled = registry.getDisabledMessagingChannelsFromEntry(entry).includes(channelName);
   const appliedPresets = deps.getAppliedPresets(sandboxName);
   const presetInRegistry = appliedPresets.includes(channelName);
   const signals: DiagnosticSignal[] = [];
@@ -523,11 +525,12 @@ export async function showSandboxChannelStatus(
 
   let channelName = channelArg;
   if (!channelName) {
-    const enabled = (entry.messagingChannels ?? []).filter((name: string) => name === "whatsapp");
+    const configuredChannels = registry.getConfiguredMessagingChannelsFromEntry(entry);
+    const enabled = configuredChannels.filter((name: string) => name === "whatsapp");
     if (enabled.length > 0) {
       channelName = "whatsapp";
-    } else if ((entry.messagingChannels ?? []).length > 0) {
-      channelName = entry.messagingChannels?.[0];
+    } else if (configuredChannels.length > 0) {
+      channelName = configuredChannels[0];
     } else {
       channelName = "whatsapp";
     }
@@ -551,7 +554,7 @@ export async function showSandboxChannelStatus(
 
   const agent = deps.loadAgent(entry.agent || "openclaw");
 
-  const disabledChannels = new Set(entry.disabledChannels ?? []);
+  const disabledChannels = new Set(registry.getDisabledMessagingChannelsFromEntry(entry));
   const channelIsPaused = disabledChannels.has(channelName);
 
   let report: ChannelStatusReport;

src/lib/actions/sandbox/doctor.ts

@@ -423,9 +423,9 @@ function channelRuntimeDoctorCheck(
 }
 
 function messagingDoctorCheck(sandboxName: string, sb: SandboxEntry): DoctorCheck {
-  const registeredChannels = Array.isArray(sb.messagingChannels) ? sb.messagingChannels : [];
-  const disabledChannels = new Set(Array.isArray(sb.disabledChannels) ? sb.disabledChannels : []);
-  const channels = registeredChannels.filter((channel: string) => !disabledChannels.has(channel));
+  const registeredChannels = registry.getConfiguredMessagingChannelsFromEntry(sb);
+  const disabledChannels = new Set(registry.getDisabledMessagingChannelsFromEntry(sb));
+  const channels = registry.getActiveMessagingChannelsFromEntry(sb);
   const pausedChannels = registeredChannels.filter((channel: string) =>
     disabledChannels.has(channel),
   );
@@ -783,13 +783,7 @@ export async function runSandboxDoctor(
     // #4156: bridge the gap between "configured" and "runtime-visible" — the
     // existing messaging check above probes provider attachment, not whether
     // OpenClaw's runtime config actually surfaces each enabled channel.
-    const registeredChannels = Array.isArray(sb.messagingChannels) ? sb.messagingChannels : [];
-    const disabledChannelsSet = new Set(
-      Array.isArray(sb.disabledChannels) ? sb.disabledChannels : [],
-    );
-    const enabledChannels = registeredChannels.filter(
-      (channel: string) => !disabledChannelsSet.has(channel),
-    );
+    const enabledChannels = registry.getActiveMessagingChannelsFromEntry(sb);
     const runtimeCheck = channelRuntimeDoctorCheck(sandboxName, enabledChannels);
     if (runtimeCheck) checks.push(runtimeCheck);
   }