@rubytech/create-maxy 1.0.657 → 1.0.659

package/payload/server/server.js

@@ -20254,8 +20254,236 @@ function resolveDataPath(raw2) {
   return { ok: true, absolute: resolvedReal, dataRootReal, relative: relPath };
 }
 
-// server/routes/admin/files.ts
+// ../lib/graph-trash/src/index.ts
+var UNIQUE_KEYS_BY_LABEL = {
+  Person: ["email", "telephone"],
+  Service: ["serviceId"],
+  LocalBusiness: ["accountId"],
+  Task: ["taskId"],
+  Event: ["eventId"],
+  KnowledgeDocument: ["attachmentId"],
+  DigitalDocument: ["attachmentId"],
+  Conversation: ["conversationId", "sessionKey"],
+  Message: ["messageId"],
+  OnboardingState: ["accountId"],
+  Workflow: ["workflowId"],
+  WorkflowStep: ["stepId"],
+  WorkflowRun: ["runId"],
+  Preference: ["preferenceId"],
+  Email: ["emailId", "messageId"],
+  AdminUser: ["userId"],
+  ToolCall: ["callId"],
+  // Composite component nulls — frees the composite constraint:
+  AccessGrant: ["contactValue"],
+  // composite (contactValue, agentSlug, accountId)
+  UserProfile: ["userId"]
+  // composite (accountId, userId)
+};
+async function trashNode(params) {
+  const { session, accountId, elementId, by, reason } = params;
+  const lookup = await session.run(
+    `MATCH (n) WHERE elementId(n) = $eid AND n.accountId = $accountId
+     RETURN labels(n) AS labels, properties(n) AS props`,
+    { eid: elementId, accountId }
+  );
+  if (lookup.records.length === 0) {
+    throw new Error(
+      `trashNode: node not found (elementId=${elementId} accountId=${accountId.slice(0, 8)}\u2026)`
+    );
+  }
+  const allLabels = lookup.records[0].get("labels");
+  const props = lookup.records[0].get("props");
+  const baseLabels = allLabels.filter((l) => l !== "Trashed");
+  if (allLabels.includes("Trashed")) {
+    return {
+      trashed: false,
+      alreadyTrashed: true,
+      nodeId: elementId,
+      labels: baseLabels,
+      trashedAt: String(props.trashedAt ?? ""),
+      originalKeys: {}
+    };
+  }
+  const uniqueKeys = /* @__PURE__ */ new Set();
+  for (const label of baseLabels) {
+    for (const key of UNIQUE_KEYS_BY_LABEL[label] ?? []) uniqueKeys.add(key);
+  }
+  const originalKeys = {};
+  for (const k of uniqueKeys) {
+    if (props[k] !== void 0 && props[k] !== null) originalKeys[k] = props[k];
+  }
+  const setNullClauses = Object.keys(originalKeys).map((k) => `n.\`${k}\` = null`).join(", ");
+  const setNullSuffix = setNullClauses ? `, ${setNullClauses}` : "";
+  const trashedAt = (/* @__PURE__ */ new Date()).toISOString();
+  await session.run(
+    `MATCH (n) WHERE elementId(n) = $eid
+     SET n:Trashed,
+         n.trashedAt = datetime($trashedAt),
+         n.trashedBy = $by,
+         n.trashReason = $reason,
+         n._trashedKeys = $trashedKeysJson${setNullSuffix}`,
+    {
+      eid: elementId,
+      trashedAt,
+      by,
+      reason: reason ?? null,
+      trashedKeysJson: JSON.stringify(originalKeys)
+    }
+  );
+  process.stderr.write(
+    `[trash:marked] accountId=${accountId} elementId=${elementId} labels=${baseLabels.join(",")} by=${by} reason=${reason ?? "null"}
+`
+  );
+  return {
+    trashed: true,
+    alreadyTrashed: false,
+    nodeId: elementId,
+    labels: baseLabels,
+    trashedAt,
+    originalKeys
+  };
+}
+async function restoreNode(params) {
+  const { session, accountId, elementId } = params;
+  const lookup = await session.run(
+    `MATCH (n:Trashed) WHERE elementId(n) = $eid
+     RETURN labels(n) AS labels, n._trashedKeys AS keysJson`,
+    { eid: elementId }
+  );
+  if (lookup.records.length === 0) {
+    throw new Error(
+      `restoreNode: trashed node not found (elementId=${elementId})`
+    );
+  }
+  const allLabels = lookup.records[0].get("labels");
+  const baseLabels = allLabels.filter((l) => l !== "Trashed");
+  const keysJson = lookup.records[0].get("keysJson");
+  const originalKeys = keysJson ? JSON.parse(keysJson) : {};
+  for (const label of baseLabels) {
+    const uniqueKeys = UNIQUE_KEYS_BY_LABEL[label] ?? [];
+    for (const k of uniqueKeys) {
+      const v = originalKeys[k];
+      if (v === void 0 || v === null) continue;
+      const conflict = await session.run(
+        `MATCH (other:\`${label}\`)
+         WHERE elementId(other) <> $eid
+           AND NOT other:Trashed
+           AND other.\`${k}\` = $val
+         RETURN elementId(other) AS otherId LIMIT 1`,
+        { eid: elementId, val: v }
+      );
+      if (conflict.records.length > 0) {
+        const otherId = conflict.records[0].get("otherId");
+        throw new Error(
+          `restoreNode: cannot restore ${label} elementId=${elementId} \u2014 active node elementId=${otherId} already holds ${k}=${JSON.stringify(v)}`
+        );
+      }
+    }
+  }
+  const setClauses = Object.keys(originalKeys).map((k) => `n.\`${k}\` = $val_${k}`).join(", ");
+  const setSuffix = setClauses ? `, ${setClauses}` : "";
+  const setParams = { eid: elementId };
+  for (const [k, v] of Object.entries(originalKeys)) setParams[`val_${k}`] = v;
+  await session.run(
+    `MATCH (n:Trashed) WHERE elementId(n) = $eid
+     REMOVE n:Trashed, n.trashedAt, n.trashedBy, n.trashReason, n._trashedKeys
+     SET n.restoredAt = datetime()${setSuffix}`,
+    setParams
+  );
+  process.stderr.write(
+    `[trash:restored] accountId=${accountId} elementId=${elementId} labels=${baseLabels.join(",")}
+`
+  );
+  return {
+    restored: true,
+    nodeId: elementId,
+    labels: baseLabels,
+    restoredKeys: originalKeys
+  };
+}
+
+// app/lib/file-delete-cascade.ts
 var UUID_RE2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function parseAttachmentPath(relPath) {
+  const segments = relPath.split("/").filter(Boolean);
+  if (segments.length !== 4) return null;
+  if (segments[0] !== "uploads") return null;
+  const accountId = segments[1];
+  const attachmentId = segments[2];
+  const filename = segments[3];
+  if (!UUID_RE2.test(accountId) || !UUID_RE2.test(attachmentId)) return null;
+  const dot = filename.lastIndexOf(".");
+  if (dot === -1) return null;
+  const stem = filename.slice(0, dot);
+  const ext = filename.slice(dot + 1);
+  if (stem !== attachmentId) return null;
+  if (ext === "meta" || filename.endsWith(".meta.json")) return null;
+  return { accountId, attachmentId };
+}
+async function cascadeDeleteDocument(params) {
+  const { accountId, attachmentId } = params;
+  const session = getSession();
+  try {
+    const lookup = await session.run(
+      `MATCH (d:KnowledgeDocument { accountId: $accountId, attachmentId: $attachmentId })
+       WHERE NOT d:Trashed
+       RETURN elementId(d) AS eid LIMIT 1`,
+      { accountId, attachmentId }
+    );
+    if (lookup.records.length === 0) return { nodes: 0 };
+    const docElementId = lookup.records[0].get("eid");
+    const childResult = await session.run(
+      `MATCH (d) WHERE elementId(d) = $eid
+       OPTIONAL MATCH (d)-[:HAS_SECTION]->(s:Section)
+       OPTIONAL MATCH (s)-[:HAS_CHUNK]->(c:Chunk)
+       WITH collect(DISTINCT s) AS sections, collect(DISTINCT c) AS chunks
+       RETURN [s IN sections WHERE s IS NOT NULL | elementId(s)] AS sectionIds,
+              [c IN chunks   WHERE c IS NOT NULL | elementId(c)] AS chunkIds`,
+      { eid: docElementId }
+    );
+    if (childResult.records.length === 0) {
+      throw new Error(
+        `cascadeDeleteDocument: child lookup returned zero rows for elementId=${docElementId} \u2014 concurrent trash or connection drop`
+      );
+    }
+    const sectionIds = childResult.records[0].get("sectionIds") ?? [];
+    const chunkIds = childResult.records[0].get("chunkIds") ?? [];
+    await trashNode({
+      session,
+      accountId,
+      elementId: docElementId,
+      by: "file-delete-cascade",
+      reason: "file deleted via /data"
+    });
+    for (const sid of sectionIds) {
+      await trashNode({
+        session,
+        accountId,
+        elementId: sid,
+        by: `file-delete-cascade:from-${docElementId}`,
+        reason: `cascade from KnowledgeDocument ${docElementId}`
+      });
+    }
+    for (const cid of chunkIds) {
+      await trashNode({
+        session,
+        accountId,
+        elementId: cid,
+        by: `file-delete-cascade:from-${docElementId}`,
+        reason: `cascade from KnowledgeDocument ${docElementId}`
+      });
+    }
+    return { nodes: 1 };
+  } finally {
+    try {
+      await session.close();
+    } catch {
+    }
+  }
+}
+
+// server/routes/admin/files.ts
+var UUID_RE3 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 async function readMeta(absDir, baseName) {
   try {
     const raw2 = await readFile4(join12(absDir, `${baseName}.meta.json`), "utf8");
@@ -20277,7 +20505,7 @@ async function readAccountNames() {
     return map;
   }
   for (const name of names) {
-    if (!UUID_RE2.test(name)) continue;
+    if (!UUID_RE3.test(name)) continue;
     const configPath2 = resolve29(accountsDir, name, "account.json");
     try {
       const raw2 = await readFile4(configPath2, "utf8");
@@ -20295,7 +20523,7 @@ async function readAccountNames() {
   return map;
 }
 async function enrich(absolute, entry, accountNames) {
-  if (entry.kind === "directory" && UUID_RE2.test(entry.name)) {
+  if (entry.kind === "directory" && UUID_RE3.test(entry.name)) {
     const meta = await readMeta(join12(absolute, entry.name), entry.name);
     if (meta?.filename) {
       entry.displayName = meta.filename;
@@ -20311,7 +20539,7 @@ async function enrich(absolute, entry, accountNames) {
   if (entry.kind === "file") {
     const dot = entry.name.lastIndexOf(".");
     const base = dot === -1 ? entry.name : entry.name.slice(0, dot);
-    if (UUID_RE2.test(base)) {
+    if (UUID_RE3.test(base)) {
       const meta = await readMeta(absolute, base);
       if (meta?.filename) {
         entry.displayName = meta.filename;
@@ -20323,7 +20551,7 @@ async function enrich(absolute, entry, accountNames) {
 function buildDisplayPath(relPath, accountNames) {
   if (relPath === "." || relPath === "") return [];
   return relPath.split("/").filter(Boolean).map((seg) => {
-    const dn = UUID_RE2.test(seg) ? accountNames.get(seg) : void 0;
+    const dn = UUID_RE3.test(seg) ? accountNames.get(seg) : void 0;
     return dn ? { name: seg, displayName: dn } : { name: seg };
   });
 }
@@ -20351,7 +20579,7 @@ app24.get("/", requireAdminSession, async (c) => {
     const names = await readdir2(absolute);
     const entries = [];
     for (const name of names) {
-      if (UUID_RE2.test(name.replace(/\.meta\.json$/, "")) && name.endsWith(".meta.json")) {
+      if (UUID_RE3.test(name.replace(/\.meta\.json$/, "")) && name.endsWith(".meta.json")) {
         continue;
       }
       try {
@@ -20497,7 +20725,8 @@ app24.post("/upload", requireAdminSession, async (c) => {
 });
 app24.delete("/", requireAdminSession, async (c) => {
   const sessionKey = c.var.sessionKey;
-  if (!getAccountIdForSession(sessionKey)) {
+  const accountId = getAccountIdForSession(sessionKey);
+  if (!accountId) {
     console.error(`[data] auth-rejected endpoint="DELETE /api/admin/files" reason="no account for session"`);
     return c.json({ error: "Account not found for session" }, 401);
   }
@@ -20527,7 +20756,7 @@ app24.delete("/", requireAdminSession, async (c) => {
     }
     const dot = base.lastIndexOf(".");
     const stem = dot === -1 ? base : base.slice(0, dot);
-    const sidecarPath = UUID_RE2.test(stem) && base !== `${stem}.meta.json` ? join12(dirname10(absolute), `${stem}.meta.json`) : null;
+    const sidecarPath = UUID_RE3.test(stem) && base !== `${stem}.meta.json` ? join12(dirname10(absolute), `${stem}.meta.json`) : null;
     await unlink2(absolute);
     if (sidecarPath) {
       try {
@@ -20536,6 +20765,19 @@ app24.delete("/", requireAdminSession, async (c) => {
       }
     }
     console.error(`[data] file-delete path="${relPath}" bytes=${info.size}`);
+    const parsed = parseAttachmentPath(relPath);
+    if (parsed) {
+      try {
+        const { nodes } = await cascadeDeleteDocument({
+          accountId,
+          attachmentId: parsed.attachmentId
+        });
+        console.error(`[data] file-delete graph-cascade path="${relPath}" nodes=${nodes}`);
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        console.error(`[data] file-delete graph-cascade-failed path="${relPath}" err="${message}"`);
+      }
+    }
     return c.json({ ok: true });
   } catch (err) {
     const code = err.code;
@@ -20884,154 +21126,6 @@ function pruneNode(node) {
 }
 var graph_subgraph_default = app26;
 
-// ../lib/graph-trash/src/index.ts
-var UNIQUE_KEYS_BY_LABEL = {
-  Person: ["email", "telephone"],
-  Service: ["serviceId"],
-  LocalBusiness: ["accountId"],
-  Task: ["taskId"],
-  Event: ["eventId"],
-  KnowledgeDocument: ["attachmentId"],
-  DigitalDocument: ["attachmentId"],
-  Conversation: ["conversationId", "sessionKey"],
-  Message: ["messageId"],
-  OnboardingState: ["accountId"],
-  Workflow: ["workflowId"],
-  WorkflowStep: ["stepId"],
-  WorkflowRun: ["runId"],
-  Preference: ["preferenceId"],
-  Email: ["emailId", "messageId"],
-  AdminUser: ["userId"],
-  ToolCall: ["callId"],
-  // Composite component nulls — frees the composite constraint:
-  AccessGrant: ["contactValue"],
-  // composite (contactValue, agentSlug, accountId)
-  UserProfile: ["userId"]
-  // composite (accountId, userId)
-};
-async function trashNode(params) {
-  const { session, accountId, elementId, by, reason } = params;
-  const lookup = await session.run(
-    `MATCH (n) WHERE elementId(n) = $eid AND n.accountId = $accountId
-     RETURN labels(n) AS labels, properties(n) AS props`,
-    { eid: elementId, accountId }
-  );
-  if (lookup.records.length === 0) {
-    throw new Error(
-      `trashNode: node not found (elementId=${elementId} accountId=${accountId.slice(0, 8)}\u2026)`
-    );
-  }
-  const allLabels = lookup.records[0].get("labels");
-  const props = lookup.records[0].get("props");
-  const baseLabels = allLabels.filter((l) => l !== "Trashed");
-  if (allLabels.includes("Trashed")) {
-    return {
-      trashed: false,
-      alreadyTrashed: true,
-      nodeId: elementId,
-      labels: baseLabels,
-      trashedAt: String(props.trashedAt ?? ""),
-      originalKeys: {}
-    };
-  }
-  const uniqueKeys = /* @__PURE__ */ new Set();
-  for (const label of baseLabels) {
-    for (const key of UNIQUE_KEYS_BY_LABEL[label] ?? []) uniqueKeys.add(key);
-  }
-  const originalKeys = {};
-  for (const k of uniqueKeys) {
-    if (props[k] !== void 0 && props[k] !== null) originalKeys[k] = props[k];
-  }
-  const setNullClauses = Object.keys(originalKeys).map((k) => `n.\`${k}\` = null`).join(", ");
-  const setNullSuffix = setNullClauses ? `, ${setNullClauses}` : "";
-  const trashedAt = (/* @__PURE__ */ new Date()).toISOString();
-  await session.run(
-    `MATCH (n) WHERE elementId(n) = $eid
-     SET n:Trashed,
-         n.trashedAt = datetime($trashedAt),
-         n.trashedBy = $by,
-         n.trashReason = $reason,
-         n._trashedKeys = $trashedKeysJson${setNullSuffix}`,
-    {
-      eid: elementId,
-      trashedAt,
-      by,
-      reason: reason ?? null,
-      trashedKeysJson: JSON.stringify(originalKeys)
-    }
-  );
-  process.stderr.write(
-    `[trash:marked] accountId=${accountId} elementId=${elementId} labels=${baseLabels.join(",")} by=${by} reason=${reason ?? "null"}
-`
-  );
-  return {
-    trashed: true,
-    alreadyTrashed: false,
-    nodeId: elementId,
-    labels: baseLabels,
-    trashedAt,
-    originalKeys
-  };
-}
-async function restoreNode(params) {
-  const { session, accountId, elementId } = params;
-  const lookup = await session.run(
-    `MATCH (n:Trashed) WHERE elementId(n) = $eid
-     RETURN labels(n) AS labels, n._trashedKeys AS keysJson`,
-    { eid: elementId }
-  );
-  if (lookup.records.length === 0) {
-    throw new Error(
-      `restoreNode: trashed node not found (elementId=${elementId})`
-    );
-  }
-  const allLabels = lookup.records[0].get("labels");
-  const baseLabels = allLabels.filter((l) => l !== "Trashed");
-  const keysJson = lookup.records[0].get("keysJson");
-  const originalKeys = keysJson ? JSON.parse(keysJson) : {};
-  for (const label of baseLabels) {
-    const uniqueKeys = UNIQUE_KEYS_BY_LABEL[label] ?? [];
-    for (const k of uniqueKeys) {
-      const v = originalKeys[k];
-      if (v === void 0 || v === null) continue;
-      const conflict = await session.run(
-        `MATCH (other:\`${label}\`)
-         WHERE elementId(other) <> $eid
-           AND NOT other:Trashed
-           AND other.\`${k}\` = $val
-         RETURN elementId(other) AS otherId LIMIT 1`,
-        { eid: elementId, val: v }
-      );
-      if (conflict.records.length > 0) {
-        const otherId = conflict.records[0].get("otherId");
-        throw new Error(
-          `restoreNode: cannot restore ${label} elementId=${elementId} \u2014 active node elementId=${otherId} already holds ${k}=${JSON.stringify(v)}`
-        );
-      }
-    }
-  }
-  const setClauses = Object.keys(originalKeys).map((k) => `n.\`${k}\` = $val_${k}`).join(", ");
-  const setSuffix = setClauses ? `, ${setClauses}` : "";
-  const setParams = { eid: elementId };
-  for (const [k, v] of Object.entries(originalKeys)) setParams[`val_${k}`] = v;
-  await session.run(
-    `MATCH (n:Trashed) WHERE elementId(n) = $eid
-     REMOVE n:Trashed, n.trashedAt, n.trashedBy, n.trashReason, n._trashedKeys
-     SET n.restoredAt = datetime()${setSuffix}`,
-    setParams
-  );
-  process.stderr.write(
-    `[trash:restored] accountId=${accountId} elementId=${elementId} labels=${baseLabels.join(",")}
-`
-  );
-  return {
-    restored: true,
-    nodeId: elementId,
-    labels: baseLabels,
-    restoredKeys: originalKeys
-  };
-}
-
 // server/routes/admin/graph-delete.ts
 var app27 = new Hono2();
 app27.post("/", requireAdminSession, async (c) => {