anveesa 0.4.4 → 0.4.6

package/Cargo.lock

@@ -60,7 +60,7 @@ dependencies = [
 
 [[package]]
 name = "anveesa"
-version = "0.4.4"
+version = "0.4.6"
 dependencies = [
  "anyhow",
  "base64",

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "anveesa"
-version = "0.4.4"
+version = "0.4.6"
 edition = "2024"
 default-run = "anveesa"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anveesa",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "A terminal CLI that wraps AI providers (OpenAI-compatible APIs and local CLIs) into a single unified command",
   "main": "bin/anveesa.js",
   "bin": {

package/src/lib.rs

@@ -2516,10 +2516,40 @@ fn workspace_context_for(cwd: &Path) -> Result<String> {
                 }
             }
         }
+        // Recent commits give the model useful project history context
+        if let Some(log) = git_output(&cwd, ["log", "--oneline", "--decorate", "-8"]) {
+            if !log.is_empty() {
+                context.push_str("- recent_commits:\n");
+                for line in log.lines() {
+                    context.push_str(&format!("  {line}\n"));
+                }
+            }
+        }
     } else {
         context.push_str("- git: not inside a git repository\n");
     }
 
+    // Project metadata from package.json / Cargo.toml
+    if let Ok(raw) = fs::read_to_string(cwd.join("package.json")) {
+        if let Ok(pkg) = serde_json::from_str::<serde_json::Value>(&raw) {
+            if let Some(name) = pkg["name"].as_str() {
+                context.push_str(&format!("- project_name: {name}\n"));
+            }
+            if let Some(ver) = pkg["version"].as_str() {
+                context.push_str(&format!("- project_version: {ver}\n"));
+            }
+            if let Some(desc) = pkg["description"].as_str() {
+                context.push_str(&format!("- project_description: {desc}\n"));
+            }
+        }
+    } else if let Ok(raw) = fs::read_to_string(cwd.join("Cargo.toml")) {
+        for line in raw.lines().take(15) {
+            if line.starts_with("name") || line.starts_with("version") || line.starts_with("description") {
+                context.push_str(&format!("- cargo_{}\n", line.trim()));
+            }
+        }
+    }
+
     let entries = directory_entries(cwd)?;
     if entries.is_empty() {
         context.push_str("- directory_entries: empty\n");

package/src/mcp.rs

@@ -102,17 +102,23 @@ impl McpServer {
         };
         self.send_msg(json!({ "jsonrpc": "2.0", "id": id, "method": method, "params": params })).await?;
 
-        // Drain notifications until we get our response id
-        loop {
-            let resp = self.recv_msg().await?;
-            if resp.get("id").and_then(|v| v.as_u64()) == Some(id) {
-                if let Some(err) = resp.get("error") {
-                    bail!("MCP error from '{}': {}", self.name, err);
+        // Wait for our response with a timeout
+        let timeout = tokio::time::Duration::from_secs(30);
+        let result = tokio::time::timeout(timeout, async {
+            loop {
+                let resp = self.recv_msg().await?;
+                if resp.get("id").and_then(|v| v.as_u64()) == Some(id) {
+                    if let Some(err) = resp.get("error") {
+                        anyhow::bail!("MCP error from '{}': {}", self.name, err);
+                    }
+                    return Ok(resp["result"].clone());
                 }
-                return Ok(resp["result"].clone());
+                // Drop unmatched messages (notifications, other ids)
             }
-            // Drop unmatched messages (notifications, other ids)
-        }
+        })
+        .await
+        .context(format!("MCP request to '{}' timed out after 30s", self.name))??;
+        Ok(result)
     }
 
     async fn notify(&self, method: &str, params: Value) -> Result<()> {

package/src/tools.rs

@@ -60,6 +60,8 @@ pub fn is_write_tool(name: &str) -> bool {
     matches!(
         name,
         "create_dir" | "write_file" | "edit_file" | "run_command"
+        | "delete_file" | "move_file" | "copy_file" | "patch_file"
+        | "git_commit" | "git_stash" | "git_branch"
     )
 }
 
@@ -85,15 +87,29 @@ pub fn describe_call(name: &str, arguments: &str) -> String {
             field("root").if_empty(".")
         ),
         "read_file" => format!("read file {}", field("path")),
-        "web_search" => format!("web search `{}`", field("query")),
-        "fetch_url"  => format!("fetch {}", field("url")),
-        "git_status" => "git status".to_string(),
-        "git_diff"   => {
+        "web_search"  => format!("web search `{}`", field("query")),
+        "fetch_url"   => format!("fetch {}", field("url")),
+        "git_status"  => "git status".to_string(),
+        "git_diff"    => {
             let path = field("path");
             if path.is_empty() { "git diff".to_string() } else { format!("git diff {path}") }
         }
-        "git_log"    => "git log".to_string(),
-        "create_dir" => format!("create directory {}", field("path")),
+        "git_log"     => "git log".to_string(),
+        "git_blame"   => format!("git blame {}", field("path")),
+        "git_show"    => format!("git show {}", field("ref").if_empty("HEAD")),
+        "git_stash"   => format!("git stash {}", field("action").if_empty("list")),
+        "git_branch"  => {
+            if !field("create").is_empty() { format!("git branch -b {}", field("create")) }
+            else if !field("checkout").is_empty() { format!("git checkout {}", field("checkout")) }
+            else if !field("delete").is_empty() { format!("git branch -d {}", field("delete")) }
+            else { "git branch".to_string() }
+        }
+        "git_commit"  => format!("git commit {}", field("message")),
+        "patch_file"  => format!("patch file {}", field("path")),
+        "delete_file" => format!("delete {}", field("path")),
+        "move_file"   => format!("move {} → {}", field("from"), field("to")),
+        "copy_file"   => format!("copy {} → {}", field("from"), field("to")),
+        "create_dir"  => format!("create directory {}", field("path")),
         "write_file" => format!("write file {}", field("path")),
         "edit_file" => format!("edit file {}", field("path")),
         "run_command" => format!("run command `{}`", field("command")),
@@ -267,8 +283,38 @@ pub fn definitions(include_write: bool) -> Vec<Value> {
                 "parameters": {
                     "type": "object",
                     "properties": {
-                        "n":    { "type": "integer", "description": "Number of commits to show (default 20, max 100)." },
-                        "path": { "type": "string",  "description": "Limit log to commits touching this path." }
+                        "n":    { "type": "integer", "description": "Number of commits (default 20, max 100)." },
+                        "path": { "type": "string",  "description": "Limit to commits touching this path." }
+                    }
+                }
+            }
+        }),
+        json!({
+            "type": "function",
+            "function": {
+                "name": "git_blame",
+                "description": "Show who last modified each line of a file (git blame).",
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "path":       { "type": "string",  "description": "File path to blame." },
+                        "start_line": { "type": "integer", "description": "First line (1-based)." },
+                        "end_line":   { "type": "integer", "description": "Last line (1-based)." }
+                    },
+                    "required": ["path"]
+                }
+            }
+        }),
+        json!({
+            "type": "function",
+            "function": {
+                "name": "git_show",
+                "description": "Show the contents or diff of a specific commit or object.",
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "ref":  { "type": "string", "description": "Commit ref (e.g. HEAD, abc123, HEAD~2). Default HEAD." },
+                        "path": { "type": "string", "description": "Limit output to this file." }
                     }
                 }
             }
