Skip to content

Reconcile stable master into dev - #89

Merged
lost-rob0t merged 44 commits into
devfrom
agent/reconcile-master-into-dev-2026-07-31
Aug 2, 2026
Merged

Reconcile stable master into dev#89
lost-rob0t merged 44 commits into
devfrom
agent/reconcile-master-into-dev-2026-07-31

Conversation

@lost-rob0t

Copy link
Copy Markdown
Owner

Goal

Restore the repository branch policy after recent work landed on master while dev continued independently.

  • dev remains the integration branch.
  • master remains the stable branch.
  • This branch starts from current master so conflict-resolution commits can be made without modifying master.
  • The merge must retain the 10 operational-salvage commits unique to dev and the 31 commits currently unique to master.

Why this must land first

Open PRs #79 and #86 now correctly target dev, but conflict because the branches diverged. PR #87 was already merged into master; this reconciliation carries its database repair into dev while preserving the operational runtime already present there.

Merge gate

  • resolve overlapping runtime/package/ASDF/view files without dropping either side
  • run schema lock, unit, integration, smoke, and container-stack checks on the merged tree
  • merge into dev only when required checks are green

After this lands, re-evaluate #79 and #86 against synchronized dev.

Adds a shared HTTP boundary, client-safe error envelopes, strict JSON validation, correlation IDs, bounded numeric query parsing, and actor-backed asynchronous bulk ingest with global and per-principal quotas.

Fixes #25.
Adds the HTTP authentication threat model, principal/capability contract, and the KV lease trust boundary. Documents default-deny behavior, API-key lifecycle, OIDC/mTLS adapters, scope restrictions, redaction, audit, bootstrap, rotation, revocation, recovery, failure behavior, and required verification.

Fixes #26.
Adds default-deny API-key authentication, immutable request and service contexts, separate CouchDB credential storage, one-time bootstrap, credential create/list/rotate/revoke/disable lifecycle, uniform constant-time verification, exact-origin CORS, authenticated bulk/Rabbit provenance, owner-scoped bulk-job status, Docker secret delivery, runtime settings rehydration, and mandatory lifecycle/concurrency/oracle/immutability tests.

The container stack verifies bootstrap, denial, authenticated FTS, restart health, credential persistence, and search after restart.

Fixes #27.
Add a dry-run-first CouchDB relation deduplication migration with canonical directed identities, evidence merging, automatic backup, two-phase writes, malformed-document protection, documentation, and focused tests.
Preserve the hardened authentication, documentation, schema, and relation-repair work from the stable line while integrating dev's owner-thread Rabbit runtime, bounded retry/quarantine, outbox, target recovery, document update, view registry, and operational acceptance tests.
@lost-rob0t
lost-rob0t marked this pull request as ready for review August 2, 2026 00:48
@lost-rob0t
lost-rob0t merged commit 1395263 into dev Aug 2, 2026
5 checks passed
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.

1 participant