kempo 4.9.2 → 4.9.3

package/dist/kempo/sdk.js

@@ -1,2 +1,2 @@
 import{get as e,post as s,put as t,patch as n,del as o}from"./fetch.js";const a="/kempo/api";export const register=async({email:e,password:t,name:n})=>s(`${a}/auth/register/email`,{email:e,password:t,name:n});export const login=async({email:e,password:t})=>s(`${a}/auth/login/email`,{email:e,password:t});export const logout=async()=>s(`${a}/auth/logout`,{});export const getSession=async()=>e(`${a}/auth/session`);export const forgotPassword=async({email:e})=>s(`${a}/forgot-password`,{email:e});export const resetPassword=async({token:e,password:t,logoutAll:n=!1})=>s(`${a}/auth/reset-password`,{token:e,newPassword:t,logoutAll:n});export const changePassword=async({currentPassword:e,newPassword:t,logoutAll:n})=>s(`${a}/auth/change-password`,{currentPassword:e,newPassword:t,logoutAll:n});export const verifyEmail=async({token:e})=>s(`${a}/auth/verify-email`,{token:e});export const currentUserHasPermission=async({permission:s})=>e(`${a}/user/current/permissions`,{permission:s});export const currentUserHasAllPermissions=async({permissions:s})=>e(`${a}/user/current/permissions/all`,{permissions:s});export const currentUserHasSomePermissions=async({permissions:s})=>e(`${a}/user/current/permissions/some`,{permissions:s});export const getAllCurrentUserPermissions=async()=>e(`${a}/user/current/permissions/list`);export const userHasPermission=async({userid:s,permission:t})=>e(`${a}/user/${s}/permissions`,{permission:t});export const userHasAllPermissions=async({userid:s,permissions:t})=>e(`${a}/user/${s}/permissions/all`,{permissions:t});export const userHasSomePermissions=async({userid:s,permissions:t})=>e(`${a}/user/${s}/permissions/some`,{permissions:t});export const getAllUserPermissions=async({userid:s})=>e(`${a}/user/${s}/permissions/list`);export const getUsers=async({limit:s,offset:t}={})=>e(`${a}/user`,{limit:s,offset:t});export const searchUsers=async({q:s,limit:t,offset:n,inGroup:o,notInGroup:i}={})=>e(`${a}/user/search`,{q:s,limit:t,offset:n,inGroup:o,notInGroup:i});export const createUser=async({name:e,email:t,password:n,emailVerified:o})=>s(`${a}/user/create`,{name:e,email:t,password:n,emailVerified:o});export const deleteUsers=async e=>o(`${a}/user`,{ids:e});export const updateUser=async({id:e,name:s,email:t,emailVerified:o,createdAt:i})=>n(`${a}/user`,{id:e,name:s,email:t,emailVerified:o,createdAt:i});export const getUser=async s=>e(`${a}/user/${s}`);export const getUserSessions=async(s,{limit:t,offset:n}={})=>e(`${a}/user/${s}/sessions`,{limit:t,offset:n});export const deleteUserSession=async(e,s)=>o(`${a}/user/${e}/sessions`,{sessionToken:s});export const deleteExpiredUserSessions=async e=>o(`${a}/user/${e}/sessions/expired`);export const getUserGroups=async(s,{limit:t,offset:n}={})=>e(`${a}/user/${s}/groups`,{limit:t,offset:n});export const addUserToGroup=async(e,t)=>s(`${a}/user/${e}/groups`,{groupName:t});export const removeUserFromGroup=async(e,s)=>o(`${a}/user/${e}/groups`,{groupName:s});export const listGroups=async({limit:s,offset:t,owner:n}={})=>e(`${a}/groups`,{limit:s,offset:t,owner:n});export const createGroup=async({name:e,description:t})=>s(`${a}/groups`,{name:e,description:t});export const updateGroup=async({name:e,newName:s,description:t})=>n(`${a}/groups`,{name:e,newName:s,description:t});export const deleteGroups=async e=>o(`${a}/groups`,{names:e});export const getGroup=async s=>e(`${a}/groups/${encodeURIComponent(s)}`);export const getGroupMembers=async(s,{limit:t,offset:n}={})=>e(`${a}/groups/${encodeURIComponent(s)}/members`,{limit:t,offset:n});export const addMemberToGroup=async(e,t)=>s(`${a}/groups/${encodeURIComponent(e)}/members`,{userId:t});export const removeMemberFromGroup=async(e,s)=>o(`${a}/groups/${encodeURIComponent(e)}/members`,{userId:s});export const getGroupPermissions=async s=>e(`${a}/groups/${encodeURIComponent(s)}/permissions`);export const addPermissionToGroup=async(e,t)=>s(`${a}/groups/${encodeURIComponent(e)}/permissions`,{permissionName:t});export const removePermissionFromGroup=async(e,s)=>o(`${a}/groups/${encodeURIComponent(e)}/permissions`,{permissionName:s});export const listPermissions=async({limit:s,offset:t,owner:n}={})=>e(`${a}/permissions`,{limit:s,offset:t,owner:n});export const createPermissions=async e=>s(`${a}/permissions`,{permissions:e});export const updatePermission=async({name:e,description:s})=>n(`${a}/permissions`,{name:e,description:s});export const deletePermissions=async e=>o(`${a}/permissions`,{names:e});export const getSetting=async(s,t)=>e(`${a}/settings/${encodeURIComponent(s)}/${encodeURIComponent(t)}`);export const listSettings=async({owner:s,limit:t,offset:n}={})=>e(`${a}/settings/${encodeURIComponent(s)}`,{limit:t,offset:n});export const setSetting=async(e,t,n)=>s(`${a}/settings/${encodeURIComponent(e)}/${encodeURIComponent(t)}`,n);export const deleteSetting=async(e,s)=>o(`${a}/settings/${encodeURIComponent(e)}/${encodeURIComponent(s)}`);export const listEmails=async({status:s,type:t,search:n,limit:o,offset:i}={})=>e(`${a}/emails`,{status:s,type:t,search:n,limit:o,offset:i});export const getEmail=async s=>e(`${a}/emails/${encodeURIComponent(s)}`);export const retryEmail=async e=>s(`${a}/emails/${encodeURIComponent(e)}/retry`,{});export const sendTestEmail=async e=>s(`${a}/emails/test`,{to:e});export const getUpdateStatus=async()=>e(`${a}/updates`);export const checkForUpdate=async()=>s(`${a}/updates/check`,{});export const prepareUpdate=async({version:e,extensions:t}={})=>s(`${a}/updates/prepare`,{version:e,extensions:t});export const applyUpdate=async({version:e,extensions:t,confirm:n}={})=>s(`${a}/updates/apply`,{version:e,extensions:t,confirm:n});export const rollbackUpdate=async e=>s(`${a}/updates/rollback`,{confirm:e});export const discardUpdate=async()=>s(`${a}/updates/discard`,{});export const listPages=async({owner:s,showHidden:t,offset:n,limit:o}={})=>e(`${a}/pages`,{owner:s,showHidden:t,offset:n,limit:o});export const rescanPages=async()=>s(`${a}/pages/rescan`,{});export const listTemplates=async()=>e(`${a}/templates`);export const listDirectories=async()=>e(`${a}/pages/directories`);export const getPage=async s=>e(`${a}/pages/file`,{file:s});export const createPage=async({directory:e,name:t,template:n})=>s(`${a}/pages`,{directory:e,name:t,template:n});export const updatePage=async({file:e,name:s,title:n,description:o,author:i,template:r,contents:c,extraMetadata:p})=>t(`${a}/pages/file`,{file:e,name:s,title:n,description:o,author:i,template:r,contents:c,extraMetadata:p});export const deletePages=async e=>o(`${a}/pages`,{files:e});export const disablePage=async e=>t(`${a}/pages/disable`,{file:e});export const enablePage=async e=>t(`${a}/pages/enable`,{file:e});export const movePage=async({file:e,newFile:s})=>n(`${a}/pages/file`,{file:e,newFile:s});export const searchPagesByMetadata=async s=>e(`${a}/pages/search`,{query:JSON.stringify(s)});export const setPageLocked=async({file:e,locked:s})=>t(`${a}/pages/lock`,{file:e,locked:s});export const getTemplate=async s=>e(`${a}/templates/file`,{file:s});export const createTemplate=async({directory:e,name:t,copyFrom:n})=>s(`${a}/templates`,{directory:e,name:t,copyFrom:n});export const updateTemplate=async({file:e,name:s,author:n,markup:o})=>t(`${a}/templates/file`,{file:e,name:s,author:n,markup:o});export const deleteTemplates=async e=>o(`${a}/templates`,{files:e});export const listEmailTemplates=async s=>e(`${a}/email-templates`,s?{owner:s}:{});export const getEmailTemplate=async s=>e(`${a}/email-templates/file`,{template:s});export const saveEmailTemplate=async({template:e,source:s})=>t(`${a}/email-templates/file`,{template:e,source:s});export const resetEmailTemplate=async e=>o(`${a}/email-templates/file`,{template:e});export const disableTemplate=async e=>t(`${a}/templates/disable`,{file:e});export const enableTemplate=async e=>t(`${a}/templates/enable`,{file:e});export const moveTemplate=async({file:e,newFile:s})=>n(`${a}/templates/file`,{file:e,newFile:s});export const setTemplateLocked=async({file:e,locked:s})=>t(`${a}/templates/lock`,{file:e,locked:s});export const listFragments=async()=>e(`${a}/fragments`);export const getFragment=async s=>e(`${a}/fragments/file`,{file:s});export const createFragment=async({directory:e,name:t})=>s(`${a}/fragments`,{directory:e,name:t});export const updateFragment=async({file:e,author:s,markup:n})=>t(`${a}/fragments/file`,{file:e,author:s,markup:n});export const deleteFragments=async e=>o(`${a}/fragments`,{files:e});export const moveFragment=async({file:e,newFile:s})=>n(`${a}/fragments/file`,{file:e,newFile:s});export const disableFragment=async e=>t(`${a}/fragments/disable`,{file:e});export const enableFragment=async e=>t(`${a}/fragments/enable`,{file:e});export const setFragmentLocked=async({file:e,locked:s})=>t(`${a}/fragments/lock`,{file:e,locked:s});export const listGlobalContent=async()=>e(`${a}/globals`);export const getGlobalContent=async s=>e(`${a}/globals/entry`,{id:s});export const createGlobalContent=async({name:e,location:t,priority:n})=>s(`${a}/globals`,{name:e,location:t,priority:n});export const updateGlobalContent=async({id:e,name:s,location:n,priority:o,markup:i})=>t(`${a}/globals/entry`,{id:e,name:s,location:n,priority:o,markup:i});export const deleteGlobalContent=async e=>o(`${a}/globals`,{ids:e});export const disableGlobalContent=async e=>t(`${a}/globals/disable`,{id:e});export const enableGlobalContent=async e=>t(`${a}/globals/enable`,{id:e});export const setGlobalContentLocked=async({id:e,locked:s})=>t(`${a}/globals/lock`,{id:e,locked:s});export const listMenus=async()=>e(`${a}/menus`);export const saveMenu=async({id:e,name:t})=>s(`${a}/menus`,{id:e,name:t});export const deleteMenu=async e=>o(`${a}/menus`,{id:e});export const assignMenuLocation=async({location:e,menuId:s})=>t(`${a}/menus/location`,{location:e,menuId:s});export const saveMenuItem=async({id:e,menuId:t,location:n,navItem:o,label:i,href:r,icon:c,newTab:p})=>s(`${a}/menus/items`,{id:e,menuId:t,location:n,navItem:o,label:i,href:r,icon:c,newTab:p});export const deleteMenuItems=async e=>o(`${a}/menus/items`,{ids:e});export const setMenuItemEnabled=async({id:e,enabled:s})=>t(`${a}/menus/items/enabled`,{id:e,enabled:s});export const reorderMenuItems=async({menuId:e,ids:s})=>t(`${a}/menus/items/order`,{menuId:e,ids:s});export const adoptMenuItem=async({id:e,menuId:s,menuName:n})=>t(`${a}/menus/adopt`,{id:e,menuId:s,menuName:n});export const listExtensions=async({limit:s,offset:t}={})=>e(`${a}/extensions`,{limit:s,offset:t});export const listAvailableExtensions=async()=>e(`${a}/extensions/available`);export const listKnownExtensions=async({search:s,sort:t,limit:n,offset:o}={})=>e(`${a}/extensions/known`,{search:s,sort:t,limit:n,offset:o});export const getKnownExtension=async s=>e(`${a}/extensions/known`,{name:s});export const rateExtension=async(e,s)=>t(`${a}/extensions/rating`,{name:e,rating:s});export const getDashboardWidgets=async()=>e(`${a}/dashboard/widgets`);export const getNotifications=async({unreadOnly:s=!1,limit:t,offset:n}={})=>e(`${a}/notifications`,{unreadOnly:s,limit:t,offset:n});export const getUnreadNotificationCount=async()=>e(`${a}/notifications/count`);export const markNotificationRead=async e=>s(`${a}/notifications/${encodeURIComponent(e)}/read`,{});export const markNotificationHandled=async e=>s(`${a}/notifications/${encodeURIComponent(e)}/handled`,{});export const markAllNotificationsRead=async()=>s(`${a}/notifications/read-all`,{});export const dismissNotification=async e=>o(`${a}/notifications/${encodeURIComponent(e)}`);export const listRealtimeConnections=async()=>e(`${a}/realtime/connections`);export const installExtension=async(e,{withDependencies:t=!1}={})=>s(`${a}/extensions`,{name:e,withDependencies:t});export const uninstallExtension=async(e,s=!1,{cascade:t=!1}={})=>o(`${a}/extensions`,{name:e,purgeData:s,cascade:t});export const enableExtension=async(e,{cascade:t=!1}={})=>s(`${a}/extensions/${encodeURIComponent(e)}/enable`,{cascade:t});export const getExtensionRequirements=async s=>e(`${a}/extensions/${encodeURIComponent(s)}/requirements`);export const disableExtension=async(e,{cascade:t=!1}={})=>s(`${a}/extensions/${encodeURIComponent(e)}/disable`,{cascade:t});export const getExtensionDependents=async(s,{includeDisabled:t=!1}={})=>e(`${a}/extensions/${encodeURIComponent(s)}/dependents`,{includeDisabled:t?"true":void 0});export const listAdminGlobalContent=async()=>e(`${a}/admin-globals`);export const getAdminGlobalContent=async s=>e(`${a}/admin-globals/${encodeURIComponent(s)}`);export const createAdminGlobalContent=async({name:e,location:t,priority:n,owner:o,markup:i})=>s(`${a}/admin-globals`,{name:e,location:t,priority:n,owner:o,markup:i});export const updateAdminGlobalContent=async(e,{name:s,location:n,priority:o,markup:i})=>t(`${a}/admin-globals/${encodeURIComponent(e)}`,{name:s,location:n,priority:o,markup:i});export const deleteAdminGlobalContent=async e=>o(`${a}/admin-globals`,{ids:e});export const enableAdminGlobalContent=async e=>t(`${a}/admin-globals/${encodeURIComponent(e)}/enable`,{});export const disableAdminGlobalContent=async e=>t(`${a}/admin-globals/${encodeURIComponent(e)}/disable`,{});
