Skip to content

Garry's Opinionated OpenClaw/Hermes Agent Brain

TypeScript

spec: refresh-barrier configs, open findings in tlc.sh (WIP)

garrytan7598ff97ae40
diff --git a/scripts/spec/tlc.sh b/scripts/spec/tlc.sh
index de8cf35b07..4eb207f276 100755
--- a/scripts/spec/tlc.sh
+++ b/scripts/spec/tlc.sh
@@ -11,6 +11,9 @@
# spec is wrong and say why in the PR
# TLC_TIMEOUT TLC did not finish within TLC_TIMEOUT_S (default 600): the state space grew; shrink the config
# TLC_ERROR TLC stopped (parse or semantic error, out of memory): the log names the line
+# TLC_FINDING_CLOSED a config whose `\* OPEN_FINDING: <Property>` line documents a known violation of the code now
+# passes: the finding is fixed; flip the config to the fixed code and drop the line
+# A config with an OPEN_FINDING line passes (`open`) only when TLC reports exactly that property violated.
# Env: TLA2TOOLS (a jar to use; otherwise scripts/spec/tla-jar.sh downloads the pinned one), TLC_OUT (logs; default
# .context/tlc), TLC_WORKERS (default: every CPU; configs run one at a time), TLC_TIMEOUT_S, TLC_JAVA_OPTS, TLC_NIGHTLY (1 also runs
# the *Nightly.cfg configs, which take too long for every pull request).
@@ -55,11 +58,17 @@ status=0
for job in "${jobs[@]}"; do
IFS='|' read -r d m c <<< "$job"
work="$out/$(basename "$d")-${c%.cfg}"; log="$work/tlc.log"; rc="$(cat "$work/rc")"; name="$(basename "$d")/$c"
- if grep -q "Model checking completed. No error has been found." "$log"; then
+ open="$(sed -nE 's/^\\\* OPEN_FINDING: ([A-Za-z0-9_]+).*/\1/p' "$d/$c" | head -1)"
+ v="$(grep -oE '(Invariant|Action property|Temporal properties|Property) [A-Za-z0-9_]* ?(is|were) violated' "$log" | head -1 || true)"
+ if [ -n "$open" ] && [ "$(echo "$v" | awk '{print $2}')" = "$open" ]; then
+ echo "open $name: $open is violated, as the config documents (an open finding; spec/tla/README.md)"
+ elif [ -n "$open" ] && grep -q "Model checking completed. No error has been found." "$log"; then
+ echo "FAIL TLC_FINDING_CLOSED $name: $open now holds, so the open finding this config documents is fixed. Drop its OPEN_FINDING line, set its constants to the fixed code and move it to the README's passing configs." >&2; status=1
+ elif grep -q "Model checking completed. No error has been found." "$log"; then
echo "ok $name: $(grep -oE '[0-9]+ distinct states found' "$log" | tail -1) ($(grep -oE 'Finished in [^ ]+' "$log" | head -1))"
elif [ "$rc" = 124 ] || [ "$rc" = 137 ]; then
echo "FAIL TLC_TIMEOUT $name: TLC did not finish within ${limit}s. Log: $log" >&2; status=1
- elif v="$(grep -oE '(Invariant|Action property|Temporal properties|Property) [A-Za-z0-9_]* ?(is|were) violated' "$log" | head -1)" && [ -n "$v" ]; then
+ elif [ -n "$v" ]; then
echo "FAIL TLC_VIOLATION $name: $v. The counterexample trace is in $log; spec/tla/README.md maps each action to its code." >&2; status=1
else
echo "FAIL TLC_ERROR $name: TLC exited $rc without a result. Log: $log" >&2; grep -m3 -iE 'error|exception' "$log" >&2 || tail -5 "$log" >&2; status=1
diff --git a/spec/tla/refresh-barrier/RefreshBarrier.cfg b/spec/tla/refresh-barrier/RefreshBarrier.cfg
index 3c3d436502..24f588cb2e 100644
--- a/spec/tla/refresh-barrier/RefreshBarrier.cfg
+++ b/spec/tla/refresh-barrier/RefreshBarrier.cfg
@@ -9,6 +9,7 @@ CONSTANTS
MaxLocalEdits = 0
ImportHolds = FALSE
HeldImportBlocks = FALSE
+ ImportExpiryLocksSource = FALSE
RecoveryDefers = FALSE
AdoptLocalEdits = FALSE
MayRestore = FALSE
diff --git a/spec/tla/refresh-barrier/RefreshBarrier.tla b/spec/tla/refresh-barrier/RefreshBarrier.tla
index e0b1e01dd1..d51297442d 100644
--- a/spec/tla/refresh-barrier/RefreshBarrier.tla
+++ b/spec/tla/refresh-barrier/RefreshBarrier.tla
@@ -42,6 +42,7 @@ CONSTANTS
MaxLocalEdits, \* uncommitted edits to F in the worktree
ImportHolds, \* #8705: a claimed write refused pending_import is moved back to deferred until the import lands
HeldImportBlocks, \* a write held for an import blocks later writes of its worktree (the claim's FIFO rule); FALSE as coded
+ ImportExpiryLocksSource, \* the import expiry re-checks last_commit under a lock on the source row; FALSE as coded
RecoveryDefers, \* #8705: admission defers behind a refresh in recovery_required instead of refusing
AdoptLocalEdits, \* #8708: a drift refusal on a one-sided local edit adopts the edit and prepares the write again
MayRestore, \* a shared-skill restore may run once
@@ -177,6 +178,8 @@ FenceRecount == TRUE
ExpiryLocks(i, w) == <<L(BRAIN, "S"), L(REF(i), "NKU"), L(CTR, "U"), L(REQ(w), "U")>>
\* ... and the refresh row is re-read under its lock: released_at IS NULL.
ExpiryRecheck(i) == ~rel[i]
+\* With ImportExpiryLocksSource: the protocol declaration (brain FOR SHARE), then the source row FOR SHARE, before the recheck.
+ImportExpiryLocks == <<L(BRAIN, "S"), L(SRC, "S")>>
\* The import expiry's recheck that the row is still held for an import that has not landed.
ImportExpiryRecheck(w) == st[w] = "deferred" /\ lastCommit = dimp[w]
\* The v292 release trigger stamps released_at on every move into completed or aborted.
@@ -577,15 +580,17 @@ ExpImpBegin(w) ==
/\ IF dref[w] = None THEN TRUE ELSE rel[dref[w]]
/\ overdue[w]
/\ ew' = w /\ Go(EXP, "e_recheck")
- /\ UNCHANGED <<reqv, refv, gitv, envv, ghostv, lockv, cw, cprep, cfin, aref, aread, passHead>>
+ /\ Need(EXP, IF ImportExpiryLocksSource THEN ImportExpiryLocks ELSE <<>>)
+ /\ UNCHANGED <<reqv, refv, gitv, envv, ghostv, held, cw, cprep, cfin, aref, aread, passHead>>
ExpImpRecheck ==
- /\ pc[EXP] = "e_recheck"
+ /\ Ready(EXP, "e_recheck")
/\ IF ImportExpiryRecheck(ew)
THEN Need(EXP, <<L(BRAIN, "S"), L(CTR, "U"), L(REQ(ew), "U")>>) /\ Go(EXP, "e_imp")
ELSE UNCHANGED want /\ Go(EXP, "idle")
+ /\ held' = IF ImportExpiryRecheck(ew) THEN held ELSE [held EXCEPT ![EXP] = NoLocks]
/\ ew' = IF ImportExpiryRecheck(ew) THEN ew ELSE 0
- /\ UNCHANGED <<reqv, refv, gitv, envv, ghostv, held, cw, cprep, cfin, aref, aread, passHead>>
+ /\ UNCHANGED <<reqv, refv, gitv, envv, ghostv, cw, cprep, cfin, aref, aread, passHead>>
ExpImpCommit ==
/\ Ready(EXP, "e_imp")
diff --git a/spec/tla/refresh-barrier/RefreshBarrierAdopt.cfg b/spec/tla/refresh-barrier/RefreshBarrierAdopt.cfg
new file mode 100644
index 0000000000..6c96b708ac
--- /dev/null
+++ b/spec/tla/refresh-barrier/RefreshBarrierAdopt.cfg
@@ -0,0 +1,30 @@
+\* #8708 as coded on #8705: one uncommitted local edit adopted by a drift refusal, no foreign commit. The two #8705
+\* open findings' invariants are left to RefreshBarrierImport*.cfg. RefreshBarrierAdoptNightly.cfg adds a foreign commit.
+SPECIFICATION Spec
+CHECK_DEADLOCK FALSE
+CONSTANTS
+ NW = 2
+ Blind = {1}
+ MaxRefreshes = 1
+ MaxForeign = 0
+ MaxLocalEdits = 1
+ ImportHolds = TRUE
+ HeldImportBlocks = FALSE
+ ImportExpiryLocksSource = FALSE
+ RecoveryDefers = TRUE
+ AdoptLocalEdits = TRUE
+ MayRestore = FALSE
+ MayRevoke = FALSE
+INVARIANT TypeOK
+INVARIANT NoDeadlock
+INVARIANT AppliedAtMostOnce
+INVARIANT ReceiptMatchesApply
+INVARIANT EveryEndNamed
+INVARIANT ImportedRevisionNeverHidden
+INVARIANT FenceNeverMidPrepare
+INVARIANT DeferredWaitsForRelease
+INVARIANT RefreshChangeNeverOverwritten
+INVARIANT NoDeferToReleased
+INVARIANT ReleasedWhenEnded
+INVARIANT RestoreLeavesNoOpenWrite
+INVARIANT NoApplyAfterRevoke
diff --git a/spec/tla/refresh-barrier/RefreshBarrierEnv.cfg b/spec/tla/refresh-barrier/RefreshBarrierEnv.cfg
new file mode 100644
index 0000000000..31127209c8
--- /dev/null
+++ b/spec/tla/refresh-barrier/RefreshBarrierEnv.cfg
@@ -0,0 +1,31 @@
+\* #8682 with a shared-skill restore and a credential revocation that may each run once (no foreign commit).
+SPECIFICATION Spec
+CHECK_DEADLOCK FALSE
+CONSTANTS
+ NW = 2
+ Blind = {1}
+ MaxRefreshes = 1
+ MaxForeign = 0
+ MaxLocalEdits = 0
+ ImportHolds = FALSE
+ HeldImportBlocks = FALSE
+ ImportExpiryLocksSource = FALSE
+ RecoveryDefers = FALSE
+ AdoptLocalEdits = FALSE
+ MayRestore = TRUE
+ MayRevoke = TRUE
+INVARIANT TypeOK
+INVARIANT NoDeadlock
+INVARIANT AppliedAtMostOnce
+INVARIANT ReceiptMatchesApply
+INVARIANT EveryEndNamed
+INVARIANT ImportedRevisionNeverHidden
+INVARIANT FenceNeverMidPrepare
+INVARIANT DeferredWaitsForRelease
+INVARIANT RefreshChangeNeverOverwritten
+INVARIANT NoDeferToReleased
+INVARIANT ReleasedWhenEnded
+INVARIANT ExpiryOnlyWhileWaiting
+INVARIANT RestoreLeavesNoOpenWrite
+INVARIANT NoApplyAfterRevoke
+INVARIANT CommitsInAdmissionOrder
diff --git a/spec/tla/refresh-barrier/RefreshBarrierImportExpiry.cfg b/spec/tla/refresh-barrier/RefreshBarrierImportExpiry.cfg
new file mode 100644
index 0000000000..edb7514ed0
--- /dev/null
+++ b/spec/tla/refresh-barrier/RefreshBarrierImportExpiry.cfg
@@ -0,0 +1,34 @@
+\* #8705 as coded. Open finding: the import expiry re-checks last_commit without a lock on the source row, so a sync
+\* stamp that commits between the re-check and completeWrite leaves a write failed pending_import_expired after its import
+\* landed. Flip ImportExpiryLocksSource to TRUE once the re-check declares the protocol and locks the source row FOR SHARE.
+\* CommitsInAdmissionOrder is RefreshBarrierImportOrder.cfg's finding.
+\* OPEN_FINDING: ExpiryOnlyWhileWaiting
+SPECIFICATION Spec
+CHECK_DEADLOCK FALSE
+CONSTANTS
+ NW = 2
+ Blind = {1}
+ MaxRefreshes = 1
+ MaxForeign = 1
+ MaxLocalEdits = 0
+ ImportHolds = TRUE
+ HeldImportBlocks = FALSE
+ ImportExpiryLocksSource = FALSE
+ RecoveryDefers = TRUE
+ AdoptLocalEdits = FALSE
+ MayRestore = FALSE
+ MayRevoke = FALSE
+INVARIANT TypeOK
+INVARIANT NoDeadlock
+INVARIANT AppliedAtMostOnce
+INVARIANT ReceiptMatchesApply
+INVARIANT EveryEndNamed
+INVARIANT ImportedRevisionNeverHidden
+INVARIANT FenceNeverMidPrepare
+INVARIANT DeferredWaitsForRelease
+INVARIANT RefreshChangeNeverOverwritten
+INVARIANT NoDeferToReleased
+INVARIANT ReleasedWhenEnded
+INVARIANT ExpiryOnlyWhileWaiting
+INVARIANT RestoreLeavesNoOpenWrite
+INVARIANT NoApplyAfterRevoke
diff --git a/spec/tla/refresh-barrier/RefreshBarrierImportOrder.cfg b/spec/tla/refresh-barrier/RefreshBarrierImportOrder.cfg
new file mode 100644
index 0000000000..795bc9f068
--- /dev/null
+++ b/spec/tla/refresh-barrier/RefreshBarrierImportOrder.cfg
@@ -0,0 +1,34 @@
+\* #8705 as coded (writes held for an import, deferral behind recovery_required). Open finding: a write held for an
+\* import holds back no later write, so a later write to the same page commits between the sync's page import and its
+\* last_commit stamp, and the held write then lands on top of it. Flip HeldImportBlocks to TRUE once the claim's FIFO
+\* rule counts held rows. ExpiryOnlyWhileWaiting is RefreshBarrierImportExpiry.cfg's finding.
+\* OPEN_FINDING: CommitsInAdmissionOrder
+SPECIFICATION Spec
+CHECK_DEADLOCK FALSE
+CONSTANTS
+ NW = 2
+ Blind = {1}
+ MaxRefreshes = 1
+ MaxForeign = 1
+ MaxLocalEdits = 0
+ ImportHolds = TRUE
+ HeldImportBlocks = FALSE
+ ImportExpiryLocksSource = FALSE
+ RecoveryDefers = TRUE
+ AdoptLocalEdits = FALSE
+ MayRestore = FALSE
+ MayRevoke = FALSE
+INVARIANT TypeOK
+INVARIANT NoDeadlock
+INVARIANT AppliedAtMostOnce
+INVARIANT ReceiptMatchesApply
+INVARIANT EveryEndNamed
+INVARIANT ImportedRevisionNeverHidden
+INVARIANT FenceNeverMidPrepare
+INVARIANT DeferredWaitsForRelease
+INVARIANT RefreshChangeNeverOverwritten
+INVARIANT NoDeferToReleased
+INVARIANT ReleasedWhenEnded
+INVARIANT RestoreLeavesNoOpenWrite
+INVARIANT NoApplyAfterRevoke
+INVARIANT CommitsInAdmissionOrder
diff --git a/spec/tla/refresh-barrier/RefreshBarrierLiveness.cfg b/spec/tla/refresh-barrier/RefreshBarrierLiveness.cfg
new file mode 100644
index 0000000000..768d2ca99b
--- /dev/null
+++ b/spec/tla/refresh-barrier/RefreshBarrierLiveness.cfg
@@ -0,0 +1,18 @@
+\* Liveness under fairness: every deferred write leaves deferral, and every admitted write ends.
+SPECIFICATION FairSpec
+CHECK_DEADLOCK FALSE
+CONSTANTS
+ NW = 2
+ Blind = {1}
+ MaxRefreshes = 1
+ MaxForeign = 0
+ MaxLocalEdits = 0
+ ImportHolds = FALSE
+ HeldImportBlocks = FALSE
+ ImportExpiryLocksSource = FALSE
+ RecoveryDefers = FALSE
+ AdoptLocalEdits = FALSE
+ MayRestore = FALSE
+ MayRevoke = FALSE
+PROPERTY DeferredLeaves
+PROPERTY EveryWriteEnds