strom-research 1.13.0-beta.8 → 1.13.0

package/assets/lang/cs.json

@@ -419,7 +419,6 @@
   "ui.menu.update": "Aktualizovat strom na {version}",
   "ui.doc.update": "nová verze",
   "ui.doc.update.new": "vyšla {version}",
-  "ui.update.unknown": "Nepodařilo se zjistit nejnovější verzi stromu.",
   "ui.update.current": "strom {version} je nejnovější verze.",
   "ui.update.available": "Vyšla nová verze: {version} (tato je {current}) – nainstaluje ji strom update.",
   "ui.update.npm": "Vyšla nová verze: {version}. strom je tu nainstalovaný přes npm: npm install -g strom-research@{tag}",
@@ -851,6 +850,8 @@
   "ui.error.tree.none.hint": "založit ho: strom init \"<název>\"",
   "ui.error.tree.which": "který rodokmen? je jich tu víc",
   "ui.error.tree.which.hint": "zadat --tree <název>: {names}",
+  "ui.error.update.unknown": "nepodařilo se zjistit nejnovější verzi stromu",
+  "ui.error.update.unknown.hint": "zkontrolovat připojení k síti – nebo spustit instalátor znovu",
   "ui.error.sync.which": "který rodokmen? soubor, nebo --app (rovnou z aplikace Strom)",
   "ui.error.sync.which.hint": "strom sync ~/Downloads/rodina.ged · strom sync --app · co čeká: strom sync --inbox",
   "ui.live.runs": "most běží: {url}",

package/assets/lang/de.json

@@ -419,7 +419,6 @@
   "ui.menu.update": "strom auf {version} aktualisieren",
   "ui.doc.update": "neue Version",
   "ui.doc.update.new": "{version} ist da",
-  "ui.update.unknown": "Die neueste Version von strom ließ sich nicht ermitteln.",
   "ui.update.current": "strom {version} ist die neueste Version.",
   "ui.update.available": "Eine neue Version ist da: {version} (diese ist {current}) – strom update installiert sie.",
   "ui.update.npm": "Eine neue Version ist da: {version}. strom ist hier mit npm installiert: npm install -g strom-research@{tag}",
@@ -851,6 +850,8 @@
   "ui.error.tree.none.hint": "einen anlegen: strom init \"<Name>\"",
   "ui.error.tree.which": "welcher Stammbaum? es gibt mehrere",
   "ui.error.tree.which.hint": "--tree <Name> angeben: {names}",
+  "ui.error.update.unknown": "die neueste Version von strom ließ sich nicht ermitteln",
+  "ui.error.update.unknown.hint": "die Netzwerkverbindung prüfen – oder das Installationsprogramm erneut ausführen",
   "ui.error.sync.which": "welcher Stammbaum? eine Datei, oder --app (direkt aus der Strom-App)",
   "ui.error.sync.which.hint": "strom sync ~/Downloads/familie.ged · strom sync --app · was wartet: strom sync --inbox",
   "ui.live.runs": "die Brücke läuft: {url}",

package/dist/cli/ui.js

