Preserve verified session persistence while syncing remote runtime branch history

Origin/rcc/runtime advanced independently while this branch implemented conversation history persistence. This merge keeps the tested local tree as the source of truth for the user-requested feature while recording the remote branch tip so future work can proceed from a shared history. Constraint: Push required incorporating origin/rcc/runtime history without breaking the verified session-persistence implementation Rejected: Force-push over origin/rcc/runtime | would discard remote branch history Confidence: medium Scope-risk: narrow Reversibility: clean Directive: Before the next broad CLI/runtime refactor, compare this branch against origin/rcc/runtime for any remote-only startup behavior worth porting deliberately Tested: cargo fmt; cargo clippy --workspace --all-targets -- -D warnings; cargo test --workspace Not-tested: Remote-only runtime startup semantics not exercised by the session persistence change
Persist CLI conversation history across sessions
2026-04-03 18:54:48 +08:00 · 2026-04-01 01:02:05 +00:00 · 2026-04-01 00:58:14 +00:00 · 2026-04-01 00:36:32 +00:00
12 changed files with 362 additions and 379 deletions
--- a/rust/README.md
+++ b/rust/README.md
@@ -133,6 +133,7 @@ Inside the REPL, useful commands include:
 /diff
 /version
 /export notes.txt
+/sessions
 /session list
 /exit
 ```
@@ -143,14 +144,14 @@ Inspect or maintain a saved session file without entering the REPL:

 ```bash
 cd rust
-cargo run -p rusty-claude-cli -- --resume session.json /status /compact /cost
+cargo run -p rusty-claude-cli -- --resume session-123456 /status /compact /cost
 ```

 You can also inspect memory/config state for a restored session:

 ```bash
 cd rust
