@rubytech/create-sitedesk-code 0.1.513 → 0.1.515

package/payload/server/server.js

@@ -3219,7 +3219,7 @@ var WhatsAppConfigSchema = z.object({
       z.string(),
       z.object({ managesAccount: z.string(), mode: z.enum(["active", "passive"]).optional() })
     ])
-  ).optional().describe("Account-manager bindings: E.164 phone \u2192 sub-account. The value is a bare sub-account UUID (mode 'active', the default: a full admin session) or { managesAccount, mode } where mode 'passive' selects a constrained requirement-intake spawn (only work-create, no reply). A bare string and an object without mode both resolve to 'active'. Managed via add-account-manager / remove-account-manager. A phone here must not also be in adminPhones."),
+  ).optional().describe("Account-manager bindings: E.164 phone \u2192 sub-account. The value is a bare sub-account UUID (mode 'active', the default: a full admin session) or { managesAccount, mode } where mode 'passive' selects a constrained requirement-intake spawn (only work-create, no reply). A bare string and an object without mode both resolve to 'active'. Managed via add-account-manager / remove-account-manager. A phone here must not also be in adminPhones. Read only from the account whose account.json the manager loads its config from (the house); add-account-manager is refused on any other account, and a map left there is inert and purged at boot."),
   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."),
   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."),
@@ -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}`
     );
@@ -8107,7 +8123,7 @@ function createScheduleInjectRoutes(deps) {
     const houseAccountId = account.accountId;
     console.error(`${TAG21} op=received eventId=${eventId} channel=${channel} destination=${destination} account=${houseAccountId}`);
     if (channel === "whatsapp") {
-      const effectiveAccount2 = deps.effectiveAccountFor(houseAccountId, account.accountDir, destination);
+      const effectiveAccount2 = deps.effectiveAccountFor(account.accountDir, destination);
       if (effectiveAccount2 === null) {
         console.error(`${TAG21} op=schedule-account-manager-reject eventId=${eventId} destination=${destination} reason=unresolved-effective-account`);
         return c.json({ ok: false, error: "account-manager-unresolved" }, 403);
@@ -8425,6 +8441,54 @@ function purgeNonSocketAdminPhonesAtBoot() {
     purgeNonSocketAdminPhones(acct.accountDir, socketOwner);
   }
 }
+function purgeNonSocketAccountManagers(accountDir, socketOwnerId) {
+  try {
+    const config = readConfig(accountDir);
+    const wa = config.whatsapp;
+    if (!wa || typeof wa !== "object") return { removed: [] };
+    const targetId = typeof config.accountId === "string" && config.accountId ? config.accountId : basename2(resolve9(accountDir));
+    if (targetId === socketOwnerId) return { removed: [] };
+    const map = wa.accountManagers;
+    if (!map || typeof map !== "object" || Array.isArray(map)) return { removed: [] };
+    const removed = Object.entries(map).map(([phone, entry]) => ({
+      phone,
+      managesAccount: typeof entry === "string" ? entry : entry && typeof entry === "object" && typeof entry.managesAccount === "string" ? entry.managesAccount : ""
+    }));
+    if (removed.length === 0) return { removed: [] };
+    delete wa.accountManagers;
+    writeConfig(accountDir, config);
+    for (const { phone, managesAccount } of removed) {
+      console.error(`[admin-identity] op=purge-nonsocket-accountmanager accountId=${targetId} phone=${phone} managesAccount=${managesAccount} removed=true`);
+    }
+    return { removed };
+  } catch (err) {
+    console.error(`[admin-identity] purge-nonsocket-accountmanager failed dir=${accountDir}: ${String(err)}`);
+    return { removed: [] };
+  }
+}
+function purgeNonSocketAccountManagersAtBoot() {
+  let socketOwner;
+  try {
+    socketOwner = resolveHouseOrSoleAccountId(ACCOUNTS_DIR);
+  } catch (err) {
+    console.error(`[admin-identity] purge-nonsocket-accountmanager skipped \u2014 cannot resolve socket owner: ${String(err)}`);
+    return;
+  }
+  const configOwner = resolveAccount()?.accountId ?? null;
+  if (configOwner !== socketOwner) {
+    console.error(`[admin-identity] purge-nonsocket-accountmanager skipped \u2014 resolver disagreement house=${socketOwner} configLoadedFrom=${configOwner ?? "unresolved"}`);
+    return;
+  }
+  let accounts;
+  try {
+    accounts = listValidAccounts();
+  } catch {
+    return;
+  }
+  for (const acct of accounts) {
+    purgeNonSocketAccountManagers(acct.accountDir, socketOwner);
+  }
+}
 function setAccountManager(accountDir, phone, subAccountId, mode = "active") {
   const normalized = phone.trim();
   if (!E164_PATTERN.test(normalized)) {
@@ -8443,8 +8507,31 @@ 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);
+    const targetId = typeof config.accountId === "string" && config.accountId ? config.accountId : basename2(resolve9(accountDir));
+    if (targetId !== houseId) {
+      console.error(`${TAG22} set-account-manager rejected phone=${normalized} reason=not-socket-account`);
+      return {
+        ok: false,
+        reason: "not-socket-account",
+        error: `The account-manager routing table is read from ${houseId}'s account.json only, so a binding stored on ${targetId} is never consulted. Bind ${normalized} on ${houseId} instead.`
+      };
+    }
     if (!config.whatsapp || typeof config.whatsapp !== "object") {
       config.whatsapp = {};
     }
