@rubytech/create-maxy-code 0.1.280 → 0.1.282

package/payload/server/server.js

@@ -1513,24 +1513,14 @@ function getLanIp() {
 // app/lib/whatsapp/schema.ts
 import { z } from "zod";
 var DmPolicySchema = z.enum(["open", "allowlist", "disabled"]);
-var GroupPolicySchema = z.enum(["open", "allowlist", "disabled"]);
 var WhatsAppAccountSchema = z.object({
   name: z.string().optional().describe("Display name for this WhatsApp account (e.g. 'Main', 'Sales')."),
   enabled: z.boolean().optional().describe("If disabled, this account won't connect on startup."),
   dmPolicy: DmPolicySchema.optional().describe("Who can message your public agent via WhatsApp DM. 'Open' lets anyone message. 'Allowlist' restricts to approved phone numbers. 'Disabled' blocks all public messages."),
-  groupPolicy: GroupPolicySchema.optional().describe("Whether your agent responds in WhatsApp group chats. 'Open' enables group responses (subject to per-group activation). 'Allowlist' restricts to approved senders. 'Disabled' ignores all group messages."),
   selfChatMode: z.boolean().optional().describe("Enable if the bot uses the owner's personal WhatsApp number (same phone for admin and bot). Changes how self-messages are routed."),
   adminPhones: z.array(z.string()).optional().describe("Phone numbers (E.164) that route to the admin agent. Managed via add-admin-phone / remove-admin-phone."),
   allowFrom: z.array(z.string()).optional().describe("Phone numbers allowed to message the public agent when DM policy is 'allowlist'. Add '*' for open access. Does not affect admin routing \u2014 use adminPhones for that."),
-  groupAllowFrom: z.array(z.string()).optional().describe("Phone numbers allowed to trigger the agent in groups when group policy is 'allowlist'."),
   sendReadReceipts: z.boolean().optional().default(true).describe("Whether to send read receipts (blue ticks) when messages are received. Disabling may feel less responsive but preserves privacy."),
-  groups: z.record(
-    z.string(),
-    z.object({
-      activation: z.enum(["always", "mention", "off"]).optional(),
-      publicAgent: z.string().optional().describe("Per-group public-agent slug override. When set, inbound messages in this group route to this agent instead of the per-account or top-level publicAgent.")
-    }).strict().optional()
-  ).optional().describe("Per-group settings: 'activation' controls when the agent responds ('always', 'mention', 'off'); 'publicAgent' optionally overrides the public-agent slug for this group (precedence: group \u2192 account \u2192 top-level)."),
   ackReaction: z.object({
     emoji: z.string().optional(),
     direct: z.boolean().optional().default(true),
@@ -1552,10 +1542,8 @@ var WhatsAppAccountSchema = z.object({
 var WhatsAppConfigSchema = z.object({
   accounts: z.record(z.string(), WhatsAppAccountSchema.optional()).optional().describe("Per-account config keyed by account ID."),
   dmPolicy: DmPolicySchema.optional().default("disabled").describe("Who can message your public agent via WhatsApp DM. 'Open' lets anyone message. 'Allowlist' restricts to approved phone numbers. 'Disabled' blocks all public messages."),
-  groupPolicy: GroupPolicySchema.optional().default("disabled").describe("Whether your agent responds in WhatsApp group chats. 'Open' enables group responses (subject to per-group activation). 'Allowlist' restricts to approved senders. 'Disabled' ignores all group messages."),
   adminPhones: z.array(z.string()).optional().describe("Phone numbers (E.164) that route to the admin agent. Managed via add-admin-phone / remove-admin-phone."),
   allowFrom: z.array(z.string()).optional().describe("Phone numbers allowed to message the public agent when DM policy is 'allowlist'. Add '*' for open access. Does not affect admin routing \u2014 use adminPhones for that."),
-  groupAllowFrom: z.array(z.string()).optional().describe("Phone numbers allowed to trigger the agent in groups when group policy is 'allowlist'."),
   sendReadReceipts: z.boolean().optional().default(true).describe("Whether to send read receipts (blue ticks) when messages are received. Disabling may feel less responsive but preserves privacy."),
   mediaMaxMb: z.number().int().positive().optional().default(50).describe("Maximum file size in MB for media the agent will download and process."),
   textChunkLimit: z.number().int().positive().optional().default(4e3).describe("Maximum characters per outbound message. Longer replies are split into multiple messages."),
@@ -2321,10 +2309,8 @@ function extractMessage(msg) {
 function resolveAccountConfig(config, accountConfig) {
   return {
     dmPolicy: accountConfig?.dmPolicy ?? config.dmPolicy ?? "disabled",
-    groupPolicy: accountConfig?.groupPolicy ?? config.groupPolicy ?? "disabled",
     adminPhones: accountConfig?.adminPhones ?? config.adminPhones ?? [],
     allowFrom: accountConfig?.allowFrom ?? config.allowFrom ?? [],
-    groupAllowFrom: accountConfig?.groupAllowFrom ?? config.groupAllowFrom ?? [],
     selfChatMode: accountConfig?.selfChatMode ?? false
   };
 }
@@ -2361,36 +2347,8 @@ function checkDmAccess(params) {
       return { allowed: false, reason: "unknown-dm-policy", agentType: "public" };
   }
 }
-function checkGroupAccess(params) {
-  const { senderPhone, selfPhone, groupJid, isMentioned } = params;
-  const cfg = resolveAccountConfig(params.config, params.accountConfig);
-  if (phonesMatch(senderPhone, selfPhone)) {
-    return { allowed: true, reason: "self-phone-group", agentType: "admin" };
-  }
-  switch (cfg.groupPolicy) {
-    case "open": {
-      const groupConfig = params.accountConfig?.groups?.[groupJid];
-      const activation = groupConfig?.activation ?? "mention";
-      if (activation === "off") {
-        return { allowed: false, reason: "group-activation-off", agentType: "public" };
-      }
-      if (activation === "mention" && !isMentioned) {
-        return { allowed: false, reason: "mention-gating", agentType: "public" };
-      }
-      return { allowed: true, reason: "group-policy-open", agentType: "public" };
-    }
-    case "allowlist": {
-      const inList = cfg.groupAllowFrom.some((entry) => phonesMatch(entry, senderPhone)) || cfg.adminPhones.some((entry) => phonesMatch(entry, senderPhone));
-      if (!inList) {
-        return { allowed: false, reason: "not-in-group-allowlist", agentType: "public" };
-      }
-      return { allowed: true, reason: "group-allowlist-match", agentType: "public" };
-    }
-    case "disabled":
-      return { allowed: false, reason: "group-policy-disabled", agentType: "public" };
-    default:
-      return { allowed: false, reason: "unknown-group-policy", agentType: "public" };
-  }
+function checkGroupAccess(_params) {
+  return { allowed: false, reason: "group-observe-only", agentType: "public" };
 }
 
 // app/lib/whatsapp/inbound/dedupe.ts
@@ -3275,11 +3233,20 @@ async function transcribe(audioPath, mimetype) {
   }
 }
 
+// app/lib/whatsapp/reply-error.ts
+var WaReplyError = class extends Error {
+  terminal;
+  constructor(message, terminal) {
+    super(message);
+    this.name = "WaReplyError";
+    this.terminal = terminal;
+  }
+};
+
 // app/lib/whatsapp/manager.ts
 var TAG12 = "[whatsapp:manager]";
 var MAX_RECONNECT_ATTEMPTS = 10;
 var MESSAGE_STORE_MAX = 500;
-var GROUP_META_TTL = 5 * 60 * 1e3;
 var connections = /* @__PURE__ */ new Map();
 var configDir = null;
 var whatsAppConfig = {};
@@ -3375,8 +3342,7 @@ async function startConnection(accountId) {
     reconnectAttempts: 0,
     abortController: new AbortController(),
     debouncer: null,
-    lidMapping: null,
-    groupMetaCache: /* @__PURE__ */ new Map()
+    lidMapping: null
   };
   connections.set(accountId, conn);
   await connectWithReconnect(conn);
@@ -3412,7 +3378,8 @@ function getStatus() {
     reconnectAttempts: conn.reconnectAttempts,
     lastConnectedAt: conn.lastConnectedAt,
     lastError: conn.lastError,
-    sessionStuckReason: conn.sessionStuckReason
+    sessionStuckReason: conn.sessionStuckReason,
+    terminalReason: conn.terminalReason
   }));
 }
 function getSocket(accountId) {
@@ -3456,8 +3423,7 @@ async function registerLoginSocket(accountId, sock, authDir) {
     lastConnectedAt: Date.now(),
     abortController: new AbortController(),
     debouncer: null,
-    lidMapping,
-    groupMetaCache: /* @__PURE__ */ new Map()
+    lidMapping
   };
   connections.set(accountId, conn);
   try {
@@ -3570,6 +3536,7 @@ async function connectWithReconnect(conn) {
       conn.selfLid = selfId.lid;
       conn.lastConnectedAt = connectedAt;
       conn.lastError = void 0;
+      conn.terminalReason = void 0;
       const rawLidMapping = sock.signalRepository?.lidMapping ?? null;
       conn.lidMapping = withSelfLidShortcut(rawLidMapping, selfId.lid, selfId.jid);
       if (selfId.lid) {
@@ -3612,6 +3579,7 @@ async function connectWithReconnect(conn) {
       conn.lastError = classification.message;
       console.error(`${TAG12} disconnect account=${conn.accountId}: ${classification.kind} \u2014 ${classification.message}`);
       if (!classification.shouldRetry) {
+        conn.terminalReason = classification.message;
         console.error(`${TAG12} terminal disconnect for account=${conn.accountId}, stopping reconnection`);
         return;
       }
@@ -3687,37 +3655,6 @@ function watchForDisconnect(conn) {
     }
   });
 }
-async function getGroupMeta(conn, jid) {
-  const cached3 = conn.groupMetaCache.get(jid);
-  if (cached3 && cached3.expires > Date.now()) return cached3;
-  if (!conn.sock) return null;
-  console.error(`${TAG12} group metadata cache miss for ${jid}, fetching from Baileys account=${conn.accountId}`);
-  try {
-    const meta = await conn.sock.groupMetadata(jid);
-    const participants = await Promise.all(
-      (meta.participants ?? []).map(async (p) => {
-        return await resolveJidToE164(p.id, conn.lidMapping) ?? p.id;
-      })
-    );
-    const entry = {
-      subject: meta.subject,
-      participants,
-      expires: Date.now() + GROUP_META_TTL
-    };
-    conn.groupMetaCache.set(jid, entry);
-    console.error(
-      `${TAG12} group metadata cached for ${jid}: "${meta.subject}", ${participants.length} participants, expires in ${GROUP_META_TTL}ms account=${conn.accountId}`
-    );
-    return entry;
-  } catch (err) {
-    console.error(
-      `${TAG12} group metadata fetch failed for ${jid}: ${err instanceof Error ? err.message : String(err)}, caching empty entry for ${GROUP_META_TTL}ms account=${conn.accountId}`
-    );
-    const emptyEntry = { expires: Date.now() + GROUP_META_TTL };
-    conn.groupMetaCache.set(jid, emptyEntry);
-    return null;
-  }
-}
 function monitorInbound(conn) {
   if (!conn.sock || !onInboundMessage) return;
   const sock = conn.sock;
@@ -3941,24 +3878,7 @@ async function handleInboundMessage(conn, msg) {
   }
   let accessResult;
   if (isGroup) {
-    accessResult = checkGroupAccess({
-      senderPhone,
-      selfPhone,
-      groupJid: remoteJid,
-      // Three-way mention recognition (Sub-fix 4): legacy phone-JID equality,
-      // legacy E.164-via-jidToE164 equality, plus the new self-LID equality so
-      // mentions in LID-addressed groups (deliver as `<self-lid>@lid`) match.
-      // Pre-LID groups continue matching the first two — additive, never blocks.
-      // Each clause guards against null on its right operand; a creds-parse
-      // failure leaves all three of selfJid/selfLid/selfPhone null and
-      // jidToE164 of a malformed mention also returns null — without the
-      // guards, `null === null` would spuriously match every nullified field.
-      isMentioned: extracted.mentionedJids.some(
-        (jid) => conn.selfJid !== null && jid === conn.selfJid || conn.selfLid !== null && jid === conn.selfLid || conn.selfPhone !== null && jidToE164(jid) === conn.selfPhone
-      ),
-      config: whatsAppConfig,
-      accountConfig: whatsAppConfig.accounts?.[conn.accountId]
-    });
+    accessResult = checkGroupAccess({ groupJid: remoteJid });
   } else {
     accessResult = checkDmAccess({
       senderPhone,
@@ -3971,18 +3891,20 @@ async function handleInboundMessage(conn, msg) {
     `${TAG12} inbound account=${conn.accountId} from=${senderPhone} group=${isGroup} access=${accessResult.allowed ? "allowed" : "blocked"}(${accessResult.reason}) agent=${accessResult.agentType}` + (extracted.mediaType ? ` media=${extracted.mediaType}` : "") + (mediaResult ? ` mediaPath=${mediaResult.path}` : "") + (extracted.quotedMessage ? ` replyTo=${extracted.quotedMessage.id}` : "")
   );
   if (!accessResult.allowed) return;
-  let groupSubject;
-  if (isGroup) {
-    const groupMeta = await getGroupMeta(conn, remoteJid);
-    groupSubject = groupMeta?.subject;
-  }
   const sendReceipts = whatsAppConfig.accounts?.[conn.accountId]?.sendReadReceipts ?? whatsAppConfig.sendReadReceipts ?? true;
   if (sendReceipts && msg.key.id) {
     sendReadReceipt(conn.sock, remoteJid, [msg.key.id], isGroup ? senderJid : void 0);
   }
   const reply = async (text) => {
+    if (isGroupJid(remoteJid)) {
+      console.error(`${TAG12} op=group-reply-blocked jid=${remoteJid}`);
+      throw new WaReplyError("group reply blocked \u2014 observe-only", false);
+    }
     const currentSock = conn.sock;
-    if (!currentSock) throw new Error("WhatsApp disconnected \u2014 cannot reply");
+    if (!currentSock) {
+      const reason = conn.terminalReason;
+      throw new WaReplyError(reason ?? "WhatsApp disconnected \u2014 cannot reply", Boolean(reason));
+    }
     await sendTextMessage(currentSock, remoteJid, text, { accountId: conn.accountId });
   };
   const composing = async () => {
@@ -4004,7 +3926,6 @@ async function handleInboundMessage(conn, msg) {
     text: extracted.text,
     isGroup,
     groupJid: isGroup ? remoteJid : void 0,
-    groupSubject,
     reply,
     composing,
     cacheKey,
@@ -4383,13 +4304,15 @@ app.get("/", async (c) => {
       selfPhone: a.selfPhone ?? null,
       reconnectAttempts: a.reconnectAttempts,
       lastError: a.lastError ?? null,
-      sessionStuckReason: a.sessionStuckReason ?? null
+      sessionStuckReason: a.sessionStuckReason ?? null,
+      terminalReason: a.terminalReason ?? null
     }));
   } catch (err) {
     console.error(`[health] failed to read WhatsApp status: ${err instanceof Error ? err.message : String(err)}`);
   }
   const whatsappAnyConnected = whatsappAccounts.some((a) => a.connected);
   const whatsappAnyStuck = whatsappAccounts.some((a) => Boolean(a.sessionStuckReason));
+  const whatsappAnyTerminal = whatsappAccounts.some((a) => Boolean(a.terminalReason));
   const account = resolveAccount();
   const missingPlugins = findMissingPlugins(account?.config.enabledPlugins);
   return c.json({
@@ -4404,6 +4327,7 @@ app.get("/", async (c) => {
     whatsapp: {
       any_connected: whatsappAnyConnected,
       any_stuck: whatsappAnyStuck,
+      any_terminal: whatsappAnyTerminal,
       accounts: whatsappAccounts
     }
   });
@@ -4677,7 +4601,10 @@ async function managerRcSpawn(opts) {
       sliceToken: opts.sliceToken,
       personId: opts.personId,
       userId: opts.userId,
-      waChannel: opts.waChannel
+      waChannel: opts.waChannel,
+      role: opts.role,
+      channel: opts.channel,
+      senderId: opts.senderId
     })
   }).catch((err) => ({ __throw: err instanceof Error ? err.message : String(err) }));
   if ("__throw" in res) {
@@ -5286,6 +5213,13 @@ async function ensureEntry(input) {
     spawned = await managerRcSpawn({
       sessionId: adminSessionId,
       name: nameValue ?? void 0,
+      // Task 724 — pass the real channel + role + senderId so the manager writes
+      // the classification sidecar for this admin channel (webchat, email, …),
+      // not just WhatsApp. Without these the live session was left sidecar-less
+      // and the sidebar channel badge / archive classification mis-read it.
+      role: "admin",
+      channel: input.channel,
+      senderId: input.senderId,
       logContext: `channel=${input.channel} senderId=${input.senderId}`
     });
   } else {
@@ -5987,16 +5921,6 @@ function resolvePublicAgent(accountDir, opts) {
     const config = readConfig(accountDir);
     const wa = config.whatsapp;
     if (!wa) return null;
-    if (opts.groupJid) {
-      const accounts2 = wa.accounts;
-      const account2 = accounts2?.[opts.accountId];
-      const groups = account2?.groups;
-      const group = groups?.[opts.groupJid];
-      const groupSlug = group?.publicAgent;
-      if (typeof groupSlug === "string" && groupSlug.trim()) {
-        return { slug: groupSlug.trim(), source: "group" };
-      }
-    }
     const accounts = wa.accounts;
     const account = accounts?.[opts.accountId];
     const accountSlug = account?.publicAgent;
@@ -6012,77 +5936,6 @@ function resolvePublicAgent(accountDir, opts) {
     return null;
   }
 }
-function setGroupPublicAgent(accountDir, accountId, groupJid, slug) {
-  const trimmedSlug = slug.trim();
-  const trimmedGroup = groupJid.trim();
-  const trimmedAccount = accountId.trim();
-  if (!trimmedSlug) return { ok: false, error: "Agent slug cannot be empty." };
-  if (!trimmedGroup) return { ok: false, error: "Group JID cannot be empty." };
-  if (!trimmedAccount) return { ok: false, error: "Account ID cannot be empty." };
-  const agentConfigPath = join4(accountDir, "agents", trimmedSlug, "config.json");
-  if (!existsSync4(agentConfigPath)) {
-    return { ok: false, error: `Agent "${trimmedSlug}" not found \u2014 no config.json at ${agentConfigPath}. Check the agent slug and try again.` };
-  }
-  try {
-    const config = readConfig(accountDir);
-    if (!config.whatsapp || typeof config.whatsapp !== "object") config.whatsapp = {};
-    const wa = config.whatsapp;
-    if (!wa.accounts || typeof wa.accounts !== "object") wa.accounts = {};
-    const accounts = wa.accounts;
-    if (!accounts[trimmedAccount] || typeof accounts[trimmedAccount] !== "object") accounts[trimmedAccount] = {};
-    const account = accounts[trimmedAccount];
-    if (!account.groups || typeof account.groups !== "object") account.groups = {};
-    const groups = account.groups;
-    const existing = groups[trimmedGroup] && typeof groups[trimmedGroup] === "object" ? groups[trimmedGroup] : {};
-    groups[trimmedGroup] = { ...existing, publicAgent: trimmedSlug };
-    const parsed = WhatsAppConfigSchema.safeParse(wa);
-    if (!parsed.success) {
-      const msg = parsed.error.issues.map((i) => `${i.path.join(".")}: ${i.message}`).join("; ");
-      return { ok: false, error: `Validation failed: ${msg}` };
-    }
-    config.whatsapp = parsed.data;
-    writeConfig(accountDir, config);
-    console.error(`${TAG17} setGroupPublicAgent account=${trimmedAccount} groupJid=${trimmedGroup} slug=${trimmedSlug}`);
-    reloadManagerConfig(accountDir);
-    return { ok: true, message: `Per-group public agent set to "${trimmedSlug}" for group ${trimmedGroup}.` };
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    console.error(`${TAG17} setGroupPublicAgent failed: ${msg}`);
-    return { ok: false, error: msg };
-  }
-}
-function unsetGroupPublicAgent(accountDir, accountId, groupJid) {
-  const trimmedGroup = groupJid.trim();
-  const trimmedAccount = accountId.trim();
-  if (!trimmedGroup) return { ok: false, error: "Group JID cannot be empty." };
-  if (!trimmedAccount) return { ok: false, error: "Account ID cannot be empty." };
-  try {
-    const config = readConfig(accountDir);
-    const wa = config.whatsapp ?? {};
-    const accounts = wa.accounts;
-    const account = accounts?.[trimmedAccount];
-    const groups = account?.groups;
-    const group = groups?.[trimmedGroup];
-    if (!group || typeof group.publicAgent !== "string") {
-      return { ok: true, message: `No per-group publicAgent override for group ${trimmedGroup}; nothing to remove.` };
-    }
-    delete group.publicAgent;
-    const parsed = WhatsAppConfigSchema.safeParse(wa);
-    if (!parsed.success) {
-      const msg = parsed.error.issues.map((i) => `${i.path.join(".")}: ${i.message}`).join("; ");
-      return { ok: false, error: `Validation failed: ${msg}` };
-    }
-    config.whatsapp = parsed.data;
-    writeConfig(accountDir, config);
-    console.error(`${TAG17} unsetGroupPublicAgent account=${trimmedAccount} groupJid=${trimmedGroup}`);
-    reloadManagerConfig(accountDir);
-    return { ok: true, message: `Per-group public agent override removed for group ${trimmedGroup}.` };
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    console.error(`${TAG17} unsetGroupPublicAgent failed: ${msg}`);
-    return { ok: false, error: msg };
-  }
-}
 function updateConfig(accountDir, fields) {
   const fieldNames = Object.keys(fields);
   if (fieldNames.length === 0) {
@@ -6615,29 +6468,10 @@ app3.post("/reconnect", async (c) => {
     return c.json({ error: String(err) }, 500);
   }
 });
-app3.post("/send", async (c) => {
-  try {
-    const body = await c.req.json();
-    const { to, text } = body;
-    const accountId = validateAccountId(body.accountId);
-    if (!to || !text) {
-      return c.json({ error: "Missing required fields: to, text" }, 400);
-    }
-    const sock = getSocket(accountId);
-    if (!sock) {
-      return c.json({ error: `WhatsApp account "${accountId}" is not connected` }, 503);
-    }
-    const result = await sendTextMessage(sock, to, text, { accountId });
-    return c.json(result);
-  } catch (err) {
-    console.error(`${TAG20} send error: ${String(err)}`);
-    return c.json({ error: String(err) }, 500);
-  }
-});
 app3.post("/config", async (c) => {
   try {
     const body = await c.req.json().catch(() => ({}));
-    const { action, phone, slug, groupJid, fields, accountId } = body;
+    const { action, phone, slug, fields, accountId } = body;
     if (!action || typeof action !== "string") {
       return c.json({ ok: false, error: 'Missing required field "action".' }, 400);
     }
@@ -6677,32 +6511,10 @@ app3.post("/config", async (c) => {
       }
       case "get-public-agent": {
         const targetAccount = typeof accountId === "string" && accountId.trim() ? accountId.trim() : "default";
-        const targetGroup = typeof groupJid === "string" && groupJid.trim() ? groupJid.trim() : void 0;
-        const resolved = resolvePublicAgent(account.accountDir, { accountId: targetAccount, groupJid: targetGroup });
-        console.error(`${TAG20} config action=get-public-agent accountId=${targetAccount} groupJid=${targetGroup ?? "none"} slug=${resolved?.slug ?? "none"} source=${resolved?.source ?? "none"}`);
+        const resolved = resolvePublicAgent(account.accountDir, { accountId: targetAccount });
+        console.error(`${TAG20} config action=get-public-agent accountId=${targetAccount} slug=${resolved?.slug ?? "none"} source=${resolved?.source ?? "none"}`);
         return c.json({ ok: true, slug: resolved?.slug ?? null, source: resolved?.source ?? null });
       }
-      case "set-group-public-agent": {
-        if (!slug || typeof slug !== "string") {
-          return c.json({ ok: false, error: 'Missing required field "slug" (the public-agent directory name, e.g. "my-agent").' }, 400);
-        }
-        if (!groupJid || typeof groupJid !== "string") {
-          return c.json({ ok: false, error: 'Missing required field "groupJid" (group JID ending in @g.us).' }, 400);
-        }
-        const targetAccount = typeof accountId === "string" && accountId.trim() ? accountId.trim() : "default";
-        const result = setGroupPublicAgent(account.accountDir, targetAccount, groupJid, slug);
-        console.error(`${TAG20} config action=set-group-public-agent accountId=${targetAccount} groupJid=${groupJid} slug=${slug} ok=${result.ok}`);
-        return c.json(result, result.ok ? 200 : 400);
-      }
-      case "unset-group-public-agent": {
-        if (!groupJid || typeof groupJid !== "string") {
-          return c.json({ ok: false, error: 'Missing required field "groupJid" (group JID ending in @g.us).' }, 400);
-        }
-        const targetAccount = typeof accountId === "string" && accountId.trim() ? accountId.trim() : "default";
-        const result = unsetGroupPublicAgent(account.accountDir, targetAccount, groupJid);
-        console.error(`${TAG20} config action=unset-group-public-agent accountId=${targetAccount} groupJid=${groupJid} ok=${result.ok}`);
-        return c.json(result, result.ok ? 200 : 400);
-      }
       case "list-public-agents": {
         const agentsDir = resolve7(account.accountDir, "agents");
         const agents = [];
@@ -6769,7 +6581,7 @@ app3.post("/config", async (c) => {
       }
       default:
         return c.json(
-          { ok: false, error: `Unknown action "${action}". Valid actions: add-admin-phone, remove-admin-phone, list-admin-phones, set-public-agent, get-public-agent, set-group-public-agent, unset-group-public-agent, list-public-agents, update-config, get-config, schema, list-groups.` },
+          { ok: false, error: `Unknown action "${action}". Valid actions: add-admin-phone, remove-admin-phone, list-admin-phones, set-public-agent, get-public-agent, list-public-agents, update-config, get-config, schema, list-groups.` },
           400
         );
     }
@@ -7319,8 +7131,14 @@ function splitNewLines(buf, baseOffset) {
   };
 }
 
-// server/routes/whatsapp-reader.ts
+// server/routes/admin/manager-client.ts
 var SESSION_ID_RE2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function managerBase3(tag) {
+  const port2 = requirePortEnv("CLAUDE_SESSION_MANAGER_PORT", { tag });
+  return `http://127.0.0.1:${port2}`;
+}
+
+// server/routes/whatsapp-reader.ts
 var app5 = new Hono();
 app5.get("/conversations", requireAdminSession, async (c) => {
   const cfg = claudeConfigDir();
@@ -8875,12 +8693,11 @@ app13.delete("/:id", requireAdminSession, async (c) => {
   if (!accountId) return c.json({ error: "Account not found for session" }, 401);
   const owned = await verifyConversationOwnership(sessionId, accountId);
   if (!owned) return c.json({ error: "Conversation not found" }, 404);
-  const managerPort = requirePortEnv("CLAUDE_SESSION_MANAGER_PORT", { tag: "admin-conversation-delete" });
-  const managerBase7 = `http://127.0.0.1:${managerPort}`;
+  const managerBaseUrl = managerBase3("admin-conversation-delete");
   const outcome = await cascadeAdminConversationDelete({
     sessionId,
     accountId,
-    managerBase: managerBase7
+    managerBase: managerBaseUrl
   });
   if (outcome.ok) return c.json({ ok: true, claudeSessionIds: outcome.claudeSessionIds });
   if (outcome.reason === "pty-still-alive") {
@@ -9534,10 +9351,6 @@ async function refuseIfClaudeAuthDead(c, route, sessionId) {
     503
   );
 }
-function managerBase3() {
-  const port2 = requirePortEnv("CLAUDE_SESSION_MANAGER_PORT", { tag: "claude-session-manager:wrapper" });
-  return `http://127.0.0.1:${port2}`;
-}
 var app14 = new Hono();
 async function performSpawnWithInitialMessage(args) {
   const ownerStart = Date.now();
@@ -9576,9 +9389,9 @@ async function performSpawnWithInitialMessage(args) {
     // unshapely values.
     conversationNodeId: args.conversationNodeId
   });
-  console.log(`${TAG21} forward-spawn-start managerBase=${managerBase3()} bytes=${upstreamPayload.length} hidden=${args.hidden} specialist=${args.specialist ?? "none"}`);
+  console.log(`${TAG21} forward-spawn-start managerBase=${managerBase3("claude-session-manager:wrapper")} bytes=${upstreamPayload.length} hidden=${args.hidden} specialist=${args.specialist ?? "none"}`);
   const forwardStart = Date.now();
-  const upstream = await fetch(`${managerBase3()}/public-spawn`, {
+  const upstream = await fetch(`${managerBase3("claude-session-manager:wrapper")}/public-spawn`, {
     method: "POST",
     headers: { "content-type": "application/json" },
     body: upstreamPayload
@@ -12547,8 +12360,7 @@ app20.post("/", requireAdminSession, async (c) => {
         );
         return c.json({ error: "AdminConversation node is missing sessionId" }, 500);
       }
-      const managerPort = requirePortEnv("CLAUDE_SESSION_MANAGER_PORT", { tag: "graph-page-cascade" });
-      const managerBase7 = `http://127.0.0.1:${managerPort}`;
+      const managerBaseUrl = managerBase3("graph-page-cascade");
       try {
         await session.close();
       } catch {
@@ -12556,7 +12368,7 @@ app20.post("/", requireAdminSession, async (c) => {
       const outcome = await cascadeAdminConversationDelete({
         sessionId,
         accountId,
-        managerBase: managerBase7
+        managerBase: managerBaseUrl
       });
       const elapsed2 = Date.now() - started;
       const labelSummary2 = preflightLabels.join(",");
@@ -13111,11 +12923,6 @@ var sidebar_artefacts_default = app24;
 
 // server/routes/admin/session-delete.ts
 var app25 = new Hono();
-var SESSION_ID_RE3 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-function managerBase4() {
-  const port2 = requirePortEnv("CLAUDE_SESSION_MANAGER_PORT", { tag: "session-delete:wrapper" });
-  return `http://127.0.0.1:${port2}`;
-}
 app25.post("/", requireAdminSession, async (c) => {
   let body;
   try {
@@ -13124,10 +12931,10 @@ app25.post("/", requireAdminSession, async (c) => {
     return c.json({ error: "invalid JSON body" }, 400);
   }
   const sessionId = typeof body.sessionId === "string" ? body.sessionId : "";
-  if (!SESSION_ID_RE3.test(sessionId)) {
+  if (!SESSION_ID_RE2.test(sessionId)) {
     return c.json({ error: "sessionId must be a v4 UUID" }, 400);
   }
-  const base = managerBase4();
+  const base = managerBase3("session-delete:wrapper");
   try {
     const stop = await fetch(`${base}/${sessionId}/stop`, { method: "POST" });
     if (stop.status !== 204 && stop.status !== 200 && stop.status !== 404) {
@@ -13158,11 +12965,6 @@ var session_delete_default = app25;
 
 // server/routes/admin/session-stop.ts
 var app26 = new Hono();
-var SESSION_ID_RE4 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-function managerBase5() {
-  const port2 = requirePortEnv("CLAUDE_SESSION_MANAGER_PORT", { tag: "session-stop:wrapper" });
-  return `http://127.0.0.1:${port2}`;
-}
 app26.post("/", requireAdminSession, async (c) => {
   let body;
   try {
@@ -13171,12 +12973,12 @@ app26.post("/", requireAdminSession, async (c) => {
     return c.json({ error: "invalid JSON body" }, 400);
   }
   const sessionId = typeof body.sessionId === "string" ? body.sessionId : "";
-  if (!SESSION_ID_RE4.test(sessionId)) {
+  if (!SESSION_ID_RE2.test(sessionId)) {
     return c.json({ error: "sessionId must be a v4 UUID" }, 400);
   }
   let res;
   try {
-    res = await fetch(`${managerBase5()}/${sessionId}/stop`, { method: "POST" });
+    res = await fetch(`${managerBase3("session-stop:wrapper")}/${sessionId}/stop`, { method: "POST" });
   } catch (err) {
     console.error(`[session-stop] sessionId=${sessionId} manager-unreachable err=${err instanceof Error ? err.message : String(err)}`);
     return c.json({ error: "manager-unreachable" }, 502);
@@ -13192,11 +12994,6 @@ var session_stop_default = app26;
 
 // server/routes/admin/session-rc-spawn.ts
 var app27 = new Hono();
-function managerBase6() {
-  const port2 = process.env.CLAUDE_SESSION_MANAGER_PORT;
-  if (!port2) throw new Error("CLAUDE_SESSION_MANAGER_PORT is not set");
-  return `http://127.0.0.1:${port2}`;
-}
 app27.post("/", requireAdminSession, async (c) => {
   let body;
   try {
@@ -13209,7 +13006,7 @@ app27.post("/", requireAdminSession, async (c) => {
   if (typeof body.name === "string" && body.name.length > 0) payload.name = body.name;
   let res;
   try {
-    res = await fetch(`${managerBase6()}/rc-spawn`, {
+    res = await fetch(`${managerBase3("session-rc-spawn:wrapper")}/rc-spawn`, {
       method: "POST",
       headers: { "content-type": "application/json" },
       body: JSON.stringify(payload)
@@ -15547,11 +15344,6 @@ async function startFileWatcher(opts = {}) {
   return { stop };
 }
 
-// app/lib/whatsapp/inbound/claude-bridge.ts
-function startReaper2() {
-  startReaper();
-}
-
 // app/lib/whatsapp/gateway/inbound-hub.ts
 var InboundHub = class {
   senders = /* @__PURE__ */ new Map();
@@ -15850,10 +15642,12 @@ function createWaChannelRoutes(deps) {
     try {
       await deps.sendOutbound(senderId, text);
     } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      const terminal = err instanceof WaReplyError ? err.terminal : false;
       console.error(
-        `[whatsapp-native] op=reply-failed senderId=${senderId} bytes=${bytes} error=${err instanceof Error ? err.message : String(err)}`
+        `[whatsapp-native] op=reply-failed senderId=${senderId} bytes=${bytes} terminal=${terminal} error=${message}`
       );
-      return c.json({ error: "send-failed" }, 500);
+      return c.json({ error: message, terminal }, 500);
     }
     console.error(`[whatsapp-native] op=reply-dispatch senderId=${senderId} bytes=${bytes}`);
     return c.json({ ok: true });
@@ -16373,6 +16167,11 @@ var waGateway = new WaGateway({
     const result = await managerRcSpawn({
       sessionId: adminSessionIdFor(accountId, senderId),
       userId,
+      // Task 724 — supply the channel so /rc-spawn writes the classification
+      // sidecar from the body, the same path every other admin channel uses.
+      // senderId for the sidecar continues to come from the waChannel binding.
+      role: "admin",
+      channel: "whatsapp",
       waChannel: { senderId, gatewayUrl, serverPath },
       logContext: `channel=whatsapp-native senderId=${senderId}`
     });
@@ -17229,7 +17028,7 @@ init({
 }).catch((err) => {
   console.error(`[whatsapp] init failed: ${String(err)}`);
 });
-startReaper2();
+startReaper();
 var shuttingDown = false;
 process.on("SIGTERM", async () => {
   if (shuttingDown) {