huskies: merge 1085

server/src/http/mcp/story_tools/story/query.rs

@@ -51,6 +51,8 @@ pub(crate) fn tool_get_pipeline_status(ctx: &AppContext) -> Result<String, Strin
                     "story_id": s.story_id,
                     "name": slim_name(&s.name),
                     "stage": stage,
+                    "pipeline": s.pipeline.as_str(),
+                    "status": s.status.as_str(),
                     "agent": s.agent.as_ref().map(|a| json!({
                         "agent_name": a.agent_name,
                         "model": a.model,
@@ -83,7 +85,15 @@ pub(crate) fn tool_get_pipeline_status(ctx: &AppContext) -> Result<String, Strin
     let archived: Vec<Value> = state
         .archived
         .iter()
-        .map(|s| json!({ "story_id": s.story_id, "name": slim_name(&s.name), "stage": "archived" }))
+        .map(|s| {
+            json!({
+                "story_id": s.story_id,
+                "name": slim_name(&s.name),
+                "stage": "archived",
+                "pipeline": s.pipeline.as_str(),
+                "status": s.status.as_str(),
+            })
+        })
         .collect();
 
     serde_json::to_string_pretty(&json!({

server/src/http/workflow/pipeline.rs

@@ -24,6 +24,10 @@ pub struct UpcomingStory {
     pub merge_failure: Option<String>,
     /// Active agent working on this item, if any.
     pub agent: Option<AgentAssignment>,
+    /// Display column (story 1085) — derived from `Stage::pipeline()`.
+    pub pipeline: crate::pipeline_state::Pipeline,
+    /// Display badge/indicator (story 1085) — derived from `Stage::status()`.
+    pub status: crate::pipeline_state::Status,
     /// True when the item is held in QA for human review.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub review_hold: Option<bool>,
@@ -142,6 +146,8 @@ pub fn load_pipeline_state(ctx: &AppContext) -> Result<PipelineState, String> {
             error: None,
             merge_failure,
             agent,
+            pipeline: item.stage.pipeline(),
+            status: item.stage.status(),
             review_hold,
             qa,
             retry_count: if item.retry_count() > 0 {
@@ -278,6 +284,8 @@ pub fn load_upcoming_stories(_ctx: &AppContext) -> Result<Vec<UpcomingStory>, St
                 error: None,
                 merge_failure: None,
                 agent: None,
+                pipeline: item.stage.pipeline(),
+                status: item.stage.status(),
                 review_hold: None,
                 qa: None,
                 retry_count: if item_retry_count > 0 {