rdmsm4x-changelog-20260830-2211-xentropy-additive-reconciliation
rdmsm4x-changelog-20260830-2211-xentropy-additive-reconciliation
Restored the feature-rich XEntropy product in an isolated branch
after a destructive scanner integration, preserved the newer
shared-library and universal-build work additively, and kept canonical
main and all fleet runtimes unchanged while independent
review is pending.
Scope
- Host:
rdmsm4xonly. - Canonical repository observed read-only:
/Users/richh/dev/apps/Xentropyat cleanmaincommit733d5b9eb1d8413f95c75395229224bc6fb48abf. - Writable isolated worktree:
/Users/richh/dev/apps/Xentropy-additive-reconciliation-v2. - Branch/checkpoint:
codex/xentropy-additive-reconciliation-v2at80271e5145830b601291a5b8ae19cda5f7f4e84f. - Ticket:
ISSUE-20260830-43, parentEPIC-20260830-08.
Files changed
- The complete 148-path manifest is recorded immutably by
git show --name-status 80271e5145830b601291a5b8ae19cda5f7f4e84f. - Principal restored surfaces:
app/Sources/XEntropy/APIKeyTableView.swift,app/Sources/XEntropy/CredentialCatalogClient.swift,app/Sources/XEntropy/LifecycleControlRoomView.swift,app/Sources/XEntropyCLI/,app/Sources/XEntropyGateway/, SQLite catalog/lifecycle sources underapp/Sources/XEntropyCore/, their full test targets, and the installer/verifier scripts. - Principal additive/hardened surfaces:
app/Package.swift,app/Sources/XEntropy/ScannerView.swift,app/Sources/XEntropy/SettingsView.swift,app/Sources/XEntropy/WorkspaceViewModel.swift,app/Sources/XEntropyCore/ScannerEngine.swift,app/Sources/XEntropyCore/ScanModels.swift, and scanner/CSV/app tests. - Project evidence updated:
SESSION-STATE.md,STATUS.md,ISSUES.md, andCHANGELOG.md. - Coordination state updated:
/Users/richh/.agent-coordination/checkins/codex-xentropy-additive-reconciliation-20260830.json.
What changed and why
- Reversed the destructive portion of
10a578e, which had deleted the accepted catalog, UI, CLI, API, Stateless MCP, lifecycle, tests, docs, and rollout tooling. - Preserved the universal2 gate from
733d5b9and integratedECS0UI,ECS0Permissions, andECS0Systemadditively. - Replaced the fabricated scanner samples with an explicit-root foreground adapter over the existing values-free discovery engine. Empty scope returns empty evidence; portable candidates contain redacted relative locations and no raw/masked value, digest, private absolute path, or authority locator.
- Relative to accepted rollout commit
6b32618, the checkpoint deletes zero files and changes 36 files with 1,247 insertions and 33 deletions.
Commands and verification
swift test --package-path app— 245 XCTest cases, zero failures: 53 app/UI, 15 gateway, 141 core, 36 CLI/transport.swift build --package-path app --product XEntropy— passed.swift build --package-path app --product xentropyctl— passed../script/build_and_run.sh --verify— passed; bundle architecturesx86_64 arm64.- A disposable
git archiveat/Users/richh/dev/apps/.xentropy-review-80271e5.oQQp23independently reproduced the full test and universal2 results. git diff --check— clean after whitespace-only corrections.- Count-only production scan — zero provider-key marker files, zero private-key marker files, zero forbidden scanner value/hash fields, zero hard-coded private scanner locator files.
- Review requests sent values-free as
20260830-220244-A3EDD001and20260830-220505-6F1A990D.
Recovery and undo
- Recovery bundle:
/Users/richh/dev/_migration/conflicts/rdmsm4x-20260830-xentropy-additive-reconciliation/xentropy-additive-reconciliation-80271e5.bundle. - Bundle mode:
0600; SHA-256:e7f02cf6e91554b914c31930b6a1c8196b7439c6799ade94e03bbfa5c45a1fb5. - Canonical
mainwas not moved. To abandon the proposed reconciliation, leavemainat733d5b9; the branch, worktree, disposable archive, and bundle are retained for recovery.
Outstanding owner actions
- Await independent ACCEPT or exact revision findings before canonical merge.
- After accepted merge, build/sign only on
rdmsm4x, then use the rollback-protected installer and exact per-host verification before claiming fleet redeployment. - No credential import, secret validation, provider mutation, public listener, or fleet runtime action occurred in this checkpoint.
- Apple Notes publication is pending because this session is running
under the
Backgroundlaunchd manager rather than an Aqua desktop session.