@rubytech/create-sitedesk-code 0.1.513 → 0.1.514

package/payload/server/server.js

@@ -5104,6 +5104,9 @@ function resolvePlatformAccountId(accountsDir = ACCOUNTS_DIR) {
   const routed = readChannelRoutingOverride(accountsDir, houseId);
   return routed ?? houseId;
 }
+function resolveHouseAccountId(accountsDir = ACCOUNTS_DIR) {
+  return resolveHouseId(accountsDir);
+}
 
 // app/lib/whatsapp/account-id-shape.ts
 var UUID_RE2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
@@ -6277,10 +6280,12 @@ async function startConnection(accountId) {
     return;
   }
   let platformAccountId;
+  let houseAccountId;
   try {
     platformAccountId = resolvePlatformAccountId();
+    houseAccountId = resolveHouseAccountId();
     console.error(
-      `[whatsapp-persist] resolved-account-id waname=${accountId} uuid=${platformAccountId}`
+      `[whatsapp-persist] resolved-account-id waname=${accountId} uuid=${platformAccountId} house=${houseAccountId}`
     );
   } catch (err) {
     const reason = err instanceof Error ? err.message : String(err);
@@ -6293,6 +6298,7 @@ async function startConnection(accountId) {
   const conn = {
     accountId,
     platformAccountId,
+    houseAccountId,
     accountName: whatsAppConfig.accounts?.[accountId]?.name,
     authDir,
     sock: null,
@@ -6370,6 +6376,10 @@ function resolveInboundPersistAccount(args) {
   warnNonUuidAccount("inbound-persist", account);
   return account;
 }
+function isManagerRoutedToHouse(args) {
+  const result = args.accessResult;
+  return result?.allowed === true && result.reason === "account-manager" && result.effectiveAccountId === args.houseAccountId;
+}
 function resolveConversationPersistAccount(sendAccountId, counterpartyPhone) {
   const conn = findConnectionByKey(Array.from(connections2.values()), sendAccountId);
   if (!conn) {
@@ -6399,10 +6409,12 @@ function listConnectionPlatformAccountIds() {
 async function registerLoginSocket(accountId, sock, authDir) {
   if (!configDir) throw new Error("WhatsApp manager not initialized");
   let platformAccountId;
+  let houseAccountId;
   try {
     platformAccountId = resolvePlatformAccountId();
+    houseAccountId = resolveHouseAccountId();
     console.error(
-      `[whatsapp-persist] resolved-account-id waname=${accountId} uuid=${platformAccountId}`
+      `[whatsapp-persist] resolved-account-id waname=${accountId} uuid=${platformAccountId} house=${houseAccountId}`
     );
   } catch (err) {
     const reason = err instanceof Error ? err.message : String(err);
@@ -6415,6 +6427,7 @@ async function registerLoginSocket(accountId, sock, authDir) {
   const conn = {
     accountId,
     platformAccountId,
+    houseAccountId,
     accountName: whatsAppConfig.accounts?.[accountId]?.name,
     authDir,
     sock,
@@ -7079,7 +7092,10 @@ async function handleInboundMessage(conn, msg) {
       `[whatsapp-native] op=account-manager-reject senderId=${senderPhone} reason=unresolved-effective-account`
     );
   }
-  if (accessResult.allowed && accessResult.reason === "account-manager" && accessResult.effectiveAccountId === conn.accountId) {
+  if (isManagerRoutedToHouse({
+    accessResult,
+    houseAccountId: conn.houseAccountId
+  })) {
     console.error(
       `[whatsapp-native] op=escalation-tripwire senderId=${senderPhone} reason=account-manager-routed-to-house effectiveAccount=${accessResult.effectiveAccountId}`
     );
@@ -8443,6 +8459,20 @@ function setAccountManager(accountDir, phone, subAccountId, mode = "active") {
   if (!validIds.includes(sub)) {
     return { ok: false, error: `Sub-account "${sub}" is not in this install's account registry. Check the sub-account id and try again.` };
   }
+  let houseId;
+  try {
+    houseId = resolveHouseOrSoleAccountId(dirname2(resolve9(accountDir)));
+  } catch (err) {
+    return { ok: false, error: `Could not resolve the house account to validate the binding: ${err instanceof Error ? err.message : String(err)}. Try again.` };
+  }
+  if (sub === houseId) {
+    console.error(`${TAG22} set-account-manager rejected phone=${normalized} reason=house-account-binding`);
+    return {
+      ok: false,
+      reason: "house-account-binding",
+      error: `${sub} is the house account, not a sub-account. An account manager bound to it would get house-owner admin scope. To make ${normalized} a house admin, add it to admin phones instead.`
+    };
+  }
   try {
     const config = readConfig(accountDir);
     if (!config.whatsapp || typeof config.whatsapp !== "object") {
@@ -9622,7 +9652,8 @@ app2.post("/config", async (c) => {
         }
         const managerMode = mode === "passive" ? "passive" : "active";
         const result = setAccountManager(account.accountDir, phone, managesAccount, managerMode);
-        console.error(`${TAG26} config action=add-account-manager phone=${phone} managesAccount=${managesAccount} mode=${managerMode} ok=${result.ok}`);
+        const managerReasonTail = !result.ok && result.reason ? ` reason=${result.reason}` : "";
+        console.error(`${TAG26} config action=add-account-manager phone=${phone} managesAccount=${managesAccount} mode=${managerMode} ok=${result.ok}${managerReasonTail}`);
         return c.json(result, result.ok ? 200 : 400);
       }
       case "remove-account-manager": {
@@ -26555,7 +26586,7 @@ var admin_users_list_default = app56;
 import { readdirSync as readdirSync27 } from "fs";
 var app57 = new Hono();
 var TAG47 = "[activity]";
-function resolveHouseAccountId(accounts) {
+function resolveHouseAccountId2(accounts) {
   const houses = accounts.filter((a) => a.config.role === "house");
   if (houses.length === 1) return { accountId: houses[0].accountId, reason: "house" };
   if (houses.length > 1) return { accountId: null, reason: "multiple-houses" };
@@ -26580,7 +26611,7 @@ app57.get("/", requireAdminSession, async (c) => {
   const cacheKey = c.var.cacheKey;
   const caller2 = getAccountIdForSession(cacheKey) ?? null;
   const valid = listValidAccounts();
-  const house = resolveHouseAccountId(valid);
+  const house = resolveHouseAccountId2(valid);
   const isHouse = caller2 !== null && house.accountId !== null && caller2 === house.accountId;
   console.log(
     `${TAG47} op=request req=${req} caller=${short(caller2)} house=${isHouse} houseVia=${house.reason}`

package/payload/server/public/assets/chat-DBgzjDIE.js

@@ -1 +0,0 @@
-import{B as e,W as t}from"./useSubAccountSwitcher-CJKjEPNN.js";import"./useVoiceRecorder-ChnBrzbZ.js";import"./AdminShell-BMPEWNZk.js";import{n}from"./page-DC11gesX.js";import"./useCopyFeedback-BdUwyNpa.js";var r=t(),i=e();(0,r.createRoot)(document.getElementById(`root`)).render((0,i.jsx)(n,{}));

package/payload/server/public/assets/chevron-left-DqYv3oFh.js

@@ -1 +0,0 @@
-import{P as e}from"./useSubAccountSwitcher-CJKjEPNN.js";var t=e(`chevron-left`,[[`path`,{d:`m15 18-6-6 6-6`,key:`1wnfg3`}]]);export{t};

package/payload/server/public/assets/chevron-right-CQfPGsFb.js

@@ -1 +0,0 @@
-import{P as e}from"./useSubAccountSwitcher-CJKjEPNN.js";var t=e(`chevron-right`,[[`path`,{d:`m9 18 6-6-6-6`,key:`mthhwq`}]]);export{t};

package/payload/server/public/assets/clock-Dn6FHB51.js

@@ -1 +0,0 @@
-import{P as e}from"./useSubAccountSwitcher-CJKjEPNN.js";var t=e(`clock`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`path`,{d:`M12 6v6l4 2`,key:`mmk7yg`}]]);export{t};

package/payload/server/public/assets/data-D_e6Vdfd.js

@@ -1 +0,0 @@
-import{B as e,W as t}from"./useSubAccountSwitcher-CJKjEPNN.js";import"./useVoiceRecorder-ChnBrzbZ.js";import{t as n}from"./page-BWFHRIAH.js";import"./graph-labels-BZgd0L6n.js";var r=t(),i=e();(0,r.createRoot)(document.getElementById(`root`)).render((0,i.jsx)(n,{}));