@@ -346,7 +346,6 @@ export const UI = {
     "ui.menu.update": "Update strom to {version}",
     "ui.doc.update": "new version",
     "ui.doc.update.new": "{version} is out",
-    "ui.update.unknown": "The newest version of strom could not be learned.",
     "ui.update.current": "strom {version} is the newest version.",
     "ui.update.available": "A new version is out: {version} (this is {current}) — strom update installs it.",
     "ui.update.npm": "A new version is out: {version}. strom is installed with npm here: npm install -g strom-research@{tag}",
@@ -767,6 +766,8 @@ export const UI = {
     "ui.error.tree.none.hint": "create one: strom init \"<tree name>\"",
     "ui.error.tree.which": "which tree? there are several",
     "ui.error.tree.which.hint": "pass --tree <name>: {names}",
+    "ui.error.update.unknown": "the newest version of strom could not be learned",
+    "ui.error.update.unknown.hint": "check the network — or run the installer again",
     "ui.error.sync.which": "which tree? a file, or --app (straight from the Strom app)",
     "ui.error.sync.which.hint": "strom sync ~/Downloads/family.ged · strom sync --app · what waits: strom sync --inbox",
     "ui.live.runs": "the bridge runs: {url}",

package/dist/commands/setup.js

@@ -32,7 +32,7 @@ import { isInstalled } from "../agents/global.js";
 import { offerLinks, shortcutName } from "../cli/wizard.js";
 import { linkHandlerState, linkScheme } from "../core/links.js";
 import { globalTargets, installGlobal } from "../agents/global.js";
-import { placeholders, ui } from "../cli/ui.js";
+import { placeholders, ui, UI } from "../cli/ui.js";
 import { PERMISSION_LEVELS } from "../core/config.js";
 import { PROFILES } from "../agents/profiles.js";
 import { NeedsInputError, StromError, UsageError } from "../core/errors.js";
@@ -471,8 +471,9 @@ register({
         const to = said;
         const channel = to ?? updateChannel(ctx.env);
         const latest = await latestRelease(ctx.env, { channel, timeoutMs: 8000 });
+        // the person's words in their language (the → line too); a program reads the English and the code (--json)
         if (!latest)
-            throw new StromError(t("ui.update.unknown"), { hint: "check the network — or run the installer again" });
+            throw new StromError(UI["ui.error.update.unknown"], { hint: UI["ui.error.update.unknown.hint"], code: "update.unknown" });
         const newest = latest.version;
         ctx.settings.config.updateCheck = checked(newest, channel);
         ctx.settings.save();

package/dist/core/sync.js

@@ -376,6 +376,8 @@ function allNotes(n, noteText) {
 }
 /** Words of a text, folded; numbers too (house numbers, years). */
 const wordsOf = (t) => foldText(t).match(/[\p{L}\p{M}\p{N}]{2,}/gu) ?? [];
+/** The words of a text's labels — what stands before a colon on a line ("Birth:", "Address: "): the app's own in its shapes. */
+const labelWords = (t) => new Set(t.split("\n").flatMap((l) => l.split(":").slice(0, -1).flatMap(wordsOf)));
 /**
  * A note the research has said already, folded into another shape by the app ("Birth: Address: čp. 35 …" of a
  * fact's notes): hardly a word of it that the research has not.
@@ -383,8 +385,12 @@ const wordsOf = (t) => foldText(t).match(/[\p{L}\p{M}\p{N}]{2,}/gu) ?? [];
 function knownNote(text, said) {
     const w = new Set(wordsOf(text));
     const unknown = [...w].filter((x) => !said.has(x));
-    // a word or two of the app's own ("Birth:", "Address:") around what the research said — never a short note all new
-    return unknown.length <= w.size * 0.2 || (unknown.length < 3 && unknown.length * 2 <= w.size);
+    if (unknown.length <= w.size * 0.2)
+        return true;
+    // a word or two of the app's own labels ("Birth:", "Address:") in front of what the research said — never a short
+    // note all new, nor the user's word beside one the research has (B-2: "Kim z matriky", the name and a word)
+    const labels = labelWords(text);
+    return unknown.length < 3 && unknown.length * 2 <= w.size && unknown.every((x) => labels.has(x));
 }
 /** A line of a note as compared: NFC, its spaces one (the app joins what GEDCOM splits). */
 const noteLine = (t) => t.normalize("NFC").replace(/\s+/g, " ").trim();
@@ -2027,7 +2033,8 @@ export function planSync(tree, incoming, edits, opts = {}) {
      * app's 3.10.0-beta.13: "nothing new taken", the edit lost) is no line the research has said: the user's own note
      * (typed by the user, or the app's) corrected, a session's kept and the user's line beside it (sync.edits user, an
      * archive: corrected too); a line like one the note still has, a line of its own. A line as the app was given it
-     * (the base) is no edit: the research's since stays.
+     * (the base) is no edit: the research's since stays. The person's names (the partners') are no words the research
+     * said in a note: a short note naming them is the user's (B-2: "Kim test" not taken).
      */
     const notesDiff = (owner, inc, said, facts, mine) => {
         const words = new Set(wordsOf([...said, ...facts.map((f) => [f.place, f.value, f.label].join(" "))].join("\n")));
@@ -2153,7 +2160,7 @@ export function planSync(tree, incoming, edits, opts = {}) {
             const overGuess = mySex === "U" && guessed !== undefined && !incoming.sexU;
             push({ kind: "sex.changed", action: b ? (edits === "user" ? "user" : backed || since || overGuess ? "conflict" : "correct") : "report", person: id, name, text: p.sex });
         }
-        notesDiff({ person: id, name }, p.notes, [o.said, b?.said ?? "", ...o.names], o.facts, tree.get(id)?.notes);
+        notesDiff({ person: id, name }, p.notes, [o.said, b?.said ?? ""], o.facts, tree.get(id)?.notes);
     }
     if (base && !partial)
         for (const [key, b] of base.persons)
@@ -2336,7 +2343,7 @@ export function planSync(tree, incoming, edits, opts = {}) {
         const both = [...new Set([...o.partners, ...partners])];
         factsDiff({ family: fam.id, partners: both }, f.facts, o.facts, b?.facts, true);
         citesDiff({ family: fam.id, partners: both }, f.cites, fam, b?.cites);
-        notesDiff({ family: fam.id, partners: both }, f.notes, [o.said ?? "", b?.said ?? "", ...both.map((k) => ours.persons.get(k)?.names.join(" ") ?? "")], o.facts, fam.notes);
+        notesDiff({ family: fam.id, partners: both }, f.notes, [o.said ?? "", b?.said ?? ""], o.facts, fam.notes);
         // how the couple is bound (no record proves it): the user's word where it changed since given, or where the research
         // has none; another word with nothing to stand on only said; none in the file takes nothing away (an older app)
         // (the one partner's married or divorced is the couple's facts' to say once the unknown one is named)

package/dist/core/tree.js

@@ -27,7 +27,7 @@ import { lastBackup } from "./backup.js";
 export const TREE_FILE = "strom.json";
 // 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.13.0-beta.8";
+export const VERSION = "1.13.0";
 const GITIGNORE = `# Strom Research — local state and large files are not versioned
 .strom/
 /media/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strom-research",
-  "version": "1.13.0-beta.8",
+  "version": "1.13.0",
   "description": "Genealogical research toolkit for AI coding agents",
   "type": "module",
   "bin": {
@@ -45,8 +45,5 @@
   "devDependencies": {
     "@types/node": "^22.20.4",
     "typescript": "^7.0.2"
-  },
-  "publishConfig": {
-    "tag": "beta"
   }
 }