@rubytech/create-maxy 1.0.770 → 1.0.772

package/payload/server/public/index.html

@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Maxy</title>
   <link rel="icon" href="/favicon.ico">
-  <script type="module" crossorigin src="/assets/admin-CaXX8wc3.js"></script>
+  <script type="module" crossorigin src="/assets/admin-CFttroHB.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/chunk-DD-I1_y5.js">
   <link rel="modulepreload" crossorigin href="/assets/jsx-runtime-DeNudFNA.js">
   <link rel="modulepreload" crossorigin href="/assets/preload-helper-qlgyTAkD.js">

package/payload/server/server.js

@@ -47,7 +47,7 @@ import {
   vncLog,
   waitForExit,
   writeChromiumWrapper
-} from "./chunk-IO2WQEY4.js";
+} from "./chunk-57S5JC7G.js";
 import {
   ACCOUNTS_DIR,
   GREETING_DIRECTIVE,
@@ -87,6 +87,7 @@ import {
   interruptClient,
   listAdminSessions,
   listAdminSessionsInProgress,
+  loadAdminUserName,
   loadOnboardingStep,
   preConversationLogStream,
   preflushStreamLogKey,
@@ -107,7 +108,7 @@ import {
   validateSession,
   verifyAndGetConversationUpdatedAt,
   verifyConversationOwnership
-} from "./chunk-TKYZ7AEB.js";
+} from "./chunk-XHFMXKXI.js";
 
 // ../lib/graph-trash/dist/index.js
 var require_dist = __commonJS({
@@ -7444,11 +7445,17 @@ app8.post("/set-pin", async (c) => {
     return c.json({ error: "PIN must be at least 4 characters." }, 400);
   }
   const hash = hashPin(body.pin);
-  const userId = randomUUID7();
-  mkdirSync6(dirname5(USERS_FILE), { recursive: true });
-  writeFileSync7(USERS_FILE, JSON.stringify([{ userId, name: "Owner", pin: hash }]), { mode: 384 });
-  console.log(`[set-pin] created users.json: userId=${userId.slice(0, 8)}\u2026 hash=${hash.slice(0, 8)}\u2026`);
   const account = resolveAccount();
+  const existingOwnerUserId = account?.config.admins?.find((a) => a.role === "owner")?.userId;
+  const userId = existingOwnerUserId ?? randomUUID7();
+  if (existingOwnerUserId) {
+    console.log(`[set-pin] reusing existing owner userId=${userId.slice(0, 8)}\u2026 (change-PIN preserves identity)`);
+  } else {
+    console.log(`[set-pin] minted new userId=${userId.slice(0, 8)}\u2026 (first-time install)`);
+  }
+  mkdirSync6(dirname5(USERS_FILE), { recursive: true });
+  writeFileSync7(USERS_FILE, JSON.stringify([{ userId, pin: hash }]), { mode: 384 });
+  console.log(`[set-pin] wrote users.json: userId=${userId.slice(0, 8)}\u2026 hash=${hash.slice(0, 8)}\u2026`);
   if (account) {
     try {
       const config = JSON.parse(readFileSync10(`${account.accountDir}/account.json`, "utf-8"));
@@ -7706,8 +7713,9 @@ app9.post("/", async (c) => {
 var client_error_default = app9;
 
 // server/routes/admin/session.ts
-import { readFileSync as readFileSync11, existsSync as existsSync13 } from "fs";
+import { readFileSync as readFileSync11, writeFileSync as writeFileSync8, existsSync as existsSync13 } from "fs";
 import { createHash as createHash2 } from "crypto";
+var deprecationLogged = /* @__PURE__ */ new Set();
 function hashPin2(pin) {
   return createHash2("sha256").update(pin).digest("hex");
 }
@@ -7717,6 +7725,33 @@ function readUsersFile2() {
   if (!raw) return [];
   return JSON.parse(raw);
 }
+function stripLegacyNameField(users) {
+  const dirty = users.some((u) => "name" in u && u.name !== void 0);
+  if (!dirty) return;
+  for (const u of users) {
+    if ("name" in u && u.name !== void 0) {
+      if (!deprecationLogged.has(u.userId)) {
+        console.log(`[admin-identity] users-json-name-field-deprecated userId=${u.userId.slice(0, 8)}`);
+        deprecationLogged.add(u.userId);
+      }
+      delete u.name;
+    }
+  }
+  try {
+    writeFileSync8(USERS_FILE, JSON.stringify(users), { mode: 384 });
+  } catch (err) {
+    console.error(`[admin-identity] users-json strip failed: ${err instanceof Error ? err.message : String(err)}`);
+  }
+}
+async function resolveUserName(accountId, userId) {
+  const result = await loadAdminUserName(accountId, userId);
+  if (result.source === "neo4j") {
+    console.log(`[admin-identity] userName-source=neo4j userId=${userId.slice(0, 8)} givenName=${result.givenName} familyName=${result.familyName ?? "null"} joined=${result.joined}`);
+    return result.joined;
+  }
+  console.log(`[admin-identity] userName-source=fallback reason=${result.reason} userId=${userId.slice(0, 8)} accountId=${accountId.slice(0, 8)}`);
+  return result.reason === "neo4j-unreachable" ? "Owner" : void 0;
+}
 async function createAdminSession(accountId, thinkingView, userId, userName, role) {
   const account = resolveAccount();
   const effectiveThinkingView = thinkingView ?? account?.config.thinkingView ?? "default";
@@ -7776,11 +7811,20 @@ app10.get("/", async (c) => {
   }
   const role = getRoleForSession(sessionKey);
   console.log(`[admin-session] role=${role ?? "null"} sessionKey=${sessionKey.slice(0, 8)} phase=restore`);
+  const restoredUserId = getUserIdForSession(sessionKey);
+  let restoredUserName = getUserNameForSession(sessionKey);
+  if (restoredUserId) {
+    const resolved = await resolveUserName(accountId, restoredUserId);
+    restoredUserName = resolved;
+    if (resolved !== void 0) {
+      registerSession(sessionKey, "admin", accountId, void 0, restoredUserId, resolved, role ?? void 0);
+    }
+  }
   return c.json({
     session_key: sessionKey,
     agent_id: "admin",
-    userId: getUserIdForSession(sessionKey),
-    userName: getUserNameForSession(sessionKey),
+    userId: restoredUserId,
+    userName: restoredUserName,
     role: role ?? null,
     thinkingView,
     onboardingComplete,
@@ -7812,7 +7856,8 @@ app10.post("/", async (c) => {
     console.log(`[session] PIN auth failed: no matching user`);
     return c.json({ error: "Invalid PIN" }, 401);
   }
-  const { userId, name: userName } = matchedUser;
+  stripLegacyNameField(users);
+  const { userId } = matchedUser;
   const accounts = resolveUserAccounts(userId);
   if (accounts.length === 0) {
     console.log(`[session] user has no accounts: userId=${userId}`);
@@ -7831,13 +7876,14 @@ app10.post("/", async (c) => {
         return { accountId: a.accountId, businessName, role: a.role };
       })
     );
-    return c.json({ accounts: accountList, userId, userName });
+    return c.json({ accounts: accountList, userId });
   }
   const selected = body.accountId ? accounts.find((a) => a.accountId === body.accountId) : accounts[0];
   if (!selected) {
     console.log(`[session] account selection invalid: userId=${userId} requested=${body.accountId}`);
     return c.json({ error: "Invalid account selection." }, 403);
   }
+  const userName = await resolveUserName(selected.accountId, userId);
   const payload = await createAdminSession(selected.accountId, selected.config.thinkingView, userId, userName, selected.role);
   return c.json(payload);
 });
@@ -8135,7 +8181,7 @@ var app11 = new Hono();
 app11.post("/cancel", requireAdminSession, async (c) => {
   const session_key = c.var.sessionKey;
   try {
-    const { interruptClient: interruptClient2 } = await import("./client-pool-CX2MFW75.js");
+    const { interruptClient: interruptClient2 } = await import("./client-pool-J4ZHJ6Z3.js");
     await interruptClient2(session_key);
     return c.json({ ok: true });
   } catch (err) {
@@ -9340,7 +9386,7 @@ function isValidDomain(value) {
 }
 
 // app/lib/alias-domains.ts
-import { existsSync as existsSync18, mkdirSync as mkdirSync8, readFileSync as readFileSync14, writeFileSync as writeFileSync8 } from "fs";
+import { existsSync as existsSync18, mkdirSync as mkdirSync8, readFileSync as readFileSync14, writeFileSync as writeFileSync9 } from "fs";
 import { dirname as dirname7 } from "path";
 import { resolve as resolve16 } from "path";
 var ALIAS_DOMAINS_PATH = resolve16(MAXY_DIR, "alias-domains.json");
@@ -9359,7 +9405,7 @@ function addAliasDomain(hostname2) {
   if (existing.has(hostname2)) return;
   existing.add(hostname2);
   mkdirSync8(dirname7(ALIAS_DOMAINS_PATH), { recursive: true });
-  writeFileSync8(ALIAS_DOMAINS_PATH, JSON.stringify([...existing], null, 2) + "\n", "utf-8");
+  writeFileSync9(ALIAS_DOMAINS_PATH, JSON.stringify([...existing], null, 2) + "\n", "utf-8");
 }
 
 // server/routes/admin/cloudflare.ts