@rubytech/create-maxy-code 0.1.540 → 0.1.542

package/payload/server/server.js

@@ -199,7 +199,7 @@ import {
   waitForConnection,
   warnNonUuidAccount,
   writeChatMetadataMerged
-} from "./chunk-TQTZXAK3.js";
+} from "./chunk-HZP7BKBF.js";
 import {
   ACCOUNTS_DIR,
   BIN_DIR,
@@ -3399,6 +3399,33 @@ app.get("/", async (c) => {
 });
 var health_default = app;
 
+// app/lib/claude-agent/public-address.ts
+function resolvePublicAddress(slug, accounts, houseAccountId, isActive) {
+  const claimants = accounts.filter((a) => isActive(a.accountDir, slug));
+  if (claimants.length === 0) return { kind: "none" };
+  if (claimants.length === 1) return { kind: "served", owner: claimants[0], refused: [] };
+  const house = claimants.find((a) => a.accountId === houseAccountId);
+  if (!house) return { kind: "ambiguous", claimants: claimants.map((a) => a.accountId) };
+  return {
+    kind: "served",
+    owner: house,
+    refused: claimants.filter((a) => a.accountId !== house.accountId).map((a) => a.accountId)
+  };
+}
+function resolvePublicAddressFromDisk(slug) {
+  const accounts = listValidAccounts().map((a) => ({ accountId: a.accountId, accountDir: a.accountDir }));
+  return resolvePublicAddress(slug, accounts, resolveAccount()?.accountId ?? null, isActiveAgentSlug);
+}
+function logPublicAddress(slug, verdict) {
+  if (verdict.kind === "served" && verdict.refused.length > 0) {
+    console.error(
+      `[webchat] op=address-collision slug=${slug} served=${verdict.owner.accountId} refused=${verdict.refused.join(",")}`
+    );
+  } else if (verdict.kind === "ambiguous") {
+    console.error(`[webchat] op=address-collision slug=${slug} served=none refused=${verdict.claimants.join(",")}`);
+  }
+}
+
 // app/lib/stt/voice-note.ts
 import { writeFile, mkdtemp, rm } from "fs/promises";
 import { tmpdir } from "os";
@@ -3593,15 +3620,43 @@ function isAdminKeyNamespace(key) {
 function webchatTurnTimeoutMs() {
   return Number(process.env.WEBCHAT_TURN_TIMEOUT_MS ?? String(2 * 6e4));
 }
+function resolveServingAccount(requestedSlug) {
+  if (requestedSlug) {
+    if (!validateAgentSlug(requestedSlug)) {
+      console.log(`[webchat] op=resolve slug=${requestedSlug} source=none agent=none account=none`);
+      return { ok: false, status: 404, error: "no-agent-for-address" };
+    }
+    const verdict = resolvePublicAddressFromDisk(requestedSlug);
+    logPublicAddress(requestedSlug, verdict);
+    if (verdict.kind !== "served") {
+      console.log(`[webchat] op=resolve slug=${requestedSlug} source=none agent=none account=none`);
+      return { ok: false, status: 404, error: "no-agent-for-address" };
+    }
+    console.log(
+      `[webchat] op=resolve slug=${requestedSlug} source=slug agent=${requestedSlug} account=${verdict.owner.accountId}`
+    );
+    return { ok: true, account: verdict.owner, agentSlug: requestedSlug };
+  }
+  const house = resolveAccount();
+  if (!house) {
+    console.log("[webchat] op=resolve slug=none source=none agent=none account=none");
+    return { ok: false, status: 500, error: "No account configured" };
+  }
+  const agentSlug = resolveDefaultAgentSlug(house.accountDir);
+  if (!agentSlug) {
+    console.log(`[webchat] op=resolve slug=none source=none agent=none account=${house.accountId}`);
+    return { ok: false, status: 404, error: "no-agent-for-address" };
+  }
+  console.log(
+    `[webchat] op=resolve slug=none source=default-fallback agent=${agentSlug} account=${house.accountId}`
+  );
+  return { ok: true, account: { accountId: house.accountId, accountDir: house.accountDir }, agentSlug };
+}
 function createChatRoutes(deps) {
   const app77 = new Hono();
   app77.post("/", async (c) => {
     console.log(`[chat-route] entered route=public method=POST`);
     const contentType = c.req.header("content-type") ?? "";
-    const account = resolveAccount();
-    if (!account) {
-      return c.json({ error: "No account configured" }, 500);
-    }
     let message;
     let session_key;
     let userTimestamp;
@@ -3611,6 +3666,8 @@ function createChatRoutes(deps) {
     let requestFormat;
     let attachmentCount = 0;
     let requestedSlug;
+    let account;
+    let agentSlug;
     if (contentType.startsWith("multipart/form-data")) {
       requestFormat = "multipart";
       let formData;
@@ -3633,6 +3690,10 @@ function createChatRoutes(deps) {
       if (!SESSION_KEY_RE.test(session_key)) {
         return c.json({ error: "session_key has invalid shape" }, 400);
       }
+      const serving = resolveServingAccount(requestedSlug);
+      if (!serving.ok) return c.json({ error: serving.error }, serving.status);
+      account = serving.account;
+      agentSlug = serving.agentSlug;
       const files = formData.getAll("attachments");
       if (files.length > MAX_FILES_PER_MESSAGE) {
         return c.json({ error: `Maximum ${MAX_FILES_PER_MESSAGE} files per message.` }, 422);
@@ -3710,26 +3771,16 @@ ${result.result.text}` : result.result.text;
       if (!message) {
         return c.json({ error: "message required" }, 400);
       }
+      const serving = resolveServingAccount(requestedSlug);
+      if (!serving.ok) return c.json({ error: serving.error }, serving.status);
+      account = serving.account;
+      agentSlug = serving.agentSlug;
     }
     console.log(
       `[chat-route] session=${session_key.slice(0, 8)} format=${requestFormat} messageLen=${message.length} attachments=${attachmentCount} staleTopicFields=${hasStaleTopicFields}`
     );
     const fullMessage = message + uploadNote;
     const encoder = new TextEncoder();
-    let agentSlug;
-    let resolveSource;
-    if (requestedSlug) {
-      const active = validateAgentSlug(requestedSlug) && isActiveAgentSlug(account.accountDir, requestedSlug);
-      agentSlug = active ? requestedSlug : null;
-      resolveSource = active ? "slug" : "none";
-    } else {
-      agentSlug = resolveDefaultAgentSlug(account.accountDir);
-      resolveSource = agentSlug ? "default-fallback" : "none";
-    }
-    console.log(`[webchat] op=resolve slug=${requestedSlug ?? "none"} source=${resolveSource} agent=${agentSlug ?? "none"}`);
-    if (!agentSlug) {
-      return c.json({ error: "no-agent-for-address" }, 404);
-    }
     let accessMode = "open";
     try {
       const config = resolveAgentConfig(account.accountDir, agentSlug);
@@ -5029,7 +5080,7 @@ async function defaultHttpGet(url) {
   }
 }
 async function defaultResolve(accountId) {
-  const { resolveSocket: resolveSocket2 } = await import("./manager-F6NXSOJW.js");
+  const { resolveSocket: resolveSocket2 } = await import("./manager-CM55K4J2.js");
   return resolveSocket2(accountId);
 }
 async function fetchAvatar(accountId, jid, deps = {}) {
@@ -8244,7 +8295,8 @@ app3.get("/conversation-graph-state", async (c) => {
 });
 app3.get("/group-info", async (c) => {
   const { accountId, targetSource } = resolveLifecycleAccountId(c, c.req.query("accountId") ?? null);
-  const callerAccountId = c.req.header("x-maxy-caller-account")?.trim() || null;
+  const { denial, callerAccountId } = callerScopeDenial(c, accountId, targetSource);
+  if (denial) return denial;
   const scope = `account=${accountId} targetSource=${targetSource} caller=${callerAccountId ?? "none"}`;
   const jid = c.req.query("jid");
   try {
@@ -11883,7 +11935,8 @@ function enumeratePublicRows() {
       senderId: meta.senderId,
       startedAt: meta.startedAt,
       visitorId: meta.visitorId,
-      agentSlug: meta.agentSlug
+      agentSlug: meta.agentSlug,
+      accountId: meta.accountId
     });
   }
   return rows;
@@ -11899,13 +11952,13 @@ app8.get("/session", (c) => {
   if (visitor.kind === "person") {
     found = resolveVisitorSession(rows, visitor.personId);
   } else {
-    const account = resolveAccount();
     const agentParam = c.req.query("agent");
     let effectiveSlug;
     if (agentParam) {
-      effectiveSlug = account && validateAgentSlug(agentParam) && isActiveAgentSlug(account.accountDir, agentParam) ? agentParam : null;
+      effectiveSlug = validateAgentSlug(agentParam) && resolvePublicAddressFromDisk(agentParam).kind === "served" ? agentParam : null;
     } else {
-      effectiveSlug = account ? resolveDefaultAgentSlug(account.accountDir) : null;
+      const house = resolveAccount();
+      effectiveSlug = house ? resolveDefaultAgentSlug(house.accountDir) : null;
     }
     found = effectiveSlug ? resolveOpenVisitorSession(rows, visitor.visitorId, effectiveSlug) : null;
   }
@@ -11971,8 +12024,8 @@ app8.get("/stream", (c) => {
 data: ${JSON.stringify(turn)}
 
 `));
-  const account = resolveAccount();
-  const uploadsDir = account ? publicUploadsDir(account.accountId, sessionId) : null;
+  const uploadAccountId = meta.accountId ?? resolveAccount()?.accountId ?? null;
+  const uploadsDir = uploadAccountId ? publicUploadsDir(uploadAccountId, sessionId) : null;
   const attachmentCursor = { consumed: 0 };
   const readable = new ReadableStream({
     start(controller) {
@@ -12051,12 +12104,12 @@ app8.get("/attachment/:attachmentId", (c) => {
     console.error(`${ATT_TAG} op=denied session=${ses} att=${at} reason=foreign-session`);
     return new Response("Not found", { status: 404 });
   }
-  const account = resolveAccount();
-  if (!account) {
+  const uploadAccountId = row.accountId ?? resolveAccount()?.accountId ?? null;
+  if (!uploadAccountId) {
     console.error(`${ATT_TAG} op=denied session=${ses} att=${at} reason=not-found`);
     return new Response("Not found", { status: 404 });
   }
-  const uploadsRoot = publicUploadsDir(account.accountId, sessionId);
+  const uploadsRoot = publicUploadsDir(uploadAccountId, sessionId);
   const dir = resolve15(uploadsRoot, attachmentId);
   if (!dir.startsWith(uploadsRoot + sep7)) {
     console.error(`${ATT_TAG} op=denied session=${ses} att=${at} reason=bad-id`);
@@ -27170,30 +27223,34 @@ app73.post("/", async (c) => {
   if (!body.session_id || typeof body.session_id !== "string") {
     return c.json({ error: "session_id required" }, 400);
   }
-  const accountId = getDefaultAccountId();
-  if (!accountId) {
-    console.error("[session] getDefaultAccountId() returned null \u2014 no account configured");
-    return c.json({ error: "No account configured" }, 503);
-  }
-  const account = resolveAccount();
   const cookieHeader = c.req.header("cookie");
   const visitorId = parseVisitorCookie2(cookieHeader);
+  let account;
   let agentSlug = null;
   if (body.agent) {
     if (!validateAgentSlug(body.agent)) {
       return c.json({ error: "Invalid agent name" }, 400);
     }
-    if (!account || !isActiveAgentSlug(account.accountDir, body.agent)) {
+    const verdict = resolvePublicAddressFromDisk(body.agent);
+    logPublicAddress(body.agent, verdict);
+    if (verdict.kind !== "served") {
       console.error(`[session] op=reject agent=${body.agent} reason=not-active`);
       return c.json({ error: "no-agent-for-address" }, 404);
     }
+    account = verdict.owner;
     agentSlug = body.agent;
   } else {
+    account = resolveAccount();
     agentSlug = account ? resolveDefaultAgentSlug(account.accountDir) : null;
     if (agentSlug) {
       console.log(`[session] using defaultAgent=${agentSlug} (no agent param)`);
     }
   }
+  const accountId = account?.accountId ?? null;
+  if (!accountId) {
+    console.error("[session] no account resolved for this address");
+    return c.json({ error: "No account configured" }, 503);
+  }
   if (!agentSlug) {
     console.error("[session] no agent resolved");
     return c.json({ error: "No agents configured" }, 404);
@@ -30664,6 +30721,7 @@ function buildPublicWebchatSpawnRequest(input) {
     role: "public",
     channel: "webchat",
     accountId: input.accountId,
+    agentAccountId: input.accountId,
     agentSlug,
     model: SONNET_MODEL,
     // sliceToken/personId are present only for a gated visitor; open-mode
@@ -31559,6 +31617,37 @@ function warnOnChannelAdminBindingDrift() {
   }
 }
 
+// app/lib/webchat/public-address-collision-audit.ts
+function auditPublicAddressCollisions(deps) {
+  const house = deps.houseAccountId();
+  const byslug = /* @__PURE__ */ new Map();
+  let checked2 = 0;
+  for (const row of deps.activeSlugs()) {
+    for (const slug of row.slugs) {
+      checked2++;
+      byslug.set(slug, [...byslug.get(slug) ?? [], row.accountId]);
+    }
+  }
+  const collisions = [];
+  for (const [slug, claimants] of byslug) {
+    if (claimants.length < 2) continue;
+    const served = house !== null && claimants.includes(house) ? house : null;
+    collisions.push({ slug, served, refused: claimants.filter((id) => id !== served) });
+  }
+  return { checked: checked2, collisions };
+}
+function runPublicAddressCollisionAudit(deps) {
+  const result = auditPublicAddressCollisions(deps);
+  for (const row of result.collisions) {
+    console.error(
+      `[webchat:public-address] op=collision slug=${row.slug} served=${row.served ?? "none"} refused=${row.refused.join(",")}`
+    );
+  }
+  console.error(
+    `[webchat:public-address] op=collision-audit checked=${result.checked} collisions=${result.collisions.length}`
+  );
+}
+
 // server/lib/booking-site-accounts.ts
 import { existsSync as existsSync48, readFileSync as readFileSync45 } from "fs";
 import { resolve as resolve43 } from "path";
@@ -32852,7 +32941,8 @@ ${clientErrorReporterScript}
 function loadBrandingCache(agentSlug) {
   const configDir = join53(homedir4(), BRAND.configDir);
   try {
-    const accountId = getDefaultAccountId();
+    const verdict = resolvePublicAddressFromDisk(agentSlug);
+    const accountId = verdict.kind === "served" ? verdict.owner.accountId : getDefaultAccountId();
     if (!accountId) return null;
     const cachePath = join53(configDir, "branding-cache", accountId, `${agentSlug}.json`);
     if (!existsSync50(cachePath)) return null;
@@ -33068,8 +33158,9 @@ app76.get("/browser", (c) => {
 app76.get("/:slug", async (c, next) => {
   const slug = c.req.param("slug");
   if (AGENT_SLUG_PATTERN.test(`/${slug}`)) {
-    const account = resolveAccount();
-    if (!account || !validateAgentSlug(slug) || !isActiveAgentSlug(account.accountDir, slug)) {
+    const verdict = validateAgentSlug(slug) ? resolvePublicAddressFromDisk(slug) : { kind: "none" };
+    logPublicAddress(slug, verdict);
+    if (verdict.kind !== "served") {
       console.error(`[public-catchall] op=reject path=/${slug} slug=${slug} reason=not-reachable`);
       return c.html(agentUnavailableHtml(), 404);
     }
@@ -33662,6 +33753,29 @@ registerLoop({
   firstRunDelayMs: 0,
   run: runIngestAuditTick
 });
+var WEBCHAT_ADDRESS_AUDIT_INTERVAL_MS = 60 * 60 * 1e3;
+registerLoop({
+  name: "webchat-address-audit",
+  intervalMs: WEBCHAT_ADDRESS_AUDIT_INTERVAL_MS,
+  firstRunDelayMs: 0,
+  run: () => {
+    try {
+      runPublicAddressCollisionAudit({
+        houseAccountId: () => resolveAccount()?.accountId ?? null,
+        activeSlugs: () => listValidAccounts().map((a) => {
+          const agentsRoot = join53(a.accountDir, "agents");
+          if (!existsSync50(agentsRoot)) return { accountId: a.accountId, slugs: [] };
+          const slugs = readdirSync29(agentsRoot, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name).filter((slug) => isActiveAgentSlug(a.accountDir, slug));
+          return { accountId: a.accountId, slugs };
+        })
+      });
+    } catch (err) {
+      console.error(
+        `[webchat:public-address] op=collision-audit-rejected detail=${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
+});
 var USERS_RECONCILE_INTERVAL_MS = 60 * 60 * 1e3;
 function countUsersRows() {
   if (!existsSync50(USERS_FILE)) return 0;