Skip to content

Restore pre-Codex GERM main (M9 archived for future use) - #16

Merged
JordanD120 merged 7 commits into
mainfrom
codex/restore-pre-codex-main
Nov 18, 2026
Merged

JordanD120 merged 7 commits into
mainfrom
codex/restore-pre-codex-main

Conversation

@JordanD120

@JordanD120 JordanD120 commented Nov 18, 2026 •

Copy link
Copy Markdown
Collaborator

Restores GitHub main's complete tracked source tree to original commit 8789022415ffb44aca8ff88c4d1ba31f4ef994be, while retaining accepted M9, readiness documentation, existing feature branches, PRs, tests, evidence and all integration history. GitHub only: no SSH, Pi access, service operation, deployment, firmware, hardware or data changes. /home/germ/germ-m9-test was not accessed or changed.

Preservation completed before rollback preparation

  • M9 archive branch: exact 8027b9f5b424aa5fc226ea4c3897ee3e2fbfdab3.
  • Annotated preservation tag: same exact M9; tag object 61aeed07f9eff3c70020f2f417fb2c3fb2257503.
  • PR #15 documentation archive: exact 98d209517a47556de31b80e616f8ca93f4f81414, including readiness commit 551ff294afff39c2237bb7a2bd9ca4addb5109f8. This documentation is additional to accepted M9 and remains separately recoverable.
  • Remote branch/tag targets were verified (including annotated-tag type and peeled commit); all pre-existing branches were verified unchanged. No feature/PR/evidence cleanup or deletion is included.

Reverse integration without rewriting history

Current main was checked against 713800931a5926abd8c9c5d57669c124c54dac42; no additional changes were found. This branch starts there and applies seven ordinary git revert --no-edit -m 1 <merge> commits, newest integration first. Both parent identities of every original merge were verified. Each resulting intermediate tree matches the corresponding original first-parent checkpoint.

Original PR Reverted integration merge New revert commit
#11 713800931a5926abd8c9c5d57669c124c54dac42 bfc645bbc98233a51beb35a45f72ff11c88b5f40
#10 b574f7e9ba0a95a6c3dbf1d55a721a46733edabe df6f7f50d5c4134b7f178a6a03ea117e670d90cf
#9 91447920fa052928190174307f55b59c6db14e2c ddf5c6eb122022058eb179b4ab0ef4960a3a7464
#8 5de81b195a683dc27e1858d26eb39af47870aa92 9227ba90d8b38879914155d6c31fc1b45de2c3da
#7 062bf256c6edda1922267643852841b9bb70a85f 51344ca3ded1b3f09ac2c8c68b509b41032fd98e
#6 79927b18754c63e0b79d134e00d4fbdfb7d12034 2311c44d152f064d80e2faefb2605f86798c7581
#5 5ee6228cd6b6c3c28847a9007ff2c27a47bc955e e80cca9d850f86a8eea3dcda404146f50554a12a

Final candidate: e80cca9d850f86a8eea3dcda404146f50554a12a. Final and original tree IDs are both f1516fe4c7bf3b164ced13f36fb0615902bbcd6a. git diff 8789022415ffb44aca8ff88c4d1ba31f4ef994be e80cca9d850f86a8eea3dcda404146f50554a12a is empty, covering every tracked path, Git blob, executable bit and directory. No extra documentation/test/CI file is added to the restored tree. The 42-file legacy baseline retains its original code as requested; M0–M9 files remain recoverable in the archive refs and Git history.

No reset, force push, rebase, squash or branch deletion. Existing local checkouts/untracked files and the Pi installation are outside this source rollback.

Applicable original-baseline validation

  • All 10 original host integration tests passed using existing fake devices/background-worker stubs plus a host-only guard denying physical serial opens/enumeration.
  • Original actual-sketch C++ mock-I/O behavior harness compiled and passed using local WSL g++; no controller or firmware operation.
  • Python AST parsing: 18 files; Jinja parsing: 5 templates; original JavaScript and shell syntax passed.
  • Every intermediate revert tree, final exact-tree equality, clean worktree and unchanged main base passed.
  • The original baseline contains no GitHub Actions workflow files. M0–M9 tests/workflows are preserved in M9, not silently run against the incompatible old API or weakened. Any GitHub-required checks/reviews and actual candidate check runs must be satisfied before merging; no protection/rule configuration is changed.

