artdag: record ready-to-merge-to-architecture status (Phase 7 absent on origin/architecture)
Some checks failed
Test, Build, and Deploy / test-build-deploy (push) Has been cancelled
Some checks failed
Test, Build, and Deploy / test-build-deploy (push) Has been cancelled
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -33,7 +33,26 @@ edges.
|
|||||||
|
|
||||||
`bash lib/artdag/conformance.sh` → **198/198** (11 suites: dag, analyze, plan, execute, optimize, fed, cost, serialize, stats, fault, maude-optimize)
|
`bash lib/artdag/conformance.sh` → **198/198** (11 suites: dag, analyze, plan, execute, optimize, fed, cost, serialize, stats, fault, maude-optimize)
|
||||||
|
|
||||||
Base roadmap (Phases 1–6) COMPLETE. Now extending.
|
Base roadmap (Phases 1–6) COMPLETE + Phase 7 (maude rule-based optimization) COMPLETE
|
||||||
|
(only optional miniKanren scheduling remains). Now hardening only.
|
||||||
|
|
||||||
|
## Integration / merge status (2026-06-28)
|
||||||
|
|
||||||
|
**READY TO MERGE `loops/artdag` → `architecture`.** `origin/architecture`'s `lib/artdag/`
|
||||||
|
is stale — it predates the maude-bridge, so it is missing ALL of Phase 7
|
||||||
|
(`maude-bridge.sx` + `optimize-rules.sx` both absent). `loops/artdag` is 9 commits ahead
|
||||||
|
of `origin/architecture` (the Phase 7 chain `657d8061..4a02a9c4` + the architecture-merge
|
||||||
|
`7f7957ba` that pulled in `lib/maude`). Merge facts:
|
||||||
|
- **Dependency satisfied on target:** Phase 7 consumes `lib/maude` (incl. `confluence.sx`),
|
||||||
|
already on architecture (`0963aa51`); this branch re-absorbed it at `7f7957ba`.
|
||||||
|
- **Conflict-free for artdag files:** `origin/architecture` is an ancestor of HEAD and the
|
||||||
|
branch already absorbed architecture, so `lib/artdag/**` + this plan are purely additive.
|
||||||
|
- **Target is LOCAL architecture** (146 ahead of `origin/architecture`, which is kept
|
||||||
|
deliberately stale), matching how other loops landed.
|
||||||
|
- **BLOCKED on push first:** the 5 newest commits (`1fd3aea8..4a02a9c4`) are local-only —
|
||||||
|
push to `origin/loops/artdag` is broken in this worktree (empty `~/.git-credentials`).
|
||||||
|
Restore the credential, push, then a maintainer does the merge (the loop agent must NOT
|
||||||
|
touch `architecture` itself).
|
||||||
|
|
||||||
## Ground rules
|
## Ground rules
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user