From 38cd9bd9dd8a3dd1e91d95952a1702acce4656e1 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Tue, 21 Jul 2026 16:35:12 +0000 Subject: [PATCH 1/3] WIP: shell->dag Phase-2 (Track 1, EMITTER lane not migration): fleet_converge --- dag/gunbc/fleet_converge_emit.dag | 23 +++++++++++++------ dag/gunbc/host_effect.dag | 11 +++------ .../fleet_converge_apply_witness_test.dag | 9 ++------ dag/test/claim/fleet_converge_emit_test.dag | 5 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dag/gunbc/fleet_converge_emit.dag b/dag/gunbc/fleet_converge_emit.dag index 722bba489bd..d0d728044fb 100644 --- a/dag/gunbc/fleet_converge_emit.dag +++ b/dag/gunbc/fleet_converge_emit.dag @@ -10,6 +10,7 @@ import std.layout { render } import std.disposition { Disposition, RealizationDispatch, Scaffold, Terminal } +import extdeps.filesystem.filesystem_io { filesystem_read } import std.decl_ref { DeclarationRef, WholeDeclaration } import gunbc.fleet_converge_apply { converge_apply, @@ -209,6 +210,19 @@ fn fresh_standup_bootstrap_arm_golden() -> String { ) } +fn fresh_standup_bootstrap_srv3_thin_line() -> String { + "gunbc converge --host \"srv3\" || host_failed=1" +} + +fn fresh_standup_bootstrap_committed_byte_oracle_holds() -> Bool { + let committed = filesystem_read(path: ".github/fleet-converge.sh").content + let arm = fresh_standup_bootstrap_arm_golden() + let seam = concat(arm, fresh_standup_bootstrap_srv3_thin_line()) + string_contains(s: committed, pattern: seam) + && !string_contains(s: committed, pattern: concat(seam, "x")) + && !string_contains(s: fresh_standup_bootstrap_script(), pattern: fresh_standup_bootstrap_emit_refused_poison) +} + fn thin_invocation_shell_line(host: HostIdentity) -> String { let inv = fleet_converge_thin_invocation(host: host) concat("gunbc converge --host ", sh_arg(s: inv.argv.last())) @@ -310,11 +324,6 @@ data fleet_converge_steady_state_doc_projection_dissolution_trigger: Disposition } } -data fleet_converge_fresh_standup_bootstrap_emit_dissolution_trigger: Disposition = Scaffold { - dissolves_to: RealizationDispatch, - bind: DeclarationRef { - module_path: "gunbc.fleet_converge_emit", - decl_name: "fresh_standup_bootstrap_intent", - field: WholeDeclaration - } +data fleet_converge_fresh_standup_bootstrap_emit_dissolution_trigger: Disposition = Terminal { + reason: "fresh-standup bootstrap routes through orch_emit_pipeline(intent,Bash) on fresh_standup_bootstrap_intent; fresh_standup_bootstrap_committed_byte_oracle_holds witnesses exact arm+thin-run seam vs .github/fleet-converge.sh (shell→dag P2 consumer slice, #6573/#6585)" } diff --git a/dag/gunbc/host_effect.dag b/dag/gunbc/host_effect.dag index 55cd4aa53cc..ad2dad399ee 100644 --- a/dag/gunbc/host_effect.dag +++ b/dag/gunbc/host_effect.dag @@ -74,16 +74,11 @@ type HostEffectTransport = | EmitArtifactThenThinRun { bootstrap: BootstrapFragment, invocation: ThinInvocation } data host_effect_emit_artifact_transport_scope_disposition: Disposition = Terminal { - reason: "EmitArtifactThenThinRun transport mint (shell-emission slice 1+2): BootstrapFragment.script and ThinInvocation.argv are medium-as-string scaffolds until bash-emit (#5828) routes fresh-standup bootstrap through emit(intent,Bash) and steady-state thin-run through typed argv dispatch; carrier scaffolds bind the dissolution rows below." + reason: "EmitArtifactThenThinRun transport mint (shell-emission slice 1+2): fresh-standup bootstrap routes through emit(intent,Bash) (bootstrap_fragment_script_carrier_scaffold dissolved); ThinInvocation.argv remains a medium-as-string scaffold until steady-state typed argv dispatch dissolves thin_invocation_argv_carrier_scaffold." } -data bootstrap_fragment_script_carrier_scaffold: Disposition = Scaffold { - dissolves_to: RealizationDispatch, - bind: DeclarationRef { - module_path: "gunbc.fleet_converge_emit", - decl_name: "fleet_converge_fresh_standup_bootstrap_emit_dissolution_trigger", - field: WholeDeclaration, - } +data bootstrap_fragment_script_carrier_scaffold: Disposition = Terminal { + reason: "fresh-standup bootstrap emits through orch_emit_pipeline(intent,Bash) on fresh_standup_bootstrap_intent; BootstrapFragment.script is no longer a hand-spelled concat surface for the fleet-converge bootstrap arm (fleet_converge_fresh_standup_bootstrap_emit_dissolution_trigger dissolved)" } data thin_invocation_argv_carrier_scaffold: Disposition = Scaffold { diff --git a/dag/test/claim/fleet_converge_apply_witness_test.dag b/dag/test/claim/fleet_converge_apply_witness_test.dag index d49437322ab..b6a9fa5a25d 100644 --- a/dag/test/claim/fleet_converge_apply_witness_test.dag +++ b/dag/test/claim/fleet_converge_apply_witness_test.dag @@ -57,13 +57,8 @@ fn witness_thin_invocation_argv() -> Bool { fn witness_emit_artifact_carriers_name_bash_emit_scaffolds() -> Bool { match bootstrap_fragment_script_carrier_scaffold { - Scaffold { - dissolves_to: RealizationDispatch, - bind: DeclarationRef { module_path: m, decl_name: d, field: WholeDeclaration }, - } => - m == "gunbc.fleet_converge_emit" - && d == "fleet_converge_fresh_standup_bootstrap_emit_dissolution_trigger" - _ => false + Terminal { reason: _ } => true + Scaffold { dissolves_to: _, bind: _ } => false } && match thin_invocation_argv_carrier_scaffold { Scaffold { diff --git a/dag/test/claim/fleet_converge_emit_test.dag b/dag/test/claim/fleet_converge_emit_test.dag index 03ba16cfe8f..b74f8a513b5 100644 --- a/dag/test/claim/fleet_converge_emit_test.dag +++ b/dag/test/claim/fleet_converge_emit_test.dag @@ -164,6 +164,7 @@ fn witness_fresh_standup_bootstrap_emit_bytes_hold() -> Bool { && has(s: sh, p: gunbc_host_gunbc_root_path) && has(s: sh, p: "cargo build -p v1-compiler --release --bin gunbc") && !has(s: sh, p: fresh_standup_bootstrap_emit_refused_poison) + && fresh_standup_bootstrap_committed_byte_oracle_holds() } fn witness_fresh_standup_bootstrap_arm_perturb_red() -> Bool { @@ -173,8 +174,8 @@ fn witness_fresh_standup_bootstrap_arm_perturb_red() -> Bool { fn witness_fresh_standup_bootstrap_emit_dissolution_scaffold() -> Bool { match fleet_converge_fresh_standup_bootstrap_emit_dissolution_trigger { - Scaffold { dissolves_to: _, bind: _ } => true - Terminal { reason: _ } => false + Terminal { reason: _ } => true + Scaffold { dissolves_to: _, bind: _ } => false } } From 8dfcd7d3469833919f569ab059126e8694764280 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Tue, 21 Jul 2026 16:47:22 +0000 Subject: [PATCH 2/3] WIP: shell->dag Phase-2 (Track 1, EMITTER lane not migration): fleet_converge --- dag/gunbc/fleet_converge_emit.dag | 16 +--------------- dag/test/claim/fleet_converge_emit_test.dag | 11 ++++++++++- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dag/gunbc/fleet_converge_emit.dag b/dag/gunbc/fleet_converge_emit.dag index d0d728044fb..bb6c1f1f862 100644 --- a/dag/gunbc/fleet_converge_emit.dag +++ b/dag/gunbc/fleet_converge_emit.dag @@ -10,7 +10,6 @@ import std.layout { render } import std.disposition { Disposition, RealizationDispatch, Scaffold, Terminal } -import extdeps.filesystem.filesystem_io { filesystem_read } import std.decl_ref { DeclarationRef, WholeDeclaration } import gunbc.fleet_converge_apply { converge_apply, @@ -210,19 +209,6 @@ fn fresh_standup_bootstrap_arm_golden() -> String { ) } -fn fresh_standup_bootstrap_srv3_thin_line() -> String { - "gunbc converge --host \"srv3\" || host_failed=1" -} - -fn fresh_standup_bootstrap_committed_byte_oracle_holds() -> Bool { - let committed = filesystem_read(path: ".github/fleet-converge.sh").content - let arm = fresh_standup_bootstrap_arm_golden() - let seam = concat(arm, fresh_standup_bootstrap_srv3_thin_line()) - string_contains(s: committed, pattern: seam) - && !string_contains(s: committed, pattern: concat(seam, "x")) - && !string_contains(s: fresh_standup_bootstrap_script(), pattern: fresh_standup_bootstrap_emit_refused_poison) -} - fn thin_invocation_shell_line(host: HostIdentity) -> String { let inv = fleet_converge_thin_invocation(host: host) concat("gunbc converge --host ", sh_arg(s: inv.argv.last())) @@ -325,5 +311,5 @@ data fleet_converge_steady_state_doc_projection_dissolution_trigger: Disposition } data fleet_converge_fresh_standup_bootstrap_emit_dissolution_trigger: Disposition = Terminal { - reason: "fresh-standup bootstrap routes through orch_emit_pipeline(intent,Bash) on fresh_standup_bootstrap_intent; fresh_standup_bootstrap_committed_byte_oracle_holds witnesses exact arm+thin-run seam vs .github/fleet-converge.sh (shell→dag P2 consumer slice, #6573/#6585)" + reason: "fresh-standup bootstrap routes through orch_emit_pipeline(intent,Bash) on fresh_standup_bootstrap_intent; witness_fresh_standup_bootstrap_committed_byte_oracle_holds in fleet_converge_emit_test.dag byte-oracles the arm+thin-run seam vs .github/fleet-converge.sh (shell→dag P2 consumer slice, #6573/#6585)" } diff --git a/dag/test/claim/fleet_converge_emit_test.dag b/dag/test/claim/fleet_converge_emit_test.dag index b74f8a513b5..401594fcc1b 100644 --- a/dag/test/claim/fleet_converge_emit_test.dag +++ b/dag/test/claim/fleet_converge_emit_test.dag @@ -154,6 +154,15 @@ fn witness_gunbc_pinned_tree_runs_first() -> Bool { } } +fn witness_fresh_standup_bootstrap_committed_byte_oracle_holds() -> Bool { + let committed = filesystem_read(path: ".github/fleet-converge.sh").content + let arm = fresh_standup_bootstrap_arm_golden() + let seam = concat(arm, "gunbc converge --host \"srv3\" || host_failed=1") + has(s: committed, p: seam) + && !has(s: committed, p: concat(seam, "x")) + && !has(s: fresh_standup_bootstrap_script(), p: fresh_standup_bootstrap_emit_refused_poison) +} + fn witness_fresh_standup_bootstrap_emit_bytes_hold() -> Bool { let sh = expected_fleet_converge_sh() has(s: sh, p: fresh_standup_bootstrap_arm_golden()) @@ -164,7 +173,7 @@ fn witness_fresh_standup_bootstrap_emit_bytes_hold() -> Bool { && has(s: sh, p: gunbc_host_gunbc_root_path) && has(s: sh, p: "cargo build -p v1-compiler --release --bin gunbc") && !has(s: sh, p: fresh_standup_bootstrap_emit_refused_poison) - && fresh_standup_bootstrap_committed_byte_oracle_holds() + && witness_fresh_standup_bootstrap_committed_byte_oracle_holds() } fn witness_fresh_standup_bootstrap_arm_perturb_red() -> Bool { From 99f46f5cde3c00cb654505e2d4e5f2525602899f Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Tue, 21 Jul 2026 16:57:05 +0000 Subject: [PATCH 3/3] fix(fleet-converge): newline seam in bootstrap byte-oracle witness The committed .github/fleet-converge.sh separates the emitted bootstrap arm from the srv3 thin-run line with a newline; the oracle must match that seam exactly. Co-authored-by: Cursor --- dag/test/claim/fleet_converge_emit_test.dag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dag/test/claim/fleet_converge_emit_test.dag b/dag/test/claim/fleet_converge_emit_test.dag index 401594fcc1b..3a067dd35c3 100644 --- a/dag/test/claim/fleet_converge_emit_test.dag +++ b/dag/test/claim/fleet_converge_emit_test.dag @@ -157,7 +157,7 @@ fn witness_gunbc_pinned_tree_runs_first() -> Bool { fn witness_fresh_standup_bootstrap_committed_byte_oracle_holds() -> Bool { let committed = filesystem_read(path: ".github/fleet-converge.sh").content let arm = fresh_standup_bootstrap_arm_golden() - let seam = concat(arm, "gunbc converge --host \"srv3\" || host_failed=1") + let seam = concat(concat(arm, "\n"), "gunbc converge --host \"srv3\" || host_failed=1") has(s: committed, p: seam) && !has(s: committed, p: concat(seam, "x")) && !has(s: fresh_standup_bootstrap_script(), p: fresh_standup_bootstrap_emit_refused_poison)