generator: temporal answer uses slot-held value; gold ADD evicts first when ledger full; budget default 12 for eviction pressure

clerk/generator.py

@@ -15,6 +15,8 @@ Invariants the code maintains:
   * n_uses (the salience signal) is incremented at the moment a question
     is asked, so the eviction oracle at session t only sees evidence
     available up to t.
+  * Gold programs are always executable: if an ADD would overflow a full
+    ledger, the oracle emits EVICT (lowest salience) first, then the ADD.
   * Everything is seeded: the same --seed yields byte-identical data.
 
 Author: Justin Wolcott (fallnai-research.org)
@@ -210,7 +212,7 @@ def render_session(
             qas.append({"q": q, "a": ANSWER_UNKNOWN, "type": "unknown",
                         "pred": spec["p"], "value": None})
         elif f["state"] == "tombstoned":
-            old = f["history"][-1]["value"] if f["history"] else None
+            old = f["value"]  # value the tombstoned slot holds
             if old and rng.random() < 0.5:
                 q2 = rng.choice(Q_TEMPLATES_TEMPORAL).replace("{h}", spec["h"])
                 qas.append({"q": q2, "a": ANSWER_TEMPORAL.replace("{v}", old),
@@ -267,6 +269,10 @@ def _slot_id_for(ledger: List[Slot], pending: List[Dict[str, Any]],
     return None
 
 
+def _free_slot(sim: List[Slot]) -> Optional[Slot]:
+    return next((s for s in sim if not s.occupied), None)
+
+
 def gold_ops_for_events(
     ledger: List[Slot],
     persona_name: str,
@@ -276,21 +282,36 @@ def gold_ops_for_events(
     """Build the gold edit program for one session's events, in transcript
     order, then apply budget pressure with the salience oracle.
 
-    Eviction-safe: if a predicate's slot was already evicted, an UPDATE
-    degrades to an ADD (the fact must be re-remembered) and a TOMBSTONE of
-    an absent slot is skipped."""
+    Always-executable: if an ADD would overflow a full ledger, the program
+    first EVICTs the lowest-salience occupied slot, then ADDs. If a
+    predicate's slot was already evicted, an UPDATE degrades to an ADD and a
+    TOMBSTONE of an absent slot is skipped."""
     ops: List[Dict[str, Any]] = []
     ledger_now = [Slot(**vars(s)) for s in ledger]
+
+    def sim_after_pending() -> List[Slot]:
+        s, _ = apply_ops(ledger_now, ops, session_idx)
+        return s
+
     for ev in events:
-        if ev["kind"] == "ADD":
+        if ev["kind"] in ("ADD", "UPDATE degraded to ADD"):
+            pass  # fallthrough handled below
+        if ev["kind"] == "ADD" or (ev["kind"] == "UPDATE" and
+                                   _slot_id_for(ledger_now, ops, persona_name,
+                                                ev["pred"]) is None):
+            # evict-first if the ledger is full
+            if _free_slot(sim_after_pending()) is None:
+                cur, _ = apply_ops(ledger_now, ops, session_idx)
+                victim = min((s for s in cur if s.occupied),
+                             key=lambda s: salience(s, session_idx))
+                evict = {"op": "EVICT", "i": victim.id}
+                ops.append(evict)
+                ledger_now, _ = apply_ops(ledger_now, [evict], session_idx)
             op = {"op": "ADD", "s": persona_name, "p": ev["pred"], "o": ev["value"]}
         elif ev["kind"] == "UPDATE":
             sid = _slot_id_for(ledger_now, ops, persona_name, ev["pred"])
-            if sid is None:
-                op = {"op": "ADD", "s": persona_name, "p": ev["pred"], "o": ev["value"]}
-            else:
-                op = {"op": "UPDATE", "i": sid, "s": persona_name,
-                      "p": ev["pred"], "o": ev["value"]}
+            op = {"op": "UPDATE", "i": sid, "s": persona_name,
+                  "p": ev["pred"], "o": ev["value"]}
         else:  # TOMBSTONE
             sid = _slot_id_for(ledger_now, ops, persona_name, ev["pred"])
             if sid is None:
@@ -363,7 +384,9 @@ def main() -> None:
     ap = argparse.ArgumentParser(description="CLERK synthetic session generator")
     ap.add_argument("--personas", type=int, default=100)
     ap.add_argument("--sessions", type=int, default=8)
-    ap.add_argument("--budget", type=int, default=LEDGER_BUDGET_DEFAULT)
+    ap.add_argument("--budget", type=int, default=12,
+                    help="ledger budget; 12 guarantees eviction pressure "
+                         "(personas accumulate up to ~18 facts)")
     ap.add_argument("--seed", type=int, default=137)
     ap.add_argument("--split", choices=["train", "test"], default="train")
     ap.add_argument("--out", type=str, required=True)