strom-research 1.25.1 → 1.25.2

package/assets/terms/streets.json

@@ -1,24 +1,218 @@
 {
-  "about": "Words that tell a street or a house number in the place of a fact (\"Lhota, Dlouhá ulice 12\"): the place is the municipality, the street and the number its house. Compared folded (no accents, lower case), word by word, in any script. words: a word of a street anywhere in a part; suffixes: a word ending so (German Hauptstraße, Dutch Kerkstraat); last: only as the last word of a part (\"Main St.\" — \"St. Martin\" is a saint); house: what stands before a house number (\"č. p. 12\", \"Nr. 3\") — counted only with a number after it; numbered: municipalities whose number after the name is a part of them (\"Praha 5\"), never a house — a number alone after any other municipality (\"Lhota 16\") is a house only when a person says so for the whole municipality.",
+  "about": "Words that tell a street or a house number in the place of a fact (\"Lhota, Dlouhá ulice 12\"): the place is the municipality, the street and the number its house. Compared folded (no accents, lower case), word by word, in any script. words: a word of a street anywhere in a part; suffixes: a word ending so (German Hauptstraße, Dutch Kerkstraat); last: only as the last word of a part (\"Main St.\" — \"St. Martin\" is a saint); house: what stands before a house number (\"č. p. 12\", \"Nr. 3\") — counted only with a number after it; numbered: municipalities whose number after the name is a part of them (\"Praha 5\"), never a house — a number alone after any other municipality (\"Lhota 16\") is a house only when a person says so for the whole municipality. prepositions: what stands before a municipality written in a sentence (\"v Lhotě v čp. 12\", \"in Lhotau Nr. 3\") — taken off the municipality before a house number, only in lower case where it begins it.",
   "words": {
-    "cs": ["ulice", "ul.", "náměstí", "nám.", "třída", "tř.", "nábřeží", "nábř.", "alej"],
-    "sk": ["ulica", "námestie", "nábrežie", "trieda"],
-    "pl": ["ulica", "plac", "pl.", "aleja", "rynek"],
-    "de": ["straße", "strasse", "str.", "gasse", "platz", "weg", "allee"],
-    "hu": ["utca", "tér", "út"],
-    "sl": ["trg", "ulica"],
-    "en": ["street", "road", "rd.", "avenue", "ave.", "lane", "square", "boulevard", "blvd."],
-    "fr": ["rue", "boulevard", "avenue"],
-    "it": ["via", "viale", "piazza", "corso"],
-    "es": ["calle", "plaza", "avenida"],
-    "pt": ["rua", "praça"],
-    "nl": ["straat", "plein", "laan"],
-    "ru": ["улица", "ул.", "проспект", "переулок", "пер.", "площадь", "пл.", "бульвар", "шоссе", "набережная", "наб."],
-    "uk": ["вулиця", "вул.", "провулок", "площа", "проспект", "бульвар"],
-    "bg": ["улица", "ул.", "булевард", "площад"]
+    "cs": [
+      "ulice",
+      "ul.",
+      "náměstí",
+      "nám.",
+      "třída",
+      "tř.",
+      "nábřeží",
+      "nábř.",
+      "alej"
+    ],
+    "sk": [
+      "ulica",
+      "námestie",
+      "nábrežie",
+      "trieda"
+    ],
+    "pl": [
+      "ulica",
+      "plac",
+      "pl.",
+      "aleja",
+      "rynek"
+    ],
+    "de": [
+      "straße",
+      "strasse",
+      "str.",
+      "gasse",
+      "platz",
+      "weg",
+      "allee"
+    ],
+    "hu": [
+      "utca",
+      "tér",
+      "út"
+    ],
+    "sl": [
+      "trg",
+      "ulica"
+    ],
+    "en": [
+      "street",
+      "road",
+      "rd.",
+      "avenue",
+      "ave.",
+      "lane",
+      "square",
+      "boulevard",
+      "blvd."
+    ],
+    "fr": [
+      "rue",
+      "boulevard",
+      "avenue"
+    ],
+    "it": [
+      "via",
+      "viale",
+      "piazza",
+      "corso"
+    ],
+    "es": [
+      "calle",
+      "plaza",
+      "avenida"
+    ],
+    "pt": [
+      "rua",
+      "praça"
+    ],
+    "nl": [
+      "straat",
+      "plein",
+      "laan"
+    ],
+    "ru": [
+      "улица",
+      "ул.",
+      "проспект",
+      "переулок",
+      "пер.",
+      "площадь",
+      "пл.",
+      "бульвар",
+      "шоссе",
+      "набережная",
+      "наб."
+    ],
+    "uk": [
+      "вулиця",
+      "вул.",
+      "провулок",
+      "площа",
+      "проспект",
+      "бульвар"
+    ],
+    "bg": [
+      "улица",
+      "ул.",
+      "булевард",
+      "площад"
+    ]
   },
-  "suffixes": ["straße", "strasse", "str.", "gasse", "platz", "weg", "allee", "straat", "plein", "gracht", "gatan", "gade", "vej", "vägen"],
-  "last": ["st.", "st"],
-  "house": ["č. p.", "č.p.", "čp.", "č.", "čís.", "č. d.", "nr.", "nr", "no.", "nro.", "num.", "hnr.", "hausnr.", "haus", "house", "№", "д.", "дом"],
-  "numbered": ["Praha", "Prag", "Brno", "Brünn", "Plzeň", "Pilsen", "Wien", "Budapest", "Paris", "Lyon", "Marseille"]
+  "suffixes": [
+    "straße",
+    "strasse",
+    "str.",
+    "gasse",
+    "platz",
+    "weg",
+    "allee",
+    "straat",
+    "plein",
+    "gracht",
+    "gatan",
+    "gade",
+    "vej",
+    "vägen"
+  ],
+  "last": [
+    "st.",
+    "st"
+  ],
+  "house": [
+    "č. p.",
+    "č.p.",
+    "čp.",
+    "č.",
+    "čís.",
+    "č. d.",
+    "nr.",
+    "nr",
+    "nr domu",
+    "nr. domu",
+    "numer domu",
+    "numer",
+    "dom nr",
+    "dom nr.",
+    "no.",
+    "nro.",
+    "num.",
+    "hnr.",
+    "hausnr.",
+    "haus",
+    "house",
+    "№",
+    "д.",
+    "дом"
+  ],
+  "numbered": [
+    "Praha",
+    "Prag",
+    "Brno",
+    "Brünn",
+    "Plzeň",
+    "Pilsen",
+    "Wien",
+    "Budapest",
+    "Paris",
+    "Lyon",
+    "Marseille"
+  ],
+  "prepositions": {
+    "cs": [
+      "v",
+      "ve",
+      "na",
+      "u",
+      "z",
+      "ze",
+      "do"
+    ],
+    "sk": [
+      "v",
+      "vo",
+      "na",
+      "u",
+      "z",
+      "zo",
+      "do"
+    ],
+    "pl": [
+      "w",
+      "we",
+      "na",
+      "u",
+      "z",
+      "ze",
+      "do"
+    ],
+    "de": [
+      "in",
+      "im",
+      "bei",
+      "zu",
+      "am",
+      "auf"
+    ],
+    "en": [
+      "in",
+      "at",
+      "of"
+    ],
+    "hu": [],
+    "sl": [
+      "v",
+      "na",
+      "pri",
+      "iz"
+    ]
+  }
 }