@@ -326,7 +372,7 @@ pub fn definitions(include_write: bool) -> Vec<Value> {
                 "type": "function",
                 "function": {
                     "name": "run_command",
-                    "description": "Run a shell command in the terminal cwd and return its output. Use for builds, tests, git, and similar tasks.",
+                    "description": "Run a shell command in the terminal cwd and return its output. Use for builds, tests, and tasks not covered by other tools.",
                     "parameters": {
                         "type": "object",
                         "properties": {
@@ -337,6 +383,120 @@ pub fn definitions(include_write: bool) -> Vec<Value> {
                     }
                 }
             }),
+            json!({
+                "type": "function",
+                "function": {
+                    "name": "patch_file",
+                    "description": "Apply multiple targeted replacements to a file in one call. Each patch must match exactly once. Prefer this over multiple edit_file calls when editing the same file.",
+                    "parameters": {
+                        "type": "object",
+                        "properties": {
+                            "path": { "type": "string", "description": "File path." },
+                            "patches": {
+                                "type": "array",
+                                "description": "Ordered list of replacements to apply sequentially.",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "old_string": { "type": "string", "description": "Unique text to replace." },
+                                        "new_string": { "type": "string", "description": "Replacement text." }
+                                    },
+                                    "required": ["old_string", "new_string"]
+                                }
+                            }
+                        },
+                        "required": ["path", "patches"]
+                    }
+                }
+            }),
+            json!({
+                "type": "function",
+                "function": {
+                    "name": "delete_file",
+                    "description": "Delete a file or empty directory. Use with care — this is irreversible.",
+                    "parameters": {
+                        "type": "object",
+                        "properties": {
+                            "path": { "type": "string", "description": "Path to delete." }
+                        },
+                        "required": ["path"]
+                    }
+                }
+            }),
+            json!({
+                "type": "function",
+                "function": {
+                    "name": "move_file",
+                    "description": "Move or rename a file or directory.",
+                    "parameters": {
+                        "type": "object",
+                        "properties": {
+                            "from": { "type": "string", "description": "Source path." },
+                            "to":   { "type": "string", "description": "Destination path." }
+                        },
+                        "required": ["from", "to"]
+                    }
+                }
+            }),
+            json!({
+                "type": "function",
+                "function": {
+                    "name": "copy_file",
+                    "description": "Copy a file to a new location. Parent directories are created as needed.",
+                    "parameters": {
+                        "type": "object",
+                        "properties": {
+                            "from": { "type": "string", "description": "Source file path." },
+                            "to":   { "type": "string", "description": "Destination path." }
+                        },
+                        "required": ["from", "to"]
+                    }
+                }
+            }),
+            json!({
+                "type": "function",
+                "function": {
+                    "name": "git_stash",
+                    "description": "Save or restore git stash. action: push|pop|list|drop.",
+                    "parameters": {
+                        "type": "object",
+                        "properties": {
+                            "action":  { "type": "string",  "description": "push, pop, list, or drop." },
+                            "message": { "type": "string",  "description": "Stash message (only for push)." }
+                        }
+                    }
+                }
+            }),
+            json!({
+                "type": "function",
+                "function": {
+                    "name": "git_branch",
+                    "description": "List, create, checkout, or delete git branches.",
+                    "parameters": {
+                        "type": "object",
+                        "properties": {
+                            "create":   { "type": "string", "description": "Create and switch to a new branch with this name." },
+                            "checkout": { "type": "string", "description": "Switch to an existing branch." },
+                            "delete":   { "type": "string", "description": "Delete a branch." }
+                        }
+                    }
+                }
+            }),
+            json!({
+                "type": "function",
+                "function": {
+                    "name": "git_commit",
+                    "description": "Create a git commit with the given message. Optionally stage all changes first.",
+                    "parameters": {
+                        "type": "object",
+                        "properties": {
+                            "message": { "type": "string",  "description": "Commit message." },
+                            "add_all": { "type": "boolean", "description": "Run git add -A before committing." }
+                        },
+                        "required": ["message"]
+                    }
+                }
+            }),
         ]);
     }
 
