agent-dump 1.2.3__tar.gz → 1.2.4__tar.gz

{agent_dump-1.2.3 → agent_dump-1.2.4}/Cargo.lock

@@ -10,7 +10,7 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "agent-dump"
-version = "1.2.3"
+version = "1.2.4"
 dependencies = [
  "agent-dump-core",
  "caseless",

{agent_dump-1.2.3 → agent_dump-1.2.4}/Cargo.toml

@@ -46,7 +46,7 @@ nix = { version = "0.31", default-features = false, features = ["fs", "user"] }
 
 [package]
 name = "agent-dump"
-version = "1.2.3"
+version = "1.2.4"
 edition = "2024"
 rust-version = "1.90"
 publish = false

{agent_dump-1.2.3 → agent_dump-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-dump
-Version: 1.2.3
+Version: 1.2.4
 Classifier: Environment :: Console
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Rust
@@ -479,6 +479,7 @@ provider = "openai" # openai | anthropic
 base_url = "https://api.openai.com/v1"
 model = "gpt-4.1-mini"
 api_key = "sk-..."
+reasoning = "off" # off | default
 
 [collect]
 summary_concurrency = 4 # 1-32
@@ -501,6 +502,23 @@ deny = [
 ]
 ```
 
+`[ai].reasoning` controls the model's thinking mode. `off` (the default) sends `enable_thinking: false` to OpenAI-compatible services and `thinking: {type: "disabled"}` to Anthropic. `default` sends neither and leaves the service default in place. Enabling reasoning or choosing an effort level uses vendor-specific parameters, so set them in `[ai.extra_body]`. The table is deep-merged into every request body: nested tables merge, other values replace.
+
+```toml
+# OpenAI reasoning models
+[ai.extra_body]
+reasoning_effort = "low"
+```
+
+```toml
+# Anthropic extended thinking; max_tokens must exceed budget_tokens
+[ai.extra_body]
+max_tokens = 8192
+thinking = { type = "enabled", budget_tokens = 2048 }
+```
+
+When an OpenAI-compatible service rejects the default `enable_thinking`, `temperature`, or `max_tokens`, agent-dump retries without it; `max_tokens` is renamed to `max_completion_tokens`. Parameters set in `extra_body` are never removed. `--config edit` does not prompt for `reasoning` or `extra_body` and keeps their values.
+
 `[agent.<name>].deny` only applies to `--collect`. When a session `cwd` matches one of the configured paths, or is inside that path, the session is ignored during collect.
 
 Collect, `--collect --dry-run`, and `--collect --emit-prompt` require valid TOML and exclusion arrays containing only nonempty path strings. Invalid configuration stops the command before session discovery or AI requests; compatibility parsing never disables exclusions for collect.

{agent_dump-1.2.3 → agent_dump-1.2.4}/README.md

@@ -455,6 +455,7 @@ provider = "openai" # openai | anthropic
 base_url = "https://api.openai.com/v1"
 model = "gpt-4.1-mini"
 api_key = "sk-..."
+reasoning = "off" # off | default
 
 [collect]
 summary_concurrency = 4 # 1-32
@@ -477,6 +478,23 @@ deny = [
 ]
 ```
 
+`[ai].reasoning` controls the model's thinking mode. `off` (the default) sends `enable_thinking: false` to OpenAI-compatible services and `thinking: {type: "disabled"}` to Anthropic. `default` sends neither and leaves the service default in place. Enabling reasoning or choosing an effort level uses vendor-specific parameters, so set them in `[ai.extra_body]`. The table is deep-merged into every request body: nested tables merge, other values replace.
+
+```toml
+# OpenAI reasoning models
+[ai.extra_body]
+reasoning_effort = "low"
+```
+
+```toml
+# Anthropic extended thinking; max_tokens must exceed budget_tokens
+[ai.extra_body]
+max_tokens = 8192
+thinking = { type = "enabled", budget_tokens = 2048 }
+```
+
+When an OpenAI-compatible service rejects the default `enable_thinking`, `temperature`, or `max_tokens`, agent-dump retries without it; `max_tokens` is renamed to `max_completion_tokens`. Parameters set in `extra_body` are never removed. `--config edit` does not prompt for `reasoning` or `extra_body` and keeps their values.
+
 `[agent.<name>].deny` only applies to `--collect`. When a session `cwd` matches one of the configured paths, or is inside that path, the session is ignored during collect.
 
 Collect, `--collect --dry-run`, and `--collect --emit-prompt` require valid TOML and exclusion arrays containing only nonempty path strings. Invalid configuration stops the command before session discovery or AI requests; compatibility parsing never disables exclusions for collect.

{agent_dump-1.2.3 → agent_dump-1.2.4}/crates/agent-dump-core/src/config.rs

@@ -10,6 +10,8 @@ pub struct AiConfig {
     pub base_url: String,
     pub model: String,
     pub api_key: String,
+    pub reasoning: String,
+    pub extra_body: Value,
 }
 
 pub struct CollectConfig {
@@ -183,6 +185,12 @@ impl Config {
             base_url: text(&self.data["ai"]["base_url"]),
             model: text(&self.data["ai"]["model"]),
             api_key: text(&self.data["ai"]["api_key"]),
+            reasoning: if self.data["ai"]["reasoning"].is_null() {
+                "off".into()
+            } else {
+                text(&self.data["ai"]["reasoning"])
+            },
+            extra_body: self.data["ai"]["extra_body"].clone(),
         })
     }
     pub fn output(&self) -> String {
@@ -436,6 +444,12 @@ pub fn validate_ai(
     if config.api_key.is_empty() {
         errors.push("api_key");
     }
+    if !matches!(config.reasoning.as_str(), "off" | "default") {
+        errors.push("reasoning");
+    }
+    if !config.extra_body.is_null() && !config.extra_body.is_object() {
+        errors.push("extra_body");
+    }
     if !config.base_url.is_empty() {
         let scheme = config
             .base_url

{agent_dump-1.2.3 → agent_dump-1.2.4}/src/collect/llm.rs

@@ -9,7 +9,7 @@ use std::time::Duration;
 pub struct RequestError {
     message: String,
     pub retryable: bool,
-    rejected_thinking: bool,
+    rejected: Option<&'static str>,
 }
 impl fmt::Display for RequestError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -22,7 +22,7 @@ const fn error(message: String, retryable: bool) -> RequestError {
     RequestError {
         message,
         retryable,
-        rejected_thinking: false,
+        rejected: None,
     }
 }
 
@@ -56,29 +56,68 @@ fn respond(
     structured: Option<Mode>,
 ) -> Result<Value, RequestError> {
     let system = include_str!("../../resources/prompts/system.txt");
-    let mut payload = if config.provider == "openai" {
-        json!({"model":config.model, "messages":[{"role":"system", "content":system}, {"role":"user", "content":prompt}], "temperature":0.2, "enable_thinking":false})
+    let openai = config.provider == "openai";
+    let mut payload = if openai {
+        json!({"model":config.model, "messages":[{"role":"system", "content":system}, {"role":"user", "content":prompt}], "temperature":0.2})
     } else {
-        json!({"model":config.model, "max_tokens":4096, "system":system, "messages":[{"role":"user", "content":prompt}], "thinking":{"type":"disabled"}})
+        json!({"model":config.model, "max_tokens":4096, "system":system, "messages":[{"role":"user", "content":prompt}]})
     };
+    if config.reasoning == "off" {
+        if openai {
+            payload["enable_thinking"] = false.into();
+        } else {
+            payload["thinking"] = json!({"type":"disabled"});
+        }
+    }
     if let Some(mode) = structured
-        && config.provider == "openai"
+        && openai
     {
         payload["max_tokens"] = 4096.into();
         payload["response_format"] =
             json!({"type":"json_schema", "json_schema":schema(mode)});
     }
-    match post(config, &payload, timeout) {
-        Err(error)
-            if error.rejected_thinking && config.provider == "openai" =>
-        {
-            payload.as_object_mut().unwrap().remove("enable_thinking");
-            post(config, &payload, timeout)
+    merge(&mut payload, &config.extra_body);
+    loop {
+        let result = post(config, &payload, timeout);
+        let retry = match &result {
+            Err(error) if openai => error.rejected.is_some_and(|param| {
+                config.extra_body.get(param).is_none()
+                    && drop_rejected(&mut payload, param)
+            }),
+            _ => false,
+        };
+        if !retry {
+            return result;
         }
-        result => result,
     }
 }
 
+fn merge(target: &mut Value, source: &Value) {
+    if let (Value::Object(target), Value::Object(source)) = (target, source) {
+        for (key, value) in source {
+            match target.get_mut(key) {
+                Some(slot) if slot.is_object() && value.is_object() => {
+                    merge(slot, value);
+                }
+                _ => {
+                    target.insert(key.clone(), value.clone());
+                }
+            }
+        }
+    }
+}
+
+fn drop_rejected(payload: &mut Value, param: &str) -> bool {
+    let payload = payload.as_object_mut().unwrap();
+    let Some(value) = payload.shift_remove(param) else {
+        return false;
+    };
+    if param == "max_tokens" {
+        payload.insert("max_completion_tokens".into(), value);
+    }
+    true
+}
+
 fn content(
     config: &AiConfig,
     response: &Value,
@@ -97,8 +136,8 @@ fn content(
     } else {
         response
             .get("content")
-            .and_then(|v| v.get(0))
-            .and_then(|v| v.get("text"))
+            .and_then(Value::as_array)
+            .and_then(|blocks| blocks.iter().find_map(|v| v.get("text")))
     };
     let content = content.ok_or_else(|| {
         error(format!("{provider} API response missing content"), false)
@@ -277,17 +316,22 @@ fn post(
                     .as_str()
                     .unwrap_or("")
                     .to_lowercase();
-                failure.rejected_thinking = param == "enable_thinking"
-                    || (message.contains("enable_thinking")
-                        && [
-                            "unrecognized request argument",
-                            "unknown parameter",
-                            "unsupported parameter",
-                            "unexpected keyword argument",
-                            "extra inputs are not permitted",
-                        ]
-                        .iter()
-                        .any(|s| message.contains(s)));
+                failure.rejected =
+                    ["enable_thinking", "temperature", "max_tokens"]
+                        .into_iter()
+                        .find(|name| {
+                            param == *name
+                                || (message.contains(name)
+                                    && [
+                                        "unrecognized request argument",
+                                        "unknown parameter",
+                                        "unsupported parameter",
+                                        "unexpected keyword argument",
+                                        "extra inputs are not permitted",
+                                    ]
+                                    .iter()
+                                    .any(|s| message.contains(s)))
+                        });
             }
             return Err(failure);
         }

{agent_dump-1.2.3 → agent_dump-1.2.4}/src/workflows/config.rs

@@ -343,6 +343,9 @@ fn prompt(
             base_url: values[0].trim().into(),
             model: values[1].trim().into(),
             api_key: values[2].trim().into(),
+            reasoning: existing.map_or("off", |ai| &ai.reasoning).into(),
+            extra_body: existing
+                .map_or(serde_json::Value::Null, |ai| ai.extra_body.clone()),
         });
     let output = values[3].trim().to_owned();
     writeln!(out, "{}", t("CONFIG_CONFIRM_TITLE", zh, &[]))?;