feat(933): add item_type + epic CRDT registers + migrate epic mechanism

Replaces the YAML-only `type: epic` / `epic: <id>` front-matter fields with
typed CRDT registers on PipelineItemCrdt. The epic-mechanism MCP tools
(`tool_list_epics`, `tool_show_epic`), the epic-context injection in agent
spawn, and the type-classifier helpers (`item_type_from_id`, `is_bug_item`,
`is_refactor_item`) now all read from the CRDT.

Schema:
- PipelineItemCrdt: `item_type: LwwRegisterCrdt<String>` and
  `epic: LwwRegisterCrdt<String>` registers.
- WorkItem: typed `item_type()` and `epic()` accessors returning `Option<&str>`.
- crdt_state::set_item_type(story_id, Option<&str>) and
  crdt_state::set_epic(story_id, Option<&str>) typed setters.

Write paths populate the new registers:
- create_story_file / create_bug_file / create_spike_file /
  create_refactor_file / create_epic_file — each calls set_item_type after
  write_story_content.
- tool_update_story intercepts `epic` and `type` fields and routes them to
  the typed setters (same pattern as qa / depends_on).

Read paths migrated off yaml_legacy:
- http/mcp/story_tools/epic.rs: tool_list_epics + tool_show_epic.
- agents/lifecycle.rs::item_type_from_id (numeric-only IDs).
- agents/pool/start/spawn.rs epic-context injection.
- http/workflow/bug_ops/bug.rs::is_bug_item, refactor.rs::is_refactor_item.
- http/workflow/pipeline.rs::load_pipeline_state — review_hold/qa/epic_id
  all come from the CRDT now; only merge_failure is still YAML (sweep in
  929 stage 10).

All `yaml_residue(...)` wraps for item_type / epic are removed; the
remaining residue marker doc no longer references 933.

