Add new directive initial implementation

13 files changed, 1256 insertions, 17 deletions

diff --git a/makima/src/bin/makima.rs b/makima/src/bin/makima.rs
index ee5895c..308d689 100644
--- a/makima/src/bin/makima.rs
+++ b/makima/src/bin/makima.rs
@@ -7,7 +7,7 @@ use std::sync::Arc;
 use makima::daemon::api::{ApiClient, CreateContractRequest};
 use makima::daemon::cli::{
     Cli, CliConfig, Commands, ConfigCommand, ContractCommand,
-    SupervisorCommand, ViewArgs,
+    DirectiveCommand, SupervisorCommand, ViewArgs,
 };
 use makima::daemon::tui::{self, Action, App, ListItem, ViewType, TuiWsClient, WsEvent, OutputLine, OutputMessageType, WsConnectionState, RepositorySuggestion};
 use makima::daemon::config::{DaemonConfig, RepoEntry};
@@ -29,6 +29,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         Commands::Daemon(args) => run_daemon(args).await,
         Commands::Supervisor(cmd) => run_supervisor(cmd).await,
         Commands::Contract(cmd) => run_contract(cmd).await,
+        Commands::Directive(cmd) => run_directive(cmd).await,
         Commands::View(args) => run_view(args).await,
         Commands::Config(cmd) => run_config(cmd).await,
     }
@@ -711,6 +712,67 @@ async fn run_contract(
     Ok(())
 }
 
+/// Run a directive subcommand.
+async fn run_directive(
+    cmd: DirectiveCommand,
+) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+    match cmd {
+        DirectiveCommand::Status(args) => {
+            let client = ApiClient::new(args.api_url, args.api_key)?;
+            let result = client.directive_status(args.directive_id).await?;
+            println!("{}", serde_json::to_string(&result.0)?);
+        }
+        DirectiveCommand::Goals(args) => {
+            let client = ApiClient::new(args.api_url, args.api_key)?;
+            let result = client.directive_status(args.directive_id).await?;
+            // Extract goal-related fields from directive
+            let directive = &result.0;
+            let goals = serde_json::json!({
+                "goal": directive.get("goal"),
+                "requirements": directive.get("requirements"),
+                "acceptanceCriteria": directive.get("acceptanceCriteria"),
+                "constraints": directive.get("constraints"),
+                "externalDependencies": directive.get("externalDependencies"),
+            });
+            println!("{}", serde_json::to_string(&goals)?);
+        }
+        DirectiveCommand::Chains(args) => {
+            let client = ApiClient::new(args.api_url, args.api_key)?;
+            let result = client.directive_chains(args.directive_id).await?;
+            println!("{}", serde_json::to_string(&result.0)?);
+        }
+        DirectiveCommand::Chain(args) => {
+            let client = ApiClient::new(args.common.api_url, args.common.api_key)?;
+            let result = client
+                .directive_chain(args.common.directive_id, args.chain_id)
+                .await?;
+            println!("{}", serde_json::to_string(&result.0)?);
+        }
+        DirectiveCommand::Steps(args) => {
+            let client = ApiClient::new(args.common.api_url, args.common.api_key)?;
+            let result = client
+                .directive_chain(args.common.directive_id, args.chain_id)
+                .await?;
+            // Extract steps from chain response
+            let steps = result.0.get("steps").cloned().unwrap_or(serde_json::json!([]));
+            println!("{}", serde_json::to_string(&steps)?);
+        }
+        DirectiveCommand::UpdateStatus(args) => {
+            let client = ApiClient::new(args.common.api_url, args.common.api_key)?;
+            let req = makima::daemon::api::directive::UpdateDirectiveRequest {
+                status: Some(args.status),
+                version: None,
+            };
+            let result = client
+                .directive_update(args.common.directive_id, req)
+                .await?;
+            println!("{}", serde_json::to_string(&result.0)?);
+        }
+    }
+
+    Ok(())
+}
+
 /// Run the TUI view command.
 async fn run_view(args: ViewArgs) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     // Load CLI config for defaults
diff --git a/makima/src/daemon/api/directive.rs b/makima/src/daemon/api/directive.rs
new file mode 100644
index 0000000..0c8115a
--- /dev/null
+++ b/makima/src/daemon/api/directive.rs
@@ -0,0 +1,54 @@
+//! Directive API methods.
+
+use serde::Serialize;
+use uuid::Uuid;
+
+use super::client::{ApiClient, ApiError};
+use super::supervisor::JsonValue;
+
+/// Request to update a directive.
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UpdateDirectiveRequest {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub version: Option<i32>,
+}
+
+impl ApiClient {
+    /// Get directive status and details.
+    pub async fn directive_status(&self, directive_id: Uuid) -> Result<JsonValue, ApiError> {
+        self.get(&format!("/api/v1/directives/{}", directive_id))
+            .await
+    }
+
+    /// List chains for a directive.
+    pub async fn directive_chains(&self, directive_id: Uuid) -> Result<JsonValue, ApiError> {
+        self.get(&format!("/api/v1/directives/{}/chains", directive_id))
+            .await
+    }
+
+    /// Get a chain with its steps.
+    pub async fn directive_chain(
+        &self,
+        directive_id: Uuid,
+        chain_id: Uuid,
+    ) -> Result<JsonValue, ApiError> {
+        self.get(&format!(
+            "/api/v1/directives/{}/chains/{}",
+            directive_id, chain_id
+        ))
+        .await
+    }
+
+    /// Update a directive.
+    pub async fn directive_update(
+        &self,
+        directive_id: Uuid,
+        req: UpdateDirectiveRequest,
+    ) -> Result<JsonValue, ApiError> {
+        self.put(&format!("/api/v1/directives/{}", directive_id), &req)
+            .await
+    }
+}
diff --git a/makima/src/daemon/api/mod.rs b/makima/src/daemon/api/mod.rs
index 49d80e0..2d1efbf 100644
--- a/makima/src/daemon/api/mod.rs
+++ b/makima/src/daemon/api/mod.rs
@@ -2,6 +2,7 @@
 
 pub mod client;
 pub mod contract;
+pub mod directive;
 pub mod supervisor;
 
 pub use client::ApiClient;
