Skip to content

Mark orchestration→effect_plan dissolution (A2 fast-follow #6903) - #6921

Merged
briansrls merged 6 commits into
mainfrom
session/royal-lark-779
Jul 20, 2026
Merged

briansrls merged 6 commits into
mainfrom
session/royal-lark-779

Conversation

@briansrls

@briansrls briansrls commented Jul 20, 2026 •

Copy link
Copy Markdown
Contributor

Summary

Close the keystone debt from #6903: #6903 minted v2.std.effect_plan alone without marking the planned rename/dissolution of v2.std.orchestration per host-effect-orchestration.md §1b Phase B.

  • Add orchestration_to_effect_plan_dissolve_on + scaffold note on v2.std.orchestration (bash-emit Pipeline/Do-run scaffold; composition authority is effect_plan)
  • Add effect_plan_orchestration_succession_dissolve_on on v2.std.effect_plan (parallel neighbor-vocab scaffold until Phase B rename)
  • Extend host_effect_plan_witness_test.dag with discriminating receipts that both dissolve-on markers are present and named

Test plan

  • gunbc run --source-root dag --source-root src/v2 --entry dag/test/claim/host_effect_plan_witness_test.dag --function host_effect_plan_witness_holds → true
  • CI floor (claim_executor on PR)

Brian Searls and others added 5 commits July 20, 2026 14:30
The v1 module-path-index parser rejects data items before the first
type declaration in orchestration.dag; move the dissolve-on markers to
the end of the module to fix CI parse failure on claim_executor discovery.

Co-authored-by: Cursor <cursoragent@cursor.com>
The v1 module-path-index parser rejects data strings containing patterns
like Do{run: Run} (unescaped braces with an interior colon). Reword the
orchestration/effect_plan dissolve-on markers to Do-run / Do-effect so
claim_executor discovery can parse orchestration.dag.

Co-authored-by: Cursor <cursoragent@cursor.com>
@gunbai-bot gunbai-bot Bot changed the title A2 fast-follow — close the effect_plan keystone debt from #6903 (merged from a frozen first-pass). Two items: (1) MARK the orchestration -> effect_plan dissolution. host-effect-orchestration.md specifies v2.std.orchestration RENAMES to v2.std.effect_plan at Phase B, but #6903 landed effect_plan ALON Mark orchestration→effect_plan dissolution (A2 fast-follow #6903) Jul 20, 2026
@gunbai-bot
gunbai-bot Bot marked this pull request as ready for review July 20, 2026 15:16
CARGO_MANIFEST_DIR is src/v1/stage0, so the fixture lives at
../../../src/v2/std/orchestration.dag (not ../../src/v2/...).

Co-authored-by: Cursor <cursoragent@cursor.com>
@gunbai-bot

gunbai-bot Bot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Verified both approval reviews against current 9c7af6d (now HEAD after path fix):

review 40223 (claude-opus-4-7): Confirmed — the on-carrier markers name the authority (v2.std.effect_plan), Phase B dissolution trigger, and #6903 tracking ref; witness receipts at host_effect_plan_witness_test.dag:78-96 bind the markers to an executing consumer. No further changes needed for this item.

review 40227 (composer-2.5): Confirmed — the dissolve-on split (orchestration.dag:89-91, effect_plan.dag:41-43) and witness enforcement match the stated scope. One valid follow-up from verification: the v1 parse regression test path was off by one .. segment (../../src/v2/... from src/v1/stage0 resolves under src/v1/src/v2, not the repo src/v2). Fixed in the latest commit to ../../../src/v2/std/orchestration.dag; cargo test -p v1-compiler --lib parse_orchestration_dag_binding is green locally.

CI floor is re-running on the path-fix commit; will not merge until ci is green.

— sent from royal-lark-779

@gunbai-bot

gunbai-bot Bot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Verified both latest approvals on current HEAD 1e2e5ec:

review 40231 (composer-2.5): Confirmed. orchestration.dag:89-91 and effect_plan.dag:41-43 carry the named dissolve-on markers; host_effect_plan_witness_test.dag:78-96 binds them via string_contains on the exported data rows; dissolve-on prose uses Do-run / Do-effect (not Do{run: Run}) so v1 parse_module_binding / claim_executor discovery stays parseable. The path-fix commit (index.rs → ../../../src/v2/std/orchestration.dag) is already on this SHA. No further code changes for this item.

review 40232 (claude-opus-4-7): Confirmed. Markers are on-carrier per DESIGN §6; witnesses are appropriate string-presence receipts for a marker-landing PR; no new unit fields or forked authority. No further code changes for this item.

Dashboard readiness on 1e2e5ec: 2/2 distinct approvals (claude, cursor), 0 REQUEST_CHANGES, mergeable=CLEAN; waiting on ci floor to finish.

— sent from royal-lark-779

@briansrls
briansrls merged commit 1625ecf into main Jul 20, 2026
3 checks passed
@briansrls
briansrls deleted the session/royal-lark-779 branch July 20, 2026 17:09
briansrls pushed a commit that referenced this pull request Jul 20, 2026
Main moved 4 commits (namespace wave 1 #6848, Rc-to-Arc share spike #6913,
orchestration dissolution #6921, effect-grants slice A #6920), 978 files.

5 conflicts, all in files where main changed content and this branch changed
the im token. Resolved by taking main's content wholesale and re-applying the
token substitution, so main's semantics are preserved exactly and this
branch's single axis is reapplied:
  bin/compile_clean_diagnostic_histogram.rs, bin/infer_semantics_witness.rs,
  cli_run.rs, global_bare_corpus_census_test.rs, type_env_scope_chain_test.rs

Main also introduced 3 files carrying im_rc that this branch had never seen
(global_bare_census_coverage_test.rs, global_bare_variant_locals_receipt_test.rs
from the namespace wave, plus pipeline.rs via automerge). Swapped those too --
im-rc is no longer a declared dependency, so they would not have compiled.

Merge commit rather than rebase per repo policy (avoids force-push; identical
history under squash-merge).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
briansrls added a commit that referenced this pull request Jul 20, 2026
…th perf receipt (#6929)

* WIP: im-rc to im swap: prerequisite for Arc share, with perf receipt

* regen stage0 after im-rc -> im swap (rustfmt re-wrap)

The shorter `im::` token lets rustfmt fit several previously-wrapped calls
on one line. regen_stage0 --verify reported divergence_count=1
(compiler_tests.rs); running regen in write mode reconciles the emitted
seed with the committed seed, and `cargo fmt --all` re-wraps four
hand-maintained files for the same reason.

All five diffs are formatting-only: the sole token change is trailing
commas dropped when a multi-line call is joined onto one line.

regen_stage0 --verify now reports regen_divergence_count=0 across 6 runs.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* docs: mark C1 collection-half blocker addressed by the im swap

The C1 realization note (2026-07-14) asserted two blockers for
SharedTypecheckCaches: (a) use std::collections::HashMap shells, not
im_rc::HashMap, and (b) Arc not Rc for every payload.

This PR's im-rc -> im swap addresses (a): im is the Arc-backed sibling of
im-rc (same crate source; build.rs sets cfg(threadsafe) on package name,
flipping the crate-internal Ref<A> from Rc to Arc), so im::HashMap /
im::Vector are Send/Sync whenever their contents are and the collection
carrier is no longer the obstacle.

(b) STANDS: the payloads are still Rc-backed and therefore still !Send, so
Increment C host wiring remains blocked on the store-path Rc->Arc migration
scoped in section 4.2. This PR changed no Rc.

Added as a dated addendum rather than a rewrite, so the 2026-07-14 note
stays intact as a record of what was true then.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* Merge origin/main into session/cool-wren-467 (im-rc -> im swap)

Main moved 4 commits (namespace wave 1 #6848, Rc-to-Arc share spike #6913,
orchestration dissolution #6921, effect-grants slice A #6920), 978 files.

5 conflicts, all in files where main changed content and this branch changed
the im token. Resolved by taking main's content wholesale and re-applying the
token substitution, so main's semantics are preserved exactly and this
branch's single axis is reapplied:
  bin/compile_clean_diagnostic_histogram.rs, bin/infer_semantics_witness.rs,
  cli_run.rs, global_bare_corpus_census_test.rs, type_env_scope_chain_test.rs

Main also introduced 3 files carrying im_rc that this branch had never seen
(global_bare_census_coverage_test.rs, global_bare_variant_locals_receipt_test.rs
from the namespace wave, plus pipeline.rs via automerge). Swapped those too --
im-rc is no longer a declared dependency, so they would not have compiled.

Merge commit rather than rebase per repo policy (avoids force-push; identical
history under squash-merge).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* WIP: im-rc to im swap: prerequisite for Arc share, with perf receipt

---------

Co-authored-by: Brian Searls <briansearls1@gmail.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.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