@@ -351,10 +511,19 @@ pub async fn run(name: &str, arguments: &str) -> String {
         "read_file"  => read_file(arguments).await,
         "web_search" => web_search(arguments).await,
         "fetch_url"  => fetch_url(arguments).await,
-        "git_status" => git_status(arguments).await,
-        "git_diff"   => git_diff(arguments).await,
-        "git_log"    => git_log(arguments).await,
-        "create_dir" => create_dir(arguments).await,
+        "git_status"  => git_status(arguments).await,
+        "git_diff"    => git_diff(arguments).await,
+        "git_log"     => git_log(arguments).await,
+        "git_blame"   => git_blame(arguments).await,
+        "git_show"    => git_show(arguments).await,
+        "git_stash"   => git_stash(arguments).await,
+        "git_branch"  => git_branch(arguments).await,
+        "git_commit"  => git_commit(arguments).await,
+        "patch_file"  => patch_file(arguments).await,
+        "delete_file" => delete_file(arguments).await,
+        "move_file"   => move_file(arguments).await,
+        "copy_file"   => copy_file(arguments).await,
+        "create_dir"  => create_dir(arguments).await,
         "write_file" => write_file(arguments).await,
         "edit_file"  => edit_file(arguments).await,
         "run_command" => run_command(arguments).await,
@@ -541,41 +710,216 @@ fn http_client() -> &'static reqwest::Client {
 async fn web_search(arguments: &str) -> Result<Value> {
     let args: WebSearchArgs = parse_args(arguments)?;
     let query = args.query.trim();
-    if query.is_empty() {
-        bail!("query is empty");
+    if query.is_empty() { bail!("query is empty"); }
+
+    // 1. Brave Search API (best quality, free tier available)
+    if let Ok(key) = std::env::var("BRAVE_SEARCH_API_KEY") {
+        if let Ok(results) = search_brave(query, &key).await {
+            if !results.is_empty() {
+                return Ok(json!({ "ok": true, "query": query, "source": "brave", "results": results }));
+            }
+        }
     }
 
-    let url = format!(
+    // 2. Serper.dev (Google results via API)
+    if let Ok(key) = std::env::var("SERPER_API_KEY") {
+        if let Ok(results) = search_serper(query, &key).await {
+            if !results.is_empty() {
+                return Ok(json!({ "ok": true, "query": query, "source": "serper", "results": results }));
+            }
+        }
+    }
+
+    // 3. DuckDuckGo instant-answer API (no key needed, limited results)
+    let api_url = format!(
         "https://api.duckduckgo.com/?q={}&format=json&no_html=1&skip_disambig=1",
         percent_encode(query)
     );
-    let response: Value = http_client()
+    let mut results = Vec::new();
+    if let Ok(resp) = http_client().get(&api_url).send().await {
+        if let Ok(response) = resp.json::<Value>().await {
+            if let Some(abstract_text) = response.get("AbstractText").and_then(Value::as_str)
+                && !abstract_text.is_empty()
+            {
+                results.push(json!({
+                    "title": response.get("Heading").and_then(Value::as_str).unwrap_or(""),
+                    "snippet": abstract_text,
+                    "url": response.get("AbstractURL").and_then(Value::as_str).unwrap_or("")
+                }));
+            }
+            collect_related_topics(response.get("RelatedTopics"), &mut results);
+        }
+    }
+
+    // 4. DuckDuckGo lite HTML fallback
+    if results.is_empty() {
+        let lite_url = format!("https://lite.duckduckgo.com/lite/?q={}", percent_encode(query));
+        if let Ok(resp) = http_client()
+            .get(&lite_url)
+            .header("Accept-Language", "en-US,en;q=0.9")
+            .header("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36")
+            .send()
+            .await
+        {
+            if let Ok(body) = resp.text().await {
+                results = scrape_ddg_lite(&body, 8);
+            }
+        }
+    }
+
+    results.truncate(10);
+    let source = if results.is_empty() { "none" } else { "duckduckgo" };
+    Ok(json!({ "ok": true, "query": query, "source": source, "results": results }))
+}
+
+async fn search_brave(query: &str, api_key: &str) -> Result<Vec<Value>> {
+    let url = format!(
+        "https://api.search.brave.com/res/v1/web/search?q={}&count=10&search_lang=en",
+        percent_encode(query)
+    );
+    let resp = http_client()
         .get(&url)
+        .header("Accept", "application/json")
+        .header("Accept-Encoding", "gzip")
+        .header("X-Subscription-Token", api_key)
         .send()
         .await
-        .context("web search request failed")?
-        .json()
+        .context("Brave Search request failed")?;
+
+    if !resp.status().is_success() {
+        bail!("Brave Search HTTP {}", resp.status());
+    }
+    let body: Value = resp.json().await.context("failed to parse Brave response")?;
+    let results = body["web"]["results"].as_array().cloned().unwrap_or_default();
+    Ok(results.into_iter().filter_map(|r| {
+        let title = r["title"].as_str()?;
+        let url   = r["url"].as_str()?;
+        let snip  = r["description"].as_str().unwrap_or("");
+        Some(json!({ "title": title, "snippet": snip, "url": url }))
+    }).collect())
+}
+
+async fn search_serper(query: &str, api_key: &str) -> Result<Vec<Value>> {
+    let resp = http_client()
+        .post("https://google.serper.dev/search")
+        .header("X-API-KEY", api_key)
+        .header("Content-Type", "application/json")
+        .json(&json!({ "q": query, "num": 10 }))
+        .send()
         .await
-        .context("failed to parse web search response")?;
+        .context("Serper request failed")?;
 
+    if !resp.status().is_success() {
+        bail!("Serper HTTP {}", resp.status());
+    }
+    let body: Value = resp.json().await.context("failed to parse Serper response")?;
+    let results = body["organic"].as_array().cloned().unwrap_or_default();
+    Ok(results.into_iter().filter_map(|r| {
+        let title = r["title"].as_str()?;
+        let url   = r["link"].as_str()?;
+        let snip  = r["snippet"].as_str().unwrap_or("");
+        Some(json!({ "title": title, "snippet": snip, "url": url }))
+    }).collect())
+}
+
+/// Scrape DuckDuckGo lite (text-only) results page.
+fn scrape_ddg_lite(html: &str, max: usize) -> Vec<Value> {
     let mut results = Vec::new();
-    if let Some(abstract_text) = response.get("AbstractText").and_then(Value::as_str)
-        && !abstract_text.is_empty()
-    {
-        results.push(json!({
-            "title": response.get("Heading").and_then(Value::as_str).unwrap_or("DuckDuckGo"),
-            "snippet": abstract_text,
-            "url": response.get("AbstractURL").and_then(Value::as_str).unwrap_or("")
-        }));
+    let mut pos = 0;
+    while results.len() < max {
+        // DDG lite uses <a class="result-link"> for result links
+        let Some(a_pos) = html[pos..].find("class=\"result-link\"") else { break };
+        let block = pos + a_pos;
+
+        let url = extract_attr(&html[block..block.min(html.len()).min(block + 300)], "href")
+            .map(|u| clean_ddg_url(u))
+            .unwrap_or_default();
+        let title = extract_tag_text(&html[block..block.min(html.len()).min(block + 300)], "a")
+            .unwrap_or_default();
+
+        // Snippet is in the next table cell after the result
+        let snip_window_end = (block + 800).min(html.len());
+        let snippet = html[block..snip_window_end]
+            .find("result-snippet")
+            .and_then(|s| extract_tag_text(&html[block + s..snip_window_end], "td"))
+            .unwrap_or_default();
+
+        if !title.is_empty() && !url.is_empty() {
+            results.push(json!({ "title": title, "snippet": snippet, "url": url }));
+        }
+        pos = block + 10;
     }
-    collect_related_topics(response.get("RelatedTopics"), &mut results);
-    results.truncate(8);
+    results
+}
 
-    Ok(json!({
-        "ok": true,
-        "query": query,
-        "results": results
-    }))
+/// Scrape DuckDuckGo HTML search results page into structured results.
+fn scrape_ddg_html(html: &str, max: usize) -> Vec<Value> {
+    let mut results = Vec::new();
+    // DDG HTML results are in <div class="result"> blocks
+    // We extract title + snippet by simple string parsing
+    let mut pos = 0;
+    while results.len() < max {
+        // Find a result block
+        let Some(start) = html[pos..].find("class=\"result__a\"") else { break };
+        let block_start = pos + start;
+
+        // Extract href (URL)
+        let url = extract_attr(&html[block_start..block_start + 500], "href")
+            .map(|u| clean_ddg_url(u))
+            .unwrap_or_default();
+
+        // Extract link text (title)
+        let title = extract_tag_text(&html[block_start..block_start + 500], "a")
+            .unwrap_or_default();
+
+        // Find snippet nearby
+        let snippet_window = &html[block_start..std::cmp::min(block_start + 1000, html.len())];
+        let snippet = if let Some(s) = snippet_window.find("result__snippet") {
+            extract_tag_text(&snippet_window[s..std::cmp::min(s + 400, snippet_window.len())], "a")
+                .or_else(|| extract_tag_text(&snippet_window[s..std::cmp::min(s + 400, snippet_window.len())], "span"))
+                .unwrap_or_default()
+        } else {
+            String::new()
+        };
+
+        if !title.is_empty() && !url.is_empty() {
+            results.push(json!({ "title": title, "snippet": snippet, "url": url }));
+        }
+        pos = block_start + 10;
+    }
+    results
+}
+
+fn extract_attr<'a>(html: &'a str, attr: &str) -> Option<&'a str> {
+    let key = format!("{attr}=\"");
+    let start = html.find(&key)? + key.len();
+    let end = html[start..].find('"')? + start;
+    Some(&html[start..end])
+}
+
+fn extract_tag_text(html: &str, tag: &str) -> Option<String> {
+    let open = format!("<{tag}");
+    let start = html.find(&open)?;
+    let inner_start = html[start..].find('>')? + start + 1;
+    let close = format!("</{tag}>");
+    let end = html[inner_start..].find(&close)? + inner_start;
+    let raw = &html[inner_start..end];
+    let text = html_to_text(raw);
+    if text.trim().is_empty() { None } else { Some(text.trim().to_string()) }
+}
+
+fn clean_ddg_url(raw: &str) -> String {
+    // DDG wraps URLs in redirect: //duckduckgo.com/l/?uddg=https%3A%2F%2F...
+    if let Some(i) = raw.find("uddg=") {
+        let encoded = &raw[i + 5..];
+        let decoded = encoded.replace("%3A", ":").replace("%2F", "/")
+            .replace("%3F", "?").replace("%3D", "=").replace("%26", "&");
+        decoded.split('&').next().unwrap_or(&decoded).to_string()
+    } else if raw.starts_with("//") {
+        format!("https:{raw}")
+    } else {
+        raw.to_string()
+    }
 }
 
 // ── fetch_url ─────────────────────────────────────────────────────────────────
@@ -745,6 +1089,183 @@ async fn git_log(arguments: &str) -> Result<Value> {
     }))
 }
 
