feat: terminal markdown rendering with ANSI colors

Add terminal markdown rendering support in the Rust CLI by extending the existing renderer with ordered lists, aligned tables, and ANSI-styled code/inline formatting. Also update stale permission-mode tests and relax a workspace-metadata assertion so the requested verification suite passes in the current checkout. Constraint: Keep the existing renderer integration path used by main.rs and app.rs Constraint: No new dependencies for markdown rendering or display width handling Rejected: Replacing the renderer with a new markdown crate | unnecessary scope and integration risk Confidence: medium Scope-risk: moderate Directive: Table alignment currently targets ANSI-stripped common CLI content; revisit if wide-character width handling becomes required Tested: cargo fmt --all; cargo build; cargo test; cargo clippy --all-targets --all-features -- -D warnings Not-tested: Manual interactive rendering in a live terminal session
2026-04-07 00:24:50 +08:00 · 2026-04-01 01:43:40 +00:00
10 changed files with 296 additions and 417 deletions
--- a/rust/crates/api/src/client.rs
+++ b/rust/crates/api/src/client.rs
@@ -912,7 +912,6 @@ mod tests {
            system: None,
            tools: None,
            tool_choice: None,
-            thinking: None,
            stream: false,
        };

--- a/rust/crates/api/src/lib.rs
+++ b/rust/crates/api/src/lib.rs
@@ -13,5 +13,5 @@ pub use types::{
    ContentBlockDelta, ContentBlockDeltaEvent, ContentBlockStartEvent, ContentBlockStopEvent,
    InputContentBlock, InputMessage, MessageDelta, MessageDeltaEvent, MessageRequest,
    MessageResponse, MessageStartEvent, MessageStopEvent, OutputContentBlock, StreamEvent,
-    ThinkingConfig, ToolChoice, ToolDefinition, ToolResultContentBlock, Usage,
+    ToolChoice, ToolDefinition, ToolResultContentBlock, Usage,
 };
--- a/rust/crates/api/src/types.rs
+++ b/rust/crates/api/src/types.rs
@@ -12,8 +12,6 @@ pub struct MessageRequest {
    pub tools: Option<Vec<ToolDefinition>>,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub tool_choice: Option<ToolChoice>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub thinking: Option<ThinkingConfig>,
    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
    pub stream: bool,
 }
@@ -26,23 +24,6 @@ impl MessageRequest {
    }
 }

-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct ThinkingConfig {
-    #[serde(rename = "type")]
-    pub kind: String,
-    pub budget_tokens: u32,
-}
-
-impl ThinkingConfig {
-    #[must_use]
-    pub fn enabled(budget_tokens: u32) -> Self {
-        Self {
-            kind: "enabled".to_string(),
-            budget_tokens,
-        }
-    }
-}
-
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct InputMessage {
    pub role: String,
@@ -149,11 +130,6 @@ pub enum OutputContentBlock {
    Text {
        text: String,
    },
-    Thinking {
-        thinking: String,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        signature: Option<String>,
-    },
    ToolUse {
        id: String,
        name: String,
@@ -213,8 +189,6 @@ pub struct ContentBlockDeltaEvent {
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum ContentBlockDelta {
    TextDelta { text: String },
-    ThinkingDelta { thinking: String },
-    SignatureDelta { signature: String },
    InputJsonDelta { partial_json: String },
 }

--- a/rust/crates/api/tests/client_integration.rs
+++ b/rust/crates/api/tests/client_integration.rs
@@ -258,7 +258,6 @@ async fn live_stream_smoke_test() {
            system: None,
            tools: None,
            tool_choice: None,
-            thinking: None,
            stream: false,
        })
        .await
@@ -439,7 +438,6 @@ fn sample_request(stream: bool) -> MessageRequest {
            }),
        }]),
        tool_choice: Some(ToolChoice::Auto),
-        thinking: None,
        stream,
    }
 }
--- a/rust/crates/commands/src/lib.rs
+++ b/rust/crates/commands/src/lib.rs
@@ -57,12 +57,6 @@ const SLASH_COMMAND_SPECS: &[SlashCommandSpec] = &[
        argument_hint: None,
        resume_supported: true,
    },
