1 Commits

Author SHA1 Message Date
dependabot[bot]
e7582abc39 chore(deps): bump lru from 0.12.5 to 0.16.2 in /llmx-rs
Bumps [lru](https://github.com/jeromefroe/lru-rs) from 0.12.5 to 0.16.2.
- [Changelog](https://github.com/jeromefroe/lru-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jeromefroe/lru-rs/compare/0.12.5...0.16.2)

---
updated-dependencies:
- dependency-name: lru
  dependency-version: 0.16.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-14 18:56:21 +00:00
14 changed files with 97 additions and 152 deletions

120
llmx-rs/Cargo.lock generated
View File

@@ -178,7 +178,7 @@ checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
[[package]] [[package]]
name = "app_test_support" name = "app_test_support"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"assert_cmd", "assert_cmd",
@@ -945,7 +945,7 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]] [[package]]
name = "core_test_support" name = "core_test_support"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"assert_cmd", "assert_cmd",
@@ -1192,7 +1192,7 @@ dependencies = [
[[package]] [[package]]
name = "deadpool-runtime" name = "deadpool-runtime"
version = "0.1.5" version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b"
@@ -1756,6 +1756,12 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
[[package]]
name = "foldhash"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
[[package]] [[package]]
name = "foreign-types" name = "foreign-types"
version = "0.3.2" version = "0.3.2"
@@ -2028,7 +2034,7 @@ checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
dependencies = [ dependencies = [
"allocator-api2", "allocator-api2",
"equivalent", "equivalent",
"foldhash", "foldhash 0.1.5",
] ]
[[package]] [[package]]
@@ -2036,6 +2042,11 @@ name = "hashbrown"
version = "0.16.0" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
dependencies = [
"allocator-api2",
"equivalent",
"foldhash 0.2.0",
]
[[package]] [[package]]
name = "heck" name = "heck"
@@ -2501,7 +2512,7 @@ dependencies = [
[[package]] [[package]]
name = "inout" name = "inout"
version = "0.1.5" version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
dependencies = [ dependencies = [
@@ -2822,7 +2833,7 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
[[package]] [[package]]
name = "llmx-ansi-escape" name = "llmx-ansi-escape"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"ansi-to-tui", "ansi-to-tui",
"ratatui", "ratatui",
@@ -2831,7 +2842,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-app-server" name = "llmx-app-server"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"app_test_support", "app_test_support",
@@ -2866,7 +2877,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-app-server-protocol" name = "llmx-app-server-protocol"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@@ -2884,7 +2895,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-apply-patch" name = "llmx-apply-patch"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"assert_cmd", "assert_cmd",
@@ -2899,7 +2910,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-arg0" name = "llmx-arg0"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"dotenvy", "dotenvy",
@@ -2912,7 +2923,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-async-utils" name = "llmx-async-utils"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"pretty_assertions", "pretty_assertions",
@@ -2936,7 +2947,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-backend-openapi-models" name = "llmx-backend-openapi-models"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
@@ -2945,7 +2956,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-chatgpt" name = "llmx-chatgpt"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@@ -2960,7 +2971,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-cli" name = "llmx-cli"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"assert_cmd", "assert_cmd",
@@ -3000,7 +3011,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-cloud-tasks" name = "llmx-cloud-tasks"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@@ -3026,7 +3037,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-cloud-tasks-client" name = "llmx-cloud-tasks-client"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@@ -3041,7 +3052,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-common" name = "llmx-common"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"clap", "clap",
"llmx-app-server-protocol", "llmx-app-server-protocol",
@@ -3053,7 +3064,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-core" name = "llmx-core"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"askama", "askama",
@@ -3134,7 +3145,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-exec" name = "llmx-exec"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"assert_cmd", "assert_cmd",
@@ -3167,7 +3178,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-execpolicy" name = "llmx-execpolicy"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"allocative", "allocative",
"anyhow", "anyhow",
@@ -3187,7 +3198,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-feedback" name = "llmx-feedback"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"llmx-protocol", "llmx-protocol",
@@ -3198,7 +3209,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-file-search" name = "llmx-file-search"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@@ -3211,7 +3222,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-git" name = "llmx-git"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"assert_matches", "assert_matches",
"once_cell", "once_cell",
@@ -3227,7 +3238,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-keyring-store" name = "llmx-keyring-store"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"keyring", "keyring",
"tracing", "tracing",
@@ -3235,7 +3246,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-linux-sandbox" name = "llmx-linux-sandbox"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"clap", "clap",
"landlock", "landlock",
@@ -3248,7 +3259,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-login" name = "llmx-login"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",
@@ -3272,7 +3283,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-mcp-server" name = "llmx-mcp-server"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"assert_cmd", "assert_cmd",
@@ -3299,7 +3310,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-ollama" name = "llmx-ollama"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"assert_matches", "assert_matches",
"async-stream", "async-stream",
@@ -3315,7 +3326,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-otel" name = "llmx-otel"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"chrono", "chrono",
"eventsource-stream", "eventsource-stream",
@@ -3336,14 +3347,14 @@ dependencies = [
[[package]] [[package]]
name = "llmx-process-hardening" name = "llmx-process-hardening"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"libc", "libc",
] ]
[[package]] [[package]]
name = "llmx-protocol" name = "llmx-protocol"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",
@@ -3369,7 +3380,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-responses-api-proxy" name = "llmx-responses-api-proxy"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@@ -3385,7 +3396,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-rmcp-client" name = "llmx-rmcp-client"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"axum", "axum",
@@ -3414,7 +3425,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-stdio-to-uds" name = "llmx-stdio-to-uds"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"assert_cmd", "assert_cmd",
@@ -3425,7 +3436,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-tui" name = "llmx-tui"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"arboard", "arboard",
@@ -3490,16 +3501,16 @@ dependencies = [
[[package]] [[package]]
name = "llmx-utils-cache" name = "llmx-utils-cache"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"lru", "lru 0.16.2",
"sha1", "sha1",
"tokio", "tokio",
] ]
[[package]] [[package]]
name = "llmx-utils-image" name = "llmx-utils-image"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"base64", "base64",
"image", "image",
@@ -3511,7 +3522,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-utils-json-to-toml" name = "llmx-utils-json-to-toml"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"pretty_assertions", "pretty_assertions",
"serde_json", "serde_json",
@@ -3520,7 +3531,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-utils-pty" name = "llmx-utils-pty"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"portable-pty", "portable-pty",
@@ -3529,7 +3540,7 @@ dependencies = [
[[package]] [[package]]
name = "llmx-utils-readiness" name = "llmx-utils-readiness"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"assert_matches", "assert_matches",
"async-trait", "async-trait",
@@ -3540,11 +3551,11 @@ dependencies = [
[[package]] [[package]]
name = "llmx-utils-string" name = "llmx-utils-string"
version = "0.1.5" version = "0.1.4"
[[package]] [[package]]
name = "llmx-utils-tokenizer" name = "llmx-utils-tokenizer"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"pretty_assertions", "pretty_assertions",
@@ -3613,6 +3624,15 @@ dependencies = [
"hashbrown 0.15.4", "hashbrown 0.15.4",
] ]
[[package]]
name = "lru"
version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96051b46fc183dc9cd4a223960ef37b9af631b55191852a8274bfef064cda20f"
dependencies = [
"hashbrown 0.16.0",
]
[[package]] [[package]]
name = "lru-slab" name = "lru-slab"
version = "0.1.2" version = "0.1.2"
@@ -3655,7 +3675,7 @@ checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
[[package]] [[package]]
name = "mcp-types" name = "mcp-types"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"schemars 0.8.22", "schemars 0.8.22",
"serde", "serde",
@@ -3665,7 +3685,7 @@ dependencies = [
[[package]] [[package]]
name = "mcp_test_support" name = "mcp_test_support"
version = "0.1.5" version = "0.1.4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"assert_cmd", "assert_cmd",
@@ -3942,7 +3962,7 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
[[package]] [[package]]
name = "num-integer" name = "num-integer"
version = "0.1.56" version = "0.1.46"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
dependencies = [ dependencies = [
@@ -3951,7 +3971,7 @@ dependencies = [
[[package]] [[package]]
name = "num-iter" name = "num-iter"
version = "0.1.55" version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
dependencies = [ dependencies = [
@@ -4520,7 +4540,7 @@ dependencies = [
[[package]] [[package]]
name = "potential_utf" name = "potential_utf"
version = "0.1.5" version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
dependencies = [ dependencies = [
@@ -4848,7 +4868,7 @@ dependencies = [
"indoc", "indoc",
"instability", "instability",
"itertools 0.13.0", "itertools 0.13.0",
"lru", "lru 0.12.5",
"paste", "paste",
"strum 0.26.3", "strum 0.26.3",
"unicode-segmentation", "unicode-segmentation",
@@ -6580,7 +6600,7 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
[[package]] [[package]]
name = "tracing" name = "tracing"
version = "0.1.51" version = "0.1.41"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
dependencies = [ dependencies = [

View File

@@ -43,7 +43,7 @@ members = [
resolver = "2" resolver = "2"
[workspace.package] [workspace.package]
version = "0.1.5" version = "0.1.4"
# Track the edition for all workspace crates in one place. Individual # Track the edition for all workspace crates in one place. Individual
# crates can still override this value, but keeping it here means new # crates can still override this value, but keeping it here means new
# crates created with `cargo new -w ...` automatically inherit the 2024 # crates created with `cargo new -w ...` automatically inherit the 2024
@@ -135,7 +135,7 @@ landlock = "0.4.1"
lazy_static = "1" lazy_static = "1"
libc = "0.2.175" libc = "0.2.175"
log = "0.4" log = "0.4"
lru = "0.12.5" lru = "0.16.2"
maplit = "1.0.2" maplit = "1.0.2"
mime_guess = "2.0.5" mime_guess = "2.0.5"
multimap = "0.10.0" multimap = "0.10.0"
@@ -191,7 +191,7 @@ tokio-util = "0.7.16"
toml = "0.9.5" toml = "0.9.5"
toml_edit = "0.23.4" toml_edit = "0.23.4"
tonic = "0.13.1" tonic = "0.13.1"
tracing = "0.1.51" tracing = "0.1.41"
tracing-appender = "0.2.3" tracing-appender = "0.2.3"
tracing-subscriber = "0.3.20" tracing-subscriber = "0.3.20"
tracing-test = "0.2.5" tracing-test = "0.2.5"

View File

@@ -138,7 +138,7 @@ impl McpProcess {
client_info: ClientInfo { client_info: ClientInfo {
name: "llmx-app-server-tests".to_string(), name: "llmx-app-server-tests".to_string(),
title: None, title: None,
version: "0.1.5".to_string(), version: "0.1.4".to_string(),
}, },
})?); })?);
let req_id = self.send_request("initialize", params).await?; let req_id = self.send_request("initialize", params).await?;

View File

@@ -26,7 +26,7 @@ async fn get_user_agent_returns_current_llmx_user_agent() -> Result<()> {
let os_info = os_info::get(); let os_info = os_info::get();
let user_agent = format!( let user_agent = format!(
"llmx_cli_rs/0.1.5 ({} {}; {}) {} (llmx-app-server-tests; 0.1.5)", "llmx_cli_rs/0.1.4 ({} {}; {}) {} (llmx-app-server-tests; 0.1.4)",
os_info.os_type(), os_info.os_type(),
os_info.version(), os_info.version(),
os_info.architecture().unwrap_or("unknown"), os_info.architecture().unwrap_or("unknown"),

View File

@@ -161,65 +161,10 @@ pub(crate) async fn stream_chat_completions(
// aggregated assistant message was recorded alongside an earlier partial). // aggregated assistant message was recorded alongside an earlier partial).
let mut last_assistant_text: Option<String> = None; let mut last_assistant_text: Option<String> = None;
// Build a map of which call_ids have outputs // Track call_ids of skipped function calls so we can also skip their outputs
// We'll use this to ensure we never send a FunctionCall without its corresponding output let mut skipped_call_ids: std::collections::HashSet<String> = std::collections::HashSet::new();
let mut call_ids_with_outputs: std::collections::HashSet<String> = std::collections::HashSet::new();
// First pass: collect all call_ids that have outputs
for item in input.iter() {
if let ResponseItem::FunctionCallOutput { call_id, .. } = item {
call_ids_with_outputs.insert(call_id.clone());
}
}
debug!("=== Chat Completions Request Debug ===");
debug!("Input items count: {}", input.len());
debug!("Call IDs with outputs: {:?}", call_ids_with_outputs);
// Second pass: find the first FunctionCall that doesn't have an output
let mut cutoff_at_idx: Option<usize> = None;
for (idx, item) in input.iter().enumerate() {
if let ResponseItem::FunctionCall { call_id, name, .. } = item {
if !call_ids_with_outputs.contains(call_id) {
debug!("Found unanswered function call '{}' (call_id: {}) at index {}", name, call_id, idx);
cutoff_at_idx = Some(idx);
break;
}
}
}
if let Some(cutoff) = cutoff_at_idx {
debug!("Cutting off at index {} to avoid orphaned tool calls", cutoff);
} else {
debug!("No unanswered function calls found, processing all items");
}
// Track whether the MOST RECENT FunctionCall with each call_id was skipped
// This allows the same call_id to be retried - we only skip outputs for the specific skipped calls
let mut call_id_skip_state: std::collections::HashMap<String, bool> = std::collections::HashMap::new();
for (idx, item) in input.iter().enumerate() { for (idx, item) in input.iter().enumerate() {
// Stop processing if we've reached an unanswered function call
if let Some(cutoff) = cutoff_at_idx {
if idx >= cutoff {
debug!("Stopping at index {} due to unanswered function call", idx);
break;
}
}
debug!("Processing item {} of type: {}", idx, match item {
ResponseItem::Message { role, .. } => format!("Message(role={})", role),
ResponseItem::FunctionCall { name, call_id, .. } => format!("FunctionCall(name={}, call_id={})", name, call_id),
ResponseItem::FunctionCallOutput { call_id, .. } => format!("FunctionCallOutput(call_id={})", call_id),
ResponseItem::LocalShellCall { .. } => "LocalShellCall".to_string(),
ResponseItem::CustomToolCall { .. } => "CustomToolCall".to_string(),
ResponseItem::CustomToolCallOutput { .. } => "CustomToolCallOutput".to_string(),
ResponseItem::Reasoning { .. } => "Reasoning".to_string(),
ResponseItem::WebSearchCall { .. } => "WebSearchCall".to_string(),
ResponseItem::GhostSnapshot { .. } => "GhostSnapshot".to_string(),
ResponseItem::Other => "Other".to_string(),
});
match item { match item {
ResponseItem::Message { role, content, .. } => { ResponseItem::Message { role, content, .. } => {
// Build content either as a plain string (typical for assistant text) // Build content either as a plain string (typical for assistant text)
@@ -289,14 +234,11 @@ pub(crate) async fn stream_chat_completions(
// If invalid, skip this function call to avoid API errors // If invalid, skip this function call to avoid API errors
if serde_json::from_str::<serde_json::Value>(arguments).is_err() { if serde_json::from_str::<serde_json::Value>(arguments).is_err() {
debug!("Skipping malformed function call with invalid JSON arguments: {}", arguments); debug!("Skipping malformed function call with invalid JSON arguments: {}", arguments);
// Mark this call_id's most recent state as skipped // Track this call_id so we can also skip its corresponding output
call_id_skip_state.insert(call_id.clone(), true); skipped_call_ids.insert(call_id.clone());
continue; continue;
} }
// Mark this call_id's most recent state as NOT skipped (valid call)
call_id_skip_state.insert(call_id.clone(), false);
let mut msg = json!({ let mut msg = json!({
"role": "assistant", "role": "assistant",
"content": null, "content": null,
@@ -341,9 +283,9 @@ pub(crate) async fn stream_chat_completions(
messages.push(msg); messages.push(msg);
} }
ResponseItem::FunctionCallOutput { call_id, output } => { ResponseItem::FunctionCallOutput { call_id, output } => {
// Skip outputs only if the MOST RECENT FunctionCall with this call_id was skipped // Skip outputs for function calls that were skipped due to malformed arguments
if call_id_skip_state.get(call_id) == Some(&true) { if skipped_call_ids.contains(call_id) {
debug!("Skipping function call output for most recent skipped call_id: {}", call_id); debug!("Skipping function call output for skipped call_id: {}", call_id);
continue; continue;
} }
@@ -412,23 +354,14 @@ pub(crate) async fn stream_chat_completions(
} }
} }
debug!("Built {} messages for API request", messages.len());
debug!("=== End Chat Completions Request Debug ===");
let tools_json = create_tools_json_for_chat_completions_api(&prompt.tools)?; let tools_json = create_tools_json_for_chat_completions_api(&prompt.tools)?;
let mut payload = json!({ let payload = json!({
"model": model_family.slug, "model": model_family.slug,
"messages": messages, "messages": messages,
"stream": true, "stream": true,
"tools": tools_json, "tools": tools_json,
}); });
// Add max_tokens - required by Anthropic Messages API
// Use a sensible default of 8192 if not configured
if let Some(obj) = payload.as_object_mut() {
obj.insert("max_tokens".to_string(), json!(8192));
}
debug!( debug!(
"POST to {}: {}", "POST to {}: {}",
provider.get_full_url(&None), provider.get_full_url(&None),

View File

@@ -693,7 +693,7 @@ pub(crate) fn create_tools_json_for_chat_completions_api(
// We start with the JSON for the Responses API and than rewrite it to match // We start with the JSON for the Responses API and than rewrite it to match
// the chat completions tool call format. // the chat completions tool call format.
let responses_api_tools_json = create_tools_json_for_responses_api(tools)?; let responses_api_tools_json = create_tools_json_for_responses_api(tools)?;
let mut tools_json = responses_api_tools_json let tools_json = responses_api_tools_json
.into_iter() .into_iter()
.filter_map(|mut tool| { .filter_map(|mut tool| {
if tool.get("type") != Some(&serde_json::Value::String("function".to_string())) { if tool.get("type") != Some(&serde_json::Value::String("function".to_string())) {
@@ -712,14 +712,6 @@ pub(crate) fn create_tools_json_for_chat_completions_api(
} }
}) })
.collect::<Vec<serde_json::Value>>(); .collect::<Vec<serde_json::Value>>();
// Add cache_control to the last tool to enable Anthropic prompt caching
if let Some(last_tool) = tools_json.last_mut() {
if let Some(obj) = last_tool.as_object_mut() {
obj.insert("cache_control".to_string(), json!({"type": "ephemeral"}));
}
}
Ok(tools_json) Ok(tools_json)
} }

View File

@@ -144,7 +144,7 @@ impl McpProcess {
let initialized = self.read_jsonrpc_message().await?; let initialized = self.read_jsonrpc_message().await?;
let os_info = os_info::get(); let os_info = os_info::get();
let user_agent = format!( let user_agent = format!(
"llmx_cli_rs/0.1.5 ({} {}; {}) {} (elicitation test; 0.0.0)", "llmx_cli_rs/0.1.4 ({} {}; {}) {} (elicitation test; 0.0.0)",
os_info.os_type(), os_info.os_type(),
os_info.version(), os_info.version(),
os_info.architecture().unwrap_or("unknown"), os_info.architecture().unwrap_or("unknown"),
@@ -163,7 +163,7 @@ impl McpProcess {
"serverInfo": { "serverInfo": {
"name": "llmx-mcp-server", "name": "llmx-mcp-server",
"title": "LLMX", "title": "LLMX",
"version": "0.1.5", "version": "0.1.4",
"user_agent": user_agent "user_agent": user_agent
}, },
"protocolVersion": mcp_types::MCP_SCHEMA_VERSION "protocolVersion": mcp_types::MCP_SCHEMA_VERSION

View File

@@ -5,7 +5,7 @@ expression: sanitized
/status /status
╭───────────────────────────────────────────────────────────────────────────╮ ╭───────────────────────────────────────────────────────────────────────────╮
│ >_ LLMX (v0.1.5) │ │ >_ LLMX (v0.1.4) │
│ │ │ │
│ Visit https://chatgpt.com/llmx/settings/usage for up-to-date │ │ Visit https://chatgpt.com/llmx/settings/usage for up-to-date │
│ information on rate limits and credits │ │ information on rate limits and credits │

View File

@@ -5,7 +5,7 @@ expression: sanitized
/status /status
╭─────────────────────────────────────────────────────────────────╮ ╭─────────────────────────────────────────────────────────────────╮
│ >_ LLMX (v0.1.5) │ │ >_ LLMX (v0.1.4) │
│ │ │ │
│ Visit https://chatgpt.com/llmx/settings/usage for up-to-date │ │ Visit https://chatgpt.com/llmx/settings/usage for up-to-date │
│ information on rate limits and credits │ │ information on rate limits and credits │

View File

@@ -5,7 +5,7 @@ expression: sanitized
/status /status
╭──────────────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────────────╮
│ >_ LLMX (v0.1.5) │ │ >_ LLMX (v0.1.4) │
│ │ │ │
│ Visit https://chatgpt.com/llmx/settings/usage for up-to-date │ │ Visit https://chatgpt.com/llmx/settings/usage for up-to-date │
│ information on rate limits and credits │ │ information on rate limits and credits │

View File

@@ -5,7 +5,7 @@ expression: sanitized
/status /status
╭──────────────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────────────╮
│ >_ LLMX (v0.1.5) │ │ >_ LLMX (v0.1.4) │
│ │ │ │
│ Visit https://chatgpt.com/llmx/settings/usage for up-to-date │ │ Visit https://chatgpt.com/llmx/settings/usage for up-to-date │
│ information on rate limits and credits │ │ information on rate limits and credits │

View File

@@ -5,7 +5,7 @@ expression: sanitized
/status /status
╭───────────────────────────────────────────────────────────────────╮ ╭───────────────────────────────────────────────────────────────────╮
│ >_ LLMX (v0.1.5) │ │ >_ LLMX (v0.1.4) │
│ │ │ │
│ Visit https://chatgpt.com/llmx/settings/usage for up-to-date │ │ Visit https://chatgpt.com/llmx/settings/usage for up-to-date │
│ information on rate limits and credits │ │ information on rate limits and credits │

View File

@@ -5,7 +5,7 @@ expression: sanitized
/status /status
╭────────────────────────────────────────────╮ ╭────────────────────────────────────────────╮
│ >_ LLMX (v0.1.5) │ │ >_ LLMX (v0.1.4) │
│ │ │ │
│ Visit https://chatgpt.com/llmx/settings/ │ │ Visit https://chatgpt.com/llmx/settings/ │
│ usage for up-to-date │ │ usage for up-to-date │

File diff suppressed because one or more lines are too long