@rubytech/create-maxy-code 0.1.439 → 0.1.440

package/payload/server/server.js

@@ -89,7 +89,6 @@ import {
   resolveCallback,
   resolveClientIp,
   resolveDefaultAgentSlug,
-  retagAccountForUser,
   runAdminUserSelfHeal,
   runUserProfileReconcile,
   safeJson,
@@ -111,7 +110,7 @@ import {
   vncLog,
   walkPremiumBundles,
   writeAdminUserAndPerson
-} from "./chunk-UGPQCVIW.js";
+} from "./chunk-WC4WJR6X.js";
 import {
   __commonJS,
   __toESM
@@ -126,7 +125,7 @@ var require_dist = __commonJS({
     exports.cosine = cosine;
     exports.deconflictBySubject = deconflictBySubject;
     exports.formatStandingRulesBlock = formatStandingRulesBlock2;
-    exports.resolveOwnerUserId = resolveOwnerUserId;
+    exports.resolveOwnerUserId = resolveOwnerUserId2;
     exports.queryActiveRuleCandidates = queryActiveRuleCandidates;
     exports.resolveActiveRules = resolveActiveRules2;
     exports.activeRuleSet = activeRuleSet;
@@ -166,7 +165,7 @@ var require_dist = __commonJS({
       return `## Standing rules
 ${lines.join("\n")}`;
     }
-    async function resolveOwnerUserId(session, accountId) {
+    async function resolveOwnerUserId2(session, accountId) {
       const res = await session.run(`
     MATCH (au:AdminUser {accountId: $accountId, role: 'owner'})
     RETURN au.userId AS userId
@@ -202,7 +201,7 @@ ${lines.join("\n")}`;
     async function resolveCandidates(session, accountId) {
       let ownerUserId;
       try {
-        ownerUserId = await resolveOwnerUserId(session, accountId);
+        ownerUserId = await resolveOwnerUserId2(session, accountId);
       } catch {
         return { candidates: [], ownerUserId: null, source: "owner-error" };
       }
@@ -4756,7 +4755,10 @@ function buildSelfChatDispatch(input) {
     }),
     media: [],
     // Self-chat is the owner: the session scopes to the house account (Task 1383).
-    effectiveAccountId: input.accountId
+    effectiveAccountId: input.accountId,
+    // Task 1575 — self-chat is unambiguously the owner, so attribute the spawn
+    // to the owner userId even when the owner phone is unbound in users.json.
+    ownerSelfPhone: true
   };
 }
 async function init(opts) {
@@ -5566,7 +5568,11 @@ async function handleInboundMessage(conn, msg) {
     replyContext: extracted.quotedMessage,
     // Task 1383 — the gate's single resolution feeds the spawn (house or the
     // bound sub-account); the router never re-resolves.
-    effectiveAccountId: accessResult.effectiveAccountId
+    effectiveAccountId: accessResult.effectiveAccountId,
+    // Task 1575 — the gate's owner-self verdict. Only reason:'self-phone' is the
+    // owner's own number; adminPhones/account-manager admits are other admins
+    // and must not inherit the owner userId.
+    ownerSelfPhone: accessResult.reason === "self-phone"
   };
   if (accessResult.agentType === "public") {
     const hoursResult = await isBusinessOpen(conn.accountId);
@@ -8199,8 +8205,8 @@ import { readFileSync as readFileSync15, watch, statSync as statSync5, openSync,
 import { basename as basename4, dirname as dirname4, isAbsolute, join as join15, relative as relative2, resolve as resolve12, sep as sep3 } from "path";
 
 // server/routes/admin/sidebar-sessions.ts
-import { readdirSync as readdirSync6, readFileSync as readFileSync12, statSync as statSync3 } from "fs";
-import { dirname as dirname3, join as join12, resolve as resolve11 } from "path";
+import { readdirSync as readdirSync7, readFileSync as readFileSync13, statSync as statSync4 } from "fs";
+import { dirname as dirname3, join as join13, resolve as resolve11 } from "path";
 
 // ../services/claude-session-manager/src/jsonl-path.ts
 import { existsSync as existsSync8, readdirSync as readdirSync5 } from "fs";
@@ -8225,6 +8231,96 @@ function findExistingJsonlForSessionId(claudeConfigDir2, sessionId) {
   return null;
 }
 
+// app/lib/admin-identity/pin-validator.ts
+import { createHash as createHash3 } from "crypto";
+import { existsSync as existsSync9, readFileSync as readFileSync12, readdirSync as readdirSync6, statSync as statSync3 } from "fs";
+import { join as join12 } from "path";
+function hashPin(pin) {
+  return createHash3("sha256").update(pin).digest("hex");
+}
+function readUsersFile(usersFilePath) {
+  if (!existsSync9(usersFilePath)) return null;
+  const raw = readFileSync12(usersFilePath, "utf-8").trim();
+  if (!raw) return [];
+  return JSON.parse(raw);
+}
+function validatePin(pin, usersFilePath) {
+  let users;
+  try {
+    users = readUsersFile(usersFilePath);
+  } catch (err) {
+    return { kind: "corrupt", message: err instanceof Error ? err.message : String(err) };
+  }
+  if (users === null || users.length === 0) return { kind: "unavailable" };
+  const inputHash = hashPin(pin);
+  const matched = users.find((u) => u.pin === inputHash);
+  return matched ? { kind: "match", userId: matched.userId } : { kind: "miss" };
+}
+
+// app/lib/whatsapp/inbound/resolve-admin-userid.ts
+function classifyAdminUserId(users, admins, senderPhone) {
+  const matched = users.find((u) => typeof u.phone === "string" && phonesMatch(u.phone, senderPhone));
+  if (!matched) return { kind: "no-users-binding" };
+  return admins.some((a) => a.userId === matched.userId) ? { kind: "resolved", userId: matched.userId } : { kind: "userid-not-admin", userId: matched.userId };
+}
+function pickAdminUserId(users, admins, senderPhone) {
+  const r = classifyAdminUserId(users, admins, senderPhone);
+  return r.kind === "resolved" ? r.userId : null;
+}
+function pickOwnerUserId(admins) {
+  return admins.find((a) => a.role === "owner")?.userId ?? null;
+}
+function resolveOwnerUserId(accountId) {
+  try {
+    const account = listValidAccounts().find((a) => a.accountId === accountId);
+    return pickOwnerUserId(account?.config.admins ?? []);
+  } catch {
+    return null;
+  }
+}
+function resolveAdminUserId(params) {
+  try {
+    const users = readUsersFile(USERS_FILE);
+    if (!users) return null;
+    const account = listValidAccounts().find((a) => a.accountId === params.accountId);
+    const admins = account?.config.admins ?? [];
+    const direct = pickAdminUserId(users, admins, params.senderPhone);
+    if (direct) return direct;
+    const mapped = resolveViaLidMap(readLidMap() ?? {}, params.senderPhone);
+    if (!mapped) return null;
+    const viaLid = pickAdminUserId(users, admins, mapped);
+    if (viaLid) {
+      console.error(`[lid-map] resolved-via-cache lid=${params.senderPhone} userId=${viaLid.slice(0, 8)}`);
+    }
+    return viaLid;
+  } catch {
+    return null;
+  }
+}
+
+// app/lib/whatsapp-reader/resolve-operator-name.ts
+function resolveOperatorDisplay(userIdRes, nameRes) {
+  if (userIdRes.kind === "no-users-binding") return { name: null, reason: "no-binding" };
+  if (userIdRes.kind === "userid-not-admin") return { name: null, reason: "not-admin" };
+  if (nameRes && nameRes.source === "neo4j") return { name: nameRes.joined, reason: null };
+  if (nameRes && nameRes.reason === "neo4j-unreachable") return { name: null, reason: "neo4j-unreachable" };
+  return { name: null, reason: "no-person-name" };
+}
+
+// app/lib/whatsapp-reader/resolve-operator-names.ts
+async function resolveOperatorNamesBySender(users, admins, senderIds) {
+  const out = /* @__PURE__ */ new Map();
+  const distinct = [...new Set([...senderIds].filter((s) => !!s))];
+  await Promise.all(
+    distinct.map(async (senderId) => {
+      const idRes = classifyAdminUserId(users, admins, senderId);
+      const nameRes = idRes.kind === "resolved" ? await loadAdminUserName(idRes.userId) : null;
+      out.set(senderId, resolveOperatorDisplay(idRes, nameRes));
+    })
+  );
+  return out;
+}
+
 // server/routes/admin/sidebar-sessions.ts
 var SESSION_ID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\.jsonl$/i;
 function lastAssistantModel(body) {
@@ -8261,16 +8357,16 @@ function enumerateJsonls(projectsRoot) {
   const out = [];
   let slugs;
   try {
-    slugs = readdirSync6(projectsRoot, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
+    slugs = readdirSync7(projectsRoot, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
   } catch (err) {
     if (err.code === "ENOENT") return out;
     throw err;
   }
   for (const slug of slugs) {
-    const slugDir = join12(projectsRoot, slug);
+    const slugDir = join13(projectsRoot, slug);
     let entries;
     try {
-      entries = readdirSync6(slugDir, { withFileTypes: true });
+      entries = readdirSync7(slugDir, { withFileTypes: true });
     } catch (err) {
       const code = err.code ?? "unknown";
       console.error(`[admin-sessions-list] slug-skipped slug=${slug} code=${code}`);
@@ -8278,12 +8374,12 @@ function enumerateJsonls(projectsRoot) {
     }
     for (const entry of entries) {
       if (entry.isFile() && SESSION_ID_RE.test(entry.name)) {
-        out.push({ path: join12(slugDir, entry.name), isSubagent: false, archived: false });
+        out.push({ path: join13(slugDir, entry.name), isSubagent: false, archived: false });
       } else if (entry.isDirectory() && entry.name === "subagents") {
-        const subDir = join12(slugDir, entry.name);
+        const subDir = join13(slugDir, entry.name);
         let subEntries;
         try {
-          subEntries = readdirSync6(subDir, { withFileTypes: true });
+          subEntries = readdirSync7(subDir, { withFileTypes: true });
         } catch (err) {
           const code = err.code ?? "unknown";
           console.error(`[admin-sessions-list] subagents-skipped slug=${slug} code=${code}`);
@@ -8291,14 +8387,14 @@ function enumerateJsonls(projectsRoot) {
         }
         for (const sub of subEntries) {
           if (sub.isFile() && SESSION_ID_RE.test(sub.name)) {
-            out.push({ path: join12(subDir, sub.name), isSubagent: true, archived: false });
+            out.push({ path: join13(subDir, sub.name), isSubagent: true, archived: false });
           }
         }
       } else if (entry.isDirectory() && entry.name === "archive") {
-        const archiveDir = join12(slugDir, entry.name);
+        const archiveDir = join13(slugDir, entry.name);
         let archiveEntries;
         try {
-          archiveEntries = readdirSync6(archiveDir, { withFileTypes: true });
+          archiveEntries = readdirSync7(archiveDir, { withFileTypes: true });
         } catch (err) {
           const code = err.code ?? "unknown";
           console.error(`[admin-sessions-list] archive-skipped slug=${slug} code=${code}`);
@@ -8306,7 +8402,7 @@ function enumerateJsonls(projectsRoot) {
         }
         for (const arc of archiveEntries) {
           if (arc.isFile() && SESSION_ID_RE.test(arc.name)) {
-            out.push({ path: join12(archiveDir, arc.name), isSubagent: false, archived: true });
+            out.push({ path: join13(archiveDir, arc.name), isSubagent: false, archived: true });
           }
         }
       }
@@ -8339,10 +8435,10 @@ async function fetchLiveSessions() {
 function loadUserTitles(accountDir) {
   const out = /* @__PURE__ */ new Map();
   if (!accountDir) return out;
-  const path2 = join12(accountDir, "session-titles.json");
+  const path2 = join13(accountDir, "session-titles.json");
   let raw;
   try {
-    raw = readFileSync12(path2, "utf8");
+    raw = readFileSync13(path2, "utf8");
   } catch {
     return out;
   }
@@ -8368,7 +8464,7 @@ function readSidecarMeta(metaPath) {
   const empty = { bridgeIds: [], role: null, channel: null, senderId: null, startedAt: null, personId: null, adminUserId: null, visitorId: null, agentSlug: null, accountId: null };
   let raw;
   try {
-    raw = readFileSync12(metaPath, "utf8");
+    raw = readFileSync13(metaPath, "utf8");
   } catch {
     return empty;
   }
@@ -8466,11 +8562,22 @@ app3.get("/", requireAdminSession, async (c) => {
     console.error("[admin-sessions-list] CLAUDE_CONFIG_DIR not set; returning empty list");
     return c.json({ sessions: [], accountId: scopeAccountId });
   }
-  const projectsRoot = join12(configDir2, "projects");
+  const projectsRoot = join13(configDir2, "projects");
   const jsonls = enumerateJsonls(projectsRoot);
   const liveSessions = await fetchLiveSessions();
   const accountDir = scopeAccountId ? resolve11(ACCOUNTS_DIR, scopeAccountId) : null;
   const userTitles = loadUserTitles(accountDir);
+  const account = multiAccount ? validAccounts.find((a) => a.accountId === scopeAccountId) ?? null : resolveAccount();
+  let channelUsers = [];
+  if (account) {
+    try {
+      channelUsers = readUsersFile(USERS_FILE) ?? [];
+    } catch (err) {
+      console.error(`[admin-sessions-list] op=users-file-unreadable reason=${err instanceof Error ? err.message : String(err)}`);
+      channelUsers = [];
+    }
+  }
+  const channelAdmins = account?.config.admins ?? [];
   const rows = [];
   const seenIds = /* @__PURE__ */ new Set();
   let liveCount = 0;
@@ -8484,6 +8591,8 @@ app3.get("/", requireAdminSession, async (c) => {
   const titleSourceCounts = { user: 0, ai: 0, "first-message": 0, prefix: 0 };
   const personIdBySession = /* @__PURE__ */ new Map();
   const adminUserIdBySession = /* @__PURE__ */ new Map();
+  const channelSenderBySession = /* @__PURE__ */ new Map();
+  const channelMissNoSender = [];
   for (const { path: path2, isSubagent, archived } of jsonls) {
     const lastSlash = path2.lastIndexOf("/");
     const base = path2.slice(lastSlash + 1);
@@ -8497,8 +8606,8 @@ app3.get("/", requireAdminSession, async (c) => {
     let body;
     let mtimeMs;
     try {
-      body = readFileSync12(path2, "utf8");
-      mtimeMs = statSync3(path2).mtimeMs;
+      body = readFileSync13(path2, "utf8");
+      mtimeMs = statSync4(path2).mtimeMs;
     } catch {
       continue;
     }
@@ -8506,8 +8615,8 @@ app3.get("/", requireAdminSession, async (c) => {
     const pid = live ? liveSessions.get(sessionId) ?? null : null;
     const resolved = resolveTitle(body, sessionId, userTitles);
     titleSourceCounts[resolved.source] += 1;
-    const metaPath = join12(projectDir, `${sessionId}.meta.json`);
-    const { bridgeIds, role, channel: sidecarChannel, personId, adminUserId, accountId: rowAccountId } = readSidecarMeta(metaPath);
+    const metaPath = join13(projectDir, `${sessionId}.meta.json`);
+    const { bridgeIds, role, channel: sidecarChannel, senderId, personId, adminUserId, accountId: rowAccountId } = readSidecarMeta(metaPath);
     if (multiAccount) {
       if (rowAccountId === null) untaggedCount += 1;
       if (rowAccountId !== scopeAccountId) continue;
@@ -8539,8 +8648,13 @@ app3.get("/", requireAdminSession, async (c) => {
       channel: sidecarChannel,
       personName: null,
       model: lastAssistantModel(body),
-      accountId: rowAccountId
+      accountId: rowAccountId,
+      senderId
     });
+    if ((sidecarChannel === "whatsapp" || sidecarChannel === "telegram") && resolved.source === "prefix") {
+      if (senderId) channelSenderBySession.set(sessionId, senderId);
+      else channelMissNoSender.push({ sessionId, channel: sidecarChannel });
+    }
     if (sidecarChannel === "whatsapp") channelInList.whatsapp += 1;
     else if (sidecarChannel === "telegram") channelInList.telegram += 1;
     else if (sidecarChannel === "webchat") channelInList.webchat += 1;
@@ -8575,9 +8689,29 @@ app3.get("/", requireAdminSession, async (c) => {
       })
     );
   }
+  let channelNamesResolved = 0;
+  const channelNameCandidates = channelSenderBySession.size + channelMissNoSender.length;
+  if (account && channelSenderBySession.size > 0) {
+    const resolvedNames = await resolveOperatorNamesBySender(channelUsers, channelAdmins, channelSenderBySession.values());
+    for (const row of rows) {
+      const rowSenderId = channelSenderBySession.get(row.sessionId);
+      if (!rowSenderId) continue;
+      const r = resolvedNames.get(rowSenderId) ?? { name: null, reason: "no-binding" };
+      if (r.name) {
+        row.personName = r.name;
+        channelNamesResolved += 1;
+      } else {
+        const reason = r.reason === "neo4j-unreachable" ? "neo4j-down" : "classify-miss";
+        console.error(`[admin-sessions-list] op=channel-name-unresolved sessionId=${row.sessionId.slice(0, 8)} channel=${row.channel} senderId=${rowSenderId} reason=${reason}`);
+      }
+    }
+  }
+  for (const m of channelMissNoSender) {
+    console.error(`[admin-sessions-list] op=channel-name-unresolved sessionId=${m.sessionId.slice(0, 8)} channel=${m.channel} senderId= reason=no-senderId`);
+  }
   rows.sort((a, b) => a.startedAt < b.startedAt ? 1 : -1);
   console.log(
-    `[admin-sessions-list] rows=${rows.length} live=${liveCount} subagents=${subagentCount} archived=${archivedCount} channelInList=whatsapp:${channelInList.whatsapp},telegram:${channelInList.telegram},webchat:${channelInList.webchat} unknownChannel=${unknownChannelCount} excludedPublicWebchat=${excludedPublicWebchatCount} titles user=${titleSourceCounts.user} ai=${titleSourceCounts.ai} first=${titleSourceCounts["first-message"]} prefix=${titleSourceCounts.prefix} personNames=${personNameCount} adminNames=${adminNameCount} accountId=${scopeAccountId ? scopeAccountId.slice(0, 8) : "unset"}`
+    `[admin-sessions-list] rows=${rows.length} live=${liveCount} subagents=${subagentCount} archived=${archivedCount} channelInList=whatsapp:${channelInList.whatsapp},telegram:${channelInList.telegram},webchat:${channelInList.webchat} channelNameCandidates=${channelNameCandidates} channelNamesResolved=${channelNamesResolved} unknownChannel=${unknownChannelCount} excludedPublicWebchat=${excludedPublicWebchatCount} titles user=${titleSourceCounts.user} ai=${titleSourceCounts.ai} first=${titleSourceCounts["first-message"]} prefix=${titleSourceCounts.prefix} personNames=${personNameCount} adminNames=${adminNameCount} accountId=${scopeAccountId ? scopeAccountId.slice(0, 8) : "unset"}`
   );
   console.log(
     `[admin-sessions-list] accountId=${scopeAccountId ? scopeAccountId.slice(0, 8) : "unset"} scope=${multiAccount ? "scoped" : "all"} rows=${rows.length}`
@@ -8589,71 +8723,6 @@ app3.get("/", requireAdminSession, async (c) => {
 });
 var sidebar_sessions_default = app3;
 
-// app/lib/admin-identity/pin-validator.ts
-import { createHash as createHash3 } from "crypto";
-import { existsSync as existsSync9, readFileSync as readFileSync13, readdirSync as readdirSync7, statSync as statSync4 } from "fs";
-import { join as join13 } from "path";
-function hashPin(pin) {
-  return createHash3("sha256").update(pin).digest("hex");
-}
-function readUsersFile(usersFilePath) {
-  if (!existsSync9(usersFilePath)) return null;
-  const raw = readFileSync13(usersFilePath, "utf-8").trim();
-  if (!raw) return [];
-  return JSON.parse(raw);
-}
-function validatePin(pin, usersFilePath) {
-  let users;
-  try {
-    users = readUsersFile(usersFilePath);
-  } catch (err) {
-    return { kind: "corrupt", message: err instanceof Error ? err.message : String(err) };
-  }
-  if (users === null || users.length === 0) return { kind: "unavailable" };
-  const inputHash = hashPin(pin);
-  const matched = users.find((u) => u.pin === inputHash);
-  return matched ? { kind: "match", userId: matched.userId } : { kind: "miss" };
-}
-
-// app/lib/whatsapp/inbound/resolve-admin-userid.ts
-function classifyAdminUserId(users, admins, senderPhone) {
-  const matched = users.find((u) => typeof u.phone === "string" && phonesMatch(u.phone, senderPhone));
-  if (!matched) return { kind: "no-users-binding" };
-  return admins.some((a) => a.userId === matched.userId) ? { kind: "resolved", userId: matched.userId } : { kind: "userid-not-admin", userId: matched.userId };
-}
-function pickAdminUserId(users, admins, senderPhone) {
-  const r = classifyAdminUserId(users, admins, senderPhone);
-  return r.kind === "resolved" ? r.userId : null;
-}
-function resolveAdminUserId(params) {
-  try {
-    const users = readUsersFile(USERS_FILE);
-    if (!users) return null;
-    const account = listValidAccounts().find((a) => a.accountId === params.accountId);
-    const admins = account?.config.admins ?? [];
-    const direct = pickAdminUserId(users, admins, params.senderPhone);
-    if (direct) return direct;
-    const mapped = resolveViaLidMap(readLidMap() ?? {}, params.senderPhone);
-    if (!mapped) return null;
-    const viaLid = pickAdminUserId(users, admins, mapped);
-    if (viaLid) {
-      console.error(`[lid-map] resolved-via-cache lid=${params.senderPhone} userId=${viaLid.slice(0, 8)}`);
-    }
-    return viaLid;
-  } catch {
-    return null;
-  }
-}
-
-// app/lib/whatsapp-reader/resolve-operator-name.ts
-function resolveOperatorDisplay(userIdRes, nameRes) {
-  if (userIdRes.kind === "no-users-binding") return { name: null, reason: "no-binding" };
-  if (userIdRes.kind === "userid-not-admin") return { name: null, reason: "not-admin" };
-  if (nameRes && nameRes.source === "neo4j") return { name: nameRes.joined, reason: null };
-  if (nameRes && nameRes.reason === "neo4j-unreachable") return { name: null, reason: "neo4j-unreachable" };
-  return { name: null, reason: "no-person-name" };
-}
-
 // app/lib/agent-errors.ts
 function classifyAgentError(err) {
   const msg = err instanceof Error ? err.message : String(err);
@@ -9063,19 +9132,16 @@ app4.get("/conversations", requireAdminSession, async (c) => {
   const admins = account?.config.admins ?? [];
   const nameBySender = /* @__PURE__ */ new Map();
   const distinct = [...new Set(sessionRows.map((r) => r.senderId).filter((s) => !!s))];
-  await Promise.all(
-    distinct.map(async (senderId) => {
-      if (!account) {
-        nameBySender.set(senderId, null);
-        return;
-      }
-      const idRes = classifyAdminUserId(users, admins, senderId);
-      const nameRes = idRes.kind === "resolved" ? await loadAdminUserName(idRes.userId) : null;
-      const { name, reason } = resolveOperatorDisplay(idRes, nameRes);
+  if (account) {
+    const resolved = await resolveOperatorNamesBySender(users, admins, distinct);
+    for (const senderId of distinct) {
+      const { name, reason } = resolved.get(senderId) ?? { name: null, reason: "no-binding" };
       if (reason) console.error(`[wa-reader] op=operator-unresolved senderId=${senderId} reason=${reason}`);
       nameBySender.set(senderId, name);
-    })
-  );
+    }
+  } else {
+    for (const senderId of distinct) nameBySender.set(senderId, null);
+  }
   const sessionConversations = sessionRows.map((r) => ({
     ...r,
     operatorName: r.senderId ? nameBySender.get(r.senderId) ?? null : null
@@ -12399,8 +12465,8 @@ app11.post("/switch-account", requireAdminSession, async (c) => {
   const { userName, avatar } = await resolveUserIdentity(target.accountId, userId);
   const payload = await createAdminSession(target.accountId, target.config.thinkingView, userId, userName, operatorRoleFor(target.config, userId), avatar);
   unregisterSession(oldCacheKey);
-  retagAccountForUser(userId, target.accountId);
   console.log(`[sub-account] op=switch userId=${userId.slice(0, 8)} from=${oldCacheKey.slice(0, 8)} to=${target.accountId.slice(0, 8)}`);
+  console.log(`[sub-account] op=rebind cacheKey=${payload.session_key.slice(0, 8)} account=${target.accountId.slice(0, 8)} siblingsTouched=0`);
   return c.json(payload);
 });
 var session_default = app11;
@@ -22627,7 +22693,8 @@ var WaGateway = class {
         serverPath: this.deps.serverPath,
         passive: true,
         text: input.text,
-        msgId
+        msgId,
+        ownerSelfPhone: input.ownerSelfPhone
       });
       return;
     }
@@ -22682,7 +22749,10 @@ var WaGateway = class {
           gatewayUrl: this.deps.gatewayUrl,
           serverPath: this.deps.serverPath,
           // Task 1526 — a scheduled firing's per-firing seat id; absent on real inbound.
-          sessionIdOverride: input.scheduledSessionId
+          sessionIdOverride: input.scheduledSessionId,
+          // Task 1575 — the gate's owner-self verdict; drives owner attribution
+          // for an unbound owner self-phone at the spawn site.
+          ownerSelfPhone: input.ownerSelfPhone
         });
       } finally {
         this.spawning.delete(input.senderId);
@@ -24846,7 +24916,7 @@ var waGateway = new WaGateway({
     });
     return result.ok ? { ok: true, messageId: result.messageId } : { ok: false, error: result.error };
   },
-  ensureChannelSession: async ({ accountId, effectiveAccountId, senderId, role, personId, gatewayUrl, serverPath, passive, text, msgId, sessionIdOverride }) => {
+  ensureChannelSession: async ({ accountId, effectiveAccountId, senderId, role, personId, gatewayUrl, serverPath, passive, text, msgId, sessionIdOverride, ownerSelfPhone }) => {
     if (passive) {
       const phoneHash = createHash7("sha256").update(senderId).digest("hex").slice(0, 12);
       const prompt = (text ?? "").trim();
@@ -24895,9 +24965,10 @@ var waGateway = new WaGateway({
       console.error(`[whatsapp-native] op=account-manager-route senderId=${senderId} managesAccount=${managesAccount} effectiveAccount=${effectiveAccountId} source=gate`);
     }
     const req = buildWaSpawnRequest({ accountId: effectiveAccountId, senderId, role, personId, gatewayUrl, serverPath, sessionIdOverride });
-    const userId = role === "admin" ? resolveAdminUserId({ accountId: effectiveAccountId, senderPhone: senderId }) ?? void 0 : void 0;
+    const userId = role === "admin" ? resolveAdminUserId({ accountId: effectiveAccountId, senderPhone: senderId }) ?? (ownerSelfPhone ? resolveOwnerUserId(effectiveAccountId) ?? void 0 : void 0) : void 0;
     if (role === "admin") {
-      console.error(`[whatsapp-native] op=admin-identity senderId=${senderId} userId=${userId ?? "owner-fallback"}`);
+      const attribution = userId ?? (ownerSelfPhone ? "owner-self-unresolved" : "unbound-empty");
+      console.error(`[whatsapp-native] op=admin-identity senderId=${senderId} userId=${attribution}`);
     }
     const result = await managerRcSpawn({ ...req, userId });
     if ("error" in result) {
@@ -26159,7 +26230,10 @@ init({
         passive: decision.passive,
         text: msg.text,
         reply: msg.reply,
-        media: msg.media
+        media: msg.media,
+        // Task 1575 — carry the gate's owner-self verdict to the spawn site so an
+        // unbound owner self-phone attributes to the owner userId.
+        ownerSelfPhone: msg.ownerSelfPhone
       });
     } catch (err) {
       console.error(