From 1c5a4d01c9081fbf89127765366bc6df68bebf7a Mon Sep 17 00:00:00 2001
From: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>
Date: Fri, 3 Apr 2026 15:56:48 -0500
Subject: [PATCH] fix: preserve channel status account ids

---
 src/channels/plugins/status.ts                          | 8 +++++++-
 src/commands/channels.config-only-status-output.test.ts | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/channels/plugins/status.ts b/src/channels/plugins/status.ts
index 983ba23be33..04d610dd649 100644
--- a/src/channels/plugins/status.ts
+++ b/src/channels/plugins/status.ts
@@ -14,13 +14,19 @@ async function buildSnapshotFromAccount<ResolvedAccount>(params: {
   audit?: unknown;
 }): Promise<ChannelAccountSnapshot> {
   if (params.plugin.status?.buildAccountSnapshot) {
-    return await params.plugin.status.buildAccountSnapshot({
+    const snapshot = await params.plugin.status.buildAccountSnapshot({
       account: params.account,
       cfg: params.cfg,
       runtime: params.runtime,
       probe: params.probe,
       audit: params.audit,
     });
+    return typeof snapshot.accountId === "string" && snapshot.accountId.trim().length > 0
+      ? snapshot
+      : {
+          accountId: params.accountId,
+          ...snapshot,
+        };
   }
   const enabled = params.plugin.config.isEnabled
     ? params.plugin.config.isEnabled(params.account, params.cfg)
diff --git a/src/commands/channels.config-only-status-output.test.ts b/src/commands/channels.config-only-status-output.test.ts
index 188f24eaf35..367fb034784 100644
--- a/src/commands/channels.config-only-status-output.test.ts
+++ b/src/commands/channels.config-only-status-output.test.ts
@@ -178,6 +178,7 @@ describe("config-only channels status output", () => {
 
     const joined = await formatLocalStatusSummary({ channels: {} });
     expect(joined).toContain("TokenOnly");
+    expect(joined).toContain("TokenOnly primary");
     expect(joined).toContain("configured, secret unavailable in this command path");
     expect(joined).toContain("token:config (unavailable)");
   });