diff --git a/epiphany-core/src/coordinator_objective_intake.rs b/epiphany-core/src/coordinator_objective_intake.rs index 7464ff52..4a209846 100644 --- a/epiphany-core/src/coordinator_objective_intake.rs +++ b/epiphany-core/src/coordinator_objective_intake.rs @@ -9,7 +9,6 @@ use sha2::{Digest, Sha256}; use std::path::Path; pub const USER_OBJECTIVE_INTAKE_SCHEMA_VERSION: &str = "gamecult.epiphany.user_objective_intake.v0"; -pub const USER_OBJECTIVE_INTAKE_TYPE: &str = "epiphany.coordinator.user_objective_intake"; pub const USER_OBJECTIVE_INTAKE_CONTRACT: &str = "The human supplies the initial objective. Self records that assertion and the canonical keyed Mind objective in one CAS. Thread identity is provenance only. Repeated identical intake is read-idempotent; replacement requires a separate reviewed adoption flow."; #[derive(Debug, Clone)] diff --git a/epiphany-core/src/eyes_gateway.rs b/epiphany-core/src/eyes_gateway.rs index a572e99c..f6c6ceef 100644 --- a/epiphany-core/src/eyes_gateway.rs +++ b/epiphany-core/src/eyes_gateway.rs @@ -2,8 +2,6 @@ use crate::EpiphanyResearchDecision; use crate::EpiphanyRoleFindingInterpretation; use cultcache_rs::DatabaseEntry; -pub const EYES_SOURCE_LOOKUP_RECEIPT_TYPE: &str = "epiphany.eyes.source_lookup_receipt"; -pub const EYES_EVIDENCE_PACKET_TYPE: &str = "epiphany.eyes.evidence_packet"; pub const EYES_SOURCE_LOOKUP_RECEIPT_SCHEMA_VERSION: &str = "epiphany.eyes.source_lookup_receipt.v0"; pub const EYES_EVIDENCE_PACKET_SCHEMA_VERSION: &str = "epiphany.eyes.evidence_packet.v2"; diff --git a/epiphany-core/src/hands_gateway.rs b/epiphany-core/src/hands_gateway.rs index 3e2866ea..eea8c087 100644 --- a/epiphany-core/src/hands_gateway.rs +++ b/epiphany-core/src/hands_gateway.rs @@ -5,9 +5,6 @@ pub const HANDS_PATCH_RECEIPT_TYPE: &str = "epiphany.hands.patch_receipt"; pub const HANDS_COMMIT_RECEIPT_TYPE: &str = "epiphany.hands.commit_receipt"; pub const HANDS_ACTION_INTENT_SCHEMA_VERSION: &str = "epiphany.hands.action_intent.v1"; pub const HANDS_ACTION_REVIEW_SCHEMA_VERSION: &str = "epiphany.hands.action_review.v0"; -pub const HANDS_COMMAND_RECEIPT_SCHEMA_VERSION: &str = "epiphany.hands.command_receipt.v0"; -pub const HANDS_PATCH_RECEIPT_SCHEMA_VERSION: &str = "epiphany.hands.patch_receipt.v0"; -pub const HANDS_COMMIT_RECEIPT_SCHEMA_VERSION: &str = "epiphany.hands.commit_receipt.v0"; #[derive(Debug, Clone, PartialEq, Eq, DatabaseEntry)] #[cultcache(type = "epiphany.hands.action_intent", schema = "HandsActionIntent")] @@ -69,25 +66,21 @@ pub struct HandsActionReview { #[cultcache(type = "epiphany.hands.patch_receipt", schema = "HandsPatchReceipt")] pub struct HandsPatchReceipt { #[cultcache(key = 0)] - pub schema_version: String, - #[cultcache(key = 1)] pub receipt_id: String, - #[cultcache(key = 2)] + #[cultcache(key = 1)] pub intent_id: String, - #[cultcache(key = 3)] + #[cultcache(key = 2)] pub review_id: String, - #[cultcache(key = 4)] + #[cultcache(key = 3)] pub substrate_gate_grant_receipt_id: String, - #[cultcache(key = 5)] + #[cultcache(key = 4)] pub runtime_job_id: String, - #[cultcache(key = 6)] + #[cultcache(key = 5)] pub changed_paths: Vec, - #[cultcache(key = 7)] + #[cultcache(key = 6)] pub summary: String, - #[cultcache(key = 8)] + #[cultcache(key = 7)] pub emitted_at: String, - #[cultcache(key = 9)] - pub contract: String, } #[derive(Debug, Clone, PartialEq, Eq, DatabaseEntry)] @@ -97,58 +90,50 @@ pub struct HandsPatchReceipt { )] pub struct HandsCommandReceipt { #[cultcache(key = 0)] - pub schema_version: String, - #[cultcache(key = 1)] pub receipt_id: String, - #[cultcache(key = 2)] + #[cultcache(key = 1)] pub intent_id: String, - #[cultcache(key = 3)] + #[cultcache(key = 2)] pub review_id: String, - #[cultcache(key = 4)] + #[cultcache(key = 3)] pub substrate_gate_grant_receipt_id: String, - #[cultcache(key = 5)] + #[cultcache(key = 4)] pub runtime_job_id: String, - #[cultcache(key = 6)] + #[cultcache(key = 5)] pub command: String, - #[cultcache(key = 7)] + #[cultcache(key = 6)] pub exit_code: String, - #[cultcache(key = 8)] + #[cultcache(key = 7)] pub stdout_artifact: String, - #[cultcache(key = 9)] + #[cultcache(key = 8)] pub stderr_artifact: String, - #[cultcache(key = 10)] + #[cultcache(key = 9)] pub summary: String, - #[cultcache(key = 11)] + #[cultcache(key = 10)] pub emitted_at: String, - #[cultcache(key = 12)] - pub contract: String, } #[derive(Debug, Clone, PartialEq, Eq, DatabaseEntry)] #[cultcache(type = "epiphany.hands.commit_receipt", schema = "HandsCommitReceipt")] pub struct HandsCommitReceipt { #[cultcache(key = 0)] - pub schema_version: String, - #[cultcache(key = 1)] pub receipt_id: String, - #[cultcache(key = 2)] + #[cultcache(key = 1)] pub intent_id: String, - #[cultcache(key = 3)] + #[cultcache(key = 2)] pub review_id: String, - #[cultcache(key = 4)] + #[cultcache(key = 3)] pub runtime_job_id: String, - #[cultcache(key = 5)] + #[cultcache(key = 4)] pub commit_sha: String, - #[cultcache(key = 6)] + #[cultcache(key = 5)] pub branch: String, - #[cultcache(key = 7)] + #[cultcache(key = 6)] pub changed_paths: Vec, - #[cultcache(key = 8)] + #[cultcache(key = 7)] pub summary: String, - #[cultcache(key = 9)] + #[cultcache(key = 8)] pub emitted_at: String, - #[cultcache(key = 10)] - pub contract: String, } pub fn hands_action_review_for_intent( @@ -181,7 +166,6 @@ pub fn hands_patch_receipt_for_review( emitted_at: String, ) -> HandsPatchReceipt { HandsPatchReceipt { - schema_version: HANDS_PATCH_RECEIPT_SCHEMA_VERSION.to_string(), receipt_id, intent_id: intent.intent_id.clone(), review_id: review.review_id.clone(), @@ -190,7 +174,6 @@ pub fn hands_patch_receipt_for_review( changed_paths, summary, emitted_at, - contract: "Hands patch receipt proves which files changed under the reviewed action and named Substrate Gate grant; Soul and Mind still decide verification and durable admission.".to_string(), } } @@ -207,7 +190,6 @@ pub fn hands_command_receipt_for_review( emitted_at: String, ) -> HandsCommandReceipt { HandsCommandReceipt { - schema_version: HANDS_COMMAND_RECEIPT_SCHEMA_VERSION.to_string(), receipt_id, intent_id: intent.intent_id.clone(), review_id: review.review_id.clone(), @@ -219,7 +201,6 @@ pub fn hands_command_receipt_for_review( stderr_artifact, summary, emitted_at, - contract: "Hands command receipt proves which command ran, where output evidence lives, and which reviewed action plus Substrate Gate grant authorized it.".to_string(), } } @@ -234,7 +215,6 @@ pub fn hands_commit_receipt_for_review( emitted_at: String, ) -> HandsCommitReceipt { HandsCommitReceipt { - schema_version: HANDS_COMMIT_RECEIPT_SCHEMA_VERSION.to_string(), receipt_id, intent_id: intent.intent_id.clone(), review_id: review.review_id.clone(), @@ -244,6 +224,5 @@ pub fn hands_commit_receipt_for_review( changed_paths, summary, emitted_at, - contract: "Hands commit receipt proves a repository commit consequence after a reviewed action; it is still subject to Soul verification and Mind admission.".to_string(), } } diff --git a/epiphany-core/src/lib.rs b/epiphany-core/src/lib.rs index 7da0e1d7..300d6bda 100644 --- a/epiphany-core/src/lib.rs +++ b/epiphany-core/src/lib.rs @@ -76,7 +76,6 @@ pub use atlas::*; pub use causal_work_identity::*; pub use coordinator_objective_intake::USER_OBJECTIVE_INTAKE_CONTRACT; pub use coordinator_objective_intake::USER_OBJECTIVE_INTAKE_SCHEMA_VERSION; -pub use coordinator_objective_intake::USER_OBJECTIVE_INTAKE_TYPE; pub use coordinator_objective_intake::UserObjectiveIntake; pub use coordinator_objective_intake::UserObjectiveIntakeApplied; pub use coordinator_objective_intake::UserObjectiveIntakeInput; @@ -109,9 +108,7 @@ pub use epiphany_state_model::EpiphanyMemoryEdge; pub use epiphany_state_model::EpiphanyMemoryLifecycle; pub use epiphany_state_model::EpiphanyMemoryNode; pub use eyes_gateway::EYES_EVIDENCE_PACKET_SCHEMA_VERSION; -pub use eyes_gateway::EYES_EVIDENCE_PACKET_TYPE; pub use eyes_gateway::EYES_SOURCE_LOOKUP_RECEIPT_SCHEMA_VERSION; -pub use eyes_gateway::EYES_SOURCE_LOOKUP_RECEIPT_TYPE; pub use eyes_gateway::EyesEvidencePacket; pub use eyes_gateway::EyesSourceLookupReceipt; pub use eyes_gateway::eyes_evidence_packet_from_research_finding; @@ -217,7 +214,6 @@ pub use repository_body_observer::*; pub use resident_readiness::*; pub use resident_self::*; pub use runtime_spine::ARCHIVED_RUNTIME_WORKER_ATTEMPT_SCHEMA_VERSION; -pub use runtime_spine::ARCHIVED_RUNTIME_WORKER_ATTEMPT_TYPE; pub use runtime_spine::COORDINATOR_DEATH_RECOVERY_SCHEMA_VERSION; pub use runtime_spine::COORDINATOR_RUN_RECEIPT_SCHEMA_VERSION; pub use runtime_spine::COORDINATOR_RUN_RECEIPT_TYPE; @@ -243,24 +239,15 @@ pub use runtime_spine::EpiphanyRuntimeWorkerProcessClaim; pub use runtime_spine::ModelPassFailureTerminalOptions; pub use runtime_spine::RUNTIME_IDENTITY_KEY; pub use runtime_spine::RUNTIME_IDENTITY_TYPE; -pub use runtime_spine::RUNTIME_JOB_RESULT_TYPE; -pub use runtime_spine::RUNTIME_JOB_TYPE; pub use runtime_spine::RUNTIME_MODEL_EXECUTION_BINDING_SCHEMA_VERSION; -pub use runtime_spine::RUNTIME_MODEL_EXECUTION_BINDING_TYPE; pub use runtime_spine::RUNTIME_REORIENT_WORKER_RESULT_SCHEMA_VERSION; -pub use runtime_spine::RUNTIME_REORIENT_WORKER_RESULT_TYPE; pub use runtime_spine::RUNTIME_ROLE_WORKER_RESULT_SCHEMA_VERSION; -pub use runtime_spine::RUNTIME_ROLE_WORKER_RESULT_TYPE; -pub use runtime_spine::RUNTIME_SESSION_TYPE; pub use runtime_spine::RUNTIME_SPINE_SCHEMA_VERSION; pub use runtime_spine::RUNTIME_SWARM_BINDING_KEY; pub use runtime_spine::RUNTIME_SWARM_BINDING_SCHEMA_VERSION; pub use runtime_spine::RUNTIME_TOOL_EXECUTION_BINDING_SCHEMA_VERSION; -pub use runtime_spine::RUNTIME_TOOL_EXECUTION_BINDING_TYPE; pub use runtime_spine::RUNTIME_WORKER_LAUNCH_REQUEST_SCHEMA_VERSION; -pub use runtime_spine::RUNTIME_WORKER_LAUNCH_REQUEST_TYPE; pub use runtime_spine::RUNTIME_WORKER_PROCESS_CLAIM_SCHEMA_VERSION; -pub use runtime_spine::RUNTIME_WORKER_PROCESS_CLAIM_TYPE; pub use runtime_spine::RepoFrontierResearchContinuationAction; pub use runtime_spine::RepoFrontierResearchLifecycle; pub use runtime_spine::RepoFrontierResearchLifecycleStage; @@ -342,7 +329,6 @@ pub use state_ledger::append_state_evidence; pub use state_ledger::close_state_branch; pub use state_ledger::load_state_ledger; pub use substrate_gate::SUBSTRATE_GATE_REPO_ACCESS_GRANT_RECEIPT_SCHEMA_VERSION; -pub use substrate_gate::SUBSTRATE_GATE_REPO_ACCESS_GRANT_RECEIPT_TYPE; pub use substrate_gate::SubstrateGateRepoAccessGrantReceipt; pub use substrate_gate::substrate_gate_coordinator_implementation_grant; pub use substrate_gate::substrate_gate_operation_for_governed_tool; @@ -354,7 +340,6 @@ pub use surfaces::EpiphanyCoordinatorInput; pub use surfaces::EpiphanyCoordinatorRoleStatus; pub use surfaces::EpiphanyCrrcAction; pub use surfaces::EpiphanyCrrcResultStatus; -pub use surfaces::EpiphanyReorientAction; pub use surfaces::EpiphanyReorientFindingInterpretation; pub use surfaces::EpiphanyReorientWorkerLaunchDocument; pub use surfaces::EpiphanyResearchDecision; diff --git a/epiphany-core/src/runtime_spine.rs b/epiphany-core/src/runtime_spine.rs index 885d521c..a1246f36 100644 --- a/epiphany-core/src/runtime_spine.rs +++ b/epiphany-core/src/runtime_spine.rs @@ -67,22 +67,11 @@ use std::path::Path; use std::path::PathBuf; pub const RUNTIME_IDENTITY_TYPE: &str = "epiphany.runtime.identity"; -pub const RUNTIME_SESSION_TYPE: &str = "epiphany.runtime.session"; -pub const RUNTIME_JOB_TYPE: &str = "epiphany.runtime.job"; -pub const RUNTIME_MODEL_EXECUTION_BINDING_TYPE: &str = "epiphany.runtime.model_execution_binding"; -pub const RUNTIME_TOOL_EXECUTION_BINDING_TYPE: &str = "epiphany.runtime.tool_execution_binding"; -pub const RUNTIME_WORKER_LAUNCH_REQUEST_TYPE: &str = "epiphany.runtime.worker_launch_request"; -pub const RUNTIME_WORKER_PROCESS_CLAIM_TYPE: &str = "epiphany.runtime.worker_process_claim.v0"; -pub const ARCHIVED_RUNTIME_WORKER_ATTEMPT_TYPE: &str = - "epiphany.runtime.archived_worker_attempt.v2"; -pub const RUNTIME_ROLE_WORKER_RESULT_TYPE: &str = "epiphany.runtime.role_worker_result"; -pub const RUNTIME_REORIENT_WORKER_RESULT_TYPE: &str = "epiphany.runtime.reorient_worker_result"; -pub const RUNTIME_JOB_RESULT_TYPE: &str = "epiphany.runtime.job_result"; pub const COORDINATOR_RUN_RECEIPT_TYPE: &str = "epiphany.coordinator_run_receipt.v1"; pub const RUNTIME_IDENTITY_KEY: &str = "self"; pub const RUNTIME_SWARM_BINDING_KEY: &str = "runtime-swarm-binding"; pub const RUNTIME_SWARM_BINDING_SCHEMA_VERSION: &str = "epiphany.runtime.swarm_binding.v1"; -pub const RUNTIME_SPINE_SCHEMA_VERSION: &str = "epiphany.runtime_spine.v28"; +pub const RUNTIME_SPINE_SCHEMA_VERSION: &str = "epiphany.runtime_spine.v29"; pub const EPIPHANY_RUNTIME_ROOT_SESSION_ID: &str = "epiphany-main"; pub const RUNTIME_MODEL_EXECUTION_BINDING_SCHEMA_VERSION: &str = "epiphany.runtime.model_execution_binding.v0"; diff --git a/epiphany-core/src/substrate_gate.rs b/epiphany-core/src/substrate_gate.rs index 4477c249..76adb335 100644 --- a/epiphany-core/src/substrate_gate.rs +++ b/epiphany-core/src/substrate_gate.rs @@ -1,7 +1,5 @@ use cultcache_rs::DatabaseEntry; -pub const SUBSTRATE_GATE_REPO_ACCESS_GRANT_RECEIPT_TYPE: &str = - "epiphany.substrate_gate.repo_access_grant_receipt"; pub const SUBSTRATE_GATE_REPO_ACCESS_GRANT_RECEIPT_SCHEMA_VERSION: &str = "epiphany.substrate_gate.repo_access_grant_receipt.v0"; pub const SUBSTRATE_GATE_SOURCE_READ_OPERATION: &str = "read"; diff --git a/epiphany-core/src/surfaces/mod.rs b/epiphany-core/src/surfaces/mod.rs index 80eb8eb9..a40e5898 100644 --- a/epiphany-core/src/surfaces/mod.rs +++ b/epiphany-core/src/surfaces/mod.rs @@ -1,7 +1,6 @@ mod coordinator_contract; mod coordinator_decision; mod crrc; -mod reorient; mod research_decision; mod role_board; mod role_result; @@ -11,7 +10,6 @@ pub use coordinator_contract::*; pub use coordinator_decision::recommend_coordinator_action; pub use crrc::EpiphanyCrrcAction; pub use crrc::EpiphanyCrrcResultStatus; -pub use reorient::EpiphanyReorientAction; pub use research_decision::EpiphanyResearchDecision; pub use role_board::EpiphanyRoleBoardInput; pub use role_board::EpiphanyRoleBoardLane; diff --git a/epiphany-core/src/surfaces/reorient.rs b/epiphany-core/src/surfaces/reorient.rs deleted file mode 100644 index adfc9033..00000000 --- a/epiphany-core/src/surfaces/reorient.rs +++ /dev/null @@ -1,13 +0,0 @@ -use serde::{Deserialize, Serialize}; - -/// Display projection of an accepted keyed continuity decision. -/// -/// This enum does not decide whether Reorientation should run. The keyed -/// current-work owner in `reorientation_work` owns launch, wait, review, and -/// admission behavior. -#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub enum EpiphanyReorientAction { - Resume, - Regather, -}