1 files changed, 3 insertions, 81 deletions

diff --git a/makima/src/orchestration/directive.rs b/makima/src/orchestration/directive.rs
index 344bdf5..bb573d4 100644
--- a/makima/src/orchestration/directive.rs
+++ b/makima/src/orchestration/directive.rs
@@ -9,7 +9,7 @@
 use sqlx::PgPool;
 use uuid::Uuid;
 
-use crate::db::models::{CreateTaskRequest, DirectiveMemory, UpdateTaskRequest};
+use crate::db::models::{CreateTaskRequest, UpdateTaskRequest};
 use crate::db::repository;
 use crate::server::state::{DaemonCommand, SharedState};
 
@@ -44,24 +44,7 @@ impl DirectiveOrchestrator {
                 "Directive needs planning — spawning planning task"
             );
 
-            // Load memories if memory is enabled for this directive
-            let memories = if directive.memory_enabled {
-                match repository::list_directive_memories(&self.pool, directive.id, None).await {
-                    Ok(m) => m,
-                    Err(e) => {
-                        tracing::warn!(
-                            directive_id = %directive.id,
-                            error = %e,
-                            "Failed to load directive memories for planning — continuing without"
-                        );
-                        vec![]
-                    }
-                }
-            } else {
-                vec![]
-            };
-
-            let plan = build_planning_prompt(&directive, &[], 1, &memories);
+            let plan = build_planning_prompt(&directive, &[], 1);
 
             if let Err(e) = self
                 .spawn_orchestrator_task(
@@ -143,27 +126,6 @@ impl DirectiveOrchestrator {
                 .as_deref()
                 .unwrap_or("Execute the step described below.");
 
-            // Load memories if memory is enabled for this directive
-            let memory_context = if step.memory_enabled {
-                match repository::list_directive_memories(&self.pool, step.directive_id, None).await {
-                    Ok(memories) if !memories.is_empty() => {
-                        format!("\n\nMEMORY CONTEXT (from previous planning/execution cycles):\n{}\n",
-                            format_memories_for_prompt(&memories))
-                    }
-                    Ok(_) => String::new(),
-                    Err(e) => {
-                        tracing::warn!(
-                            directive_id = %step.directive_id,
-                            error = %e,
-                            "Failed to load directive memories for execution — continuing without"
-                        );
-                        String::new()
-                    }
-                }
-            } else {
-                String::new()
-            };
-
             // Build merge instructions for additional dependencies (beyond the first)
             let merge_preamble = if dep_tasks.len() > 1 {
                 use crate::daemon::worktree::{sanitize_name, short_uuid};
@@ -196,7 +158,6 @@ impl DirectiveOrchestrator {
                  DESCRIPTION: {description}\n\n\
                  {merge_preamble}\
                  INSTRUCTIONS:\n{task_plan}\n\
-                 {memory_context}\
                  When done, the system will automatically mark this step as completed.\n\
                  If you cannot complete the task, report the failure clearly.",
                 directive_title = step.directive_title,
@@ -204,7 +165,6 @@ impl DirectiveOrchestrator {
                 description = step.step_description.as_deref().unwrap_or("(none)"),
                 merge_preamble = merge_preamble,
                 task_plan = task_plan,
-                memory_context = memory_context,
             );
 
             match self
@@ -348,24 +308,7 @@ impl DirectiveOrchestrator {
             let generation =
                 repository::get_directive_max_generation(&self.pool, directive.id).await? + 1;
 
-            // Load memories if memory is enabled for this directive
-            let memories = if directive.memory_enabled {
-                match repository::list_directive_memories(&self.pool, directive.id, None).await {
-                    Ok(m) => m,
-                    Err(e) => {
-                        tracing::warn!(
-                            directive_id = %directive.id,
-                            error = %e,
-                            "Failed to load directive memories for re-planning — continuing without"
-                        );
-                        vec![]
-                    }
-                }
-            } else {
-                vec![]
-            };
-
-            let plan = build_planning_prompt(&directive, &existing_steps, generation, &memories);
+            let plan = build_planning_prompt(&directive, &existing_steps, generation);
 
             if let Err(e) = self
                 .spawn_orchestrator_task(
@@ -747,35 +690,14 @@ impl DirectiveOrchestrator {
     }
 }
 
-/// Format memory entries into a readable prompt section.
-fn format_memories_for_prompt(memories: &[DirectiveMemory]) -> String {
-    let mut out = String::new();
-    for memory in memories {
-        let cat = memory.category.as_deref().unwrap_or("other");
-        out.push_str(&format!(
-            "- [{}] {}: {}\n",
-            cat, memory.key, memory.value
-        ));
-    }
-    out
-}
-
 /// Build the planning prompt for a directive.
 fn build_planning_prompt(
     directive: &crate::db::models::Directive,
     existing_steps: &[crate::db::models::DirectiveStep],
     generation: i32,
-    memories: &[DirectiveMemory],
 ) -> String {
     let mut prompt = String::new();
 
-    // Include memory context if available
-    if !memories.is_empty() {
-        prompt.push_str("MEMORY CONTEXT (insights and decisions from previous cycles):\n");
-        prompt.push_str(&format_memories_for_prompt(memories));
-        prompt.push_str("\nUse these memories to inform your planning. Avoid repeating past mistakes and build on prior insights.\n\n");
-    }
-
     if !existing_steps.is_empty() {
         prompt.push_str(&format!(
             "EXISTING STEPS (generation {}):\n",