strom-research 1.22.0 → 1.22.2

package/dist/core/tree.js

@@ -21,7 +21,7 @@ import { settledRecord, validateRecord } from "./validate.js";
 import { NeedsConsentError, StromError, UsageError } from "./errors.js";
 import * as git from "./git.js";
 import { opsLogs } from "./opslog.js";
-import { commitSeal, createKey, fingerprint, loadKey, sha256, signOp } from "./seal.js";
+import { commitSeal, createKey, fingerprint, loadKey, settleKey, sha256, signOp, verifyCommitSeal } from "./seal.js";
 import { stringifyCanonical } from "./json.js";
 import { lastBackup } from "./backup.js";
 export const TREE_FILE = "strom.json";
@@ -29,7 +29,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.22.0";
+export const VERSION = "1.22.2";
 const GITIGNORE = `# Strom Research — local state and large files are not versioned
 .strom/
 /media/
@@ -569,7 +569,7 @@ export class Tree {
     /** The tree's seal key on this computer, or undefined (tree moved here). */
     get key() {
         if (this.keyCache === undefined)
-            this.keyCache = loadKey(this.env, this.config.id) ?? null;
+            this.keyCache = settleKey(this.env, this.config.id, (key) => this.headSealedWith(key)) ?? null;
         return this.keyCache ?? undefined;
     }
     lastStamp = 0;
@@ -582,6 +582,11 @@ export class Tree {
     opsFilesTouched() {
         return [...this.touchedOps].map((f) => this.relative(f));
     }
+    /** Whether the last commit carries the seal of this key. */
+    headSealedWith(key) {
+        const head = git.headInfo(this.root);
+        return !!head && verifyCommitSeal(key, head.tree, head.message);
+    }
     /** Forget the cached key (after one was created on this computer). */
     reloadKey() {
         this.keyCache = undefined;
@@ -605,7 +610,8 @@ export class Tree {
         ], undefined, undefined, { code: SEAL_FOREIGN, params: { name: this.config.name, set: "strom seal adopt" } });
     }
     /** Sealed commit of everything under pathspec. */
-    commit(message, pathspec = ["."]) {
+    /** `always`: a commit even when nothing changed (strom repair sealing again what was committed outside strom). */
+    commit(message, pathspec = ["."], always = false) {
         const key = this.requireKey();
         // its IDs on disk before it commits (written once here, not after every record: a sync of 2 200 people wrote the
         // counters thousands of times)
@@ -613,7 +619,7 @@ export class Tree {
         // another process may have committed since this one last looked — under the lock it read HEAD afresh already
         if (this.lockDepth === 0)
             git.resetCache(this.root);
-        const hash = git.commitAll(this.root, message, pathspec, (treeHash) => commitSeal(key, treeHash));
+        const hash = git.commitAll(this.root, message, pathspec, (treeHash) => commitSeal(key, treeHash), always);
         // the logs this commit holds are closed: what comes next goes into new ones
         this.opsNow.clear();
         if (hash) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strom-research",
-  "version": "1.22.0",
+  "version": "1.22.2",
   "description": "Genealogical research toolkit for AI coding agents",
   "type": "module",
   "bin": {