Repository navigation
Revert #6640 Wave-1 namespace strip — restore main to green - #6847
Merged
Merged
Conversation
gunbai-bot
Bot
changed the title
6 tasks
gunbai-bot Bot
pushed a commit
that referenced
this pull request
Jul 18, 2026
Rebase onto main (namespace revert #6847); drop redundant import-restore commits. Remove misleading shell_path_prefix wrappers in ci_layer_roots (plumb SourceRootShellStyle directly) and add cli_invoke dissolve-on marker for interim _shell builders. Co-authored-by: Cursor <cursoragent@cursor.com>
This was referenced Jul 18, 2026
Closed
briansrls
added a commit
that referenced
this pull request
Jul 18, 2026
…ff raw shell concat onto a modeled operation Brief: docs/plans/shell-intent-emit-realization-design.md Phase 3 (operation family 1: gunbc-run / claim-executor invocations). The flagship (#6833 git.diff) proved the pattern; apply i (#6841) * Phase 3a: centralize gunbc-run / claim-executor invocations (rebased on main) Relocate first-party CLI argv/shell authority to gunbc.cli_invoke and typed service ops to gunbc.cli_services; rewire CI/falsifier/runtime call sites; add frozen deploy golden + witness coverage. Rebases onto main (5a0ed6f). Co-authored-by: Cursor <cursoragent@cursor.com> * fix(gunbc): rebase on main + address review 39605 nits Rebase onto main (namespace revert #6847); drop redundant import-restore commits. Remove misleading shell_path_prefix wrappers in ci_layer_roots (plumb SourceRootShellStyle directly) and add cli_invoke dissolve-on marker for interim _shell builders. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(gunbc): single authority for claim_executor_bin_name (review 39618) build_step_transport imports the constant from gunbc.cli_invoke instead of re-declaring it, closing the §3 fork in the consolidated invocation family. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: Brian Searls <briansearls1@gmail.com> Co-authored-by: Cursor <cursoragent@cursor.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts merge commit 5a0ed6f (#6640, -m 1). Nothing landed on main after it, so this is the exact inverse — main's tree returns byte-identical to pre-merge state c2859a6.
Why: #6640 stripped imports across ~1,650 files before the resolver could place every bare reference. Main went ci-RED: 957 hard compile-clean diagnostics on the dag/ tree (homonyms like Frame/Terminal/Nat/FilePath collapsed to ambiguous by the flat global-bare census) plus src/v2 witness-discovery failures on unique cross-module types (Symbol, ShellProgram — a separate census-scoping gap), plus bare value/function refs (shell, gcp, fold, render). Multiple mechanisms, two corpora — fix-forward means days of red main blocking every PR's CI. Operator-approved decision: revert now, re-land when actually green.
Verified at this head:
cargo build --binsEXIT 0Re-land plan (owned by quiet-gull-833): complete namespace resolution on a branch against the stripped corpus — nearest-container disambiguation replacing the flat census (operator-ruled uniform containment model), the src/v2 scoping gap, bare value/function resolution — then re-land strip + resolver as one atomic PR gated on whole-tree compile-clean green across BOTH trees, not just plan-resolve. The strip content stays in git history; nothing is lost.
🤖 Generated with Claude Code