@volter/supercode-orchestrator 0.4.83 → 0.4.84

package/board/ztrack.mjs

@@ -50,8 +50,8 @@ class ZtrackBoard {
     };
     this.tx(() => {});
   }
-  get(key, fallback = null) { return json(this.runtime.prepare('SELECT value FROM state WHERE key = ?').get(key)?.value, fallback); }
-  put(key, value) { this.runtime.prepare('INSERT INTO state VALUES (?, ?) ON CONFLICT(key) DO UPDATE SET value = excluded.value').run(key, JSON.stringify(value)); }
+  get(key, fallback = null) { return this.computing && this.pendingValues.has(key) ? this.pendingValues.get(key) : json(this.runtime.prepare('SELECT value FROM state WHERE key = ?').get(key)?.value, fallback); }
+  put(key, value) { if (this.computing) { this.pendingValues.set(key, value); return; } this.runtime.prepare('INSERT INTO state VALUES (?, ?) ON CONFLICT(key) DO UPDATE SET value = excluded.value').run(key, JSON.stringify(value)); }
   stamp() {
     const fileStamp = (path) => { try { const s = statSync(path); return `${s.ino}:${s.size}:${s.mtimeMs}`; } catch { return 'missing'; } };
     return [fileStamp(this.path), fileStamp(this.archive), fileStamp(this.compatPath), this.get('version', '')].join('|');
@@ -71,6 +71,8 @@ class ZtrackBoard {
       if (current === file.before) atomic(file.path, file.text);
     }
     this.put('snapshot', pending.snapshot);
+    if (pending.intent) this.put(`applied:${pending.intent}`, true);
+    this.put('version', randomBytes(8).toString('hex'));
     this.runtime.prepare("DELETE FROM state WHERE key = 'pending'").run();
   }
   tx(fn) {
@@ -86,14 +88,22 @@ class ZtrackBoard {
       let committed = false;
       try {
         this.recover();
+        const version = this.get('version');
+        this.runtime.exec('COMMIT');
+        // Parsing, rules and rendering run against a snapshot, without a runtime writer transaction.
+        this.pendingValues = new Map(); this.computing = true;
         this.load();
         if (this.seed) this.seedIntoMemory();
         else this.lift();
         const result = fn(this.db);
         const documents = this.documents();
         const files = [{ path: this.path, before: hash(this.text), text: documents.open }, { path: this.archive, before: hash(this.archiveText), text: documents.archived }];
-        if (files.some((f) => hash(read(f.path)) !== f.before)) { this.runtime.exec('ROLLBACK'); continue; }
         const snapshot = this.snapshot();
+        this.computing = false;
+        this.runtime.exec('BEGIN IMMEDIATE');
+        this.recover();
+        if (this.get('version') !== version || files.some((f) => hash(read(f.path)) !== f.before)) { this.runtime.exec('ROLLBACK'); continue; }
+        for (const [key, value] of this.pendingValues) this.put(key, value);
         // A durable intent precedes filesystem writes; recovery completes exactly this version.
         const intent = randomBytes(16).toString('hex');
         this.put('pending', { intent, files, snapshot });
@@ -101,14 +111,19 @@ class ZtrackBoard {
         // A concurrent writer may recover this intent and advance the runtime. Re-read
         // its identity before touching documents, retrying from any newer version.
         this.runtime.exec('BEGIN IMMEDIATE');
-        if (this.get('pending')?.intent !== intent) { this.runtime.exec('ROLLBACK'); continue; }
+        if (this.get('pending')?.intent !== intent) {
+          const applied = this.get(`applied:${intent}`, false);
+          this.runtime.exec('ROLLBACK');
+          if (applied) { this.loadedStamp = null; this.seed = null; return result; }
+          continue;
+        }
         // Detect an editor racing the journal commit before replacing either document.
         if (files.some((f) => hash(read(f.path)) !== f.before)) {
           this.runtime.prepare("DELETE FROM state WHERE key = 'pending'").run(); this.runtime.exec('COMMIT');
           continue;
         }
         for (const f of files) if (hash(f.text) !== f.before) atomic(f.path, f.text);
-        this.put('snapshot', snapshot); this.runtime.prepare("DELETE FROM state WHERE key = 'pending'").run();
+        this.put('snapshot', snapshot); this.put(`applied:${intent}`, true); this.runtime.prepare("DELETE FROM state WHERE key = 'pending'").run();
         this.export();
         this.put('version', randomBytes(8).toString('hex'));
         this.runtime.exec('COMMIT');
@@ -120,7 +135,7 @@ class ZtrackBoard {
         if (/busy|locked|Hermes wrote/i.test(error.message)) continue;
         if (committed) error.message += ' (the runtime journal retains any unfinished document write)';
         throw error;
-      } finally { this.active = false; }
+      } finally { this.active = false; this.computing = false; this.pendingValues = null; }
     }
   }
   seedIntoMemory() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-orchestrator",
-  "version": "0.4.83",
+  "version": "0.4.84",
   "type": "module",
   "description": "The orchestrator runtime over the Volter Harness ontology: one typed operational model whose folder is its serialization, read and written through the harness orchestration doors (docs/ORCHESTRATOR-IR.md)",
   "exports": {