diff --git a/CHANGELOG.md b/CHANGELOG.md
index e314ad8e6..85e020e70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - Tools: unify reaction removal semantics across Discord/Slack/Telegram/WhatsApp and allow WhatsApp reaction routing across accounts.
 - Gateway/CLI: add daemon runtime selection (Node recommended; Bun optional) and document WhatsApp/Baileys Bun WebSocket instability on reconnect.
 - CLI: add `clawdbot docs` live docs search with pretty output.
+- CLI: add `clawdbot agents` (list/add/delete) with wizarded workspace/setup, provider login, and full prune on delete.
 - Agent: treat compaction retry AbortError as a fallback trigger without swallowing non-abort errors. Thanks @erikpr1994 for PR #341.
 - Agent: deliver final replies for non-streaming models when block chunking is enabled. Thank you @mneves75 for PR #369!
 - Sub-agents: allow `sessions_spawn` model overrides and error on invalid models. Thanks @azade-c for PR #298.
diff --git a/src/commands/agents.ts b/src/commands/agents.ts
index 78ce0ab86..f7afad11e 100644
--- a/src/commands/agents.ts
+++ b/src/commands/agents.ts
@@ -218,7 +218,7 @@ export function pruneAgentConfig(
   removedAllow: number;
 } {
   const id = normalizeAgentId(agentId);
-  const agents = { ...(cfg.routing?.agents ?? {}) };
+  const agents = { ...cfg.routing?.agents };
   delete agents[id];
   const nextAgents = Object.keys(agents).length > 0 ? agents : undefined;
 
diff --git a/src/commands/onboard-providers.ts b/src/commands/onboard-providers.ts
index 5e60f6b4b..77d1bf174 100644
--- a/src/commands/onboard-providers.ts
+++ b/src/commands/onboard-providers.ts
@@ -618,7 +618,7 @@ export async function setupProviders(
           accounts: {
             ...next.whatsapp?.accounts,
             [whatsappAccountId]: {
-              ...(next.whatsapp?.accounts?.[whatsappAccountId] ?? {}),
+              ...next.whatsapp?.accounts?.[whatsappAccountId],
               enabled:
                 next.whatsapp?.accounts?.[whatsappAccountId]?.enabled ?? true,
             },