@promptowl/contextnest-community 1.20.0 → 1.21.0

package/dist/index.js

@@ -18,8 +18,10 @@ import {
   getPendingReview,
   getReviewHistory,
   getReviewQueue,
+  isNestTarget,
   isSafeConnectorUrl,
   listDeletionRequests,
+  nodeTrail,
   nodeWriteKey,
   notifyDeletionResolved,
   notifyNestEvent,
@@ -35,7 +37,7 @@ import {
   submitForReview,
   withNodeWriteLock,
   withdrawDeletionRequest
-} from "./chunk-GVUBZTI3.js";
+} from "./chunk-4KJGQHWB.js";
 import {
   canCreateInNest,
   canManageStewards,
@@ -55,7 +57,7 @@ import {
   resolveUserRoles,
   syncFromConfig,
   updateSteward
-} from "./chunk-O5DYL7ZG.js";
+} from "./chunk-N2DTJFCD.js";
 import {
   createGrant,
   deleteGrant,
@@ -64,7 +66,7 @@ import {
   listGrants,
   listUserGrants,
   resolveNodeGrant
-} from "./chunk-3LUUJUWS.js";
+} from "./chunk-XWGEXQU3.js";
 import {
   generateApiKey,
   getKeyPrefix,
@@ -77,17 +79,20 @@ import {
 import {
   checkConflict,
   createVersion,
+  deleteSupersededDrafts,
+  deleteUnsealedVersions,
   getApprovedVersion,
   getApprovedVersions,
   getCurrentVersion,
   getDisplayStatus,
   getDisplayStatuses,
+  getSealedVersion,
   getTrackedNodeIds,
   getVersions,
   listMyDrafts,
   setApprovedVersion,
   upsertVersion
-} from "./chunk-KHMSDTJJ.js";
+} from "./chunk-IGPJ74O4.js";
 import {
   approveExternalEdit,
   getExternalEditDetail,
@@ -99,19 +104,22 @@ import {
   scanDocumentForDrift,
   scanNestForDrift,
   startDriftScanner
-} from "./chunk-EY7WOKJR.js";
+} from "./chunk-6PJQSKKV.js";
 import {
   addMember,
   addWatcher,
+  archiveNest,
   assertSafeNodeId,
   buildTitleMap,
   canApproveWith,
   canEditWith,
+  capForArchive,
   collabPermToRole,
   createNest,
   createTeam,
   deleteNest,
   deleteTeam,
+  describeNode,
   disableStewardshipAndWipeGovernance,
   docLink,
   engineApi,
@@ -133,6 +141,7 @@ import {
   isEmailConfigured,
   isLicenseAdminEmail,
   isLicenseAdminUserId,
+  isNestArchived,
   isPublicReader,
   isServerAdminUserId,
   isStewardshipEnabled,
@@ -143,6 +152,7 @@ import {
   listNotifications,
   listPublicNests,
   listSharedNests,
+  listSharedTeamMembers,
   listTeamsForUser,
   listVisibleNests,
   listWatchers,
@@ -160,8 +170,11 @@ import {
   notifyNestInvite,
   nowExpr,
   opContext,
+  parseSharedTeams,
   permissionLevel,
   persistSetting,
+  pinNest,
+  pinnedNestIds,
   primaryRole,
   readIndexedNodes,
   rebuildNodeIndex,
@@ -177,6 +190,7 @@ import {
   resolveNestPermission,
   resolveNodeUrl,
   resolveTeamRolesForUser,
+  restoreNest,
   sendEmailToRecipient,
   setAllowSelfApprove,
   setPrimeOnlyReview,
@@ -189,11 +203,12 @@ import {
   syncNodeTags,
   trackEvent,
   uniqueNestName,
+  unpinNest,
   unshareTeamFromNest,
   updateMemberRole,
   validateLicense,
   verifySmtp
-} from "./chunk-7CPP6FIU.js";
+} from "./chunk-6JGQX4GA.js";
 import {
   AppError,
   ConflictError,
@@ -211,7 +226,7 @@ import {
   initDb,
   isEmailListish,
   isEmailish
-} from "./chunk-XCFKS65Y.js";
+} from "./chunk-LPPKPEYI.js";
 import {
   ANON_EMAIL,
   ANON_USER_ID,
@@ -1727,6 +1742,10 @@ authRoutes.delete("/users/:userId", async (c) => {
       target.id
     ]);
     await tx.run("DELETE FROM api_keys WHERE user_id = ?", [target.id]);
+    try {
+      await tx.run("DELETE FROM nest_pins WHERE user_id = ?", [target.id]);
+    } catch {
+    }
     await tx.run("DELETE FROM users WHERE id = ?", [target.id]);
   });
   await deleteAllSessionsForUser(target.id);
@@ -1870,6 +1889,7 @@ import {
   filterDocuments,
   DocumentNotFoundError,
   NODE_TYPES,
+  TAG_PATTERN,
   generateIndexMd
 } from "@promptowl/contextnest-engine";
 import { rename, mkdir, rm, stat } from "fs/promises";
@@ -1918,6 +1938,158 @@ function documentPrimeFlag(metadata) {
   return void 0;
 }
 
+// src/governance/mention-notify.ts
+import { v4 as uuid4 } from "uuid";
+
+// src/nests/people-service.ts
+var PERSON_SOURCES = [
+  "owner",
+  // 0
+  "collaborator",
+  // 1
+  "team",
+  // 2 — not in the union; team rosters are JSON on the team row
+  "steward",
+  // 3
+  "grant"
+  // 4
+];
+async function listNestPeople(nestId) {
+  const db = getDb();
+  const [nest, rows] = await Promise.all([
+    db.get("SELECT shared_teams FROM nests WHERE id = ?", [nestId]),
+    db.all(
+      `SELECT 0 AS rank, u.id AS user_id, u.email AS email, u.name AS name
+         FROM nests n JOIN users u ON u.id = n.user_id
+        WHERE n.id = ?
+       UNION ALL
+       SELECT 1, u.id, u.email, u.name
+         FROM nest_collaborators nc JOIN users u ON u.id = nc.user_id
+        WHERE nc.nest_id = ?
+       UNION ALL
+       SELECT 3, u.id, s.user_email, u.name
+         FROM stewards s
+         LEFT JOIN users u ON LOWER(u.email) = LOWER(s.user_email)
+        WHERE s.nest_id = ? AND s.is_active = 1
+       UNION ALL
+       SELECT 4, u.id, u.email, u.name
+         FROM grants g JOIN users u ON u.id = g.user_id
+        WHERE g.nest_id = ?
+       ORDER BY rank`,
+      [nestId, nestId, nestId, nestId]
+    )
+  ]);
+  if (!nest) return [];
+  const teamRefs = parseSharedTeams(nest.shared_teams);
+  const teamRows = teamRefs.length ? (await listSharedTeamMembers(teamRefs)).map((m) => ({
+    rank: 2,
+    user_id: m.userId,
+    email: m.email,
+    name: m.name
+  })) : [];
+  const people = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const row of [...rows, ...teamRows].sort((a, b) => a.rank - b.rank)) {
+    const email = (row.email || "").trim();
+    const key = email.toLowerCase();
+    if (!email || seen.has(key)) continue;
+    seen.add(key);
+    people.push({
+      email,
+      name: row.name ?? null,
+      userId: row.user_id ?? null,
+      source: PERSON_SOURCES[row.rank]
+    });
+  }
+  return people;
+}
+
+// src/shared/mentions.ts
+var MENTION = /(?:^|\s)@(?:\(([^)]+)\)|([a-zA-Z0-9._@-]+))/g;
+function stripCode(markdown2) {
+  return markdown2.replace(/```[\s\S]*?```/g, " ").replace(/`[^`\n]*`/g, " ");
+}
+function extractMentions(markdown2) {
+  const names = [];
+  const seen = /* @__PURE__ */ new Set();
+  const text = stripCode(markdown2 || "");
+  let match;
+  MENTION.lastIndex = 0;
+  while ((match = MENTION.exec(text)) !== null) {
+    const name = (match[1] || match[2] || "").trim();
+    const key = name.toLowerCase();
+    if (!name || seen.has(key)) continue;
+    seen.add(key);
+    names.push(name);
+  }
+  return names;
+}
+function newMentions(previous, next) {
+  const before = new Set(extractMentions(previous).map((n) => n.toLowerCase()));
+  return extractMentions(next).filter((n) => !before.has(n.toLowerCase()));
+}
+function resolveMention(people, name) {
+  const n = name.trim().toLowerCase();
+  if (!n) return void 0;
+  const exact = people.find((p) => p.email.toLowerCase() === n);
+  if (exact) return exact;
+  const matches = people.filter(
+    (p) => p.email.toLowerCase().split("@")[0] === n || (p.name || "").toLowerCase() === n
+  );
+  return matches.length === 1 ? matches[0] : void 0;
+}
+
+// src/governance/mention-notify.ts
+async function canOpenNode(nestId, nodeId, userId, email) {
+  const access = await resolveNestAccess(nestId, userId);
+  if (access.permission === "none") {
+    return await resolveNodeGrant(nestId, userId, nodeId) !== null;
+  }
+  return canReadNode(nestId, nodeId, userId, email);
+}
+async function notifyMentions(params) {
+  const { nestId, nodeId, previousBody, nextBody, actorEmail } = params;
+  try {
+    const names = newMentions(previousBody, nextBody);
+    if (names.length === 0) return 0;
+    const people = await listNestPeople(nestId);
+    const actor = actorEmail.toLowerCase();
+    const recipients = /* @__PURE__ */ new Map();
+    for (const name of names) {
+      const person = resolveMention(people, name);
+      if (!person?.userId) continue;
+      const key = person.email.toLowerCase();
+      if (key === actor || recipients.has(key)) continue;
+      recipients.set(key, { email: person.email, userId: person.userId });
+    }
+    if (recipients.size === 0) return 0;
+    const label = await describeNode(nestId, nodeId);
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    const db = getDb();
+    let created = 0;
+    for (const { email, userId } of recipients.values()) {
+      if (!await canOpenNode(nestId, nodeId, userId, email)) continue;
+      await db.run(
+        `INSERT INTO notifications (id, nest_id, user_email, kind, subject_id, message, created_at)
+         VALUES (?, ?, ?, 'mention', ?, ?, ?)`,
+        [
+          uuid4(),
+          nestId,
+          email.toLowerCase(),
+          nodeId,
+          `${actorEmail} mentioned you in "${label}"`,
+          now
+        ]
+      );
+      created++;
+    }
+    return created;
+  } catch (err) {
+    console.error("[notify] mention fan-out failed", nestId, nodeId, err);
+    return 0;
+  }
+}
+
 // src/nodes/service.ts
 async function userIdFromEmail(email) {
   const db = getDb();
@@ -1927,7 +2099,20 @@ async function userIdFromEmail(email) {
   );
   return row?.id ?? ANON_USER_ID;
 }
-var normalizeTag2 = (t) => t.startsWith("#") ? t : `#${t}`;
+var storedTag = (t) => `#${String(t).trim().replace(/^#+/, "").toLowerCase()}`;
+function requireTag(raw) {
+  const tag = storedTag(raw);
+  if (!TAG_PATTERN.test(tag)) {
+    throw new ValidationError(
+      `"${String(raw).trim()}" isn't a usable tag \u2014 a tag starts with a letter and is built from letters a-z, digits, "_", ":" and "-".`
+    );
+  }
+  return tag;
+}
+function requireTags(raw) {
+  const tags = (raw || []).map((t) => String(t).trim()).filter(Boolean).map(requireTag);
+  return [...new Set(tags)];
+}
 var MAX_TITLE_LENGTH = 120;
 function assertTitleLength(title) {
   if (title.length > MAX_TITLE_LENGTH) {
@@ -2000,7 +2185,7 @@ async function departmentTagFor(userEmail) {
       [userEmail]
     );
     const slug = slugify(String(row?.department ?? ""));
-    return slug ? normalizeTag2(`dept:${slug}`) : null;
+    return slug ? storedTag(`dept:${slug}`) : null;
   } catch (err) {
     console.error("[dept-tag] department lookup failed (tag skipped):", err);
     return null;
@@ -2041,7 +2226,11 @@ var ACCEPTED_NODE_TYPES = /* @__PURE__ */ new Set([
 function toNodeResponse(node) {
   const fm = node.frontmatter;
   const title = fm.title === void 0 || fm.title === null ? "" : String(fm.title);
-  const tags = Array.isArray(fm.tags) ? fm.tags.map((t) => String(t)) : [];
+  const tags = Array.isArray(fm.tags) ? [
+    ...new Set(
+      fm.tags.map((t) => String(t).trim()).filter(Boolean).map(storedTag)
+    )
+  ] : [];
   return {
     id: node.id,
     title,
@@ -2376,7 +2565,8 @@ async function nestCensus(nestId, userId) {
   for (const d of visible) {
     const fm = d.frontmatter;
     types[fm.type || "document"] = (types[fm.type || "document"] || 0) + 1;
-    for (const t of fm.tags || []) tags[String(t)] = (tags[String(t)] || 0) + 1;
+    for (const t of new Set((fm.tags || []).map((t2) => storedTag(String(t2)))))
+      tags[t] = (tags[t] || 0) + 1;
     const folder = folderOfId(d.id);
     if (folder) direct.set(folder, (direct.get(folder) || 0) + 1);
     const edited = Date.parse(String(fm.updated_at || ""));
@@ -2470,7 +2660,7 @@ async function createNode(nestId, input, userEmail) {
   }
 }
 async function createNodeOnce(nestId, input, userEmail) {
-  const { storage, versions: versionManager } = await engineCache.get(nestId);
+  const { storage } = await engineCache.get(nestId);
   assertTitleLength(input.title);
   assertTitleReadable(input.title);
   const slug = slugify(input.title).slice(0, 100).replace(/-+$/, "");
@@ -2480,7 +2670,7 @@ async function createNodeOnce(nestId, input, userEmail) {
     const prefix = folderSegments.length > 0 ? `nodes/${folderSegments.join("/")}/` : "nodes/";
     id = `${prefix}${slug || await generatedSlug(storage, prefix)}`;
   }
-  const tags = (input.tags || []).map(normalizeTag2);
+  const tags = requireTags(input.tags);
   const requestedType = input.type || "document";
   if (requestedType === "artifact" && !config.TYPE_ARTIFACT_ENABLED) {
     throw new ValidationError("Artifact nodes are disabled on this server");
@@ -2527,7 +2717,7 @@ async function createNodeOnce(nestId, input, userEmail) {
       });
     }
     const deptTag = await departmentTagFor(userEmail);
-    if (deptTag && !tags.some((t) => t.toLowerCase() === deptTag)) {
+    if (deptTag && !tags.includes(deptTag)) {
       tags.push(deptTag);
     }
     if (input.prime !== void 0) await assertMayFlagPrime(nestId, userEmail);
@@ -2591,13 +2781,6 @@ async function createNodeOnce(nestId, input, userEmail) {
       });
       await setApprovedVersion(nestId, id, savedVersion, userEmail);
     } else {
-      if (publishReason === null) {
-        try {
-          await versionManager.createVersion(node, userEmail);
-        } catch (err) {
-          console.error("VersionManager.createVersion failed (node create)", err);
-        }
-      }
       await createVersion({
         nestId,
         nodeId: id,
@@ -2609,6 +2792,13 @@ async function createNodeOnce(nestId, input, userEmail) {
       });
     }
     await trackEvent("node.create", { nestId, nodeId: id });
+    await notifyMentions({
+      nestId,
+      nodeId: id,
+      previousBody: "",
+      nextBody: node.body || "",
+      actorEmail: userEmail
+    });
     return { node, version: savedVersion };
   });
 }
@@ -2671,7 +2861,7 @@ async function registerImportedDocuments(nestId, userEmail) {
   const engineMs = Date.now() - startedAt;
   const dbStartedAt = Date.now();
   for (const d of docs) {
-    const tags = d.tags.map((t) => normalizeTag2(String(t)));
+    const tags = d.tags.map((t) => storedTag(String(t)));
     await createVersion({
       nestId,
       nodeId: d.id,
@@ -2714,6 +2904,7 @@ async function updateNode(nestId, nodeId, patch, userEmail) {
       } catch {
         throw new NotFoundError(`Node not found: ${nodeId}`);
       }
+      const previousBody = node.body || "";
       const opInput = {};
       if (patch.content !== void 0) {
         node = { ...node, body: patch.content };
@@ -2724,7 +2915,7 @@ async function updateNode(nestId, nodeId, patch, userEmail) {
         opInput.append = "\n" + patch.append;
       }
       if (patch.tags) {
-        const nextTags = [...new Set(patch.tags.map(normalizeTag2))];
+        const nextTags = requireTags(patch.tags);
         node = { ...node, frontmatter: { ...node.frontmatter, tags: nextTags } };
         opInput.tags = nextTags;
       }
@@ -2801,17 +2992,7 @@ async function updateNode(nestId, nodeId, patch, userEmail) {
         );
         node = await storage.readDocument(nodeId);
         await syncNodeTags(nestId, nodeId, currentTags);
-        try {
-          await versionManager.createVersion(node, userEmail, {
-            note: patch.changeNote
-          });
-        } catch (err) {
-          console.error(
-            "VersionManager.createVersion failed (node patch)",
-            err
-          );
-          throw err;
-        }
+        await deleteSupersededDrafts(nestId, nodeId, newVersion);
         await createVersion({
           nestId,
           nodeId,
@@ -2863,6 +3044,13 @@ async function updateNode(nestId, nodeId, patch, userEmail) {
         );
         responseVersion = publishedVersion;
       }
+      await notifyMentions({
+        nestId,
+        nodeId,
+        previousBody,
+        nextBody: node.body || "",
+        actorEmail: userEmail
+      });
       return { node, version: responseVersion };
     } catch (err) {
       throw toSafeError(
@@ -3019,6 +3207,43 @@ async function moveNode(nestId, nodeId, folder, userEmail) {
     return { node: moved, previousId: nodeId };
   });
 }
+async function discardDraft(nestId, nodeId, userEmail) {
+  return withNodeWriteLock(nodeWriteKey(nestId, nodeId), async () => {
+    await assertNotReviewLocked(nestId, nodeId, userEmail, "discarding");
+    const sealed = await getSealedVersion(nestId, nodeId);
+    if (sealed == null) {
+      await deleteNode(nestId, nodeId, userEmail);
+      return { deleted: true, version: null };
+    }
+    const { storage, versions: versionManager } = await engineCache.get(nestId);
+    let raw;
+    try {
+      raw = await versionManager.reconstructVersion(nodeId, sealed);
+    } catch (err) {
+      console.error(
+        "reconstructVersion failed (discard draft)",
+        nestId,
+        nodeId,
+        sealed,
+        err
+      );
+      throw new ValidationError(
+        `Can't restore version ${sealed} of this document \u2014 its history no longer replays. Delete the document instead.`
+      );
+    }
+    await storage.writeDocument(nodeId, raw);
+    await storage.regenerateIndex();
+    const restored = parseDocument(`${nodeId}.md`, raw, nodeId);
+    await syncNodeTags(
+      nestId,
+      nodeId,
+      (restored.frontmatter.tags || []).map(storedTag)
+    );
+    await deleteUnsealedVersions(nestId, nodeId, sealed);
+    await trackEvent("node.discard_draft", { nestId, nodeId, version: sealed });
+    return { deleted: false, version: sealed };
+  });
+}
 async function deleteNode(nestId, nodeId, userEmail) {
   const { storage } = await engineCache.get(nestId);
   await assertNotReviewLocked(nestId, nodeId, userEmail, "deleting");
@@ -3325,7 +3550,10 @@ async function deleteUnsyncedFolder(folderName) {
 async function effectiveAccess(nestId, userId) {
   const access = await resolveNestAccess(nestId, userId);
   if (config.AUTH_MODE === "open" && access.ownerId === ANON_USER_ID) {
-    return { permission: "owner", access };
+    return {
+      permission: capForArchive("owner", access.archived),
+      access: { ...access, rawPermission: "owner" }
+    };
   }
   const permission = access.permission;
   if (permission === "none" && access.hasGrant) {
@@ -3342,12 +3570,14 @@ function isGrantOnly(access) {
 var nestRoutes = new Hono3();
 nestRoutes.get("/", async (c) => {
   const userId = c.get("userId");
-  const owned = await listNests(userId);
-  const shared = await listSharedNests(userId);
-  const publicExtras = await listPublicNests(userId);
+  const archivedOnly = c.req.query("archived") === "1";
+  const owned = await listNests(userId, { archived: archivedOnly });
+  const shared = archivedOnly ? [] : await listSharedNests(userId);
+  const publicExtras = archivedOnly ? [] : await listPublicNests(userId);
   const db = getDb();
   const ownerEmailSql = "SELECT email FROM users WHERE id = ?";
   const callerEmail = await resolveCallerEmail(userId);
+  const pinned = await pinnedNestIds(userId);
   const myGrantRows = await db.all(
     "SELECT nest_id, target FROM grants WHERE user_id = ?",
     [userId]
@@ -3370,10 +3600,11 @@ nestRoutes.get("/", async (c) => {
         owner_email: owner_email2,
         roles: ["viewer"],
         grant_only: true,
-        stewardship_enabled: !!n.stewardship_enabled
+        stewardship_enabled: !!n.stewardship_enabled,
+        pinned: pinned.has(n.id)
       };
     }
-    const is_owner = permission === "owner";
+    const is_owner = access.rawPermission === "owner";
     const needOwnerEmail = !is_owner && n.user_id !== ANON_USER_ID;
     const [roles, owner_email] = await Promise.all([
       is_owner ? Promise.resolve(["owner"]) : resolveGrantRoles(n.id, callerEmail, userId),
@@ -3388,7 +3619,8 @@ nestRoutes.get("/", async (c) => {
       owner_email,
       roles,
       grant_only: false,
-      stewardship_enabled: !!n.stewardship_enabled
+      stewardship_enabled: !!n.stewardship_enabled,
+      pinned: pinned.has(n.id)
     };
   };
   const seen = /* @__PURE__ */ new Set();
@@ -3610,24 +3842,56 @@ nestRoutes.patch("/:nestId", async (c) => {
   });
   return c.json({ nest });
 });
-nestRoutes.delete("/:nestId", async (c) => {
+nestRoutes.post("/:nestId/pin", async (c) => {
+  const nestId = c.req.param("nestId");
+  const userId = c.get("userId");
+  if (await effectivePermission(nestId, userId) === "none") {
+    throw new NotFoundError("Nest not found");
+  }
+  await pinNest(userId, nestId);
+  return c.json({ pinned: true });
+});
+nestRoutes.delete("/:nestId/pin", async (c) => {
   const nestId = c.req.param("nestId");
   const userId = c.get("userId");
+  if (await effectivePermission(nestId, userId) === "none") {
+    throw new NotFoundError("Nest not found");
+  }
+  await unpinNest(userId, nestId);
+  return c.json({ pinned: false });
+});
+async function requireNestCaretaker(nestId, userId, verb) {
   const nest = await getNest(nestId);
   if (!nest) {
     throw new NotFoundError("Nest not found");
   }
-  const permission = await effectivePermission(nestId, userId);
-  const isAnonOwned = nest.user_id === ANON_USER_ID;
-  const adminCaretaker = config.AUTH_MODE !== "open" && isAnonOwned && await isLicenseAdminUserId(userId);
-  if (permission !== "owner" && !adminCaretaker) {
+  const { access } = await effectiveAccess(nestId, userId);
+  const adminCaretaker = config.AUTH_MODE !== "open" && nest.user_id === ANON_USER_ID && await isLicenseAdminUserId(userId);
+  if (access.rawPermission !== "owner" && !adminCaretaker) {
     throw new ForbiddenError(
-      "You don't have permission to delete this nest. Only the nest owner can delete it."
+      `You don't have permission to ${verb} this nest. Only the nest owner can ${verb} it.`
     );
   }
+  return nest;
+}
+nestRoutes.delete("/:nestId", async (c) => {
+  const nestId = c.req.param("nestId");
+  await requireNestCaretaker(nestId, c.get("userId"), "delete");
   await deleteNest(nestId);
   return c.json({ deleted: true });
 });
+nestRoutes.post("/:nestId/archive", async (c) => {
+  const nestId = c.req.param("nestId");
+  await requireNestCaretaker(nestId, c.get("userId"), "archive");
+  await archiveNest(nestId);
+  return c.json({ archived: true });
+});
+nestRoutes.post("/:nestId/restore", async (c) => {
+  const nestId = c.req.param("nestId");
+  await requireNestCaretaker(nestId, c.get("userId"), "restore");
+  await restoreNest(nestId);
+  return c.json({ restored: true });
+});
 nestRoutes.get("/:nestId/settings", async (c) => {
   const nestId = c.req.param("nestId");
   const permission = await effectivePermission(nestId, c.get("userId"));
@@ -3696,7 +3960,7 @@ nestRoutes.patch("/:nestId/settings", async (c) => {
 import { Hono as Hono4 } from "hono";
 
 // src/nests/sharing-service.ts
-import { v4 as uuid4 } from "uuid";
+import { v4 as uuid5 } from "uuid";
 var VALID_PERMISSIONS = ["read", "write", "admin"];
 async function addCollaborator(params) {
   const { nestId } = params;
@@ -3723,10 +3987,10 @@ async function addCollaborator(params) {
       userId = existing.id;
     } else {
       const { hashPassword: hashPassword2 } = await import("./keys-CTOGAG3W.js");
-      userId = uuid4();
+      userId = uuid5();
       await db.run(
         "INSERT INTO users (id, email, name, password_hash, is_invited) VALUES (?, ?, ?, ?, 1)",
-        [userId, email, null, await hashPassword2(uuid4())]
+        [userId, email, null, await hashPassword2(uuid5())]
       );
     }
   }
@@ -3764,7 +4028,7 @@ async function addCollaborator(params) {
     [params.grantedByEmail]
   ))?.id : void 0;
   const granterId = params.grantedByUserId || granterByEmail || ownerRow.user_id;
-  const collabId = uuid4();
+  const collabId = uuid5();
   await db.run(
     "INSERT INTO nest_collaborators (id, nest_id, user_id, permission, granted_by) VALUES (?, ?, ?, ?, ?)",
     [collabId, nestId, userId, params.permission, granterId]
@@ -3835,7 +4099,10 @@ sharingRoutes.get("/collaborators", async (c) => {
       roles: await resolveUserRoles(nestId, collab.email)
     });
   }
-  return c.json({ collaborators: enriched });
+  return c.json({
+    collaborators: enriched,
+    people: await listNestPeople(nestId)
+  });
 });
 sharingRoutes.post("/collaborators", async (c) => {
   const body = await c.req.json();
@@ -3955,7 +4222,7 @@ sharingRoutes.patch("/reader-mode", async (c) => {
 
 // src/nests/grant-routes.ts
 import { Hono as Hono5 } from "hono";
-import { v4 as uuid5 } from "uuid";
+import { v4 as uuid6 } from "uuid";
 var grantRoutes = new Hono5();
 async function requireManage(c, nestId) {
   if (!await canManageStewards(nestId, c.get("userId"))) {
@@ -3970,10 +4237,10 @@ async function resolveGrantee(email) {
   const existing = await db.get("SELECT id FROM users WHERE LOWER(email) = ?", [e]);
   if (existing) return existing.id;
   const { hashPassword: hashPassword2 } = await import("./keys-CTOGAG3W.js");
-  const id = uuid5();
+  const id = uuid6();
   await db.run(
     "INSERT INTO users (id, email, name, password_hash, is_invited) VALUES (?, ?, ?, ?, 1)",
-    [id, e, null, await hashPassword2(uuid5())]
+    [id, e, null, await hashPassword2(uuid6())]
   );
   return id;
 }
@@ -4075,7 +4342,7 @@ grantRoutes.delete("/:id", async (c) => {
 import { Hono as Hono6 } from "hono";
 
 // src/nests/publish-service.ts
-import { v4 as uuid6 } from "uuid";
+import { v4 as uuid7 } from "uuid";
 import { createHash as createHash2, randomBytes as randomBytes3 } from "crypto";
 var MODES = ["public", "email", "code", "invite"];
 var LINK_TTL_SECONDS = 60 * 60;
@@ -4138,8 +4405,13 @@ async function createPublish(params) {
   if (!await nodeExists(nestId, nodeId)) {
     throw new ValidationError(`No such document in this nest: ${nodeId}`);
   }
+  if (await getApprovedVersion(nestId, nodeId) == null) {
+    throw new ValidationError(
+      "This document has no approved version, so a link to it would show nothing. Get it approved first, then publish."
+    );
+  }
   const db = getDb();
-  const id = uuid6();
+  const id = uuid7();
   const slug = newSlug();
   const created = nowIso();
   const codeHash = mode === "code" && params.code ? await hashPassword(params.code.trim()) : null;
@@ -4170,7 +4442,7 @@ async function createPublish(params) {
       await db.run(
         `INSERT INTO access_grant (id, publish_id, kind, email, token_hash, expires_at, used_at, created_at)
          VALUES (?, ?, 'invite', ?, NULL, NULL, NULL, ?)`,
-        [uuid6(), id, email, created]
+        [uuid7(), id, email, created]
       );
     }
   }
@@ -4179,7 +4451,12 @@ async function createPublish(params) {
   return row;
 }
 async function getPublishBySlug(slug) {
-  return await getDb().get("SELECT * FROM publish WHERE slug = ?", [slug]);
+  return await getDb().get(
+    `SELECT p.* FROM publish p
+       JOIN nests n ON n.id = p.nest_id
+      WHERE p.slug = ? AND n.archived_at IS NULL`,
+    [slug]
+  );
 }
 async function getPublishById(nestId, id) {
   return await getDb().get("SELECT * FROM publish WHERE id = ? AND nest_id = ?", [
@@ -4220,7 +4497,7 @@ async function mintMagicLink(publishId, email) {
   await getDb().run(
     `INSERT INTO access_grant (id, publish_id, kind, email, token_hash, expires_at, used_at, created_at)
      VALUES (?, ?, 'link', ?, ?, ?, NULL, ?)`,
-    [uuid6(), publishId, e, sha256Hex(token), expires, nowIso()]
+    [uuid7(), publishId, e, sha256Hex(token), expires, nowIso()]
   );
   return token;
 }
@@ -4250,7 +4527,7 @@ async function createSession2(publishId, email) {
   await getDb().run(
     `INSERT INTO access_grant (id, publish_id, kind, email, token_hash, expires_at, used_at, created_at)
      VALUES (?, ?, 'session', ?, ?, ?, NULL, ?)`,
-    [uuid6(), publishId, email, sha256Hex(token), expires, nowIso()]
+    [uuid7(), publishId, email, sha256Hex(token), expires, nowIso()]
   );
   return token;
 }
@@ -4267,7 +4544,7 @@ async function logView(publishId, email) {
   await getDb().run(
     `INSERT INTO access_grant (id, publish_id, kind, email, token_hash, expires_at, used_at, created_at)
      VALUES (?, ?, 'view', ?, NULL, NULL, NULL, ?)`,
-    [uuid6(), publishId, email, nowIso()]
+    [uuid7(), publishId, email, nowIso()]
   );
 }
 async function listAllowlist(publishId) {
@@ -4360,7 +4637,7 @@ import { Hono as Hono7 } from "hono";
 import MarkdownIt from "markdown-it";
 
 // src/annotations/service.ts
-import { v4 as uuid7 } from "uuid";
+import { v4 as uuid8 } from "uuid";
 
 // src/annotations/projection.ts
 var MAX_CONTEXT_CHARS = 250;
@@ -4510,7 +4787,7 @@ async function createThread(nestId, nodeId, input, authorEmail) {
     throw new Error("comment body is required");
   }
   const db = getDb();
-  const id = uuid7();
+  const id = uuid8();
   const anchor = clampAnchor(input.anchor);
   const snapshot = input.snapshotVersion ?? await getApprovedVersion(nestId, nodeId) ?? null;
   await db.transaction(async (tx) => {
@@ -4529,7 +4806,7 @@ async function createThread(nestId, nodeId, input, authorEmail) {
     );
     await tx.run(
       "INSERT INTO annotation_comments (id, thread_id, author, body) VALUES (?, ?, ?, ?)",
-      [uuid7(), id, authorEmail, body]
+      [uuid8(), id, authorEmail, body]
     );
   });
   return rowToThread(await getThreadRow(id));
@@ -4549,7 +4826,7 @@ async function addComment(nestId, nodeId, threadId, authorEmail, body) {
   await getScopedThreadRow(threadId, nestId, nodeId);
   await getDb().run(
     "INSERT INTO annotation_comments (id, thread_id, author, body) VALUES (?, ?, ?, ?)",
-    [uuid7(), threadId, authorEmail, trimmed]
+    [uuid8(), threadId, authorEmail, trimmed]
   );
   return rowToThread(await getThreadRow(threadId));
 }
@@ -4569,6 +4846,21 @@ async function setThreadStatus(nestId, nodeId, threadId, status, byEmail) {
   }
   return rowToThread(await getThreadRow(threadId));
 }
+async function resolveHostedNodeId(nestId, nodeId) {
+  if (nodeId.startsWith("nodes/")) return nodeId;
+  const row = await getDb().get(
+    "SELECT is_imported FROM nests WHERE id = ?",
+    [nestId]
+  );
+  if (!row?.is_imported) return `nodes/${nodeId}`;
+  const { storage } = await engineCache.get(nestId);
+  try {
+    await storage.readDocument(nodeId);
+    return nodeId;
+  } catch {
+    return `nodes/${nodeId}`;
+  }
+}
 async function readArtifact(nestId, nodeId, version) {
   const { storage, versions: versionManager } = await engineCache.get(nestId);
   const target = version ?? await getApprovedVersion(nestId, nodeId) ?? null;
@@ -5525,7 +5817,7 @@ nodeRoutes.post("/", async (c) => {
 nodeRoutes.get("/:nodeId{.+}/stewards", async (c) => {
   const nestId = c.req.param("nestId");
   const nodeId = c.req.param("nodeId");
-  const { resolveStewardsWithFallback: resolveStewardsWithFallback2 } = await import("./stewardship-service-HRVD7SIS.js");
+  const { resolveStewardsWithFallback: resolveStewardsWithFallback2 } = await import("./stewardship-service-2YKGBP63.js");
   const { stewards, fallbackToOwner, ownerEmail } = await resolveStewardsWithFallback2(
     nestId,
     nodeId
@@ -5546,10 +5838,24 @@ nodeRoutes.get("/:nodeId{.+}/stewards", async (c) => {
 nodeRoutes.get("/:nodeId{.+}/reviews", async (c) => {
   const nestId = c.req.param("nestId");
   const nodeId = c.req.param("nodeId");
-  const { getReviewHistory: getReviewHistory2 } = await import("./review-service-TJRHRMMZ.js");
+  const { getReviewHistory: getReviewHistory2 } = await import("./review-service-6JK64IRT.js");
   const history = await getReviewHistory2(nestId, nodeId);
   return c.json({ reviews: history });
 });
+nodeRoutes.post("/:nodeId{.+}/discard", async (c) => {
+  const nestId = c.req.param("nestId");
+  const nodeId = c.req.param("nodeId");
+  const userId = c.get("userId");
+  const userEmail = await resolveCallerEmail(userId);
+  if (!await canReadNode(nestId, nodeId, userId, userEmail)) {
+    return c.json(
+      { error: "Access denied \u2014 no steward assignment for this node" },
+      403
+    );
+  }
+  const result = await discardDraft(nestId, nodeId, userEmail);
+  return c.json({ ok: true, ...result });
+});
 nodeRoutes.post("/:nodeId{.+}/revert", async (c) => {
   const nestId = c.req.param("nestId");
   const nodeId = c.req.param("nodeId");
@@ -5873,7 +6179,7 @@ annotationRoutes.post("/:nodeId{.+}/annotations/:threadId/reopen", async (c) =>
 });
 annotationRoutes.get("/:nodeId{.+}/hosted", async (c) => {
   const nestId = c.req.param("nestId");
-  const nodeId = getNodeId(c);
+  const nodeId = await resolveHostedNodeId(nestId, getNodeId(c));
   const userId = c.get("userId");
   const userEmail = await resolveCallerEmail(userId);
   if (!await canReadNode(nestId, nodeId, userId, userEmail)) {
@@ -7172,10 +7478,10 @@ async function listTraceEvents(filters = {}) {
 }
 
 // src/mcp/workflow-tools.ts
-import { v4 as uuid10 } from "uuid";
+import { v4 as uuid11 } from "uuid";
 
 // src/workflow/run-service.ts
-import { v4 as uuid8 } from "uuid";
+import { v4 as uuid9 } from "uuid";
 var RUNNABLE_TYPES = ["agent", "skill"];
 async function flowSubgraph(nestId, agentNode) {
   const db = getDb();
@@ -7305,7 +7611,7 @@ async function triggerRun(opts) {
   }
   const edges = await flowSubgraph(nestId, agentNode);
   const definitions = await referencedDefinitions(nestId, edges);
-  const id = `run_${uuid8()}`;
+  const id = `run_${uuid9()}`;
   const db = getDb();
   await db.transaction(async (tx) => {
     if (parentRunId) {
@@ -7492,7 +7798,7 @@ async function listRuns(nestId, opts) {
 
 // src/workflow/edge-routes.ts
 import { Hono as Hono13 } from "hono";
-import { v4 as uuid9 } from "uuid";
+import { v4 as uuid10 } from "uuid";
 function toResponse(e, t) {
   return {
     id: e.id,
@@ -7553,7 +7859,7 @@ async function validateCondition(nestId, mode, condition) {
 async function assertNoFlowCycle(db, nestId, fromNode, toNode) {
   if (fromNode === toNode) {
     throw new ConflictError(
-      `cycle: ["${fromNode}","${toNode}"] \u2014 flow edges must form a DAG`
+      `cycle: ${await nodeTrail(db, nestId, [fromNode])} cannot flow into itself`
     );
   }
   const rows = await db.all(
@@ -7582,7 +7888,7 @@ async function assertNoFlowCycle(db, nestId, fromNode, toNode) {
       }
       path.reverse().push(toNode);
       throw new ConflictError(
-        `cycle: ${JSON.stringify(path)} \u2014 flow edges must form a DAG`
+        `cycle: ${await nodeTrail(db, nestId, path)} \u2014 flow edges must form a DAG`
       );
     }
     for (const nb of adj.get(cur) ?? []) {
@@ -7674,7 +7980,7 @@ edgeRoutes.post("/", requireWorkflowPlane, async (c) => {
   );
   const metadata = body.metadata === void 0 || body.metadata === null ? null : JSON.stringify(body.metadata);
   const now = (/* @__PURE__ */ new Date()).toISOString();
-  const id = uuid9();
+  const id = uuid10();
   await db.transaction(async (tx) => {
     await assertNoDuplicateEdge(tx, nestId, fromNode, toNode, type);
     if (type.is_flow) {
@@ -8075,7 +8381,7 @@ async function createEdge(ctx, args) {
   );
   const metadata = args.metadata === void 0 || args.metadata === null ? null : JSON.stringify(args.metadata);
   const now = (/* @__PURE__ */ new Date()).toISOString();
-  const id = uuid10();
+  const id = uuid11();
   await db.transaction(async (tx) => {
     await assertNoDuplicateEdge(tx, ctx.nestId, fromNode, toNode, type);
     if (type.is_flow) {
@@ -8139,7 +8445,7 @@ async function upsertEdgeType(ctx, args) {
         `INSERT INTO edge_types
            (id, nest_id, name, description, direction, is_flow, condition_schema, color, created_by, created_at, updated_at)
          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-        [uuid10(), ctx.nestId, name, args.description.trim(), direction, isFlow, conditionSchema, color, definedBy, now, now]
+        [uuid11(), ctx.nestId, name, args.description.trim(), direction, isFlow, conditionSchema, color, definedBy, now, now]
       );
     }
   });
@@ -8172,6 +8478,13 @@ async function deleteEdgeType(nestId, id) {
 
 // src/mcp/tools.ts
 var MAX_HOPS = 10;
+var SEARCH_DEFAULT_LIMIT = 20;
+var SEARCH_MAX_LIMIT = 200;
+function normalizeSearchLimit(raw) {
+  const n = Math.floor(Number(raw));
+  if (!Number.isFinite(n) || n < 1) return SEARCH_DEFAULT_LIMIT;
+  return Math.min(n, SEARCH_MAX_LIMIT);
+}
 function normalizeHops(raw) {
   if (raw == null) return 2;
   const n = Number(raw);
@@ -8215,11 +8528,15 @@ var TOOL_DEFINITIONS = [
   },
   {
     name: "context_search",
-    description: "Full-text keyword search across all node content, titles, tags, and metadata.",
+    description: "Full-text keyword search across all node content, titles, tags, and metadata \u2014 the same index-backed match as REST GET /search. Returns `count` (everything found) and the first `limit` hits, title matches first.",
     inputSchema: {
       type: "object",
       properties: {
-        query: { type: "string", description: "Search terms" }
+        query: { type: "string", description: "Search terms" },
+        limit: {
+          type: "number",
+          description: "Max hits to return (default 20, max 200)"
+        }
       },
       required: ["query"]
     }
@@ -8675,12 +8992,21 @@ var TOOL_DEFINITIONS = [
     }
   }
 ];
-async function resolveLlmBody(ctx, node) {
-  if (!await canReadNode(ctx.nestId, node.id, ctx.userId, ctx.userEmail)) {
+async function batchedBodyGate(nestId) {
+  const stewardshipEnabled = await isStewardshipEnabled(nestId);
+  return {
+    accessChecked: true,
+    stewardshipEnabled,
+    approvedVersions: stewardshipEnabled ? await getApprovedVersions(nestId) : null
+  };
+}
+async function resolveLlmBody(ctx, node, gate) {
+  if (!gate?.accessChecked && !await canReadNode(ctx.nestId, node.id, ctx.userId, ctx.userEmail)) {
     return null;
   }
-  if (!await isStewardshipEnabled(ctx.nestId)) return node.body || "";
-  const approved = await getApprovedVersion(ctx.nestId, node.id);
+  const stewardship = gate ? gate.stewardshipEnabled : await isStewardshipEnabled(ctx.nestId);
+  if (!stewardship) return node.body || "";
+  const approved = gate ? gate.approvedVersions?.get(node.id) ?? null : await getApprovedVersion(ctx.nestId, node.id);
   if (approved == null) return null;
   try {
     return await ctx.versionManager.reconstructVersion(node.id, approved);
@@ -8787,39 +9113,46 @@ ${fmt(tags)}
 ${nodeList}`;
     }
     case "context_search": {
-      const docs = await storage.discoverDocuments();
-      const terms = (args.query || "").toLowerCase().split(/\s+/).filter(Boolean);
-      const enriched = await Promise.all(
-        docs.map(async (n) => ({ node: n, body: await resolveLlmBody(ctx, n) }))
+      const query = String(args.query ?? "");
+      const limit = normalizeSearchLimit(args.limit);
+      const matches = matchDocuments(await discoverForSearch(storage), query).filter((n) => !isDerivedAnnotationsNode(n.id));
+      const accessible = await filterAccessible(
+        nestId,
+        userId,
+        userEmail,
+        matches
       );
-      const visible = enriched.filter((e) => e.body !== null);
-      const matches = visible.filter(({ node: n, body }) => {
-        const hay = [
-          n.frontmatter.title,
-          body || "",
-          n.frontmatter.type || "",
-          ...n.frontmatter.tags || []
-        ].join(" ").toLowerCase();
-        return terms.every((t) => hay.includes(t));
-      });
-      if (!matches.length)
+      const count = accessible.length;
+      if (count === 0)
         return {
-          text: `No nodes matched search: "${args.query}"`,
-          data: { results: [] }
+          text: `No nodes matched search: "${query}"`,
+          data: { results: [], count }
         };
-      const results = matches.map(
-        ({ node: n, body }, i) => `${i + 1}. **${n.frontmatter.title}** [${n.frontmatter.type || "document"}] ${(n.frontmatter.tags || []).join(" ")}
-   ${(body || "").slice(0, 200).replace(/\n/g, " ")}`
-      ).join("\n\n");
+      const gate = await batchedBodyGate(nestId);
+      const page = await Promise.all(
+        accessible.slice(0, limit).map(async (node) => ({
+          node,
+          body: await resolveLlmBody(ctx, node, gate)
+        }))
+      );
+      const results = page.map(({ node: n, body }, i) => {
+        const head = `${i + 1}. **${n.frontmatter.title}** [${n.frontmatter.type || "document"}] ${(n.frontmatter.tags || []).join(" ")}`;
+        const preview = body === null ? "_(no approved version yet \u2014 body withheld)_" : body.slice(0, 200).replace(/\n/g, " ");
+        return `${head}
+   ${preview}`;
+      }).join("\n\n");
+      const more = count > page.length ? ` (showing the first ${page.length}; pass \`limit\` for more)` : "";
       return {
-        text: `Found ${matches.length} node(s) matching "${args.query}":
+        text: `Found ${count} node(s) matching "${query}"${more}:
 
 ${results}`,
-        // Same gated bodies the prose is built from — `resolveLlmBody`
-        // already refused everything this caller may not read. No `score`:
-        // this is a term-containment filter, not a ranked search.
+        // `count` is everything found (like REST); `results` is the page.
+        // Bodies are the gated ones the prose is built from. No `score`:
+        // this is a term-containment filter with title-first ordering, not
+        // a ranked search.
         data: {
-          results: matches.map(({ node: n, body }) => summarizeNode(n, body))
+          results: page.map(({ node: n, body }) => summarizeNode(n, body)),
+          count
         }
       };
     }
@@ -9327,7 +9660,9 @@ ${list}`;
         });
         return `Rejected the deletion request for **${label}**. It stays, and ${request.requestedBy} has been told why.`;
       }
-      if (request.targetType === "nest") {
+      if (request.targetType === "nest_archive") {
+        await archiveNest(nestId);
+      } else if (request.targetType === "nest") {
         await deleteNest(nestId);
       } else if (request.targetType === "folder") {
         await deleteFolder(nestId, request.nodeId, userEmail);
@@ -9346,7 +9681,7 @@ ${list}`;
         targetType: request.targetType,
         baseUrl: ctx.baseUrl
       });
-      return `Deleted **${label}** \u2014 ${request.requestedBy}'s request was honoured. Irreversible.`;
+      return request.targetType === "nest_archive" ? `Archived **${label}** \u2014 ${request.requestedBy}'s request was honoured. Nothing was deleted: the nest is read-only and hidden until someone restores it.` : `Deleted **${label}** \u2014 ${request.requestedBy}'s request was honoured. Irreversible.`;
     }
     case "context_review_queue": {
       const status = args.status || "pending";
@@ -9592,19 +9927,19 @@ ${list}`,
       if (!target) return "target is required (a node id or folder prefix).";
       if (!["read", "write"].includes(role)) return "role must be read or write.";
       try {
-        const { createGrant: createGrant2 } = await import("./grants-service-WC27TRY3.js");
-        const db = (await import("./client-7Z2IVCPW.js")).getDb();
+        const { createGrant: createGrant2 } = await import("./grants-service-LSNZN6NG.js");
+        const db = (await import("./client-BD6PAUCZ.js")).getDb();
         const { normalizeEmail: normalizeEmail2 } = await import("./email-R7DFS6E5.js");
         const e = normalizeEmail2(String(args.email || ""));
         if (!e) return "email is required.";
         let row = await db.get("SELECT id FROM users WHERE LOWER(email) = ?", [e]);
         if (!row) {
           const { hashPassword: hashPassword2 } = await import("./keys-CTOGAG3W.js");
-          const { v4: uuid18 } = await import("uuid");
-          const id = uuid18();
+          const { v4: uuid19 } = await import("uuid");
+          const id = uuid19();
           await db.run(
             "INSERT INTO users (id, email, name, password_hash, is_invited) VALUES (?, ?, ?, ?, 1)",
-            [id, e, null, await hashPassword2(uuid18())]
+            [id, e, null, await hashPassword2(uuid19())]
           );
           row = { id };
         }
@@ -9726,7 +10061,7 @@ mcpRoutes.all("/", async (c) => {
 
 // src/workflow/run-routes.ts
 import { Hono as Hono15 } from "hono";
-import { v4 as uuid11 } from "uuid";
+import { v4 as uuid12 } from "uuid";
 var RUNNABLE_TYPES2 = ["agent", "skill"];
 var safeJson2 = (s) => {
   if (!s) return null;
@@ -9923,7 +10258,7 @@ runTriggerRoutes.post("/:agentNode{.+}", requireWorkflowPlane, async (c) => {
   }
   const bundle = await buildRunBundle(nestId, agentNode);
   const triggeredBy = await resolveCallerEmail(c.get("userId"));
-  const id = `run_${uuid11()}`;
+  const id = `run_${uuid12()}`;
   await getDb().run(
     `INSERT INTO runs (id, nest_id, agent_node, triggered_by, status, inputs, started_at, parent_run_id, depth)
      VALUES (?, ?, ?, ?, 'running', ?, ?, ?, ?)`,
@@ -10136,7 +10471,7 @@ runDetailRoutes.get("/:id", requireWorkflowPlane, async (c) => {
 
 // src/workflow/schedule-routes.ts
 import { Hono as Hono16 } from "hono";
-import { v4 as uuid12 } from "uuid";
+import { v4 as uuid13 } from "uuid";
 var RUNNABLE_TYPES3 = ["agent", "skill"];
 var MIN_EVERY = 5;
 var MAX_EVERY = 7 * 24 * 60;
@@ -10214,7 +10549,7 @@ scheduleRoutes.post("/", requireWorkflowPlane, async (c) => {
     );
   }
   const now = (/* @__PURE__ */ new Date()).toISOString();
-  const id = `sch_${uuid12()}`;
+  const id = `sch_${uuid13()}`;
   await db.run(
     `INSERT INTO schedules (id, nest_id, agent_node, every_minutes, enabled, last_run_at, max_runs, runs_created, created_by, created_at, updated_at)
      VALUES (?, ?, ?, ?, ?, NULL, ?, 0, ?, ?, ?)`,
@@ -10270,7 +10605,7 @@ scheduleRoutes.delete("/:id", requireWorkflowPlane, async (c) => {
 
 // src/notify/connector-routes.ts
 import { Hono as Hono17 } from "hono";
-import { v4 as uuid13 } from "uuid";
+import { v4 as uuid14 } from "uuid";
 var KNOWN_EVENTS = [
   "review_requested",
   "review_approved",
@@ -10335,7 +10670,7 @@ connectorRoutes.post("/", async (c) => {
   const url = parseUrl(body.url);
   const events = parseEvents(body.events);
   const now = (/* @__PURE__ */ new Date()).toISOString();
-  const id = `con_${uuid13()}`;
+  const id = `con_${uuid14()}`;
   await getDb().run(
     `INSERT INTO connectors (id, nest_id, channel, url, events, enabled, created_by, created_at, updated_at)
      VALUES (?, ?, ?, ?, ?, 1, ?, ?, ?)`,
@@ -10483,7 +10818,9 @@ hookFireRoutes.post("/:token", async (c) => {
   }
   const db = getDb();
   const hook = await db.get(
-    "SELECT * FROM trigger_hooks WHERE id = ? AND enabled = 1",
+    `SELECT h.* FROM trigger_hooks h
+       JOIN nests n ON n.id = h.nest_id
+      WHERE h.id = ? AND h.enabled = 1 AND n.archived_at IS NULL`,
     [token]
   );
   if (!hook) throw new NotFoundError("Not found");
@@ -10576,7 +10913,7 @@ hookFireRoutes.post("/:token", async (c) => {
 
 // src/definitions/routes.ts
 import { Hono as Hono19 } from "hono";
-import { v4 as uuid14 } from "uuid";
+import { v4 as uuid15 } from "uuid";
 var definitionRoutes = new Hono19();
 definitionRoutes.get("/", async (c) => {
   const nestId = c.req.param("nestId");
@@ -10656,7 +10993,7 @@ definitionRoutes.post("/", async (c) => {
       await applyUpdate(tx, existing.id);
       targetId = existing.id;
     } else {
-      targetId = uuid14();
+      targetId = uuid15();
       wasCreated = true;
       await tx.run(
         `INSERT INTO definitions (id, nest_id, term, definition, linked_tag, defined_by, created_at, updated_at)
@@ -10686,7 +11023,7 @@ definitionRoutes.delete("/:id", async (c) => {
 
 // src/nests/asset-routes.ts
 import { Hono as Hono20 } from "hono";
-import { v4 as uuid15 } from "uuid";
+import { v4 as uuid16 } from "uuid";
 import { mkdir as mkdir2, readFile, writeFile } from "fs/promises";
 import { join as join4 } from "path";
 var assetRoutes = new Hono20();
@@ -10735,7 +11072,7 @@ assetRoutes.post("/", async (c) => {
       `${isVideo ? "video" : "image"} too large (${(file.size / (1024 * 1024)).toFixed(1)} MB, max ${maxBytes / (1024 * 1024)} MB for ${isVideo ? "video" : "images"})`
     );
   }
-  const name = `${uuid15()}.${ext === "jpeg" ? "jpg" : ext}`;
+  const name = `${uuid16()}.${ext === "jpeg" ? "jpg" : ext}`;
   const dir = join4(resolveNestPath(nestId), "assets");
   await mkdir2(dir, { recursive: true });
   await writeFile(join4(dir, name), Buffer.from(await file.arrayBuffer()));
@@ -10795,10 +11132,15 @@ async function canRead(nestId, userId) {
 }
 async function resolveNestRef(ref, userId) {
   const db = getDb();
-  const byId = await db.get("SELECT * FROM nests WHERE id = ?", [ref]);
+  const byId = await db.get(
+    "SELECT * FROM nests WHERE id = ? AND archived_at IS NULL",
+    [ref]
+  );
   if (byId) return byId;
   const byName = await db.all(
-    "SELECT * FROM nests WHERE LOWER(name) = LOWER(?) OR LOWER(slug) = LOWER(?)",
+    `SELECT * FROM nests
+      WHERE archived_at IS NULL
+        AND (LOWER(name) = LOWER(?) OR LOWER(slug) = LOWER(?))`,
     [ref, ref]
   );
   if (byName.length <= 1) return byName[0] ?? null;
@@ -10897,12 +11239,16 @@ var SERVER_TOOL_DEFINITIONS = [
   },
   {
     name: "context_search",
-    description: "Full-text keyword search across one nest.",
+    description: "Full-text keyword search across one nest \u2014 the same index-backed match as REST GET /search. Returns `count` (everything found) and the first `limit` hits.",
     inputSchema: {
       type: "object",
       properties: {
         ...NEST_ARG,
-        query: { type: "string", description: "Search terms" }
+        query: { type: "string", description: "Search terms" },
+        limit: {
+          type: "number",
+          description: "Max hits to return (default 20, max 200)"
+        }
       },
       required: ["nest", "query"]
     }
@@ -11203,6 +11549,26 @@ Claude Code / Cursor / VS Code connect natively via HTTP with the
 npx -y mcp-remote ${B}/mcp --header "Authorization: Bearer <api-key>"
 \`\`\`
 
+## From the ctx CLI
+
+The \`ctx\` CLI (\`@promptowl/contextnest-cli\` 2.2+) reads a hosted nest the
+same way it reads a local vault: register the MCP endpoint as a vault alias,
+then pass \`--vault <alias>\` to \`query\`, \`read\`, \`list\`, \`search\`. The key
+is read from the environment variable named by \`--bearer-env\` \u2014 never put it
+on the command line.
+
+\`\`\`
+export CONTEXTNEST_API_KEY=<api-key>
+# every nest these credentials can read, through the server-level endpoint
+ctx vault add contextnest --url ${B}/mcp --bearer-env CONTEXTNEST_API_KEY
+# or one nest
+ctx vault add mynest --url ${B}/nests/<nest-id>/mcp --bearer-env CONTEXTNEST_API_KEY
+ctx query "#gtm" --vault mynest
+\`\`\`
+
+Servers in "open" auth mode: drop \`--bearer-env\`. Pushing a local folder up
+is \`ctx push --server ${B} --nest <nest-id>\` with the same env var set.
+
 ## npm packages
 
 - \`@promptowl/contextnest-community\` \u2014 this server
@@ -11354,7 +11720,7 @@ async function getNestFeed(params) {
 }
 
 // src/governance/comment-service.ts
-import { v4 as uuid16 } from "uuid";
+import { v4 as uuid17 } from "uuid";
 async function createComment(params) {
   const db = getDb();
   const body = (params.body ?? "").trim();
@@ -11370,7 +11736,7 @@ async function createComment(params) {
       throw new Error("Parent comment not found on this node");
     }
   }
-  const id = uuid16();
+  const id = uuid17();
   await db.run(
     `INSERT INTO comments
        (id, nest_id, node_id, version, anchor_start, anchor_end, anchor_text,
@@ -11885,12 +12251,12 @@ governanceRoutes.post("/request-deletion", async (c) => {
   if (!reason) {
     throw new ValidationError("A reason for the deletion request is required");
   }
-  if (body.targetType !== "folder" && body.targetType !== "nest") {
+  if (body.targetType !== "folder" && body.targetType !== "nest" && body.targetType !== "nest_archive") {
     throw new ValidationError(
-      'targetType must be "folder" or "nest" \u2014 flag a single document via POST /nests/:nestId/nodes/:nodeId/request-deletion'
+      'targetType must be "folder", "nest" or "nest_archive" \u2014 flag a single document via POST /nests/:nestId/nodes/:nodeId/request-deletion'
     );
   }
-  const target = body.targetType === "nest" ? nestId : (body.target || "").trim().replace(/^\/+|\/+$/g, "").replace(/^nodes\//, "");
+  const target = isNestTarget(body.targetType) ? nestId : (body.target || "").trim().replace(/^\/+|\/+$/g, "").replace(/^nodes\//, "");
   if (body.targetType === "folder" && !target) {
     throw new ValidationError("target (the folder path) is required");
   }
@@ -11926,14 +12292,16 @@ governanceRoutes.post("/deletion-requests/:id/delete", async (c) => {
   }
   const actor = await getUserEmail4(c);
   const docTitle = await deletionTargetTitle(request);
-  if (request.targetType === "nest" || request.targetType === "folder") {
+  if (isNestTarget(request.targetType) || request.targetType === "folder") {
     const denied = denyUnlessNestManager(
       c,
-      request.targetType === "nest" ? "a nest" : "a folder"
+      request.targetType === "folder" ? "a folder" : "a nest"
     );
     if (denied) return denied;
   }
-  if (request.targetType === "nest") {
+  if (request.targetType === "nest_archive") {
+    await archiveNest(nestId);
+  } else if (request.targetType === "nest") {
     await deleteNest(nestId);
   } else if (request.targetType === "folder") {
     await deleteFolder(nestId, request.nodeId, actor);
@@ -12112,11 +12480,18 @@ governanceNodeRoutes.get("/:nodeId{.+}/versions/:version{[0-9]+}", async (c) =>
       403
     );
   }
-  const { versions: versionManager } = await engineCache.get(nestId);
+  const { storage, versions: versionManager } = await engineCache.get(nestId);
   try {
     const raw = await versionManager.reconstructVersion(nodeId, version);
     return c.json({ version, content: bodyOnly(nodeId, raw) });
   } catch (err) {
+    try {
+      const node = await storage.readDocument(nodeId);
+      if ((node.frontmatter.version ?? 1) === version) {
+        return c.json({ version, content: node.body ?? "" });
+      }
+    } catch {
+    }
     console.error("reconstructVersion failed", nestId, nodeId, version, err);
     return c.json({ version, content: null }, 200);
   }
@@ -13387,11 +13762,15 @@ function createApp() {
       nestName2.set(n.id, n.name ?? n.id);
     const limit = Math.min(Math.max(Number(c.req.query("limit")) || 25, 1), 100);
     const offset = Math.max(Number(c.req.query("offset")) || 0, 0);
+    const sort = c.req.query("sort") === "title" ? "title" : "updated";
     const { drafts, total } = await listMyDrafts({
       authorEmail: me,
       nestIds: [...nestName2.keys()],
       limit,
-      offset
+      offset,
+      q: c.req.query("q") ?? void 0,
+      sort,
+      nestNames: nestName2
     });
     return c.json({
       drafts: drafts.map((d) => ({
@@ -13405,8 +13784,8 @@ function createApp() {
         version: d.version,
         updated_at: d.updatedAt
       })),
-      // has_more off the REQUESTED page size, not the returned row count: the
-      // existence filter can shorten a page, and that must not read as "last".
+      // `total` counts drafts whose document still exists — the same set the
+      // page is sliced from — so this is exact in every sort and search mode.
       pagination: { total, limit, offset, has_more: offset + limit < total }
     });
   });
@@ -13500,6 +13879,8 @@ function createApp() {
     const userId = c.get("userId");
     const nestScope = c.get("nestScope");
     const isMcpTransport = parts.length === 2 && parts[1] === "mcp";
+    const isNestLifecycleAction = parts.length === 2 && c.req.method === "POST" && (parts[1] === "archive" || parts[1] === "restore");
+    const isPinAction = parts.length === 2 && parts[1] === "pin";
     const deny = async (status, error, extra) => {
       if (!isMcpTransport) return c.json({ error, ...extra }, status);
       let id = null;
@@ -13544,11 +13925,25 @@ function createApp() {
       }
     }
     if (config.AUTH_MODE === "open") {
-      c.set("nestPermission", "owner");
+      const archived = await isNestArchived(nestId);
+      if (archived) {
+        if (isMcpTransport) return deny(404, "Nest not found");
+        if (c.req.method !== "GET" && !isNestLifecycleAction) {
+          return deny(
+            403,
+            "This nest is archived, so it is read-only. Restore it to make changes.",
+            { archived: true }
+          );
+        }
+      }
+      c.set("nestPermission", archived ? "read" : "owner");
       return next();
     }
     const access = await resolveNestAccess(nestId, userId);
     const permission = access.permission;
+    if (access.archived && isMcpTransport) {
+      return deny(404, "Nest not found");
+    }
     const isReadQuery = parts.length === 2 && ["context", "query", "search", "export"].includes(parts[1]);
     let grantRole = null;
     let grantNestVisible = false;
@@ -13566,6 +13961,8 @@ function createApp() {
         grantNestVisible = access.hasGrant;
       } else if (isReadQuery) {
         grantNestVisible = access.hasGrant;
+      } else if (isPinAction) {
+        grantNestVisible = access.hasGrant;
       } else if (parts[1] === "definitions" && parts.length === 2 && c.req.method === "GET") {
         grantNestVisible = access.hasGrant;
       }
@@ -13599,12 +13996,12 @@ function createApp() {
       required = c.req.method === "GET" ? "write" : "admin";
     } else if (parts[1] === "hooks") {
       required = "write";
-    } else if (c.req.method !== "GET" && !isStewardActionPath && !isCommentAction && !isDeletionRequestAction && !isAnnotationAction && !isReadQuery && !isMcpTransport) {
+    } else if (c.req.method !== "GET" && !isStewardActionPath && !isCommentAction && !isDeletionRequestAction && !isNestLifecycleAction && !isPinAction && !isAnnotationAction && !isReadQuery && !isMcpTransport) {
       required = "write";
     }
     const isNodeAction = c.req.method === "POST" && parts.length >= 4 && (parts[parts.length - 1] === "revert" || parts[parts.length - 1] === "move");
     let stewardEditorBypass = false;
-    if (required === "write" && permission === "read" && parts[1] === "nodes") {
+    if (required === "write" && permission === "read" && !access.archived && parts[1] === "nodes") {
       const userEmail = await resolveCallerEmail(userId);
       if (parts.length >= 3 && (c.req.method === "PATCH" || c.req.method === "DELETE" || isNodeAction)) {
         const idParts = isNodeAction ? parts.slice(2, -1) : parts.slice(2);
@@ -14000,7 +14397,7 @@ async function repairGraftedVersionChains(db) {
 }
 
 // src/workflow/scheduler.ts
-import { v4 as uuid17 } from "uuid";
+import { v4 as uuid18 } from "uuid";
 function isDue(s, now) {
   if (!s.last_run_at) return true;
   const last = Date.parse(s.last_run_at);
@@ -14009,7 +14406,11 @@ function isDue(s, now) {
 }
 async function schedulerTick(now = Date.now()) {
   const db = getDb();
-  const due = (await db.all("SELECT * FROM schedules WHERE enabled = 1")).filter((s) => isDue(s, now));
+  const due = (await db.all(
+    `SELECT s.* FROM schedules s
+         JOIN nests n ON n.id = s.nest_id
+        WHERE s.enabled = 1 AND n.archived_at IS NULL`
+  )).filter((s) => isDue(s, now));
   const created = [];
   for (const s of due) {
     try {
@@ -14024,7 +14425,7 @@ async function schedulerTick(now = Date.now()) {
         );
         continue;
       }
-      const id = `run_${uuid17()}`;
+      const id = `run_${uuid18()}`;
       const nowIso2 = new Date(now).toISOString();
       await db.run(
         `INSERT INTO runs (id, nest_id, agent_node, triggered_by, status, inputs, started_at, parent_run_id, depth)