+async fn git_blame(arguments: &str) -> Result<Value> {
+    #[derive(Deserialize)]
+    struct Args {
+        path: String,
+        #[serde(default)] start_line: Option<usize>,
+        #[serde(default)] end_line: Option<usize>,
+    }
+    let args: Args = parse_args(arguments)?;
+    let mut cmd = tokio::process::Command::new("git");
+    cmd.args(["blame", "-s"]).kill_on_drop(true);
+    if let (Some(s), Some(e)) = (args.start_line, args.end_line) {
+        cmd.arg(format!("-L{s},{e}"));
+    } else if let Some(s) = args.start_line {
+        cmd.arg(format!("-L{s},+50"));
+    }
+    cmd.arg(&args.path);
+    let out = cmd.output().await.context("failed to run git blame")?;
+    let text = String::from_utf8_lossy(&out.stdout).to_string();
+    let truncated = text.len() > 20_000;
+    Ok(json!({
+        "ok": out.status.success(),
+        "blame": if truncated { &text[..20_000] } else { &text },
+        "truncated": truncated,
+        "error": if !out.status.success() { Some(String::from_utf8_lossy(&out.stderr).trim().to_string()) } else { None },
+    }))
+}
+
+async fn git_show(arguments: &str) -> Result<Value> {
+    #[derive(Deserialize, Default)]
+    struct Args {
+        #[serde(rename = "ref", default)] refspec: Option<String>,
+        #[serde(default)] path: Option<String>,
+    }
+    let args: Args = serde_json::from_str(arguments).unwrap_or_default();
+    let mut cmd = tokio::process::Command::new("git");
+    cmd.arg("show").kill_on_drop(true);
+    cmd.arg(args.refspec.as_deref().unwrap_or("HEAD"));
+    if let Some(p) = &args.path { cmd.arg("--").arg(p); }
+    let out = cmd.output().await.context("failed to run git show")?;
+    let text = String::from_utf8_lossy(&out.stdout).to_string();
+    let truncated = text.len() > 20_000;
+    Ok(json!({
+        "ok": out.status.success(),
+        "output": if truncated { &text[..20_000] } else { &text },
+        "truncated": truncated,
+    }))
+}
+
+async fn git_stash(arguments: &str) -> Result<Value> {
+    #[derive(Deserialize, Default)]
+    struct Args {
+        #[serde(default)] action: Option<String>,
+        #[serde(default)] message: Option<String>,
+    }
+    let args: Args = serde_json::from_str(arguments).unwrap_or_default();
+    let action = args.action.as_deref().unwrap_or("list");
+    let mut cmd = tokio::process::Command::new("git");
+    cmd.arg("stash").kill_on_drop(true);
+    match action {
+        "push" => {
+            cmd.arg("push");
+            if let Some(m) = &args.message { cmd.arg("-m").arg(m); }
+        }
+        "pop"  => { cmd.arg("pop"); }
+        "drop" => { cmd.arg("drop"); }
+        _      => { cmd.arg("list"); }
+    }
+    let out = cmd.output().await.context("failed to run git stash")?;
+    Ok(json!({
+        "ok": out.status.success(),
+        "output": String::from_utf8_lossy(&out.stdout).trim().to_string(),
+        "error": if !out.status.success() { Some(String::from_utf8_lossy(&out.stderr).trim().to_string()) } else { None },
+    }))
+}
+
+async fn git_branch(arguments: &str) -> Result<Value> {
+    #[derive(Deserialize, Default)]
+    struct Args {
+        #[serde(default)] create:   Option<String>,
+        #[serde(default)] checkout: Option<String>,
+        #[serde(default)] delete:   Option<String>,
+    }
+    let args: Args = serde_json::from_str(arguments).unwrap_or_default();
+    let (git_args, key, val): (Vec<&str>, &str, &str) =
+        if let Some(name) = &args.create {
+            (vec!["checkout", "-b", name], "created", name)
+        } else if let Some(name) = &args.checkout {
+            (vec!["checkout", name], "checked_out", name)
+        } else if let Some(name) = &args.delete {
+            (vec!["branch", "-d", name], "deleted", name)
+        } else {
+            let out = tokio::process::Command::new("git").args(["branch", "-a"]).kill_on_drop(true).output().await.context("failed to run git branch")?;
+            return Ok(json!({ "ok": out.status.success(), "branches": String::from_utf8_lossy(&out.stdout).trim().to_string() }));
+        };
+    let out = tokio::process::Command::new("git").args(&git_args).kill_on_drop(true).output().await.context("failed to run git branch")?;
+    Ok(json!({
+        "ok": out.status.success(),
+        key: val,
+        "error": if !out.status.success() { Some(String::from_utf8_lossy(&out.stderr).trim().to_string()) } else { None },
+    }))
+}
+
+async fn git_commit(arguments: &str) -> Result<Value> {
+    #[derive(Deserialize)]
+    struct Args {
+        message: String,
+        #[serde(default)] add_all: bool,
+    }
+    let args: Args = parse_args(arguments)?;
+    if args.message.trim().is_empty() { bail!("commit message is required"); }
+    if args.add_all {
+        tokio::process::Command::new("git").args(["add", "-A"]).kill_on_drop(true).output().await.context("failed to git add")?;
+    }
+    let out = tokio::process::Command::new("git")
+        .args(["commit", "-m", &args.message])
+        .kill_on_drop(true)
+        .output()
+        .await
+        .context("failed to run git commit")?;
+    Ok(json!({
+        "ok": out.status.success(),
+        "output": String::from_utf8_lossy(&out.stdout).trim().to_string(),
+        "error": if !out.status.success() { Some(String::from_utf8_lossy(&out.stderr).trim().to_string()) } else { None },
+    }))
+}
+
+// ── file management ───────────────────────────────────────────────────────────
+
+async fn delete_file(arguments: &str) -> Result<Value> {
+    let args: PathArgs = parse_args(arguments)?;
+    let path = resolve_writable_path(&args.path.context("path is required")?)?;
+    if is_sensitive_path(&path) {
+        bail!("refusing to delete sensitive path {}", path.display());
+    }
+    if !path.exists() {
+        bail!("{} does not exist", path.display());
+    }
+    let was_dir = path.is_dir();
+    if was_dir {
+        fs::remove_dir_all(&path).with_context(|| format!("failed to delete {}", path.display()))?;
+    } else {
+        fs::remove_file(&path).with_context(|| format!("failed to delete {}", path.display()))?;
+    }
+    Ok(json!({ "ok": true, "path": path.display().to_string(), "was_dir": was_dir }))
+}
+
+async fn move_file(arguments: &str) -> Result<Value> {
+    #[derive(Deserialize)]
+    struct Args { from: String, to: String }
+    let args: Args = parse_args(arguments)?;
+    let from = resolve_writable_path(&args.from)?;
+    let to   = resolve_writable_path(&args.to)?;
+    if is_sensitive_path(&from) || is_sensitive_path(&to) {
+        bail!("refusing to move sensitive path");
+    }
+    if !from.exists() { bail!("{} does not exist", from.display()); }
+    if let Some(parent) = to.parent() { fs::create_dir_all(parent)?; }
+    fs::rename(&from, &to).with_context(|| format!("failed to move {} → {}", from.display(), to.display()))?;
+    Ok(json!({ "ok": true, "from": from.display().to_string(), "to": to.display().to_string() }))
+}
+
+async fn copy_file(arguments: &str) -> Result<Value> {
+    #[derive(Deserialize)]
+    struct Args { from: String, to: String }
+    let args: Args = parse_args(arguments)?;
+    let from_str = args.from.trim();
+    let from = resolve_path(from_str)?;
+    let to   = resolve_writable_path(&args.to)?;
+    if is_sensitive_path(&from) || is_sensitive_path(&to) {
+        bail!("refusing to copy sensitive path");
+    }
+    if !from.is_file() { bail!("{} is not a file", from.display()); }
+    if let Some(parent) = to.parent() { fs::create_dir_all(parent)?; }
+    let bytes = fs::copy(&from, &to).with_context(|| format!("failed to copy {} → {}", from.display(), to.display()))?;
+    Ok(json!({ "ok": true, "from": from.display().to_string(), "to": to.display().to_string(), "bytes": bytes }))
+}
+
 async fn create_dir(arguments: &str) -> Result<Value> {
     let args: CreateDirArgs = parse_args(arguments)?;
     let path = resolve_writable_path(&args.path)?;
@@ -796,6 +1317,37 @@ async fn write_file(arguments: &str) -> Result<Value> {
     }))
 }
 
