Merged the independently reviewed XEntropy API Key Table into local canonical main while preserving all five pre-existing dirty owner files byte-for-byte and leaving runtime, providers, secrets, remote publication, LiteLLM, and Tyrell untouched.

XEntropy API Key Table local merge

Scope

• Host: rdmsm4x.
• Canonical project: /Users/richh/dev/apps/Xentropy.
• Reviewed feature worktree: /Users/richh/dev/_handoff/codex-out/xentropy-api-key-table-v1.
• Clean integration worktree: /Users/richh/dev/_handoff/codex-out/xentropy-api-key-table-v1-integration.
• Reviewed feature HEAD: 20eab06057e0b734e28ea78c29cbdbf8ffa2f8d7.
• Integration merge commit: 51a448a2b9896a69a1fa1c9c5067767662d11fcf.
• Final local main: 16810dd57ee180c52b92cbdfcf2cdc4419d5891e.
• Remote origin/main: f41eb604575450645da5cd97806a4e1e8ec081c6; no push occurred.

What changed

• Reverified the feature branch with the full Swift suite.
• Created codex/api-key-table-v1-integration from the exact local/remote main base and merged codex/api-key-table-v1 with an explicit no-fast-forward merge commit.
• Reverified the merged integration tree with the full suite, both requested product builds, diff checks, and count-only secret-boundary scans.
• Captured the canonical checkout's two modified and three untracked owner files in recovery stash 47f56816fd4eb33a4a0efa8df7acb18eaa423bde, a verified pre-merge Git bundle, and a SHA-256 manifest.
• Fast-forwarded local canonical main to the verified merge, restored all five owner files from the immutable stash trees, and confirmed every restored SHA-256 exactly matched its pre-merge value.
• Committed only feature-owned lifecycle records, ISSUES.md and SESSION-STATE.md, as 16810dd57ee180c52b92cbdfcf2cdc4419d5891e.
• Updated the fleet PROJECTS.md milestone and coordination check-in to distinguish local integration from push, runtime activation, provider use, and deployment.

Preserved dirty owner state

The canonical checkout again contains exactly:

• Modified: PROJECT_SUMMARY.md
• Modified: docs/backlog/phased-roadmap.md
• Untracked: STATUS.md
• Untracked: docs/product/PRD-addendum-2026-08-24-automation-and-api-observability.md
• Untracked: docs/research/field-evidence-credential-sprawl-2026-08-24.md

The five restored hashes are recorded in the recovery manifest and match the pre-merge measurements exactly. They were not staged, committed, semantically reconciled, discarded, or silently absorbed into the feature.

Recovery artifacts

• Manifest: /Users/richh/dev/_migration/conflicts/rdmsm4x-20260828-xentropy-api-key-table-merge/MANIFEST.md
• Pre-merge complete bundle: /Users/richh/dev/_migration/conflicts/rdmsm4x-20260828-xentropy-api-key-table-merge/xentropy-premerge.bundle
• Post-merge complete bundle: /Users/richh/dev/_migration/conflicts/rdmsm4x-20260828-xentropy-api-key-table-merge/xentropy-local-main-16810dd.bundle
• Recovery stash: 47f56816fd4eb33a4a0efa8df7acb18eaa423bde

Both bundles are mode 0600, passed git bundle verify, and contain complete history plus the feature, integration, and stash refs needed for recovery.

Commands and verification

• git fetch origin main confirmed local and remote base f41eb604575450645da5cd97806a4e1e8ec081c6.
• swift test --package-path app passed 122/122 on the feature branch, the clean integration merge, canonical main after restoration, and final local main after the lifecycle commit.
• swift build --package-path app --product XEntropy passed.
• swift build --package-path app --product xentropyctl passed.
• git diff --check passed.
• Count-only provider-key, private-key, production locator, and production bearer-literal scans returned zero matching files; no matched content was printed.
• Count-only scans over the five dirty owner files returned zero provider-key-shaped values, private-key blocks, or obvious long secret assignments.
• git bundle verify passed for both recovery bundles.
• The final five-file status and all five SHA-256 values match the pre-merge state.

Explicit non-changes

• No push, pull request, tag, release, signing, publication, or deployment.
• No app catalog activation or live schema migration.
• No production listener, Keychain credential, bearer pairing, public connector, or claude.ai connector.
• No secret import, reveal, copy, validation, creation, rotation, or revocation.
• No provider, LiteLLM, Tyrell, TokenBar, CloudKit, firewall, Tailscale, or account mutation.
• The exposed OpenRouter generation remains pending owner revocation and was not read, copied, validated, or imported.

Undo and outstanding owner actions

The merge is local and recoverable. Preserve the five dirty owner files first, verify the recovery bundles, and use new revert commits if the API Key Table integration must be backed out; do not overwrite the dirty checkout or drop the recovery stash. The next owner decisions are whether to push local main, how to reconcile the five restored documentation paths, and when to run the separately gated foreground credential/pairing/provider canaries.