diff --git a/makima/src/daemon/cli/directive.rs b/makima/src/daemon/cli/directive.rs
new file mode 100644
index 0000000..5ce88c5
--- /dev/null
+++ b/makima/src/daemon/cli/directive.rs
@@ -0,0 +1,40 @@
+//! Directive subcommand - directive orchestration commands.
+
+use clap::Args;
+use uuid::Uuid;
+
+/// Common arguments for directive commands.
+#[derive(Args, Debug, Clone)]
+pub struct DirectiveArgs {
+    /// API URL
+    #[arg(long, env = "MAKIMA_API_URL", default_value = "https://api.makima.jp", global = true)]
+    pub api_url: String,
+
+    /// API key for authentication
+    #[arg(long, env = "MAKIMA_API_KEY", global = true)]
+    pub api_key: String,
+
+    /// Directive ID
+    #[arg(long, env = "MAKIMA_DIRECTIVE_ID", global = true)]
+    pub directive_id: Uuid,
+}
+
+/// Arguments for chain command (get specific chain).
+#[derive(Args, Debug)]
+pub struct ChainArgs {
+    #[command(flatten)]
+    pub common: DirectiveArgs,
+
+    /// Chain ID to retrieve
+    pub chain_id: Uuid,
+}
+
+/// Arguments for update-status command.
+#[derive(Args, Debug)]
+pub struct UpdateStatusArgs {
+    #[command(flatten)]
+    pub common: DirectiveArgs,
+
+    /// New status (draft, planning, active, paused, completed, archived, failed)
+    pub status: String,
+}
diff --git a/makima/src/daemon/cli/mod.rs b/makima/src/daemon/cli/mod.rs
index 0805edd..9fba216 100644
--- a/makima/src/daemon/cli/mod.rs
+++ b/makima/src/daemon/cli/mod.rs
@@ -3,6 +3,7 @@
 pub mod config;
 pub mod contract;
 pub mod daemon;
+pub mod directive;
 pub mod server;
 pub mod supervisor;
 pub mod view;
@@ -12,6 +13,7 @@ use clap::{Parser, Subcommand};
 pub use config::CliConfig;
 pub use contract::ContractArgs;
 pub use daemon::DaemonArgs;
+pub use directive::DirectiveArgs;
 pub use server::ServerArgs;
 pub use supervisor::SupervisorArgs;
 pub use view::ViewArgs;
