Replace queue prose with typed rows
This commit is contained in:
Meta Vens
parent
34b8d109df
commit
4a3cc47236
6 changed files with 115 additions and 30 deletions
|
|
@ -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<String> {
|
|||
.map(ToString::to_string)
|
||||
}
|
||||
|
||||
fn compact_row_field(row: Option<&Value>, field: &str) -> Option<String> {
|
||||
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 <repo> [--epiphany-root <path>] [--store <local-verse.ccmp>] [--runtime-id <id>] [--until blocked-or-published] [--max-iterations <n>] [--max-items <n>] [--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");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14850,22 +14850,23 @@ fn normalize_path_text(value: &str) -> String {
|
|||
fn repo_work_queue_selection_rows(
|
||||
overviews: &[EpiphanyCultMeshRepoWorkOverviewEntry],
|
||||
workspace: &Path,
|
||||
) -> Vec<String> {
|
||||
) -> Vec<Value> {
|
||||
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 [
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -660,4 +660,4 @@ current_status:
|
|||
- Service lifecycle receipt history is now event-only: `load_epiphany_cultmesh_daemon_service_lifecycle_receipts` filters out the `epiphany-local/daemon-service-lifecycle-receipt/latest` mirror, while `load_latest_epiphany_cultmesh_daemon_service_lifecycle_receipt` remains the latest-state reader. Focused unit test `service_lifecycle_receipt_history_excludes_latest_mirror` proves two per-receipt writes return exactly two history records and latest points at the second. Fresh smoke `verse-query-lifecycle-history-filter-smoke` and live overview/triage `local-20260618-145632-497-efac6f0d` / `local-20260618-145632-321-867947af` prove compact swarm sights still expose service lifecycle attention plus the present elevated runbook artifact without daemon pokes or service mutation. Do not use a broad unscoped cargo test filter for this check on Windows; it fans out across bin harnesses and hit a broken pipe during this pass.
|
||||
- `epiphany-verse-query seed-compact` is the compact seed receipt for wrappers and read-only rites. The older `seed` command still prints the full local Verse context for explicit debugging, but compact wrapper modes now avoid full `seed`/final `query` readback after the combined overview proof exposed Windows debug stack overflow from full-context serialization pressure.
|
||||
last_completed_repo_swarm_cut: Huginn live-fire has crossed the first real repo Body from Persona pressure to branch-local Hands commit and Soul/Mind closure, and now has repeatable closure and redacted-public-proof mouths. On `E:\Projects\Huginn` branch `epiphany/huginn/first-awakening`, `tools/epiphany_local_run.ps1 -Mode repo-persona-intake` accepted item `huginn-inspection-readback-livefire`, Weksa/Persona intake remained sealed, and `epiphany-work derive-plan` lowered it to model-authored safe family `repo.status_section` for `README.md` only. `tools/epiphany_local_run.ps1 -Mode repo-swarm-run` advanced four bounded pulses: run-from-plan, adopt-from-plan, execute-from-plan, and close-from-execute. Huginn commit `e9b07c38fceabbdc89ea35c2156326c80c0393a2` updated only `README.md`; closure receipt `.epiphany\work\work-close-huginn-inspection-readback-livefire.json` records status `closed`, Soul verdict `passed`, Mind state commit `repo-work-close-huginn-inspection-readback-livefire-mind-commit`, safe family `repo.status_section`, path scope `README.md`, Bifrost publication gate, and `privateStateExposed=false`. Verification also ran Huginn's TypeScript compiler through concrete Node path: `C:\Program Files\nodejs\node.exe E:\Projects\Huginn\node_modules\typescript\bin\tsc -p tsconfig.json` passed. Native verifier `epiphany-repo-livefire-closure-smoke --workspace E:\Projects\Huginn --item huginn-inspection-readback-livefire --expected-path README.md --expected-family repo.status_section --expected-gate awaiting-publication --expected-blocker bifrost-publication-missing` checks closure receipt, Mind map entry, overview gate/blocker, authority seals, and `git show` changed paths, returning `status=ok`, `soulVerdict=passed`, `publicationGate=Bifrost`, and `privateStateExposed=false`. Wrapper `tools/epiphany_local_run.ps1 -Mode repo-livefire-closure -Workspace E:\Projects\Huginn -RepoWorkItem huginn-inspection-readback-livefire -SkipBuild` exposes the same read-only proof through the local operator mouth; artifact `local-20260621-190156-803-2f85ba15` printed commit, path, gate, blocker, Soul verdict, Mind commit receipt, and `privateStateExposed=False` without push, merge, publication, or target mutation. New wrapper `tools/epiphany_local_run.ps1 -Mode repo-work-public-proof -Workspace E:\Projects\Huginn -RepoWorkItem huginn-inspection-readback-livefire -SkipBuild` exports the redacted proof bundle and repo-local Verse index without publishing; artifact `local-20260621-190645-345-4555b1dc` wrote `.epiphany\public\proof-bundles\repo-work-public-proof-huginn-inspection-readback-livefire.json`, proof id `repo-work-public-proof-huginn-inspection-readback-livefire`, SHA-256 `857545b199f3e37eb06c2e757e5cfc201958e46667bb1f8403fd333a22620f63`, nine artifact rows, zero publication rows, and `privateStateExposed=False`. swarm overview readback `local-20260621-190701-140-b9519ec6` sees the `REPO-WORK-PUBLIC-PROOF` row and action row from Huginn's repo-local Verse with the same SHA-256 while Bifrost publication remains missing. Launcher compact modes are now named compact operator-context modes instead of read-only modes, and `bifrost-public-proof` summaries print item, target public Verse, room, proof SHA-256, review receipts, and credit receipts so publication receipts are auditable without claiming upstream sync.
|
||||
next_action: Continue the conceptual-substitution modeling pass beyond receipt writers. Operational/evidence/self-state and operator surfaces with owned clocks are event-time ordered; operator receipts bind intents by run identity rather than global chronology; Eve/tool/Bifrost/collaboration projections join chains only by typed identity; repo-work projections follow owning time; writerless readiness-review is deleted. Bifrost provider receipts still need provider-owned chronology, and artifact/metrics receipts need explicit repo-work request identity; accounting refuses closure until those contracts exist. Continue auditing other evidence/security mirrors, service configuration claims, adapters, and destructive path consumers for borrowed authority.
|
||||
next_action: Continue the conceptual-substitution modeling pass beyond receipt writers. Operational/evidence/self-state and operator surfaces with owned clocks are event-time ordered; operator receipts bind intents by run identity rather than global chronology; Eve/tool/Bifrost/collaboration projections join chains only by typed identity; repo-work projections follow owning time and queue scheduling uses typed rows rather than reparsed TUI prose; writerless readiness-review is deleted. Bifrost provider receipts still need provider-owned chronology, and artifact/metrics receipts need explicit repo-work request identity; accounting refuses closure until those contracts exist. Continue auditing other evidence/security mirrors, service configuration claims, adapters, and destructive path consumers for borrowed authority.
|
||||
|
|
|
|||
Reference in a new issue