package/dist/brief/places.js

@@ -5,7 +5,7 @@
 import { langName } from "../core/lang.js";
 import { match } from "../cli/registry.js";
 import { synopsis } from "./sheet.js";
-import { factForms, personsHand, PLACES_IDENTIFY_ORIGIN, queueBatches, readPlacesFile, recordIndex } from "../core/placeid.js";
+import { factForms, otherNames, personsHand, PLACES_IDENTIFY_ORIGIN, queueBatches, readPlacesFile, recordIndex } from "../core/placeid.js";
 import { historyOn } from "../core/pastevents.js";
 import { othersRecords } from "../core/placeadopt.js";
 import { foldText } from "../core/text.js";
@@ -24,6 +24,24 @@ function span(ys) {
     const b = Math.max(...ys);
     return a === b ? String(a) : `${a}–${b}`;
 }
+/** A name as the agent writes it: name[@lang][:from-to]. */
+function nameSaid(n) {
+    const years = n.from === undefined && n.to === undefined ? "" : n.from === n.to ? `:${n.from}` : `:${n.from ?? ""}-${n.to ?? ""}`;
+    return `${n.name}${n.lang ? `@${n.lang}` : ""}${years}`;
+}
+/** A record's names: today's, its other names (another language, old names — with their language and years), the forms of the facts. */
+function recordNames(p) {
+    const rest = otherNames(p);
+    const alt = rest.filter((n) => n.kind !== "form");
+    const forms = rest.filter((n) => n.kind === "form");
+    return [
+        nameSaid(p.names[0]),
+        alt.length ? `other names ${alt.map(nameSaid).join(", ")}` : "",
+        forms.length ? `forms ${forms.map((n) => n.name).join(", ")}` : "",
+    ]
+        .filter(Boolean)
+        .join("; ");
+}
 /** One place of the batch: its form, the facts, the people, the archives of its sources, the record of it. */
 function placeLine(tree, form, f, entry, p, others) {
     const areas = f
@@ -40,7 +58,7 @@ function placeLine(tree, form, f, entry, p, others) {
         f ? `${f.facts} fact${f.facts === 1 ? "" : "s"} ${span(f.years)}` : "",
         persons.length ? `people ${persons.join(" ")}${f.persons.size > persons.length ? " …" : ""}` : "",
         areas.length ? `sources from ${areas.join(", ")}` : "",
-        p ? `record ${p.id}: ${p.names.map((n) => n.name).join(", ")}` : "no record yet",
+        p ? `record ${p.id}: ${recordNames(p)}` : "no record yet",
         p?.parent ? `in ${p.parent}` : "",
         p?.jurisdictions.length ? p.jurisdictions.map((j) => `${j.kind} ${j.name}${j.from || j.to ? ` ${j.from ?? "…"}–${j.to ?? "…"}` : ""}`).join(", ") : "",
         p?.coords ? `on the map ${p.coords.lat.toFixed(4)}, ${p.coords.lon.toFixed(4)}${personsHand(p) ? " (the person's — never moved)" : ""}` : "",
@@ -82,17 +100,32 @@ export function placesIdentifySections(tree, task, alone, settings) {
             pointer: "strom help place identify",
             text: [
                 "## How — from the cheap steps up, the web last",
-                "1. free, the tree first: the sources of the facts there (their archive, parish, register — strom source show S…), the other places of the same people and years (strom person card P…), the place records (strom place show L…), the records of other research on this computer (above); a place the tree tells apart already needs nothing else",
+                "1. free, the tree first: the sources of the facts there (their archive, parish, register — strom show S… or B…, any record by its ID), the other places of the same people and years (strom person card P…), the place records (strom place show L…), the records of other research on this computer (above); a place the tree tells apart already needs nothing else",
                 "2. free, the writing: abbreviations and other spellings of one place (strom place rewrite … --to L…); a street or a house number written as a place (\"Lhota, Dlouhá\", \"Horní 12\"): the place is the municipality, the street goes into the house (--house), a house written there is never replaced",
                 "3. the web last, for what is still open: gazetteers, the registers of municipalities, historical maps and the Wikipedia in the region's language. Only the place's name with its parish or district goes into a search — never a person's name, a date or anything else of the tree",
                 "",
+                "",
+                "The record of a place:",
+                "- its first name is the official name of today in the language of the country it lies in now (a village now in Poland: Polish; the German name is historical) — the names of the facts and the old names go in as --form and --alt name@lang:from-to (an old name: from-to its years; one year: name@lang:1844)",
+                "- the record's other names above are known already (name@language:years): today's name in another language may be among them — look it up by that name before calling it not found, and set it first with --name when the reference confirms it",
+                "- a name of the record found wrong (another place's name, a slip of a record no fact writes any more): strom place names L… --drop \"<name>\" --why \"what shows it is wrong\" — never left in with a note that it is wrong",
+                "- what is found of a place goes into its record, also where the coordinates are right already: strom place verify L… --ok --why \"…\" --alt … --form … (never only into the history)",
+                "- a jurisdiction found wrong (another parish): strom place verify L… --ok --why \"what the records say\" --drop-jurisdiction parish:<name> --jurisdiction parish:<right one>:from-to (one year: parish:<name>:1899)",
+                "- the reference a check stood on: strom place verify L… --ok --why \"…\" --source-title \"…\" --source-url …",
+                "- a form of the facts that is a place with a record already (\"Nové Lhoty\" of Lhoty): strom place identify L… --form \"<form>\" — never a second record; two records of one place: strom place merge L… --into L… --reason \"…\"",
+                "",
                 "Three degrees, never guessed:",
                 "- sure (the parish of the records, the district and the years agree; no other place of the name fits): strom place identify \"<form>\" --lat … --lon … --why \"on what\" [--name, --form for each other writing of the facts, --alt for another language or an old name (name@lang:from-to), --jurisdiction kind:name:from-to, --source-title/--source-url of the reference read]",
                 "- probable (1–3 places fit): strom place propose \"<form>\" --candidate \"name|lat|lon|why|district|country|title|url\" for each — the person chooses",
                 "- not to be decided: strom place unlocated \"<form>\" --why \"…\" --needs \"what would decide it\" — it comes back by itself when that is known; a wrong place is worse than none",
                 "- a place on the map the person put there is never moved: the records agree — strom place verify L… --ok --why \"…\"; they do not — strom place propose L… --conflict --candidate …; it cannot be told — strom place verify L… --undecided \"why\"",
                 "- one place written several ways in the facts: strom place rewrite \"<form>\" --to L… (a street: --house \"<street>\"; a house written there is kept) when sure; else --propose --why \"…\" — the person says yes",
-                ...(history ? ["- the history of the places is on: each place identified gets its regions too — strom history map \"<form>\" --region <id>:<from>-<to> (strom help history map)"] : []),
+                ...(history
+                    ? [
+                        "- the history of the places is on: each place identified gets its regions too — strom history map \"<form>\" --region <id>:<from>-<to> [--region …] (each region's ID as strom history status lists it; every period of the place covered, none left out)",
+                    ]
+                    : []),
+                "- this session is on the places only: no searches of records are written here (strom search add), nothing of the people",
             ].join("\n"),
         },
     ];
@@ -102,6 +135,8 @@ export function placesIdentifySections(tree, task, alone, settings) {
         cmd(["place", "unlocated"]),
         cmd(["place", "verify"]),
         cmd(["place", "rewrite"]),
+        cmd(["place", "merge"]),
+        cmd(["place", "names"]),
         cmd(["place", "show"]),
         ...(history ? [cmd(["history", "map"])] : []),
     ].filter(Boolean);
@@ -114,7 +149,7 @@ export function placesIdentifySections(tree, task, alone, settings) {
         pointer: "",
         text: [
             "## Finishing",
-            `- every place above identified, proposed or not located: strom session close --done "how many identified, proposed, not located"${more ? ' --next "the next places of the queue"' : ""}`,
+            `- every place above identified, proposed or not located: strom session close --done "what was found of the places, in a few words" (strom puts the counts before it: identified, verified, asked, not located)${more ? ' --next "the next places of the queue"' : ""}`,
             `- time up before: strom session close --continue --summary "…" --next "the places left"`,
             alone
                 ? `- the summary: plain words for the record (the menu, the Strom app), in ${langName(tree.lang)}, never addressed to the user, no advice; after strom session close you are done: a last message of one line at most`

package/dist/cli/ui.js

@@ -2544,6 +2544,7 @@ export const UI = {
     "ui.conflict.titleAfter": "title after the name",
     "ui.conflict.parents": "parents",
     "ui.conflict.removed": "in the tree",
+    "ui.conflict.title": "{who}: {what} — {ours} × {theirs}",
     "ui.conflict.removed.ours": "removed in the Strom app ({day}, {sync})",
     "ui.conflict.removed.theirs": "edited in another copy of the app",
     "ui.conflict.removing.ours": "edited later in another copy of the app",

package/dist/commands/browse.js

@@ -230,7 +230,17 @@ register({
             ...shown.map((t) => [`  ${t.state === "doing" ? ui(lang, "ui.plan.now") : `${++n}.`}`, `${truncate(humanTask(tree, t.what, lang), 110)}${lacksImages(tree, t) ? ui(lang, "ui.plan.images") : ""}${offLines.has(t.id) ? ui(lang, "ui.plan.offline") : ""}`]),
             ...later.slice(0, 5).map(({ t, a }) => [`  ${ui(lang, "ui.plan.later")}`, `${truncate(humanTask(tree, t.what, lang), 110)}${ui(lang, "ui.plan.asleep", { at: clockUp(a.until), host: a.host })}`]),
         ];
-        const storyNames = [...new Set(stories.map((t) => tree.get(t.subject[0] ?? "")).filter((p) => !!p).map((p) => `${displayName(p)} [${p.id}]`))];
+        // whose story: a person's, or a couple's (strom story set F…: the partners' names)
+        const whose = (id) => {
+            const rec = tree.get(id);
+            if (rec?.type === "person")
+                return `${displayName(rec)} [${rec.id}]`;
+            if (rec?.type !== "family")
+                return undefined;
+            const names = rec.partners.map((x) => tree.get(x)).filter((p) => p?.type === "person").map((p) => displayName(p));
+            return `${names.join(" & ") || rec.id} [${rec.id}]`;
+        };
+        const storyNames = [...new Set(stories.map((t) => whose(t.subject[0] ?? "")).filter((x) => !!x))];
         const out = [ui(lang, "ui.plan.title", { name: tree.config.name })];
         if (!queue.length && !later.length)
             out.push(`  ${ui(lang, "ui.plan.none")}`);

package/dist/commands/history.js

@@ -26,7 +26,7 @@ import { displayName } from "../core/people.js";
 import { historyOn, readLocal } from "../core/pastevents.js";
 import { placeRecord } from "../core/placehistory.js";
 import { foldText } from "../core/text.js";
-import { recordIndex, unlocatePlace } from "../core/placeid.js";
+import { addOtherNames, recordIndex, unlocatePlace } from "../core/placeid.js";
 function shared(ctx) {
     const s = ctx.settings.shared()?.value;
     if (!s)
@@ -237,7 +237,7 @@ register({
     args: [{ name: "place", description: "the place, as the facts write it", required: true }],
     options: [
         { name: "region", type: "string", multiple: true, value: "<id>[:<from>-<to>]", description: "a region it belonged to, with the years (repeatable)" },
-        { name: "also", type: "string", multiple: true, value: "<name>", description: "another name of the place (another language, a historical name; repeatable)" },
+        { name: "also", type: "string", multiple: true, value: "<name[@lang][:from-to]>", description: "another name of the place (another language, a historical name; kept in its place record too; repeatable)" },
         { name: "unlocated", type: "boolean", description: "the place cannot be located" },
         { name: "why", type: "string", value: "<text>", description: "why it cannot be located" },
         ...textOpts("name", "the name of a new region"),
@@ -274,6 +274,8 @@ register({
                 ensureRegion(sh, missing[0], name);
         }
         const m = mapPlace(tree, key, { regions: links, also: listOpt(opts.also) });
+        // the names are the place's: its record keeps them too (spec 034 — the app and the identification read them there)
+        addOtherNames(tree, key, listOpt(opts.also));
         return { text: lines(...tree.written.map((o) => o.summary), missing.length && tree.dryRun ? `would make the region ${missing[0]}` : undefined), data: { place: key, map: m } };
     },
 }, {

package/dist/commands/placeid.js

@@ -8,9 +8,8 @@ import { UsageError } from "../core/errors.js";
 import { listOpt } from "../core/records.js";
 import { refuseInArchive } from "../core/state.js";
 import { isAgent } from "../core/which.js";
-import { answerPlaces, cancelPlaces, factForms, identifyEstimate, identifyPlace, parseCandidate, parseJurisdiction, PLACE_TAKES, placeState, proposePlace, queueBatches, queueOrder, queuePlaces, raisePlacesTask, readPlacesFile, recordIndex, rewriteForm, undoPlaces, unlocatePlace, verifyPlace, identifyingNow, placeIdOf, PLACE_FLAGS, REQUEST_MAX, } from "../core/placeid.js";
+import { answerPlaces, cancelPlaces, dropPlaceNames, factForms, identifyEstimate, identifyPlace, parseCandidate, parseJurisdiction, PLACE_TAKES, placeState, proposePlace, queueBatches, queueOrder, queuePlaces, raisePlacesTask, readPlacesFile, recordIndex, rewriteForm, undoPlaces, unlocatePlace, verifyPlace, identifyingNow, mergePlaces, parseAltName, parseDrop, placeIdOf, PLACE_FLAGS, REQUEST_MAX, } from "../core/placeid.js";
 import { actsAsArchive } from "../core/state.js";
-import { altName } from "./sources.js";
 function str(v) {
     return typeof v === "string" && v.trim() ? v.trim() : undefined;
 }
@@ -18,6 +17,16 @@ function written(tree) {
     return lines(...tree.written.map((o) => o.summary));
 }
 const name = (p) => p.names[0]?.name ?? p.id;
+/** What identify and verify write of a place beside its coordinates. */
+const DETAIL_OPTIONS = [
+    { name: "name", type: "string", value: "<name>", description: "today's (official) name, when the record's first is not it: the old one stays as a form or an old name" },
+    { name: "alt", type: "string", multiple: true, value: "<name[@lang][:from-to]>", description: 'another name of the place (another language, an old name, an old spelling), e.g. "Ober Lhota@de:-1945"; one year: "Lhotow@cs:1654"; a --form of the same name is kept as this name alone (repeatable)' },
+    { name: "form", type: "string", multiple: true, value: "<place>", description: "another form of the facts that is the same place (kept among the record's names as a form, out of the queue; repeatable)" },
+    { name: "kind", type: "string", value: "<kind>", description: "village, town, part of a municipality, …" },
+    { name: "parent", type: "string", value: "<L…>", description: "the place it is part of" },
+    { name: "jurisdiction", type: "string", multiple: true, value: "<kind:name[:from-to]>", description: 'e.g. "parish:Lhotov:1784-", "district:Lhotov" or one year "district:Lhotov:1899" (repeatable)' },
+    { name: "drop-jurisdiction", type: "string", multiple: true, value: "<kind:name>", description: "a jurisdiction of the record found wrong: taken off, --why says why (repeatable)" },
+];
 register({
     path: ["place", "identify"],
     summary: "Write a place identified surely: its coordinates, names, parent and jurisdictions, why and from what",
@@ -32,15 +41,12 @@ register({
         { name: "why", type: "string", value: "<text>", description: "why it is this place (the records' parish, district, years)" },
         { name: "source-title", type: "string", value: "<title>", description: "the reference it stands on (a gazetteer, a register of places)" },
         { name: "source-url", type: "string", value: "<url>", description: "its address" },
-        { name: "name", type: "string", value: "<name>", description: "today's name, when the record's first is not it" },
-        { name: "alt", type: "string", multiple: true, value: "<name[@lang][:from-to]>", description: 'another name of the place (another language, an old name), e.g. "Ober Lhota@de:-1945"; a --form of the same name is kept as this name alone (repeatable)' },
-        { name: "form", type: "string", multiple: true, value: "<place>", description: "another form of the facts that is the same place (kept among the record's names as a form; repeatable)" },
-        { name: "kind", type: "string", value: "<kind>", description: "village, town, part of a municipality, …" },
-        { name: "parent", type: "string", value: "<L…>", description: "the place it is part of" },
-        { name: "jurisdiction", type: "string", multiple: true, value: "<kind:name[:from-to]>", description: 'e.g. "parish:Lhotov:1784-" or "district:Lhotov" (repeatable)' },
+        ...DETAIL_OPTIONS,
+        { name: "separate", type: "string", multiple: true, value: "<L…>", description: "a record nearer than 1.5 km that is another place (a part of it, a neighbour) — said, never assumed (repeatable)" },
     ],
     examples: [
         'strom place identify "H. Lhota" --lat 49.61 --lon 15.23 --name "Horní Lhota" --jurisdiction "parish:Lhotov" --why "the parish of the registers; the other Horní Lhota is 200 km away" --source-title "Register of places"',
+        'strom place identify "Lhota" --lat 50.2 --lon 15.9 --name "Lhotów" --alt "Lhotau@de:-1945" --why "…"',
     ],
     run(ctx, { args, opts }) {
         const tree = ctx.tree();
@@ -51,21 +57,17 @@ register({
         const url = str(opts["source-url"]);
         if (url && !title)
             throw new UsageError("--source-url with its --source-title");
-        const p = identifyPlace(tree, args[0], {
+        const r = identifyPlace(tree, args[0], {
             lat,
             lon,
             why: String(opts.why ?? ""),
             ...(title ? { source: { title, ...(url ? { url } : {}) } } : {}),
-            ...(str(opts.name) ? { name: str(opts.name) } : {}),
-            alt: listOpt(opts.alt).map(altName),
-            forms: listOpt(opts.form),
-            ...(str(opts.kind) ? { kind: str(opts.kind) } : {}),
-            ...(str(opts.parent) ? { parent: placeRef(String(opts.parent)) } : {}),
-            jurisdictions: listOpt(opts.jurisdiction).map(parseJurisdiction),
+            ...detailsOf(opts),
+            separate: listOpt(opts.separate),
             by: isAgent(ctx.env) || ctx.env.STROM_SESSION ? "research" : "person",
         });
         raisePlacesTask(tree, actsAsArchive(tree));
-        return { text: written(tree), data: { place: p } };
+        return stepResult(tree, r);
     },
 }, {
     path: ["place", "unlocated"],
@@ -114,19 +116,53 @@ register({
     group: "sources",
     tree: true,
     writes: true,
+    description: "The coordinates are never moved; what the check found of the place is written with it: its other and old names (--alt), the forms of the facts that are it (--form: no second record of one place), today's name (--name), its jurisdictions (--jurisdiction; a wrong one taken off with --drop-jurisdiction and --why).",
     options: [
         { name: "ok", type: "boolean", description: "the records agree with the coordinates" },
         { name: "undecided", type: "string", value: "<why>", description: "it cannot be decided, and why" },
-        { name: "why", type: "string", value: "<text>", description: "with --ok: on what" },
+        { name: "why", type: "string", value: "<text>", description: "with --ok: on what (kept with the check); with --drop-jurisdiction: why it is wrong" },
+        { name: "source-title", type: "string", value: "<title>", description: "the reference the check stands on (a gazetteer, a register of places)" },
+        { name: "source-url", type: "string", value: "<url>", description: "its address" },
+        ...DETAIL_OPTIONS,
     ],
     args: [{ name: "place", description: "place ID (L0012) or the place as the facts write it", required: true }],
-    examples: ['strom place verify L0002 --ok', 'strom place verify L0002 --undecided "the records name no parish"'],
+    examples: [
+        'strom place verify L0002 --ok --why "the parish of the registers"',
+        'strom place verify L0002 --ok --alt "Lhotau@de:-1945" --form "Nová Lhota" --drop-jurisdiction "parish:Lhotov" --jurisdiction "parish:Horní Lhota" --why "the town had its own parish; Lhotov was the source\'s"',
+        'strom place verify L0002 --undecided "the records name no parish"',
+    ],
     run(ctx, { args, opts }) {
         const tree = ctx.tree();
         refuseInArchive(tree, "place verify", ctx.settings.agent(tree.config).value);
         if (!!opts.ok === !!opts.undecided)
-            throw new UsageError("--ok or --undecided \"<why>\"");
-        const p = verifyPlace(tree, args[0], opts.ok ? { ok: true, ...(str(opts.why) ? { why: str(opts.why) } : {}) } : { ok: false, why: String(opts.undecided) });
+            throw new UsageError("--ok or --undecided \"<why>\"", { hint: `strom place verify ${args[0] ?? "L…"} --ok --why "on what" (names found: --alt, --form)` });
+        const title = str(opts["source-title"]);
+        const url = str(opts["source-url"]);
+        if (url && !title)
+            throw new UsageError("--source-url with its --source-title");
+        const source = title ? { source: { title, ...(url ? { url } : {}) } } : {};
+        const r = verifyPlace(tree, args[0], opts.ok ? { ok: true, ...(str(opts.why) ? { why: str(opts.why) } : {}), ...source } : { ok: false, why: String(opts.undecided), ...source }, detailsOf(opts));
+        raisePlacesTask(tree, actsAsArchive(tree));
+        return stepResult(tree, r);
+    },
+}, {
+    path: ["place", "merge"],
+    summary: "Two records of one place made one: names, forms and jurisdictions into the other, the duplicate retracted",
+    group: "sources",
+    tree: true,
+    writes: true,
+    description: "Only when sure it is one place (the same parish and district, an old name of the town); --reason says why. The person's coordinates win. Records further than 1.5 km apart are not merged: ask the person with strom place propose --conflict.",
+    args: [{ name: "place", description: "the duplicate's ID (L0012)", required: true }],
+    options: [
+        { name: "into", type: "string", value: "<L…>", description: "the record it is the same place as" },
+    ],
+    examples: ['strom place merge L0003 --into L0002 --reason "Nová Lhota is the old name of Horní Lhota; the same parish"'],
+    run(ctx, { args, opts }) {
+        const tree = ctx.tree();
+        refuseInArchive(tree, "place merge", ctx.settings.agent(tree.config).value);
+        if (!str(opts.into))
+            throw new UsageError("--into <L…>: the record it is the same place as", { hint: `strom place merge ${args[0]} --into L… --reason "…"` });
+        const p = mergePlaces(tree, args[0], String(opts.into), String(opts.reason ?? ""));
         raisePlacesTask(tree, actsAsArchive(tree));
         return { text: written(tree), data: { place: p } };
     },
@@ -156,11 +192,35 @@ register({
             propose: !!opts.propose,
             ...(str(opts.why) ? { why: str(opts.why) } : {}),
         });
+        raisePlacesTask(tree, actsAsArchive(tree));
         return {
             text: lines(written(tree), r.left ? `left: ${counted(r.left, "fact")} (their house says another thing — never written over)` : undefined),
             data: { place: r.place, changed: r.changed, left: r.left, asked: r.asked },
         };
     },
+}, {
+    path: ["place", "names"],
+    summary: "Take a wrong name off a place record (a slip of a record kept as a form, another place's name), with the reason",
+    group: "sources",
+    tree: true,
+    writes: true,
+    description: "Never today's name (the first: --name of strom place verify or identify sets another) and never a name a fact still writes for the place (strom place rewrite first). Other names are added with --alt and --form of strom place identify or verify.",
+    args: [{ name: "place", description: "place ID (L0012)", required: true }],
+    options: [
+        { name: "drop", type: "string", multiple: true, value: "<name>", description: "the name to take off, as the record has it" },
+        { name: "why", type: "string", value: "<text>", description: "why it is wrong (kept with the step)" },
+    ],
+    examples: ['strom place names L0002 --drop "v Lhotě v" --why "a slip of the register; the facts write Lhota now"'],
+    run(ctx, { args, opts }) {
+        const tree = ctx.tree();
+        refuseInArchive(tree, "place names", ctx.settings.agent(tree.config).value);
+        const r = dropPlaceNames(tree, args[0], listOpt(opts.drop), String(opts.why ?? ""));
+        raisePlacesTask(tree, actsAsArchive(tree));
+        return {
+            text: lines(`${r.place.id}: ${r.dropped.map((n) => n.name).join(", ")} taken off`, `undo (the person's): strom place undo ${r.undo}`, written(tree)),
+            data: { place: r.place, dropped: r.dropped, undo: r.undo },
+        };
+    },
 }, {
     path: ["place", "queue"],
     summary: "Queue places to be identified (or their coordinates checked) — or show the queue",
@@ -275,12 +335,12 @@ register({
     },
 }, {
     path: ["place", "undo"],
-    summary: "Undo the person's last step on places (answers)",
+    summary: "Undo a step on places by its id (the person's answers, names taken off, the queue tidied)",
     group: "sources",
     tree: true,
     writes: true,
-    person: "Undoing the person's answers is the person's own",
-    args: [{ name: "step", description: "the step's id (the answer prints it)", required: true }],
+    person: "Undoing a step on places is the person's own",
+    args: [{ name: "step", description: "the step's id (the step prints it; each of the last 20 steps once)", required: true }],
     examples: ["strom place undo u1a2b3c"],
     run(ctx, { args }) {
         const tree = ctx.tree();
@@ -380,6 +440,23 @@ const SKIP_SAID = {
     unknown: "no fact of the tree has it",
     unlocated: "not located",
 };
+function detailsOf(opts) {
+    return {
+        ...(str(opts.name) ? { name: str(opts.name) } : {}),
+        alt: listOpt(opts.alt).map(parseAltName),
+        forms: listOpt(opts.form),
+        ...(str(opts.kind) ? { kind: str(opts.kind) } : {}),
+        ...(str(opts.parent) ? { parent: placeRef(String(opts.parent)) } : {}),
+        jurisdictions: listOpt(opts.jurisdiction).map(parseJurisdiction),
+        drop: listOpt(opts["drop-jurisdiction"]).map(parseDrop),
+    };
+}
+function stepResult(tree, r) {
+    return {
+        text: lines(written(tree), r.today ? `today's name first: ${r.today} (the one other name in use since a year with no end; --name sets another)` : undefined),
+        data: { place: r.place, ...(r.today ? { today: r.today } : {}), ...(r.dropped.length ? { dropped: r.dropped } : {}) },
+    };
+}
 function placeRef(ref) {
     const m = /^[Ll](\d+)$/u.exec(ref.trim());
     if (!m)

package/dist/commands/session.js

@@ -62,6 +62,7 @@ import { isArchive } from "../core/mode.js";
 import { afterDeathProposals, settleAfterDeath } from "../core/afterdeath.js";
 import { usageOpt, webOpt } from "../core/metrics.js";
 import { calibrationKey, viewModel } from "../core/viewsizes.js";
+import { claudeConfigSet, claudeLoggedIn, claudeLoginCommand } from "../core/claudedir.js";
 function written(tree) {
     return lines(...tree.written.map((o) => o.summary));
 }
@@ -874,7 +875,14 @@ register(updatedDuringRun({
             let gateAnswered = false;
             if (gate)
                 out(ui(lang, gateHolds ? "ui.run.gate" : "ui.run.gate.once", { name: gate.manifest.title ?? gate.name }));
-            for (let i = 0; i < max; i++) {
+            // Claude Code of a folder said outright (CLAUDE_CONFIG_DIR, agent.claudeConfigDir) not logged in there: no session
+            // would work — said before the first one, with how to log in (found 2026-11-03)
+            const loggedOut = runnerId === "claude" && claudeConfigSet(runEnv) !== undefined && claudeLoggedIn(runEnv, runner.command) === false;
+            if (loggedOut) {
+                stopCode = "auth";
+                stopValues = { command: claudeLoginCommand(runEnv) };
+            }
+            for (let i = 0; i < (loggedOut ? 0 : max); i++) {
                 if (stop.signal.aborted || finishing) {
                     stopCode = "user";
                     break;
@@ -1233,7 +1241,7 @@ register(updatedDuringRun({
                 }
                 if (result.outcome === "auth") {
                     stopCode = "auth";
-                    stopValues = { command: runner.command };
+                    stopValues = { command: runnerId === "claude" ? claudeLoginCommand(runEnv) : runner.command };
                     break;
                 }
                 // the agent does not take its model: said with what to do, never only its raw error