huskies: merge 1010

server/src/agents/pool/auto_assign/pipeline.rs

@@ -27,7 +27,13 @@ impl AgentPool {
     /// here as well.
     pub(super) async fn assign_pipeline_stages(&self, project_root: &Path, config: &ProjectConfig) {
         let stages: [(Stage, PipelineStage); 2] = [
-            (Stage::Coding { claim: None }, PipelineStage::Coder),
+            (
+                Stage::Coding {
+                    claim: None,
+                    plan: Default::default(),
+                },
+                PipelineStage::Coder,
+            ),
             (Stage::Qa, PipelineStage::Qa),
         ];
 

server/src/agents/pool/auto_assign/scan.rs

@@ -218,7 +218,10 @@ mod tests {
             crate::db::ItemMeta::named("baz"),
         );
 
-        let items = scan_stage_items(&Stage::Coding { claim: None });
+        let items = scan_stage_items(&Stage::Coding {
+            claim: None,
+            plan: Default::default(),
+        });
         // The global CRDT may contain items from other tests, so check
         // that our three items are present and appear in sorted order.
         assert!(

server/src/agents/pool/cost_rollup_subscriber.rs

@@ -100,7 +100,9 @@ mod tests {
     use super::*;
     use crate::agents::TokenUsage;
     use crate::agents::token_usage::TokenUsageRecord;
-    use crate::pipeline_state::{BranchName, PipelineEvent, Stage, StoryId, TransitionFired};
+    use crate::pipeline_state::{
+        BranchName, PipelineEvent, PlanState, Stage, StoryId, TransitionFired,
+    };
     use chrono::Utc;
     use std::num::NonZeroU32;
 
@@ -148,7 +150,10 @@ mod tests {
     fn fired_abandoned(story_id: &str) -> TransitionFired {
         TransitionFired {
             story_id: StoryId(story_id.to_string()),
-            before: Stage::Coding { claim: None },
+            before: Stage::Coding {
+                claim: None,
+                plan: PlanState::Missing,
+            },
             after: Stage::Abandoned { ts: Utc::now() },
             event: PipelineEvent::Abandon,
             at: Utc::now(),
@@ -159,7 +164,10 @@ mod tests {
         TransitionFired {
             story_id: StoryId(story_id.to_string()),
             before: Stage::Backlog,
-            after: Stage::Coding { claim: None },
+            after: Stage::Coding {
+                claim: None,
+                plan: PlanState::Missing,
+            },
             event: PipelineEvent::DepsMet,
             at: Utc::now(),
         }