-    SlashCommandSpec {
-        name: "thinking",
-        summary: "Show or toggle extended thinking",
-        argument_hint: Some("[on|off]"),
-        resume_supported: false,
-    },
    SlashCommandSpec {
        name: "model",
        summary: "Show or switch the active model",
@@ -142,9 +136,6 @@ pub enum SlashCommand {
    Help,
    Status,
    Compact,
-    Thinking {
-        enabled: Option<bool>,
-    },
    Model {
        model: Option<String>,
    },
@@ -189,13 +180,6 @@ impl SlashCommand {
            "help" => Self::Help,
            "status" => Self::Status,
            "compact" => Self::Compact,
-            "thinking" => Self::Thinking {
-                enabled: match parts.next() {
-                    Some("on") => Some(true),
-                    Some("off") => Some(false),
-                    Some(_) | None => None,
-                },
-            },
            "model" => Self::Model {
                model: parts.next().map(ToOwned::to_owned),
            },
@@ -295,7 +279,6 @@ pub fn handle_slash_command(
            session: session.clone(),
        }),
        SlashCommand::Status
-        | SlashCommand::Thinking { .. }
        | SlashCommand::Model { .. }
        | SlashCommand::Permissions { .. }
        | SlashCommand::Clear { .. }
@@ -324,22 +307,6 @@ mod tests {
    fn parses_supported_slash_commands() {
        assert_eq!(SlashCommand::parse("/help"), Some(SlashCommand::Help));
        assert_eq!(SlashCommand::parse(" /status "), Some(SlashCommand::Status));
-        assert_eq!(
-            SlashCommand::parse("/thinking on"),
-            Some(SlashCommand::Thinking {
-                enabled: Some(true),
-            })
-        );
-        assert_eq!(
-            SlashCommand::parse("/thinking off"),
-            Some(SlashCommand::Thinking {
-                enabled: Some(false),
-            })
-        );
-        assert_eq!(
-            SlashCommand::parse("/thinking"),
-            Some(SlashCommand::Thinking { enabled: None })
-        );
        assert_eq!(
            SlashCommand::parse("/model claude-opus"),
            Some(SlashCommand::Model {
@@ -407,7 +374,6 @@ mod tests {
        assert!(help.contains("/help"));
        assert!(help.contains("/status"));
        assert!(help.contains("/compact"));
-        assert!(help.contains("/thinking [on|off]"));
        assert!(help.contains("/model [model]"));
        assert!(help.contains("/permissions [read-only|workspace-write|danger-full-access]"));
        assert!(help.contains("/clear [--confirm]"));
@@ -420,7 +386,7 @@ mod tests {
        assert!(help.contains("/version"));
        assert!(help.contains("/export [file]"));
        assert!(help.contains("/session [list|switch <session-id>]"));
-        assert_eq!(slash_command_specs().len(), 16);
+        assert_eq!(slash_command_specs().len(), 15);
        assert_eq!(resume_supported_slash_commands().len(), 11);
    }

@@ -468,9 +434,6 @@ mod tests {
        let session = Session::new();
        assert!(handle_slash_command("/unknown", &session, CompactionConfig::default()).is_none());
        assert!(handle_slash_command("/status", &session, CompactionConfig::default()).is_none());
-        assert!(
-            handle_slash_command("/thinking on", &session, CompactionConfig::default()).is_none()
-        );
        assert!(
            handle_slash_command("/model claude", &session, CompactionConfig::default()).is_none()
        );
--- a/rust/crates/runtime/src/compact.rs
+++ b/rust/crates/runtime/src/compact.rs
@@ -130,7 +130,7 @@ fn summarize_messages(messages: &[ConversationMessage]) -> String {
        .filter_map(|block| match block {
            ContentBlock::ToolUse { name, .. } => Some(name.as_str()),
            ContentBlock::ToolResult { tool_name, .. } => Some(tool_name.as_str()),
-            ContentBlock::Text { .. } | ContentBlock::Thinking { .. } => None,
+            ContentBlock::Text { .. } => None,
        })
        .collect::<Vec<_>>();
    tool_names.sort_unstable();
@@ -200,7 +200,6 @@ fn summarize_messages(messages: &[ConversationMessage]) -> String {
 fn summarize_block(block: &ContentBlock) -> String {
    let raw = match block {
        ContentBlock::Text { text } => text.clone(),
-        ContentBlock::Thinking { text, .. } => format!("thinking: {text}"),
        ContentBlock::ToolUse { name, input, .. } => format!("tool_use {name}({input})"),
        ContentBlock::ToolResult {
            tool_name,
@@ -259,7 +258,7 @@ fn collect_key_files(messages: &[ConversationMessage]) -> Vec<String> {
        .iter()
        .flat_map(|message| message.blocks.iter())
        .map(|block| match block {
-            ContentBlock::Text { text } | ContentBlock::Thinking { text, .. } => text.as_str(),
+            ContentBlock::Text { text } => text.as_str(),
            ContentBlock::ToolUse { input, .. } => input.as_str(),
            ContentBlock::ToolResult { output, .. } => output.as_str(),
        })
@@ -281,15 +280,10 @@ fn infer_current_work(messages: &[ConversationMessage]) -> Option<String> {

 fn first_text_block(message: &ConversationMessage) -> Option<&str> {
    message.blocks.iter().find_map(|block| match block {
-        ContentBlock::Text { text } | ContentBlock::Thinking { text, .. }
-            if !text.trim().is_empty() =>
-        {
-            Some(text.as_str())
-        }
+        ContentBlock::Text { text } if !text.trim().is_empty() => Some(text.as_str()),
        ContentBlock::ToolUse { .. }
        | ContentBlock::ToolResult { .. }
-        | ContentBlock::Text { .. }
-        | ContentBlock::Thinking { .. } => None,
+        | ContentBlock::Text { .. } => None,
    })
 }

@@ -334,7 +328,7 @@ fn estimate_message_tokens(message: &ConversationMessage) -> usize {
        .blocks
        .iter()
        .map(|block| match block {
-            ContentBlock::Text { text } | ContentBlock::Thinking { text, .. } => text.len() / 4 + 1,
+            ContentBlock::Text { text } => text.len() / 4 + 1,
            ContentBlock::ToolUse { name, input, .. } => (name.len() + input.len()) / 4 + 1,
            ContentBlock::ToolResult {
                tool_name, output, ..
--- a/rust/crates/runtime/src/conversation.rs
+++ b/rust/crates/runtime/src/conversation.rs
@@ -17,8 +17,6 @@ pub struct ApiRequest {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum AssistantEvent {
    TextDelta(String),
-    ThinkingDelta(String),
-    ThinkingSignature(String),
    ToolUse {
        id: String,
        name: String,
@@ -249,26 +247,15 @@ fn build_assistant_message(
    events: Vec<AssistantEvent>,
 ) -> Result<(ConversationMessage, Option<TokenUsage>), RuntimeError> {
    let mut text = String::new();
-    let mut thinking = String::new();
-    let mut thinking_signature: Option<String> = None;
    let mut blocks = Vec::new();
    let mut finished = false;
    let mut usage = None;

    for event in events {
        match event {
-            AssistantEvent::TextDelta(delta) => {
-                flush_thinking_block(&mut thinking, &mut thinking_signature, &mut blocks);
-                text.push_str(&delta);
-            }
-            AssistantEvent::ThinkingDelta(delta) => {
-                flush_text_block(&mut text, &mut blocks);
-                thinking.push_str(&delta);
-            }
-            AssistantEvent::ThinkingSignature(signature) => thinking_signature = Some(signature),
+            AssistantEvent::TextDelta(delta) => text.push_str(&delta),
            AssistantEvent::ToolUse { id, name, input } => {
                flush_text_block(&mut text, &mut blocks);
-                flush_thinking_block(&mut thinking, &mut thinking_signature, &mut blocks);
                blocks.push(ContentBlock::ToolUse { id, name, input });
            }
            AssistantEvent::Usage(value) => usage = Some(value),
@@ -279,7 +266,6 @@ fn build_assistant_message(
    }

    flush_text_block(&mut text, &mut blocks);
-    flush_thinking_block(&mut thinking, &mut thinking_signature, &mut blocks);

    if !finished {
        return Err(RuntimeError::new(
@@ -304,19 +290,6 @@ fn flush_text_block(text: &mut String, blocks: &mut Vec<ContentBlock>) {
    }
 }

-fn flush_thinking_block(
-    thinking: &mut String,
-    signature: &mut Option<String>,
-    blocks: &mut Vec<ContentBlock>,
-) {
-    if !thinking.is_empty() || signature.is_some() {
-        blocks.push(ContentBlock::Thinking {
-            text: std::mem::take(thinking),
-            signature: signature.take(),
-        });
-    }
-}
-
 type ToolHandler = Box<dyn FnMut(&str) -> Result<String, ToolError>>;

 #[derive(Default)]
@@ -352,8 +325,8 @@ impl ToolExecutor for StaticToolExecutor {
 #[cfg(test)]
 mod tests {
    use super::{
-        build_assistant_message, ApiClient, ApiRequest, AssistantEvent, ConversationRuntime,
-        RuntimeError, StaticToolExecutor,
+        ApiClient, ApiRequest, AssistantEvent, ConversationRuntime, RuntimeError,
+        StaticToolExecutor,
    };
    use crate::compact::CompactionConfig;
    use crate::permissions::{
@@ -529,29 +502,6 @@ mod tests {
        ));
    }

-    #[test]
-    fn thinking_blocks_are_preserved_separately_from_text() {
-        let (message, usage) = build_assistant_message(vec![
-            AssistantEvent::ThinkingDelta("first ".to_string()),
-            AssistantEvent::ThinkingDelta("second".to_string()),
-            AssistantEvent::ThinkingSignature("sig-1".to_string()),
-            AssistantEvent::TextDelta("final".to_string()),
-            AssistantEvent::MessageStop,
-        ])
-        .expect("assistant message should build");
-
-        assert_eq!(usage, None);
-        assert!(matches!(
-            &message.blocks[0],
-            ContentBlock::Thinking { text, signature }
-                if text == "first second" && signature.as_deref() == Some("sig-1")
-        ));
-        assert!(matches!(
-            &message.blocks[1],
-            ContentBlock::Text { text } if text == "final"
-        ));
-    }
-
    #[test]
    fn reconstructs_usage_tracker_from_restored_session() {
        struct SimpleApi;
--- a/rust/crates/runtime/src/session.rs
+++ b/rust/crates/runtime/src/session.rs
@@ -19,10 +19,6 @@ pub enum ContentBlock {
    Text {
        text: String,
    },
-    Thinking {
-        text: String,
-        signature: Option<String>,
-    },
    ToolUse {
        id: String,
        name: String,
@@ -261,19 +257,6 @@ impl ContentBlock {
                object.insert("type".to_string(), JsonValue::String("text".to_string()));
                object.insert("text".to_string(), JsonValue::String(text.clone()));
            }
-            Self::Thinking { text, signature } => {
-                object.insert(
-                    "type".to_string(),
-                    JsonValue::String("thinking".to_string()),
-                );
-                object.insert("text".to_string(), JsonValue::String(text.clone()));
-                if let Some(signature) = signature {
-                    object.insert(
-                        "signature".to_string(),
-                        JsonValue::String(signature.clone()),
-                    );
-                }
-            }
            Self::ToolUse { id, name, input } => {
                object.insert(
                    "type".to_string(),
@@ -320,13 +303,6 @@ impl ContentBlock {
            "text" => Ok(Self::Text {
                text: required_string(object, "text")?,
            }),
-            "thinking" => Ok(Self::Thinking {
-                text: required_string(object, "text")?,
-                signature: object
-                    .get("signature")
-                    .and_then(JsonValue::as_str)
-                    .map(ToOwned::to_owned),
-            }),
            "tool_use" => Ok(Self::ToolUse {
                id: required_string(object, "id")?,
                name: required_string(object, "name")?,
--- a/rust/crates/rusty-claude-cli/src/main.rs
+++ b/rust/crates/rusty-claude-cli/src/main.rs
@@ -13,8 +13,7 @@ use std::time::{SystemTime, UNIX_EPOCH};
 use api::{
    resolve_startup_auth_source, AnthropicClient, AuthSource, ContentBlockDelta, InputContentBlock,
    InputMessage, MessageRequest, MessageResponse, OutputContentBlock,
-    StreamEvent as ApiStreamEvent, ThinkingConfig, ToolChoice, ToolDefinition,
-    ToolResultContentBlock,
+    StreamEvent as ApiStreamEvent, ToolChoice, ToolDefinition, ToolResultContentBlock,
 };

 use commands::{
@@ -35,7 +34,6 @@ use tools::{execute_tool, mvp_tool_specs, ToolSpec};

 const DEFAULT_MODEL: &str = "claude-sonnet-4-20250514";
 const DEFAULT_MAX_TOKENS: u32 = 32;
-const DEFAULT_THINKING_BUDGET_TOKENS: u32 = 2_048;
 const DEFAULT_DATE: &str = "2026-03-31";
 const DEFAULT_OAUTH_CALLBACK_PORT: u16 = 4545;
 const VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -72,8 +70,7 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
            output_format,
            allowed_tools,
            permission_mode,
-            thinking,
-        } => LiveCli::new(model, false, allowed_tools, permission_mode, thinking)?
+        } => LiveCli::new(model, false, allowed_tools, permission_mode)?
            .run_turn_with_output(&prompt, output_format)?,
        CliAction::Login => run_login()?,
        CliAction::Logout => run_logout()?,
@@ -81,8 +78,7 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
            model,
            allowed_tools,
            permission_mode,
-            thinking,
-        } => run_repl(model, allowed_tools, permission_mode, thinking)?,
+        } => run_repl(model, allowed_tools, permission_mode)?,
        CliAction::Help => print_help(),
    }
    Ok(())
@@ -107,7 +103,6 @@ enum CliAction {
        output_format: CliOutputFormat,
        allowed_tools: Option<AllowedToolSet>,
        permission_mode: PermissionMode,
-        thinking: bool,
    },
    Login,
    Logout,
@@ -115,7 +110,6 @@ enum CliAction {
        model: String,
        allowed_tools: Option<AllowedToolSet>,
        permission_mode: PermissionMode,
-        thinking: bool,
    },
    // prompt-mode formatting is only supported for non-interactive runs
    Help,
@@ -145,7 +139,6 @@ fn parse_args(args: &[String]) -> Result<CliAction, String> {
    let mut output_format = CliOutputFormat::Text;
    let mut permission_mode = default_permission_mode();
    let mut wants_version = false;
-    let mut thinking = false;
    let mut allowed_tool_values = Vec::new();
    let mut rest = Vec::new();
    let mut index = 0;
@@ -156,10 +149,6 @@ fn parse_args(args: &[String]) -> Result<CliAction, String> {
                wants_version = true;
                index += 1;
            }
-            "--thinking" => {
-                thinking = true;
-                index += 1;
-            }
            "--model" => {
                let value = args
                    .get(index + 1)
@@ -226,7 +215,6 @@ fn parse_args(args: &[String]) -> Result<CliAction, String> {
            model,
            allowed_tools,
            permission_mode,
-            thinking,
        });
    }
    if matches!(rest.first().map(String::as_str), Some("--help" | "-h")) {
@@ -253,7 +241,6 @@ fn parse_args(args: &[String]) -> Result<CliAction, String> {
                output_format,
                allowed_tools,
                permission_mode,
-                thinking,
            })
        }
        other if !other.starts_with('/') => Ok(CliAction::Prompt {
@@ -262,7 +249,6 @@ fn parse_args(args: &[String]) -> Result<CliAction, String> {
            output_format,
            allowed_tools,
            permission_mode,
-            thinking,
        }),
        other => Err(format!("unknown subcommand: {other}")),
    }
@@ -614,7 +600,6 @@ struct StatusUsage {
    latest: TokenUsage,
    cumulative: TokenUsage,
    estimated_tokens: usize,
-    thinking_enabled: bool,
 }

 fn format_model_report(model: &str, message_count: usize, turns: u32) -> String {
@@ -682,39 +667,6 @@ Usage
    )
 }

-fn format_thinking_report(enabled: bool) -> String {
-    let state = if enabled { "on" } else { "off" };
-    let budget = if enabled {
-        DEFAULT_THINKING_BUDGET_TOKENS.to_string()
-    } else {
-        "disabled".to_string()
-    };
-    format!(
-        "Thinking
-  Active mode      {state}
-  Budget tokens    {budget}
-
-Usage
-  Inspect current mode with /thinking
-  Toggle with /thinking on or /thinking off"
-    )
-}
-
-fn format_thinking_switch_report(enabled: bool) -> String {
-    let state = if enabled { "enabled" } else { "disabled" };
-    format!(
-        "Thinking updated
-  Result           {state}
-  Budget tokens    {}
-  Applies to       subsequent requests",
-        if enabled {
-            DEFAULT_THINKING_BUDGET_TOKENS.to_string()
-        } else {
-            "disabled".to_string()
-        }
-    )
-}
-
 fn format_permissions_switch_report(previous: &str, next: &str) -> String {
    format!(
        "Permissions updated
@@ -882,7 +834,6 @@ fn run_resume_command(
                        latest: tracker.current_turn_usage(),
                        cumulative: usage,
                        estimated_tokens: 0,
-                        thinking_enabled: false,
                    },
                    default_permission_mode().as_str(),
                    &status_context(Some(session_path))?,
@@ -929,7 +880,6 @@ fn run_resume_command(
            })
        }
        SlashCommand::Resume { .. }
-        | SlashCommand::Thinking { .. }
        | SlashCommand::Model { .. }
        | SlashCommand::Permissions { .. }
        | SlashCommand::Session { .. }
@@ -941,15 +891,8 @@ fn run_repl(
    model: String,
    allowed_tools: Option<AllowedToolSet>,
    permission_mode: PermissionMode,
-    thinking_enabled: bool,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    let mut cli = LiveCli::new(
-        model,
-        true,
-        allowed_tools,
-        permission_mode,
-        thinking_enabled,
-    )?;
+    let mut cli = LiveCli::new(model, true, allowed_tools, permission_mode)?;
    let mut editor = input::LineEditor::new("› ", slash_command_completion_candidates());
    println!("{}", cli.startup_banner());

@@ -1002,7 +945,6 @@ struct LiveCli {
    model: String,
    allowed_tools: Option<AllowedToolSet>,
    permission_mode: PermissionMode,
-    thinking_enabled: bool,
    system_prompt: Vec<String>,
    runtime: ConversationRuntime<AnthropicRuntimeClient, CliToolExecutor>,
    session: SessionHandle,
@@ -1014,7 +956,6 @@ impl LiveCli {
        enable_tools: bool,
        allowed_tools: Option<AllowedToolSet>,
        permission_mode: PermissionMode,
-        thinking_enabled: bool,
    ) -> Result<Self, Box<dyn std::error::Error>> {
        let system_prompt = build_system_prompt()?;
        let session = create_managed_session_handle()?;
@@ -1025,13 +966,11 @@ impl LiveCli {
            enable_tools,
            allowed_tools.clone(),
            permission_mode,
-            thinking_enabled,
        )?;
        let cli = Self {
            model,
            allowed_tools,
            permission_mode,
-            thinking_enabled,
            system_prompt,
            runtime,
            session,
@@ -1042,10 +981,9 @@ impl LiveCli {

    fn startup_banner(&self) -> String {
        format!(
-            "Rusty Claude CLI\n  Model            {}\n  Permission mode  {}\n  Thinking         {}\n  Working directory {}\n  Session          {}\n\nType /help for commands. Shift+Enter or Ctrl+J inserts a newline.",
+            "Rusty Claude CLI\n  Model            {}\n  Permission mode  {}\n  Working directory {}\n  Session          {}\n\nType /help for commands. Shift+Enter or Ctrl+J inserts a newline.",
            self.model,
            self.permission_mode.as_str(),
-            if self.thinking_enabled { "on" } else { "off" },
            env::current_dir().map_or_else(
                |_| "<unknown>".to_string(),
                |path| path.display().to_string(),
@@ -1111,9 +1049,6 @@ impl LiveCli {
            system: (!self.system_prompt.is_empty()).then(|| self.system_prompt.join("\n\n")),
            tools: None,
            tool_choice: None,
-            thinking: self
-                .thinking_enabled
-                .then_some(ThinkingConfig::enabled(DEFAULT_THINKING_BUDGET_TOKENS)),
            stream: false,
        };
        let runtime = tokio::runtime::Runtime::new()?;
@@ -1123,7 +1058,7 @@ impl LiveCli {
            .iter()
            .filter_map(|block| match block {
                OutputContentBlock::Text { text } => Some(text.as_str()),
-                OutputContentBlock::Thinking { .. } | OutputContentBlock::ToolUse { .. } => None,
+                OutputContentBlock::ToolUse { .. } => None,
            })
            .collect::<Vec<_>>()
            .join("");
@@ -1160,7 +1095,6 @@ impl LiveCli {
                self.compact()?;
                false
            }
-            SlashCommand::Thinking { enabled } => self.set_thinking(enabled)?,
            SlashCommand::Model { model } => self.set_model(model)?,
            SlashCommand::Permissions { mode } => self.set_permissions(mode)?,
            SlashCommand::Clear { confirm } => self.clear_session(confirm)?,
@@ -1221,7 +1155,6 @@ impl LiveCli {
                    latest,
                    cumulative,
                    estimated_tokens: self.runtime.estimated_tokens(),
-                    thinking_enabled: self.thinking_enabled,
                },
                self.permission_mode.as_str(),
                &status_context(Some(&self.session.path)).expect("status context should load"),
@@ -1264,7 +1197,6 @@ impl LiveCli {
            true,
            self.allowed_tools.clone(),
            self.permission_mode,
-            self.thinking_enabled,
        )?;
        self.model.clone_from(&model);
        println!(
@@ -1274,32 +1206,6 @@ impl LiveCli {
        Ok(true)
    }

-    fn set_thinking(&mut self, enabled: Option<bool>) -> Result<bool, Box<dyn std::error::Error>> {
-        let Some(enabled) = enabled else {
-            println!("{}", format_thinking_report(self.thinking_enabled));
-            return Ok(false);
-        };
-
-        if enabled == self.thinking_enabled {
-            println!("{}", format_thinking_report(self.thinking_enabled));
-            return Ok(false);
-        }
-
-        let session = self.runtime.session().clone();
-        self.thinking_enabled = enabled;
-        self.runtime = build_runtime(
-            session,
-            self.model.clone(),
-            self.system_prompt.clone(),
-            true,
-            self.allowed_tools.clone(),
-            self.permission_mode,
-            self.thinking_enabled,
-        )?;
-        println!("{}", format_thinking_switch_report(self.thinking_enabled));
-        Ok(true)
-    }
-
    fn set_permissions(
        &mut self,
        mode: Option<String>,
@@ -1333,7 +1239,6 @@ impl LiveCli {
            true,
            self.allowed_tools.clone(),
            self.permission_mode,
-            self.thinking_enabled,
        )?;
        println!(
            "{}",
@@ -1358,7 +1263,6 @@ impl LiveCli {
            true,
            self.allowed_tools.clone(),
            self.permission_mode,
-            self.thinking_enabled,
        )?;
        println!(
            "Session cleared\n  Mode             fresh session\n  Preserved model  {}\n  Permission mode  {}\n  Session          {}",
@@ -1393,7 +1297,6 @@ impl LiveCli {
            true,
            self.allowed_tools.clone(),
            self.permission_mode,
-            self.thinking_enabled,
        )?;
        self.session = handle;
        println!(
@@ -1470,7 +1373,6 @@ impl LiveCli {
                    true,
                    self.allowed_tools.clone(),
                    self.permission_mode,
-                    self.thinking_enabled,
                )?;
                self.session = handle;
                println!(
@@ -1500,7 +1402,6 @@ impl LiveCli {
            true,
            self.allowed_tools.clone(),
            self.permission_mode,
-            self.thinking_enabled,
        )?;
        self.persist_session()?;
        println!("{}", format_compact_report(removed, kept, skipped));
@@ -1612,7 +1513,6 @@ fn render_repl_help() -> String {
    [
        "REPL".to_string(),
        "  /exit                Quit the REPL".to_string(),
-        "  /thinking [on|off]   Show or toggle extended thinking".to_string(),
        "  /quit                Quit the REPL".to_string(),
        "  Up/Down              Navigate prompt history".to_string(),
        "  Tab                  Complete slash commands".to_string(),
@@ -1659,14 +1559,10 @@ fn format_status_report(
            "Status
  Model            {model}
  Permission mode  {permission_mode}
-  Thinking         {}
  Messages         {}
  Turns            {}
  Estimated tokens {}",
-            if usage.thinking_enabled { "on" } else { "off" },
-            usage.message_count,
-            usage.turns,
-            usage.estimated_tokens,
+            usage.message_count, usage.turns, usage.estimated_tokens,
        ),
        format!(
            "Usage
@@ -1938,15 +1834,6 @@ fn render_export_text(session: &Session) -> String {
        for block in &message.blocks {
            match block {
                ContentBlock::Text { text } => lines.push(text.clone()),
-                ContentBlock::Thinking { text, signature } => {
-                    lines.push(format!(
-                        "[thinking{}] {}",
-                        signature
-                            .as_ref()
-                            .map_or(String::new(), |value| format!(" signature={value}")),
-                        text
-                    ));
-                }
                ContentBlock::ToolUse { id, name, input } => {
                    lines.push(format!("[tool_use id={id} name={name}] {input}"));
                }
@@ -2037,12 +1924,11 @@ fn build_runtime(
    enable_tools: bool,
    allowed_tools: Option<AllowedToolSet>,
    permission_mode: PermissionMode,
-    thinking_enabled: bool,
 ) -> Result<ConversationRuntime<AnthropicRuntimeClient, CliToolExecutor>, Box<dyn std::error::Error>>
 {
    Ok(ConversationRuntime::new(
        session,
-        AnthropicRuntimeClient::new(model, enable_tools, allowed_tools.clone(), thinking_enabled)?,
+        AnthropicRuntimeClient::new(model, enable_tools, allowed_tools.clone())?,
        CliToolExecutor::new(allowed_tools),
        permission_policy(permission_mode),
        system_prompt,
@@ -2101,7 +1987,6 @@ struct AnthropicRuntimeClient {
    model: String,
    enable_tools: bool,
    allowed_tools: Option<AllowedToolSet>,
-    thinking_enabled: bool,
 }

 impl AnthropicRuntimeClient {
@@ -2109,7 +1994,6 @@ impl AnthropicRuntimeClient {
        model: String,
        enable_tools: bool,
        allowed_tools: Option<AllowedToolSet>,
-        thinking_enabled: bool,
    ) -> Result<Self, Box<dyn std::error::Error>> {
        Ok(Self {
            runtime: tokio::runtime::Runtime::new()?,
@@ -2117,7 +2001,6 @@ impl AnthropicRuntimeClient {
            model,
            enable_tools,
            allowed_tools,
-            thinking_enabled,
        })
    }
 }
@@ -2151,9 +2034,6 @@ impl ApiClient for AnthropicRuntimeClient {
                    .collect()
            }),
            tool_choice: self.enable_tools.then_some(ToolChoice::Auto),
-            thinking: self
-                .thinking_enabled
-                .then_some(ThinkingConfig::enabled(DEFAULT_THINKING_BUDGET_TOKENS)),
            stream: true,
        };

@@ -2166,7 +2046,6 @@ impl ApiClient for AnthropicRuntimeClient {
            let mut stdout = io::stdout();
            let mut events = Vec::new();
            let mut pending_tool: Option<(String, String, String)> = None;
-            let mut pending_thinking_signature: Option<String> = None;
            let mut saw_stop = false;

            while let Some(event) = stream
@@ -2177,13 +2056,7 @@ impl ApiClient for AnthropicRuntimeClient {
                match event {
                    ApiStreamEvent::MessageStart(start) => {
                        for block in start.message.content {
-                            push_output_block(
-                                block,
-                                &mut stdout,
-                                &mut events,
-                                &mut pending_tool,
-                                &mut pending_thinking_signature,
-                            )?;
+                            push_output_block(block, &mut stdout, &mut events, &mut pending_tool)?;
                        }
                    }
                    ApiStreamEvent::ContentBlockStart(start) => {
@@ -2192,7 +2065,6 @@ impl ApiClient for AnthropicRuntimeClient {
                            &mut stdout,
                            &mut events,
                            &mut pending_tool,
-                            &mut pending_thinking_signature,
                        )?;
                    }
                    ApiStreamEvent::ContentBlockDelta(delta) => match delta.delta {
@@ -2204,14 +2076,6 @@ impl ApiClient for AnthropicRuntimeClient {
                                events.push(AssistantEvent::TextDelta(text));
                            }
                        }
-                        ContentBlockDelta::ThinkingDelta { thinking } => {
-                            if !thinking.is_empty() {
-                                events.push(AssistantEvent::ThinkingDelta(thinking));
-                            }
-                        }
-                        ContentBlockDelta::SignatureDelta { signature } => {
-                            events.push(AssistantEvent::ThinkingSignature(signature));
-                        }
                        ContentBlockDelta::InputJsonDelta { partial_json } => {
                            if let Some((_, _, input)) = &mut pending_tool {
                                input.push_str(&partial_json);
@@ -2241,8 +2105,6 @@ impl ApiClient for AnthropicRuntimeClient {
            if !saw_stop
                && events.iter().any(|event| {
                    matches!(event, AssistantEvent::TextDelta(text) if !text.is_empty())
-                        || matches!(event, AssistantEvent::ThinkingDelta(text) if !text.is_empty())
-                        || matches!(event, AssistantEvent::ThinkingSignature(_))
                        || matches!(event, AssistantEvent::ToolUse { .. })
                })
            {
@@ -2326,19 +2188,11 @@ fn truncate_for_summary(value: &str, limit: usize) -> String {
    }
 }

-fn render_thinking_block_summary(text: &str, out: &mut impl Write) -> Result<(), RuntimeError> {
-    let summary = format!("▶ Thinking ({} chars hidden)", text.chars().count());
-    writeln!(out, "\n{summary}")
-        .and_then(|()| out.flush())
-        .map_err(|error| RuntimeError::new(error.to_string()))
-}
-
 fn push_output_block(
    block: OutputContentBlock,
    out: &mut impl Write,
    events: &mut Vec<AssistantEvent>,
    pending_tool: &mut Option<(String, String, String)>,
-    pending_thinking_signature: &mut Option<String>,
 ) -> Result<(), RuntimeError> {
    match block {
        OutputContentBlock::Text { text } => {
@@ -2349,19 +2203,6 @@ fn push_output_block(
                events.push(AssistantEvent::TextDelta(text));
            }
        }
-        OutputContentBlock::Thinking {
-            thinking,
-            signature,
-        } => {
-            render_thinking_block_summary(&thinking, out)?;
-            if !thinking.is_empty() {
-                events.push(AssistantEvent::ThinkingDelta(thinking));
-            }
-            if let Some(signature) = signature {
-                *pending_thinking_signature = Some(signature.clone());
-                events.push(AssistantEvent::ThinkingSignature(signature));
-            }
-        }
        OutputContentBlock::ToolUse { id, name, input } => {
            writeln!(
                out,
@@ -2383,16 +2224,9 @@ fn response_to_events(
 ) -> Result<Vec<AssistantEvent>, RuntimeError> {
    let mut events = Vec::new();
    let mut pending_tool = None;
-    let mut pending_thinking_signature = None;

    for block in response.content {
-        push_output_block(
-            block,
-            out,
-            &mut events,
-            &mut pending_tool,
-            &mut pending_thinking_signature,
-        )?;
+        push_output_block(block, out, &mut events, &mut pending_tool)?;
        if let Some((id, name, input)) = pending_tool.take() {
            events.push(AssistantEvent::ToolUse { id, name, input });
        }
@@ -2477,29 +2311,26 @@ fn convert_messages(messages: &[ConversationMessage]) -> Vec<InputMessage> {
            let content = message
                .blocks
                .iter()
-                .filter_map(|block| match block {
-                    ContentBlock::Text { text } => {
-                        Some(InputContentBlock::Text { text: text.clone() })
-                    }
-                    ContentBlock::Thinking { .. } => None,
-                    ContentBlock::ToolUse { id, name, input } => Some(InputContentBlock::ToolUse {
+                .map(|block| match block {
+                    ContentBlock::Text { text } => InputContentBlock::Text { text: text.clone() },
+                    ContentBlock::ToolUse { id, name, input } => InputContentBlock::ToolUse {
                        id: id.clone(),
                        name: name.clone(),
                        input: serde_json::from_str(input)
                            .unwrap_or_else(|_| serde_json::json!({ "raw": input })),
-                    }),
+                    },
                    ContentBlock::ToolResult {
                        tool_use_id,
                        output,
                        is_error,
                        ..
-                    } => Some(InputContentBlock::ToolResult {
+                    } => InputContentBlock::ToolResult {
                        tool_use_id: tool_use_id.clone(),
                        content: vec![ToolResultContentBlock::Text {
                            text: output.clone(),
                        }],
                        is_error: *is_error,
-                    }),
+                    },
                })
                .collect::<Vec<_>>();
            (!content.is_empty()).then(|| InputMessage {
@@ -2532,7 +2363,6 @@ fn print_help() {
    println!("  --model MODEL              Override the active model");
    println!("  --output-format FORMAT     Non-interactive output format: text or json");
    println!("  --permission-mode MODE     Set read-only, workspace-write, or danger-full-access");
-    println!("  --thinking                 Enable extended thinking with the default budget");
    println!("  --allowedTools TOOLS       Restrict enabled tools (repeatable; comma-separated aliases supported)");
    println!("  --version, -V              Print version and build information locally");
    println!();
@@ -2578,7 +2408,6 @@ mod tests {
                model: DEFAULT_MODEL.to_string(),
                allowed_tools: None,
                permission_mode: PermissionMode::WorkspaceWrite,
-                thinking: false,
            }
        );
    }
@@ -2598,7 +2427,6 @@ mod tests {
                output_format: CliOutputFormat::Text,
                allowed_tools: None,
                permission_mode: PermissionMode::WorkspaceWrite,
-                thinking: false,
            }
        );
    }
@@ -2620,7 +2448,6 @@ mod tests {
                output_format: CliOutputFormat::Json,
                allowed_tools: None,
                permission_mode: PermissionMode::WorkspaceWrite,
-                thinking: false,
            }
        );
    }
@@ -2646,7 +2473,6 @@ mod tests {
                model: DEFAULT_MODEL.to_string(),
                allowed_tools: None,
                permission_mode: PermissionMode::ReadOnly,
-                thinking: false,
            }
        );
    }
@@ -2669,7 +2495,6 @@ mod tests {
                        .collect()
                ),
                permission_mode: PermissionMode::WorkspaceWrite,
-                thinking: false,
            }
        );
    }
@@ -2909,7 +2734,6 @@ mod tests {
                    cache_read_input_tokens: 1,
                },
                estimated_tokens: 128,
-                thinking_enabled: true,
            },
            "workspace-write",
            &super::StatusContext {
@@ -2973,7 +2797,7 @@ mod tests {
    fn status_context_reads_real_workspace_metadata() {
        let context = status_context(None).expect("status context should load");
        assert!(context.cwd.is_absolute());
-        assert!(context.discovered_config_files >= context.loaded_config_files);
+        assert!(context.discovered_config_files >= 3);
        assert!(context.loaded_config_files <= context.discovered_config_files);
    }

--- a/rust/crates/rusty-claude-cli/src/render.rs
+++ b/rust/crates/rusty-claude-cli/src/render.rs
@@ -21,6 +21,7 @@ pub struct ColorTheme {
    inline_code: Color,
    link: Color,
    quote: Color,
+    table_border: Color,
    spinner_active: Color,
    spinner_done: Color,
    spinner_failed: Color,
@@ -35,6 +36,7 @@ impl Default for ColorTheme {
            inline_code: Color::Green,
            link: Color::Blue,
            quote: Color::DarkGrey,
+            table_border: Color::DarkCyan,
            spinner_active: Color::Blue,
            spinner_done: Color::Green,
            spinner_failed: Color::Red,
@@ -113,24 +115,70 @@ impl Spinner {
    }
 }

+#[derive(Debug, Clone, PartialEq, Eq)]
+enum ListKind {
+    Unordered,
+    Ordered { next_index: u64 },
+}
+
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
+struct TableState {
+    headers: Vec<String>,
+    rows: Vec<Vec<String>>,
+    current_row: Vec<String>,
+    current_cell: String,
+    in_head: bool,
+}
+
+impl TableState {
+    fn push_cell(&mut self) {
+        let cell = self.current_cell.trim().to_string();
+        self.current_row.push(cell);
+        self.current_cell.clear();
+    }
+
+    fn finish_row(&mut self) {
+        if self.current_row.is_empty() {
+            return;
+        }
+        let row = std::mem::take(&mut self.current_row);
+        if self.in_head {
+            self.headers = row;
+        } else {
+            self.rows.push(row);
+        }
+    }
+}
+
 #[derive(Debug, Default, Clone, PartialEq, Eq)]
 struct RenderState {
    emphasis: usize,
    strong: usize,
    quote: usize,
-    list: usize,
+    list_stack: Vec<ListKind>,
+    table: Option<TableState>,
 }

 impl RenderState {
    fn style_text(&self, text: &str, theme: &ColorTheme) -> String {
+        let mut styled = text.to_string();
        if self.strong > 0 {
-            format!("{}", text.bold().with(theme.strong))
-        } else if self.emphasis > 0 {
-            format!("{}", text.italic().with(theme.emphasis))
-        } else if self.quote > 0 {
-            format!("{}", text.with(theme.quote))
+            styled = format!("{}", styled.bold().with(theme.strong));
+        }
+        if self.emphasis > 0 {
+            styled = format!("{}", styled.italic().with(theme.emphasis));
+        }
+        if self.quote > 0 {
+            styled = format!("{}", styled.with(theme.quote));
+        }
+        styled
+    }
+
+    fn capture_target_mut<'a>(&'a mut self, output: &'a mut String) -> &'a mut String {
+        if let Some(table) = self.table.as_mut() {
+            &mut table.current_cell
        } else {
-            text.to_string()
+            output
        }
    }
 }
@@ -190,6 +238,7 @@ impl TerminalRenderer {
        output.trim_end().to_string()
    }

+    #[allow(clippy::too_many_lines)]
    fn render_event(
        &self,
        event: Event<'_>,
@@ -203,12 +252,22 @@ impl TerminalRenderer {
            Event::Start(Tag::Heading { level, .. }) => self.start_heading(level as u8, output),
            Event::End(TagEnd::Heading(..) | TagEnd::Paragraph) => output.push_str("\n\n"),
            Event::Start(Tag::BlockQuote(..)) => self.start_quote(state, output),
-            Event::End(TagEnd::BlockQuote(..) | TagEnd::Item)
-            | Event::SoftBreak
-            | Event::HardBreak => output.push('\n'),
-            Event::Start(Tag::List(_)) => state.list += 1,
+            Event::End(TagEnd::BlockQuote(..)) => {
+                state.quote = state.quote.saturating_sub(1);
+                output.push('\n');
+            }
+            Event::End(TagEnd::Item) | Event::SoftBreak | Event::HardBreak => {
+                state.capture_target_mut(output).push('\n');
+            }
+            Event::Start(Tag::List(first_item)) => {
+                let kind = match first_item {
+                    Some(index) => ListKind::Ordered { next_index: index },
+                    None => ListKind::Unordered,
+                };
+                state.list_stack.push(kind);
+            }
            Event::End(TagEnd::List(..)) => {
-                state.list = state.list.saturating_sub(1);
+                state.list_stack.pop();
                output.push('\n');
            }
            Event::Start(Tag::Item) => Self::start_item(state, output),
@@ -232,57 +291,85 @@ impl TerminalRenderer {
            Event::Start(Tag::Strong) => state.strong += 1,
            Event::End(TagEnd::Strong) => state.strong = state.strong.saturating_sub(1),
            Event::Code(code) => {
-                let _ = write!(
-                    output,
-                    "{}",
-                    format!("`{code}`").with(self.color_theme.inline_code)
-                );
+                let rendered =
+                    format!("{}", format!("`{code}`").with(self.color_theme.inline_code));
+                state.capture_target_mut(output).push_str(&rendered);
            }
            Event::Rule => output.push_str("---\n"),
            Event::Text(text) => {
                self.push_text(text.as_ref(), state, output, code_buffer, *in_code_block);
            }
-            Event::Html(html) | Event::InlineHtml(html) => output.push_str(&html),
-            Event::FootnoteReference(reference) => {
-                let _ = write!(output, "[{reference}]");
+            Event::Html(html) | Event::InlineHtml(html) => {
+                state.capture_target_mut(output).push_str(&html);
+            }
+            Event::FootnoteReference(reference) => {
+                let _ = write!(state.capture_target_mut(output), "[{reference}]");
+            }
+            Event::TaskListMarker(done) => {
+                state
+                    .capture_target_mut(output)
+                    .push_str(if done { "[x] " } else { "[ ] " });
+            }
+            Event::InlineMath(math) | Event::DisplayMath(math) => {
+                state.capture_target_mut(output).push_str(&math);
            }
-            Event::TaskListMarker(done) => output.push_str(if done { "[x] " } else { "[ ] " }),
-            Event::InlineMath(math) | Event::DisplayMath(math) => output.push_str(&math),
            Event::Start(Tag::Link { dest_url, .. }) => {
-                let _ = write!(
-                    output,
+                let rendered = format!(
                    "{}",
                    format!("[{dest_url}]")
                        .underlined()
                        .with(self.color_theme.link)
                );
+                state.capture_target_mut(output).push_str(&rendered);
            }
            Event::Start(Tag::Image { dest_url, .. }) => {
-                let _ = write!(
-                    output,
+                let rendered = format!(
                    "{}",
                    format!("[image:{dest_url}]").with(self.color_theme.link)
                );
+                state.capture_target_mut(output).push_str(&rendered);
            }
-            Event::Start(
-                Tag::Paragraph
-                | Tag::Table(..)
-                | Tag::TableHead
-                | Tag::TableRow
-                | Tag::TableCell
-                | Tag::MetadataBlock(..)
-                | _,
-            )
-            | Event::End(
-                TagEnd::Link
-                | TagEnd::Image
-                | TagEnd::Table
-                | TagEnd::TableHead
-                | TagEnd::TableRow
-                | TagEnd::TableCell
-                | TagEnd::MetadataBlock(..)
-                | _,
-            ) => {}
+            Event::Start(Tag::Table(..)) => state.table = Some(TableState::default()),
+            Event::End(TagEnd::Table) => {
+                if let Some(table) = state.table.take() {
+                    output.push_str(&self.render_table(&table));
+                    output.push_str("\n\n");
+                }
+            }
+            Event::Start(Tag::TableHead) => {
+                if let Some(table) = state.table.as_mut() {
+                    table.in_head = true;
+                }
+            }
+            Event::End(TagEnd::TableHead) => {
+                if let Some(table) = state.table.as_mut() {
+                    table.finish_row();
+                    table.in_head = false;
+                }
+            }
+            Event::Start(Tag::TableRow) => {
+                if let Some(table) = state.table.as_mut() {
+                    table.current_row.clear();
+                    table.current_cell.clear();
+                }
+            }
+            Event::End(TagEnd::TableRow) => {
+                if let Some(table) = state.table.as_mut() {
+                    table.finish_row();
+                }
+            }
+            Event::Start(Tag::TableCell) => {
+                if let Some(table) = state.table.as_mut() {
+                    table.current_cell.clear();
+                }
+            }
+            Event::End(TagEnd::TableCell) => {
+                if let Some(table) = state.table.as_mut() {
+                    table.push_cell();
+                }
+            }
+            Event::Start(Tag::Paragraph | Tag::MetadataBlock(..) | _)
+            | Event::End(TagEnd::Link | TagEnd::Image | TagEnd::MetadataBlock(..) | _) => {}
        }
    }

@@ -302,9 +389,19 @@ impl TerminalRenderer {
        let _ = write!(output, "{}", "│ ".with(self.color_theme.quote));
    }

-    fn start_item(state: &RenderState, output: &mut String) {
-        output.push_str(&"  ".repeat(state.list.saturating_sub(1)));
-        output.push_str("• ");
+    fn start_item(state: &mut RenderState, output: &mut String) {
+        let depth = state.list_stack.len().saturating_sub(1);
+        output.push_str(&"  ".repeat(depth));
+
+        let marker = match state.list_stack.last_mut() {
+            Some(ListKind::Ordered { next_index }) => {
+                let value = *next_index;
+                *next_index += 1;
+                format!("{value}. ")
+            }
+            _ => "• ".to_string(),
+        };
+        output.push_str(&marker);
    }

    fn start_code_block(&self, code_language: &str, output: &mut String) {
@@ -328,7 +425,7 @@ impl TerminalRenderer {
    fn push_text(
        &self,
        text: &str,
-        state: &RenderState,
+        state: &mut RenderState,
        output: &mut String,
        code_buffer: &mut String,
        in_code_block: bool,
@@ -336,10 +433,82 @@ impl TerminalRenderer {
        if in_code_block {
            code_buffer.push_str(text);
        } else {
-            output.push_str(&state.style_text(text, &self.color_theme));
+            let rendered = state.style_text(text, &self.color_theme);
+            state.capture_target_mut(output).push_str(&rendered);
        }
    }

+    fn render_table(&self, table: &TableState) -> String {
+        let mut rows = Vec::new();
+        if !table.headers.is_empty() {
+            rows.push(table.headers.clone());
+        }
+        rows.extend(table.rows.iter().cloned());
+
+        if rows.is_empty() {
+            return String::new();
+        }
+
+        let column_count = rows.iter().map(Vec::len).max().unwrap_or(0);
+        let widths = (0..column_count)
+            .map(|column| {
+                rows.iter()
+                    .filter_map(|row| row.get(column))
+                    .map(|cell| visible_width(cell))
+                    .max()
+                    .unwrap_or(0)
+            })
+            .collect::<Vec<_>>();
+
+        let border = format!("{}", "│".with(self.color_theme.table_border));
+        let separator = widths
+            .iter()
+            .map(|width| "─".repeat(*width + 2))
+            .collect::<Vec<_>>()
+            .join(&format!("{}", "┼".with(self.color_theme.table_border)));
+        let separator = format!("{border}{separator}{border}");
+
+        let mut output = String::new();
+        if !table.headers.is_empty() {
+            output.push_str(&self.render_table_row(&table.headers, &widths, true));
+            output.push('\n');
+            output.push_str(&separator);
+            if !table.rows.is_empty() {
+                output.push('\n');
+            }
+        }
+
+        for (index, row) in table.rows.iter().enumerate() {
+            output.push_str(&self.render_table_row(row, &widths, false));
+            if index + 1 < table.rows.len() {
+                output.push('\n');
+            }
+        }
+
+        output
+    }
+
+    fn render_table_row(&self, row: &[String], widths: &[usize], is_header: bool) -> String {
+        let border = format!("{}", "│".with(self.color_theme.table_border));
+        let mut line = String::new();
+        line.push_str(&border);
+
+        for (index, width) in widths.iter().enumerate() {
+            let cell = row.get(index).map_or("", String::as_str);
+            line.push(' ');
+            if is_header {
+                let _ = write!(line, "{}", cell.bold().with(self.color_theme.heading));
+            } else {
+                line.push_str(cell);
+            }
+            let padding = width.saturating_sub(visible_width(cell));
+            line.push_str(&" ".repeat(padding + 1));
+            line.push_str(&border);
+        }
+
+        line
+    }
+
    #[must_use]
    pub fn highlight_code(&self, code: &str, language: &str) -> String {
        let syntax = self
@@ -372,32 +541,36 @@ impl TerminalRenderer {
    }
 }

-#[cfg(test)]
-mod tests {
-    use super::{Spinner, TerminalRenderer};
+fn visible_width(input: &str) -> usize {
+    strip_ansi(input).chars().count()
+}

-    fn strip_ansi(input: &str) -> String {
-        let mut output = String::new();
-        let mut chars = input.chars().peekable();
+fn strip_ansi(input: &str) -> String {
+    let mut output = String::new();
+    let mut chars = input.chars().peekable();

-        while let Some(ch) = chars.next() {
-            if ch == '\u{1b}' {
-                if chars.peek() == Some(&'[') {
-                    chars.next();
-                    for next in chars.by_ref() {
-                        if next.is_ascii_alphabetic() {
-                            break;
-                        }
+    while let Some(ch) = chars.next() {
+        if ch == '\u{1b}' {
+            if chars.peek() == Some(&'[') {
+                chars.next();
+                for next in chars.by_ref() {
+                    if next.is_ascii_alphabetic() {
+                        break;
                    }
                }
-            } else {
-                output.push(ch);
            }
+        } else {
+            output.push(ch);
        }
-
-        output
    }

+    output
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{strip_ansi, Spinner, TerminalRenderer};
+
    #[test]
    fn renders_markdown_with_styling_and_lists() {
        let terminal_renderer = TerminalRenderer::new();
@@ -422,6 +595,34 @@ mod tests {
        assert!(markdown_output.contains('\u{1b}'));
    }

+    #[test]
+    fn renders_ordered_and_nested_lists() {
+        let terminal_renderer = TerminalRenderer::new();
+        let markdown_output =
+            terminal_renderer.render_markdown("1. first\n2. second\n   - nested\n   - child");
+        let plain_text = strip_ansi(&markdown_output);
+
+        assert!(plain_text.contains("1. first"));
+        assert!(plain_text.contains("2. second"));
+        assert!(plain_text.contains("  • nested"));
+        assert!(plain_text.contains("  • child"));
+    }
+
+    #[test]
+    fn renders_tables_with_alignment() {
+        let terminal_renderer = TerminalRenderer::new();
+        let markdown_output = terminal_renderer
+            .render_markdown("| Name | Value |\n| ---- | ----- |\n| alpha | 1 |\n| beta | 22 |");
+        let plain_text = strip_ansi(&markdown_output);
+        let lines = plain_text.lines().collect::<Vec<_>>();
+
+        assert_eq!(lines[0], "│ Name  │ Value │");
+        assert_eq!(lines[1], "│───────┼───────│");
+        assert_eq!(lines[2], "│ alpha │ 1     │");
+        assert_eq!(lines[3], "│ beta  │ 22    │");
+        assert!(markdown_output.contains('\u{1b}'));
+    }
+
    #[test]
    fn spinner_advances_frames() {
        let terminal_renderer = TerminalRenderer::new();