cargo fmt --check, clippy --all-targets -- -D warnings, and the 2857-test
suite all pass.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Timmy
2026-05-12 19:58:43 +01:00
parent aadbb1b2af
commit 7d7ab85994
16 changed files with 200 additions and 109 deletions
+30 -42
View File
@@ -4,10 +4,6 @@
//! and refactors. They are not pipeline-driven but provide authoritative context
//! injected into agent prompts for all member work items.
// Epic mechanism (item_type, epic link) has no CRDT register yet — story 933.
// parse_front_matter calls here are wrapped in `yaml_residue` so they're
// grep-findable until 933 lands.
use crate::db::yaml_legacy::{parse_front_matter, yaml_residue};
use crate::http::context::AppContext;
use crate::http::workflow::create_epic_file;
use serde_json::{Value, json};
@@ -53,7 +49,7 @@ pub(crate) fn tool_list_epics(_ctx: &AppContext) -> Result<String, String> {
let all_items = crate::pipeline_state::read_all_typed();
// Collect epics: items with type == "epic".
// Collect epics: items with item_type == "epic" in the CRDT register.
let mut epics: Vec<(String, String)> = Vec::new(); // (id, name)
// Collect member items: map from epic_id → list of (story_id, is_done).
let mut members: std::collections::HashMap<String, Vec<(String, bool)>> =
@@ -61,23 +57,18 @@ pub(crate) fn tool_list_epics(_ctx: &AppContext) -> Result<String, String> {
for item in &all_items {
let sid = &item.story_id.0;
let content = match crate::db::read_content(sid) {
Some(c) => c,
None => continue,
};
let meta = match yaml_residue(parse_front_matter(&content)) {
Ok(m) => m,
Err(_) => continue,
let Some(view) = crate::crdt_state::read_item(sid) else {
continue;
};
if meta.item_type.as_deref() == Some("epic") {
if view.item_type() == Some("epic") {
epics.push((sid.clone(), item.name.clone()));
}
if let Some(epic_id) = meta.epic {
if let Some(epic_id) = view.epic() {
let is_done = matches!(item.stage, Stage::Done { .. });
members
.entry(epic_id)
.entry(epic_id.to_string())
.or_default()
.push((sid.clone(), is_done));
}
@@ -116,13 +107,13 @@ pub(crate) fn tool_show_epic(args: &Value, _ctx: &AppContext) -> Result<String,
let content = crate::db::read_content(epic_id)
.ok_or_else(|| format!("Epic '{epic_id}' not found in content store"))?;
let meta = yaml_residue(parse_front_matter(&content))
.map_err(|e| format!("Failed to parse epic front matter: {e}"))?;
let epic_view = crate::crdt_state::read_item(epic_id)
.ok_or_else(|| format!("Epic '{epic_id}' not found in CRDT"))?;
if meta.item_type.as_deref() != Some("epic") {
if epic_view.item_type() != Some("epic") {
return Err(format!(
"'{epic_id}' is not an epic (type: {:?})",
meta.item_type
"'{epic_id}' is not an epic (item_type: {:?})",
epic_view.item_type()
));
}
@@ -131,15 +122,10 @@ pub(crate) fn tool_show_epic(args: &Value, _ctx: &AppContext) -> Result<String,
let mut member_items: Vec<Value> = Vec::new();
for item in &all_items {
let sid = &item.story_id.0;
let member_content = match crate::db::read_content(sid) {
Some(c) => c,
None => continue,
let Some(member_view) = crate::crdt_state::read_item(sid) else {
continue;
};
let member_meta = match yaml_residue(parse_front_matter(&member_content)) {
Ok(m) => m,
Err(_) => continue,
};
if member_meta.epic.as_deref() == Some(epic_id) {
if member_view.epic() == Some(epic_id) {
let stage_name = match &item.stage {
Stage::Upcoming | Stage::Backlog => "backlog",
Stage::Coding => "current",
@@ -164,7 +150,7 @@ pub(crate) fn tool_show_epic(args: &Value, _ctx: &AppContext) -> Result<String,
serde_json::to_string_pretty(&json!({
"epic_id": epic_id,
"name": meta.name,
"name": epic_view.name(),
"content": content,
"members": member_items,
"rollup": format!("{done}/{total} done"),
@@ -242,34 +228,36 @@ mod tests {
#[test]
fn tool_list_epics_shows_member_rollup() {
crate::crdt_state::init_for_test();
crate::db::ensure_content_store();
// Write a fake epic.
// Write a fake epic with the typed CRDT registers (story 933).
crate::db::write_item_with_content(
"9990_epic_rollup",
"1_backlog",
"---\ntype: epic\nname: \"Rollup Epic\"\n---\n\n## Goal\n\nTest\n",
crate::db::ItemMeta::from_yaml(
"---\ntype: epic\nname: \"Rollup Epic\"\n---\n\n## Goal\n\nTest\n",
),
"# Rollup Epic\n\n## Goal\n\nTest\n",
crate::db::ItemMeta::named("Rollup Epic"),
);
crate::crdt_state::set_item_type("9990_epic_rollup", Some("epic"));
// Write two member items: one done, one current.
crate::db::write_item_with_content(
"9991_story_member_done",
"5_done",
"---\ntype: story\nname: \"Done Member\"\nepic: \"9990_epic_rollup\"\n---\n",
crate::db::ItemMeta::from_yaml(
"---\ntype: story\nname: \"Done Member\"\nepic: \"9990_epic_rollup\"\n---\n",
),
"# Done Member\n",
crate::db::ItemMeta::named("Done Member"),
);
crate::crdt_state::set_item_type("9991_story_member_done", Some("story"));
crate::crdt_state::set_epic("9991_story_member_done", Some("9990_epic_rollup"));
crate::db::write_item_with_content(
"9992_story_member_current",
"2_current",
"---\ntype: story\nname: \"Current Member\"\nepic: \"9990_epic_rollup\"\n---\n",
crate::db::ItemMeta::from_yaml(
"---\ntype: story\nname: \"Current Member\"\nepic: \"9990_epic_rollup\"\n---\n",
),
"# Current Member\n",
crate::db::ItemMeta::named("Current Member"),
);
crate::crdt_state::set_item_type("9992_story_member_current", Some("story"));
crate::crdt_state::set_epic("9992_story_member_current", Some("9990_epic_rollup"));
let tmp = tempfile::tempdir().unwrap();
let ctx = crate::http::test_helpers::test_ctx(tmp.path());
@@ -40,6 +40,17 @@ pub(crate) fn tool_update_story(args: &Value, ctx: &AppContext) -> Result<String
crate::crdt_state::set_qa_mode(story_id, mode);
}
// Story 933: intercept `epic` and `type` fields — route to typed CRDT
// registers so the auto-assigner / epic-rollup tools see the change.
if let Some(epic_val) = front_matter.remove("epic") {
let epic_id = epic_val.as_str().filter(|s| !s.is_empty());
crate::crdt_state::set_epic(story_id, epic_id);
}
if let Some(type_val) = front_matter.remove("type") {
let item_type = type_val.as_str().filter(|s| !s.is_empty());
crate::crdt_state::set_item_type(story_id, item_type);
}
// Route `depends_on` to the typed CRDT register and remove it from the
// front-matter map so it is NOT written back to the YAML content store.
// This matches the `qa` field pattern: CRDT is the single source of truth.
+6 -5
View File
@@ -66,23 +66,24 @@ pub fn create_bug_file(
// Sync depends_on to the typed CRDT register.
crate::crdt_state::set_depends_on(&bug_id, depends_on.unwrap_or(&[]));
// Story 933: typed CRDT register for item_type.
crate::crdt_state::set_item_type(&bug_id, Some("bug"));
Ok(bug_id)
}
/// Returns true if the item stem is a bug item.
///
/// Checks the slug-based ID format first (e.g. `"4_bug_login_crash"`), then
/// falls back to reading `type: bug` from the content store for numeric-only IDs.
/// consults the typed CRDT `item_type` register for numeric-only IDs (story 933).
pub(super) fn is_bug_item(stem: &str) -> bool {
let after_num = stem.trim_start_matches(|c: char| c.is_ascii_digit());
if after_num.starts_with("_bug_") {
return true;
}
// Numeric-only ID: check content store front matter.
if after_num.is_empty() {
return crate::db::read_content(stem)
.and_then(|c| parse_front_matter(&c).ok())
.and_then(|m| m.item_type)
return crate::crdt_state::read_item(stem)
.and_then(|v| v.item_type().map(str::to_string))
.map(|t| t == "bug")
.unwrap_or(false);
}
+3
View File
@@ -72,5 +72,8 @@ pub fn create_epic_file(
// Epics are stored in backlog (no pipeline advancement).
write_story_content(root, &epic_id, "1_backlog", &content);
// Story 933: typed CRDT register for item_type.
crate::crdt_state::set_item_type(&epic_id, Some("epic"));
Ok(epic_id)
}
+7 -6
View File
@@ -62,23 +62,24 @@ pub fn create_refactor_file(
// Sync depends_on to the typed CRDT register.
crate::crdt_state::set_depends_on(&refactor_id, depends_on.unwrap_or(&[]));
// Story 933: typed CRDT register for item_type.
crate::crdt_state::set_item_type(&refactor_id, Some("refactor"));
Ok(refactor_id)
}
/// Returns true if the item stem is a refactor item.
///
/// Checks the slug-based ID format first (e.g. `"5_refactor_split_agents_rs"`), then
/// falls back to reading `type: refactor` from the content store for numeric-only IDs.
/// Checks the slug-based ID format first (e.g. `"5_refactor_split_agents_rs"`),
/// then consults the typed CRDT `item_type` register for numeric-only IDs (933).
pub(super) fn is_refactor_item(stem: &str) -> bool {
let after_num = stem.trim_start_matches(|c: char| c.is_ascii_digit());
if after_num.starts_with("_refactor_") {
return true;
}
// Numeric-only ID: check content store front matter.
if after_num.is_empty() {
return crate::db::read_content(stem)
.and_then(|c| parse_front_matter(&c).ok())
.and_then(|m| m.item_type)
return crate::crdt_state::read_item(stem)
.and_then(|v| v.item_type().map(str::to_string))
.map(|t| t == "refactor")
.unwrap_or(false);
}
@@ -66,5 +66,8 @@ pub fn create_spike_file(
// Sync depends_on to the typed CRDT register.
crate::crdt_state::set_depends_on(&spike_id, depends_on.unwrap_or(&[]));
// Story 933: typed CRDT register for item_type.
crate::crdt_state::set_item_type(&spike_id, Some("spike"));
Ok(spike_id)
}
+11 -14
View File
@@ -95,18 +95,16 @@ pub fn load_pipeline_state(ctx: &AppContext) -> Result<PipelineState, String> {
let sid = &item.story_id.0;
let agent = agent_map.get(sid).cloned();
// Enrich with content-derived metadata (merge_failure, review_hold, qa, epic_id).
let (merge_failure, review_hold, qa, epic_id) = crate::db::read_content(sid)
// Stories 929/932/933: review_hold, qa_mode, epic_id come from typed
// CRDT registers. merge_failure remains in YAML for now (tracked by
// 929 stage 10's sweep).
let view = crate::crdt_state::read_item(sid);
let review_hold = view.as_ref().map(|v| v.review_hold()).filter(|b| *b);
let qa = view.as_ref().and_then(|v| v.qa_mode().map(str::to_string));
let epic_id = view.as_ref().and_then(|v| v.epic().map(str::to_string));
let merge_failure = crate::db::read_content(sid)
.and_then(|c| parse_front_matter(&c).ok())
.map(|meta| {
(
meta.merge_failure,
meta.review_hold,
meta.qa.map(|m| m.as_str().to_string()),
meta.epic,
)
})
.unwrap_or((None, None, None, None));
.and_then(|meta| meta.merge_failure);
let story = UpcomingStory {
story_id: sid.clone(),
@@ -211,9 +209,8 @@ pub fn load_upcoming_stories(_ctx: &AppContext) -> Result<Vec<UpcomingStory>, St
.filter(|item| matches!(item.stage, Stage::Backlog))
.map(|item| {
let sid = &item.story_id.0;
let epic_id = crate::db::read_content(sid)
.and_then(|c| parse_front_matter(&c).ok())
.and_then(|meta| meta.epic);
let epic_id =
crate::crdt_state::read_item(sid).and_then(|v| v.epic().map(str::to_string));
UpcomingStory {
story_id: item.story_id.0.clone(),
name: if item.name.is_empty() {
@@ -71,6 +71,9 @@ pub fn create_story_file(
// Sync depends_on to the typed CRDT register.
crate::crdt_state::set_depends_on(&story_id, depends_on.unwrap_or(&[]));
// Story 933: typed CRDT register for item_type.
crate::crdt_state::set_item_type(&story_id, Some("story"));
Ok(story_id)
}