eidosmd 0.2.0 → 0.3.0

package/dist/src/core/server.js

@@ -12,10 +12,11 @@ import path from 'node:path';
 import { marked } from 'marked';
 import { checkRoot } from './check.js';
 import { buildIndexes } from './index-leaf.js';
+import { applyPlan, editContext, EditError, moveWithLinks, planDocAdd, planDocRemove, renameRoleFiles } from './edits.js';
 import { embeddedIndexOf, frameworkToDocument, parseFrameworkStructured, serializeDocument, withEmbeddedIndex } from './framework-structured.js';
 import { FRAMEWORK_DIR, FrameworkError, propertiesFor } from './framework.js';
-import { readVersions, recordVersion, VersionError } from './versions.js';
-import { gitHead, gitLog, gitShowFile, gitUser } from './git.js';
+import { readVersions, recordVersion, tagPrefix, VersionError } from './versions.js';
+import { moveFile, gitHead, gitLog, gitShowFile, gitUser } from './git.js';
 import { actingUser, matchesIdentity, readSettings, writeSettings } from './settings.js';
 import { formatFrontmatter } from './frontmatter.js';
 import { findRole, isRoleName, listRoles, meFile, readActor, renderActor, roleFile, writeActor } from './me.js';
@@ -23,6 +24,7 @@ import { scaffoldBlueprint, ScaffoldError } from './scaffold.js';
 import { blueprintId, blueprintTitle, propertyString, resolveVariant } from './blueprint.js';
 import { loadTemplate, stripFrontmatter } from './template.js';
 import { unitOf } from './framework-model.js';
+import { regionsAsHtml } from './regions.js';
 import { Store } from './store.js';
 import { CliError, today } from '../output.js';
 import { browserDir, packageVersion, readStandard, standardVersion } from '../paths.js';
@@ -91,29 +93,50 @@ function findingsFor(context, blueprint) {
     return checkRoot(context.framework, context.blueprints, { only: new Set([blueprint.path]), standardVersion: standardVersion() }).findings.filter((finding) => finding.path === blueprint.rel);
 }
 function propertyView(property) {
-    return { name: property.name, type: property.type, core: property.core, owner: property.owner, meaning: property.meaning, applies_to: property.appliesTo, canvas: property.canvas ?? null, tools: property.tools ?? {} };
+    return { name: property.name, type: property.type, core: property.core, owner: property.owner, required: property.required, options: property.options ?? null, meaning: property.meaning, applies_to: property.appliesTo, canvas: property.canvas ?? null, tools: property.tools ?? {} };
 }