-//# sourceMappingURL=c:\Users\dusti\dev\kempo\dist\kempo\sdk.js.map
+//# sourceMappingURL=C:\Users\dusti\dev\kempo\dist\kempo\sdk.js.map

package/dist/kempo/utils/safeNext.js

@@ -1,2 +1,2 @@
 export default t=>"string"!=typeof t||t.length>2048||!t.startsWith("/")||t.startsWith("//")||/[\\\u0000-\u001f\u007f]/.test(t)?"":t;
-//# sourceMappingURL=c:\Users\dusti\dev\kempo\dist\kempo\utils\safeNext.js.map
+//# sourceMappingURL=C:\Users\dusti\dev\kempo\dist\kempo\utils\safeNext.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kempo",
-  "version": "4.9.2",
+  "version": "4.9.3",
   "type": "module",
   "description": "A fullstack CMS framework for creating websites with user authentication",
   "scripts": {

package/server/utils/updates/applyStagedUpdate.js

@@ -1,4 +1,4 @@
-import { existsSync } from 'fs';
+import { existsSync, rmSync } from 'fs';
 import { join } from 'path';
 import { and, eq, like } from 'drizzle-orm';
 import db from '../../db/index.js';
@@ -6,7 +6,7 @@ import { notification } from '../../db/schema.js';
 import { RUNNING_VERSION } from './runtime.js';
 import backupDatabase from './backupDatabase.js';
 import { restartMode, scheduleRestart } from './restart.js';
-import { clearState, paths, readState, requestSwitch } from './siteLayout.js';
+import { basisOf, clearState, paths, readState, requestSwitch } from './siteLayout.js';
 import { applyStarterFiles } from './starterFiles.js';
 import { PACKAGE } from './helpers.js';
 import triggerHook from '../hooks/triggerHook.js';
@@ -46,7 +46,12 @@ export default async ({ confirm = {}, siteRoot = process.env.KEMPO_SITE_ROOT, cw
     return [{ code: 409, msg: 'No update is ready: prepare one first' }, null];
   }
   if(readState(siteRoot, 'switch')){
-    return [{ code: 409, msg: 'The last switch has not finished proving itself yet' }, null];
+    return [{ code: 409, msg: 'The last switch is still being checked, which takes about a minute after the restart. Try again shortly.' }, null];
+  }
+  if(staged.basis && staged.basis !== basisOf(siteRoot)){
+    rmSync(paths(siteRoot).staging, { recursive: true, force: true });
+    clearState(siteRoot, 'staged');
+    return [{ code: 409, msg: 'The site changed after this update was downloaded (another update, or an extension was installed), so switching to it would undo that. It has been thrown away: get the update ready again.' }, null];
   }
 
   const { plan } = staged;

package/server/utils/updates/goBackPlan.js

@@ -0,0 +1,34 @@
+import { existsSync } from 'fs';
+import { join } from 'path';
+import { getCurrent, paths, readState } from './siteLayout.js';
+
+/*
+  What "Go back" would do right now, worked out in one place so that what the Updates screen says and what the server does
+  cannot differ. It is not offered while a switch is still proving itself (the site is a minute old and its record of what
+  it came from is not final), or when there is no earlier version, or straight after a rollback (the earlier version is then
+  the one that was just left, and "going back" would be a confusing way to say "update again"). It restores the database
+  only when the update being undone changed data and its backup is still there.
+*/
+export default siteRoot => {
+  const { previous, version } = getCurrent(siteRoot);
+  const source = previous?.id ? join(paths(siteRoot).releases, previous.id) : null;
+  const last = readState(siteRoot, 'last');
+  const plan = { available: false, reason: null, restoresData: false, previous, version, source, last };
+
+  if(readState(siteRoot, 'switch')){
+    plan.reason = 'The last switch is still being checked, which takes about a minute after the restart. Try again shortly.';
+    return plan;
+  }
+  if(!source || !existsSync(join(source, 'node_modules'))){
+    plan.reason = 'There is no earlier version to go back to';
+    return plan;
+  }
+  if(last?.kind === 'rollback'){
+    plan.reason = 'The site has just gone back, so there is nothing newer to go back from. To move forward again, update it.';
+    return plan;
+  }
+
+  plan.available = true;
+  plan.restoresData = Boolean(last?.ok && last.breaking && last.to === version && last.dbBackup && existsSync(last.dbBackup));
+  return plan;
+};

package/server/utils/updates/prepareUpdate.js

@@ -101,7 +101,7 @@ export default async ({ version = 'latest', extensions = [], siteRoot = process.
       return [{ code: 500, msg: `What this update would change could not be worked out: ${error.message}` }, null];
     }
 
-    writeState(siteRoot, 'staged', { id: staged.id, dir: staged.dir, version: kempoVersion, kempoUpdate: Boolean(manifest), from: RUNNING_VERSION, packages: targets, plan, preparedAt: new Date().toISOString() });
+    writeState(siteRoot, 'staged', { id: staged.id, dir: staged.dir, basis: staged.basis, version: kempoVersion, kempoUpdate: Boolean(manifest), from: RUNNING_VERSION, packages: targets, plan, preparedAt: new Date().toISOString() });
     return [null, { version: kempoVersion, kempoUpdate: Boolean(manifest), packages: targets, plan }];
   } finally {
     preparing = false;

package/server/utils/updates/releaseStatus.js

@@ -1,22 +1,25 @@
 import { existsSync } from 'fs';
 import { join } from 'path';
-import { getCurrent, paths, readState } from './siteLayout.js';
+import goBackPlan from './goBackPlan.js';
+import { readState } from './siteLayout.js';
 
 /*
   The part of the update status that only a site running from a Docker volume has: whether a version is staged and what
-  switching to it would change, whether there is an earlier version to go back to, and how the last switch ended.
+  switching to it would change, whether going back is possible now and what it would do (see goBackPlan), whether a switch is still proving
+  itself, and how the last switch ended.
 */
 export default (siteRoot = process.env.KEMPO_SITE_ROOT) => {
   if(!siteRoot) return { mode: 'in-place' };
 
   const staged = readState(siteRoot, 'staged');
-  const { previous } = getCurrent(siteRoot);
   const last = readState(siteRoot, 'last');
+  const back = goBackPlan(siteRoot);
   return {
     mode: 'release',
     staged: staged && existsSync(join(staged.dir, 'node_modules')) ? { version: staged.version, kempoUpdate: Boolean(staged.kempoUpdate), packages: staged.packages ?? [], plan: staged.plan, preparedAt: staged.preparedAt } : null,
-    canGoBack: Boolean(previous?.id && existsSync(join(paths(siteRoot).releases, previous.id, 'node_modules'))),
-    previousVersion: previous?.version ?? null,
+    canGoBack: back.available,
+    previousVersion: back.previous?.version ?? null,
+    goBack: { available: back.available, reason: back.reason, restoresData: back.restoresData, packages: back.last?.ok && back.last.to === back.version ? back.last.packages ?? [] : [] },
     switching: readState(siteRoot, 'switch')?.status ?? null,
     lastUpdate: last ? { ok: last.ok, from: last.from, to: last.to, packages: last.packages ?? [], reason: last.reason ?? null, breaking: Boolean(last.breaking), at: last.at } : null
   };

package/server/utils/updates/rollbackUpdate.js

@@ -1,8 +1,7 @@
-import { existsSync } from 'fs';
-import { join } from 'path';
 import { RUNNING_VERSION } from './runtime.js';
+import goBackPlan from './goBackPlan.js';
 import { restartMode, scheduleRestart } from './restart.js';
-import { getCurrent, paths, readState, requestSwitch } from './siteLayout.js';
+import { requestSwitch } from './siteLayout.js';
 
 let going = false;
 
@@ -10,7 +9,8 @@ let going = false;
   Puts a site that runs from a Docker volume back on the version it had before the last update: the code, and the
   starter files the update replaced. If that update changed data, going back also restores the database from the backup
   taken before it, which loses whatever was entered since, so that needs `confirm.data`. Otherwise (the usual case: an
-  update only added to the database) the earlier version runs on the database as it is and nothing is lost.
+  update only added to the database) the earlier version runs on the database as it is and nothing is lost. What it
+  would do, and whether it is allowed now, is goBackPlan, the same answer the Updates screen shows.
 
   Resolves to [error, { from, to, restart, restoresData }].
 */
@@ -21,19 +21,12 @@ export default async ({ confirm = {}, siteRoot = process.env.KEMPO_SITE_ROOT, re
   if(going){
     return [{ code: 409, msg: 'A switch is already under way' }, null];
   }
-  if(readState(siteRoot, 'switch')){
-    return [{ code: 409, msg: 'The last switch has not finished proving itself yet' }, null];
-  }
 
-  const { previous, version } = getCurrent(siteRoot);
-  const source = previous?.id ? join(paths(siteRoot).releases, previous.id) : null;
-  if(!source || !existsSync(join(source, 'node_modules'))){
-    return [{ code: 409, msg: 'There is no earlier version to go back to' }, null];
+  const plan = goBackPlan(siteRoot);
+  if(!plan.available){
+    return [{ code: 409, msg: plan.reason }, null];
   }
-
-  const last = readState(siteRoot, 'last');
-  const restoresData = Boolean(last?.ok && last.breaking && last.to === version && last.dbBackup && existsSync(last.dbBackup));
-  if(restoresData && !confirm.data){
+  if(plan.restoresData && !confirm.data){
     return [{ code: 409, msg: 'Going back restores the database from before the update and loses what was entered since', details: { confirm: 'data' } }, null];
   }
 
@@ -41,15 +34,15 @@ export default async ({ confirm = {}, siteRoot = process.env.KEMPO_SITE_ROOT, re
   try {
     requestSwitch({
       siteRoot,
-      id: previous.id,
-      version: previous.version,
-      source,
+      id: plan.previous.id,
+      version: plan.previous.version,
+      source: plan.source,
       kind: 'rollback',
-      filesBackup: last?.ok && last.to === version ? last.filesBackup : null,
-      dbBackup: restoresData ? last.dbBackup : null
+      filesBackup: plan.last?.ok && plan.last.to === plan.version ? plan.last.filesBackup : null,
+      dbBackup: plan.restoresData ? plan.last.dbBackup : null
     });
     restart();
-    return [null, { from: RUNNING_VERSION, to: previous.version, restart: restartMode(), restoresData }];
+    return [null, { from: RUNNING_VERSION, to: plan.previous.version, restart: restartMode(), restoresData: plan.restoresData }];
   } finally {
     going = false;
   }

package/server/utils/updates/siteLayout.js

@@ -1,3 +1,4 @@
+import { createHash } from 'crypto';
 import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from 'fs';
 import { dirname, join } from 'path';
 
@@ -81,9 +82,23 @@ export const seedSite = ({ siteRoot, seed }) => {
 
 export const getCurrent = siteRoot => readState(siteRoot, 'current') ?? { id: null, version: versionIn(paths(siteRoot).app), previous: null };
 
+/*
+  A fingerprint of the code the site is running: which release it is, and the manifests that say what is installed. A
+  staged copy is made from this code, so it is only good while the fingerprint is the same. If the site's code changes in
+  between (another switch, an extension installed from the admin), switching to the copy would silently undo that change.
+*/
+export const basisOf = siteRoot => {
+  const { app } = paths(siteRoot);
+  const hash = createHash('sha256').update(String(getCurrent(siteRoot).id));
+  for(const name of MANIFESTS){
+    if(existsSync(join(app, name))) hash.update(readFileSync(join(app, name)));
+  }
+  return hash.digest('hex');
+};
+
 /*
   Staging a new version: a copy of the code the site has now, which the caller then installs into. The running site is
-  not touched. Only one is kept: staging again replaces the one before.
+  not touched. Only one is kept: staging again replaces the one before. `basis` is the fingerprint it was made from.
 */
 export const stage = ({ siteRoot, version }) => {
   const { app, staging } = paths(siteRoot);
@@ -93,7 +108,7 @@ export const stage = ({ siteRoot, version }) => {
   mkdirSync(dir, { recursive: true });
   copyManifests(app, dir);
   cpSync(join(app, 'node_modules'), join(dir, 'node_modules'), { recursive: true, verbatimSymlinks: true });
-  return { id, dir };
+  return { id, dir, basis: basisOf(siteRoot) };
 };
 
 /*