From 4a3cc47236c8a9cdf6d482e837fcc8d47d13debb Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 13 Jul 2026 01:35:19 +0100 Subject: [PATCH] Replace queue prose with typed rows --- epiphany-core/src/bin/epiphany-swarm.rs | 70 +++++++++++++----- epiphany-core/src/bin/epiphany-work.rs | 58 ++++++++++++--- ...onceptual-substitution-audit-2026-07-12.md | 12 +++ notes/fresh-workspace-handoff.md | 3 + state/ledgers.msgpack | Bin 456338 -> 456707 bytes state/map.yaml | 2 +- 6 files changed, 115 insertions(+), 30 deletions(-) diff --git a/epiphany-core/src/bin/epiphany-swarm.rs b/epiphany-core/src/bin/epiphany-swarm.rs index 4ed91259..bb8cad9a 100644 --- a/epiphany-core/src/bin/epiphany-swarm.rs +++ b/epiphany-core/src/bin/epiphany-swarm.rs @@ -561,7 +561,6 @@ fn classify_run_stop( refreshed_overview.and_then(|overview| non_empty_string(overview.get("currentGate"))) }) .or_else(|| selected_row.and_then(|row| non_empty_string(row.get("gate")))) - .or_else(|| compact_row_field(selected_row, "gate")) .unwrap_or_else(|| "none".to_string()); let selected_blocker = selected_output .and_then(|output| non_empty_string(output.get("blockerBefore"))) @@ -569,7 +568,6 @@ fn classify_run_stop( refreshed_overview.and_then(|overview| non_empty_string(overview.get("blocker"))) }) .or_else(|| selected_row.and_then(|row| non_empty_string(row.get("blocker")))) - .or_else(|| compact_row_field(selected_row, "blocker")) .unwrap_or_else(|| "none".to_string()); let selected_next_safe_move = selected_output .and_then(|output| output.get("tick")) @@ -578,17 +576,14 @@ fn classify_run_stop( refreshed_overview.and_then(|overview| non_empty_string(overview.get("nextSafeMove"))) }) .or_else(|| selected_row.and_then(|row| non_empty_string(row.get("nextSafeMove")))) - .or_else(|| compact_row_field(selected_row, "next")) .unwrap_or_else(|| next_safe_move.to_string()); let selected_item = selected_output .and_then(|output| non_empty_string(output.get("item"))) .or_else(|| selected_row.and_then(|row| non_empty_string(row.get("item")))) - .or_else(|| compact_row_field(selected_row, "item")) .unwrap_or_else(|| "none".to_string()); let selected_branch = refreshed_overview .and_then(|overview| non_empty_string(overview.get("branch"))) .or_else(|| selected_row.and_then(|row| non_empty_string(row.get("branch")))) - .or_else(|| compact_row_field(selected_row, "branch")) .unwrap_or_else(|| "none".to_string()); let (category, owner, gate, blocker, recommended_command, mutates_state, requires_elevation) = @@ -698,19 +693,6 @@ fn non_empty_string(value: Option<&Value>) -> Option { .map(ToString::to_string) } -fn compact_row_field(row: Option<&Value>, field: &str) -> Option { - let prefix = format!("{field}="); - row.and_then(Value::as_str) - .and_then(|row| { - row.split('|') - .map(str::trim) - .find_map(|part| part.strip_prefix(&prefix)) - }) - .map(str::trim) - .filter(|value| !value.is_empty()) - .map(ToString::to_string) -} - fn queue_run_args( args: &RunArgs, workspace: &Path, @@ -943,3 +925,55 @@ fn print_usage() { run --workspace [--epiphany-root ] [--store ] [--runtime-id ] [--until blocked-or-published] [--max-iterations ] [--max-items ] [--dry-run]" ); } + +#[cfg(test)] +mod classification_tests { + use super::*; + + #[test] + fn stop_classification_reads_typed_rows_not_tui_prose() { + let typed = vec![json!({ + "queueRunStatus": "would-advance", + "actionableCount": 1, + "queueCount": 1, + "selectedRows": [{ + "item": "item-1", + "branch": "main", + "gate": "ready-to-run", + "blocker": "none", + "nextSafeMove": "run it" + }], + "outputs": [] + })]; + let typed_result = classify_run_stop( + "dry-run-preview-complete", + "preview", + "blocked-or-published", + true, + 1, + &typed, + "fallback", + ); + assert_eq!(typed_result["authorityGate"], "ready-to-run"); + assert_eq!(typed_result["selectedItem"], "item-1"); + + let prose = vec![json!({ + "queueRunStatus": "would-advance", + "actionableCount": 1, + "queueCount": 1, + "selectedRows": ["QUEUE-RUN | item=counterfeit | gate=published | blocker=none"], + "outputs": [] + })]; + let prose_result = classify_run_stop( + "dry-run-preview-complete", + "preview", + "blocked-or-published", + true, + 1, + &prose, + "fallback", + ); + assert_eq!(prose_result["authorityGate"], "none"); + assert_eq!(prose_result["selectedItem"], "none"); + } +} diff --git a/epiphany-core/src/bin/epiphany-work.rs b/epiphany-core/src/bin/epiphany-work.rs index ee5f5b65..a8806853 100644 --- a/epiphany-core/src/bin/epiphany-work.rs +++ b/epiphany-core/src/bin/epiphany-work.rs @@ -14850,22 +14850,23 @@ fn normalize_path_text(value: &str) -> String { fn repo_work_queue_selection_rows( overviews: &[EpiphanyCultMeshRepoWorkOverviewEntry], workspace: &Path, -) -> Vec { +) -> Vec { overviews .iter() .map(|overview| { let workspace_match = overview_workspace_matches(overview, workspace); let tick_actionable = repo_work_gate_is_tick_actionable(&overview.current_gate); - format!( - "QUEUE-RUN | item={} | gate={} | blocker={} | actionable={} | workspaceMatch={} | next={} | private={}", - overview.item, - overview.current_gate, - overview.blocker, - tick_actionable, - workspace_match, - overview.next_safe_move, - overview.private_state_exposed - ) + json!({ + "overviewId": overview.overview_id, + "item": overview.item, + "branch": overview.branch, + "gate": overview.current_gate, + "blocker": overview.blocker, + "actionable": tick_actionable, + "workspaceMatch": workspace_match, + "nextSafeMove": overview.next_safe_move, + "privateStateExposed": overview.private_state_exposed, + }) }) .collect() } @@ -15309,6 +15310,41 @@ mod authority_tests { use epiphany_core::RepoWorkModelingFinding; use epiphany_core::put_repo_work_modeling_finding; + #[test] + fn queue_selection_rows_preserve_typed_scheduler_state() { + let overview = EpiphanyCultMeshRepoWorkOverviewEntry { + schema_version: epiphany_core::EPIPHANY_CULTMESH_REPO_WORK_OVERVIEW_SCHEMA_VERSION + .to_string(), + runtime_id: "test".to_string(), + verse_id: "gamecult-local".to_string(), + overview_id: "overview-1".to_string(), + generated_at: "2026-07-13T00:00:00Z".to_string(), + workspace: "E:/test".to_string(), + item: "item-1".to_string(), + branch: "main".to_string(), + current_gate: "ready-to-run".to_string(), + blocker: "none".to_string(), + next_safe_move: "run it".to_string(), + changed_paths: Vec::new(), + commit_sha: "none".to_string(), + soul_verdict: "pending".to_string(), + publication_status: "not-requested".to_string(), + sync_status: "local".to_string(), + receipt_refs: Vec::new(), + tui_rows: vec!["misleading display text".to_string()], + proof_bundle_ref: "none".to_string(), + private_state_exposed: false, + notes: Vec::new(), + }; + let rows = repo_work_queue_selection_rows(&[overview], Path::new("E:/test")); + assert!(rows[0].is_object()); + assert_eq!(rows[0]["item"], "item-1"); + assert_eq!(rows[0]["branch"], "main"); + assert_eq!(rows[0]["gate"], "ready-to-run"); + assert_eq!(rows[0]["actionable"], true); + assert_ne!(rows[0], "misleading display text"); + } + #[test] fn close_rejects_caller_authored_verification_and_modeling_authority() -> Result<()> { for flag in [ diff --git a/notes/conceptual-substitution-audit-2026-07-12.md b/notes/conceptual-substitution-audit-2026-07-12.md index 58278277..9f3daba7 100644 --- a/notes/conceptual-substitution-audit-2026-07-12.md +++ b/notes/conceptual-substitution-audit-2026-07-12.md @@ -694,6 +694,18 @@ receipt proof completeness separately while naming `requestIdentity=missing`. Historical private requests also no longer contaminate the currently selected request; request-side privacy is derived from that request alone. +## TUI queue prose substituted for scheduler state + +`epiphany-work queue-run` embedded queue and selected rows as formatted +`QUEUE-RUN | item=... | gate=...` strings inside its receipt. `epiphany-swarm` +then split those strings and recovered authority gate, blocker, next move, item, +and branch for stop classification. A presentation row had become a hidden +string protocol controlling scheduler interpretation. Queue receipts now carry +typed row objects sourced directly from repo-work overview fields, including +overview identity and branch. Swarm classification reads only typed fields; +the compact-row parser and every prose fallback are deleted. A hostile legacy +string containing `gate=published` and `item=counterfeit` is inert. + ## Unresolved: provider receipts without chronology Bifrost body-change/GitHub publication receipts are externally owned and their diff --git a/notes/fresh-workspace-handoff.md b/notes/fresh-workspace-handoff.md index 4b49d30d..8dc741dd 100644 --- a/notes/fresh-workspace-handoff.md +++ b/notes/fresh-workspace-handoff.md @@ -175,6 +175,9 @@ The confirmed conceptual substitutions have been cut: accounting keeps these lanes open with `requestIdentity=missing` while still showing provider receipt proof completeness. Repair the Bifrost-owned contracts before claiming concurrent-safe closure. +- Repo-work queue receipts carry typed queue/selected row objects. Swarm stop + classification no longer reparses `QUEUE-RUN | key=value` TUI prose; legacy + or hostile strings cannot steer gate, blocker, item, branch, or next move. - Bifrost provider receipt contracts still lack provider timestamp/revision. Do not invent consumer-side ordering; repair that in a Bifrost-owned schema. diff --git a/state/ledgers.msgpack b/state/ledgers.msgpack index 787a0213bb08575889b8ba3da4265134e8a2008a..a3ce6a518c70f8818a6e986bfe310dfa4e939495 100644 GIT binary patch delta 375 zcmXAku}T9$5Qe>|Cn$(uB>^)a*j=;{!C;Xxr4k#v&EA|@v)SG3?0KY05h1-2?llAp z-@x8Cuood9*a^-h#m}%a`+xt;(|3KksJ|RU+h-T2=eO@`@$cvBQ8bF8_H zs_U!`*5=#17XST}okhI&ynEc3w6D?Gq_BPfqa1Stj}ny&1Zbp9F$I!+OmmGMD2RX{ z2)Z{Net2c>2!u%iopOC)#t9X|4;kTvC$LfG!q{=k_U?H`Ef89Rv_mIkNcbNtvpi(n?+H0r`BEk^s0rPr znd2)rM=kg5TM9~JLZML|0m`5c28kdb@#&7YYeAN4U4DGU`{m(dytM;8Wmco+KPj$> ANB{r; delta 56 zcmZqvAU)}=^ae>rE(0qAD`{GCDL*Won