diff --git a/src/app/runtime/actions/mod.rs b/src/app/runtime/actions/mod.rs
index c0b6e64..8269cfa 100644
--- a/src/app/runtime/actions/mod.rs
+++ b/src/app/runtime/actions/mod.rs
@@ -556,7 +556,7 @@ pub fn apply_action(state: &mut AppStateRest, action: Action) {
                     .map(str::len)
                     .sum();
                 let token_estimate = total_chars / 3;
-                rt.messages = crate::app::runtime::shortsend::shape_messages(&rt.messages, token_estimate, max_wire_tokens, true, None);
+                rt.messages = crate::app::runtime::context::shaping::shape_messages(&rt.messages, token_estimate, max_wire_tokens, true, None);
                 state.push_toast(Toast::new(ToastKind::Success, "Conversation history compacted.".to_string()));
                 state.dirty = true;
             }
@@ -1154,10 +1154,10 @@ fn run_agent_turn(
         // Skip message compaction if abort was requested — the non-streaming
         // LLM call for summarization would block without checking abort_flag.
         let wire_msgs = if !tc.abort_flag.load(std::sync::atomic::Ordering::SeqCst)
-            && crate::app::runtime::shortsend::should_shape(token_estimate, max_wire_tokens, prev_shaped)
+            && crate::app::runtime::context::shaping::should_shape(token_estimate, max_wire_tokens, prev_shaped)
         {
             prev_shaped = true;
-            let compacted = crate::app::runtime::shortsend::shape_messages(&msgs, token_estimate, max_wire_tokens, false, Some(&tc.client));
+            let compacted = crate::app::runtime::context::shaping::shape_messages(&msgs, token_estimate, max_wire_tokens, false, Some(&tc.client));
             
             // Dispatch the compacted messages to the main thread so the local session history
             // is permanently compacted and doesn't trigger shaping again immediately on next turn.
diff --git a/src/app/subagent/engine.rs b/src/app/subagent/engine.rs
index 41d6a78..d696b96 100644
--- a/src/app/subagent/engine.rs
+++ b/src/app/subagent/engine.rs
@@ -475,7 +475,6 @@ pub fn run_subagent(ctx: &SubagentContext, tx: &mpsc::Sender<SubagentEvent>) ->
         // drain thread can show it as progress instead of just the tool name.
         if !content.is_empty() {
             let _ = tx.blocking_send(SubagentEvent::StepCompleted {
-                step,
                 output: content.clone(),
             });
         }
@@ -612,7 +611,6 @@ pub fn run_subagent(ctx: &SubagentContext, tx: &mpsc::Sender<SubagentEvent>) ->
                         let _ = tx.blocking_send(SubagentEvent::ToolResult {
                             tool: tool_name.clone(),
                             args: args.clone(),
-                            output: output_text.clone(),
                         });
                         
                         let is_readonly = tool_name == "read" 
@@ -651,7 +649,6 @@ pub fn run_subagent(ctx: &SubagentContext, tx: &mpsc::Sender<SubagentEvent>) ->
                         let _ = tx.blocking_send(SubagentEvent::ToolResult {
                             tool: tool_name.clone(),
                             args: args.clone(),
-                            output: msg,
                         });
                     }
                 }
@@ -663,7 +660,6 @@ pub fn run_subagent(ctx: &SubagentContext, tx: &mpsc::Sender<SubagentEvent>) ->
                 output.push('\n');
             }
             let _ = tx.blocking_send(SubagentEvent::StepCompleted {
-                step,
                 output: content.clone(),
             });
             // Break only when we got real content; empty means something went wrong
@@ -673,7 +669,7 @@ pub fn run_subagent(ctx: &SubagentContext, tx: &mpsc::Sender<SubagentEvent>) ->
         }
     }
 
-    let _ = tx.blocking_send(SubagentEvent::Completed { output: output.clone() });
+    let _ = tx.blocking_send(SubagentEvent::Completed);
     Ok(output)
 }