@rubytech/create-maxy-code 0.1.158 → 0.1.161

package/payload/server/server.js

@@ -35,12 +35,12 @@ import {
   getAccountIdForSession,
   getAgentSessionIdForConversation,
   getConversationClaudeSessionIds,
-  getConversationIdByClaudeSessionId,
-  getConversationIdForSession,
   getRecentMessages,
   getRoleForSession,
   getSession,
-  getSessionKeyByConversationId,
+  getSessionIdByClaudeSessionId,
+  getSessionIdForSession,
+  getSessionKeyBySessionId,
   getUserIdForSession,
   getUserNameForSession,
   getUserTimezone,
@@ -70,8 +70,8 @@ import {
   safeJson,
   sanitizeClientCorrId,
   serve,
-  setConversationIdForSession,
   setRemotePassword,
+  setSessionIdForSession,
   setWantsPriorConversation,
   stripAttachmentMetaSuffix,
   tryCookieBridgeForConversation,
@@ -84,7 +84,7 @@ import {
   vncLog,
   walkPremiumBundles,
   writeAdminUserAndPerson
-} from "./chunk-AXOL2PPG.js";
+} from "./chunk-3TRIXQSJ.js";
 import {
   __commonJS,
   __toESM
@@ -114,7 +114,7 @@ var require_dist = __commonJS({
       KnowledgeDocument: ["attachmentId"],
       ConversationArchive: ["conversationIdentity"],
       DigitalDocument: ["attachmentId"],
-      Conversation: ["conversationId"],
+      Conversation: ["sessionId"],
       Message: ["messageId"],
       Workflow: ["workflowId"],
       WorkflowStep: ["stepId"],
@@ -541,7 +541,7 @@ var require_dist2 = __commonJS({
         }
       }
       if (primaryLabel === "Conversation") {
-        const id = typeof props.conversationId === "string" ? props.conversationId : null;
+        const id = typeof props.sessionId === "string" ? props.sessionId : null;
         if (id)
           return `Conv ${id.slice(0, 8)}`;
       }
@@ -584,7 +584,7 @@ var require_dist2 = __commonJS({
           return v;
       }
       if (primaryLabel === "Conversation") {
-        const id = typeof props.conversationId === "string" ? props.conversationId : null;
+        const id = typeof props.sessionId === "string" ? props.sessionId : null;
         if (id)
           return `Conv ${id.slice(0, 8)}`;
       }
@@ -2074,7 +2074,7 @@ async function persistWhatsAppMessage(input) {
   try {
     session = getSession();
     const cypher = `
-      MATCH (c:Conversation {conversationId: $conversationId})
+      MATCH (c:Conversation {sessionId: $sessionId})
       OPTIONAL MATCH (existingS:Person {telephone: $senderTelephone})
       OPTIONAL MATCH (existingM:Message {messageId: $messageId})
       WITH c,
@@ -2095,7 +2095,7 @@ async function persistWhatsAppMessage(input) {
         ON CREATE SET
           m:WhatsAppMessage,
           m.accountId        = $platformAccountId,
-          m.conversationId   = c.conversationId,
+          m.sessionId   = c.sessionId,
           m.source           = 'whatsapp',
           m.createdByAgent   = 'whatsapp-live',
           m.createdBySource  = 'whatsapp-live',
@@ -2138,7 +2138,7 @@ async function persistWhatsAppMessage(input) {
         senderReused         AS senderReused
     `;
     const params = {
-      conversationId: input.conversationId,
+      sessionId: input.sessionId,
       messageId,
       platformAccountId: input.platformAccountId,
       senderTelephone,
@@ -2228,16 +2228,16 @@ async function ensureWhatsAppConversation(input) {
       input.cacheKey
     );
     const ms = Date.now() - t0;
-    if (!result.conversationId) {
+    if (!result.sessionId) {
       console.error(
-        `${TAG7} conversation-merged FAIL cacheKey=${input.cacheKey} reason=null-conversationId ms=${ms}`
+        `${TAG7} conversation-merged FAIL cacheKey=${input.cacheKey} reason=null-sessionId ms=${ms}`
       );
       return null;
     }
     console.error(
       `${TAG7} conversation-merged cacheKey=${input.cacheKey} agentType=${input.agentType} channel=whatsapp created=${result.created} ms=${ms}`
     );
-    return { conversationId: result.conversationId, created: result.created };
+    return { sessionId: result.sessionId, created: result.created };
   } catch (err) {
     const ms = Date.now() - t0;
     const reason = err instanceof Error ? `${err.name}:${err.message.slice(0, 200)}` : String(err).slice(0, 200);
@@ -3266,7 +3266,7 @@ function monitorInbound(conn) {
                 platformAccountId: conn.platformAccountId,
                 remoteJid,
                 cacheKey,
-                conversationId: merged.conversationId,
+                sessionId: merged.sessionId,
                 msgKeyId: msg.key.id,
                 fromMe,
                 senderPhone,
@@ -5662,7 +5662,7 @@ app3.get("/conversation-graph-state", async (c) => {
       MATCH (c:Conversation {accountId: $accountId, channel: 'whatsapp', channelAddress: $channelAddress})
       OPTIONAL MATCH (m:Message:WhatsAppMessage)-[:PART_OF]->(c)
       RETURN
-        c.conversationId AS conversationId,
+        c.sessionId AS sessionId,
         m.messageId      AS messageId,
         m.dateSent       AS dateSent,
         m.fromMe         AS fromMe,
@@ -5672,14 +5672,14 @@ app3.get("/conversation-graph-state", async (c) => {
     `;
     let session = null;
     const t0 = Date.now();
-    let conversationId = null;
+    let sessionId = null;
     const rows = [];
     try {
       session = getSession();
       const result = await session.run(cypher, { accountId, channelAddress });
       for (const rec of result.records) {
-        if (conversationId === null) {
-          conversationId = rec.get("conversationId") ?? null;
+        if (sessionId === null) {
+          sessionId = rec.get("sessionId") ?? null;
         }
         const messageId = rec.get("messageId");
         if (!messageId) continue;
@@ -5698,10 +5698,10 @@ app3.get("/conversation-graph-state", async (c) => {
       return c.json({ error: `Graph query failed: ${msg}`, cacheKey, cypher: cypher.trim() }, 500);
     }
     const ms = Date.now() - t0;
-    console.error(`[mcp:whatsapp] tool=whatsapp-conversation-graph-state cacheKey=${cacheKey} graphRows=${rows.length} conversationId=${conversationId ?? "null"} ms=${ms}`);
+    console.error(`[mcp:whatsapp] tool=whatsapp-conversation-graph-state cacheKey=${cacheKey} graphRows=${rows.length} sessionId=${sessionId ?? "null"} ms=${ms}`);
     return c.json({
       cacheKey,
-      conversationId,
+      sessionId,
       graphRows: rows,
       cypher: cypher.trim(),
       ms
@@ -6353,7 +6353,7 @@ async function createAdminSession(accountId, thinkingView, userId, userName, rol
     businessName = branding?.name || void 0;
   } catch {
   }
-  let initialConversationId = null;
+  let initialSessionId = null;
   try {
     const ensured = await ensureConversation(
       accountId,
@@ -6363,15 +6363,15 @@ async function createAdminSession(accountId, thinkingView, userId, userName, rol
       void 0,
       userId
     );
-    if (ensured.conversationId) {
-      initialConversationId = ensured.conversationId;
-      setConversationIdForSession(cacheKey, ensured.conversationId);
+    if (ensured.sessionId) {
+      initialSessionId = ensured.sessionId;
+      setSessionIdForSession(cacheKey, ensured.sessionId);
     }
   } catch (err) {
     console.error(`[session] eager-ensureConversation FAILED at boot: ${err instanceof Error ? err.message : String(err)}`);
   }
-  console.log(`[session] ${(/* @__PURE__ */ new Date()).toISOString()} admin session created: userId=${userId ?? "\u2013"} userName=${userName ?? "\u2013"} accountId=${accountId} conversationId=${initialConversationId ?? "unbound"} cacheKey=${cacheKey.slice(0, 8)}`);
-  console.log(`[admin-session] role=${role ?? "null"} cacheKey=${cacheKey.slice(0, 8)} phase=create eager-ensured=${initialConversationId ? "true" : "false"}`);
+  console.log(`[session] ${(/* @__PURE__ */ new Date()).toISOString()} admin session created: userId=${userId ?? "\u2013"} userName=${userName ?? "\u2013"} accountId=${accountId} sessionId=${initialSessionId ?? "unbound"} cacheKey=${cacheKey.slice(0, 8)}`);
+  console.log(`[admin-session] role=${role ?? "null"} cacheKey=${cacheKey.slice(0, 8)} phase=create eager-ensured=${initialSessionId ? "true" : "false"}`);
   return {
     session_key: signedSessionToken,
     agent_id: "admin",
@@ -6381,7 +6381,7 @@ async function createAdminSession(accountId, thinkingView, userId, userName, rol
     role: role ?? null,
     thinkingView: effectiveThinkingView,
     businessName,
-    conversationId: initialConversationId
+    sessionId: initialSessionId
   };
 }
 var app6 = new Hono();
@@ -6428,7 +6428,7 @@ app6.get("/", async (c) => {
     role: role ?? null,
     thinkingView,
     businessName,
-    conversationId: getConversationIdForSession(cacheKey) ?? null
+    sessionId: getSessionIdForSession(cacheKey) ?? null
   });
 });
 app6.post("/", async (c) => {
@@ -6578,7 +6578,7 @@ var app9 = new Hono();
 app9.get("/", async (c) => {
   const fileParam = c.req.query("file");
   const typeParam = c.req.query("type");
-  const conversationIdParam = c.req.query("conversationId");
+  const sessionIdParam = c.req.query("sessionId");
   const cacheKeyParam = c.req.query("cacheKey");
   const download = c.req.query("download") === "1";
   const account = resolveAccount();
@@ -6626,18 +6626,18 @@ app9.get("/", async (c) => {
         400
       );
     }
-    if (!conversationIdParam && !cacheKeyParam) {
+    if (!sessionIdParam && !cacheKeyParam) {
       console.warn(`[admin/logs] rejected type=${typeParam} reason=no-id`);
       return c.json(
-        { error: `type=${typeParam} requires conversationId or cacheKey`, code: "ID_REQUIRED" },
+        { error: `type=${typeParam} requires sessionId or cacheKey`, code: "ID_REQUIRED" },
         400
       );
     }
     const cacheKey = cacheKeyParam ?? null;
-    const conversationId = conversationIdParam ?? null;
-    const sessionKeyFromConv = conversationId ? getSessionKeyByConversationId(conversationId) ?? null : null;
-    const primaryId = cacheKey ?? sessionKeyFromConv ?? conversationId;
-    const fallbackId = primaryId !== conversationId && conversationId ? conversationId : null;
+    const sessionId = sessionIdParam ?? null;
+    const sessionKeyFromConv = sessionId ? getSessionKeyBySessionId(sessionId) ?? null : null;
+    const primaryId = cacheKey ?? sessionKeyFromConv ?? sessionId;
+    const fallbackId = primaryId !== sessionId && sessionId ? sessionId : null;
     const tried = [];
     let hit = null;
     if (primaryId) {
@@ -6653,9 +6653,9 @@ app9.get("/", async (c) => {
       if (result.hits.length > 0) hit = result.hits[0];
     }
     const cacheKeySlice = cacheKey ? cacheKey.slice(0, 12) : "none";
-    const conversationIdSlice = conversationId ? conversationId.slice(0, 12) : "none";
+    const sessionIdSlice = sessionId ? sessionId.slice(0, 12) : "none";
     if (hit) {
-      console.info(`[admin/logs] resolved cacheKey=${cacheKeySlice} conversationId=${conversationIdSlice} via=${primaryId === cacheKey ? "cacheKey" : primaryId === sessionKeyFromConv ? "reverse-lookup" : "conversationId-fallback"}`);
+      console.info(`[admin/logs] resolved cacheKey=${cacheKeySlice} sessionId=${sessionIdSlice} via=${primaryId === cacheKey ? "cacheKey" : primaryId === sessionKeyFromConv ? "reverse-lookup" : "sessionId-fallback"}`);
       try {
         const filename = basename3(hit.path);
         const buffer = readFileSync10(hit.path);
@@ -6678,14 +6678,14 @@ app9.get("/", async (c) => {
     }
     const reason = "no log file on disk for the given identifier(s)";
     if (primaryId) emitMissingOnResolve(primaryId, "admin-logs-route", reason);
-    console.warn(`[admin/logs] not-found tried=[${tried.join(",")}] cacheKey=${cacheKeySlice} conversationId=${conversationIdSlice} reason=${JSON.stringify(reason)}`);
+    console.warn(`[admin/logs] not-found tried=[${tried.join(",")}] cacheKey=${cacheKeySlice} sessionId=${sessionIdSlice} reason=${JSON.stringify(reason)}`);
     return c.json(
       {
         error: reason,
         code: "NOT_FOUND",
         reason,
         cacheKey: cacheKey ?? null,
-        conversationId: conversationId ?? null
+        sessionId: sessionId ?? null
       },
       404
     );
@@ -6926,7 +6926,7 @@ import { existsSync as existsSync14, mkdirSync as mkdirSync3, createWriteStream
 async function purgeAdminConversationJsonls(args) {
   const fetchImpl = args.fetchImpl ?? fetch;
   const log = args.logger ?? ((line) => console.log(line));
-  const id8 = args.conversationId.slice(0, 8);
+  const id8 = args.sessionId.slice(0, 8);
   const purged = [];
   for (const sessionId of args.claudeSessionIds) {
     const url = `${args.managerBase}/${encodeURIComponent(sessionId)}`;
@@ -6936,7 +6936,7 @@ async function purgeAdminConversationJsonls(args) {
     } catch (err) {
       const message2 = err instanceof Error ? err.message : String(err);
       log(
-        `[admin-conversation-delete] conversationId=${id8} reason=jsonl-purge-failed claudeSessionId=${sessionId.slice(0, 8)} message=${message2}`
+        `[admin-conversation-delete] sessionId=${id8} reason=jsonl-purge-failed claudeSessionId=${sessionId.slice(0, 8)} message=${message2}`
       );
       return {
         ok: false,
@@ -6953,7 +6953,7 @@ async function purgeAdminConversationJsonls(args) {
     }
     if (res.status === 409) {
       log(
-        `[admin-conversation-delete] conversationId=${id8} reason=pty-still-alive claudeSessionId=${sessionId.slice(0, 8)}`
+        `[admin-conversation-delete] sessionId=${id8} reason=pty-still-alive claudeSessionId=${sessionId.slice(0, 8)}`
       );
       return {
         ok: false,
@@ -6970,7 +6970,7 @@ async function purgeAdminConversationJsonls(args) {
     } catch {
     }
     log(
-      `[admin-conversation-delete] conversationId=${id8} reason=jsonl-purge-failed claudeSessionId=${sessionId.slice(0, 8)} message=${message}`
+      `[admin-conversation-delete] sessionId=${id8} reason=jsonl-purge-failed claudeSessionId=${sessionId.slice(0, 8)} message=${message}`
     );
     return {
       ok: false,
@@ -6989,17 +6989,17 @@ async function cascadeAdminConversationDelete(args) {
   const started = Date.now();
   const fetchImpl = args.fetchImpl ?? fetch;
   const log = args.logger ?? ((line) => console.log(line));
-  const id8 = args.conversationId.slice(0, 8);
+  const id8 = args.sessionId.slice(0, 8);
   let claudeSessionIds;
   try {
-    claudeSessionIds = args.claudeSessionIds ?? await getConversationClaudeSessionIds(args.conversationId, args.accountId);
+    claudeSessionIds = args.claudeSessionIds ?? await getConversationClaudeSessionIds(args.sessionId, args.accountId);
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    log(`[admin-conversation-delete] conversationId=${id8} reason=graph-delete-failed claudeSessionIds-purged= message=transcript-resolve:${message}`);
+    log(`[admin-conversation-delete] sessionId=${id8} reason=graph-delete-failed claudeSessionIds-purged= message=transcript-resolve:${message}`);
     return { ok: false, reason: "graph-delete-failed", claudeSessionIdsPurged: [], message };
   }
   const purgeOutcome = await purgeAdminConversationJsonls({
-    conversationId: args.conversationId,
+    sessionId: args.sessionId,
     accountId: args.accountId,
     managerBase: args.managerBase,
     claudeSessionIds,
@@ -7022,11 +7022,11 @@ async function cascadeAdminConversationDelete(args) {
   const purged = purgeOutcome.claudeSessionIdsPurged;
   let found;
   try {
-    ({ found } = await deleteConversation(args.conversationId));
+    ({ found } = await deleteConversation(args.sessionId));
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     const csv2 = purged.map((s) => s.slice(0, 8)).join(",");
-    log(`[admin-conversation-delete] conversationId=${id8} reason=graph-delete-failed claudeSessionIds-purged=${csv2} message=${message}`);
+    log(`[admin-conversation-delete] sessionId=${id8} reason=graph-delete-failed claudeSessionIds-purged=${csv2} message=${message}`);
     return {
       ok: false,
       reason: "graph-delete-failed",
@@ -7039,7 +7039,7 @@ async function cascadeAdminConversationDelete(args) {
   }
   const ms = Date.now() - started;
   const csv = purged.map((s) => s.slice(0, 8)).join(",");
-  log(`[admin-conversation-delete] conversationId=${id8} claudeSessionIds=${csv} ms=${ms}`);
+  log(`[admin-conversation-delete] sessionId=${id8} claudeSessionIds=${csv} ms=${ms}`);
   return { ok: true, claudeSessionIds: purged, ms };
 }
 
@@ -7064,13 +7064,13 @@ import { homedir as homedir2 } from "os";
 var pickComponentBytes = (..._args) => null;
 
 // server/routes/admin/sessions.ts
-function openResumeStreamLog(accountId, conversationId) {
+function openResumeStreamLog(accountId, sessionId) {
   const dir = resolvePath(ACCOUNTS_DIR, accountId, "resume-logs");
   try {
     mkdirSync3(dir, { recursive: true });
   } catch {
   }
-  return createWriteStream(resolvePath(dir, `${conversationId}.log`), { flags: "a" });
+  return createWriteStream(resolvePath(dir, `${sessionId}.log`), { flags: "a" });
 }
 var healPending = /* @__PURE__ */ new Map();
 function markHealPending(accountId, attachmentId) {
@@ -7090,7 +7090,7 @@ function clearHealPending(accountId, attachmentId) {
 function isHealPending(accountId, attachmentId) {
   return healPending.get(accountId)?.has(attachmentId) ?? false;
 }
-function validateAndShapeAttachments(raws, conversationAccountId, conversationId, messageId, streamLogPath) {
+function validateAndShapeAttachments(raws, conversationAccountId, sessionId, messageId, streamLogPath) {
   const chips = [];
   let valid = 0;
   let invalid = 0;
@@ -7102,7 +7102,7 @@ function validateAndShapeAttachments(raws, conversationAccountId, conversationId
     if (reason) {
       invalid++;
       try {
-        streamLogPath.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [attachment-rehydrate-invalid] conversationId=${conversationId.slice(0, 8)} messageId=${messageId.slice(0, 8)} attachmentId=${(a.attachmentId || "").slice(0, 8)} reason=${reason}
+        streamLogPath.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [attachment-rehydrate-invalid] sessionId=${sessionId.slice(0, 8)} messageId=${messageId.slice(0, 8)} attachmentId=${(a.attachmentId || "").slice(0, 8)} reason=${reason}
 `);
       } catch {
       }
@@ -7118,7 +7118,7 @@ function validateAndShapeAttachments(raws, conversationAccountId, conversationId
   }
   return { chips, valid, invalid };
 }
-function reconstructAssistantEvents(content, components, conversationId, messageId, streamLogPath) {
+function reconstructAssistantEvents(content, components, sessionId, messageId, streamLogPath) {
   if (components.length === 0) {
     return {
       events: content.length > 0 ? [{ type: "text", content }] : [],
@@ -7162,7 +7162,7 @@ function reconstructAssistantEvents(content, components, conversationId, message
       invalid += 1;
       const notice = `[component-rehydrate-invalid] ${c.name || "<unnamed>"} could not be restored (reason=${invalidReason})`;
       events.push({ type: "text", content: notice, _invalid: true });
-      const line = `[${(/* @__PURE__ */ new Date()).toISOString()}] [component-rehydrate-invalid] conversationId=${conversationId.slice(0, 8)} messageId=${messageId.slice(0, 8)} name=${c.name || "<unnamed>"} reason=${invalidReason}
+      const line = `[${(/* @__PURE__ */ new Date()).toISOString()}] [component-rehydrate-invalid] sessionId=${sessionId.slice(0, 8)} messageId=${messageId.slice(0, 8)} name=${c.name || "<unnamed>"} reason=${invalidReason}
 `;
       try {
         streamLogPath.write(line);
@@ -7215,7 +7215,7 @@ app14.get("/", requireAdminSession, async (c) => {
   try {
     const flushed = await listAdminSessions(accountId, userId, 20);
     const sessions = flushed.map((r) => ({
-      conversationId: r.conversationId,
+      sessionId: r.sessionId,
       cacheKey: null,
       name: r.name,
       updatedAt: r.updatedAt,
@@ -7251,7 +7251,7 @@ app14.post("/new", requireAdminSession, async (c) => {
   registerSession(newCacheKey, "admin", accountId, void 0, userId, userName);
   unregisterSession(oldCacheKey);
   console.log(`[admin-chat] new-conversation outcome=ok oldKey=${oldCacheKey.slice(0, 8)} newKey=${newCacheKey.slice(0, 8)}`);
-  return c.json({ session_key: newSignedSessionToken, conversationId: null });
+  return c.json({ session_key: newSignedSessionToken, sessionId: null });
 });
 app14.post("/switch", requireAdminSession, async (c) => {
   const cacheKey = c.var.cacheKey;
@@ -7277,21 +7277,21 @@ app14.post("/switch", requireAdminSession, async (c) => {
     console.error(`[session-switch] reject reason=ownership-mismatch from=${cacheKey.slice(0, 8)} target=${targetCacheKey.slice(0, 8)} accountMatch=${targetAccountId === accountId} userMatch=${targetUserId === userId}`);
     return c.json({ error: "Target session not owned by current operator" }, 403);
   }
-  const targetConversationId = getConversationIdForSession(targetCacheKey) ?? null;
-  console.log(`[session-switch] from=${cacheKey.slice(0, 8)} to=${targetCacheKey.slice(0, 8)} targetConvId=${targetConversationId?.slice(0, 8) ?? "none"} accountId=${accountId.slice(0, 8)}`);
-  return c.json({ session_key: targetSignedSessionToken, conversationId: targetConversationId });
+  const targetSessionId = getSessionIdForSession(targetCacheKey) ?? null;
+  console.log(`[session-switch] from=${cacheKey.slice(0, 8)} to=${targetCacheKey.slice(0, 8)} targetConvId=${targetSessionId?.slice(0, 8) ?? "none"} accountId=${accountId.slice(0, 8)}`);
+  return c.json({ session_key: targetSignedSessionToken, sessionId: targetSessionId });
 });
 app14.delete("/:id", requireAdminSession, async (c) => {
-  const conversationId = c.req.param("id");
+  const sessionId = c.req.param("id");
   const cacheKey = c.var.cacheKey;
   const accountId = getAccountIdForSession(cacheKey);
   if (!accountId) return c.json({ error: "Account not found for session" }, 401);
-  const owned = await verifyConversationOwnership(conversationId, accountId);
+  const owned = await verifyConversationOwnership(sessionId, accountId);
   if (!owned) return c.json({ error: "Conversation not found" }, 404);
   const managerPort = requirePortEnv("CLAUDE_SESSION_MANAGER_PORT", { tag: "admin-conversation-delete" });
   const managerBase3 = `http://127.0.0.1:${managerPort}`;
   const outcome = await cascadeAdminConversationDelete({
-    conversationId,
+    sessionId,
     accountId,
     managerBase: managerBase3
   });
@@ -7311,7 +7311,7 @@ app14.delete("/:id", requireAdminSession, async (c) => {
         error: "jsonl-purge-failed",
         detail: outcome.message,
         claudeSessionId: outcome.claudeSessionId,
-        conversationId,
+        sessionId,
         claudeSessionIdsPurged: outcome.claudeSessionIdsPurged
       },
       outcome.status >= 400 && outcome.status < 600 ? outcome.status : 502
@@ -7321,14 +7321,14 @@ app14.delete("/:id", requireAdminSession, async (c) => {
     {
       error: "graph-delete-failed",
       detail: outcome.message,
-      conversationId,
+      sessionId,
       claudeSessionIdsPurged: outcome.claudeSessionIdsPurged
     },
     500
   );
 });
 app14.post("/:id/resume", async (c) => {
-  const conversationId = c.req.param("id");
+  const sessionId = c.req.param("id");
   const t0 = Date.now();
   const signedSessionToken = c.req.query("session_key") ?? "";
   if (!signedSessionToken) {
@@ -7340,7 +7340,7 @@ app14.post("/:id/resume", async (c) => {
   let result = validateSession(cacheKey, "admin", signedSessionToken);
   if (!result.ok) {
     if (result.reason === "session-not-registered") {
-      const bridge = await tryCookieBridgeForConversation(c, cacheKey, conversationId);
+      const bridge = await tryCookieBridgeForConversation(c, cacheKey, sessionId);
       if (!bridge.ok) {
         if (bridge.reason === "conversation-not-found") {
           return c.json({ error: "Conversation not found" }, 404);
@@ -7371,11 +7371,11 @@ app14.post("/:id/resume", async (c) => {
   if (!userId && !bridged) {
     return c.json({ error: "Session missing user context" }, 400);
   }
-  const updatedAt = await verifyAndGetConversationUpdatedAt(conversationId, accountId);
+  const updatedAt = await verifyAndGetConversationUpdatedAt(sessionId, accountId);
   if (updatedAt === null) return c.json({ error: "Conversation not found" }, 404);
-  const persistedAgentSessionId = await getAgentSessionIdForConversation(conversationId);
-  setConversationIdForSession(cacheKey, conversationId);
-  const streamLogPath = openResumeStreamLog(accountId, conversationId);
+  const persistedAgentSessionId = await getAgentSessionIdForConversation(sessionId);
+  setSessionIdForSession(cacheKey, sessionId);
+  const streamLogPath = openResumeStreamLog(accountId, sessionId);
   const tag = persistedAgentSessionId ? `agentSessionId=${persistedAgentSessionId.slice(0, 8)}\u2026` : "agentSessionId=missing";
   let messages = [];
   let neo4jMessages = [];
@@ -7386,9 +7386,9 @@ app14.post("/:id/resume", async (c) => {
   let jsonlHealOk = 0;
   let jsonlHealFail = 0;
   try {
-    neo4jMessages = await getRecentMessages(conversationId);
+    neo4jMessages = await getRecentMessages(sessionId);
   } catch (err) {
-    console.error(`[admin-resume] ${(/* @__PURE__ */ new Date()).toISOString()} getRecentMessages failed: conversationId=${conversationId.slice(0, 8)}\u2026 error=${err instanceof Error ? err.message : String(err)}`);
+    console.error(`[admin-resume] ${(/* @__PURE__ */ new Date()).toISOString()} getRecentMessages failed: sessionId=${sessionId.slice(0, 8)}\u2026 error=${err instanceof Error ? err.message : String(err)}`);
     return c.json({ error: "Failed to load conversation messages" }, 500);
   }
   if (persistedAgentSessionId) {
@@ -7398,7 +7398,7 @@ app14.post("/:id/resume", async (c) => {
     jsonlMalformedLines = replay.malformedLines;
     jsonlReplayMessages = replay.messages;
     if (replay.jsonlMissing) {
-      console.error(`[jsonl-resume-miss] cacheKey=${cacheKey.slice(0, 8)}\u2026 conversationId=${conversationId.slice(0, 8)}\u2026 agentSessionId=${persistedAgentSessionId.slice(0, 8)}\u2026 expectedPath=${jsonlPath} configDir=${process.env.CLAUDE_CONFIG_DIR ?? "<unset>"}`);
+      console.error(`[jsonl-resume-miss] cacheKey=${cacheKey.slice(0, 8)}\u2026 sessionId=${sessionId.slice(0, 8)}\u2026 agentSessionId=${persistedAgentSessionId.slice(0, 8)}\u2026 expectedPath=${jsonlPath} configDir=${process.env.CLAUDE_CONFIG_DIR ?? "<unset>"}`);
     }
   } else {
     jsonlMissing = true;
@@ -7499,7 +7499,7 @@ app14.post("/:id/resume", async (c) => {
               }
             }));
             const messageId = await persistMessage(
-              conversationId,
+              sessionId,
               q.role,
               q.content,
               accountId,
@@ -7511,14 +7511,14 @@ app14.post("/:id/resume", async (c) => {
             );
             jsonlHealOk += 1;
             try {
-              streamLogPath.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [admin-persist-heal] convId=${conversationId.slice(0, 8)} turnIndex=${i} role=${q.role} outcome=ok messageId=${(messageId ?? "").slice(0, 8)}
+              streamLogPath.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [admin-persist-heal] convId=${sessionId.slice(0, 8)} turnIndex=${i} role=${q.role} outcome=ok messageId=${(messageId ?? "").slice(0, 8)}
 `);
             } catch {
             }
           } catch (err) {
             jsonlHealFail += 1;
             try {
-              streamLogPath.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [admin-persist-heal] convId=${conversationId.slice(0, 8)} turnIndex=${i} role=${q.role} outcome=fail reason=${JSON.stringify((err instanceof Error ? err.message : String(err)).slice(0, 200))}
+              streamLogPath.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [admin-persist-heal] convId=${sessionId.slice(0, 8)} turnIndex=${i} role=${q.role} outcome=fail reason=${JSON.stringify((err instanceof Error ? err.message : String(err)).slice(0, 200))}
 `);
             } catch {
             }
@@ -7537,7 +7537,7 @@ app14.post("/:id/resume", async (c) => {
     const components = m.components ?? [];
     const rawAttachments = m.attachments ?? [];
     if (m.role !== "assistant") {
-      const { chips, valid: valid2, invalid: invalid2 } = validateAndShapeAttachments(rawAttachments, accountId, conversationId, m.messageId, streamLogPath);
+      const { chips, valid: valid2, invalid: invalid2 } = validateAndShapeAttachments(rawAttachments, accountId, sessionId, m.messageId, streamLogPath);
       totalAttachments += valid2;
       totalAttachmentInvalid += invalid2;
       const cleanedContent = chips.length > 0 ? stripAttachmentMetaSuffix(m.content) : m.content;
@@ -7550,7 +7550,7 @@ app14.post("/:id/resume", async (c) => {
         ...chips.length > 0 ? { attachments: chips } : {}
       };
     }
-    const { events, valid, invalid, submittedEventIndices } = reconstructAssistantEvents(m.content, components, conversationId, m.messageId, streamLogPath);
+    const { events, valid, invalid, submittedEventIndices } = reconstructAssistantEvents(m.content, components, sessionId, m.messageId, streamLogPath);
     totalValid += valid;
     totalInvalid += invalid;
     totalComponents += components.length;
@@ -7569,27 +7569,27 @@ app14.post("/:id/resume", async (c) => {
   const reason = bridged ? "post-restart" : "page-refresh";
   try {
     const source = jsonlMissing ? persistedAgentSessionId ? "jsonl-missing" : "neo4j-only" : "jsonl";
-    streamLogPath.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [admin-resume] reason=${reason} source=${source} cacheKey=${cacheKey.slice(0, 8)} conversationId=${conversationId.slice(0, 8)} ${tag} loadedMessages=${messages.length} jsonlReplayMessages=${jsonlReplayMessages.length} neo4jMessages=${neo4jMessages.length} jsonlMalformed=${jsonlMalformedLines} componentCount=${totalComponents} userAttachmentCount=${totalAttachments} syntheticHidden=${syntheticHidden}
+    streamLogPath.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [admin-resume] reason=${reason} source=${source} cacheKey=${cacheKey.slice(0, 8)} sessionId=${sessionId.slice(0, 8)} ${tag} loadedMessages=${messages.length} jsonlReplayMessages=${jsonlReplayMessages.length} neo4jMessages=${neo4jMessages.length} jsonlMalformed=${jsonlMalformedLines} componentCount=${totalComponents} userAttachmentCount=${totalAttachments} syntheticHidden=${syntheticHidden}
 `);
     if (totalComponents > 0) {
-      streamLogPath.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [component-rehydrate] conversationId=${conversationId.slice(0, 8)} count=${totalComponents} valid=${totalValid} invalid=${totalInvalid} textRuns=${textRuns}
+      streamLogPath.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [component-rehydrate] sessionId=${sessionId.slice(0, 8)} count=${totalComponents} valid=${totalValid} invalid=${totalInvalid} textRuns=${textRuns}
 `);
     }
     if (totalAttachments > 0 || totalAttachmentInvalid > 0) {
-      streamLogPath.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [attachment-rehydrate] conversationId=${conversationId.slice(0, 8)} userMessages=${userMessageCount} attachments=${totalAttachments} invalid=${totalAttachmentInvalid}
+      streamLogPath.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [attachment-rehydrate] sessionId=${sessionId.slice(0, 8)} userMessages=${userMessageCount} attachments=${totalAttachments} invalid=${totalAttachmentInvalid}
 `);
     }
     if (jsonlHealMissing > 0) {
-      streamLogPath.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [admin-resume-heal] conversationId=${conversationId.slice(0, 8)} missingTurns=${jsonlHealMissing} healOk=${jsonlHealOk} healFail=${jsonlHealFail} note=async-writes-may-still-be-in-flight
+      streamLogPath.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [admin-resume-heal] sessionId=${sessionId.slice(0, 8)} missingTurns=${jsonlHealMissing} healOk=${jsonlHealOk} healFail=${jsonlHealFail} note=async-writes-may-still-be-in-flight
 `);
     }
   } catch {
   }
   const age = formatAge(updatedAt);
-  console.log(`[admin-resume] ${(/* @__PURE__ */ new Date()).toISOString()} reason=${reason} conversationId=${conversationId.slice(0, 8)}\u2026 age=${age} loaded=${messages.length} messages ${tag} components=${totalComponents} attachments=${totalAttachments} syntheticHidden=${syntheticHidden} jsonlMissing=${jsonlMissing} healMissing=${jsonlHealMissing} cacheKey=${cacheKey.slice(0, 8)}\u2026`);
-  console.log(`[admin-session-restore] cacheKey=${cacheKey.slice(0, 8)} conversationId=${conversationId.slice(0, 8)} messageCount=${rehydrated.length} ms=${Date.now() - t0}`);
+  console.log(`[admin-resume] ${(/* @__PURE__ */ new Date()).toISOString()} reason=${reason} sessionId=${sessionId.slice(0, 8)}\u2026 age=${age} loaded=${messages.length} messages ${tag} components=${totalComponents} attachments=${totalAttachments} syntheticHidden=${syntheticHidden} jsonlMissing=${jsonlMissing} healMissing=${jsonlHealMissing} cacheKey=${cacheKey.slice(0, 8)}\u2026`);
+  console.log(`[admin-session-restore] cacheKey=${cacheKey.slice(0, 8)} sessionId=${sessionId.slice(0, 8)} messageCount=${rehydrated.length} ms=${Date.now() - t0}`);
   return c.json({
-    conversationId,
+    sessionId,
     messages: rehydrated,
     resumeHeal: {
       missingTurns: jsonlHealMissing,
@@ -7601,7 +7601,7 @@ app14.post("/:id/resume", async (c) => {
   });
 });
 app14.put("/:id/label", requireAdminSession, async (c) => {
-  const conversationId = c.req.param("id");
+  const sessionId = c.req.param("id");
   const cacheKey = c.var.cacheKey;
   let body;
   try {
@@ -7611,7 +7611,7 @@ app14.put("/:id/label", requireAdminSession, async (c) => {
   }
   const accountId = getAccountIdForSession(cacheKey);
   if (!accountId) return c.json({ error: "Account not found for session" }, 401);
-  const owned = await verifyConversationOwnership(conversationId, accountId);
+  const owned = await verifyConversationOwnership(sessionId, accountId);
   if (!owned) return c.json({ error: "Conversation not found" }, 404);
   const label = typeof body.label === "string" ? body.label.trim() : "";
   if (!label) return c.json({ error: "label is required and must be non-empty" }, 400);
@@ -7619,10 +7619,10 @@ app14.put("/:id/label", requireAdminSession, async (c) => {
     return c.json({ error: `label must be ${LABEL_MAX_LENGTH} characters or fewer` }, 400);
   }
   try {
-    await renameConversation(conversationId, label);
+    await renameConversation(sessionId, label);
     return c.json({ ok: true });
   } catch (err) {
-    console.error(`[persist] manual-label: failed to rename ${conversationId} \u2014 ${err instanceof Error ? err.message : String(err)}`);
+    console.error(`[persist] manual-label: failed to rename ${sessionId} \u2014 ${err instanceof Error ? err.message : String(err)}`);
     return c.json({ error: "Failed to rename session" }, 500);
   }
 });
@@ -7978,7 +7978,7 @@ async function performSpawnWithInitialMessage(args) {
     specialistDomains,
     tunnelUrl,
     // Task 382 — thread the active conversation's UUID through to the
-    // manager so the PTY env carries CONVERSATION_NODE_ID. Undefined is
+    // manager so the PTY env carries SESSION_NODE_ID. Undefined is
     // legitimate (autonomous spawns); the manager's UUID gate filters
     // unshapely values.
     conversationNodeId: args.conversationNodeId
@@ -8018,9 +8018,9 @@ async function performSpawnWithInitialMessage(args) {
     claudeSessionId
   };
 }
-function mintTranscriptEdge(conversationId, claudeSessionId, accountId) {
-  if (!conversationId || !claudeSessionId) return;
-  void linkConversationTranscript(conversationId, claudeSessionId, accountId);
+function mintTranscriptEdge(sessionId, claudeSessionId, accountId) {
+  if (!sessionId || !claudeSessionId) return;
+  void linkConversationTranscript(sessionId, claudeSessionId, accountId);
 }
 var requireAdminSessionUnlessLoopbackSpawn = async (c, next) => {
   const remoteAddr = c.env?.incoming?.socket?.remoteAddress ?? "";
@@ -8076,7 +8076,7 @@ app15.post("/", async (c) => {
   const specialist = typeof body.specialist === "string" && /^[A-Za-z0-9_-]{1,64}$/.test(body.specialist) ? body.specialist : void 0;
   const model = typeof body.model === "string" && /^[A-Za-z0-9._-]{1,64}$/.test(body.model) ? body.model : void 0;
   console.log(`${TAG17} spawn-request-in surface=${authSurface} accountId=${senderId.slice(0, 8)} userId=${userId ? userId.slice(0, 8) : "absent"} channel=${channel} permissionMode=${permissionMode ?? "default"} specialist=${specialist ?? "none"} model=${model ?? "default"} initialMessage=${initialMessage ? "yes" : "no"}`);
-  const conversationNodeId = cacheKey ? getConversationIdForSession(cacheKey) : void 0;
+  const conversationNodeId = cacheKey ? getSessionIdForSession(cacheKey) : void 0;
   const { response, claudeSessionId } = await performSpawnWithInitialMessage({
     senderId,
     userId,
@@ -8090,7 +8090,7 @@ app15.post("/", async (c) => {
     conversationNodeId
   });
   mintTranscriptEdge(
-    cacheKey ? getConversationIdForSession(cacheKey) : void 0,
+    cacheKey ? getSessionIdForSession(cacheKey) : void 0,
     claudeSessionId,
     senderId
   );
@@ -8167,11 +8167,11 @@ app15.post("/resume", async (c) => {
       specialistDomains,
       tunnelUrl,
       // Task 382 — resume parity with /spawn: thread the active
-      // conversationId so the re-spawned PTY's MCP env carries
-      // CONVERSATION_NODE_ID. Undefined when no active conversation is
+      // sessionId so the re-spawned PTY's MCP env carries
+      // SESSION_NODE_ID. Undefined when no active conversation is
       // bound to this cacheKey (rare for resume — the user is by
       // definition continuing a known conversation).
-      conversationNodeId: getConversationIdForSession(cacheKey)
+      conversationNodeId: getSessionIdForSession(cacheKey)
     })
   }).catch((err) => {
     console.error(`${TAG17} fetch-failed op=resume message=${err instanceof Error ? err.message : String(err)}`);
@@ -8190,7 +8190,7 @@ app15.post("/resume", async (c) => {
     }
   }
   mintTranscriptEdge(
-    getConversationIdForSession(cacheKey),
+    getSessionIdForSession(cacheKey),
     claudeSessionIdFromResume,
     senderId
   );
@@ -8226,15 +8226,15 @@ app15.post("/:sessionId/rename", async (c) => {
   return new Response(upstream.body, { status: upstream.status, headers: upstream.headers });
 });
 app15.delete("/:sessionId", async (c) => {
-  const sessionId = c.req.param("sessionId");
+  const claudeSessionId = c.req.param("sessionId");
   const cacheKey = c.get("cacheKey") ?? "";
   const accountId = getAccountIdForSession(cacheKey) ?? "";
   if (!accountId) return c.json({ error: "admin-account-not-resolved" }, 500);
-  const conversationId = await getConversationIdByClaudeSessionId(sessionId, accountId);
-  if (!conversationId) {
-    console.log(`[admin-conversation-delete] reason=no-conversation-mapping claudeSessionId=${sessionId.slice(0, 8)}`);
+  const sessionId = await getSessionIdByClaudeSessionId(claudeSessionId, accountId);
+  if (!sessionId) {
+    console.log(`[admin-conversation-delete] reason=no-conversation-mapping claudeSessionId=${claudeSessionId.slice(0, 8)}`);
     const upstream = await fetch(
-      `${managerBase2()}/${encodeURIComponent(sessionId)}`,
+      `${managerBase2()}/${encodeURIComponent(claudeSessionId)}`,
       { method: "DELETE" }
     ).catch((err) => {
       console.error(`${TAG17} fetch-failed op=delete message=${err instanceof Error ? err.message : String(err)}`);
@@ -8245,13 +8245,13 @@ app15.delete("/:sessionId", async (c) => {
   }
   let siblings;
   try {
-    siblings = await getConversationClaudeSessionIds(conversationId, accountId);
+    siblings = await getConversationClaudeSessionIds(sessionId, accountId);
   } catch {
-    siblings = [sessionId];
+    siblings = [claudeSessionId];
   }
-  const all = [sessionId, ...siblings.filter((s) => s !== sessionId)];
+  const all = [claudeSessionId, ...siblings.filter((s) => s !== claudeSessionId)];
   const outcome = await cascadeAdminConversationDelete({
-    conversationId,
+    sessionId,
     accountId,
     managerBase: managerBase2(),
     claudeSessionIds: all
@@ -8272,7 +8272,7 @@ app15.delete("/:sessionId", async (c) => {
         error: "jsonl-purge-failed",
         detail: outcome.message,
         claudeSessionId: outcome.claudeSessionId,
-        conversationId,
+        sessionId,
         claudeSessionIdsPurged: outcome.claudeSessionIdsPurged
       },
       outcome.status >= 400 && outcome.status < 600 ? outcome.status : 502
@@ -8282,7 +8282,7 @@ app15.delete("/:sessionId", async (c) => {
     {
       error: "graph-delete-failed",
       detail: outcome.message,
-      conversationId,
+      sessionId,
       claudeSessionIdsPurged: outcome.claudeSessionIdsPurged
     },
     500
@@ -8508,7 +8508,7 @@ var UNIQUE_KEYS_BY_LABEL = {
   KnowledgeDocument: ["attachmentId"],
   ConversationArchive: ["conversationIdentity"],
   DigitalDocument: ["attachmentId"],
-  Conversation: ["conversationId"],
+  Conversation: ["sessionId"],
   Message: ["messageId"],
   Workflow: ["workflowId"],
   WorkflowStep: ["stepId"],
@@ -10275,7 +10275,7 @@ async function handleNeighbourhood(c, accountId) {
       const messageCount = nodes.filter((n) => n.labels.includes("Message")).length;
       if (conversationNode && messageCount >= 2) {
         console.error(
-          `[graph] cluster-expand kind=conversation conversationId=${conversationNode.id} messageCount=${messageCount} reason=click-target-is-${nodes[0]?.labels.includes("Message") ? "message" : "conversation"}`
+          `[graph] cluster-expand kind=conversation sessionId=${conversationNode.id} messageCount=${messageCount} reason=click-target-is-${nodes[0]?.labels.includes("Message") ? "message" : "conversation"}`
         );
       }
     }
@@ -10686,7 +10686,7 @@ app21.post("/", requireAdminSession, async (c) => {
     const lookup = await session.run(
       `MATCH (n)
        WHERE elementId(n) = $elementId AND n.accountId = $accountId
-       RETURN labels(n) AS labels, n.conversationId AS conversationId LIMIT 1`,
+       RETURN labels(n) AS labels, n.sessionId AS sessionId LIMIT 1`,
       { elementId, accountId }
     );
     if (lookup.records.length === 0) {
@@ -10697,14 +10697,14 @@ app21.post("/", requireAdminSession, async (c) => {
       return c.json({ error: "Node not found" }, 404);
     }
     const preflightLabels = lookup.records[0].get("labels") ?? [];
-    const conversationId = lookup.records[0].get("conversationId");
+    const sessionId = lookup.records[0].get("sessionId");
     if (preflightLabels.includes("AdminConversation")) {
-      if (!conversationId) {
+      if (!sessionId) {
         const elapsed3 = Date.now() - started;
         console.error(
-          `[graph-page] delete account=${accountId} elementId=${elementId} by=${by} labels=${preflightLabels.join(",")} route=cascade result=error ms=${elapsed3} err="AdminConversation node has no conversationId"`
+          `[graph-page] delete account=${accountId} elementId=${elementId} by=${by} labels=${preflightLabels.join(",")} route=cascade result=error ms=${elapsed3} err="AdminConversation node has no sessionId"`
         );
-        return c.json({ error: "AdminConversation node is missing conversationId" }, 500);
+        return c.json({ error: "AdminConversation node is missing sessionId" }, 500);
       }
       const managerPort = requirePortEnv("CLAUDE_SESSION_MANAGER_PORT", { tag: "graph-page-cascade" });
       const managerBase3 = `http://127.0.0.1:${managerPort}`;
@@ -10713,7 +10713,7 @@ app21.post("/", requireAdminSession, async (c) => {
       } catch {
       }
       const outcome = await cascadeAdminConversationDelete({
-        conversationId,
+        sessionId,
         accountId,
         managerBase: managerBase3
       });
@@ -10726,7 +10726,7 @@ app21.post("/", requireAdminSession, async (c) => {
         const response2 = {
           route: "cascade",
           elementId,
-          conversationId,
+          sessionId,
           labels: preflightLabels,
           claudeSessionIds: outcome.claudeSessionIds
         };
@@ -10741,7 +10741,7 @@ app21.post("/", requireAdminSession, async (c) => {
             error: "pty-still-alive",
             detail: "stop the session before deleting",
             claudeSessionId: outcome.claudeSessionId,
-            conversationId
+            sessionId
           },
           409
         );
@@ -10753,7 +10753,7 @@ app21.post("/", requireAdminSession, async (c) => {
         const response2 = {
           route: "cascade",
           elementId,
-          conversationId,
+          sessionId,
           labels: preflightLabels,
           claudeSessionIds: []
         };
@@ -10769,7 +10769,7 @@ app21.post("/", requireAdminSession, async (c) => {
             error: "jsonl-purge-failed",
             detail: outcome.message,
             claudeSessionId: outcome.claudeSessionId,
-            conversationId,
+            sessionId,
             claudeSessionIdsPurged: outcome.claudeSessionIdsPurged
           },
           status
@@ -10782,7 +10782,7 @@ app21.post("/", requireAdminSession, async (c) => {
         {
           error: "graph-delete-failed",
           detail: outcome.message,
-          conversationId,
+          sessionId,
           claudeSessionIdsPurged: outcome.claudeSessionIdsPurged
         },
         500
@@ -12031,24 +12031,24 @@ app33.get("/", async (c) => {
       return c.json({ error: "post-turn-context-loopback-only" }, 403);
     }
   }
-  const conversationId = (c.req.query("conversationId") ?? "").trim();
+  const sessionId = (c.req.query("sessionId") ?? "").trim();
   const accountId = (c.req.query("accountId") ?? "").trim();
-  if (!conversationId) return c.json({ error: "conversationId required" }, 400);
+  if (!sessionId) return c.json({ error: "sessionId required" }, 400);
   if (!accountId) return c.json({ error: "accountId required" }, 400);
   const session = getSession();
   const started = Date.now();
   try {
     const cypher = `
-      MATCH (c:Conversation {conversationId: $conversationId, accountId: $accountId})
+      MATCH (c:Conversation {sessionId: $sessionId, accountId: $accountId})
       MATCH (c)<-[:PRODUCED]-(n)
       WHERE coalesce(n.accountId, $accountId) = $accountId
       RETURN elementId(n) AS elementId, labels(n) AS labels, properties(n) AS properties, coalesce(n.createdAt, n.observedAt, '') AS sortKey
       UNION
-      MATCH (n) WHERE n.conversationId = $conversationId AND n.accountId = $accountId
+      MATCH (n) WHERE n.sessionId = $sessionId AND n.accountId = $accountId
       RETURN elementId(n) AS elementId, labels(n) AS labels, properties(n) AS properties, coalesce(n.createdAt, n.observedAt, '') AS sortKey
     `;
     const res = await session.executeRead(
-      (tx) => tx.run(cypher, { conversationId, accountId })
+      (tx) => tx.run(cypher, { sessionId, accountId })
     );
     const writes = res.records.map((r) => ({
       elementId: r.get("elementId"),
@@ -12059,7 +12059,7 @@ app33.get("/", async (c) => {
     writes.sort((a, b) => a.sortKey.localeCompare(b.sortKey));
     const total = Date.now() - started;
     console.log(
-      `${TAG20} conversationId=${conversationId} accountId=${accountId} writes=${writes.length} ms=${total}`
+      `${TAG20} sessionId=${sessionId} accountId=${accountId} writes=${writes.length} ms=${total}`
     );
     return c.json({
       writes: writes.map(({ elementId, labels, properties }) => ({ elementId, labels, properties }))
@@ -12068,7 +12068,7 @@ app33.get("/", async (c) => {
     const elapsed = Date.now() - started;
     const message = err instanceof Error ? err.message : String(err);
     console.error(
-      `${TAG20} neo4j-unreachable conversationId=${conversationId} ms=${elapsed} err="${message}"`
+      `${TAG20} neo4j-unreachable sessionId=${sessionId} ms=${elapsed} err="${message}"`
     );
     return c.json({ error: `post-turn-context unavailable: ${message}` }, 503);
   } finally {