strom-research 1.25.1 → 1.25.2

package/dist/core/placesview.js

@@ -60,6 +60,7 @@ function view(k, p) {
         ...(why ? { why } : {}),
         ...(loc?.source ? { source: loc.source } : {}),
         ...(loc?.verified ? { verified: loc.verified } : {}),
+        ...(loc?.verifiedSource ? { verifiedSource: loc.verifiedSource } : {}),
         ...(loc?.checkWhy ? { checkWhy: loc.checkWhy } : {}),
         ...(!p.coords && p.unlocated && loc?.needs ? { needs: loc.needs } : {}),
         ...(q && (state === "proposed" || state === "conflict") ? { waiting: p.id } : {}),

package/dist/core/schema.js

@@ -77,7 +77,10 @@ export const SCHEMAS = {
                 why: S({ max: 1000 }),
                 source: { t: "object", of: { title: S({ req: true, max: 300 }), url: S({ max: 2000 }) } },
                 verified: S(),
+                verifiedWhy: S({ max: 1000 }),
+                verifiedSource: { t: "object", of: { title: S({ req: true, max: 300 }), url: S({ max: 2000 }) } },
                 checkWhy: S({ max: 1000 }),
+                checked: S(),
                 needs: S({ max: 300 }),
                 context: { t: "number", int: true, min: 0 },
                 kept: { t: "object", of: { lat: { t: "number", req: true, min: -90, max: 90 }, lon: { t: "number", req: true, min: -180, max: 180 } } },

package/dist/core/session.js

@@ -22,6 +22,7 @@ import { forgetLeftAlone } from "./leftalone.js";
 import { Settings } from "./config.js";
 import { forGaps, regionOfTask, takeRegion } from "./pastevents.js";
 import { placeOfTask, takePlace } from "./placehistory.js";
+import { PLACES_IDENTIFY_ORIGIN, placesSessionCounts } from "./placeid.js";
 function currentFile(tree, env = tree.env) {
     const w = env.STROM_WORKER;
     return path.join(tree.root, ".strom", isWorkerId(w) ? `session-${w}.json` : "session.json");
@@ -236,6 +237,10 @@ export function closeSession(tree, s, input) {
                 tree.put(back, { op: "task.continue", targets: [task.id, s.id], summary: `${task.id} back to the queue` });
             }
         }
+        // a session on the places: what it did counted by strom (identified, verified, asked …) before the agent's words
+        const counts = task?.origin === PLACES_IDENTIFY_ORIGIN ? placesSessionCounts(tree, s.id) : "";
+        if (counts)
+            input = { ...input, summary: input.summary.trim() ? `${counts} — ${input.summary.trim()}` : counts };
         const closed = {
             ...s,
             state: input.interrupted ? "interrupted" : "closed",

package/dist/core/streetfix.js

@@ -44,7 +44,7 @@ export function streetPlaceFixes(tree) {
                 towns.set(b.key, t);
                 continue;
             }
-            const place = streets.townOf(s.town);
+            const place = streets.townOf(s.town, s.sentence);
             const had = e.house?.trim();
             // the house: the street and the number where the fact has none, the street before a number alone
             const house = houseWith(s.house, had);
@@ -56,6 +56,29 @@ export function streetPlaceFixes(tree) {
             out.fixes.push({ owner: o.id, event: e.id, before: placeHouse(e.place, e.house), after: placeHouse(place, house), ...(record ? { record } : {}) });
         }
     }
+    // what an older fix left of a sentence in the place ("v Lhotici v" of "v Lhotici v čp. 46", before prepositions were
+    // known): the place as the rules split it now, the fact's house kept — only where the fact is as that fix left it
+    const ownerOf = new Map();
+    for (const o of owners(tree)) {
+        if (o.retracted || o.mergedInto)
+            continue;
+        for (const e of o.events)
+            if (!e.retracted && e.status !== "retracted")
+                ownerOf.set(e.id, { owner: o, place: e.place, house: e.house });
+    }
+    const taken = new Set(out.fixes.map((f) => f.event));
+    for (const it of readStreetsFile(tree).runs.flatMap((r) => r.items)) {
+        const now = ownerOf.get(it.event);
+        if (!now || taken.has(it.event) || !same(now.place, now.house, it.after))
+            continue;
+        const s = streets.split(it.before.place);
+        const place = s ? streets.townOf(s.town, s.sentence) : undefined;
+        if (!place || place === it.after.place)
+            continue;
+        const record = recordOf(place);
+        out.fixes.push({ owner: now.owner.id, event: it.event, before: it.after, after: placeHouse(place, it.after.house), ...(record ? { record } : {}) });
+        taken.add(it.event);
+    }
     out.towns = [...towns]
         .map(([key, t]) => ({ town: t.town, key, fixes: t.fixes, places: [...t.places].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).map(([p]) => p) }))
         .sort((a, b) => b.fixes.length - a.fixes.length || a.town.localeCompare(b.town));

package/dist/core/streets.js

@@ -36,6 +36,7 @@ export function streetTerms() {
         last: new Set((f.last ?? []).map((w) => foldText(w))),
         house: (f.house ?? []).map(words).filter((w) => w.length).sort((a, b) => b.length - a.length),
         numbered: new Set((f.numbered ?? []).map((w) => foldText(w))),
+        prepositions: new Set(Object.values(f.prepositions ?? {}).flat().map((w) => foldText(w))),
     };
     return terms;
 }