@@ -41,6 +43,10 @@ pub enum Commands {
     #[command(subcommand)]
     Contract(ContractCommand),
 
+    /// Directive commands for autonomous goal-driven execution
+    #[command(subcommand)]
+    Directive(DirectiveCommand),
+
     /// Interactive TUI browser for contracts and tasks
     ///
     /// Provides a drill-down interface for browsing contracts, viewing their
@@ -196,6 +202,28 @@ pub enum ContractCommand {
     CreateFile(contract::CreateFileArgs),
 }
 
+/// Directive subcommands for autonomous goal-driven execution.
+#[derive(Subcommand, Debug)]
+pub enum DirectiveCommand {
+    /// Get directive status and details
+    Status(DirectiveArgs),
+
+    /// Get goal, requirements, acceptance criteria
+    Goals(DirectiveArgs),
+
+    /// List chains for the directive
+    Chains(DirectiveArgs),
+
+    /// Get a chain with its steps
+    Chain(directive::ChainArgs),
+
+    /// List steps in a chain
+    Steps(directive::ChainArgs),
+
+    /// Update directive status
+    UpdateStatus(directive::UpdateStatusArgs),
+}
+
 impl Cli {
     /// Parse command-line arguments
     pub fn parse_args() -> Self {
diff --git a/makima/src/daemon/skills/directive.md b/makima/src/daemon/skills/directive.md
new file mode 100644
index 0000000..cdfdaa2
--- /dev/null
+++ b/makima/src/daemon/skills/directive.md
@@ -0,0 +1,68 @@
+---
+name: makima-directive
+description: Directive orchestration tools for autonomous goal-driven execution. Use when working with directives, chains, steps, verifiers, and approvals.
+---
+
+# Makima Directive Commands
+
+These commands let orchestrators interact with directive state. Environment variables (`MAKIMA_API_URL`, `MAKIMA_API_KEY`, `MAKIMA_DIRECTIVE_ID`) are pre-configured by the daemon.
+
+## Status and Information
+
+### Get directive status
+```bash
+makima directive status
+```
+Returns full directive details including status, autonomy level, thresholds, and tracking info.
+
+### Get directive goals
+```bash
+makima directive goals
+```
+Returns the goal, requirements, acceptance criteria, constraints, and external dependencies.
+
+### List chains
+```bash
+makima directive chains
+```
+Returns all chains (plan generations) for the directive, ordered by generation.
+
+### Get chain with steps
+```bash
+makima directive chain <chain_id>
+```
+Returns a chain and all its steps with status, dependencies, and evaluation info.
+
+### List steps in a chain
+```bash
+makima directive steps <chain_id>
+```
+Returns just the steps array from a chain.
+
+## Status Updates
+
+### Update directive status
+```bash
+makima directive update-status <status>
+```
+Updates the directive status. Valid statuses: `draft`, `planning`, `active`, `paused`, `completed`, `archived`, `failed`.
+
+## Output Format
+
+All commands output JSON to stdout.
+
+Example workflow:
+```bash
+# Check directive details and goals
+makima directive status
+makima directive goals
+
+# List execution chains
+makima directive chains
+
+# Get details of a specific chain
+makima directive chain <chain_id>
+
+# Update status to active
+makima directive update-status active
+```
diff --git a/makima/src/daemon/skills/mod.rs b/makima/src/daemon/skills/mod.rs
index 0b05f3a..6e5d0a8 100644
--- a/makima/src/daemon/skills/mod.rs
+++ b/makima/src/daemon/skills/mod.rs
@@ -9,8 +9,12 @@ pub const SUPERVISOR_SKILL: &str = include_str!("supervisor.md");
 /// Contract skill content - task-contract interaction commands
 pub const CONTRACT_SKILL: &str = include_str!("contract.md");
 
+/// Directive skill content - directive orchestration commands
+pub const DIRECTIVE_SKILL: &str = include_str!("directive.md");
+
 /// All skills as (name, content) pairs for installation
 pub const ALL_SKILLS: &[(&str, &str)] = &[
     ("makima-supervisor", SUPERVISOR_SKILL),
     ("makima-contract", CONTRACT_SKILL),
+    ("makima-directive", DIRECTIVE_SKILL),
 ];
diff --git a/makima/src/db/models.rs b/makima/src/db/models.rs
index 3b10cb5..ec4ee15 100644
--- a/makima/src/db/models.rs
+++ b/makima/src/db/models.rs
@@ -2690,3 +2690,237 @@ mod tests {
         assert_eq!(deserialized.progress, 50);
     }
 }
+
+// =============================================================================
+// Directive Types
+// =============================================================================
+
+/// Default autonomy level for directives
+fn default_autonomy_level() -> String {
+    "guardrails".to_string()
+}
+
+/// Default empty JSON array
+fn default_json_array() -> serde_json::Value {
+    serde_json::json!([])
+}
+
+/// Default empty JSON object
+fn default_json_object() -> serde_json::Value {
+    serde_json::json!({})
+}
+
+/// Default confidence threshold (green)
+fn default_confidence_green() -> f64 {
+    0.85
+}
+
+/// Default confidence threshold (yellow)
+fn default_confidence_yellow() -> f64 {
+    0.60
+}
+
+/// Default max rework cycles
+fn default_max_rework_cycles() -> Option<i32> {
+    Some(3)
+}
+
+/// Default max chain regenerations
+fn default_max_chain_regenerations() -> Option<i32> {
+    Some(2)
+}
+
+/// Full directive row from the database.
+#[derive(Debug, Clone, FromRow, Serialize, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct Directive {
+    pub id: Uuid,
+    pub owner_id: Uuid,
+    pub title: String,
+    pub goal: String,
+    #[sqlx(json)]
+    pub requirements: serde_json::Value,
+    #[sqlx(json)]
+    pub acceptance_criteria: serde_json::Value,
+    #[sqlx(json)]
+    pub constraints: serde_json::Value,
+    #[sqlx(json)]
+    pub external_dependencies: serde_json::Value,
+    pub status: String,
+    pub autonomy_level: String,
+    pub confidence_threshold_green: f64,
+    pub confidence_threshold_yellow: f64,
+    pub max_total_cost_usd: Option<f64>,
+    pub max_wall_time_minutes: Option<i32>,
+    pub max_rework_cycles: Option<i32>,
+    pub max_chain_regenerations: Option<i32>,
+    pub repository_url: Option<String>,
+    pub local_path: Option<String>,
+    pub base_branch: Option<String>,
+    pub orchestrator_contract_id: Option<Uuid>,
+    pub current_chain_id: Option<Uuid>,
+    pub chain_generation_count: i32,
+    pub total_cost_usd: f64,
+    pub started_at: Option<DateTime<Utc>>,
+    pub completed_at: Option<DateTime<Utc>>,
+    pub version: i32,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+}
+
+/// Summary of a directive for list views.
+#[derive(Debug, Clone, FromRow, Serialize, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DirectiveSummary {
+    pub id: Uuid,
+    pub title: String,
+    pub goal: String,
+    pub status: String,
+    pub autonomy_level: String,
+    pub chain_count: i64,
+    pub step_count: i64,
+    pub total_cost_usd: f64,
+    pub version: i32,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+}
+
+/// Response for directive list endpoint.
+#[derive(Debug, Serialize, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DirectiveListResponse {
+    pub directives: Vec<DirectiveSummary>,
+    pub total: i64,
+}
+
+/// Request to create a new directive.
+#[derive(Debug, Clone, Deserialize, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct CreateDirectiveRequest {
+    pub title: String,
+    pub goal: String,
+    #[serde(default = "default_json_array")]
+    pub requirements: serde_json::Value,
+    #[serde(default = "default_json_array")]
+    pub acceptance_criteria: serde_json::Value,
+    #[serde(default = "default_json_array")]
+    pub constraints: serde_json::Value,
+    #[serde(default = "default_json_array")]
+    pub external_dependencies: serde_json::Value,
+    #[serde(default = "default_autonomy_level")]
+    pub autonomy_level: String,
+    #[serde(default = "default_confidence_green")]
+    pub confidence_threshold_green: f64,
+    #[serde(default = "default_confidence_yellow")]
+    pub confidence_threshold_yellow: f64,
+    pub max_total_cost_usd: Option<f64>,
+    pub max_wall_time_minutes: Option<i32>,
+    #[serde(default = "default_max_rework_cycles")]
+    pub max_rework_cycles: Option<i32>,
+    #[serde(default = "default_max_chain_regenerations")]
+    pub max_chain_regenerations: Option<i32>,
+    pub repository_url: Option<String>,
+    pub local_path: Option<String>,
+    pub base_branch: Option<String>,
+}
+
+/// Request to update an existing directive.
+#[derive(Debug, Clone, Deserialize, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct UpdateDirectiveRequest {
+    pub title: Option<String>,
+    pub goal: Option<String>,
+    pub requirements: Option<serde_json::Value>,
+    pub acceptance_criteria: Option<serde_json::Value>,
+    pub constraints: Option<serde_json::Value>,
+    pub external_dependencies: Option<serde_json::Value>,
+    pub status: Option<String>,
+    pub autonomy_level: Option<String>,
+    pub confidence_threshold_green: Option<f64>,
+    pub confidence_threshold_yellow: Option<f64>,
+    pub max_total_cost_usd: Option<f64>,
+    pub max_wall_time_minutes: Option<i32>,
+    pub max_rework_cycles: Option<i32>,
+    pub max_chain_regenerations: Option<i32>,
+    pub repository_url: Option<String>,
+    pub local_path: Option<String>,
+    pub base_branch: Option<String>,
+    /// Version for optimistic locking
+    pub version: Option<i32>,
+}
+
+/// Directive with its chains for detail view.
+#[derive(Debug, Serialize, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DirectiveWithChains {
+    #[serde(flatten)]
+    pub directive: Directive,
+    pub chains: Vec<DirectiveChain>,
+}
+
+/// Full row from directive_chains table.
+#[derive(Debug, Clone, FromRow, Serialize, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DirectiveChain {
+    pub id: Uuid,
+    pub directive_id: Uuid,
+    pub generation: i32,
+    pub name: String,
+    pub description: Option<String>,
+    pub rationale: Option<String>,
+    pub planning_model: Option<String>,
+    pub status: String,
+    pub total_steps: i32,
+    pub completed_steps: i32,
+    pub failed_steps: i32,
+    pub current_confidence: Option<f64>,
+    pub started_at: Option<DateTime<Utc>>,
+    pub completed_at: Option<DateTime<Utc>>,
+    pub version: i32,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+}
+
+/// Full row from chain_steps table.
+#[derive(Debug, Clone, FromRow, Serialize, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ChainStep {
+    pub id: Uuid,
+    pub chain_id: Uuid,
+    pub name: String,
+    pub description: Option<String>,
+    pub step_type: String,
+    pub contract_type: String,
+    pub initial_phase: Option<String>,
+    pub task_plan: Option<String>,
+    pub phases: Option<Vec<String>>,
+    pub depends_on: Option<Vec<Uuid>>,
+    pub parallel_group: Option<String>,
+    pub requirement_ids: Option<Vec<String>>,
+    pub acceptance_criteria_ids: Option<Vec<String>>,
+    #[sqlx(json)]
+    pub verifier_config: serde_json::Value,
+    pub status: String,
+    pub contract_id: Option<Uuid>,
+    pub supervisor_task_id: Option<Uuid>,
+    pub confidence_score: Option<f64>,
+    pub confidence_level: Option<String>,
+    pub evaluation_count: i32,
+    pub rework_count: i32,
+    pub last_evaluation_id: Option<Uuid>,
+    pub editor_x: Option<f64>,
+    pub editor_y: Option<f64>,
+    pub order_index: i32,
+    pub started_at: Option<DateTime<Utc>>,
+    pub completed_at: Option<DateTime<Utc>>,
+    pub created_at: DateTime<Utc>,
+}
+
+/// Chain with its steps for detail view.
+#[derive(Debug, Serialize, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ChainWithSteps {
+    #[serde(flatten)]
+    pub chain: DirectiveChain,
+    pub steps: Vec<ChainStep>,
+}
diff --git a/makima/src/db/repository.rs b/makima/src/db/repository.rs
index 863d927..5949079 100644
--- a/makima/src/db/repository.rs
+++ b/makima/src/db/repository.rs
@@ -6,16 +6,17 @@ use sqlx::PgPool;
 use uuid::Uuid;
 
 use super::models::{
-    CheckpointPatch, CheckpointPatchInfo, Contract, ContractChatConversation,
+    ChainStep, CheckpointPatch, CheckpointPatchInfo, Contract, ContractChatConversation,
     ContractChatMessageRecord, ContractEvent, ContractRepository, ContractSummary,
     ContractTypeTemplateRecord, ConversationMessage, ConversationSnapshot,
-    CreateContractRequest, CreateFileRequest, CreateTaskRequest, CreateTemplateRequest,
-    Daemon, DaemonTaskAssignment, DaemonWithCapacity, DeliverableDefinition,
+    CreateContractRequest, CreateDirectiveRequest, CreateFileRequest, CreateTaskRequest,
+    CreateTemplateRequest, Daemon, DaemonTaskAssignment, DaemonWithCapacity,
+    DeliverableDefinition, Directive, DirectiveChain, DirectiveSummary,
     File, FileSummary, FileVersion, HistoryEvent, HistoryQueryFilters,
     MeshChatConversation, MeshChatMessageRecord, PhaseChangeResult, PhaseConfig,
     PhaseDefinition, SupervisorHeartbeatRecord, SupervisorState, Task, TaskCheckpoint,
-    TaskEvent, TaskSummary, UpdateContractRequest, UpdateFileRequest, UpdateTaskRequest,
-    UpdateTemplateRequest,
+    TaskEvent, TaskSummary, UpdateContractRequest, UpdateDirectiveRequest,
+    UpdateFileRequest, UpdateTaskRequest, UpdateTemplateRequest,
 };
 
 /// Repository error types.
