drafted 1.19.41 → 1.19.43

package/mcp/server.mjs

@@ -1368,6 +1368,14 @@ function enforceTokenBudget(text, max = MAX_TOOL_RESULT_CHARS) {
   return head + tail;
 }
 
+// Mirrors projectIsTrashed in src/db/queries.ts and isTrashed() in home-html.mjs:
+// a project is out of the active listing if it has a trashedAt clock OR carries
+// the legacy '__archived' folder sentinel. Both are checked because pre-Trash
+// rows still hold the sentinel and were deliberately not migrated onto a clock.
+function isTrashedRow(x) {
+  return !!(x && (x.trashedAt || x.folder === '__archived'));
+}
+
 function ok(text, opts) {
   const str = typeof text === 'string' ? text : JSON.stringify(text, null, 2);
   const result = { content: [{ type: 'text', text: enforceTokenBudget(str) }] };
@@ -3474,7 +3482,7 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
       // the row while wiki/skills used the form the caller typed — one result,
       // two spellings of one org.
       const projectRows = (Array.isArray(projects.v?.projects) ? projects.v.projects : [])
-        .filter(x => x.folder !== '__archived');
+        .filter(x => !isTrashedRow(x));
       const folderById = new Map(projectRows.map(x => [x.id, x.folder || '']));
       const orgAs = canonicalOrg;
       section('Projects', projects, () => {
@@ -3821,7 +3829,7 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
       // active list — mirroring the web UI. An org-scoped root lists ONLY that
       // org's projects (Shape A).
       const listing = await api('GET', '/api/projects');
-      let rows = (Array.isArray(listing?.projects) ? listing.projects : []).filter(x => x.folder !== '__archived');
+      let rows = (Array.isArray(listing?.projects) ? listing.projects : []).filter(x => !isTrashedRow(x));
       if (orgFromPath) {
         const kept = [];
         for (const x of rows) {
@@ -4147,27 +4155,37 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
           return ok(result);
         }
         case 'rm': {
-          // Project-level rm = archive (soft delete): move to the reserved
-          // __archived folder. Frame/lane rm still deletes those items, but a
-          // whole project is never hard-deleted by an agent — the web UI's
-          // Archive bin is where a human permanently deletes.
+          // Project-level rm = move to Trash (soft delete). Frame/lane rm still
+          // deletes those items outright, but a whole project is never
+          // hard-deleted by an agent — a human does that from the Trash bin, or
+          // the server's purge sweep does it after the retention window.
+          // It now goes through DELETE (which trashes unless ?permanent=1) rather
+          // than PATCHing folder='__archived': the sentinel overwrote the
+          // project's real folder, so restoring dumped it at the org root.
           // A layer or lane path has no filename, so it used to fall through to
           // the archive branch and archive the WHOLE project — with a
           // success-shaped response. /slides/deck and /slides are one keystroke
-          // from the project path; only the bare project path may archive.
+          // from the project path; only the bare project path may trash.
           const scope = rmScope(layer, lane, filename);
           if (scope === 'directory') {
             return err(new Error(
               `rm on a ${lane ? 'lane' : 'layer'} path deletes nothing — Drafted has no directory delete. ` +
               `Remove the frames individually: /projects/<project>/${layer}${lane ? '/' + lane : ''}/<file>. ` +
-              `To archive the whole project, address the project itself: /projects/<project>`
+              `To trash the whole project, address the project itself: /projects/<project>`
             ));
           }
           if (scope === 'project') {
             const pid = getState().projectId;
-            if (!pid) return err(new Error('could not resolve project id for archive'));
-            const result = await api('PATCH', `/api/project/${pid}`, { folder: '__archived' }, orgHeader);
-            return ok({ archived: true, project: projectRef, projectId: pid, archiveHint: 'The project now lives in the Archive bin in the web UI sidebar — a human can restore or permanently delete it there.' });
+            if (!pid) return err(new Error('could not resolve project id for trash'));
+            const result = await api('DELETE', `/api/project/${pid}`, undefined, orgHeader);
+            const days = result?.retentionDays ?? 30;
+            return ok({
+              trashed: true,
+              project: projectRef,
+              projectId: pid,
+              retentionDays: days,
+              trashHint: `The project is in the Trash bin in the web UI sidebar. It keeps its folder and can be restored there for ${days} days, after which it is deleted permanently.`,
+            });
           }
           const rmPath = lane ? `/${layer}/${lane}/${filename}` : `/${layer}/${filename}`;
           const result = await api('DELETE', `/api/fs/${rmPath.replace(/^\//, '')}`, undefined, orgHeader);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drafted",
-  "version": "1.19.41",
+  "version": "1.19.43",
   "description": "Drafted — visual thinking surface for humans and AI agents. Renders HTML, markdown, images, and code as frames on a zoomable canvas, with MCP tools for AI agents and real-time sync for humans.",
   "type": "module",
   "files": [