Original host output:

test_both_modes_compile_upload_and_confirm (__main__.RouteTests.test_both_modes_compile_upload_and_confirm) ... ok
test_fan_command_is_acknowledged (__main__.RouteTests.test_fan_command_is_acknowledged) ... ok
test_host_scripts_rejected (__main__.RouteTests.test_host_scripts_rejected) ... ok
test_invalid_values_never_send (__main__.RouteTests.test_invalid_values_never_send) ... ok
test_lighting_selector_and_unknown_mode (__main__.RouteTests.test_lighting_selector_and_unknown_mode) ... ok
test_routes_preserved (__main__.RouteTests.test_routes_preserved) ... ok
test_upload_token_and_build_failure (__main__.RouteTests.test_upload_token_and_build_failure) ... ok
test_firmware_pause_closes_connection (__main__.SerialTests.test_firmware_pause_closes_connection) ... ok
test_matched_acknowledgement (__main__.SerialTests.test_matched_acknowledgement) ... ok
test_stale_acknowledgement_is_not_success (__main__.SerialTests.test_stale_acknowledgement_is_not_success) ... ok

----------------------------------------------------------------------
Ran 10 tests in 1.302s

OK

C++/shell output:

g++ (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0
Copyright (C) 2021 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

PASS: actual legacy sketch mock-I/O C++ behavior and shell syntax; no SSH, device or deployment operation

Review and restoration instructions

  1. Verify this head, archive refs, seven first-parent reverts, exact tree ID and applicable checks/reviews. Merge with a normal merge commit only after applicable requirements pass. Preserve all branches.
  2. After merge, a normal git fetch origin retrieves restored main; use a fresh local checkout if desired. Do not reset/clean existing workspaces or deploy from this PR. This GitHub operation does not replace software, switch databases, restart services or change hardware on the Pi.
  3. For future M9 inspection/build, create a separate local branch from archive/germ-m9-codex-2026 or the annotated tag. Readiness documentation is under its separate archive branch. Reintroducing M9 to main needs a new reviewed integration plan: already-merged-and-reverted commits are not automatically reapplied by simply merging the same archive ancestry.

User authorization: explicit GitHub-only restoration request dated 2026-11-17 (America/Chicago). No physical, deployment, historical deletion or Pi operation is authorized or performed.

Actual restoration result

Merged and independently verified. New main commit 470963eb9da4ede6813c6872975a9897310c5c0e has the verified original tree f1516fe4c7bf3b164ced13f36fb0615902bbcd6a, exactly matching 8789022415ffb44aca8ff88c4d1ba31f4ef994be. A fresh fetch and full Git diff confirmed equality.

All 10 original host checks, actual-sketch C++, Python/Jinja/JavaScript/shell parsing and exact-tree checks passed. Live policy inspection found no configured protection/rulesets or required reviews/status checks; no candidate failures, pending checks or requested reviews were bypassed, and no policy was changed. The original tree has no hosted CI workflow; no hosted CI run is claimed.

All prior feature branches and PR #5-#15 heads/bases/states remain unchanged. Archive branch, annotated tag/peeled M9 target and documentation archive were reverified after merge. Rollback branch, original workspaces and 15 hashes are preserved. No SSH, Pi access, deployment, hardware operation or history rewrite occurred.

This reverts commit 7138009, reversing
changes made to b574f7e.
This reverts commit b574f7e, reversing
changes made to 9144792.
This reverts commit 9144792, reversing
changes made to 5de81b1.
This reverts commit 5de81b1, reversing
changes made to 062bf25.
This reverts commit 062bf25, reversing
changes made to 79927b1.
This reverts commit 79927b1, reversing
changes made to 5ee6228.
This reverts commit 5ee6228, reversing
changes made to 8789022.
@JordanD120
JordanD120 merged commit 470963e into main Nov 18, 2026
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