-// The values a Text property already takes across a collection, for the
-// editor to offer; a canvas hint's keys count as values too.
+// Markdown a person reads in the root, rendered: a tool's region is shown as
+// it is, never rendered, since its contents are the tool's to draw.
+function renderMarkdown(text) {
+    return marked.parse(regionsAsHtml(text), { async: false });
+}
+// The values a property already takes across a collection, for the editor
+// to offer; a canvas hint's keys count as values too. A property that
+// declares options offers them first, in their declared order, then any
+// value in use that the list does not hold, so a filter still finds it.
 function knownValues(context, collectionName) {
     const out = {};
     for (const property of propertiesFor(context.framework, collectionName)) {
-        if (property.type !== 'Text' || ['id', 'title', 'summary'].includes(property.name))
+        if (!['Text', 'List'].includes(property.type) || ['id', 'title', 'summary'].includes(property.name))
+            continue;
+        if (property.type === 'List' && !property.options)
             continue;
         const values = new Set();
-        for (const key of [...Object.keys(property.canvas?.shape ?? {}), ...Object.keys(property.canvas?.color ?? {})])
+        for (const key of Object.keys(property.canvas?.styles ?? {}))
             values.add(key);
         for (const blueprint of context.blueprints) {
             if (blueprint.collection.name !== collectionName)
                 continue;
-            const value = propertyString(blueprint, property.name);
-            if (value)
+            for (const value of heldValues(blueprint, property.name))
                 values.add(value);
         }
-        if (values.size > 0)
-            out[property.name] = values;
+        const listed = withOptionsFirst(property, values);
+        if (listed.length > 0)
+            out[property.name] = listed;
     }
-    return Object.fromEntries(Object.entries(out).map(([name, values]) => [name, [...values].sort((a, b) => a.localeCompare(b))]));
+    return out;
+}
+// The strings a blueprint holds under a property: the Text value, or a List's elements.
+function heldValues(blueprint, name) {
+    const held = blueprint.properties?.[name];
+    if (Array.isArray(held))
+        return held.filter((item) => typeof item === 'string' && item.trim() !== '');
+    const value = propertyString(blueprint, name);
+    return value === null ? [] : [value];
+}
+function withOptionsFirst(property, values) {
+    const rest = [...values].filter((value) => !property.options?.includes(value)).sort((a, b) => a.localeCompare(b));
+    return [...(property.options ?? []), ...rest];
 }
 function blueprintDetail(context, blueprint) {
     const raw = readFileSync(blueprint.path, 'utf8');
@@ -128,7 +151,7 @@ function blueprintDetail(context, blueprint) {
         sections: blueprint.sections.map((section) => section.heading.text),
         template_sections: template?.sections ?? [],
         body: blueprint.body,
-        html: marked.parse(blueprint.body, { async: false }),
+        html: renderMarkdown(blueprint.body),
         raw,
         findings: findingsFor(context, blueprint),
     };
@@ -150,14 +173,15 @@ function topLevelFile(context, relPath) {
         throw new HttpError(404, `no top-level document at ${wanted}`);
     }
     const doc = context.framework.topLevel.find((entry) => path.resolve(path.dirname(context.framework.file), entry.path) === file);
-    return { file, rel: rel(context.root, file), title: doc?.title ?? path.basename(file, '.md') };
+    return { file, rel: rel(context.root, file), title: doc?.title ?? path.basename(file, '.md'), description: doc?.description ?? '', declared: doc !== undefined };
 }
 function docView(context, relPath) {
-    const { file, rel: relative, title } = topLevelFile(context, relPath);
+    const { file, rel: relative, title, description, declared } = topLevelFile(context, relPath);
     if (!existsSync(file))
         throw new HttpError(404, `${relative} does not exist`);
     const raw = readFileSync(file, 'utf8');
-    return { path: relative, title, html: marked.parse(raw, { async: false }), raw, history: gitInfo(context.root).available ? gitLog(context.root, relative, 20) : [] };
+    const git = gitInfo(context.root);
+    return { path: relative, title, description, declared, html: renderMarkdown(raw), raw, git: git.available, history: git.available ? gitLog(context.root, relative, 20) : [] };
 }
 function rootSnapshot(context, store) {
     const actor = readActor(context.root);
@@ -169,16 +193,19 @@ function rootSnapshot(context, store) {
         cli_version: packageVersion(),
         standard_version: standardVersion(),
         search_engine: store.engine,
+        // the machine the server runs on, for the page to name its file manager
+        platform: process.platform,
         git_head: git.head,
         git,
         settings,
         framework: { file: rel(context.root, context.framework.file), format: context.framework.format, problems: context.framework.problems, ...frameworkToDocument(context.framework) },
         blueprints: context.blueprints.map(blueprintSummary),
         roles: listRoles(context.root).map((role) => ({ name: role.name, title: role.title, summary: role.summary })),
-        // the health check's totals, for the sidebar's badge
+        // the health check's totals, for the sidebar's badge, and whether this
+        // root counts a warning as a failure
         check: (() => {
             const report = checkRoot(context.framework, context.blueprints, { standardVersion: standardVersion() });
-            return { errors: report.errors, warnings: report.warnings };
+            return { errors: report.errors, warnings: report.warnings, strict: settings.shared.check.strict };
         })(),
         canvases: listCanvases(context.framework).map((canvas) => ({ id: canvas.id, title: canvas.title, pages: canvas.pages.length })),
         actor: { exists: actor.exists, role: actor.actor.role, ownership: actor.actor.ownership, experience: actor.actor.experience, capacity: actor.actor.capacity, path: rel(context.root, meFile(context.root)) },
@@ -218,6 +245,8 @@ function collectionTable(context, name) {
             description: collection.description,
             unit: unitOf(collection),
             framing: collection.framing,
+            // variants whose template file does not exist: nothing to scaffold a new blueprint from
+            missing_templates: collection.variants.filter((variant) => !existsSync(path.join(context.framework.root, FRAMEWORK_DIR, variant.template))).map((variant) => variant.name),
             variants: collection.variants.map((variant) => ({ name: variant.name, default: variant.isDefault, description: variant.description })),
             grouping: collection.grouping ? { label: collection.grouping.label, property: collection.grouping.property, groups: collection.grouping.groups } : null,
         },
@@ -226,22 +255,24 @@ function collectionTable(context, name) {
         rows,
     };
 }
-// The values a Text property takes anywhere in the root, for a sketch's fields.
+// The values a property takes anywhere in the root, for a sketch's fields;
+// declared options first, in order.
 function knownValuesAll(context, name) {
     const values = new Set();
     const property = context.framework.schema.custom.find((candidate) => candidate.name === name);
-    for (const key of [...Object.keys(property?.canvas?.shape ?? {}), ...Object.keys(property?.canvas?.color ?? {})])
+    for (const key of Object.keys(property?.canvas?.styles ?? {}))
         values.add(key);
     for (const blueprint of context.blueprints) {
-        const value = propertyString(blueprint, name);
-        if (value !== null && value !== '')
+        for (const value of heldValues(blueprint, name))
             values.add(value);
     }
-    return [...values];
+    return property ? withOptionsFirst(property, values) : [...values];
 }
 function checkSnapshot(context) {
     const report = checkRoot(context.framework, context.blueprints, { standardVersion: standardVersion() });
     return {
+        // whether this root counts a warning as a failure: the owner's setting
+        strict: readSettings(context.root).shared.check.strict,
         root: report.root,
         eidos_version: report.eidosVersion,
         naming: report.naming,
@@ -283,10 +314,62 @@ function frameworkView(context) {
 // The whole document replaced, the generated index carried over untouched.
 // A document that cannot be read at all is refused; one with problems is
 // written and the problems returned, as `check` would report them.
+// Settings renames a collection or a template through its document; the files
+// follow: a collection's folder, and a template's file, moved when the old one
+// exists and the new one does not. Nothing is overwritten.
+function applyRenames(context, given) {
+    if (!given || typeof given !== 'object')
+        return;
+    const renames = given;
+    const inside = (base, target) => target.startsWith(base + path.sep) && !path.relative(base, target).includes('..');
+    // a top-level doc's file follows its title, and every link to it follows the file
+    const docMoves = [];
+    for (const [from, to] of Object.entries(renames.docs ?? {})) {
+        const source = path.resolve(context.root, from);
+        const target = path.resolve(context.root, to);
+        if (!inside(context.root, source) || !inside(context.root, target) || source === target || path.dirname(source) !== context.root || path.dirname(target) !== context.root || !/\.md$/i.test(target))
+            continue;
+        if (existsSync(source) && !existsSync(target))
+            docMoves.push({ from: source, to: target });
+    }
+    if (docMoves.length > 0)
+        moveWithLinks(context.root, docMoves);
+    const templatesDir = path.join(context.root, FRAMEWORK_DIR, 'templates');
+    for (const [from, to] of Object.entries(renames.templates ?? {})) {
+        const source = path.resolve(context.root, FRAMEWORK_DIR, from);
+        const target = path.resolve(context.root, FRAMEWORK_DIR, to);
+        if (!inside(templatesDir, source) || !inside(templatesDir, target) || source === target)
+            continue;
+        if (existsSync(source) && !existsSync(target))
+            moveFile(context.root, source, target);
+    }
+    for (const [from, to] of Object.entries(renames.folders ?? {})) {
+        const source = path.resolve(context.root, from);
+        const target = path.resolve(context.root, to);
+        if (!inside(context.root, source) || !inside(context.root, target) || source === target || path.dirname(source) !== context.root || path.dirname(target) !== context.root)
+            continue;
+        if (existsSync(source) && !existsSync(target))
+            moveFile(context.root, source, target);
+    }
+}
+// Settings removes a top-level doc's file when the entry is removed on
+// purpose: one <name>.md straight under the root, never anything else.
+function applyDeletes(context, given) {
+    if (!given || typeof given !== 'object')
+        return;
+    const deletes = given;
+    for (const name of Array.isArray(deletes.docs) ? deletes.docs : []) {
+        if (typeof name !== 'string' || !/^[^/\\]+\.md$/i.test(name) || name.startsWith('.'))
+            continue;
+        const file = path.join(context.root, name);
+        if (existsSync(file))
+            unlinkSync(file);
+    }
+}
 function saveFramework(context, body) {
     const given = (typeof body['document'] === 'object' && body['document'] !== null ? body['document'] : body);
-    if (!Array.isArray(given['collections'])) {
-        throw new HttpError(400, 'expected { document } with a collections list');
+    if (!Array.isArray(given['folders'])) {
+        throw new HttpError(400, 'expected { document } with a folders list');
     }
     const document = { ...given };
     delete document['index'];
@@ -435,7 +518,12 @@ function pageView(context, canvas, page) {
         nodes,
         comments: renderComments(page, nodes),
         author: commentAuthor(context),
-        palette: canvasProperties(context.framework).map((property) => ({ property: property.name, type: property.type, applies_to: property.appliesTo, shape: property.canvas.shape ?? null, color: property.canvas.color ?? null, show: property.canvas.show === true })),
+        // each styling property with its value styles, and the color per value alone for the legend
+        palette: canvasProperties(context.framework).map((property) => {
+            const styles = property.canvas.styles ?? {};
+            const color = Object.fromEntries(Object.entries(styles).flatMap(([value, style]) => (style.color ? [[value, style.color]] : [])));
+            return { property: property.name, type: property.type, applies_to: property.appliesTo, styles, color: Object.keys(color).length > 0 ? color : null, show: property.canvas.show === true };
+        }),
         // schema properties a sketch may hold: those applying to every collection, with the values the root uses
         sketch_properties: propertiesFor(context.framework, '')
             .filter((property) => !property.core && property.appliesTo === 'all')
@@ -1094,7 +1182,7 @@ export function createServer(options) {
         if (resource === 'events' && method === 'GET') {
             response.writeHead(200, { 'content-type': 'text/event-stream', 'cache-control': 'no-cache', connection: 'keep-alive' });
             response.write(': connected\n\n');
-            const off = store.onChange(() => response.write('data: {"type":"change"}\n\n'));
+            const off = store.onChange((paths) => response.write(`data: ${JSON.stringify({ type: 'change', paths })}\n\n`));
             request.on('close', off);
             return;
         }
@@ -1215,11 +1303,33 @@ export function createServer(options) {
             json(response, 200, docView(store.context(), rest));
             return;
         }
-        // POST /api/docs { path, title }: a new markdown file at the root, for ## Top-Level to declare.
+        // POST /api/docs { title, description? }: a top-level doc declared under
+        // top_level and written at the root, named for its title, the same plan as
+        // `eidos configure:doc add`. { path, title } writes the file alone, for a
+        // framework draft that declares it itself.
         if (resource === 'docs' && rest === '' && method === 'POST') {
             const current = store.context();
             const body = await readBody(request);
-            const name = typeof body['path'] === 'string' ? body['path'].trim().replace(/\\/g, '/') : '';
+            if (typeof body['path'] !== 'string') {
+                const title = str(body['title']);
+                if (!title)
+                    throw new HttpError(400, 'expected { title }');
+                let plan;
+                try {
+                    plan = planDocAdd(editContext(current.root), title, str(body['description']) ?? '');
+                }
+                catch (cause) {
+                    if (cause instanceof EditError)
+                        throw new HttpError(400, cause.message);
+                    throw cause;
+                }
+                applyPlan(plan, standardVersion());
+                store.invalidate();
+                const made = store.context().framework.topLevel.find((doc) => doc.title === title);
+                json(response, 201, { path: made ? path.basename(made.path) : '', title });
+                return;
+            }
+            const name = body['path'].trim().replace(/\\/g, '/');
             if (!/^[^/]+\.md$/i.test(name) || name.startsWith('.'))
                 throw new HttpError(400, 'a top-level document is one <name>.md straight under the root');
             const file = path.join(current.root, name);
@@ -1231,6 +1341,28 @@ export function createServer(options) {
             json(response, 201, { path: name, title });
             return;
         }
+        // DELETE /api/docs/<path>: the entry under top_level and the file, the same plan as `eidos configure:doc remove`.
+        if (resource === 'docs' && rest !== '' && method === 'DELETE') {
+            const current = store.context();
+            const { file, rel: relative, declared } = topLevelFile(current, rest);
+            if (declared) {
+                let plan;
+                try {
+                    plan = planDocRemove(editContext(current.root), path.basename(file), { preserve: false });
+                }
+                catch (cause) {
+                    if (cause instanceof EditError)
+                        throw new HttpError(400, cause.message);
+                    throw cause;
+                }
+                applyPlan(plan, standardVersion());
+            }
+            else if (existsSync(file))
+                rmSync(file);
+            store.invalidate();
+            json(response, 200, { deleted: relative });
+            return;
+        }
         if (resource === 'docs' && rest !== '' && method === 'PUT') {
             const current = store.context();
             const { file, rel: relative } = topLevelFile(current, rest);
@@ -1243,7 +1375,7 @@ export function createServer(options) {
             return;
         }
         if (resource === 'versions' && method === 'GET') {
-            json(response, 200, { versions: readVersions(store.context().root), git_head: gitInfo(store.context().root).head });
+            json(response, 200, { versions: readVersions(store.context().root), git_head: gitInfo(store.context().root).head, tag_prefix: tagPrefix(store.context().root) });
             return;
         }
         // POST /api/versions { version, commit?, tag? }: a snapshot of the root, only because someone asked.
@@ -1268,7 +1400,10 @@ export function createServer(options) {
             return;
         }
         if (resource === 'framework' && method === 'PUT') {
-            const saved = saveFramework(store.context(), await readBody(request));
+            const body = await readBody(request);
+            applyRenames(store.context(), body['renames']);
+            applyDeletes(store.context(), body['deletes']);
+            const saved = saveFramework(store.context(), body);
             store.invalidate();
             json(response, 200, { ...saved, ...frameworkView(store.context()) });
             return;
@@ -1311,6 +1446,21 @@ export function createServer(options) {
             }
             if (method === 'PUT') {
                 const body = await readBody(request);
+                // { rename } moves the file to the new name, me.md and the users following
+                if (typeof body['rename'] === 'string') {
+                    const to = body['rename'].trim();
+                    if (!isRoleName(to))
+                        throw new HttpError(400, 'a role name is kebab-case: letters, digits, and dashes');
+                    if (!existsSync(file))
+                        throw new HttpError(404, `no role '${name}'`);
+                    if (to !== name && existsSync(roleFile(current.root, to)))
+                        throw new HttpError(409, `a role '${to}' already exists`);
+                    if (to !== name)
+                        renameRoleFiles(current.root, name, to);
+                    store.invalidate();
+                    json(response, 200, { name: to, path: rel(current.root, roleFile(current.root, to)) });
+                    return;
+                }
                 if (typeof body['text'] !== 'string')
                     throw new HttpError(400, 'expected { text }');
                 mkdirSync(path.dirname(file), { recursive: true });
@@ -1390,6 +1540,29 @@ export function createServer(options) {
             json(response, 200, { launched: command });
             return;
         }
+        // POST /api/reveal { path }: the file shown in the machine's file manager, selected where the platform can (Finder, Explorer, the FileManager1 desktop service on Linux, else the folder opened).
+        if (resource === 'reveal' && method === 'POST') {
+            const current = store.context();
+            const body = await readBody(request);
+            const target = typeof body['path'] === 'string' ? body['path'] : '';
+            const file = path.resolve(current.root, target);
+            if (target === '' || !file.startsWith(current.root + path.sep) || !existsSync(file))
+                throw new HttpError(400, 'not a file of this root');
+            const launch = (command, args, onError) => {
+                const child = spawn(command, args, { cwd: current.root, detached: true, stdio: 'ignore' });
+                child.on('error', () => onError?.());
+                child.on('exit', (code) => code !== 0 && onError?.());
+                child.unref();
+            };
+            if (process.platform === 'darwin')
+                launch('open', ['-R', file]);
+            else if (process.platform === 'win32')
+                launch('explorer', [`/select,${file}`]);
+            else
+                launch('dbus-send', ['--session', '--dest=org.freedesktop.FileManager1', '--type=method_call', '/org/freedesktop/FileManager1', 'org.freedesktop.FileManager1.ShowItems', `array:string:file://${file}`, 'string:'], () => launch('xdg-open', [path.dirname(file)]));
+            json(response, 200, { revealed: rel(current.root, file) });
+            return;
+        }
         if (resource === 'canvas') {
             await handleCanvas(store, method, segments.slice(2), request, response);
             return;

package/dist/src/core/settings.js

@@ -3,21 +3,37 @@
 // root's and travels with it (whether git is used, the people who work in
 // the root, what every save does to a blueprint); `local.yaml` is one
 // person's on one machine (who they are acting as, how their canvas
-// behaves, which columns they hide, the diff viewer installed here) and is
-// ignored by git through a .gitignore beside it. Nothing the browser
-// remembers lives anywhere else.
+// behaves, which columns they hide, the diff viewer installed here), the
+// personal file the standard names since 5.2.0, kept out of git by the one
+// pattern the root's `.eidos/.gitignore` carries for every tool. Nothing
+// the browser remembers lives anywhere else.
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
 import { parse as parseYaml, stringify } from 'yaml';
 import { FRAMEWORK_DIR, PLUGINS_DIR, TOOL_KEY } from './framework-model.js';
 export const SETTINGS_DIR = `${PLUGINS_DIR}/${TOOL_KEY}`;
-export const DEFAULT_SHARED = { features: { git: true }, users: [], on_save: [] };
+// The one line in the root's `.eidos/.gitignore` that keeps every tool's
+// personal file out of the repository (Eidos 5.2.0), beside `me.md`.
+export const LOCAL_IGNORE_PATTERN = 'plugins/*/local.yaml';
+// Whether the root's `.eidos/.gitignore` already carries that line.
+export function rootIgnoresLocal(root) {
+    const file = path.join(root, FRAMEWORK_DIR, '.gitignore');
+    if (!existsSync(file))
+        return false;
+    return readFileSync(file, 'utf8')
+        .split(/\r?\n/)
+        .some((line) => line.trim() === LOCAL_IGNORE_PATTERN);
+}
+export const DEFAULT_TAG_PREFIX = 'blueprints/';
+export const DEFAULT_SHARED = { features: { git: true }, users: [], on_save: [], versions: { tag_prefix: DEFAULT_TAG_PREFIX }, check: { strict: false } };
 export const DEFAULT_LOCAL = {
     user: null,
     theme: 'system',
     canvas: { wheel_zoom: true, right_drag_pan: true, ctrl_click_menu: false, enter_commits: true, context_menu: true, resize_all: false },
     tables: { page_size: 50, columns: {} },
     source_mode: false,
+    hide_overview: false,
+    reader_width: 'fixed',
     diff_viewer: null,
     editor: null,
     recent_searches: [],
@@ -25,10 +41,12 @@ export const DEFAULT_LOCAL = {
 const SHARED_HEADER = `eidosmd settings shared by everyone in this root. Edit by hand, with eidos setup, or from the browser.
 features.git: whether the browser reads git (history, authors, versions) when the root is in a repository.
 users: the people who work here: { name, alias (for @mentions, no spaces), role (from .eidos/roles/), email (ties to git) }.
-on_save: rules applied to a blueprint's frontmatter on every save from the browser: { property, set: today | now }.`;
+on_save: rules applied to a blueprint's frontmatter on every save from the browser: { property, set: today | now }.
+versions.tag_prefix: what a recorded version's git tag starts with (eidos version record --tag), blueprints/ by default.
+check.strict: whether a warning fails eidos check as an error does; the framework owner's decision for this root (eidos check --strict / --no-strict override one run).`;
 const LOCAL_HEADER = `eidosmd settings for this machine, ignored by git. Edit by hand, with eidos setup, or from the browser's Preferences.
 user: who this machine acts as, by alias or name from users; absent = the git identity, else the role in me.md.
-theme: system | light | dark. canvas: scroll-wheel zoom, right-drag pan, ctrl-click menus, whether Enter finishes an in-place edit, whether a right click opens the menu or the details, whether every node resizes. tables: page size and the columns hidden per collection. source_mode: the reader shows files as text.
+theme: system | light | dark. canvas: scroll-wheel zoom, right-drag pan, ctrl-click menus, whether Enter finishes an in-place edit, whether a right click opens the menu or the details, whether every node resizes. tables: page size and the columns hidden per collection. source_mode: the reader shows files as text. hide_overview: the sidebar leaves out Eidos Overview. reader_width: fixed (every page but the canvas held to about 1200px, for a wide screen) | fluid (the whole window).
 editor: a command with {file} that opens a file in an external editor; blank = the system's default app.
 diff_viewer: the git plugin's viewer, a command with {a} and {b} for the two files, e.g. "code --diff {a} {b}".`;
 const isPlain = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
@@ -71,7 +89,17 @@ function readShared(value, base = DEFAULT_SHARED) {
             rules.push({ property: entry['property'].trim(), set: entry['set'] });
         }
     }
-    return { features: { git }, users: 'users' in value ? readUsers(value['users']) : base.users.map((user) => ({ ...user })), on_save: 'on_save' in value ? rules : base.on_save.map((rule) => ({ ...rule })) };
+    const versions = isPlain(value['versions']) ? value['versions'] : {};
+    const prefix = typeof versions['tag_prefix'] === 'string' ? versions['tag_prefix'].trim() : base.versions.tag_prefix;
+    const check = isPlain(value['check']) ? value['check'] : {};
+    const strict = typeof check['strict'] === 'boolean' ? check['strict'] : base.check.strict;
+    return {
+        features: { git },
+        users: 'users' in value ? readUsers(value['users']) : base.users.map((user) => ({ ...user })),
+        on_save: 'on_save' in value ? rules : base.on_save.map((rule) => ({ ...rule })),
+        versions: { tag_prefix: prefix },
+        check: { strict },
+    };
 }
 // A user by alias (case-insensitive) or by name.
 export function findUser(users, key) {
@@ -103,6 +131,9 @@ function readLocal(value, base = DEFAULT_LOCAL) {
     if (typeof tables['page_size'] === 'number' && tables['page_size'] >= 10)
         out.tables.page_size = Math.round(tables['page_size']);
     if (isPlain(tables['columns'])) {
+        // a columns map given is the whole map (a write merges per collection
+        // before it gets here), so an entry it lacks is gone
+        out.tables.columns = {};
         for (const [collection, hidden] of Object.entries(tables['columns'])) {
             if (Array.isArray(hidden))
                 out.tables.columns[collection] = hidden.filter((name) => typeof name === 'string');
@@ -110,6 +141,10 @@ function readLocal(value, base = DEFAULT_LOCAL) {
     }
     if (typeof value['source_mode'] === 'boolean')
         out.source_mode = value['source_mode'];
+    if (typeof value['hide_overview'] === 'boolean')
+        out.hide_overview = value['hide_overview'];
+    if (value['reader_width'] === 'fixed' || value['reader_width'] === 'fluid')
+        out.reader_width = value['reader_width'];
     if (value['diff_viewer'] === null)
         out.diff_viewer = null;
     else if (typeof value['diff_viewer'] === 'string')
@@ -142,8 +177,11 @@ function writeYaml(file, header, value) {
     writeFileSync(file, `${comment}\n${stringify(value)}`, 'utf8');
 }
 // Each file is written whole from the merged value: a partial patch keeps
-// what it does not name. The local file's .gitignore is written beside it
-// the first time, so a personal setting never reaches the repository.
+// what it does not name. On a root whose `.eidos/.gitignore` does not yet
+// carry the standard's pattern (one written before 5.2.0 and not migrated),
+// a .gitignore of this tool's own is written beside the local file, so a
+// personal setting never reaches the repository; `eidos migrate` adds the
+// pattern and removes that file.
 export function writeSettings(root, patch) {
     const current = readSettings(root);
     const dir = settingsDir(root);
@@ -153,6 +191,10 @@ export function writeSettings(root, patch) {
         const merged = { ...base, ...given };
         if (isPlain(given['features']))
             merged['features'] = { ...base['features'], ...given['features'] };
+        if (isPlain(given['versions']))
+            merged['versions'] = { ...base['versions'], ...given['versions'] };
+        if (isPlain(given['check']))
+            merged['check'] = { ...base['check'], ...given['check'] };
         writeYaml(path.join(dir, 'settings.yaml'), SHARED_HEADER, readShared(merged, current.shared));
     }
     if (isPlain(patch.local)) {
@@ -164,12 +206,21 @@ export function writeSettings(root, patch) {
         if (isPlain(given['tables'])) {
             const tables = base['tables'];
             merged['tables'] = { ...tables, ...given['tables'] };
-            if (isPlain(given['tables']['columns']))
-                merged['tables']['columns'] = { ...tables['columns'], ...given['tables']['columns'] };
+            if (isPlain(given['tables']['columns'])) {
+                // a collection given as null drops its entry, for a collection renamed away
+                const columns = { ...tables['columns'] };
+                for (const [collection, hidden] of Object.entries(given['tables']['columns'])) {
+                    if (hidden === null)
+                        delete columns[collection];
+                    else
+                        columns[collection] = hidden;
+                }
+                merged['tables']['columns'] = columns;
+            }
         }
         writeYaml(path.join(dir, 'local.yaml'), LOCAL_HEADER, readLocal(merged, current.local));
         const ignore = path.join(dir, '.gitignore');
-        if (!existsSync(ignore))
+        if (!rootIgnoresLocal(root) && !existsSync(ignore))
             writeFileSync(ignore, 'local.yaml\n', 'utf8');
     }
     return readSettings(root);