@@ -4910,3 +4911,275 @@ fn truncate_string(s: &str, max_len: usize) -> String {
         format!("{}...", &s[..max_len - 3])
     }
 }
+
+// =============================================================================
+// Directive CRUD
+// =============================================================================
+
+/// Create a new directive, scoped to owner.
+pub async fn create_directive_for_owner(
+    pool: &PgPool,
+    owner_id: Uuid,
+    req: CreateDirectiveRequest,
+) -> Result<Directive, sqlx::Error> {
+    sqlx::query_as::<_, Directive>(
+        r#"
+        INSERT INTO directives (
+            owner_id, title, goal,
+            requirements, acceptance_criteria, constraints, external_dependencies,
+            autonomy_level, confidence_threshold_green, confidence_threshold_yellow,
+            max_total_cost_usd, max_wall_time_minutes, max_rework_cycles, max_chain_regenerations,
+            repository_url, local_path, base_branch
+        )
+        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17)
+        RETURNING *
+        "#,
+    )
+    .bind(owner_id)
+    .bind(&req.title)
+    .bind(&req.goal)
+    .bind(&req.requirements)
+    .bind(&req.acceptance_criteria)
+    .bind(&req.constraints)
+    .bind(&req.external_dependencies)
+    .bind(&req.autonomy_level)
+    .bind(req.confidence_threshold_green)
+    .bind(req.confidence_threshold_yellow)
+    .bind(req.max_total_cost_usd)
+    .bind(req.max_wall_time_minutes)
+    .bind(req.max_rework_cycles)
+    .bind(req.max_chain_regenerations)
+    .bind(&req.repository_url)
+    .bind(&req.local_path)
+    .bind(&req.base_branch)
+    .fetch_one(pool)
+    .await
+}
+
+/// Get a directive by ID, scoped to owner.
+pub async fn get_directive_for_owner(
+    pool: &PgPool,
+    id: Uuid,
+    owner_id: Uuid,
+) -> Result<Option<Directive>, sqlx::Error> {
+    sqlx::query_as::<_, Directive>(
+        r#"
+        SELECT *
+        FROM directives
+        WHERE id = $1 AND owner_id = $2
+        "#,
+    )
+    .bind(id)
+    .bind(owner_id)
+    .fetch_optional(pool)
+    .await
+}
+
+/// List all directives for an owner, ordered by created_at DESC.
+pub async fn list_directives_for_owner(
+    pool: &PgPool,
+    owner_id: Uuid,
+) -> Result<Vec<DirectiveSummary>, sqlx::Error> {
+    sqlx::query_as::<_, DirectiveSummary>(
+        r#"
+        SELECT
+            d.id, d.title, d.goal, d.status, d.autonomy_level,
+            (SELECT COUNT(*) FROM directive_chains WHERE directive_id = d.id) as chain_count,
+            (SELECT COUNT(*) FROM chain_steps cs JOIN directive_chains dc ON cs.chain_id = dc.id WHERE dc.directive_id = d.id) as step_count,
+            d.total_cost_usd, d.version, d.created_at, d.updated_at
+        FROM directives d
+        WHERE d.owner_id = $1
+        ORDER BY d.created_at DESC
+        "#,
+    )
+    .bind(owner_id)
+    .fetch_all(pool)
+    .await
+}
+
+/// Update a directive by ID with optimistic locking, scoped to owner.
+pub async fn update_directive_for_owner(
+    pool: &PgPool,
+    id: Uuid,
+    owner_id: Uuid,
+    req: UpdateDirectiveRequest,
+) -> Result<Option<Directive>, RepositoryError> {
+    let existing = get_directive_for_owner(pool, id, owner_id).await?;
+    let Some(existing) = existing else {
+        return Ok(None);
+    };
+
+    // Check version if provided (optimistic locking)
+    if let Some(expected_version) = req.version {
+        if existing.version != expected_version {
+            return Err(RepositoryError::VersionConflict {
+                expected: expected_version,
+                actual: existing.version,
+            });
+        }
+    }
+
+    // Apply updates
+    let title = req.title.unwrap_or(existing.title);
+    let goal = req.goal.unwrap_or(existing.goal);
+    let requirements = req.requirements.unwrap_or(existing.requirements);
+    let acceptance_criteria = req.acceptance_criteria.unwrap_or(existing.acceptance_criteria);
+    let constraints = req.constraints.unwrap_or(existing.constraints);
+    let external_dependencies = req.external_dependencies.unwrap_or(existing.external_dependencies);
+    let status = req.status.unwrap_or(existing.status);
+    let autonomy_level = req.autonomy_level.unwrap_or(existing.autonomy_level);
+    let confidence_threshold_green = req.confidence_threshold_green.unwrap_or(existing.confidence_threshold_green);
+    let confidence_threshold_yellow = req.confidence_threshold_yellow.unwrap_or(existing.confidence_threshold_yellow);
+    let max_total_cost_usd = req.max_total_cost_usd.or(existing.max_total_cost_usd);
+    let max_wall_time_minutes = req.max_wall_time_minutes.or(existing.max_wall_time_minutes);
+    let max_rework_cycles = req.max_rework_cycles.or(existing.max_rework_cycles);
+    let max_chain_regenerations = req.max_chain_regenerations.or(existing.max_chain_regenerations);
+    let repository_url = req.repository_url.or(existing.repository_url);
+    let local_path = req.local_path.or(existing.local_path);
+    let base_branch = req.base_branch.or(existing.base_branch);
+
+    let result = if req.version.is_some() {
+        sqlx::query_as::<_, Directive>(
+            r#"
+            UPDATE directives
+            SET title = $3, goal = $4,
+                requirements = $5, acceptance_criteria = $6, constraints = $7, external_dependencies = $8,
+                status = $9, autonomy_level = $10,
+                confidence_threshold_green = $11, confidence_threshold_yellow = $12,
+                max_total_cost_usd = $13, max_wall_time_minutes = $14,
+                max_rework_cycles = $15, max_chain_regenerations = $16,
+                repository_url = $17, local_path = $18, base_branch = $19,
+                version = version + 1, updated_at = NOW()
+            WHERE id = $1 AND owner_id = $2 AND version = $20
+            RETURNING *
+            "#,
+        )
+        .bind(id)
+        .bind(owner_id)
+        .bind(&title)
+        .bind(&goal)
+        .bind(&requirements)
+        .bind(&acceptance_criteria)
+        .bind(&constraints)
+        .bind(&external_dependencies)
+        .bind(&status)
+        .bind(&autonomy_level)
+        .bind(confidence_threshold_green)
+        .bind(confidence_threshold_yellow)
+        .bind(max_total_cost_usd)
+        .bind(max_wall_time_minutes)
+        .bind(max_rework_cycles)
+        .bind(max_chain_regenerations)
+        .bind(&repository_url)
+        .bind(&local_path)
+        .bind(&base_branch)
+        .bind(req.version.unwrap())
+        .fetch_optional(pool)
+        .await?
+    } else {
+        sqlx::query_as::<_, Directive>(
+            r#"
+            UPDATE directives
+            SET title = $3, goal = $4,
+                requirements = $5, acceptance_criteria = $6, constraints = $7, external_dependencies = $8,
+                status = $9, autonomy_level = $10,
+                confidence_threshold_green = $11, confidence_threshold_yellow = $12,
+                max_total_cost_usd = $13, max_wall_time_minutes = $14,
+                max_rework_cycles = $15, max_chain_regenerations = $16,
+                repository_url = $17, local_path = $18, base_branch = $19,
+                version = version + 1, updated_at = NOW()
+            WHERE id = $1 AND owner_id = $2
+            RETURNING *
+            "#,
+        )
+        .bind(id)
+        .bind(owner_id)
+        .bind(&title)
+        .bind(&goal)
+        .bind(&requirements)
+        .bind(&acceptance_criteria)
+        .bind(&constraints)
+        .bind(&external_dependencies)
+        .bind(&status)
+        .bind(&autonomy_level)
+        .bind(confidence_threshold_green)
+        .bind(confidence_threshold_yellow)
+        .bind(max_total_cost_usd)
+        .bind(max_wall_time_minutes)
+        .bind(max_rework_cycles)
+        .bind(max_chain_regenerations)
+        .bind(&repository_url)
+        .bind(&local_path)
+        .bind(&base_branch)
+        .fetch_optional(pool)
+        .await?
+    };
+
+    // If versioned update returned None, there was a race condition
+    if result.is_none() && req.version.is_some() {
+        if let Some(current) = get_directive_for_owner(pool, id, owner_id).await? {
+            return Err(RepositoryError::VersionConflict {
+                expected: req.version.unwrap(),
+                actual: current.version,
+            });
+        }
+    }
+
+    Ok(result)
+}
+
+/// Delete a directive by ID, scoped to owner.
+pub async fn delete_directive_for_owner(
+    pool: &PgPool,
+    id: Uuid,
+    owner_id: Uuid,
+) -> Result<bool, sqlx::Error> {
+    let result = sqlx::query(
+        r#"
+        DELETE FROM directives
+        WHERE id = $1 AND owner_id = $2
+        "#,
+    )
+    .bind(id)
+    .bind(owner_id)
+    .execute(pool)
+    .await?;
+
+    Ok(result.rows_affected() > 0)
+}
+
+/// List chains for a directive (read-only).
+pub async fn list_chains_for_directive(
+    pool: &PgPool,
+    directive_id: Uuid,
+) -> Result<Vec<DirectiveChain>, sqlx::Error> {
+    sqlx::query_as::<_, DirectiveChain>(
+        r#"
+        SELECT *
+        FROM directive_chains
+        WHERE directive_id = $1
+        ORDER BY generation DESC, created_at DESC
+        "#,
+    )
+    .bind(directive_id)
+    .fetch_all(pool)
+    .await
+}
+
+/// List steps for a chain (read-only).
+pub async fn list_steps_for_chain(
+    pool: &PgPool,
+    chain_id: Uuid,
+) -> Result<Vec<ChainStep>, sqlx::Error> {
+    sqlx::query_as::<_, ChainStep>(
+        r#"
+        SELECT *
+        FROM chain_steps
+        WHERE chain_id = $1
+        ORDER BY order_index ASC, created_at ASC
+        "#,
+    )
+    .bind(chain_id)
+    .fetch_all(pool)
+    .await
+}
diff --git a/makima/src/server/handlers/directives.rs b/makima/src/server/handlers/directives.rs
new file mode 100644
index 0000000..a74f8ff
--- /dev/null
+++ b/makima/src/server/handlers/directives.rs
@@ -0,0 +1,440 @@
+//! HTTP handlers for directive CRUD operations.
+
+use axum::{
+    extract::{Path, State},
+    http::StatusCode,
+    response::IntoResponse,
+    Json,
+};
+use uuid::Uuid;
+
+use crate::db::models::{
+    ChainWithSteps, CreateDirectiveRequest, Directive, DirectiveChain,
+    DirectiveListResponse, DirectiveWithChains, UpdateDirectiveRequest,
+};
+use crate::db::repository::{self, RepositoryError};
+use crate::server::auth::Authenticated;
+use crate::server::messages::ApiError;
+use crate::server::state::SharedState;
+
+/// List all directives for the authenticated user's owner.
+#[utoipa::path(
+    get,
+    path = "/api/v1/directives",
+    responses(
+        (status = 200, description = "List of directives", body = DirectiveListResponse),
+        (status = 401, description = "Unauthorized", body = ApiError),
+        (status = 503, description = "Database not configured", body = ApiError),
+        (status = 500, description = "Internal server error", body = ApiError),
+    ),
+    security(
+        ("bearer_auth" = []),
+        ("api_key" = [])
+    ),
+    tag = "Directives"
+)]
+pub async fn list_directives(
+    State(state): State<SharedState>,
+    Authenticated(auth): Authenticated,
+) -> impl IntoResponse {
+    let Some(ref pool) = state.db_pool else {
+        return (
+            StatusCode::SERVICE_UNAVAILABLE,
+            Json(ApiError::new("DB_UNAVAILABLE", "Database not configured")),
+        )
+            .into_response();
+    };
+
+    match repository::list_directives_for_owner(pool, auth.owner_id).await {
+        Ok(directives) => {
+            let total = directives.len() as i64;
+            Json(DirectiveListResponse { directives, total }).into_response()
+        }
+        Err(e) => {
+            tracing::error!("Failed to list directives: {}", e);
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(ApiError::new("DB_ERROR", e.to_string())),
+            )
+                .into_response()
+        }
+    }
+}
+
+/// Get a directive by ID with its chains.
+#[utoipa::path(
+    get,
+    path = "/api/v1/directives/{id}",
+    params(
+        ("id" = Uuid, Path, description = "Directive ID")
+    ),
+    responses(
+        (status = 200, description = "Directive details with chains", body = DirectiveWithChains),
+        (status = 401, description = "Unauthorized", body = ApiError),
+        (status = 404, description = "Directive not found", body = ApiError),
+        (status = 503, description = "Database not configured", body = ApiError),
+        (status = 500, description = "Internal server error", body = ApiError),
+    ),
+    security(
+        ("bearer_auth" = []),
+        ("api_key" = [])
+    ),
+    tag = "Directives"
+)]
+pub async fn get_directive(
+    State(state): State<SharedState>,
+    Authenticated(auth): Authenticated,
+    Path(id): Path<Uuid>,
+) -> impl IntoResponse {
+    let Some(ref pool) = state.db_pool else {
+        return (
+            StatusCode::SERVICE_UNAVAILABLE,
+            Json(ApiError::new("DB_UNAVAILABLE", "Database not configured")),
+        )
+            .into_response();
+    };
+
+    let directive = match repository::get_directive_for_owner(pool, id, auth.owner_id).await {
+        Ok(Some(d)) => d,
+        Ok(None) => {
+            return (
+                StatusCode::NOT_FOUND,
+                Json(ApiError::new("NOT_FOUND", "Directive not found")),
+            )
+                .into_response();
+        }
+        Err(e) => {
+            tracing::error!("Failed to get directive {}: {}", id, e);
+            return (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(ApiError::new("DB_ERROR", e.to_string())),
+            )
+                .into_response();
+        }
+    };
+
+    let chains = match repository::list_chains_for_directive(pool, id).await {
+        Ok(c) => c,
+        Err(e) => {
+            tracing::warn!("Failed to get chains for directive {}: {}", id, e);
+            Vec::new()
+        }
+    };
+
+    Json(DirectiveWithChains { directive, chains }).into_response()
+}
+
+/// Create a new directive.
+#[utoipa::path(
+    post,
+    path = "/api/v1/directives",
+    request_body = CreateDirectiveRequest,
+    responses(
+        (status = 201, description = "Directive created", body = Directive),
+        (status = 400, description = "Invalid request", body = ApiError),
+        (status = 401, description = "Unauthorized", body = ApiError),
+        (status = 503, description = "Database not configured", body = ApiError),
+        (status = 500, description = "Internal server error", body = ApiError),
+    ),
+    security(
+        ("bearer_auth" = []),
+        ("api_key" = [])
+    ),
+    tag = "Directives"
+)]
+pub async fn create_directive(
+    State(state): State<SharedState>,
+    Authenticated(auth): Authenticated,
+    Json(req): Json<CreateDirectiveRequest>,
+) -> impl IntoResponse {
+    let Some(ref pool) = state.db_pool else {
+        return (
+            StatusCode::SERVICE_UNAVAILABLE,
+            Json(ApiError::new("DB_UNAVAILABLE", "Database not configured")),
+        )
+            .into_response();
+    };
+
+    match repository::create_directive_for_owner(pool, auth.owner_id, req).await {
+        Ok(directive) => (StatusCode::CREATED, Json(directive)).into_response(),
+        Err(e) => {
+            tracing::error!("Failed to create directive: {}", e);
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(ApiError::new("DB_ERROR", e.to_string())),
+            )
+                .into_response()
+        }
+    }
+}
+
+/// Update an existing directive.
+#[utoipa::path(
+    put,
+    path = "/api/v1/directives/{id}",
+    params(
+        ("id" = Uuid, Path, description = "Directive ID")
+    ),
+    request_body = UpdateDirectiveRequest,
+    responses(
+        (status = 200, description = "Directive updated", body = Directive),
+        (status = 401, description = "Unauthorized", body = ApiError),
+        (status = 404, description = "Directive not found", body = ApiError),
+        (status = 409, description = "Version conflict", body = ApiError),
+        (status = 503, description = "Database not configured", body = ApiError),
+        (status = 500, description = "Internal server error", body = ApiError),
+    ),
+    security(
+        ("bearer_auth" = []),
+        ("api_key" = [])
+    ),
+    tag = "Directives"
+)]
+pub async fn update_directive(
+    State(state): State<SharedState>,
+    Authenticated(auth): Authenticated,
+    Path(id): Path<Uuid>,
+    Json(req): Json<UpdateDirectiveRequest>,
+) -> impl IntoResponse {
+    let Some(ref pool) = state.db_pool else {
+        return (
+            StatusCode::SERVICE_UNAVAILABLE,
+            Json(ApiError::new("DB_UNAVAILABLE", "Database not configured")),
+        )
+            .into_response();
+    };
+
+    match repository::update_directive_for_owner(pool, id, auth.owner_id, req).await {
+        Ok(Some(directive)) => Json(directive).into_response(),
+        Ok(None) => (
+            StatusCode::NOT_FOUND,
+            Json(ApiError::new("NOT_FOUND", "Directive not found")),
+        )
+            .into_response(),
+        Err(RepositoryError::VersionConflict { expected, actual }) => (
+            StatusCode::CONFLICT,
+            Json(ApiError::new(
+                "VERSION_CONFLICT",
+                format!(
+                    "Version conflict: expected {}, actual {}",
+                    expected, actual
+                ),
+            )),
+        )
+            .into_response(),
+        Err(RepositoryError::Database(e)) => {
+            tracing::error!("Failed to update directive {}: {}", id, e);
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(ApiError::new("DB_ERROR", e.to_string())),
+            )
+                .into_response()
+        }
+    }
+}
+
+/// Delete a directive.
+#[utoipa::path(
+    delete,
+    path = "/api/v1/directives/{id}",
+    params(
+        ("id" = Uuid, Path, description = "Directive ID")
+    ),
+    responses(
+        (status = 204, description = "Directive deleted"),
+        (status = 401, description = "Unauthorized", body = ApiError),
+        (status = 404, description = "Directive not found", body = ApiError),
+        (status = 503, description = "Database not configured", body = ApiError),
+        (status = 500, description = "Internal server error", body = ApiError),
+    ),
+    security(
+        ("bearer_auth" = []),
+        ("api_key" = [])
+    ),
+    tag = "Directives"
+)]
+pub async fn delete_directive(
+    State(state): State<SharedState>,
+    Authenticated(auth): Authenticated,
+    Path(id): Path<Uuid>,
+) -> impl IntoResponse {
+    let Some(ref pool) = state.db_pool else {
+        return (
+            StatusCode::SERVICE_UNAVAILABLE,
+            Json(ApiError::new("DB_UNAVAILABLE", "Database not configured")),
+        )
+            .into_response();
+    };
+
+    match repository::delete_directive_for_owner(pool, id, auth.owner_id).await {
+        Ok(true) => StatusCode::NO_CONTENT.into_response(),
+        Ok(false) => (
+            StatusCode::NOT_FOUND,
+            Json(ApiError::new("NOT_FOUND", "Directive not found")),
+        )
+            .into_response(),
+        Err(e) => {
+            tracing::error!("Failed to delete directive {}: {}", id, e);
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(ApiError::new("DB_ERROR", e.to_string())),
+            )
+                .into_response()
+        }
+    }
+}
+
+/// List chains for a directive.
+#[utoipa::path(
+    get,
+    path = "/api/v1/directives/{id}/chains",
+    params(
+        ("id" = Uuid, Path, description = "Directive ID")
+    ),
+    responses(
+        (status = 200, description = "List of chains", body = Vec<DirectiveChain>),
+        (status = 401, description = "Unauthorized", body = ApiError),
+        (status = 404, description = "Directive not found", body = ApiError),
+        (status = 503, description = "Database not configured", body = ApiError),
+        (status = 500, description = "Internal server error", body = ApiError),
+    ),
+    security(
+        ("bearer_auth" = []),
+        ("api_key" = [])
+    ),
+    tag = "Directives"
+)]
+pub async fn list_chains(
+    State(state): State<SharedState>,
+    Authenticated(auth): Authenticated,
+    Path(id): Path<Uuid>,
+) -> impl IntoResponse {
+    let Some(ref pool) = state.db_pool else {
+        return (
+            StatusCode::SERVICE_UNAVAILABLE,
+            Json(ApiError::new("DB_UNAVAILABLE", "Database not configured")),
+        )
+            .into_response();
+    };
+
+    // Verify directive exists and belongs to owner
+    match repository::get_directive_for_owner(pool, id, auth.owner_id).await {
+        Ok(Some(_)) => {}
+        Ok(None) => {
+            return (
+                StatusCode::NOT_FOUND,
+                Json(ApiError::new("NOT_FOUND", "Directive not found")),
+            )
+                .into_response();
+        }
+        Err(e) => {
+            tracing::error!("Failed to get directive {}: {}", id, e);
+            return (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(ApiError::new("DB_ERROR", e.to_string())),
+            )
+                .into_response();
+        }
+    }
+
+    match repository::list_chains_for_directive(pool, id).await {
+        Ok(chains) => Json(chains).into_response(),
+        Err(e) => {
+            tracing::error!("Failed to list chains for directive {}: {}", id, e);
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(ApiError::new("DB_ERROR", e.to_string())),
+            )
+                .into_response()
+        }
+    }
+}
+
+/// Get a chain with its steps.
+#[utoipa::path(
+    get,
+    path = "/api/v1/directives/{id}/chains/{chain_id}",
+    params(
+        ("id" = Uuid, Path, description = "Directive ID"),
+        ("chain_id" = Uuid, Path, description = "Chain ID")
+    ),
+    responses(
+        (status = 200, description = "Chain with steps", body = ChainWithSteps),
+        (status = 401, description = "Unauthorized", body = ApiError),
+        (status = 404, description = "Chain not found", body = ApiError),
+        (status = 503, description = "Database not configured", body = ApiError),
+        (status = 500, description = "Internal server error", body = ApiError),
+    ),
+    security(
+        ("bearer_auth" = []),
+        ("api_key" = [])
+    ),
+    tag = "Directives"
+)]
+pub async fn get_chain(
+    State(state): State<SharedState>,
+    Authenticated(auth): Authenticated,
+    Path((id, chain_id)): Path<(Uuid, Uuid)>,
+) -> impl IntoResponse {
+    let Some(ref pool) = state.db_pool else {
+        return (
+            StatusCode::SERVICE_UNAVAILABLE,
+            Json(ApiError::new("DB_UNAVAILABLE", "Database not configured")),
+        )
+            .into_response();
+    };
+
+    // Verify directive exists and belongs to owner
+    match repository::get_directive_for_owner(pool, id, auth.owner_id).await {
+        Ok(Some(_)) => {}
+        Ok(None) => {
+            return (
+                StatusCode::NOT_FOUND,
+                Json(ApiError::new("NOT_FOUND", "Directive not found")),
+            )
+                .into_response();
+        }
+        Err(e) => {
+            tracing::error!("Failed to get directive {}: {}", id, e);
+            return (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(ApiError::new("DB_ERROR", e.to_string())),
+            )
+                .into_response();
+        }
+    }
+
+    // Get the chain and verify it belongs to this directive
+    let chains = match repository::list_chains_for_directive(pool, id).await {
+        Ok(c) => c,
+        Err(e) => {
+            tracing::error!("Failed to list chains: {}", e);
+            return (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(ApiError::new("DB_ERROR", e.to_string())),
+            )
+                .into_response();
+        }
+    };
+
+    let chain = match chains.into_iter().find(|c| c.id == chain_id) {
+        Some(c) => c,
+        None => {
+            return (
+                StatusCode::NOT_FOUND,
+                Json(ApiError::new("NOT_FOUND", "Chain not found")),
+            )
+                .into_response();
+        }
+    };
+
+    let steps = match repository::list_steps_for_chain(pool, chain_id).await {
+        Ok(s) => s,
+        Err(e) => {
+            tracing::warn!("Failed to get steps for chain {}: {}", chain_id, e);
+            Vec::new()
+        }
+    };
+
+    Json(ChainWithSteps { chain, steps }).into_response()
+}
diff --git a/makima/src/server/handlers/mod.rs b/makima/src/server/handlers/mod.rs
index ae370c9..29cd09f 100644
--- a/makima/src/server/handlers/mod.rs
+++ b/makima/src/server/handlers/mod.rs
@@ -6,6 +6,7 @@ pub mod contract_chat;
 pub mod contract_daemon;
 pub mod contract_discuss;
 pub mod contracts;
