strom-research 1.22.0 → 1.22.2

package/CHANGELOG.cs.md

@@ -5,6 +5,30 @@
 Změny každé verze ve zkratce. Úplné poznámky a instalační řádky jsou na
 [GitHub Releases](https://github.com/ACiDekCZ/strom-research/releases) (anglicky).
 
+## 1.22.2
+
+*30. 10. 2026 · patří k aplikaci Strom 3.17.1.*
+
+- **Strom z desktopové aplikace agenta a z terminálu zase zapisují do jednoho výzkumu (Windows).** Desktopová aplikace
+  agenta může být pro Windows zabalená (MSIX) a každý soubor, který strom spuštěný z ní vytvořil v nastavení stromu, skončil
+  v soukromé kopii aplikace: strom z aplikace a strom z terminálu měly každý vlastní pečetní klíč a každý bral zápisy
+  druhého jako změnu mimo strom. Nastavení je teď mimo AppData (`%USERPROFILE%\.config\strom`) a samo se převezme ze
+  staré složky i z kopie aplikace (obě zůstanou, jak byly). Rozdvojený výzkum se opraví sám, kde to jde; jinak
+  klíče sjednotí `strom seal adopt` v terminálu (nabídka ho jednou nabídne) – každý záznam zkontrolovaný, nic se
+  neztratí, nikdy `strom repair`. `strom update` spuštěný z takové aplikace nic nenainstaluje (viděla by to jen ona)
+  a řekne, ať se spustí v terminálu; `strom doctor` najde kopii programu, kterou si aplikace drží pro sebe.
+- **`strom repair` po commitu přes git, který nezměnil žádný záznam** (prázdný, jen poznámky), výzkum znovu zapečetí;
+  dřív commit zůstal nezapečetěný, každý zápis byl odmítnut a nebylo co opravit.
+
+## 1.22.1
+
+*29. 10. 2026 · patří k aplikaci Strom 3.17.0.*
+
+- **Událost místa se u regionu nezapíše znovu.** Když se dějiny místa hledaly dřív než dějiny regionů, do kterých
+  patří, mohly dějiny regionu přidat tutéž událost ještě jednou (stejný druh, stejné roky). Region teď vynechá, co už
+  má některé z jeho míst; událost, která se týkala celého regionu, se zapíše dál. To, co agent k místu čte, říká
+  i to, které z jeho regionů se ještě neprošly.
+
 ## 1.22.0
 
 *29. 10. 2026 · patří k aplikaci Strom 3.17.0.*

package/CHANGELOG.de.md

@@ -5,6 +5,33 @@
 Die Änderungen jeder Version in Kürze. Die vollständigen Hinweise und die Installationszeilen stehen bei
 [GitHub Releases](https://github.com/ACiDekCZ/strom-research/releases) (auf Englisch).
 
+## 1.22.2
+
+*30.10.2026 · gehört zur Strom-App 3.17.1.*
+
+- **strom aus der Desktop-App eines Agenten und aus einem Terminal schreiben wieder in eine Forschung (Windows).** Die
+  Desktop-App eines Agenten kann für Windows verpackt sein (MSIX), und jede Datei, die ein von ihr gestartetes strom in den Einstellungen
+  von strom anlegte, landete in der privaten Kopie der App: das strom der App und das des Terminals hatten je einen
+  eigenen Siegelschlüssel, und jedes hielt die Schreibvorgänge des anderen für Änderungen außerhalb von strom. Die
+  Einstellungen liegen jetzt außerhalb von AppData (`%USERPROFILE%\.config\strom`) und werden aus dem alten Ordner
+  und aus der Kopie der App von selbst übernommen (beide bleiben, wie sie waren). Eine so geteilte Forschung heilt sich
+  selbst, wo es geht; sonst vereint `strom seal adopt` in einem Terminal die Schlüssel (das Menü bietet es einmal an) –
+  jeder Datensatz geprüft, nichts geht verloren, nie `strom repair`. Ein aus einer solchen App gestartetes
+  `strom update` installiert nichts (nur die App sähe es) und sagt, es im Terminal auszuführen; `strom doctor` findet
+  eine Kopie des Programms, die eine App für sich behält.
+- **`strom repair` nach einem mit git gemachten Commit, der keinen Datensatz änderte** (leer, nur Notizen), versiegelt
+  die Forschung wieder; vorher blieb der Commit unversiegelt, jeder Schreibvorgang wurde abgelehnt, und es gab nichts zu reparieren.
+
+## 1.22.1
+
+*29.10.2026 · gehört zur Strom-App 3.17.0.*
+
+- **Ein Ereignis eines Ortes wird bei seiner Region nicht noch einmal geschrieben.** Wurde die Geschichte eines Ortes
+  vor den Regionen gesucht, zu denen er gehört, konnte die Geschichte der Region dasselbe Ereignis noch einmal
+  hinzufügen (dieselbe Art, dieselben Jahre). Die Region lässt jetzt aus, was einer ihrer Orte schon hat; ein
+  Ereignis, das die ganze Region betraf, wird weiter geschrieben. Was der Agent zu einem Ort liest, sagt auch, welche
+  seiner Regionen noch nicht durchgesehen sind.
+
 ## 1.22.0
 
 *29.10.2026 · gehört zur Strom-App 3.17.0.*

package/CHANGELOG.md

@@ -5,6 +5,30 @@ English · [Čeština](CHANGELOG.cs.md) · [Deutsch](CHANGELOG.de.md)
 The changes of each version in short. The full notes and the install lines are on
 [GitHub Releases](https://github.com/ACiDekCZ/strom-research/releases).
 
+## 1.22.2
+
+*2026-10-30 · goes with the Strom app 3.17.1.*
+
+- **Strom from an agent's desktop app and from a terminal write to one research again (Windows).** An agent's
+  desktop app can be packaged for Windows (MSIX), and every file a strom it started made in strom's settings went to
+  the app's private copy: the app's strom and the terminal's each had a seal key of their own, and each refused the other's writes as
+  made outside strom. The settings are now outside AppData (`%USERPROFILE%\.config\strom`), taken over from the old
+  folder and from the app's copy by themselves (both left as they were). A research split so heals itself where it can;
+  else `strom seal adopt` in a terminal unites the keys (the menu offers it once) — every record checked, nothing lost,
+  never `strom repair`. `strom update` started from such an app installs nothing (only the app would see it) and says
+  to run it in a terminal; `strom doctor` finds a copy of the program an app keeps for itself.
+- **`strom repair` after a commit made with git that changed no record** (an empty one, notes only) seals the research
+  again; before, the commit stayed unsealed, every write was refused and there was nothing to repair.
+
+## 1.22.1
+
+*2026-10-29 · goes with the Strom app 3.17.0.*
+
+- **An event of a place is not written again for its region.** When the history of a place was looked for before the
+  regions it lies in, the region's history could add the same event once more (the same kind, the same years). The
+  region now leaves out what one of its places has already; an event that touched the whole region is still written.
+  What the agent reads for a place also says which of its regions are not looked through yet.
+
 ## 1.22.0
 
 *2026-10-29 · goes with the Strom app 3.17.0.*

package/assets/lang/cs.json

@@ -569,6 +569,8 @@
   "ui.tree.created": "✓ Rodokmen „{name}“ je založený: {dir}",
   "ui.chat.trust": "Claude Code se poprvé zeptá, jestli této složce důvěřovat. Je to složka rodokmenu, kterou vytvořil strom – stačí potvrdit „Yes, proceed“.",
   "ui.doc.program": "program",
+  "ui.doc.packaged": "kopie programu",
+  "ui.doc.packaged.copy": "aplikace zabalená pro Windows má vlastní kopii programu: {folders} – ta aplikace spouští jiný strom než terminál",
   "ui.doc.git": "git (historie)",
   "ui.doc.home": "složka výzkumu",
   "ui.doc.gitdir": "git ve složce výzkumů",
@@ -636,6 +638,7 @@
   "ui.doc.appurl.env.fix": "proměnnou STROM_APP_URL nastavit na adresu aplikace Strom ({web}, nebo její kopie na tomto počítači http://127.0.0.1:<port>/), nebo odebrat",
   "ui.doc.tree.ok": "{name}: data v pořádku a zapečetěná",
   "ui.doc.tree.bad": "{name}: {n, plural, one {# problém} few {# problémy} other {# problémů}}",
+  "ui.doc.tree.twokeys": "{name}: zapečetěno dvěma klíči stromu na tomto počítači (strom z aplikace a z terminálu) – zápisy obou jsou stromu",
   "ui.doc.write": "zápis do rodokmenu",
   "ui.doc.write.ok": "do jeho .strom i .git lze zapisovat",
   "ui.doc.write.sandbox": "{where}: zápis odepřen – strom běží pod agentem, nejspíš to zakazuje jeho sandbox",
@@ -672,6 +675,8 @@
   "ui.fix.git.inwindow": "Dokončit instalaci v okně systému a pak znovu spustit strom doctor.",
   "ui.fix.failed": "Nepovedlo se: {detail}",
   "ui.fix.app": "Otevřít aplikaci Strom v prohlížeči a nainstalovat ji?",
+  "ui.fix.packaged": "Přesunout kopii programu, kterou si aplikace drží pro sebe, do koše (aplikace pak spouští strom z terminálu)?",
+  "ui.fix.packaged.done": "V koši: {folder}",
   "ui.fix.nothing": "Nic, co by strom opravil sám – viz šipky.",
   "ui.why.git.human": "chybí git – strom v něm uchovává historii výzkumu",
   "ui.why.git.agent": "chybí git (strom v něm uchovává historii výzkumu): řekni to uživateli a spusť tohle – uživatel to potvrdí v okně systému",
@@ -2565,6 +2570,8 @@
   "ui.error.folder.in-program.default.hint": "Zadat složku mimo ni: strom setup --home \"{suggested}\" --yes",
   "ui.error.update.in-program": "{folder} leží uvnitř {entry}, kterou aktualizace nahrazuje – výzkum by šel s ní. Nic se nenainstalovalo.",
   "ui.error.update.in-program.hint": "Nejdřív přesunout výzkum ze složky programu strom: strom setup ve vlastním terminálu (otázka na složku ho přesune i s výzkumem), pak znovu strom update",
+  "ui.error.update.packaged": "Tento strom spustila aplikace zabalená pro Windows (MSIX): co by aktualizace nainstalovala do {folder}, uvidí jen ta aplikace, terminál by zůstal na {current}. Nic se nenainstalovalo.",
+  "ui.error.update.packaged.hint": "strom update ve vlastním terminálu (PowerShell); aplikace novou verzi převezme odtud",
   "ui.error.tree.newer": "Tento rodokmen zapsal strom {by}, novější než tento strom {version}. Tento strom ho nechává beze změny.",
   "ui.error.tree.newer.hint": "Aktualizovat strom: strom update",
   "ui.error.tree.newer.backup": "Tento rodokmen zapsal strom {by}, novější než tento strom {version}. Tento strom ho nechává beze změny.",
@@ -3087,9 +3094,16 @@
   "ui.seal.ask": "Převzít „{name}“ na tomto počítači? Záznamy jsou zkontrolované a beze změn.",
   "ui.seal.adopted": "„{name}“ je teď zapečetěný na tomto počítači – zapisovat jde tady",
   "ui.seal.already": "„{name}“ je na tomto počítači zapečetěný už",
+  "ui.seal.unite.ask": "„{name}“ je na tomto počítači zapečetěný dvěma klíči stromu (strom z aplikace a z terminálu, každý s vlastním nastavením). Sjednotit je? Záznamy jsou zkontrolované: nic se nezměnilo mimo strom, nic se neztratí.",
+  "ui.seal.united": "„{name}“ je teď na tomto počítači zapečetěný jedním klíčem – zapisovat jde z aplikace i z terminálu",
+  "ui.error.seal.other-key": "výzkum „{name}“ je na tomto počítači zapečetěný dvěma klíči stromu (strom z aplikace a z terminálu, každý s vlastním nastavením): nic se nezapsalo",
+  "ui.error.seal.other-key.hint": "sjednotit ve vlastním terminálu: {set} – nikdy strom repair, ten by tu práci vrátil zpět",
+  "ui.check.otherkey": "zapečetěno dvěma klíči stromu na tomto počítači (strom z aplikace a z terminálu): zápisy obou jsou stromu",
+  "ui.check.otherkey.hint": "sjednotit ve vlastním terminálu: strom seal adopt – nikdy strom repair",
   "ui.seal.problems": "nepřevzato: záznamy nesedí se svou pečetí – co, řekne strom check",
   "ui.menu.seal": "Zapečetěno na jiném počítači: zapisovat tu jde až po převzetí (strom seal adopt).",
   "ui.seal.bridge": "výzkum „{name}“ je zapečetěný na jiném počítači: nic se nezapsalo – po převzetí na tomto počítači (terminál: strom seal adopt, nebo nabídka strom) poslat znovu",
+  "ui.seal.bridge.twokeys": "výzkum „{name}“ je na tomto počítači zapečetěný dvěma klíči stromu (strom z aplikace a z terminálu): nic se nezapsalo – po sjednocení (terminál: strom seal adopt, nebo nabídka strom) poslat znovu",
   "ui.check.foreignseal": "zapečetěno na jiném počítači (nebo tu chybí nastavení stromu): číst jde, zapisovat až po převzetí tady",
   "ui.check.foreignseal.hint": "převzít ve vlastním terminálu: strom seal adopt – nebo v nabídce (strom)",
   "ui.why.seal.human": "výzkum je zapečetěný na jiném počítači: zapisovat tu jde až po převzetí (potvrzuje se v tomto terminálu)",

package/assets/lang/de.json

@@ -569,6 +569,8 @@
   "ui.tree.created": "✓ Der Stammbaum „{name}“ ist angelegt: {dir}",
   "ui.chat.trust": "Beim ersten Mal fragt Claude Code, ob diesem Ordner vertraut wird. Es ist der Ordner des Stammbaums, von strom angelegt – mit „Yes, proceed“ bestätigen.",
   "ui.doc.program": "Programm",
+  "ui.doc.packaged": "Kopie des Programms",
+  "ui.doc.packaged.copy": "eine für Windows verpackte App hat eine eigene Kopie des Programms: {folders} – diese App startet ein anderes strom als das Terminal",
   "ui.doc.git": "Git (Verlauf)",
   "ui.doc.home": "Forschungsordner",
   "ui.doc.gitdir": "git im Forschungsordner",
@@ -636,6 +638,7 @@
   "ui.doc.appurl.env.fix": "die Variable STROM_APP_URL auf eine Adresse der Strom-App setzen ({web}, oder eine Kopie auf diesem Computer http://127.0.0.1:<port>/) oder entfernen",
   "ui.doc.tree.ok": "{name}: Daten in Ordnung und versiegelt",
   "ui.doc.tree.bad": "{name}: {n, plural, one {# Problem} other {# Probleme}}",
+  "ui.doc.tree.twokeys": "{name}: mit zwei Schlüsseln von strom auf diesem Computer versiegelt (strom einer App und eines Terminals) – die Schreibvorgänge beider sind von strom",
   "ui.doc.write": "Schreiben in diesen Stammbaum",
   "ui.doc.write.ok": "in sein .strom und .git kann geschrieben werden",
   "ui.doc.write.sandbox": "{where}: Schreiben verweigert – strom läuft unter einem Agenten, wahrscheinlich verbietet es dessen Sandbox",
@@ -672,6 +675,8 @@
   "ui.fix.git.inwindow": "Die Installation im Fenster des Systems abschließen, dann strom doctor erneut starten.",
   "ui.fix.failed": "Das hat nicht geklappt: {detail}",
   "ui.fix.app": "Die Strom-App im Browser öffnen, um sie zu installieren?",
+  "ui.fix.packaged": "Die Kopie des Programms, die eine App für sich behält, in den Papierkorb legen (die App startet dann das strom des Terminals)?",
+  "ui.fix.packaged.done": "Im Papierkorb: {folder}",
   "ui.fix.nothing": "Nichts, was strom selbst beheben kann – siehe die Pfeile.",
   "ui.why.git.human": "Git fehlt – strom bewahrt darin den Verlauf der Forschung auf",
   "ui.why.git.agent": "Git fehlt (strom bewahrt darin den Verlauf auf): sag es dem Benutzer und führe dies aus – der Benutzer bestätigt in einem Fenster des Systems",
@@ -2565,6 +2570,8 @@
   "ui.error.folder.in-program.default.hint": "Einen Ordner außerhalb angeben: strom setup --home \"{suggested}\" --yes",
   "ui.error.update.in-program": "{folder} liegt in {entry}, das das Update ersetzt – die Forschung ginge mit. Nichts wurde installiert.",
   "ui.error.update.in-program.hint": "Zuerst die Forschung aus dem Programmordner von strom verschieben: strom setup in einem eigenen Terminal (die Frage nach dem Ordner verschiebt sie mit), dann erneut strom update",
+  "ui.error.update.packaged": "Dieses strom wurde von einer für Windows verpackten App (MSIX) gestartet: was das Update in {folder} installierte, sähe nur diese App, das Terminal bliebe bei {current}. Nichts wurde installiert.",
+  "ui.error.update.packaged.hint": "strom update in einem eigenen Terminal (PowerShell); die App übernimmt die neue Version von dort",
   "ui.error.tree.newer": "Diesen Stammbaum hat strom {by} geschrieben, neuer als dieses strom {version}. Dieses strom lässt ihn unverändert.",
   "ui.error.tree.newer.hint": "strom aktualisieren: strom update",
   "ui.error.tree.newer.backup": "Diesen Stammbaum hat strom {by} geschrieben, neuer als dieses strom {version}. Dieses strom lässt ihn unverändert.",
@@ -3087,9 +3094,16 @@
   "ui.seal.ask": "„{name}“ auf diesem Computer übernehmen? Die Einträge sind geprüft und unverändert.",
   "ui.seal.adopted": "„{name}“ ist jetzt auf diesem Computer versiegelt – schreiben geht hier",
   "ui.seal.already": "„{name}“ ist auf diesem Computer schon versiegelt",
+  "ui.seal.unite.ask": "„{name}“ ist auf diesem Computer mit zwei Schlüsseln von strom versiegelt (strom aus einer App und aus einem Terminal, jedes mit eigenen Einstellungen). Vereinen? Alle Einträge sind geprüft: nichts außerhalb von strom geändert, nichts geht verloren.",
+  "ui.seal.united": "„{name}“ ist jetzt auf diesem Computer mit einem Schlüssel versiegelt – schreiben geht aus der App wie aus dem Terminal",
+  "ui.error.seal.other-key": "die Forschung „{name}“ ist auf diesem Computer mit zwei Schlüsseln von strom versiegelt (strom aus einer App und aus einem Terminal, jedes mit eigenen Einstellungen): nichts wurde geschrieben",
+  "ui.error.seal.other-key.hint": "vereinen in einem eigenen Terminal: {set} – nie strom repair, das würde diese Arbeit rückgängig machen",
+  "ui.check.otherkey": "mit zwei Schlüsseln von strom auf diesem Computer versiegelt (strom aus einer App und aus einem Terminal): was beide schrieben, ist von strom",
+  "ui.check.otherkey.hint": "vereinen in einem eigenen Terminal: strom seal adopt – nie strom repair",
   "ui.seal.problems": "nicht übernommen: was im Stammbaum steht, ist nicht so versiegelt, wie strom es schrieb – was, sagt strom check",
   "ui.menu.seal": "Auf einem anderen Computer versiegelt: schreiben hier erst nach der Übernahme (strom seal adopt).",
   "ui.seal.bridge": "die Forschung „{name}“ ist auf einem anderen Computer versiegelt: nichts wurde geschrieben – nach der Übernahme auf diesem Computer (Terminal: strom seal adopt, oder das Menü von strom) erneut senden",
+  "ui.seal.bridge.twokeys": "die Forschung „{name}“ ist auf diesem Computer mit zwei Schlüsseln von strom versiegelt (strom einer App und eines Terminals): nichts wurde geschrieben – nach dem Vereinen (Terminal: strom seal adopt, oder das Menü von strom) erneut senden",
   "ui.check.foreignseal": "auf einem anderen Computer versiegelt (oder die Einstellungen von strom fehlen hier): lesen geht, schreiben erst nach der Übernahme hier",
   "ui.check.foreignseal.hint": "übernehmen in einem eigenen Terminal: strom seal adopt – oder im Menü (strom)",
   "ui.why.seal.human": "die Forschung ist auf einem anderen Computer versiegelt: schreiben hier erst nach der Übernahme (bestätigt in diesem Terminal)",

package/dist/agents/files.js

@@ -14,6 +14,7 @@ import { isArchive } from "../core/mode.js";
 import { Settings } from "../core/config.js";
 import { agentAppUrl, appSite } from "../core/stromapp.js";
 import { configDir, ownCommand } from "../core/paths.js";
+import { oldSettingsDirs, packagedSettingsPattern } from "../core/oldsettings.js";
 import { within } from "../core/relocate.js";
 import { agentBrowser } from "../core/connector.js";
 import { CHROME_ALLOW, CHROME_DENY, chromeDomain } from "../core/browser.js";
@@ -212,6 +213,15 @@ export function settingsKeptFrom(dir, research, platform = process.platform) {
         return { path: p, folder };
     });
 }
+/**
+ * What of strom's settings is kept from the agents: of today's folder, of each it was kept in before (oldsettings.ts),
+ * and every packaged app's copy whole, one made after these rules too.
+ */
+function keptSettings(tree, settings) {
+    const research = researchFolders(tree, settings);
+    const packaged = packagedSettingsPattern(tree.env);
+    return [...[configDir(tree.env), ...oldSettingsDirs(tree.env)].flatMap((d) => settingsKeptFrom(d, research)), ...(packaged ? [{ path: packaged, folder: true }] : [])];
+}
 /** The folders of the research the agent works in: its home, the shared folder, the tree. */
 function researchFolders(tree, settings) {
     return [settings.home()?.value, settings.shared()?.value, tree.root].filter((p) => !!p);
@@ -227,7 +237,7 @@ function treeRules(tree, agent) {
     const shared = settings.shared()?.value;
     const claude = agent === "claude";
     const at = (abs) => (claude ? permissionPath(abs) : abs.replace(/\\/g, "/"));
-    const kept = settingsKeptFrom(configDir(tree.env), researchFolders(tree, settings)).map((k) => (k.folder ? `${at(k.path)}/**` : at(k.path)));
+    const kept = keptSettings(tree, settings).map((k) => (k.folder ? `${at(k.path)}/**` : at(k.path)));
     // Browser tools (Claude in Chrome): for the sites of the connectors fetching through the browser — or, agent.browser
     // always, of every archive of the research (anything else is asked in a conversation, not used in a run).
     const web = claude ? agentBrowser(tree, shared) : { on: false, hosts: [] };
@@ -402,7 +412,7 @@ export function opencodeConfig(tree) {
                 }
                 : {}),
             // the seal keys and the person's settings, and what the browser downloads (strom's to take over)
-            ...Object.fromEntries(settingsKeptFrom(configDir(tree.env), researchFolders(tree, settings)).map((k) => [k.folder ? `${abs(k.path)}/*` : abs(k.path), "deny"])),
+            ...Object.fromEntries(keptSettings(tree, settings).map((k) => [k.folder ? `${abs(k.path)}/*` : abs(k.path), "deny"])),
             [`${abs(settings.downloads())}/*`]: "deny",
         },
         webfetch: "allow",

package/dist/brief/history.js

@@ -200,6 +200,9 @@ function placeSections(tree, id, shared, alone) {
     const events = c?.events ?? [];
     const live = events.filter((e) => !e.retracted);
     const theirs = regionEventsAt(tree, shared, p.id, at);
+    // its regions not looked through yet (K7.1a): what touched the whole region is theirs, written when they are
+    const maps = readPlaces(tree);
+    const waiting = [...new Set((at?.keys ?? []).flatMap((k) => maps[k]?.regions ?? []).map((g) => g.id))].filter((g) => !shared || !readCatalog(shared, g)?.done);
     const out = [];
     out.push({
         name: "history",
@@ -237,6 +240,9 @@ function placeSections(tree, id, shared, alone) {
                 : ["  none yet"]),
             theirs.length ? `The regions' events at this place in its years (${theirs.length}) — the Strom app shows them here already, never written for the place (refused):` : "No region's event at this place yet.",
             ...theirs.slice(0, EVENTS_SHOWN).map(({ event: e, region }) => `  ${e.id} ${years(e.from, e.to)} ${e.kind} (${region.region.id}) "${short(e.text[lang] ?? e.text.en ?? Object.values(e.text)[0] ?? "")}"`),
+            waiting.length
+                ? `Regions of this place not looked through yet (${waiting.join(", ")}): what touched the whole region (a war of the land, its epidemic, a reform of the state) is theirs, written when they are — here only what happened at the place or near enough to touch its people`
+                : "",
             c?.tried.length ? `Pages strom could not read (never tried again): ${c.tried.slice(-20).map((t) => `${t.url} (${short(t.why, 40)})`).join(" · ")}` : "",
         ].filter(Boolean).join("\n"),
     });

package/dist/cli/main.js

@@ -13,6 +13,7 @@ import { commands, match } from "./registry.js";
 import { asCommand, asCommandJson, shellArg } from "./format.js";
 import { groupHelpAs, helpAs } from "./help.js";
 import { autoCommit } from "./commit.js";
+import { takeOverOldSettings } from "../core/oldsettings.js";
 import { assertIntact } from "../core/integrity.js";
 import { head as gitHead, resetCache } from "../core/git.js";
 import { newerTree, Tree, VERSION } from "../core/tree.js";
@@ -226,6 +227,14 @@ async function mainOf(argv, io, env, cwd) {
     resetCache(undefined, "command");
     // the app's install line in its one variable (STROM_FROM): read as the five of an older line
     expandFromLine(env);
+    // strom's settings on Windows before (%APPDATA%\strom and a packaged app's copy of it) taken over, before anything
+    // reads them (core/oldsettings.ts)
+    try {
+        takeOverOldSettings(env);
+    }
+    catch {
+        // taken over next time; the old ones are read meanwhile
+    }
     // what ran and how long, for the reminder of the session's time
     const startedAt = Date.now();
     let ran;

package/dist/cli/menu.js

@@ -10,7 +10,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { ui } from "./ui.js";
 import { isAgent } from "../core/which.js";
-import { offerAdopt } from "./seal.js";
+import { offerAdopt, offerUnite } from "./seal.js";
 import { mb, setTidyAsked, tidyAskAgain, tidyAsked, tidyOn, tidyPlan, TIDY_SAID } from "../core/tidy.js";
 import { calibrationLabel, calibrationOffer } from "../core/viewsizes.js";
 /** A line as a sentence: its first letter capital (a catalog's text that also stands inside a line). */
@@ -231,6 +231,12 @@ export async function runMenu(ctx, run) {
                     out();
                 }
             }
+            else if (offerUnite(ctx, tree, !isAgent(ctx.env))) {
+                // sealed here with two keys of this computer (strom of an app packaged for Windows and of a terminal): united on
+                // the person's yes, offered once (as strom seal adopt: every operation and record checked)
+                await run(["seal", "adopt", "--tree", root]);
+                out();
+            }
             // what of it the Strom app does not show (only here in the terminal) said, so its number and the app's agree
             if (waiting)
                 out(waitingLine(lang, waits));

package/dist/cli/seal.js

@@ -2,7 +2,7 @@
 // every record checked against its seal, the person's yes, then this computer's key. Never by itself, never by an agent.
 import { ui } from "./ui.js";
 import { verifyFull } from "../core/integrity.js";
-import { createKey } from "../core/seal.js";
+import { createKey, fingerprint, otherKeys } from "../core/seal.js";
 import { sealedHere } from "../core/tree.js";
 /**
  * The tree taken over here: refused while a record does not match its seal (what, strom check says), else asked — the
@@ -10,7 +10,7 @@ import { sealedHere } from "../core/tree.js";
  */
 export async function adoptSeal(ctx, tree, lang) {
     if (tree.key)
-        return { adopted: false, why: "already" };
+        return uniteSeal(ctx, tree, lang);
     const problems = verifyFull(tree).findings.filter((f) => f.level === "error");
     if (problems.length)
         return { adopted: false, why: "problems", problems };
@@ -33,6 +33,16 @@ export function offerAdopt(ctx, root, person) {
     asked.add(root);
     return true;
 }
+/**
+ * Whether to offer uniting this tree's keys now (strom update brought a strom that sees both): sealed here, another key
+ * of this computer that the check needs, a person at a terminal, not asked yet in this process.
+ */
+export function offerUnite(ctx, tree, person) {
+    if (!person || !ctx.interactive || asked.has(tree.root) || !tree.key || !otherKeys(tree.env, tree.config.id, tree.key).length)
+        return false;
+    asked.add(tree.root);
+    return keysToUnite(tree).length > 0;
+}
 /**
  * The family trees the setup found in the research's folder (strom brought back, a folder from another computer): each
  * said, and of one sealed on another computer how it is taken over — the setup then never ends with "strom init".
@@ -48,3 +58,36 @@ export function foundTrees(ctx, lang) {
     ];
     return { lines, foreign: foreign.map(({ name, root }) => ({ name, root })) };
 }
+/**
+ * The other keys of this computer a tree sealed here needs united (strom of an app packaged for Windows and of a
+ * terminal each had their own: core/oldsettings.ts): none when the check finds nothing wrong, or none of them.
+ */
+export function keysToUnite(tree) {
+    if (!tree.key)
+        return [];
+    if (!verifyFull(tree).findings.some((f) => f.level === "error"))
+        return [];
+    return otherKeys(tree.env, tree.config.id, tree.key).map((o) => o.key);
+}
+/**
+ * A tree sealed here with another key of this computer too: every operation of the other keys checked with them and
+ * every record against its seal — refused while anything does not match (a record changed outside strom stays refused),
+ * else the person's yes, then the operation seal.unite of this key (the other keys' operations until now taken) and its
+ * commit sealed with it.
+ */
+async function uniteSeal(ctx, tree, lang) {
+    const others = keysToUnite(tree);
+    if (!others.length)
+        return { adopted: false, why: "already" };
+    const problems = verifyFull(tree, { trust: others }).findings.filter((f) => f.level === "error");
+    if (problems.length)
+        return { adopted: false, why: "problems", problems };
+    if (!(await ctx.confirm(ui(lang, "ui.seal.unite.ask", { name: tree.config.name }), true)))
+        return { adopted: false, why: "cancelled" };
+    const united = others.map(fingerprint);
+    tree.withTreeLock(() => {
+        tree.appendOp({ op: "seal.unite", targets: [], files: [], summary: "Seal keys of this computer united", keys: united });
+        tree.commit("Seal: keys of this computer united");
+    });
+    return { adopted: true, united };
+}

package/dist/cli/ui.js

@@ -540,6 +540,8 @@ export const UI = {
     "ui.tree.created": "✓ The family tree \"{name}\" is ready: {dir}",
     "ui.chat.trust": "The first time, Claude Code asks whether this folder is trusted. It is the family tree's folder, made by strom — confirm with \"Yes, proceed\".",
     "ui.doc.program": "program",
+    "ui.doc.packaged": "copy of the program",
+    "ui.doc.packaged.copy": "an app packaged for Windows keeps a copy of the program of its own: {folders} — that app runs another strom than the terminal",
     "ui.doc.git": "git (history)",
     "ui.doc.home": "research folder",
     "ui.doc.gitdir": "git in the research folder",
@@ -607,6 +609,7 @@ export const UI = {
     "ui.doc.appurl.env.fix": "the variable STROM_APP_URL set to an address of the Strom app ({web}, or a copy on this computer http://127.0.0.1:<port>/), or removed",
     "ui.doc.tree.ok": "{name}: data consistent and sealed",
     "ui.doc.tree.bad": "{name}: {n, plural, one {# problem} other {# problems}}",
+    "ui.doc.tree.twokeys": "{name}: sealed with two keys of strom on this computer (strom of an app and of a terminal) — writes of both are strom's",
     "ui.doc.write": "writing into this family tree",
     "ui.doc.write.ok": "its .strom and .git can be written",
     "ui.doc.write.sandbox": "{where}: writing refused — strom runs under an agent, most likely its sandbox forbids it",
@@ -643,6 +646,8 @@ export const UI = {
     "ui.fix.git.inwindow": "Finish the installation in the window of the system, then run strom doctor again.",
     "ui.fix.failed": "It did not work: {detail}",
     "ui.fix.app": "Open the Strom app in the browser, to install it?",
+    "ui.fix.packaged": "Put the copy of the program an app keeps for itself into the trash (the app then runs the strom of the terminal)?",
+    "ui.fix.packaged.done": "Into the trash: {folder}",
     "ui.fix.nothing": "Nothing strom can fix by itself — see the arrows.",
     "ui.why.git.human": "git is missing — strom keeps the history of the research in it",
     "ui.why.git.agent": "git is missing (strom keeps the research history in it): tell the user, then run this — the user says yes in a window of the system",
@@ -2420,6 +2425,8 @@ export const UI = {
     "ui.error.folder.in-program.default.hint": "Name a folder outside it: strom setup --home \"{suggested}\" --yes",
     "ui.error.update.in-program": "{folder} lies inside {entry}, which the update replaces — the research would go with it. Nothing was installed.",
     "ui.error.update.in-program.hint": "First move the research out of strom's program folder: strom setup in a terminal of its own (the question about the folder moves it along), then strom update again",
+    "ui.error.update.packaged": "This strom was started by an app packaged for Windows (MSIX): what the update installed into {folder} only that app would see, the terminal would stay at {current}. Nothing was installed.",
+    "ui.error.update.packaged.hint": "strom update in a terminal of its own (PowerShell); the app takes the new version from there",
     "ui.error.tree.newer": "This family tree was written by strom {by}, newer than this strom {version}. This strom keeps it untouched.",
     "ui.error.tree.newer.hint": "Update strom: strom update",
     "ui.error.tree.newer.backup": "This family tree was written by strom {by}, newer than this strom {version}. This strom keeps it untouched.",
@@ -2781,9 +2788,16 @@ export const UI = {
     "ui.seal.ask": "Take over \"{name}\" on this computer? Its records were checked: unchanged.",
     "ui.seal.adopted": "\"{name}\" is sealed on this computer now — writing works here",
     "ui.seal.already": "\"{name}\" is sealed on this computer already",
+    "ui.seal.unite.ask": "\"{name}\" was sealed with two keys of strom on this computer (strom of an app and of a terminal, each with settings of its own). Unite them? Every record was checked: nothing changed outside strom, nothing is lost.",
+    "ui.seal.united": "\"{name}\" is sealed with one key on this computer now — writing works from the app and the terminal alike",
+    "ui.error.seal.other-key": "\"{name}\" was sealed with two keys of strom on this computer (strom of an app and of a terminal, each with settings of its own): nothing written",
+    "ui.error.seal.other-key.hint": "united in a terminal of its own: {set} — never strom repair, which would undo that work",
+    "ui.check.otherkey": "sealed with two keys of strom on this computer (strom of an app and of a terminal): the writes of both are strom's own",
+    "ui.check.otherkey.hint": "united in a terminal of its own: strom seal adopt — never strom repair",
     "ui.seal.problems": "not taken over: records do not match their seals — what, strom check says",
     "ui.menu.seal": "Sealed on another computer: writing here only once taken over (strom seal adopt).",
     "ui.seal.bridge": "\"{name}\" was sealed on another computer: nothing was written — once it is taken over on this one (a terminal: strom seal adopt, or strom's menu), send again",
+    "ui.seal.bridge.twokeys": "\"{name}\" was sealed with two keys of strom on this computer (strom of an app and of a terminal): nothing was written — once they are united (a terminal: strom seal adopt, or strom's menu), send again",
     "ui.check.foreignseal": "sealed on another computer (or strom's settings are not on this one): it can be read, written only once taken over here",
     "ui.check.foreignseal.hint": "taken over in a terminal of its own: strom seal adopt — or in strom's menu (strom)",
     "ui.why.seal.human": "the research was sealed on another computer: writing here only once taken over (confirmed in this terminal)",

package/dist/commands/checks.js

@@ -8,9 +8,9 @@ import { counted, lines, table } from "../cli/format.js";
 import { check, SHARED_MISSING, sharedMissing } from "../core/check.js";
 import { guard } from "../core/guard.js";
 import { unprovenPeople } from "../core/review.js";
-import { NOT_DOWNLOADED, SEALED_PATHS, notDownloaded, notDownloadedError, verifyFast, verifyFull } from "../core/integrity.js";
+import { NOT_DOWNLOADED, OTHER_KEY, SEALED_PATHS, notDownloaded, notDownloadedError, otherKeyError, verifyFast, verifyFull } from "../core/integrity.js";
 import { verifyCommitSeal } from "../core/seal.js";
-import { adoptSeal } from "../cli/seal.js";
+import { adoptSeal, keysToUnite } from "../cli/seal.js";
 import { NeedsConsentError, StromError } from "../core/errors.js";
 import * as git from "../core/git.js";
 import { ui } from "../cli/ui.js";
@@ -29,6 +29,8 @@ function said(f, lang) {
         return ui(lang, "ui.check.unwritable");
     if (lang && f.code === "foreign-seal")
         return ui(lang, "ui.check.foreignseal");
+    if (lang && f.code === OTHER_KEY)
+        return ui(lang, "ui.check.otherkey");
     if (lang && f.code === NOT_DOWNLOADED)
         return ui(lang, "ui.check.notdownloaded", { n: f.count ?? 1, first: f.file ?? "" });
     if (lang && f.code === SHARED_MISSING)
@@ -45,6 +47,8 @@ function said(f, lang) {
 function hintSaid(f, lang) {
     if (lang && f.code === "foreign-seal")
         return ui(lang, "ui.check.foreignseal.hint");
+    if (lang && f.code === OTHER_KEY)
+        return ui(lang, "ui.check.otherkey.hint");
     if (lang && f.code === NOT_DOWNLOADED)
         return ui(lang, "ui.check.notdownloaded.hint");
     if (lang && f.code === SHARED_MISSING)
@@ -185,8 +189,10 @@ function repair(tree) {
             restored.push(rel);
         }
     }
+    // sealed again even when the commits outside strom changed nothing of it (an empty one, notes only): else the last
+    // commit stays unsealed and every write refused, with nothing left to repair
     if (!headSealed)
-        tree.commit(`Repair: restore the sealed state of ${sealed.slice(0, 8)}\n\nCommits made outside strom were undone for data/, strom.json, history/ and quality/.`, SEALED_PATHS);
+        tree.commit(`Repair: restore the sealed state of ${sealed.slice(0, 8)}\n\nCommits made outside strom were undone for data/, strom.json, history/ and quality/.`, SEALED_PATHS, true);
     return { restored, quarantined, from: sealed };
 }
 register({
@@ -210,22 +216,29 @@ register({
     summary: "Take over a tree sealed on another computer (the user runs this in a terminal)",
     group: "history",
     tree: true,
-    description: "Checks the chain and every record hash, then creates this computer's seal key for the tree.\nAgents must not run this — it needs the user's confirmation.",
+    description: "Checks the chain and every record hash, then creates this computer's seal key for the tree.\n" +
+        "A tree sealed here with a second key of this computer too (a copy of strom's settings an app packaged for Windows\n" +
+        "made): checks every operation of that key with it, then unites the keys — never strom repair, which would undo that work.\n" +
+        "Agents must not run this — it needs the user's confirmation.",
     person: "Taking over this tree on this computer (the seal) is the user's own, in their terminal",
     run: async (ctx) => {
         const tree = ctx.tree();
         // a person reads it in the research's language (the menu, a link's terminal, the setup go the same way)
         const lang = tree.lang;
         const name = tree.config.name;
-        if (tree.key)
+        // sealed here: another key of this computer to unite (strom of a packaged app and of a terminal), else nothing to do
+        const unite = tree.key ? keysToUnite(tree).length > 0 : false;
+        if (tree.key && !unite)
             return { text: ui(lang, "ui.seal.already", { name }), data: { adopted: false } };
+        if (!ctx.interactive && unite)
+            throw otherKeyError(name);
         if (!ctx.interactive)
             throw new NeedsConsentError([
                 { key: "seal", kind: "consent", question: "Take over this tree on this computer?", set: "strom seal adopt" },
             ]);
         const r = await adoptSeal(ctx, tree, lang);
         if (r.adopted)
-            return { text: ui(lang, "ui.seal.adopted", { name }), data: { adopted: true } };
+            return r.united ? { text: ui(lang, "ui.seal.united", { name }), data: { adopted: true, united: r.united } } : { text: ui(lang, "ui.seal.adopted", { name }), data: { adopted: true } };
         if (r.why === "problems") {
             const found = report(r.problems, "", lang, true);
             return { ...found, text: lines(found.text, ui(lang, "ui.seal.problems")), data: { ...found.data, adopted: false } };

package/dist/commands/history.js

@@ -15,7 +15,7 @@ import { resolvePerson } from "../core/people.js";
 import { checkQuotes, cleanText, findPassages, mainQuote, pageParts, PageError, quotesShape, readPage, PART_CHARS } from "../core/pagecheck.js";
 import { currentSession } from "../core/session.js";
 import { addLocalEvent, addRegionEvent, askFirst, assignPlace, checkKind, checkTexts, checkYears, deleteEvent, ensureRegion, factPlaceKey, hideEvent, historyAnswer, historyStatus, forGaps, forHistory, gapsOfTask, gapText, historyOrder, historyHeld, historyTurn, mapPlace, raiseHistoryTasks, markDone, donePeriod, noteTried, readCatalog, redoRegion, refuseBeforePage, REGION_LANGS, regionIdOk, regionOfTask, requireHistoryOn, requireRegionId, retractEvent, skipHistory, EVENT_KINDS, yearsToSearch, whoSees, readPlaces, inRegion, regionName, placeRecordOf, } from "../core/pastevents.js";
-import { addPlaceEvent, askPlace, refusePlaceAsk, ensurePlaceCatalog, markPlaceDone, factsByRecord, notePlaceTried, placeEstimate, placeKeyOf, placeLabel, placeOfTask, readPlaceCatalog, refusePlaceBeforePage, requirePlace, setArea, yearsAt, } from "../core/placehistory.js";
+import { addPlaceEvent, askPlace, refusePlaceAsk, ensurePlaceCatalog, markPlaceDone, factsByRecord, notePlaceTried, placeEstimate, placeKeyOf, placeLabel, placeOfTask, readPlaceCatalog, refusePlaceBeforePage, refusePlaceSame, requirePlace, setArea, yearsAt, } from "../core/placehistory.js";
 // strom history list
 import { moreLine, paginate } from "../cli/format.js";
 import { displayName } from "../core/people.js";
@@ -336,8 +336,11 @@ register({
         }
         if (place)
             refusePlaceBeforePage(tree, sh, place, { kind, from, to }, s, url);
-        else
+        else {
             refuseBeforePage(sh, region, { kind, from, to }, s, url);
+            if (!s.sameAs && !s.distinct)
+                refusePlaceSame(tree, sh, region, { kind, from, to });
+        }
         let checked;
         try {
             checked = await checkQuotes(url, quotes, { from, to }, sh, ctx.env);
@@ -363,6 +366,9 @@ register({
             sha: checked.page.sha,
         };
         const event = { from, to, ...(date ? { date } : {}), kind, text, ...(why ? { why } : {}), ...(tip ? { tip } : {}), ...(opts.sensitive ? { sensitive: true } : {}), source };
+        // a place looked for before its region (K7.1a): its own events checked again once the page is read
+        if (!place && !s.sameAs && !s.distinct)
+            refusePlaceSame(tree, sh, region, { kind, from, to });
         const r = place ? addPlaceEvent(tree, sh, place, event, s) : addRegionEvent(sh, tree.config.id, { region: region, ...event }, s);
         const where = place ? `at ${placeLabel(place, "en")} (${place.id}) and its surroundings` : `in ${region}`;
         // who it shows at (their person in the Strom app, their story): for the agent to say to the person who asked