Skip to content

Bootstrap: refresh gen-0 compiler_lib sidecar stamp after spine drift (#1492) - #15227

Merged
PurHur merged 1 commit into
masterfrom
agent/issue-1492-refresh-gen0-sidecar
Jul 3, 2026
Merged

PurHur merged 1 commit into
masterfrom
agent/issue-1492-refresh-gen0-sidecar

Conversation

@PurHur

@PurHur PurHur commented Jul 3, 2026

Copy link
Copy Markdown
Owner

Summary

  • Updates prelinked/bootstrap-gen0/.m3_compiler_lib_sidecar.sha to match current compiler_lib_spine_smoke/main.php SHA (00962fc5…, was stale ae5d54d6…).
  • Refreshes manifest.json generated_at via bootstrap-gen0-refresh-sidecar.
  • Fixes script/docker-exec.sh tar-fallback sync-back: merge prelinked/bootstrap-gen0/ with docker cp …/. instead of nesting bootstrap-gen0/bootstrap-gen0/ (exited containers cannot docker exec for path classification).

Unblocks M4 bootstrap-loop-gen2-recompile-spine / make bootstrap-loop-probe when native parseAndCompile returns null but gen-0 sidecar fallback is valid.

Test plan

php script/check-selfhost-spine-sidecar-sync.php
# check-selfhost-spine-sidecar-sync: OK (stamp matches spine entry SHA-1 00962fc5…)

./script/docker-exec.sh -- bash -lc './script/bootstrap-loop-gen2-recompile-spine.sh'
# bootstrap-loop-gen2-recompile-spine: OK gen-2=… gen-3=… (3760/3760 spine, argv -o)

./script/docker-exec.sh -- bash -lc 'make bootstrap-loop-probe'
# bootstrap-loop-probe: M4 full ladder OK — gen-1→gen-2 native + gen-2→gen-3 spine + full-revision (exit 0)

Relates to #1492, #8703, #8704.

Made with Cursor

…#1492).

Spine entry SHA moved to 00962fc5 but prelinked stamp still had ae5d54d6,
blocking M4 gen-2→gen-3 recompile sidecar fallback. Fix docker-exec tar
sync-back to merge prelinked/bootstrap-gen0/ instead of nesting dir/dir.

Co-authored-by: Cursor <cursoragent@cursor.com>
@PurHur
PurHur merged commit 4fcb194 into master Jul 3, 2026
@PurHur
PurHur deleted the agent/issue-1492-refresh-gen0-sidecar branch July 3, 2026 00:50
PurHur added a commit that referenced this pull request Jul 3, 2026
…5226 (#15231)

PR #15227 stamped 00962fc5 (pre-merge spine) while master spine entry is
daeee12a after asinh/strcasecmp spine includes — restore sidecar sync gate.

Co-authored-by: PurHur <PurHur@users.noreply.github.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
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