@rubytech/create-maxy 1.0.876 → 1.0.877

package/payload/server/server.js

@@ -1,19 +1,11 @@
 import {
   ACCOUNTS_DIR,
   ATTACHMENTS_ROOT,
-  CDP_PORT,
-  COMMERCIAL_MODE,
   Hono,
-  LOG_DIR,
-  MAXY_DIR,
   MAX_FILES_PER_MESSAGE,
   MAX_FILE_SIZE_BYTES,
   PLATFORM_ROOT,
   SUPPORTED_MIME_TYPES,
-  TELEGRAM_ADMIN_WEBHOOK_SECRET_FILE,
-  TELEGRAM_WEBHOOK_SECRET_FILE,
-  USERS_FILE,
-  WEBSOCKIFY_PORT,
   assertSupportedMime,
   autoDeliverPremiumPlugins,
   browserViewerLog,
@@ -83,12 +75,22 @@ import {
   vncLog,
   waitForExit,
   writeChromiumWrapper
-} from "./chunk-5U36PKG4.js";
+} from "./chunk-I4AQMEJA.js";
 import {
+  CDP_PORT,
+  COMMERCIAL_MODE,
+  LOG_DIR,
+  MAXY_DIR,
+  TELEGRAM_ADMIN_WEBHOOK_SECRET_FILE,
+  TELEGRAM_WEBHOOK_SECRET_FILE,
+  USERS_FILE,
+  WEBSOCKIFY_PORT,
   agentLogStream,
   clearSessionHistory,
   completeGrantSetup,
+  consumeWantsPriorConversation,
   getAccountIdForSession,
+  getActiveClient,
   getAgentNameForSession,
   getConversationIdForSession,
   getGrantForSession,
@@ -100,6 +102,7 @@ import {
   getVisitorIdForSession,
   interruptClient,
   listAdminSessionsInProgress,
+  mintAdminSessionKey,
   preConversationLogStream,
   registerGrantSession,
   registerResumedSession,
@@ -107,10 +110,11 @@ import {
   setAgentSessionId,
   setConversationIdForSession,
   setGroupContextForSession,
+  setWantsPriorConversation,
   sigtermFlushStreamLogs,
   unregisterSession,
   validateSession
-} from "./chunk-NDEQBCVI.js";
+} from "./chunk-GOZP57CX.js";
 import {
   CLOUDFLARE_TASK_DIAGNOSTICS,
   appendCloudflareSteps,
@@ -118,7 +122,7 @@ import {
   openCloudflareTask,
   readTunnelState,
   resolveUnitGoneVerdict
-} from "./chunk-UXLZ5Z3Y.js";
+} from "./chunk-RRVBWC66.js";
 import {
   GREETING_DIRECTIVE,
   HAIKU_MODEL,
@@ -137,6 +141,7 @@ import {
   getAgentSessionIdForConversation,
   getGroupParticipants,
   getMessagesSince,
+  getMostRecentAdminConversationForUser,
   getRecentMessages,
   getSession,
   getUserTimezone,
@@ -150,7 +155,7 @@ import {
   verifyAndGetConversationUpdatedAt,
   verifyConversationOwnership,
   writeAdminUserAndPerson
-} from "./chunk-FHNFKJZN.js";
+} from "./chunk-LU6TUP3E.js";
 import {
   __commonJS,
   __toESM
@@ -7000,8 +7005,9 @@ async function resolveUserIdentity(accountId, userId) {
 async function createAdminSession(accountId, thinkingView, userId, userName, role, avatar) {
   const account = resolveAccount();
   const effectiveThinkingView = thinkingView ?? account?.config.thinkingView ?? "default";
-  const sessionKey = crypto.randomUUID();
+  const sessionKey = userId ? mintAdminSessionKey({ accountId, userId }) : crypto.randomUUID();
   registerSession(sessionKey, "admin", accountId, void 0, userId, userName, role);
+  if (userId) setWantsPriorConversation(sessionKey);
   let onboardingComplete = true;
   try {
     const step = await loadOnboardingStep(accountId);
@@ -7439,7 +7445,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-XAEDMS5D.js");
+    const { interruptClient: interruptClient2 } = await import("./client-pool-VYDOIFG7.js");
     await interruptClient2(session_key);
     return c.json({ ok: true });
   } catch (err) {
@@ -7596,22 +7602,41 @@ app11.post("/", requireAdminSession, async (c) => {
   if (!isSystemMessage) {
     gatewayResult = await processInbound(message, "web-admin");
   }
+  let acquireReason = "cold";
+  let resumedAgentSessionId = null;
   let conversationId = getConversationIdForSession(session_key);
-  if (!conversationId) {
+  if (conversationId) {
+    acquireReason = getActiveClient(session_key) ? "warm" : "cold";
+  } else {
     const userId = getUserIdForSession(session_key);
     const userName = getUserNameForSession(session_key);
     const accountId = getAccountIdForSession(session_key);
     if (!userId || !accountId) {
       return chatReject(401, "Invalid or expired admin session", session_key);
     }
-    const minted = randomUUID6();
-    const created = await createNewAdminConversation(userId, accountId, session_key, userName, minted);
-    if (!created) {
-      return chatReject(500, "Failed to create conversation", session_key);
+    const wantsPrior = consumeWantsPriorConversation(session_key);
+    const prior = wantsPrior ? await getMostRecentAdminConversationForUser(accountId, userId) : null;
+    if (prior) {
+      conversationId = prior.conversationId;
+      setConversationIdForSession(session_key, conversationId);
+      setAgentSessionId(session_key, prior.agentSessionId);
+      resumedAgentSessionId = prior.agentSessionId;
+      acquireReason = "pin-rebind";
+      console.log(`[chat-route] resume-from-prior conversationId=${conversationId.slice(0, 8)}\u2026 priorAgentSessionId=${prior.agentSessionId.slice(0, 8)}\u2026 sessionKey=${session_key.slice(0, 12)}\u2026`);
+    } else {
+      if (wantsPrior) {
+        console.log(`[chat-route] prior-conversation-not-found accountId=${accountId.slice(0, 8)}\u2026 userId=${userId.slice(0, 8)}\u2026 sessionKey=${session_key.slice(0, 12)}\u2026 \u2014 cold-minting`);
+      }
+      const minted = randomUUID6();
+      const created = await createNewAdminConversation(userId, accountId, session_key, userName, minted);
+      if (!created) {
+        return chatReject(500, "Failed to create conversation", session_key);
+      }
+      conversationId = created;
+      setConversationIdForSession(session_key, conversationId);
+      acquireReason = "cold";
+      console.log(`[chat-route] new conversation conversationId=${conversationId} sessionKey=${session_key.slice(0, 12)}\u2026`);
     }
-    conversationId = created;
-    setConversationIdForSession(session_key, conversationId);
-    console.log(`[chat-route] new conversation conversationId=${conversationId} sessionKey=${session_key.slice(0, 12)}\u2026`);
   }
   const encoder = new TextEncoder();
   const sseLogStream = agentLogStream("sse-events", account.accountDir, conversationId);
@@ -7619,6 +7644,11 @@ app11.post("/", requireAdminSession, async (c) => {
   const teeStreamLogPath = resolve8(account.accountDir, "logs", `claude-agent-stream-${conversationId}.log`);
   try {
     appendFileSync3(teeStreamLogPath, `[${(/* @__PURE__ */ new Date()).toISOString()}] [chat-route-version=task965-mint-at-entry] sessionKey=${session_key.slice(0, 12)}\u2026 conversationId=${conversationId}
+`);
+  } catch {
+  }
+  try {
+    appendFileSync3(teeStreamLogPath, `[${(/* @__PURE__ */ new Date()).toISOString()}] [client-acquire] sessionKey=${session_key.slice(0, 12)}\u2026 resume=${resumedAgentSessionId ? resumedAgentSessionId.slice(0, 8) + "\u2026" : "none"} reason=${acquireReason}
 `);
   } catch {
   }
@@ -13467,7 +13497,7 @@ autoDeliverPremiumPlugins(bootEntitlement?.purchasedPlugins ?? void 0);
 (async () => {
   if (!bootAccount) return;
   try {
-    const { recoverRunningCloudflareTasks } = await import("./cloudflare-task-tracker-OCFIVXEJ.js");
+    const { recoverRunningCloudflareTasks } = await import("./cloudflare-task-tracker-M7APAYEF.js");
     const result = await recoverRunningCloudflareTasks(
       bootAccount.accountId,
       configDirForWhatsApp,

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

@@ -1 +0,0 @@
-import{i as e,t}from"./jsx-runtime-B8sGPXtT.js";import{t as n}from"./page-BM9O7QN8.js";import"./graph-labels-t_04n4zX.js";var r=e(),i=t();(0,r.createRoot)(document.getElementById(`root`)).render((0,i.jsx)(n,{}));

package/payload/server/public/assets/graph-DVAWZmkb.js

@@ -1 +0,0 @@
-import{i as e,t}from"./jsx-runtime-B8sGPXtT.js";import{n}from"./page-qI0NJSs6.js";import"./graph-labels-t_04n4zX.js";import"./Checkbox-BsqexMy3.js";var r=e(),i=t();(0,r.createRoot)(document.getElementById(`root`)).render((0,i.jsx)(n,{}));