Skip to content

Re-land #283 unlocks (Quantum, Disambiguator, verb_table, animal-farm harness) — orphaned by merge order#285

Merged
AdaWorldAPI merged 3 commits into
mainfrom
claude/grammar-unlocks-r2-2026-04-29
Apr 29, 2026
Merged

Re-land #283 unlocks (Quantum, Disambiguator, verb_table, animal-farm harness) — orphaned by merge order#285
AdaWorldAPI merged 3 commits into
mainfrom
claude/grammar-unlocks-r2-2026-04-29

Conversation

@AdaWorldAPI
Copy link
Copy Markdown
Owner

Why this PR exists

PR #283 was marked merged but the unlock content never landed on main. The merge order on 2026-04-29 was:

time event
06:26:38 #282 (grammar-fixes) merged to main
06:26:45 #283 (grammar-unlocks) merged to claude/grammar-fixes-r2-2026-04-29 (its base — already drained into main)

#283 landed on the orphaned branch tip 7d7b7224, which is no longer reachable from main. The three unlock commits sit there with nowhere to go.

This PR brings that content forward against the current main. No content change vs the original #283 — same three commits, same +845 / -22 footprint across 9 files.

What's wired

  • B-unlock-yaml-style (bbb9898) — YAML robustness + Instrument variant + persistence + 144-cell verb taxonomy table
  • B-unlock-bridge (30e43f8)Trajectory audit-hash bridge + generalised Disambiguator trait + Quantum mode (PhaseTag + HolographicMode) + Animal Farm forward-validation harness
  • B-META R2 unlocks (5f17459) — Wires verb_table + disambiguator + trajectory_audit + quantum_mode modules + the PhaseTag u128::MAX as f32 → infinity overflow fix

Files changed (vs current main)

crates/deepnsm/src/lib.rs                          |   ?   modified
crates/deepnsm/src/quantum_mode.rs                 |   ?   added
crates/deepnsm/src/trajectory_audit.rs             |   ?   added
crates/deepnsm/tests/animal_farm_harness.rs        |   ?   added
crates/lance-graph-contract/src/grammar/disambiguator.rs   |   added
crates/lance-graph-contract/src/grammar/mod.rs     |   8 +  modified
crates/lance-graph-contract/src/grammar/tekamolo.rs|   9 +/-1   modified
crates/lance-graph-contract/src/grammar/thinking_styles.rs | 244 +/-   modified
crates/lance-graph-contract/src/grammar/verb_table.rs      | 120 +    added
9 files changed, 845 insertions(+), 22 deletions(-)

Verification

Cross-link

Generated by Claude Code


Generated by Claude Code

claude added 3 commits April 29, 2026 05:49
… + quantum_mode + PhaseTag fix

- Re-exported VerbFamily, VerbRoleTable, SlotPrior, default_table from grammar/mod.rs
- Re-exported Disambiguatable, GeneralizedResult, disambiguate_general
- Added pub mod trajectory_audit + pub mod quantum_mode in deepnsm/lib.rs
- Fixed PhaseTag from_angle/to_angle: u128::MAX as f32 was overflowing to
  infinity, producing NaN on round-trip. Switched to f64 intermediate and
  use only the low 64 bits (high 64 reserved for future precision)
@AdaWorldAPI AdaWorldAPI merged commit 55a6179 into main Apr 29, 2026
2 of 10 checks passed
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5f1745969f

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment on lines +18 to +19
pub fn pi() -> Self {
PhaseTag(u128::MAX / 2)
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Encode π from the low 64-bit phase domain

to_angle decodes only the low 64 bits of PhaseTag, but pi() sets the full 128-bit value to u128::MAX / 2; that makes the low half u64::MAX, so PhaseTag::pi().to_angle() resolves to ~TAU (2π), not π. Any caller using pi() as a canonical half-turn phase will get the wrong phase offset and distance behavior. pi() should be derived from the same low-half mapping as from_angle (or set low bits to ~u64::MAX / 2).

Useful? React with 👍 / 👎.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants