@cavelang/cli 0.34.0 → 0.36.0

package/dist/internal/rules/declare.js

@@ -11,8 +11,10 @@
  * prelude) appends nothing.
  */
 import { Claim, Key, Value } from '@cavelang/core';
+import { canonicalizeText } from '@cavelang/canonical';
 import { Row } from '@cavelang/store';
 import * as Rule from "./rule.js";
+import { currentDeclarations, declarationText } from "./declarations.js";
 import { provenanceContext, ruleAttribute, ruleSubject } from "./engine.js";
 /** Subject of the prelude digest bookkeeping claim. */
 const preludeSubject = 'derive/prelude';
@@ -33,6 +35,7 @@ export const declareRules = (store, text) => {
     const problems = [];
     const rules = [];
     const preludeLines = [];
+    const preludeSourceLines = [];
     const ruleLines = [];
     text.split(/\r?\n/).forEach((line, index) => {
         if (Rule.isRuleLine(line)) {
@@ -40,17 +43,27 @@ export const declareRules = (store, text) => {
         }
         else {
             preludeLines.push(line);
+            preludeSourceLines.push(index + 1);
         }
     });
     return store.transaction(() => {
+        store.registry();
         let prelude = 0;
         const preludeText = preludeLines.join('\n');
         if (preludeText.trim() !== '') {
+            // Validate even cached input: older versions cached failed preludes too.
+            const canonical = canonicalizeText(preludeText, store.registry());
+            if (canonical.problems.length > 0) {
+                for (const problem of canonical.problems)
+                    problems.push({
+                        ...problem, line: preludeSourceLines[problem.line - 1] ?? problem.line
+                    });
+                return { declared: 0, unchanged: 0, prelude: 0, rules, problems };
+            }
             const digest = Rule.digestOf(preludeText);
             const known = store.currentBelief(declarationKey(preludeSubject, preludeDigestAttribute));
             if (known === undefined || known.conf <= 0 || known.value_text !== digest) {
-                const result = store.ingest(preludeText, { source: 'cave-derive' });
-                problems.push(...result.problems);
+                const result = store.insertResult(canonical, { source: 'cave-derive' });
                 prelude = result.ids.length;
                 store.ingest(`${preludeSubject} HAS ${preludeDigestAttribute}: ${digest} @${provenanceContext}`);
             }
@@ -60,7 +73,8 @@ export const declareRules = (store, text) => {
         for (const { line, at } of ruleLines) {
             const parsed = Rule.parse(line);
             if (!parsed.ok) {
-                problems.push(...parsed.problems.map(message => ({ line: at, message })));
+                for (const message of parsed.problems)
+                    problems.push({ line: at, message });
                 continue;
             }
             const rule = parsed.rule;
@@ -85,10 +99,10 @@ export const declareRules = (store, text) => {
     });
 };
 /** Current positive rules of a store, in declaration order. */
-export const listRules = (store) => store.currentBeliefs()
-    .filter(row => row.verb === 'HAS' && row.attribute === ruleAttribute && row.negated === 0 && row.conf > 0 && row.value_text !== null)
+export const listRules = (store) => currentDeclarations(store, ruleAttribute)
+    .filter(row => row.value_text !== null)
     .map(row => {
-    const text = Row.parseValue(row.value_text).raw;
+    const text = declarationText(row);
     const parsed = Rule.parse(text);
     const label = (parsed.ok ? parsed.rule.label : undefined) ?? row.comment ?? undefined;
     return {
@@ -105,17 +119,17 @@ export const listRules = (store) => store.currentBeliefs()
  * justification does not outlive its rule.
  */
 export const retractRule = (store, ref) => {
-    const declarations = store.currentBeliefs().filter(row => row.verb === 'HAS' && row.attribute === ruleAttribute && row.negated === 0 && row.conf > 0);
-    const matches = declarations.filter(row => row.subject === ref || row.subject === ruleSubject(ref) ||
-        (ref.length >= 4 && row.subject.startsWith(ruleSubject(ref))));
-    const subjects = [...new Set(matches.map(row => row.subject))];
-    if (subjects.length === 0) {
-        return { ok: false, error: `no current rule matches ${JSON.stringify(ref)}` };
-    }
-    if (subjects.length > 1) {
-        return { ok: false, error: `${JSON.stringify(ref)} is ambiguous — matches ${subjects.join(', ')}` };
-    }
     return store.transaction(() => {
+        const declarations = currentDeclarations(store, ruleAttribute);
+        const matches = declarations.filter(row => row.subject === ref || row.subject === ruleSubject(ref) ||
+            (ref.length >= 4 && row.subject.startsWith(ruleSubject(ref))));
+        const subjects = [...new Set(matches.map(row => row.subject))];
+        if (subjects.length === 0) {
+            return { ok: false, error: `no current rule matches ${JSON.stringify(ref)}` };
+        }
+        if (subjects.length > 1) {
+            return { ok: false, error: `${JSON.stringify(ref)} is ambiguous — matches ${subjects.join(', ')}` };
+        }
         let derived = 0;
         for (const declaration of matches) {
             store.insertResult({

package/dist/internal/rules/declare.js.map

@@ -1 +1 @@
-{"version":3,"file":"declare.js","sourceRoot":"","sources":["../../src/declare.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"declare.js","sourceRoot":"","sources":["../../src/declare.ts"],"names":[],"mappings":"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"}

package/dist/internal/rules/engine.d.ts

@@ -22,8 +22,8 @@
  *   declaration row (§24.3);
  * - re-runs are idempotent — a conclusion equal to current belief appends
  *   nothing — and incremental by per-rule tx watermark claims: a rule
- *   re-fires only when rows recorded since its watermark could extend a
- *   premise match, and a watermark predating the rule's current
+ *   re-fires when newer rows could change a premise match or the active
+ *   vocabulary/evaluation-policy fingerprint differs. A watermark predating the rule's current
  *   declaration row is stale — a re-declared rule fires from scratch
  *   (§24.4);
  * - support is recomputed on every firing: previously-derived claims the
@@ -67,16 +67,17 @@ export type RuleOutcome = {
     readonly label?: string;
     /** `false` when every pass skipped the rule — watermark said nothing new. */
     fired: boolean;
+    /** Attempted evaluations, including evaluations in rolled-back reconciliation. */
     evaluations: number;
-    /** Solutions of the rule's final evaluation. */
+    /** Solutions of the rule's final attempted evaluation. */
     solutions: number;
-    /** Conclusions asserted for the first time (or re-asserted after retraction). */
+    /** Retained first assertions (or re-assertions); excludes rolled-back reconciliation. */
     appended: number;
-    /** Conclusions whose confidence or value changed — belief updates. */
+    /** Retained confidence/value updates; excludes rolled-back reconciliation. */
     updated: number;
-    /** Idempotent skips — conclusion equals current belief (§24.4). */
+    /** Attempted idempotent skips, including during rolled-back reconciliation (§24.4). */
     unchanged: number;
-    /** Previously-derived claims retracted — premises no longer hold (§24.5). */
+    /** Retained retractions for lost support; excludes rolled-back reconciliation (§24.5). */
     retracted: number;
     readonly problems: string[];
 };

package/dist/internal/rules/engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../src/engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../src/engine.ts"],"names":[],"mappings":"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"}

package/dist/internal/rules/engine.js

@@ -22,8 +22,8 @@
  *   declaration row (§24.3);
  * - re-runs are idempotent — a conclusion equal to current belief appends
  *   nothing — and incremental by per-rule tx watermark claims: a rule
- *   re-fires only when rows recorded since its watermark could extend a
- *   premise match, and a watermark predating the rule's current
+ *   re-fires when newer rows could change a premise match or the active
+ *   vocabulary/evaluation-policy fingerprint differs. A watermark predating the rule's current
  *   declaration row is stale — a re-declared rule fires from scratch
  *   (§24.4);
  * - support is recomputed on every firing: previously-derived claims the
@@ -33,16 +33,19 @@
  *   retracts the whole dependent chain, mutually-supporting cycles
  *   included (§24.5).
  */
-import { Claim, Confidence, Context, Key, Value, Verb } from '@cavelang/core';
+import { createHash } from 'node:crypto';
+import { Claim, Context, Key, Value, Verb } from '@cavelang/core';
 import * as Canonical from '@cavelang/canonical';
 import { noisyAndIndependent } from '@cavelang/fusion';
 import { Row } from '@cavelang/store';
 import { match } from '@cavelang/query';
 import * as Rule from "./rule.js";
+import { currentDeclarations, declarationText } from "./declarations.js";
 /** Attribute of rule declaration claims: `rule/<digest> HAS rule: …`. */
 export const ruleAttribute = 'rule';
 /** Attribute of per-rule watermark claims (§24.4). */
 export const watermarkAttribute = 'derive-watermark';
+const vocabularyAttribute = 'derive-vocabulary';
 /** Source context stamped on declarations and bookkeeping (like `src:cave-connect`). */
 export const provenanceContext = 'src:cave-derive';
 /** Declaration subject of a rule: its digest under the `rule/` scope. */
@@ -64,6 +67,21 @@ const bookkeepingKey = (subject, attribute) => Key.of(Claim.of({
     contexts: [provenanceContext]
 }));
 const maxTx = (store) => store.db.prepare('SELECT MAX(tx) AS t FROM cave_claim').get().t ?? undefined;
+// Registry values are immutable. Cache per identity, but hash sorted semantic
+// contents so reopening or replaying an equivalent registry retains the mark.
+const vocabularyCache = new WeakMap();
+const vocabularyOf = (store) => {
+    const registry = store.registry();
+    const cached = vocabularyCache.get(registry);
+    if (cached !== undefined)
+        return cached;
+    const pairs = [...registry.pairs].map(([name, pair]) => [name, pair.primary, pair.inverse]).sort();
+    const text = JSON.stringify([pairs, [...registry.declared].sort(),
+        [...registry.storage].sort(), [...registry.preferred].sort(), [...registry.renames].sort()]);
+    const fingerprint = `v1-${createHash('sha256').update(text).digest('hex')}`;
+    vocabularyCache.set(registry, fingerprint);
+    return fingerprint;
+};
 /** Latest row per claim key among `rows` — the series current beliefs. */
 const latestPerKey = (rows) => {
     const latest = new Map();
@@ -93,9 +111,9 @@ const loadRules = (store) => {
     const problems = [];
     const notes = [];
     const byDigest = new Map();
-    const declarations = store.currentBeliefs().filter(row => row.verb === 'HAS' && row.attribute === ruleAttribute && row.negated === 0 && row.conf > 0 && row.value_text !== null);
+    const declarations = currentDeclarations(store, ruleAttribute).filter(row => row.value_text !== null);
     for (const row of declarations) {
-        const text = Row.parseValue(row.value_text).raw;
+        const text = declarationText(row);
         const parsed = Rule.parse(text);
         if (!parsed.ok) {
             problems.push({ subject: row.subject, problems: parsed.problems });
@@ -132,7 +150,7 @@ const loadRules = (store) => {
 /**
  * Could a row recorded after `mark` extend a match of one of the rule's
  * premises? A *shape* test — subject/verb/object/attribute/negated plus
- * context and tag membership; confidence and currency are ignored, so a
+ * context membership; mutable values, tags and confidence are ignored, so a
  * retraction row re-fires the rules its claim used to feed (§24.5).
  * Over-matching costs a harmless re-evaluation; under-matching would be a
  * correctness bug — under `aliases`, entity terms are dropped from the
@@ -140,6 +158,12 @@ const loadRules = (store) => {
  * fires too.
  */
 const shapeMatchesSince = (store, rule, mark, aliases) => {
+    // A new mapping can make old facts match a different premise direction.
+    // Their fact timestamps do not move, so ordinary shape probes miss it.
+    if (store.db.prepare(`SELECT 1 FROM cave_claim
+    WHERE tx > ? AND (verb IN ('REVERSE', 'RENAMED-TO') OR (verb = 'IS' AND object = 'verb'))
+    LIMIT 1`).get(mark) !== undefined)
+        return true;
     const registry = store.registry();
     for (const premise of rule.premises) {
         if (premise.kind !== 'pattern') {
@@ -178,33 +202,32 @@ const shapeMatchesSince = (store, rule, mark, aliases) => {
                 params.push(subjectSlot.text);
             }
             if (objectSlot?.kind === 'term' && !aliases) {
-                // A date/number object also matches metric rows (value in value_text).
-                conditions.push('(c.object = ? OR c.value_text = ?)');
-                params.push(objectSlot.text, objectSlot.text);
+                // Metric values share a claim key across changes. A replacement that
+                // stops matching must still wake the rule to retract its conclusions.
+                conditions.push('(c.object = ? OR c.object IS NULL)');
+                params.push(objectSlot.text);
             }
             if (premise.pattern.payload.kind === 'attribute') {
                 conditions.push('c.attribute = ?');
                 params.push(premise.pattern.payload.attribute);
-                if (premise.pattern.payload.value.kind === 'term') {
-                    conditions.push('c.value_text = ?');
-                    params.push(premise.pattern.payload.value.text);
-                }
+                // Attribute values are mutable within a series. Do not restrict the
+                // wake-up probe to either their spelling or their normalized value.
             }
         }
-        for (const context of premise.pattern.contexts) {
-            conditions.push('EXISTS (SELECT 1 FROM cave_context x WHERE x.claim_id = c.id AND x.context = ?)');
-            params.push(context);
-        }
-        for (const tag of premise.pattern.tags) {
-            if (tag.value === undefined) {
-                conditions.push('EXISTS (SELECT 1 FROM cave_tag t WHERE t.claim_id = c.id AND t.key = ? AND t.value IS NULL)');
-                params.push(tag.key);
-            }
-            else {
-                conditions.push('EXISTS (SELECT 1 FROM cave_tag t WHERE t.claim_id = c.id AND t.key = ? AND t.value = ?)');
-                params.push(tag.key, tag.value);
+        if (premise.pattern.contexts.length <= 16) {
+            for (const context of premise.pattern.contexts) {
+                conditions.push('EXISTS (SELECT 1 FROM cave_context x WHERE x.claim_id = c.id AND x.context = ?)');
+                params.push(context);
             }
         }
+        else {
+            conditions.push(`NOT EXISTS (SELECT 1 FROM json_each(?) required
+        WHERE NOT EXISTS (SELECT 1 FROM cave_context x
+          WHERE x.claim_id = c.id AND x.context = required.value))`);
+            params.push(JSON.stringify(premise.pattern.contexts));
+        }
+        // Tags are metadata, not identity: removing a required tag can invalidate
+        // prior conclusions just as adding it can enable a new match.
         const row = store.db.prepare(`SELECT 1 AS hit FROM cave_claim c WHERE ${conditions.join(' AND ')} LIMIT 1`)
             .get(...params);
         if (row !== undefined) {
@@ -228,11 +251,11 @@ const shapeMatchesSince = (store, rule, mark, aliases) => {
  * no row can match.
  */
 export const specialize = (pattern, bindings) => {
-    const slot = (candidate) => candidate.kind === 'var' && bindings[candidate.name] !== undefined ?
+    const slot = (candidate) => candidate.kind === 'var' && Object.hasOwn(bindings, candidate.name) && bindings[candidate.name] !== undefined ?
         { kind: 'term', text: bindings[candidate.name] } :
         candidate;
     let verb = pattern.verb;
-    if (verb.kind === 'var' && bindings[verb.name] !== undefined) {
+    if (verb.kind === 'var' && Object.hasOwn(bindings, verb.name) && bindings[verb.name] !== undefined) {
         const name = bindings[verb.name];
         if (!Verb.isVerbToken(name)) {
             return undefined;
@@ -318,7 +341,7 @@ const conclude = (rule, solution, registry) => {
     else if (payload.kind === 'metric' && payload.value.kind === 'atom' && payload.value.raw.startsWith('?')) {
         payload = Claim.metric(Row.parseValue(solution.bindings[payload.value.raw.slice(1)]));
     }
-    const conf = Confidence.parse(Confidence.format(noisyAndIndependent(rule.conf, solution.rows.map(row => row.conf))));
+    const conf = noisyAndIndependent(rule.conf, solution.rows.map(row => row.conf));
     const draft = Claim.of({
         subject: term(template.subject, 'subject'),
         verb: template.verb,
@@ -352,9 +375,37 @@ const rollback = Symbol('cave-derive dry run');
  * transaction.
  */
 export const derive = (store, options = {}) => {
+    const suppliedMinConf = options.minConf;
+    const minConf = suppliedMinConf === undefined ? defaultMinConf : suppliedMinConf;
+    if (!Number.isFinite(minConf) || minConf < 0 || minConf > 1) {
+        throw new Error('minConf must be finite and in 0..1');
+    }
+    const suppliedMaxPasses = options.maxPasses;
+    const maxPasses = suppliedMaxPasses === undefined ? defaultMaxPasses : suppliedMaxPasses;
+    if (!Number.isSafeInteger(maxPasses) || maxPasses < 1) {
+        throw new Error('maxPasses must be a positive safe integer');
+    }
+    options = { minConf, maxPasses, full: options.full, dryRun: options.dryRun, aliases: options.aliases };
+    for (const key of ['full', 'dryRun', 'aliases']) {
+        if (options[key] !== undefined && typeof options[key] !== 'boolean') {
+            throw new Error(`${key} must be a boolean`);
+        }
+    }
+    return store.transaction(() => {
+        store.registry();
+        return deriveLocked(store, options);
+    });
+};
+/** Read declarations and watermarks only after reserving the write transaction. */
+const deriveLocked = (store, options) => {
     const minConf = options.minConf ?? defaultMinConf;
     const maxPasses = options.maxPasses ?? defaultMaxPasses;
     const aliases = options.aliases === true;
+    // The persisted vocabulary companion also identifies the evaluation policy:
+    // unchanged rows can gain or lose support when these options change.
+    // v3 re-evaluates conclusions formerly rounded to two percentage decimals.
+    const evaluationFingerprint = () => 'v3-' + createHash('sha256')
+        .update(JSON.stringify([vocabularyOf(store), aliases, minConf])).digest('hex');
     const { loaded, problems, notes } = loadRules(store);
     let passes = 0;
     const supported = new Set();
@@ -364,6 +415,8 @@ export const derive = (store, options = {}) => {
     /** Per-rule scan mark: rows at or before it are fully accounted for. */
     const marks = new Map();
     const storedMarks = new Map();
+    const vocabularies = new Map();
+    const storedVocabularies = new Map();
     let complete = true;
     for (const { rule, row } of loaded) {
         const watermark = store.currentBelief(bookkeepingKey(ruleSubject(rule.digest), watermarkAttribute));
@@ -376,6 +429,11 @@ export const derive = (store, options = {}) => {
         const stored = watermark !== undefined && watermark.conf > 0 && watermark.tx > row.tx ?
             watermark.value_text ?? undefined :
             undefined;
+        const vocabulary = store.currentBelief(bookkeepingKey(ruleSubject(rule.digest), vocabularyAttribute));
+        const storedVocabulary = vocabulary !== undefined && vocabulary.conf > 0 && vocabulary.tx > row.tx
+            ? vocabulary.value_text ?? undefined : undefined;
+        storedVocabularies.set(rule.digest, storedVocabulary);
+        vocabularies.set(rule.digest, storedVocabulary);
         storedMarks.set(rule.digest, stored);
         marks.set(rule.digest, options.full === true ? undefined : stored);
     }
@@ -440,18 +498,17 @@ export const derive = (store, options = {}) => {
             }
             const current = store.currentBelief(conclusion.key);
             const columns = Row.toColumns(conclusion.claim);
-            if (current !== undefined && current.conf > 0 &&
-                Math.abs(current.conf - conclusion.conf) < 1e-9 && current.value_text === columns.valueText) {
+            if (current !== undefined && current.conf === conclusion.conf && current.value_text === columns.valueText) {
                 outcome.unchanged += 1;
                 continue;
             }
-            const inserted = store.insertResult({ claims: [{ claim: conclusion.claim, line: 0 }], edges: [], registry: store.registry(), problems: [] }, { source: ruleSubject(rule.digest), lifecycle: true });
-            // `conclude` returns the claim rather than its one-line registry
-            // result. Replay all stored declarations after a generated vocabulary
-            // claim so later rules and fixpoint passes see it immediately.
-            if (isDeclarationClaim(conclusion.claim)) {
-                store.reloadRegistry();
-            }
+            const registry = store.registry();
+            // Extend the current registry, not the snapshot used to construct a
+            // batch of conclusions. Canonicalization preserves first-declaration-
+            // wins behavior for competing declarations from that batch.
+            const nextRegistry = isDeclarationClaim(conclusion.claim) ?
+                Canonical.canonicalizeText(Canonical.emitClaim(conclusion.claim), registry).registry : registry;
+            const inserted = store.insertResult({ claims: [{ claim: conclusion.claim, line: 0 }], edges: [], registry: nextRegistry, problems: [] }, { source: ruleSubject(rule.digest), lifecycle: true });
             const id = inserted.ids[0];
             const premiseIds = [...new Set(conclusion.rows.map(premiseRow => premiseRow.id))];
             store.appendEdges([
@@ -468,23 +525,30 @@ export const derive = (store, options = {}) => {
         }
         return progress;
     };
-    const run = () => {
+    let reconciling = false;
+    const incompleteReconciliation = Symbol('cave-derive incomplete reconciliation');
+    const run = (resumeRetraction = false) => {
         const truncate = () => {
             complete = false;
             notes.push(`stopped at ${maxPasses} passes before reaching a fixpoint — no unsupported conclusions were retracted and no watermarks were advanced; re-run to continue, or raise maxPasses`);
         };
         for (;;) {
             // Pass loop: evaluate until no rule writes or extends support.
-            let quiescent = false;
+            // The single recursive entry resumes at the first retraction under a
+            // savepoint; it must not repeat evaluation or charge an extra pass.
+            let quiescent = resumeRetraction;
+            resumeRetraction = false;
             while (!quiescent && passes < maxPasses) {
                 passes += 1;
                 let progress = false;
                 for (const entry of loaded) {
                     const mark = marks.get(entry.rule.digest);
-                    const now = maxTx(store);
-                    if (mark !== undefined && !shapeMatchesSince(store, entry.rule, mark, aliases)) {
+                    const vocabulary = evaluationFingerprint();
+                    if (mark !== undefined && vocabularies.get(entry.rule.digest) === vocabulary &&
+                        !shapeMatchesSince(store, entry.rule, mark, aliases)) {
                         continue;
                     }
+                    const now = maxTx(store);
                     if (!fired.has(entry.rule.digest)) {
                         fired.add(entry.rule.digest);
                         entry.outcome.fired = true;
@@ -494,6 +558,19 @@ export const derive = (store, options = {}) => {
                         progress = true;
                     }
                     marks.set(entry.rule.digest, now);
+                    vocabularies.set(entry.rule.digest, vocabulary);
+                    if (evaluationFingerprint() !== vocabulary) {
+                        // A proof established under the old mapping is no longer valid.
+                        // Re-suspend all current derivations on the next bounded pass,
+                        // including conclusions written earlier in this invocation.
+                        supported.clear();
+                        suspended.clear();
+                        fired.clear();
+                        marks.clear();
+                        vocabularies.clear();
+                        progress = true;
+                        break;
+                    }
                 }
                 quiescent = !progress;
             }
@@ -504,6 +581,32 @@ export const derive = (store, options = {}) => {
                 truncate();
                 return;
             }
+            if (!reconciling) {
+                if (![...suspended.values()].some(({ row }) => !supported.has(row.claim_key)))
+                    return;
+                // Keep additions from initial evaluation, but commit destructive support
+                // reconciliation only if all subsequent evaluation/retraction settles.
+                // The recursive call enters this savepoint once, regardless of depth
+                // of the dependency chain; subsequent passes use the ordinary loop.
+                const counts = loaded.map(({ outcome }) => ({
+                    appended: outcome.appended, updated: outcome.updated, retracted: outcome.retracted
+                }));
+                reconciling = true;
+                try {
+                    store.transaction(() => {
+                        run(true);
+                        if (!complete)
+                            throw incompleteReconciliation;
+                    });
+                }
+                catch (error) {
+                    if (error !== incompleteReconciliation)
+                        throw error;
+                    for (let i = 0; i < loaded.length; i++)
+                        Object.assign(loaded[i].outcome, counts[i]);
+                }
+                return;
+            }
             // Retraction phase (§24.5): suspended rows never re-supported lost
             // their premises. Retraction rows are ordinary appends — the loop
             // re-enters so dependent rules see them and cascade.
@@ -534,10 +637,13 @@ export const derive = (store, options = {}) => {
                 continue;
             }
             const mark = marks.get(entry.rule.digest);
-            if (mark === undefined || mark === storedMarks.get(entry.rule.digest)) {
-                continue;
+            if (mark !== undefined && mark !== storedMarks.get(entry.rule.digest)) {
+                store.ingest(`${ruleSubject(entry.rule.digest)} HAS ${watermarkAttribute}: ${mark} @${provenanceContext}`);
+            }
+            const vocabulary = vocabularies.get(entry.rule.digest);
+            if (vocabulary !== undefined && vocabulary !== storedVocabularies.get(entry.rule.digest)) {
+                store.ingest(`${ruleSubject(entry.rule.digest)} HAS ${vocabularyAttribute}: ${vocabulary} @${provenanceContext}`);
             }
-            store.ingest(`${ruleSubject(entry.rule.digest)} HAS ${watermarkAttribute}: ${mark} @${provenanceContext}`);
         }
     };
     if (options.dryRun === true) {