crashlabs/huskies
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

huskies: merge 517_story_remove_filesystem_shadow_fallback_paths_from_lifecycle_rs_finish_the_migration_to_crdt_only

Browse Source
This commit is contained in:
dave
2026-04-10 12:56:16 +00:00
parent fe405e81c6
commit 31388da609
12 changed files with 171 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/http/mcp/merge_tools.rs
+8 -6
View File
@@ -245,8 +245,11 @@ mod tests {
setup_git_repo_in(tmp.path());
let current_dir = tmp.path().join(".huskies/work/2_current");
std::fs::create_dir_all(&current_dir).unwrap();
let content = "---\nname: Test\n---\n";
let story_file = current_dir.join("24_story_test.md");
std::fs::write(&story_file, "---\nname: Test\n---\n").unwrap();
std::fs::write(&story_file, content).unwrap();
crate::db::ensure_content_store();
crate::db::write_content("24_story_test", content);
std::process::Command::new("git")
.args(["add", "."])
.current_dir(tmp.path())
@@ -259,13 +262,12 @@ mod tests {
.unwrap();
let ctx = test_ctx(tmp.path());
// The agent start will fail in test (no worktree/config), but the file move should succeed
// The agent start will fail in test (no worktree/config), but the move should succeed
let result = tool_move_story_to_merge(&json!({"story_id": "24_story_test"}), &ctx).await;
// File should have been moved regardless of agent start outcome
assert!(!story_file.exists(), "2_current file should be gone");
// Content store should still have the item after the move
assert!(
tmp.path().join(".huskies/work/4_merge/24_story_test.md").exists(),
"4_merge file should exist"
crate::db::read_content("24_story_test").is_some(),
"content store should have the story after move"
);
// Result is either Ok (agent started) or Err (agent failed - acceptable in tests)
let _ = result;