+pub mod directives;
 pub mod file_ws;
 pub mod files;
 pub mod history;
diff --git a/makima/src/server/mod.rs b/makima/src/server/mod.rs
index b7a4156..a429612 100644
--- a/makima/src/server/mod.rs
+++ b/makima/src/server/mod.rs
@@ -18,7 +18,7 @@ use tower_http::trace::TraceLayer;
 use utoipa::OpenApi;
 use utoipa_swagger_ui::SwaggerUi;
 
-use crate::server::handlers::{api_keys, chat, contract_chat, contract_daemon, contract_discuss, contracts, file_ws, files, history, listen, mesh, mesh_chat, mesh_daemon, mesh_merge, mesh_supervisor, mesh_ws, repository_history, speak, templates, transcript_analysis, users, versions};
+use crate::server::handlers::{api_keys, chat, contract_chat, contract_daemon, contract_discuss, contracts, directives, file_ws, files, history, listen, mesh, mesh_chat, mesh_daemon, mesh_merge, mesh_supervisor, mesh_ws, repository_history, speak, templates, transcript_analysis, users, versions};
 use crate::server::openapi::ApiDoc;
 use crate::server::state::SharedState;
 
@@ -170,6 +170,19 @@ pub fn make_router(state: SharedState) -> Router {
             "/contracts/{id}/chat/history",
             get(contract_chat::get_contract_chat_history).delete(contract_chat::clear_contract_chat_history),
         )
+        // Directive endpoints
+        .route(
+            "/directives",
+            get(directives::list_directives).post(directives::create_directive),
+        )
+        .route(
+            "/directives/{id}",
+            get(directives::get_directive)
+                .put(directives::update_directive)
+                .delete(directives::delete_directive),
+        )
+        .route("/directives/{id}/chains", get(directives::list_chains))
+        .route("/directives/{id}/chains/{chain_id}", get(directives::get_chain))
         // Contract supervisor resume endpoints
         .route("/contracts/{id}/supervisor/resume", post(mesh_supervisor::resume_supervisor))
         .route("/contracts/{id}/supervisor/conversation/rewind", post(mesh_supervisor::rewind_conversation))
diff --git a/makima/src/server/openapi.rs b/makima/src/server/openapi.rs
index a70342b..0e6912a 100644
--- a/makima/src/server/openapi.rs
+++ b/makima/src/server/openapi.rs
@@ -4,23 +4,25 @@ use utoipa::OpenApi;
 
 use crate::db::models::{
     AddLocalRepositoryRequest, AddRemoteRepositoryRequest, BranchInfo, BranchListResponse,
-    BranchTaskRequest, BranchTaskResponse, ChangePhaseRequest, Contract,
-    ContractChatHistoryResponse, ContractChatMessageRecord, ContractEvent, ContractListResponse,
-    ContractRepository, ContractSummary, ContractWithRelations, CreateContractRequest,
-    CreateFileRequest, CreateManagedRepositoryRequest, CreateTaskRequest, Daemon,
-    DaemonDirectoriesResponse, DaemonDirectory, DaemonListResponse, File, FileListResponse,
-    FileSummary, MergeCommitRequest, MergeCompleteCheckResponse, MergeResolveRequest,
-    MergeResultResponse, MergeSkipRequest, MergeStartRequest, MergeStatusResponse,
-    MeshChatConversation, MeshChatHistoryResponse, MeshChatMessageRecord, RepositoryHistoryEntry,
+    BranchTaskRequest, BranchTaskResponse, ChainStep, ChainWithSteps, ChangePhaseRequest,
+    Contract, ContractChatHistoryResponse, ContractChatMessageRecord, ContractEvent,
+    ContractListResponse, ContractRepository, ContractSummary, ContractWithRelations,
+    CreateContractRequest, CreateDirectiveRequest, CreateFileRequest,
+    CreateManagedRepositoryRequest, CreateTaskRequest, Daemon, DaemonDirectoriesResponse,
+    DaemonDirectory, DaemonListResponse, Directive, DirectiveChain, DirectiveListResponse,
+    DirectiveSummary, DirectiveWithChains, File, FileListResponse, FileSummary,
+    MergeCommitRequest, MergeCompleteCheckResponse, MergeResolveRequest, MergeResultResponse,
+    MergeSkipRequest, MergeStartRequest, MergeStatusResponse, MeshChatConversation,
+    MeshChatHistoryResponse, MeshChatMessageRecord, RepositoryHistoryEntry,
     RepositoryHistoryListResponse, RepositorySuggestionsQuery, SendMessageRequest, Task,
     TaskEventListResponse, TaskListResponse, TaskSummary, TaskWithSubtasks, TranscriptEntry,
-    UpdateContractRequest, UpdateFileRequest, UpdateTaskRequest,
+    UpdateContractRequest, UpdateDirectiveRequest, UpdateFileRequest, UpdateTaskRequest,
 };
 use crate::server::auth::{
     ApiKey, ApiKeyInfoResponse, CreateApiKeyRequest, CreateApiKeyResponse,
     RefreshApiKeyRequest, RefreshApiKeyResponse, RevokeApiKeyResponse,
 };
