huskies: merge 872

This commit is contained in:
dave
2026-04-29 15:54:33 +00:00
parent 7505f7fdeb
commit 9bd3c10a09
10 changed files with 147 additions and 12 deletions
+11 -1
View File
@@ -47,8 +47,18 @@ pub(crate) fn tool_create_spike(args: &Value, ctx: &AppContext) -> Result<String
);
}
let depends_on: Option<Vec<u32>> = args
.get("depends_on")
.and_then(|v| serde_json::from_value(v.clone()).ok());
let root = ctx.state.get_project_root()?;
let spike_id = create_spike_file(&root, name, description, &acceptance_criteria)?;
let spike_id = create_spike_file(
&root,
name,
description,
&acceptance_criteria,
depends_on.as_deref(),
)?;
Ok(format!("Created spike: {spike_id}"))
}
@@ -38,6 +38,19 @@ pub(crate) fn tool_update_story(args: &Value, ctx: &AppContext) -> Result<String
crate::crdt_state::set_qa_mode(story_id, mode);
}
// Sync `depends_on` to the typed CRDT register when present in the update.
if let Some(deps_val) = front_matter.get("depends_on") {
if let Some(arr) = deps_val.as_array() {
let dep_nums: Vec<u32> = arr
.iter()
.filter_map(|v| v.as_u64().map(|n| n as u32))
.collect();
crate::crdt_state::set_depends_on(story_id, &dep_nums);
} else if deps_val.is_null() {
crate::crdt_state::set_depends_on(story_id, &[]);
}
}
let front_matter_opt = if front_matter.is_empty() {
None
} else {
+3
View File
@@ -63,6 +63,9 @@ pub fn create_bug_file(
// Write to database content store and CRDT.
write_story_content(root, &bug_id, "1_backlog", &content);
// Sync depends_on to the typed CRDT register.
crate::crdt_state::set_depends_on(&bug_id, depends_on.unwrap_or(&[]));
Ok(bug_id)
}
@@ -59,6 +59,9 @@ pub fn create_refactor_file(
// Write to database content store and CRDT.
write_story_content(root, &refactor_id, "1_backlog", &content);
// Sync depends_on to the typed CRDT register.
crate::crdt_state::set_depends_on(&refactor_id, depends_on.unwrap_or(&[]));
Ok(refactor_id)
}
@@ -12,6 +12,7 @@ pub fn create_spike_file(
name: &str,
description: Option<&str>,
acceptance_criteria: &[String],
depends_on: Option<&[u32]>,
) -> Result<String, String> {
let spike_number = next_item_number(root)?;
let slug = slugify_name(name);
@@ -26,6 +27,10 @@ pub fn create_spike_file(
content.push_str("---\n");
content.push_str("type: spike\n");
content.push_str(&format!("name: \"{}\"\n", name.replace('"', "\\\"")));
if let Some(deps) = depends_on.filter(|d| !d.is_empty()) {
let nums: Vec<String> = deps.iter().map(|n| n.to_string()).collect();
content.push_str(&format!("depends_on: [{}]\n", nums.join(", ")));
}
content.push_str("---\n\n");
content.push_str(&format!("# Spike {spike_number}: {name}\n\n"));
content.push_str("## Question\n\n");
@@ -58,5 +63,8 @@ pub fn create_spike_file(
// Write to database content store and CRDT.
write_story_content(root, &spike_id, "1_backlog", &content);
// Sync depends_on to the typed CRDT register.
crate::crdt_state::set_depends_on(&spike_id, depends_on.unwrap_or(&[]));
Ok(spike_id)
}
+13 -7
View File
@@ -246,8 +246,14 @@ fn create_bug_file_uses_default_acceptance_criterion() {
fn create_spike_file_writes_correct_content() {
let tmp = tempfile::tempdir().unwrap();
let spike_id =
create_spike_file(tmp.path(), "Filesystem Watcher Architecture", None, &[]).unwrap();
let spike_id = create_spike_file(
tmp.path(),
"Filesystem Watcher Architecture",
None,
&[],
None,
)
.unwrap();
assert!(
spike_id.chars().all(|c| c.is_ascii_digit()),
@@ -278,7 +284,7 @@ fn create_spike_file_uses_description_when_provided() {
let description = "What is the best approach for watching filesystem events?";
let spike_id =
create_spike_file(tmp.path(), "FS Watcher Spike", Some(description), &[]).unwrap();
create_spike_file(tmp.path(), "FS Watcher Spike", Some(description), &[], None).unwrap();
let contents = crate::db::read_content(&spike_id)
.or_else(|| {
@@ -294,7 +300,7 @@ fn create_spike_file_uses_description_when_provided() {
#[test]
fn create_spike_file_uses_placeholder_when_no_description() {
let tmp = tempfile::tempdir().unwrap();
let spike_id = create_spike_file(tmp.path(), "My Spike", None, &[]).unwrap();
let spike_id = create_spike_file(tmp.path(), "My Spike", None, &[], None).unwrap();
let contents = crate::db::read_content(&spike_id)
.or_else(|| {
@@ -310,7 +316,7 @@ fn create_spike_file_uses_placeholder_when_no_description() {
#[test]
fn create_spike_file_rejects_empty_name() {
let tmp = tempfile::tempdir().unwrap();
let result = create_spike_file(tmp.path(), "!!!", None, &[]);
let result = create_spike_file(tmp.path(), "!!!", None, &[], None);
assert!(result.is_err());
assert!(result.unwrap_err().contains("alphanumeric"));
}
@@ -319,7 +325,7 @@ fn create_spike_file_rejects_empty_name() {
fn create_spike_file_with_special_chars_in_name_produces_valid_yaml() {
let tmp = tempfile::tempdir().unwrap();
let name = "Spike: compare \"fast\" vs slow encoders";
let result = create_spike_file(tmp.path(), name, None, &[]);
let result = create_spike_file(tmp.path(), name, None, &[], None);
assert!(result.is_ok(), "create_spike_file failed: {result:?}");
let spike_id = result.unwrap();
@@ -345,7 +351,7 @@ fn create_spike_file_increments_from_existing_items() {
"---\nname: Existing\n---\n",
);
let spike_id = create_spike_file(tmp.path(), "My Spike", None, &[]).unwrap();
let spike_id = create_spike_file(tmp.path(), "My Spike", None, &[], None).unwrap();
assert!(
spike_id.chars().all(|c| c.is_ascii_digit()),
"spike ID must be numeric-only, got: {spike_id}"
@@ -68,6 +68,9 @@ pub fn create_story_file(
// Write to database content store and CRDT.
write_story_content(root, &story_id, "1_backlog", &content);
// Sync depends_on to the typed CRDT register.
crate::crdt_state::set_depends_on(&story_id, depends_on.unwrap_or(&[]));
Ok(story_id)
}