@@ -9622,7 +9709,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": {
@@ -17031,6 +17119,7 @@ var session_upload_default = app17;
 // server/routes/admin/agents.ts
 import { resolve as resolve23 } from "path";
 import { readdirSync as readdirSync22, readFileSync as readFileSync33, existsSync as existsSync31, rmSync as rmSync2, renameSync as renameSync9, mkdirSync as mkdirSync7, writeFileSync as writeFileSync13 } from "fs";
+import { execFileSync as execFileSync6 } from "child_process";
 
 // ../services/claude-session-manager/src/tool-surface.ts
 import { readFileSync as readFileSync32, readdirSync as readdirSync21, statSync as statSync15, existsSync as existsSync30 } from "fs";
@@ -17780,6 +17869,17 @@ async function resolveWritableAccount(c, op, slug) {
   }
   return account;
 }
+function reconcileRoutingProse(accountDir, accountId, op, slug) {
+  const script = resolve23(PLATFORM_ROOT, "scripts", "lib", "agents-md-bootstrap.sh");
+  try {
+    execFileSync6("bash", [script, accountDir], { encoding: "utf-8", timeout: 1e4 });
+    return true;
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    console.error(`[admin/agents] op=agents-md-reconcile source=${op} accountId=${accountId.slice(0, 8)} slug=${slug} outcome=failed reason="${msg}"`);
+    return false;
+  }
+}
 app18.post("/:slug/disable", async (c) => {
   const slug = c.req.param("slug");
   if (SLUG_UNSAFE(slug)) return c.json({ error: "Invalid agent slug" }, 400);
@@ -17807,8 +17907,9 @@ app18.post("/:slug/disable", async (c) => {
     console.error(`[admin/agents] op=disable accountId=${resolved.accountId.slice(0, 8)} slug=${slug} outcome=failed reason="${msg}"`);
     return c.json({ error: `Disable failed, disabled store unreadable or unwritable: ${msg}` }, 500);
   }
-  console.log(`[admin/agents] op=disable accountId=${resolved.accountId.slice(0, 8)} slug=${slug} outcome=ok moved=${moved}`);
-  return c.json({ ok: true, moved });
+  const routingReconciled = reconcileRoutingProse(resolved.accountDir, resolved.accountId, "disable", slug);
+  console.log(`[admin/agents] op=disable accountId=${resolved.accountId.slice(0, 8)} slug=${slug} outcome=ok moved=${moved} routingReconciled=${routingReconciled}`);
+  return c.json({ ok: true, moved, routingReconciled });
 });
 app18.post("/:slug/enable", async (c) => {
   const slug = c.req.param("slug");
@@ -17837,8 +17938,9 @@ app18.post("/:slug/enable", async (c) => {
     console.error(`[admin/agents] op=enable accountId=${resolved.accountId.slice(0, 8)} slug=${slug} outcome=failed reason="${msg}"`);
     return c.json({ error: `Enable failed: ${msg}` }, 500);
   }
-  console.log(`[admin/agents] op=enable accountId=${resolved.accountId.slice(0, 8)} slug=${slug} outcome=ok restored=${restored}`);
-  return c.json({ ok: true, restored });
+  const routingReconciled = reconcileRoutingProse(resolved.accountDir, resolved.accountId, "enable", slug);
+  console.log(`[admin/agents] op=enable accountId=${resolved.accountId.slice(0, 8)} slug=${slug} outcome=ok restored=${restored} routingReconciled=${routingReconciled}`);
+  return c.json({ ok: true, restored, routingReconciled });
 });
 app18.delete("/:slug", async (c) => {
   const slug = c.req.param("slug");
@@ -26555,7 +26657,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 +26682,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}`
@@ -31749,6 +31851,22 @@ function warnOnChannelAdminBindingDrift() {
   }
 }
 
+// server/routes/channel/effective-account.ts
+function resolveScheduledEffectiveAccount(deps, accountDir, destination) {
+  const managed = managedAccountFor(deps.readAccountManagers(accountDir), destination);
+  if (managed === null) return deps.resolvePlatformAccountId();
+  if (managed.mode === "passive") return null;
+  if (!deps.isValidAccountId(managed.account)) return null;
+  return managed.account;
+}
+function resolveScheduledEffectiveAccountForInstall(accountDir, destination) {
+  return resolveScheduledEffectiveAccount(
+    { readAccountManagers, resolvePlatformAccountId, isValidAccountId },
+    accountDir,
+    destination
+  );
+}
+
 // server/lib/booking-site-accounts.ts
 import { existsSync as existsSync46, readFileSync as readFileSync46 } from "fs";
 import { resolve as resolve43 } from "path";
@@ -32481,13 +32599,13 @@ var scheduleInjectRoutes = createScheduleInjectRoutes({
     const sent = await sendTelegramText(botToken, chatId, text);
     if (!sent.ok) throw new Error(sent.error ?? "telegram send failed");
   },
-  effectiveAccountFor: (accountId, accountDir, destination) => {
-    const managed = managedAccountFor(readAccountManagers(accountDir), destination);
-    if (managed === null) return accountId;
-    if (managed.mode === "passive") return null;
-    if (!isValidAccountId(managed.account)) return null;
-    return managed.account;
-  }
+  // Task 2051 — the four branches moved into their own module so they have a
+  // test, and so the non-manager branch resolves the channel account through
+  // `resolvePlatformAccountId` (the function the live inbound path uses) rather
+  // than returning the house id this closure used to be handed. See
+  // effective-account.ts for why `resolveAccount()` was the wrong side to move,
+  // and why the real dependencies are bound there rather than assembled here.
+  effectiveAccountFor: resolveScheduledEffectiveAccountForInstall
 });
 app69.route("/api/channel/schedule-inject", scheduleInjectRoutes);
 app69.use("*", clientIpMiddleware);
@@ -33789,6 +33907,7 @@ for (const acct of listValidAccounts()) {
   cleanupLeakedPremiumSubs(acct.accountDir, acct.config, acct.accountId);
 }
 purgeNonSocketAdminPhonesAtBoot();
+purgeNonSocketAccountManagersAtBoot();
 void preloadEmbedModel();
 warnOnChannelAdminBindingDrift();
 var bootEnabled = Array.isArray(bootAccountConfig?.enabledPlugins) ? bootAccountConfig.enabledPlugins : [];

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,{}));