@@ -50,6 +51,10 @@ function markerAt(toks, i) {
     return 0;
 }
 const isNumber = (t) => !!t && NUMBER.test(t.fold);
+/** A house that says it is a house already ("č. p. 12", "Nr. 3", "nr domu 12"): a marker of a house number at its beginning. */
+export function hasHouseMark(text) {
+    return markerAt(tokens(text.normalize("NFC")), 0) > 0;
+}
 /** A house of numbers alone ("12", "13/2"). */
 export function numbersOnly(text) {
     const toks = tokens(text.normalize("NFC"));
@@ -119,6 +124,7 @@ export function splitStreet(place, known) {
     const keep = [];
     const house = [];
     let by = "word";
+    let sentence = false;
     for (const [i, part] of parts.entries()) {
         const toks = tokens(part);
         if (!toks.length)
@@ -150,7 +156,12 @@ export function splitStreet(place, known) {
         }
         // a house number with its marker at the end of a part ("Lhota č. p. 12", "Lhota, Horní Lhota Nr. 3"): the number
         if (tail && tail.at < tail.number && tail.at > 0) {
-            keep.push(part.slice(0, toks[tail.at].start).replace(/[\s,;:–-]+$/u, "").trim());
+            const words = sentenceWords(part, toks.slice(0, tail.at));
+            if (!words.town)
+                continue;
+            if (words.sentence)
+                sentence = true;
+            keep.push(words.town);
             house.push(part.slice(toks[tail.number].start).trim());
             continue;
         }
@@ -158,7 +169,23 @@ export function splitStreet(place, known) {
     }
     if (!house.length || !keep.length || !keep[0])
         return undefined;
-    return { town: keep.join(", "), house: house.join(" "), by };
+    return { town: keep.join(", "), house: house.join(" "), by, ...(sentence ? { sentence: true } : {}) };
+}
+/**
+ * The words before a house number without the sentence they stood in: a preposition at the end taken off ("v Lhotici v"
+ * of "v Lhotici v čp. 46"), and one in lower case at the beginning ("v Lhotici" → "Lhotici"; "U Lípy", a name, stays).
+ */
+function sentenceWords(part, toks) {
+    const prep = streetTerms().prepositions;
+    let a = 0;
+    let b = toks.length;
+    while (b > a + 1 && prep.has(toks[b - 1].fold))
+        b--;
+    const first = toks[a];
+    const word = part.slice(first.start, first.end);
+    if (b > a + 1 && prep.has(first.fold) && word === word.toLowerCase() && word !== word.toUpperCase())
+        a++;
+    return { town: part.slice(toks[a].start, toks[b - 1].end).replace(/[\s,;:–-]+$/u, "").trim(), sentence: a > 0 || b < toks.length };
 }
 /**
  * A number alone at the end of the place's first part, after words, with no marker ("Lhota 16", "Lhota 16, okres
@@ -272,6 +299,11 @@ export function streetsOf(tree) {
     }
     for (const t of known.keys())
         partOf(t);
+    // the municipalities' names as the research writes them, by their name folded (the facts' spelling first)
+    const named = new Map();
+    for (const f of spellings.keys())
+        if (!f.includes(","))
+            named.set(f, f);
     for (const r of tree.list("place")) {
         if (r.retracted)
             continue;
@@ -280,6 +312,9 @@ export function streetsOf(tree) {
                 partOf(n.name.split(",")[0]);
             else
                 towns.add(foldText(n.name.split(",")[0]));
+            const f = foldText(n.name);
+            if (!f.includes(",") && !named.has(f))
+                named.set(f, n.name.normalize("NFC").trim());
         }
     }
     const bare = (place) => {
@@ -295,7 +330,7 @@ export function streetsOf(tree) {
         return { ...b, key, ...(a ? { houses: a.houses } : {}) };
     };
     const most = (m) => [...m].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]))[0][0];
-    const townOf = (town) => {
+    const townOf = (town, sentence) => {
         const f = foldText(town);
         const exact = spellings.get(f);
         if (exact)
@@ -304,6 +339,14 @@ export function streetsOf(tree) {
             const forms = byFirst.get(f);
             if (forms?.size === 1)
                 return most(spellings.get([...forms][0]));
+            if (sentence && !named.has(f)) {
+                const like = [...named.keys()].filter((k) => otherCase(f, k));
+                if (like.length === 1) {
+                    const k = like[0];
+                    const m = spellings.get(k);
+                    return m ? most(m) : named.get(k);
+                }
+            }
         }
         return town;
     };
@@ -313,12 +356,28 @@ export function streetsOf(tree) {
         townOf,
         placeOf: (place) => {
             const s = split(place);
-            return s ? townOf(s.town) : place;
+            return s ? townOf(s.town, s.sentence) : place;
         },
     };
     memo.set(tree, { version: tree.version, answers: answersKey, streets });
     return streets;
 }
+/**
+ * A municipality's name in a sentence in another case than the research writes it (folded): the same words but the
+ * ending of the last — the word as written ending in at most three letters of its own, the research's in at most one,
+ * three letters alike before ("lhotici" of "lhotice", "lhote" of "lhota", "lhotowie" of "lhotow"; never "lhote" of
+ * "lhotka", another municipality).
+ */
+function otherCase(written, research) {
+    if (written === research)
+        return false;
+    let p = 0;
+    while (p < written.length && p < research.length && written[p] === research[p])
+        p++;
+    const a = written.slice(p);
+    const b = research.slice(p);
+    return p >= 3 && !/\s/u.test(written.slice(0, p).slice(-1)) && a.length <= 3 && b.length <= 1 && !/[\s,]/u.test(a + b);
+}
 /**
  * Checks a place written now (strom event add|edit --place, person add --born-place|--died-place, family add
  * --married-place): a street or a house number in it is refused with what to write instead — the municipality as the
@@ -331,7 +390,7 @@ export function checkStreetPlace(tree, place, house, flag = "--place") {
     const s = streets.split(place);
     if (!s)
         return;
-    const town = streets.townOf(s.town);
+    const town = streets.townOf(s.town, s.sentence);
     const given = house?.trim();
     const both = houseWith(s.house, given);
     const set = both ?? s.house;

package/dist/core/sync.js

@@ -33,6 +33,7 @@ import { appAge, appDate } from "./appshapes.js";
 import { dateYears } from "./gdate.js";
 import { create, update } from "./records.js";
 import { decodeText, foldText, safeFolderName } from "./text.js";
+import { hasHouseMark } from "./streets.js";
 import { roleWord } from "./roles.js";
 import { labels } from "../gedcom/labels.js";
 import { eventName, humanDate, humanDay } from "../cli/human.js";
@@ -3684,7 +3685,7 @@ export function applySync(tree, plan, incoming, source, only) {
                         toCheck(owner, gr);
                     }
                     else {
-                        const title = editTitle(c.name ?? owner, eventName(c.fact.kind, tree.lang, c.fact.label), factWords(tree, incoming, mine), factWords(tree, incoming, c.fact));
+                        const title = editTitle(tree.lang, c.name ?? owner, eventName(c.fact.kind, tree.lang, c.fact.label), factWords(tree, incoming, mine), factWords(tree, incoming, c.fact));
                         conflictOfEdit(tree, applied, owner, c.fact.kind, title, [
                             { ...(mine.citations[0] ? { source: mine.citations[0].source } : {}), value: describe(mine), note: `the research: ${mine.id}`, text: factWords(tree, incoming, mine) },
                             { source: source.id, value: claimValue(c.fact), note: "the user's edit", text: factWords(tree, incoming, c.fact) },
@@ -3698,7 +3699,7 @@ export function applySync(tree, plan, incoming, source, only) {
                         break;
                     // picked without the state it was given: a record's fact is not overwritten
                     if (c.action === "conflict" || (c.action === "pick" && recordBacked(tree, mine))) {
-                        const title = editTitle(c.name ?? owner, eventName(c.fact.kind, tree.lang, c.fact.label), factWords(tree, incoming, mine), factWords(tree, incoming, c.fact));
+                        const title = editTitle(tree.lang, c.name ?? owner, eventName(c.fact.kind, tree.lang, c.fact.label), factWords(tree, incoming, mine), factWords(tree, incoming, c.fact));
                         conflictOfEdit(tree, applied, owner, c.fact.kind, title, [
                             { ...(mine.citations[0] ? { source: mine.citations[0].source } : {}), value: describe(mine), note: `the research: ${mine.id}`, text: factWords(tree, incoming, mine) },
                             { source: source.id, value: describe(c.fact), note: "the user's edit", text: factWords(tree, incoming, c.fact) },
@@ -3748,7 +3749,7 @@ export function applySync(tree, plan, incoming, source, only) {
                     const at = c.wasPart ? before.findIndex((x) => x.role === c.wasPart.role && (c.wasPart.person ? x.person === c.wasPart.person : !x.person && nameKey(x.name ?? "") === nameKey(c.wasPart.name ?? ""))) : -1;
                     const kindOfRec = owner.startsWith("F") ? "family" : "person";
                     if (c.action === "conflict") {
-                        const title = editTitle(c.name ?? owner, eventName(mine.kind, tree.lang, mine.label), partWords(c.wasPart, incoming, tree.lang), partWords(c.part, incoming, tree.lang));
+                        const title = editTitle(tree.lang, c.name ?? owner, eventName(mine.kind, tree.lang, mine.label), partWords(c.wasPart, incoming, tree.lang), partWords(c.part, incoming, tree.lang));
                         conflictOfEdit(tree, applied, owner, mine.kind, title, [
                             { ...(mine.citations[0] ? { source: mine.citations[0].source } : {}), value: `${c.wasPart.role} ${c.wasPart.name ?? c.wasPart.person ?? "?"}`, note: `the research: ${mine.id}`, text: partWords(c.wasPart, incoming, tree.lang) },
                             { source: source.id, value: partText(c.part, incoming), note: "the user's edit", text: partWords(c.part, incoming, tree.lang) },
@@ -3905,7 +3906,7 @@ export function applySync(tree, plan, incoming, source, only) {
                     const day = humanDay(p.retracted.at, tree.lang);
                     const ours = ui(tree.lang, "ui.conflict.removed.ours", { day, sync: c.removedBy ?? "—" });
                     const theirs = ui(tree.lang, "ui.conflict.removed.theirs");
-                    const { open } = conflictOfEdit(tree, applied, p.id, "PERSON", editTitle(name, ui(tree.lang, "ui.conflict.removed"), ours, theirs), [
+                    const { open } = conflictOfEdit(tree, applied, p.id, "PERSON", editTitle(tree.lang, name, ui(tree.lang, "ui.conflict.removed"), ours, theirs), [
                         { value: `removed${c.removedBy ? ` ${c.removedBy}` : ""}`, note: "the research: removed by an earlier send", text: ours },
                         { source: source.id, value: "edited", note: "the user's edit", text: theirs },
                     ]);
@@ -3924,7 +3925,7 @@ export function applySync(tree, plan, incoming, source, only) {
                         const ours = ui(tree.lang, by === "app" ? "ui.conflict.removing.ours" : `ui.conflict.removing.${by}`);
                         const theirs = ui(tree.lang, "ui.conflict.removing.theirs");
                         const where = by === "app" ? "in another copy" : by === "research" ? "in the research" : "in another copy and in the research";
-                        const { open } = conflictOfEdit(tree, applied, p.id, "PERSON", editTitle(name, ui(tree.lang, "ui.conflict.removed"), ours, theirs), [
+                        const { open } = conflictOfEdit(tree, applied, p.id, "PERSON", editTitle(tree.lang, name, ui(tree.lang, "ui.conflict.removed"), ours, theirs), [
                             { value: "edited", note: `the research: edited since ${where}`, text: ours },
                             { source: source.id, value: "removed", note: "the user's edit", text: theirs },
                         ]);
@@ -4009,7 +4010,7 @@ export function applySync(tree, plan, incoming, source, only) {
                     else {
                         // a record gives the name: the user decides; their name kept as another form meanwhile (sent again, it
                         // asks nothing new)
-                        const title = editTitle(c.wasName ?? owner, ui(tree.lang, "ui.conflict.name"), (c.wasName ?? "").replace(/\//g, "").replace(/\s+/g, " ").trim() || "—", c.text.replace(/\//g, "").replace(/\s+/g, " ").trim());
+                        const title = editTitle(tree.lang, c.wasName ?? owner, ui(tree.lang, "ui.conflict.name"), (c.wasName ?? "").replace(/\//g, "").replace(/\s+/g, " ").trim() || "—", c.text.replace(/\//g, "").replace(/\s+/g, " ").trim());
                         const { was } = conflictOfEdit(tree, applied, owner, "NAME", title, [
                             { ...(shown.citations?.[0] ? { source: shown.citations[0].source } : {}), value: c.wasName ?? "", note: "the research: the name the person is shown by", text: (c.wasName ?? "").replace(/\//g, "").replace(/\s+/g, " ").trim() || "—" },
                             { source: source.id, value: c.text, note: "the user's edit", text: c.text.replace(/\//g, "").replace(/\s+/g, " ").trim() },
@@ -4034,7 +4035,7 @@ export function applySync(tree, plan, incoming, source, only) {
                     if (c.action === "conflict") {
                         const who = gedcomName(primaryName(p)).replace(/\//g, "").replace(/\s+/g, " ").trim();
                         const said = (n) => (n ? formatName(n) : ui(tree.lang, "ui.conflict.primary.none"));
-                        conflictOfEdit(tree, applied, owner, "NAME", editTitle(who, ui(tree.lang, "ui.conflict.primary"), said(was), said(target)), [
+                        conflictOfEdit(tree, applied, owner, "NAME", editTitle(tree.lang, who, ui(tree.lang, "ui.conflict.primary"), said(was), said(target)), [
                             { value: was ? gedcomName(was) : "", note: "the research: the name it shows the person by", text: said(was) },
                             { source: source.id, value: target ? gedcomName(target) : "", note: "the user's edit", text: said(target) },
                         ], undefined, undefined, true);
@@ -4053,7 +4054,7 @@ export function applySync(tree, plan, incoming, source, only) {
                         // a record gives the name: the user decides (strom conflict resolve --take user|research)
                         const said = (v) => v || "—";
                         const what = ui(tree.lang, c.title.part === "before" ? "ui.conflict.titleBefore" : "ui.conflict.titleAfter");
-                        conflictOfEdit(tree, applied, owner, titleTag(c.title.part), editTitle(formatName(shown), what, said(c.title.was), said(now)), [
+                        conflictOfEdit(tree, applied, owner, titleTag(c.title.part), editTitle(tree.lang, formatName(shown), what, said(c.title.was), said(now)), [
                             { ...(shown.citations?.[0] ? { source: shown.citations[0].source } : {}), value: c.title.was, note: "the research: the title of the name the person is shown by", text: said(c.title.was) },
                             { source: source.id, value: now, note: "the user's edit", text: said(now) },
                         ]);
@@ -4092,7 +4093,7 @@ export function applySync(tree, plan, incoming, source, only) {
                     const p = tree.get(owner);
                     if (c.action === "conflict") {
                         const who = gedcomName(primaryName(p)).replace(/\//g, "").replace(/\s+/g, " ").trim();
-                        conflictOfEdit(tree, applied, owner, "SEX", editTitle(who, ui(tree.lang, "ui.conflict.sex"), sexWord(p.sex, tree.lang), sexWord(c.text, tree.lang)), [
+                        conflictOfEdit(tree, applied, owner, "SEX", editTitle(tree.lang, who, ui(tree.lang, "ui.conflict.sex"), sexWord(p.sex, tree.lang), sexWord(c.text, tree.lang)), [
                             { value: p.sex, note: "the research: the sex its records give", text: sexWord(p.sex, tree.lang) },
                             { source: source.id, value: c.text, note: "the user's edit", text: sexWord(c.text, tree.lang) },
                         ]);
@@ -4220,7 +4221,7 @@ export function applySync(tree, plan, incoming, source, only) {
                     const partners = (c.partners ?? []).map((k) => who(k)).filter((k) => !!k);
                     // the family of the user's parents: the research's the file named, or the one this send made — else made when taken
                     const to = c.family ?? families.get(famKey(partners));
-                    conflictOfEdit(tree, applied, child, "FAMC", editTitle(name, ui(tree.lang, "ui.conflict.parents"), ours, theirs), [
+                    conflictOfEdit(tree, applied, child, "FAMC", editTitle(tree.lang, name, ui(tree.lang, "ui.conflict.parents"), ours, theirs), [
                         { value: `${born.id}: ${ours}`, note: "the research: the parents it gives", text: ours },
                         { source: source.id, value: theirs, note: "the user's edit", text: theirs },
                     ], undefined, partners.length ? { child, from: born.id, partners, ...(to ? { to } : {}) } : undefined);
@@ -4400,15 +4401,25 @@ function nameOfView(p, view) {
     const key = view.startsWith("married|") ? view.slice("married|".length) : undefined;
     return key === undefined ? undefined : p.names.find((n) => n !== first && nameKey(gedcomName(n)) === key);
 }
-function editTitle(who, what, ours, theirs) {
-    return `${who.replace(/\//g, "").replace(/\s+/g, " ").trim()}: ${what.charAt(0).toUpperCase()}${what.slice(1)} — ${ours} × ${theirs}`;
+function editTitle(lang, who, what, ours, theirs) {
+    return ui(lang, "ui.conflict.title", { who: who.replace(/\//g, "").replace(/\s+/g, " ").trim(), what: `${what.charAt(0).toUpperCase()}${what.slice(1)}`, ours, theirs });
+}
+/**
+ * A fact's house as a person reads it, in the research's language: "čp. 12" of "12" — a house that says it is one
+ * already ("nr domu 12", "Nr. 3") as it is, never "nr domu nr domu 12".
+ */
+export function houseWords(lang, house) {
+    const prefix = foldText(ui(lang, "ui.sync.house", { x: "" }).trim());
+    if (hasHouseMark(house) || (prefix && foldText(house).startsWith(prefix)))
+        return house;
+    return ui(lang, "ui.sync.house", { x: house });
 }
 /** A fact as a conflict's title says it, in the research's language: "1904, Praha, čp. 12, věk 45 let". */
 function factWords(tree, incoming, f) {
     const lang = tree.lang;
     const given = (k) => (k.startsWith("x:") ? undefined : tree.get(k)?.names[0]?.given) ?? (incoming.persons.get(k)?.names[0]?.split("/")[0]?.trim() || k);
     const ages = Object.entries(f.ages ?? {}).map(([who, a]) => `${given(who)} ${humanAge(a, lang)}`);
-    return [f.value, humanDate(f.date, lang), f.place, f.house && ui(lang, "ui.sync.house", { x: f.house }), f.age && humanAge(f.age, lang), ...ages, f.cause && ui(lang, "ui.sync.cause", { x: f.cause })].filter(Boolean).join(", ") || "—";
+    return [f.value, humanDate(f.date, lang), f.place, f.house && houseWords(lang, f.house), f.age && humanAge(f.age, lang), ...ages, f.cause && ui(lang, "ui.sync.cause", { x: f.cause })].filter(Boolean).join(", ") || "—";
 }
 /** Who the record names, as a conflict's title says it: "kmotr Jan Novák". */
 function partWords(p, snap, lang) {

package/dist/core/tree.js

@@ -31,7 +31,7 @@ export const TREE_FILE = "strom.json";
 export const SEAL_FOREIGN = "seal.foreign";
 // between releases the candidate being made (a bridge run from the sources says what it is: the Strom app goes by it);
 // at a release the release's own (package.json)
-export const VERSION = "1.25.1";
+export const VERSION = "1.25.2";
 const GITIGNORE = `# Strom Research — local state and large files are not versioned
 .strom/
 /media/

package/dist/runners/runner.js

@@ -4,7 +4,7 @@ import { spawn } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import { findAgent } from "../core/which.js";
-import { claudeEnv, isClaudeCommand } from "../core/claudedir.js";
+import { forClaude, isClaudeCommand } from "../core/claudedir.js";
 /** A number the agent said, else nothing. */
 export function usageNumber(n) {
     return typeof n === "number" && Number.isFinite(n) ? n : undefined;
@@ -104,10 +104,10 @@ function cmdQuote(arg) {
 /**
  * Start an agent CLI found on PATH. npm installs agents on Windows as .cmd
  * launchers, which Node can only start through cmd.exe. Claude Code gets its folder (agent.claudeConfigDir) when the
- * environment says none: every `claude` strom starts goes through here.
+ * environment says none, and none when it says the default one (forClaude): every `claude` strom starts goes through here.
  */
 export function spawnAgent(command, args, given) {
-    const opts = isClaudeCommand(command) ? { ...given, env: { ...given.env, ...claudeEnv(given.env) } } : given;
+    const opts = isClaudeCommand(command) ? { ...given, env: forClaude(given.env) } : given;
     const found = findAgent(command, opts.env) ?? command;
     if (process.platform === "win32" && /\.(cmd|bat)$/i.test(found)) {
         const line = [cmdQuote(found), ...args.map(cmdQuote)].join(" ");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strom-research",
-  "version": "1.25.1",
+  "version": "1.25.2",
   "description": "Genealogical research toolkit for AI coding agents",
   "type": "module",
   "stromLayout": 2,