-cargo run -p rusty-claude-cli -- --resume session.json /memory /config
+cargo run -p rusty-claude-cli -- --resume ~/.claude/sessions/session-123456.json /memory /config
 ```

 ## Available commands
@@ -158,7 +159,7 @@ cargo run -p rusty-claude-cli -- --resume session.json /memory /config
 ### Top-level CLI commands

 - `prompt <text...>` — run one prompt non-interactively
- `--resume <session.json> [/commands...]` — inspect or maintain a saved session
+- `--resume <session-id-or-path> [/commands...]` — inspect or maintain a saved session stored under `~/.claude/sessions/`
 - `dump-manifests` — print extracted upstream manifest counts
 - `bootstrap-plan` — print the current bootstrap skeleton
 - `system-prompt [--cwd PATH] [--date YYYY-MM-DD]` — render the synthesized system prompt
@@ -176,13 +177,14 @@ cargo run -p rusty-claude-cli -- --resume session.json /memory /config
 - `/permissions [read-only|workspace-write|danger-full-access]` — inspect or switch permissions
 - `/clear [--confirm]` — clear the current local session
 - `/cost` — show token usage totals
- `/resume <session-path>` — load a saved session into the REPL
+- `/resume <session-id-or-path>` — load a saved session into the REPL
 - `/config [env|hooks|model]` — inspect discovered Claude config
 - `/memory` — inspect loaded instruction memory files
 - `/init` — create a starter `CLAUDE.md`
 - `/diff` — show the current git diff for the workspace
 - `/version` — print version and build metadata locally
 - `/export [file]` — export the current conversation transcript
+- `/sessions` — list recent managed local sessions from `~/.claude/sessions/`
 - `/session [list|switch <session-id>]` — inspect or switch managed local sessions
 - `/exit` — leave the REPL

--- 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",
@@ -90,7 +84,7 @@ const SLASH_COMMAND_SPECS: &[SlashCommandSpec] = &[
    SlashCommandSpec {
        name: "resume",
        summary: "Load a saved session into the REPL",
-        argument_hint: Some("<session-path>"),
+        argument_hint: Some("<session-id-or-path>"),
        resume_supported: false,
    },
    SlashCommandSpec {
@@ -135,6 +129,12 @@ const SLASH_COMMAND_SPECS: &[SlashCommandSpec] = &[
        argument_hint: Some("[list|switch <session-id>]"),
        resume_supported: false,
    },
+    SlashCommandSpec {
+        name: "sessions",
+        summary: "List recent managed local sessions",
+        argument_hint: None,
+        resume_supported: false,
+    },
 ];

 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -142,9 +142,6 @@ pub enum SlashCommand {
    Help,
    Status,
    Compact,
-    Thinking {
-        enabled: Option<bool>,
-    },
    Model {
        model: Option<String>,
    },
@@ -172,6 +169,7 @@ pub enum SlashCommand {
        action: Option<String>,
        target: Option<String>,
    },
+    Sessions,
    Unknown(String),
 }

@@ -189,13 +187,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),
            },
@@ -223,6 +214,7 @@ impl SlashCommand {
                action: parts.next().map(ToOwned::to_owned),
                target: parts.next().map(ToOwned::to_owned),
            },
+            "sessions" => Self::Sessions,
            other => Self::Unknown(other.to_string()),
        })
    }
@@ -295,7 +287,6 @@ pub fn handle_slash_command(
            session: session.clone(),
        }),
        SlashCommand::Status
-        | SlashCommand::Thinking { .. }
        | SlashCommand::Model { .. }
        | SlashCommand::Permissions { .. }
        | SlashCommand::Clear { .. }
@@ -308,6 +299,7 @@ pub fn handle_slash_command(
        | SlashCommand::Version
        | SlashCommand::Export { .. }
        | SlashCommand::Session { .. }
+        | SlashCommand::Sessions
        | SlashCommand::Unknown(_) => None,
    }
 }
@@ -324,22 +316,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 {
@@ -398,6 +374,10 @@ mod tests {
                target: Some("abc123".to_string())
            })
        );
+        assert_eq!(
+            SlashCommand::parse("/sessions"),
+            Some(SlashCommand::Sessions)
+        );
    }

    #[test]
@@ -407,12 +387,11 @@ 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]"));
        assert!(help.contains("/cost"));
-        assert!(help.contains("/resume <session-path>"));
+        assert!(help.contains("/resume <session-id-or-path>"));
        assert!(help.contains("/config [env|hooks|model]"));
        assert!(help.contains("/memory"));
        assert!(help.contains("/init"));
@@ -420,6 +399,7 @@ mod tests {
        assert!(help.contains("/version"));
        assert!(help.contains("/export [file]"));
        assert!(help.contains("/session [list|switch <session-id>]"));
+        assert!(help.contains("/sessions"));
        assert_eq!(slash_command_specs().len(), 16);
        assert_eq!(resume_supported_slash_commands().len(), 11);
    }
@@ -438,6 +418,7 @@ mod tests {
                    text: "recent".to_string(),
                }]),
            ],
+            metadata: None,
        };

        let result = handle_slash_command(
@@ -468,9 +449,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()
        );
@@ -505,5 +483,6 @@ mod tests {
        assert!(
            handle_slash_command("/session list", &session, CompactionConfig::default()).is_none()
        );
+        assert!(handle_slash_command("/sessions", &session, CompactionConfig::default()).is_none());
    }
 }
--- a/rust/crates/runtime/src/compact.rs
+++ b/rust/crates/runtime/src/compact.rs
@@ -105,6 +105,7 @@ pub fn compact_session(session: &Session, config: CompactionConfig) -> Compactio
        compacted_session: Session {
            version: session.version,
            messages: compacted_messages,
+            metadata: session.metadata.clone(),
        },
        removed_message_count: removed.len(),
    }
@@ -130,7 +131,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 +201,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 +259,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 +281,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 +329,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, ..
@@ -399,6 +394,7 @@ mod tests {
        let session = Session {
            version: 1,
            messages: vec![ConversationMessage::user_text("hello")],
+            metadata: None,
        };

        let result = compact_session(&session, CompactionConfig::default());
@@ -426,6 +422,7 @@ mod tests {
                    usage: None,
                },
            ],
+            metadata: None,
        };

        let result = compact_session(
--- 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/lib.rs
+++ b/rust/crates/runtime/src/lib.rs
@@ -73,7 +73,9 @@ pub use remote::{
    RemoteSessionContext, UpstreamProxyBootstrap, UpstreamProxyState, DEFAULT_REMOTE_BASE_URL,
    DEFAULT_SESSION_TOKEN_PATH, DEFAULT_SYSTEM_CA_BUNDLE, NO_PROXY_HOSTS, UPSTREAM_PROXY_ENV_KEYS,
 };
-pub use session::{ContentBlock, ConversationMessage, MessageRole, Session, SessionError};
+pub use session::{
+    ContentBlock, ConversationMessage, MessageRole, Session, SessionError, SessionMetadata,
+};
 pub use usage::{
    format_usd, pricing_for_model, ModelPricing, TokenUsage, UsageCostEstimate, UsageTracker,
 };
--- 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,
@@ -43,10 +39,19 @@ pub struct ConversationMessage {
    pub usage: Option<TokenUsage>,
 }

+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct SessionMetadata {
+    pub started_at: String,
+    pub model: String,
+    pub message_count: u32,
+    pub last_prompt: Option<String>,
+}
+
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Session {
    pub version: u32,
    pub messages: Vec<ConversationMessage>,
+    pub metadata: Option<SessionMetadata>,
 }

 #[derive(Debug)]
@@ -86,6 +91,7 @@ impl Session {
        Self {
            version: 1,
            messages: Vec::new(),
+            metadata: None,
        }
    }

@@ -115,6 +121,9 @@ impl Session {
                    .collect(),
            ),
        );
+        if let Some(metadata) = &self.metadata {
+            object.insert("metadata".to_string(), metadata.to_json());
+        }
        JsonValue::Object(object)
    }

@@ -135,7 +144,15 @@ impl Session {
            .iter()
            .map(ConversationMessage::from_json)
            .collect::<Result<Vec<_>, _>>()?;
-        Ok(Self { version, messages })
+        let metadata = object
+            .get("metadata")
+            .map(SessionMetadata::from_json)
+            .transpose()?;
+        Ok(Self {
+            version,
+            messages,
+            metadata,
+        })
    }
 }

@@ -145,6 +162,41 @@ impl Default for Session {
    }
 }

+impl SessionMetadata {
+    #[must_use]
+    pub fn to_json(&self) -> JsonValue {
+        let mut object = BTreeMap::new();
+        object.insert(
+            "started_at".to_string(),
+            JsonValue::String(self.started_at.clone()),
+        );
+        object.insert("model".to_string(), JsonValue::String(self.model.clone()));
+        object.insert(
+            "message_count".to_string(),
+            JsonValue::Number(i64::from(self.message_count)),
+        );
+        if let Some(last_prompt) = &self.last_prompt {
+            object.insert(
+                "last_prompt".to_string(),
+                JsonValue::String(last_prompt.clone()),
+            );
+        }
+        JsonValue::Object(object)
+    }
+
+    fn from_json(value: &JsonValue) -> Result<Self, SessionError> {
+        let object = value.as_object().ok_or_else(|| {
+            SessionError::Format("session metadata must be an object".to_string())
+        })?;
+        Ok(Self {
+            started_at: required_string(object, "started_at")?,
+            model: required_string(object, "model")?,
+            message_count: required_u32(object, "message_count")?,
+            last_prompt: optional_string(object, "last_prompt"),
+        })
+    }
+}
+
 impl ConversationMessage {
    #[must_use]
    pub fn user_text(text: impl Into<String>) -> Self {
@@ -261,19 +313,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 +359,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")?,
@@ -392,6 +424,13 @@ fn required_string(
        .ok_or_else(|| SessionError::Format(format!("missing {key}")))
 }

+fn optional_string(object: &BTreeMap<String, JsonValue>, key: &str) -> Option<String> {
+    object
+        .get(key)
+        .and_then(JsonValue::as_str)
+        .map(ToOwned::to_owned)
+}
+
 fn required_u32(object: &BTreeMap<String, JsonValue>, key: &str) -> Result<u32, SessionError> {
    let value = object
        .get(key)
@@ -402,7 +441,8 @@ fn required_u32(object: &BTreeMap<String, JsonValue>, key: &str) -> Result<u32,

 #[cfg(test)]
 mod tests {
-    use super::{ContentBlock, ConversationMessage, MessageRole, Session};
+    use super::{ContentBlock, ConversationMessage, MessageRole, Session, SessionMetadata};
+    use crate::json::JsonValue;
    use crate::usage::TokenUsage;
    use std::fs;
    use std::time::{SystemTime, UNIX_EPOCH};
@@ -410,6 +450,12 @@ mod tests {
    #[test]
    fn persists_and_restores_session_json() {
        let mut session = Session::new();
+        session.metadata = Some(SessionMetadata {
+            started_at: "2026-04-01T00:00:00Z".to_string(),
+            model: "claude-sonnet".to_string(),
+            message_count: 3,
+            last_prompt: Some("hello".to_string()),
+        });
        session
            .messages
            .push(ConversationMessage::user_text("hello"));
@@ -452,5 +498,23 @@ mod tests {
            restored.messages[1].usage.expect("usage").total_tokens(),
            17
        );
+        assert_eq!(restored.metadata, session.metadata);
+    }
+
+    #[test]
+    fn loads_legacy_session_without_metadata() {
+        let legacy = r#"{
+  "version": 1,
+  "messages": [
+    {
+      "role": "user",
+      "blocks": [{"type": "text", "text": "hello"}]
+    }
+  ]
+}"#;
+        let restored = Session::from_json(&JsonValue::parse(legacy).expect("legacy json"))
+            .expect("legacy session should parse");
+        assert_eq!(restored.messages.len(), 1);
+        assert!(restored.metadata.is_none());
    }
 }
--- a/rust/crates/runtime/src/usage.rs
+++ b/rust/crates/runtime/src/usage.rs
@@ -300,6 +300,7 @@ mod tests {
                    cache_read_input_tokens: 0,
                }),
            }],
+            metadata: None,
        };

        let tracker = UsageTracker::from_session(&session);
--- 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::{
@@ -28,17 +27,17 @@ use runtime::{
    AssistantEvent, CompactionConfig, ConfigLoader, ConfigSource, ContentBlock,
    ConversationMessage, ConversationRuntime, MessageRole, OAuthAuthorizationRequest,
    OAuthTokenExchangeRequest, PermissionMode, PermissionPolicy, ProjectContext, RuntimeError,
-    Session, TokenUsage, ToolError, ToolExecutor, UsageTracker,
+    Session, SessionMetadata, TokenUsage, ToolError, ToolExecutor, UsageTracker,
 };
 use serde_json::json;
 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");
+const OLD_SESSION_COMPACTION_AGE_SECS: u64 = 60 * 60 * 24;
 const BUILD_TARGET: Option<&str> = option_env!("TARGET");
 const GIT_SHA: Option<&str> = option_env!("GIT_SHA");

@@ -72,8 +71,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 +79,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 +104,6 @@ enum CliAction {
        output_format: CliOutputFormat,
        allowed_tools: Option<AllowedToolSet>,
        permission_mode: PermissionMode,
-        thinking: bool,
    },
    Login,
    Logout,
@@ -115,7 +111,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 +140,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 +150,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 +216,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 +242,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 +250,6 @@ fn parse_args(args: &[String]) -> Result<CliAction, String> {
            output_format,
            allowed_tools,
            permission_mode,
-            thinking,
        }),
        other => Err(format!("unknown subcommand: {other}")),
    }
@@ -549,7 +536,14 @@ fn print_version() {
 }

 fn resume_session(session_path: &Path, commands: &[String]) {
-    let session = match Session::load_from_path(session_path) {
+    let handle = match resolve_session_reference(&session_path.display().to_string()) {
+        Ok(handle) => handle,
+        Err(error) => {
+            eprintln!("failed to resolve session: {error}");
+            std::process::exit(1);
+        }
+    };
+    let session = match Session::load_from_path(&handle.path) {
        Ok(session) => session,
        Err(error) => {
            eprintln!("failed to restore session: {error}");
@@ -560,7 +554,7 @@ fn resume_session(session_path: &Path, commands: &[String]) {
    if commands.is_empty() {
        println!(
            "Restored session from {} ({} messages).",
-            session_path.display(),
+            handle.path.display(),
            session.messages.len()
        );
        return;
@@ -572,7 +566,7 @@ fn resume_session(session_path: &Path, commands: &[String]) {
            eprintln!("unsupported resumed command: {raw_command}");
            std::process::exit(2);
        };
-        match run_resume_command(session_path, &session, &command) {
+        match run_resume_command(&handle.path, &session, &command) {
            Ok(ResumeCommandOutcome {
                session: next_session,
                message,
@@ -614,7 +608,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 +675,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 +842,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,10 +888,10 @@ fn run_resume_command(
            })
        }
        SlashCommand::Resume { .. }
-        | SlashCommand::Thinking { .. }
        | SlashCommand::Model { .. }
        | SlashCommand::Permissions { .. }
        | SlashCommand::Session { .. }
+        | SlashCommand::Sessions
        | SlashCommand::Unknown(_) => Err("unsupported resumed slash command".into()),
    }
 }
@@ -941,15 +900,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());

@@ -996,13 +948,15 @@ struct ManagedSessionSummary {
    path: PathBuf,
    modified_epoch_secs: u64,
    message_count: usize,
+    model: Option<String>,
+    started_at: Option<String>,
+    last_prompt: Option<String>,
 }

 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,10 +968,10 @@ 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()?;
+        auto_compact_inactive_sessions(&session.id)?;
        let runtime = build_runtime(
            Session::new(),
            model.clone(),
@@ -1025,13 +979,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 +994,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 +1062,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 +1071,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 +1108,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)?,
@@ -1196,6 +1143,10 @@ impl LiveCli {
            SlashCommand::Session { action, target } => {
                self.handle_session_command(action.as_deref(), target.as_deref())?
            }
+            SlashCommand::Sessions => {
+                println!("{}", render_session_list(&self.session.id)?);
+                false
+            }
            SlashCommand::Unknown(name) => {
                eprintln!("unknown slash command: /{name}");
                false
@@ -1204,7 +1155,10 @@ impl LiveCli {
    }

    fn persist_session(&self) -> Result<(), Box<dyn std::error::Error>> {
-        self.runtime.session().save_to_path(&self.session.path)?;
+        let mut session = self.runtime.session().clone();
+        session.metadata = Some(derive_session_metadata(&session, &self.model));
+        session.save_to_path(&self.session.path)?;
+        auto_compact_inactive_sessions(&self.session.id)?;
        Ok(())
    }

@@ -1221,7 +1175,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 +1217,6 @@ impl LiveCli {
            true,
            self.allowed_tools.clone(),
            self.permission_mode,
-            self.thinking_enabled,
        )?;
        self.model.clone_from(&model);
        println!(
@@ -1274,32 +1226,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 +1259,6 @@ impl LiveCli {
            true,
            self.allowed_tools.clone(),
            self.permission_mode,
-            self.thinking_enabled,
        )?;
        println!(
            "{}",
@@ -1358,7 +1283,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          {}",
@@ -1379,13 +1303,20 @@ impl LiveCli {
        session_path: Option<String>,
    ) -> Result<bool, Box<dyn std::error::Error>> {
        let Some(session_ref) = session_path else {
-            println!("Usage: /resume <session-path>");
+            println!("Usage: /resume <session-id-or-path>");
            return Ok(false);
        };

        let handle = resolve_session_reference(&session_ref)?;
        let session = Session::load_from_path(&handle.path)?;
        let message_count = session.messages.len();
+        if let Some(model) = session
+            .metadata
+            .as_ref()
+            .map(|metadata| metadata.model.clone())
+        {
+            self.model = model;
+        }
        self.runtime = build_runtime(
            session,
            self.model.clone(),
@@ -1393,7 +1324,6 @@ impl LiveCli {
            true,
            self.allowed_tools.clone(),
            self.permission_mode,
-            self.thinking_enabled,
        )?;
        self.session = handle;
        println!(
@@ -1463,6 +1393,13 @@ impl LiveCli {
                let handle = resolve_session_reference(target)?;
                let session = Session::load_from_path(&handle.path)?;
                let message_count = session.messages.len();
+                if let Some(model) = session
+                    .metadata
+                    .as_ref()
+                    .map(|metadata| metadata.model.clone())
+                {
+                    self.model = model;
+                }
                self.runtime = build_runtime(
                    session,
                    self.model.clone(),
@@ -1470,7 +1407,6 @@ impl LiveCli {
                    true,
                    self.allowed_tools.clone(),
                    self.permission_mode,
-                    self.thinking_enabled,
                )?;
                self.session = handle;
                println!(
@@ -1500,7 +1436,6 @@ impl LiveCli {
            true,
            self.allowed_tools.clone(),
            self.permission_mode,
-            self.thinking_enabled,
        )?;
        self.persist_session()?;
        println!("{}", format_compact_report(removed, kept, skipped));
@@ -1509,8 +1444,10 @@ impl LiveCli {
 }

 fn sessions_dir() -> Result<PathBuf, Box<dyn std::error::Error>> {
-    let cwd = env::current_dir()?;
-    let path = cwd.join(".claude").join("sessions");
+    let home = env::var_os("HOME")
+        .map(PathBuf::from)
+        .ok_or_else(|| io::Error::new(io::ErrorKind::NotFound, "HOME is not set"))?;
+    let path = home.join(".claude").join("sessions");
    fs::create_dir_all(&path)?;
    Ok(path)
 }
@@ -1531,8 +1468,19 @@ fn generate_session_id() -> String {

 fn resolve_session_reference(reference: &str) -> Result<SessionHandle, Box<dyn std::error::Error>> {
    let direct = PathBuf::from(reference);
+    let expanded = if let Some(stripped) = reference.strip_prefix("~/") {
+        sessions_dir()?
+            .parent()
+            .and_then(|claude| claude.parent())
+            .map(|home| home.join(stripped))
+            .unwrap_or(direct.clone())
+    } else {
+        direct.clone()
+    };
    let path = if direct.exists() {
        direct
+    } else if expanded.exists() {
+        expanded
    } else {
        sessions_dir()?.join(format!("{reference}.json"))
    };
@@ -1562,9 +1510,11 @@ fn list_managed_sessions() -> Result<Vec<ManagedSessionSummary>, Box<dyn std::er
            .and_then(|time| time.duration_since(UNIX_EPOCH).ok())
            .map(|duration| duration.as_secs())
            .unwrap_or_default();
-        let message_count = Session::load_from_path(&path)
-            .map(|session| session.messages.len())
-            .unwrap_or_default();
+        let session = Session::load_from_path(&path).ok();
+        let derived_message_count = session.as_ref().map_or(0, |session| session.messages.len());
+        let stored = session
+            .as_ref()
+            .and_then(|session| session.metadata.as_ref());
        let id = path
            .file_stem()
            .and_then(|value| value.to_str())
@@ -1574,7 +1524,12 @@ fn list_managed_sessions() -> Result<Vec<ManagedSessionSummary>, Box<dyn std::er
            id,
            path,
            modified_epoch_secs,
-            message_count,
+            message_count: stored.map_or(derived_message_count, |metadata| {
+                metadata.message_count as usize
+            }),
+            model: stored.map(|metadata| metadata.model.clone()),
+            started_at: stored.map(|metadata| metadata.started_at.clone()),
+            last_prompt: stored.and_then(|metadata| metadata.last_prompt.clone()),
        });
    }
    sessions.sort_by(|left, right| right.modified_epoch_secs.cmp(&left.modified_epoch_secs));
@@ -1597,22 +1552,103 @@ fn render_session_list(active_session_id: &str) -> Result<String, Box<dyn std::e
        } else {
            "○ saved"
        };
+        let model = session.model.as_deref().unwrap_or("unknown");
+        let started = session.started_at.as_deref().unwrap_or("unknown");
+        let last_prompt = session.last_prompt.as_deref().map_or_else(
+            || "-".to_string(),
+            |prompt| truncate_for_summary(prompt, 36),
+        );
        lines.push(format!(
-            "  {id:<20} {marker:<10} msgs={msgs:<4} modified={modified} path={path}",
+            "  {id:<20} {marker:<10} msgs={msgs:<4} model={model:<24} started={started} modified={modified} last={last_prompt} path={path}",
            id = session.id,
            msgs = session.message_count,
+            model = model,
+            started = started,
            modified = session.modified_epoch_secs,
+            last_prompt = last_prompt,
            path = session.path.display(),
        ));
    }
    Ok(lines.join("\n"))
 }

+fn current_epoch_secs() -> u64 {
+    SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .map(|duration| duration.as_secs())
+        .unwrap_or_default()
+}
+
+fn current_timestamp_rfc3339ish() -> String {
+    format!("{}Z", current_epoch_secs())
+}
+
+fn last_prompt_from_session(session: &Session) -> Option<String> {
+    session
+        .messages
+        .iter()
+        .rev()
+        .find(|message| message.role == MessageRole::User)
+        .and_then(|message| {
+            message.blocks.iter().find_map(|block| match block {
+                ContentBlock::Text { text } => Some(text.trim().to_string()),
+                _ => None,
+            })
+        })
+        .filter(|text| !text.is_empty())
+}
+
+fn derive_session_metadata(session: &Session, model: &str) -> SessionMetadata {
+    let started_at = session
+        .metadata
+        .as_ref()
+        .map_or_else(current_timestamp_rfc3339ish, |metadata| {
+            metadata.started_at.clone()
+        });
+    SessionMetadata {
+        started_at,
+        model: model.to_string(),
+        message_count: session.messages.len().try_into().unwrap_or(u32::MAX),
+        last_prompt: last_prompt_from_session(session),
+    }
+}
+
+fn session_age_secs(modified_epoch_secs: u64) -> u64 {
+    current_epoch_secs().saturating_sub(modified_epoch_secs)
+}
+
+fn auto_compact_inactive_sessions(
+    active_session_id: &str,
+) -> Result<(), Box<dyn std::error::Error>> {
+    for summary in list_managed_sessions()? {
+        if summary.id == active_session_id
+            || session_age_secs(summary.modified_epoch_secs) < OLD_SESSION_COMPACTION_AGE_SECS
+        {
+            continue;
+        }
+        let path = summary.path.clone();
+        let Ok(session) = Session::load_from_path(&path) else {
+            continue;
+        };
+        if !runtime::should_compact(&session, CompactionConfig::default()) {
+            continue;
+        }
+        let mut compacted =
+            runtime::compact_session(&session, CompactionConfig::default()).compacted_session;
+        let model = compacted.metadata.as_ref().map_or_else(
+            || DEFAULT_MODEL.to_string(),
+            |metadata| metadata.model.clone(),
+        );
+        compacted.metadata = Some(derive_session_metadata(&compacted, &model));
+        compacted.save_to_path(&path)?;
+    }
+    Ok(())
+}
+
 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 +1695,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 +1970,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 +2060,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 +2123,6 @@ struct AnthropicRuntimeClient {
    model: String,
    enable_tools: bool,
    allowed_tools: Option<AllowedToolSet>,
-    thinking_enabled: bool,
 }

 impl AnthropicRuntimeClient {
@@ -2109,7 +2130,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 +2137,6 @@ impl AnthropicRuntimeClient {
            model,
            enable_tools,
            allowed_tools,
-            thinking_enabled,
        })
    }
 }
@@ -2151,9 +2170,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 +2182,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 +2192,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 +2201,6 @@ impl ApiClient for AnthropicRuntimeClient {
                            &mut stdout,
                            &mut events,
                            &mut pending_tool,
-                            &mut pending_thinking_signature,
                        )?;
                    }
                    ApiStreamEvent::ContentBlockDelta(delta) => match delta.delta {
@@ -2204,14 +2212,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 +2241,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 +2324,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 +2339,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 +2360,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 +2447,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 +2499,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!();
@@ -2559,17 +2525,73 @@ fn print_help() {
 #[cfg(test)]
 mod tests {
    use super::{
-        filter_tool_specs, format_compact_report, format_cost_report, format_init_report,
-        format_model_report, format_model_switch_report, format_permissions_report,
-        format_permissions_switch_report, format_resume_report, format_status_report,
-        format_tool_call_start, format_tool_result, normalize_permission_mode, parse_args,
-        parse_git_status_metadata, render_config_report, render_init_claude_md,
-        render_memory_report, render_repl_help, resume_supported_slash_commands, status_context,
-        CliAction, CliOutputFormat, SlashCommand, StatusUsage, DEFAULT_MODEL,
+        derive_session_metadata, filter_tool_specs, format_compact_report, format_cost_report,
+        format_init_report, format_model_report, format_model_switch_report,
+        format_permissions_report, format_permissions_switch_report, format_resume_report,
+        format_status_report, format_tool_call_start, format_tool_result, list_managed_sessions,
+        normalize_permission_mode, parse_args, parse_git_status_metadata, render_config_report,
+        render_init_claude_md, render_memory_report, render_repl_help,
+        resume_supported_slash_commands, sessions_dir, status_context, CliAction, CliOutputFormat,
+        SlashCommand, StatusUsage, DEFAULT_MODEL,
    };
-    use runtime::{ContentBlock, ConversationMessage, MessageRole, PermissionMode};
+    use runtime::{ContentBlock, ConversationMessage, MessageRole, PermissionMode, Session};
+    use std::fs;
    use std::path::{Path, PathBuf};

+    #[test]
+    fn derive_session_metadata_recomputes_prompt_and_count() {
+        let mut session = Session::new();
+        session
+            .messages
+            .push(ConversationMessage::user_text("first prompt"));
+        session
+            .messages
+            .push(ConversationMessage::assistant(vec![ContentBlock::Text {
+                text: "reply".to_string(),
+            }]));
+        let metadata = derive_session_metadata(&session, "claude-test");
+        assert_eq!(metadata.model, "claude-test");
+        assert_eq!(metadata.message_count, 2);
+        assert_eq!(metadata.last_prompt.as_deref(), Some("first prompt"));
+        assert!(metadata.started_at.ends_with('Z'));
+    }
+
+    #[test]
+    fn managed_sessions_use_home_directory_and_list_metadata() {
+        let temp =
+            std::env::temp_dir().join(format!("rusty-claude-cli-home-{}", std::process::id()));
+        let _ = fs::remove_dir_all(&temp);
+        fs::create_dir_all(&temp).expect("temp home should exist");
+        let previous_home = std::env::var_os("HOME");
+        std::env::set_var("HOME", &temp);
+
+        let dir = sessions_dir().expect("sessions dir");
+        assert_eq!(dir, temp.join(".claude").join("sessions"));
+
+        let mut session = Session::new();
+        session
+            .messages
+            .push(ConversationMessage::user_text("persist me"));
+        session.metadata = Some(derive_session_metadata(&session, "claude-home"));
+        let file = dir.join("session-test.json");
+        session.save_to_path(&file).expect("session save");
+
+        let listed = list_managed_sessions().expect("session list");
+        let found = listed
+            .into_iter()
+            .find(|entry| entry.id == "session-test")
+            .expect("saved session should be listed");
+        assert_eq!(found.message_count, 1);
+        assert_eq!(found.model.as_deref(), Some("claude-home"));
+        assert_eq!(found.last_prompt.as_deref(), Some("persist me"));
+
+        fs::remove_file(file).ok();
+        if let Some(previous_home) = previous_home {
+            std::env::set_var("HOME", previous_home);
+        }
+        fs::remove_dir_all(temp).ok();
+    }
+
    #[test]
    fn defaults_to_repl_when_no_args() {
        assert_eq!(
@@ -2578,7 +2600,6 @@ mod tests {
                model: DEFAULT_MODEL.to_string(),
                allowed_tools: None,
                permission_mode: PermissionMode::WorkspaceWrite,
-                thinking: false,
            }
        );
    }
@@ -2598,7 +2619,6 @@ mod tests {
                output_format: CliOutputFormat::Text,
                allowed_tools: None,
                permission_mode: PermissionMode::WorkspaceWrite,
-                thinking: false,
            }
        );
    }
@@ -2620,7 +2640,6 @@ mod tests {
                output_format: CliOutputFormat::Json,
                allowed_tools: None,
                permission_mode: PermissionMode::WorkspaceWrite,
-                thinking: false,
            }
        );
    }
@@ -2646,7 +2665,6 @@ mod tests {
                model: DEFAULT_MODEL.to_string(),
                allowed_tools: None,
                permission_mode: PermissionMode::ReadOnly,
-                thinking: false,
            }
        );
    }
@@ -2669,7 +2687,6 @@ mod tests {
                        .collect()
                ),
                permission_mode: PermissionMode::WorkspaceWrite,
-                thinking: false,
            }
        );
    }
@@ -2780,7 +2797,8 @@ mod tests {
        assert!(help.contains("/permissions [read-only|workspace-write|danger-full-access]"));
        assert!(help.contains("/clear [--confirm]"));
        assert!(help.contains("/cost"));
-        assert!(help.contains("/resume <session-path>"));
+        assert!(help.contains("/resume <session-id-or-path>"));
+        assert!(help.contains("/sessions"));
        assert!(help.contains("/config [env|hooks|model]"));
        assert!(help.contains("/memory"));
        assert!(help.contains("/init"));
@@ -2909,7 +2927,6 @@ mod tests {
                    cache_read_input_tokens: 1,
                },
                estimated_tokens: 128,
-                thinking_enabled: true,
            },
            "workspace-write",
            &super::StatusContext {
@@ -2973,7 +2990,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);
    }