-use crate::server::handlers::{api_keys, contract_chat, contract_discuss, contracts, files, listen, mesh, mesh_chat, mesh_merge, repository_history, users};
+use crate::server::handlers::{api_keys, contract_chat, contract_discuss, contracts, directives, files, listen, mesh, mesh_chat, mesh_merge, repository_history, users};
 use crate::server::messages::{ApiError, AudioEncoding, StartMessage, StopMessage, TranscriptMessage};
 
 #[derive(OpenApi)]
@@ -103,6 +105,14 @@ use crate::server::messages::{ApiError, AudioEncoding, StartMessage, StopMessage
         repository_history::list_repository_history,
         repository_history::get_repository_suggestions,
         repository_history::delete_repository_history,
+        // Directive endpoints
+        directives::list_directives,
+        directives::get_directive,
+        directives::create_directive,
+        directives::update_directive,
+        directives::delete_directive,
+        directives::list_chains,
+        directives::get_chain,
     ),
     components(
         schemas(
@@ -187,6 +197,16 @@ use crate::server::messages::{ApiError, AudioEncoding, StartMessage, StopMessage
             RepositoryHistoryEntry,
             RepositoryHistoryListResponse,
             RepositorySuggestionsQuery,
+            // Directive schemas
+            Directive,
+            DirectiveSummary,
+            DirectiveListResponse,
+            DirectiveWithChains,
+            DirectiveChain,
+            ChainStep,
+            ChainWithSteps,
+            CreateDirectiveRequest,
+            UpdateDirectiveRequest,
         )
     ),
     tags(
@@ -197,6 +217,7 @@ use crate::server::messages::{ApiError, AudioEncoding, StartMessage, StopMessage
         (name = "API Keys", description = "API key management for programmatic access"),
         (name = "Users", description = "User account management"),
         (name = "Settings", description = "User settings including repository history"),
+        (name = "Directives", description = "Directive management for autonomous goal-driven execution"),
     )
 )]
 pub struct ApiDoc;