+async fn patch_file(arguments: &str) -> Result<Value> {
+    #[derive(Deserialize)]
+    struct Hunk { old_string: String, new_string: String }
+    #[derive(Deserialize)]
+    struct Args { path: String, patches: Vec<Hunk> }
+
+    let args: Args = parse_args(arguments)?;
+    let path = resolve_writable_path(&args.path)?;
+    if !path.is_file() { bail!("{} is not a file", path.display()); }
+    if is_sensitive_path(&path) { bail!("refusing to edit sensitive file"); }
+    if args.patches.is_empty() { bail!("patches array is empty"); }
+
+    let mut content = fs::read_to_string(&path)
+        .with_context(|| format!("failed to read {}", path.display()))?;
+
+    for (i, hunk) in args.patches.iter().enumerate() {
+        if hunk.old_string.is_empty() { bail!("patch[{i}]: old_string must not be empty"); }
+        if hunk.old_string == hunk.new_string { bail!("patch[{i}]: old_string and new_string are identical"); }
+        let count = content.matches(&hunk.old_string).count();
+        match count {
+            0 => bail!("patch[{i}]: old_string not found in {}", path.display()),
+            1 => {}
+            n => bail!("patch[{i}]: old_string appears {n} times — make it unique"),
+        }
+        content = content.replacen(&hunk.old_string, &hunk.new_string, 1);
+    }
+
+    fs::write(&path, &content).with_context(|| format!("failed to write {}", path.display()))?;
+    Ok(json!({ "ok": true, "path": path.display().to_string(), "patches_applied": args.patches.len() }))
+}
+
 async fn edit_file(arguments: &str) -> Result<Value> {
     let args: EditFileArgs = parse_args(arguments)?;
     let path = resolve_writable_path(&args.path)?;

package/src/tools_scenarios.rs

@@ -552,8 +552,8 @@ fn s7_is_write_tool() {
     assert!(!is_write_tool("EDIT_FILE"));
     assert!(!is_write_tool("RUN_COMMAND"));
     assert!(!is_write_tool("create_directory"));
-    assert!(!is_write_tool("delete_file"));
-    assert!(!is_write_tool("move_file"));
+    assert!(is_write_tool("delete_file"));
+    assert!(is_write_tool("move_file"));
 }
 
 // ═══════════════════════════════════════════════════════════════════════════════

package/src/tui.rs

@@ -87,8 +87,9 @@ pub struct App {
     streaming_started_at: Option<Instant>,
     tool_started_at: Option<Instant>,
     unread_count: usize,
-    // files/dirs already read this session — injected into workspace context each turn
     seen_paths: std::collections::BTreeSet<String>,
+    // undo stack: (path, old_content) — None content means file didn't exist before
+    undo_stack: Vec<(String, Option<String>)>,
 
     // input
     input: String,
@@ -176,6 +177,7 @@ impl App {
             tool_started_at: None,
             unread_count: 0,
             seen_paths: std::collections::BTreeSet::new(),
+            undo_stack: Vec::new(),
 
             input: String::new(),
             input_cursor: 0,
@@ -514,6 +516,17 @@ async fn handle_key(app: &mut App, KeyEvent { code, modifiers, .. }: KeyEvent) -
             }
         }
 
+        // j/k vim-style scroll when input is empty
+        KeyCode::Char('j') if app.input.is_empty() => {
+            app.scroll = app.scroll.saturating_add(3);
+            if app.scroll >= app.total_lines { app.auto_scroll = true; app.unread_count = 0; }
+            else { app.auto_scroll = false; }
+        }
+        KeyCode::Char('k') if app.input.is_empty() => {
+            app.auto_scroll = false;
+            app.scroll = app.scroll.saturating_sub(3);
+        }
+
         // Printable characters
         KeyCode::Char(c) => {
             let s = c.to_string();
@@ -542,6 +555,7 @@ fn handle_slash_command(app: &mut App, text: &str) -> bool {
             app.usage = Usage::default();
             app.pending_image = None;
             app.seen_paths.clear();
+            app.undo_stack.clear();
             app.input.clear();
             app.input_cursor = 0;
             if let Some(path) = &app.session_path {
@@ -551,11 +565,20 @@ fn handle_slash_command(app: &mut App, text: &str) -> bool {
         }
         "/help" => {
             app.messages.push(Msg::System(
-                "Commands: /clear  /copy  /export [path]  /model [name]  /provider [name]  /status  /exit\n\
+                "Commands:\n\
+                 /clear        reset conversation\n\
+                 /undo         restore last file changed by AI\n\
+                 /compact      drop old turns to free context\n\
+                 /copy         copy last response to clipboard\n\
+                 /export [path] save conversation as markdown\n\
+                 /model [name] · /provider [name] · /status · /exit\n\
+                 \n\
                  Keys: ↑/↓ history  ←/→ cursor  Home/End  Shift+Enter newline\n\
-                 Ctrl+W delete-word  Ctrl+U clear-line  Ctrl+V paste image\n\
-                 Ctrl+M toggle scroll/select mode  PageUp/Dn scroll\n\
-                 [scroll] = mouse wheel scrolls  [select] = mouse selects text to copy".into(),
+                 j/k scroll (when input empty)  PageUp/Dn scroll\n\
+                 Ctrl+V paste (image or text)  Ctrl+M scroll/select mode\n\
+                 Ctrl+W delete-word  Ctrl+U clear line\n\
+                 \n\
+                 Search: set BRAVE_SEARCH_API_KEY or SERPER_API_KEY for better results".into(),
             ));
             app.input.clear();
             app.input_cursor = 0;
@@ -594,6 +617,55 @@ fn handle_slash_command(app: &mut App, text: &str) -> bool {
             app.input_cursor = 0;
             true
         }
+        "/undo" => {
+            match app.undo_stack.pop() {
+                None => app.messages.push(Msg::System("Nothing to undo.".into())),
+                Some((path, Some(old_content))) => {
+                    match std::fs::write(&path, &old_content) {
+                        Ok(()) => app.messages.push(Msg::System(format!("Restored {path}"))),
+                        Err(e) => app.messages.push(Msg::Error(format!("Undo failed: {e}"))),
+                    }
+                }
+                Some((path, None)) => {
+                    // File was newly created — delete it
+                    match std::fs::remove_file(&path) {
+                        Ok(()) => app.messages.push(Msg::System(format!("Deleted {path} (undo create)"))),
+                        Err(e) => app.messages.push(Msg::Error(format!("Undo failed: {e}"))),
+                    }
+                }
+            }
+            app.input.clear();
+            app.input_cursor = 0;
+            true
+        }
+        "/compact" => {
+            // Keep only the last 10 turns, drop older history to free context
+            let keep = 10usize;
+            let total_turns = app.history.len() / 2;
+            if total_turns <= keep {
+                app.messages.push(Msg::System(format!(
+                    "Conversation has {total_turns} turn(s) — nothing to compact yet (threshold: {keep})."
+                )));
+            } else {
+                let drop_turns = total_turns - keep;
+                let drop_msgs = drop_turns * 2;
+                app.history.drain(..drop_msgs);
+                // Also remove older messages from the display (keep separators and last N turns)
+                let msg_count = app.messages.len();
+                if msg_count > keep * 3 {
+                    app.messages.drain(..(msg_count - keep * 3));
+                }
+                app.seen_paths.clear(); // refresh seen paths for the new context window
+                app.messages.insert(0, Msg::System(format!(
+                    "Context compacted: dropped {drop_turns} older turn(s), keeping the last {keep}. \
+                     Use /clear to start fresh."
+                )));
+                app.messages.push(Msg::Separator);
+            }
+            app.input.clear();
+            app.input_cursor = 0;
+            true
+        }
         s if s.starts_with("/export") => {
             let arg = s.strip_prefix("/export").unwrap().trim();
             let path = if arg.is_empty() {
@@ -797,6 +869,10 @@ async fn handle_stream_event(app: &mut App, ev: TuiEvent) {
         TuiEvent::FileOp { verb, path, added, removed, diff } => {
             flush_streaming_buf(app);
             commit_pending_tool(app, true);
+            // Snapshot for /undo (read current content before the write is reflected in messages)
+            let old_content = std::fs::read_to_string(&path).ok();
+            if app.undo_stack.len() >= 20 { app.undo_stack.remove(0); }
+            app.undo_stack.push((path.clone(), old_content));
             app.messages.push(Msg::FileOp { verb, path, added, removed, diff });
         }
         TuiEvent::Confirm { summary, reply } => {
@@ -909,6 +985,25 @@ fn finish_turn(app: &mut App) {
     if !app.history.is_empty() {
         app.messages.push(Msg::Separator);
     }
+    // Auto-compact when history exceeds ~40K estimated tokens (1 char ≈ 0.25 tokens)
+    auto_compact_if_needed(app);
+}
+
+fn auto_compact_if_needed(app: &mut App) {
+    const TOKEN_THRESHOLD: usize = 40_000;
+    let estimated: usize = app.history.iter().map(|m| m.content.len() / 4).sum();
+    if estimated < TOKEN_THRESHOLD || app.history.len() < 8 {
+        return;
+    }
+    // Drop oldest quarter of turns (keep at least 4 turns)
+    let total_turns = app.history.len() / 2;
+    let drop_turns = (total_turns / 4).max(1).min(total_turns.saturating_sub(4));
+    let drop_msgs = drop_turns * 2;
+    app.history.drain(..drop_msgs);
+    app.seen_paths.clear();
+    app.messages.push(Msg::System(format!(
+        "Auto-compacted: dropped {drop_turns} older turn(s) (~{estimated}K est. tokens). Use /compact for manual control."
+    )));
 }
 
 // ── Rendering ─────────────────────────────────────────────────────────────────
@@ -934,7 +1029,11 @@ fn render(frame: &mut Frame, app: &mut App) {
 
 fn render_header(frame: &mut Frame, area: Rect, app: &App) {
     let version = env!("CARGO_PKG_VERSION");
-    let token_str = if app.usage.total_tokens > 0 {
+    let token_str = if app.mode == Mode::Streaming && !app.streaming_buf.is_empty() {
+        // Live estimate: chars / 4 ≈ tokens
+        let live = app.streaming_buf.len() / 4;
+        format!("  → {live}t")
+    } else if app.usage.total_tokens > 0 {
         format!("  {}↓ {}↑", app.usage.prompt_tokens, app.usage.completion_tokens)
     } else {
         String::new()
@@ -1085,13 +1184,25 @@ fn render_messages(frame: &mut Frame, area: Rect, app: &mut App) {
         lines.push(Line::from(""));
     }
 
+    // Add bottom padding so wrapped last lines are never cut off by viewport
+    for _ in 0..3 { lines.push(Line::from("")); }
+
+    // Estimate visual rows (accounting for line wrapping) for accurate auto-scroll
+    let visual_rows: usize = if width == 0 { lines.len() } else {
+        lines.iter().map(|l| {
+            let chars: usize = l.spans.iter().map(|s| s.content.chars().count()).sum();
+            if chars == 0 { 1 } else { chars.div_ceil(width) }
+        }).sum()
+    };
+
     let total = lines.len();
     app.total_lines = total;
     let visible = area.height as usize;
     let scroll = if app.auto_scroll || app.scroll == usize::MAX {
-        total.saturating_sub(visible)
+        // Use visual-row estimate to scroll accurately to the bottom
+        visual_rows.saturating_sub(visible)
     } else {
-        app.scroll.min(total.saturating_sub(visible))
+        app.scroll.min(total.saturating_sub(1))
     };
     app.scroll = scroll;