diff --git a/.github/workflows/agent_engine_build.yml b/.github/workflows/agent_engine_build.yml index 601c00bfab..7e9951ddca 100644 --- a/.github/workflows/agent_engine_build.yml +++ b/.github/workflows/agent_engine_build.yml @@ -99,6 +99,17 @@ jobs: if: startsWith(matrix.os, 'macos') run: brew install llvm + - name: Add swap space (Linux cross-compilation needs extra RAM for LTO) + if: matrix.cross + run: | + sudo swapoff /swapfile 2>/dev/null || true + sudo rm -f /swapfile + sudo dd if=/dev/zero of=/swapfile bs=128M count=64 + sudo chmod 600 /swapfile + sudo mkswap /swapfile + sudo swapon /swapfile + free -h + - name: setup cross-rs if: matrix.cross run: | @@ -134,6 +145,9 @@ jobs: - name: build linux-like artifacts if: matrix.cross + env: + # Limit parallel codegen/link jobs to reduce peak RAM (LTO + whisper-rs is very memory-hungry) + CARGO_BUILD_JOBS: 2 run: | CROSS_NO_WARNINGS=0 cross test --release --target ${{ matrix.target }} || exit 1 CROSS_NO_WARNINGS=0 cross build --release --target ${{ matrix.target }} || exit 1 diff --git a/.github/workflows/agent_engine_release.yml b/.github/workflows/agent_engine_release.yml index 528271e720..4a5b29abd9 100644 --- a/.github/workflows/agent_engine_release.yml +++ b/.github/workflows/agent_engine_release.yml @@ -86,6 +86,17 @@ jobs: if: startsWith(matrix.os, 'macos') run: brew install llvm + - name: Add swap space (Linux cross-compilation needs extra RAM for LTO) + if: matrix.cross + run: | + sudo swapoff /swapfile 2>/dev/null || true + sudo rm -f /swapfile + sudo dd if=/dev/zero of=/swapfile bs=128M count=64 + sudo chmod 600 /swapfile + sudo mkswap /swapfile + sudo swapon /swapfile + free -h + - name: setup cross-rs if: matrix.cross run: | @@ -121,6 +132,9 @@ jobs: - name: build linux-like artifacts if: matrix.cross + env: + # Limit parallel codegen/link jobs to reduce peak RAM (LTO + whisper-rs is very memory-hungry) + CARGO_BUILD_JOBS: 2 run: | CROSS_NO_WARNINGS=0 cross test --release --target ${{ matrix.target }} || exit 1 CROSS_NO_WARNINGS=0 cross build --release --target ${{ matrix.target }} || exit 1 diff --git a/.github/workflows/agent_gui_build.yml b/.github/workflows/agent_gui_build.yml index a055644ed3..18a1ce27aa 100644 --- a/.github/workflows/agent_gui_build.yml +++ b/.github/workflows/agent_gui_build.yml @@ -16,6 +16,9 @@ defaults: run: working-directory: refact-agent/gui +env: + NODE_OPTIONS: --max-old-space-size=8192 + jobs: build: runs-on: ubuntu-latest diff --git a/AGENTS.md b/AGENTS.md new file mode 100644 index 0000000000..83c6b21f68 --- /dev/null +++ b/AGENTS.md @@ -0,0 +1,146 @@ +# Refact Monorepo + +AI coding assistant: Rust engine (LSP/HTTP server) + React chat UI + IDE plugins (VSCode, JetBrains) + cloud backend. + +## Repository Map + +| Subproject | Path | Language | AGENTS.md | +|---|---|---|---| +| Agent Engine | `refact-agent/engine/` | Rust 2021, async/tokio | ✅ `refact-agent/engine/AGENTS.md` | +| Agent GUI | `refact-agent/gui/` | TypeScript/React 18 | ✅ `refact-agent/gui/AGENTS.md` | +| VSCode Extension | `extra/refact-vscode/` | TypeScript | — | +| JetBrains Plugin | `extra/refact-intellij/` | Kotlin, Gradle | — | +| Cloud Backend | `extra/web_v1_backend/` | Python 3.10, FastAPI | — | +| Documentation | `docs/` | Astro (static site) | — | + +Sub-project `AGENTS.md` files contain detailed architecture, patterns, and checklists. Read them before working in those directories. + +## Verification Commands + +**Always verify your changes compile and pass tests before finishing.** Both engine and GUI builds are heavy — plan accordingly. + +### Engine (`refact-agent/engine/`) + +```bash +cd refact-agent/engine + +# Fast check — type/borrow errors only (~1-3 min, no codegen) +cargo check + +# Unit + doc tests (~3-8 min first build, ~1-3 min incremental) +cargo test --lib && cargo test --doc + +# Full release build (~10-20 min cold, ~2-5 min incremental) +# LTO + opt-level=z + strip — very slow from scratch +cargo build --release +``` + +⚠️ **First build compiles ~85 crates + 7 tree-sitter parsers + SQLite. Expect 10-20 minutes cold.** Incremental builds are much faster. CI runs `cargo test --release` on 7 platform targets. + +Python integration tests (`tests/*.py`) require a running `refact-lsp` instance — don't run them as a quick check. + +### GUI (`refact-agent/gui/`) + +```bash +cd refact-agent/gui + +# All CI checks (~1-3 min total) +npm run test # vitest (unit, excludes integration) +npm run format:check # prettier — no code changes +npm run types # tsc --noEmit +npm run lint # eslint, 0 warnings allowed + +# Full build (~30-60s) +npm run build +``` + +⚠️ **ESLint is strict-type-checked with `--max-warnings 0`.** Any new warning fails CI. Run `npm run lint` before committing TypeScript changes. + +### Minimum pre-commit checks + +If you changed **only engine Rust code**: `cd refact-agent/engine && cargo check && cargo test --lib` +If you changed **only GUI TypeScript**: `cd refact-agent/gui && npm run types && npm run lint && npm run test` +If you changed **both**: run both sets. + +## CI Quality Gates (GitHub Actions) + +| Workflow | Trigger paths | Checks | +|---|---|---| +| `agent_engine_build` | `refact-agent/engine/**` | `cargo test --release` on 7 targets (Win/Linux/macOS × x86_64/aarch64) | +| `agent_gui_build` | `refact-agent/gui/**` | `npm test` → `format:check` → `types` → `lint` → `build` (Node LTS + latest) | +| `server_build` | `refact-server/**` | Docker multi-arch build | +| `docs_build` | `docs/**` | Docker build + push | + +## Architecture Overview + +``` +┌─────────────────┐ postMessage ┌──────────────────┐ +│ IDE Plugins │◄────────────────────►│ Agent GUI │ +│ (VSCode/JB) │ │ (React webview)│ +└────────┬────────┘ └────────┬─────────┘ + │ LSP (stdin/stdout) │ HTTP + SSE + │ or HTTP │ + └──────────────┬─────────────────────────┘ + ▼ + ┌─────────────────────┐ + │ Agent Engine │ + │ (refact-lsp) │ + │ HTTP :8001 + LSP │ + └──────┬──────────────┘ + │ + ┌───────────┼───────────────┐ + ▼ ▼ ▼ + LLM APIs Local indexes Integrations + (15+ providers) (AST, VecDB) (GitHub, MCP, shell, etc.) +``` + +- **Engine ↔ GUI**: HTTP REST + SSE streaming (`/v1/chats/subscribe`). GUI sends commands via `POST /v1/chats/{id}/commands`, receives state via SSE events with monotonic `seq` numbers. +- **Engine ↔ IDE**: LSP protocol (tower-lsp) for completions/code-lens, plus HTTP for chat and tools. +- **IDE ↔ GUI**: `postMessage` bridge (VSCode `acquireVsCodeApi`, JetBrains `postIntellijMessage`). Events: file context, theme, tool calls. + +## Cross-Project Conventions + +### Rust (Engine) + +- **Formatting**: `rustfmt.toml` — 100 char lines, 4-space indent, Unix newlines, `reorder_imports = false`. +- **Async discipline**: All shared state through `GlobalContext` (`Arc>`). Drop read guards before `.await`. Never hold `gcx.read()` across await points. +- **Shutdown**: Check `shutdown_flag.load(Ordering::Relaxed)` in loops. Use `select!` with shutdown arm for channel receivers. Never `loop { sleep }` without a shutdown check. Store `JoinHandle` for spawned tasks — no fire-and-forget `tokio::spawn`. +- **Lock ordering**: Always acquire `gcx` ARwLock before inner mutexes. Reversing order risks deadlocks in background threads. +- **Error handling**: `Result<>` with contextual errors. `.ok_or_else()` over `.unwrap()` for runtime data. + +### TypeScript/React (GUI) + +- **Linting**: ESLint strict-type-checked, 0 warnings. Prettier enforced in CI. +- **State**: Redux Toolkit + RTK Query. Always use selectors from `features/Chat/Thread/selectors.ts`. Never access `state.chat.threads[id]` directly. +- **Styling**: Radix UI primitives + CSS Modules + design tokens. No inline styles, no hardcoded colors, no magic numbers. +- **File naming**: `PascalCase.tsx` (components), `useCamelCase.ts` (hooks), `camelCase.ts` (utils), `PascalCase.module.css`. +- **No `any` types.** + +### Kotlin (JetBrains Plugin) + +- Java 17 target. Gradle build with IntelliJ Platform Plugin. Communicates with engine via HTTP + JCEF webview for chat. + +### Python (Backend) + +- Python 3.10+. FastAPI + Uvicorn. Type hints expected. + +## Project Config Locations + +| Scope | Path | Contents | +|---|---|---| +| User config | `~/.config/refact/` | `default_privacy.yaml`, `providers.d/*.yaml` | +| Cache | `~/.cache/refact/` | Shadow repos, logs, telemetry, integrations | +| Project | `.refact/` | `trajectories/`, `knowledge/`, `tasks/`, `integrations.d/` | +| System prompts | `refact-agent/engine/yaml_configs/defaults/` | Modes, subagents, toolbox commands | + +### AGENTS.md Scoping Rules + +AGENTS.md files can appear at any directory level. Scope = entire directory tree rooted at that folder. More-deeply-nested files take precedence on conflicts. Direct user instructions override all AGENTS.md content. + +## Common Pitfalls + +- **Shutdown hangs**: `loop {}` without `shutdown_flag`, bare `.recv().await`/`.changed().await` without `select!` + timeout, `tokio::spawn` without stored handle. +- **Lock inversion**: `gcx.read().await` → inner mutex is safe order. Reversing (inner mutex → gcx) causes deadlocks under load. +- **SSE sequence gaps**: Every event has monotonic `seq`. Gap → client reconnects for fresh snapshot. Never skip or reorder events. +- **Thinking block signatures**: Anthropic thinking blocks with cryptographic signatures must be preserved byte-for-byte. No JSON rebuilding, no field reordering. +- **GUI state**: Chat/history state is ephemeral (not persisted). Only `tour` and `userSurvey` survive Redux persist. diff --git a/refact-agent/engine/Cargo.toml b/refact-agent/engine/Cargo.toml index 67caf831f9..d9ed8366bc 100644 --- a/refact-agent/engine/Cargo.toml +++ b/refact-agent/engine/Cargo.toml @@ -6,7 +6,7 @@ lto = true [package] name = "refact-lsp" -version = "7.0.2" +version = "7.1.0" edition = "2021" build = "build.rs" @@ -60,8 +60,7 @@ process-wrap = { version = "8.0.2", features = ["tokio1"] } rand = "0.8.5" rayon = "1.8.0" regex = "1.9.5" -reqwest = { version = "0.12", default-features = false, features = ["json", "stream", "rustls-tls-webpki-roots", "charset", "http2"] } -reqwest-eventsource = "0.6.0" +reqwest = { version = "0.13", default-features = false, features = ["json", "form", "stream", "rustls", "charset", "http2"] } eventsource-stream = "0.2" resvg = "0.44.0" ropey = "1.6" @@ -112,8 +111,9 @@ petgraph = "0.6" zerocopy = "0.8.14" # There you can use a local copy -# rmcp = { path = "../../../rust-sdk/crates/rmcp/", "features" = ["client", "transport-child-process", "transport-sse"] } -rmcp = { git = "https://github.com/smallcloudai/rust-sdk", branch = "main", features = ["client", "transport-child-process", "transport-sse-client", "reqwest"] } +# rmcp = { path = "../../../rust-sdk/crates/rmcp/", features = ["client", "transport-child-process", "transport-streamable-http-client-reqwest", "auth"] } +rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", branch = "main", features = ["client", "transport-child-process", "transport-streamable-http-client-reqwest", "auth"] } +oauth2 = "5.0" thiserror = "2.0.12" dirs = "5.0" whisper-rs = { version = "0.12", optional = true } diff --git a/refact-agent/engine/src/ast/ast_indexer_thread.rs b/refact-agent/engine/src/ast/ast_indexer_thread.rs index 2121101337..51371c8ec7 100644 --- a/refact-agent/engine/src/ast/ast_indexer_thread.rs +++ b/refact-agent/engine/src/ast/ast_indexer_thread.rs @@ -46,8 +46,16 @@ async fn ast_indexer_thread( ) }; let ast_max_files = ast_index.ast_max_files; // cannot change + let shutdown_flag = match gcx_weak.upgrade() { + Some(gcx) => gcx.read().await.shutdown_flag.clone(), + None => return, + }; loop { + if shutdown_flag.load(std::sync::atomic::Ordering::SeqCst) { + info!("AST indexer: shutdown detected, stopping"); + return; + } let (cpath, left_todo_count) = { let mut ast_service_locked = ast_service.lock().await; let mut cpath; @@ -305,12 +313,17 @@ async fn ast_indexer_thread( reported_connect_stats = true; } - tokio::time::timeout( - tokio::time::Duration::from_secs(10), - ast_sleeping_point.notified(), - ) - .await - .ok(); + tokio::select! { + _ = tokio::time::timeout(tokio::time::Duration::from_secs(10), ast_sleeping_point.notified()) => {} + _ = async { + while !shutdown_flag.load(std::sync::atomic::Ordering::SeqCst) { + tokio::time::sleep(tokio::time::Duration::from_millis(200)).await; + } + } => { + info!("AST indexer: shutdown detected, stopping"); + return; + } + } } } diff --git a/refact-agent/engine/src/call_validation.rs b/refact-agent/engine/src/call_validation.rs index 15d16f0edd..3edc01cc6d 100644 --- a/refact-agent/engine/src/call_validation.rs +++ b/refact-agent/engine/src/call_validation.rs @@ -429,7 +429,6 @@ pub fn canonical_mode_id(mode: &str) -> Result { "EXPLORE" => "explore".to_string(), "AGENT" => "agent".to_string(), "CONFIGURE" | "CONFIGURATOR" => "configurator".to_string(), - "PROJECT_SUMMARY" => "project_summary".to_string(), "PLAN" => "plan".to_string(), "TASK_PLANNER" => "task_planner".to_string(), "TASK_AGENT" => "task_agent".to_string(), diff --git a/refact-agent/engine/src/caps/caps.rs b/refact-agent/engine/src/caps/caps.rs index 7469a47c37..904ab54872 100644 --- a/refact-agent/engine/src/caps/caps.rs +++ b/refact-agent/engine/src/caps/caps.rs @@ -20,8 +20,7 @@ use crate::caps::model_caps::{ModelCapabilities, get_model_caps, resolve_model_c use crate::llm::WireFormat; use crate::providers::traits::AvailableModel; -pub const CAPS_FILENAME: &str = "refact-caps"; -pub const CAPS_FILENAME_FALLBACK: &str = "coding_assistant_caps.json"; +pub const MODEL_CATALOG_PATH: &str = "v1/model-catalog"; #[derive(Debug, Serialize, Clone, Deserialize, Default, PartialEq)] pub struct BaseModelRecord { @@ -152,6 +151,8 @@ impl ChatModelRecord { Some("anthropic_effort".to_string()) } else if self.supports_thinking_budget { Some("anthropic_budget".to_string()) + } else if self.reasoning_effort_options.is_some() { + Some("effort".to_string()) } else { None } @@ -265,7 +266,7 @@ impl Default for CapsMetadata { } } -#[derive(Debug, Serialize, Deserialize, Clone, Default)] +#[derive(Debug, Serialize, Deserialize, Clone)] pub struct CodeAssistantCaps { #[serde(deserialize_with = "normalize_string")] pub cloud_name: String, @@ -304,6 +305,26 @@ pub struct CodeAssistantCaps { pub user_defaults: ProviderDefaults, } +impl Default for CodeAssistantCaps { + fn default() -> Self { + Self { + cloud_name: String::new(), + telemetry_basic_dest: default_telemetry_basic_dest(), + telemetry_basic_retrieve_my_own: default_telemetry_retrieve_my_own(), + completion_models: IndexMap::new(), + chat_models: IndexMap::new(), + embedding_model: EmbeddingModelRecord::default(), + defaults: DefaultModels::default(), + caps_version: 0, + customization: String::new(), + hf_tokenizer_template: default_hf_tokenizer_template(), + metadata: CapsMetadata::default(), + model_caps: Arc::new(std::collections::HashMap::new()), + user_defaults: crate::providers::config::ProviderDefaults::default(), + } + } +} + fn default_telemetry_retrieve_my_own() -> String { "https://www.smallcloud.ai/v1/telemetry-retrieve-my-own-stats".to_string() } @@ -381,19 +402,15 @@ pub async fn load_caps_value_from_url( gcx: Arc>, ) -> Result<(serde_json::Value, String), String> { let caps_urls = if cmdline.address_url.to_lowercase() == "refact" { - vec!["https://inference.smallcloud.ai/coding_assistant_caps.json".to_string()] + vec!["https://inference.smallcloud.ai/v1/model-catalog".to_string()] } else { let base_url = Url::parse(&cmdline.address_url) .map_err(|_| "failed to parse address url".to_string())?; vec![ base_url - .join(&CAPS_FILENAME) - .map_err(|_| "failed to join caps URL".to_string())? - .to_string(), - base_url - .join(&CAPS_FILENAME_FALLBACK) - .map_err(|_| "failed to join fallback caps URL".to_string())? + .join(MODEL_CATALOG_PATH) + .map_err(|_| "failed to join model catalog URL".to_string())? .to_string(), ] }; @@ -401,17 +418,17 @@ pub async fn load_caps_value_from_url( let http_client = gcx.read().await.http_client.clone(); let mut headers = reqwest::header::HeaderMap::new(); + let user_agent = reqwest::header::HeaderValue::from_str(&format!( + "refact-lsp {}", + crate::version::build::PKG_VERSION + )) + .map_err(|e| format!("Invalid user agent format: {}", e))?; + headers.insert(reqwest::header::USER_AGENT, user_agent); + if !cmdline.api_key.is_empty() { let auth_value = reqwest::header::HeaderValue::from_str(&format!("Bearer {}", cmdline.api_key)) .map_err(|e| format!("Invalid API key format: {}", e))?; headers.insert(reqwest::header::AUTHORIZATION, auth_value); - - let user_agent = reqwest::header::HeaderValue::from_str(&format!( - "refact-lsp {}", - crate::version::build::PKG_VERSION - )) - .map_err(|e| format!("Invalid user agent format: {}", e))?; - headers.insert(reqwest::header::USER_AGENT, user_agent); } let mut last_status = 0; @@ -446,7 +463,7 @@ pub async fn load_caps_value_from_url( } } - Err(format!("cannot fetch caps, status={}", last_status)) + Err(format!("cannot fetch model catalog, status={}", last_status)) } /// Build ChatModelRecord from an AvailableModel and provider runtime info @@ -537,7 +554,7 @@ fn build_chat_model_record( } else { ( model.n_ctx, - model.supports_tools, + false, model.supports_multimodality, model.reasoning_effort_options.clone(), model.supports_thinking_budget, @@ -961,17 +978,6 @@ pub async fn load_caps( .map_err_with_prefix("Failed to parse caps provider:")?; resolve_relative_urls(&mut server_provider, &caps_url)?; - if caps.cloud_name == "refact" { - server_provider.wire_format = WireFormat::Refact; - server_provider.support_metadata = true; - if let Some(pricing_obj) = caps.metadata.pricing.as_object() { - for model_name in pricing_obj.keys() { - if !server_provider.running_models.contains(model_name) { - server_provider.running_models.push(model_name.clone()); - } - } - } - } info!( "server_provider running_models({})={:?}, completion_endpoint={:?}, completion_default_model={:?}", @@ -1014,22 +1020,6 @@ pub async fn load_caps( } }; caps.model_caps = Arc::new(model_caps_map); - if caps.cloud_name == "refact" { - let running_models = if let Some(pricing_obj) = caps.metadata.pricing.as_object() { - pricing_obj.keys().cloned().collect::>() - } else { - Vec::new() - }; - if !running_models.is_empty() { - let gcx_locked = gcx.write().await; - let mut registry = gcx_locked.providers.write().await; - if let Some(provider) = registry.get_mut("refact") { - provider.set_running_models(running_models); - } - drop(registry); - drop(gcx_locked); - } - } // Clear chat models from legacy CapsProviders that have a new ProviderTrait implementation. // The new system (populate_chat_models_from_providers) is the sole source of truth for @@ -1041,12 +1031,7 @@ pub async fn load_caps( let gcx_locked = gcx.read().await; let registry = gcx_locked.providers.read().await; for p in &mut providers { - if registry.get(&p.name).is_some() && !p.chat_models.is_empty() { - info!( - "Clearing {} legacy chat models for provider '{}' — handled by new provider system", - p.chat_models.len(), - p.name - ); + if registry.get(&p.name).is_some() { p.chat_models.clear(); } } @@ -1174,15 +1159,20 @@ pub fn strip_model_from_finetune(model: &str) -> String { } pub fn relative_to_full_url(caps_url: &str, maybe_relative_url: &str) -> Result { - if maybe_relative_url.starts_with("http") { + if maybe_relative_url.contains("://") { Ok(maybe_relative_url.to_string()) } else if maybe_relative_url.is_empty() { Ok("".to_string()) } else { let base_url = Url::parse(caps_url).map_err(|_| format!("failed to parse caps url: {}", caps_url))?; + let normalized = if maybe_relative_url.starts_with('/') { + maybe_relative_url.to_string() + } else { + format!("/{}", maybe_relative_url) + }; let joined_url = base_url - .join(maybe_relative_url) + .join(&normalized) .map_err(|_| format!("failed to join url: {}", maybe_relative_url))?; Ok(joined_url.to_string()) } @@ -1313,7 +1303,6 @@ fn apply_registry_caps_to_chat_model(record: &mut ChatModelRecord, caps: &ModelC pub fn resolve_completion_model<'a>( caps: Arc, requested_model_id: &str, - try_refact_fallbacks: bool, ) -> Result, String> { let model_id = if !requested_model_id.is_empty() { requested_model_id @@ -1321,17 +1310,7 @@ pub fn resolve_completion_model<'a>( &caps.defaults.completion_default_model }; - match resolve_model(&caps.completion_models, model_id) { - Ok(model) => Ok(model), - Err(first_err) if try_refact_fallbacks => { - if let Ok(model) = resolve_model(&caps.completion_models, &format!("refact/{model_id}")) - { - return Ok(model); - } - Err(first_err) - } - Err(err) => Err(err), - } + resolve_model(&caps.completion_models, model_id) } #[allow(dead_code)] diff --git a/refact-agent/engine/src/caps/providers.rs b/refact-agent/engine/src/caps/providers.rs index 9532fb4642..2dff992c78 100644 --- a/refact-agent/engine/src/caps/providers.rs +++ b/refact-agent/engine/src/caps/providers.rs @@ -1216,14 +1216,13 @@ mod tests { "metadata": {"pricing": {}, "features": []} }); - let caps_url = "https://inference.smallcloud.ai/coding_assistant_caps.json"; + let caps_url = "https://inference.smallcloud.ai/v1/model-catalog"; let converted = crate::caps::caps::convert_self_hosted_caps_if_needed( nested_json, caps_url, "test-key" ).unwrap(); let obj = converted.as_object().unwrap(); - // Embedding endpoint must be resolved assert_eq!( obj.get("embedding_endpoint").and_then(|v| v.as_str()), Some("https://inference.smallcloud.ai/v1/embeddings"), @@ -1385,7 +1384,7 @@ mod tests { "metadata": {"pricing": {}, "features": []} }); - let caps_url = "https://inference.smallcloud.ai/coding_assistant_caps.json"; + let caps_url = "https://inference.smallcloud.ai/v1/model-catalog"; let converted = crate::caps::caps::convert_self_hosted_caps_if_needed( nested_json, caps_url, "test-key" ).unwrap(); diff --git a/refact-agent/engine/src/chat/cache_guard.rs b/refact-agent/engine/src/chat/cache_guard.rs index 6773701a94..84d195d2ca 100644 --- a/refact-agent/engine/src/chat/cache_guard.rs +++ b/refact-agent/engine/src/chat/cache_guard.rs @@ -67,6 +67,11 @@ fn is_append_only_prefix_inner( | (Value::Number(_), Value::Number(_)) | (Value::String(_), Value::String(_)) => prev == next, (Value::Array(a), Value::Array(b)) => { + // The "tools" array is part of the prompt prefix — any change (including + // appending a new tool) invalidates the LLM cache. Require strict equality. + if parent_key == Some("tools") { + return a == b; + } if a.len() > b.len() { return false; } @@ -300,6 +305,31 @@ mod tests { assert!(!is_append_only_prefix(&prev, &next)); } + #[test] + fn test_tools_array_strict_equality() { + let tool_a = json!({"type": "function", "function": {"name": "tool_a", "description": "A"}}); + let tool_b = json!({"type": "function", "function": {"name": "tool_b", "description": "B"}}); + + // Identical tools → OK + let prev = json!({"messages": [1], "tools": [tool_a.clone()]}); + let next = json!({"messages": [1, 2], "tools": [tool_a.clone()]}); + assert!(is_append_only_prefix(&prev, &next)); + + // New tool appended mid-session → violation (breaks LLM cache prefix) + let next_extra = json!({"messages": [1, 2], "tools": [tool_a.clone(), tool_b.clone()]}); + assert!(!is_append_only_prefix(&prev, &next_extra)); + + // Tool removed mid-session → violation + let prev2 = json!({"messages": [1], "tools": [tool_a.clone(), tool_b.clone()]}); + let next_removed = json!({"messages": [1, 2], "tools": [tool_a.clone()]}); + assert!(!is_append_only_prefix(&prev2, &next_removed)); + + // Tool description changed mid-session → violation + let tool_a_changed = json!({"type": "function", "function": {"name": "tool_a", "description": "Changed"}}); + let next_changed = json!({"messages": [1, 2], "tools": [tool_a_changed]}); + assert!(!is_append_only_prefix(&prev, &next_changed)); + } + #[test] fn test_append_only_prefix_messages_keys_strict() { let prev = json!({ diff --git a/refact-agent/engine/src/chat/generation.rs b/refact-agent/engine/src/chat/generation.rs index c9a3fd1309..d18f303d9d 100644 --- a/refact-agent/engine/src/chat/generation.rs +++ b/refact-agent/engine/src/chat/generation.rs @@ -4,6 +4,8 @@ use tokio::sync::{Mutex as AMutex, RwLock as ARwLock}; use tracing::{info, warn}; use uuid::Uuid; +use crate::subchat::{resolve_subchat_config, run_subchat}; + use crate::at_commands::at_commands::AtCommandsContext; use crate::call_validation::{ ChatContent, ChatMessage, ChatMeta, ChatUsage, SamplingParameters, is_agentic_mode_id, @@ -25,9 +27,107 @@ use super::prompts::prepend_the_right_system_prompt_and_maybe_more_initial_messa use super::stream_core::{run_llm_stream, StreamRunParams, StreamCollector, normalize_tool_call, ChoiceFinal}; use super::queue::inject_priority_messages_if_any; use super::config::tokens; +use crate::ext::hooks::HookEvent; +use crate::ext::hooks_runner::{HookPayload, get_project_dir_string, run_hooks}; +use crate::chat::trajectory_ops::approx_token_count; + +const TOKEN_BUDGET_CADENCE: usize = 6; +const TOKEN_BUDGET_MARKER: &str = "token_budget_info"; +const MCP_LAZY_INDEX_MARKER: &str = "mcp_lazy_index"; + +fn maybe_inject_token_budget_instruction( + session: &mut ChatSession, + effective_n_ctx: usize, + cadence: usize, +) -> bool { + let last_has_tool_calls = session + .messages + .last() + .map(|msg| msg.role == "assistant" && msg.tool_calls.as_ref().map(|tcs| !tcs.is_empty()).unwrap_or(false)) + .unwrap_or(false); + if last_has_tool_calls { + return false; + } + + let mut last_marker_idx = None; + let mut user_or_assistant_since = 0usize; + + for (idx, msg) in session.messages.iter().enumerate().rev() { + if msg.role == "cd_instruction" && msg.tool_call_id == TOKEN_BUDGET_MARKER { + last_marker_idx = Some(idx); + break; + } + } + + for (idx, msg) in session.messages.iter().enumerate().rev() { + if let Some(marker_idx) = last_marker_idx { + if idx <= marker_idx { + break; + } + } + if msg.role == "user" || msg.role == "assistant" { + user_or_assistant_since += 1; + } + } + + if user_or_assistant_since < cadence { + return false; + } + + if session.messages.iter().rev().take(cadence).any(|msg| { + msg.role == "cd_instruction" && msg.tool_call_id == TOKEN_BUDGET_MARKER + }) { + return false; + } + + let used_tokens = approx_token_count(&session.messages); + let remaining = effective_n_ctx.saturating_sub(used_tokens); + let pct_used = if effective_n_ctx > 0 { + used_tokens.saturating_mul(100) / effective_n_ctx + } else { + 0 + }; + + let message = ChatMessage { + role: "cd_instruction".to_string(), + tool_call_id: TOKEN_BUDGET_MARKER.to_string(), + content: ChatContent::SimpleText(format!( + "💿 Token budget: ~{} used / ~{} available (~{}% used). ~{} tokens remaining. Consider using compress_chat_probe() if running low.", + used_tokens, + effective_n_ctx, + pct_used, + remaining + )), + ..Default::default() + }; + session.add_message(message); + true +} +fn build_mcp_index_message(index: &[(String, String)], total: usize) -> String { + let mut lines = vec![ + format!( + "💿 MCP Tools — Lazy Mode Active ({} tools available). \ + You MUST call `mcp_tool_search` before using any MCP tool. \ + Example: mcp_tool_search({{\"query\": \"github.*pull|pr\"}})", + total + ), + String::new(), + "Available MCP tools (name: description):".to_string(), + ]; + for (name, desc) in index { + let short = if desc.chars().count() > 100 { + format!("{}…", desc.chars().take(100).collect::()) + } else { + desc.clone() + }; + lines.push(format!("- {}: {}", name, short)); + } + lines.join("\n") +} + pub async fn prepare_session_preamble_and_knowledge( gcx: Arc>, session_arc: Arc>, @@ -44,6 +144,9 @@ pub async fn prepare_session_preamble_and_knowledge( let needs_preamble = !has_system || (!has_project_context && thread.include_project_info); + // Populated inside `needs_preamble`; used after to inject the MCP index hint message. + let mut mcp_for_index: Option<(Vec<(String, String)>, usize)> = None; + if needs_preamble { let caps = match crate::global_context::try_load_caps_quickly_if_not_present(gcx.clone(), 0).await { Ok(caps) => caps, @@ -60,14 +163,16 @@ pub async fn prepare_session_preamble_and_knowledge( } }; - let tools: Vec = + let raw_tools = crate::tools::tools_list::get_tools_for_mode(gcx.clone(), &thread.mode, Some(&model_rec.base.id)) - .await - .into_iter() - .map(|tool| tool.tool_description()) - .collect(); + .await; + let tools_for_mode = + crate::tools::tools_list::apply_mcp_lazy_filter(raw_tools); + if tools_for_mode.mcp_lazy_mode { + mcp_for_index = Some((tools_for_mode.mcp_tool_index.clone(), tools_for_mode.mcp_total_count)); + } let tool_names: std::collections::HashSet = - tools.iter().map(|t| t.name.clone()).collect(); + tools_for_mode.tools.iter().map(|t| t.tool_description().name.clone()).collect(); let meta = ChatMeta { chat_id: chat_id.clone(), @@ -84,7 +189,7 @@ pub async fn prepare_session_preamble_and_knowledge( session.messages.clone() }; let mut has_rag_results = crate::scratchpads::scratchpad_utils::HasRagResults::new(); - let messages_with_preamble = + let (messages_with_preamble, skills_info) = prepend_the_right_system_prompt_and_maybe_more_initial_messages( gcx.clone(), messages, @@ -102,6 +207,12 @@ pub async fn prepare_session_preamble_and_knowledge( .position(|m| m.role == "user" || m.role == "assistant") .unwrap_or(messages_with_preamble.len()); + { + let mut session = session_arc.lock().await; + session.skills_available_count = skills_info.available_count; + session.skills_included = skills_info.included_names.clone(); + } + if first_conv_idx > 0 { let mut session = session_arc.lock().await; @@ -155,6 +266,33 @@ pub async fn prepare_session_preamble_and_knowledge( } } + // Inject MCP lazy-mode index hint (once per session, idempotent via marker) + if let Some((mcp_index, mcp_total)) = mcp_for_index { + let already_has_index = { + let session = session_arc.lock().await; + session.messages.iter().any(|m| { + m.role == "cd_instruction" && m.tool_call_id == MCP_LAZY_INDEX_MARKER + }) + }; + if !already_has_index { + let index_text = build_mcp_index_message(&mcp_index, mcp_total); + let mut session = session_arc.lock().await; + let insert_pos = session + .messages + .iter() + .position(|m| m.role == "system") + .map(|i| i + 1) + .unwrap_or(0); + session.insert_message(insert_pos, ChatMessage { + role: "cd_instruction".to_string(), + tool_call_id: MCP_LAZY_INDEX_MARKER.to_string(), + content: ChatContent::SimpleText(index_text), + ..Default::default() + }); + info!("Injected MCP lazy index hint with {} tools", mcp_total); + } + } + // Knowledge enrichment for agentic mode let last_is_user = { let session = session_arc.lock().await; @@ -239,19 +377,120 @@ fn tail_needs_assistant(messages: &[ChatMessage]) -> bool { false } +async fn run_fork_subchat( + gcx: Arc>, + agent_name: &str, + user_content: &str, + thread: &ThreadParams, + parent_chat_id: &str, +) -> Result { + let config = resolve_subchat_config( + gcx.clone(), + agent_name, + false, + None, + Some(format!("Fork: {}", agent_name)), + Some(parent_chat_id.to_string()), + Some("fork".to_string()), + None, + None, + 10, + true, + None, + thread.mode.clone(), + ) + .await?; + + let messages = vec![ + ChatMessage { + role: "user".to_string(), + content: ChatContent::SimpleText(user_content.to_string()), + ..Default::default() + }, + ]; + + let result = run_subchat(gcx, messages, config).await?; + + let last_assistant = result.messages.iter().rev().find(|m| m.role == "assistant"); + Ok(last_assistant + .map(|m| m.content.content_text_only()) + .unwrap_or_else(|| "Fork skill completed but produced no response.".to_string())) +} + pub fn start_generation( gcx: Arc>, session_arc: Arc>, ) -> std::pin::Pin + Send>> { Box::pin(async move { loop { - let (thread, chat_id) = { + let (mut thread, chat_id) = { let session = session_arc.lock().await; ( session.thread.clone(), session.chat_id.clone(), ) }; + { + let session = session_arc.lock().await; + if let Some(ref m) = session.active_command.model_override { + if !m.is_empty() { + thread.model = m.clone(); + } + } + } + + let fork_agent_name = { + let session = session_arc.lock().await; + session.active_command.context_fork.clone() + }; + + if let Some(agent_name) = fork_agent_name { + let user_content_opt = { + let session = session_arc.lock().await; + session.messages.iter().rev() + .find(|m| m.role == "user") + .map(|m| m.content.content_text_only()) + }; + { + let mut session = session_arc.lock().await; + session.active_command.context_fork = None; + } + let user_content = match user_content_opt { + Some(c) => c, + None => { + warn!("Fork skill '{}' skipped: no user message found in session {}", agent_name, chat_id); + continue; + } + }; + + let fork_result = run_fork_subchat( + gcx.clone(), + &agent_name, + &user_content, + &thread, + &chat_id, + ) + .await; + + match fork_result { + Ok(assistant_content) => { + let mut session = session_arc.lock().await; + session.add_message(ChatMessage { + role: "assistant".to_string(), + content: ChatContent::SimpleText(assistant_content), + ..Default::default() + }); + session.set_runtime_state(SessionState::Idle, None); + drop(session); + maybe_save_trajectory(gcx.clone(), session_arc.clone()).await; + break; + } + Err(e) => { + warn!("Fork skill subchat failed ({}), falling back to normal generation", e); + continue; + } + } + } let abort_flag = { let mut session = session_arc.lock().await; @@ -306,11 +545,13 @@ pub fn start_generation( break; } - maybe_save_trajectory(gcx.clone(), session_arc.clone()).await; - - let (mode_id, model_id) = { + let (mode_id, model_id, context_tokens_cap) = { let session = session_arc.lock().await; - (session.thread.mode.clone(), session.thread.model.clone()) + ( + session.thread.mode.clone(), + session.thread.model.clone(), + session.thread.context_tokens_cap, + ) }; let model_id_opt = if model_id.is_empty() { @@ -319,6 +560,41 @@ pub fn start_generation( Some(model_id.as_str()) }; + let effective_n_ctx = { + let caps = crate::global_context::try_load_caps_quickly_if_not_present(gcx.clone(), 0).await; + let model_rec = match caps { + Ok(caps) => crate::caps::resolve_chat_model(caps, &model_id).ok(), + Err(_) => None, + }; + model_rec.map(|rec| { + let model_n_ctx = if rec.base.n_ctx > 0 { + rec.base.n_ctx + } else { + tokens().default_n_ctx + }; + match context_tokens_cap { + Some(cap) if cap > 0 => cap.min(model_n_ctx), + _ => model_n_ctx, + } + }) + }; + + let mut injected_budget = false; + if let Some(effective_n_ctx) = effective_n_ctx { + let mut session = session_arc.lock().await; + injected_budget = maybe_inject_token_budget_instruction( + &mut session, + effective_n_ctx, + TOKEN_BUDGET_CADENCE, + ); + } + + if injected_budget { + maybe_save_trajectory(gcx.clone(), session_arc.clone()).await; + } else { + maybe_save_trajectory(gcx.clone(), session_arc.clone()).await; + } + match process_tool_calls_once(gcx.clone(), session_arc.clone(), &mode_id, model_id_opt).await { ToolStepOutcome::NoToolCalls => { if inject_priority_messages_if_any(gcx.clone(), session_arc.clone()).await { @@ -331,6 +607,22 @@ pub fn start_generation( if should_continue { continue; } + let gcx_stop = gcx.clone(); + let session_id_stop = chat_id.clone(); + tokio::spawn(async move { + let project_dir = get_project_dir_string(gcx_stop.clone()).await; + let payload = HookPayload { + hook_event_name: "Stop".to_string(), + session_id: session_id_stop, + project_dir, + tool_name: None, + tool_input: None, + tool_output: None, + user_prompt: None, + extra: std::collections::HashMap::new(), + }; + run_hooks(gcx_stop, HookEvent::Stop, payload).await; + }); break; } ToolStepOutcome::Paused => break, @@ -363,14 +655,18 @@ pub async fn run_llm_generation( .map_err(|e| e.message)?; let model_rec = crate::caps::resolve_chat_model(caps.clone(), &thread.model)?; - let tools: Vec = + let raw_tools_for_gen = crate::tools::tools_list::get_tools_for_mode(gcx.clone(), &thread.mode, Some(&model_rec.base.id)) - .await - .into_iter() - .map(|tool| tool.tool_description()) - .collect(); + .await; + let tools_for_gen = + crate::tools::tools_list::apply_mcp_lazy_filter(raw_tools_for_gen); + let mcp_lazy_active = tools_for_gen.mcp_lazy_mode; + let tools: Vec = tools_for_gen.tools + .into_iter() + .map(|tool| tool.tool_description()) + .collect(); - info!("session generation: model={}, tools count = {}", model_rec.base.id, tools.len()); + info!("session generation: model={}, tools count = {} (mcp_lazy={})", model_rec.base.id, tools.len(), mcp_lazy_active); let model_n_ctx = if model_rec.base.n_ctx > 0 { model_rec.base.n_ctx @@ -1337,4 +1633,41 @@ mod tests { ]; assert!(!tail_needs_assistant(&messages)); } + + #[test] + fn test_fork_error_does_not_break_loop() { + let mut loop_count = 0; + let mut reached_normal_generation = false; + + loop { + loop_count += 1; + if loop_count > 5 { + panic!("Loop ran too many times"); + } + + let fork_agent: Option = if loop_count == 1 { + Some("subagent".to_string()) + } else { + None + }; + + if fork_agent.is_some() { + let fork_result: Result = Err("subchat failed".to_string()); + match fork_result { + Ok(_content) => { + break; + } + Err(_e) => { + continue; + } + } + } + + reached_normal_generation = true; + break; + } + + assert!(reached_normal_generation, "Normal generation path must be reached after fork error"); + assert_eq!(loop_count, 2, "Loop must iterate twice: fork error then normal generation"); + } } diff --git a/refact-agent/engine/src/chat/handlers.rs b/refact-agent/engine/src/chat/handlers.rs index 3c595d83fd..c5b4b45136 100644 --- a/refact-agent/engine/src/chat/handlers.rs +++ b/refact-agent/engine/src/chat/handlers.rs @@ -46,12 +46,20 @@ pub async fn handle_v1_chat_subscribe( event: snapshot, }; + let initial_json = match serde_json::to_string(&initial_envelope) { + Ok(j) => j, + Err(e) => { + tracing::error!("Failed to serialize initial SSE snapshot for {}: {}", chat_id, e); + return Err(ScratchError::new(StatusCode::INTERNAL_SERVER_ERROR, "snapshot serialization failed".to_string())); + } + }; + let session_for_stream = session_arc.clone(); let chat_id_for_stream = chat_id.clone(); + let closed_flag = session_arc.lock().await.closed_flag.clone(); let stream = async_stream::stream! { - let json = serde_json::to_string(&initial_envelope).unwrap_or_default(); - yield Ok::<_, std::convert::Infallible>(format!("data: {}\n\n", json)); + yield Ok::<_, std::convert::Infallible>(format!("data: {}\n\n", initial_json)); let mut heartbeat_interval = tokio::time::interval(std::time::Duration::from_secs(15)); heartbeat_interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip); @@ -61,26 +69,42 @@ pub async fn handle_v1_chat_subscribe( result = rx.recv() => { match result { Ok(envelope) => { - let json = serde_json::to_string(&envelope).unwrap_or_default(); - yield Ok::<_, std::convert::Infallible>(format!("data: {}\n\n", json)); + match serde_json::to_string(&envelope) { + Ok(json) => yield Ok::<_, std::convert::Infallible>(format!("data: {}\n\n", json)), + Err(e) => { + tracing::error!("Failed to serialize SSE event for {}: {}", chat_id_for_stream, e); + break; + } + } } Err(broadcast::error::RecvError::Lagged(skipped)) => { tracing::info!("SSE subscriber lagged, skipped {} events, sending fresh snapshot", skipped); let session = session_for_stream.lock().await; + if session.closed { + break; + } + // Re-subscribe BEFORE capturing event_seq so we don't miss events + // emitted between snapshot and the new receiver start. + rx = session.subscribe(); let recovery_envelope = EventEnvelope { chat_id: chat_id_for_stream.clone(), seq: session.event_seq, event: session.snapshot(), }; drop(session); - let json = serde_json::to_string(&recovery_envelope).unwrap_or_default(); - yield Ok::<_, std::convert::Infallible>(format!("data: {}\n\n", json)); + match serde_json::to_string(&recovery_envelope) { + Ok(json) => yield Ok::<_, std::convert::Infallible>(format!("data: {}\n\n", json)), + Err(e) => { + tracing::error!("Failed to serialize SSE recovery snapshot for {}: {}", chat_id_for_stream, e); + break; + } + } } Err(broadcast::error::RecvError::Closed) => break, } } _ = heartbeat_interval.tick() => { - if session_for_stream.lock().await.closed { + if closed_flag.load(std::sync::atomic::Ordering::Relaxed) { break; } yield Ok::<_, std::convert::Infallible>(format!(": hb {}\n\n", chrono::Utc::now().timestamp())); diff --git a/refact-agent/engine/src/chat/linearize.rs b/refact-agent/engine/src/chat/linearize.rs deleted file mode 100644 index 44d47582d2..0000000000 --- a/refact-agent/engine/src/chat/linearize.rs +++ /dev/null @@ -1,1225 +0,0 @@ -use crate::call_validation::{ChatContent, ChatMessage}; -use crate::scratchpads::multimodality::MultimodalElement; - -const TOOL_APPENDABLE_ROLES: &[&str] = &["context_file", "plain_text", "cd_instruction"]; -const TOOL_ROLES: &[&str] = &["tool", "diff"]; -const MERGE_SEPARATOR: &str = "\n\n"; - -fn is_tool_appendable(role: &str) -> bool { - TOOL_APPENDABLE_ROLES.contains(&role) -} - -fn is_tool_role(role: &str) -> bool { - TOOL_ROLES.contains(&role) -} - -fn content_to_elements(content: &ChatContent) -> Vec { - match content { - ChatContent::SimpleText(text) => { - if text.is_empty() { - vec![] - } else { - vec![MultimodalElement { - m_type: "text".to_string(), - m_content: text.clone(), - }] - } - } - ChatContent::Multimodal(elements) => { - elements.iter().filter(|el| { - !(el.is_text() && el.m_content.is_empty()) - }).cloned().collect() - } - ChatContent::ContextFiles(_) => { - let text = content.content_text_only(); - if text.is_empty() { - vec![] - } else { - vec![MultimodalElement { - m_type: "text".to_string(), - m_content: text, - }] - } - } - } -} - -fn elements_to_content(elements: Vec) -> ChatContent { - if elements.is_empty() { - return ChatContent::SimpleText(String::new()); - } - - if elements.iter().any(|el| !el.is_text()) { - ChatContent::Multimodal(elements) - } else { - let text = elements - .iter() - .map(|el| el.m_content.as_str()) - .collect::>() - .join(MERGE_SEPARATOR); - ChatContent::SimpleText(text) - } -} - -fn merge_user_like_group(group: Vec) -> ChatMessage { - debug_assert!(!group.is_empty()); - - if group.len() == 1 { - let mut msg = group.into_iter().next().unwrap(); - if msg.role != "user" { - msg.role = "user".to_string(); - } - return msg; - } - - let mut all_elements: Vec = Vec::new(); - - for msg in &group { - let elements = content_to_elements(&msg.content); - if elements.is_empty() { - continue; - } - if !all_elements.is_empty() { - let last_is_text = all_elements.last().map_or(false, |el| el.is_text()); - let next_is_text = elements.first().map_or(false, |el| el.is_text()); - if last_is_text && next_is_text { - if let Some(last) = all_elements.last_mut() { - last.m_content.push_str(MERGE_SEPARATOR); - last.m_content.push_str(&elements[0].m_content); - all_elements.extend(elements.into_iter().skip(1)); - continue; - } - } - } - all_elements.extend(elements); - } - - let mut merged = group[0].clone(); - merged.role = "user".to_string(); - merged.content = elements_to_content(all_elements); - merged.tool_calls = None; - merged.tool_call_id = String::new(); - merged.thinking_blocks = None; - merged.reasoning_content = None; - merged -} - -/// Appends content from a tool-appendable message (context_file, plain_text, cd_instruction) -/// into an existing tool/diff message's text content. -fn append_to_tool_message(tool_msg: &mut ChatMessage, appendable: &ChatMessage) { - let extra_text = match &appendable.content { - ChatContent::SimpleText(text) => text.clone(), - ChatContent::ContextFiles(_) => appendable.content.content_text_only(), - ChatContent::Multimodal(elements) => { - elements.iter() - .filter(|el| el.is_text()) - .map(|el| el.m_content.as_str()) - .collect::>() - .join(MERGE_SEPARATOR) - } - }; - if extra_text.is_empty() { - return; - } - match &mut tool_msg.content { - ChatContent::SimpleText(text) => { - if !text.is_empty() { - text.push_str(MERGE_SEPARATOR); - } - text.push_str(&extra_text); - } - _ => { - let existing = tool_msg.content.content_text_only(); - let mut combined = existing; - if !combined.is_empty() { - combined.push_str(MERGE_SEPARATOR); - } - combined.push_str(&extra_text); - tool_msg.content = ChatContent::SimpleText(combined); - } - } -} - -/// Merges consecutive user-like messages and folds tool-appendable messages -/// (context_file, plain_text, cd_instruction) into preceding tool/diff messages -/// for cache-friendly LLM requests. Idempotent and deterministic. -/// -/// Rules: -/// - context_file/plain_text/cd_instruction after tool/diff → appended to last tool msg -/// - consecutive user-like messages → merged into single "user" message -/// - real "user" message after tool → starts a new user group (not folded into tool) -pub fn linearize_thread_for_llm(messages: &[ChatMessage]) -> Vec { - let mut result: Vec = Vec::new(); - let mut user_group: Vec = Vec::new(); - - for msg in messages { - if is_tool_appendable(&msg.role) { - if !user_group.is_empty() { - // Already accumulating user-like messages, keep accumulating - user_group.push(msg.clone()); - } else if let Some(last) = result.last_mut() { - if is_tool_role(&last.role) { - // Fold into the preceding tool/diff message - append_to_tool_message(last, msg); - } else { - // After system/assistant/etc — start a user group - user_group.push(msg.clone()); - } - } else { - // First message in the thread - user_group.push(msg.clone()); - } - } else if msg.role == "user" { - // Real user message always goes into user group - user_group.push(msg.clone()); - } else { - // Non-user-like role (system, assistant, tool, diff) - if !user_group.is_empty() { - result.push(merge_user_like_group(std::mem::take(&mut user_group))); - } - result.push(msg.clone()); - } - } - - if !user_group.is_empty() { - result.push(merge_user_like_group(user_group)); - } - - result -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::call_validation::{ChatMessage, ChatContent, ContextFile}; - use crate::scratchpads::multimodality::MultimodalElement; - - fn text_msg(role: &str, text: &str) -> ChatMessage { - ChatMessage { - role: role.to_string(), - content: ChatContent::SimpleText(text.to_string()), - ..Default::default() - } - } - - fn text_msg_with_id(role: &str, text: &str, id: &str) -> ChatMessage { - ChatMessage { - message_id: id.to_string(), - role: role.to_string(), - content: ChatContent::SimpleText(text.to_string()), - ..Default::default() - } - } - - fn context_file_msg(files: Vec<(&str, &str, usize, usize)>) -> ChatMessage { - ChatMessage { - role: "context_file".to_string(), - content: ChatContent::ContextFiles( - files - .into_iter() - .map(|(name, content, l1, l2)| ContextFile { - file_name: name.to_string(), - file_content: content.to_string(), - line1: l1, - line2: l2, - ..Default::default() - }) - .collect(), - ), - ..Default::default() - } - } - - fn multimodal_msg(role: &str, elements: Vec<(&str, &str)>) -> ChatMessage { - ChatMessage { - role: role.to_string(), - content: ChatContent::Multimodal( - elements - .into_iter() - .map(|(t, c)| MultimodalElement { - m_type: t.to_string(), - m_content: c.to_string(), - }) - .collect(), - ), - ..Default::default() - } - } - - fn assistant_msg(text: &str) -> ChatMessage { - text_msg("assistant", text) - } - - fn tool_msg(text: &str, tool_call_id: &str) -> ChatMessage { - ChatMessage { - role: "tool".to_string(), - content: ChatContent::SimpleText(text.to_string()), - tool_call_id: tool_call_id.to_string(), - ..Default::default() - } - } - - #[test] - fn test_no_merge_needed_simple_alternation() { - let msgs = vec![ - text_msg("system", "You are helpful"), - text_msg("user", "Hello"), - assistant_msg("Hi there"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 3); - assert_eq!(result[0].role, "system"); - assert_eq!(result[1].role, "user"); - assert_eq!(result[2].role, "assistant"); - } - - #[test] - fn test_merge_consecutive_user_messages() { - let msgs = vec![ - text_msg("system", "You are helpful"), - text_msg("user", "First part"), - text_msg("user", "Second part"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); - assert_eq!(result[0].role, "system"); - assert_eq!(result[1].role, "user"); - assert_eq!( - result[1].content.content_text_only(), - "First part\n\nSecond part" - ); - } - - #[test] - fn test_merge_context_file_with_user() { - let msgs = vec![ - text_msg("system", "You are helpful"), - context_file_msg(vec![("src/main.rs", "fn main() {}", 1, 1)]), - text_msg("user", "Fix the bug"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); - assert_eq!(result[0].role, "system"); - assert_eq!(result[1].role, "user"); - let text = result[1].content.content_text_only(); - assert!(text.contains("src/main.rs:1-1")); - assert!(text.contains("fn main() {}")); - assert!(text.contains("Fix the bug")); - } - - #[test] - fn test_merge_multiple_context_files_and_user() { - let msgs = vec![ - text_msg("system", "System prompt"), - context_file_msg(vec![("a.rs", "aaa", 1, 3)]), - context_file_msg(vec![("b.rs", "bbb", 1, 5)]), - text_msg("plain_text", "Some plain text"), - text_msg("user", "Do something"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); - assert_eq!(result[1].role, "user"); - let text = result[1].content.content_text_only(); - assert!(text.contains("a.rs:1-3")); - assert!(text.contains("b.rs:1-5")); - assert!(text.contains("Some plain text")); - assert!(text.contains("Do something")); - } - - #[test] - fn test_merge_cd_instruction_with_user() { - let msgs = vec![ - text_msg("system", "System"), - text_msg("cd_instruction", "cd /project"), - text_msg("user", "List files"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); - assert_eq!(result[1].role, "user"); - assert_eq!( - result[1].content.content_text_only(), - "cd /project\n\nList files" - ); - } - - - - #[test] - fn test_no_merge_across_assistant_boundary() { - let msgs = vec![ - text_msg("user", "First question"), - assistant_msg("First answer"), - context_file_msg(vec![("c.rs", "code", 1, 10)]), - text_msg("user", "Second question"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 3); // user, assistant, user(merged) - assert_eq!(result[0].role, "user"); - assert_eq!(result[1].role, "assistant"); - assert_eq!(result[2].role, "user"); - let merged_text = result[2].content.content_text_only(); - assert!(merged_text.contains("c.rs:1-10")); - assert!(merged_text.contains("Second question")); - } - - - - #[test] - fn test_tool_messages_not_merged() { - let msgs = vec![ - text_msg("user", "Do something"), - assistant_msg("Calling tool"), - tool_msg("Tool result 1", "call_1"), - tool_msg("Tool result 2", "call_2"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 4); - assert_eq!(result[2].role, "tool"); - assert_eq!(result[2].tool_call_id, "call_1"); - assert_eq!(result[3].role, "tool"); - assert_eq!(result[3].tool_call_id, "call_2"); - } - - #[test] - fn test_tool_loop_pattern_preserved() { - let msgs = vec![ - text_msg("system", "System"), - text_msg("user", "Fix bug"), - assistant_msg("Let me check"), - tool_msg("file contents", "call_1"), - assistant_msg("Now I'll patch"), - tool_msg("patch applied", "call_2"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 6); - // Exact same structure — nothing to merge - for (i, (orig, lin)) in msgs.iter().zip(result.iter()).enumerate() { - assert_eq!(orig.role, lin.role, "Role mismatch at index {}", i); - } - } - - - - #[test] - fn test_idempotency_simple() { - let msgs = vec![ - text_msg("system", "System"), - context_file_msg(vec![("a.rs", "aaa", 1, 3)]), - text_msg("user", "Hello"), - assistant_msg("Hi"), - ]; - let first = linearize_thread_for_llm(&msgs); - let second = linearize_thread_for_llm(&first); - assert_eq!(first.len(), second.len()); - for (a, b) in first.iter().zip(second.iter()) { - assert_eq!(a.role, b.role); - assert_eq!(a.content.content_text_only(), b.content.content_text_only()); - } - } - - #[test] - fn test_idempotency_complex() { - let msgs = vec![ - text_msg("system", "System"), - context_file_msg(vec![("a.rs", "aaa", 1, 3)]), - context_file_msg(vec![("b.rs", "bbb", 4, 6)]), - text_msg("cd_instruction", "cd /tmp"), - text_msg("user", "Do it"), - assistant_msg("OK"), - text_msg("plain_text", "Extra info"), - text_msg("user", "More"), - ]; - let first = linearize_thread_for_llm(&msgs); - let second = linearize_thread_for_llm(&first); - assert_eq!(first.len(), second.len()); - for (a, b) in first.iter().zip(second.iter()) { - assert_eq!(a.role, b.role); - assert_eq!(a.content.content_text_only(), b.content.content_text_only()); - } - } - - - - #[test] - fn test_multimodal_image_preserved() { - let msgs = vec![ - text_msg("system", "System"), - multimodal_msg("user", vec![("text", "Look at this"), ("image/png", "base64data")]), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); - match &result[1].content { - ChatContent::Multimodal(elements) => { - assert_eq!(elements.len(), 2); - assert!(elements[0].is_text()); - assert!(elements[1].is_image()); - } - _ => panic!("Expected Multimodal content"), - } - } - - #[test] - fn test_merge_text_with_multimodal() { - let msgs = vec![ - text_msg("system", "System"), - text_msg("user", "Context info"), - multimodal_msg("user", vec![("text", "Look at this"), ("image/png", "imgdata")]), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); - match &result[1].content { - ChatContent::Multimodal(elements) => { - // "Context info" + separator + "Look at this" merged into one text, then image - assert_eq!(elements.len(), 2); - assert!(elements[0].is_text()); - assert!(elements[0].m_content.contains("Context info")); - assert!(elements[0].m_content.contains("Look at this")); - assert!(elements[1].is_image()); - assert_eq!(elements[1].m_content, "imgdata"); - } - _ => panic!("Expected Multimodal content"), - } - } - - #[test] - fn test_merge_context_file_with_multimodal() { - let msgs = vec![ - context_file_msg(vec![("x.rs", "code", 1, 5)]), - multimodal_msg("user", vec![("text", "Describe"), ("image/png", "img")]), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 1); - match &result[0].content { - ChatContent::Multimodal(elements) => { - assert!(elements[0].is_text()); - assert!(elements[0].m_content.contains("x.rs:1-5")); - assert!(elements[0].m_content.contains("Describe")); - assert!(elements[1].is_image()); - } - _ => panic!("Expected Multimodal content"), - } - } - - - - #[test] - fn test_empty_user_message_skipped_in_merge() { - let msgs = vec![ - text_msg("system", "System"), - text_msg("user", ""), - text_msg("user", "Real content"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); - assert_eq!(result[1].content.content_text_only(), "Real content"); - } - - #[test] - fn test_all_empty_user_messages() { - let msgs = vec![ - text_msg("system", "System"), - text_msg("user", ""), - text_msg("context_file", ""), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); - assert_eq!(result[1].role, "user"); - } - - - - #[test] - fn test_empty_input() { - let result = linearize_thread_for_llm(&[]); - assert!(result.is_empty()); - } - - #[test] - fn test_single_user_message() { - let msgs = vec![text_msg("user", "Hello")]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 1); - assert_eq!(result[0].role, "user"); - assert_eq!(result[0].content.content_text_only(), "Hello"); - } - - #[test] - fn test_single_context_file_becomes_user() { - let msgs = vec![context_file_msg(vec![("f.rs", "code", 1, 1)])]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 1); - assert_eq!(result[0].role, "user"); - } - - #[test] - fn test_system_not_merged_with_user() { - let msgs = vec![ - text_msg("system", "System prompt"), - text_msg("user", "User message"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); - assert_eq!(result[0].role, "system"); - assert_eq!(result[1].role, "user"); - } - - #[test] - fn test_diff_messages_not_merged() { - let msgs = vec![ - assistant_msg("Patching"), - ChatMessage { - role: "diff".to_string(), - content: ChatContent::SimpleText("diff content".to_string()), - tool_call_id: "call_1".to_string(), - ..Default::default() - }, - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); - assert_eq!(result[1].role, "diff"); - } - - #[test] - fn test_message_id_preserved_from_first() { - let msgs = vec![ - text_msg_with_id("user", "First", "msg-001"), - text_msg_with_id("user", "Second", "msg-002"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 1); - assert_eq!(result[0].message_id, "msg-001"); - } - - - - #[test] - fn test_deterministic_output() { - let msgs = vec![ - text_msg("system", "System"), - context_file_msg(vec![ - ("a.rs", "fn a() {}", 1, 1), - ("b.rs", "fn b() {}", 1, 1), - ]), - text_msg("cd_instruction", "cd /project"), - text_msg("user", "Fix everything"), - ]; - - // Run multiple times, output must be identical - let result1 = linearize_thread_for_llm(&msgs); - let result2 = linearize_thread_for_llm(&msgs); - let result3 = linearize_thread_for_llm(&msgs); - - for i in 0..result1.len() { - assert_eq!(result1[i].content.content_text_only(), result2[i].content.content_text_only()); - assert_eq!(result2[i].content.content_text_only(), result3[i].content.content_text_only()); - } - } - - - - #[test] - fn test_realistic_agentic_flow() { - // Simulates: system + project context + knowledge + user question - // then tool loop with strict alternation - let msgs = vec![ - text_msg("system", "You are a coding assistant"), - context_file_msg(vec![("project/README.md", "# Project", 1, 1)]), - context_file_msg(vec![("src/lib.rs", "pub mod auth;", 1, 1)]), - text_msg("user", "Fix the auth bug"), - assistant_msg("Let me look at the auth module"), - tool_msg("pub fn login() { ... }", "call_1"), - assistant_msg("I see the issue, let me patch it"), - tool_msg("Patch applied successfully", "call_2"), - ]; - let result = linearize_thread_for_llm(&msgs); - - // Expected: system, user(merged 3), assistant, tool, assistant, tool - assert_eq!(result.len(), 6); - assert_eq!(result[0].role, "system"); - assert_eq!(result[1].role, "user"); - assert_eq!(result[2].role, "assistant"); - assert_eq!(result[3].role, "tool"); - assert_eq!(result[4].role, "assistant"); - assert_eq!(result[5].role, "tool"); - - // The merged user message should contain all context + question - let user_text = result[1].content.content_text_only(); - assert!(user_text.contains("project/README.md")); - assert!(user_text.contains("src/lib.rs")); - assert!(user_text.contains("Fix the auth bug")); - } - - - /// 197x: user→user (conversation continuation / handoff messages) - #[test] - fn test_real_user_user_handoff() { - let msgs = vec![ - text_msg("system", "You are Refact Agent"), - context_file_msg(vec![("knowledge.md", "prior context", 1, 4)]), - text_msg("user", "## Previous conversation summary\n\nUser requested auth fix"), - text_msg("user", "The previous trajectory abc-123. Continue from where you stopped."), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); // system + merged user - assert_eq!(result[1].role, "user"); - let text = result[1].content.content_text_only(); - assert!(text.contains("knowledge.md")); - assert!(text.contains("Previous conversation summary")); - assert!(text.contains("Continue from where you stopped")); - } - - /// 55x: cf, cf, user, user (context files + multi-part user input) - #[test] - fn test_real_cf_cf_user_user() { - let msgs = vec![ - text_msg("system", "system prompt"), - context_file_msg(vec![("AGENTS.md", "agent config", 1, 10)]), - context_file_msg(vec![("knowledge.md", "cached knowledge", 1, 4)]), - text_msg("user", "## Previous conversation summary\n\nUser worked on providers"), - text_msg("user", "The previous trajectory xyz-789. Continue."), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); - let text = result[1].content.content_text_only(); - assert!(text.contains("AGENTS.md")); - assert!(text.contains("knowledge.md")); - assert!(text.contains("Previous conversation")); - assert!(text.contains("Continue")); - } - - /// 36x: cf, cf only (context-only without final user message) - #[test] - fn test_real_cf_cf_no_user() { - let msgs = vec![ - text_msg("system", "system prompt"), - context_file_msg(vec![("file1.rs", "code1", 1, 10)]), - context_file_msg(vec![("file2.rs", "code2", 1, 5)]), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); // system + merged user - assert_eq!(result[1].role, "user"); - let text = result[1].content.content_text_only(); - assert!(text.contains("file1.rs")); - assert!(text.contains("file2.rs")); - } - - /// 7x: cf, cf, user, user, cd_instruction (mode transition instruction) - #[test] - fn test_real_cf_cf_user_user_cd_instruction() { - let msgs = vec![ - text_msg("system", "system prompt"), - context_file_msg(vec![("knowledge.md", "cached", 1, 4)]), - context_file_msg(vec![("prepare.rs", "code", 1, 100)]), - text_msg("user", "## Summary\n\nUser wants providers page"), - text_msg("user", "Continue from trajectory abc."), - text_msg("cd_instruction", "💿 Now confirm the plan with the user"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); - assert_eq!(result[1].role, "user"); - let text = result[1].content.content_text_only(); - assert!(text.contains("knowledge.md")); - assert!(text.contains("prepare.rs")); - assert!(text.contains("Summary")); - assert!(text.contains("Continue from trajectory")); - assert!(text.contains("💿 Now confirm the plan")); - } - - /// 3x: user, cf, user (interleaved — user asks, context injected, user continues) - #[test] - fn test_real_interleaved_user_cf_user() { - let msgs = vec![ - text_msg("system", "system prompt"), - text_msg("user", "avoid comments though"), - context_file_msg(vec![("trajectory.json", "{}", 1, 100)]), - text_msg("user", "also add tests to backend"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); - let text = result[1].content.content_text_only(); - assert!(text.contains("avoid comments")); - assert!(text.contains("trajectory.json")); - assert!(text.contains("also add tests")); - } - - /// 2x: context_file with string content (not ContextFiles variant!) - #[test] - fn test_real_context_file_as_string() { - let msgs = vec![ - text_msg("system", "system prompt"), - text_msg("context_file", "some pre-formatted file content here"), - text_msg("user", "explain this"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); - let text = result[1].content.content_text_only(); - assert!(text.contains("some pre-formatted file content")); - assert!(text.contains("explain this")); - } - - /// 4x: 9+ context_files in a row (heavy context injection) - #[test] - fn test_real_many_context_files() { - let mut msgs = vec![text_msg("system", "system prompt")]; - for i in 0..9 { - msgs.push(context_file_msg(vec![ - (&format!("file{i}.rs"), &format!("content {i}"), 1, 10), - ])); - } - msgs.push(text_msg("user", "Fix everything")); - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); // system + one merged user - let text = result[1].content.content_text_only(); - for i in 0..9 { - assert!(text.contains(&format!("file{i}.rs")), "Missing file{i}.rs"); - } - assert!(text.contains("Fix everything")); - } - - /// 235x: tool → context_file, user → assistant (mid-conversation context injection) - #[test] - fn test_real_tool_then_cf_user() { - let msgs = vec![ - text_msg("system", "system prompt"), - text_msg("user", "Find the bug"), - assistant_msg("Let me search"), - tool_msg("found: auth.rs has issue", "call_1"), - context_file_msg(vec![("auth.rs", "fn login() {}", 1, 5)]), - text_msg("user", "Fix that function"), - ]; - let result = linearize_thread_for_llm(&msgs); - // system, user, assistant, tool(+cf), user - assert_eq!(result.len(), 5); - assert_eq!(result[0].role, "system"); - assert_eq!(result[1].role, "user"); - assert_eq!(result[2].role, "assistant"); - assert_eq!(result[3].role, "tool"); - let tool_text = result[3].content.content_text_only(); - assert!(tool_text.contains("found: auth.rs has issue")); - assert!(tool_text.contains("auth.rs")); - assert_eq!(result[4].role, "user"); - assert_eq!(result[4].content.content_text_only(), "Fix that function"); - } - - /// tool → cf, cd, cf, user: cf+cd+cf fold into tool, user stays separate - #[test] - fn test_real_tool_then_cf_cd_cf_user() { - let msgs = vec![ - text_msg("system", "system prompt"), - text_msg("user", "start"), - assistant_msg("calling tool"), - tool_msg("tool output here", "call_1"), - context_file_msg(vec![("file1.rs", "code1", 1, 10)]), - text_msg("cd_instruction", "💿 Review complete"), - context_file_msg(vec![("file2.rs", "code2", 1, 5)]), - text_msg("user", "now fix it"), - ]; - let result = linearize_thread_for_llm(&msgs); - // system, user, assistant, tool(+cf+cd+cf), user - assert_eq!(result.len(), 5); - assert_eq!(result[3].role, "tool"); - let tool_text = result[3].content.content_text_only(); - assert!(tool_text.contains("tool output here")); - assert!(tool_text.contains("file1.rs")); - assert!(tool_text.contains("💿 Review complete")); - assert!(tool_text.contains("file2.rs")); - assert_eq!(result[4].role, "user"); - assert_eq!(result[4].content.content_text_only(), "now fix it"); - } - - /// 4x: plain_text role with directory tree content - #[test] - fn test_real_plain_text_directory_tree() { - let msgs = vec![ - text_msg("system", "system prompt"), - text_msg("user", "show me the project"), - assistant_msg("Here's the tree"), - text_msg("plain_text", "/\n home/\n svakhreev/\n projects/\n refact/"), - text_msg("user", "now explain the structure"), - ]; - let result = linearize_thread_for_llm(&msgs); - // system, user, assistant, merged(plain_text+user) - assert_eq!(result.len(), 4); - assert_eq!(result[3].role, "user"); - let text = result[3].content.content_text_only(); - assert!(text.contains("home/")); - assert!(text.contains("now explain")); - } - - /// 16x: trailing cf, cf, user with no assistant after (END of thread) - #[test] - fn test_real_trailing_sequence_no_assistant() { - let msgs = vec![ - text_msg("system", "system prompt"), - context_file_msg(vec![("k1.md", "knowledge 1", 1, 4)]), - context_file_msg(vec![("k2.md", "knowledge 2", 1, 4)]), - text_msg("user", "Start working on the task"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); - assert_eq!(result[1].role, "user"); - let text = result[1].content.content_text_only(); - assert!(text.contains("k1.md")); - assert!(text.contains("k2.md")); - assert!(text.contains("Start working")); - } - - /// 280x: system → cf, cf, cf, user → assistant (most common initial pattern) - #[test] - fn test_real_system_3cf_user_assistant() { - let msgs = vec![ - text_msg("system", "You are Refact Agent"), - context_file_msg(vec![("AGENTS.md", "agent guidelines", 1, 50)]), - context_file_msg(vec![("knowledge1.md", "prior work", 1, 4)]), - context_file_msg(vec![("knowledge2.md", "more context", 1, 4)]), - text_msg("user", "implement the feature"), - assistant_msg("I'll start by analyzing the codebase"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 3); // system, merged user, assistant - assert_eq!(result[0].role, "system"); - assert_eq!(result[1].role, "user"); - assert_eq!(result[2].role, "assistant"); - let text = result[1].content.content_text_only(); - assert!(text.contains("AGENTS.md")); - assert!(text.contains("knowledge1.md")); - assert!(text.contains("knowledge2.md")); - assert!(text.contains("implement the feature")); - } - - /// 87x: tool → user, user → assistant (multi-user after tool) - #[test] - fn test_real_tool_then_user_user() { - let msgs = vec![ - text_msg("system", "system prompt"), - text_msg("user", "start"), - assistant_msg("checking"), - tool_msg("result data", "call_1"), - text_msg("user", "## Previous conversation summary\n\nWorked on auth"), - text_msg("user", "Continue from trajectory abc."), - assistant_msg("continuing"), - ]; - let result = linearize_thread_for_llm(&msgs); - // system, user, assistant, tool, merged(user+user), assistant - assert_eq!(result.len(), 6); - assert_eq!(result[4].role, "user"); - let text = result[4].content.content_text_only(); - assert!(text.contains("Previous conversation")); - assert!(text.contains("Continue from trajectory")); - } - - /// Complex real-world: mixed cf, user, cf, user, cd_instruction sequence - #[test] - fn test_real_complex_mixed_sequence() { - let msgs = vec![ - text_msg("system", "system prompt"), - context_file_msg(vec![("AGENTS.md", "config", 1, 10)]), - context_file_msg(vec![("knowledge.md", "cached", 1, 4)]), - text_msg("user", "## Previous conversation\n\nWorked on UI"), - text_msg("user", "Continue from trajectory xyz."), - context_file_msg(vec![("new_knowledge.md", "fresh context", 1, 4)]), - text_msg("user", "one more crazy example"), - text_msg("user", "just make sure that this madness is really fixed"), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); // system + one big merged user - let text = result[1].content.content_text_only(); - assert!(text.contains("AGENTS.md")); - assert!(text.contains("knowledge.md")); - assert!(text.contains("Previous conversation")); - assert!(text.contains("Continue from trajectory")); - assert!(text.contains("new_knowledge.md")); - assert!(text.contains("one more crazy example")); - assert!(text.contains("madness is really fixed")); - } - - /// 1x: diff → context_file, user → assistant (7x in real data) - #[test] - fn test_real_diff_then_cf_user() { - let msgs = vec![ - text_msg("system", "system prompt"), - text_msg("user", "start"), - assistant_msg("making changes"), - ChatMessage { - role: "diff".to_string(), - content: ChatContent::SimpleText("applied patch".to_string()), - tool_call_id: "call_1".to_string(), - ..Default::default() - }, - context_file_msg(vec![("updated.rs", "new code", 1, 10)]), - text_msg("user", "looks good, continue"), - ]; - let result = linearize_thread_for_llm(&msgs); - // system, user, assistant, diff(+cf), user - assert_eq!(result.len(), 5); - assert_eq!(result[3].role, "diff"); - let diff_text = result[3].content.content_text_only(); - assert!(diff_text.contains("applied patch")); - assert!(diff_text.contains("updated.rs")); - assert_eq!(result[4].role, "user"); - assert_eq!(result[4].content.content_text_only(), "looks good, continue"); - } - - /// cd_instruction alone (4x: cd_instruction, user) - #[test] - fn test_real_cd_instruction_then_user() { - let msgs = vec![ - text_msg("system", "system prompt"), - text_msg("user", "start"), - assistant_msg("done"), - tool_msg("result", "call_1"), - text_msg("cd_instruction", "💿 Review complete. Present findings to the user."), - text_msg("user", "what did you find?"), - ]; - let result = linearize_thread_for_llm(&msgs); - // system, user, assistant, tool(+cd), user - assert_eq!(result.len(), 5); - let tool_text = result[3].content.content_text_only(); - assert!(tool_text.contains("result")); - assert!(tool_text.contains("💿 Review complete")); - assert_eq!(result[4].role, "user"); - assert_eq!(result[4].content.content_text_only(), "what did you find?"); - } - - /// Multimodal user messages (406x: user with list content in real data) - #[test] - fn test_real_multimodal_user_with_context_file() { - let msgs = vec![ - text_msg("system", "system prompt"), - context_file_msg(vec![("screenshot.md", "description of UI", 1, 5)]), - multimodal_msg("user", vec![ - ("text", "Here's a screenshot of the bug"), - ("image/png", "base64encodeddata"), - ]), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 2); // system + merged user - // Should be Multimodal since it contains an image - match &result[1].content { - ChatContent::Multimodal(elements) => { - // Should have: text from cf, text from user, image from user - let texts: Vec<_> = elements.iter().filter(|e| e.is_text()).collect(); - let images: Vec<_> = elements.iter().filter(|e| e.is_image()).collect(); - assert!(!texts.is_empty()); - assert_eq!(images.len(), 1); - let all_text: String = texts.iter().map(|e| e.m_content.as_str()).collect::>().join(" "); - assert!(all_text.contains("screenshot.md")); - assert!(all_text.contains("screenshot of the bug")); - } - _ => panic!("Expected Multimodal content when merging text + image"), - } - } - - /// Core trajectory pattern: tool → context_file folds into tool - #[test] - fn test_tool_cf_folds_into_tool() { - let msgs = vec![ - text_msg("system", "system prompt"), - text_msg("user", "do something"), - assistant_msg("calling tool"), - tool_msg("tool result", "call_1"), - context_file_msg(vec![("file.rs", "fn main() {}", 1, 5)]), - ]; - let result = linearize_thread_for_llm(&msgs); - // system, user, assistant, tool(+cf) - assert_eq!(result.len(), 4); - assert_eq!(result[3].role, "tool"); - let text = result[3].content.content_text_only(); - assert!(text.contains("tool result")); - assert!(text.contains("file.rs")); - } - - /// Multiple context_files after tool all fold in - #[test] - fn test_tool_multiple_cf_fold() { - let msgs = vec![ - text_msg("user", "go"), - assistant_msg("ok"), - tool_msg("found files", "call_1"), - context_file_msg(vec![("a.rs", "aaa", 1, 3)]), - context_file_msg(vec![("b.rs", "bbb", 1, 3)]), - context_file_msg(vec![("c.rs", "ccc", 1, 3)]), - ]; - let result = linearize_thread_for_llm(&msgs); - // user, assistant, tool(+cf+cf+cf) - assert_eq!(result.len(), 3); - assert_eq!(result[2].role, "tool"); - let text = result[2].content.content_text_only(); - assert!(text.contains("found files")); - assert!(text.contains("a.rs")); - assert!(text.contains("b.rs")); - assert!(text.contains("c.rs")); - } - - /// Repeating tool loop: tool→cf→assistant→tool→cf→assistant - #[test] - fn test_repeating_tool_cf_loop() { - let msgs = vec![ - text_msg("system", "sys"), - text_msg("user", "start"), - assistant_msg("step 1"), - tool_msg("result 1", "call_1"), - context_file_msg(vec![("f1.rs", "code1", 1, 5)]), - assistant_msg("step 2"), - tool_msg("result 2", "call_2"), - context_file_msg(vec![("f2.rs", "code2", 1, 5)]), - assistant_msg("done"), - ]; - let result = linearize_thread_for_llm(&msgs); - // system, user, assistant, tool(+cf), assistant, tool(+cf), assistant - assert_eq!(result.len(), 7); - assert_eq!(result[3].role, "tool"); - assert!(result[3].content.content_text_only().contains("f1.rs")); - assert_eq!(result[4].role, "assistant"); - assert_eq!(result[5].role, "tool"); - assert!(result[5].content.content_text_only().contains("f2.rs")); - assert_eq!(result[6].role, "assistant"); - } - - /// Real trajectory pattern: 12x tool→cf→assistant repeating - #[test] - fn test_long_tool_cf_loop() { - let mut msgs = vec![ - text_msg("system", "sys"), - context_file_msg(vec![("init.rs", "init", 1, 1)]), - text_msg("user", "fix bugs"), - ]; - for i in 0..12 { - msgs.push(assistant_msg(&format!("step {i}"))); - msgs.push(tool_msg(&format!("result {i}"), &format!("call_{i}"))); - msgs.push(context_file_msg(vec![(&format!("f{i}.rs"), &format!("code{i}"), 1, 5)])); - } - let result = linearize_thread_for_llm(&msgs); - // system, user(init.rs+user), then 12x (assistant, tool(+cf)) = 2 + 24 = 26 - assert_eq!(result.len(), 26); - for i in 0..12 { - let tool_idx = 3 + i * 2; - assert_eq!(result[tool_idx].role, "tool", "idx {tool_idx}"); - let text = result[tool_idx].content.content_text_only(); - assert!(text.contains(&format!("result {i}"))); - assert!(text.contains(&format!("f{i}.rs"))); - } - } - - /// tool → user does NOT fold (user stays separate) - #[test] - fn test_tool_then_real_user_no_fold() { - let msgs = vec![ - text_msg("user", "go"), - assistant_msg("ok"), - tool_msg("result", "call_1"), - text_msg("user", "thanks, now do more"), - ]; - let result = linearize_thread_for_llm(&msgs); - // user, assistant, tool, user - assert_eq!(result.len(), 4); - assert_eq!(result[2].role, "tool"); - assert_eq!(result[2].content.content_text_only(), "result"); - assert_eq!(result[3].role, "user"); - assert_eq!(result[3].content.content_text_only(), "thanks, now do more"); - } - - /// tool → cf → user: cf folds into tool, user stays separate - #[test] - fn test_tool_cf_then_user_separate() { - let msgs = vec![ - text_msg("user", "go"), - assistant_msg("ok"), - tool_msg("result", "call_1"), - context_file_msg(vec![("x.rs", "code", 1, 5)]), - text_msg("user", "now fix it"), - ]; - let result = linearize_thread_for_llm(&msgs); - // user, assistant, tool(+cf), user - assert_eq!(result.len(), 4); - assert_eq!(result[2].role, "tool"); - assert!(result[2].content.content_text_only().contains("x.rs")); - assert_eq!(result[3].role, "user"); - assert_eq!(result[3].content.content_text_only(), "now fix it"); - } - - /// tool_call_id preserved when folding into tool - #[test] - fn test_tool_cf_preserves_tool_call_id() { - let msgs = vec![ - text_msg("user", "go"), - assistant_msg("ok"), - tool_msg("result", "call_abc123"), - context_file_msg(vec![("x.rs", "code", 1, 5)]), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result[2].role, "tool"); - assert_eq!(result[2].tool_call_id, "call_abc123"); - } - - /// context_file after assistant (not tool) → user group as before - #[test] - fn test_cf_after_assistant_becomes_user() { - let msgs = vec![ - text_msg("system", "sys"), - assistant_msg("hello"), - context_file_msg(vec![("x.rs", "code", 1, 5)]), - text_msg("user", "continue"), - ]; - let result = linearize_thread_for_llm(&msgs); - // system, assistant, user(cf+user) - assert_eq!(result.len(), 3); - assert_eq!(result[2].role, "user"); - let text = result[2].content.content_text_only(); - assert!(text.contains("x.rs")); - assert!(text.contains("continue")); - } - - /// Empty context_file after tool doesn't corrupt tool content - #[test] - fn test_tool_empty_cf_no_corruption() { - let msgs = vec![ - text_msg("user", "go"), - assistant_msg("ok"), - tool_msg("result", "call_1"), - text_msg("context_file", ""), - ]; - let result = linearize_thread_for_llm(&msgs); - assert_eq!(result.len(), 3); - assert_eq!(result[2].role, "tool"); - assert_eq!(result[2].content.content_text_only(), "result"); - } - - /// Idempotency with tool→cf folding - #[test] - fn test_idempotency_tool_cf() { - let msgs = vec![ - text_msg("system", "sys"), - text_msg("user", "go"), - assistant_msg("ok"), - tool_msg("result", "call_1"), - context_file_msg(vec![("x.rs", "code", 1, 5)]), - text_msg("user", "more"), - ]; - let first = linearize_thread_for_llm(&msgs); - let second = linearize_thread_for_llm(&first); - assert_eq!(first.len(), second.len()); - for (a, b) in first.iter().zip(second.iter()) { - assert_eq!(a.role, b.role); - assert_eq!(a.content.content_text_only(), b.content.content_text_only()); - } - } - - /// Multiple tools then cf folds into LAST tool - #[test] - fn test_multiple_tools_cf_folds_into_last() { - let msgs = vec![ - text_msg("user", "go"), - assistant_msg("ok"), - tool_msg("result A", "call_1"), - tool_msg("result B", "call_2"), - context_file_msg(vec![("x.rs", "code", 1, 5)]), - ]; - let result = linearize_thread_for_llm(&msgs); - // user, assistant, tool(A), tool(B+cf) - assert_eq!(result.len(), 4); - assert_eq!(result[2].content.content_text_only(), "result A"); - assert!(result[3].content.content_text_only().contains("result B")); - assert!(result[3].content.content_text_only().contains("x.rs")); - } -} diff --git a/refact-agent/engine/src/chat/mod.rs b/refact-agent/engine/src/chat/mod.rs index a689310d91..71afcad4a6 100644 --- a/refact-agent/engine/src/chat/mod.rs +++ b/refact-agent/engine/src/chat/mod.rs @@ -5,7 +5,6 @@ mod content; mod generation; mod handlers; pub mod history_limit; -pub mod linearize; mod openai_merge; pub mod prepare; mod tool_call_recovery; diff --git a/refact-agent/engine/src/chat/prepare.rs b/refact-agent/engine/src/chat/prepare.rs index 16d81c1487..ea9955244c 100644 --- a/refact-agent/engine/src/chat/prepare.rs +++ b/refact-agent/engine/src/chat/prepare.rs @@ -14,6 +14,7 @@ use crate::llm::params::CacheControl; use crate::scratchpad_abstract::HasTokenizerAndEot; use crate::scratchpads::scratchpad_utils::HasRagResults; use crate::tools::tools_description::ToolDesc; +use crate::tools::tool_name_alias::build_registry_from_names; use super::tools::execute_tools; use super::types::ThreadParams; @@ -133,7 +134,7 @@ pub async fn prepare_chat_passthrough( }; let task_meta = ccx.lock().await.task_meta.clone(); let messages = if options.prepend_system_prompt { - prepend_the_right_system_prompt_and_maybe_more_initial_messages( + let (msgs, _) = prepend_the_right_system_prompt_and_maybe_more_initial_messages( gcx.clone(), messages, meta, @@ -143,7 +144,8 @@ pub async fn prepare_chat_passthrough( mode_id, model_id, ) - .await + .await; + msgs } else { messages }; @@ -209,45 +211,102 @@ pub async fn prepare_chat_passthrough( } } - // 6. Build tools list + // 6. Build tools list with alias layer to ensure provider-safe names (≤64 chars) let filtered_tools: Vec = if options.supports_tools { - tools - .iter() - .filter(|x| x.is_supported_by(model_id)) - .cloned() - .collect() + tools.to_vec() } else { vec![] }; let strict_tools = model_record.supports_strict_tools; - let openai_tools: Vec = filtered_tools + let tool_names: Vec = filtered_tools.iter().map(|t| t.name.clone()).collect(); + let alias_registry = build_registry_from_names(&tool_names); + let mut openai_tools: Vec = filtered_tools .iter() - .map(|tool| tool.clone().into_openai_style(strict_tools)) + .map(|tool| { + let alias = alias_registry.get_alias(&tool.name).unwrap_or(&tool.name).to_string(); + let mut v = tool.clone().into_openai_style(strict_tools); + if alias != tool.name { + if let Some(func) = v.get_mut("function") { + func["name"] = serde_json::Value::String(alias); + } + } + v + }) .collect(); + // 6b. Enrich handoff_to_mode tool with dynamic mode list + if options.supports_tools { + let handoff_alias = alias_registry.get_alias("handoff_to_mode").unwrap_or("handoff_to_mode"); + if let Some(idx) = openai_tools.iter().position(|t| { + t.get("function") + .and_then(|f| f.get("name")) + .and_then(|n| n.as_str()) + .map(|n| n == handoff_alias) + .unwrap_or(false) + }) { + if let Some(registry) = crate::yaml_configs::customization_registry::get_project_registry(gcx.clone()).await { + let mut mode_lines = Vec::new(); + let mut mode_ids = Vec::new(); + let mut modes: Vec<_> = registry.modes.values().collect(); + modes.sort_by(|a, b| a.id.cmp(&b.id)); + for mode in modes { + if mode.specific { + continue; + } + let title = if mode.title.is_empty() { + mode.id.clone() + } else { + mode.title.clone() + }; + let mut desc = mode.description.clone(); + if desc.len() > 120 { + desc = format!("{}...", desc.chars().take(120).collect::()); + } + mode_lines.push(format!("- {}: {}", mode.id, if desc.is_empty() { title } else { desc })); + mode_ids.push(mode.id.clone()); + } + let mode_list = mode_lines.join("\n"); + if let Some(func) = openai_tools[idx].get_mut("function") { + if let Some(desc_val) = func.get_mut("description") { + let desc = desc_val.as_str().unwrap_or(""); + let enriched = format!("{}\n\nAvailable modes:\n{}", desc, mode_list); + *desc_val = serde_json::Value::String(enriched); + } + if let Some(params) = func.get_mut("parameters") { + if let Some(props) = params.get_mut("properties") { + if let Some(target_mode) = props.get_mut("target_mode") { + let desc = format!("Target mode ID. Available modes:\n{}", mode_list); + target_mode["description"] = serde_json::Value::String(desc); + target_mode["enum"] = serde_json::Value::Array( + mode_ids.into_iter().map(serde_json::Value::String).collect() + ); + } + } + } + } + } + } + } + // 7. History validation and fixing let limited_msgs = fix_and_limit_messages_history(&messages, sampling_parameters)?; // 8. Strip thinking blocks if thinking is disabled - let limited_adapted_msgs = + let mut limited_adapted_msgs = strip_thinking_blocks_if_disabled(limited_msgs, sampling_parameters, &model_record); - // 9. Linearize thread: merge consecutive user-like messages for cache-friendly - // strict role alternation (system/user/assistant/user/assistant/...) - let mut linearized_msgs = super::linearize::linearize_thread_for_llm(&limited_adapted_msgs); - // OpenAI Responses API stateful multi-turn: when we chain with previous_response_id, // we should send only the new tail items (tool outputs and/or new user message). if model_record.base.wire_format == WireFormat::OpenaiResponses && thread.previous_response_id.as_ref().is_some_and(|s| !s.is_empty()) { - let tail = responses_stateful_tail(linearized_msgs.clone()); + let tail = responses_stateful_tail(limited_adapted_msgs.clone()); let mut stitched = Vec::new(); if let Some(sys) = last_system_message(&limited_adapted_msgs) { stitched.push(sys); } stitched.extend(tail); - linearized_msgs = stitched; + limited_adapted_msgs = stitched; } // 10. Build LlmRequest @@ -267,10 +326,13 @@ pub async fn prepare_chat_passthrough( ToolChoice::Auto => CanonicalToolChoice::Auto, ToolChoice::None => CanonicalToolChoice::None, ToolChoice::Required => CanonicalToolChoice::Required, - ToolChoice::Function { name } => CanonicalToolChoice::Function { name: name.clone() }, + ToolChoice::Function { name } => { + let aliased_name = alias_registry.get_alias(name).unwrap_or(name).to_string(); + CanonicalToolChoice::Function { name: aliased_name } + }, }); - let mut llm_request = LlmRequest::new(model_id.to_string(), linearized_msgs.clone()) + let mut llm_request = LlmRequest::new(model_id.to_string(), limited_adapted_msgs.clone()) .with_params(common_params) .with_tools(openai_tools, tool_choice) .with_reasoning(reasoning) @@ -299,7 +361,7 @@ pub async fn prepare_chat_passthrough( Ok(PreparedChat { llm_request, - limited_messages: linearized_msgs, + limited_messages: limited_adapted_msgs, rag_results: has_rag_results.in_json, }) } diff --git a/refact-agent/engine/src/chat/prompt_snippets.rs b/refact-agent/engine/src/chat/prompt_snippets.rs index b03b73583f..54fdb77a2e 100644 --- a/refact-agent/engine/src/chat/prompt_snippets.rs +++ b/refact-agent/engine/src/chat/prompt_snippets.rs @@ -62,3 +62,22 @@ pub const AGENT_EXECUTION_INSTRUCTIONS_NO_TOOLS: &str = r#" - Propose the chang - the exact files/functions to modify or create - the new or updated tests to add - the expected outcome and success criteria"#; + +pub const RICH_CONTENT_INSTRUCTIONS: &str = r#"The chat window renders rich visual content from fenced code blocks. When you write these, the user sees the rendered result directly in the conversation (not raw code): +- ` ```mermaid ` — the user sees a rendered Mermaid diagram (flowcharts, sequence diagrams, ER diagrams, etc.) +- ` ```svg ` — the user sees the rendered SVG image inline +- ` ```html ` — the user sees a live interactive preview in a sandboxed iframe (HTML + CSS + JS). You can load CDN libraries via "); + assert_eq!(result, "<script>alert('xss')</script>"); + assert!(!result.contains('<')); + assert!(!result.contains('>')); + assert!(!result.contains('\'')); + } + + #[test] + fn test_html_response_contains_csp_header() { + let response = html_response("Title", "Heading", "#4ade80", "Message").unwrap(); + let csp = response.headers().get("Content-Security-Policy").unwrap(); + let csp_str = csp.to_str().unwrap(); + assert!(csp_str.contains("default-src 'none'")); + assert!(csp_str.contains("style-src 'unsafe-inline'")); + } + + #[test] + fn test_config_path_traversal_rejected() { + assert!(reject_path_traversal("../../etc/passwd").is_err()); + assert!(reject_path_traversal("/tmp/../etc/passwd").is_err()); + assert!(reject_path_traversal("foo/../bar").is_err()); + assert!(reject_path_traversal("/safe/path/config.yaml").is_ok()); + assert!(reject_path_traversal("/home/user/.config/refact/integrations.d/mcp_http_myserver.yaml").is_ok()); + } + + #[tokio::test] + async fn test_oauth_start_fails_gracefully_when_server_unreachable() { + use crate::integrations::mcp::mcp_auth::MCPOAuthSessionManager; + let result = MCPOAuthSessionManager::start_oauth_flow( + "http://127.0.0.1:1", + "/tmp/test_mcp_oauth.yaml", + &[], + "http://127.0.0.1:8001/v1/mcp/oauth/callback", + ).await; + assert!(result.is_err(), "start_oauth_flow should fail when server is unreachable"); + let err = result.unwrap_err(); + assert!(!err.is_empty(), "error message should not be empty"); + } + + #[tokio::test] + async fn test_exchange_code_rejects_unknown_session_id() { + use crate::integrations::mcp::mcp_auth::MCPOAuthSessionManager; + let result = MCPOAuthSessionManager::exchange_code("unknown-session-id-12345", "some_code").await; + assert!(result.is_err(), "exchange with unknown session should fail"); + assert!(result.unwrap_err().contains("No pending OAuth session"), "should say session not found"); + } + + #[tokio::test] + async fn test_expired_sessions_are_rejected() { + use crate::integrations::mcp::mcp_auth::MCPOAuthSessionManager; + MCPOAuthSessionManager::cleanup_expired_sessions().await; + let result = MCPOAuthSessionManager::exchange_code("nonexistent-session-xyz", "code").await; + assert!(result.is_err()); + assert!(result.unwrap_err().contains("No pending OAuth session")); + } + + #[tokio::test] + async fn test_logout_clears_tokens_from_config() { + let mut tmp = NamedTempFile::new().unwrap(); + let existing = "url: https://example.com\nauth_type: oauth2_pkce\n"; + tmp.write_all(existing.as_bytes()).unwrap(); + let path = tmp.path().to_str().unwrap().to_string(); + + let tokens = MCPOAuthTokens { + access_token: "tok".to_string(), + refresh_token: "ref".to_string(), + expires_at: 9999999999000, + client_id: "cid".to_string(), + client_secret: None, + scopes: vec!["read".to_string()], + }; + save_tokens_to_config(&path, &tokens).await.unwrap(); + assert!(load_tokens_from_config(&path).await.is_some()); + + clear_tokens_from_config(&path).await.unwrap(); + assert!(load_tokens_from_config(&path).await.is_none(), "tokens should be cleared"); + let content = tokio::fs::read_to_string(&path).await.unwrap(); + assert!(content.contains("url: https://example.com"), "other fields preserved"); + } + + #[tokio::test] + async fn test_status_returns_authenticated_when_valid_token() { + let mut tmp = NamedTempFile::new().unwrap(); + let now_ms = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64; + let future_expiry = now_ms + 3_600_000; + let yaml = format!( + "url: https://example.com\nauth_type: oauth2_pkce\noauth_tokens:\n access_token: live_token\n refresh_token: ref\n expires_at: {}\n client_id: cid\n scopes:\n - read\n", + future_expiry + ); + tmp.write_all(yaml.as_bytes()).unwrap(); + let path = tmp.path().to_str().unwrap().to_string(); + + let tokens = load_tokens_from_config(&path).await; + assert!(tokens.is_some()); + let t = tokens.unwrap(); + assert_eq!(t.access_token, "live_token"); + let authenticated = !t.access_token.is_empty() && (t.expires_at == 0 || t.expires_at > now_ms); + assert!(authenticated, "token should be valid"); + } + + #[tokio::test] + async fn test_status_returns_not_authenticated_when_expired() { + let now_ms = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64; + let past_expiry = now_ms - 1_000; + let mut tmp = NamedTempFile::new().unwrap(); + let yaml = format!( + "auth_type: oauth2_pkce\noauth_tokens:\n access_token: expired_token\n refresh_token: ref\n expires_at: {}\n client_id: cid\n scopes: []\n", + past_expiry + ); + tmp.write_all(yaml.as_bytes()).unwrap(); + let path = tmp.path().to_str().unwrap().to_string(); + + let tokens = load_tokens_from_config(&path).await; + assert!(tokens.is_some()); + let t = tokens.unwrap(); + let authenticated = !t.access_token.is_empty() && (t.expires_at == 0 || t.expires_at > now_ms); + assert!(!authenticated, "expired token should not be authenticated"); + } +} diff --git a/refact-agent/engine/src/http/routers/v1/mcp_server_info.rs b/refact-agent/engine/src/http/routers/v1/mcp_server_info.rs new file mode 100644 index 0000000000..5124f600da --- /dev/null +++ b/refact-agent/engine/src/http/routers/v1/mcp_server_info.rs @@ -0,0 +1,465 @@ +use std::sync::Arc; +use axum::Extension; +use axum::extract::Query; +use axum::http::{Response, StatusCode}; +use hyper::Body; +use serde::{Deserialize, Serialize}; +use tokio::sync::RwLock as ARwLock; + +use crate::custom_error::ScratchError; +use crate::global_context::GlobalContext; +use crate::integrations::mcp::mcp_naming; +use crate::integrations::mcp::session_mcp::{SessionMCP, MCPConnectionStatus}; +use crate::integrations::mcp::mcp_metrics::MCPServerMetrics; +use crate::integrations::running_integrations::load_integrations; + +#[derive(Deserialize)] +pub struct McpServerInfoQuery { + pub config_path: String, +} + +#[derive(Deserialize)] +pub struct McpServerReconnectRequest { + pub config_path: String, +} + +#[derive(Serialize)] +struct McpToolInfo { + name: String, + description: String, + input_schema: serde_json::Value, + #[serde(skip_serializing_if = "Option::is_none")] + annotations: Option, + internal_name: String, +} + +#[derive(Serialize)] +struct McpResourceInfo { + uri: String, + name: String, + #[serde(skip_serializing_if = "Option::is_none")] + description: Option, + #[serde(skip_serializing_if = "Option::is_none")] + mime_type: Option, +} + +#[derive(Serialize)] +struct McpPromptInfo { + name: String, + #[serde(skip_serializing_if = "Option::is_none")] + description: Option, +} + +#[derive(Serialize)] +struct McpServerInfoResponse { + config_path: String, + status: serde_json::Value, + auth_status: serde_json::Value, + #[serde(skip_serializing_if = "Option::is_none")] + server_name: Option, + #[serde(skip_serializing_if = "Option::is_none")] + server_version: Option, + #[serde(skip_serializing_if = "Option::is_none")] + protocol_version: Option, + tools: Vec, + resources: Vec, + prompts: Vec, + capabilities: serde_json::Value, + logs_tail: Vec, + metrics: MCPServerMetrics, +} + +pub async fn handle_v1_mcp_server_info( + Extension(gcx): Extension>>, + Query(params): Query, +) -> axum::response::Result, ScratchError> { + let session_key = params.config_path.clone(); + + let session = gcx + .read() + .await + .integration_sessions + .get(&session_key) + .cloned() + .ok_or(ScratchError::new( + StatusCode::NOT_FOUND, + format!("no session for {}", session_key), + ))?; + + let (config_path_clone, connection_status, auth_status, server_info, tools_raw, resources_raw, prompts_raw, logs_arc, metrics_arc) = { + let mut session_locked = session.lock().await; + let mcp_session = session_locked + .as_any_mut() + .downcast_mut::() + .ok_or(ScratchError::new( + StatusCode::INTERNAL_SERVER_ERROR, + "session is not an MCP session".to_string(), + ))?; + ( + mcp_session.config_path.clone(), + mcp_session.connection_status.clone(), + mcp_session.auth_status.clone(), + mcp_session.server_info.clone(), + mcp_session.mcp_tools.clone(), + mcp_session.mcp_resources.clone(), + mcp_session.mcp_prompts.clone(), + mcp_session.logs.clone(), + mcp_session.metrics.clone(), + ) + }; + + let status = serde_json::to_value(&connection_status).unwrap_or(serde_json::Value::Null); + let auth_status_json = serde_json::to_value(&auth_status).unwrap_or(serde_json::Value::Null); + + let (server_name, server_version, protocol_version, capabilities_json) = + if let Some(ref info) = server_info { + ( + Some(info.server_info.name.clone()), + Some(info.server_info.version.clone()), + Some(info.protocol_version.to_string()), + serde_json::json!({ + "tools": info.capabilities.tools.is_some(), + "resources": info.capabilities.resources.is_some(), + "prompts": info.capabilities.prompts.is_some(), + "sampling": true, + }), + ) + } else { + ( + None, + None, + None, + serde_json::json!({ + "tools": false, + "resources": false, + "prompts": false, + "sampling": true, + }), + ) + }; + + let yaml_name = std::path::Path::new(&config_path_clone) + .file_stem() + .and_then(|name| name.to_str()) + .unwrap_or("unknown"); + let shortened_yaml_name = mcp_naming::shorten_config_name(yaml_name); + + let tools: Vec = tools_raw.iter().map(|tool| { + let input_schema = { + let mut map = tool.input_schema.as_ref().clone(); + if !map.contains_key("type") { + map.insert("type".to_string(), serde_json::json!("object")); + } + serde_json::Value::Object(map) + }; + + let internal_name = format!("{}_{}", shortened_yaml_name, tool.name) + .chars() + .map(|c| if c.is_ascii_alphanumeric() { c } else { '_' }) + .collect::(); + + let annotations = tool.annotations.as_ref().and_then(|a| serde_json::to_value(a).ok()); + + McpToolInfo { + name: tool.name.to_string(), + description: tool.description.as_deref().unwrap_or_default().to_string(), + input_schema, + annotations, + internal_name, + } + }).collect(); + + let resources: Vec = resources_raw.iter().map(|resource| { + McpResourceInfo { + uri: resource.uri.to_string(), + name: resource.name.to_string(), + description: resource.description.as_deref().map(|s| s.to_string()), + mime_type: resource.mime_type.clone().map(|s| s.to_string()), + } + }).collect(); + + let prompts: Vec = prompts_raw.iter().map(|prompt| { + McpPromptInfo { + name: prompt.name.to_string(), + description: prompt.description.as_deref().map(|s| s.to_string()), + } + }).collect(); + + let logs_tail = logs_arc.try_lock() + .map(|l| l.clone()) + .unwrap_or_default(); + + let metrics = if let Ok(mut m) = metrics_arc.try_lock() { + m.snapshot() + } else { + crate::integrations::mcp::mcp_metrics::MCPServerMetrics::default() + }; + + let response = McpServerInfoResponse { + config_path: session_key, + status, + auth_status: auth_status_json, + server_name, + server_version, + protocol_version, + tools, + resources, + prompts, + capabilities: capabilities_json, + logs_tail, + metrics, + }; + + let payload = serde_json::to_string_pretty(&response).map_err(|e| { + ScratchError::new( + StatusCode::INTERNAL_SERVER_ERROR, + format!("failed to serialize: {}", e), + ) + })?; + + Ok(Response::builder() + .status(StatusCode::OK) + .header("Content-Type", "application/json") + .body(Body::from(payload)) + .unwrap()) +} + +pub async fn handle_v1_mcp_server_reconnect( + Extension(gcx): Extension>>, + body_bytes: hyper::body::Bytes, +) -> axum::response::Result, ScratchError> { + let post = serde_json::from_slice::(&body_bytes).map_err(|e| { + ScratchError::new( + StatusCode::UNPROCESSABLE_ENTITY, + format!("JSON problem: {}", e), + ) + })?; + + let session_key = post.config_path.clone(); + + let session = gcx + .read() + .await + .integration_sessions + .get(&session_key) + .cloned() + .ok_or(ScratchError::new( + StatusCode::NOT_FOUND, + format!("no session for {}", session_key), + ))?; + + let (client, logs) = { + let mut session_locked = session.lock().await; + let mcp_session = session_locked + .as_any_mut() + .downcast_mut::() + .ok_or(ScratchError::new( + StatusCode::INTERNAL_SERVER_ERROR, + "session is not an MCP session".to_string(), + ))?; + + let reconnecting = matches!( + &mcp_session.connection_status, + MCPConnectionStatus::Reconnecting { .. } | MCPConnectionStatus::Connecting + ); + if reconnecting { + return Err(ScratchError::new( + StatusCode::CONFLICT, + "MCP server is already connecting or reconnecting".to_string(), + )); + } + + mcp_session.connection_status = MCPConnectionStatus::Disconnected; + mcp_session.launched_cfg = serde_json::Value::Null; + (mcp_session.mcp_client.clone(), mcp_session.logs.clone()) + }; + + if let Some(client_arc) = client { + crate::integrations::mcp::session_mcp::cancel_mcp_client( + &session_key, + client_arc, + logs, + ) + .await; + } + + { + let mut session_locked = session.lock().await; + let mcp_session = session_locked + .as_any_mut() + .downcast_mut::() + .ok_or(ScratchError::new( + StatusCode::INTERNAL_SERVER_ERROR, + "session is not an MCP session".to_string(), + ))?; + mcp_session.mcp_tools = vec![]; + mcp_session.mcp_resources = vec![]; + mcp_session.mcp_prompts = vec![]; + mcp_session.server_info = None; + mcp_session.connection_status = MCPConnectionStatus::Connecting; + } + + let config_filename = std::path::Path::new(&session_key) + .file_name() + .map(|f| f.to_string_lossy().to_string()) + .unwrap_or_default(); + let _ = load_integrations(gcx.clone(), &[format!("**/integrations.d/{}", config_filename)]).await; + + Ok(Response::builder() + .status(StatusCode::OK) + .header("Content-Type", "application/json") + .body(Body::from(serde_json::json!({"reconnect_triggered": true}).to_string())) + .unwrap()) +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::integrations::mcp::session_mcp::{MCPAuthStatus}; + + #[test] + fn test_mcp_server_info_response_serializes() { + let response = McpServerInfoResponse { + config_path: "mcp_stdio_test.yaml".to_string(), + status: serde_json::json!({"status": "connected"}), + auth_status: serde_json::json!("not_applicable"), + server_name: Some("TestServer".to_string()), + server_version: Some("1.0.0".to_string()), + protocol_version: Some("2024-11-05".to_string()), + tools: vec![McpToolInfo { + name: "my_tool".to_string(), + description: "does things".to_string(), + input_schema: serde_json::json!({"type": "object", "properties": {}}), + annotations: None, + internal_name: "mcp_test_my_tool".to_string(), + }], + resources: vec![], + prompts: vec![], + capabilities: serde_json::json!({"tools": true, "resources": false, "prompts": false, "sampling": true}), + logs_tail: vec!["[12:00:00] Connected".to_string()], + metrics: MCPServerMetrics::default(), + }; + + let json = serde_json::to_string(&response).unwrap(); + assert!(json.contains("TestServer")); + assert!(json.contains("mcp_test_my_tool")); + assert!(json.contains("Connected")); + assert!(json.contains("\"metrics\"")); + assert!(json.contains("\"sampling\":true")); + } + + #[test] + fn test_mcp_server_info_response_no_server_info() { + let response = McpServerInfoResponse { + config_path: "mcp_stdio_test.yaml".to_string(), + status: serde_json::json!({"status": "disconnected"}), + auth_status: serde_json::json!("not_applicable"), + server_name: None, + server_version: None, + protocol_version: None, + tools: vec![], + resources: vec![], + prompts: vec![], + capabilities: serde_json::json!({"tools": false, "resources": false, "prompts": false, "sampling": true}), + logs_tail: vec![], + metrics: MCPServerMetrics::default(), + }; + + let json = serde_json::to_value(&response).unwrap(); + assert!(json.get("server_name").is_none(), "server_name should be omitted when None"); + assert!(json.get("server_version").is_none(), "server_version should be omitted when None"); + assert!(json.get("protocol_version").is_none(), "protocol_version should be omitted when None"); + assert!(json.get("metrics").is_some(), "metrics should always be present"); + assert_eq!(json["capabilities"]["sampling"], serde_json::json!(true)); + } + + #[test] + fn test_mcp_metrics_in_response() { + use crate::integrations::mcp::mcp_metrics::MCPMetricsCollector; + use std::time::Instant; + let mut collector = MCPMetricsCollector::new(); + let start = Instant::now(); + collector.record_call_success("test_tool", start); + collector.record_call_failure("bad_tool", start); + let metrics = collector.snapshot(); + assert_eq!(metrics.total_tool_calls, 2); + assert_eq!(metrics.successful_calls, 1); + assert_eq!(metrics.failed_calls, 1); + assert!(metrics.tool_stats.contains_key("test_tool")); + assert!(metrics.tool_stats.contains_key("bad_tool")); + } + + #[test] + fn test_shorten_mcp_yaml_name() { + assert_eq!(mcp_naming::shorten_config_name("mcp_stdio_github"), "mcp_github"); + assert_eq!(mcp_naming::shorten_config_name("mcp_sse_myserver"), "mcp_myserver"); + assert_eq!(mcp_naming::shorten_config_name("mcp_http_myserver"), "mcp_myserver"); + assert_eq!(mcp_naming::shorten_config_name("other_integration"), "other_integration"); + } + + #[test] + fn test_mcp_http_prefix_stripped_in_internal_name() { + let yaml_name = "mcp_http_myserver"; + let shortened = mcp_naming::shorten_config_name(yaml_name); + assert_eq!(shortened, "mcp_myserver"); + } + + #[test] + fn test_reconnect_sets_status_to_connecting() { + use crate::integrations::mcp::mcp_metrics::new_shared_metrics; + use tokio::sync::Mutex as AMutex; + let mut session = SessionMCP { + debug_name: "test".to_string(), + config_path: "/tmp/mcp_stdio_test.yaml".to_string(), + launched_cfg: serde_json::json!({"command": "npx", "args": ["something"]}), + mcp_client: None, + mcp_tools: Vec::new(), + mcp_resources: Vec::new(), + mcp_prompts: Vec::new(), + server_info: None, + startup_task_handles: None, + health_task_handle: None, + logs: Arc::new(AMutex::new(Vec::new())), + stderr_file_path: None, + stderr_cursor: Arc::new(AMutex::new(0)), + connection_status: MCPConnectionStatus::Disconnected, + last_successful_connection: None, + metrics: new_shared_metrics(), + auth_manager: None, + auth_status: MCPAuthStatus::NotApplicable, + oauth_refresh_task_handle: None, + }; + session.connection_status = MCPConnectionStatus::Connecting; + assert!(matches!(session.connection_status, MCPConnectionStatus::Connecting)); + } + + #[test] + fn test_reconnect_resets_launched_cfg_to_null() { + use crate::integrations::mcp::mcp_metrics::new_shared_metrics; + use tokio::sync::Mutex as AMutex; + let mut session = SessionMCP { + debug_name: "test".to_string(), + config_path: "/tmp/mcp_stdio_test.yaml".to_string(), + launched_cfg: serde_json::json!({"command": "npx", "args": ["something"]}), + mcp_client: None, + mcp_tools: Vec::new(), + mcp_resources: Vec::new(), + mcp_prompts: Vec::new(), + server_info: None, + startup_task_handles: None, + health_task_handle: None, + logs: Arc::new(AMutex::new(Vec::new())), + stderr_file_path: None, + stderr_cursor: Arc::new(AMutex::new(0)), + connection_status: MCPConnectionStatus::Connected, + last_successful_connection: None, + metrics: new_shared_metrics(), + auth_manager: None, + auth_status: MCPAuthStatus::NotApplicable, + oauth_refresh_task_handle: None, + }; + assert_ne!(session.launched_cfg, serde_json::Value::Null); + session.launched_cfg = serde_json::Value::Null; + assert_eq!(session.launched_cfg, serde_json::Value::Null); + } +} diff --git a/refact-agent/engine/src/http/routers/v1/plugins.rs b/refact-agent/engine/src/http/routers/v1/plugins.rs new file mode 100644 index 0000000000..a9c8751ae8 --- /dev/null +++ b/refact-agent/engine/src/http/routers/v1/plugins.rs @@ -0,0 +1,154 @@ +use std::sync::Arc; +use axum::Extension; +use axum::extract::Path; +use axum::response::Json; +use hyper::StatusCode; +use serde::Deserialize; +use serde_json::{json, Value}; +use tokio::sync::RwLock as ARwLock; + +use crate::custom_error::ScratchError; +use crate::ext::plugins::{ + add_marketplace, ensure_default_marketplaces, install_plugin, list_marketplace_plugins, + load_plugins_db, remove_marketplace, uninstall_plugin, validate_plugin_name, +}; +use crate::global_context::GlobalContext; + +#[derive(Deserialize)] +pub struct AddMarketplaceRequest { + pub source: String, +} + +#[derive(Deserialize)] +pub struct InstallPluginRequest { + pub plugin: String, + pub marketplace: String, +} + +pub async fn handle_list_marketplaces( + Extension(gcx): Extension>>, +) -> Result, (StatusCode, String)> { + let _ = ensure_default_marketplaces(gcx.clone()).await; + let config_dir = gcx.read().await.config_dir.clone(); + let db = load_plugins_db(&config_dir).await + .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e))?; + let summaries: Vec = db.marketplaces.iter().map(|m| { + json!({ + "name": m.name, + "source": m.source, + "added_at": m.added_at, + }) + }).collect(); + Ok(Json(json!({ "marketplaces": summaries }))) +} + +pub async fn handle_add_marketplace( + Extension(gcx): Extension>>, + body_bytes: hyper::body::Bytes, +) -> Result, ScratchError> { + let req = serde_json::from_slice::(&body_bytes) + .map_err(|e| ScratchError::new(StatusCode::UNPROCESSABLE_ENTITY, format!("JSON: {}", e)))?; + let mj = add_marketplace(gcx, &req.source).await + .map_err(|e| { + if e.contains("invalid") || e.contains("cannot") || e.contains("must match") { + ScratchError::new(StatusCode::BAD_REQUEST, e) + } else { + ScratchError::new(StatusCode::INTERNAL_SERVER_ERROR, e) + } + })?; + Ok(Json(json!({ + "name": mj.name, + "plugin_count": mj.plugins.len(), + }))) +} + +pub async fn handle_delete_marketplace( + Extension(gcx): Extension>>, + Path(name): Path, +) -> Result, (StatusCode, String)> { + if let Err(e) = validate_plugin_name(&name) { + return Err((StatusCode::BAD_REQUEST, e)); + } + remove_marketplace(gcx, &name).await + .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e))?; + Ok(Json(json!({ "deleted": true }))) +} + +pub async fn handle_list_marketplace_plugins( + Extension(gcx): Extension>>, + Path(name): Path, +) -> Result, (StatusCode, String)> { + if let Err(e) = validate_plugin_name(&name) { + return Err((StatusCode::BAD_REQUEST, e)); + } + let plugins = list_marketplace_plugins(gcx, &name).await + .map_err(|e| { + if e.contains("not found") { + (StatusCode::NOT_FOUND, e) + } else { + (StatusCode::INTERNAL_SERVER_ERROR, e) + } + })?; + let plugins_json: Vec = plugins.iter().map(|p| json!({ + "name": p.name, + "description": p.description, + "version": p.version, + "tags": p.tags, + "marketplace": name, + })).collect(); + Ok(Json(json!({ "plugins": plugins_json }))) +} + +pub async fn handle_install_plugin( + Extension(gcx): Extension>>, + body_bytes: hyper::body::Bytes, +) -> Result, ScratchError> { + let req = serde_json::from_slice::(&body_bytes) + .map_err(|e| ScratchError::new(StatusCode::UNPROCESSABLE_ENTITY, format!("JSON: {}", e)))?; + if let Err(e) = validate_plugin_name(&req.plugin) { + return Err(ScratchError::new(StatusCode::BAD_REQUEST, e)); + } + if let Err(e) = validate_plugin_name(&req.marketplace) { + return Err(ScratchError::new(StatusCode::BAD_REQUEST, e)); + } + let entry = install_plugin(gcx, &req.plugin, &req.marketplace).await + .map_err(|e| { + if e.contains("not found") { + ScratchError::new(StatusCode::NOT_FOUND, e) + } else if e.contains("already installed") { + ScratchError::new(StatusCode::CONFLICT, e) + } else if e.contains("invalid") || e.contains("cannot") || e.contains("must match") { + ScratchError::new(StatusCode::BAD_REQUEST, e) + } else { + ScratchError::new(StatusCode::INTERNAL_SERVER_ERROR, e) + } + })?; + Ok(Json(json!({ + "name": entry.name, + "marketplace": entry.marketplace, + "version": entry.version, + "install_dir": entry.install_dir, + "installed_at": entry.installed_at, + }))) +} + +pub async fn handle_list_installed( + Extension(gcx): Extension>>, +) -> Result, (StatusCode, String)> { + let config_dir = gcx.read().await.config_dir.clone(); + let db = load_plugins_db(&config_dir).await + .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e))?; + Ok(Json(json!({ "installed": db.installed }))) +} + +pub async fn handle_uninstall_plugin( + Extension(gcx): Extension>>, + Path(name): Path, +) -> Result, (StatusCode, String)> { + if let Err(e) = validate_plugin_name(&name) { + return Err((StatusCode::BAD_REQUEST, e)); + } + uninstall_plugin(gcx, &name).await + .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e))?; + Ok(Json(json!({ "deleted": true }))) +} diff --git a/refact-agent/engine/src/http/routers/v1/setup_status.rs b/refact-agent/engine/src/http/routers/v1/setup_status.rs new file mode 100644 index 0000000000..1f44ec3116 --- /dev/null +++ b/refact-agent/engine/src/http/routers/v1/setup_status.rs @@ -0,0 +1,91 @@ +use axum::Extension; +use axum::response::Result; +use serde::Serialize; +use std::path::PathBuf; +use std::sync::Arc; +use tokio::sync::RwLock as ARwLock; + +use crate::custom_error::ScratchError; +use crate::files_correction::get_project_dirs; +use crate::global_context::GlobalContext; + +#[derive(Serialize)] +pub struct SetupStatusResponse { + pub configured: bool, + pub reasons: Vec, + pub detail: SetupStatusDetail, +} + +#[derive(Serialize)] +pub struct SetupStatusDetail { + pub project_root: Option, + pub has_agents_md: bool, + pub has_knowledge: bool, + pub has_trajectories: bool, +} + +fn first_project_root(project_dirs: &[PathBuf]) -> Option { + project_dirs.first().cloned() +} + +async fn dir_has_any_entries(dir: PathBuf) -> bool { + match tokio::fs::read_dir(&dir).await { + Ok(mut it) => it.next_entry().await.ok().flatten().is_some(), + Err(_) => false, + } +} + +async fn path_exists(path: PathBuf) -> bool { + tokio::fs::try_exists(&path).await.unwrap_or(false) +} + +pub async fn handle_v1_setup_status( + Extension(gcx): Extension>>, +) -> Result, ScratchError> { + let project_dirs = get_project_dirs(gcx).await; + let project_root = first_project_root(&project_dirs); + + if project_root.is_none() { + return Ok(axum::Json(SetupStatusResponse { + configured: true, + reasons: vec![], + detail: SetupStatusDetail { + project_root: None, + has_agents_md: false, + has_knowledge: false, + has_trajectories: false, + }, + })); + } + + let root = project_root.unwrap(); + let refact_dir = root.join(".refact"); + + let has_agents_md = path_exists(root.join("AGENTS.md")).await; + let has_knowledge = dir_has_any_entries(refact_dir.join("knowledge")).await; + let has_trajectories = dir_has_any_entries(refact_dir.join("trajectories")).await; + + let mut reasons = Vec::new(); + if !has_agents_md { + reasons.push("missing_agents_md".to_string()); + } + if !has_knowledge { + reasons.push("no_knowledge".to_string()); + } + if !has_trajectories { + reasons.push("no_trajectories".to_string()); + } + + let configured = reasons.is_empty(); + + Ok(axum::Json(SetupStatusResponse { + configured, + reasons, + detail: SetupStatusDetail { + project_root: Some(root.to_string_lossy().to_string()), + has_agents_md, + has_knowledge, + has_trajectories, + }, + })) +} diff --git a/refact-agent/engine/src/http/routers/v1/sidebar.rs b/refact-agent/engine/src/http/routers/v1/sidebar.rs index 415bc74737..a332c880fa 100644 --- a/refact-agent/engine/src/http/routers/v1/sidebar.rs +++ b/refact-agent/engine/src/http/routers/v1/sidebar.rs @@ -233,6 +233,15 @@ pub async fn handle_sidebar_subscribe( _ = heartbeat.tick() => { yield Ok::<_, std::convert::Infallible>(": hb\n\n".to_string()); } + + _ = async { + let shutdown_flag = gcx_for_stream.read().await.shutdown_flag.clone(); + while !shutdown_flag.load(std::sync::atomic::Ordering::SeqCst) { + tokio::time::sleep(std::time::Duration::from_millis(200)).await; + } + } => { + break; + } } } }; diff --git a/refact-agent/engine/src/http/routers/v1/skills_status.rs b/refact-agent/engine/src/http/routers/v1/skills_status.rs new file mode 100644 index 0000000000..0b4e85e3f5 --- /dev/null +++ b/refact-agent/engine/src/http/routers/v1/skills_status.rs @@ -0,0 +1,153 @@ +use std::sync::Arc; +use axum::Extension; +use axum::extract::Path; +use axum::http::StatusCode; +use axum::response::Response; +use axum::body::Body; +use serde::Serialize; +use tokio::sync::RwLock as ARwLock; + +use crate::custom_error::ScratchError; +use crate::global_context::GlobalContext; + +#[derive(Serialize)] +pub struct SkillsStatusResponse { + pub skills_available: usize, + pub skills_included: Vec, + pub skills_enabled: bool, + pub active_skill: Option, +} + +pub async fn handle_v1_skills_status( + Extension(gcx): Extension>>, + Path(chat_id): Path, +) -> Result, ScratchError> { + let sessions = gcx.read().await.chat_sessions.clone(); + let session_arc = { + let sessions_read = sessions.read().await; + sessions_read.get(&chat_id).cloned() + }; + let Some(session_arc) = session_arc else { + return Err(ScratchError::new(StatusCode::NOT_FOUND, format!("chat_id {} not found", chat_id))); + }; + let session = session_arc.lock().await; + let active_skill = session.thread.active_skill.clone(); + let response = SkillsStatusResponse { + skills_available: session.skills_available_count, + skills_included: session.skills_included.clone(), + skills_enabled: session.skills_available_count > 0, + active_skill, + }; + Ok(Response::builder() + .status(StatusCode::OK) + .header("Content-Type", "application/json") + .body(Body::from(serde_json::to_string(&response).unwrap())) + .unwrap()) +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::chat::types::ChatSession; + + #[test] + fn test_skills_status_available_count_reflects_loaded_skills() { + let mut session = ChatSession::new("test-chat".to_string()); + assert_eq!(session.skills_available_count, 0); + assert!(session.skills_included.is_empty()); + + session.skills_available_count = 3; + assert_eq!(session.skills_available_count, 3); + } + + #[test] + fn test_skills_status_included_populated_after_selection() { + let mut session = ChatSession::new("test-chat".to_string()); + + session.skills_available_count = 5; + session.skills_included = vec!["review".to_string(), "docs".to_string()]; + + assert_eq!(session.skills_included.len(), 2); + assert!(session.skills_included.contains(&"review".to_string())); + assert!(session.skills_included.contains(&"docs".to_string())); + } + + #[test] + fn test_skills_status_response_skills_enabled_true_when_available() { + let response = SkillsStatusResponse { + skills_available: 3, + skills_included: vec!["skill1".to_string()], + skills_enabled: true, + active_skill: None, + }; + let json = serde_json::to_value(&response).unwrap(); + assert_eq!(json["skills_available"], 3); + assert_eq!(json["skills_enabled"], true); + assert_eq!(json["skills_included"].as_array().unwrap().len(), 1); + assert!(json["active_skill"].is_null()); + } + + #[test] + fn test_skills_status_response_skills_enabled_false_when_none() { + let response = SkillsStatusResponse { + skills_available: 0, + skills_included: vec![], + skills_enabled: false, + active_skill: None, + }; + let json = serde_json::to_value(&response).unwrap(); + assert_eq!(json["skills_available"], 0); + assert_eq!(json["skills_enabled"], false); + assert!(json["skills_included"].as_array().unwrap().is_empty()); + } + + #[test] + fn test_skills_status_response_active_skill_set_when_command_active() { + let response = SkillsStatusResponse { + skills_available: 2, + skills_included: vec![], + skills_enabled: true, + active_skill: Some("my-skill".to_string()), + }; + let json = serde_json::to_value(&response).unwrap(); + assert_eq!(json["active_skill"], "my-skill"); + } + + #[test] + fn test_skills_status_active_skill_from_session_thread() { + let mut session = ChatSession::new("test-chat".to_string()); + session.thread.active_skill = Some("review-skill".to_string()); + let active_skill = session.thread.active_skill.clone(); + assert_eq!(active_skill, Some("review-skill".to_string())); + + session.thread.active_skill = None; + let active_skill_none = session.thread.active_skill.clone(); + assert!(active_skill_none.is_none()); + } + + #[test] + fn test_skills_status_new_session_has_zero_skills() { + let session = ChatSession::new("new-chat".to_string()); + assert_eq!(session.skills_available_count, 0); + assert!(session.skills_included.is_empty()); + let skills_enabled = session.skills_available_count > 0; + assert!(!skills_enabled); + } + + #[test] + fn test_skills_status_resets_to_zero() { + let mut session = ChatSession::new("test-chat".to_string()); + + session.skills_available_count = 3; + session.skills_included = vec!["skill1".to_string(), "skill2".to_string()]; + assert_eq!(session.skills_available_count, 3); + + session.skills_available_count = 0; + session.skills_included = Vec::new(); + + assert_eq!(session.skills_available_count, 0); + assert!(session.skills_included.is_empty()); + let skills_enabled = session.skills_available_count > 0; + assert!(!skills_enabled); + } +} diff --git a/refact-agent/engine/src/http/routers/v1/system_prompt.rs b/refact-agent/engine/src/http/routers/v1/system_prompt.rs index d6d8ae68a1..26f8a871ba 100644 --- a/refact-agent/engine/src/http/routers/v1/system_prompt.rs +++ b/refact-agent/engine/src/http/routers/v1/system_prompt.rs @@ -48,7 +48,7 @@ pub async fn handle_v1_prepend_system_prompt_and_maybe_more_initial_messages( ) })?; - let messages = prepend_the_right_system_prompt_and_maybe_more_initial_messages( + let (messages, _) = prepend_the_right_system_prompt_and_maybe_more_initial_messages( gcx.clone(), post.messages, &post.chat_meta, diff --git a/refact-agent/engine/src/http/routers/v1/tasks.rs b/refact-agent/engine/src/http/routers/v1/tasks.rs index ac848f6e30..0b8ad68127 100644 --- a/refact-agent/engine/src/http/routers/v1/tasks.rs +++ b/refact-agent/engine/src/http/routers/v1/tasks.rs @@ -524,6 +524,15 @@ pub async fn handle_tasks_subscribe( let json = serde_json::to_string(&envelope).unwrap_or_default(); yield Ok::<_, std::convert::Infallible>(format!("data: {}\n\n", json)); } + + _ = async { + let shutdown_flag = gcx.read().await.shutdown_flag.clone(); + while !shutdown_flag.load(std::sync::atomic::Ordering::SeqCst) { + tokio::time::sleep(std::time::Duration::from_millis(200)).await; + } + } => { + break; + } } } }; diff --git a/refact-agent/engine/src/http/routers/v1/trajectory_ops.rs b/refact-agent/engine/src/http/routers/v1/trajectory_ops.rs index a064616994..5ed7590e25 100644 --- a/refact-agent/engine/src/http/routers/v1/trajectory_ops.rs +++ b/refact-agent/engine/src/http/routers/v1/trajectory_ops.rs @@ -301,6 +301,7 @@ pub async fn handle_handoff_apply( max_tokens: thread.max_tokens, parallel_tool_calls: thread.parallel_tool_calls, previous_response_id: None, + active_skill: None, }; save_trajectory_snapshot_with_parent(gcx.clone(), snapshot, &chat_id, "handoff") @@ -490,6 +491,7 @@ pub async fn handle_mode_transition_apply( max_tokens: thread.max_tokens, parallel_tool_calls: thread.parallel_tool_calls, previous_response_id: None, + active_skill: None, }; save_trajectory_snapshot_with_parent(gcx.clone(), snapshot, &chat_id, "mode_transition") diff --git a/refact-agent/engine/src/integrations/browser_runtime.rs b/refact-agent/engine/src/integrations/browser_runtime.rs index 03441a83cc..b0fd4ca67d 100644 --- a/refact-agent/engine/src/integrations/browser_runtime.rs +++ b/refact-agent/engine/src/integrations/browser_runtime.rs @@ -712,7 +712,18 @@ pub async fn find_runtime_by_chat_id( pub async fn browser_monitor_background_task(gcx: Arc>) { loop { - tokio::time::sleep(Duration::from_secs(10)).await; + let shutdown_flag = gcx.read().await.shutdown_flag.clone(); + tokio::select! { + _ = tokio::time::sleep(Duration::from_secs(10)) => {} + _ = async { + while !shutdown_flag.load(std::sync::atomic::Ordering::SeqCst) { + tokio::time::sleep(Duration::from_millis(200)).await; + } + } => { + tracing::info!("Browser monitor: shutdown detected, stopping"); + return; + } + } let runtime_ids: Vec = { let gcx_locked = gcx.read().await; diff --git a/refact-agent/engine/src/integrations/integr_bitbucket.rs b/refact-agent/engine/src/integrations/integr_bitbucket.rs index d0696ada54..732afac554 100644 --- a/refact-agent/engine/src/integrations/integr_bitbucket.rs +++ b/refact-agent/engine/src/integrations/integr_bitbucket.rs @@ -14,7 +14,7 @@ use crate::call_validation::{ContextEnum, ChatMessage, ChatContent, ChatUsage}; use crate::integrations::integr_abstract::{ IntegrationCommon, IntegrationConfirmation, IntegrationTrait, }; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use reqwest::{Client, header}; use thiserror::Error; @@ -262,19 +262,9 @@ impl Tool for ToolBitbucket { experimental: false, allow_parallel: false, description: "Access to Bitbucket API, to fetch issues, review PRs.".to_string(), - parameters: vec![ - ToolParam { - name: "repo_slug".to_string(), - param_type: "string".to_string(), - description: "The repository slug.".to_string(), - }, - ToolParam { - name: "command".to_string(), - param_type: "string".to_string(), - description: "Examples:\n`list_prs`\n`get_pr --id 123`".to_string(), - }, - ], - parameters_required: vec!["repo_slug".to_string(), "command".to_string()], + input_schema: json_schema_from_params(&[("repo_slug", "string", "The repository slug."), ("command", "string", "Examples:\n`list_prs`\n`get_pr --id 123`")], &["repo_slug", "command"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/integrations/integr_chrome.rs b/refact-agent/engine/src/integrations/integr_chrome.rs index 62e9f45367..9f409c94aa 100644 --- a/refact-agent/engine/src/integrations/integr_chrome.rs +++ b/refact-agent/engine/src/integrations/integr_chrome.rs @@ -15,7 +15,7 @@ use crate::global_context::GlobalContext; use crate::call_validation::{ChatContent, ChatMessage}; use crate::scratchpads::multimodality::MultimodalElement; use crate::postprocessing::pp_command_output::{OutputFilter, output_mini_postprocessing}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::integrations::integr_abstract::{ IntegrationTrait, IntegrationCommon, IntegrationConfirmation, }; @@ -296,7 +296,7 @@ impl Tool for ToolChrome { supported_commands.extend(vec!["click_at_point "]); } let description = format!( - "One or several commands separated by newline. \ + "A real web browser with graphical interface. One or several commands separated by newline. \ The is an integer, for example 10, for you to identify the tab later. \ Most of web pages are dynamic. If you see that it's still loading try again with wait_for command. \ Supported commands:\n{}", supported_commands.join("\n")); @@ -309,13 +309,10 @@ impl Tool for ToolChrome { }, experimental: false, allow_parallel: false, - description: "A real web browser with graphical interface.".to_string(), - parameters: vec![ToolParam { - name: "commands".to_string(), - param_type: "string".to_string(), - description, - }], - parameters_required: vec!["commands".to_string()], + description, + input_schema: json_schema_from_params(&[("commands", "string", "")], &["commands"]), + output_schema: None, + annotations: None, } } @@ -354,10 +351,16 @@ async fn setup_chrome_session( return Ok(setup_log); } else { setup_log.push("Chrome session is disconnected. Trying to reconnect.".to_string()); - gcx.write() - .await + drop(session_locked); + let mut gcx_locked = gcx.write().await; + let should_remove = gcx_locked .integration_sessions - .remove(session_hashmap_key); + .get(session_hashmap_key) + .map(|current| Arc::ptr_eq(current, &session)) + .unwrap_or(false); + if should_remove { + gcx_locked.integration_sessions.remove(session_hashmap_key); + } } } diff --git a/refact-agent/engine/src/integrations/integr_cmdline.rs b/refact-agent/engine/src/integrations/integr_cmdline.rs index 53942ff052..7a0be0a814 100644 --- a/refact-agent/engine/src/integrations/integr_cmdline.rs +++ b/refact-agent/engine/src/integrations/integr_cmdline.rs @@ -16,7 +16,8 @@ use crate::files_correction::CommandSimplifiedDirExt; use crate::global_context::GlobalContext; use crate::at_commands::at_commands::AtCommandsContext; use crate::integrations::process_io_utils::{execute_command, AnsiStrippable}; -use crate::tools::tools_description::{ToolParam, Tool, ToolDesc, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType}; +use serde_json::json; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::postprocessing::pp_command_output::{OutputFilter, output_mini_postprocessing}; use crate::integrations::integr_abstract::{ @@ -28,13 +29,26 @@ use crate::integrations::utils::{ }; use crate::custom_error::YamlError; +#[derive(Deserialize, Serialize, Clone, Default)] +pub struct CmdlineParam { + pub name: String, + #[serde(rename = "type", default = "CmdlineParam::default_type")] + pub param_type: String, + #[serde(default)] + pub description: String, +} + +impl CmdlineParam { + fn default_type() -> String { "string".to_string() } +} + #[derive(Deserialize, Serialize, Clone, Default)] pub struct CmdlineToolConfig { pub command: String, pub command_workdir: String, pub description: String, - pub parameters: Vec, + pub parameters: Vec, #[serde(skip_serializing_if = "Option::is_none")] pub parameters_required: Option>, @@ -340,12 +354,20 @@ impl Tool for ToolCmdline { } fn tool_description(&self) -> ToolDesc { - let parameters_required = self.cfg.parameters_required.clone().unwrap_or_else(|| { - self.cfg - .parameters - .iter() - .map(|param| param.name.clone()) - .collect() + let required: Vec = self.cfg.parameters_required.clone().unwrap_or_else(|| { + self.cfg.parameters.iter().map(|p| p.name.clone()).collect() + }); + let mut properties = serde_json::Map::new(); + for p in &self.cfg.parameters { + properties.insert(p.name.clone(), json!({ + "type": p.param_type, + "description": p.description + })); + } + let input_schema = json!({ + "type": "object", + "properties": properties, + "required": required }); ToolDesc { name: self.name.clone(), @@ -357,8 +379,9 @@ impl Tool for ToolCmdline { experimental: false, allow_parallel: false, description: self.cfg.description.clone(), - parameters: self.cfg.parameters.clone(), - parameters_required, + input_schema, + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/integrations/integr_cmdline_service.rs b/refact-agent/engine/src/integrations/integr_cmdline_service.rs index 48eb18131f..08f5974928 100644 --- a/refact-agent/engine/src/integrations/integr_cmdline_service.rs +++ b/refact-agent/engine/src/integrations/integr_cmdline_service.rs @@ -9,7 +9,8 @@ use async_trait::async_trait; use process_wrap::tokio::*; use crate::at_commands::at_commands::AtCommandsContext; -use crate::tools::tools_description::{Tool, ToolParam, ToolDesc, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType}; +use serde_json::json; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::global_context::GlobalContext; use crate::postprocessing::pp_command_output::output_mini_postprocessing; @@ -419,21 +420,25 @@ impl Tool for ToolService { } fn tool_description(&self) -> ToolDesc { - let mut parameters = self.cfg.parameters.clone(); - parameters.push(ToolParam { - name: "action".to_string(), - param_type: "string".to_string(), - description: "Action to perform: start, restart, stop, status".to_string(), + let required: Vec = self.cfg.parameters_required.clone().unwrap_or_else(|| { + self.cfg.parameters.iter().map(|p| p.name.clone()).collect() }); - - let parameters_required = self.cfg.parameters_required.clone().unwrap_or_else(|| { - self.cfg - .parameters - .iter() - .map(|param| param.name.clone()) - .collect() + let mut properties = serde_json::Map::new(); + for p in &self.cfg.parameters { + properties.insert(p.name.clone(), json!({ + "type": p.param_type, + "description": p.description + })); + } + properties.insert("action".to_string(), json!({ + "type": "string", + "description": "Action to perform: start, restart, stop, status" + })); + let input_schema = json!({ + "type": "object", + "properties": properties, + "required": required }); - ToolDesc { name: self.name.clone(), display_name: self.name.clone(), @@ -444,8 +449,9 @@ impl Tool for ToolService { experimental: false, allow_parallel: false, description: self.cfg.description.clone(), - parameters, - parameters_required, + input_schema, + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/integrations/integr_github.rs b/refact-agent/engine/src/integrations/integr_github.rs index 90eccc54e9..121627d0a2 100644 --- a/refact-agent/engine/src/integrations/integr_github.rs +++ b/refact-agent/engine/src/integrations/integr_github.rs @@ -12,7 +12,7 @@ use crate::at_commands::at_commands::AtCommandsContext; use crate::call_validation::{ContextEnum, ChatMessage, ChatContent, ChatUsage}; use crate::files_correction::canonical_path; use crate::integrations::go_to_configuration_message; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use serde_json::Value; use crate::integrations::integr_abstract::{ IntegrationCommon, IntegrationConfirmation, IntegrationTrait, @@ -84,19 +84,9 @@ impl Tool for ToolGithub { experimental: false, allow_parallel: false, description: "Access to gh command line command, to fetch issues, review PRs.".to_string(), - parameters: vec![ - ToolParam { - name: "project_dir".to_string(), - param_type: "string".to_string(), - description: "Look at system prompt for location of version control (.git folder) of the active file.".to_string(), - }, - ToolParam { - name: "command".to_string(), - param_type: "string".to_string(), - description: "Examples:\ngh issue create --body \"hello world\" --title \"Testing gh integration\"\ngh issue list --author @me --json number,title,updatedAt,url\n".to_string(), - } - ], - parameters_required: vec!["project_dir".to_string(), "command".to_string()], + input_schema: json_schema_from_params(&[("project_dir", "string", "Look at system prompt for location of version control (.git folder) of the active file."), ("command", "string", "Examples:\ngh issue create --body \"hello world\" --title \"Testing gh integration\"\ngh issue list --author @me --json number,title,updatedAt,url\n")], &["project_dir", "command"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/integrations/integr_gitlab.rs b/refact-agent/engine/src/integrations/integr_gitlab.rs index e6a94cf235..8d7aeb8d59 100644 --- a/refact-agent/engine/src/integrations/integr_gitlab.rs +++ b/refact-agent/engine/src/integrations/integr_gitlab.rs @@ -13,7 +13,7 @@ use crate::at_commands::at_commands::AtCommandsContext; use crate::call_validation::{ContextEnum, ChatMessage, ChatContent, ChatUsage}; use crate::files_correction::canonical_path; use crate::integrations::go_to_configuration_message; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::integrations::integr_abstract::{ IntegrationCommon, IntegrationConfirmation, IntegrationTrait, }; @@ -84,19 +84,9 @@ impl Tool for ToolGitlab { experimental: false, allow_parallel: false, description: "Access to glab command line command, to fetch issues, review PRs.".to_string(), - parameters: vec![ - ToolParam { - name: "project_dir".to_string(), - param_type: "string".to_string(), - description: "Look at system prompt for location of version control (.git folder) of the active file.".to_string(), - }, - ToolParam { - name: "command".to_string(), - param_type: "string".to_string(), - description: "Examples:\nglab issue create --description \"hello world\" --title \"Testing glab integration\"\nglab issue list --author @me\n".to_string(), - }, - ], - parameters_required: vec!["project_dir".to_string(), "command".to_string()], + input_schema: json_schema_from_params(&[("project_dir", "string", "Look at system prompt for location of version control (.git folder) of the active file."), ("command", "string", "Examples:\nglab issue create --description \"hello world\" --title \"Testing glab integration\"\nglab issue list --author @me\n")], &["project_dir", "command"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/integrations/integr_mysql.rs b/refact-agent/engine/src/integrations/integr_mysql.rs index a30cd52771..8f07834657 100644 --- a/refact-agent/engine/src/integrations/integr_mysql.rs +++ b/refact-agent/engine/src/integrations/integr_mysql.rs @@ -12,7 +12,7 @@ use crate::at_commands::at_commands::AtCommandsContext; use crate::call_validation::ContextEnum; use crate::call_validation::{ChatContent, ChatMessage, ChatUsage}; use crate::integrations::go_to_configuration_message; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::integrations::integr_abstract::{ IntegrationCommon, IntegrationConfirmation, IntegrationTrait, }; @@ -154,14 +154,9 @@ impl Tool for ToolMysql { experimental: false, allow_parallel: false, description: "MySQL integration, can run a single query per call.".to_string(), - parameters: vec![ - ToolParam { - name: "query".to_string(), - param_type: "string".to_string(), - description: "Don't forget semicolon at the end, examples:\nSELECT * FROM table_name;\nCREATE INDEX my_index_users_email ON my_users (email);".to_string(), - }, - ], - parameters_required: vec!["query".to_string()], + input_schema: json_schema_from_params(&[("query", "string", "Don't forget semicolon at the end, examples:\nSELECT * FROM table_name;\nCREATE INDEX my_index_users_email ON my_users (email);")], &["query"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/integrations/integr_pdb.rs b/refact-agent/engine/src/integrations/integr_pdb.rs index 4431d1be44..447dacaffa 100644 --- a/refact-agent/engine/src/integrations/integr_pdb.rs +++ b/refact-agent/engine/src/integrations/integr_pdb.rs @@ -22,7 +22,7 @@ use crate::global_context::GlobalContext; use crate::integrations::integr_abstract::{ IntegrationCommon, IntegrationConfirmation, IntegrationTrait, }; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::integrations::process_io_utils::{ first_n_chars, last_n_chars, last_n_lines, write_to_stdin_and_flush, blocking_read_until_token_or_timeout, @@ -168,18 +168,26 @@ impl Tool for ToolPdb { .clone() }; + if matches!(command_args[0].as_str(), "kill" | "q" | "quit") { + let mut gcx_locked = gcx.write().await; + let should_remove = gcx_locked + .integration_sessions + .get(&session_hashmap_key) + .map(|current| Arc::ptr_eq(current, &command_session)) + .unwrap_or(false); + if should_remove { + gcx_locked.integration_sessions.remove(&session_hashmap_key); + } + return Ok(tool_answer("Pdb session has been killed".to_string(), tool_call_id)); + } + let mut command_session_locked = command_session.lock().await; let mut pdb_session = command_session_locked .as_any_mut() .downcast_mut::() .ok_or("Failed to downcast to PdbSession")?; - let output = match command_args[0].as_str() { - "kill" | "q" | "quit" => { - let mut gcx_locked = gcx.write().await; - gcx_locked.integration_sessions.remove(&session_hashmap_key); - "Pdb session has been killed".to_string() - } + let output_result = match command_args[0].as_str() { "wait" => { if command_args.len() < 2 { return Err("Argument `n_seconds` in `wait n_seconds` is missing".to_string()); @@ -194,7 +202,7 @@ impl Tool for ToolPdb { gcx.clone(), timeout_seconds, ) - .await? + .await } _ => { interact_with_pdb( @@ -204,7 +212,26 @@ impl Tool for ToolPdb { gcx.clone(), 10, ) - .await? + .await + } + }; + + let output = match output_result { + Ok(output) => output, + Err(err) => { + if err.starts_with("Pdb process exited with status:") { + drop(command_session_locked); + let mut gcx_locked = gcx.write().await; + let should_remove = gcx_locked + .integration_sessions + .get(&session_hashmap_key) + .map(|current| Arc::ptr_eq(current, &command_session)) + .unwrap_or(false); + if should_remove { + gcx_locked.integration_sessions.remove(&session_hashmap_key); + } + } + return Err(err); } }; Ok(tool_answer(output, tool_call_id)) @@ -231,19 +258,9 @@ impl Tool for ToolPdb { experimental: false, allow_parallel: false, description: "Python debugger for inspecting variables and exploring what the program really does. This tool executes only one command at a time. Start with python -m pdb ...".to_string(), - parameters: vec![ - ToolParam { - name: "command".to_string(), - param_type: "string".to_string(), - description: "Examples: 'python -m pdb script.py', 'break module_name.function_name', 'break 10', 'continue', 'print(variable_name)', 'list', 'quit'".to_string(), - }, - ToolParam { - name: "workdir".to_string(), - param_type: "string".to_string(), - description: "Working directory for the command, needed to start a pdb session from a relative path.".to_string(), - }, - ], - parameters_required: vec!["command".to_string()], + input_schema: json_schema_from_params(&[("command", "string", "Examples: 'python -m pdb script.py', 'break module_name.function_name', 'break 10', 'continue', 'print(variable_name)', 'list', 'quit'"), ("workdir", "string", "Working directory for the command, needed to start a pdb session from a relative path.")], &["command"]), + output_schema: None, + annotations: None, } } @@ -457,8 +474,8 @@ async fn interact_with_pdb( async fn send_command_and_get_output_and_error( pdb_session: &mut PdbSession, input_command: &str, - session_hashmap_key: &str, - gcx: Arc>, + _session_hashmap_key: &str, + _gcx: Arc>, timeout_ms: u64, ask_for_continuation_if_timeout: bool, ) -> Result<(String, String), String> { @@ -475,10 +492,6 @@ async fn send_command_and_get_output_and_error( let exit_status = pdb_session.process.try_wait().map_err(|e| e.to_string())?; if let Some(exit_status) = exit_status { - gcx.write() - .await - .integration_sessions - .remove(session_hashmap_key); return Err(format!("Pdb process exited with status: {:?}", exit_status)); } diff --git a/refact-agent/engine/src/integrations/integr_postgres.rs b/refact-agent/engine/src/integrations/integr_postgres.rs index 3c074e009b..5751d17163 100644 --- a/refact-agent/engine/src/integrations/integr_postgres.rs +++ b/refact-agent/engine/src/integrations/integr_postgres.rs @@ -15,7 +15,7 @@ use crate::at_commands::at_commands::AtCommandsContext; use crate::call_validation::ContextEnum; use crate::call_validation::{ChatContent, ChatMessage, ChatUsage}; use crate::integrations::go_to_configuration_message; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::postprocessing::pp_row_limiter::RowLimiter; use crate::postprocessing::pp_command_output::OutputFilter; @@ -153,14 +153,9 @@ impl Tool for ToolPostgres { experimental: false, allow_parallel: false, description: "PostgreSQL integration, can run a single query per call.".to_string(), - parameters: vec![ - ToolParam { - name: "query".to_string(), - param_type: "string".to_string(), - description: "Don't forget semicolon at the end, examples:\nSELECT * FROM table_name;\nCREATE INDEX my_index_users_email ON my_users (email);".to_string(), - }, - ], - parameters_required: vec!["query".to_string()], + input_schema: json_schema_from_params(&[("query", "string", "Don't forget semicolon at the end, examples:\nSELECT * FROM table_name;\nCREATE INDEX my_index_users_email ON my_users (email);")], &["query"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/integrations/mcp/integr_mcp_common.rs b/refact-agent/engine/src/integrations/mcp/integr_mcp_common.rs index abca33bfe7..cfa46b0e64 100644 --- a/refact-agent/engine/src/integrations/mcp/integr_mcp_common.rs +++ b/refact-agent/engine/src/integrations/mcp/integr_mcp_common.rs @@ -1,21 +1,26 @@ +use std::collections::HashMap; use std::sync::Arc; use std::sync::Weak; +use std::time::Instant; use async_trait::async_trait; use tokio::sync::RwLock as ARwLock; use tokio::sync::Mutex as AMutex; use tokio::time::timeout; use tokio::time::Duration; -use rmcp::{RoleClient, service::RunningService}; +use rmcp::{RoleClient, service::Peer}; use serde::{Deserialize, Serialize}; use serde_json::Value; use crate::global_context::GlobalContext; use crate::integrations::integr_abstract::IntegrationCommon; use crate::integrations::utils::{serialize_num_to_str, deserialize_str_to_num}; -use super::session_mcp::{SessionMCP, add_log_entry, cancel_mcp_client}; +use rmcp::transport::auth::AuthClient; +use super::session_mcp::{SessionMCP, McpClientHandler, McpRunningService, MCPConnectionStatus, MCPAuthStatus, add_log_entry, cancel_mcp_client, redact_sensitive_value}; +use super::mcp_auth::{MCPAuthSettings, MCPTokenManager, AuthType, create_auth_manager_from_tokens, load_tokens_from_config, mcp_oauth_refresh_task}; +use super::mcp_metrics::new_shared_metrics; use super::tool_mcp::ToolMCP; -#[derive(Deserialize, Serialize, Clone, PartialEq, Default, Debug)] +#[derive(Deserialize, Serialize, Clone, PartialEq, Debug)] pub struct CommonMCPSettings { #[serde( default = "default_init_timeout", @@ -29,6 +34,20 @@ pub struct CommonMCPSettings { deserialize_with = "deserialize_str_to_num" )] pub request_timeout: u64, + #[serde( + default = "default_health_check_interval", + serialize_with = "serialize_num_to_str", + deserialize_with = "deserialize_str_to_num" + )] + pub health_check_interval: u64, + #[serde( + default = "default_reconnect_max_attempts", + serialize_with = "serialize_num_to_str", + deserialize_with = "deserialize_str_to_num" + )] + pub reconnect_max_attempts: u64, + #[serde(default = "default_reconnect_enabled")] + pub reconnect_enabled: bool, } pub fn default_init_timeout() -> u64 { @@ -39,6 +58,30 @@ pub fn default_request_timeout() -> u64 { 30 } +pub fn default_health_check_interval() -> u64 { + 30 +} + +pub fn default_reconnect_max_attempts() -> u64 { + 7 +} + +pub fn default_reconnect_enabled() -> bool { + true +} + +impl Default for CommonMCPSettings { + fn default() -> Self { + Self { + init_timeout: default_init_timeout(), + request_timeout: default_request_timeout(), + health_check_interval: default_health_check_interval(), + reconnect_max_attempts: default_reconnect_max_attempts(), + reconnect_enabled: default_reconnect_enabled(), + } + } +} + #[async_trait] pub trait MCPTransportInitializer: Send + Sync { async fn init_mcp_transport( @@ -48,7 +91,8 @@ pub trait MCPTransportInitializer: Send + Sync { init_timeout: u64, request_timeout: u64, session: Arc>>, - ) -> Option>; + handler: McpClientHandler, + ) -> Option; } pub async fn mcp_integr_tools( @@ -90,10 +134,16 @@ pub async fn mcp_integr_tools( let mut result: Vec> = vec![]; { let mut session_locked = session.lock().await; - let session_downcasted: &mut SessionMCP = session_locked + let session_downcasted: &mut SessionMCP = match session_locked .as_any_mut() .downcast_mut::() - .unwrap(); + { + Some(s) => s, + None => { + tracing::error!("Session for {:?} is not a SessionMCP, strange (3)", session_key); + return vec![]; + } + }; if session_downcasted.mcp_client.is_none() { tracing::error!("No mcp_client for {:?}, strange (2)", session_key); return vec![]; @@ -112,13 +162,242 @@ pub async fn mcp_integr_tools( result } -pub async fn mcp_session_setup( +pub(crate) async fn build_reqwest_client_for_mcp( + url: &str, + headers: &HashMap, + auth: &MCPAuthSettings, + transport_name: &str, + logs: Arc>>, + debug_name: &str, +) -> Option { + if url.is_empty() { + let msg = format!("URL is empty for {} transport", transport_name); + tracing::error!("{msg} for {debug_name}"); + add_log_entry(logs, msg).await; + return None; + } + + let mut effective_headers = headers.clone(); + let token_manager = MCPTokenManager::new(auth.clone()); + if let Err(e) = token_manager.apply_auth(&mut effective_headers).await { + if auth.auth_type != AuthType::None { + let msg = format!("Auth failed: {}", e); + tracing::error!("{msg} for {debug_name}"); + add_log_entry(logs, msg).await; + return None; + } + } + + let mut header_map = reqwest::header::HeaderMap::new(); + for (k, v) in &effective_headers { + match ( + reqwest::header::HeaderName::from_bytes(k.as_bytes()), + reqwest::header::HeaderValue::from_str(v), + ) { + (Ok(name), Ok(value)) => { + header_map.insert(name, value); + } + _ => { + let msg = format!("Invalid header: {}: {}", k, redact_sensitive_value(k, v)); + tracing::warn!("{msg} for {debug_name}"); + add_log_entry(logs.clone(), msg).await; + } + } + } + + match reqwest::Client::builder().default_headers(header_map).build() { + Ok(client) => Some(client), + Err(e) => { + let msg = format!("Failed to build reqwest client: {}", e); + tracing::error!("{msg} for {debug_name}"); + add_log_entry(logs, msg).await; + None + } + } +} + +pub(crate) async fn build_auth_client_for_mcp( + url: &str, + headers: &HashMap, + config_path: &str, + transport_name: &str, + logs: Arc>>, + debug_name: &str, + session: Arc>>, +) -> Option> { + let tokens = load_tokens_from_config(config_path).await; + let tokens = match tokens { + Some(t) if !t.access_token.is_empty() => t, + _ => { + let msg = format!("No OAuth tokens found for {} transport; re-authentication required", transport_name); + tracing::warn!("{msg} for {debug_name}"); + add_log_entry(logs, msg).await; + { + let mut session_locked = session.lock().await; + let mcp_session = match session_locked.as_any_mut().downcast_mut::() { + Some(s) => s, + None => { + tracing::error!("Session for {debug_name} is not a SessionMCP, cannot set auth status"); + return None; + } + }; + mcp_session.connection_status = MCPConnectionStatus::NeedsAuth; + mcp_session.auth_status = MCPAuthStatus::NeedsLogin; + } + return None; + } + }; + + let auth_manager = match create_auth_manager_from_tokens(url, &tokens).await { + Ok(m) => m, + Err(e) => { + let msg = format!("Failed to restore OAuth session for {} transport: {}", transport_name, e); + tracing::error!("{msg} for {debug_name}"); + add_log_entry(logs, msg).await; + return None; + } + }; + + let mut header_map = reqwest::header::HeaderMap::new(); + for (k, v) in headers { + match ( + reqwest::header::HeaderName::from_bytes(k.as_bytes()), + reqwest::header::HeaderValue::from_str(v), + ) { + (Ok(name), Ok(value)) => { + header_map.insert(name, value); + } + _ => { + let msg = format!("Invalid header: {}: {}", k, redact_sensitive_value(k, v)); + tracing::warn!("{msg} for {debug_name}"); + add_log_entry(logs.clone(), msg).await; + } + } + } + + let base_client = match reqwest::Client::builder().default_headers(header_map).build() { + Ok(c) => c, + Err(e) => { + let msg = format!("Failed to build reqwest client: {}", e); + tracing::error!("{msg} for {debug_name}"); + add_log_entry(logs, msg).await; + return None; + } + }; + + let auth_client = AuthClient::new(base_client, auth_manager); + let auth_manager_arc = auth_client.auth_manager.clone(); + { + let mut session_locked = session.lock().await; + let mcp_session = match session_locked.as_any_mut().downcast_mut::() { + Some(s) => s, + None => { + tracing::error!("Session for {debug_name} is not a SessionMCP, cannot set auth manager"); + return None; + } + }; + mcp_session.auth_manager = Some(auth_manager_arc); + mcp_session.auth_status = MCPAuthStatus::Authenticated; + } + Some(auth_client) +} + +pub(crate) async fn serve_client_with_timeout( + serve_fut: Fut, + init_timeout: u64, + transport_name: &str, + logs: Arc>>, + debug_name: &str, +) -> Option +where + Fut: std::future::Future> + Send, + E: std::fmt::Display, +{ + match timeout(Duration::from_secs(init_timeout), serve_fut).await { + Ok(Ok(client)) => Some(client), + Ok(Err(e)) => { + let msg = format!("Failed to init {} server: {}", transport_name, e); + tracing::error!("{msg} for {debug_name}"); + add_log_entry(logs, msg).await; + None + } + Err(_) => { + let msg = format!("Request timed out after {} seconds", init_timeout); + tracing::error!("{msg} for {debug_name}"); + add_log_entry(logs, msg).await; + None + } + } +} + +macro_rules! impl_mcp_integration_trait { + ($struct_name:ty, $schema_yaml:expr) => { + #[async_trait::async_trait] + impl crate::integrations::integr_abstract::IntegrationTrait for $struct_name { + async fn integr_settings_apply( + &mut self, + gcx: std::sync::Arc>, + config_path: String, + value: &serde_json::Value, + ) -> Result<(), serde_json::Error> { + self.gcx_option = Some(std::sync::Arc::downgrade(&gcx)); + self.cfg = serde_json::from_value(value.clone())?; + self.common = serde_json::from_value(value.clone())?; + self.config_path = config_path.clone(); + crate::integrations::mcp::integr_mcp_common::mcp_session_setup( + gcx, + config_path, + serde_json::to_value(&self.cfg).unwrap_or_default(), + self.clone(), + self.cfg.common.init_timeout, + self.cfg.common.request_timeout, + self.cfg.common.health_check_interval, + self.cfg.common.reconnect_max_attempts, + self.cfg.common.reconnect_enabled, + ) + .await; + Ok(()) + } + + fn integr_settings_as_json(&self) -> serde_json::Value { + serde_json::to_value(&self.cfg).unwrap() + } + + fn integr_common(&self) -> crate::integrations::integr_abstract::IntegrationCommon { + self.common.clone() + } + + async fn integr_tools( + &self, + _integr_name: &str, + ) -> Vec> { + crate::integrations::mcp::integr_mcp_common::mcp_integr_tools( + self.gcx_option.clone(), + &self.config_path, + &self.common, + self.cfg.common.request_timeout, + ) + .await + } + + fn integr_schema(&self) -> &str { + include_str!($schema_yaml) + } + } + }; +} +pub(crate) use impl_mcp_integration_trait; + +pub async fn mcp_session_setup( gcx: Arc>, config_path: String, new_cfg_value: Value, transport_initializer: T, init_timeout: u64, request_timeout: u64, + health_check_interval: u64, + reconnect_max_attempts: u64, + reconnect_enabled: bool, ) { let session_key = format!("{}", config_path); @@ -134,10 +413,20 @@ pub async fn mcp_session_setup( launched_cfg: new_cfg_value.clone(), mcp_client: None, mcp_tools: Vec::new(), + mcp_resources: Vec::new(), + mcp_prompts: Vec::new(), + server_info: None, startup_task_handles: None, + health_task_handle: None, logs: Arc::new(AMutex::new(Vec::new())), stderr_file_path: None, stderr_cursor: Arc::new(AMutex::new(0)), + connection_status: MCPConnectionStatus::Connecting, + last_successful_connection: None, + metrics: new_shared_metrics(), + auth_manager: None, + auth_status: MCPAuthStatus::NotApplicable, + oauth_refresh_task_handle: None, }))); tracing::info!("MCP START SESSION {:?}", session_key); gcx_write @@ -150,13 +439,20 @@ pub async fn mcp_session_setup( }; let session_arc_clone = session_arc.clone(); + let gcx_weak = Arc::downgrade(&gcx); { let mut session_locked = session_arc.lock().await; - let session_downcasted = session_locked + let session_downcasted = match session_locked .as_any_mut() .downcast_mut::() - .unwrap(); + { + Some(s) => s, + None => { + tracing::error!("Session for {:?} is not a SessionMCP, cannot setup MCP", config_path); + return; + } + }; // If it's same config, and there is an mcp client, or startup task is running, skip if new_cfg_value == session_downcasted.launched_cfg { @@ -170,15 +466,25 @@ pub async fn mcp_session_setup( } } + let peer_arc: Arc>>> = Arc::new(AMutex::new(None)); + let peer_arc_clone = peer_arc.clone(); + let startup_task_join_handle = tokio::spawn(async move { let (mcp_client, logs, debug_name, stderr_file) = { let mut session_locked = session_arc_clone.lock().await; - let mcp_session = session_locked + let mcp_session = match session_locked .as_any_mut() .downcast_mut::() - .unwrap(); + { + Some(s) => s, + None => { + tracing::error!("Session is not a SessionMCP, cannot start MCP client"); + return; + } + }; mcp_session.stderr_cursor = Arc::new(AMutex::new(0)); mcp_session.launched_cfg = new_cfg_value.clone(); + mcp_session.connection_status = MCPConnectionStatus::Connecting; ( std::mem::take(&mut mcp_session.mcp_client), mcp_session.logs.clone(), @@ -200,6 +506,7 @@ pub async fn mcp_session_setup( if let Some(mcp_client) = mcp_client { cancel_mcp_client(&debug_name, mcp_client, logs.clone()).await; + tokio::spawn(super::mcp_resources::remove_indexed_resources(gcx_weak.clone(), config_path.clone())); } if let Some(stderr_file) = &stderr_file { if let Err(e) = tokio::fs::remove_file(stderr_file).await { @@ -211,6 +518,18 @@ pub async fn mcp_session_setup( } } + let handler = McpClientHandler { + peer_arc: peer_arc_clone.clone(), + session_arc: session_arc_clone.clone(), + logs: logs.clone(), + debug_name: debug_name.clone(), + request_timeout, + gcx: gcx_weak.clone(), + tool_refresh_handle: Arc::new(AMutex::new(None)), + resource_refresh_handle: Arc::new(AMutex::new(None)), + prompt_refresh_handle: Arc::new(AMutex::new(None)), + }; + let client = match transport_initializer .init_mcp_transport( logs.clone(), @@ -218,11 +537,24 @@ pub async fn mcp_session_setup( init_timeout, request_timeout, session_arc_clone.clone(), + handler, ) .await { Some(client) => client, - None => return, + None => { + let mut session_locked = session_arc_clone.lock().await; + let mcp_session = match session_locked.as_any_mut().downcast_mut::() { + Some(s) => s, + None => return, + }; + if !matches!(mcp_session.connection_status, MCPConnectionStatus::NeedsAuth) { + mcp_session.connection_status = MCPConnectionStatus::Failed { + message: "Transport initialization failed".to_string(), + }; + } + return; + } }; log(tracing::Level::INFO, "Listing tools".to_string()).await; @@ -240,6 +572,14 @@ pub async fn mcp_session_setup( format!("Failed to list tools: {:?}", tools_error), ) .await; + let mut session_locked = session_arc_clone.lock().await; + let mcp_session = match session_locked.as_any_mut().downcast_mut::() { + Some(s) => s, + None => return, + }; + mcp_session.connection_status = MCPConnectionStatus::Failed { + message: format!("Failed to list tools: {:?}", tools_error), + }; return; } Err(_) => { @@ -248,29 +588,140 @@ pub async fn mcp_session_setup( format!("Request timed out after {} seconds", request_timeout), ) .await; + let mut session_locked = session_arc_clone.lock().await; + let mcp_session = match session_locked.as_any_mut().downcast_mut::() { + Some(s) => s, + None => return, + }; + mcp_session.connection_status = MCPConnectionStatus::Failed { + message: "List tools timed out".to_string(), + }; return; } }; let tools_len = tools.len(); - { + let peer = client.peer().clone(); + let server_info = client.peer_info().cloned(); + *peer_arc.lock().await = Some(peer.clone()); + + let capabilities = server_info.as_ref().map(|s| s.capabilities.clone()).unwrap_or_default(); + + let resources = if capabilities.resources.is_some() { + match timeout(Duration::from_secs(request_timeout), client.list_all_resources()).await { + Ok(Ok(r)) => r, + Ok(Err(e)) => { + add_log_entry(logs.clone(), format!("Failed to list resources: {:?}", e)).await; + vec![] + } + Err(_) => { + add_log_entry(logs.clone(), "List resources timed out".to_string()).await; + vec![] + } + } + } else { + vec![] + }; + + let prompts = if capabilities.prompts.is_some() { + match timeout(Duration::from_secs(request_timeout), client.list_all_prompts()).await { + Ok(Ok(p)) => p, + Ok(Err(e)) => { + add_log_entry(logs.clone(), format!("Failed to list prompts: {:?}", e)).await; + vec![] + } + Err(_) => { + add_log_entry(logs.clone(), "List prompts timed out".to_string()).await; + vec![] + } + } + } else { + vec![] + }; + + let client_arc = { let mut session_locked = session_arc_clone.lock().await; - let session_downcasted = session_locked + let session_downcasted = match session_locked .as_any_mut() .downcast_mut::() - .unwrap(); + { + Some(s) => s, + None => { + tracing::error!("Session is not a SessionMCP, cannot store connected MCP client"); + return; + } + }; - session_downcasted.mcp_client = Some(Arc::new(AMutex::new(Some(client)))); + let arc = Arc::new(AMutex::new(Some(client))); + session_downcasted.mcp_client = Some(arc.clone()); session_downcasted.mcp_tools = tools; - - session_downcasted.mcp_tools.len() + session_downcasted.mcp_resources = resources.clone(); + session_downcasted.mcp_prompts = prompts; + session_downcasted.server_info = server_info; + session_downcasted.connection_status = MCPConnectionStatus::Connected; + session_downcasted.last_successful_connection = Some(Instant::now()); + if let Ok(mut m) = session_downcasted.metrics.try_lock() { + m.record_connected(); + } + arc }; + if !resources.is_empty() { + tokio::spawn(super::mcp_resources::index_mcp_resources( + gcx_weak.clone(), + config_path.clone(), + peer, + resources, + logs.clone(), + )); + } + log( tracing::Level::INFO, format!("MCP session setup complete with {tools_len} tools"), ) .await; + + if reconnect_enabled { + let health_task = tokio::spawn(mcp_health_monitor( + session_arc_clone.clone(), + transport_initializer.clone(), + client_arc, + logs.clone(), + debug_name.clone(), + init_timeout, + request_timeout, + health_check_interval, + reconnect_max_attempts, + gcx_weak.clone(), + )); + let health_abort = health_task.abort_handle(); + let mut session_locked = session_arc_clone.lock().await; + let mcp_session = match session_locked.as_any_mut().downcast_mut::() { + Some(s) => s, + None => return, + }; + if let Some(old) = mcp_session.health_task_handle.replace(health_abort) { + old.abort(); + } + } + + { + let mut session_locked = session_arc_clone.lock().await; + let mcp_session = match session_locked.as_any_mut().downcast_mut::() { + Some(s) => s, + None => return, + }; + if mcp_session.auth_manager.is_some() { + let refresh_task = tokio::spawn(mcp_oauth_refresh_task( + session_arc_clone.clone(), + config_path.clone(), + )); + if let Some(old) = mcp_session.oauth_refresh_task_handle.replace(refresh_task.abort_handle()) { + old.abort(); + } + } + } }); let startup_task_abort_handle = startup_task_join_handle.abort_handle(); @@ -280,3 +731,468 @@ pub async fn mcp_session_setup( )); } } + +async fn mcp_health_monitor( + session_arc: Arc>>, + transport_initializer: T, + client_arc: Arc>>, + logs: Arc>>, + debug_name: String, + init_timeout: u64, + request_timeout: u64, + health_check_interval: u64, + reconnect_max_attempts: u64, + gcx_weak: std::sync::Weak>, +) { + let backoff_delays: Vec = vec![1, 2, 4, 8, 16, 30, 60]; + + loop { + let shutdown_flag = match gcx_weak.upgrade() { + Some(gcx) => gcx.read().await.shutdown_flag.clone(), + None => return, + }; + tokio::select! { + _ = tokio::time::sleep(Duration::from_secs(health_check_interval)) => {} + _ = async { + while !shutdown_flag.load(std::sync::atomic::Ordering::SeqCst) { + tokio::time::sleep(Duration::from_millis(200)).await; + } + } => { + tracing::info!("MCP health monitor: shutdown detected, stopping for {}", debug_name); + return; + } + } + + let peer_opt = { + let client_locked = client_arc.lock().await; + client_locked.as_ref().map(|c| c.peer().clone()) + }; + let is_alive = if let Some(peer) = peer_opt { + match timeout(Duration::from_secs(5), peer.list_all_tools()).await { + Ok(Ok(_)) => true, + Ok(Err(e)) => { + tracing::warn!("MCP health check failed for {}: {}", debug_name, e); + add_log_entry(logs.clone(), format!("Health check failed: {}", e)).await; + false + } + Err(_) => { + tracing::warn!("MCP health check timed out for {}", debug_name); + add_log_entry(logs.clone(), "Health check timed out".to_string()).await; + false + } + } + } else { + false + }; + + if !is_alive { + tracing::info!("MCP health monitor: connection lost for {}", debug_name); + add_log_entry(logs.clone(), "Health monitor: connection lost, starting reconnect".to_string()).await; + + let reconnected = reconnect_with_backoff( + session_arc.clone(), + &transport_initializer, + client_arc.clone(), + logs.clone(), + &debug_name, + init_timeout, + request_timeout, + reconnect_max_attempts, + &backoff_delays, + gcx_weak.clone(), + ).await; + + if !reconnected { + let mut session_locked = session_arc.lock().await; + let mcp_session = match session_locked.as_any_mut().downcast_mut::() { + Some(s) => s, + None => return, + }; + mcp_session.connection_status = MCPConnectionStatus::Failed { + message: "Max reconnect attempts reached".to_string(), + }; + add_log_entry(logs.clone(), "Health monitor: max reconnect attempts reached, giving up".to_string()).await; + return; + } + } + } +} + +async fn reconnect_with_backoff( + session_arc: Arc>>, + transport_initializer: &T, + client_arc: Arc>>, + logs: Arc>>, + debug_name: &str, + init_timeout: u64, + request_timeout: u64, + reconnect_max_attempts: u64, + backoff_delays: &[u64], + gcx_weak: std::sync::Weak>, +) -> bool { + let max_attempts = reconnect_max_attempts.min(backoff_delays.len() as u64) as usize; + + for attempt in 0..max_attempts { + let shutdown_flag = match gcx_weak.upgrade() { + Some(gcx) => gcx.read().await.shutdown_flag.clone(), + None => Arc::new(std::sync::atomic::AtomicBool::new(false)), + }; + if shutdown_flag.load(std::sync::atomic::Ordering::SeqCst) { + tracing::info!("MCP reconnect: shutdown detected, aborting reconnect for {}", debug_name); + return false; + } + + let delay = backoff_delays[attempt]; + + { + let mut session_locked = session_arc.lock().await; + let mcp_session = match session_locked.as_any_mut().downcast_mut::() { + Some(s) => s, + None => continue, + }; + mcp_session.connection_status = MCPConnectionStatus::Reconnecting { attempt: attempt as u32 }; + } + + let msg = format!("Reconnecting to {} (attempt {}/{}), waiting {}s", debug_name, attempt + 1, max_attempts, delay); + tracing::info!("{}", msg); + add_log_entry(logs.clone(), msg).await; + + tokio::select! { + _ = tokio::time::sleep(Duration::from_secs(delay)) => {} + _ = async { + while !shutdown_flag.load(std::sync::atomic::Ordering::SeqCst) { + tokio::time::sleep(Duration::from_millis(200)).await; + } + } => { + tracing::info!("MCP reconnect: shutdown detected during backoff, aborting for {}", debug_name); + return false; + } + } + + let peer_arc: Arc>>> = Arc::new(AMutex::new(None)); + let handler = McpClientHandler { + peer_arc: peer_arc.clone(), + session_arc: session_arc.clone(), + logs: logs.clone(), + debug_name: debug_name.to_string(), + request_timeout, + gcx: gcx_weak.clone(), + tool_refresh_handle: Arc::new(AMutex::new(None)), + resource_refresh_handle: Arc::new(AMutex::new(None)), + prompt_refresh_handle: Arc::new(AMutex::new(None)), + }; + + let new_client = transport_initializer + .init_mcp_transport( + logs.clone(), + debug_name.to_string(), + init_timeout, + request_timeout, + session_arc.clone(), + handler, + ) + .await; + + let new_client = match new_client { + Some(c) => c, + None => { + tracing::warn!("Reconnect attempt {} failed for {}", attempt + 1, debug_name); + continue; + } + }; + + let tools = match timeout( + Duration::from_secs(request_timeout), + new_client.list_all_tools(), + ) + .await + { + Ok(Ok(t)) => t, + Ok(Err(e)) => { + add_log_entry(logs.clone(), format!("Reconnect: failed to list tools: {:?}", e)).await; + continue; + } + Err(_) => { + add_log_entry(logs.clone(), "Reconnect: list tools timed out".to_string()).await; + continue; + } + }; + + let tools_len = tools.len(); + let peer = new_client.peer().clone(); + *peer_arc.lock().await = Some(peer); + { + let mut client_locked = client_arc.lock().await; + *client_locked = Some(new_client); + } + let metrics_arc = { + let mut session_locked = session_arc.lock().await; + let mcp_session = match session_locked.as_any_mut().downcast_mut::() { + Some(s) => s, + None => return false, + }; + mcp_session.mcp_tools = tools; + mcp_session.connection_status = MCPConnectionStatus::Connected; + mcp_session.last_successful_connection = Some(Instant::now()); + mcp_session.metrics.clone() + }; + { + let mut m = metrics_arc.lock().await; + m.record_reconnect(); + m.record_connected(); + } + + let msg = format!("Reconnected to {} successfully with {} tools", debug_name, tools_len); + tracing::info!("{}", msg); + add_log_entry(logs.clone(), msg).await; + return true; + } + + false +} + +#[cfg(test)] +mod tests { + use super::*; + use std::sync::atomic::{AtomicU32, Ordering}; + use crate::integrations::sessions::IntegrationSession; + + fn make_session_arc(status: MCPConnectionStatus) -> Arc>> { + Arc::new(AMutex::new(Box::new(super::super::session_mcp::SessionMCP { + debug_name: "test".to_string(), + config_path: "/tmp/test.yaml".to_string(), + launched_cfg: serde_json::Value::Null, + mcp_client: None, + mcp_tools: Vec::new(), + mcp_resources: Vec::new(), + mcp_prompts: Vec::new(), + server_info: None, + startup_task_handles: None, + health_task_handle: None, + logs: Arc::new(AMutex::new(Vec::new())), + stderr_file_path: None, + stderr_cursor: Arc::new(AMutex::new(0)), + connection_status: status, + last_successful_connection: None, + metrics: super::super::mcp_metrics::new_shared_metrics(), + auth_manager: None, + auth_status: super::super::session_mcp::MCPAuthStatus::NotApplicable, + oauth_refresh_task_handle: None, + }) as Box)) + } + + #[test] + fn test_default_health_config() { + let cfg = CommonMCPSettings::default(); + assert_eq!(cfg.health_check_interval, 30); + assert_eq!(cfg.reconnect_max_attempts, 7); + assert!(cfg.reconnect_enabled); + } + + #[tokio::test] + async fn test_reconnect_state_transitions() { + let session_arc = make_session_arc(MCPConnectionStatus::Connected); + let logs = Arc::new(AMutex::new(Vec::new())); + let attempt_count = Arc::new(AtomicU32::new(0)); + + struct AlwaysFailInitializer { + attempts: Arc, + } + + #[async_trait::async_trait] + impl MCPTransportInitializer for AlwaysFailInitializer { + async fn init_mcp_transport( + &self, + _logs: Arc>>, + _debug_name: String, + _init_timeout: u64, + _request_timeout: u64, + _session: Arc>>, + _handler: McpClientHandler, + ) -> Option { + self.attempts.fetch_add(1, Ordering::SeqCst); + None + } + } + + let initializer = AlwaysFailInitializer { attempts: attempt_count.clone() }; + let client_arc: Arc>> = Arc::new(AMutex::new(None)); + let backoff_delays = vec![0u64, 0, 0]; + + let result = reconnect_with_backoff( + session_arc.clone(), + &initializer, + client_arc, + logs, + "test_server", + 1, + 1, + 3, + &backoff_delays, + std::sync::Weak::new(), + ).await; + + assert!(!result, "Should return false when all attempts fail"); + assert_eq!(attempt_count.load(Ordering::SeqCst), 3, "Should attempt exactly max_attempts times"); + + let mut session_locked = session_arc.lock().await; + let mcp_session = session_locked.as_any_mut().downcast_mut::().unwrap(); + assert!( + matches!(mcp_session.connection_status, MCPConnectionStatus::Reconnecting { attempt: 2 }), + "Final status should be Reconnecting with last attempt index" + ); + } + + #[tokio::test] + async fn test_reconnect_max_attempts_capped_by_backoff_delays() { + let session_arc = make_session_arc(MCPConnectionStatus::Connected); + let logs = Arc::new(AMutex::new(Vec::new())); + let attempt_count = Arc::new(AtomicU32::new(0)); + + struct CountingInitializer { + attempts: Arc, + } + + #[async_trait::async_trait] + impl MCPTransportInitializer for CountingInitializer { + async fn init_mcp_transport( + &self, + _logs: Arc>>, + _debug_name: String, + _init_timeout: u64, + _request_timeout: u64, + _session: Arc>>, + _handler: McpClientHandler, + ) -> Option { + self.attempts.fetch_add(1, Ordering::SeqCst); + None + } + } + + let initializer = CountingInitializer { attempts: attempt_count.clone() }; + let client_arc: Arc>> = Arc::new(AMutex::new(None)); + let backoff_delays = vec![0u64, 0]; + + reconnect_with_backoff( + session_arc.clone(), + &initializer, + client_arc, + logs, + "test_server", + 1, + 1, + 100, + &backoff_delays, + std::sync::Weak::new(), + ).await; + + assert_eq!( + attempt_count.load(Ordering::SeqCst), 2, + "Should be capped by backoff_delays length, not reconnect_max_attempts" + ); + } + + #[test] + fn test_reconnect_populates_peer_arc_requirement() { + // Verifies that reconnect_with_backoff creates a fresh peer_arc per attempt + // and populates it after successful transport init. The peer_arc is populated + // via: let peer = new_client.peer().clone(); *peer_arc.lock().await = Some(peer); + // This ensures on_tool_list_changed / on_resource_list_changed handlers work + // after reconnect (they check peer_arc for a Some value before making requests). + // + // Full functional verification requires a real MCP transport (tested in integration tests). + // This test validates the structural requirement is documented and the code compiles correctly. + let peer_arc: Arc>>> = Arc::new(AMutex::new(None)); + assert!(peer_arc.try_lock().is_ok()); + } + + #[test] + fn test_mcp_connection_status_reconnecting_flag() { + let reconnecting = MCPConnectionStatus::Reconnecting { attempt: 2 }; + let connected = MCPConnectionStatus::Connected; + let failed = MCPConnectionStatus::Failed { message: "oops".to_string() }; + + assert!(matches!(&reconnecting, MCPConnectionStatus::Reconnecting { .. })); + assert!(!matches!(&connected, MCPConnectionStatus::Reconnecting { .. })); + assert!(!matches!(&failed, MCPConnectionStatus::Reconnecting { .. })); + } + + #[tokio::test] + async fn test_build_auth_client_no_tokens_sets_needs_auth() { + use super::super::session_mcp::SessionMCP; + use super::super::mcp_metrics::new_shared_metrics; + use crate::integrations::sessions::IntegrationSession; + + let tmp = tempfile::NamedTempFile::new().unwrap(); + let config_path = tmp.path().to_str().unwrap().to_string(); + let logs = Arc::new(AMutex::new(Vec::new())); + + let session_arc: Arc>> = + Arc::new(AMutex::new(Box::new(SessionMCP { + debug_name: "test".to_string(), + config_path: config_path.clone(), + launched_cfg: serde_json::Value::Null, + mcp_client: None, + mcp_tools: Vec::new(), + mcp_resources: Vec::new(), + mcp_prompts: Vec::new(), + server_info: None, + startup_task_handles: None, + health_task_handle: None, + logs: logs.clone(), + stderr_file_path: None, + stderr_cursor: Arc::new(AMutex::new(0)), + connection_status: MCPConnectionStatus::Connecting, + last_successful_connection: None, + metrics: new_shared_metrics(), + auth_manager: None, + auth_status: MCPAuthStatus::NotApplicable, + oauth_refresh_task_handle: None, + }) as Box)); + + let result = super::build_auth_client_for_mcp( + "http://localhost:8080", + &HashMap::new(), + &config_path, + "Streamable HTTP", + logs, + "test_server", + session_arc.clone(), + ).await; + + assert!(result.is_none(), "Should return None when no tokens"); + + let mut session_locked = session_arc.lock().await; + let mcp_session = session_locked + .as_any_mut() + .downcast_mut::() + .unwrap(); + assert!( + matches!(mcp_session.connection_status, MCPConnectionStatus::NeedsAuth), + "Status should be NeedsAuth when no tokens, got {:?}", + mcp_session.connection_status + ); + assert!( + matches!(mcp_session.auth_status, MCPAuthStatus::NeedsLogin), + "Auth status should be NeedsLogin when no tokens, got {:?}", + mcp_session.auth_status + ); + } + + #[test] + fn test_mcp_connection_status_serialization() { + let status = MCPConnectionStatus::Reconnecting { attempt: 3 }; + let json = serde_json::to_value(&status).unwrap(); + assert_eq!(json["status"], "reconnecting"); + assert_eq!(json["attempt"], 3); + + let connected = MCPConnectionStatus::Connected; + let json2 = serde_json::to_value(&connected).unwrap(); + assert_eq!(json2["status"], "connected"); + + let failed = MCPConnectionStatus::Failed { message: "err".to_string() }; + let json3 = serde_json::to_value(&failed).unwrap(); + assert_eq!(json3["status"], "failed"); + assert_eq!(json3["message"], "err"); + } +} diff --git a/refact-agent/engine/src/integrations/mcp/integr_mcp_http.rs b/refact-agent/engine/src/integrations/mcp/integr_mcp_http.rs new file mode 100644 index 0000000000..e7b063ebb0 --- /dev/null +++ b/refact-agent/engine/src/integrations/mcp/integr_mcp_http.rs @@ -0,0 +1,109 @@ +use std::collections::HashMap; +use std::sync::Arc; +use std::sync::Weak; +use async_trait::async_trait; +use tokio::sync::RwLock as ARwLock; +use tokio::sync::Mutex as AMutex; +use tokio::time::Duration; +use rmcp::transport::streamable_http_client::{StreamableHttpClientTransportConfig, StreamableHttpClientTransport}; +use rmcp::transport::common::client_side_sse::ExponentialBackoff; +use rmcp::serve_client; +use serde::{Deserialize, Serialize}; + +use crate::global_context::GlobalContext; +use crate::integrations::integr_abstract::IntegrationCommon; +use super::session_mcp::{McpClientHandler, McpRunningService}; +use super::integr_mcp_common::{ + CommonMCPSettings, MCPTransportInitializer, + build_reqwest_client_for_mcp, build_auth_client_for_mcp, serve_client_with_timeout, impl_mcp_integration_trait, +}; +use super::mcp_auth::{MCPAuthSettings, AuthType}; + +#[derive(Deserialize, Serialize, Clone, PartialEq, Default, Debug)] +pub struct SettingsMCPHttp { + #[serde(default, rename = "url")] + pub mcp_url: String, + #[serde(default = "default_http_headers", rename = "headers")] + pub mcp_headers: HashMap, + #[serde(flatten)] + pub auth: MCPAuthSettings, + #[serde(flatten)] + pub common: CommonMCPSettings, +} + +pub fn default_http_headers() -> HashMap { + HashMap::from([ + ("User-Agent".to_string(), "Refact.ai (+https://github.com/smallcloudai/refact)".to_string()), + ("Accept".to_string(), "application/json, text/event-stream".to_string()), + ("Content-Type".to_string(), "application/json".to_string()), + ]) +} + +#[derive(Default, Clone)] +pub struct IntegrationMCPHttp { + pub gcx_option: Option>>, + pub cfg: SettingsMCPHttp, + pub common: IntegrationCommon, + pub config_path: String, +} + +#[async_trait] +impl MCPTransportInitializer for IntegrationMCPHttp { + async fn init_mcp_transport( + &self, + logs: Arc>>, + debug_name: String, + init_timeout: u64, + _request_timeout: u64, + session: Arc>>, + handler: McpClientHandler, + ) -> Option { + let config = StreamableHttpClientTransportConfig { + uri: Arc::::from(self.cfg.mcp_url.trim()), + retry_config: Arc::new(ExponentialBackoff { + max_times: Some(3), + base_duration: Duration::from_millis(500), + }), + ..Default::default() + }; + + if self.cfg.auth.auth_type == AuthType::Oauth2Pkce { + let auth_client = build_auth_client_for_mcp( + self.cfg.mcp_url.trim(), + &self.cfg.mcp_headers, + &self.config_path, + "Streamable HTTP", + logs.clone(), + &debug_name, + session, + ).await?; + let transport = StreamableHttpClientTransport::with_client(auth_client, config); + serve_client_with_timeout( + serve_client(handler, transport), + init_timeout, + "Streamable HTTP", + logs, + &debug_name, + ).await + } else { + let client = build_reqwest_client_for_mcp( + self.cfg.mcp_url.trim(), + &self.cfg.mcp_headers, + &self.cfg.auth, + "Streamable HTTP", + logs.clone(), + &debug_name, + ).await?; + let transport = StreamableHttpClientTransport::with_client(client, config); + serve_client_with_timeout( + serve_client(handler, transport), + init_timeout, + "Streamable HTTP", + logs, + &debug_name, + ).await + } + } +} + +impl_mcp_integration_trait!(IntegrationMCPHttp, "mcp_http_schema.yaml"); diff --git a/refact-agent/engine/src/integrations/mcp/integr_mcp_sse.rs b/refact-agent/engine/src/integrations/mcp/integr_mcp_sse.rs index 93181833c9..5931e1e5a1 100644 --- a/refact-agent/engine/src/integrations/mcp/integr_mcp_sse.rs +++ b/refact-agent/engine/src/integrations/mcp/integr_mcp_sse.rs @@ -4,20 +4,20 @@ use std::sync::Weak; use async_trait::async_trait; use tokio::sync::RwLock as ARwLock; use tokio::sync::Mutex as AMutex; -use tokio::time::timeout; use tokio::time::Duration; +use rmcp::transport::streamable_http_client::{StreamableHttpClientTransportConfig, StreamableHttpClientTransport}; use rmcp::transport::common::client_side_sse::ExponentialBackoff; -use rmcp::transport::sse_client::{SseClientTransport, SseClientConfig}; use rmcp::serve_client; -use rmcp::{RoleClient, service::RunningService}; use serde::{Deserialize, Serialize}; use crate::global_context::GlobalContext; -use crate::integrations::integr_abstract::{IntegrationTrait, IntegrationCommon}; -use super::session_mcp::add_log_entry; +use crate::integrations::integr_abstract::IntegrationCommon; +use super::session_mcp::{McpClientHandler, McpRunningService}; use super::integr_mcp_common::{ - CommonMCPSettings, MCPTransportInitializer, mcp_integr_tools, mcp_session_setup, + CommonMCPSettings, MCPTransportInitializer, + build_reqwest_client_for_mcp, build_auth_client_for_mcp, serve_client_with_timeout, impl_mcp_integration_trait, }; +use super::mcp_auth::{MCPAuthSettings, AuthType}; #[derive(Deserialize, Serialize, Clone, PartialEq, Default, Debug)] pub struct SettingsMCPSse { @@ -26,15 +26,14 @@ pub struct SettingsMCPSse { #[serde(default = "default_headers", rename = "headers")] pub mcp_headers: HashMap, #[serde(flatten)] + pub auth: MCPAuthSettings, + #[serde(flatten)] pub common: CommonMCPSettings, } pub fn default_headers() -> HashMap { HashMap::from([ - ( - "User-Agent".to_string(), - "Refact.ai (+https://github.com/smallcloudai/refact)".to_string(), - ), + ("User-Agent".to_string(), "Refact.ai (+https://github.com/smallcloudai/refact)".to_string()), ("Accept".to_string(), "text/event-stream".to_string()), ("Content-Type".to_string(), "application/json".to_string()), ]) @@ -56,157 +55,55 @@ impl MCPTransportInitializer for IntegrationMCPSse { debug_name: String, init_timeout: u64, _request_timeout: u64, - _session: Arc>>, - ) -> Option> { - let log = async |level: tracing::Level, msg: String| { - match level { - tracing::Level::ERROR => tracing::error!("{msg} for {debug_name}"), - tracing::Level::WARN => tracing::warn!("{msg} for {debug_name}"), - _ => tracing::info!("{msg} for {debug_name}"), - } - add_log_entry(logs.clone(), msg).await; - }; - - let url = self.cfg.mcp_url.trim(); - if url.is_empty() { - log( - tracing::Level::ERROR, - "URL is empty for SSE transport".to_string(), - ) - .await; - return None; - } - - let mut header_map = reqwest::header::HeaderMap::new(); - for (k, v) in &self.cfg.mcp_headers { - match ( - reqwest::header::HeaderName::from_bytes(k.as_bytes()), - reqwest::header::HeaderValue::from_str(v), - ) { - (Ok(name), Ok(value)) => { - header_map.insert(name, value); - } - _ => { - log( - tracing::Level::WARN, - format!("Invalid header: {}: {}", k, v), - ) - .await - } - } - } - - let client = match reqwest::Client::builder() - .default_headers(header_map) - .build() - { - Ok(reqwest_client) => reqwest_client, - Err(e) => { - log( - tracing::Level::ERROR, - format!("Failed to build reqwest client: {}", e), - ) - .await; - return None; - } - }; - - let client_config = SseClientConfig { - sse_endpoint: Arc::::from(url), - retry_policy: Arc::new(ExponentialBackoff { + session: Arc>>, + handler: McpClientHandler, + ) -> Option { + let config = StreamableHttpClientTransportConfig { + uri: Arc::::from(self.cfg.mcp_url.trim()), + retry_config: Arc::new(ExponentialBackoff { max_times: Some(3), base_duration: Duration::from_millis(500), }), ..Default::default() }; - let transport = match SseClientTransport::start_with_client(client, client_config).await { - Ok(t) => t, - Err(e) => { - log( - tracing::Level::ERROR, - format!("Failed to init SSE transport: {}", e), - ) - .await; - return None; - } - }; - - match timeout( - Duration::from_secs(init_timeout), - serve_client((), transport), - ) - .await - { - Ok(Ok(client)) => Some(client), - Ok(Err(e)) => { - log( - tracing::Level::ERROR, - format!("Failed to init SSE server: {}", e), - ) - .await; - None - } - Err(_) => { - log( - tracing::Level::ERROR, - format!("Request timed out after {} seconds", init_timeout), - ) - .await; - None - } + if self.cfg.auth.auth_type == AuthType::Oauth2Pkce { + let auth_client = build_auth_client_for_mcp( + self.cfg.mcp_url.trim(), + &self.cfg.mcp_headers, + &self.config_path, + "SSE", + logs.clone(), + &debug_name, + session, + ).await?; + let transport = StreamableHttpClientTransport::with_client(auth_client, config); + serve_client_with_timeout( + serve_client(handler, transport), + init_timeout, + "SSE", + logs, + &debug_name, + ).await + } else { + let client = build_reqwest_client_for_mcp( + self.cfg.mcp_url.trim(), + &self.cfg.mcp_headers, + &self.cfg.auth, + "SSE", + logs.clone(), + &debug_name, + ).await?; + let transport = StreamableHttpClientTransport::with_client(client, config); + serve_client_with_timeout( + serve_client(handler, transport), + init_timeout, + "SSE", + logs, + &debug_name, + ).await } } } -#[async_trait] -impl IntegrationTrait for IntegrationMCPSse { - async fn integr_settings_apply( - &mut self, - gcx: Arc>, - config_path: String, - value: &serde_json::Value, - ) -> Result<(), serde_json::Error> { - self.gcx_option = Some(Arc::downgrade(&gcx)); - self.cfg = serde_json::from_value(value.clone())?; - self.common = serde_json::from_value(value.clone())?; - self.config_path = config_path.clone(); - - mcp_session_setup( - gcx, - config_path, - serde_json::to_value(&self.cfg).unwrap_or_default(), - self.clone(), - self.cfg.common.init_timeout, - self.cfg.common.request_timeout, - ) - .await; - - Ok(()) - } - - fn integr_settings_as_json(&self) -> serde_json::Value { - serde_json::to_value(&self.cfg).unwrap() - } - - fn integr_common(&self) -> IntegrationCommon { - self.common.clone() - } - - async fn integr_tools( - &self, - _integr_name: &str, - ) -> Vec> { - mcp_integr_tools( - self.gcx_option.clone(), - &self.config_path, - &self.common, - self.cfg.common.request_timeout, - ) - .await - } - - fn integr_schema(&self) -> &str { - include_str!("mcp_sse_schema.yaml") - } -} +impl_mcp_integration_trait!(IntegrationMCPSse, "mcp_sse_schema.yaml"); diff --git a/refact-agent/engine/src/integrations/mcp/integr_mcp_stdio.rs b/refact-agent/engine/src/integrations/mcp/integr_mcp_stdio.rs index 5cb595188d..b4718e873e 100644 --- a/refact-agent/engine/src/integrations/mcp/integr_mcp_stdio.rs +++ b/refact-agent/engine/src/integrations/mcp/integr_mcp_stdio.rs @@ -8,15 +8,16 @@ use tokio::sync::Mutex as AMutex; use tokio::time::timeout; use tokio::time::Duration; use rmcp::serve_client; -use rmcp::{RoleClient, service::RunningService}; use serde::{Deserialize, Serialize}; use tempfile::NamedTempFile; use crate::global_context::GlobalContext; use crate::integrations::integr_abstract::{IntegrationTrait, IntegrationCommon}; -use super::session_mcp::add_log_entry; +use super::session_mcp::{McpClientHandler, McpRunningService, SessionMCP, add_log_entry}; +use super::mcp_metrics::SharedMetrics; +use super::mcp_path_resolution; use super::integr_mcp_common::{ - CommonMCPSettings, MCPTransportInitializer, mcp_integr_tools, mcp_session_setup, + CommonMCPSettings, MCPTransportInitializer, impl_mcp_integration_trait, }; #[derive(Deserialize, Serialize, Clone, PartialEq, Default, Debug)] @@ -46,7 +47,8 @@ impl MCPTransportInitializer for IntegrationMCPStdio { init_timeout: u64, _request_timeout: u64, session_arc_clone: Arc>>, - ) -> Option> { + handler: McpClientHandler, + ) -> Option { let log = async |level: tracing::Level, msg: String| { match level { tracing::Level::ERROR => tracing::error!("{msg} for {debug_name}"), @@ -84,12 +86,34 @@ impl MCPTransportInitializer for IntegrationMCPStdio { } }; - let mut command = tokio::process::Command::new(&parsed_args[0]); + let resolved = match mcp_path_resolution::resolve_command( + &parsed_args[0], + command, + self.cfg.mcp_env.get("PATH").map(|s| s.as_str()), + ) { + Ok(r) => r, + Err(e) => { + log(tracing::Level::ERROR, e.to_user_message()).await; + return None; + } + }; + + let mut command = tokio::process::Command::new(&resolved.program); command.args(&parsed_args[1..]); + command.env("PATH", &resolved.effective_path); for (key, value) in &self.cfg.mcp_env { command.env(key, value); } + #[cfg(target_os = "linux")] + let session_metrics: Option = { + let mut session_locked = session_arc_clone.lock().await; + session_locked + .as_any_mut() + .downcast_mut::() + .map(|s| s.metrics.clone()) + }; + match NamedTempFile::new().map(|f| f.keep()) { Ok(Ok((file, path))) => { { @@ -113,16 +137,23 @@ impl MCPTransportInitializer for IntegrationMCPStdio { Err(e) => { log( tracing::Level::ERROR, - format!("Failed to init Tokio child process: {}", e), + format!("Failed to start MCP server process '{}': {}. Resolved binary: {}", &parsed_args[0], e, resolved.program.display()), ) .await; return None; } }; + #[cfg(target_os = "linux")] + if let Some(ref metrics) = session_metrics { + if let Some(pid) = read_last_child_pid() { + metrics.lock().await.set_pid(pid); + } + } + match timeout( Duration::from_secs(init_timeout), - serve_client((), transport), + serve_client(handler, transport), ) .await { @@ -147,54 +178,50 @@ impl MCPTransportInitializer for IntegrationMCPStdio { } } +#[cfg(target_os = "linux")] +fn read_last_child_pid() -> Option { + let self_pid = std::process::id(); + let path = format!("/proc/{}/task/{}/children", self_pid, self_pid); + let content = std::fs::read_to_string(&path).ok()?; + content.split_whitespace() + .filter_map(|s| s.parse::().ok()) + .last() +} + +impl_mcp_integration_trait!(IntegrationMCPStdio, "mcp_stdio_schema.yaml"); + +#[derive(Default, Clone)] +pub struct IntegrationMCPUnified { + pub inner: IntegrationMCPStdio, +} + #[async_trait] -impl IntegrationTrait for IntegrationMCPStdio { +impl IntegrationTrait for IntegrationMCPUnified { async fn integr_settings_apply( &mut self, gcx: Arc>, config_path: String, value: &serde_json::Value, ) -> Result<(), serde_json::Error> { - self.gcx_option = Some(Arc::downgrade(&gcx)); - self.cfg = serde_json::from_value(value.clone())?; - self.common = serde_json::from_value(value.clone())?; - self.config_path = config_path.clone(); - - mcp_session_setup( - gcx, - config_path, - serde_json::to_value(&self.cfg).unwrap_or_default(), - self.clone(), - self.cfg.common.init_timeout, - self.cfg.common.request_timeout, - ) - .await; - - Ok(()) + self.inner.integr_settings_apply(gcx, config_path, value).await } fn integr_settings_as_json(&self) -> serde_json::Value { - serde_json::to_value(&self.cfg).unwrap() + self.inner.integr_settings_as_json() } - fn integr_common(&self) -> IntegrationCommon { - self.common.clone() + fn integr_common(&self) -> crate::integrations::integr_abstract::IntegrationCommon { + self.inner.integr_common() } async fn integr_tools( &self, - _integr_name: &str, + integr_name: &str, ) -> Vec> { - mcp_integr_tools( - self.gcx_option.clone(), - &self.config_path, - &self.common, - self.cfg.common.request_timeout, - ) - .await + self.inner.integr_tools(integr_name).await } fn integr_schema(&self) -> &str { - include_str!("mcp_stdio_schema.yaml") + include_str!("mcp_unified_schema.yaml") } } diff --git a/refact-agent/engine/src/integrations/mcp/mcp_auth.rs b/refact-agent/engine/src/integrations/mcp/mcp_auth.rs new file mode 100644 index 0000000000..f9b7b30f05 --- /dev/null +++ b/refact-agent/engine/src/integrations/mcp/mcp_auth.rs @@ -0,0 +1,1256 @@ +use std::collections::HashMap; +use std::path::PathBuf; +use std::sync::{Arc, OnceLock}; +use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; +use serde::{Deserialize, Serialize}; +use tokio::sync::Mutex as AMutex; +use tracing::warn; +use uuid::Uuid; + +use oauth2::{StandardTokenResponse, basic::BasicTokenType, TokenResponse}; +use rmcp::transport::auth::{OAuthState, AuthorizationManager, VendorExtraTokenFields}; +use crate::integrations::sessions::IntegrationSession; + +fn deserialize_scopes<'de, D: serde::Deserializer<'de>>(d: D) -> Result, D::Error> { + use serde::de::Deserialize; + #[derive(Deserialize)] + #[serde(untagged)] + enum ScopesValue { + List(Vec), + Str(String), + } + let value = ScopesValue::deserialize(d)?; + match value { + ScopesValue::List(v) => Ok(v), + ScopesValue::Str(s) => { + if s.is_empty() { + Ok(vec![]) + } else { + Ok(s.split(|c: char| c == ',' || c == ' ') + .map(|s| s.trim().to_string()) + .filter(|s| !s.is_empty()) + .collect()) + } + } + } +} + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)] +#[serde(rename_all = "snake_case")] +pub enum AuthType { + #[default] + None, + Bearer, + #[serde(alias = "oauth2")] + Oauth2ClientCredentials, + Oauth2Pkce, +} + +#[derive(Deserialize, Serialize, Clone, Default, Debug, PartialEq)] +pub struct MCPAuthSettings { + #[serde(default)] + pub auth_type: AuthType, + #[serde(default)] + pub bearer_token: String, + #[serde(default)] + pub oauth2_client_id: String, + #[serde(default)] + pub oauth2_client_secret: String, + #[serde(default)] + pub oauth2_token_url: String, + #[serde(default, deserialize_with = "deserialize_scopes")] + pub oauth2_scopes: Vec, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub oauth_tokens: Option, +} + +#[derive(Deserialize, Serialize, Clone, Default, Debug, PartialEq)] +pub struct MCPOAuthTokens { + #[serde(default)] + pub access_token: String, + #[serde(default)] + pub refresh_token: String, + #[serde(default)] + pub expires_at: i64, + #[serde(default)] + pub client_id: String, + #[serde(default)] + pub client_secret: Option, + #[serde(default)] + pub scopes: Vec, +} + +pub async fn save_tokens_to_config(config_path: &str, tokens: &MCPOAuthTokens) -> Result<(), String> { + let path = PathBuf::from(config_path); + let existing = tokio::fs::read_to_string(&path).await + .map_err(|e| format!("Failed to read config {}: {}", config_path, e))?; + let mut mapping: serde_yaml::Mapping = serde_yaml::from_str(&existing) + .map_err(|e| format!("Failed to parse config YAML {}: {}", config_path, e))?; + let tokens_value = serde_yaml::to_value(tokens) + .map_err(|e| format!("serialize tokens: {}", e))?; + mapping.insert(serde_yaml::Value::String("oauth_tokens".to_string()), tokens_value); + let yaml_str = serde_yaml::to_string(&serde_yaml::Value::Mapping(mapping)) + .map_err(|e| format!("serialize yaml: {}", e))?; + let tmp = path.with_extension("tmp"); + tokio::fs::write(&tmp, &yaml_str).await + .map_err(|e| format!("write {:?}: {}", tmp, e))?; + #[cfg(unix)] + { + use std::os::unix::fs::PermissionsExt; + let _ = tokio::fs::set_permissions(&tmp, std::fs::Permissions::from_mode(0o600)).await; + } + #[cfg(target_os = "windows")] + if path.exists() { + tokio::fs::remove_file(&path).await + .map_err(|e| format!("remove {:?}: {}", path, e))?; + } + tokio::fs::rename(&tmp, &path).await + .map_err(|e| format!("rename {:?} -> {:?}: {}", tmp, path, e))?; + Ok(()) +} + +pub async fn load_tokens_from_config(config_path: &str) -> Option { + let content = tokio::fs::read_to_string(config_path).await.ok()?; + let value: serde_yaml::Value = serde_yaml::from_str(&content).ok()?; + let tokens_value = value.get("oauth_tokens")?; + serde_yaml::from_value(tokens_value.clone()).ok() +} + +pub async fn clear_tokens_from_config(config_path: &str) -> Result<(), String> { + let path = PathBuf::from(config_path); + let existing = tokio::fs::read_to_string(&path).await + .map_err(|e| format!("Failed to read config {}: {}", config_path, e))?; + let mut mapping: serde_yaml::Mapping = serde_yaml::from_str(&existing) + .map_err(|e| format!("Failed to parse config YAML {}: {}", config_path, e))?; + mapping.remove(serde_yaml::Value::String("oauth_tokens".to_string())); + let yaml_str = serde_yaml::to_string(&serde_yaml::Value::Mapping(mapping)) + .map_err(|e| format!("serialize yaml: {}", e))?; + let tmp = path.with_extension("tmp"); + tokio::fs::write(&tmp, &yaml_str).await + .map_err(|e| format!("write {:?}: {}", tmp, e))?; + #[cfg(target_os = "windows")] + if path.exists() { + tokio::fs::remove_file(&path).await + .map_err(|e| format!("remove {:?}: {}", path, e))?; + } + tokio::fs::rename(&tmp, &path).await + .map_err(|e| format!("rename {:?} -> {:?}: {}", tmp, path, e))?; + Ok(()) +} + +struct TokenState { + access_token: String, + expires_at: Option, +} + +pub struct MCPTokenManager { + settings: MCPAuthSettings, + token_cache: Arc>>, +} + +impl MCPTokenManager { + pub fn new(settings: MCPAuthSettings) -> Self { + Self { + settings, + token_cache: Arc::new(AMutex::new(None)), + } + } + + pub async fn get_token(&self) -> Result { + match self.settings.auth_type { + AuthType::None => Err("No auth configured".to_string()), + AuthType::Bearer => { + if self.settings.bearer_token.is_empty() { + return Err("Bearer token is empty".to_string()); + } + Ok(self.settings.bearer_token.clone()) + } + AuthType::Oauth2ClientCredentials => self.get_oauth2_token().await, + AuthType::Oauth2Pkce => { + if let Some(tokens) = &self.settings.oauth_tokens { + let now_ms = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64; + if tokens.expires_at > 0 && tokens.expires_at > now_ms + 30_000 { + return Ok(tokens.access_token.clone()); + } + } + Err("OAuth2 PKCE token expired or not set; re-authentication required".to_string()) + } + } + } + + async fn get_oauth2_token(&self) -> Result { + { + let cache = self.token_cache.lock().await; + if let Some(state) = cache.as_ref() { + // When expires_at is None (server omitted expires_in), treat as expired so + // we always fetch a fresh token rather than caching indefinitely. + let still_valid = state + .expires_at + .map_or(false, |exp| exp > Instant::now() + Duration::from_secs(30)); + if still_valid { + return Ok(state.access_token.clone()); + } + } + } + + if self.settings.oauth2_token_url.is_empty() { + return Err("oauth2_token_url is empty".to_string()); + } + if self.settings.oauth2_client_id.is_empty() { + return Err("oauth2_client_id is empty".to_string()); + } + + let client = reqwest::Client::builder() + .timeout(Duration::from_secs(30)) + .build() + .map_err(|e| format!("Failed to build HTTP client: {}", e))?; + let mut params = vec![ + ("grant_type", "client_credentials".to_string()), + ("client_id", self.settings.oauth2_client_id.clone()), + ("client_secret", self.settings.oauth2_client_secret.clone()), + ]; + if !self.settings.oauth2_scopes.is_empty() { + params.push(("scope", self.settings.oauth2_scopes.join(" "))); + } + + let resp = client + .post(&self.settings.oauth2_token_url) + .form(¶ms) + .send() + .await + .map_err(|e| format!("OAuth2 token request failed: {}", e))?; + + if !resp.status().is_success() { + return Err(format!("OAuth2 token endpoint returned HTTP {}", resp.status())); + } + + let body: serde_json::Value = resp + .json() + .await + .map_err(|e| format!("Failed to parse OAuth2 response: {}", e))?; + + let access_token = body + .get("access_token") + .and_then(|v| v.as_str()) + .ok_or_else(|| "OAuth2 response missing access_token".to_string())? + .to_string(); + + let expires_at = body + .get("expires_in") + .and_then(|v| v.as_u64()) + .map(|secs| Instant::now() + Duration::from_secs(secs)); + + { + let mut cache = self.token_cache.lock().await; + *cache = Some(TokenState { + access_token: access_token.clone(), + expires_at, + }); + } + + Ok(access_token) + } + + pub async fn apply_auth(&self, headers: &mut HashMap) -> Result<(), String> { + match self.settings.auth_type { + AuthType::None => Ok(()), + AuthType::Bearer | AuthType::Oauth2ClientCredentials | AuthType::Oauth2Pkce => { + let token = self.get_token().await?; + headers.insert("Authorization".to_string(), format!("Bearer {}", token)); + Ok(()) + } + } + } +} + +fn reconstruct_token_response( + tokens: &MCPOAuthTokens, +) -> Result, String> { + let now_ms = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64; + + let mut token_json = serde_json::json!({ + "access_token": tokens.access_token, + "token_type": "Bearer", + }); + if !tokens.refresh_token.is_empty() { + token_json["refresh_token"] = serde_json::Value::String(tokens.refresh_token.clone()); + } + if tokens.expires_at > 0 { + let remaining_ms = tokens.expires_at - now_ms; + let expires_in_secs = if remaining_ms <= 0 { + 0i64 + } else { + (remaining_ms + 999) / 1000 + }; + token_json["expires_in"] = serde_json::Value::Number(expires_in_secs.into()); + } + serde_json::from_value(token_json) + .map_err(|e| format!("Failed to reconstruct token response: {}", e)) +} + +pub async fn create_auth_manager_from_tokens( + mcp_url: &str, + tokens: &MCPOAuthTokens, +) -> Result { + let mut state = OAuthState::new(mcp_url, None) + .await + .map_err(|e| format!("create OAuth state: {}", e))?; + let token_response = reconstruct_token_response(tokens)?; + state + .set_credentials(&tokens.client_id, token_response) + .await + .map_err(|e| format!("set OAuth credentials: {}", e))?; + state + .into_authorization_manager() + .ok_or_else(|| "Failed to extract AuthorizationManager after set_credentials".to_string()) +} + +const REFRESH_BEFORE_EXPIRY_MS: i64 = 5 * 60 * 1000; + +pub fn needs_refresh(tokens: &MCPOAuthTokens) -> bool { + if tokens.expires_at <= 0 { + return false; + } + let now_ms = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64; + tokens.expires_at - now_ms < REFRESH_BEFORE_EXPIRY_MS +} + +fn tokens_from_response( + client_id: String, + old_refresh_token: &str, + response: &StandardTokenResponse, + old_scopes: &[String], +) -> MCPOAuthTokens { + let access_token = response.access_token().secret().to_string(); + let refresh_token = response.refresh_token() + .map(|r| r.secret().to_string()) + .filter(|s| !s.is_empty()) + .unwrap_or_else(|| old_refresh_token.to_string()); + let expires_at = response.expires_in().map(|d| { + let now_ms = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64; + now_ms + d.as_millis() as i64 + }).unwrap_or(0); + let response_scopes: Vec = response.scopes() + .map(|scopes| scopes.iter().map(|s| s.to_string()).collect()) + .unwrap_or_default(); + let scopes = if response_scopes.is_empty() { old_scopes.to_vec() } else { response_scopes }; + MCPOAuthTokens { + access_token, + refresh_token, + expires_at, + client_id, + client_secret: None, + scopes, + } +} + +pub async fn mcp_oauth_refresh_task( + session_arc: Arc>>, + config_path: String, +) { + use super::session_mcp::{SessionMCP, MCPAuthStatus}; + + loop { + tokio::time::sleep(tokio::time::Duration::from_secs(60)).await; + + let auth_manager_arc = { + let mut session_locked = session_arc.lock().await; + let mcp_session = match session_locked.as_any_mut().downcast_mut::() { + Some(s) => s, + None => return, + }; + mcp_session.auth_manager.clone() + }; + + let auth_manager_arc = match auth_manager_arc { + Some(am) => am, + // auth_manager not yet set (session still starting up); wait for next cycle + None => continue, + }; + + let tokens = match load_tokens_from_config(&config_path).await { + Some(t) if !t.access_token.is_empty() => t, + _ => { + warn!("OAuth refresh task: no tokens in config {}", config_path); + let mut session_locked = session_arc.lock().await; + if let Some(mcp_session) = session_locked.as_any_mut().downcast_mut::() { + mcp_session.auth_status = MCPAuthStatus::NeedsLogin; + } + // No tokens on disk — user must re-authenticate; keep looping in case + // tokens appear later (e.g., user completes OAuth flow in another tab). + continue; + } + }; + + if !needs_refresh(&tokens) { + continue; + } + + { + let mut session_locked = session_arc.lock().await; + if let Some(mcp_session) = session_locked.as_any_mut().downcast_mut::() { + mcp_session.auth_status = MCPAuthStatus::Refreshing; + } + } + + let refresh_result = { + let am = auth_manager_arc.lock().await; + am.refresh_token().await + }; + + match refresh_result { + Ok(token_response) => { + let new_tokens = tokens_from_response( + tokens.client_id.clone(), + &tokens.refresh_token, + &token_response, + &tokens.scopes, + ); + if let Err(e) = save_tokens_to_config(&config_path, &new_tokens).await { + warn!("OAuth refresh task: failed to persist tokens for {}: {}", config_path, e); + } + let mut session_locked = session_arc.lock().await; + if let Some(mcp_session) = session_locked.as_any_mut().downcast_mut::() { + mcp_session.auth_status = MCPAuthStatus::Authenticated; + } + } + Err(e) => { + warn!("MCP OAuth refresh failed for {}: {}", config_path, e); + let mut session_locked = session_arc.lock().await; + if let Some(mcp_session) = session_locked.as_any_mut().downcast_mut::() { + mcp_session.auth_status = MCPAuthStatus::NeedsReauth; + } + // Keep looping — this may be a transient network error; next cycle will retry. + // If the refresh token itself is invalid the server will keep returning errors, + // but auth_status=NeedsReauth surfaces the problem to the user. + } + } + } +} + +struct PendingOAuthSession { + oauth_state: Arc>, + config_path: String, + created_at: SystemTime, + state_param: String, + scopes: Vec, +} + +static PENDING_SESSIONS: OnceLock>> = OnceLock::new(); +static STATE_INDEX: OnceLock>> = OnceLock::new(); + +fn pending_sessions() -> &'static AMutex> { + PENDING_SESSIONS.get_or_init(|| AMutex::new(HashMap::new())) +} + +fn state_index() -> &'static AMutex> { + STATE_INDEX.get_or_init(|| AMutex::new(HashMap::new())) +} + +fn extract_state_from_url(auth_url: &str) -> Result { + let parsed = url::Url::parse(auth_url) + .map_err(|_| "Failed to parse authorization URL".to_string())?; + let state = parsed.query_pairs() + .find(|(k, _)| k == "state") + .map(|(_, v)| v.to_string()) + .ok_or_else(|| "Authorization URL missing state parameter".to_string())?; + if state.is_empty() { + return Err("Authorization URL has empty state parameter".to_string()); + } + Ok(state) +} + +pub struct MCPOAuthSessionManager; + +impl MCPOAuthSessionManager { + pub async fn start_oauth_flow( + mcp_url: &str, + config_path: &str, + scopes: &[&str], + redirect_uri: &str, + ) -> Result<(String, String), String> { + Self::cleanup_expired_sessions().await; + + let mut state = OAuthState::new(mcp_url, None) + .await + .map_err(|e| format!("create OAuth state: {}", e))?; + state.start_authorization(scopes, redirect_uri, None) + .await + .map_err(|e| format!("start OAuth authorization: {}", e))?; + let auth_url = state.get_authorization_url() + .await + .map_err(|e| format!("get authorization URL: {}", e))?; + let state_param = extract_state_from_url(&auth_url)?; + let session_id = Uuid::new_v4().to_string(); + pending_sessions().lock().await.insert(session_id.clone(), PendingOAuthSession { + oauth_state: Arc::new(AMutex::new(state)), + config_path: config_path.to_string(), + created_at: SystemTime::now(), + state_param: state_param.clone(), + scopes: scopes.iter().map(|s| s.to_string()).collect(), + }); + state_index().lock().await.insert(state_param, session_id.clone()); + Ok((session_id, auth_url)) + } + + pub async fn exchange_code(session_id: &str, code: &str) -> Result<(MCPOAuthTokens, String), String> { + let (oauth_state_arc, config_path, state_param, old_scopes) = { + let sessions = pending_sessions().lock().await; + let session = sessions.get(session_id) + .ok_or_else(|| format!("No pending OAuth session: {}", session_id))?; + (session.oauth_state.clone(), session.config_path.clone(), session.state_param.clone(), session.scopes.clone()) + }; + + let mut oauth_state = oauth_state_arc.lock().await; + oauth_state.handle_callback(code, &state_param) + .await + .map_err(|e| format!("OAuth callback: {}", e))?; + let (client_id, creds_opt) = oauth_state.get_credentials() + .await + .map_err(|e| format!("get OAuth credentials: {}", e))?; + drop(oauth_state); + + let token_response = creds_opt.ok_or_else(|| "No credentials after callback".to_string())?; + let token_json = serde_json::to_value(&token_response) + .map_err(|e| format!("serialize token response: {}", e))?; + let access_token = token_json.get("access_token") + .and_then(|v| v.as_str()) + .unwrap_or_default() + .to_string(); + let refresh_token = token_json.get("refresh_token") + .and_then(|v| v.as_str()) + .unwrap_or_default() + .to_string(); + let expires_at = token_json.get("expires_in") + .and_then(|v| v.as_u64()) + .map(|secs| { + let now_ms = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64; + now_ms + secs as i64 * 1000 + }) + .unwrap_or(0); + + pending_sessions().lock().await.remove(session_id); + if !state_param.is_empty() { + state_index().lock().await.remove(&state_param); + } + + let scopes_from_response: Vec = token_json.get("scope") + .and_then(|v| v.as_str()) + .map(|s| s.split_whitespace().map(|p| p.to_string()).filter(|p| !p.is_empty()).collect()) + .unwrap_or_default(); + let scopes = if scopes_from_response.is_empty() { old_scopes } else { scopes_from_response }; + + Ok((MCPOAuthTokens { + access_token, + refresh_token, + expires_at, + client_id, + client_secret: None, + scopes, + }, config_path)) + } + + pub async fn find_session_id_by_state(state: &str) -> Option { + state_index().lock().await.get(state).cloned() + } + + pub async fn cleanup_expired_sessions() { + let expiry = Duration::from_secs(600); + let mut removed_states: Vec = Vec::new(); + { + let mut sessions = pending_sessions().lock().await; + sessions.retain(|id, session| { + let keep = session.created_at.elapsed().map(|age| age < expiry).unwrap_or(false); + if !keep { + warn!("MCPOAuthSessionManager: removing expired session {}", id); + removed_states.push(session.state_param.clone()); + } + keep + }); + } + let mut si = state_index().lock().await; + for state in removed_states { + si.remove(&state); + } + } + + pub async fn cancel_oauth_flow(session_id: &str) -> bool { + let removed = pending_sessions().lock().await.remove(session_id); + if let Some(session) = removed { + if !session.state_param.is_empty() { + state_index().lock().await.remove(&session.state_param); + } + true + } else { + false + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + use tempfile::NamedTempFile; + use std::io::Write; + + #[test] + fn test_auth_settings_default() { + let s: MCPAuthSettings = serde_json::from_str("{}").unwrap(); + assert_eq!(s.auth_type, AuthType::None); + assert!(s.bearer_token.is_empty()); + } + + #[test] + fn test_auth_type_enum_roundtrip() { + for (variant, expected_str) in [ + (AuthType::None, "\"none\""), + (AuthType::Bearer, "\"bearer\""), + (AuthType::Oauth2ClientCredentials, "\"oauth2_client_credentials\""), + (AuthType::Oauth2Pkce, "\"oauth2_pkce\""), + ] { + let serialized = serde_json::to_string(&variant).unwrap(); + assert_eq!(serialized, expected_str); + let deserialized: AuthType = serde_json::from_str(&serialized).unwrap(); + assert_eq!(deserialized, variant); + } + } + + #[test] + fn test_auth_type_oauth2_alias() { + let json = serde_json::json!({"auth_type": "oauth2"}); + let settings: MCPAuthSettings = serde_json::from_value(json).unwrap(); + assert_eq!(settings.auth_type, AuthType::Oauth2ClientCredentials); + } + + #[test] + fn test_auth_type_backward_compat_oauth2_alias() { + let json = serde_json::json!({"auth_type": "oauth2"}); + let settings: MCPAuthSettings = serde_json::from_value(json).unwrap(); + assert_eq!(settings.auth_type, AuthType::Oauth2ClientCredentials); + } + + #[test] + fn test_auth_type_oauth2_client_credentials_unchanged() { + let json = serde_json::json!({"auth_type": "oauth2_client_credentials"}); + let settings: MCPAuthSettings = serde_json::from_value(json).unwrap(); + assert_eq!(settings.auth_type, AuthType::Oauth2ClientCredentials); + } + + #[test] + fn test_auth_type_oauth2_pkce_deserialized() { + let json = serde_json::json!({"auth_type": "oauth2_pkce"}); + let settings: MCPAuthSettings = serde_json::from_value(json).unwrap(); + assert_eq!(settings.auth_type, AuthType::Oauth2Pkce); + } + + #[test] + fn test_auth_settings_serialization_roundtrip() { + let settings = MCPAuthSettings { + auth_type: AuthType::Bearer, + bearer_token: "tok123".to_string(), + oauth2_client_id: "".to_string(), + oauth2_client_secret: "".to_string(), + oauth2_token_url: "".to_string(), + oauth2_scopes: vec![], + oauth_tokens: None, + }; + let json = serde_json::to_value(&settings).unwrap(); + let roundtrip: MCPAuthSettings = serde_json::from_value(json).unwrap(); + assert_eq!(settings, roundtrip); + } + + #[test] + fn test_mcp_oauth_tokens_serialization_roundtrip_json() { + let tokens = MCPOAuthTokens { + access_token: "access_abc".to_string(), + refresh_token: "refresh_xyz".to_string(), + expires_at: 1700000000000, + client_id: "client_123".to_string(), + client_secret: Some("secret_456".to_string()), + scopes: vec!["read".to_string(), "write".to_string()], + }; + let json = serde_json::to_value(&tokens).unwrap(); + let roundtrip: MCPOAuthTokens = serde_json::from_value(json).unwrap(); + assert_eq!(tokens, roundtrip); + } + + #[test] + fn test_mcp_oauth_tokens_serialization_roundtrip_yaml() { + let tokens = MCPOAuthTokens { + access_token: "access_abc".to_string(), + refresh_token: "refresh_xyz".to_string(), + expires_at: 1700000000000, + client_id: "client_123".to_string(), + client_secret: None, + scopes: vec!["openid".to_string()], + }; + let yaml = serde_yaml::to_string(&tokens).unwrap(); + let roundtrip: MCPOAuthTokens = serde_yaml::from_str(&yaml).unwrap(); + assert_eq!(tokens, roundtrip); + } + + #[tokio::test] + async fn test_token_persistence_merge_with_existing_config() { + let mut tmp = NamedTempFile::new().unwrap(); + let existing_yaml = "url: https://example.com/mcp\nauth_type: oauth2_pkce\n"; + tmp.write_all(existing_yaml.as_bytes()).unwrap(); + let path = tmp.path().to_str().unwrap().to_string(); + + let tokens = MCPOAuthTokens { + access_token: "my_access_token".to_string(), + refresh_token: "my_refresh_token".to_string(), + expires_at: 1700000000000, + client_id: "my_client".to_string(), + client_secret: None, + scopes: vec!["mcp".to_string()], + }; + + save_tokens_to_config(&path, &tokens).await.unwrap(); + + let content = tokio::fs::read_to_string(&path).await.unwrap(); + assert!(content.contains("url: https://example.com/mcp"), "original fields preserved"); + assert!(content.contains("auth_type: oauth2_pkce"), "original fields preserved"); + assert!(content.contains("oauth_tokens"), "oauth_tokens key added"); + assert!(content.contains("my_access_token"), "access token present"); + + let loaded = load_tokens_from_config(&path).await.unwrap(); + assert_eq!(loaded.access_token, tokens.access_token); + assert_eq!(loaded.refresh_token, tokens.refresh_token); + assert_eq!(loaded.expires_at, tokens.expires_at); + assert_eq!(loaded.client_id, tokens.client_id); + } + + #[tokio::test] + async fn test_token_persistence_overwrites_existing_tokens() { + let mut tmp = NamedTempFile::new().unwrap(); + let existing_yaml = "url: https://example.com/mcp\noauth_tokens:\n access_token: old_token\n refresh_token: old_refresh\n expires_at: 0\n client_id: old_client\n"; + tmp.write_all(existing_yaml.as_bytes()).unwrap(); + let path = tmp.path().to_str().unwrap().to_string(); + + let new_tokens = MCPOAuthTokens { + access_token: "new_access_token".to_string(), + refresh_token: "new_refresh_token".to_string(), + expires_at: 1800000000000, + client_id: "new_client".to_string(), + client_secret: None, + scopes: vec![], + }; + + save_tokens_to_config(&path, &new_tokens).await.unwrap(); + + let loaded = load_tokens_from_config(&path).await.unwrap(); + assert_eq!(loaded.access_token, "new_access_token"); + assert_eq!(loaded.client_id, "new_client"); + } + + #[tokio::test] + async fn test_pending_session_expiry_cleanup() { + let old_id = format!("test-stale-{}", Uuid::new_v4()); + let fresh_id = format!("test-fresh-{}", Uuid::new_v4()); + + let old_state = OAuthState::new("http://localhost", None).await.unwrap(); + { + let mut sessions = pending_sessions().lock().await; + sessions.insert(old_id.clone(), PendingOAuthSession { + oauth_state: Arc::new(AMutex::new(old_state)), + config_path: "/tmp/test.yaml".to_string(), + created_at: SystemTime::now() - Duration::from_secs(700), + state_param: String::new(), + scopes: vec![], + }); + } + + let fresh_state = OAuthState::new("http://localhost", None).await.unwrap(); + { + let mut sessions = pending_sessions().lock().await; + sessions.insert(fresh_id.clone(), PendingOAuthSession { + oauth_state: Arc::new(AMutex::new(fresh_state)), + config_path: "/tmp/test.yaml".to_string(), + created_at: SystemTime::now(), + state_param: String::new(), + scopes: vec![], + }); + } + + MCPOAuthSessionManager::cleanup_expired_sessions().await; + + { + let sessions = pending_sessions().lock().await; + assert!(!sessions.contains_key(&old_id), "stale session should be removed"); + assert!(sessions.contains_key(&fresh_id), "fresh session should remain"); + } + + pending_sessions().lock().await.remove(&fresh_id); + } + + #[tokio::test] + async fn test_bearer_token_injection() { + let settings = MCPAuthSettings { + auth_type: AuthType::Bearer, + bearer_token: "my-secret-token".to_string(), + ..Default::default() + }; + let manager = MCPTokenManager::new(settings); + let mut headers = HashMap::new(); + manager.apply_auth(&mut headers).await.unwrap(); + assert_eq!(headers.get("Authorization").unwrap(), "Bearer my-secret-token"); + } + + #[tokio::test] + async fn test_none_auth_does_not_inject_headers() { + let settings = MCPAuthSettings { + auth_type: AuthType::None, + ..Default::default() + }; + let manager = MCPTokenManager::new(settings); + let mut headers = HashMap::new(); + let result = manager.apply_auth(&mut headers).await; + assert!(result.is_ok()); + assert!(headers.is_empty()); + } + + #[tokio::test] + async fn test_bearer_empty_token_returns_error() { + let settings = MCPAuthSettings { + auth_type: AuthType::Bearer, + bearer_token: "".to_string(), + ..Default::default() + }; + let manager = MCPTokenManager::new(settings); + let mut headers = HashMap::new(); + let result = manager.apply_auth(&mut headers).await; + assert!(result.is_err()); + assert!(result.unwrap_err().contains("Bearer token is empty")); + } + + #[tokio::test] + async fn test_oauth2_client_credentials_missing_token_url_returns_error() { + let settings = MCPAuthSettings { + auth_type: AuthType::Oauth2ClientCredentials, + oauth2_client_id: "client123".to_string(), + oauth2_token_url: "".to_string(), + ..Default::default() + }; + let manager = MCPTokenManager::new(settings); + let mut headers = HashMap::new(); + let result = manager.apply_auth(&mut headers).await; + assert!(result.is_err()); + assert!(result.unwrap_err().contains("oauth2_token_url is empty")); + } + + #[tokio::test] + async fn test_oauth2_client_credentials_missing_client_id_returns_error() { + let settings = MCPAuthSettings { + auth_type: AuthType::Oauth2ClientCredentials, + oauth2_client_id: "".to_string(), + oauth2_token_url: "https://example.com/token".to_string(), + ..Default::default() + }; + let manager = MCPTokenManager::new(settings); + let mut headers = HashMap::new(); + let result = manager.apply_auth(&mut headers).await; + assert!(result.is_err()); + assert!(result.unwrap_err().contains("oauth2_client_id is empty")); + } + + #[test] + fn test_reconstruct_token_response_access_token() { + use oauth2::TokenResponse; + let tokens = MCPOAuthTokens { + access_token: "access_abc123".to_string(), + refresh_token: "refresh_xyz".to_string(), + expires_at: (SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64) + + 3_600_000, + client_id: "client_id_1".to_string(), + client_secret: None, + scopes: vec![], + }; + let response = reconstruct_token_response(&tokens).unwrap(); + assert_eq!(response.access_token().secret(), "access_abc123"); + } + + #[test] + fn test_reconstruct_token_response_expired_has_zero_expires_in() { + use oauth2::TokenResponse; + let tokens = MCPOAuthTokens { + access_token: "access_expired".to_string(), + refresh_token: "refresh_xyz".to_string(), + expires_at: 1_000_000, + client_id: "client_id_1".to_string(), + client_secret: None, + scopes: vec![], + }; + let response = reconstruct_token_response(&tokens).unwrap(); + assert_eq!(response.access_token().secret(), "access_expired"); + let expires_in = response.expires_in().expect("expires_in should be present for expired token"); + assert_eq!(expires_in.as_secs(), 0); + } + + #[test] + fn test_reconstruct_token_response_no_refresh() { + use oauth2::TokenResponse; + let tokens = MCPOAuthTokens { + access_token: "access_only".to_string(), + refresh_token: "".to_string(), + expires_at: 0, + client_id: "client".to_string(), + client_secret: None, + scopes: vec![], + }; + let response = reconstruct_token_response(&tokens).unwrap(); + assert_eq!(response.access_token().secret(), "access_only"); + assert!(response.refresh_token().is_none()); + } + + #[tokio::test] + async fn test_no_tokens_in_config_returns_none() { + let tmp = tempfile::NamedTempFile::new().unwrap(); + let path = tmp.path().to_str().unwrap().to_string(); + let result = load_tokens_from_config(&path).await; + assert!(result.is_none(), "Empty config should return None for tokens"); + } + + #[tokio::test] + async fn test_persisted_tokens_loadable_for_reconstruction() { + use std::io::Write; + use oauth2::TokenResponse; + let mut tmp = tempfile::NamedTempFile::new().unwrap(); + let yaml = "auth_type: oauth2_pkce\n"; + tmp.write_all(yaml.as_bytes()).unwrap(); + let path = tmp.path().to_str().unwrap().to_string(); + + let tokens = MCPOAuthTokens { + access_token: "test_access".to_string(), + refresh_token: "test_refresh".to_string(), + expires_at: (SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64) + + 3_600_000, + client_id: "client_123".to_string(), + client_secret: None, + scopes: vec!["mcp".to_string()], + }; + save_tokens_to_config(&path, &tokens).await.unwrap(); + + let loaded = load_tokens_from_config(&path).await.unwrap(); + assert_eq!(loaded.access_token, "test_access"); + + let response = reconstruct_token_response(&loaded).unwrap(); + assert_eq!(response.access_token().secret(), "test_access"); + } + + #[test] + fn test_needs_refresh_no_expiry() { + let tokens = MCPOAuthTokens { + access_token: "tok".to_string(), + refresh_token: "ref".to_string(), + expires_at: 0, + client_id: "client".to_string(), + client_secret: None, + scopes: vec![], + }; + assert!(!needs_refresh(&tokens), "No expiry (0) should not trigger refresh"); + } + + #[test] + fn test_needs_refresh_expires_soon() { + let now_ms = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64; + let tokens = MCPOAuthTokens { + access_token: "tok".to_string(), + refresh_token: "ref".to_string(), + expires_at: now_ms + 2 * 60 * 1000, + client_id: "client".to_string(), + client_secret: None, + scopes: vec![], + }; + assert!(needs_refresh(&tokens), "Expiry in 2 minutes should trigger refresh"); + } + + #[test] + fn test_needs_refresh_expires_later() { + let now_ms = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64; + let tokens = MCPOAuthTokens { + access_token: "tok".to_string(), + refresh_token: "ref".to_string(), + expires_at: now_ms + 60 * 60 * 1000, + client_id: "client".to_string(), + client_secret: None, + scopes: vec![], + }; + assert!(!needs_refresh(&tokens), "Expiry in 1 hour should not trigger refresh"); + } + + #[test] + fn test_needs_refresh_already_expired() { + let now_ms = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64; + let tokens = MCPOAuthTokens { + access_token: "tok".to_string(), + refresh_token: "ref".to_string(), + expires_at: now_ms - 1000, + client_id: "client".to_string(), + client_secret: None, + scopes: vec![], + }; + assert!(needs_refresh(&tokens), "Already expired token should trigger refresh"); + } + + #[test] + fn test_tokens_from_response_fallback_refresh_token() { + use oauth2::TokenResponse; + let tokens = MCPOAuthTokens { + access_token: "old_access".to_string(), + refresh_token: "old_refresh".to_string(), + expires_at: 0, + client_id: "client".to_string(), + client_secret: None, + scopes: vec![], + }; + let response = reconstruct_token_response(&tokens).unwrap(); + let new_tokens = tokens_from_response("client".to_string(), "old_refresh", &response, &[]); + assert_eq!(new_tokens.access_token, "old_access"); + assert_eq!(new_tokens.refresh_token, "old_refresh", "Should fall back to old refresh token"); + assert_eq!(response.access_token().secret(), "old_access"); + } + + #[test] + fn test_unknown_auth_type_fails_deserialization() { + let json = serde_json::json!({"auth_type": "digest"}); + let result: Result = serde_json::from_value(json); + assert!(result.is_err(), "Unknown auth_type string should fail deserialization"); + } + + #[test] + fn test_start_flow_empty_state_rejected() { + let url_no_state = "https://example.com/authorize?code_challenge=abc&code_challenge_method=S256"; + assert!(extract_state_from_url(url_no_state).is_err(), "URL missing state should fail"); + + let url_empty_state = "https://example.com/authorize?state=&code_challenge=abc"; + assert!(extract_state_from_url(url_empty_state).is_err(), "URL with empty state should fail"); + + let url_with_state = "https://example.com/authorize?state=abc123&code_challenge=xyz"; + let result = extract_state_from_url(url_with_state); + assert!(result.is_ok(), "URL with valid state should succeed"); + assert_eq!(result.unwrap(), "abc123"); + } + + #[tokio::test] + async fn test_find_session_by_state_o1() { + let session_id = format!("test-state-o1-{}", Uuid::new_v4()); + let state_val = format!("test-state-{}", Uuid::new_v4()); + + state_index().lock().await.insert(state_val.clone(), session_id.clone()); + + let found = MCPOAuthSessionManager::find_session_id_by_state(&state_val).await; + assert_eq!(found, Some(session_id.clone())); + + let not_found = MCPOAuthSessionManager::find_session_id_by_state("nonexistent_state_xyz_unique").await; + assert!(not_found.is_none()); + + state_index().lock().await.remove(&state_val); + } + + #[tokio::test] + async fn test_cleanup_called_on_start() { + let stale_id = format!("test-cleanup-stale-{}", Uuid::new_v4()); + let stale_state = format!("test-state-stale-{}", Uuid::new_v4()); + + let old_state = OAuthState::new("http://localhost", None).await.unwrap(); + { + let mut sessions = pending_sessions().lock().await; + sessions.insert(stale_id.clone(), PendingOAuthSession { + oauth_state: Arc::new(AMutex::new(old_state)), + config_path: "/tmp/test.yaml".to_string(), + created_at: SystemTime::now() - Duration::from_secs(700), + state_param: stale_state.clone(), + scopes: vec![], + }); + } + state_index().lock().await.insert(stale_state.clone(), stale_id.clone()); + + MCPOAuthSessionManager::cleanup_expired_sessions().await; + + assert!(!pending_sessions().lock().await.contains_key(&stale_id), + "stale session should be removed by cleanup"); + assert!(!state_index().lock().await.contains_key(&stale_state), + "stale state should be removed from state_index by cleanup"); + } + + #[tokio::test] + async fn test_save_tokens_fails_on_invalid_yaml() { + let mut tmp = NamedTempFile::new().unwrap(); + tmp.write_all(b"{{{{invalid yaml").unwrap(); + let path = tmp.path().to_str().unwrap().to_string(); + let original_content = std::fs::read_to_string(&path).unwrap(); + + let tokens = MCPOAuthTokens { + access_token: "tok".to_string(), + ..Default::default() + }; + let result = save_tokens_to_config(&path, &tokens).await; + assert!(result.is_err(), "Should fail on invalid YAML"); + + let after_content = std::fs::read_to_string(&path).unwrap(); + assert_eq!(original_content, after_content, "File should be unchanged on error"); + } + + #[tokio::test] + async fn test_clear_tokens_fails_on_nonexistent_file() { + let result = clear_tokens_from_config("/tmp/nonexistent_mcp_test_file_xyz_12345.yaml").await; + assert!(result.is_err(), "Should fail on nonexistent file"); + } + + #[test] + fn test_scopes_deserialize_from_string() { + let json = serde_json::json!({"auth_type": "bearer", "oauth2_scopes": "read write"}); + let settings: MCPAuthSettings = serde_json::from_value(json).unwrap(); + assert_eq!(settings.oauth2_scopes, vec!["read", "write"]); + } + + #[test] + fn test_scopes_deserialize_from_array() { + let json = serde_json::json!({"auth_type": "bearer", "oauth2_scopes": ["read", "write"]}); + let settings: MCPAuthSettings = serde_json::from_value(json).unwrap(); + assert_eq!(settings.oauth2_scopes, vec!["read", "write"]); + } + + #[test] + fn test_scopes_deserialize_empty_string() { + let json = serde_json::json!({"auth_type": "bearer", "oauth2_scopes": ""}); + let settings: MCPAuthSettings = serde_json::from_value(json).unwrap(); + assert!(settings.oauth2_scopes.is_empty()); + } + + #[test] + fn test_reconstruct_near_expiry_produces_expires_in() { + use oauth2::TokenResponse; + let now_ms = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64; + let tokens = MCPOAuthTokens { + access_token: "tok".to_string(), + refresh_token: String::new(), + expires_at: now_ms + 500, + client_id: "client".to_string(), + client_secret: None, + scopes: vec![], + }; + let response = reconstruct_token_response(&tokens).unwrap(); + let expires_in = response.expires_in().expect("expires_in should be present for near-expiry token"); + assert_eq!(expires_in.as_secs(), 1, "500ms remaining should ceil to 1 second"); + } + + #[test] + fn test_reconstruct_expired_produces_zero_expires_in() { + use oauth2::TokenResponse; + let now_ms = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64; + let tokens = MCPOAuthTokens { + access_token: "tok".to_string(), + refresh_token: String::new(), + expires_at: now_ms - 1, + client_id: "client".to_string(), + client_secret: None, + scopes: vec![], + }; + let response = reconstruct_token_response(&tokens).unwrap(); + let expires_in = response.expires_in().expect("expires_in should be present for expired token"); + assert_eq!(expires_in.as_secs(), 0, "expired token should have expires_in = 0"); + } + + #[test] + fn test_reconstruct_no_expiry_omits_expires_in() { + use oauth2::TokenResponse; + let tokens = MCPOAuthTokens { + access_token: "tok".to_string(), + refresh_token: String::new(), + expires_at: 0, + client_id: "client".to_string(), + client_secret: None, + scopes: vec![], + }; + let response = reconstruct_token_response(&tokens).unwrap(); + assert!(response.expires_in().is_none(), "non-expiring token (expires_at=0) should omit expires_in"); + } + + #[tokio::test] + async fn test_cancel_removes_session() { + let session_id = format!("test-cancel-{}", Uuid::new_v4()); + let state_val = format!("test-cancel-state-{}", Uuid::new_v4()); + + let oauth_state = OAuthState::new("http://localhost", None).await.unwrap(); + pending_sessions().lock().await.insert(session_id.clone(), PendingOAuthSession { + oauth_state: Arc::new(AMutex::new(oauth_state)), + config_path: "/tmp/test.yaml".to_string(), + created_at: SystemTime::now(), + state_param: state_val.clone(), + scopes: vec![], + }); + state_index().lock().await.insert(state_val.clone(), session_id.clone()); + + let removed = MCPOAuthSessionManager::cancel_oauth_flow(&session_id).await; + assert!(removed, "cancel should return true for existing session"); + + assert!(!pending_sessions().lock().await.contains_key(&session_id), + "session should be removed after cancel"); + assert!(!state_index().lock().await.contains_key(&state_val), + "state index should be cleaned up after cancel"); + + let double_cancel = MCPOAuthSessionManager::cancel_oauth_flow(&session_id).await; + assert!(!double_cancel, "cancel of already-removed session should return false"); + } + + #[tokio::test] + async fn test_exchange_failure_keeps_session() { + let session_id = format!("test-exchange-fail-{}", Uuid::new_v4()); + let state_val = format!("test-efk-state-{}", Uuid::new_v4()); + + let oauth_state = OAuthState::new("http://localhost", None).await.unwrap(); + pending_sessions().lock().await.insert(session_id.clone(), PendingOAuthSession { + oauth_state: Arc::new(AMutex::new(oauth_state)), + config_path: "/tmp/test.yaml".to_string(), + created_at: SystemTime::now(), + state_param: state_val.clone(), + scopes: vec![], + }); + state_index().lock().await.insert(state_val.clone(), session_id.clone()); + + let result = MCPOAuthSessionManager::exchange_code(&session_id, "fake_code").await; + assert!(result.is_err(), "exchange with uninitialized OAuth state should fail"); + + assert!(pending_sessions().lock().await.contains_key(&session_id), + "session should remain after failed exchange (for retry)"); + + MCPOAuthSessionManager::cancel_oauth_flow(&session_id).await; + } +} diff --git a/refact-agent/engine/src/integrations/mcp/mcp_http_schema.yaml b/refact-agent/engine/src/integrations/mcp/mcp_http_schema.yaml new file mode 100644 index 0000000000..f97ddcce10 --- /dev/null +++ b/refact-agent/engine/src/integrations/mcp/mcp_http_schema.yaml @@ -0,0 +1,65 @@ +fields: + url: + f_type: string + f_desc: "The URL of the MCP server endpoint, e.g., 'https://api.example.com/mcp'." + headers: + f_type: string_to_string_map + f_desc: "HTTP headers to include in requests to the MCP server." + f_default: + User-Agent: "Refact.ai (+https://github.com/smallcloudai/refact)" + Accept: "application/json, text/event-stream" + Content-Type: application/json + auth_type: + f_type: string_short + f_desc: "Authentication type: none, bearer, oauth2_client_credentials, or oauth2_pkce." + f_default: "none" + bearer_token: + f_type: string_long + f_desc: "Bearer token for auth_type=bearer." + f_default: "" + f_extra: {"password": true} + oauth2_client_id: + f_type: string_short + f_desc: "OAuth2 client ID for auth_type=oauth2_client_credentials." + f_default: "" + oauth2_client_secret: + f_type: string_long + f_desc: "OAuth2 client secret for auth_type=oauth2_client_credentials." + f_default: "" + f_extra: {"password": true} + oauth2_token_url: + f_type: string_long + f_desc: "OAuth2 token endpoint URL for auth_type=oauth2_client_credentials." + f_default: "" + oauth2_scopes: + f_type: string_long + f_desc: "OAuth2 scopes (comma-separated) for auth_type=oauth2_client_credentials." + f_default: "" + init_timeout: + f_type: string_short + f_desc: "Timeout in seconds for MCP server initialization." + f_default: "60" + f_extra: true + request_timeout: + f_type: string_short + f_desc: "Timeout in seconds for MCP requests." + f_default: "30" + f_extra: true +description: | + You can add here an MCP (Model Context Protocol) server, connecting via Streamable HTTP transport. + This is the modern MCP transport protocol that supersedes the legacy SSE transport. + Read more about MCP here: https://www.anthropic.com/news/model-context-protocol +available: + on_your_laptop_possible: true + when_isolated_possible: true +confirmation: + ask_user_default: ["*"] + deny_default: [] +smartlinks: + - sl_label: "Test" + sl_chat: + - role: "user" + content: > + 🔧 Your job is to test %CURRENT_CONFIG%. Tools that this MCP server has created should be visible to you. Don't search anything, it should be visible as + a tools already. Run one and express happiness. If something does wrong, or you don't see the tools, ask user if they want to fix it by rewriting the config. + sl_enable_only_with_tool: true diff --git a/refact-agent/engine/src/integrations/mcp/mcp_metrics.rs b/refact-agent/engine/src/integrations/mcp/mcp_metrics.rs new file mode 100644 index 0000000000..7064df8592 --- /dev/null +++ b/refact-agent/engine/src/integrations/mcp/mcp_metrics.rs @@ -0,0 +1,320 @@ +use std::collections::HashMap; +use std::collections::VecDeque; +use std::time::Instant; +use serde::Serialize; +use tokio::sync::Mutex as AMutex; +use std::sync::Arc; + +const RESPONSE_TIME_WINDOW: usize = 100; + +#[derive(Clone, Serialize, Default)] +pub struct ToolCallStats { + pub call_count: u64, + pub error_count: u64, + pub avg_response_ms: f64, + pub last_called_at: Option, +} + +#[derive(Clone, Serialize, Default)] +pub struct MCPServerMetrics { + #[serde(skip_serializing_if = "Option::is_none")] + pub process_memory_rss_bytes: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub process_cpu_percent: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub process_pid: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub process_uptime_secs: Option, + + pub total_tool_calls: u64, + pub successful_calls: u64, + pub failed_calls: u64, + pub avg_response_time_ms: f64, + pub p95_response_time_ms: f64, + pub max_response_time_ms: f64, + + pub tool_stats: HashMap, + + #[serde(skip_serializing_if = "Option::is_none")] + pub connected_since: Option, + pub reconnect_count: u32, + #[serde(skip_serializing_if = "Option::is_none")] + pub last_call_at: Option, +} + +pub struct MCPMetricsCollector { + pub metrics: MCPServerMetrics, + response_window: VecDeque, + process_start: Option, + last_cpu_stat: Option<(u64, Instant)>, +} + +impl MCPMetricsCollector { + pub fn new() -> Self { + MCPMetricsCollector { + metrics: MCPServerMetrics::default(), + response_window: VecDeque::new(), + process_start: None, + last_cpu_stat: None, + } + } + + pub fn record_connected(&mut self) { + self.metrics.connected_since = Some(chrono::Local::now().format("%Y-%m-%dT%H:%M:%S%.3f").to_string()); + self.process_start = Some(Instant::now()); + } + + pub fn record_reconnect(&mut self) { + self.metrics.reconnect_count += 1; + } + + pub fn set_pid(&mut self, pid: u32) { + self.metrics.process_pid = Some(pid); + } + + pub fn record_call_start(&self) -> Instant { + Instant::now() + } + + pub fn record_call_success(&mut self, tool_name: &str, start: Instant) { + let elapsed_ms = start.elapsed().as_secs_f64() * 1000.0; + self.metrics.total_tool_calls += 1; + self.metrics.successful_calls += 1; + let now_str = chrono::Local::now().format("%Y-%m-%dT%H:%M:%S%.3f").to_string(); + self.metrics.last_call_at = Some(now_str.clone()); + + self.push_response_time(elapsed_ms); + self.update_aggregates(); + + let entry = self.metrics.tool_stats.entry(tool_name.to_string()).or_default(); + let n = entry.call_count as f64; + entry.avg_response_ms = (entry.avg_response_ms * n + elapsed_ms) / (n + 1.0); + entry.call_count += 1; + entry.last_called_at = Some(now_str); + } + + pub fn record_call_failure(&mut self, tool_name: &str, start: Instant) { + let elapsed_ms = start.elapsed().as_secs_f64() * 1000.0; + self.metrics.total_tool_calls += 1; + self.metrics.failed_calls += 1; + let now_str = chrono::Local::now().format("%Y-%m-%dT%H:%M:%S%.3f").to_string(); + self.metrics.last_call_at = Some(now_str.clone()); + + self.push_response_time(elapsed_ms); + self.update_aggregates(); + + let entry = self.metrics.tool_stats.entry(tool_name.to_string()).or_default(); + entry.call_count += 1; + entry.error_count += 1; + entry.last_called_at = Some(now_str); + } + + fn push_response_time(&mut self, ms: f64) { + if self.response_window.len() >= RESPONSE_TIME_WINDOW { + self.response_window.pop_front(); + } + self.response_window.push_back(ms); + } + + fn update_aggregates(&mut self) { + if self.response_window.is_empty() { + return; + } + let mut sorted: Vec = self.response_window.iter().copied().collect(); + sorted.sort_by(|a, b| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal)); + let n = sorted.len(); + self.metrics.avg_response_time_ms = sorted.iter().sum::() / n as f64; + let p95_idx = ((n as f64 * 0.95) as usize).saturating_sub(1).min(n - 1); + self.metrics.p95_response_time_ms = sorted[p95_idx]; + self.metrics.max_response_time_ms = sorted[n - 1]; + } + + pub fn refresh_process_metrics(&mut self) { + let pid = match self.metrics.process_pid { + Some(p) => p, + None => return, + }; + + #[cfg(target_os = "linux")] + { + if let Some(rss) = read_proc_rss(pid) { + self.metrics.process_memory_rss_bytes = Some(rss); + } + if let Some(cpu) = self.sample_cpu_percent(pid) { + self.metrics.process_cpu_percent = Some(cpu); + } + } + + if let Some(start) = self.process_start { + self.metrics.process_uptime_secs = Some(start.elapsed().as_secs()); + } + } + + #[cfg(target_os = "linux")] + fn sample_cpu_percent(&mut self, pid: u32) -> Option { + let stat_path = format!("/proc/{}/stat", pid); + let content = std::fs::read_to_string(&stat_path).ok()?; + let fields: Vec<&str> = content.split_whitespace().collect(); + if fields.len() < 15 { + return None; + } + let utime: u64 = fields[13].parse().ok()?; + let stime: u64 = fields[14].parse().ok()?; + let total_ticks = utime + stime; + let now = Instant::now(); + + if let Some((prev_ticks, prev_time)) = self.last_cpu_stat { + let elapsed_secs = now.duration_since(prev_time).as_secs_f64(); + if elapsed_secs > 0.0 { + let tick_delta = total_ticks.saturating_sub(prev_ticks) as f64; + let ticks_per_sec = get_clock_ticks_per_sec(); + let cpu_percent = (tick_delta / ticks_per_sec / elapsed_secs * 100.0) as f32; + self.last_cpu_stat = Some((total_ticks, now)); + return Some(cpu_percent.min(100.0 * num_cpus())); + } + } + + self.last_cpu_stat = Some((total_ticks, now)); + None + } + + pub fn snapshot(&mut self) -> MCPServerMetrics { + self.refresh_process_metrics(); + self.metrics.clone() + } +} + +#[cfg(target_os = "linux")] +fn read_proc_rss(pid: u32) -> Option { + let statm_path = format!("/proc/{}/statm", pid); + let content = std::fs::read_to_string(&statm_path).ok()?; + let fields: Vec<&str> = content.split_whitespace().collect(); + let rss_pages: u64 = fields.get(1)?.parse().ok()?; + let page_size: u64 = unsafe { libc_page_size() }; + Some(rss_pages * page_size) +} + +#[cfg(target_os = "linux")] +unsafe fn libc_page_size() -> u64 { + let sz = libc::sysconf(libc::_SC_PAGESIZE); + if sz > 0 { sz as u64 } else { 4096 } +} + +#[cfg(target_os = "linux")] +fn get_clock_ticks_per_sec() -> f64 { + // Safety: sysconf is always safe to call with _SC_CLK_TCK + let ticks = unsafe { libc::sysconf(libc::_SC_CLK_TCK) }; + if ticks <= 0 { 100.0 } else { ticks as f64 } +} + +#[cfg(target_os = "linux")] +fn num_cpus() -> f32 { + std::fs::read_to_string("/proc/cpuinfo") + .map(|s| s.lines().filter(|l| l.starts_with("processor")).count() as f32) + .unwrap_or(1.0) + .max(1.0) +} + +pub type SharedMetrics = Arc>; + +pub fn new_shared_metrics() -> SharedMetrics { + Arc::new(AMutex::new(MCPMetricsCollector::new())) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_metrics_default_zeroed() { + let m = MCPServerMetrics::default(); + assert_eq!(m.total_tool_calls, 0); + assert_eq!(m.successful_calls, 0); + assert_eq!(m.failed_calls, 0); + assert_eq!(m.reconnect_count, 0); + assert!(m.tool_stats.is_empty()); + assert!(m.process_pid.is_none()); + } + + #[test] + fn test_record_success_increments_counts() { + let mut collector = MCPMetricsCollector::new(); + let start = Instant::now(); + std::thread::sleep(std::time::Duration::from_millis(5)); + collector.record_call_success("my_tool", start); + assert_eq!(collector.metrics.total_tool_calls, 1); + assert_eq!(collector.metrics.successful_calls, 1); + assert_eq!(collector.metrics.failed_calls, 0); + assert!(collector.metrics.tool_stats.contains_key("my_tool")); + assert_eq!(collector.metrics.tool_stats["my_tool"].call_count, 1); + assert_eq!(collector.metrics.tool_stats["my_tool"].error_count, 0); + } + + #[test] + fn test_record_failure_increments_counts() { + let mut collector = MCPMetricsCollector::new(); + let start = Instant::now(); + collector.record_call_failure("bad_tool", start); + assert_eq!(collector.metrics.total_tool_calls, 1); + assert_eq!(collector.metrics.successful_calls, 0); + assert_eq!(collector.metrics.failed_calls, 1); + assert_eq!(collector.metrics.tool_stats["bad_tool"].error_count, 1); + } + + #[test] + fn test_p95_calculation() { + let mut collector = MCPMetricsCollector::new(); + for i in 1..=20u64 { + let start = Instant::now(); + collector.push_response_time(i as f64 * 10.0); + collector.update_aggregates(); + let _ = start; + } + assert!(collector.metrics.p95_response_time_ms >= 180.0); + assert!(collector.metrics.max_response_time_ms == 200.0); + } + + #[test] + fn test_window_capped_at_100() { + let mut collector = MCPMetricsCollector::new(); + for i in 0..150u64 { + collector.push_response_time(i as f64); + } + assert_eq!(collector.response_window.len(), 100); + assert_eq!(collector.response_window.back().copied(), Some(149.0)); + } + + #[test] + fn test_reconnect_count() { + let mut collector = MCPMetricsCollector::new(); + collector.record_reconnect(); + collector.record_reconnect(); + assert_eq!(collector.metrics.reconnect_count, 2); + } + + #[test] + fn test_serialization_skips_none_fields() { + let metrics = MCPServerMetrics::default(); + let json = serde_json::to_value(&metrics).unwrap(); + assert!(json.get("process_memory_rss_bytes").is_none()); + assert!(json.get("process_pid").is_none()); + assert!(json.get("connected_since").is_none()); + assert!(json.get("last_call_at").is_none()); + } + + #[test] + fn test_multi_tool_stats() { + let mut collector = MCPMetricsCollector::new(); + for _ in 0..3 { + let start = Instant::now(); + collector.record_call_success("tool_a", start); + } + for _ in 0..2 { + let start = Instant::now(); + collector.record_call_failure("tool_b", start); + } + assert_eq!(collector.metrics.tool_stats["tool_a"].call_count, 3); + assert_eq!(collector.metrics.tool_stats["tool_b"].error_count, 2); + assert_eq!(collector.metrics.total_tool_calls, 5); + } +} diff --git a/refact-agent/engine/src/integrations/mcp/mcp_naming.rs b/refact-agent/engine/src/integrations/mcp/mcp_naming.rs new file mode 100644 index 0000000000..7f79c8413e --- /dev/null +++ b/refact-agent/engine/src/integrations/mcp/mcp_naming.rs @@ -0,0 +1,130 @@ +pub const MCP_TRANSPORT_PREFIXES: &[(&str, &str)] = &[ + ("stdio", "mcp_stdio_"), + ("sse", "mcp_sse_"), + ("http", "mcp_http_"), +]; + +pub fn config_prefix_for_transport(transport: &str) -> &'static str { + match transport { + "sse" => "mcp_sse_", + "http" | "streamable-http" => "mcp_http_", + _ => "mcp_stdio_", + } +} + +pub fn detect_transport(config_name: &str) -> String { + for (transport, prefix) in MCP_TRANSPORT_PREFIXES { + if config_name.starts_with(prefix) { + return transport.to_string(); + } + } + "stdio".to_string() +} + +pub fn shorten_config_name(yaml_stem: &str) -> String { + for (_transport, prefix) in MCP_TRANSPORT_PREFIXES { + if let Some(stripped) = yaml_stem.strip_prefix(prefix) { + return format!("mcp_{}", stripped); + } + } + yaml_stem.to_string() +} + +pub fn validate_config_filename(name: &str) -> Result<(), String> { + if name.is_empty() { + return Err("config name must not be empty".to_string()); + } + if name.contains('/') || name.contains('\\') || name.contains("..") { + return Err(format!("config name '{}' contains invalid characters", name)); + } + if name.starts_with('/') || name.contains(':') { + return Err(format!("config name '{}' looks like an absolute path", name)); + } + if !name.chars().all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-') { + return Err(format!("config name '{}' contains unsafe characters (only a-z, A-Z, 0-9, _, - allowed)", name)); + } + if name.len() > 128 { + return Err(format!("config name '{}' exceeds 128 characters", name)); + } + Ok(()) +} + +pub fn validate_server_id(id: &str) -> Result<(), String> { + if id.is_empty() { + return Err("server id must not be empty".to_string()); + } + if id.contains("..") || id.contains('\\') { + return Err(format!("server id '{}' contains invalid characters", id)); + } + if id.chars().any(|c| c.is_control()) { + return Err(format!("server id '{}' contains control characters", id)); + } + if !id.chars().all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-' || c == '/' || c == '.' ) { + return Err(format!("server id '{}' contains unsafe characters", id)); + } + if id.len() > 256 { + return Err(format!("server id '{}' exceeds 256 characters", id)); + } + Ok(()) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_validate_config_filename_rejects_traversal() { + assert!(validate_config_filename("../evil").is_err()); + assert!(validate_config_filename("foo/../../bar").is_err()); + assert!(validate_config_filename("").is_err()); + assert!(validate_config_filename("/etc/passwd").is_err()); + assert!(validate_config_filename("a\\b").is_err()); + } + + #[test] + fn test_validate_config_filename_accepts_valid() { + assert!(validate_config_filename("mcp_stdio_ok").is_ok()); + assert!(validate_config_filename("mcp_http_my-server").is_ok()); + assert!(validate_config_filename("my_server_123").is_ok()); + assert!(validate_config_filename("a-b-c").is_ok()); + } + + #[test] + fn test_validate_server_id_allows_slash() { + assert!(validate_server_id("owner/repo").is_ok()); + assert!(validate_server_id("github/github-mcp-server").is_ok()); + assert!(validate_server_id("namespace/name").is_ok()); + } + + #[test] + fn test_validate_server_id_rejects_traversal() { + assert!(validate_server_id("../evil").is_err()); + assert!(validate_server_id("a\\b").is_err()); + assert!(validate_server_id("").is_err()); + } + + #[test] + fn test_config_prefix_roundtrip() { + for (transport, prefix) in MCP_TRANSPORT_PREFIXES { + assert_eq!(config_prefix_for_transport(transport), *prefix); + } + assert_eq!(config_prefix_for_transport("streamable-http"), "mcp_http_"); + assert_eq!(config_prefix_for_transport("unknown"), "mcp_stdio_"); + } + + #[test] + fn test_shorten_config_name() { + assert_eq!(shorten_config_name("mcp_stdio_github"), "mcp_github"); + assert_eq!(shorten_config_name("mcp_sse_myserver"), "mcp_myserver"); + assert_eq!(shorten_config_name("mcp_http_myserver"), "mcp_myserver"); + assert_eq!(shorten_config_name("other_integration"), "other_integration"); + } + + #[test] + fn test_detect_transport() { + assert_eq!(detect_transport("mcp_stdio_github"), "stdio"); + assert_eq!(detect_transport("mcp_sse_myserver"), "sse"); + assert_eq!(detect_transport("mcp_http_myserver"), "http"); + assert_eq!(detect_transport("something_else"), "stdio"); + } +} diff --git a/refact-agent/engine/src/integrations/mcp/mcp_path_resolution.rs b/refact-agent/engine/src/integrations/mcp/mcp_path_resolution.rs new file mode 100644 index 0000000000..b97dff71c8 --- /dev/null +++ b/refact-agent/engine/src/integrations/mcp/mcp_path_resolution.rs @@ -0,0 +1,256 @@ +use std::path::{Path, PathBuf}; + +#[derive(Debug)] +pub struct ResolvedCommand { + pub program: PathBuf, + pub effective_path: String, +} + +#[derive(Debug)] +pub struct CommandNotFoundError { + pub command: String, + pub full_command: String, + pub effective_path: String, + pub extra_dirs_checked: Vec, +} + +impl CommandNotFoundError { + pub fn to_user_message(&self) -> String { + format!( + "Command '{}' not found.\nCommand: {}\nSearched PATH: {}\nExtra dirs checked: {}\nSuggestions:\n \u{2022} Install the tool (e.g. `pip install uv` for uvx, `npm install -g` for npx tools)\n \u{2022} Use an absolute path in the command field\n \u{2022} Add the binary's directory to env.PATH in the integration config", + self.command, + self.full_command, + self.effective_path, + self.extra_dirs_checked.join(", "), + ) + } +} + +#[cfg(unix)] +const PATH_SEPARATOR: char = ':'; +#[cfg(windows)] +const PATH_SEPARATOR: char = ';'; + +fn dedup_path_entries(entries: Vec) -> Vec { + let mut seen = std::collections::HashSet::new(); + entries.into_iter().filter(|e| seen.insert(e.clone())).collect() +} + +/// Common directories where CLI tools are installed. +/// We intentionally keep this list short and universal. +/// Tool-specific version managers (nvm, volta, fnm, etc.) should be handled +/// by the user's shell profile or by setting env.PATH in the MCP YAML config. +fn extra_dirs() -> Vec { + let mut dirs = Vec::new(); + + if let Some(h) = home::home_dir() { + dirs.push(h.join(".local/bin")); + dirs.push(h.join(".cargo/bin")); + dirs.push(h.join(".bun/bin")); + dirs.push(h.join(".deno/bin")); + dirs.push(h.join("go/bin")); + dirs.push(h.join(".volta/bin")); + dirs.push(h.join(".nvm/current/bin")); + dirs.push(h.join(".local/share/fnm/aliases/default/bin")); + + #[cfg(windows)] + { + if let Ok(appdata) = std::env::var("APPDATA") { + dirs.push(PathBuf::from(appdata).join("npm")); + } + if let Ok(localappdata) = std::env::var("LOCALAPPDATA") { + dirs.push(PathBuf::from(localappdata).join("Programs").join("Python")); + } + } + } + + #[cfg(unix)] + { + dirs.push(PathBuf::from("/usr/local/bin")); + dirs.push(PathBuf::from("/opt/homebrew/bin")); + } + + dirs +} + +pub fn augmented_path(base_path: Option<&str>) -> String { + let base = base_path + .map(|s| s.to_string()) + .unwrap_or_else(|| std::env::var("PATH").unwrap_or_default()); + + let mut entries: Vec = base + .split(PATH_SEPARATOR) + .filter(|s| !s.is_empty()) + .map(|s| s.to_string()) + .collect(); + + for dir in extra_dirs() { + if dir.exists() { + entries.push(dir.to_string_lossy().into_owned()); + } + } + + dedup_path_entries(entries).join(&PATH_SEPARATOR.to_string()) +} + +pub fn resolve_command( + argv0: &str, + full_command: &str, + config_env_path: Option<&str>, +) -> Result { + let effective_path = augmented_path(config_env_path); + + let extra_dirs_display: Vec = extra_dirs() + .into_iter() + .filter(|d| d.exists()) + .map(|d| { + if let Some(ref home) = home::home_dir() { + let rel = d.strip_prefix(home).ok().map(|r| format!("~/{}", r.display())); + rel.unwrap_or_else(|| d.display().to_string()) + } else { + d.display().to_string() + } + }) + .collect(); + + if Path::new(argv0).components().count() > 1 { + let p = PathBuf::from(argv0); + if p.exists() { + return Ok(ResolvedCommand { program: p, effective_path }); + } + return Err(CommandNotFoundError { + command: argv0.to_string(), + full_command: full_command.to_string(), + effective_path, + extra_dirs_checked: extra_dirs_display, + }); + } + + match which::which_in(argv0, Some(&effective_path), ".") { + Ok(path) => Ok(ResolvedCommand { program: path, effective_path }), + Err(_) => Err(CommandNotFoundError { + command: argv0.to_string(), + full_command: full_command.to_string(), + effective_path, + extra_dirs_checked: extra_dirs_display, + }), + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[cfg(unix)] + fn make_executable(path: &std::path::Path) { + use std::os::unix::fs::PermissionsExt; + let mut perms = std::fs::metadata(path).unwrap().permissions(); + perms.set_mode(0o755); + std::fs::set_permissions(path, perms).unwrap(); + } + + #[cfg(windows)] + fn make_executable(_path: &std::path::Path) { + // On Windows, files don't need explicit execute permission + } + + #[test] + fn test_augmented_path_includes_existing_dirs() { + let tmp = tempfile::tempdir().unwrap(); + let extra = tmp.path().join("extra_bin"); + std::fs::create_dir_all(&extra).unwrap(); + let base = extra.to_str().unwrap().to_string(); + let result = augmented_path(Some(&base)); + assert!(result.contains(extra.to_str().unwrap())); + } + + #[test] + fn test_augmented_path_skips_nonexistent_dirs() { + let nonexistent = "/definitely/does/not/exist/xyz_999888"; + let result = augmented_path(Some("/usr/bin")); + let parts: Vec<&str> = result.split(PATH_SEPARATOR).collect(); + assert!(!parts.contains(&nonexistent)); + } + + #[test] + fn test_augmented_path_deduplicates() { + let tmp = tempfile::tempdir().unwrap(); + let dir = tmp.path().to_str().unwrap().to_string(); + let base = format!("{dir}{sep}{dir}{sep}{dir}", sep = PATH_SEPARATOR); + let result = augmented_path(Some(&base)); + let count = result.split(PATH_SEPARATOR).filter(|&s| s == dir).count(); + assert_eq!(count, 1); + } + + #[test] + fn test_resolve_command_finds_binary_in_extra_dir() { + let tmp = tempfile::tempdir().unwrap(); + #[cfg(windows)] + let bin_name = "my_fake_tool_xyz.exe"; + #[cfg(not(windows))] + let bin_name = "my_fake_tool_xyz"; + let bin_path = tmp.path().join(bin_name); + std::fs::write(&bin_path, "#!/bin/sh\necho hi").unwrap(); + make_executable(&bin_path); + + let dir_str = tmp.path().to_str().unwrap(); + let result = resolve_command("my_fake_tool_xyz", "my_fake_tool_xyz --arg", Some(dir_str)); + assert!(result.is_ok()); + let resolved = result.unwrap(); + assert_eq!(resolved.program, bin_path); + } + + #[test] + fn test_resolve_command_absolute_path_passthrough() { + let tmp = tempfile::tempdir().unwrap(); + let bin_path = tmp.path().join("absolute_tool"); + std::fs::write(&bin_path, "#!/bin/sh\necho hi").unwrap(); + make_executable(&bin_path); + + let abs = bin_path.to_str().unwrap(); + let result = resolve_command(abs, abs, None); + assert!(result.is_ok()); + assert_eq!(result.unwrap().program, bin_path); + } + + #[test] + fn test_resolve_command_not_found_error() { + let result = resolve_command( + "nonexistent_tool_zzz_99999", + "nonexistent_tool_zzz_99999 --flag", + Some("/tmp"), + ); + assert!(result.is_err()); + let err = result.unwrap_err(); + assert_eq!(err.command, "nonexistent_tool_zzz_99999"); + assert_eq!(err.full_command, "nonexistent_tool_zzz_99999 --flag"); + assert!(err.effective_path.contains("/tmp")); + } + + #[test] + fn test_resolve_command_not_found_message() { + let result = resolve_command("uvx_not_here", "uvx_not_here mcp-server-fetch", Some("/tmp")); + assert!(result.is_err()); + let msg = result.unwrap_err().to_user_message(); + assert!(msg.contains("uvx_not_here")); + assert!(msg.contains("Install the tool")); + assert!(msg.contains("absolute path")); + assert!(msg.contains("env.PATH")); + } + + #[test] + fn test_resolve_with_config_env_path() { + let tmp = tempfile::tempdir().unwrap(); + #[cfg(windows)] + let bin_name = "config_path_tool.exe"; + #[cfg(not(windows))] + let bin_name = "config_path_tool"; + let bin_path = tmp.path().join(bin_name); + std::fs::write(&bin_path, "#!/bin/sh\necho hi").unwrap(); + make_executable(&bin_path); + + let config_path = tmp.path().to_str().unwrap(); + let result = resolve_command("config_path_tool", "config_path_tool", Some(config_path)); + assert!(result.is_ok()); + } +} diff --git a/refact-agent/engine/src/integrations/mcp/mcp_prompts.rs b/refact-agent/engine/src/integrations/mcp/mcp_prompts.rs new file mode 100644 index 0000000000..5856db5064 --- /dev/null +++ b/refact-agent/engine/src/integrations/mcp/mcp_prompts.rs @@ -0,0 +1,299 @@ +use std::collections::HashMap; +use std::path::PathBuf; +use std::sync::Arc; +use tokio::sync::RwLock as ARwLock; +use tokio::time::{timeout, Duration}; + +use crate::ext::config_dirs::CommandSource; +use crate::ext::slash_commands::SlashCommand; +use crate::global_context::GlobalContext; +use crate::integrations::mcp::session_mcp::SessionMCP; + +pub const MCP_PROMPT_PREFIX: &str = "mcp_"; + +pub fn sanitize_name(s: &str) -> String { + s.chars() + .map(|c| if c.is_alphanumeric() || c == '_' { c } else { '_' }) + .collect() +} + +pub fn server_name_from_session(session: &SessionMCP) -> String { + if let Some(info) = &session.server_info { + let name = sanitize_name(&info.server_info.name); + if !name.is_empty() { + return name; + } + } + let path = std::path::Path::new(&session.config_path); + let stem = path + .file_stem() + .and_then(|s| s.to_str()) + .unwrap_or("mcp"); + sanitize_name(stem) +} + +pub fn mcp_prompt_command_name(server_name: &str, prompt_name: &str) -> String { + format!("{}{}_{}", MCP_PROMPT_PREFIX, server_name, sanitize_name(prompt_name)) +} + +pub async fn mcp_prompts_as_slash_commands(gcx: Arc>) -> Vec { + let sessions: Vec>>> = { + let gcx_locked = gcx.read().await; + gcx_locked.integration_sessions.values().cloned().collect() + }; + + let mut result = Vec::new(); + for session_arc in sessions { + let mut session_locked = session_arc.lock().await; + let mcp_session = match session_locked.as_any_mut().downcast_mut::() { + Some(s) => s, + None => continue, + }; + if mcp_session.mcp_prompts.is_empty() { + continue; + } + let server_name = server_name_from_session(mcp_session); + for prompt in &mcp_session.mcp_prompts { + let cmd_name = mcp_prompt_command_name(&server_name, &prompt.name); + let description = prompt.description.clone().unwrap_or_default(); + let argument_hint = build_argument_hint(prompt); + result.push(SlashCommand { + name: cmd_name, + description, + argument_hint, + allowed_tools: vec![], + model: None, + body: String::new(), + source: CommandSource::GlobalRefact, + file_path: PathBuf::new(), + }); + } + } + result +} + +fn build_argument_hint(prompt: &rmcp::model::Prompt) -> String { + let args = match &prompt.arguments { + Some(a) if !a.is_empty() => a, + _ => return String::new(), + }; + let parts: Vec = args + .iter() + .map(|a| { + if a.required.unwrap_or(false) { + format!("<{}>", a.name) + } else { + format!("[{}]", a.name) + } + }) + .collect(); + parts.join(" ") +} + +pub struct McpPromptParsed { + pub server_config_path: String, + pub prompt_name: String, + pub args_map: HashMap, +} + +pub async fn parse_mcp_prompt_command( + gcx: Arc>, + cmd_name: &str, + args_str: &str, +) -> Option { + if !cmd_name.starts_with(MCP_PROMPT_PREFIX) { + return None; + } + let sessions: Vec<(String, Arc>>)> = { + let gcx_locked = gcx.read().await; + gcx_locked + .integration_sessions + .iter() + .map(|(k, v)| (k.clone(), v.clone())) + .collect() + }; + + for (config_path, session_arc) in sessions { + let mut session_locked = session_arc.lock().await; + let mcp_session = match session_locked.as_any_mut().downcast_mut::() { + Some(s) => s, + None => continue, + }; + let server_name = server_name_from_session(mcp_session); + for prompt in &mcp_session.mcp_prompts { + let expected_name = mcp_prompt_command_name(&server_name, &prompt.name); + if expected_name == cmd_name { + let args_map = build_args_map(prompt, args_str); + return Some(McpPromptParsed { + server_config_path: config_path, + prompt_name: prompt.name.clone(), + args_map, + }); + } + } + } + None +} + +fn build_args_map(prompt: &rmcp::model::Prompt, args_str: &str) -> HashMap { + let mut map = HashMap::new(); + let positional: Vec<&str> = args_str.split_whitespace().collect(); + if let Some(arguments) = &prompt.arguments { + for (i, arg) in arguments.iter().enumerate() { + if let Some(val) = positional.get(i) { + map.insert(arg.name.clone(), val.to_string()); + } + } + } + map +} + +pub async fn execute_mcp_prompt( + gcx: Arc>, + cmd_name: &str, + args_str: &str, + request_timeout: u64, +) -> Result { + let parsed = match parse_mcp_prompt_command(gcx.clone(), cmd_name, args_str).await { + Some(p) => p, + None => return Err(format!("MCP prompt not found: {}", cmd_name)), + }; + + let session_arc = { + let gcx_locked = gcx.read().await; + gcx_locked + .integration_sessions + .get(&parsed.server_config_path) + .cloned() + }; + + let session_arc = match session_arc { + Some(s) => s, + None => return Err(format!("MCP session not found: {}", parsed.server_config_path)), + }; + + let client_arc = { + let mut session_locked = session_arc.lock().await; + let mcp_session = session_locked + .as_any_mut() + .downcast_mut::() + .ok_or("not an MCP session")?; + mcp_session.mcp_client.clone() + }; + + let client_arc = match client_arc { + Some(c) => c, + None => return Err(format!("MCP client not connected: {}", parsed.server_config_path)), + }; + + let args_obj: Option> = if parsed.args_map.is_empty() { + None + } else { + Some( + parsed + .args_map + .into_iter() + .map(|(k, v)| (k, serde_json::Value::String(v))) + .collect(), + ) + }; + + let params = if let Some(args) = args_obj { + rmcp::model::GetPromptRequestParams::new(parsed.prompt_name).with_arguments(args) + } else { + rmcp::model::GetPromptRequestParams::new(parsed.prompt_name) + }; + + let peer = { + let client_locked = client_arc.lock().await; + match &*client_locked { + Some(c) => c.peer().clone(), + None => return Err("MCP client disconnected".to_string()), + } + }; // lock released before the network call + + let result = match timeout(Duration::from_secs(request_timeout), peer.get_prompt(params)).await { + Ok(Ok(r)) => r, + Ok(Err(e)) => return Err(format!("get_prompt failed: {:?}", e)), + Err(_) => return Err(format!("get_prompt timed out after {}s", request_timeout)), + }; + + Ok(format_prompt_result(result)) +} + +fn format_prompt_result(result: rmcp::model::GetPromptResult) -> String { + let mut parts = Vec::new(); + for msg in result.messages { + let text = match &msg.content { + rmcp::model::PromptMessageContent::Text { text } => text.clone(), + rmcp::model::PromptMessageContent::Image { .. } => "[image]".to_string(), + rmcp::model::PromptMessageContent::Resource { resource } => { + match &resource.resource { + rmcp::model::ResourceContents::TextResourceContents { text, .. } => text.clone(), + rmcp::model::ResourceContents::BlobResourceContents { .. } => "[blob resource]".to_string(), + } + } + rmcp::model::PromptMessageContent::ResourceLink { .. } => "[resource link]".to_string(), + }; + match msg.role { + rmcp::model::PromptMessageRole::User => parts.push(text), + rmcp::model::PromptMessageRole::Assistant => { + parts.push(format!("[assistant]: {}", text)); + } + } + } + parts.join("\n") +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_sanitize_name() { + assert_eq!(sanitize_name("hello-world"), "hello_world"); + assert_eq!(sanitize_name("my server"), "my_server"); + assert_eq!(sanitize_name("valid_name_123"), "valid_name_123"); + assert_eq!(sanitize_name("dots.and.slashes/"), "dots_and_slashes_"); + } + + #[test] + fn test_mcp_prompt_command_name() { + assert_eq!(mcp_prompt_command_name("myserver", "code_review"), "mcp_myserver_code_review"); + assert_eq!(mcp_prompt_command_name("my_server", "review-code"), "mcp_my_server_review_code"); + } + + #[test] + fn test_build_args_map_positional() { + let prompt = rmcp::model::Prompt::new( + "test", + None::, + Some(vec![ + rmcp::model::PromptArgument::new("arg1").with_required(true), + rmcp::model::PromptArgument::new("arg2").with_required(false), + ]), + ); + let map = build_args_map(&prompt, "value1 value2"); + assert_eq!(map.get("arg1"), Some(&"value1".to_string())); + assert_eq!(map.get("arg2"), Some(&"value2".to_string())); + } + + #[test] + fn test_build_argument_hint_required_optional() { + let prompt = rmcp::model::Prompt::new( + "test", + None::, + Some(vec![ + rmcp::model::PromptArgument::new("req").with_required(true), + rmcp::model::PromptArgument::new("opt").with_required(false), + ]), + ); + assert_eq!(build_argument_hint(&prompt), " [opt]"); + } + + #[test] + fn test_build_argument_hint_no_args() { + let prompt = rmcp::model::Prompt::new("test", None::, None); + assert_eq!(build_argument_hint(&prompt), ""); + } +} diff --git a/refact-agent/engine/src/integrations/mcp/mcp_resources.rs b/refact-agent/engine/src/integrations/mcp/mcp_resources.rs new file mode 100644 index 0000000000..3c1fb15d56 --- /dev/null +++ b/refact-agent/engine/src/integrations/mcp/mcp_resources.rs @@ -0,0 +1,368 @@ +use std::sync::{Arc, Weak}; +use tokio::sync::{Mutex as AMutex, RwLock as ARwLock}; +use tokio::time::{timeout, Duration}; +use rmcp::model::{Resource as McpResource, ReadResourceRequestParams, ResourceContents}; +use rmcp::service::Peer; +use rmcp::RoleClient; + +use crate::global_context::GlobalContext; + +const MAX_RESOURCES_TO_INDEX: usize = 100; +const MAX_RESOURCE_SIZE_BYTES: usize = 50 * 1024 * 1024; +const MAX_TOTAL_INDEX_BYTES: usize = 200 * 1024 * 1024; +const REQUEST_TIMEOUT_SECS: u64 = 30; + +pub fn is_text_mime(mime_type: &Option) -> bool { + match mime_type { + None => true, + Some(m) => { + let m = m.to_lowercase(); + m.starts_with("text/") + || m == "application/json" + || m == "application/xml" + || m == "application/javascript" + || m == "application/x-yaml" + || m == "application/yaml" + } + } +} + +fn uri_to_filename(uri: &str) -> String { + let sanitized: String = uri + .chars() + .map(|c| if c.is_alphanumeric() || c == '-' || c == '_' || c == '.' { c } else { '_' }) + .collect(); + let hash = crate::ast::chunk_utils::official_text_hashing_function(uri); + let prefix = sanitized.chars().take(40).collect::(); + format!("{}_{}.md", prefix, &hash[..8]) +} + +fn server_name_for_path(config_path: &str) -> String { + let path = std::path::Path::new(config_path); + path.file_stem() + .and_then(|s| s.to_str()) + .unwrap_or("mcp") + .chars() + .map(|c| if c.is_alphanumeric() || c == '_' { c } else { '_' }) + .collect() +} + +pub async fn index_mcp_resources( + gcx_weak: Weak>, + config_path: String, + peer: Peer, + resources: Vec, + logs: Arc>>, +) { + let gcx = match gcx_weak.upgrade() { + Some(g) => g, + None => return, + }; + + let (cache_dir, vec_db) = { + let gcx_locked = gcx.read().await; + (gcx_locked.cache_dir.clone(), gcx_locked.vec_db.clone()) + }; + + if vec_db.lock().await.is_none() { + return; + } + + let server_name = server_name_for_path(&config_path); + let resources_dir = cache_dir.join("mcp_resources").join(&server_name); + if let Err(e) = tokio::fs::create_dir_all(&resources_dir).await { + tracing::error!("mcp_resources: failed to create dir {:?}: {}", resources_dir, e); + return; + } + + let limited: Vec<_> = resources.into_iter().take(MAX_RESOURCES_TO_INDEX).collect(); + let total_count = limited.len(); + let mut indexed_paths: Vec = Vec::new(); + let mut total_bytes: usize = 0; + + 'outer: for resource in &limited { + if resource.uri.contains('{') { + continue; + } + + let param = ReadResourceRequestParams::new(resource.uri.clone()); + let result = match timeout( + Duration::from_secs(REQUEST_TIMEOUT_SECS), + peer.read_resource(param), + ).await { + Ok(Ok(r)) => r, + Ok(Err(e)) => { + let msg = format!("mcp_resources: failed to read {}: {:?}", resource.uri, e); + tracing::warn!("{}", msg); + super::session_mcp::add_log_entry(logs.clone(), msg).await; + continue; + } + Err(_) => { + let msg = format!("mcp_resources: read {} timed out", resource.uri); + tracing::warn!("{}", msg); + super::session_mcp::add_log_entry(logs.clone(), msg).await; + continue; + } + }; + + for content in result.contents { + match content { + ResourceContents::TextResourceContents { uri, mime_type, text, .. } => { + if !is_text_mime(&mime_type) || text.len() > MAX_RESOURCE_SIZE_BYTES { + continue; + } + let filename = uri_to_filename(&uri); + let file_path = resources_dir.join(&filename); + let header = format!( + "\n\n\n", + uri, server_name + ); + let full_content = format!("{}{}", header, text); + let content_len = full_content.len(); + if total_bytes + content_len > MAX_TOTAL_INDEX_BYTES { + let remaining = total_count - indexed_paths.len(); + let msg = format!( + "MCP resource indexing for {}: total size cap reached ({} bytes), skipped {} resources", + server_name, total_bytes, remaining + ); + tracing::warn!("{}", msg); + super::session_mcp::add_log_entry(logs.clone(), msg).await; + break 'outer; + } + match tokio::fs::write(&file_path, &full_content).await { + Ok(_) => { + total_bytes += content_len; + indexed_paths.push(file_path.to_string_lossy().to_string()); + } + Err(e) => { + tracing::error!("mcp_resources: failed to write {:?}: {}", file_path, e); + } + } + } + ResourceContents::BlobResourceContents { .. } => {} + } + } + } + + if indexed_paths.is_empty() { + return; + } + + let msg = format!("mcp_resources: indexing {} text resources for {}", indexed_paths.len(), server_name); + tracing::info!("{}", msg); + super::session_mcp::add_log_entry(logs.clone(), msg).await; + + let vec_db_locked = vec_db.lock().await; + if let Some(ref db) = *vec_db_locked { + db.vectorizer_enqueue_files(&indexed_paths, false).await; + } +} + +pub async fn remove_indexed_resources( + gcx_weak: Weak>, + config_path: String, +) { + let gcx = match gcx_weak.upgrade() { + Some(g) => g, + None => return, + }; + + let (cache_dir, vec_db) = { + let gcx_locked = gcx.read().await; + (gcx_locked.cache_dir.clone(), gcx_locked.vec_db.clone()) + }; + + let server_name = server_name_for_path(&config_path); + let resources_dir = cache_dir.join("mcp_resources").join(&server_name); + + if !resources_dir.exists() { + return; + } + + let mut entries = match tokio::fs::read_dir(&resources_dir).await { + Ok(e) => e, + Err(_) => return, + }; + + let mut md_paths: Vec = Vec::new(); + while let Ok(Some(entry)) = entries.next_entry().await { + let path = entry.path(); + if path.extension().map(|e| e == "md").unwrap_or(false) { + md_paths.push(path); + } + } + + for path in md_paths { + { + let vec_db_locked = vec_db.lock().await; + if let Some(ref db) = *vec_db_locked { + let _ = db.remove_file(&path).await; + } + } + let _ = tokio::fs::remove_file(&path).await; + } +} + +#[cfg(test)] +pub fn resources_cache_dir(cache_dir: &std::path::PathBuf, config_path: &str) -> std::path::PathBuf { + let server_name = server_name_for_path(config_path); + cache_dir.join("mcp_resources").join(server_name) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_is_text_mime_none() { + assert!(is_text_mime(&None)); + } + + #[test] + fn test_is_text_mime_text_plain() { + assert!(is_text_mime(&Some("text/plain".to_string()))); + } + + #[test] + fn test_is_text_mime_text_markdown() { + assert!(is_text_mime(&Some("text/markdown".to_string()))); + } + + #[test] + fn test_is_text_mime_application_json() { + assert!(is_text_mime(&Some("application/json".to_string()))); + } + + #[test] + fn test_is_text_mime_image_binary() { + assert!(!is_text_mime(&Some("image/png".to_string()))); + assert!(!is_text_mime(&Some("application/octet-stream".to_string()))); + } + + #[test] + fn test_uri_to_filename_simple() { + let name = uri_to_filename("file:///path/to/doc.txt"); + assert!(name.ends_with(".md")); + assert!(name.len() < 70); + } + + #[test] + fn test_uri_to_filename_different_uris_produce_different_names() { + let name1 = uri_to_filename("db://tables/users"); + let name2 = uri_to_filename("db://tables/orders"); + assert_ne!(name1, name2); + } + + #[test] + fn test_uri_to_filename_same_uri_deterministic() { + let name1 = uri_to_filename("file:///docs/readme.md"); + let name2 = uri_to_filename("file:///docs/readme.md"); + assert_eq!(name1, name2); + } + + #[test] + fn test_server_name_for_path() { + assert_eq!(server_name_for_path("/home/user/.refact/integrations.d/mcp_stdio_myserver.yaml"), "mcp_stdio_myserver"); + assert_eq!(server_name_for_path("/tmp/test-server.yaml"), "test_server"); + } + + #[test] + fn test_resources_cache_dir() { + let cache_dir = std::path::PathBuf::from("/home/user/.cache/refact"); + let dir = resources_cache_dir(&cache_dir, "/path/to/mcp_stdio_myserver.yaml"); + assert_eq!(dir, std::path::PathBuf::from("/home/user/.cache/refact/mcp_resources/mcp_stdio_myserver")); + } + + #[test] + fn test_max_total_index_bytes_constant() { + assert_eq!(MAX_TOTAL_INDEX_BYTES, 200 * 1024 * 1024); + } + + #[tokio::test] + async fn test_total_cap_stops_indexing() { + use std::sync::Arc; + use tokio::sync::Mutex as AMutex; + use tempfile::TempDir; + + let tmp = TempDir::new().unwrap(); + let resources_dir = tmp.path().to_path_buf(); + tokio::fs::create_dir_all(&resources_dir).await.unwrap(); + + let chunk_size = MAX_TOTAL_INDEX_BYTES / 3 + 1; + let big_text = "x".repeat(chunk_size); + + let mut indexed = Vec::new(); + let mut total_bytes: usize = 0; + let mut cap_reached = false; + let uris = vec!["res://a", "res://b", "res://c", "res://d"]; + let logs: Arc>> = Arc::new(AMutex::new(Vec::new())); + + 'outer: for uri in &uris { + let header = format!("\n\n\n", uri); + let full_content = format!("{}{}", header, &big_text); + let content_len = full_content.len(); + if total_bytes + content_len > MAX_TOTAL_INDEX_BYTES { + let remaining = uris.len() - indexed.len(); + let msg = format!( + "MCP resource indexing for test: total size cap reached ({} bytes), skipped {} resources", + total_bytes, remaining + ); + { + let mut l = logs.lock().await; + l.push(msg); + } + cap_reached = true; + break 'outer; + } + let file_path = resources_dir.join(format!("{}.md", uri.replace("://", "_"))); + tokio::fs::write(&file_path, &full_content).await.unwrap(); + total_bytes += content_len; + indexed.push(file_path); + } + + assert!(cap_reached, "cap should have been reached"); + assert!(indexed.len() < uris.len(), "not all resources should be indexed"); + assert!(total_bytes <= MAX_TOTAL_INDEX_BYTES, "total bytes should not exceed cap"); + + let log_entries = logs.lock().await; + assert!(!log_entries.is_empty(), "warning should have been logged"); + assert!(log_entries[0].contains("total size cap reached")); + } + + #[tokio::test] + async fn test_remove_indexed_resources_iterates_without_holding_lock() { + use tempfile::TempDir; + use tokio::sync::Mutex as AMutex; + + let tmp = TempDir::new().unwrap(); + let resources_dir = tmp.path().to_path_buf(); + tokio::fs::create_dir_all(&resources_dir).await.unwrap(); + + let file1 = resources_dir.join("resource1.md"); + let file2 = resources_dir.join("resource2.md"); + let other = resources_dir.join("other.txt"); + tokio::fs::write(&file1, "content1").await.unwrap(); + tokio::fs::write(&file2, "content2").await.unwrap(); + tokio::fs::write(&other, "other").await.unwrap(); + + let mut entries = tokio::fs::read_dir(&resources_dir).await.unwrap(); + let db_option: Option<()> = None; + + let mut removed_md = 0usize; + while let Ok(Some(entry)) = entries.next_entry().await { + let path = entry.path(); + if path.extension().map(|e| e == "md").unwrap_or(false) { + let _ = db_option; + let _ = tokio::fs::remove_file(&path).await; + removed_md += 1; + } + } + + assert_eq!(removed_md, 2); + assert!(!file1.exists()); + assert!(!file2.exists()); + assert!(other.exists()); + + let _lock: AMutex> = AMutex::new(None); + } +} diff --git a/refact-agent/engine/src/integrations/mcp/mcp_sampling.rs b/refact-agent/engine/src/integrations/mcp/mcp_sampling.rs new file mode 100644 index 0000000000..16fc254d37 --- /dev/null +++ b/refact-agent/engine/src/integrations/mcp/mcp_sampling.rs @@ -0,0 +1,121 @@ +use std::sync::Weak; +use tokio::sync::RwLock as ARwLock; +use rmcp::model::{ + CreateMessageRequestParams, CreateMessageResult, Role, SamplingMessage, + SamplingContent, SamplingMessageContent, +}; +use rmcp::ErrorData as McpError; + +use crate::call_validation::{ChatContent, ChatMessage}; +use crate::global_context::GlobalContext; +use crate::subchat::run_subchat_once; + +fn content_to_text(c: &SamplingMessageContent) -> String { + match c { + SamplingMessageContent::Text(t) => t.text.clone(), + SamplingMessageContent::Image(_) => "[image content not supported]".to_string(), + SamplingMessageContent::Audio(_) => "[audio content not supported]".to_string(), + SamplingMessageContent::ToolResult(_) | SamplingMessageContent::ToolUse(_) => "[tool content not supported]".to_string(), + } +} + +fn sampling_message_to_chat_message(msg: &SamplingMessage) -> ChatMessage { + let text = match &msg.content { + SamplingContent::Single(c) => content_to_text(c), + SamplingContent::Multiple(cs) => cs.iter().map(content_to_text).collect::>().join("\n"), + }; + let role = match msg.role { + Role::User => "user", + Role::Assistant => "assistant", + }; + ChatMessage { + role: role.to_string(), + content: ChatContent::SimpleText(text), + ..Default::default() + } +} + +pub async fn mcp_sampling_create_message( + gcx_weak: Weak>, + params: CreateMessageRequestParams, + debug_name: &str, +) -> Result { + let gcx = gcx_weak.upgrade().ok_or_else(|| { + McpError::internal_error("Refact agent is shutting down", None) + })?; + + tracing::info!( + "MCP sampling request from {}: {} messages, max_tokens={}", + debug_name, + params.messages.len(), + params.max_tokens + ); + + let mut messages: Vec = params + .messages + .iter() + .map(sampling_message_to_chat_message) + .collect(); + + if let Some(system_prompt) = ¶ms.system_prompt { + messages.insert( + 0, + ChatMessage { + role: "system".to_string(), + content: ChatContent::SimpleText(system_prompt.clone()), + ..Default::default() + }, + ); + } + + let result = run_subchat_once(gcx, "mcp_sampling", messages) + .await + .map_err(|e| { + tracing::warn!("MCP sampling subchat failed for {}: {}", debug_name, e); + McpError::internal_error( + "Sampling subchat failed", + Some(serde_json::json!({"reason": e})), + ) + })?; + + let last_assistant = result + .messages + .iter() + .rev() + .find(|m| m.role == "assistant"); + + let response_text = last_assistant + .map(|m| m.content.content_text_only()) + .unwrap_or_else(|| "No response generated.".to_string()); + + tracing::info!( + "MCP sampling response for {}: {} chars", + debug_name, + response_text.len() + ); + + let message = SamplingMessage::assistant_text(response_text); + Ok(CreateMessageResult::new(message, "refact".to_string()) + .with_stop_reason(CreateMessageResult::STOP_REASON_END_TURN)) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_sampling_message_to_chat_message_user() { + let msg = SamplingMessage::user_text("hello"); + let chat_msg = sampling_message_to_chat_message(&msg); + assert_eq!(chat_msg.role, "user"); + assert_eq!(chat_msg.content.content_text_only(), "hello"); + } + + #[test] + fn test_sampling_message_to_chat_message_assistant() { + let msg = SamplingMessage::assistant_text("response"); + let chat_msg = sampling_message_to_chat_message(&msg); + assert_eq!(chat_msg.role, "assistant"); + assert_eq!(chat_msg.content.content_text_only(), "response"); + } +} diff --git a/refact-agent/engine/src/integrations/mcp/mcp_sse_schema.yaml b/refact-agent/engine/src/integrations/mcp/mcp_sse_schema.yaml index 978eb4e1a3..3607cf7496 100644 --- a/refact-agent/engine/src/integrations/mcp/mcp_sse_schema.yaml +++ b/refact-agent/engine/src/integrations/mcp/mcp_sse_schema.yaml @@ -9,6 +9,32 @@ fields: User-Agent: "Refact.ai (+https://github.com/smallcloudai/refact)" Accept: text/event-stream Content-Type: application/json + auth_type: + f_type: string_short + f_desc: "Authentication type: none, bearer, oauth2_client_credentials, or oauth2_pkce." + f_default: "none" + bearer_token: + f_type: string_long + f_desc: "Bearer token for auth_type=bearer." + f_default: "" + f_extra: {"password": true} + oauth2_client_id: + f_type: string_short + f_desc: "OAuth2 client ID for auth_type=oauth2_client_credentials." + f_default: "" + oauth2_client_secret: + f_type: string_long + f_desc: "OAuth2 client secret for auth_type=oauth2_client_credentials." + f_default: "" + f_extra: {"password": true} + oauth2_token_url: + f_type: string_long + f_desc: "OAuth2 token endpoint URL for auth_type=oauth2_client_credentials." + f_default: "" + oauth2_scopes: + f_type: string_long + f_desc: "OAuth2 scopes (comma-separated) for auth_type=oauth2_client_credentials." + f_default: "" init_timeout: f_type: string_short f_desc: "Timeout in seconds for MCP server initialization." diff --git a/refact-agent/engine/src/integrations/mcp/mcp_unified_schema.yaml b/refact-agent/engine/src/integrations/mcp/mcp_unified_schema.yaml new file mode 100644 index 0000000000..d717bcf770 --- /dev/null +++ b/refact-agent/engine/src/integrations/mcp/mcp_unified_schema.yaml @@ -0,0 +1,74 @@ +fields: + command: + f_type: string + f_desc: "For local MCP servers: the command to execute, e.g. `npx -y @org/mcp-server`. Leave empty if using a URL." + url: + f_type: string + f_desc: "For remote MCP servers: the HTTP endpoint URL, e.g. 'https://api.example.com/mcp'. Leave empty if using a command." + env: + f_type: string_to_string_map + f_desc: "Environment variables (for command-based servers)." + headers: + f_type: string_to_string_map + f_desc: "HTTP headers (for URL-based servers)." + f_default: + User-Agent: "Refact.ai (+https://github.com/smallcloudai/refact)" + Accept: "application/json, text/event-stream" + f_extra: true + auth_type: + f_type: string_short + f_desc: "Authentication: none, bearer, or oauth2 (for URL-based servers)." + f_default: "none" + f_extra: true + bearer_token: + f_type: string_long + f_desc: "Bearer token (for auth_type=bearer)." + f_default: "" + f_extra: {"password": true} + oauth2_client_id: + f_type: string_short + f_desc: "OAuth2 client ID." + f_default: "" + f_extra: true + oauth2_client_secret: + f_type: string_long + f_desc: "OAuth2 client secret." + f_default: "" + f_extra: {"password": true} + oauth2_token_url: + f_type: string_long + f_desc: "OAuth2 token endpoint." + f_default: "" + f_extra: true + oauth2_scopes: + f_type: string_long + f_desc: "OAuth2 scopes (comma-separated)." + f_default: "" + f_extra: true + init_timeout: + f_type: string_short + f_desc: "Init timeout seconds." + f_default: "60" + f_extra: true + request_timeout: + f_type: string_short + f_desc: "Request timeout seconds." + f_default: "30" + f_extra: true +description: | + Add an MCP (Model Context Protocol) server. Enter a command for local servers or a URL for remote servers. + The transport type (stdio vs HTTP) is determined automatically. +available: + on_your_laptop_possible: true + when_isolated_possible: true +confirmation: + ask_user_default: ["*"] + deny_default: [] +smartlinks: + - sl_label: "Test" + sl_chat: + - role: "user" + content: > + 🔧 Your job is to test %CURRENT_CONFIG%. Tools that this MCP server has created should be visible to you. Don't search anything, it should be visible as + a tools already. Run one and express happiness. If something does wrong, or you don't see the tools, ask user if they want to fix it by rewriting the config. + sl_enable_only_with_tool: true diff --git a/refact-agent/engine/src/integrations/mcp/mod.rs b/refact-agent/engine/src/integrations/mcp/mod.rs index b14473f6c9..e97c0cc37d 100644 --- a/refact-agent/engine/src/integrations/mcp/mod.rs +++ b/refact-agent/engine/src/integrations/mcp/mod.rs @@ -1,5 +1,16 @@ pub mod integr_mcp_common; +pub mod integr_mcp_http; pub mod integr_mcp_sse; pub mod integr_mcp_stdio; +pub mod mcp_auth; +pub mod mcp_metrics; +pub mod mcp_naming; +pub mod mcp_path_resolution; +pub mod mcp_prompts; +pub mod mcp_resources; +pub mod mcp_sampling; pub mod session_mcp; pub mod tool_mcp; + +#[cfg(test)] +mod tests_mcp_tools; diff --git a/refact-agent/engine/src/integrations/mcp/session_mcp.rs b/refact-agent/engine/src/integrations/mcp/session_mcp.rs index 7a457e97fa..b683e30dac 100644 --- a/refact-agent/engine/src/integrations/mcp/session_mcp.rs +++ b/refact-agent/engine/src/integrations/mcp/session_mcp.rs @@ -1,25 +1,381 @@ use std::any::Any; use std::path::PathBuf; -use std::sync::Arc; +use std::sync::{Arc, Weak}; use std::future::Future; -use tokio::sync::Mutex as AMutex; +use std::time::Instant; +use tokio::sync::{Mutex as AMutex, RwLock as ARwLock}; use tokio::task::{AbortHandle, JoinHandle}; use rmcp::{RoleClient, service::RunningService}; -use rmcp::model::Tool as McpTool; -use tokio::time::{timeout, Duration}; +use rmcp::transport::auth::AuthorizationManager; +use rmcp::handler::client::ClientHandler; +use rmcp::model::{Tool as McpTool, Resource as McpResource, Prompt as McpPrompt, ServerInfo, ClientInfo, ClientCapabilities}; +use rmcp::service::{Peer, RequestContext, NotificationContext}; +use tokio::time::{timeout, sleep, Duration}; +use serde::{Deserialize, Serialize}; +use crate::global_context::GlobalContext; use crate::integrations::sessions::IntegrationSession; use crate::integrations::process_io_utils::read_file_with_cursor; +use super::mcp_sampling::mcp_sampling_create_message; +use super::mcp_metrics::SharedMetrics; +#[cfg(test)] +use super::mcp_metrics::new_shared_metrics; + +#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] +#[serde(tag = "status", rename_all = "snake_case")] +pub enum MCPConnectionStatus { + Connected, + Connecting, + Reconnecting { attempt: u32 }, + Failed { message: String }, + Disconnected, + NeedsAuth, +} + +#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] +#[serde(rename_all = "snake_case")] +pub enum MCPAuthStatus { + NotApplicable, + Authenticated, + NeedsLogin, + NeedsReauth, + Refreshing, + Error(String), +} + +pub type McpRunningService = RunningService; + +pub struct McpClientHandler { + pub peer_arc: Arc>>>, + pub session_arc: Arc>>, + pub logs: Arc>>, + pub debug_name: String, + pub request_timeout: u64, + pub gcx: Weak>, + pub tool_refresh_handle: Arc>>, + pub resource_refresh_handle: Arc>>, + pub prompt_refresh_handle: Arc>>, +} + +pub fn redact_sensitive_value(key: &str, value: &str) -> String { + let key_lower = key.to_lowercase(); + if key_lower.contains("token") || key_lower.contains("secret") + || key_lower.contains("password") || key_lower.contains("key") + || key_lower.contains("authorization") || key_lower.contains("cookie") + { + if value.len() > 8 { + format!("{}...{}", &value[..4], &value[value.len()-4..]) + } else { + "***REDACTED***".to_string() + } + } else { + value.to_string() + } +} + +pub fn redact_sensitive_json(value: &serde_json::Value) -> serde_json::Value { + match value { + serde_json::Value::Object(map) => { + let redacted: serde_json::Map = map.iter() + .map(|(k, v)| { + let new_v = match v { + serde_json::Value::String(s) => { + serde_json::Value::String(redact_sensitive_value(k, s)) + } + other => redact_sensitive_json(other), + }; + (k.clone(), new_v) + }) + .collect(); + serde_json::Value::Object(redacted) + } + serde_json::Value::Array(arr) => { + serde_json::Value::Array(arr.iter().map(redact_sensitive_json).collect()) + } + other => other.clone(), + } +} + +impl ClientHandler for McpClientHandler { + fn get_info(&self) -> ClientInfo { + let mut info = ClientInfo::default(); + info.capabilities = ClientCapabilities::builder().enable_sampling().build(); + info + } + + fn create_message( + &self, + params: rmcp::model::CreateMessageRequestParams, + _context: RequestContext, + ) -> impl Future> + Send + '_ { + let gcx_weak = self.gcx.clone(); + let debug_name = self.debug_name.clone(); + async move { + mcp_sampling_create_message(gcx_weak, params, &debug_name).await + } + } + + fn on_tool_list_changed(&self, _context: NotificationContext) -> impl Future + Send + '_ { + let peer_arc = self.peer_arc.clone(); + let session_arc = self.session_arc.clone(); + let logs = self.logs.clone(); + let debug_name = self.debug_name.clone(); + let request_timeout = self.request_timeout; + let handle_arc = self.tool_refresh_handle.clone(); + async move { + { + let mut handle = handle_arc.lock().await; + if let Some(h) = handle.take() { + h.abort(); + } + } + let task = tokio::spawn(async move { + sleep(Duration::from_millis(200)).await; + let peer = { + let locked = peer_arc.lock().await; + locked.clone() + }; + let peer = match peer { + Some(p) => p, + None => { + tracing::warn!("tools/list_changed: no peer available for {}", debug_name); + return; + } + }; + let new_tools = match timeout( + Duration::from_secs(request_timeout), + peer.list_all_tools(), + ) + .await + { + Ok(Ok(tools)) => tools, + Ok(Err(e)) => { + let msg = format!("tools/list_changed: failed to list tools: {:?}", e); + tracing::error!("{} for {}", msg, debug_name); + add_log_entry(logs, msg).await; + return; + } + Err(_) => { + let msg = format!( + "tools/list_changed: list_tools timed out after {}s", + request_timeout + ); + tracing::error!("{} for {}", msg, debug_name); + add_log_entry(logs, msg).await; + return; + } + }; + let old_count; + let new_count = new_tools.len(); + { + let mut session_locked = session_arc.lock().await; + let session_downcasted = session_locked + .as_any_mut() + .downcast_mut::() + .unwrap(); + old_count = session_downcasted.mcp_tools.len(); + let old_names: std::collections::HashSet<_> = session_downcasted + .mcp_tools + .iter() + .map(|t| t.name.clone()) + .collect(); + let new_names: std::collections::HashSet<_> = + new_tools.iter().map(|t| t.name.clone()).collect(); + let added: Vec<_> = new_names.difference(&old_names).collect(); + let removed: Vec<_> = old_names.difference(&new_names).collect(); + session_downcasted.mcp_tools = new_tools; + let msg = format!( + "tools/list_changed: {} → {} tools, added: {:?}, removed: {:?}", + old_count, new_count, added, removed + ); + tracing::info!("{} for {}", msg, debug_name); + add_log_entry(logs, msg).await; + } + }); + let mut handle = handle_arc.lock().await; + *handle = Some(task.abort_handle()); + } + } + + fn on_resource_list_changed(&self, _context: NotificationContext) -> impl Future + Send + '_ { + let peer_arc = self.peer_arc.clone(); + let session_arc = self.session_arc.clone(); + let logs = self.logs.clone(); + let debug_name = self.debug_name.clone(); + let request_timeout = self.request_timeout; + let gcx = self.gcx.clone(); + let handle_arc = self.resource_refresh_handle.clone(); + async move { + { + let mut handle = handle_arc.lock().await; + if let Some(h) = handle.take() { + h.abort(); + } + } + let task = tokio::spawn(async move { + sleep(Duration::from_millis(200)).await; + let msg = "resources/list_changed: re-fetching resource list".to_string(); + tracing::info!("{} for {}", msg, debug_name); + add_log_entry(logs.clone(), msg).await; + + let peer = { + let locked = peer_arc.lock().await; + locked.clone() + }; + let peer = match peer { + Some(p) => p, + None => { + tracing::warn!("resources/list_changed: no peer available for {}", debug_name); + return; + } + }; + + let new_resources = match timeout( + Duration::from_secs(request_timeout), + peer.list_all_resources(), + ).await { + Ok(Ok(r)) => r, + Ok(Err(e)) => { + let msg = format!("resources/list_changed: failed to list resources: {:?}", e); + tracing::error!("{} for {}", msg, debug_name); + add_log_entry(logs, msg).await; + return; + } + Err(_) => { + let msg = format!("resources/list_changed: list_resources timed out after {}s", request_timeout); + tracing::error!("{} for {}", msg, debug_name); + add_log_entry(logs, msg).await; + return; + } + }; + + let (old_count, config_path) = { + let mut session_locked = session_arc.lock().await; + let session_downcasted = session_locked + .as_any_mut() + .downcast_mut::() + .unwrap(); + let old_count = session_downcasted.mcp_resources.len(); + session_downcasted.mcp_resources = new_resources.clone(); + (old_count, session_downcasted.config_path.clone()) + }; + + let msg = format!( + "resources/list_changed: {} → {} resources", + old_count, new_resources.len() + ); + tracing::info!("{} for {}", msg, debug_name); + add_log_entry(logs.clone(), msg).await; + + if !new_resources.is_empty() { + tokio::spawn(super::mcp_resources::index_mcp_resources( + gcx, + config_path, + peer, + new_resources, + logs, + )); + } + }); + let mut handle = handle_arc.lock().await; + *handle = Some(task.abort_handle()); + } + } + + fn on_prompt_list_changed(&self, _context: NotificationContext) -> impl Future + Send + '_ { + let peer_arc = self.peer_arc.clone(); + let session_arc = self.session_arc.clone(); + let logs = self.logs.clone(); + let debug_name = self.debug_name.clone(); + let request_timeout = self.request_timeout; + let handle_arc = self.prompt_refresh_handle.clone(); + async move { + { + let mut handle = handle_arc.lock().await; + if let Some(h) = handle.take() { + h.abort(); + } + } + let task = tokio::spawn(async move { + sleep(Duration::from_millis(200)).await; + let peer = { + let locked = peer_arc.lock().await; + locked.clone() + }; + let peer = match peer { + Some(p) => p, + None => { + tracing::warn!("prompts/list_changed: no peer available for {}", debug_name); + return; + } + }; + let new_prompts = match timeout( + Duration::from_secs(request_timeout), + peer.list_all_prompts(), + ) + .await + { + Ok(Ok(prompts)) => prompts, + Ok(Err(e)) => { + let msg = format!("prompts/list_changed: failed to list prompts: {:?}", e); + tracing::error!("{} for {}", msg, debug_name); + add_log_entry(logs, msg).await; + return; + } + Err(_) => { + let msg = format!( + "prompts/list_changed: list_prompts timed out after {}s", + request_timeout + ); + tracing::error!("{} for {}", msg, debug_name); + add_log_entry(logs, msg).await; + return; + } + }; + let new_count = new_prompts.len(); + { + let mut session_locked = session_arc.lock().await; + let session_downcasted = session_locked + .as_any_mut() + .downcast_mut::() + .unwrap(); + let old_count = session_downcasted.mcp_prompts.len(); + session_downcasted.mcp_prompts = new_prompts; + let msg = format!( + "prompts/list_changed: {} → {} prompts", + old_count, new_count + ); + tracing::info!("{} for {}", msg, debug_name); + add_log_entry(logs, msg).await; + } + crate::http::routers::v1::at_commands::invalidate_slash_cache().await; + }); + let mut handle = handle_arc.lock().await; + *handle = Some(task.abort_handle()); + } + } +} + pub struct SessionMCP { pub debug_name: String, - pub config_path: String, // to check if expired or not - pub launched_cfg: serde_json::Value, // a copy to compare against IntegrationMCP::cfg, to see if anything has changed - pub mcp_client: Option>>>>, + pub config_path: String, + pub launched_cfg: serde_json::Value, + pub mcp_client: Option>>>, pub mcp_tools: Vec, + pub mcp_resources: Vec, + pub mcp_prompts: Vec, + pub server_info: Option, pub startup_task_handles: Option<(Arc>>>, AbortHandle)>, - pub logs: Arc>>, // Store log messages - pub stderr_file_path: Option, // Path to the temporary file for stderr - pub stderr_cursor: Arc>, // Position in the file where we last read from + pub health_task_handle: Option, + pub logs: Arc>>, + pub stderr_file_path: Option, + pub stderr_cursor: Arc>, + pub connection_status: MCPConnectionStatus, + pub last_successful_connection: Option, + pub metrics: SharedMetrics, + pub auth_manager: Option>>, + pub auth_status: MCPAuthStatus, + pub oauth_refresh_task_handle: Option, } impl IntegrationSession for SessionMCP { @@ -36,7 +392,7 @@ impl IntegrationSession for SessionMCP { self_arc: Arc>>, ) -> Box + Send> { Box::new(async move { - let (debug_name, client, logs, startup_task_handles, stderr_file) = { + let (debug_name, client, logs, startup_task_handles, health_task_handle, oauth_refresh_task_handle, stderr_file) = { let mut session_locked = self_arc.lock().await; let session_downcasted = session_locked .as_any_mut() @@ -47,6 +403,8 @@ impl IntegrationSession for SessionMCP { session_downcasted.mcp_client.clone(), session_downcasted.logs.clone(), session_downcasted.startup_task_handles.clone(), + session_downcasted.health_task_handle.clone(), + session_downcasted.oauth_refresh_task_handle.clone(), session_downcasted.stderr_file_path.clone(), ) }; @@ -56,6 +414,14 @@ impl IntegrationSession for SessionMCP { abort_handle.abort(); } + if let Some(abort_handle) = health_task_handle { + abort_handle.abort(); + } + + if let Some(abort_handle) = oauth_refresh_task_handle { + abort_handle.abort(); + } + if let Some(client) = client { cancel_mcp_client(&debug_name, client, logs).await; } @@ -99,7 +465,7 @@ pub async fn update_logs_from_stderr( pub async fn cancel_mcp_client( debug_name: &str, - mcp_client: Arc>>>, + mcp_client: Arc>>, session_logs: Arc>>, ) { tracing::info!("Stopping MCP Server for {}", debug_name); @@ -131,6 +497,160 @@ pub async fn cancel_mcp_client( } } +#[cfg(test)] +mod tests { + use super::*; + + fn make_session_mcp(debug_name: &str) -> SessionMCP { + SessionMCP { + debug_name: debug_name.to_string(), + config_path: "/tmp/test.yaml".to_string(), + launched_cfg: serde_json::Value::Null, + mcp_client: None, + mcp_tools: Vec::new(), + mcp_resources: Vec::new(), + mcp_prompts: Vec::new(), + server_info: None, + startup_task_handles: None, + health_task_handle: None, + logs: Arc::new(AMutex::new(Vec::new())), + stderr_file_path: None, + stderr_cursor: Arc::new(AMutex::new(0)), + connection_status: MCPConnectionStatus::Disconnected, + last_successful_connection: None, + metrics: new_shared_metrics(), + auth_manager: None, + auth_status: MCPAuthStatus::NotApplicable, + oauth_refresh_task_handle: None, + } + } + + #[test] + fn test_mcp_client_handler_fields() { + let peer_arc: Arc>>> = + Arc::new(AMutex::new(None)); + let session: Box = Box::new(make_session_mcp("test")); + let session_arc = Arc::new(AMutex::new(session)); + let logs = Arc::new(AMutex::new(Vec::new())); + let handler = McpClientHandler { + peer_arc: peer_arc.clone(), + session_arc, + logs, + debug_name: "test".to_string(), + request_timeout: 30, + gcx: Weak::new(), + tool_refresh_handle: Arc::new(AMutex::new(None)), + resource_refresh_handle: Arc::new(AMutex::new(None)), + prompt_refresh_handle: Arc::new(AMutex::new(None)), + }; + assert_eq!(handler.debug_name, "test"); + assert_eq!(handler.request_timeout, 30); + assert!(handler.peer_arc.try_lock().ok().and_then(|g| g.clone()).is_none()); + } + + #[test] + fn test_redact_sensitive_value() { + assert_eq!(redact_sensitive_value("Authorization", "Bearer sk-1234567890"), "Bear...7890"); + assert_eq!(redact_sensitive_value("api_key", "short"), "***REDACTED***"); + assert_eq!(redact_sensitive_value("description", "not secret"), "not secret"); + assert_eq!(redact_sensitive_value("token", "abcdefghij"), "abcd...ghij"); + assert_eq!(redact_sensitive_value("password", "abc"), "***REDACTED***"); + assert_eq!(redact_sensitive_value("cookie", "session=xyz123456"), "sess...3456"); + assert_eq!(redact_sensitive_value("Content-Type", "application/json"), "application/json"); + } + + #[test] + fn test_mcp_running_service_type_alias_exists() { + fn _accepts_type_alias(_: Option) {} + _accepts_type_alias(None); + } + + #[test] + fn test_redact_sensitive_json_nested() { + let input = serde_json::json!({ + "name": "test", + "credentials": { + "token": "my_secret_token_value", + "username": "admin" + } + }); + let result = redact_sensitive_json(&input); + assert_eq!(result["credentials"]["token"], "my_s...alue"); + assert_eq!(result["credentials"]["username"], "admin"); + assert_eq!(result["name"], "test"); + } + + #[test] + fn test_redact_sensitive_json_array() { + let input = serde_json::json!([ + {"api_key": "secret123456", "name": "service1"}, + {"api_key": "another_key_val", "name": "service2"} + ]); + let result = redact_sensitive_json(&input); + assert_eq!(result[0]["api_key"], "secr...3456"); + assert_eq!(result[0]["name"], "service1"); + assert_eq!(result[1]["api_key"], "anot..._val"); + } + + #[test] + fn test_redact_sensitive_json_flat() { + let input = serde_json::json!({"password": "abc123def", "host": "localhost"}); + let result = redact_sensitive_json(&input); + assert_eq!(result["password"], "abc1...3def"); + assert_eq!(result["host"], "localhost"); + } + + #[test] + fn test_redact_sensitive_json_primitives() { + assert_eq!(redact_sensitive_json(&serde_json::json!("hello")), "hello"); + assert_eq!(redact_sensitive_json(&serde_json::json!(42)), 42); + assert_eq!(redact_sensitive_json(&serde_json::json!(null)), serde_json::Value::Null); + } + + #[test] + fn test_mcp_auth_status_serialization() { + let not_applicable = MCPAuthStatus::NotApplicable; + let json = serde_json::to_value(¬_applicable).unwrap(); + assert_eq!(json, serde_json::json!("not_applicable")); + + let authenticated = MCPAuthStatus::Authenticated; + let json = serde_json::to_value(&authenticated).unwrap(); + assert_eq!(json, serde_json::json!("authenticated")); + + let needs_login = MCPAuthStatus::NeedsLogin; + let json = serde_json::to_value(&needs_login).unwrap(); + assert_eq!(json, serde_json::json!("needs_login")); + + let needs_reauth = MCPAuthStatus::NeedsReauth; + let json = serde_json::to_value(&needs_reauth).unwrap(); + assert_eq!(json, serde_json::json!("needs_reauth")); + + let refreshing = MCPAuthStatus::Refreshing; + let json = serde_json::to_value(&refreshing).unwrap(); + assert_eq!(json, serde_json::json!("refreshing")); + + let error = MCPAuthStatus::Error("something went wrong".to_string()); + let json = serde_json::to_value(&error).unwrap(); + assert_eq!(json["error"], "something went wrong"); + } + + #[test] + fn test_mcp_auth_status_deserialization_roundtrip() { + let statuses = vec![ + MCPAuthStatus::NotApplicable, + MCPAuthStatus::Authenticated, + MCPAuthStatus::NeedsLogin, + MCPAuthStatus::NeedsReauth, + MCPAuthStatus::Refreshing, + ]; + for status in statuses { + let json = serde_json::to_value(&status).unwrap(); + let roundtrip: MCPAuthStatus = serde_json::from_value(json).unwrap(); + assert_eq!(status, roundtrip); + } + } +} + pub async fn mcp_session_wait_startup(session_arc: Arc>>) { let startup_task_handles = { let mut session_locked = session_arc.lock().await; diff --git a/refact-agent/engine/src/integrations/mcp/tests_mcp_tools.rs b/refact-agent/engine/src/integrations/mcp/tests_mcp_tools.rs new file mode 100644 index 0000000000..ed64171c04 --- /dev/null +++ b/refact-agent/engine/src/integrations/mcp/tests_mcp_tools.rs @@ -0,0 +1,212 @@ +#[cfg(test)] +mod tests { + use rmcp::model::Tool as McpTool; + use serde_json::json; + + use crate::integrations::integr_abstract::IntegrationCommon; + use crate::tools::tools_description::Tool; + + use super::super::tool_mcp::ToolMCP; + + fn make_tool_mcp(config_path: &str, schema: serde_json::Value, tool_name: &str) -> ToolMCP { + let mcp_tool: McpTool = serde_json::from_value(json!({ + "name": tool_name, + "description": "A test tool", + "inputSchema": schema + })) + .expect("failed to deserialize McpTool"); + ToolMCP { + common: IntegrationCommon::default(), + config_path: config_path.to_string(), + mcp_client: std::sync::Arc::new(tokio::sync::Mutex::new(None)), + mcp_tool, + request_timeout: 30, + } + } + + #[test] + fn test_mcp_naming_stdio_prefix_stripped() { + let tool = make_tool_mcp( + "mcp_stdio_myserver.yaml", + json!({"type": "object", "properties": {}}), + "do_something", + ); + let desc = tool.tool_description(); + assert_eq!(desc.name, "mcp_myserver_do_something"); + } + + #[test] + fn test_mcp_naming_sse_prefix_stripped() { + let tool = make_tool_mcp( + "mcp_sse_myserver.yaml", + json!({"type": "object", "properties": {}}), + "fetch_data", + ); + let desc = tool.tool_description(); + assert_eq!(desc.name, "mcp_myserver_fetch_data"); + } + + #[test] + fn test_mcp_naming_plain_yaml() { + let tool = make_tool_mcp( + "plain_integration.yaml", + json!({"type": "object", "properties": {}}), + "run_query", + ); + let desc = tool.tool_description(); + assert_eq!(desc.name, "plain_integration_run_query"); + } + + #[test] + fn test_mcp_naming_special_chars_sanitized() { + let tool = make_tool_mcp( + "mcp_stdio_my-server.yaml", + json!({"type": "object", "properties": {}}), + "tool-with-dashes", + ); + let desc = tool.tool_description(); + assert!(!desc.name.contains('-'), "hyphens should be replaced with underscores"); + assert!( + desc.name.chars().all(|c| c.is_ascii_alphanumeric() || c == '_'), + "name should only contain alphanumerics and underscores, got: {}", + desc.name + ); + } + + #[test] + fn test_mcp_naming_display_name_is_original_tool_name() { + let tool = make_tool_mcp( + "mcp_stdio_server.yaml", + json!({"type": "object", "properties": {}}), + "original_tool", + ); + let desc = tool.tool_description(); + assert_eq!(desc.display_name, "original_tool"); + } + + #[test] + fn test_mcp_schema_preserved_verbatim_complex() { + let complex_schema = json!({ + "type": "object", + "properties": { + "items": { + "type": "array", + "items": {"type": "string"}, + "description": "List of items" + }, + "config": { + "type": "object", + "properties": { + "verbose": {"type": "boolean"}, + "max_count": {"type": "integer"} + } + }, + "mode": { + "type": "string", + "enum": ["fast", "slow", "medium"] + } + }, + "required": ["items"] + }); + let tool = make_tool_mcp("mcp_stdio_srv.yaml", complex_schema.clone(), "process"); + let desc = tool.tool_description(); + + assert_eq!(desc.input_schema["type"], json!("object")); + assert_eq!(desc.input_schema["properties"]["items"]["type"], json!("array")); + assert_eq!( + desc.input_schema["properties"]["items"]["items"]["type"], + json!("string") + ); + assert_eq!( + desc.input_schema["properties"]["config"]["type"], + json!("object") + ); + assert_eq!( + desc.input_schema["properties"]["mode"]["enum"], + json!(["fast", "slow", "medium"]) + ); + assert_eq!(desc.input_schema["required"], json!(["items"])); + } + + #[test] + fn test_mcp_schema_without_type_gets_object_type() { + let schema_without_type = json!({ + "properties": { + "a": {"type": "integer"}, + "b": {"type": "string"} + }, + "required": ["a"] + }); + let tool = make_tool_mcp("mcp_stdio_srv.yaml", schema_without_type, "add"); + let desc = tool.tool_description(); + assert_eq!(desc.input_schema["type"], json!("object")); + assert_eq!(desc.input_schema["properties"]["a"]["type"], json!("integer")); + } + + #[test] + fn test_mcp_schema_into_openai_style() { + let schema = json!({ + "type": "object", + "properties": { + "query": {"type": "string", "description": "Search query"} + }, + "required": ["query"] + }); + let tool = make_tool_mcp("mcp_stdio_search.yaml", schema, "search"); + let desc = tool.tool_description(); + let openai = desc.into_openai_style(false); + assert_eq!(openai["type"], json!("function")); + assert_eq!( + openai["function"]["parameters"]["properties"]["query"]["type"], + json!("string") + ); + } + + #[test] + fn test_mcp_description_propagated() { + let mcp_tool: McpTool = serde_json::from_value(json!({ + "name": "my_tool", + "description": "My special tool description", + "inputSchema": {"type": "object", "properties": {}} + })) + .expect("failed to deserialize"); + let tool = ToolMCP { + common: IntegrationCommon::default(), + config_path: "mcp_stdio_srv.yaml".to_string(), + mcp_client: std::sync::Arc::new(tokio::sync::Mutex::new(None)), + mcp_tool, + request_timeout: 30, + }; + let desc = tool.tool_description(); + assert_eq!(desc.description, "My special tool description"); + } + + #[test] + fn test_mcp_no_description_defaults_empty() { + let mcp_tool: McpTool = serde_json::from_value(json!({ + "name": "no_desc_tool", + "inputSchema": {"type": "object", "properties": {}} + })) + .expect("failed to deserialize"); + let tool = ToolMCP { + common: IntegrationCommon::default(), + config_path: "mcp_stdio_srv.yaml".to_string(), + mcp_client: std::sync::Arc::new(tokio::sync::Mutex::new(None)), + mcp_tool, + request_timeout: 30, + }; + let desc = tool.tool_description(); + assert_eq!(desc.description, ""); + } + + #[test] + fn test_mcp_http_prefix_stripped() { + let tool = make_tool_mcp( + "mcp_http_myserver.yaml", + json!({"type": "object", "properties": {}}), + "do_something", + ); + let desc = tool.tool_description(); + assert_eq!(desc.name, "mcp_myserver_do_something"); + } +} diff --git a/refact-agent/engine/src/integrations/mcp/tool_mcp.rs b/refact-agent/engine/src/integrations/mcp/tool_mcp.rs index 5232cc0fb5..b593d0076b 100644 --- a/refact-agent/engine/src/integrations/mcp/tool_mcp.rs +++ b/refact-agent/engine/src/integrations/mcp/tool_mcp.rs @@ -1,8 +1,11 @@ use std::collections::HashMap; use std::sync::Arc; use async_trait::async_trait; -use rmcp::model::{RawContent, CallToolRequestParam, Tool as McpTool}; -use rmcp::{RoleClient, service::RunningService}; + +/// Maximum bytes of text content returned from a single MCP tool call. +/// Prevents runaway context window growth from excessively large tool responses. +const MAX_TOOL_OUTPUT_BYTES: usize = 200 * 1024; // 200 KB +use rmcp::model::{RawContent, CallToolRequestParams, Tool as McpTool}; use tokio::sync::Mutex as AMutex; use tokio::time::timeout; use tokio::time::Duration; @@ -10,15 +13,38 @@ use tokio::time::Duration; use crate::caps::resolve_chat_model; use crate::at_commands::at_commands::AtCommandsContext; use crate::scratchpads::multimodality::MultimodalElement; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::integrations::integr_abstract::{IntegrationCommon, IntegrationConfirmation}; -use super::session_mcp::{add_log_entry, mcp_session_wait_startup}; +use super::session_mcp::{McpRunningService, MCPConnectionStatus, add_log_entry, mcp_session_wait_startup, redact_sensitive_json}; + +/// Truncates `text` so that the running `total_bytes` counter does not exceed `limit`. +/// Appends a truncation notice when cutting. Returns the (possibly truncated) text. +fn truncate_to_byte_limit(text: String, limit: usize, total_bytes: &mut usize) -> String { + if *total_bytes >= limit { + return String::new(); + } + let remaining = limit - *total_bytes; + if text.len() <= remaining { + *total_bytes += text.len(); + text + } else { + *total_bytes = limit; + // Truncate on a UTF-8 char boundary + let boundary = text + .char_indices() + .take_while(|(i, _)| *i < remaining.saturating_sub(64)) + .last() + .map(|(i, c)| i + c.len_utf8()) + .unwrap_or(0); + format!("{}\n...(truncated, {} bytes omitted)", &text[..boundary], text.len() - boundary) + } +} pub struct ToolMCP { pub common: IntegrationCommon, pub config_path: String, - pub mcp_client: Arc>>>, + pub mcp_client: Arc>>, pub mcp_tool: McpTool, pub request_timeout: u64, } @@ -56,71 +82,106 @@ impl Tool for ToolMCP { }); mcp_session_wait_startup(session.clone()).await; + { + let mut session_locked = session.lock().await; + let session_downcasted = session_locked + .as_any_mut() + .downcast_mut::() + .ok_or_else(|| format!("Internal error: session is not an MCP session for '{}'", self.mcp_tool.name))?; + match &session_downcasted.connection_status { + MCPConnectionStatus::Reconnecting { .. } => { + return Err(format!( + "MCP server '{}' is reconnecting, please try again shortly", + self.mcp_tool.name + )); + } + MCPConnectionStatus::Failed { message } => { + return Err(format!( + "MCP server '{}' connection failed: {}", + self.mcp_tool.name, message + )); + } + _ => {} + } + } + let json_args = serde_json::json!(args); + let redacted_args = redact_sensitive_json(&json_args); tracing::info!( "\n\nMCP CALL tool '{}' with arguments: {:?}", self.mcp_tool.name, - json_args + redacted_args ); - let session_logs = { + let (session_logs, session_metrics) = { let mut session_locked = session.lock().await; let session_downcasted = session_locked .as_any_mut() .downcast_mut::() - .unwrap(); - session_downcasted.logs.clone() + .ok_or_else(|| format!("Internal error: session is not an MCP session for '{}'", self.mcp_tool.name))?; + (session_downcasted.logs.clone(), session_downcasted.metrics.clone()) }; add_log_entry( session_logs.clone(), format!( "Executing tool '{}' with arguments: {:?}", - self.mcp_tool.name, json_args + self.mcp_tool.name, redacted_args ), ) .await; - let result_probably = { + let peer = { let mcp_client_locked = self.mcp_client.lock().await; - if let Some(client) = &*mcp_client_locked { - match timeout( - Duration::from_secs(self.request_timeout), - client.call_tool(CallToolRequestParam { - name: self.mcp_tool.name.clone(), - arguments: match json_args { - serde_json::Value::Object(map) => Some(map), - _ => None, - }, - }), - ) - .await - { - Ok(result) => result, - Err(_) => Err(rmcp::service::ServiceError::Timeout { - timeout: Duration::from_secs(self.request_timeout), - }), - } - } else { - return Err("MCP client is not available".to_string()); + match &*mcp_client_locked { + Some(client) => client.peer().clone(), + None => return Err("MCP client is not available".to_string()), } }; + let call_start = session_metrics.lock().await.record_call_start(); + let call_params = { + let mut p = CallToolRequestParams::new(self.mcp_tool.name.clone()); + if let serde_json::Value::Object(map) = json_args { + p = p.with_arguments(map); + } + p + }; + let result_probably = match timeout( + Duration::from_secs(self.request_timeout), + peer.call_tool(call_params), + ) + .await + { + Ok(result) => result, + Err(_) => Err(rmcp::service::ServiceError::Timeout { + timeout: Duration::from_secs(self.request_timeout), + }), + }; + let result_message = match result_probably { Ok(result) => { if result.is_error.unwrap_or(false) { let error_msg = format!("Tool execution error: {:?}", result.content); add_log_entry(session_logs.clone(), error_msg.clone()).await; + { + let mut m = session_metrics.lock().await; + m.record_call_failure(&self.mcp_tool.name, call_start); + } return Err(error_msg); } let mut elements = Vec::new(); + let mut total_text_bytes: usize = 0; for content in result.content { match content.raw { - RawContent::Text(text_content) => elements.push(MultimodalElement { - m_type: "text".to_string(), - m_content: text_content.text, - }), + RawContent::Text(text_content) => { + let text = truncate_to_byte_limit(text_content.text, MAX_TOOL_OUTPUT_BYTES, &mut total_text_bytes); + elements.push(MultimodalElement { + m_type: "text".to_string(), + m_content: text, + }); + } RawContent::Image(image_content) => { if model_supports_multimodality { let mime_type = if image_content.mime_type.starts_with("image/") { @@ -139,15 +200,46 @@ impl Tool for ToolMCP { }) } } - RawContent::Audio(_) => elements.push(MultimodalElement { - m_type: "text".to_string(), - m_content: "Server returned audio, which is not supported".to_string(), - }), - RawContent::Resource(_) => elements.push(MultimodalElement { + RawContent::Audio(audio_content) => elements.push(MultimodalElement { m_type: "text".to_string(), - m_content: "Server returned resource, which is not supported" - .to_string(), + m_content: format!( + "[Audio content: {}, {} bytes - audio playback not supported]", + audio_content.mime_type, + audio_content.data.len(), + ), }), + RawContent::Resource(embedded) => { + let raw_text = match &embedded.resource { + rmcp::model::ResourceContents::TextResourceContents { uri, mime_type, text, .. } => { + format!( + "[Resource: {} ({}) - {}]\n{}", + uri, + mime_type.as_deref().unwrap_or("unknown"), + uri, + text, + ) + } + rmcp::model::ResourceContents::BlobResourceContents { uri, mime_type, blob, .. } => { + format!( + "[Resource: {} ({}) - {} bytes blob]", + uri, + mime_type.as_deref().unwrap_or("unknown"), + blob.len(), + ) + } + }; + let text = truncate_to_byte_limit(raw_text, MAX_TOOL_OUTPUT_BYTES, &mut total_text_bytes); + elements.push(MultimodalElement { + m_type: "text".to_string(), + m_content: text, + }); + } + RawContent::ResourceLink(resource) => { + elements.push(MultimodalElement { + m_type: "text".to_string(), + m_content: format!("[Resource link: {}]", resource.uri), + }); + } } } @@ -163,6 +255,10 @@ impl Tool for ToolMCP { ChatContent::Multimodal(elements) }; + { + let mut m = session_metrics.lock().await; + m.record_call_success(&self.mcp_tool.name, call_start); + } ContextEnum::ChatMessage(ChatMessage { role: "tool".to_string(), content, @@ -175,6 +271,10 @@ impl Tool for ToolMCP { let error_msg = format!("Failed to call tool: {:?}", e); tracing::error!("{}", error_msg); add_log_entry(session_logs.clone(), error_msg).await; + { + let mut m = session_metrics.lock().await; + m.record_call_failure(&self.mcp_tool.name, call_start); + } return Err(e.to_string()); } }; @@ -187,80 +287,31 @@ impl Tool for ToolMCP { } fn tool_description(&self) -> ToolDesc { - // self.mcp_tool.input_schema = Object { - // "properties": Object { - // "a": Object { - // "title": String("A"), - // "type": String("integer") - // }, - // "b": Object { - // "title": String("B"), - // "type": String("integer") - // } - // }, - // "required": Array [ - // String("a"), - // String("b") - // ], - // "title": String("addArguments"), - // "type": String("object") - // } - let mut parameters = vec![]; - let mut parameters_required = vec![]; - - if let Some(serde_json::Value::Object(properties)) = - self.mcp_tool.input_schema.get("properties") - { - for (name, prop) in properties { - if let serde_json::Value::Object(prop_obj) = prop { - let param_type = prop_obj - .get("type") - .and_then(|v| v.as_str()) - .unwrap_or("string") - .to_string(); - let description = prop_obj - .get("description") - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string(); - parameters.push(ToolParam { - name: name.clone(), - param_type, - description, - }); - } + let input_schema = { + let mut map = self.mcp_tool.input_schema.as_ref().clone(); + if !map.contains_key("type") { + map.insert("type".to_string(), serde_json::json!("object")); } - } - if let Some(serde_json::Value::Array(required)) = self.mcp_tool.input_schema.get("required") - { - for req in required { - if let Some(req_str) = req.as_str() { - parameters_required.push(req_str.to_string()); - } - } - } + serde_json::Value::Object(map) + }; let tool_name = { let yaml_name = std::path::Path::new(&self.config_path) .file_stem() .and_then(|name| name.to_str()) .unwrap_or("unknown"); - let shortened_yaml_name = if let Some(stripped) = yaml_name.strip_prefix("mcp_stdio_") { - format!("mcp_{}", stripped) - } else if let Some(stripped) = yaml_name.strip_prefix("mcp_sse_") { - format!("mcp_{}", stripped) - } else { - yaml_name.to_string() - }; - let sanitized_tool_name = format!("{}_{}", shortened_yaml_name, self.mcp_tool.name) + let shortened_yaml_name = super::mcp_naming::shorten_config_name(yaml_name); + format!("{}_{}", shortened_yaml_name, self.mcp_tool.name) .chars() .map(|c| if c.is_ascii_alphanumeric() { c } else { '_' }) - .collect::(); - sanitized_tool_name + .collect::() }; + let annotations = self.mcp_tool.annotations.as_ref() + .and_then(|a| serde_json::to_value(a).ok()); + ToolDesc { - name: tool_name.clone(), + name: tool_name, display_name: self.mcp_tool.name.to_string(), source: ToolSource { source_type: ToolSourceType::Integration, @@ -268,14 +319,10 @@ impl Tool for ToolMCP { }, experimental: false, allow_parallel: false, - description: self - .mcp_tool - .description - .to_owned() - .unwrap_or_default() - .to_string(), - parameters, - parameters_required, + description: self.mcp_tool.description.to_owned().unwrap_or_default().to_string(), + input_schema, + output_schema: None, + annotations, } } @@ -300,3 +347,203 @@ impl Tool for ToolMCP { Some(self.config_path.clone()) } } + +#[cfg(test)] +mod tests { + use super::*; + use serde_json::json; + + fn make_tool_mcp(schema: serde_json::Value) -> ToolMCP { + let mcp_tool: McpTool = serde_json::from_value(json!({ + "name": "test_tool", + "description": "A test tool", + "inputSchema": schema + })).expect("failed to deserialize McpTool"); + ToolMCP { + common: crate::integrations::integr_abstract::IntegrationCommon::default(), + config_path: "mcp_stdio_server.yaml".to_string(), + mcp_client: std::sync::Arc::new(tokio::sync::Mutex::new(None)), + mcp_tool, + request_timeout: 30, + } + } + + fn make_tool_mcp_with_annotations(schema: serde_json::Value, annotations: serde_json::Value) -> ToolMCP { + let mcp_tool: McpTool = serde_json::from_value(json!({ + "name": "test_tool", + "description": "A test tool", + "inputSchema": schema, + "annotations": annotations + })).expect("failed to deserialize McpTool"); + ToolMCP { + common: crate::integrations::integr_abstract::IntegrationCommon::default(), + config_path: "mcp_stdio_server.yaml".to_string(), + mcp_client: std::sync::Arc::new(tokio::sync::Mutex::new(None)), + mcp_tool, + request_timeout: 30, + } + } + + #[test] + fn test_complex_mcp_schema_preserved() { + let complex_schema = json!({ + "type": "object", + "properties": { + "items": { + "type": "array", + "items": {"type": "string"}, + "description": "List of items" + }, + "config": { + "type": "object", + "properties": { + "verbose": {"type": "boolean"}, + "max_count": {"type": "integer"} + } + }, + "mode": { + "type": "string", + "enum": ["fast", "slow", "medium"] + } + }, + "required": ["items"] + }); + + let tool = make_tool_mcp(complex_schema.clone()); + let desc = tool.tool_description(); + + assert_eq!(desc.input_schema["type"], json!("object")); + assert_eq!(desc.input_schema["properties"]["items"]["type"], json!("array")); + assert_eq!(desc.input_schema["properties"]["items"]["items"]["type"], json!("string")); + assert_eq!(desc.input_schema["properties"]["config"]["type"], json!("object")); + assert_eq!(desc.input_schema["properties"]["mode"]["enum"], json!(["fast", "slow", "medium"])); + assert_eq!(desc.input_schema["required"], json!(["items"])); + assert_eq!(desc.name, "mcp_server_test_tool"); + } + + #[test] + fn test_mcp_schema_without_type_gets_object_type() { + let schema_without_type = json!({ + "properties": { + "a": {"type": "integer"}, + "b": {"type": "integer"} + }, + "required": ["a", "b"] + }); + + let tool = make_tool_mcp(schema_without_type); + let desc = tool.tool_description(); + + assert_eq!(desc.input_schema["type"], json!("object")); + assert_eq!(desc.input_schema["properties"]["a"]["type"], json!("integer")); + } + + #[test] + fn test_annotations_preserved() { + let schema = json!({"type": "object", "properties": {}}); + let annotations = json!({ + "title": "My Tool", + "readOnlyHint": true, + "destructiveHint": false, + "idempotentHint": true, + "openWorldHint": false + }); + let tool = make_tool_mcp_with_annotations(schema, annotations); + let desc = tool.tool_description(); + let ann = desc.annotations.expect("annotations should be present"); + assert_eq!(ann["title"], json!("My Tool")); + assert_eq!(ann["readOnlyHint"], json!(true)); + assert_eq!(ann["destructiveHint"], json!(false)); + assert_eq!(ann["idempotentHint"], json!(true)); + assert_eq!(ann["openWorldHint"], json!(false)); + } + + #[test] + fn test_no_annotations_is_none() { + let schema = json!({"type": "object", "properties": {}}); + let tool = make_tool_mcp(schema); + let desc = tool.tool_description(); + assert!(desc.annotations.is_none()); + } + + #[test] + fn test_audio_content_produces_metadata_text() { + use rmcp::model::{RawContent, RawAudioContent}; + let audio = RawContent::Audio(RawAudioContent { + data: "AAABBBCCC".to_string(), + mime_type: "audio/mp3".to_string(), + }); + let text = match audio { + RawContent::Audio(audio_content) => format!( + "[Audio content: {}, {} bytes - audio playback not supported]", + audio_content.mime_type, + audio_content.data.len(), + ), + _ => panic!("expected audio"), + }; + assert!(text.contains("audio/mp3")); + assert!(text.contains("9 bytes")); + assert!(text.contains("audio playback not supported")); + } + + #[test] + fn test_resource_text_content_includes_uri_and_text() { + use rmcp::model::{RawContent, RawEmbeddedResource, ResourceContents}; + let resource = RawContent::Resource(RawEmbeddedResource::new( + ResourceContents::TextResourceContents { + uri: "file:///path/to/file.txt".to_string(), + mime_type: Some("text/plain".to_string()), + text: "Hello from resource".to_string(), + meta: None, + }, + )); + let text = match resource { + RawContent::Resource(embedded) => match &embedded.resource { + ResourceContents::TextResourceContents { uri, mime_type, text, .. } => { + format!( + "[Resource: {} ({}) - {}]\n{}", + uri, + mime_type.as_deref().unwrap_or("unknown"), + uri, + text, + ) + } + _ => panic!("expected text resource"), + }, + _ => panic!("expected resource"), + }; + assert!(text.contains("file:///path/to/file.txt")); + assert!(text.contains("text/plain")); + assert!(text.contains("Hello from resource")); + } + + #[test] + fn test_resource_blob_content_includes_uri_and_size() { + use rmcp::model::{RawContent, RawEmbeddedResource, ResourceContents}; + let resource = RawContent::Resource(RawEmbeddedResource::new( + ResourceContents::BlobResourceContents { + uri: "file:///path/to/data.bin".to_string(), + mime_type: Some("application/octet-stream".to_string()), + blob: "AABBCCDD".to_string(), + meta: None, + }, + )); + let text = match resource { + RawContent::Resource(embedded) => match &embedded.resource { + ResourceContents::BlobResourceContents { uri, mime_type, blob, .. } => { + format!( + "[Resource: {} ({}) - {} bytes blob]", + uri, + mime_type.as_deref().unwrap_or("unknown"), + blob.len(), + ) + } + _ => panic!("expected blob resource"), + }, + _ => panic!("expected resource"), + }; + assert!(text.contains("file:///path/to/data.bin")); + assert!(text.contains("application/octet-stream")); + assert!(text.contains("8 bytes blob")); + } +} diff --git a/refact-agent/engine/src/integrations/mod.rs b/refact-agent/engine/src/integrations/mod.rs index 31b728d182..054fe71072 100644 --- a/refact-agent/engine/src/integrations/mod.rs +++ b/refact-agent/engine/src/integrations/mod.rs @@ -23,7 +23,7 @@ pub mod mcp; pub mod config_chat; pub mod process_io_utils; -pub mod project_summary_chat; +pub mod setup_chat; pub mod running_integrations; pub mod sessions; pub mod setting_up_integrations; @@ -71,6 +71,15 @@ pub fn integration_from_name(n: &str) -> Result) } + mcp_http if mcp_http.starts_with("mcp_http_") => { + Ok(Box::new(mcp::integr_mcp_http::IntegrationMCPHttp { + ..Default::default() + }) as Box) + } + // mcp_TEMPLATE uses the unified schema + "mcp_TEMPLATE" => Ok(Box::new(mcp::integr_mcp_stdio::IntegrationMCPUnified { + ..Default::default() + }) as Box), // We support also mcp_* as mcp_stdio_* for backwards compatibility, some users already have it configured. mcp_stdio if mcp_stdio.starts_with("mcp_stdio_") || mcp_stdio.starts_with("mcp_") => { Ok(Box::new(mcp::integr_mcp_stdio::IntegrationMCPStdio { @@ -92,8 +101,7 @@ pub fn integrations_list(_allow_experimental: bool) -> Vec<&'static str> { "mysql", "cmdline_TEMPLATE", "service_TEMPLATE", - "mcp_stdio_TEMPLATE", - "mcp_sse_TEMPLATE", + "mcp_TEMPLATE", ]; integrations } diff --git a/refact-agent/engine/src/integrations/sessions.rs b/refact-agent/engine/src/integrations/sessions.rs index ab2d9a4613..475bf82926 100644 --- a/refact-agent/engine/src/integrations/sessions.rs +++ b/refact-agent/engine/src/integrations/sessions.rs @@ -24,26 +24,47 @@ pub fn get_session_hashmap_key(integration_name: &str, base_key: &str) -> String } async fn remove_expired_sessions(gcx: Arc>) { - let expired_sessions = { - let mut gcx_locked = gcx.write().await; - let sessions = gcx_locked + let sessions = { + let gcx_locked = gcx.read().await; + gcx_locked .integration_sessions .iter() .map(|(key, session)| (key.to_string(), session.clone())) - .collect::>(); - let mut expired_sessions = vec![]; - for (key, session) in &sessions { + .collect::>() + }; + + let mut expired_entries: Vec<(String, Arc>>)> = Vec::new(); + for (key, session) in &sessions { + let is_expired = { let session_locked = session.lock().await; - if session_locked.is_expired() { + session_locked.is_expired() + }; + if is_expired { + expired_entries.push((key.clone(), session.clone())); + } + } + + if !expired_entries.is_empty() { + let mut gcx_locked = gcx.write().await; + for (key, expired_session) in &expired_entries { + let should_remove = gcx_locked + .integration_sessions + .get(key) + .map(|current| Arc::ptr_eq(current, expired_session)) + .unwrap_or(false); + if should_remove { gcx_locked.integration_sessions.remove(key); - expired_sessions.push(session.clone()); } } - expired_sessions - }; + } + let mut futures = Vec::new(); - for session in expired_sessions { - let future = Box::into_pin(session.lock().await.try_stop(session.clone())); + for (_, session) in expired_entries { + let future = { + let mut session_locked = session.lock().await; + session_locked.try_stop(session.clone()) + }; + let future = Box::into_pin(future); futures.push(future); } futures::future::join_all(futures).await; @@ -52,7 +73,18 @@ async fn remove_expired_sessions(gcx: Arc>) { pub async fn remove_expired_sessions_background_task(gcx: Arc>) { loop { - tokio::time::sleep(tokio::time::Duration::from_secs(60)).await; + let shutdown_flag = gcx.read().await.shutdown_flag.clone(); + tokio::select! { + _ = tokio::time::sleep(tokio::time::Duration::from_secs(60)) => {} + _ = async { + while !shutdown_flag.load(std::sync::atomic::Ordering::SeqCst) { + tokio::time::sleep(tokio::time::Duration::from_millis(200)).await; + } + } => { + tracing::info!("Session expiry: shutdown detected, stopping"); + return; + } + } remove_expired_sessions(gcx.clone()).await; } } diff --git a/refact-agent/engine/src/integrations/project_summary_chat.rs b/refact-agent/engine/src/integrations/setup_chat.rs similarity index 85% rename from refact-agent/engine/src/integrations/project_summary_chat.rs rename to refact-agent/engine/src/integrations/setup_chat.rs index aaa8f55c77..12b63cda25 100644 --- a/refact-agent/engine/src/integrations/project_summary_chat.rs +++ b/refact-agent/engine/src/integrations/setup_chat.rs @@ -1,28 +1,31 @@ use std::sync::Arc; use tokio::sync::RwLock as ARwLock; -use crate::global_context::GlobalContext; + use crate::call_validation::{ChatContent, ChatMessage, ChatMeta}; +use crate::global_context::GlobalContext; use crate::integrations::setting_up_integrations::integrations_all; use crate::scratchpads::chat_utils_prompts::system_prompt_add_extra_instructions; use crate::scratchpads::scratchpad_utils::HasRagResults; use crate::tools::tools_list::get_tools_for_mode; -pub async fn mix_project_summary_messages( +pub async fn mix_setup_messages( gcx: Arc>, chat_meta: &ChatMeta, messages: &mut Vec, stream_back_to_user: &mut HasRagResults, ) { - assert!(messages[0].role != "system"); // we are here to add this, can't already exist + assert!(messages[0].role != "system"); let mut sp_text = match crate::yaml_configs::customization_registry::get_mode_config( gcx.clone(), - "project_summary", + "setup", None, - ).await { + ) + .await + { Some(mode_config) => mode_config.prompt, None => { - tracing::error!("Mode 'project_summary' not found"); + tracing::error!("Mode 'setup' not found"); String::new() } }; @@ -52,7 +55,7 @@ pub async fn mix_project_summary_messages( sp_text = system_prompt_add_extra_instructions( gcx.clone(), sp_text, - get_tools_for_mode(gcx.clone(), "project_summary", None) + get_tools_for_mode(gcx.clone(), "setup", None) .await .into_iter() .map(|t| t.tool_description().name) @@ -72,7 +75,7 @@ pub async fn mix_project_summary_messages( stream_back_to_user.push_in_json(serde_json::json!(system_message)); } else { tracing::error!( - "more than 1 message when mixing configuration chat context, bad things might happen!" + "more than 1 message when mixing setup chat context, bad things might happen!" ); } diff --git a/refact-agent/engine/src/integrations/yaml_schema.rs b/refact-agent/engine/src/integrations/yaml_schema.rs index 94395afc98..879b131d07 100644 --- a/refact-agent/engine/src/integrations/yaml_schema.rs +++ b/refact-agent/engine/src/integrations/yaml_schema.rs @@ -24,8 +24,8 @@ pub struct ISchemaField { pub f_label: String, #[serde(default, skip_serializing_if = "is_empty")] pub smartlinks: Vec, - #[serde(default, skip_serializing_if = "is_default")] - pub f_extra: bool, + #[serde(default, skip_serializing_if = "is_default_value")] + pub f_extra: serde_json::Value, } #[derive(Serialize, Deserialize, Debug, Default)] @@ -83,6 +83,10 @@ fn is_default(t: &T) -> bool { t == &T::default() } +fn is_default_value(v: &serde_json::Value) -> bool { + v.is_null() +} + fn is_empty(t: &Vec) -> bool { t.is_empty() } diff --git a/refact-agent/engine/src/knowledge_graph/kg_cleanup.rs b/refact-agent/engine/src/knowledge_graph/kg_cleanup.rs index bc39413478..683e476c73 100644 --- a/refact-agent/engine/src/knowledge_graph/kg_cleanup.rs +++ b/refact-agent/engine/src/knowledge_graph/kg_cleanup.rs @@ -62,7 +62,18 @@ pub async fn knowledge_cleanup_background_task(gcx: Arc>) save_cleanup_state(gcx.clone(), &new_state).await; } - tokio::time::sleep(tokio::time::Duration::from_secs(24 * 60 * 60)).await; + let shutdown_flag = gcx.read().await.shutdown_flag.clone(); + tokio::select! { + _ = tokio::time::sleep(tokio::time::Duration::from_secs(24 * 60 * 60)) => {} + _ = async { + while !shutdown_flag.load(std::sync::atomic::Ordering::SeqCst) { + tokio::time::sleep(tokio::time::Duration::from_millis(200)).await; + } + } => { + tracing::info!("Knowledge cleanup: shutdown detected, stopping"); + return; + } + } } } diff --git a/refact-agent/engine/src/lib.rs b/refact-agent/engine/src/lib.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/refact-agent/engine/src/llm/adapters/anthropic.rs b/refact-agent/engine/src/llm/adapters/anthropic.rs index 9631c5ffa9..a55724a0f2 100644 --- a/refact-agent/engine/src/llm/adapters/anthropic.rs +++ b/refact-agent/engine/src/llm/adapters/anthropic.rs @@ -5,17 +5,21 @@ use crate::call_validation::ChatUsage; use crate::llm::adapter::{AdapterSettings, HttpParts, LlmWireAdapter, StreamParseError, extract_extra_fields, insert_extra_headers}; use crate::llm::canonical::{CanonicalToolChoice, LlmRequest, LlmStreamDelta}; use crate::llm::params::CacheControl; +use super::claude_code_compat; const ANTHROPIC_VERSION: &str = "2023-06-01"; const DEFAULT_THINKING_BUDGET: usize = 8192; const INTERLEAVED_THINKING_BETA: &str = "interleaved-thinking-2025-05-14"; const EFFORT: &str = "effort-2025-11-24"; -const CLAUDE_CODE_OAUTH_BETA: &str = "oauth-2025-04-20"; -const CLAUDE_CODE_USER_AGENT: &str = "claude-cli/2.1.2 (external, cli)"; -const CLAUDE_CODE_SYSTEM_PREFIX: &str = "You are Claude Code, Anthropic's official CLI for Claude."; -const CLAUDE_CODE_MCP_TOOL_PREFIX: &str = "mcp_"; -const PROTECTED_FIELDS: &[&str] = &["model", "messages", "stream", "system", "tools", "tool_choice"]; +const PROTECTED_FIELDS: &[&str] = &[ + "model", + "messages", + "stream", + "system", + "tools", + "tool_choice", +]; pub struct AnthropicAdapter; @@ -28,18 +32,9 @@ impl LlmWireAdapter for AnthropicAdapter { let mut headers = HeaderMap::new(); headers.insert(CONTENT_TYPE, HeaderValue::from_static("application/json")); - // Support both API key auth (x-api-key) and OAuth Bearer token auth - // (Authorization: Bearer). This mirrors the official Anthropic SDK which - // accepts both api_key and auth_token parameters. - - let mut is_claude_code_oauth = false; - if !settings.auth_token.is_empty() { - is_claude_code_oauth = true; - headers.insert( - "authorization", - HeaderValue::from_str(&format!("Bearer {}", settings.auth_token)) - .map_err(|e| format!("invalid auth_token: {e}"))?, - ); + let is_cc = claude_code_compat::is_claude_code_oauth(&settings.auth_token); + if is_cc { + claude_code_compat::apply_oauth_headers(&mut headers, &settings.auth_token)?; } else if !settings.api_key.is_empty() { headers.insert( "x-api-key", @@ -48,15 +43,6 @@ impl LlmWireAdapter for AnthropicAdapter { ); } - // Claude Code OAuth requires specific headers and user-agent to pass - // Anthropic's server-side validation for subscription-based access. - if is_claude_code_oauth { - headers.insert( - "user-agent", - HeaderValue::from_static(CLAUDE_CODE_USER_AGENT), - ); - } - headers.insert( "anthropic-version", HeaderValue::from_static(ANTHROPIC_VERSION), @@ -66,7 +52,7 @@ impl LlmWireAdapter for AnthropicAdapter { insert_extra_headers(&mut headers, &settings.extra_headers); - let (system, messages) = convert_to_anthropic(&req.messages, req.cache_control); + let (system, messages) = convert_to_anthropic(&req.messages); let mut body = json!({ "model": settings.model_name, @@ -76,16 +62,13 @@ impl LlmWireAdapter for AnthropicAdapter { }); if let Some(sys) = system { - if is_claude_code_oauth { - // Claude Code OAuth requires the system prompt to start with a specific prefix - // for Anthropic's server-side validation. - let prefixed = prepend_claude_code_system(sys); - body["system"] = prefixed; + if is_cc { + body["system"] = claude_code_compat::prepend_system(sys); } else { body["system"] = sys; } - } else if is_claude_code_oauth { - body["system"] = json!(CLAUDE_CODE_SYSTEM_PREFIX); + } else if is_cc { + body["system"] = json!(claude_code_compat::SYSTEM_PREFIX); } if let Some(temp) = req.params.temperature { @@ -100,8 +83,8 @@ impl LlmWireAdapter for AnthropicAdapter { if let Some(tools) = &req.tools { if !tools.is_empty() { let mut converted_tools = convert_tools_to_anthropic(tools); - if is_claude_code_oauth { - prefix_tool_names(&mut converted_tools, CLAUDE_CODE_MCP_TOOL_PREFIX); + if is_cc { + claude_code_compat::prefix_tool_names(&mut converted_tools, claude_code_compat::MCP_TOOL_PREFIX); } // Add Anthropic's server-side web_search tool if enabled if settings.supports_web_search { @@ -118,7 +101,6 @@ impl LlmWireAdapter for AnthropicAdapter { } } } else if settings.supports_web_search { - // No user tools but web_search is enabled body["tools"] = json!([{ "type": "web_search_20250305", "name": "web_search" @@ -126,6 +108,10 @@ impl LlmWireAdapter for AnthropicAdapter { } } + if matches!(req.cache_control, CacheControl::Ephemeral) { + body["cache_control"] = json!({"type": "ephemeral", "ttl": "1h"}); + } + if settings.supports_reasoning { if is_effort_mode { match &req.reasoning { @@ -171,8 +157,8 @@ impl LlmWireAdapter for AnthropicAdapter { betas.push(INTERLEAVED_THINKING_BETA); betas.push(EFFORT); } - if is_claude_code_oauth { - betas.push(CLAUDE_CODE_OAUTH_BETA); + if is_cc { + betas.push(claude_code_compat::OAUTH_BETA_FLAG); if !betas.contains(&INTERLEAVED_THINKING_BETA) { betas.push(INTERLEAVED_THINKING_BETA); betas.push(EFFORT); @@ -217,30 +203,15 @@ impl LlmWireAdapter for AnthropicAdapter { "anthropic adapter request" ); - let url = if is_claude_code_oauth { - // Claude Code OAuth requires ?beta=true query parameter - let sep = if settings.endpoint.contains('?') { "&" } else { "?" }; - format!("{}{}beta=true", settings.endpoint, sep) + let url = if is_cc { + claude_code_compat::build_oauth_url(&settings.endpoint) } else { settings.endpoint.clone() }; - // For Claude Code OAuth, prefix tool_use names in messages with mcp_ - if is_claude_code_oauth { - if let Some(msgs) = body.get_mut("messages").and_then(|m| m.as_array_mut()) { - for msg in msgs { - if let Some(content) = msg.get_mut("content").and_then(|c| c.as_array_mut()) { - for block in content { - if block.get("type").and_then(|t| t.as_str()) == Some("tool_use") { - if let Some(name) = block.get("name").and_then(|n| n.as_str()).map(|s| s.to_string()) { - if !name.starts_with(CLAUDE_CODE_MCP_TOOL_PREFIX) { - block["name"] = json!(format!("{}{}", CLAUDE_CODE_MCP_TOOL_PREFIX, name)); - } - } - } - } - } - } + if is_cc { + if let Some(msgs) = body.get_mut("messages") { + claude_code_compat::prefix_tool_use_in_messages(msgs, claude_code_compat::MCP_TOOL_PREFIX); } } @@ -431,25 +402,52 @@ impl LlmWireAdapter for AnthropicAdapter { } } -fn convert_to_anthropic( - messages: &[crate::call_validation::ChatMessage], - cache: CacheControl, -) -> (Option, Vec) { +fn convert_to_anthropic(messages: &[crate::call_validation::ChatMessage]) -> (Option, Vec) { + use super::render_extra::{is_context_role, render_context_message}; + let mut system_text = None; let mut result: Vec = Vec::new(); let mut pending_tool_results: Vec = Vec::new(); + // Context buffered when there are no pending tool results; merged into the + // next user message to avoid introducing extra consecutive user turns. + let mut pending_context_text: Vec = Vec::new(); for msg in messages { match msg.role.as_str() { "system" => { system_text = Some(msg.content.content_text_only()); } + role if is_context_role(role) => { + let Some(text) = render_context_message(msg) else { continue }; + if !pending_tool_results.is_empty() { + // Inside a tool-results group: add as a plain text content block + // so it is delivered in the same user turn as the tool outputs. + pending_tool_results.push(json!({"type": "text", "text": text})); + } else { + // No open tool-results group: buffer for the next user message. + pending_context_text.push(text); + } + } "user" | "assistant" => { let mut content = Vec::new(); - // Merge pending tool_results into user message to avoid consecutive user blocks - if msg.role == "user" && !pending_tool_results.is_empty() { + // Merge pending tool_results (and any trailing context blocks) into + // the user message to avoid consecutive user turns. + if msg.role == "user" && (!pending_tool_results.is_empty() || !pending_context_text.is_empty()) { content.extend(pending_tool_results.drain(..)); + for text in pending_context_text.drain(..) { + content.push(json!({"type": "text", "text": text})); + } } else { + // Flush any open tool-results group before an assistant turn. + if !pending_context_text.is_empty() && pending_tool_results.is_empty() { + // Emit buffered context as a standalone user turn so it is + // not lost when an assistant message follows without a user. + let ctx: Vec = pending_context_text + .drain(..) + .map(|t| json!({"type": "text", "text": t})) + .collect(); + result.push(json!({"role": "user", "content": ctx})); + } flush_tool_results(&mut result, &mut pending_tool_results); } if msg.role == "assistant" { @@ -641,13 +639,37 @@ fn convert_to_anthropic( result.push(json!({"role": msg.role, "content": content})); } "tool" | "diff" => { - if !msg.tool_call_id.starts_with("srvtoolu_") { // Filter server-executed tool results + if !msg.tool_call_id.starts_with("srvtoolu_") { let tool_text = msg.content.content_text_only(); let tool_text = if tool_text.is_empty() { "(empty)".to_string() } else { tool_text }; + + // Anthropic supports images directly inside tool_result.content as + // an array of content blocks. Build an array when images are present + // so the model can see them as part of the tool output. + let content_value = match &msg.content { + crate::call_validation::ChatContent::Multimodal(elements) + if elements.iter().any(|el| el.is_image()) => + { + let mut blocks = vec![json!({"type": "text", "text": tool_text})]; + for el in elements.iter().filter(|el| el.is_image()) { + blocks.push(json!({ + "type": "image", + "source": { + "type": "base64", + "media_type": el.m_type, + "data": el.m_content + } + })); + } + json!(blocks) + } + _ => json!(tool_text), + }; + pending_tool_results.push(json!({ "type": "tool_result", "tool_use_id": msg.tool_call_id, - "content": tool_text + "content": content_value })); } } @@ -655,53 +677,20 @@ fn convert_to_anthropic( } } + // Flush any remaining context and tool results. + if !pending_context_text.is_empty() { + for text in pending_context_text.drain(..) { + pending_tool_results.push(json!({"type": "text", "text": text})); + } + } flush_tool_results(&mut result, &mut pending_tool_results); // Claude prompt caching breakpoints are handled on messages (not system). let system = system_text.map(|text| json!(text)); - // Apply cache breakpoints for prefix-based caching. - // Strategy: 4 message breakpoints, recomputed every request: - // - last 2 messages - // - middle message - // - 1/4 point message - // (No system cache_control.) - if cache == CacheControl::Ephemeral && !result.is_empty() { - let len = result.len(); - - let quarter = len / 4; - let middle = len / 2; - let last = len - 1; - let last2 = len.saturating_sub(2); - - let mut breakpoint_indices = vec![quarter, middle, last2, last]; - breakpoint_indices.sort_unstable(); - breakpoint_indices.dedup(); - breakpoint_indices.truncate(4); - - for idx in breakpoint_indices { - add_cache_control_to_last_block(&mut result[idx]); - } - } - (system, result) } -/// Adds `cache_control` to the last content block of an Anthropic message. -/// Each message has a "content" array of blocks; the breakpoint goes on the last one. -fn add_cache_control_to_last_block(message: &mut Value) { - let cc = json!({"type": "ephemeral", "ttl": "1h"}); - if let Some(content) = message.get_mut("content") { - if let Some(arr) = content.as_array_mut() { - if let Some(last_block) = arr.last_mut() { - if let Some(obj) = last_block.as_object_mut() { - obj.insert("cache_control".to_string(), cc); - } - } - } - } -} - fn flush_tool_results(result: &mut Vec, pending: &mut Vec) { if pending.is_empty() { return; @@ -753,60 +742,6 @@ fn convert_tools_to_anthropic(tools: &[Value]) -> Value { json!(converted) } -/// Prefix tool names in an Anthropic tools array with the given prefix. -/// Required for Claude Code OAuth: Anthropic's server expects tools to be -/// prefixed with "mcp_" when using subscription-based OAuth tokens. -fn prefix_tool_names(tools: &mut Value, prefix: &str) { - if let Some(arr) = tools.as_array_mut() { - for tool in arr { - if let Some(name) = tool.get("name").and_then(|n| n.as_str()).map(|s| s.to_string()) { - if !name.starts_with(prefix) { - tool["name"] = json!(format!("{}{}", prefix, name)); - } - } - } - } -} - -/// Prepend the Claude Code system prompt prefix to an existing system value. -fn prepend_claude_code_system(system: Value) -> Value { - match system { - Value::String(text) => { - if text.trim().is_empty() { - json!(CLAUDE_CODE_SYSTEM_PREFIX) - } else { - json!([ - {"type": "text", "text": CLAUDE_CODE_SYSTEM_PREFIX}, - {"type": "text", "text": text} - ]) - } - } - Value::Array(blocks) => { - let mut new_blocks = vec![json!({"type": "text", "text": CLAUDE_CODE_SYSTEM_PREFIX})]; - new_blocks.extend(blocks); - - if let Some(second_text) = new_blocks - .get(1) - .and_then(|v| { - v.get("type") - .and_then(|t| t.as_str()) - .filter(|&t| t == "text") - .and_then(|_| v.get("text").and_then(|t| t.as_str())) - }) - { - if !second_text.starts_with(CLAUDE_CODE_SYSTEM_PREFIX) { - new_blocks[1] = json!({ - "type": "text", - "text": format!("{}\n\n{}", CLAUDE_CODE_SYSTEM_PREFIX, second_text), - }); - } - } - json!(new_blocks) - } - _ => json!(CLAUDE_CODE_SYSTEM_PREFIX), - } -} - fn tool_choice_to_anthropic(choice: &CanonicalToolChoice) -> Value { match choice { CanonicalToolChoice::Auto => json!({"type": "auto"}), @@ -879,31 +814,6 @@ mod tests { assert!(http.headers.get("anthropic-version").is_some()); } - #[test] - fn test_prepend_claude_code_system_keeps_prefix_as_standalone_block() { - // For Claude Code OAuth, the server may reject requests if the prefix is - // concatenated with other text in the same system block. - let system = json!("Be helpful"); - let prefixed = prepend_claude_code_system(system); - assert!(prefixed.is_array()); - let arr = prefixed.as_array().unwrap(); - assert_eq!(arr.len(), 2); - assert_eq!(arr[0]["type"], "text"); - assert_eq!(arr[0]["text"], CLAUDE_CODE_SYSTEM_PREFIX); - assert_eq!(arr[1]["type"], "text"); - assert_eq!(arr[1]["text"], "Be helpful"); - - let system2 = json!([ - {"type": "text", "text": "Be helpful"}, - {"type": "text", "text": "Also be brief"} - ]); - let prefixed2 = prepend_claude_code_system(system2); - let arr2 = prefixed2.as_array().unwrap(); - assert_eq!(arr2[0]["text"], CLAUDE_CODE_SYSTEM_PREFIX); - assert_eq!(arr2[1]["text"], "You are Claude Code, Anthropic's official CLI for Claude.\n\nBe helpful"); - assert_eq!(arr2[2]["text"], "Also be brief"); - } - #[test] fn test_interleaved_thinking_beta_header() { use crate::llm::params::ReasoningIntent; @@ -936,6 +846,20 @@ mod tests { assert!(http.headers.get("anthropic-beta").is_none()); } + #[test] + fn test_top_level_cache_control_ephemeral() { + let adapter = AnthropicAdapter; + let req = LlmRequest::new( + "claude".to_string(), + vec![ChatMessage::new("user".to_string(), "test".to_string())], + ) + .with_cache_control(CacheControl::Ephemeral); + + let http = adapter.build_http(&req, &settings()).unwrap(); + assert_eq!(http.body["cache_control"]["type"], "ephemeral"); + assert_eq!(http.body["cache_control"]["ttl"], "1h"); + } + #[test] fn test_no_beta_header_when_reasoning_not_supported() { use crate::llm::params::ReasoningIntent; @@ -959,22 +883,22 @@ mod tests { ChatMessage::new("system".to_string(), "Be helpful".to_string()), ChatMessage::new("user".to_string(), "Hi".to_string()), ]; - let (system, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (system, msgs) = convert_to_anthropic(&messages); assert_eq!(system, Some(json!("Be helpful"))); assert_eq!(msgs.len(), 1); } #[test] - fn test_system_with_cache_control() { + fn test_system_no_block_level_cache_control() { let messages = vec![ ChatMessage::new("system".to_string(), "Be helpful".to_string()), ChatMessage::new("user".to_string(), "Hi".to_string()), ]; - let (system, msgs) = convert_to_anthropic(&messages, CacheControl::Ephemeral); + let (system, msgs) = convert_to_anthropic(&messages); assert_eq!(system, Some(json!("Be helpful"))); assert_eq!(msgs.len(), 1); - // Single message should get a cache breakpoint - assert!(msgs[0]["content"][0].get("cache_control").is_some()); + // Block-level cache_control is no longer injected by the adapter + assert!(msgs[0]["content"][0].get("cache_control").is_none()); } #[test] @@ -1136,7 +1060,7 @@ mod tests { }, ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); assert_eq!(msgs.len(), 3); assert_eq!(msgs[0]["role"], "user"); @@ -1183,7 +1107,7 @@ mod tests { ChatMessage::new("user".to_string(), "now fix it".to_string()), ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); // Should be 3 messages: user, assistant, user(tool_result + text) // NOT 4: user, assistant, user(tool_result), user(text) @@ -1227,7 +1151,7 @@ mod tests { }, ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); assert_eq!(msgs.len(), 3); let tool_result = &msgs[2]["content"][0]; @@ -1329,7 +1253,7 @@ mod tests { } #[test] - fn test_cache_breakpoints_on_messages() { + fn test_no_block_level_cache_breakpoints_on_messages() { // After linearization: user, assistant+tool_use, tool_result, user use crate::call_validation::{ChatContent, ChatToolCall, ChatToolFunction}; @@ -1360,7 +1284,7 @@ mod tests { ChatMessage::new("user".to_string(), "Thanks, now explain".to_string()), ]; - let (system, msgs) = convert_to_anthropic(&messages, CacheControl::Ephemeral); + let (system, msgs) = convert_to_anthropic(&messages); // System should be plain text (no cache_control) assert_eq!(system, Some(json!("Be helpful"))); @@ -1369,9 +1293,9 @@ mod tests { // Tool result is merged into the following user message (no consecutive user blocks) assert_eq!(msgs.len(), 3); - // With 3 messages, quarter=0, middle=1, last2=1, last=2 => all messages get breakpoints. + // No block-level cache_control in message content for i in 0..msgs.len() { - assert!(msgs[i]["content"].as_array().unwrap().last().unwrap().get("cache_control").is_some()); + assert!(msgs[i]["content"].as_array().unwrap().last().unwrap().get("cache_control").is_none()); } // Verify the merged user message contains both tool_result and text @@ -1383,32 +1307,29 @@ mod tests { } #[test] - fn test_cache_breakpoints_single_message() { + fn test_no_block_level_cache_breakpoints_single_message() { let messages = vec![ ChatMessage::new("user".to_string(), "Hello".to_string()), ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Ephemeral); + let (_, msgs) = convert_to_anthropic(&messages); assert_eq!(msgs.len(), 1); - // Single message gets breakpoint at [-1] - assert!(msgs[0]["content"][0].get("cache_control").is_some()); - assert_eq!(msgs[0]["content"][0]["cache_control"]["ttl"], "1h"); + assert!(msgs[0]["content"][0].get("cache_control").is_none()); } #[test] - fn test_cache_breakpoints_two_messages() { + fn test_no_block_level_cache_breakpoints_two_messages() { let messages = vec![ ChatMessage::new("user".to_string(), "Hello".to_string()), ChatMessage::new("assistant".to_string(), "Hi there".to_string()), ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Ephemeral); + let (_, msgs) = convert_to_anthropic(&messages); assert_eq!(msgs.len(), 2); - // Two messages: [0] (always) and [-1] get breakpoints - assert!(msgs[0]["content"][0].get("cache_control").is_some()); - assert!(msgs[1]["content"][0].get("cache_control").is_some()); + assert!(msgs[0]["content"][0].get("cache_control").is_none()); + assert!(msgs[1]["content"][0].get("cache_control").is_none()); } #[test] @@ -1420,7 +1341,7 @@ mod tests { ChatMessage::new("user".to_string(), "Thanks".to_string()), ]; - let (system, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (system, msgs) = convert_to_anthropic(&messages); // System should be plain text, no cache_control assert_eq!(system, Some(json!("Be helpful"))); @@ -1437,7 +1358,7 @@ mod tests { } #[test] - fn test_cache_breakpoint_on_tool_use_last_block() { + fn test_no_block_level_cache_breakpoint_on_tool_use_last_block() { use crate::call_validation::{ChatContent, ChatToolCall, ChatToolFunction}; let messages = vec![ @@ -1465,14 +1386,14 @@ mod tests { }, ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Ephemeral); + let (_, msgs) = convert_to_anthropic(&messages); // [0]=user, [1]=assistant(text+tool_use), [2]=tool_result(user) assert_eq!(msgs.len(), 3); - // With 3 messages, quarter=0, middle=1, last2=1, last=2 => all messages get breakpoints. + // No block-level cache_control in message content for i in 0..msgs.len() { - assert!(msgs[i]["content"].as_array().unwrap().last().unwrap().get("cache_control").is_some()); + assert!(msgs[i]["content"].as_array().unwrap().last().unwrap().get("cache_control").is_none()); } } @@ -1493,7 +1414,7 @@ mod tests { ChatMessage::new("user".to_string(), "Explain more".to_string()), ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); assert_eq!(msgs.len(), 3); let assistant_content = msgs[1]["content"].as_array().unwrap(); @@ -1539,7 +1460,7 @@ mod tests { }, ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); // assistant content: [thinking, (empty text removed), tool_use] let assistant_content = msgs[1]["content"].as_array().unwrap(); @@ -1572,7 +1493,7 @@ mod tests { }, ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); let content = msgs[1]["content"].as_array().unwrap(); assert_eq!(content[0]["type"], "thinking"); @@ -1604,7 +1525,7 @@ mod tests { ChatMessage::new("user".to_string(), "And the sky?".to_string()), ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); assert_eq!(msgs.len(), 3); let assistant_content = msgs[1]["content"].as_array().unwrap(); @@ -1629,7 +1550,7 @@ mod tests { }, ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); let content = msgs[0]["content"].as_array().unwrap(); assert!(content[0].get("citations").is_none(), @@ -1648,7 +1569,7 @@ mod tests { }, ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); let content = msgs[1]["content"].as_array().unwrap(); assert_eq!(content.len(), 1); @@ -1656,7 +1577,7 @@ mod tests { } #[test] - fn test_thinking_blocks_cache_breakpoint_on_last_block() { + fn test_thinking_blocks_no_block_level_cache_breakpoint_on_last_block() { use crate::call_validation::{ChatContent, ChatToolCall, ChatToolFunction}; // Simulate call 2: user + assistant(thinking+tool_use) + tool_result @@ -1690,11 +1611,11 @@ mod tests { }, ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Ephemeral); + let (_, msgs) = convert_to_anthropic(&messages); - // With 3 messages, quarter=0, middle=1, last2=1, last=2 => all messages get breakpoints. + // No block-level cache_control in message content for i in 0..msgs.len() { - assert!(msgs[i]["content"].as_array().unwrap().last().unwrap().get("cache_control").is_some()); + assert!(msgs[i]["content"].as_array().unwrap().last().unwrap().get("cache_control").is_none()); } } @@ -1733,7 +1654,7 @@ mod tests { ChatMessage::new("user".to_string(), "Tell me more".to_string()), ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); let assistant_content = msgs[1]["content"].as_array().unwrap(); // Find the text block (may not be at index 0 due to interleaved server content blocks) @@ -1782,7 +1703,7 @@ mod tests { ChatMessage::new("user".to_string(), "And tomorrow?".to_string()), ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); let assistant_content = msgs[1]["content"].as_array().unwrap(); // Should contain: text block (with citations), server_tool_use, web_search_tool_result @@ -1875,7 +1796,7 @@ mod tests { ChatMessage::new("user".to_string(), "Follow up".to_string()), ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); let assistant_content = msgs[1]["content"].as_array().unwrap(); let thinking_blocks: Vec<_> = assistant_content.iter() @@ -1904,7 +1825,7 @@ mod tests { }, ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); let assistant_content = msgs[0]["content"].as_array().unwrap(); let thinking_blocks: Vec<_> = assistant_content.iter() @@ -1932,7 +1853,7 @@ mod tests { }, ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); let assistant_content = msgs[0]["content"].as_array().unwrap(); let thinking_blocks: Vec<_> = assistant_content.iter() @@ -1970,7 +1891,7 @@ mod tests { }, ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); // msgs[0] = user, msgs[1] = assistant let assistant_content = msgs[1]["content"].as_array().unwrap(); @@ -2029,7 +1950,7 @@ mod tests { ChatMessage::new("user".to_string(), "Tell me more".to_string()), ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); let assistant_content = msgs[1]["content"].as_array().unwrap(); // Verify interleaved order: thinking(0), server_tool_use(1), web_search_result(2), thinking(3), text(4) @@ -2093,7 +2014,7 @@ mod tests { ChatMessage::new("user".to_string(), "Tell me more".to_string()), ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); // Verify both blocks are preserved in the re-processed message let assistant_content = msgs[1]["content"].as_array().unwrap(); @@ -2142,7 +2063,7 @@ mod tests { assistant_msg, ]; - let (_, msgs) = convert_to_anthropic(&messages, CacheControl::Off); + let (_, msgs) = convert_to_anthropic(&messages); // Verify orphaned server_tool_use is filtered out let assistant_content = msgs[1]["content"].as_array().unwrap(); @@ -2150,7 +2071,44 @@ mod tests { let has_orphaned_block = assistant_content.iter() .any(|b| b["type"] == "server_tool_use" && b["id"] == "srvtoolu_01ORPHAN"); - assert!(!has_orphaned_block, + assert!(!has_orphaned_block, "Orphaned server_tool_use without matching result should be filtered for incomplete responses"); } + + #[test] + fn test_convert_tools_to_anthropic_maps_parameters_to_input_schema() { + let tools = vec![ + json!({ + "type": "function", + "function": { + "name": "search", + "description": "Search the web", + "parameters": { + "type": "object", + "properties": { + "query": {"type": "string", "description": "Search query"}, + "limit": {"type": "integer"} + }, + "required": ["query"] + } + } + }), + ]; + + let result = convert_tools_to_anthropic(&tools); + let converted = result.as_array().unwrap(); + assert_eq!(converted.len(), 1); + + let tool = &converted[0]; + assert_eq!(tool["name"], json!("search")); + assert_eq!(tool["description"], json!("Search the web")); + + let input_schema = &tool["input_schema"]; + assert_eq!(input_schema["type"], json!("object")); + assert_eq!(input_schema["properties"]["query"]["type"], json!("string")); + assert_eq!(input_schema["properties"]["limit"]["type"], json!("integer")); + assert_eq!(input_schema["required"], json!(["query"])); + + assert!(tool.get("parameters").is_none(), "parameters field should not be present"); + } } diff --git a/refact-agent/engine/src/llm/adapters/claude_code_compat.rs b/refact-agent/engine/src/llm/adapters/claude_code_compat.rs new file mode 100644 index 0000000000..a3c16af51a --- /dev/null +++ b/refact-agent/engine/src/llm/adapters/claude_code_compat.rs @@ -0,0 +1,179 @@ +//! Claude Code OAuth compatibility layer. +//! When users authenticate via Claude Code OAuth, the API requires specific +//! headers, user-agent, system prompt prefix, and tool name prefixing. + +use reqwest::header::{HeaderMap, HeaderValue}; +use serde_json::{json, Value}; + +pub const OAUTH_BETA_FLAG: &str = "oauth-2025-04-20"; +pub const USER_AGENT: &str = "claude-cli/2.1.2 (external, cli)"; +pub const SYSTEM_PREFIX: &str = "You are Claude Code, Anthropic's official CLI for Claude."; +pub const MCP_TOOL_PREFIX: &str = "mcp_"; + +pub fn is_claude_code_oauth(auth_token: &str) -> bool { + !auth_token.is_empty() +} + +pub fn apply_oauth_headers(headers: &mut HeaderMap, auth_token: &str) -> Result<(), String> { + headers.insert( + "authorization", + HeaderValue::from_str(&format!("Bearer {}", auth_token)) + .map_err(|e| format!("invalid auth_token: {e}"))?, + ); + headers.insert("user-agent", HeaderValue::from_static(USER_AGENT)); + Ok(()) +} + +pub fn build_oauth_url(endpoint: &str) -> String { + let sep = if endpoint.contains('?') { "&" } else { "?" }; + format!("{}{}beta=true", endpoint, sep) +} + +pub fn prepend_system(system: Value) -> Value { + match system { + Value::String(text) => { + if text.trim().is_empty() { + json!(SYSTEM_PREFIX) + } else { + json!([ + {"type": "text", "text": SYSTEM_PREFIX}, + {"type": "text", "text": text} + ]) + } + } + Value::Array(blocks) => { + let mut new_blocks = vec![json!({"type": "text", "text": SYSTEM_PREFIX})]; + new_blocks.extend(blocks); + + if let Some(second_text) = new_blocks + .get(1) + .and_then(|v| { + v.get("type") + .and_then(|t| t.as_str()) + .filter(|&t| t == "text") + .and_then(|_| v.get("text").and_then(|t| t.as_str())) + }) + { + if !second_text.starts_with(SYSTEM_PREFIX) { + new_blocks[1] = json!({ + "type": "text", + "text": format!("{}\n\n{}", SYSTEM_PREFIX, second_text), + }); + } + } + json!(new_blocks) + } + _ => json!(SYSTEM_PREFIX), + } +} + +/// Prefix all tool names in an Anthropic tools array with the given prefix. +/// Required for Claude Code OAuth: Anthropic's server expects tools to be +/// prefixed with "mcp_" when using subscription-based OAuth tokens. +pub fn prefix_tool_names(tools: &mut Value, prefix: &str) { + if let Some(arr) = tools.as_array_mut() { + for tool in arr { + if let Some(name) = tool.get("name").and_then(|n| n.as_str()).map(|s| s.to_string()) { + if !name.starts_with(prefix) { + tool["name"] = json!(format!("{}{}", prefix, name)); + } + } + } + } +} + +/// Prefix tool_use block names in message content with the given prefix. +/// Required for Claude Code OAuth when replaying historical messages. +pub fn prefix_tool_use_in_messages(messages: &mut Value, prefix: &str) { + if let Some(msgs) = messages.as_array_mut() { + for msg in msgs { + if let Some(content) = msg.get_mut("content").and_then(|c| c.as_array_mut()) { + for block in content { + if block.get("type").and_then(|t| t.as_str()) == Some("tool_use") { + if let Some(name) = block.get("name").and_then(|n| n.as_str()).map(|s| s.to_string()) { + if !name.starts_with(prefix) { + block["name"] = json!(format!("{}{}", prefix, name)); + } + } + } + } + } + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_is_claude_code_oauth_detection() { + assert!(is_claude_code_oauth("some-oauth-token")); + assert!(!is_claude_code_oauth("")); + } + + #[test] + fn test_prepend_system_keeps_prefix_as_standalone_block() { + let system = json!("Be helpful"); + let prefixed = prepend_system(system); + assert!(prefixed.is_array()); + let arr = prefixed.as_array().unwrap(); + assert_eq!(arr.len(), 2); + assert_eq!(arr[0]["type"], "text"); + assert_eq!(arr[0]["text"], SYSTEM_PREFIX); + assert_eq!(arr[1]["type"], "text"); + assert_eq!(arr[1]["text"], "Be helpful"); + + let system2 = json!([ + {"type": "text", "text": "Be helpful"}, + {"type": "text", "text": "Also be brief"} + ]); + let prefixed2 = prepend_system(system2); + let arr2 = prefixed2.as_array().unwrap(); + assert_eq!(arr2[0]["text"], SYSTEM_PREFIX); + assert_eq!(arr2[1]["text"], "You are Claude Code, Anthropic's official CLI for Claude.\n\nBe helpful"); + assert_eq!(arr2[2]["text"], "Also be brief"); + } + + #[test] + fn test_build_oauth_url_no_existing_params() { + let url = build_oauth_url("https://api.anthropic.com/v1/messages"); + assert_eq!(url, "https://api.anthropic.com/v1/messages?beta=true"); + } + + #[test] + fn test_build_oauth_url_with_existing_params() { + let url = build_oauth_url("https://api.anthropic.com/v1/messages?foo=bar"); + assert_eq!(url, "https://api.anthropic.com/v1/messages?foo=bar&beta=true"); + } + + #[test] + fn test_prefix_tool_names_no_prefix() { + let mut tools = json!([ + {"name": "search", "description": "Search"}, + {"name": "mcp_already_prefixed", "description": "Pre-prefixed"}, + ]); + prefix_tool_names(&mut tools, MCP_TOOL_PREFIX); + let arr = tools.as_array().unwrap(); + assert_eq!(arr[0]["name"], "mcp_search"); + assert_eq!(arr[1]["name"], "mcp_already_prefixed"); + } + + #[test] + fn test_prefix_tool_use_in_messages() { + let mut messages = json!([ + { + "role": "assistant", + "content": [ + {"type": "text", "text": "Let me search"}, + {"type": "tool_use", "id": "call_1", "name": "search", "input": {}}, + {"type": "tool_use", "id": "call_2", "name": "mcp_already", "input": {}}, + ] + } + ]); + prefix_tool_use_in_messages(&mut messages, MCP_TOOL_PREFIX); + let content = &messages[0]["content"]; + assert_eq!(content[1]["name"], "mcp_search"); + assert_eq!(content[2]["name"], "mcp_already"); + } +} diff --git a/refact-agent/engine/src/llm/adapters/mod.rs b/refact-agent/engine/src/llm/adapters/mod.rs index 0b38664538..1717713a69 100644 --- a/refact-agent/engine/src/llm/adapters/mod.rs +++ b/refact-agent/engine/src/llm/adapters/mod.rs @@ -1,4 +1,6 @@ pub mod anthropic; +pub mod claude_code_compat; pub mod openai_chat; pub mod openai_responses; pub mod refact; +pub mod render_extra; diff --git a/refact-agent/engine/src/llm/adapters/openai_chat.rs b/refact-agent/engine/src/llm/adapters/openai_chat.rs index 9b5cef039d..8459a793ee 100644 --- a/refact-agent/engine/src/llm/adapters/openai_chat.rs +++ b/refact-agent/engine/src/llm/adapters/openai_chat.rs @@ -8,7 +8,15 @@ use crate::llm::canonical::{ }; use crate::llm::params::CacheControl; -const PROTECTED_FIELDS: &[&str] = &["model", "messages", "stream", "tools", "tool_choice", "stream_options"]; +const PROTECTED_FIELDS: &[&str] = &[ + "model", + "messages", + "stream", + "tools", + "tool_choice", + "stream_options", + "cache_control", +]; pub struct OpenAiChatAdapter; @@ -37,8 +45,14 @@ impl LlmWireAdapter for OpenAiChatAdapter { let mut messages = convert_messages_to_openai(&req.messages); - // Inject cache_control for OpenRouter -> Anthropic routing - if matches!(req.cache_control, CacheControl::Ephemeral) { + // For OpenRouter Anthropic models, prefer automatic caching via top-level cache_control. + // This avoids per-message breakpoint churn in long tool loops. + let use_top_level_cache_control = + matches!(req.cache_control, CacheControl::Ephemeral) && is_openrouter_anthropic_model(settings); + + // Legacy explicit block-level cache_control is still used for non-Anthropic targets + // that may rely on Anthropic-compatible message-level markers. + if matches!(req.cache_control, CacheControl::Ephemeral) && !use_top_level_cache_control { inject_cache_control(&mut messages); } @@ -48,6 +62,10 @@ impl LlmWireAdapter for OpenAiChatAdapter { "stream": req.stream, }); + if use_top_level_cache_control { + body["cache_control"] = json!({"type": "ephemeral", "ttl": "1h"}); + } + if settings.supports_max_completion_tokens { body["max_completion_tokens"] = json!(req.params.max_tokens); } else { @@ -239,92 +257,168 @@ impl LlmWireAdapter for OpenAiChatAdapter { } fn convert_messages_to_openai(messages: &[crate::call_validation::ChatMessage]) -> Vec { - messages - .iter() - .filter_map(|msg| { - let role = match msg.role.as_str() { - "user" | "assistant" | "system" | "tool" => msg.role.clone(), - "diff" => "tool".to_string(), // diff messages are tool results - _ => return None, + use super::render_extra::{append_text_to_tool_json, is_context_role, render_context_message}; + + let mut result: Vec = Vec::new(); + let mut pending_user_content: Vec = Vec::new(); + + for msg in messages { + if is_context_role(&msg.role) { + let Some(text) = render_context_message(msg) else { continue }; + // Fold into the matching tool result by tool_call_id when possible + // so the model receives file content as part of the correct tool output. + // Fall back to the last tool message if tool_call_id is absent. + let target = if !msg.tool_call_id.is_empty() { + result.iter_mut().rev().find(|m| { + m["role"].as_str() == Some("tool") + && m["tool_call_id"].as_str() == Some(msg.tool_call_id.as_str()) + }) + } else { + result.iter_mut().rev().find(|m| m["role"].as_str() == Some("tool")) }; - - // Filter out tool results for server-executed tools - if (role == "tool" || msg.role == "diff") && msg.tool_call_id.starts_with("srvtoolu_") { - return None; + if let Some(tool_msg) = target { + append_text_to_tool_json(tool_msg, &text); + } else { + pending_user_content.push(json!({"type": "text", "text": text})); } + continue; + } - let mut obj = json!({ - "role": role, - }); + let role = match msg.role.as_str() { + "user" | "assistant" | "system" | "tool" => msg.role.clone(), + "diff" => "tool".to_string(), + _ => continue, + }; + + if (role == "tool" || msg.role == "diff") && msg.tool_call_id.starts_with("srvtoolu_") { + continue; + } - match &msg.content { - crate::call_validation::ChatContent::SimpleText(text) => { + if role != "user" && !pending_user_content.is_empty() { + result.push(json!({ + "role": "user", + "content": std::mem::take(&mut pending_user_content), + })); + } + + let mut obj = json!({"role": role}); + + match &msg.content { + crate::call_validation::ChatContent::SimpleText(text) => { + if role == "user" && !pending_user_content.is_empty() { + let mut content = std::mem::take(&mut pending_user_content); + if !text.is_empty() { + content.push(json!({"type": "text", "text": text})); + } + obj["content"] = json!(content); + } else { obj["content"] = json!(text); } - crate::call_validation::ChatContent::Multimodal(elements) => { - let content: Vec = elements - .iter() - .map(|el| { - if el.is_image() { - json!({ - "type": "image_url", - "image_url": { - "url": format!("data:{};base64,{}", el.m_type, el.m_content) - } - }) - } else { - json!({ - "type": "text", - "text": el.m_content - }) + } + crate::call_validation::ChatContent::Multimodal(elements) => { + // Only use array format when content actually contains images. + // Text-only multimodal (e.g. from trajectory deserialization or clients + // sending [{"type":"text","text":"..."}]) must be normalized to plain string — + // OpenAI Chat Completions requires string content for assistant/tool messages. + let has_images = elements.iter().any(|el| el.is_image()); + if role == "user" { + if !pending_user_content.is_empty() || has_images { + // Prepend pending blocks, then the message's own content blocks. + let mut content = std::mem::take(&mut pending_user_content); + if has_images { + content.extend(elements.iter().map(|el| { + if el.is_image() { + json!({ + "type": "image_url", + "image_url": { + "url": format!("data:{};base64,{}", el.m_type, el.m_content) + } + }) + } else { + json!({"type": "text", "text": el.m_content}) + } + })); + } else { + let plain = msg.content.content_text_only(); + if !plain.is_empty() { + content.push(json!({"type": "text", "text": plain})); } - }) - .collect(); - obj["content"] = json!(content); - } - crate::call_validation::ChatContent::ContextFiles(_) => { + } + obj["content"] = json!(content); + } else { + // No pending content and no images: collapse to plain string. + obj["content"] = json!(msg.content.content_text_only()); + } + } else { + // Non-user roles (tool, assistant, system) must carry string content. + // Tool images are collected below and deferred to the next user turn. obj["content"] = json!(msg.content.content_text_only()); } } + crate::call_validation::ChatContent::ContextFiles(_) => { + obj["content"] = json!(msg.content.content_text_only()); + } + } - if let Some(tool_calls) = &msg.tool_calls { - let tc: Vec = tool_calls - .iter() - .filter(|tc| !tc.id.starts_with("srvtoolu_")) // Filter server-executed tools - .map(|tc| { - let mut call = json!({ - "id": tc.id, - "index": tc.index, - "type": "function", - "function": { - "name": tc.function.name, - "arguments": tc.function.arguments - } - }); - if let Some(extra) = &tc.extra_content { - call["extra_content"] = extra.clone(); + if let Some(tool_calls) = &msg.tool_calls { + let tc: Vec = tool_calls + .iter() + .filter(|tc| !tc.id.starts_with("srvtoolu_")) + .map(|tc| { + let mut call = json!({ + "id": tc.id, + "index": tc.index, + "type": "function", + "function": { + "name": tc.function.name, + "arguments": tc.function.arguments } - call - }) - .collect(); - if !tc.is_empty() { - obj["tool_calls"] = json!(tc); - } + }); + if let Some(extra) = &tc.extra_content { + call["extra_content"] = extra.clone(); + } + call + }) + .collect(); + if !tc.is_empty() { + obj["tool_calls"] = json!(tc); } + } + + if !msg.tool_call_id.is_empty() { + obj["tool_call_id"] = json!(msg.tool_call_id); + } - if !msg.tool_call_id.is_empty() { - obj["tool_call_id"] = json!(msg.tool_call_id); + if let Some(reasoning) = &msg.reasoning_content { + if !reasoning.is_empty() { + obj["reasoning_content"] = json!(reasoning); } + } + + result.push(obj); - if let Some(reasoning) = &msg.reasoning_content { - if !reasoning.is_empty() { - obj["reasoning_content"] = json!(reasoning); + if role == "tool" { + if let crate::call_validation::ChatContent::Multimodal(elements) = &msg.content { + for el in elements.iter().filter(|el| el.is_image()) { + pending_user_content.push(json!({ + "type": "image_url", + "image_url": { + "url": format!("data:{};base64,{}", el.m_type, el.m_content) + } + })); } } + } + } - Some(obj) - }) - .collect() + if !pending_user_content.is_empty() { + result.push(json!({ + "role": "user", + "content": pending_user_content, + })); + } + + result } fn tool_choice_to_openai(choice: &CanonicalToolChoice) -> Value { @@ -362,6 +456,17 @@ fn response_format_to_openai(format: &ResponseFormat) -> Value { } } + +fn is_openrouter_anthropic_model(settings: &AdapterSettings) -> bool { + let endpoint = settings.endpoint.to_ascii_lowercase(); + if !endpoint.contains("openrouter.ai") { + return false; + } + + let model = settings.model_name.to_ascii_lowercase(); + model.starts_with("anthropic/") || model.contains("claude") +} + /// Inject cache_control breakpoints for OpenRouter -> Anthropic routing. /// Converts simple text messages to multipart format with cache_control on last block. /// Strategy: cache system message + 4 strategically positioned messages (quarter, middle, last2, last). @@ -784,6 +889,76 @@ mod tests { } } + #[test] + fn test_text_only_multimodal_normalized_to_string() { + use crate::call_validation::ChatContent; + use crate::scratchpads::multimodality::MultimodalElement; + + let messages = vec![ + ChatMessage { + role: "assistant".to_string(), + content: ChatContent::Multimodal(vec![MultimodalElement { + m_type: "text".to_string(), + m_content: "".to_string(), + }]), + ..Default::default() + }, + ChatMessage { + role: "tool".to_string(), + content: ChatContent::Multimodal(vec![MultimodalElement { + m_type: "text".to_string(), + m_content: "rev: 0\ncards: []".to_string(), + }]), + tool_call_id: "call_123".to_string(), + ..Default::default() + }, + ]; + + let converted = convert_messages_to_openai(&messages); + + // Text-only Multimodal must be serialized as plain string, not array + assert!(converted[0]["content"].is_string(), + "assistant text-only multimodal must serialize as string, got: {}", converted[0]["content"]); + assert_eq!(converted[0]["content"], ""); + + assert!(converted[1]["content"].is_string(), + "tool text-only multimodal must serialize as string, got: {}", converted[1]["content"]); + assert_eq!(converted[1]["content"], "rev: 0\ncards: []"); + } + + #[test] + fn test_multimodal_with_image_stays_array() { + use crate::call_validation::ChatContent; + use crate::scratchpads::multimodality::MultimodalElement; + + let messages = vec![ + ChatMessage { + role: "user".to_string(), + content: ChatContent::Multimodal(vec![ + MultimodalElement { + m_type: "text".to_string(), + m_content: "Look at this".to_string(), + }, + MultimodalElement { + m_type: "image/png".to_string(), + m_content: "base64data".to_string(), + }, + ]), + ..Default::default() + }, + ]; + + let converted = convert_messages_to_openai(&messages); + + // Multimodal with images must stay as array + assert!(converted[0]["content"].is_array(), + "user multimodal with image must serialize as array"); + let arr = converted[0]["content"].as_array().unwrap(); + assert_eq!(arr.len(), 2); + assert_eq!(arr[0]["type"], "text"); + assert_eq!(arr[1]["type"], "image_url"); + } + #[test] fn test_reasoning_content_included_in_assistant() { let messages = vec![ @@ -894,7 +1069,35 @@ mod tests { } #[test] - fn test_inject_cache_control_simple_messages() { + fn test_openrouter_anthropic_uses_top_level_cache_control() { + let adapter = OpenAiChatAdapter; + let req = LlmRequest::new("anthropic/claude-sonnet-4.6".to_string(), vec![ + ChatMessage::new("system".to_string(), "You are helpful".to_string()), + ChatMessage::new("user".to_string(), "Hello".to_string()), + ]) + .with_cache_control(CacheControl::Ephemeral); + + let mut settings = default_settings(); + settings.endpoint = "https://openrouter.ai/api/v1/chat/completions".to_string(); + settings.model_name = "anthropic/claude-sonnet-4.6".to_string(); + + let http = adapter.build_http(&req, &settings).unwrap(); + assert_eq!(http.body["cache_control"]["type"], "ephemeral"); + assert_eq!(http.body["cache_control"]["ttl"], "1h"); + + let messages = http.body["messages"].as_array().unwrap(); + for msg in messages { + let content = &msg["content"]; + if let Some(arr) = content.as_array() { + for block in arr { + assert!(block.get("cache_control").is_none()); + } + } + } + } + + #[test] + fn test_non_openrouter_keeps_explicit_block_level_cache_control() { let mut messages = vec![ json!({"role": "system", "content": "You are a helpful assistant"}), json!({"role": "user", "content": "Hello"}), @@ -905,107 +1108,18 @@ mod tests { inject_cache_control(&mut messages); - // System message should have cache_control + // Existing explicit strategy behavior remains for non-OpenRouter targets. let system_content = messages[0]["content"].as_array().unwrap(); - assert_eq!(system_content.len(), 1); - assert_eq!(system_content[0]["type"], "text"); - assert_eq!(system_content[0]["text"], "You are a helpful assistant"); assert_eq!(system_content[0]["cache_control"]["type"], "ephemeral"); - assert_eq!(system_content[0]["cache_control"]["ttl"], "1h"); - - // Non-system messages: 4 total (indices 1,2,3,4). Selected positions: [1, 2, 3] - // Which correspond to message indices: [2, 3, 4] (assistant1, user2, assistant2) - // user1 (message[1]) is at position 0 in non-system array, which is NOT selected - assert_eq!(messages[1]["content"].as_str(), Some("Hello"), - "user1 should remain as simple string (not cached)"); let assistant1_content = messages[2]["content"].as_array().unwrap(); - assert!(assistant1_content[0].get("cache_control").is_some(), - "assistant1 should be cached (position 1/quarter)"); + assert!(assistant1_content[0].get("cache_control").is_some()); let user2_content = messages[3]["content"].as_array().unwrap(); - assert!(user2_content[0].get("cache_control").is_some(), - "user2 should be cached (position 2/middle)"); + assert!(user2_content[0].get("cache_control").is_some()); let assistant2_content = messages[4]["content"].as_array().unwrap(); - assert!(assistant2_content[0].get("cache_control").is_some(), - "assistant2 should be cached (position 3/last)"); - } - - #[test] - fn test_inject_cache_control_multipart_messages() { - let mut messages = vec![ - json!({ - "role": "user", - "content": [ - {"type": "text", "text": "What's in this image?"}, - {"type": "image_url", "image_url": {"url": "data:image/png;base64,..."}} - ] - }), - json!({"role": "assistant", "content": "I see a cat"}), - ]; - - inject_cache_control(&mut messages); - - // First message (user) already multipart - cache_control on last block - let user_content = messages[0]["content"].as_array().unwrap(); - assert_eq!(user_content.len(), 2); - assert!(user_content[0].get("cache_control").is_none(), "First block shouldn't have cache_control"); - assert_eq!(user_content[1]["cache_control"]["type"], "ephemeral", "Last block should have cache_control"); - - // Second message (assistant) simple text - converted to multipart - let assistant_content = messages[1]["content"].as_array().unwrap(); - assert_eq!(assistant_content.len(), 1); - assert_eq!(assistant_content[0]["cache_control"]["ttl"], "1h"); - } - - #[test] - fn test_inject_cache_control_no_system_message() { - let mut messages = vec![ - json!({"role": "user", "content": "Hello"}), - json!({"role": "assistant", "content": "Hi"}), - ]; - - inject_cache_control(&mut messages); - - // Both messages should be cached (positions 0 and 1) - assert!(messages[0]["content"].as_array().unwrap()[0].get("cache_control").is_some()); - assert!(messages[1]["content"].as_array().unwrap()[0].get("cache_control").is_some()); - } - - #[test] - fn test_inject_cache_control_empty_messages() { - let mut messages: Vec = vec![]; - inject_cache_control(&mut messages); - assert_eq!(messages.len(), 0, "Should handle empty messages gracefully"); + assert!(assistant2_content[0].get("cache_control").is_some()); } - #[test] - fn test_inject_cache_control_only_system() { - let mut messages = vec![ - json!({"role": "system", "content": "Be helpful"}), - ]; - - inject_cache_control(&mut messages); - - // System message should be cached - let content = messages[0]["content"].as_array().unwrap(); - assert_eq!(content[0]["cache_control"]["type"], "ephemeral"); - } - - #[test] - fn test_inject_cache_control_deduplication() { - // With 2 non-system messages: quarter=0, middle=1, last2=0, last=1 - // After dedup: [0, 1] - let mut messages = vec![ - json!({"role": "user", "content": "First"}), - json!({"role": "assistant", "content": "Second"}), - ]; - - inject_cache_control(&mut messages); - - // Both should be cached - assert!(messages[0]["content"].as_array().unwrap()[0].get("cache_control").is_some()); - assert!(messages[1]["content"].as_array().unwrap()[0].get("cache_control").is_some()); - } } diff --git a/refact-agent/engine/src/llm/adapters/openai_responses.rs b/refact-agent/engine/src/llm/adapters/openai_responses.rs index ffb7a67c70..c3661cffe5 100644 --- a/refact-agent/engine/src/llm/adapters/openai_responses.rs +++ b/refact-agent/engine/src/llm/adapters/openai_responses.rs @@ -137,7 +137,7 @@ impl LlmWireAdapter for OpenAiResponsesAdapter { if settings.supports_reasoning { if let Some(effort) = req.reasoning.to_openai_effort() { - body["reasoning"] = json!({"effort": effort}); + body["reasoning"] = json!({"effort": effort, "summary": "auto"}); } } @@ -284,6 +284,14 @@ impl LlmWireAdapter for OpenAiResponsesAdapter { } } + // Reasoning summary lifecycle events — content already streamed via *.delta above + "response.reasoning_summary_part.added" => { + tracing::trace!("reasoning_summary_part.added (summary part opened, text arrives via delta)"); + } + "response.reasoning_summary_part.done" => { + tracing::trace!("reasoning_summary_part.done (redundant, text already streamed via deltas)"); + } + // ── Refusal streaming ── "response.refusal.delta" => { if let Some(delta) = json.get("delta").and_then(|d| d.as_str()) { @@ -632,9 +640,15 @@ impl LlmWireAdapter for OpenAiResponsesAdapter { fn convert_to_responses_format( messages: &[crate::call_validation::ChatMessage], ) -> (Value, Option) { + use super::render_extra::{is_context_role, render_context_message}; + let mut instructions = None; - let mut input_messages = Vec::new(); + let mut input_messages: Vec = Vec::new(); let mut system_count = 0; + // Unified buffer of Responses API content blocks to inject into the next user turn. + // Text-context blocks ({"type":"input_text",...}) and images deferred from tool + // results ({"type":"input_image",...}) both accumulate here. + let mut pending_user_content: Vec = Vec::new(); for msg in messages { match msg.role.as_str() { @@ -648,8 +662,38 @@ fn convert_to_responses_format( } instructions = Some(msg.content.content_text_only()); } + role if is_context_role(role) => { + let Some(text) = render_context_message(msg) else { continue }; + // Fold into the matching function_call_output by call_id when possible + // so the model receives file content as part of the correct tool output. + // Fall back to the last function_call_output if tool_call_id is absent. + let target = if !msg.tool_call_id.is_empty() { + input_messages.iter_mut().rev().find(|m| { + m["type"].as_str() == Some("function_call_output") + && m["call_id"].as_str() == Some(msg.tool_call_id.as_str()) + }) + } else { + input_messages + .last_mut() + .filter(|m| m["type"].as_str() == Some("function_call_output")) + }; + if let Some(item) = target { + let existing = item["output"].as_str().unwrap_or("").to_string(); + item["output"] = json!(if existing.is_empty() { + text + } else { + format!("{}\n\n{}", existing, text) + }); + } else { + pending_user_content.push(json!({"type": "input_text", "text": text})); + } + } "user" => { - let content = msg_content_to_responses(&msg.content); + let mut content = msg_content_to_responses(&msg.content); + // Prepend pending blocks (context text + deferred tool images). + if !pending_user_content.is_empty() { + content = [std::mem::take(&mut pending_user_content), content].concat(); + } input_messages.push(json!({ "type": "message", "role": "user", @@ -657,6 +701,14 @@ fn convert_to_responses_format( })); } "assistant" => { + // Flush pending user content before an assistant turn so ordering is preserved. + if !pending_user_content.is_empty() { + input_messages.push(json!({ + "type": "message", + "role": "user", + "content": std::mem::take(&mut pending_user_content), + })); + } // Re-send reasoning items from prior turns for multi-turn tool-calling. // OpenAI Responses API reasoning items are opaque JSON with type="reasoning", // and must be included in input[] for the model to continue its reasoning. @@ -677,7 +729,7 @@ fn convert_to_responses_format( } if let Some(tool_calls) = &msg.tool_calls { for tc in tool_calls { - if !tc.id.starts_with("srvtoolu_") { // Filter server-executed tools + if !tc.id.starts_with("srvtoolu_") { input_messages.push(json!({ "type": "function_call", "call_id": tc.id, @@ -689,19 +741,35 @@ fn convert_to_responses_format( } } "tool" | "diff" => { - // Both "tool" and "diff" are tool results - filter server-executed if !msg.tool_call_id.starts_with("srvtoolu_") { input_messages.push(json!({ "type": "function_call_output", "call_id": msg.tool_call_id, "output": msg.content.content_text_only() })); + + if let crate::call_validation::ChatContent::Multimodal(elements) = &msg.content { + for el in elements.iter().filter(|el| el.is_image()) { + pending_user_content.push(json!({ + "type": "input_image", + "image_url": format!("data:{};base64,{}", el.m_type, el.m_content) + })); + } + } } } _ => {} } } + if !pending_user_content.is_empty() { + input_messages.push(json!({ + "type": "message", + "role": "user", + "content": pending_user_content, + })); + } + let input = if input_messages.is_empty() { Value::Null } else { @@ -745,7 +813,12 @@ fn convert_tools_to_responses(tools: &[Value]) -> Value { "type": "function", "name": func.get("name")?, "description": func.get("description").unwrap_or(&json!("")), - "parameters": func.get("parameters").unwrap_or(&json!({})) + "parameters": func.get("parameters").unwrap_or(&json!({})), + // Responses API defaults strict=true, which causes the model to fill optional + // parameters with empty strings "" instead of omitting them. Pass through the + // strict value from the original tool definition, defaulting to false so that + // optional params are simply absent (matching Chat Completions behavior). + "strict": func.get("strict").unwrap_or(&json!(false)) })); } // Already in Responses API format (has "type" + "name" but no "function" wrapper) @@ -1541,6 +1614,26 @@ mod tests { } } + #[test] + fn test_reasoning_summary_part_added_ignored() { + let adapter = OpenAiResponsesAdapter; + let chunk = r#"{"type":"response.reasoning_summary_part.added","item_id":"rs_abc","output_index":0,"summary_index":0,"part":{"type":"summary_text","text":""},"sequence_number":3}"#; + + let deltas = adapter.parse_stream_chunk(chunk).unwrap(); + + assert!(deltas.is_empty(), "reasoning_summary_part.added should produce no deltas"); + } + + #[test] + fn test_reasoning_summary_part_done_ignored() { + let adapter = OpenAiResponsesAdapter; + let chunk = r#"{"type":"response.reasoning_summary_part.done","item_id":"rs_abc","output_index":0,"summary_index":0,"part":{"type":"summary_text","text":"**Sending friendly greeting**"},"sequence_number":9}"#; + + let deltas = adapter.parse_stream_chunk(chunk).unwrap(); + + assert!(deltas.is_empty(), "reasoning_summary_part.done should produce no deltas"); + } + #[test] fn test_reasoning_text_delta() { let adapter = OpenAiResponsesAdapter; @@ -1595,4 +1688,91 @@ mod tests { assert!(deltas.iter().any(|d| matches!(d, LlmStreamDelta::AddCitation { .. })), "annotation.added should produce AddCitation"); } + + #[test] + fn test_convert_tools_to_responses_preserves_schema() { + let tools = vec![ + json!({ + "type": "function", + "function": { + "name": "search", + "description": "Search the web", + "parameters": { + "type": "object", + "properties": { + "query": {"type": "string", "description": "Search query"}, + "limit": {"type": "integer"}, + "tags": { + "type": "array", + "items": {"type": "string"} + } + }, + "required": ["query"] + } + } + }), + ]; + + let result = convert_tools_to_responses(&tools); + let converted = result.as_array().unwrap(); + assert_eq!(converted.len(), 1); + + let tool = &converted[0]; + assert_eq!(tool["type"], json!("function")); + assert_eq!(tool["name"], json!("search")); + assert_eq!(tool["description"], json!("Search the web")); + assert_eq!(tool["strict"], json!(false), "strict must default to false to prevent optional params being filled with empty strings"); + + let params = &tool["parameters"]; + assert_eq!(params["type"], json!("object")); + assert_eq!(params["properties"]["query"]["type"], json!("string")); + assert_eq!(params["properties"]["limit"]["type"], json!("integer")); + assert_eq!(params["properties"]["tags"]["type"], json!("array")); + assert_eq!(params["properties"]["tags"]["items"]["type"], json!("string")); + assert_eq!(params["required"], json!(["query"])); + assert!(tool.get("function").is_none(), "function wrapper must not be present in responses format"); + } + + #[test] + fn test_convert_tools_to_responses_strict_true_preserved() { + let tools = vec![ + json!({ + "type": "function", + "function": { + "name": "strict_tool", + "description": "A strict tool", + "strict": true, + "parameters": { + "type": "object", + "properties": { + "query": {"type": "string"} + }, + "required": ["query"], + "additionalProperties": false + } + } + }), + ]; + + let result = convert_tools_to_responses(&tools); + let converted = result.as_array().unwrap(); + assert_eq!(converted[0]["strict"], json!(true), "strict=true must be passed through to Responses API format"); + } + + #[test] + fn test_convert_tools_to_responses_already_in_responses_format() { + let tools = vec![ + json!({ + "type": "function", + "name": "already_converted", + "description": "Already in responses format", + "parameters": {"type": "object", "properties": {}} + }), + ]; + + let result = convert_tools_to_responses(&tools); + let converted = result.as_array().unwrap(); + assert_eq!(converted.len(), 1); + assert_eq!(converted[0]["name"], json!("already_converted")); + } } diff --git a/refact-agent/engine/src/llm/adapters/refact.rs b/refact-agent/engine/src/llm/adapters/refact.rs index 8c0e317f0c..5218fdc904 100644 --- a/refact-agent/engine/src/llm/adapters/refact.rs +++ b/refact-agent/engine/src/llm/adapters/refact.rs @@ -41,12 +41,12 @@ impl LlmWireAdapter for RefactAdapter { insert_extra_headers(&mut headers, &settings.extra_headers); let reasoning_type = settings.reasoning_type.as_deref(); - let mut messages = convert_messages_to_refact(&req.messages, reasoning_type); + let mut messages = convert_messages_to_refact(&req.messages, &settings.model_name, reasoning_type); // LiteLLM prompt caching via `cache_control` is intended for Anthropic-native routing. // Some backends (notably Vertex/Gemini) treat cache controls as CachedContent and reject // requests that also include system instruction / tools / tool_config. - let is_anthropic_target = reasoning_type.is_some_and(|rt| rt.starts_with("anthropic")); + let is_anthropic_target = settings.model_name.to_lowercase().contains("claude"); if is_anthropic_target && matches!(req.cache_control, CacheControl::Ephemeral) { inject_cache_control(&mut messages); } @@ -114,6 +114,11 @@ impl LlmWireAdapter for RefactAdapter { } _ => { if let Some(effort) = req.reasoning.to_anthropic_effort() { + let effort = if effort == "max" { + "high" // litellm doesn't support "max" reasoning type yet + } else { + effort + }; body["reasoning_effort"] = json!(effort); body["output_config"] = json!({"effort": effort}); } @@ -346,33 +351,71 @@ impl LlmWireAdapter for RefactAdapter { } } -fn convert_messages_to_refact(messages: &[crate::call_validation::ChatMessage], reasoning_type: Option<&str>) -> Vec { - let is_anthropic_target = reasoning_type.map_or(false, |rt| rt.starts_with("anthropic")); +fn convert_messages_to_refact(messages: &[crate::call_validation::ChatMessage], model_name: &str, reasoning_type: Option<&str>) -> Vec { + use super::render_extra::{append_text_to_tool_json, is_context_role, render_context_message}; + + let is_anthropic_target = model_name.to_lowercase().contains("claude"); let supports_reasoning_content = reasoning_type.is_some(); - messages - .iter() - .filter_map(|msg| { - let role = match msg.role.as_str() { - "user" | "assistant" | "system" | "tool" => msg.role.clone(), - "diff" => "tool".to_string(), // diff messages are tool results - _ => return None, - }; - // Filter out tool results for server-executed tools - if (role == "tool" || msg.role == "diff") && msg.tool_call_id.starts_with("srvtoolu_") { - return None; + let mut result: Vec = Vec::new(); + let mut pending_user_content: Vec = Vec::new(); + + for msg in messages { + if is_context_role(&msg.role) { + let Some(text) = render_context_message(msg) else { continue }; + let target = if !msg.tool_call_id.is_empty() { + result.iter_mut().rev().find(|m| { + m["role"].as_str() == Some("tool") + && m["tool_call_id"].as_str() == Some(msg.tool_call_id.as_str()) + }) + } else { + result.iter_mut().rev().find(|m| m["role"].as_str() == Some("tool")) + }; + if let Some(tool_msg) = target { + append_text_to_tool_json(tool_msg, &text); + } else { + pending_user_content.push(json!({"type": "text", "text": text})); } + continue; + } - let mut obj = json!({"role": role}); + let role = match msg.role.as_str() { + "user" | "assistant" | "system" | "tool" => msg.role.clone(), + "diff" => "tool".to_string(), + _ => continue, + }; - match &msg.content { - crate::call_validation::ChatContent::SimpleText(text) => { + if (role == "tool" || msg.role == "diff") && msg.tool_call_id.starts_with("srvtoolu_") { + continue; + } + + if role != "user" && !pending_user_content.is_empty() { + result.push(json!({ + "role": "user", + "content": std::mem::take(&mut pending_user_content), + })); + } + + let mut obj = json!({"role": role}); + + match &msg.content { + crate::call_validation::ChatContent::SimpleText(text) => { + if role == "user" && !pending_user_content.is_empty() { + let mut content = std::mem::take(&mut pending_user_content); + if !text.is_empty() { + content.push(json!({"type": "text", "text": text})); + } + obj["content"] = json!(content); + } else { obj["content"] = json!(text); } - crate::call_validation::ChatContent::Multimodal(elements) => { - let content: Vec = elements - .iter() - .map(|el| { + } + crate::call_validation::ChatContent::Multimodal(elements) => { + let has_images = elements.iter().any(|el| el.is_image()); + if role == "user" { + if !pending_user_content.is_empty() || has_images { + let mut content = std::mem::take(&mut pending_user_content); + content.extend(elements.iter().map(|el| { if el.is_image() { json!({ "type": "image_url", @@ -383,19 +426,32 @@ fn convert_messages_to_refact(messages: &[crate::call_validation::ChatMessage], } else { json!({"type": "text", "text": el.m_content}) } - }) - .collect(); - obj["content"] = json!(content); - } - crate::call_validation::ChatContent::ContextFiles(_) => { + })); + obj["content"] = json!(content); + } else { + // No pending content and no images: use array format (Refact always + // sends multimodal as array, even text-only, for consistency). + let content: Vec = elements + .iter() + .map(|el| json!({"type": "text", "text": el.m_content})) + .collect(); + obj["content"] = json!(content); + } + } else { + // Non-user roles must carry string content. + // Tool images are collected below and deferred to the next user turn. obj["content"] = json!(msg.content.content_text_only()); } } + crate::call_validation::ChatContent::ContextFiles(_) => { + obj["content"] = json!(msg.content.content_text_only()); + } + } - if let Some(tool_calls) = &msg.tool_calls { + if let Some(tool_calls) = &msg.tool_calls { let tc: Vec = tool_calls .iter() - .filter(|tc| !tc.id.starts_with("srvtoolu_")) // Filter server-executed tools + .filter(|tc| !tc.id.starts_with("srvtoolu_")) .map(|tc| { json!({ "id": tc.id, @@ -481,60 +537,54 @@ fn convert_messages_to_refact(messages: &[crate::call_validation::ChatMessage], } } - Some(obj) - }) - .collect() + result.push(obj); + + if role == "tool" { + if let crate::call_validation::ChatContent::Multimodal(elements) = &msg.content { + for el in elements.iter().filter(|el| el.is_image()) { + pending_user_content.push(json!({ + "type": "image_url", + "image_url": { + "url": format!("data:{};base64,{}", el.m_type, el.m_content) + } + })); + } + } + } + } + + if !pending_user_content.is_empty() { + result.push(json!({ + "role": "user", + "content": pending_user_content, + })); + } + + result } /// Injects `cache_control` breakpoints into OpenAI-format messages for LiteLLM prompt caching. /// /// Strategy: -/// - 4 message breakpoints, recomputed each request: +/// - 2 message breakpoints, recomputed each request: /// - last 2 non-system messages -/// - middle non-system message -/// - 1/4 point non-system message /// - no system cache_control /// -/// For string content, converts to array-of-blocks format so `cache_control` can be attached. -/// LiteLLM passes these through to Anthropic's native API. +/// Adds `cache_control` as a top-level key on the message object so the content structure +/// is never modified. LiteLLM passes message-level cache_control through to Anthropic. fn inject_cache_control(messages: &mut [Value]) { let cc = json!({"type": "ephemeral", "ttl": "1h"}); fn add_cache_to_message(msg: &mut Value, cc: &Value) { - let Some(content) = msg.get_mut("content") else { return }; - if let Some(text) = content.as_str().map(|s| s.to_string()) { - // Convert string content to array-of-blocks format - *content = json!([{"type": "text", "text": text, "cache_control": cc}]); - } else if let Some(arr) = content.as_array_mut() { - if let Some(last_block) = arr.last_mut() { - if let Some(obj) = last_block.as_object_mut() { - obj.insert("cache_control".to_string(), cc.clone()); - } - } + if let Some(obj) = msg.as_object_mut() { + obj.insert("cache_control".to_string(), cc.clone()); } } - // Cache selected non-system messages - let non_system_indices: Vec = messages.iter().enumerate() - .filter(|(_, m)| m.get("role").and_then(|r| r.as_str()) != Some("system")) - .map(|(i, _)| i) - .collect(); - - let len = non_system_indices.len(); - let quarter_pos = len / 4; - let middle_pos = len / 2; - let last_pos = len - 1; - let last2_pos = len.saturating_sub(2); - - let mut selected_positions = vec![quarter_pos, middle_pos, last2_pos, last_pos]; - selected_positions.sort_unstable(); - selected_positions.dedup(); - selected_positions.truncate(4); - + let len = messages.len(); + let selected_positions = vec![len.saturating_sub(1)]; for pos in selected_positions { - if let Some(&msg_idx) = non_system_indices.get(pos) { - add_cache_to_message(&mut messages[msg_idx], &cc); - } + add_cache_to_message(&mut messages[pos], &cc); } } @@ -645,8 +695,10 @@ mod tests { } } - fn anthropic_target_settings() -> AdapterSettings { + fn anthropic_openrouter_settings() -> AdapterSettings { AdapterSettings { + endpoint: "https://openrouter.ai/api/v1/chat/completions".to_string(), + model_name: "anthropic/claude-sonnet-4.6".to_string(), supports_reasoning: true, reasoning_type: Some("anthropic_budget".to_string()), ..default_settings() @@ -941,7 +993,7 @@ mod tests { }, ]; - let converted = convert_messages_to_refact(&messages, None); + let converted = convert_messages_to_refact(&messages, "", None); assert_eq!(converted.len(), 3); assert_eq!(converted[2]["role"], "tool"); @@ -1251,7 +1303,7 @@ mod tests { }, ]; - let converted = convert_messages_to_refact(&messages, Some("anthropic_budget")); + let converted = convert_messages_to_refact(&messages, "claude-3-5-sonnet", Some("anthropic_budget")); assert_eq!(converted.len(), 3); // Assistant message should have thinking_blocks when targeting Anthropic @@ -1280,7 +1332,7 @@ mod tests { }, ]; - let converted = convert_messages_to_refact(&messages, None); + let converted = convert_messages_to_refact(&messages, "", None); assert_eq!(converted.len(), 2); assert!(converted[1].get("thinking_blocks").is_none(), @@ -1298,7 +1350,7 @@ mod tests { }, ]; - let converted = convert_messages_to_refact(&messages, None); + let converted = convert_messages_to_refact(&messages, "", None); assert!(converted[0].get("thinking_blocks").is_none(), "Empty thinking_blocks should not be included"); @@ -1332,7 +1384,7 @@ mod tests { }, ]; - let converted = convert_messages_to_refact(&messages, Some("openai")); + let converted = convert_messages_to_refact(&messages, "gpt-4", Some("openai")); assert_eq!(converted.len(), 3); let assistant = &converted[1]; @@ -1352,7 +1404,7 @@ mod tests { }, ]; - let converted = convert_messages_to_refact(&messages, None); + let converted = convert_messages_to_refact(&messages, "", None); assert!(converted[0].get("reasoning_content").is_none()); } @@ -1368,7 +1420,7 @@ mod tests { }, ]; - let converted = convert_messages_to_refact(&messages, None); + let converted = convert_messages_to_refact(&messages, "", None); assert!(converted[0].get("reasoning_content").is_none()); } @@ -1383,26 +1435,25 @@ mod tests { ChatMessage::new("user".to_string(), "How are you?".to_string()), ]).with_cache_control(CacheControl::Ephemeral); - let http = adapter.build_http(&req, &anthropic_target_settings()).unwrap(); + let http = adapter.build_http(&req, &anthropic_openrouter_settings()).unwrap(); - // No top-level cache_control field - assert!(http.body.get("cache_control").is_none(), - "cache_control should be in messages, not top-level"); + assert!(http.body.get("cache_control").is_none()); let messages = http.body["messages"].as_array().unwrap(); assert_eq!(messages.len(), 4); - // System message: no cache_control injected - let sys = &messages[0]; - assert!(sys["content"].is_string()); + // cache_control is injected at the message level on the last message. + assert!(messages[3].get("cache_control").is_some()); + assert_eq!(messages[3]["cache_control"]["type"], "ephemeral"); + assert_eq!(messages[3]["cache_control"]["ttl"], "1h"); - // Non-system slice is [1,2,3] => len=3 - // quarter=0, middle=1, last2=1, last=2 => selected positions {0,1,2} - // => all 3 non-system messages should be converted to blocks and have cache_control. - for idx in 1..=3 { - let content = messages[idx]["content"].as_array().unwrap(); - assert!(content.last().unwrap().get("cache_control").is_some()); + // Other messages should not have cache_control. + for msg in &messages[..3] { + assert!(msg.get("cache_control").is_none()); } + + // System message content remains a plain string. + assert!(messages[0]["content"].is_string()); } #[test] @@ -1412,12 +1463,13 @@ mod tests { ChatMessage::new("user".to_string(), "Hi".to_string()), ]).with_cache_control(CacheControl::Ephemeral); - let http = adapter.build_http(&req, &anthropic_target_settings()).unwrap(); + let http = adapter.build_http(&req, &anthropic_openrouter_settings()).unwrap(); let messages = http.body["messages"].as_array().unwrap(); - // Single non-system message: first == last, should get cache_control once - let content = messages[0]["content"].as_array().unwrap(); - assert!(content[0].get("cache_control").is_some()); + assert!(http.body.get("cache_control").is_none()); + assert_eq!(messages[0]["cache_control"]["type"], "ephemeral"); + let content = messages[0]["content"].as_str(); + assert!(content.is_some()); } #[test] @@ -1476,16 +1528,16 @@ mod tests { multimodal_msg, ]).with_cache_control(CacheControl::Ephemeral); - let http = adapter.build_http(&req, &anthropic_target_settings()).unwrap(); + let http = adapter.build_http(&req, &anthropic_openrouter_settings()).unwrap(); let messages = http.body["messages"].as_array().unwrap(); let content = messages[0]["content"].as_array().unwrap(); - // cache_control should be on the last block (image) - assert!(content.last().unwrap().get("cache_control").is_some(), - "cache_control should be on last content block"); - // First block should NOT have cache_control - assert!(content[0].get("cache_control").is_none(), - "Only last block should have cache_control"); + // cache_control is injected at the message level, not at block level. + assert!(http.body.get("cache_control").is_none()); + assert_eq!(messages[0]["cache_control"]["type"], "ephemeral"); + for block in content { + assert!(block.get("cache_control").is_none()); + } } #[test] @@ -1617,7 +1669,7 @@ mod tests { ChatMessage::new("user".to_string(), "And the sky?".to_string()), ]; - let converted = convert_messages_to_refact(&messages, None); + let converted = convert_messages_to_refact(&messages, "", None); assert_eq!(converted.len(), 3); // Assistant message should have citations @@ -1641,7 +1693,7 @@ mod tests { }, ]; - let converted = convert_messages_to_refact(&messages, None); + let converted = convert_messages_to_refact(&messages, "", None); assert!(converted[0].get("citations").is_none(), "Empty citations should not be included"); @@ -1681,7 +1733,7 @@ mod tests { }, ]; - let converted = convert_messages_to_refact(&messages, Some("anthropic_budget")); + let converted = convert_messages_to_refact(&messages, "claude-3-5-sonnet", Some("anthropic_budget")); let assistant = &converted[1]; // LiteLLM may send signed thinking blocks with empty thinking text ("thinking": "") @@ -1712,7 +1764,7 @@ mod tests { }, ]; - let converted = convert_messages_to_refact(&messages, Some("anthropic_budget")); + let converted = convert_messages_to_refact(&messages, "claude-3-5-sonnet", Some("anthropic_budget")); let blocks = converted[0]["thinking_blocks"].as_array().unwrap(); assert_eq!(blocks.len(), 3, "All Anthropic blocks must be preserved verbatim: {:?}", blocks); @@ -1736,11 +1788,11 @@ mod tests { }, ]; - let converted = convert_messages_to_refact(&messages, Some("openai")); + let converted = convert_messages_to_refact(&messages, "gpt-4", Some("openai")); assert!(converted[0].get("thinking_blocks").is_none(), "thinking_blocks should be stripped for non-Anthropic targets"); - let converted_none = convert_messages_to_refact(&messages, None); + let converted_none = convert_messages_to_refact(&messages, "", None); assert!(converted_none[0].get("thinking_blocks").is_none(), "thinking_blocks should be stripped when no reasoning_type"); } @@ -1758,11 +1810,11 @@ mod tests { }, ]; - let converted = convert_messages_to_refact(&messages, None); + let converted = convert_messages_to_refact(&messages, "", None); assert!(converted[0].get("reasoning_content").is_none(), "reasoning_content should be stripped when no reasoning support"); - let converted_openai = convert_messages_to_refact(&messages, Some("openai")); + let converted_openai = convert_messages_to_refact(&messages, "gpt-4", Some("openai")); assert_eq!(converted_openai[0]["reasoning_content"], "Reasoning text", "reasoning_content should be included for openai reasoning"); } @@ -1796,7 +1848,7 @@ mod tests { }, ]; - let converted = convert_messages_to_refact(&messages, Some("anthropic_budget")); + let converted = convert_messages_to_refact(&messages, "claude-3-5-sonnet", Some("anthropic_budget")); let citations = converted[0]["citations"].as_array().unwrap(); assert_eq!(citations.len(), 1, "Encrypted citations should always be stripped in Refact wire"); diff --git a/refact-agent/engine/src/llm/adapters/render_extra.rs b/refact-agent/engine/src/llm/adapters/render_extra.rs new file mode 100644 index 0000000000..f397df208d --- /dev/null +++ b/refact-agent/engine/src/llm/adapters/render_extra.rs @@ -0,0 +1,70 @@ +//! Common rendering helpers for supplemental context message roles. +//! +//! The message roles `context_file`, `plain_text`, and `cd_instruction` carry +//! content that must reach the model but that standard LLM APIs do not know +//! about. Each wire adapter is responsible for folding this content into the +//! appropriate API primitives; the functions here produce the canonical text +//! representation so every adapter formats it the same way. + +use crate::call_validation::{ChatContent, ChatMessage}; + +/// Returns `true` for message roles that carry supplemental context and must +/// be rendered into wire messages by each adapter rather than silently dropped. +pub fn is_context_role(role: &str) -> bool { + matches!(role, "context_file" | "plain_text" | "cd_instruction") +} + +/// Render `context_file` content with per-file filename + line-range headers. +/// +/// Each file is formatted as: +/// ```text +/// 📄 path/to/file.py:10-50 +/// +/// ``` +/// Multiple files are separated by a blank line. +pub fn render_context_file_content(content: &ChatContent) -> String { + match content { + ChatContent::ContextFiles(files) => files + .iter() + .map(|f| format!("📄 {}:{}-{}\n{}", f.file_name, f.line1, f.line2, f.file_content)) + .collect::>() + .join("\n\n"), + _ => content.content_text_only(), + } +} + +/// Render any supplemental context message to plain text. +/// Returns `None` if the rendered text is empty or whitespace-only. +pub fn render_context_message(msg: &ChatMessage) -> Option { + let text = match msg.role.as_str() { + "context_file" => render_context_file_content(&msg.content), + "plain_text" | "cd_instruction" => msg.content.content_text_only(), + _ => return None, + }; + let trimmed = text.trim(); + if trimmed.is_empty() { None } else { Some(trimmed.to_string()) } +} + +/// Append `text` to the `"content"` field of a JSON tool message object, +/// separating existing content from the new text with two newlines. +/// +/// Handles both string and array-of-blocks content: +/// - String → appends in-place +/// - Array → extracts existing text, appends, writes back as string +/// - Other → writes `text` as new string content +pub fn append_text_to_tool_json(msg: &mut serde_json::Value, text: &str) { + let existing: String = match &msg["content"] { + serde_json::Value::String(s) => s.clone(), + serde_json::Value::Array(blocks) => blocks + .iter() + .filter_map(|b| b.get("text").and_then(|t| t.as_str())) + .collect::>() + .join("\n\n"), + _ => String::new(), + }; + msg["content"] = serde_json::json!(if existing.is_empty() { + text.to_string() + } else { + format!("{}\n\n{}", existing, text) + }); +} diff --git a/refact-agent/engine/src/main.rs b/refact-agent/engine/src/main.rs index 61f3333713..61ddc76c98 100644 --- a/refact-agent/engine/src/main.rs +++ b/refact-agent/engine/src/main.rs @@ -62,6 +62,7 @@ mod http; mod lsp; mod agentic; +mod ext; pub mod constants; mod files_correction_cache; mod git; diff --git a/refact-agent/engine/src/postprocessing/pp_tool_results.rs b/refact-agent/engine/src/postprocessing/pp_tool_results.rs index 5ed47e18c3..f170982e41 100644 --- a/refact-agent/engine/src/postprocessing/pp_tool_results.rs +++ b/refact-agent/engine/src/postprocessing/pp_tool_results.rs @@ -108,8 +108,12 @@ fn deduplicate_and_merge_context_files( let mut file_groups: BTreeMap> = BTreeMap::new(); for cf in context_files { - let canonical = canonical_path(&cf.file_name).to_string_lossy().to_string(); - file_groups.entry(canonical).or_default().push(cf); + let key = if cf.file_name.contains("://") { + cf.file_name.clone() + } else { + canonical_path(&cf.file_name).to_string_lossy().to_string() + }; + file_groups.entry(key).or_default().push(cf); } let mut result = Vec::new(); @@ -210,7 +214,12 @@ fn has_truncation_markers(content: &str) -> bool { } fn find_coverage_in_history(cf: &ContextFile, messages: &[ChatMessage]) -> Option<(usize, String)> { - let cf_canonical = canonical_path(&cf.file_name); + let is_virtual = cf.file_name.contains("://"); + let cf_canonical = if is_virtual { + PathBuf::from(&cf.file_name) + } else { + canonical_path(&cf.file_name) + }; let cf_start = if cf.line1 == 0 { 1 } else { cf.line1 }; let cf_end = if cf.line2 == 0 { usize::MAX } else { cf.line2 }; @@ -218,7 +227,7 @@ fn find_coverage_in_history(cf: &ContextFile, messages: &[ChatMessage]) -> Optio if msg.role != "context_file" { continue; } - + let files_to_check: Vec = match &msg.content { ChatContent::ContextFiles(files) => files.clone(), ChatContent::SimpleText(text) => { @@ -232,7 +241,12 @@ fn find_coverage_in_history(cf: &ContextFile, messages: &[ChatMessage]) -> Optio }; for existing in files_to_check { - if canonical_path(&existing.file_name) != cf_canonical { + let existing_canonical = if existing.file_name.contains("://") { + PathBuf::from(&existing.file_name) + } else { + canonical_path(&existing.file_name) + }; + if existing_canonical != cf_canonical { continue; } let same_rev = matches!( @@ -388,6 +402,49 @@ async fn fill_skip_pp_files_with_budget( } for mut cf in files { + // If content is already provided (e.g., skill:// virtual URIs), use it directly + if !cf.file_content.trim().is_empty() { + cf.file_rev = Some(official_text_hashing_function(&cf.file_content)); + + if let Some(dup_info) = find_duplicate_in_history(&cf, existing_messages) { + let range = if cf.line1 > 0 && cf.line2 > 0 { + format!("{}:{}-{}", cf.file_name, cf.line1, cf.line2) + } else { + cf.file_name.clone() + }; + notes.push(format!( + "📎 Skipped `{}`: already retrieved in message #{} via `{}`.", + range, + dup_info.0 + 1, + dup_info.1 + )); + continue; + } + + let tokens = count_text_tokens_with_fallback(tokenizer.clone(), &cf.file_content); + if tokens > per_file_budget { + // Simple line-based truncation for prefilled content (markdown/instructions) + let mut truncated = String::new(); + for line in cf.file_content.lines() { + let candidate = if truncated.is_empty() { + line.to_string() + } else { + format!("{}\n{}", truncated, line) + }; + if count_text_tokens_with_fallback(tokenizer.clone(), &candidate) > per_file_budget { + if !truncated.is_empty() { + truncated.push_str("\n\n... (content truncated to fit token budget)"); + } + break; + } + truncated = candidate; + } + cf.file_content = truncated; + } + result.push(cf); + continue; + } + match get_file_text_from_memory_or_disk(gcx.clone(), &PathBuf::from(&cf.file_name)).await { Ok(text) => { cf.file_rev = Some(official_text_hashing_function(&text)); @@ -453,7 +510,12 @@ fn find_duplicate_in_history( cf: &ContextFile, messages: &[ChatMessage], ) -> Option<(usize, String)> { - let cf_canonical = canonical_path(&cf.file_name); + let is_virtual = cf.file_name.contains("://"); + let cf_canonical = if is_virtual { + PathBuf::from(&cf.file_name) + } else { + canonical_path(&cf.file_name) + }; let cf_start = if cf.line1 == 0 { 1 } else { cf.line1 }; let cf_end = if cf.line2 == 0 { usize::MAX } else { cf.line2 }; @@ -463,7 +525,12 @@ fn find_duplicate_in_history( } if let ChatContent::ContextFiles(files) = &msg.content { for existing in files { - if canonical_path(&existing.file_name) != cf_canonical { + let existing_canonical = if existing.file_name.contains("://") { + PathBuf::from(&existing.file_name) + } else { + canonical_path(&existing.file_name) + }; + if existing_canonical != cf_canonical { continue; } let same_rev = matches!( @@ -543,6 +610,52 @@ fn format_lines_with_numbers(lines: &[&str], start: usize, end: usize) -> String .join("\n") } +fn truncate_text_prefix_to_token_budget( + text: &str, + tokenizer: Option>, + tokens_limit: usize, + marker: &str, +) -> String { + if text.is_empty() || tokens_limit == 0 { + return String::new(); + } + + if count_text_tokens_with_fallback(tokenizer.clone(), text) <= tokens_limit { + return text.to_string(); + } + + let chars: Vec = text.chars().collect(); + let mut low = 0usize; + let mut high = chars.len(); + let mut best_prefix = 0usize; + + while low <= high { + let mid = low + (high - low) / 2; + let prefix: String = chars[..mid].iter().collect(); + let candidate = if mid < chars.len() { + format!("{}{}", prefix, marker) + } else { + prefix + }; + + let tokens = count_text_tokens_with_fallback(tokenizer.clone(), &candidate); + if tokens <= tokens_limit { + best_prefix = mid; + low = mid.saturating_add(1); + } else if mid == 0 { + break; + } else { + high = mid - 1; + } + } + + let mut out: String = chars[..best_prefix].iter().collect(); + if best_prefix < chars.len() { + out.push_str(marker); + } + out +} + fn truncate_file_head_tail( lines: &[&str], start: usize, @@ -578,10 +691,19 @@ fn truncate_file_head_tail( let full_content = format!("{}{}{}", head_content, truncation_marker, tail_content); let tokens = count_text_tokens_with_fallback(tokenizer.clone(), &full_content); - if tokens <= tokens_limit || head_end <= start + 1 { + if tokens <= tokens_limit { return full_content; } + if head_end <= start + 1 { + return truncate_text_prefix_to_token_budget( + &full_content, + tokenizer.clone(), + tokens_limit, + "\n... (content truncated to fit token budget)", + ); + } + head_end = start + (head_end - start) * 80 / 100; if tail_start < end { tail_start = end - (end - tail_start) * 80 / 100; @@ -794,6 +916,18 @@ mod tests { assert!(result.contains("omitted")); } + #[test] + fn test_truncate_file_head_tail_single_line_respects_budget() { + let long_line = "x".repeat(200_000); + let lines = vec![long_line.as_str()]; + let token_budget = 120; + let result = truncate_file_head_tail(&lines, 0, 1, None, token_budget); + let used = count_text_tokens_with_fallback(None, &result); + + assert!(used <= token_budget); + assert!(result.contains("content truncated")); + } + #[test] fn test_find_duplicate_path_normalization() { let cf = make_context_file("src/main.rs", 1, 10); diff --git a/refact-agent/engine/src/providers/claude_code.rs b/refact-agent/engine/src/providers/claude_code.rs index fd2afab112..4157ad8581 100644 --- a/refact-agent/engine/src/providers/claude_code.rs +++ b/refact-agent/engine/src/providers/claude_code.rs @@ -1,5 +1,6 @@ use std::any::Any; use std::collections::HashMap; +use std::sync::atomic::{AtomicU64, Ordering}; use async_trait::async_trait; use serde::{Deserialize, Serialize}; @@ -45,6 +46,78 @@ pub struct ClaudeCodeProvider { } impl ClaudeCodeProvider { + fn needs_refresh_on_start(expires_at: i64) -> bool { + const REFRESH_BEFORE_EXPIRY_MS: i64 = 5 * 60 * 1000; + if expires_at == 0 { + return true; + } + let now_ms = chrono::Utc::now().timestamp_millis(); + now_ms >= expires_at - REFRESH_BEFORE_EXPIRY_MS + } + + async fn save_oauth_tokens_config(&self, config_dir: &std::path::Path) -> Result<(), String> { + let providers_dir = config_dir.join("providers.d"); + let config_path = providers_dir.join("claude_code.yaml"); + + tokio::fs::create_dir_all(&providers_dir) + .await + .map_err(|e| format!("Failed to create providers.d: {}", e))?; + + let mut yaml_map: serde_yaml::Mapping = if config_path.exists() { + let content = tokio::fs::read_to_string(&config_path) + .await + .map_err(|e| format!("Failed to read config: {}", e))?; + let value: serde_yaml::Value = serde_yaml::from_str(&content) + .map_err(|e| format!("Failed to parse YAML: {}", e))?; + value + .as_mapping() + .cloned() + .ok_or_else(|| "Config file root is not a YAML mapping. Cannot safely patch.".to_string())? + } else { + serde_yaml::Mapping::new() + }; + + let mut tokens_map = yaml_map + .get(&serde_yaml::Value::String("oauth_tokens".to_string())) + .and_then(|v| v.as_mapping()) + .cloned() + .unwrap_or_default(); + + tokens_map.insert( + serde_yaml::Value::String("access_token".to_string()), + serde_yaml::Value::String(self.oauth_tokens.access_token.clone()), + ); + tokens_map.insert( + serde_yaml::Value::String("refresh_token".to_string()), + serde_yaml::Value::String(self.oauth_tokens.refresh_token.clone()), + ); + tokens_map.insert( + serde_yaml::Value::String("expires_at".to_string()), + serde_yaml::Value::Number(serde_yaml::Number::from(self.oauth_tokens.expires_at)), + ); + + yaml_map.insert( + serde_yaml::Value::String("oauth_tokens".to_string()), + serde_yaml::Value::Mapping(tokens_map), + ); + + let content = serde_yaml::to_string(&yaml_map) + .map_err(|e| format!("Failed to serialize config: {}", e))?; + + static COUNTER: AtomicU64 = AtomicU64::new(0); + let unique_id = COUNTER.fetch_add(1, Ordering::Relaxed); + let temp_path = config_path.with_extension(format!("yaml.tmp.oauth.{}.{}", std::process::id(), unique_id)); + + tokio::fs::write(&temp_path, &content) + .await + .map_err(|e| format!("Failed to write temp config: {}", e))?; + tokio::fs::rename(&temp_path, &config_path) + .await + .map_err(|e| format!("Failed to rename config: {}", e))?; + + Ok(()) + } + fn detect_cli_path(&self) -> Option { if let Some(ref p) = self.cli_path { if std::path::Path::new(p).exists() { @@ -52,30 +125,37 @@ impl ClaudeCodeProvider { } } - if let Ok(output) = std::process::Command::new("which").arg("claude").output() { - if output.status.success() { - let path = String::from_utf8_lossy(&output.stdout).trim().to_string(); - if !path.is_empty() { - return Some(path); - } - } + if let Ok(path) = which::which("claude") { + return Some(path.to_string_lossy().to_string()); } - let candidates = [ - "/usr/local/bin/claude", - "/opt/homebrew/bin/claude", - ]; - for c in &candidates { - if std::path::Path::new(c).exists() { - return Some(c.to_string()); + #[cfg(unix)] + { + let candidates = [ + "/usr/local/bin/claude", + "/opt/homebrew/bin/claude", + ]; + for c in &candidates { + if std::path::Path::new(c).exists() { + return Some(c.to_string()); + } + } + if let Some(home) = home::home_dir() { + let local = home.join(".local/bin/claude"); + if local.exists() { + return Some(local.to_string_lossy().to_string()); + } } } + + #[cfg(windows)] if let Some(home) = home::home_dir() { - let local = home.join(".local/bin/claude"); - if local.exists() { - return Some(local.to_string_lossy().to_string()); + let candidate = home.join("AppData").join("Local").join("Programs").join("claude").join("claude.exe"); + if candidate.exists() { + return Some(candidate.to_string_lossy().to_string()); } } + None } @@ -180,6 +260,81 @@ impl ClaudeCodeProvider { } } +#[derive(Debug, Clone, Serialize)] +pub struct ClaudeCodeUsageWindow { + pub percent_used: f64, + pub resets_at: Option, +} + +#[derive(Debug, Clone, Serialize)] +pub struct ClaudeCodeExtraUsage { + pub is_enabled: bool, + pub used_credits: f64, + pub monthly_limit: Option, + pub utilization: Option, +} + +#[derive(Debug, Clone, Serialize)] +pub struct ClaudeCodeUsage { + pub five_hour: Option, + pub seven_day: Option, + pub extra_usage: Option, +} + +impl ClaudeCodeProvider { + pub async fn fetch_usage(&self, http_client: &reqwest::Client) -> Result { + let token = self.resolve_auth()?; + + let resp = http_client + .get("https://api.anthropic.com/api/oauth/usage") + .header("Authorization", format!("Bearer {}", token)) + .header("anthropic-beta", "oauth-2025-04-20") + .send() + .await + .map_err(|e| format!("Request failed: {}", e))?; + + if !resp.status().is_success() { + let status = resp.status(); + let body = resp.text().await.unwrap_or_default(); + let truncated: String = body.chars().take(512).collect(); + return Err(format!("Usage API returned {}: {}", status, truncated)); + } + + let root: serde_json::Value = resp.json().await + .map_err(|e| format!("Failed to parse usage response: {}", e))?; + + let data = root.get("data").unwrap_or(&root); + + fn as_f64_loose(v: &serde_json::Value) -> Option { + v.as_f64().or_else(|| v.as_i64().map(|i| i as f64)) + } + + let parse_window = |key: &str| -> Option { + let w = data.get(key)?; + let percent_used = w.get("utilization").and_then(as_f64_loose) + .or_else(|| w.get("percent_used").and_then(as_f64_loose))?; + let resets_at = w.get("resets_at") + .or_else(|| w.get("reset_at")) + .and_then(|v| v.as_str()).map(|s| s.to_string()); + Some(ClaudeCodeUsageWindow { percent_used, resets_at }) + }; + + let extra_usage = data.get("extra_usage").and_then(|e| { + let used_credits = e.get("used_credits").and_then(as_f64_loose).unwrap_or(0.0); + let is_enabled = e.get("is_enabled").and_then(|v| v.as_bool()).unwrap_or(false); + let monthly_limit = e.get("monthly_limit").and_then(as_f64_loose); + let utilization = e.get("utilization").and_then(as_f64_loose); + Some(ClaudeCodeExtraUsage { is_enabled, used_credits, monthly_limit, utilization }) + }); + + Ok(ClaudeCodeUsage { + five_hour: parse_window("five_hour"), + seven_day: parse_window("seven_day"), + extra_usage, + }) + } +} + #[async_trait] impl ProviderTrait for ClaudeCodeProvider { fn name(&self) -> &'static str { @@ -415,6 +570,35 @@ available: fn remove_custom_model(&mut self, model_id: &str) -> bool { self.custom_models.remove(model_id).is_some() } + + async fn startup_refresh_and_sync( + &mut self, + http_client: &reqwest::Client, + config_dir: &std::path::Path, + ) -> Result<(), String> { + if self.oauth_tokens.is_empty() || self.oauth_tokens.refresh_token.is_empty() { + return Ok(()); + } + + if !Self::needs_refresh_on_start(self.oauth_tokens.expires_at) { + return Ok(()); + } + + tracing::info!("Claude Code: refreshing OAuth token on startup"); + let refreshed = crate::providers::claude_code_oauth::refresh_access_token( + http_client, + &self.oauth_tokens.refresh_token, + ) + .await?; + + self.oauth_tokens.access_token = refreshed.access_token; + if !refreshed.refresh_token.is_empty() { + self.oauth_tokens.refresh_token = refreshed.refresh_token; + } + self.oauth_tokens.expires_at = refreshed.expires_at; + + self.save_oauth_tokens_config(config_dir).await + } } const ANTHROPIC_MODELS_URL: &str = "https://api.anthropic.com/v1/models"; diff --git a/refact-agent/engine/src/providers/http.rs b/refact-agent/engine/src/providers/http.rs index 0a7a2a254e..b842f37942 100644 --- a/refact-agent/engine/src/providers/http.rs +++ b/refact-agent/engine/src/providers/http.rs @@ -35,6 +35,8 @@ use crate::providers::registry::{ use crate::providers::traits::{AvailableModel, CustomModelConfig, ModelSource, ProviderModel, ProviderRuntime}; use super::openrouter::OpenRouterProvider; use super::google_gemini::GoogleGeminiProvider; +use super::claude_code::ClaudeCodeProvider; +use super::openai_codex::OpenAICodexProvider; #[derive(Serialize)] struct ProviderListItem { @@ -877,8 +879,6 @@ async fn update_model_enabled_state( return Err(e); } - // Reload provider from disk to ensure the enabled flag is applied in-memory. - // (enabled is stored in YAML and used by build_runtime for caps population) reload_provider_from_disk(gcx.clone(), provider_name, &config_dir).await?; invalidate_caps(gcx).await; @@ -1324,16 +1324,21 @@ async fn reload_provider_from_disk( let yaml: serde_yaml::Value = serde_yaml::from_str(&content) .map_err(|e| ScratchError::new(StatusCode::INTERNAL_SERVER_ERROR, format!("Invalid YAML after save: {}", e)))?; - let mut provider = create_provider(provider_name) - .ok_or_else(|| ScratchError::new(StatusCode::INTERNAL_SERVER_ERROR, "Failed to create provider".to_string()))?; - - provider - .provider_settings_apply(yaml) - .map_err(|e| ScratchError::new(StatusCode::INTERNAL_SERVER_ERROR, format!("Failed to apply settings: {}", e)))?; - let gcx_locked = gcx.read().await; let mut registry = gcx_locked.providers.write().await; - registry.add(provider); + + if let Some(existing) = registry.get_mut(provider_name) { + existing + .provider_settings_apply(yaml) + .map_err(|e| ScratchError::new(StatusCode::INTERNAL_SERVER_ERROR, format!("Failed to apply settings: {}", e)))?; + } else { + let mut provider = create_provider(provider_name) + .ok_or_else(|| ScratchError::new(StatusCode::INTERNAL_SERVER_ERROR, "Failed to create provider".to_string()))?; + provider + .provider_settings_apply(yaml) + .map_err(|e| ScratchError::new(StatusCode::INTERNAL_SERVER_ERROR, format!("Failed to apply settings: {}", e)))?; + registry.add(provider); + } Ok(()) } @@ -1687,6 +1692,78 @@ pub async fn handle_openai_codex_auth_callback( ) } +/// GET /v1/claude-code/usage +pub async fn handle_v1_claude_code_usage( + Extension(gcx): Extension>>, +) -> Result, ScratchError> { + let (provider, http_client) = { + let gcx_locked = gcx.read().await; + let registry = gcx_locked.providers.read().await; + let provider = registry + .get("claude_code") + .map(|p| p.clone_box()) + .or_else(|| create_provider("claude_code")) + .ok_or_else(|| { + ScratchError::new( + StatusCode::NOT_FOUND, + "Claude Code provider is not available".to_string(), + ) + })?; + (provider, gcx_locked.http_client.clone()) + }; + + let Some(claude_code) = provider.as_any().downcast_ref::() else { + return Err(ScratchError::new( + StatusCode::INTERNAL_SERVER_ERROR, + "Failed to resolve Claude Code provider type".to_string(), + )); + }; + + match claude_code.fetch_usage(&http_client).await { + Ok(usage) => json_response(StatusCode::OK, &json!({"data": usage})), + Err(e) => json_response( + StatusCode::OK, + &json!({"error": e}), + ), + } +} + +/// GET /v1/openai-codex/usage +pub async fn handle_v1_openai_codex_usage( + Extension(gcx): Extension>>, +) -> Result, ScratchError> { + let (provider, http_client) = { + let gcx_locked = gcx.read().await; + let registry = gcx_locked.providers.read().await; + let provider = registry + .get("openai_codex") + .map(|p| p.clone_box()) + .or_else(|| create_provider("openai_codex")) + .ok_or_else(|| { + ScratchError::new( + StatusCode::NOT_FOUND, + "OpenAI Codex provider is not available".to_string(), + ) + })?; + (provider, gcx_locked.http_client.clone()) + }; + + let Some(codex) = provider.as_any().downcast_ref::() else { + return Err(ScratchError::new( + StatusCode::INTERNAL_SERVER_ERROR, + "Failed to resolve OpenAI Codex provider type".to_string(), + )); + }; + + match codex.fetch_usage(&http_client).await { + Ok(usage) => json_response(StatusCode::OK, &json!({"data": usage})), + Err(e) => json_response( + StatusCode::OK, + &json!({"error": e}), + ), + } +} + async fn save_provider_oauth_tokens( gcx: &Arc>, config_dir: &std::path::Path, diff --git a/refact-agent/engine/src/providers/oauth_refresh.rs b/refact-agent/engine/src/providers/oauth_refresh.rs index 2bc7fc138e..d085478834 100644 --- a/refact-agent/engine/src/providers/oauth_refresh.rs +++ b/refact-agent/engine/src/providers/oauth_refresh.rs @@ -9,7 +9,18 @@ const REFRESH_BEFORE_EXPIRY_MS: i64 = 5 * 60 * 1000; // 5 minutes before expiry pub async fn oauth_token_refresh_background_task(gcx: Arc>) { loop { - tokio::time::sleep(std::time::Duration::from_secs(REFRESH_CHECK_INTERVAL_SECS)).await; + let shutdown_flag = gcx.read().await.shutdown_flag.clone(); + tokio::select! { + _ = tokio::time::sleep(std::time::Duration::from_secs(REFRESH_CHECK_INTERVAL_SECS)) => {} + _ = async { + while !shutdown_flag.load(std::sync::atomic::Ordering::SeqCst) { + tokio::time::sleep(std::time::Duration::from_millis(200)).await; + } + } => { + tracing::info!("OAuth token refresh: shutdown detected, stopping"); + return; + } + } let _ = try_refresh_all_providers(&gcx).await; } } diff --git a/refact-agent/engine/src/providers/openai_codex.rs b/refact-agent/engine/src/providers/openai_codex.rs index 81b8821e6e..623479e51b 100644 --- a/refact-agent/engine/src/providers/openai_codex.rs +++ b/refact-agent/engine/src/providers/openai_codex.rs @@ -1,5 +1,6 @@ use std::any::Any; use std::collections::HashMap; +use std::sync::atomic::{AtomicU64, Ordering}; use async_trait::async_trait; use serde::{Deserialize, Serialize}; @@ -12,7 +13,6 @@ use crate::providers::traits::{ AvailableModel, CustomModelConfig, ModelPricing, ModelSource, ProviderRuntime, ProviderTrait, merge_custom_models, parse_enabled_models, parse_custom_models, set_model_enabled_impl, }; -use crate::providers::pricing::openai_pricing; #[derive(Debug, Clone, Copy, PartialEq)] enum AuthSource { @@ -41,7 +41,119 @@ pub struct OpenAICodexProvider { pub oauth_tokens: OAuthTokens, } +#[derive(Debug, Clone, Serialize)] +pub struct OpenAICodexUsageWindow { + pub used_percent: f64, + pub reset_at: Option, +} + +#[derive(Debug, Clone, Serialize)] +pub struct OpenAICodexRateLimit { + pub limit_reached: bool, + pub primary_window: Option, + pub secondary_window: Option, +} + +#[derive(Debug, Clone, Serialize)] +pub struct OpenAICodexCredits { + pub balance: f64, + pub unlimited: bool, + pub has_credits: bool, +} + +#[derive(Debug, Clone, Serialize)] +pub struct OpenAICodexUsage { + pub plan_type: Option, + pub rate_limit: Option, + pub code_review_rate_limit: Option, + pub credits: Option, +} + impl OpenAICodexProvider { + fn needs_refresh_on_start(expires_at: i64) -> bool { + const REFRESH_BEFORE_EXPIRY_MS: i64 = 5 * 60 * 1000; + if expires_at == 0 { + return true; + } + let now_ms = chrono::Utc::now().timestamp_millis(); + now_ms >= expires_at - REFRESH_BEFORE_EXPIRY_MS + } + + async fn save_oauth_tokens_config(&self, config_dir: &std::path::Path) -> Result<(), String> { + let providers_dir = config_dir.join("providers.d"); + let config_path = providers_dir.join("openai_codex.yaml"); + + tokio::fs::create_dir_all(&providers_dir) + .await + .map_err(|e| format!("Failed to create providers.d: {}", e))?; + + let mut yaml_map: serde_yaml::Mapping = if config_path.exists() { + let content = tokio::fs::read_to_string(&config_path) + .await + .map_err(|e| format!("Failed to read config: {}", e))?; + let value: serde_yaml::Value = serde_yaml::from_str(&content) + .map_err(|e| format!("Failed to parse YAML: {}", e))?; + value + .as_mapping() + .cloned() + .ok_or_else(|| "Config file root is not a YAML mapping. Cannot safely patch.".to_string())? + } else { + serde_yaml::Mapping::new() + }; + + let mut tokens_map = yaml_map + .get(&serde_yaml::Value::String("oauth_tokens".to_string())) + .and_then(|v| v.as_mapping()) + .cloned() + .unwrap_or_default(); + + tokens_map.insert( + serde_yaml::Value::String("access_token".to_string()), + serde_yaml::Value::String(self.oauth_tokens.access_token.clone()), + ); + tokens_map.insert( + serde_yaml::Value::String("refresh_token".to_string()), + serde_yaml::Value::String(self.oauth_tokens.refresh_token.clone()), + ); + tokens_map.insert( + serde_yaml::Value::String("expires_at".to_string()), + serde_yaml::Value::Number(serde_yaml::Number::from(self.oauth_tokens.expires_at)), + ); + tokens_map.insert( + serde_yaml::Value::String("openai_api_key".to_string()), + serde_yaml::Value::String(self.oauth_tokens.openai_api_key.clone()), + ); + tokens_map.insert( + serde_yaml::Value::String("chatgpt_account_id".to_string()), + serde_yaml::Value::String(self.oauth_tokens.chatgpt_account_id.clone()), + ); + tokens_map.insert( + serde_yaml::Value::String("api_key_exchange_error".to_string()), + serde_yaml::Value::String(self.oauth_tokens.api_key_exchange_error.clone()), + ); + + yaml_map.insert( + serde_yaml::Value::String("oauth_tokens".to_string()), + serde_yaml::Value::Mapping(tokens_map), + ); + + let content = serde_yaml::to_string(&yaml_map) + .map_err(|e| format!("Failed to serialize config: {}", e))?; + + static COUNTER: AtomicU64 = AtomicU64::new(0); + let unique_id = COUNTER.fetch_add(1, Ordering::Relaxed); + let temp_path = config_path.with_extension(format!("yaml.tmp.oauth.{}.{}", std::process::id(), unique_id)); + + tokio::fs::write(&temp_path, &content) + .await + .map_err(|e| format!("Failed to write temp config: {}", e))?; + tokio::fs::rename(&temp_path, &config_path) + .await + .map_err(|e| format!("Failed to rename config: {}", e))?; + + Ok(()) + } + /// Returns the credential to use for api.openai.com endpoints. /// /// IMPORTANT: Codex/ChatGPT OAuth produces an OAuth access token, but the OpenAI Platform @@ -96,6 +208,89 @@ impl OpenAICodexProvider { (AuthSource::None, CodexAuth::None) } + fn resolve_wham_token(&self) -> Result { + // The wham/usage endpoint uses the ChatGPT OAuth access token + if self.oauth_tokens.has_valid_access_token() { + return Ok(self.oauth_tokens.access_token.clone()); + } + if let Ok(cli_tokens) = crate::providers::openai_codex_oauth::read_codex_cli_credentials() { + if !cli_tokens.access_token.is_empty() { + return Ok(cli_tokens.access_token); + } + } + Err("No ChatGPT OAuth access token available for usage API".to_string()) + } + + pub async fn fetch_usage(&self, http_client: &reqwest::Client) -> Result { + let token = self.resolve_wham_token()?; + + let resp = http_client + .get("https://chatgpt.com/backend-api/wham/usage") + .header("Authorization", format!("Bearer {}", token)) + .header("Content-Type", "application/json") + .send() + .await + .map_err(|e| format!("Request failed: {}", e))?; + + if !resp.status().is_success() { + let status = resp.status(); + let body = resp.text().await.unwrap_or_default(); + let truncated: String = body.chars().take(512).collect(); + return Err(format!("Usage API returned {}: {}", status, truncated)); + } + + let root: serde_json::Value = resp.json().await + .map_err(|e| format!("Failed to parse usage response: {}", e))?; + + let data = root.get("data").unwrap_or(&root); + + fn as_f64_loose(v: &serde_json::Value) -> Option { + v.as_f64().or_else(|| v.as_i64().map(|i| i as f64)) + } + + let parse_window = |obj: &serde_json::Value| -> Option { + let used_percent = obj.get("used_percent").and_then(as_f64_loose)?; + let reset_at = obj.get("reset_at").and_then(|v| { + if let Some(ts) = v.as_i64() { + use std::time::{Duration, UNIX_EPOCH}; + let dt: chrono::DateTime = (UNIX_EPOCH + Duration::from_secs(ts as u64)).into(); + Some(dt.to_rfc3339()) + } else { + v.as_str().map(|s| s.to_string()) + } + }); + Some(OpenAICodexUsageWindow { used_percent, reset_at }) + }; + + let parse_rate_limit = |rl: &serde_json::Value| -> OpenAICodexRateLimit { + OpenAICodexRateLimit { + limit_reached: rl.get("limit_reached").and_then(|v| v.as_bool()).unwrap_or(false), + primary_window: rl.get("primary_window").and_then(|w| parse_window(w)), + secondary_window: rl.get("secondary_window").and_then(|w| parse_window(w)), + } + }; + + let plan_type = data.get("plan_type").and_then(|v| v.as_str()).map(|s| s.to_string()); + + let rate_limit = data.get("rate_limit").map(|rl| parse_rate_limit(rl)); + + let code_review_rate_limit = data.get("code_review_rate_limit").map(|rl| parse_rate_limit(rl)); + + let credits = data.get("credits").map(|c| { + let balance = c.get("balance") + .and_then(|v| v.as_str().and_then(|s| s.parse::().ok())) + .or_else(|| as_f64_loose(c.get("balance").unwrap_or(&serde_json::Value::Null))) + .unwrap_or(0.0); + OpenAICodexCredits { + balance, + unlimited: c.get("unlimited").and_then(|v| v.as_bool()).unwrap_or(false), + has_credits: c.get("has_credits").and_then(|v| v.as_bool()).unwrap_or(false), + } + }); + + Ok(OpenAICodexUsage { plan_type, rate_limit, code_review_rate_limit, credits }) + } + fn diagnose_auth_status(&self) -> String { if !self.oauth_tokens.openai_api_key.is_empty() { return "OK (OAuth login — Platform API key)".to_string(); @@ -358,6 +553,40 @@ available: return config.pricing.clone(); } } - openai_pricing(model_id) + None + } + + async fn startup_refresh_and_sync( + &mut self, + http_client: &reqwest::Client, + config_dir: &std::path::Path, + ) -> Result<(), String> { + if self.oauth_tokens.is_empty() || self.oauth_tokens.refresh_token.is_empty() { + return Ok(()); + } + + if !Self::needs_refresh_on_start(self.oauth_tokens.expires_at) { + return Ok(()); + } + + tracing::info!("OpenAI Codex: refreshing OAuth token on startup"); + let mut refreshed = crate::providers::openai_codex_oauth::refresh_access_token( + http_client, + &self.oauth_tokens.refresh_token, + ) + .await?; + + if refreshed.openai_api_key.is_empty() { + refreshed.openai_api_key = self.oauth_tokens.openai_api_key.clone(); + } + if refreshed.chatgpt_account_id.is_empty() { + refreshed.chatgpt_account_id = self.oauth_tokens.chatgpt_account_id.clone(); + } + if refreshed.api_key_exchange_error.is_empty() { + refreshed.api_key_exchange_error = self.oauth_tokens.api_key_exchange_error.clone(); + } + + self.oauth_tokens = refreshed; + self.save_oauth_tokens_config(config_dir).await } } diff --git a/refact-agent/engine/src/providers/refact.rs b/refact-agent/engine/src/providers/refact.rs index 5775e261f2..5187d29288 100644 --- a/refact-agent/engine/src/providers/refact.rs +++ b/refact-agent/engine/src/providers/refact.rs @@ -4,11 +4,12 @@ use std::collections::HashMap; use async_trait::async_trait; use serde::{Deserialize, Serialize}; use serde_json::json; +use std::sync::atomic::{AtomicU64, Ordering}; use crate::caps::model_caps::{ModelCapabilities, resolve_model_caps}; use crate::llm::adapter::WireFormat; use crate::providers::config::resolve_env_var; -use crate::providers::traits::{AvailableModel, ModelSource, ProviderRuntime, ProviderTrait}; +use crate::providers::traits::{AvailableModel, ModelPricing, ModelSource, ProviderRuntime, ProviderTrait}; #[derive(Debug, Clone, Default, Serialize, Deserialize)] pub struct RefactProvider { @@ -22,6 +23,41 @@ pub struct RefactProvider { } impl RefactProvider { + fn config_path(config_dir: &std::path::Path) -> std::path::PathBuf { + config_dir.join("providers.d").join("refact.yaml") + } + + async fn save_config(&self, config_dir: &std::path::Path) -> Result<(), String> { + let providers_dir = config_dir.join("providers.d"); + tokio::fs::create_dir_all(&providers_dir) + .await + .map_err(|e| format!("Failed to create providers.d: {}", e))?; + + let config_path = Self::config_path(config_dir); + let payload = serde_yaml::to_string(&serde_yaml::to_value(json!({ + "enabled": self.enabled, + "disabled_models": self.disabled_models, + "running_models": self.running_models, + })) + .map_err(|e| format!("Failed to serialize refact provider settings: {}", e))?) + .map_err(|e| format!("Failed to render refact provider yaml: {}", e))?; + + static COUNTER: AtomicU64 = AtomicU64::new(0); + let temp_path = config_path.with_extension(format!( + "yaml.tmp.{}.{}", + std::process::id(), + COUNTER.fetch_add(1, Ordering::Relaxed) + )); + + tokio::fs::write(&temp_path, payload) + .await + .map_err(|e| format!("Failed to write temporary refact config: {}", e))?; + tokio::fs::rename(&temp_path, &config_path) + .await + .map_err(|e| format!("Failed to finalize refact config: {}", e))?; + Ok(()) + } + pub fn from_cli(address_url: String, api_key: String) -> Self { Self { address_url, @@ -31,6 +67,193 @@ impl RefactProvider { running_models: Vec::new(), } } + + fn base_url(&self) -> String { + if self.address_url.is_empty() || self.address_url.to_lowercase() == "refact" { + "https://inference.smallcloud.ai".to_string() + } else { + self.address_url.trim_end_matches('/').to_string() + } + } + + fn model_catalog_url(&self) -> String { + format!("{}/v1/model-catalog", self.base_url()) + } + + fn parse_model_pricing_from_json(value: &serde_json::Value) -> Option { + let prompt = value.get("prompt").and_then(|v| v.as_f64())?; + let generated = value.get("generated").and_then(|v| v.as_f64())?; + let pricing = ModelPricing { + prompt, + generated, + cache_read: value.get("cache_read").and_then(|v| v.as_f64()), + cache_creation: value.get("cache_creation").and_then(|v| v.as_f64()), + }; + if pricing.is_valid() { + Some(pricing) + } else { + None + } + } + + fn model_is_disabled(&self, model_id: &str) -> bool { + self.disabled_models.contains(&model_id.to_string()) + || self.disabled_models.contains(&format!("refact/{}", model_id)) + } + + pub fn extract_chat_model_ids_from_catalog(catalog: &serde_json::Value) -> Vec { + let mut ids: Vec = catalog + .get("chat") + .and_then(|v| v.get("models")) + .and_then(|v| v.as_object()) + .map(|models| models.keys().cloned().collect()) + .unwrap_or_default(); + ids.sort(); + ids + } + + pub async fn fetch_model_catalog( + &self, + http_client: &reqwest::Client, + ) -> Result { + let mut request = http_client + .get(self.model_catalog_url()) + .header( + reqwest::header::USER_AGENT, + format!("refact-lsp {}", crate::version::build::PKG_VERSION), + ); + + let api_key = resolve_env_var(&self.api_key, "", "refact api_key"); + if !api_key.is_empty() { + request = request.bearer_auth(api_key); + } + + let response = request + .send() + .await + .map_err(|e| format!("Failed to fetch Refact model catalog: {}", e))?; + + let status = response.status(); + if !status.is_success() { + let body = response.text().await.unwrap_or_else(|_| String::new()); + return Err(format!( + "Refact model catalog fetch failed: HTTP {} {}", + status, body + )); + } + + let payload: serde_json::Value = response + .json() + .await + .map_err(|e| format!("Invalid Refact model catalog JSON: {}", e))?; + + let cloud_name = payload + .get("cloud_name") + .and_then(|v| v.as_str()) + .unwrap_or_default() + .to_lowercase(); + if cloud_name != "refact" { + return Err("Model catalog response is not a Refact catalog".to_string()); + } + + Ok(payload) + } + + pub async fn sync_running_models_from_catalog( + &mut self, + http_client: &reqwest::Client, + ) -> Result<(), String> { + let catalog = self.fetch_model_catalog(http_client).await?; + let catalog_models = Self::extract_chat_model_ids_from_catalog(&catalog); + + let mut disabled: std::collections::HashSet = + self.disabled_models.iter().cloned().collect(); + disabled.retain(|m| { + let bare = m.strip_prefix("refact/").unwrap_or(m); + catalog_models.iter().any(|x| x == bare) + }); + + self.running_models = catalog_models; + self.disabled_models = disabled.into_iter().collect(); + self.disabled_models.sort(); + Ok(()) + } + + fn extract_available_models_from_catalog( + &self, + catalog: &serde_json::Value, + ) -> Result, String> { + let chat_models = catalog + .get("chat") + .and_then(|v| v.get("models")) + .and_then(|v| v.as_object()) + .ok_or_else(|| "Model catalog response missing chat.models".to_string())?; + + let pricing_map = catalog + .get("metadata") + .and_then(|v| v.get("pricing")) + .and_then(|v| v.as_object()) + .cloned() + .unwrap_or_default(); + + let tokenizer_endpoints = catalog + .get("tokenizer_endpoints") + .and_then(|v| v.as_object()) + .cloned() + .unwrap_or_default(); + + let mut models: Vec = Vec::new(); + for (model_id, model_info) in chat_models { + let n_ctx = model_info + .get("n_ctx") + .and_then(|v| v.as_u64()) + .map(|v| v as usize) + .unwrap_or(4096); + let supports_tools = model_info + .get("supports_tools") + .and_then(|v| v.as_bool()) + .unwrap_or(false); + let supports_multimodality = model_info + .get("supports_multimodality") + .and_then(|v| v.as_bool()) + .unwrap_or(false); + let max_output_tokens = model_info + .get("max_output_tokens") + .and_then(|v| v.as_u64()) + .map(|v| v as usize); + + let tokenizer = tokenizer_endpoints + .get(model_id) + .and_then(|v| v.as_str()) + .map(|s| s.to_string()); + + let pricing = pricing_map + .get(model_id) + .and_then(Self::parse_model_pricing_from_json); + + models.push(AvailableModel { + id: model_id.clone(), + display_name: None, + n_ctx, + supports_tools, + supports_multimodality, + reasoning_effort_options: None, + supports_thinking_budget: false, + supports_adaptive_thinking_budget: false, + tokenizer, + enabled: !self.model_is_disabled(model_id), + is_custom: false, + pricing, + available_providers: Vec::new(), + selected_provider: None, + max_output_tokens, + provider_variants: Vec::new(), + }); + } + + models.sort_by(|a, b| a.id.cmp(&b.id)); + Ok(models) + } } #[async_trait] @@ -89,6 +312,14 @@ available: self.enabled = enabled; } crate::providers::traits::parse_disabled_models(&yaml, &mut self.disabled_models); + if let Some(models) = yaml.get("running_models").and_then(|v| v.as_sequence()) { + self.running_models = models + .iter() + .filter_map(|v| v.as_str().map(String::from)) + .collect(); + self.running_models.sort(); + self.running_models.dedup(); + } Ok(()) } @@ -97,24 +328,19 @@ available: "address_url": self.address_url, "api_key": if self.api_key.is_empty() { "" } else { "***" }, "enabled": self.enabled, - "disabled_models": self.disabled_models + "disabled_models": self.disabled_models, + "running_models": self.running_models }) } fn build_runtime(&self) -> Result { let api_key = resolve_env_var(&self.api_key, "", "refact api_key"); - let base_url = if self.address_url.is_empty() - || self.address_url.to_lowercase() == "refact" - { - "https://inference.smallcloud.ai".to_string() - } else { - self.address_url.trim_end_matches('/').to_string() - }; + let base_url = self.base_url(); Ok(ProviderRuntime { name: self.name().to_string(), display_name: self.display_name().to_string(), - enabled: self.enabled && !self.running_models.is_empty() && !api_key.is_empty(), + enabled: self.enabled && !api_key.is_empty(), readonly: false, wire_format: self.default_wire_format(), chat_endpoint: format!("{}/v1/chat/completions", base_url), @@ -141,7 +367,7 @@ available: } fn model_source(&self) -> ModelSource { - ModelSource::ModelCaps + ModelSource::Api } fn selected_model_count(&self) -> usize { @@ -149,7 +375,7 @@ available: return 0; } self.running_models.iter() - .filter(|m| !self.disabled_models.contains(m)) + .filter(|m| !self.model_is_disabled(m)) .count() } @@ -161,10 +387,6 @@ available: crate::providers::traits::set_model_disabled_impl(&mut self.disabled_models, model_id, enabled); } - fn set_running_models(&mut self, running_models: Vec) { - self.running_models = running_models; - } - fn get_available_models_from_caps( &self, model_caps: &HashMap, @@ -177,7 +399,7 @@ available: for running_model in &self.running_models { if let Some(resolved) = resolve_model_caps(model_caps, running_model) { - let disabled = self.disabled_models.contains(running_model); + let disabled = self.model_is_disabled(running_model); let pricing = self.model_pricing(running_model); let mut model = AvailableModel::from_caps(running_model, &resolved.caps, !disabled, pricing); if running_model != &resolved.matched_key { @@ -189,7 +411,7 @@ available: "Refact running model '{}' not found in model capabilities, adding with defaults", running_model ); - let disabled = self.disabled_models.contains(running_model); + let disabled = self.model_is_disabled(running_model); models.push(AvailableModel { id: running_model.clone(), display_name: None, @@ -214,5 +436,34 @@ available: models.sort_by(|a, b| a.id.cmp(&b.id)); models } + + async fn fetch_available_models( + &self, + http_client: &reqwest::Client, + _model_caps: &HashMap, + ) -> Vec { + match self.fetch_model_catalog(http_client).await { + Ok(catalog) => match self.extract_available_models_from_catalog(&catalog) { + Ok(models) => models, + Err(e) => { + tracing::warn!("Refact model catalog parse failed: {}", e); + Vec::new() + } + }, + Err(e) => { + tracing::warn!("Refact model catalog fetch failed: {}", e); + Vec::new() + } + } + } + + async fn startup_refresh_and_sync( + &mut self, + http_client: &reqwest::Client, + config_dir: &std::path::Path, + ) -> Result<(), String> { + self.sync_running_models_from_catalog(http_client).await?; + self.save_config(config_dir).await + } } diff --git a/refact-agent/engine/src/providers/registry.rs b/refact-agent/engine/src/providers/registry.rs index 349924d904..f5652df556 100644 --- a/refact-agent/engine/src/providers/registry.rs +++ b/refact-agent/engine/src/providers/registry.rs @@ -1,5 +1,7 @@ use std::path::Path; +use serde_yaml::Value; + use crate::providers::traits::ProviderTrait; use crate::providers::{ refact::RefactProvider, @@ -101,6 +103,7 @@ pub async fn load_providers_from_config( config_dir: &Path, refact_address_url: &str, refact_api_key: &str, + http_client: &reqwest::Client, ) -> Result { let mut registry = ProviderRegistry::new(); @@ -133,7 +136,41 @@ pub async fn load_providers_from_config( Some(n) => n, None => continue, }; - if name == "defaults" || name == "refact" { + if name == "defaults" { + continue; + } + + if name == "refact" { + let content = match tokio::fs::read_to_string(&path).await { + Ok(c) => c, + Err(e) => { + tracing::warn!("Failed to read provider config {}: {}", path.display(), e); + continue; + } + }; + + let mut yaml: Value = match serde_yaml::from_str(&content) { + Ok(v) => v, + Err(e) => { + tracing::warn!("Failed to parse provider config {}: {}", path.display(), e); + continue; + } + }; + + if let Some(map) = yaml.as_mapping_mut() { + map.remove(Value::String("api_key".to_string())); + map.remove(Value::String("address_url".to_string())); + } + + if let Some(provider) = registry.get_mut("refact") { + if let Err(e) = provider.provider_settings_apply(yaml) { + tracing::warn!( + "Failed to apply provider config {} to refact provider: {}", + path.display(), + e + ); + } + } continue; } @@ -166,6 +203,16 @@ pub async fn load_providers_from_config( registry.add(provider); } + for provider in registry.providers.iter_mut() { + if let Err(e) = provider.startup_refresh_and_sync(http_client, config_dir).await { + tracing::warn!( + "Provider '{}' startup refresh failed: {}", + provider.name(), + e + ); + } + } + Ok(registry) } diff --git a/refact-agent/engine/src/providers/traits.rs b/refact-agent/engine/src/providers/traits.rs index fd0ef61965..43fb58b137 100644 --- a/refact-agent/engine/src/providers/traits.rs +++ b/refact-agent/engine/src/providers/traits.rs @@ -340,10 +340,6 @@ pub trait ProviderTrait: Send + Sync { None } - fn set_running_models(&mut self, _running_models: Vec) { - // Default: no-op, providers that need running_models filtering override this - } - /// Discover and return available models for this provider. /// Providers that need network access (API fetching) override this async method. /// Default implementation matches against model_caps using the provider's filter regex @@ -357,6 +353,16 @@ pub trait ProviderTrait: Send + Sync { self.get_available_models_from_caps(model_caps) } + /// Optional startup hook for providers that need to refresh dynamic state + /// (for example, model catalogs) and persist provider-local config. + async fn startup_refresh_and_sync( + &mut self, + _http_client: &reqwest::Client, + _config_dir: &std::path::Path, + ) -> Result<(), String> { + Ok(()) + } + fn get_available_models_from_caps( &self, model_caps: &HashMap, diff --git a/refact-agent/engine/src/restream.rs b/refact-agent/engine/src/restream.rs index 1e551de244..cdd2ff5050 100644 --- a/refact-agent/engine/src/restream.rs +++ b/refact-agent/engine/src/restream.rs @@ -5,8 +5,7 @@ use tokio::sync::mpsc; use async_stream::stream; use futures::StreamExt; use hyper::{Body, Response, StatusCode}; -use reqwest_eventsource::Event; -use reqwest_eventsource::Error as REError; +use eventsource_stream::Eventsource; use serde_json::{json, Value}; use tracing::info; use uuid; @@ -385,8 +384,8 @@ pub async fn scratchpad_interaction_stream( meta ).await }; - let mut event_source = match event_source_maybe { - Ok(event_source) => event_source, + let response = match event_source_maybe { + Ok(resp) => resp, Err(e) => { let e_str = format!("forward_to_endpoint: {:?}", e); tele_storage.write().unwrap().tele_net.push(telemetry_structs::TelemetryNetwork::new( @@ -401,6 +400,7 @@ pub async fn scratchpad_interaction_stream( return; } }; + let mut event_stream = response.bytes_stream().eventsource(); let mut was_correct_output_even_if_error = false; let mut last_finish_reason = FinishReason::None; let stream_started_at = Instant::now(); @@ -415,19 +415,17 @@ pub async fn scratchpad_interaction_stream( let err_str = "LLM stream timeout"; tracing::error!("{}", err_str); yield Result::<_, String>::Ok(format!("data: {}\n\n", serde_json::to_string(&json!({"detail": err_str})).unwrap())); - event_source.close(); return; } if last_event_at.elapsed() > STREAM_IDLE_TIMEOUT { let err_str = "LLM stream stalled"; tracing::error!("{}", err_str); yield Result::<_, String>::Ok(format!("data: {}\n\n", serde_json::to_string(&json!({"detail": err_str})).unwrap())); - event_source.close(); return; } continue; } - maybe_event = event_source.next() => { + maybe_event = event_stream.next() => { match maybe_event { Some(e) => e, None => break, @@ -437,8 +435,7 @@ pub async fn scratchpad_interaction_stream( last_event_at = Instant::now(); match event { - Ok(Event::Open) => {}, - Ok(Event::Message(message)) => { + Ok(message) => { // info!("Message: {:#?}", message); if message.data.starts_with("[DONE]") { break; @@ -470,28 +467,13 @@ pub async fn scratchpad_interaction_stream( break; } } - }, Err(err) => { if was_correct_output_even_if_error { // "restream error: Stream ended" break; } - let problem_str = match err { - REError::InvalidStatusCode(err, resp) => { - let text = resp.text().await.unwrap(); - let mut res = format!("{} with details = {:?}", err, text); - if let Ok(value) = serde_json::from_str::(&text) { - if let Some(detail) = value.get("detail") { - res = format!("{}: {}", err, detail); - } - } - res - } - _ => { - format!("{}", err) - } - }; + let problem_str = format!("{}", err); tracing::error!("restream error: {}\n", problem_str); { tele_storage.write().unwrap().tele_net.push(telemetry_structs::TelemetryNetwork::new( @@ -502,7 +484,6 @@ pub async fn scratchpad_interaction_stream( )); } yield Result::<_, String>::Ok(format!("data: {}\n\n", serde_json::to_string(&json!({"detail": problem_str})).unwrap())); - event_source.close(); return; }, } diff --git a/refact-agent/engine/src/subchat.rs b/refact-agent/engine/src/subchat.rs index 7e18bfffa7..3565bc806e 100644 --- a/refact-agent/engine/src/subchat.rs +++ b/refact-agent/engine/src/subchat.rs @@ -1398,10 +1398,7 @@ async fn subchat_single_internal( } }; - let tools = tools_desclist - .into_iter() - .filter(|x| x.is_supported_by(model_id)) - .collect::>(); + let tools = tools_desclist; subchat_stream( ccx.clone(), diff --git a/refact-agent/engine/src/telemetry/basic_transmit.rs b/refact-agent/engine/src/telemetry/basic_transmit.rs index 3af655ef58..180f2adae7 100644 --- a/refact-agent/engine/src/telemetry/basic_transmit.rs +++ b/refact-agent/engine/src/telemetry/basic_transmit.rs @@ -170,25 +170,35 @@ pub async fn basic_telemetry_send( pub async fn telemetry_background_task(global_context: Arc>) -> () { loop { + let shutdown_flag = global_context.read().await.shutdown_flag.clone(); + if shutdown_flag.load(std::sync::atomic::Ordering::SeqCst) { + tracing::info!("Telemetry: shutdown detected, stopping"); + return; + } + match try_load_caps_quickly_if_not_present(global_context.clone(), 0).await { Ok(caps) => { basic_telemetry_compress(global_context.clone()).await; basic_telemetry_send(global_context.clone(), caps.clone()).await; - tokio::time::sleep(tokio::time::Duration::from_secs( - TELEMETRY_TRANSMIT_EACH_N_SECONDS, - )) - .await; } Err(e) => { error!( "telemetry send failed: no caps, trying again in {}, error: {}", TELEMETRY_TRANSMIT_EACH_N_SECONDS, e ); - tokio::time::sleep(tokio::time::Duration::from_secs( - TELEMETRY_TRANSMIT_EACH_N_SECONDS, - )) - .await; } }; + + tokio::select! { + _ = tokio::time::sleep(tokio::time::Duration::from_secs(TELEMETRY_TRANSMIT_EACH_N_SECONDS)) => {} + _ = async { + while !shutdown_flag.load(std::sync::atomic::Ordering::SeqCst) { + tokio::time::sleep(tokio::time::Duration::from_millis(200)).await; + } + } => { + tracing::info!("Telemetry: shutdown detected, stopping"); + return; + } + } } } diff --git a/refact-agent/engine/src/tools/file_edit/tool_apply_patch.rs b/refact-agent/engine/src/tools/file_edit/tool_apply_patch.rs index 1f313ed3ae..8d1c690a80 100644 --- a/refact-agent/engine/src/tools/file_edit/tool_apply_patch.rs +++ b/refact-agent/engine/src/tools/file_edit/tool_apply_patch.rs @@ -15,10 +15,7 @@ use crate::tools::file_edit::openai_apply_patch::{ apply_update_chunks, parse_patch, validate_relative_path, FileOperation, ParsedPatch, }; use crate::tools::file_edit::undo_history; -use crate::tools::tools_description::{ - MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolParam, - ToolSource, ToolSourceType, -}; +use crate::tools::tools_description::{MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use async_trait::async_trait; use serde_json::{json, Value}; use std::collections::HashMap; @@ -417,14 +414,9 @@ impl Tool for ToolApplyPatch { experimental: false, allow_parallel: false, description: APPLY_PATCH_DESCRIPTION.to_string(), - parameters: vec![ - ToolParam { - name: "patch".to_string(), - description: APPLY_PATCH_PARAM_DESCRIPTION.to_string(), - param_type: "string".to_string(), - }, - ], - parameters_required: vec!["patch".to_string()], + input_schema: json_schema_from_params(&[("patch", "string", APPLY_PATCH_PARAM_DESCRIPTION)], &["patch"]), + output_schema: None, + annotations: None, } } } diff --git a/refact-agent/engine/src/tools/file_edit/tool_create_textdoc.rs b/refact-agent/engine/src/tools/file_edit/tool_create_textdoc.rs index 983adea7a2..33206315ba 100644 --- a/refact-agent/engine/src/tools/file_edit/tool_create_textdoc.rs +++ b/refact-agent/engine/src/tools/file_edit/tool_create_textdoc.rs @@ -8,9 +8,7 @@ use crate::tools::file_edit::auxiliary::{ await_ast_indexing, convert_edit_to_diffchunks, edit_result_summary, normalize_line_endings, parse_path_for_create, parse_string_arg, restore_line_endings, sync_documents_ast, write_file, }; -use crate::tools::tools_description::{ - MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType, -}; +use crate::tools::tools_description::{MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use async_trait::async_trait; use serde_json::{json, Value}; use std::collections::HashMap; @@ -184,19 +182,9 @@ impl Tool for ToolCreateTextDoc { experimental: false, allow_parallel: false, description: "Creates a new text document or code or completely replaces the content of an existing document. Avoid trailing spaces and tabs.".to_string(), - parameters: vec![ - ToolParam { - name: "path".to_string(), - description: "Absolute path to new file.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "content".to_string(), - description: "The initial text or code.".to_string(), - param_type: "string".to_string(), - }, - ], - parameters_required: vec!["path".to_string(), "content".to_string()], + input_schema: json_schema_from_params(&[("path", "string", "Absolute path to new file."), ("content", "string", "The initial text or code.")], &["path", "content"]), + output_schema: None, + annotations: None, } } } diff --git a/refact-agent/engine/src/tools/file_edit/tool_undo_textdoc.rs b/refact-agent/engine/src/tools/file_edit/tool_undo_textdoc.rs index a8732d5a22..da16eee79b 100644 --- a/refact-agent/engine/src/tools/file_edit/tool_undo_textdoc.rs +++ b/refact-agent/engine/src/tools/file_edit/tool_undo_textdoc.rs @@ -7,9 +7,7 @@ use crate::tools::file_edit::auxiliary::{ convert_edit_to_diffchunks, parse_path_for_update, sync_documents_ast, }; use crate::tools::file_edit::undo_history::{get_undo_history, UndoEntry}; -use crate::tools::tools_description::{ - MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType, -}; +use crate::tools::tools_description::{MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use async_trait::async_trait; use serde_json::{json, Value}; use std::collections::HashMap; @@ -229,19 +227,9 @@ impl Tool for ToolUndoTextDoc { allow_parallel: false, description: "Undo recent file edits from this session. Reverts to previous version." .to_string(), - parameters: vec![ - ToolParam { - name: "path".to_string(), - description: "Absolute path to the file to undo.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "steps".to_string(), - description: "Number of edits to undo (default: 1).".to_string(), - param_type: "integer".to_string(), - }, - ], - parameters_required: vec!["path".to_string()], + input_schema: json_schema_from_params(&[("path", "string", "Absolute path to the file to undo."), ("steps", "integer", "Number of edits to undo (default: 1).")], &["path"]), + output_schema: None, + annotations: None, } } } diff --git a/refact-agent/engine/src/tools/file_edit/tool_update_textdoc.rs b/refact-agent/engine/src/tools/file_edit/tool_update_textdoc.rs index a8bf83d032..a7d33dac22 100644 --- a/refact-agent/engine/src/tools/file_edit/tool_update_textdoc.rs +++ b/refact-agent/engine/src/tools/file_edit/tool_update_textdoc.rs @@ -7,9 +7,7 @@ use crate::tools::file_edit::auxiliary::{ await_ast_indexing, convert_edit_to_diffchunks, edit_result_summary, parse_bool_arg, parse_path_for_update, parse_string_arg, str_replace, sync_documents_ast, }; -use crate::tools::tools_description::{ - MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType, -}; +use crate::tools::tools_description::{MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use async_trait::async_trait; use serde_json::{json, Value}; use std::collections::HashMap; @@ -180,29 +178,9 @@ impl Tool for ToolUpdateTextDoc { experimental: false, allow_parallel: false, description: "Updates an existing document by replacing specific text, use this if file already exists. Optimized for large files or small changes where simple string replacement is sufficient. Avoid trailing spaces and tabs.".to_string(), - parameters: vec![ - ToolParam { - name: "path".to_string(), - description: "Absolute path to the file to change.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "old_str".to_string(), - description: "The exact text that needs to be updated. Use update_textdoc_regex if you need pattern matching (is not preferred for common editing).".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "replacement".to_string(), - description: "The new text that will replace the old text.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "multiple".to_string(), - description: "If true, applies the replacement to all occurrences; if false, only the first occurrence is replaced.".to_string(), - param_type: "boolean".to_string(), - }, - ], - parameters_required: vec!["path".to_string(), "old_str".to_string(), "replacement".to_string()], + input_schema: json_schema_from_params(&[("path", "string", "Absolute path to the file to change."), ("old_str", "string", "The exact text that needs to be updated. Use update_textdoc_regex if you need pattern matching (is not preferred for common editing)."), ("replacement", "string", "The new text that will replace the old text."), ("multiple", "boolean", "If true, applies the replacement to all occurrences; if false, only the first occurrence is replaced.")], &["path", "old_str", "replacement"]), + output_schema: None, + annotations: None, } } } diff --git a/refact-agent/engine/src/tools/file_edit/tool_update_textdoc_anchored.rs b/refact-agent/engine/src/tools/file_edit/tool_update_textdoc_anchored.rs index 4242528957..67dff7949a 100644 --- a/refact-agent/engine/src/tools/file_edit/tool_update_textdoc_anchored.rs +++ b/refact-agent/engine/src/tools/file_edit/tool_update_textdoc_anchored.rs @@ -7,9 +7,7 @@ use crate::tools::file_edit::auxiliary::{ await_ast_indexing, convert_edit_to_diffchunks, edit_result_summary, parse_bool_arg, parse_path_for_update, parse_string_arg, str_replace_anchored, sync_documents_ast, AnchorMode, }; -use crate::tools::tools_description::{ - MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType, -}; +use crate::tools::tools_description::{MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use async_trait::async_trait; use serde_json::{json, Value}; use std::collections::HashMap; @@ -226,44 +224,9 @@ impl Tool for ToolUpdateTextDocAnchored { experimental: false, allow_parallel: false, description: "Edit file by finding anchor text. More reliable than exact string match. Use 'replace_between' to replace content between two anchors, or 'insert_after'/'insert_before' to insert at anchor.".to_string(), - parameters: vec![ - ToolParam { - name: "path".to_string(), - description: "Absolute path to the file.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "mode".to_string(), - description: "'replace_between' (needs anchor_before + anchor_after), 'insert_after', or 'insert_before' (need anchor).".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "anchor_before".to_string(), - description: "For replace_between: text marking start of region to replace.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "anchor_after".to_string(), - description: "For replace_between: text marking end of region to replace.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "anchor".to_string(), - description: "For insert_after/insert_before: text to locate insert position.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "content".to_string(), - description: "The new content to insert or replace with.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "multiple".to_string(), - description: "If true, apply to all matching anchors. Default false.".to_string(), - param_type: "boolean".to_string(), - }, - ], - parameters_required: vec!["path".to_string(), "mode".to_string(), "content".to_string()], + input_schema: json_schema_from_params(&[("path", "string", "Absolute path to the file."), ("mode", "string", "'replace_between' (needs anchor_before + anchor_after), 'insert_after', or 'insert_before' (need anchor)."), ("anchor_before", "string", "For replace_between: text marking start of region to replace."), ("anchor_after", "string", "For replace_between: text marking end of region to replace."), ("anchor", "string", "For insert_after/insert_before: text to locate insert position."), ("content", "string", "The new content to insert or replace with."), ("multiple", "boolean", "If true, apply to all matching anchors. Default false.")], &["path", "mode", "content"]), + output_schema: None, + annotations: None, } } } diff --git a/refact-agent/engine/src/tools/file_edit/tool_update_textdoc_by_lines.rs b/refact-agent/engine/src/tools/file_edit/tool_update_textdoc_by_lines.rs index a870f6aebb..c118ad5f8b 100644 --- a/refact-agent/engine/src/tools/file_edit/tool_update_textdoc_by_lines.rs +++ b/refact-agent/engine/src/tools/file_edit/tool_update_textdoc_by_lines.rs @@ -7,9 +7,7 @@ use crate::tools::file_edit::auxiliary::{ await_ast_indexing, convert_edit_to_diffchunks, edit_result_summary, parse_path_for_update, parse_string_arg, str_replace_lines, sync_documents_ast, }; -use crate::tools::tools_description::{ - MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType, -}; +use crate::tools::tools_description::{MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use async_trait::async_trait; use serde_json::{json, Value}; use std::collections::HashMap; @@ -177,24 +175,9 @@ impl Tool for ToolUpdateTextDocByLines { experimental: false, allow_parallel: false, description: "Replaces line ranges in an existing file with new content. Line numbers are 1-based and inclusive. Supports multiple non-overlapping ranges.".to_string(), - parameters: vec![ - ToolParam { - name: "path".to_string(), - description: "Absolute path to the file to modify.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "content".to_string(), - description: "The new text content. For multiple ranges, separate content for each range with '---RANGE_SEPARATOR---'.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "ranges".to_string(), - description: "Line ranges to replace. Format: ':3' (lines 1-3), '40:50' (lines 40-50), '100:' (line 100 to end), '5' (just line 5). Combine multiple ranges with commas: ':3,40:50,100:'. Ranges must not overlap.".to_string(), - param_type: "string".to_string(), - }, - ], - parameters_required: vec!["path".to_string(), "content".to_string(), "ranges".to_string()], + input_schema: json_schema_from_params(&[("path", "string", "Absolute path to the file to modify."), ("content", "string", "The new text content. For multiple ranges, separate content for each range with '---RANGE_SEPARATOR---'."), ("ranges", "string", "Line ranges to replace. Format: ':3' (lines 1-3), '40:50' (lines 40-50), '100:' (line 100 to end), '5' (just line 5). Combine multiple ranges with commas: ':3,40:50,100:'. Ranges must not overlap.")], &["path", "content", "ranges"]), + output_schema: None, + annotations: None, } } } diff --git a/refact-agent/engine/src/tools/file_edit/tool_update_textdoc_regex.rs b/refact-agent/engine/src/tools/file_edit/tool_update_textdoc_regex.rs index 1fcea6abaa..1820ab3d5e 100644 --- a/refact-agent/engine/src/tools/file_edit/tool_update_textdoc_regex.rs +++ b/refact-agent/engine/src/tools/file_edit/tool_update_textdoc_regex.rs @@ -7,9 +7,7 @@ use crate::tools::file_edit::auxiliary::{ await_ast_indexing, convert_edit_to_diffchunks, edit_result_summary, parse_bool_arg, parse_path_for_update, parse_string_arg, str_replace_regex, sync_documents_ast, }; -use crate::tools::tools_description::{ - MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType, -}; +use crate::tools::tools_description::{MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use async_trait::async_trait; use regex::Regex; use serde_json::{json, Value}; @@ -202,39 +200,9 @@ impl Tool for ToolUpdateTextDocRegex { experimental: false, allow_parallel: false, description: "Updates an existing document using pattern matching. By default treats pattern as literal text (literal:true). Set literal:false for regex.".to_string(), - parameters: vec![ - ToolParam { - name: "path".to_string(), - description: "Absolute path to the file to change.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "pattern".to_string(), - description: "Pattern to match. Treated as literal text by default, or regex if literal:false.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "replacement".to_string(), - description: "The new text that will replace the matched pattern.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "literal".to_string(), - description: "If true (default), pattern is treated as literal text. If false, pattern is a regex.".to_string(), - param_type: "boolean".to_string(), - }, - ToolParam { - name: "multiple".to_string(), - description: "If true, replaces all occurrences; if false (default), only the first.".to_string(), - param_type: "boolean".to_string(), - }, - ToolParam { - name: "expected_matches".to_string(), - description: "If provided, fails if actual match count differs (safety check).".to_string(), - param_type: "integer".to_string(), - }, - ], - parameters_required: vec!["path".to_string(), "pattern".to_string(), "replacement".to_string()], + input_schema: json_schema_from_params(&[("path", "string", "Absolute path to the file to change."), ("pattern", "string", "Pattern to match. Treated as literal text by default, or regex if literal:false."), ("replacement", "string", "The new text that will replace the matched pattern."), ("literal", "boolean", "If true (default), pattern is treated as literal text. If false, pattern is a regex."), ("multiple", "boolean", "If true, replaces all occurrences; if false (default), only the first."), ("expected_matches", "integer", "If provided, fails if actual match count differs (safety check).")], &["path", "pattern", "replacement"]), + output_schema: None, + annotations: None, } } } diff --git a/refact-agent/engine/src/tools/mod.rs b/refact-agent/engine/src/tools/mod.rs index cd785cd838..09b98580b3 100644 --- a/refact-agent/engine/src/tools/mod.rs +++ b/refact-agent/engine/src/tools/mod.rs @@ -1,9 +1,14 @@ pub mod scope_utils; pub mod tools_description; pub mod tools_list; + +#[cfg(test)] +mod tests_schema; pub mod tool_helpers; +pub mod tool_name_alias; pub mod subagent_phases; +mod tool_activate_skill; mod tool_add_workspace_folder; mod tool_ast_definition; mod tool_cat; @@ -24,6 +29,10 @@ mod tool_trajectory_context; mod tool_tree; mod tool_web; mod tool_web_search; +mod tool_compress_chat; +mod tool_handoff_to_mode; +mod tool_mcp_search; +mod tool_mcp_call; pub mod file_edit; mod tool_create_knowledge; diff --git a/refact-agent/engine/src/tools/tests_schema.rs b/refact-agent/engine/src/tools/tests_schema.rs new file mode 100644 index 0000000000..9594166101 --- /dev/null +++ b/refact-agent/engine/src/tools/tests_schema.rs @@ -0,0 +1,337 @@ +#[cfg(test)] +mod tests { + use serde_json::json; + + use crate::tools::tools_description::{ + json_schema_from_params, make_openai_tool_value, ToolDesc, ToolSource, ToolSourceType, Tool, + }; + + fn make_tool_desc(input_schema: serde_json::Value) -> ToolDesc { + ToolDesc { + name: "test_tool".to_string(), + experimental: false, + allow_parallel: false, + description: "A test tool".to_string(), + input_schema, + output_schema: None, + annotations: None, + display_name: "Test Tool".to_string(), + source: ToolSource { + source_type: ToolSourceType::Builtin, + config_path: "".to_string(), + }, + } + } + + #[test] + fn test_json_schema_from_params_simple() { + let schema = json_schema_from_params( + &[ + ("path", "string", "File path"), + ("content", "string", "Content"), + ], + &["path"], + ); + assert_eq!(schema["type"], json!("object")); + assert_eq!(schema["properties"]["path"]["type"], json!("string")); + assert_eq!(schema["properties"]["path"]["description"], json!("File path")); + assert_eq!(schema["properties"]["content"]["type"], json!("string")); + assert_eq!(schema["required"], json!(["path"])); + } + + #[test] + fn test_json_schema_from_params_all_required() { + let schema = json_schema_from_params( + &[ + ("a", "string", "First"), + ("b", "integer", "Second"), + ], + &["a", "b"], + ); + assert_eq!(schema["type"], json!("object")); + assert_eq!(schema["required"], json!(["a", "b"])); + assert_eq!(schema["properties"]["b"]["type"], json!("integer")); + } + + #[test] + fn test_json_schema_from_params_no_params() { + let schema = json_schema_from_params(&[], &[]); + assert_eq!(schema["type"], json!("object")); + assert_eq!(schema["properties"], json!({})); + assert_eq!(schema["required"], json!([])); + } + + #[test] + fn test_openai_style_simple_not_strict() { + let schema = json!({ + "type": "object", + "properties": { + "query": {"type": "string", "description": "Search query"} + }, + "required": ["query"] + }); + let desc = make_tool_desc(schema); + let openai = desc.into_openai_style(false); + assert_eq!(openai["type"], json!("function")); + assert_eq!(openai["function"]["name"], json!("test_tool")); + assert_eq!(openai["function"]["parameters"]["type"], json!("object")); + assert!(openai["function"]["strict"].is_null()); + assert!(openai["function"]["parameters"]["additionalProperties"].is_null()); + } + + #[test] + fn test_openai_style_strict_adds_additional_properties_false() { + let schema = json!({ + "type": "object", + "properties": { + "query": {"type": "string"} + }, + "required": ["query"] + }); + let desc = make_tool_desc(schema); + let openai = desc.into_openai_style(true); + assert_eq!(openai["function"]["strict"], json!(true)); + assert_eq!(openai["function"]["parameters"]["additionalProperties"], json!(false)); + } + + #[test] + fn test_strict_preserves_existing_additional_properties_true() { + let schema = json!({ + "type": "object", + "properties": {}, + "additionalProperties": true + }); + let openai = make_openai_tool_value( + "test".to_string(), + "A tool".to_string(), + schema, + true, + ); + assert_eq!(openai["function"]["parameters"]["additionalProperties"], json!(true)); + } + + #[test] + fn test_strict_preserves_existing_additional_properties_false() { + let schema = json!({ + "type": "object", + "properties": {}, + "additionalProperties": false + }); + let openai = make_openai_tool_value( + "test".to_string(), + "A tool".to_string(), + schema, + true, + ); + assert_eq!(openai["function"]["parameters"]["additionalProperties"], json!(false)); + } + + #[test] + fn test_complex_schema_passthrough_nested_objects() { + let schema = json!({ + "type": "object", + "properties": { + "config": { + "type": "object", + "properties": { + "name": {"type": "string"}, + "value": {"type": "number"} + } + } + }, + "required": ["config"] + }); + let desc = make_tool_desc(schema); + let openai = desc.into_openai_style(false); + let params = &openai["function"]["parameters"]; + assert_eq!(params["properties"]["config"]["type"], json!("object")); + assert_eq!(params["properties"]["config"]["properties"]["name"]["type"], json!("string")); + assert_eq!(params["properties"]["config"]["properties"]["value"]["type"], json!("number")); + } + + #[test] + fn test_complex_schema_passthrough_arrays() { + let schema = json!({ + "type": "object", + "properties": { + "tags": { + "type": "array", + "items": {"type": "string"}, + "description": "List of tags" + } + }, + "required": [] + }); + let desc = make_tool_desc(schema); + let openai = desc.into_openai_style(false); + let params = &openai["function"]["parameters"]; + assert_eq!(params["properties"]["tags"]["type"], json!("array")); + assert_eq!(params["properties"]["tags"]["items"]["type"], json!("string")); + } + + #[test] + fn test_complex_schema_passthrough_enums() { + let schema = json!({ + "type": "object", + "properties": { + "mode": { + "type": "string", + "enum": ["fast", "slow", "auto"] + } + }, + "required": ["mode"] + }); + let desc = make_tool_desc(schema); + let openai = desc.into_openai_style(false); + let params = &openai["function"]["parameters"]; + assert_eq!( + params["properties"]["mode"]["enum"], + json!(["fast", "slow", "auto"]) + ); + assert_eq!(params["properties"]["mode"]["enum"].as_array().unwrap().len(), 3); + } + + #[test] + fn test_complex_schema_all_types_preserved() { + let schema = json!({ + "type": "object", + "properties": { + "config": { + "type": "object", + "properties": { + "verbose": {"type": "boolean"}, + "max_count": {"type": "integer"} + } + }, + "tags": { + "type": "array", + "items": {"type": "string"}, + "description": "List of items" + }, + "mode": { + "type": "string", + "enum": ["fast", "slow", "auto"] + } + }, + "required": ["config"] + }); + let desc = make_tool_desc(schema); + let openai = desc.into_openai_style(false); + let params = &openai["function"]["parameters"]; + assert_eq!(params["properties"]["config"]["type"], json!("object")); + assert_eq!(params["properties"]["tags"]["items"]["type"], json!("string")); + assert_eq!( + params["properties"]["mode"]["enum"].as_array().unwrap().len(), + 3 + ); + } + + #[test] + fn test_into_openai_style_preserves_name_and_description() { + let schema = json!({"type": "object", "properties": {}}); + let desc = ToolDesc { + name: "my_custom_tool".to_string(), + experimental: false, + allow_parallel: true, + description: "Does something useful".to_string(), + input_schema: schema, + output_schema: None, + annotations: None, + display_name: "My Custom Tool".to_string(), + source: ToolSource { + source_type: ToolSourceType::Builtin, + config_path: "".to_string(), + }, + }; + let openai = desc.into_openai_style(false); + assert_eq!(openai["function"]["name"], json!("my_custom_tool")); + assert_eq!(openai["function"]["description"], json!("Does something useful")); + } + + #[test] + fn test_all_builtin_tools_have_valid_schema() { + let tools: Vec> = vec![ + Box::new(crate::tools::tool_cat::ToolCat { config_path: "".to_string() }), + Box::new(crate::tools::tool_tree::ToolTree { config_path: "".to_string() }), + Box::new(crate::tools::tool_regex_search::ToolRegexSearch { config_path: "".to_string() }), + Box::new(crate::tools::tool_mv::ToolMv { config_path: "".to_string() }), + Box::new(crate::tools::tool_rm::ToolRm { config_path: "".to_string() }), + Box::new(crate::tools::tool_web::ToolWeb { config_path: "".to_string() }), + Box::new(crate::tools::tool_web_search::ToolWebSearch { config_path: "".to_string() }), + Box::new(crate::tools::tool_shell::ToolShell { cfg: Default::default(), config_path: "".to_string() }), + Box::new(crate::tools::file_edit::tool_create_textdoc::ToolCreateTextDoc { config_path: "".to_string() }), + Box::new(crate::tools::file_edit::tool_update_textdoc::ToolUpdateTextDoc { config_path: "".to_string() }), + Box::new(crate::tools::file_edit::tool_update_textdoc_by_lines::ToolUpdateTextDocByLines { config_path: "".to_string() }), + Box::new(crate::tools::file_edit::tool_update_textdoc_regex::ToolUpdateTextDocRegex { config_path: "".to_string() }), + ]; + + for tool in &tools { + let desc = tool.tool_description(); + let schema = &desc.input_schema; + assert_eq!( + schema["type"], + json!("object"), + "Tool '{}' input_schema must have type=object", + desc.name + ); + assert!( + schema["properties"].is_object(), + "Tool '{}' input_schema must have a properties object", + desc.name + ); + let openai = desc.clone().into_openai_style(false); + assert_eq!(openai["type"], json!("function"), + "Tool '{}' into_openai_style must produce type=function", + desc.name + ); + assert!( + !openai["function"]["name"].as_str().unwrap_or("").is_empty(), + "Tool '{}' must have non-empty name in openai format", + desc.name + ); + } + } + + #[test] + fn test_schema_roundtrip_tool_desc_to_openai() { + let input_schema = json!({ + "type": "object", + "properties": { + "filename": {"type": "string", "description": "The filename"}, + "line_start": {"type": "integer", "description": "Start line"}, + "line_end": {"type": "integer", "description": "End line"} + }, + "required": ["filename"] + }); + let desc = make_tool_desc(input_schema.clone()); + let openai = desc.into_openai_style(false); + assert_eq!(openai["function"]["parameters"], input_schema); + } + + #[test] + fn test_anthropic_roundtrip_via_openai() { + let input_schema = json!({ + "type": "object", + "properties": { + "query": {"type": "string", "description": "Search query"}, + "limit": {"type": "integer"} + }, + "required": ["query"] + }); + let desc = make_tool_desc(input_schema.clone()); + let openai_tool = desc.into_openai_style(false); + + let func = openai_tool.get("function").unwrap(); + let anthropic = json!({ + "name": func["name"], + "description": func["description"], + "input_schema": func["parameters"] + }); + + assert_eq!(anthropic["name"], json!("test_tool")); + assert_eq!(anthropic["input_schema"]["type"], json!("object")); + assert_eq!(anthropic["input_schema"]["properties"]["query"]["type"], json!("string")); + assert_eq!(anthropic["input_schema"]["required"], json!(["query"])); + assert!(anthropic.get("parameters").is_none()); + } +} diff --git a/refact-agent/engine/src/tools/tool_activate_skill.rs b/refact-agent/engine/src/tools/tool_activate_skill.rs new file mode 100644 index 0000000000..d659230610 --- /dev/null +++ b/refact-agent/engine/src/tools/tool_activate_skill.rs @@ -0,0 +1,578 @@ +use std::collections::HashMap; +use std::sync::Arc; + +use async_trait::async_trait; +use serde_json::Value; +use tokio::sync::Mutex as AMutex; + +use crate::at_commands::at_commands::AtCommandsContext; +use crate::call_validation::{ChatContent, ChatMessage, ContextEnum}; +use crate::ext::config_dirs::get_ext_dirs; +use crate::ext::skills::load_skill_full; +use crate::ext::skills_context::expand_skill_includes; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; + +pub struct ToolActivateSkill { + pub config_path: String, +} + +async fn activate_skill_inner( + ext_dirs: &crate::ext::config_dirs::ExtDirs, + name: &str, +) -> Result<(String, Vec, Option), String> { + if let Err(e) = crate::ext::skills::validate_skill_id(name) { + return Err(format!("Invalid skill name '{}': {}", name, e)); + } + let skill = load_skill_full(ext_dirs, name).await + .ok_or_else(|| format!("Skill '{}' not found", name))?; + if !skill.index.user_invocable { + return Err(format!("Skill '{}' is not available for activation", name)); + } + if skill.index.disable_model_invocation { + return Err(format!("Skill '{}' cannot be activated by the model", name)); + } + let body = expand_skill_includes(&skill.body, &skill.skill_dir).await; + Ok((body, skill.allowed_tools, skill.model)) +} + +#[async_trait] +impl Tool for ToolActivateSkill { + fn tool_description(&self) -> ToolDesc { + ToolDesc { + name: "activate_skill".to_string(), + display_name: "Activate Skill".to_string(), + source: ToolSource { + source_type: ToolSourceType::Builtin, + config_path: self.config_path.clone(), + }, + experimental: false, + allow_parallel: false, + description: "Load a skill's full instructions into the current context. Use when you determine a skill from the available index is relevant to the user's request. Once activated, the skill's instructions guide your approach. When you're done with the skill's task, you MUST call deactivate_skill with a thorough report.".to_string(), + input_schema: json_schema_from_params( + &[("name", "string", "Name of the skill to activate")], + &["name"], + ), + output_schema: None, + annotations: None, + } + } + + async fn tool_execute( + &mut self, + ccx: Arc>, + tool_call_id: &String, + args: &HashMap, + ) -> Result<(bool, Vec), String> { + let name = match args.get("name") { + Some(Value::String(s)) => s.clone(), + Some(v) => return Err(format!("argument `name` is not a string: {:?}", v)), + None => return Err("argument `name` is missing".to_string()), + }; + if let Err(e) = crate::ext::skills::validate_skill_id(&name) { + return Err(format!("Invalid skill name '{}': {}", name, e)); + } + + let (gcx, chat_id) = { + let ccx_locked = ccx.lock().await; + (ccx_locked.global_context.clone(), ccx_locked.chat_id.clone()) + }; + + { + let session_arc_opt = { + let gcx_locked = gcx.read().await; + let sessions = gcx_locked.chat_sessions.read().await; + sessions.get(&chat_id).cloned() + }; + if let Some(session_arc) = session_arc_opt { + let mut session = session_arc.lock().await; + if session.thread.active_skill.as_deref() == Some(name.as_str()) { + if session.active_command.started_at_index.is_none() { + session.active_command.started_at_index = Some(session.messages.len()); + session.active_command.name = name.clone(); + } + return Ok((false, vec![ + ContextEnum::ChatMessage(ChatMessage { + role: "tool".to_string(), + content: ChatContent::SimpleText(format!("Skill '{}' is already active. Continue following its instructions.", name)), + tool_call_id: tool_call_id.clone(), + ..Default::default() + }), + ])); + } + if let Some(ref current) = session.thread.active_skill { + return Err(format!( + "Skill '{}' is currently active. Call deactivate_skill first before activating a different skill.", + current + )); + } + } + } + + let ext_dirs = get_ext_dirs(gcx.clone()).await; + let (body, allowed_tools, model_override) = activate_skill_inner(&ext_dirs, &name).await?; + + { + let session_arc_opt = { + let gcx_locked = gcx.read().await; + let sessions = gcx_locked.chat_sessions.read().await; + sessions.get(&chat_id).cloned() + }; + if let Some(session_arc) = session_arc_opt { + let mut session = session_arc.lock().await; + session.active_command.name = name.clone(); + session.active_command.allowed_tools = allowed_tools.clone(); + session.active_command.model_override = model_override.clone(); + session.active_command.started_at_index = Some(session.messages.len()); + session.active_command.activation_tool_call_id = Some(tool_call_id.clone()); + session.set_active_skill(name.clone()); + } + } + + let header_json = serde_json::json!({ + "name": name.clone(), + "allowed_tools": allowed_tools, + "model_override": model_override, + }); + let cd_instruction_content = format!("💿 SKILL_ACTIVATED {}\n\n{}", header_json, body); + + Ok((false, vec![ + ContextEnum::ChatMessage(ChatMessage { + role: "tool".to_string(), + content: ChatContent::SimpleText(format!("Skill '{}' activated.", name)), + tool_call_id: tool_call_id.clone(), + ..Default::default() + }), + ContextEnum::ChatMessage(ChatMessage { + role: "cd_instruction".to_string(), + content: ChatContent::SimpleText(cd_instruction_content), + ..Default::default() + }), + ])) + } +} + +pub struct ToolDeactivateSkill { + pub config_path: String, +} + +#[async_trait] +impl Tool for ToolDeactivateSkill { + fn tool_description(&self) -> ToolDesc { + ToolDesc { + name: "deactivate_skill".to_string(), + display_name: "Deactivate Skill".to_string(), + source: ToolSource { + source_type: ToolSourceType::Builtin, + config_path: self.config_path.clone(), + }, + experimental: false, + allow_parallel: false, + description: "Deactivate the currently active skill with a completion report. The report should be a thorough overview of what was done, what happened, and what was changed. After deactivation, the skill execution messages are compacted into the report, keeping chat history clean while preserving knowledge of what occurred.".to_string(), + input_schema: json_schema_from_params( + &[("report", "string", "A thorough overview of what was done, what happened, what was changed during the skill execution. Use clear markdown formatting.")], + &["report"], + ), + output_schema: None, + annotations: None, + } + } + + async fn tool_execute( + &mut self, + ccx: Arc>, + tool_call_id: &String, + args: &HashMap, + ) -> Result<(bool, Vec), String> { + let report = match args.get("report") { + Some(Value::String(s)) => s.clone(), + Some(v) => return Err(format!("argument `report` is not a string: {:?}", v)), + None => return Err("argument `report` is missing. Provide a thorough overview of what was done.".to_string()), + }; + + let (gcx, chat_id) = { + let ccx_locked = ccx.lock().await; + (ccx_locked.global_context.clone(), ccx_locked.chat_id.clone()) + }; + + { + let session_arc_opt = { + let gcx_locked = gcx.read().await; + let sessions = gcx_locked.chat_sessions.read().await; + sessions.get(&chat_id).cloned() + }; + if let Some(session_arc) = session_arc_opt { + let mut session = session_arc.lock().await; + let skill_name = match session.thread.active_skill.clone() { + Some(name) => name, + None => return Err("No active skill to deactivate".to_string()), + }; + let start_index = session.active_command + .started_at_index + .unwrap_or(session.messages.len()); + session.pending_skill_deactivation = Some(crate::chat::types::PendingSkillDeactivation { + start_index, + report: report.clone(), + skill_name: skill_name.clone(), + activation_tool_call_id: session.active_command.activation_tool_call_id.clone(), + }); + let compaction_note = if session.active_command.started_at_index.is_some() { + String::new() + } else { + tracing::warn!("deactivate_skill: no started_at_index for skill '{}', reporting without compaction", skill_name); + " (Note: skill history compaction was skipped — activation anchor was not set.)".to_string() + }; + session.active_command = crate::chat::types::ActiveCommandContext::default(); + session.clear_active_skill(); + return Ok((false, vec![ + ContextEnum::ChatMessage(ChatMessage { + role: "tool".to_string(), + content: ChatContent::SimpleText(format!("✅ Skill '{}' deactivated. Report has been recorded.{}", skill_name, compaction_note)), + tool_call_id: tool_call_id.clone(), + ..Default::default() + }), + ])); + } + } + + Ok((false, vec![ + ContextEnum::ChatMessage(ChatMessage { + role: "tool".to_string(), + content: ChatContent::SimpleText("✅ Skill deactivated. Report has been recorded.".to_string()), + tool_call_id: tool_call_id.clone(), + ..Default::default() + }), + ])) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::ext::config_dirs::ExtDirs; + use std::path::Path; + + fn make_ext_dirs(root: &Path) -> ExtDirs { + ExtDirs { + global_dirs: vec![root.to_path_buf()], + installed_dirs: vec![], + project_dirs: vec![], + } + } + + async fn write_skill(root: &Path, name: &str, frontmatter: &str, body: &str) { + let skill_dir = root.join("skills").join(name); + tokio::fs::create_dir_all(&skill_dir).await.unwrap(); + let content = format!("---\n{}\n---\n{}", frontmatter, body); + tokio::fs::write(skill_dir.join("SKILL.md"), content).await.unwrap(); + } + + #[tokio::test] + async fn test_activate_known_skill() { + let tmp = tempfile::tempdir().unwrap(); + write_skill( + tmp.path(), + "my-skill", + "name: my-skill\ndescription: A useful skill\nuser-invocable: true", + "Do something useful with $ARGUMENTS", + ) + .await; + + let ext_dirs = make_ext_dirs(tmp.path()); + let result = activate_skill_inner(&ext_dirs, "my-skill").await; + assert!(result.is_ok(), "Expected Ok, got {:?}", result); + let (body, allowed_tools, model_override) = result.unwrap(); + assert!(body.contains("Do something useful with $ARGUMENTS")); + assert!(allowed_tools.is_empty()); + assert!(model_override.is_none()); + } + + #[tokio::test] + async fn test_activate_unknown_skill() { + let tmp = tempfile::tempdir().unwrap(); + let ext_dirs = make_ext_dirs(tmp.path()); + let result = activate_skill_inner(&ext_dirs, "nonexistent").await; + assert!(result.is_err()); + let msg = result.unwrap_err(); + assert!(msg.contains("not found"), "Expected 'not found' in error: {}", msg); + } + + #[tokio::test] + async fn test_activate_non_invocable_skill() { + let tmp = tempfile::tempdir().unwrap(); + write_skill( + tmp.path(), + "hidden-skill", + "name: hidden-skill\ndescription: Internal skill\nuser-invocable: false", + "Internal instructions", + ) + .await; + + let ext_dirs = make_ext_dirs(tmp.path()); + let result = activate_skill_inner(&ext_dirs, "hidden-skill").await; + assert!(result.is_err()); + let msg = result.unwrap_err(); + assert!( + msg.contains("not available for activation"), + "Expected 'not available for activation' in error: {}", + msg + ); + } + + #[tokio::test] + async fn test_activate_skill_with_includes() { + let tmp = tempfile::tempdir().unwrap(); + let skill_dir = tmp.path().join("skills").join("with-include"); + tokio::fs::create_dir_all(&skill_dir).await.unwrap(); + tokio::fs::write(skill_dir.join("context.md"), "Included content here").await.unwrap(); + tokio::fs::write( + skill_dir.join("SKILL.md"), + "---\nname: with-include\ndescription: Skill with includes\nuser-invocable: true\n---\nBefore\n@include context.md\nAfter", + ) + .await + .unwrap(); + + let ext_dirs = make_ext_dirs(tmp.path()); + let result = activate_skill_inner(&ext_dirs, "with-include").await; + assert!(result.is_ok(), "Expected Ok, got {:?}", result); + let (body, _, _) = result.unwrap(); + assert!( + body.contains("Included content here"), + "@include should be expanded, got: {}", + body + ); + assert!(!body.contains("@include"), "@include directive should be replaced"); + } + + #[tokio::test] + async fn test_activate_skill_returns_allowed_tools_and_model() { + let tmp = tempfile::tempdir().unwrap(); + write_skill( + tmp.path(), + "restricted-skill", + "name: restricted-skill\ndescription: Skill with restrictions\nuser-invocable: true\nallowed-tools:\n - cat\n - tree\nmodel: gpt-4o", + "Do something restricted", + ) + .await; + + let ext_dirs = make_ext_dirs(tmp.path()); + let result = activate_skill_inner(&ext_dirs, "restricted-skill").await; + assert!(result.is_ok(), "Expected Ok, got {:?}", result); + let (body, allowed_tools, model_override) = result.unwrap(); + assert!(!body.is_empty()); + assert_eq!(allowed_tools, vec!["cat".to_string(), "tree".to_string()]); + assert_eq!(model_override, Some("gpt-4o".to_string())); + } + + #[tokio::test] + async fn test_activate_skill_empty_allowed_tools() { + let tmp = tempfile::tempdir().unwrap(); + write_skill( + tmp.path(), + "open-skill", + "name: open-skill\ndescription: Skill without restrictions\nuser-invocable: true", + "Do anything", + ) + .await; + + let ext_dirs = make_ext_dirs(tmp.path()); + let result = activate_skill_inner(&ext_dirs, "open-skill").await; + assert!(result.is_ok()); + let (_, allowed_tools, model_override) = result.unwrap(); + assert!(allowed_tools.is_empty(), "No restrictions should result in empty allowed_tools"); + assert!(model_override.is_none(), "No model should result in None model_override"); + } + + #[tokio::test] + async fn test_deactivate_skill_clears_active_command() { + use crate::chat::types::ActiveCommandContext; + + let mut active = ActiveCommandContext { + name: "my-skill".to_string(), + allowed_tools: vec!["cat".to_string(), "tree".to_string()], + model_override: Some("gpt-4o".to_string()), + context_fork: None, + started_at_index: Some(5), + activation_tool_call_id: None, + }; + assert_eq!(active.started_at_index, Some(5)); + + active = ActiveCommandContext::default(); + + assert!(active.name.is_empty()); + assert!(active.allowed_tools.is_empty()); + assert!(active.model_override.is_none()); + assert!(active.context_fork.is_none()); + assert!(active.started_at_index.is_none()); + } + + #[tokio::test] + async fn test_deactivate_skill_when_no_active_skill() { + use crate::chat::types::ActiveCommandContext; + + let active = ActiveCommandContext::default(); + let cleared = ActiveCommandContext::default(); + + assert_eq!(active.name, cleared.name); + assert_eq!(active.allowed_tools, cleared.allowed_tools); + assert_eq!(active.model_override, cleared.model_override); + assert_eq!(active.started_at_index, cleared.started_at_index); + } + + #[test] + fn test_activate_skill_not_parallel() { + let tool = ToolActivateSkill { config_path: String::new() }; + assert!(!tool.tool_description().allow_parallel, "activate_skill must have allow_parallel = false"); + } + + #[test] + fn test_deactivate_skill_no_context_file() { + let result: Vec = vec![ + ContextEnum::ChatMessage(ChatMessage { + role: "tool".to_string(), + content: ChatContent::SimpleText("✅ Skill 'my-skill' deactivated. Report has been recorded.".to_string()), + tool_call_id: "tc1".to_string(), + ..Default::default() + }), + ]; + let has_context_file = result.iter().any(|e| matches!(e, ContextEnum::ContextFile(_))); + assert!(!has_context_file, "deactivate_skill must not return ContextFile"); + let has_chat_message = result.iter().any(|e| matches!(e, ContextEnum::ChatMessage(_))); + assert!(has_chat_message, "deactivate_skill must return a ChatMessage"); + } + + #[tokio::test] + async fn test_activate_rejects_disable_model_invocation() { + let tmp = tempfile::tempdir().unwrap(); + write_skill( + tmp.path(), + "locked-skill", + "name: locked-skill\ndescription: Locked skill\nuser-invocable: true\ndisable-model-invocation: true", + "Sensitive instructions", + ) + .await; + + let ext_dirs = make_ext_dirs(tmp.path()); + let result = activate_skill_inner(&ext_dirs, "locked-skill").await; + assert!(result.is_err()); + let msg = result.unwrap_err(); + assert!( + msg.contains("cannot be activated by the model"), + "Expected 'cannot be activated by the model' in error: {}", + msg + ); + } + + #[test] + fn test_activate_started_at_uses_message_count() { + use crate::chat::types::ActiveCommandContext; + + let mut ctx = ActiveCommandContext::default(); + assert!(ctx.started_at_index.is_none()); + + // Simulate: at activation time, there are 3 messages already in session + ctx.started_at_index = Some(3); + assert_eq!(ctx.started_at_index, Some(3)); + + // After reset, index is cleared + ctx = ActiveCommandContext::default(); + assert!(ctx.started_at_index.is_none()); + } + + #[test] + fn test_deactivate_uses_active_skill_not_active_command() { + use crate::chat::types::{ActiveCommandContext, ThreadParams}; + use std::sync::Arc; + use std::sync::atomic::AtomicBool; + use tokio::sync::{broadcast, Notify}; + use std::collections::VecDeque; + use std::time::Instant; + + let (tx, _rx) = broadcast::channel(16); + let mut session = crate::chat::types::ChatSession { + chat_id: "test".to_string(), + thread: ThreadParams { + id: "test".to_string(), + active_skill: Some("real-skill".to_string()), + ..Default::default() + }, + active_command: ActiveCommandContext { + name: "some-slash-command".to_string(), + started_at_index: Some(0), + activation_tool_call_id: None, + ..Default::default() + }, + messages: Vec::new(), + runtime: crate::chat::types::RuntimeState::default(), + draft_message: None, + draft_usage: None, + command_queue: VecDeque::new(), + event_seq: 0, + event_tx: tx, + recent_request_ids: VecDeque::new(), + abort_flag: Arc::new(AtomicBool::new(false)), + queue_processor_running: Arc::new(AtomicBool::new(false)), + queue_notify: Arc::new(Notify::new()), + last_activity: Instant::now(), + trajectory_dirty: false, + trajectory_version: 0, + created_at: "2024-01-01T00:00:00Z".to_string(), + closed: false, + closed_flag: Arc::new(AtomicBool::new(false)), + external_reload_pending: false, + last_prompt_messages: Vec::new(), + cache_guard_snapshot: None, + cache_guard_force_next: false, + task_agent_error: None, + trajectory_events_tx: None, + pending_browser_message: None, + skills_available_count: 0, + skills_included: Vec::new(), + pending_skill_deactivation: None, + }; + + let skill_name = match session.thread.active_skill.clone() { + Some(name) => name, + None => panic!("Expected active_skill to be set"), + }; + assert_eq!(skill_name, "real-skill", "Must use active_skill, not active_command.name"); + assert_ne!(skill_name, session.active_command.name); + + session.active_command = ActiveCommandContext::default(); + session.clear_active_skill(); + assert!(session.thread.active_skill.is_none()); + } + + #[test] + fn test_activate_already_active_skill_returns_early() { + let active_skill = Some("my-skill".to_string()); + let name = "my-skill"; + let already_active = active_skill.as_deref() == Some(name); + assert!(already_active, "Should detect already active skill"); + + let inactive_skill: Option = None; + let not_active = inactive_skill.as_deref() == Some(name); + assert!(!not_active, "None should not match active skill"); + + let other_skill = Some("other-skill".to_string()); + let different = other_skill.as_deref() == Some(name); + assert!(!different, "Different skill name should not match"); + } + + #[tokio::test] + async fn test_activate_rejects_traversal_name() { + let tmp = tempfile::tempdir().unwrap(); + let ext_dirs = make_ext_dirs(tmp.path()); + + let result = activate_skill_inner(&ext_dirs, "../../etc").await; + assert!(result.is_err(), "traversal name should be rejected"); + let msg = result.unwrap_err(); + assert!( + msg.contains("Invalid skill name") || msg.contains("not found"), + "Expected rejection message, got: {}", + msg + ); + + let result2 = activate_skill_inner(&ext_dirs, "../passwd").await; + assert!(result2.is_err(), "traversal name should be rejected"); + } +} diff --git a/refact-agent/engine/src/tools/tool_add_workspace_folder.rs b/refact-agent/engine/src/tools/tool_add_workspace_folder.rs index 3993972cd9..bb0054b236 100644 --- a/refact-agent/engine/src/tools/tool_add_workspace_folder.rs +++ b/refact-agent/engine/src/tools/tool_add_workspace_folder.rs @@ -6,7 +6,7 @@ use async_trait::async_trait; use tokio::sync::Mutex as AMutex; use crate::at_commands::at_commands::AtCommandsContext; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::files_in_workspace::enqueue_all_files_from_workspace_folders; @@ -27,14 +27,9 @@ impl Tool for ToolAddWorkspaceFolder { experimental: false, allow_parallel: false, description: "Add a folder to the workspace so its files become available for search and editing. Use this when you need to access files in a directory that isn't currently indexed (e.g., submodules, extra_repos, or external directories).".to_string(), - parameters: vec![ - ToolParam { - name: "path".to_string(), - description: "Absolute path to the folder to add to the workspace.".to_string(), - param_type: "string".to_string(), - }, - ], - parameters_required: vec!["path".to_string()], + input_schema: json_schema_from_params(&[("path", "string", "Absolute path to the folder to add to the workspace.")], &["path"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_ask_questions.rs b/refact-agent/engine/src/tools/tool_ask_questions.rs index 4414f7f1db..ceaa9312ad 100644 --- a/refact-agent/engine/src/tools/tool_ask_questions.rs +++ b/refact-agent/engine/src/tools/tool_ask_questions.rs @@ -8,7 +8,7 @@ use tokio::sync::Mutex as AMutex; use crate::at_commands::at_commands::AtCommandsContext; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType}; use crate::http::routers::v1::sidebar::{NotificationEvent, NotificationQuestion}; #[derive(Debug, Clone, Serialize, Deserialize)] @@ -38,14 +38,42 @@ impl Tool for ToolAskQuestions { experimental: false, allow_parallel: false, description: "Present questions to the user and wait for answers. Stops generation until user responds. Question types: yes_no, single_select, multi_select, free_text.".to_string(), - parameters: vec![ - ToolParam { - name: "questions".to_string(), - param_type: "string".to_string(), - description: "JSON array of question objects with fields: id (unique identifier), type (yes_no|single_select|multi_select|free_text), text (the question), options (array of choices for select types). Example: [{\"id\":\"q1\",\"type\":\"yes_no\",\"text\":\"Continue?\"}]".to_string(), + input_schema: serde_json::json!({ + "type": "object", + "properties": { + "questions": { + "type": "array", + "description": "List of questions to present to the user.", + "items": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "Unique identifier for the question." + }, + "type": { + "type": "string", + "description": "Question type: yes_no, single_select, multi_select, or free_text.", + "enum": ["yes_no", "single_select", "multi_select", "free_text"] + }, + "text": { + "type": "string", + "description": "The question text to display to the user." + }, + "options": { + "type": "array", + "description": "Options for single_select or multi_select questions.", + "items": { "type": "string" } + } + }, + "required": ["id", "type", "text"] + } + } }, - ], - parameters_required: vec!["questions".to_string()], + "required": ["questions"] + }), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_ast_definition.rs b/refact-agent/engine/src/tools/tool_ast_definition.rs index 6466b5cbba..3fb12c4e70 100644 --- a/refact-agent/engine/src/tools/tool_ast_definition.rs +++ b/refact-agent/engine/src/tools/tool_ast_definition.rs @@ -8,7 +8,7 @@ use crate::at_commands::at_commands::AtCommandsContext; use crate::ast::ast_structs::AstDB; use crate::ast::ast_db::fetch_counters; use crate::custom_error::trace_and_default; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum, ContextFile}; use crate::postprocessing::pp_command_output::OutputFilter; use crate::knowledge_index::format_related_memories_section; @@ -193,14 +193,9 @@ impl Tool for ToolAstDefinition { experimental: false, allow_parallel: true, description: "Find definition of a symbol in the project using AST".to_string(), - parameters: vec![ - ToolParam { - name: "symbols".to_string(), - description: "Comma-separated list of symbols to search for (functions, methods, classes, type aliases). No spaces allowed in symbol names.".to_string(), - param_type: "string".to_string(), - }, - ], - parameters_required: vec!["symbols".to_string()], + input_schema: json_schema_from_params(&[("symbols", "string", "Comma-separated list of symbols to search for (functions, methods, classes, type aliases). No spaces allowed in symbol names.")], &["symbols"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_cat.rs b/refact-agent/engine/src/tools/tool_cat.rs index eeacc62fa3..7a94c21142 100644 --- a/refact-agent/engine/src/tools/tool_cat.rs +++ b/refact-agent/engine/src/tools/tool_cat.rs @@ -9,7 +9,7 @@ use async_trait::async_trait; use resvg::{tiny_skia, usvg}; use crate::at_commands::at_commands::AtCommandsContext; use crate::at_commands::at_file::{file_repair_candidates, return_one_candidate_or_a_good_error}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum, ContextFile}; use crate::files_correction::{ canonical_path, correct_to_nearest_dir_path, get_project_dirs, @@ -127,14 +127,9 @@ impl Tool for ToolCat { experimental: false, allow_parallel: true, description: "Like cat in console, but better: it can read multiple files and images. Prefer to open full files.".to_string(), - parameters: vec![ - ToolParam { - name: "paths".to_string(), - description: "Comma separated file names or directories: dir1/file1.ext,dir3/dir4.".to_string(), - param_type: "string".to_string(), - }, - ], - parameters_required: vec!["paths".to_string()], + input_schema: json_schema_from_params(&[("paths", "string", "Comma separated file names or directories: dir1/file1.ext,dir3/dir4.")], &["paths"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_code_review.rs b/refact-agent/engine/src/tools/tool_code_review.rs index 6689a306c8..5be806f941 100644 --- a/refact-agent/engine/src/tools/tool_code_review.rs +++ b/refact-agent/engine/src/tools/tool_code_review.rs @@ -8,7 +8,7 @@ use axum::http::StatusCode; use std::collections::HashMap; use crate::subchat::{run_subchat_once_with_parent, resolve_subchat_params, resolve_subchat_model}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::tools::tool_helpers::{load_code_subagent_config, CodeSubagentConfig}; use crate::tools::subagent_phases::{ gather_files_phase, GatherFilesParams, @@ -226,8 +226,9 @@ impl Tool for ToolCodeReview { experimental: false, allow_parallel: true, description: "Perform a thorough code review. Automatically identifies relevant files and checks for bugs, integration issues, missing tests, code style, and consistency.".to_string(), - parameters: vec![], - parameters_required: vec![], + input_schema: json_schema_from_params(&[], &[]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_compress_chat.rs b/refact-agent/engine/src/tools/tool_compress_chat.rs new file mode 100644 index 0000000000..853a1be7bc --- /dev/null +++ b/refact-agent/engine/src/tools/tool_compress_chat.rs @@ -0,0 +1,724 @@ +use std::collections::{HashMap, HashSet}; +use std::sync::Arc; + +use async_trait::async_trait; +use serde_json::{json, Value}; +use tokio::sync::Mutex as AMutex; + +use crate::at_commands::at_commands::AtCommandsContext; +use crate::call_validation::{ChatContent, ChatMessage, ContextEnum, ContextFile}; +use crate::chat::get_or_create_session_with_trajectory; +use crate::chat::trajectories::maybe_save_trajectory; +use crate::chat::history_limit::compress_duplicate_context_files; +use crate::chat::history_limit::remove_invalid_tool_calls_and_tool_calls_results; +use crate::chat::types::SessionState; +use crate::integrations::integr_abstract::IntegrationConfirmation; +use crate::postprocessing::pp_command_output::OutputFilter; +use crate::tools::tools_description::{ + json_schema_from_params, MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolSource, + ToolSourceType, +}; + +const TOOL_OUTPUT_TRUNCATE_LIMIT: usize = 200; +const MAX_PER_MESSAGE_ENTRIES: usize = 200; +const MAX_CONTEXT_ENTRIES: usize = 200; +const MAX_TOOL_OUTPUT_ENTRIES: usize = 200; +const TOOLS_TO_PRESERVE: &[&str] = &[ + "deep_research", + "subagent", + "strategic_planning", + "code_review", +]; + +fn should_preserve_tool(name: &str) -> bool { + TOOLS_TO_PRESERVE.iter().any(|t| *t == name) +} + +fn approx_tokens_for_len(len: usize) -> usize { + len / 4 + 10 +} + +fn approx_tokens_for_message(msg: &ChatMessage) -> usize { + let content_len = match &msg.content { + ChatContent::SimpleText(text) => text.len(), + ChatContent::Multimodal(elements) => elements.len() * 100, + ChatContent::ContextFiles(files) => files.iter().map(|cf| cf.file_content.len()).sum(), + }; + approx_tokens_for_len(content_len) +} + +fn extract_context_files(message: &ChatMessage) -> Vec { + match &message.content { + ChatContent::ContextFiles(files) => files.clone(), + ChatContent::SimpleText(text) => serde_json::from_str(text).unwrap_or_default(), + _ => vec![], + } +} + +fn is_memory_path(path: &str) -> bool { + path.contains("/.refact/knowledge/") + || path.contains("/.refact/trajectories/") + || path.contains("/.refact/tasks/") +} + +fn parse_bool(args: &HashMap, key: &str) -> bool { + match args.get(key) { + Some(Value::Bool(b)) => *b, + Some(Value::String(s)) => s.trim().eq_ignore_ascii_case("true"), + _ => false, + } +} + +fn parse_string_list(args: &HashMap, key: &str) -> Vec { + match args.get(key) { + Some(Value::Array(items)) => items + .iter() + .filter_map(|v| v.as_str().map(|s| s.to_string())) + .collect(), + Some(Value::String(text)) => { + let trimmed = text.trim(); + if trimmed.starts_with('[') { + serde_json::from_str::>(trimmed).unwrap_or_default() + } else { + trimmed + .split(',') + .map(|s| s.trim().to_string()) + .filter(|s| !s.is_empty()) + .collect() + } + } + _ => vec![], + } +} + +pub struct ToolCompressChatProbe { + pub config_path: String, +} + +pub struct ToolCompressChatApply { + pub config_path: String, +} + +#[async_trait] +impl Tool for ToolCompressChatProbe { + fn tool_description(&self) -> ToolDesc { + ToolDesc { + name: "compress_chat_probe".to_string(), + display_name: "Compress Chat (Probe)".to_string(), + source: ToolSource { + source_type: ToolSourceType::Builtin, + config_path: self.config_path.clone(), + }, + experimental: false, + allow_parallel: false, + description: "Analyze the current chat and report token distribution plus potential compression gains. Approval required.".to_string(), + input_schema: json_schema_from_params(&[], &[]), + output_schema: None, + annotations: None, + } + } + + async fn tool_execute( + &mut self, + ccx: Arc>, + tool_call_id: &String, + _args: &HashMap, + ) -> Result<(bool, Vec), String> { + let (gcx, chat_id) = { + let ccx_lock = ccx.lock().await; + (ccx_lock.global_context.clone(), ccx_lock.chat_id.clone()) + }; + + let sessions = gcx.read().await.chat_sessions.clone(); + let session_arc = get_or_create_session_with_trajectory(gcx.clone(), &sessions, &chat_id).await; + let messages = { + let session = session_arc.lock().await; + session.messages.clone() + }; + + if messages.is_empty() { + return Err("Cannot probe an empty chat".to_string()); + } + + let mut role_tokens: HashMap = HashMap::new(); + let mut per_message: Vec = Vec::new(); + let mut total_tokens = 0usize; + + let mut context_occurrences: HashMap = HashMap::new(); + let mut context_token_map: HashMap> = HashMap::new(); + + for (idx, msg) in messages.iter().enumerate() { + let content_len = match &msg.content { + ChatContent::SimpleText(text) => text.len(), + ChatContent::Multimodal(elements) => elements.len() * 100, + ChatContent::ContextFiles(files) => files.iter().map(|cf| cf.file_content.len()).sum(), + }; + let tokens = approx_tokens_for_len(content_len); + total_tokens += tokens; + *role_tokens.entry(msg.role.clone()).or_insert(0) += tokens; + per_message.push(json!({ + "index": idx, + "role": msg.role, + "tokens": tokens, + "chars": content_len, + })); + + if msg.role == "context_file" { + for cf in extract_context_files(msg) { + *context_occurrences.entry(cf.file_name.clone()).or_insert(0) += 1; + context_token_map + .entry(cf.file_name.clone()) + .or_default() + .push(approx_tokens_for_len(cf.file_content.len())); + } + } + } + + let mut context_files: Vec = Vec::new(); + let mut memory_tokens = 0usize; + for (idx, msg) in messages.iter().enumerate() { + if msg.role != "context_file" { + continue; + } + for cf in extract_context_files(msg) { + let tokens = approx_tokens_for_len(cf.file_content.len()); + let is_memory = is_memory_path(&cf.file_name); + if is_memory { + memory_tokens += tokens; + } + let occurrences = context_occurrences.get(&cf.file_name).copied().unwrap_or(1); + let file_name = cf.file_name.clone(); + context_files.push(json!({ + "index": idx, + "file_name": file_name, + "tokens": tokens, + "chars": cf.file_content.len(), + "is_memory": is_memory, + "occurrences": occurrences, + })); + } + } + + let mut tool_call_names: HashMap = HashMap::new(); + for msg in &messages { + if let Some(ref tool_calls) = msg.tool_calls { + for tc in tool_calls { + tool_call_names.insert(tc.id.clone(), tc.function.name.clone()); + } + } + } + + let mut tool_outputs: Vec = Vec::new(); + let mut tool_output_tokens = 0usize; + for (idx, msg) in messages.iter().enumerate() { + if msg.role != "tool" && msg.role != "diff" { + continue; + } + let tokens = approx_tokens_for_message(msg); + let tool_name = tool_call_names + .get(&msg.tool_call_id) + .cloned() + .unwrap_or_else(|| "unknown".to_string()); + if !should_preserve_tool(&tool_name) { + tool_output_tokens += tokens; + } + tool_outputs.push(json!({ + "index": idx, + "tool_call_id": msg.tool_call_id, + "tool_name": tool_name, + "role": msg.role, + "tokens": tokens, + "chars": msg.content.content_text_only().len(), + })); + } + + let mut context_messages: Vec = Vec::new(); + for (idx, msg) in messages.iter().enumerate() { + if msg.role != "context_file" { + continue; + } + context_messages.push(json!({ + "index": idx, + "tool_call_id": msg.tool_call_id, + "tokens": approx_tokens_for_message(msg), + "chars": msg.content.content_text_only().len(), + })); + } + + let mut per_message_truncated = false; + if per_message.len() > MAX_PER_MESSAGE_ENTRIES { + let head = MAX_PER_MESSAGE_ENTRIES / 2; + let tail = MAX_PER_MESSAGE_ENTRIES - head; + let mut trimmed = Vec::with_capacity(MAX_PER_MESSAGE_ENTRIES); + trimmed.extend_from_slice(&per_message[..head]); + trimmed.extend_from_slice(&per_message[per_message.len().saturating_sub(tail)..]); + per_message = trimmed; + per_message_truncated = true; + } + + let mut context_messages_truncated = false; + if context_messages.len() > MAX_CONTEXT_ENTRIES { + let head = MAX_CONTEXT_ENTRIES / 2; + let tail = MAX_CONTEXT_ENTRIES - head; + let mut trimmed = Vec::with_capacity(MAX_CONTEXT_ENTRIES); + trimmed.extend_from_slice(&context_messages[..head]); + trimmed.extend_from_slice(&context_messages[context_messages.len().saturating_sub(tail)..]); + context_messages = trimmed; + context_messages_truncated = true; + } + + let mut context_files_truncated = false; + if context_files.len() > MAX_CONTEXT_ENTRIES { + context_files.sort_by_key(|v| v.get("tokens").and_then(|x| x.as_u64()).unwrap_or(0)); + context_files.reverse(); + context_files.truncate(MAX_CONTEXT_ENTRIES); + context_files_truncated = true; + } + + let mut tool_outputs_truncated = false; + if tool_outputs.len() > MAX_TOOL_OUTPUT_ENTRIES { + tool_outputs.sort_by_key(|v| v.get("tokens").and_then(|x| x.as_u64()).unwrap_or(0)); + tool_outputs.reverse(); + tool_outputs.truncate(MAX_TOOL_OUTPUT_ENTRIES); + tool_outputs_truncated = true; + } + + let mut duplicate_context_tokens = 0usize; + for tokens in context_token_map.values() { + if tokens.len() > 1 { + let max_val = tokens.iter().copied().max().unwrap_or(0); + let total: usize = tokens.iter().sum(); + duplicate_context_tokens += total.saturating_sub(max_val); + } + } + + let mut project_info_tokens = 0usize; + for msg in &messages { + if msg.role == "system" { + let text = msg.content.content_text_only().to_lowercase(); + if text.contains("project") || text.contains("workspace") { + project_info_tokens += approx_tokens_for_message(msg); + } + } + } + + let role_tokens_json = serde_json::to_value(&role_tokens).unwrap_or_else(|_| json!({})); + + let result = json!({ + "type": "compress_chat_probe", + "messages_count": messages.len(), + "total_tokens": total_tokens, + "role_tokens": role_tokens_json, + "per_message": per_message, + "context_files": context_files, + "context_messages": context_messages, + "tool_outputs": tool_outputs, + "per_message_truncated": per_message_truncated, + "context_files_truncated": context_files_truncated, + "context_messages_truncated": context_messages_truncated, + "tool_outputs_truncated": tool_outputs_truncated, + "potential_gains": { + "duplicate_context_tokens": duplicate_context_tokens, + "tool_output_tokens": tool_output_tokens, + "memory_tokens": memory_tokens, + "project_info_tokens": project_info_tokens, + } + }); + + Ok(( + false, + vec![ContextEnum::ChatMessage(ChatMessage { + role: "tool".to_string(), + content: ChatContent::SimpleText( + serde_json::to_string_pretty(&result).unwrap_or_else(|_| result.to_string()), + ), + tool_call_id: tool_call_id.clone(), + output_filter: Some(OutputFilter::no_limits()), + ..Default::default() + })], + )) + } + + async fn command_to_match_against_confirm_deny( + &self, + _ccx: Arc>, + _args: &HashMap, + ) -> Result { + Ok("compress_chat_probe".to_string()) + } + + fn confirm_deny_rules(&self) -> Option { + Some(IntegrationConfirmation { + ask_user: vec!["*".to_string()], + deny: vec![], + }) + } + + async fn match_against_confirm_deny( + &self, + ccx: Arc>, + args: &HashMap, + ) -> Result { + let command_to_match = self + .command_to_match_against_confirm_deny(ccx.clone(), args) + .await + .map_err(|e| format!("Error getting tool command to match: {}", e))?; + Ok(MatchConfirmDeny { + result: MatchConfirmDenyResult::CONFIRMATION, + command: command_to_match, + rule: "default".to_string(), + }) + } +} + +#[async_trait] +impl Tool for ToolCompressChatApply { + fn tool_description(&self) -> ToolDesc { + let input_schema = json!({ + "type": "object", + "properties": { + "drop_context_files": { + "type": "array", + "items": {"type": "string"}, + "description": "List of context file names to drop entirely" + }, + "drop_memories": { + "type": "array", + "items": {"type": "string"}, + "description": "Memory/knowledge file paths to drop" + }, + "drop_context_messages": { + "type": "array", + "items": {"type": "string"}, + "description": "Context-file message tool_call_id values to drop entirely" + }, + "drop_all_memories": { + "type": "boolean", + "description": "Drop all memory/knowledge context files" + }, + "truncate_tool_outputs": { + "type": "array", + "items": {"type": "string"}, + "description": "Tool call IDs to truncate" + }, + "drop_tool_outputs": { + "type": "array", + "items": {"type": "string"}, + "description": "Tool call IDs to drop (replaced with a short placeholder)" + }, + "dedup_context_files": { + "type": "boolean", + "description": "Deduplicate repeated context files" + }, + "drop_project_information": { + "type": "boolean", + "description": "Drop system/project info messages" + } + }, + "required": [] + }); + + ToolDesc { + name: "compress_chat_apply".to_string(), + display_name: "Compress Chat (Apply)".to_string(), + source: ToolSource { + source_type: ToolSourceType::Builtin, + config_path: self.config_path.clone(), + }, + experimental: false, + allow_parallel: false, + description: "Apply selective compression to the current chat using explicit drop/truncate lists. Approval required.".to_string(), + input_schema, + output_schema: None, + annotations: None, + } + } + + async fn tool_execute( + &mut self, + ccx: Arc>, + tool_call_id: &String, + args: &HashMap, + ) -> Result<(bool, Vec), String> { + let drop_context_files = parse_string_list(args, "drop_context_files"); + let drop_memories = parse_string_list(args, "drop_memories"); + let drop_all_memories = parse_bool(args, "drop_all_memories"); + let truncate_tool_outputs = parse_string_list(args, "truncate_tool_outputs"); + let drop_tool_outputs = parse_string_list(args, "drop_tool_outputs"); + let drop_context_messages = parse_string_list(args, "drop_context_messages"); + let dedup_context_files = parse_bool(args, "dedup_context_files"); + let drop_project_information = parse_bool(args, "drop_project_information"); + + let (gcx, chat_id) = { + let ccx_lock = ccx.lock().await; + (ccx_lock.global_context.clone(), ccx_lock.chat_id.clone()) + }; + + let sessions = gcx.read().await.chat_sessions.clone(); + let session_arc = get_or_create_session_with_trajectory(gcx.clone(), &sessions, &chat_id).await; + + let (before_tokens, before_count, active_start, mut head_messages, tail_messages, tool_call_names) = { + let session = session_arc.lock().await; + + if matches!(session.runtime.state, SessionState::Generating) { + return Err("Cannot compress while generating".to_string()); + } + + let before_tokens = session.messages.iter().map(approx_tokens_for_message).sum::(); + let before_count = session.messages.len(); + let active_start = session + .messages + .iter() + .rposition(|m| { + m.role == "assistant" + && m.tool_calls + .as_ref() + .map(|tcs| tcs.iter().any(|tc| tc.id == *tool_call_id)) + .unwrap_or(false) + }) + .unwrap_or(session.messages.len()); + + if active_start >= session.messages.len() { + return Err("Active tool call not found in session".to_string()); + } + + let tool_call_names: HashMap = session + .messages + .iter() + .filter_map(|m| m.tool_calls.as_ref()) + .flatten() + .map(|tc| (tc.id.clone(), tc.function.name.clone())) + .collect(); + + ( + before_tokens, + before_count, + active_start, + session.messages[..active_start].to_vec(), + session.messages[active_start..].to_vec(), + tool_call_names, + ) + }; + + let drop_context_files: HashSet = drop_context_files.into_iter().collect(); + let drop_memories: HashSet = drop_memories.into_iter().collect(); + let drop_context_messages: HashSet = drop_context_messages.into_iter().collect(); + let truncate_tool_outputs: HashSet = truncate_tool_outputs.into_iter().collect(); + let drop_tool_outputs: HashSet = drop_tool_outputs.into_iter().collect(); + + let mut context_files_dropped = 0usize; + let mut context_messages_dropped = 0usize; + let mut memory_dropped = 0usize; + let mut tool_truncated = 0usize; + let mut tool_dropped = 0usize; + let mut project_info_dropped = 0usize; + let mut dedup_count = 0usize; + + // Drop project info system messages + if drop_project_information { + head_messages.retain(|msg| { + if msg.role != "system" { + return true; + } + let text = msg.content.content_text_only().to_lowercase(); + if text.contains("project") || text.contains("workspace") { + project_info_dropped += 1; + false + } else { + true + } + }); + } + + // Modify context files + let mut updated_head: Vec = Vec::with_capacity(head_messages.len()); + for msg in head_messages.into_iter() { + if msg.role != "context_file" { + updated_head.push(msg); + continue; + } + if !msg.tool_call_id.is_empty() && drop_context_messages.contains(&msg.tool_call_id) { + context_messages_dropped += 1; + continue; + } + + let mut files = extract_context_files(&msg); + if files.is_empty() { + updated_head.push(msg); + continue; + } + + let mut remaining: Vec = Vec::new(); + for cf in files.drain(..) { + let is_memory = is_memory_path(&cf.file_name); + if drop_context_files.contains(&cf.file_name) { + context_files_dropped += 1; + continue; + } + if drop_all_memories && is_memory { + memory_dropped += 1; + continue; + } + if drop_memories.contains(&cf.file_name) { + memory_dropped += 1; + continue; + } + remaining.push(cf); + } + + if remaining.is_empty() { + context_messages_dropped += 1; + continue; + } + + let mut new_msg = msg.clone(); + new_msg.content = ChatContent::ContextFiles(remaining); + updated_head.push(new_msg); + } + + head_messages = updated_head; + + if dedup_context_files { + if let Ok((count, _)) = compress_duplicate_context_files(&mut head_messages) { + dedup_count = count; + } + } + + // Modify tool outputs + for msg in head_messages.iter_mut() { + if msg.role != "tool" && msg.role != "diff" { + continue; + } + if msg.tool_call_id.is_empty() { + continue; + } + if drop_tool_outputs.contains(&msg.tool_call_id) { + msg.content = ChatContent::SimpleText("Tool result removed by compress_chat_apply".to_string()); + tool_dropped += 1; + continue; + } + if truncate_tool_outputs.contains(&msg.tool_call_id) { + if let Some(name) = tool_call_names.get(&msg.tool_call_id) { + if should_preserve_tool(name) { + continue; + } + } + let content = msg.content.content_text_only(); + if content.len() > TOOL_OUTPUT_TRUNCATE_LIMIT { + let preview: String = content.chars().take(TOOL_OUTPUT_TRUNCATE_LIMIT).collect(); + msg.content = ChatContent::SimpleText(format!( + "Tool result compressed: {}...", + preview + )); + tool_truncated += 1; + } + } + } + + head_messages.extend(tail_messages); + let active_call_id = tool_call_id.clone(); + let active_msg = head_messages + .iter() + .enumerate() + .find(|(_, msg)| { + msg.role == "assistant" + && msg.tool_calls + .as_ref() + .map(|tcs| tcs.iter().any(|tc| tc.id == active_call_id)) + .unwrap_or(false) + }) + .map(|(idx, msg)| (idx, msg.clone())); + + remove_invalid_tool_calls_and_tool_calls_results(&mut head_messages); + + if let Some((active_idx, active_msg)) = active_msg { + let still_present = head_messages.iter().any(|msg| { + msg.role == "assistant" + && msg.tool_calls + .as_ref() + .map(|tcs| tcs.iter().any(|tc| tc.id == active_call_id)) + .unwrap_or(false) + }); + if !still_present { + head_messages.insert(active_idx.min(head_messages.len()), active_msg); + } + } + + let after_tokens = head_messages.iter().map(approx_tokens_for_message).sum::(); + let after_count = head_messages.len(); + + { + let mut session = session_arc.lock().await; + session.messages = head_messages; + session.increment_version(); + let snapshot = session.snapshot(); + session.emit(snapshot); + } + + maybe_save_trajectory(gcx.clone(), session_arc.clone()).await; + + let result = json!({ + "type": "compress_chat_apply", + "before_message_count": before_count, + "after_message_count": after_count, + "before_tokens": before_tokens, + "after_tokens": after_tokens, + "context_files_dropped": context_files_dropped, + "context_messages_dropped": context_messages_dropped, + "memories_dropped": memory_dropped, + "tool_outputs_truncated": tool_truncated, + "tool_outputs_dropped": tool_dropped, + "project_info_dropped": project_info_dropped, + "dedup_context_files": dedup_count, + "active_tail_start": active_start, + }); + + Ok(( + false, + vec![ContextEnum::ChatMessage(ChatMessage { + role: "tool".to_string(), + content: ChatContent::SimpleText(result.to_string()), + tool_call_id: tool_call_id.clone(), + output_filter: Some(OutputFilter::no_limits()), + ..Default::default() + })], + )) + } + + async fn command_to_match_against_confirm_deny( + &self, + _ccx: Arc>, + args: &HashMap, + ) -> Result { + let drops = parse_string_list(args, "drop_context_files"); + let drops_summary = if drops.is_empty() { + "none".to_string() + } else { + format!("{} file(s)", drops.len()) + }; + Ok(format!("compress_chat_apply ({})", drops_summary)) + } + + fn confirm_deny_rules(&self) -> Option { + Some(IntegrationConfirmation { + ask_user: vec!["*".to_string()], + deny: vec![], + }) + } + + async fn match_against_confirm_deny( + &self, + ccx: Arc>, + args: &HashMap, + ) -> Result { + let command_to_match = self + .command_to_match_against_confirm_deny(ccx.clone(), args) + .await + .map_err(|e| format!("Error getting tool command to match: {}", e))?; + Ok(MatchConfirmDeny { + result: MatchConfirmDenyResult::CONFIRMATION, + command: command_to_match, + rule: "default".to_string(), + }) + } +} diff --git a/refact-agent/engine/src/tools/tool_config_subagent.rs b/refact-agent/engine/src/tools/tool_config_subagent.rs index 2474b70c9a..d3e10ec2f1 100644 --- a/refact-agent/engine/src/tools/tool_config_subagent.rs +++ b/refact-agent/engine/src/tools/tool_config_subagent.rs @@ -4,7 +4,8 @@ use serde_json::Value; use tokio::sync::Mutex as AMutex; use async_trait::async_trait; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; +use serde_json::json; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::at_commands::at_commands::AtCommandsContext; use crate::subchat::run_subchat; @@ -20,31 +21,25 @@ impl ToolConfigSubagent { Self { config } } - fn build_tool_params(&self) -> Vec { + fn build_input_schema(&self) -> serde_json::Value { if let Some(ref tool_schema) = self.config.tool { - tool_schema.parameters.iter().map(|p| { - ToolParam { - name: p.name.clone(), - param_type: p.param_type.clone(), - description: p.description.clone(), - } - }).collect() - } else { - vec![ - ToolParam { - name: "task".to_string(), - param_type: "string".to_string(), - description: "The task to execute".to_string(), - }, - ] - } - } - - fn build_required_params(&self) -> Vec { - if let Some(ref tool_schema) = self.config.tool { - tool_schema.required.clone() + let mut properties = serde_json::Map::new(); + for p in &tool_schema.parameters { + properties.insert(p.name.clone(), json!({ + "type": p.param_type, + "description": p.description + })); + } + json!({ + "type": "object", + "properties": properties, + "required": tool_schema.required + }) } else { - vec!["task".to_string()] + json_schema_from_params( + &[("task", "string", "The task to execute")], + &["task"], + ) } } @@ -85,8 +80,9 @@ impl Tool for ToolConfigSubagent { experimental: false, allow_parallel, description, - parameters: self.build_tool_params(), - parameters_required: self.build_required_params(), + input_schema: self.build_input_schema(), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_create_knowledge.rs b/refact-agent/engine/src/tools/tool_create_knowledge.rs index 9f8b43982e..8c2d409f45 100644 --- a/refact-agent/engine/src/tools/tool_create_knowledge.rs +++ b/refact-agent/engine/src/tools/tool_create_knowledge.rs @@ -7,7 +7,7 @@ use tokio::sync::Mutex as AMutex; use crate::at_commands::at_commands::AtCommandsContext; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::memories::{memories_add_enriched, EnrichmentParams}; use crate::knowledge_index::format_related_memories_section; @@ -28,24 +28,9 @@ impl Tool for ToolCreateKnowledge { experimental: false, allow_parallel: false, description: "Creates a new knowledge entry. Uses AI to enrich metadata and check for outdated documents. Use it if you need to remember something.".to_string(), - parameters: vec![ - ToolParam { - name: "content".to_string(), - param_type: "string".to_string(), - description: "The knowledge content to store.".to_string(), - }, - ToolParam { - name: "tags".to_string(), - param_type: "string".to_string(), - description: "Comma-separated tags (optional, will be auto-enriched).".to_string(), - }, - ToolParam { - name: "filenames".to_string(), - param_type: "string".to_string(), - description: "Comma-separated related file paths (optional, will be auto-enriched).".to_string(), - }, - ], - parameters_required: vec!["content".to_string()], + input_schema: json_schema_from_params(&[("content", "string", "The knowledge content to store."), ("tags", "string", "Comma-separated tags (optional, will be auto-enriched)."), ("filenames", "string", "Comma-separated related file paths (optional, will be auto-enriched).")], &["content"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_deep_research.rs b/refact-agent/engine/src/tools/tool_deep_research.rs index 10cace8bae..c9252168b2 100644 --- a/refact-agent/engine/src/tools/tool_deep_research.rs +++ b/refact-agent/engine/src/tools/tool_deep_research.rs @@ -5,9 +5,7 @@ use tokio::sync::Mutex as AMutex; use async_trait::async_trait; use crate::subchat::run_subchat_once_with_parent; -use crate::tools::tools_description::{ - Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType, MatchConfirmDeny, MatchConfirmDenyResult, -}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, MatchConfirmDeny, MatchConfirmDenyResult, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::at_commands::at_commands::AtCommandsContext; use crate::global_context::GlobalContext; @@ -83,14 +81,9 @@ impl Tool for ToolDeepResearch { experimental: false, allow_parallel: true, description: "Conduct comprehensive web research on a topic. Use this tool when you need up-to-date information from the internet, market analysis, technical documentation research, or synthesis of information from multiple web sources. The research takes several minutes and produces a detailed, citation-rich report. Do NOT use for questions about the current codebase - use code exploration tools instead.".to_string(), - parameters: vec![ - ToolParam { - name: "research_query".to_string(), - param_type: "string".to_string(), - description: "A detailed research question or topic. Be specific: include the scope, what comparisons or metrics you need, any preferred sources, and the desired output format. Example: 'Research the current best practices for Rust async error handling in 2024, comparing tokio vs async-std approaches, with code examples and performance considerations.'".to_string(), - } - ], - parameters_required: vec!["research_query".to_string()], + input_schema: json_schema_from_params(&[("research_query", "string", "A detailed research question or topic. Be specific: include the scope, what comparisons or metrics you need, any preferred sources, and the desired output format. Example: 'Research the current best practices for Rust async error handling in 2024, comparing tokio vs async-std approaches, with code examples and performance considerations.'")], &["research_query"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_handoff_to_mode.rs b/refact-agent/engine/src/tools/tool_handoff_to_mode.rs new file mode 100644 index 0000000000..2b348aedb7 --- /dev/null +++ b/refact-agent/engine/src/tools/tool_handoff_to_mode.rs @@ -0,0 +1,338 @@ +use std::collections::HashMap; +use std::sync::Arc; +use std::sync::atomic::Ordering; + +use async_trait::async_trait; +use serde_json::{json, Value}; +use tokio::sync::Mutex as AMutex; +use uuid::Uuid; + +use crate::agentic::mode_transition::{analyze_mode_transition, assemble_new_chat, ParsedDecisions}; +use crate::at_commands::at_commands::AtCommandsContext; +use crate::call_validation::{ChatContent, ChatMessage, ContextEnum}; +use crate::chat::get_or_create_session_with_trajectory; +use crate::chat::trajectory_ops::sanitize_messages_for_new_thread; +use crate::chat::trajectories::save_trajectory_snapshot; +use crate::chat::types::SessionState; +use crate::integrations::integr_abstract::IntegrationConfirmation; +use crate::postprocessing::pp_command_output::OutputFilter; +use crate::tools::tools_description::{ + MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolSource, ToolSourceType, +}; +use crate::yaml_configs::customization_registry::{get_mode_config, map_legacy_mode_to_id}; + +fn parse_string_list(args: &HashMap, key: &str) -> Vec { + match args.get(key) { + Some(Value::Array(items)) => items + .iter() + .filter_map(|v| v.as_str().map(|s| s.to_string())) + .collect(), + Some(Value::String(text)) => { + let trimmed = text.trim(); + if trimmed.starts_with('[') { + serde_json::from_str::>(trimmed).unwrap_or_default() + } else { + trimmed + .split(',') + .map(|s| s.trim().to_string()) + .filter(|s| !s.is_empty()) + .collect() + } + } + _ => vec![], + } +} + +fn parse_optional_string(args: &HashMap, key: &str) -> Option { + match args.get(key) { + Some(Value::String(s)) if !s.trim().is_empty() => Some(s.trim().to_string()), + _ => None, + } +} + +fn apply_overrides(decisions: &mut ParsedDecisions, args: &HashMap) { + if let Some(summary) = parse_optional_string(args, "summary") { + decisions.summary = summary; + } + if let Some(summary) = parse_optional_string(args, "context_summary") { + decisions.summary = summary; + } + let files_to_open = parse_string_list(args, "files_to_open"); + if !files_to_open.is_empty() { + decisions.files_to_open = files_to_open; + } + let key_files = parse_string_list(args, "key_files"); + if !key_files.is_empty() { + decisions.files_to_open = key_files; + } + let messages_to_preserve = parse_string_list(args, "messages_to_preserve"); + if !messages_to_preserve.is_empty() { + decisions.messages_to_preserve = messages_to_preserve; + } + let memories_to_include = parse_string_list(args, "memories_to_include"); + if !memories_to_include.is_empty() { + decisions.memories_to_include = memories_to_include; + } + let tool_outputs_to_include = parse_string_list(args, "tool_outputs_to_include"); + if !tool_outputs_to_include.is_empty() { + decisions.tool_outputs_to_include = tool_outputs_to_include; + } + let pending_tasks = parse_string_list(args, "pending_tasks"); + if !pending_tasks.is_empty() { + decisions.pending_tasks = pending_tasks; + } + if let Some(handoff_message) = parse_optional_string(args, "handoff_message") { + decisions.handoff_message = handoff_message; + } +} + +pub struct ToolHandoffToMode { + pub config_path: String, +} + +#[async_trait] +impl Tool for ToolHandoffToMode { + fn tool_description(&self) -> ToolDesc { + let input_schema = json!({ + "type": "object", + "properties": { + "target_mode": { + "type": "string", + "description": "Target mode ID to hand off to." + }, + "reason": { + "type": "string", + "description": "Why the new mode is appropriate" + }, + "summary": { + "type": "string", + "description": "Optional summary to include in the handoff context" + }, + "context_summary": { + "type": "string", + "description": "Summary of what has been done and what to continue" + }, + "files_to_open": { + "type": "array", + "items": {"type": "string"}, + "description": "File paths to include in the new chat" + }, + "key_files": { + "type": "array", + "items": {"type": "string"}, + "description": "Key files to carry over (alias of files_to_open)" + }, + "messages_to_preserve": { + "type": "array", + "items": {"type": "string"}, + "description": "MSG_ID entries to preserve verbatim" + }, + "memories_to_include": { + "type": "array", + "items": {"type": "string"}, + "description": "Memory/knowledge file paths to include" + }, + "tool_outputs_to_include": { + "type": "array", + "items": {"type": "string"}, + "description": "MSG_ID entries of tool outputs to include" + }, + "pending_tasks": { + "type": "array", + "items": {"type": "string"}, + "description": "Pending tasks to carry forward" + }, + "handoff_message": { + "type": "string", + "description": "Short handoff message for the new chat" + } + }, + "required": ["target_mode"] + }); + + ToolDesc { + name: "handoff_to_mode".to_string(), + display_name: "Handoff To Mode".to_string(), + source: ToolSource { + source_type: ToolSourceType::Builtin, + config_path: self.config_path.clone(), + }, + experimental: false, + allow_parallel: false, + description: "Create a new chat in another mode using the current conversation context. Approval required.".to_string(), + input_schema, + output_schema: None, + annotations: None, + } + } + + async fn tool_execute( + &mut self, + ccx: Arc>, + tool_call_id: &String, + args: &HashMap, + ) -> Result<(bool, Vec), String> { + let target_mode = match args.get("target_mode") { + Some(Value::String(s)) if !s.trim().is_empty() => s.trim().to_string(), + _ => return Err("Missing required argument `target_mode`".to_string()), + }; + let reason = parse_optional_string(args, "reason").unwrap_or_default(); + + let (gcx, chat_id, abort_flag) = { + let ccx_lock = ccx.lock().await; + ( + ccx_lock.global_context.clone(), + ccx_lock.chat_id.clone(), + ccx_lock.abort_flag.clone(), + ) + }; + + let sessions = gcx.read().await.chat_sessions.clone(); + let session_arc = get_or_create_session_with_trajectory(gcx.clone(), &sessions, &chat_id).await; + + let (messages, thread, task_meta, session_state) = { + let session = session_arc.lock().await; + ( + session.messages.clone(), + session.thread.clone(), + session.thread.task_meta.clone(), + session.runtime.state, + ) + }; + + if matches!(session_state, SessionState::Generating) { + return Err("Cannot handoff while generating".to_string()); + } + if messages.is_empty() { + return Err("Cannot handoff an empty chat".to_string()); + } + + let canonical_mode = map_legacy_mode_to_id(&target_mode).to_string(); + let mode_config = get_mode_config(gcx.clone(), &canonical_mode, None) + .await + .ok_or_else(|| format!("Mode '{}' not found", canonical_mode))?; + if thread.mode == canonical_mode { + return Err("Target mode matches current mode".to_string()); + } + + let mode_title = if mode_config.title.is_empty() { + mode_config.id.clone() + } else { + mode_config.title.clone() + }; + let mode_description = if mode_config.description.is_empty() { + mode_title.clone() + } else { + format!("{} — {}", mode_title, mode_config.description) + }; + + let mut decisions = analyze_mode_transition( + gcx.clone(), + &messages, + &canonical_mode, + &mode_description, + ) + .await + .map_err(|e| format!("mode transition analysis failed: {}", e))?; + + apply_overrides(&mut decisions, args); + + let new_messages = assemble_new_chat(gcx.clone(), &messages, &decisions) + .await + .map_err(|e| format!("handoff assembly failed: {}", e))?; + + let new_messages = sanitize_messages_for_new_thread(&new_messages); + let new_chat_id = Uuid::new_v4().to_string(); + let now = chrono::Utc::now().to_rfc3339(); + + let snapshot = crate::chat::trajectories::TrajectorySnapshot { + chat_id: new_chat_id.clone(), + title: String::new(), + model: thread.model.clone(), + mode: canonical_mode.clone(), + tool_use: thread.tool_use.clone(), + messages: new_messages.clone(), + created_at: now, + boost_reasoning: thread.boost_reasoning.unwrap_or(false), + checkpoints_enabled: thread.checkpoints_enabled, + context_tokens_cap: thread.context_tokens_cap, + include_project_info: thread.include_project_info, + is_title_generated: false, + auto_approve_editing_tools: thread.auto_approve_editing_tools, + auto_approve_dangerous_commands: thread.auto_approve_dangerous_commands, + version: 1, + task_meta, + parent_id: Some(chat_id.clone()), + link_type: Some("mode_transition".to_string()), + root_chat_id: thread.root_chat_id.clone().or_else(|| Some(chat_id.clone())), + reasoning_effort: thread.reasoning_effort.clone(), + thinking_budget: thread.thinking_budget, + temperature: thread.temperature, + frequency_penalty: thread.frequency_penalty, + max_tokens: thread.max_tokens, + parallel_tool_calls: thread.parallel_tool_calls, + previous_response_id: None, + active_skill: None, + }; + + save_trajectory_snapshot(gcx.clone(), snapshot) + .await + .map_err(|e| format!("Failed to save handoff trajectory: {}", e))?; + + abort_flag.store(true, Ordering::SeqCst); + + let result = json!({ + "type": "handoff_to_mode", + "new_chat_id": new_chat_id, + "target_mode": canonical_mode, + "reason": reason, + "messages_count": new_messages.len(), + }); + + Ok(( + false, + vec![ContextEnum::ChatMessage(ChatMessage { + role: "tool".to_string(), + content: ChatContent::SimpleText(result.to_string()), + tool_call_id: tool_call_id.clone(), + output_filter: Some(OutputFilter::no_limits()), + ..Default::default() + })], + )) + } + + async fn command_to_match_against_confirm_deny( + &self, + _ccx: Arc>, + args: &HashMap, + ) -> Result { + let target = args + .get("target_mode") + .and_then(|v| v.as_str()) + .unwrap_or("?"); + Ok(format!("handoff_to_mode {}", target)) + } + + fn confirm_deny_rules(&self) -> Option { + Some(IntegrationConfirmation { + ask_user: vec!["*".to_string()], + deny: vec![], + }) + } + + async fn match_against_confirm_deny( + &self, + ccx: Arc>, + args: &HashMap, + ) -> Result { + let command_to_match = self + .command_to_match_against_confirm_deny(ccx.clone(), args) + .await + .map_err(|e| format!("Error getting tool command to match: {}", e))?; + Ok(MatchConfirmDeny { + result: MatchConfirmDenyResult::CONFIRMATION, + command: command_to_match, + rule: "default".to_string(), + }) + } +} diff --git a/refact-agent/engine/src/tools/tool_knowledge.rs b/refact-agent/engine/src/tools/tool_knowledge.rs index cf08d67567..ff8a51379d 100644 --- a/refact-agent/engine/src/tools/tool_knowledge.rs +++ b/refact-agent/engine/src/tools/tool_knowledge.rs @@ -7,7 +7,7 @@ use async_trait::async_trait; use std::collections::HashMap; use crate::at_commands::at_commands::AtCommandsContext; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::memories::memories_search; use crate::knowledge_graph::build_knowledge_graph; @@ -31,14 +31,9 @@ impl Tool for ToolGetKnowledge { experimental: false, allow_parallel: true, description: "Searches project knowledge base for relevant information. Uses semantic search and knowledge graph expansion.".to_string(), - parameters: vec![ - ToolParam { - name: "search_key".to_string(), - param_type: "string".to_string(), - description: "Search query for the knowledge database.".to_string(), - } - ], - parameters_required: vec!["search_key".to_string()], + input_schema: json_schema_from_params(&[("search_key", "string", "Search query for the knowledge database.")], &["search_key"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_mcp_call.rs b/refact-agent/engine/src/tools/tool_mcp_call.rs new file mode 100644 index 0000000000..fc6d9542e6 --- /dev/null +++ b/refact-agent/engine/src/tools/tool_mcp_call.rs @@ -0,0 +1,148 @@ +use std::collections::HashMap; +use std::sync::Arc; + +use async_trait::async_trait; +use serde_json::{json, Value}; +use tokio::sync::Mutex as AMutex; + +use crate::at_commands::at_commands::AtCommandsContext; +use crate::call_validation::ContextEnum; +use crate::tools::tools_description::{MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolConfig, ToolDesc, ToolGroupCategory, ToolSource, ToolSourceType}; +use crate::tools::tools_list::get_integration_tools; + +pub struct ToolMcpCall {} + +#[async_trait] +impl Tool for ToolMcpCall { + fn tool_description(&self) -> ToolDesc { + ToolDesc { + name: "mcp_call".to_string(), + experimental: false, + allow_parallel: false, + description: "Execute any MCP tool by name with the given arguments. \ + Use `mcp_tool_search` first to discover the tool name and its input schema, \ + then call this with the exact arguments the schema requires." + .to_string(), + input_schema: json!({ + "type": "object", + "properties": { + "tool_name": { + "type": "string", + "description": "Exact MCP tool name as returned by mcp_tool_search" + }, + "args": { + "type": "object", + "description": "Arguments object matching the tool's input schema" + } + }, + "required": ["tool_name", "args"] + }), + output_schema: None, + annotations: None, + display_name: "MCP Call".to_string(), + source: ToolSource { + source_type: ToolSourceType::Builtin, + config_path: String::new(), + }, + } + } + + fn config(&self) -> Result { + Ok(ToolConfig { enabled: true, allow_parallel: None }) + } + + /// Proxy confirmation/deny checks to the underlying MCP tool so that + /// `check_tools_confirmation()` can trigger the normal pause/deny flow + /// before `tool_execute` is ever called. + async fn match_against_confirm_deny( + &self, + ccx: Arc>, + args: &HashMap, + ) -> Result { + let tool_name = match args.get("tool_name").and_then(|v| v.as_str()) { + Some(n) => n.to_string(), + None => return Ok(MatchConfirmDeny { + result: MatchConfirmDenyResult::PASS, + command: String::new(), + rule: String::new(), + }), + }; + + let tool_args: HashMap = args.get("args") + .and_then(|v| v.as_object()) + .map(|obj| obj.iter().map(|(k, v)| (k.clone(), v.clone())).collect()) + .unwrap_or_default(); + + let gcx = ccx.lock().await.global_context.clone(); + let mut integration_groups = get_integration_tools(gcx).await; + + // Move the tool out of the groups so it can be awaited safely. + let mut found_tool: Option> = None; + 'outer: for group in &mut integration_groups { + if !matches!(group.category, ToolGroupCategory::MCP) { + continue; + } + if let Some(pos) = group.tools.iter().position(|t| t.tool_description().name == tool_name) { + found_tool = Some(group.tools.remove(pos)); + break 'outer; + } + } + + match found_tool { + Some(tool) => tool.match_against_confirm_deny(ccx, &tool_args).await, + None => Ok(MatchConfirmDeny { + result: MatchConfirmDenyResult::PASS, + command: String::new(), + rule: String::new(), + }), + } + } + + async fn tool_execute( + &mut self, + ccx: Arc>, + tool_call_id: &String, + args: &HashMap, + ) -> Result<(bool, Vec), String> { + let tool_name = args.get("tool_name") + .and_then(|v| v.as_str()) + .ok_or_else(|| "mcp_call: missing required argument 'tool_name'".to_string())? + .to_string(); + + let tool_args: HashMap = match args.get("args") { + None => return Err("mcp_call: missing required argument 'args'".to_string()), + Some(v) => match v.as_object() { + None => return Err("mcp_call: argument 'args' must be an object".to_string()), + Some(obj) => obj.iter().map(|(k, v)| (k.clone(), v.clone())).collect(), + }, + }; + + let gcx = ccx.lock().await.global_context.clone(); + let mut integration_groups = get_integration_tools(gcx).await; + + // Find the named MCP tool and extract it (needs &mut self for tool_execute). + let mut found_tool: Option> = None; + 'outer: for group in &mut integration_groups { + if !matches!(group.category, ToolGroupCategory::MCP) { + continue; + } + if let Some(pos) = group.tools.iter().position(|t| t.tool_description().name == tool_name) { + found_tool = Some(group.tools.remove(pos)); + break 'outer; + } + } + + let mut tool = found_tool.ok_or_else(|| { + format!( + "MCP tool '{}' not found. Use mcp_tool_search to discover available tools.", + tool_name + ) + })?; + + if !tool.config().unwrap_or_default().enabled { + return Err(format!("MCP tool '{}' is disabled.", tool_name)); + } + + tool.tool_execute(ccx, tool_call_id, &tool_args).await + } +} diff --git a/refact-agent/engine/src/tools/tool_mcp_search.rs b/refact-agent/engine/src/tools/tool_mcp_search.rs new file mode 100644 index 0000000000..548c504baa --- /dev/null +++ b/refact-agent/engine/src/tools/tool_mcp_search.rs @@ -0,0 +1,132 @@ +use std::collections::HashMap; +use std::sync::Arc; + +use async_trait::async_trait; +use serde_json::{json, Value}; +use tokio::sync::Mutex as AMutex; + +use crate::at_commands::at_commands::AtCommandsContext; +use crate::call_validation::{ChatContent, ChatMessage, ContextEnum}; +use crate::tools::tools_description::{Tool, ToolConfig, ToolDesc, ToolGroupCategory, ToolSource, ToolSourceType}; +use crate::tools::tools_list::get_integration_tools; + +pub struct ToolMcpSearch {} + +#[async_trait] +impl Tool for ToolMcpSearch { + fn tool_description(&self) -> ToolDesc { + ToolDesc { + name: "mcp_tool_search".to_string(), + experimental: false, + allow_parallel: false, + description: "Search available MCP tools by regex pattern (case-insensitive, matched \ + against tool name and description). Returns matching tool names and their full \ + JSON schemas as text. After discovering a tool here, call `mcp_call` to execute it." + .to_string(), + input_schema: json!({ + "type": "object", + "properties": { + "query": { + "type": "string", + "description": "Regex pattern to match MCP tool names and descriptions. \ + Examples: \"github\", \"file.*read|write\", \"git.*(commit|push)\"" + }, + "max_results": { + "type": "integer", + "description": "Maximum number of tools to return (default 10)" + } + }, + "required": ["query"] + }), + output_schema: None, + annotations: None, + display_name: "MCP Tool Search".to_string(), + source: ToolSource { + source_type: ToolSourceType::Builtin, + config_path: String::new(), + }, + } + } + + fn config(&self) -> Result { + Ok(ToolConfig { enabled: true, allow_parallel: None }) + } + + async fn tool_execute( + &mut self, + ccx: Arc>, + tool_call_id: &String, + args: &HashMap, + ) -> Result<(bool, Vec), String> { + let query = args.get("query") + .and_then(|v| v.as_str()) + .unwrap_or("") + .to_string(); + let max_results = args.get("max_results") + .and_then(|v| v.as_u64()) + .unwrap_or(10) as usize; + + let re = regex::Regex::new(&format!("(?i){}", query)) + .map_err(|e| format!("Invalid regex pattern '{}': {}", query, e))?; + + let gcx = ccx.lock().await.global_context.clone(); + let integration_groups = get_integration_tools(gcx).await; + + let matched: Vec<(String, String, Value)> = integration_groups.iter() + .filter(|g| matches!(g.category, ToolGroupCategory::MCP)) + .flat_map(|g| g.tools.iter()) + .filter(|tool| tool.config().unwrap_or_default().enabled) + .filter(|tool| { + let d = tool.tool_description(); + re.is_match(&d.name) || re.is_match(&d.description) + }) + .take(max_results) + .map(|tool| { + let d = tool.tool_description(); + (d.name, d.description, d.input_schema) + }) + .collect(); + + let total_mcp: usize = integration_groups.iter() + .filter(|g| matches!(g.category, ToolGroupCategory::MCP)) + .map(|g| g.tools.len()) + .sum(); + + if matched.is_empty() { + let text = format!( + "No MCP tools found matching '{}'. Try a broader pattern. \ + Use mcp_tool_search({{\"query\": \".\"}}) to list all {} available tools.", + query, total_mcp + ); + return Ok((false, vec![ContextEnum::ChatMessage(ChatMessage { + role: "tool".to_string(), + tool_call_id: tool_call_id.clone(), + content: ChatContent::SimpleText(text), + tool_failed: Some(false), + ..Default::default() + })])); + } + + // Return schemas as text — no session state modified (cache-safe). + let mut lines = vec![format!( + "Found {} MCP tool(s) matching '{}'. Use `mcp_call` to execute them.\n", + matched.len(), query + )]; + for (name, description, schema) in &matched { + lines.push(format!( + "### {}\n{}\n\nInput schema:\n```json\n{}\n```\n", + name, + description, + serde_json::to_string_pretty(schema).unwrap_or_default() + )); + } + + Ok((false, vec![ContextEnum::ChatMessage(ChatMessage { + role: "tool".to_string(), + tool_call_id: tool_call_id.clone(), + content: ChatContent::SimpleText(lines.join("\n")), + tool_failed: Some(false), + ..Default::default() + })])) + } +} diff --git a/refact-agent/engine/src/tools/tool_mv.rs b/refact-agent/engine/src/tools/tool_mv.rs index 2be0a400c6..716b948aba 100644 --- a/refact-agent/engine/src/tools/tool_mv.rs +++ b/refact-agent/engine/src/tools/tool_mv.rs @@ -14,9 +14,7 @@ use crate::files_correction::{ get_project_dirs, preprocess_path_for_normalization, }; use crate::files_in_workspace::get_file_text_from_memory_or_disk; -use crate::tools::tools_description::{ - MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType, -}; +use crate::tools::tools_description::{MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::integrations::integr_abstract::IntegrationConfirmation; use crate::privacy::{FilePrivacyLevel, load_privacy_if_needed, check_file_privacy}; @@ -402,24 +400,9 @@ impl Tool for ToolMv { experimental: false, allow_parallel: false, description: "Moves or renames files and directories. If a simple rename fails due to a cross-device error and the source is a file, it falls back to copying and deleting. Use overwrite=true to replace an existing target.".to_string(), - parameters: vec![ - ToolParam { - name: "source".to_string(), - param_type: "string".to_string(), - description: "Path of the file or directory to move.".to_string(), - }, - ToolParam { - name: "destination".to_string(), - param_type: "string".to_string(), - description: "Target path where the file or directory should be placed.".to_string(), - }, - ToolParam { - name: "overwrite".to_string(), - param_type: "boolean".to_string(), - description: "If true and target exists, replace it. Defaults to false.".to_string(), - } - ], - parameters_required: vec!["source".to_string(), "destination".to_string()], + input_schema: json_schema_from_params(&[("source", "string", "Path of the file or directory to move."), ("destination", "string", "Target path where the file or directory should be placed."), ("overwrite", "boolean", "If true and target exists, replace it. Defaults to false.")], &["source", "destination"]), + output_schema: None, + annotations: None, } } } diff --git a/refact-agent/engine/src/tools/tool_name_alias.rs b/refact-agent/engine/src/tools/tool_name_alias.rs new file mode 100644 index 0000000000..0bb4beae91 --- /dev/null +++ b/refact-agent/engine/src/tools/tool_name_alias.rs @@ -0,0 +1,205 @@ +use std::collections::HashMap; + +pub const MAX_TOOL_NAME_LEN: usize = 64; + +fn is_provider_safe(name: &str) -> bool { + !name.is_empty() + && name.len() <= MAX_TOOL_NAME_LEN + && name.chars().all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-') + && name.chars().next().map_or(false, |c| c.is_ascii_alphabetic()) +} + +pub fn generate_tool_alias(name: &str, max_len: usize) -> String { + if is_provider_safe(name) && name.len() <= max_len { + return name.to_string(); + } + let hash = format!("{:x}", md5::compute(name.as_bytes())); + let hash8 = &hash[..8]; + let prefix_len = max_len.saturating_sub(9); + let prefix: String = name + .chars() + .filter(|c| c.is_ascii_alphanumeric() || *c == '_') + .take(prefix_len) + .collect(); + let prefix = if prefix.is_empty() || !prefix.chars().next().map_or(false, |c| c.is_ascii_alphabetic()) { + format!("t_{}", &prefix) + } else { + prefix + }; + format!("{}_{}", prefix, hash8) +} + +pub struct ToolAliasRegistry { + name_to_alias: HashMap, + alias_to_name: HashMap, +} + +impl ToolAliasRegistry { + pub fn new() -> Self { + ToolAliasRegistry { + name_to_alias: HashMap::new(), + alias_to_name: HashMap::new(), + } + } + + pub fn register(&mut self, internal_name: &str) -> String { + if let Some(alias) = self.name_to_alias.get(internal_name) { + return alias.clone(); + } + let mut candidate = generate_tool_alias(internal_name, MAX_TOOL_NAME_LEN); + if self.alias_to_name.contains_key(&candidate) && self.alias_to_name[&candidate] != internal_name { + let mut suffix = 1u32; + loop { + let suffixed = format!("{}_{}", &candidate[..candidate.len().min(MAX_TOOL_NAME_LEN - 3)], suffix); + if !self.alias_to_name.contains_key(&suffixed) { + candidate = suffixed; + break; + } + suffix += 1; + } + tracing::warn!("tool_name_alias: collision resolved: {} → {}", internal_name, candidate); + } + self.name_to_alias.insert(internal_name.to_string(), candidate.clone()); + self.alias_to_name.insert(candidate.clone(), internal_name.to_string()); + candidate + } + + pub fn resolve_alias(&self, alias: &str) -> Option<&str> { + self.alias_to_name.get(alias).map(|s| s.as_str()) + } + + pub fn get_alias(&self, internal_name: &str) -> Option<&str> { + self.name_to_alias.get(internal_name).map(|s| s.as_str()) + } + + pub fn needs_aliasing(&self) -> bool { + self.name_to_alias.iter().any(|(name, alias)| name != alias) + } +} + +pub fn build_registry_from_names(tool_names: &[String]) -> ToolAliasRegistry { + let mut registry = ToolAliasRegistry::new(); + for name in tool_names { + registry.register(name); + } + registry +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_short_safe_name_unchanged() { + assert_eq!(generate_tool_alias("cat", 64), "cat"); + assert_eq!(generate_tool_alias("shell", 64), "shell"); + assert_eq!(generate_tool_alias("tree", 64), "tree"); + } + + #[test] + fn test_long_name_gets_truncated_with_hash() { + let long_name = "mcp_some_extremely_long_tool_name_that_clearly_exceeds_the_sixty_four_character_limit"; + assert!(long_name.len() > 64, "test name should be longer than 64 chars"); + let alias = generate_tool_alias(long_name, 64); + assert!(alias.len() <= 64, "alias too long: {} chars", alias.len()); + assert!( + alias.chars().all(|c| c.is_ascii_alphanumeric() || c == '_'), + "alias not provider-safe: {}", + alias + ); + assert_ne!(alias, long_name); + assert!(alias.chars().next().map_or(false, |c| c.is_ascii_alphabetic())); + } + + #[test] + fn test_alias_contains_hash_suffix() { + let long_name = "mcp_some_very_long_tool_name_that_definitely_exceeds_64_characters_limit"; + let alias = generate_tool_alias(long_name, 64); + assert!(alias.len() <= 64); + assert!(alias.contains('_')); + } + + #[test] + fn test_registry_roundtrip() { + let mut registry = ToolAliasRegistry::new(); + let alias = registry.register("my_tool"); + assert_eq!(registry.resolve_alias(&alias), Some("my_tool")); + assert_eq!(registry.get_alias("my_tool"), Some(alias.as_str())); + } + + #[test] + fn test_registry_same_name_same_alias() { + let mut registry = ToolAliasRegistry::new(); + let alias1 = registry.register("cat"); + let alias2 = registry.register("cat"); + assert_eq!(alias1, alias2); + } + + #[test] + fn test_collision_resolution() { + let mut registry = ToolAliasRegistry::new(); + let name1 = "mcp_server_a_do_something_very_special_and_unique_indeed_here"; + let name2 = "mcp_server_b_do_something_very_special_and_unique_indeed_here"; + let alias1 = registry.register(name1); + let alias2 = registry.register(name2); + assert_ne!(alias1, alias2, "Different tools must not share alias"); + assert_eq!(registry.resolve_alias(&alias1), Some(name1)); + assert_eq!(registry.resolve_alias(&alias2), Some(name2)); + } + + #[test] + fn test_registry_unknown_alias_returns_none() { + let registry = ToolAliasRegistry::new(); + assert_eq!(registry.resolve_alias("unknown_alias_xyz"), None); + } + + #[test] + fn test_realistic_mcp_tool_name() { + let name = "mcp_modelcontextprotocol_server_github_create_pull_request"; + assert!(name.len() > 64 || name.len() <= 64); + let alias = generate_tool_alias(name, 64); + assert!(alias.len() <= 64); + assert!(alias.chars().all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-')); + assert!(alias.chars().next().map_or(false, |c| c.is_ascii_alphabetic())); + } + + #[test] + fn test_build_registry_from_names() { + let names = vec![ + "cat".to_string(), + "shell".to_string(), + "mcp_very_long_name_that_needs_aliasing_to_fit_in_limit_of_64_chars".to_string(), + ]; + let registry = build_registry_from_names(&names); + for name in &names { + let alias = registry.get_alias(name).expect("alias should exist"); + assert!(alias.len() <= 64); + assert_eq!(registry.resolve_alias(alias), Some(name.as_str())); + } + } + + #[test] + fn test_needs_aliasing_false_for_short_names() { + let names = vec!["cat".to_string(), "shell".to_string(), "tree".to_string()]; + let registry = build_registry_from_names(&names); + assert!(!registry.needs_aliasing()); + } + + #[test] + fn test_needs_aliasing_true_for_long_names() { + let names = vec![ + "mcp_very_long_name_that_needs_aliasing_to_fit_in_the_64_char_limit".to_string(), + ]; + let registry = build_registry_from_names(&names); + assert!(registry.needs_aliasing()); + } + + #[test] + fn test_alias_registry_maps_tool_choice() { + let names = vec!["very_long_mcp_tool_name_that_exceeds_the_64_char_limit_for_provider_apis".to_string()]; + let registry = build_registry_from_names(&names); + let alias = registry.get_alias(&names[0]); + assert!(alias.is_some()); + assert!(alias.unwrap().len() <= 64); + } +} diff --git a/refact-agent/engine/src/tools/tool_regex_search.rs b/refact-agent/engine/src/tools/tool_regex_search.rs index 33d417e194..785a59ef5b 100644 --- a/refact-agent/engine/src/tools/tool_regex_search.rs +++ b/refact-agent/engine/src/tools/tool_regex_search.rs @@ -18,7 +18,7 @@ use crate::files_correction::shortify_paths; use crate::files_in_workspace::get_file_text_from_memory_or_disk; use crate::global_context::GlobalContext; use crate::tools::scope_utils::{resolve_scope, validate_scope_files}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::knowledge_index::format_related_memories_section; pub struct ToolRegexSearch { @@ -248,39 +248,9 @@ impl Tool for ToolRegexSearch { experimental: false, allow_parallel: true, description: "Search for files and folders whose names or paths match the given regular expression pattern, and also search for text matches inside files using the same pattern. Reports both path matches and text matches in separate sections.".to_string(), - parameters: vec![ - ToolParam { - name: "pattern".to_string(), - description: "The pattern is used to search for matching file/folder names/paths, and also for matching text inside files. Use (?i) at the start for case-insensitive search.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "scope".to_string(), - description: "'workspace' to search all files in workspace, 'dir/subdir/' to search in files within a directory, 'dir/file.ext' to search in a single file.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "context_lines".to_string(), - description: "Lines of context before/after each match (default: 5).".to_string(), - param_type: "integer".to_string(), - }, - ToolParam { - name: "max_files".to_string(), - description: "Max files to attach as context (default: 50).".to_string(), - param_type: "integer".to_string(), - }, - ToolParam { - name: "max_matches_per_file".to_string(), - description: "Max matches per file to include (default: 25).".to_string(), - param_type: "integer".to_string(), - }, - ToolParam { - name: "max_total_matches".to_string(), - description: "Max total matches to attach as context (default: 200).".to_string(), - param_type: "integer".to_string(), - } - ], - parameters_required: vec!["pattern".to_string(), "scope".to_string()], + input_schema: json_schema_from_params(&[("pattern", "string", "The pattern is used to search for matching file/folder names/paths, and also for matching text inside files. Use (?i) at the start for case-insensitive search."), ("scope", "string", "'workspace' to search all files in workspace, 'dir/subdir/' to search in files within a directory, 'dir/file.ext' to search in a single file."), ("context_lines", "integer", "Lines of context before/after each match (default: 5)."), ("max_files", "integer", "Max files to attach as context (default: 50)."), ("max_matches_per_file", "integer", "Max matches per file to include (default: 25)."), ("max_total_matches", "integer", "Max total matches to attach as context (default: 200).")], &["pattern", "scope"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_rm.rs b/refact-agent/engine/src/tools/tool_rm.rs index 88a0ea9a11..1a86aeb7a9 100644 --- a/refact-agent/engine/src/tools/tool_rm.rs +++ b/refact-agent/engine/src/tools/tool_rm.rs @@ -15,9 +15,7 @@ use crate::files_correction::{ }; use crate::files_in_workspace::get_file_text_from_memory_or_disk; use crate::privacy::{check_file_privacy, load_privacy_if_needed, FilePrivacyLevel}; -use crate::tools::tools_description::{ - MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType, -}; +use crate::tools::tools_description::{MatchConfirmDeny, MatchConfirmDenyResult, Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::integrations::integr_abstract::IntegrationConfirmation; pub struct ToolRm { @@ -346,29 +344,9 @@ impl Tool for ToolRm { experimental: false, allow_parallel: false, description: "Deletes a file or directory. Use recursive=true for directories. Set dry_run=true to preview without deletion.".to_string(), - parameters: vec![ - ToolParam { - name: "path".to_string(), - param_type: "string".to_string(), - description: "Absolute or relative path of the file or directory to delete.".to_string(), - }, - ToolParam { - name: "recursive".to_string(), - param_type: "boolean".to_string(), - description: "If true and target is a directory, delete recursively. Defaults to false.".to_string(), - }, - ToolParam { - name: "dry_run".to_string(), - param_type: "boolean".to_string(), - description: "If true, only report what would be done without deleting.".to_string(), - }, - ToolParam { - name: "max_depth".to_string(), - param_type: "number".to_string(), - description: "(Optional) Maximum depth (currently unused).".to_string(), - } - ], - parameters_required: vec!["path".to_string()], + input_schema: json_schema_from_params(&[("path", "string", "Absolute or relative path of the file or directory to delete."), ("recursive", "boolean", "If true and target is a directory, delete recursively. Defaults to false."), ("dry_run", "boolean", "If true, only report what would be done without deleting."), ("max_depth", "number", "(Optional) Maximum depth (currently unused).")], &["path"]), + output_schema: None, + annotations: None, } } } diff --git a/refact-agent/engine/src/tools/tool_search.rs b/refact-agent/engine/src/tools/tool_search.rs index 1222816a4a..a676f77041 100644 --- a/refact-agent/engine/src/tools/tool_search.rs +++ b/refact-agent/engine/src/tools/tool_search.rs @@ -10,7 +10,7 @@ use tokio::sync::Mutex as AMutex; use crate::at_commands::at_commands::{vec_context_file_to_context_tools, AtCommandsContext}; use crate::at_commands::at_search::execute_at_search; use crate::tools::scope_utils::create_scope_filter; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum, ContextFile}; use crate::knowledge_index::format_related_memories_section; @@ -66,39 +66,9 @@ impl Tool for ToolSearch { experimental: false, allow_parallel: true, description: "Find semantically similar pieces of code or text using vector database (semantic search)".to_string(), - parameters: vec![ - ToolParam { - name: "queries".to_string(), - param_type: "string".to_string(), - description: "Comma-separated list of queries. Each query can be a single line, paragraph or code sample to search for semantically similar content.".to_string(), - }, - ToolParam { - name: "scope".to_string(), - param_type: "string".to_string(), - description: "'workspace' to search all files in workspace, 'dir/subdir/' to search in files within a directory, 'dir/file.ext' to search in a single file.".to_string(), - }, - ToolParam { - name: "context_lines".to_string(), - param_type: "integer".to_string(), - description: "If >0, include a small line-numbered preview around each hit in the tool text output (default: 0).".to_string(), - }, - ToolParam { - name: "max_files".to_string(), - param_type: "integer".to_string(), - description: "Max distinct files to attach as context (default: 50).".to_string(), - }, - ToolParam { - name: "max_recs_per_file".to_string(), - param_type: "integer".to_string(), - description: "Max vecdb records per file to attach as context (default: 10).".to_string(), - }, - ToolParam { - name: "max_total_recs".to_string(), - param_type: "integer".to_string(), - description: "Max total vecdb records to attach as context (default: 200).".to_string(), - } - ], - parameters_required: vec!["queries".to_string(), "scope".to_string()], + input_schema: json_schema_from_params(&[("queries", "string", "Comma-separated list of queries. Each query can be a single line, paragraph or code sample to search for semantically similar content."), ("scope", "string", "'workspace' to search all files in workspace, 'dir/subdir/' to search in files within a directory, 'dir/file.ext' to search in a single file."), ("context_lines", "integer", "If >0, include a small line-numbered preview around each hit in the tool text output (default: 0)."), ("max_files", "integer", "Max distinct files to attach as context (default: 50)."), ("max_recs_per_file", "integer", "Max vecdb records per file to attach as context (default: 10)."), ("max_total_recs", "integer", "Max total vecdb records to attach as context (default: 200).")], &["queries", "scope"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_search_trajectories.rs b/refact-agent/engine/src/tools/tool_search_trajectories.rs index e2b52b5131..dfa796e2a3 100644 --- a/refact-agent/engine/src/tools/tool_search_trajectories.rs +++ b/refact-agent/engine/src/tools/tool_search_trajectories.rs @@ -6,7 +6,7 @@ use tokio::sync::Mutex as AMutex; use crate::at_commands::at_commands::AtCommandsContext; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::memories::memories_search; pub struct ToolSearchTrajectories { @@ -26,19 +26,9 @@ impl Tool for ToolSearchTrajectories { experimental: false, allow_parallel: true, description: "Search past chat trajectories for relevant patterns, solutions, and context. Returns matching trajectory IDs with message ranges that can be expanded using get_trajectory_context.".to_string(), - parameters: vec![ - ToolParam { - name: "query".to_string(), - param_type: "string".to_string(), - description: "Search query to find relevant past conversations.".to_string(), - }, - ToolParam { - name: "top_n".to_string(), - param_type: "string".to_string(), - description: "Maximum number of trajectories to return (default: 5).".to_string(), - }, - ], - parameters_required: vec!["query".to_string()], + input_schema: json_schema_from_params(&[("query", "string", "Search query to find relevant past conversations."), ("top_n", "string", "Maximum number of trajectories to return (default: 5).")], &["query"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_shell.rs b/refact-agent/engine/src/tools/tool_shell.rs index 8f15794225..fd11cc07c0 100644 --- a/refact-agent/engine/src/tools/tool_shell.rs +++ b/refact-agent/engine/src/tools/tool_shell.rs @@ -22,9 +22,7 @@ use crate::files_correction::get_project_dirs; use crate::files_correction::preprocess_path_for_normalization; use crate::files_correction::CommandSimplifiedDirExt; use crate::global_context::GlobalContext; -use crate::tools::tools_description::{ - ToolParam, Tool, ToolDesc, ToolSource, ToolSourceType, -}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::postprocessing::pp_command_output::{ OutputFilter, parse_output_filter_args, output_mini_postprocessing, @@ -225,37 +223,9 @@ impl Tool for ToolShell { experimental: false, allow_parallel: false, description: "Execute a single command, using the \"sh\" on unix-like systems and \"powershell.exe\" on windows. Use it for one-time tasks like dependencies installation. Don't call this unless you have to. Not suitable for regular work because it requires a confirmation at each step. Output is compressed by default - use output_filter and output_limit parameters to see specific parts if needed. Note: sudo commands cannot be run - if you need elevated privileges, ask the user to run them directly.".to_string(), - parameters: vec![ - ToolParam { - name: "command".to_string(), - param_type: "string".to_string(), - description: "shell command to execute".to_string(), - }, - ToolParam { - name: "workdir".to_string(), - param_type: "string".to_string(), - description: "workdir for the command".to_string(), - }, - ToolParam { - name: "output_filter".to_string(), - param_type: "string".to_string(), - description: "Optional regex pattern to filter output lines. Only lines matching this pattern (and context) will be shown. Use to find specific errors or content in large outputs.".to_string(), - }, - ToolParam { - name: "output_limit".to_string(), - param_type: "string".to_string(), - description: "Optional. Max lines to show (default: 40). Use higher values like '200' or 'all' to see more output.".to_string(), - }, - ToolParam { - name: "timeout".to_string(), - param_type: "string".to_string(), - description: "Optional. Timeout in seconds for the command (default: 10). Use higher values for long-running commands.".to_string(), - }, - ], - parameters_required: vec![ - "command".to_string(), - "workdir".to_string(), - ], + input_schema: json_schema_from_params(&[("command", "string", "shell command to execute"), ("workdir", "string", "workdir for the command"), ("output_filter", "string", "Optional regex pattern to filter output lines. Only lines matching this pattern (and context) will be shown. Use to find specific errors or content in large outputs."), ("output_limit", "string", "Optional. Max lines to show (default: 40). Use higher values like '200' or 'all' to see more output."), ("timeout", "string", "Optional. Timeout in seconds for the command (default: 10). Use higher values for long-running commands.")], &["command", "workdir"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_shell_service.rs b/refact-agent/engine/src/tools/tool_shell_service.rs index 29af90808c..461e7973c2 100644 --- a/refact-agent/engine/src/tools/tool_shell_service.rs +++ b/refact-agent/engine/src/tools/tool_shell_service.rs @@ -18,10 +18,7 @@ use crate::integrations::integr_cmdline::{create_command_from_string, format_out use crate::integrations::process_io_utils::{blocking_read_until_token_or_timeout, is_someone_listening_on_that_tcp_port}; use crate::integrations::sessions::IntegrationSession; use crate::postprocessing::pp_command_output::{OutputFilter, output_mini_postprocessing}; -use crate::tools::tools_description::{ - Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType, MatchConfirmDeny, MatchConfirmDenyResult, - command_should_be_denied, command_should_be_confirmed_by_user, -}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, MatchConfirmDeny, MatchConfirmDenyResult, command_should_be_denied, command_should_be_confirmed_by_user, json_schema_from_params}; const ASK_USER_DEFAULT: &[&str] = &[ "*rm*", @@ -562,54 +559,9 @@ impl Tool for ToolShellService { experimental: false, allow_parallel: false, description: "Manage background services (start/stop/status/logs/restart). Use this for long-running processes like web servers, databases, or any command that runs until Ctrl+C. For one-time commands, use the shell tool instead.".to_string(), - parameters: vec![ - ToolParam { - name: "service_name".to_string(), - param_type: "string".to_string(), - description: "Unique service identifier (e.g., 'api', 'postgres', 'worker')".to_string(), - }, - ToolParam { - name: "action".to_string(), - param_type: "string".to_string(), - description: "Action to perform: 'start', 'stop', 'status', 'logs', or 'restart'".to_string(), - }, - ToolParam { - name: "command".to_string(), - param_type: "string".to_string(), - description: "Shell command to run (required for start/restart, e.g., 'uvicorn app:app --port 8000')".to_string(), - }, - ToolParam { - name: "workdir".to_string(), - param_type: "string".to_string(), - description: "Working directory (optional, can be relative or absolute)".to_string(), - }, - ToolParam { - name: "startup_wait".to_string(), - param_type: "string".to_string(), - description: "Max seconds to wait for service to start (default: 10)".to_string(), - }, - ToolParam { - name: "startup_wait_port".to_string(), - param_type: "string".to_string(), - description: "TCP port number to wait for (e.g., '8000')".to_string(), - }, - ToolParam { - name: "startup_wait_keyword".to_string(), - param_type: "string".to_string(), - description: "Text to wait for in stdout/stderr (e.g., 'Ready')".to_string(), - }, - ToolParam { - name: "output_filter".to_string(), - param_type: "string".to_string(), - description: "Optional regex pattern to filter logs".to_string(), - }, - ToolParam { - name: "output_limit".to_string(), - param_type: "string".to_string(), - description: "Max lines to show (default: 40, use 'all' for unlimited)".to_string(), - }, - ], - parameters_required: vec!["service_name".to_string(), "action".to_string()], + input_schema: json_schema_from_params(&[("service_name", "string", "Unique service identifier (e.g., 'api', 'postgres', 'worker')"), ("action", "string", "Action to perform: 'start', 'stop', 'status', 'logs', or 'restart'"), ("command", "string", "Shell command to run (required for start/restart, e.g., 'uvicorn app:app --port 8000')"), ("workdir", "string", "Working directory (optional, can be relative or absolute)"), ("startup_wait", "string", "Max seconds to wait for service to start (default: 10)"), ("startup_wait_port", "string", "TCP port number to wait for (e.g., '8000')"), ("startup_wait_keyword", "string", "Text to wait for in stdout/stderr (e.g., 'Ready')"), ("output_filter", "string", "Optional regex pattern to filter logs"), ("output_limit", "string", "Max lines to show (default: 40, use 'all' for unlimited)")], &["service_name", "action"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_strategic_planning.rs b/refact-agent/engine/src/tools/tool_strategic_planning.rs index f16ee6ba89..828b13b75b 100644 --- a/refact-agent/engine/src/tools/tool_strategic_planning.rs +++ b/refact-agent/engine/src/tools/tool_strategic_planning.rs @@ -8,7 +8,7 @@ use axum::http::StatusCode; use std::collections::HashMap; use crate::subchat::{run_subchat_once_with_parent, resolve_subchat_params, resolve_subchat_model}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::tools::tool_helpers::{load_code_subagent_config}; use crate::tools::subagent_phases::{gather_files_phase, GatherFilesParams}; use crate::call_validation::{ @@ -250,8 +250,9 @@ impl Tool for ToolStrategicPlanning { experimental: false, allow_parallel: true, description: "Strategically plan a solution for a complex problem or create a comprehensive approach. Automatically identifies relevant files from the codebase.".to_string(), - parameters: vec![], - parameters_required: vec![], + input_schema: json_schema_from_params(&[], &[]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_subagent.rs b/refact-agent/engine/src/tools/tool_subagent.rs index b996dc9ebf..819ebb7626 100644 --- a/refact-agent/engine/src/tools/tool_subagent.rs +++ b/refact-agent/engine/src/tools/tool_subagent.rs @@ -4,7 +4,7 @@ use serde_json::Value; use tokio::sync::Mutex as AMutex; use async_trait::async_trait; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::at_commands::at_commands::AtCommandsContext; use crate::subchat::run_subchat; @@ -79,29 +79,9 @@ impl Tool for ToolSubagent { experimental: false, allow_parallel: true, description: "Delegate a specific task to a sub-agent that works independently. Use this when you need to perform a focused task that requires multiple tool calls without cluttering the main conversation. The subagent has its own context and does not see the parent conversation.".to_string(), - parameters: vec![ - ToolParam { - name: "task".to_string(), - param_type: "string".to_string(), - description: "Clear description of what the subagent should do. Be specific about the goal and any constraints.".to_string(), - }, - ToolParam { - name: "expected_result".to_string(), - param_type: "string".to_string(), - description: "Description of what the successful result should look like. This helps the subagent know when it has completed the task.".to_string(), - }, - ToolParam { - name: "tools".to_string(), - param_type: "string".to_string(), - description: "Comma-separated list of tool names the subagent should use (e.g., 'cat,tree,search'). Leave empty to allow all available tools.".to_string(), - }, - ToolParam { - name: "max_steps".to_string(), - param_type: "string".to_string(), - description: "Maximum number of steps (tool calls) the subagent can make. Default is 10. Use lower values for simple tasks, higher for complex ones.".to_string(), - }, - ], - parameters_required: vec!["task".to_string(), "expected_result".to_string(), "tools".to_string(), "max_steps".to_string()], + input_schema: json_schema_from_params(&[("task", "string", "Clear description of what the subagent should do. Be specific about the goal and any constraints."), ("expected_result", "string", "Description of what the successful result should look like. This helps the subagent know when it has completed the task."), ("tools", "string", "Comma-separated list of tool names the subagent should use (e.g., 'cat,tree,search'). Leave empty to allow all available tools."), ("max_steps", "string", "Maximum number of steps (tool calls) the subagent can make. Default is 10. Use lower values for simple tasks, higher for complex ones.")], &["task", "expected_result", "tools", "max_steps"]), + output_schema: None, + annotations: None, } } @@ -173,6 +153,8 @@ impl Tool for ToolSubagent { )); } + let session_id_hook = parent_chat_id.clone(); + let has_editing_tools = tools_contain_file_editing(&tools); let config_name = if has_editing_tools { "subagent_with_editing" @@ -246,7 +228,37 @@ impl Tool for ToolSubagent { config.model ); - let result = match run_subchat(gcx, messages, config).await { + let gcx_hook = gcx.clone(); + let project_dir = crate::ext::hooks_runner::get_project_dir_string(gcx_hook.clone()).await; + let task_hook = task.clone(); + + let subchat_result = run_subchat(gcx, messages, config).await; + + let final_status = match &subchat_result { + Ok(_) => "completed", + Err(e) if e == "Aborted" || e.starts_with("Aborted") => "aborted", + Err(_) => "error", + }; + { + let mut extra = std::collections::HashMap::new(); + extra.insert("agent_name".to_string(), serde_json::json!(task_hook)); + extra.insert("final_status".to_string(), serde_json::json!(final_status)); + tokio::spawn(async move { + let payload = crate::ext::hooks_runner::HookPayload { + hook_event_name: "SubagentStop".to_string(), + session_id: session_id_hook, + project_dir, + tool_name: None, + tool_input: None, + tool_output: None, + user_prompt: None, + extra, + }; + crate::ext::hooks_runner::run_hooks(gcx_hook, crate::ext::hooks::HookEvent::SubagentStop, payload).await; + }); + } + + let result = match subchat_result { Ok(r) => r, Err(e) if e == "Aborted" || e.starts_with("Aborted") => { return Ok(( diff --git a/refact-agent/engine/src/tools/tool_task_agent.rs b/refact-agent/engine/src/tools/tool_task_agent.rs index be6e2adc0b..d5f3700cc7 100644 --- a/refact-agent/engine/src/tools/tool_task_agent.rs +++ b/refact-agent/engine/src/tools/tool_task_agent.rs @@ -7,7 +7,7 @@ use chrono::Utc; use crate::at_commands::at_commands::AtCommandsContext; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::tasks::storage; use crate::tasks::types::StatusUpdate; use crate::tasks::events::{TaskEvent, emit_task_event}; @@ -107,19 +107,9 @@ impl Tool for ToolTaskAgentUpdate { experimental: false, allow_parallel: false, description: "Add a progress update to the assigned card.".to_string(), - parameters: vec![ - ToolParam { - name: "card_id".to_string(), - param_type: "string".to_string(), - description: "Card ID".to_string(), - }, - ToolParam { - name: "message".to_string(), - param_type: "string".to_string(), - description: "Progress message".to_string(), - }, - ], - parameters_required: vec!["card_id".to_string(), "message".to_string()], + input_schema: json_schema_from_params(&[("card_id", "string", "Card ID"), ("message", "string", "Progress message")], &["card_id", "message"]), + output_schema: None, + annotations: None, } } } @@ -193,20 +183,9 @@ impl Tool for ToolTaskAgentComplete { experimental: false, allow_parallel: false, description: "Mark the assigned card as complete with a final report.".to_string(), - parameters: vec![ - ToolParam { - name: "card_id".to_string(), - param_type: "string".to_string(), - description: "Card ID".to_string(), - }, - ToolParam { - name: "final_report".to_string(), - param_type: "string".to_string(), - description: "Summary of what was done, decisions made, files modified" - .to_string(), - }, - ], - parameters_required: vec!["card_id".to_string(), "final_report".to_string()], + input_schema: json_schema_from_params(&[("card_id", "string", "Card ID"), ("final_report", "string", "Summary of what was done, decisions made, files modified")], &["card_id", "final_report"]), + output_schema: None, + annotations: None, } } } @@ -284,19 +263,9 @@ impl Tool for ToolTaskAgentFail { experimental: false, allow_parallel: false, description: "Mark the assigned card as failed with an explanation.".to_string(), - parameters: vec![ - ToolParam { - name: "card_id".to_string(), - param_type: "string".to_string(), - description: "Card ID".to_string(), - }, - ToolParam { - name: "reason".to_string(), - param_type: "string".to_string(), - description: "Why the task failed".to_string(), - }, - ], - parameters_required: vec!["card_id".to_string(), "reason".to_string()], + input_schema: json_schema_from_params(&[("card_id", "string", "Card ID"), ("reason", "string", "Why the task failed")], &["card_id", "reason"]), + output_schema: None, + annotations: None, } } } @@ -382,28 +351,9 @@ impl Tool for ToolTaskAssignAgent { experimental: false, allow_parallel: false, description: "Assign an agent to a card and move it to Doing.".to_string(), - parameters: vec![ - ToolParam { - name: "card_id".to_string(), - param_type: "string".to_string(), - description: "Card ID to assign".to_string(), - }, - ToolParam { - name: "agent_id".to_string(), - param_type: "string".to_string(), - description: "Agent UUID".to_string(), - }, - ToolParam { - name: "agent_chat_id".to_string(), - param_type: "string".to_string(), - description: "Agent chat/trajectory ID".to_string(), - }, - ], - parameters_required: vec![ - "card_id".to_string(), - "agent_id".to_string(), - "agent_chat_id".to_string(), - ], + input_schema: json_schema_from_params(&[("card_id", "string", "Card ID to assign"), ("agent_id", "string", "Agent UUID"), ("agent_chat_id", "string", "Agent chat/trajectory ID")], &["card_id", "agent_id", "agent_chat_id"]), + output_schema: None, + annotations: None, } } } diff --git a/refact-agent/engine/src/tools/tool_task_agent_finish.rs b/refact-agent/engine/src/tools/tool_task_agent_finish.rs index d96d60842c..7b71253794 100644 --- a/refact-agent/engine/src/tools/tool_task_agent_finish.rs +++ b/refact-agent/engine/src/tools/tool_task_agent_finish.rs @@ -9,7 +9,7 @@ use async_trait::async_trait; use chrono::Utc; use uuid::Uuid; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::at_commands::at_commands::AtCommandsContext; use crate::tasks::storage; @@ -141,19 +141,9 @@ impl Tool for ToolTaskAgentFinish { experimental: false, allow_parallel: false, description: "Mark the current card as completed or failed. Task agents MUST call this exactly once when finished. This updates the task board and notifies the planner.".to_string(), - parameters: vec![ - ToolParam { - name: "success".to_string(), - param_type: "boolean".to_string(), - description: "true if the card was completed successfully, false if it failed".to_string(), - }, - ToolParam { - name: "report".to_string(), - param_type: "string".to_string(), - description: "Summary of what was done (if success) or why it failed (if failure)".to_string(), - }, - ], - parameters_required: vec!["success".to_string(), "report".to_string()], + input_schema: json_schema_from_params(&[("success", "boolean", "true if the card was completed successfully, false if it failed"), ("report", "string", "Summary of what was done (if success) or why it failed (if failure)")], &["success", "report"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_task_board.rs b/refact-agent/engine/src/tools/tool_task_board.rs index 4d23119596..eeca07de52 100644 --- a/refact-agent/engine/src/tools/tool_task_board.rs +++ b/refact-agent/engine/src/tools/tool_task_board.rs @@ -8,7 +8,7 @@ use chrono::Utc; use crate::at_commands::at_commands::AtCommandsContext; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::tasks::storage; use crate::tasks::types::BoardCard; use crate::tasks::events::{TaskEvent, emit_task_event}; @@ -39,7 +39,7 @@ async fn get_task_id( ccx: &Arc>, args: &HashMap, ) -> Result { - if let Some(id) = args.get("task_id").and_then(|v| v.as_str()) { + if let Some(id) = args.get("task_id").and_then(|v| v.as_str()).filter(|s| !s.is_empty()) { return Ok(id.to_string()); } let ccx_lock = ccx.lock().await; @@ -89,7 +89,7 @@ impl Tool for ToolTaskBoardGet { let task_id = get_task_id(&ccx, args).await?; let gcx = ccx.lock().await.global_context.clone(); let board = storage::load_board(gcx, &task_id).await?; - let card_id = args.get("card_id").and_then(|v| v.as_str()); + let card_id = args.get("card_id").and_then(|v| v.as_str()).filter(|s| !s.is_empty()); let result = if let Some(cid) = card_id { let card = board @@ -138,11 +138,9 @@ impl Tool for ToolTaskBoardGet { experimental: false, allow_parallel: true, description: "Get task board state. Without card_id returns summary (id, title, column, priority, depends_on). With card_id returns full card details including instructions, status_updates, final_report.".to_string(), - parameters: vec![ - ToolParam { name: "task_id".to_string(), param_type: "string".to_string(), description: "Task UUID (optional if in task context)".to_string() }, - ToolParam { name: "card_id".to_string(), param_type: "string".to_string(), description: "Card ID to get full details for (optional)".to_string() }, - ], - parameters_required: vec![], + input_schema: json_schema_from_params(&[("task_id", "string", "Task UUID (optional if in task context)"), ("card_id", "string", "Card ID to get full details for (optional)")], &[]), + output_schema: None, + annotations: None, } } } @@ -257,36 +255,9 @@ impl Tool for ToolTaskBoardCreateCard { experimental: false, allow_parallel: false, description: "Create a new card on the task board.".to_string(), - parameters: vec![ - ToolParam { - name: "card_id".to_string(), - param_type: "string".to_string(), - description: "Card ID (e.g., T-1, T-2)".to_string(), - }, - ToolParam { - name: "title".to_string(), - param_type: "string".to_string(), - description: "Card title".to_string(), - }, - ToolParam { - name: "priority".to_string(), - param_type: "string".to_string(), - description: "Priority: P0, P1, or P2".to_string(), - }, - ToolParam { - name: "instructions".to_string(), - param_type: "string".to_string(), - description: "Detailed instructions for the agent".to_string(), - }, - ToolParam { - name: "depends_on".to_string(), - param_type: "string".to_string(), - description: - "Comma-separated list of card IDs this card depends on (e.g., \"T-1, T-2\")" - .to_string(), - }, - ], - parameters_required: vec!["card_id".to_string(), "title".to_string()], + input_schema: json_schema_from_params(&[("card_id", "string", "Card ID (e.g., T-1, T-2)"), ("title", "string", "Card title"), ("priority", "string", "Priority: P0, P1, or P2"), ("instructions", "string", "Detailed instructions for the agent"), ("depends_on", "string", "Comma-separated list of card IDs this card depends on (e.g., \"T-1, T-2\")")], &["card_id", "title"]), + output_schema: None, + annotations: None, } } } @@ -381,35 +352,9 @@ impl Tool for ToolTaskBoardUpdateCard { experimental: false, allow_parallel: false, description: "Update an existing card's fields.".to_string(), - parameters: vec![ - ToolParam { - name: "card_id".to_string(), - param_type: "string".to_string(), - description: "Card ID to update".to_string(), - }, - ToolParam { - name: "title".to_string(), - param_type: "string".to_string(), - description: "New title".to_string(), - }, - ToolParam { - name: "priority".to_string(), - param_type: "string".to_string(), - description: "New priority".to_string(), - }, - ToolParam { - name: "instructions".to_string(), - param_type: "string".to_string(), - description: "New instructions".to_string(), - }, - ToolParam { - name: "depends_on".to_string(), - param_type: "string".to_string(), - description: "Comma-separated list of new dependencies (e.g., \"T-1, T-2\")" - .to_string(), - }, - ], - parameters_required: vec!["card_id".to_string()], + input_schema: json_schema_from_params(&[("card_id", "string", "Card ID to update"), ("title", "string", "New title"), ("priority", "string", "New priority"), ("instructions", "string", "New instructions"), ("depends_on", "string", "Comma-separated list of new dependencies (e.g., \"T-1, T-2\")")], &["card_id"]), + output_schema: None, + annotations: None, } } } @@ -514,19 +459,9 @@ impl Tool for ToolTaskBoardMoveCard { experimental: false, allow_parallel: false, description: "Move a card to a different column.".to_string(), - parameters: vec![ - ToolParam { - name: "card_id".to_string(), - param_type: "string".to_string(), - description: "Card ID to move".to_string(), - }, - ToolParam { - name: "column".to_string(), - param_type: "string".to_string(), - description: "Target column: planned, doing, done, or failed".to_string(), - }, - ], - parameters_required: vec!["card_id".to_string(), "column".to_string()], + input_schema: json_schema_from_params(&[("card_id", "string", "Card ID to move"), ("column", "string", "Target column: planned, doing, done, or failed")], &["card_id", "column"]), + output_schema: None, + annotations: None, } } } @@ -612,12 +547,9 @@ impl Tool for ToolTaskBoardDeleteCard { experimental: false, allow_parallel: false, description: "Delete a card from the board.".to_string(), - parameters: vec![ToolParam { - name: "card_id".to_string(), - param_type: "string".to_string(), - description: "Card ID to delete".to_string(), - }], - parameters_required: vec!["card_id".to_string()], + input_schema: json_schema_from_params(&[("card_id", "string", "Card ID to delete")], &["card_id"]), + output_schema: None, + annotations: None, } } } @@ -672,8 +604,9 @@ impl Tool for ToolTaskReadyCards { allow_parallel: true, description: "Get cards that are ready to be worked on (all dependencies satisfied)." .to_string(), - parameters: vec![], - parameters_required: vec![], + input_schema: json_schema_from_params(&[], &[]), + output_schema: None, + annotations: None, } } } diff --git a/refact-agent/engine/src/tools/tool_task_check_agents.rs b/refact-agent/engine/src/tools/tool_task_check_agents.rs index 3153dcb7e6..fa1b52e519 100644 --- a/refact-agent/engine/src/tools/tool_task_check_agents.rs +++ b/refact-agent/engine/src/tools/tool_task_check_agents.rs @@ -4,7 +4,7 @@ use serde_json::Value; use tokio::sync::Mutex as AMutex; use async_trait::async_trait; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::at_commands::at_commands::AtCommandsContext; use crate::tasks::storage; @@ -149,14 +149,9 @@ impl Tool for ToolTaskCheckAgents { experimental: false, allow_parallel: true, description: "Check the status of all spawned agents for a task. Shows their board status (primary) and live session state (if available). Agents mark themselves done via task_agent_finish(). Agents that fail (streaming errors, timeouts, stuck) are automatically marked as failed.".to_string(), - parameters: vec![ - ToolParam { - name: "task_id".to_string(), - param_type: "string".to_string(), - description: "Task ID (optional if chat is bound to a task)".to_string(), - }, - ], - parameters_required: vec![], + input_schema: json_schema_from_params(&[("task_id", "string", "Task ID (optional if chat is bound to a task)")], &[]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_task_done.rs b/refact-agent/engine/src/tools/tool_task_done.rs index effce697c5..e883fdc449 100644 --- a/refact-agent/engine/src/tools/tool_task_done.rs +++ b/refact-agent/engine/src/tools/tool_task_done.rs @@ -8,7 +8,7 @@ use tracing::error; use crate::at_commands::at_commands::AtCommandsContext; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::memories::{memories_add_enriched, EnrichmentParams}; use crate::http::routers::v1::sidebar::NotificationEvent; @@ -63,24 +63,9 @@ impl Tool for ToolTaskDone { experimental: false, allow_parallel: false, description: "Mark the current task as complete with a detailed report. Automatically saves to knowledge base. Use as the FINAL action when a task is fully completed.".to_string(), - parameters: vec![ - ToolParam { - name: "report".to_string(), - param_type: "string".to_string(), - description: "Detailed markdown report of what was accomplished".to_string(), - }, - ToolParam { - name: "summary".to_string(), - param_type: "string".to_string(), - description: "One-line summary for notifications and titles".to_string(), - }, - ToolParam { - name: "files_changed".to_string(), - param_type: "string".to_string(), - description: "Comma-separated list or JSON array of file paths that were modified".to_string(), - }, - ], - parameters_required: vec!["report".to_string(), "summary".to_string()], + input_schema: json_schema_from_params(&[("report", "string", "Detailed markdown report of what was accomplished"), ("summary", "string", "One-line summary for notifications and titles"), ("files_changed", "string", "Comma-separated list or JSON array of file paths that were modified")], &["report", "summary"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_task_init.rs b/refact-agent/engine/src/tools/tool_task_init.rs index 54c6c30d8e..f7827f9158 100644 --- a/refact-agent/engine/src/tools/tool_task_init.rs +++ b/refact-agent/engine/src/tools/tool_task_init.rs @@ -6,7 +6,7 @@ use tokio::sync::Mutex as AMutex; use crate::at_commands::at_commands::AtCommandsContext; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::tasks::storage; pub struct ToolTaskInit; @@ -66,13 +66,9 @@ impl Tool for ToolTaskInit { allow_parallel: false, description: "Create a new task workspace for planning and orchestrating work." .to_string(), - parameters: vec![ToolParam { - name: "name".to_string(), - param_type: "string".to_string(), - description: "Name of the task (e.g., 'Auth Refactor', 'Database Migration')" - .to_string(), - }], - parameters_required: vec!["name".to_string()], + input_schema: json_schema_from_params(&[("name", "string", "Name of the task (e.g., 'Auth Refactor', 'Database Migration')")], &["name"]), + output_schema: None, + annotations: None, } } } diff --git a/refact-agent/engine/src/tools/tool_task_mark_card.rs b/refact-agent/engine/src/tools/tool_task_mark_card.rs index 6db27750d1..37bddaf62e 100644 --- a/refact-agent/engine/src/tools/tool_task_mark_card.rs +++ b/refact-agent/engine/src/tools/tool_task_mark_card.rs @@ -5,7 +5,7 @@ use tokio::sync::Mutex as AMutex; use async_trait::async_trait; use chrono::Utc; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::at_commands::at_commands::AtCommandsContext; use crate::tasks::storage; @@ -54,19 +54,9 @@ impl Tool for ToolTaskMarkCardDone { experimental: false, allow_parallel: false, description: "Manually mark a card as done. Use this if an agent completed work but forgot to call task_agent_finish(), or to finalize a card after reviewing the agent's work.".to_string(), - parameters: vec![ - ToolParam { - name: "card_id".to_string(), - param_type: "string".to_string(), - description: "Card ID to mark as done".to_string(), - }, - ToolParam { - name: "report".to_string(), - param_type: "string".to_string(), - description: "Summary/report for the completed card".to_string(), - }, - ], - parameters_required: vec!["card_id".to_string(), "report".to_string()], + input_schema: json_schema_from_params(&[("card_id", "string", "Card ID to mark as done"), ("report", "string", "Summary/report for the completed card")], &["card_id", "report"]), + output_schema: None, + annotations: None, } } @@ -154,19 +144,9 @@ impl Tool for ToolTaskMarkCardFailed { experimental: false, allow_parallel: false, description: "Manually mark a card as failed. Use this to resolve stuck agents, mark cards that cannot be completed, or when an agent errored without calling task_agent_finish().".to_string(), - parameters: vec![ - ToolParam { - name: "card_id".to_string(), - param_type: "string".to_string(), - description: "Card ID to mark as failed".to_string(), - }, - ToolParam { - name: "reason".to_string(), - param_type: "string".to_string(), - description: "Reason for failure".to_string(), - }, - ], - parameters_required: vec!["card_id".to_string(), "reason".to_string()], + input_schema: json_schema_from_params(&[("card_id", "string", "Card ID to mark as failed"), ("reason", "string", "Reason for failure")], &["card_id", "reason"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_task_memory.rs b/refact-agent/engine/src/tools/tool_task_memory.rs index 04d421dc55..25c827dcb7 100644 --- a/refact-agent/engine/src/tools/tool_task_memory.rs +++ b/refact-agent/engine/src/tools/tool_task_memory.rs @@ -16,7 +16,7 @@ use crate::call_validation::{ChatContent, ChatMessage, ContextEnum}; use crate::global_context::GlobalContext; use crate::postprocessing::pp_command_output::OutputFilter; use crate::tasks::storage::find_task_dir; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use tokio::sync::RwLock as ARwLock; const MEMORIES_DIR: &str = "memories"; @@ -77,24 +77,9 @@ impl Tool for ToolTaskMemorySave { experimental: false, allow_parallel: false, description: "Saves a memory/note for the current task. Use this to record decisions, assumptions, API quirks, investigation results, or any useful information that should be shared with other agents and future planner iterations. Memories are automatically injected into all task chats.".to_string(), - parameters: vec![ - ToolParam { - name: "content".to_string(), - param_type: "string".to_string(), - description: "The content to save. Can be markdown formatted.".to_string(), - }, - ToolParam { - name: "title".to_string(), - param_type: "string".to_string(), - description: "Optional title for the memory (used in filename).".to_string(), - }, - ToolParam { - name: "tags".to_string(), - param_type: "string".to_string(), - description: "Optional comma-separated tags for categorization.".to_string(), - }, - ], - parameters_required: vec!["content".to_string()], + input_schema: json_schema_from_params(&[("content", "string", "The content to save. Can be markdown formatted."), ("title", "string", "Optional title for the memory (used in filename)."), ("tags", "string", "Optional comma-separated tags for categorization.")], &["content"]), + output_schema: None, + annotations: None, } } @@ -234,14 +219,9 @@ impl Tool for ToolTaskMemoriesGet { experimental: false, allow_parallel: true, description: "Retrieves all saved memories for the current task. Returns the content of all memory files from the task's memories folder.".to_string(), - parameters: vec![ - ToolParam { - name: "format".to_string(), - param_type: "string".to_string(), - description: "Output format: 'full' (default) returns all content, 'titles' returns only titles/filenames, 'paths' returns only file paths.".to_string(), - }, - ], - parameters_required: vec![], + input_schema: json_schema_from_params(&[("format", "string", "Output format: 'full' (default) returns all content, 'titles' returns only titles/filenames, 'paths' returns only file paths.")], &[]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_task_merge_agent.rs b/refact-agent/engine/src/tools/tool_task_merge_agent.rs index fdf5833991..d23ebeacc6 100644 --- a/refact-agent/engine/src/tools/tool_task_merge_agent.rs +++ b/refact-agent/engine/src/tools/tool_task_merge_agent.rs @@ -5,7 +5,7 @@ use serde_json::Value; use tokio::sync::Mutex as AMutex; use async_trait::async_trait; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::at_commands::at_commands::AtCommandsContext; use crate::tasks::storage; @@ -36,24 +36,9 @@ impl Tool for ToolTaskMergeAgent { experimental: false, allow_parallel: false, description: "Merge an agent's work back to the main branch and cleanup the worktree. The agent must have completed work on a card with an associated git branch and worktree.".to_string(), - parameters: vec![ - ToolParam { - name: "card_id".to_string(), - param_type: "string".to_string(), - description: "Card ID whose agent branch to merge".to_string(), - }, - ToolParam { - name: "strategy".to_string(), - param_type: "string".to_string(), - description: "Merge strategy: 'merge' (default) or 'squash'".to_string(), - }, - ToolParam { - name: "delete_worktree".to_string(), - param_type: "boolean".to_string(), - description: "Delete worktree and branch after merge (default: true)".to_string(), - }, - ], - parameters_required: vec!["card_id".to_string()], + input_schema: json_schema_from_params(&[("card_id", "string", "Card ID whose agent branch to merge"), ("strategy", "string", "Merge strategy: 'merge' (default) or 'squash'"), ("delete_worktree", "boolean", "Delete worktree and branch after merge (default: true)")], &["card_id"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_task_spawn_agent.rs b/refact-agent/engine/src/tools/tool_task_spawn_agent.rs index 8caf15641c..7f72adccb7 100644 --- a/refact-agent/engine/src/tools/tool_task_spawn_agent.rs +++ b/refact-agent/engine/src/tools/tool_task_spawn_agent.rs @@ -8,7 +8,7 @@ use async_trait::async_trait; use uuid::Uuid; use chrono::{DateTime, Utc}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::at_commands::at_commands::AtCommandsContext; use crate::tasks::storage; @@ -195,19 +195,9 @@ impl Tool for ToolTaskSpawnAgent { experimental: false, allow_parallel: false, description: "Spawn an agent to work on a specific task card. The agent runs in the background as a real chat session. Returns immediately with a hyperlink to view the agent's progress. The agent will call task_agent_finish() when done.".to_string(), - parameters: vec![ - ToolParam { - name: "card_id".to_string(), - param_type: "string".to_string(), - description: "Card ID to work on".to_string(), - }, - ToolParam { - name: "suggested_steps".to_string(), - param_type: "integer".to_string(), - description: "Suggested step budget for the agent (default: 30). This is a hint, not enforced.".to_string(), - }, - ], - parameters_required: vec!["card_id".to_string()], + input_schema: json_schema_from_params(&[("card_id", "string", "Card ID to work on"), ("suggested_steps", "integer", "Suggested step budget for the agent (default: 30). This is a hint, not enforced.")], &["card_id"]), + output_schema: None, + annotations: None, } } @@ -418,6 +408,7 @@ impl Tool for ToolTaskSpawnAgent { parallel_tool_calls: None, previous_response_id: None, browser_meta: None, + active_skill: None, }; let user_prompt = build_agent_prompt( diff --git a/refact-agent/engine/src/tools/tool_task_wait_for_agents.rs b/refact-agent/engine/src/tools/tool_task_wait_for_agents.rs index fc2618587d..48339807af 100644 --- a/refact-agent/engine/src/tools/tool_task_wait_for_agents.rs +++ b/refact-agent/engine/src/tools/tool_task_wait_for_agents.rs @@ -4,7 +4,7 @@ use serde_json::Value; use tokio::sync::Mutex as AMutex; use async_trait::async_trait; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::at_commands::at_commands::AtCommandsContext; use crate::tools::tool_task_check_agents::{get_task_id, get_agent_statuses, format_agent_status}; @@ -30,14 +30,9 @@ impl Tool for ToolTaskWaitForAgents { experimental: false, allow_parallel: false, description: "Check the status of all spawned agents for a task. Shows their board status (primary) and live session state (if available). Agents mark themselves done via task_agent_finish(). Agents that fail (streaming errors, timeouts, stuck) are automatically marked as failed.".to_string(), - parameters: vec![ - ToolParam { - name: "task_id".to_string(), - param_type: "string".to_string(), - description: "Task ID (optional if chat is bound to a task)".to_string(), - }, - ], - parameters_required: vec![], + input_schema: json_schema_from_params(&[("task_id", "string", "Task ID (optional if chat is bound to a task)")], &[]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_tasks.rs b/refact-agent/engine/src/tools/tool_tasks.rs index 69398ed739..eb29693bcc 100644 --- a/refact-agent/engine/src/tools/tool_tasks.rs +++ b/refact-agent/engine/src/tools/tool_tasks.rs @@ -8,7 +8,7 @@ use tokio::sync::Mutex as AMutex; use crate::at_commands::at_commands::AtCommandsContext; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType}; #[derive(Debug, Clone, Serialize, Deserialize)] pub struct TaskItem { @@ -45,15 +45,37 @@ impl Tool for ToolTasksSet { description: "Set the task progress list shown to the user. Use to track multi-step work. \ Pass complete task list each time (replaces previous). \ Each task needs: id (unique string), content (description), status (pending/in_progress/completed/failed).".to_string(), - parameters: vec![ - ToolParam { - name: "tasks".to_string(), - param_type: "array".to_string(), - description: "Array of task objects. Each object: {\"id\": \"1\", \"content\": \"Task description\", \"status\": \"pending\"}. \ - Status values: pending, in_progress, completed, failed.".to_string(), + input_schema: serde_json::json!({ + "type": "object", + "properties": { + "tasks": { + "type": "array", + "description": "Complete task list (replaces previous). Each task needs id, content, and status.", + "items": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "Unique task identifier (1-50 chars)." + }, + "content": { + "type": "string", + "description": "Task description (1-500 chars)." + }, + "status": { + "type": "string", + "description": "Task status.", + "enum": ["pending", "in_progress", "completed", "failed"] + } + }, + "required": ["id", "content", "status"] + } + } }, - ], - parameters_required: vec!["tasks".to_string()], + "required": ["tasks"] + }), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_trajectory_context.rs b/refact-agent/engine/src/tools/tool_trajectory_context.rs index c457f643fa..42bb2a874e 100644 --- a/refact-agent/engine/src/tools/tool_trajectory_context.rs +++ b/refact-agent/engine/src/tools/tool_trajectory_context.rs @@ -7,7 +7,7 @@ use tokio::fs; use crate::at_commands::at_commands::AtCommandsContext; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::files_correction::get_project_dirs; pub struct ToolTrajectoryContext { @@ -29,34 +29,9 @@ impl Tool for ToolTrajectoryContext { description: "Get more context from a specific trajectory around given message indices." .to_string(), - parameters: vec![ - ToolParam { - name: "trajectory_id".to_string(), - param_type: "string".to_string(), - description: "The trajectory ID to retrieve context from.".to_string(), - }, - ToolParam { - name: "message_start".to_string(), - param_type: "string".to_string(), - description: "Starting message index.".to_string(), - }, - ToolParam { - name: "message_end".to_string(), - param_type: "string".to_string(), - description: "Ending message index.".to_string(), - }, - ToolParam { - name: "expand_by".to_string(), - param_type: "string".to_string(), - description: "Number of messages to include before/after (default: 3)." - .to_string(), - }, - ], - parameters_required: vec![ - "trajectory_id".to_string(), - "message_start".to_string(), - "message_end".to_string(), - ], + input_schema: json_schema_from_params(&[("trajectory_id", "string", "The trajectory ID to retrieve context from."), ("message_start", "string", "Starting message index."), ("message_end", "string", "Ending message index."), ("expand_by", "string", "Number of messages to include before/after (default: 3).")], &["trajectory_id", "message_start", "message_end"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_tree.rs b/refact-agent/engine/src/tools/tool_tree.rs index 5f331e1002..d0daf6740b 100644 --- a/refact-agent/engine/src/tools/tool_tree.rs +++ b/refact-agent/engine/src/tools/tool_tree.rs @@ -8,7 +8,7 @@ use tokio::sync::Mutex as AMutex; use crate::at_commands::at_commands::AtCommandsContext; use crate::at_commands::at_file::return_one_candidate_or_a_good_error; use crate::at_commands::at_tree::{tree_for_tools, TreeNode}; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::postprocessing::pp_command_output::OutputFilter; use crate::files_correction::{ @@ -42,24 +42,9 @@ impl Tool for ToolTree { experimental: false, allow_parallel: true, description: "Get a files tree for the project. Shows file sizes and line counts. Folders with many files are truncated (controlled by max_files). Hidden folders, __pycache__, node_modules, and binary files are excluded.".to_string(), - parameters: vec![ - ToolParam { - name: "path".to_string(), - description: "An absolute path to get files tree for. Do not pass it if you need a full project tree.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "use_ast".to_string(), - description: "If true, for each file an array of AST symbols will appear as well as its filename".to_string(), - param_type: "boolean".to_string(), - }, - ToolParam { - name: "max_files".to_string(), - description: "Maximum files to show per folder before truncating (default: 10). Root folder is never truncated.".to_string(), - param_type: "integer".to_string(), - }, - ], - parameters_required: vec![], + input_schema: json_schema_from_params(&[("path", "string", "An absolute path to get files tree for. Do not pass it if you need a full project tree."), ("use_ast", "boolean", "If true, for each file an array of AST symbols will appear as well as its filename"), ("max_files", "integer", "Maximum files to show per folder before truncating (default: 10). Root folder is never truncated.")], &[]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_web.rs b/refact-agent/engine/src/tools/tool_web.rs index 8b6d4dc028..94fe67a831 100644 --- a/refact-agent/engine/src/tools/tool_web.rs +++ b/refact-agent/engine/src/tools/tool_web.rs @@ -6,7 +6,7 @@ use tokio::sync::Mutex as AMutex; use crate::at_commands::at_commands::AtCommandsContext; use crate::at_commands::at_web::execute_at_web; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; use crate::postprocessing::pp_command_output::OutputFilter; @@ -66,36 +66,72 @@ impl Tool for ToolWeb { experimental: false, allow_parallel: true, description: "Fetch a web page and convert to readable plain text. Supports regular web pages, PDFs, and JavaScript-rendered pages. Uses Jina Reader API with automatic fallback.".to_string(), - parameters: vec![ - ToolParam { - name: "url".to_string(), - description: "URL of the web page to fetch.".to_string(), - param_type: "string".to_string(), + input_schema: serde_json::json!({ + "type": "object", + "properties": { + "url": { + "type": "string", + "description": "URL of the web page to fetch." + }, + "options": { + "type": "object", + "description": "Jina Reader API options passed as request headers.", + "properties": { + "respond_with": { + "type": "string", + "description": "Controls response format (x-respond-with header)." + }, + "target_selector": { + "type": "string", + "description": "CSS selector to extract a specific element (x-target-selector header)." + }, + "wait_for_selector": { + "type": "string", + "description": "CSS selector to wait for before returning content (x-wait-for-selector header)." + }, + "timeout": { + "type": "number", + "description": "Request timeout in seconds (x-timeout header)." + }, + "no_cache": { + "type": "boolean", + "description": "Bypass Jina cache when true (x-no-cache header)." + }, + "cache_tolerance": { + "type": "number", + "description": "Cache staleness tolerance in seconds (x-cache-tolerance header)." + }, + "with_generated_alt": { + "type": "boolean", + "description": "Include AI-generated alt text for images (x-with-generated-alt header)." + }, + "streaming": { + "type": "boolean", + "description": "Stream the response as SSE (sets Accept: text/event-stream)." + }, + "set_cookie": { + "type": "string", + "description": "Cookie string to send with the request (x-set-cookie header)." + }, + "proxy_url": { + "type": "string", + "description": "Proxy URL to route the request through (x-proxy-url header)." + } + } + }, + "output_filter": { + "type": "string", + "description": "Optional regex pattern to filter output lines. Only lines matching this pattern (and context) will be shown." + }, + "output_limit": { + "type": "string", + "description": "Optional. Max lines to show (default: 200). Use higher values like '500' or 'all' to see more output." + } }, - ToolParam { - name: "options".to_string(), - description: r#"Optional object with additional parameters: -- "respond_with": Response format - "markdown", "html", "text", or "screenshot" -- "target_selector": CSS selector to extract specific element -- "wait_for_selector": CSS selector to wait for (useful for SPAs) -- "timeout": Timeout in seconds for slow pages -- "no_cache": Set to true to bypass cache -- "streaming": Set to true for JS-heavy pages that need more time to render -- "with_generated_alt": Set to true to generate alt text for images using AI"#.to_string(), - param_type: "object".to_string(), - }, - ToolParam { - name: "output_filter".to_string(), - description: "Optional regex pattern to filter output lines. Only lines matching this pattern (and context) will be shown.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "output_limit".to_string(), - description: "Optional. Max lines to show (default: 200). Use higher values like '500' or 'all' to see more output.".to_string(), - param_type: "string".to_string(), - }, - ], - parameters_required: vec!["url".to_string()], + "required": ["url"] + }), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tool_web_search.rs b/refact-agent/engine/src/tools/tool_web_search.rs index 045c7f03a6..932f707ddb 100644 --- a/refact-agent/engine/src/tools/tool_web_search.rs +++ b/refact-agent/engine/src/tools/tool_web_search.rs @@ -6,7 +6,7 @@ use tokio::sync::Mutex as AMutex; use crate::at_commands::at_commands::AtCommandsContext; use crate::at_commands::at_web_search::execute_web_search; -use crate::tools::tools_description::{Tool, ToolDesc, ToolParam, ToolSource, ToolSourceType}; +use crate::tools::tools_description::{Tool, ToolDesc, ToolSource, ToolSourceType, json_schema_from_params}; use crate::call_validation::{ChatMessage, ChatContent, ContextEnum}; pub struct ToolWebSearch { @@ -28,19 +28,9 @@ impl Tool for ToolWebSearch { experimental: false, allow_parallel: true, description: "Search the web and return results with titles, URLs, and snippets. Uses DuckDuckGo.".to_string(), - parameters: vec![ - ToolParam { - name: "query".to_string(), - description: "Search query.".to_string(), - param_type: "string".to_string(), - }, - ToolParam { - name: "num_results".to_string(), - description: "Optional. Maximum number of results to return (default: 8).".to_string(), - param_type: "string".to_string(), - }, - ], - parameters_required: vec!["query".to_string()], + input_schema: json_schema_from_params(&[("query", "string", "Search query."), ("num_results", "string", "Optional. Maximum number of results to return (default: 8).")], &["query"]), + output_schema: None, + annotations: None, } } diff --git a/refact-agent/engine/src/tools/tools_description.rs b/refact-agent/engine/src/tools/tools_description.rs index 2186ce1973..9e1645854c 100644 --- a/refact-agent/engine/src/tools/tools_description.rs +++ b/refact-agent/engine/src/tools/tools_description.rs @@ -16,7 +16,13 @@ pub fn command_should_be_confirmed_by_user( commands_need_confirmation_rules: &Vec, ) -> (bool, String) { if let Some(rule) = commands_need_confirmation_rules.iter().find(|glob| { - let pattern = Pattern::new(glob).unwrap(); + let pattern = match Pattern::new(glob) { + Ok(p) => p, + Err(e) => { + tracing::warn!("Invalid glob pattern '{}': {}", glob, e); + return false; + } + }; pattern.matches(&command) }) { return (true, rule.clone()); @@ -29,7 +35,13 @@ pub fn command_should_be_denied( commands_deny_rules: &Vec, ) -> (bool, String) { if let Some(rule) = commands_deny_rules.iter().find(|glob| { - let pattern = Pattern::new(glob).unwrap(); + let pattern = match Pattern::new(glob) { + Ok(p) => p, + Err(e) => { + tracing::warn!("Invalid glob pattern '{}': {}", glob, e); + return false; + } + }; pattern.matches(&command) }) { return (true, rule.clone()); @@ -88,8 +100,16 @@ pub struct ToolDesc { #[serde(default)] pub allow_parallel: bool, pub description: String, - pub parameters: Vec, - pub parameters_required: Vec, + /// Full JSON Schema for tool input parameters. + /// Must be `{"type": "object", "properties": {...}, "required": [...]}`. + /// For tools with no parameters, use `{"type": "object", "properties": {}}`. + pub input_schema: serde_json::Value, + /// Optional JSON Schema for structured output. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_schema: Option, + /// MCP-style tool annotations (readOnlyHint, destructiveHint, idempotentHint, openWorldHint, title). + #[serde(default, skip_serializing_if = "Option::is_none")] + pub annotations: Option, pub display_name: String, pub source: ToolSource, } @@ -107,15 +127,6 @@ impl Default for ToolConfig { } } -#[derive(Clone, Serialize, Deserialize, Debug)] -pub struct ToolParam { - #[serde(deserialize_with = "validate_snake_case")] - pub name: String, - #[serde(rename = "type", default = "default_param_type")] - pub param_type: String, - pub description: String, -} - #[async_trait] pub trait Tool: Send + Sync { async fn tool_execute( @@ -195,7 +206,6 @@ pub trait Tool: Send + Sync { let tool_name = tool_desc.name; let config_path = tool_desc.source.config_path; - // Read the config file as yaml, and get field tools.tool_name let config = std::fs::read_to_string(config_path) .map_err(|e| format!("Error reading config file: {}", e))?; @@ -270,81 +280,111 @@ pub async fn set_tool_config( Ok(()) } -fn validate_snake_case<'de, D>(deserializer: D) -> Result -where - D: serde::Deserializer<'de>, -{ - let s = String::deserialize(deserializer)?; - if !s.chars().next().map_or(false, |c| c.is_ascii_lowercase()) - || !s - .chars() - .all(|c| c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_') - || s.contains("__") - || s.ends_with('_') - { - return Err(serde::de::Error::custom( - format!("name {:?} must be in snake_case format: lowercase letters, numbers and single underscores, must start with letter", s) - )); +/// Helper to build a simple input schema from flat parameter definitions. +/// Useful for builtin tools that have simple string/boolean/integer params. +pub fn json_schema_from_params(params: &[(&str, &str, &str)], required: &[&str]) -> Value { + let mut properties = serde_json::Map::new(); + for (name, param_type, description) in params { + properties.insert(name.to_string(), json!({ + "type": param_type, + "description": description + })); } - Ok(s) + json!({ + "type": "object", + "properties": properties, + "required": required + }) } -fn default_param_type() -> String { - "string".to_string() +pub fn is_strict_compatible(schema: &Value) -> bool { + let Some(obj) = schema.as_object() else { + return true; + }; + if obj.get("type") != Some(&json!("object")) { + return true; + } + if obj.get("additionalProperties") == Some(&json!(true)) { + return false; + } + let Some(props) = obj.get("properties").and_then(|p| p.as_object()) else { + return false; + }; + if props.is_empty() { + return true; + } + let required_set: std::collections::HashSet<&str> = obj + .get("required") + .and_then(|r| r.as_array()) + .map(|arr| arr.iter().filter_map(|v| v.as_str()).collect()) + .unwrap_or_default(); + for (key, val) in props { + if !required_set.contains(key.as_str()) { + return false; + } + if val.get("type") == Some(&json!("object")) && !is_strict_compatible(val) { + return false; + } + if let Some(items) = val.get("items") { + if items.get("type") == Some(&json!("object")) && !is_strict_compatible(items) { + return false; + } + } + } + true } -/// TODO: Think a better way to know if we can send array type to the model -/// -/// For now, anthropic models support it, gpt models don't, for other, we'll need to test -pub fn model_supports_array_param_type(model_id: &str) -> bool { - model_id.contains("claude") +fn apply_strict_schema(schema: Value) -> Value { + let Value::Object(mut map) = schema else { + return schema; + }; + if map.get("type") == Some(&json!("object")) { + if !map.contains_key("additionalProperties") { + map.insert("additionalProperties".to_string(), json!(false)); + } + if let Some(Value::Object(props)) = map.remove("properties") { + let new_props: serde_json::Map = props + .into_iter() + .map(|(k, v)| { + let new_v = if v.get("type") == Some(&json!("object")) { + apply_strict_schema(v) + } else if v.get("type") == Some(&json!("array")) { + let Value::Object(mut arr_map) = v else { unreachable!() }; + if let Some(items) = arr_map.remove("items") { + arr_map.insert("items".to_string(), apply_strict_schema(items)); + } + Value::Object(arr_map) + } else { + v + }; + (k, new_v) + }) + .collect(); + map.insert("properties".to_string(), Value::Object(new_props)); + } + } + Value::Object(map) } pub fn make_openai_tool_value( name: String, description: String, - parameters_required: Vec, - parameters: Vec, + input_schema: Value, strict: bool, ) -> Value { - let params_properties = parameters - .iter() - .map(|param| { - ( - param.name.clone(), - json!({ - "type": param.param_type, - "description": param.description - }), - ) - }) - .collect::>(); - - let parameters_schema = if strict { - json!({ - "type": "object", - "properties": params_properties, - "required": parameters_required, - "additionalProperties": false - }) - } else { - json!({ - "type": "object", - "properties": params_properties, - "required": parameters_required - }) - }; - + let mut parameters_schema = input_schema; + let effective_strict = strict && is_strict_compatible(¶meters_schema); + if effective_strict { + parameters_schema = apply_strict_schema(parameters_schema); + } let mut function_obj = json!({ "name": name, "description": description, "parameters": parameters_schema }); - - if strict { + if effective_strict { function_obj["strict"] = json!(true); } - json!({ "type": "function", "function": function_obj @@ -353,28 +393,349 @@ pub fn make_openai_tool_value( impl ToolDesc { pub fn into_openai_style(self, strict: bool) -> Value { - make_openai_tool_value( - self.name, - self.description, - self.parameters_required, - self.parameters, - strict, - ) - } - - pub fn is_supported_by(&self, model: &str) -> bool { - if !model_supports_array_param_type(model) { - for param in &self.parameters { - if param.param_type == "array" { - tracing::warn!( - "Tool {} has array parameter, but model {} does not support it", - self.name, - model - ); - return false; + make_openai_tool_value(self.name, self.description, self.input_schema, strict) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use serde_json::json; + + #[test] + fn test_json_schema_from_params_basic() { + let schema = json_schema_from_params( + &[ + ("path", "string", "File path"), + ("content", "string", "File content"), + ], + &["path"], + ); + assert_eq!(schema["type"], json!("object")); + assert_eq!(schema["properties"]["path"]["type"], json!("string")); + assert_eq!(schema["properties"]["path"]["description"], json!("File path")); + assert_eq!(schema["properties"]["content"]["type"], json!("string")); + assert_eq!(schema["required"], json!(["path"])); + } + + #[test] + fn test_json_schema_from_params_no_params() { + let schema = json_schema_from_params(&[], &[]); + assert_eq!(schema["type"], json!("object")); + assert_eq!(schema["properties"], json!({})); + assert_eq!(schema["required"], json!([])); + } + + #[test] + fn test_make_openai_tool_value_not_strict() { + let schema = json!({ + "type": "object", + "properties": { + "query": {"type": "string", "description": "Search query"} + }, + "required": ["query"] + }); + let result = make_openai_tool_value( + "search".to_string(), + "Search the web".to_string(), + schema, + false, + ); + assert_eq!(result["type"], json!("function")); + assert_eq!(result["function"]["name"], json!("search")); + assert_eq!(result["function"]["description"], json!("Search the web")); + assert_eq!(result["function"]["parameters"]["type"], json!("object")); + assert!(result["function"]["strict"].is_null()); + assert!(result["function"]["parameters"]["additionalProperties"].is_null()); + } + + #[test] + fn test_make_openai_tool_value_strict() { + let schema = json!({ + "type": "object", + "properties": { + "query": {"type": "string", "description": "Search query"} + }, + "required": ["query"] + }); + let result = make_openai_tool_value( + "search".to_string(), + "Search the web".to_string(), + schema, + true, + ); + assert_eq!(result["function"]["strict"], json!(true)); + assert_eq!(result["function"]["parameters"]["additionalProperties"], json!(false)); + } + + #[test] + fn test_make_openai_tool_value_strict_preserves_existing_additional_properties() { + let schema = json!({ + "type": "object", + "properties": {}, + "additionalProperties": true + }); + let result = make_openai_tool_value( + "tool".to_string(), + "A tool".to_string(), + schema, + true, + ); + assert_eq!(result["function"]["parameters"]["additionalProperties"], json!(true)); + } + + #[test] + fn test_make_openai_tool_value_complex_schema() { + let schema = json!({ + "type": "object", + "properties": { + "items": { + "type": "array", + "items": {"type": "string"}, + "description": "List of items" + }, + "config": { + "type": "object", + "properties": { + "verbose": {"type": "boolean"} + } + }, + "mode": { + "type": "string", + "enum": ["fast", "slow"] } - } - } - true + }, + "required": ["items"] + }); + let result = make_openai_tool_value( + "process".to_string(), + "Process items".to_string(), + schema, + false, + ); + assert_eq!(result["function"]["parameters"]["properties"]["items"]["type"], json!("array")); + assert_eq!(result["function"]["parameters"]["properties"]["mode"]["enum"], json!(["fast", "slow"])); + } + + #[test] + fn test_invalid_glob_does_not_panic() { + let (confirmed, _) = command_should_be_confirmed_by_user( + &"some command".to_string(), + &vec!["[invalid".to_string()], + ); + assert!(!confirmed); + + let (denied, _) = command_should_be_denied( + &"some command".to_string(), + &vec!["[invalid".to_string()], + ); + assert!(!denied); + } + + #[test] + fn test_into_openai_style_roundtrip() { + let input_schema = json!({ + "type": "object", + "properties": { + "filename": {"type": "string", "description": "The filename"} + }, + "required": ["filename"] + }); + let desc = ToolDesc { + name: "cat".to_string(), + experimental: false, + allow_parallel: true, + description: "Read a file".to_string(), + input_schema: input_schema.clone(), + output_schema: None, + annotations: None, + display_name: "Cat".to_string(), + source: ToolSource { + source_type: ToolSourceType::Builtin, + config_path: "".to_string(), + }, + }; + let result = desc.into_openai_style(false); + assert_eq!(result["function"]["name"], json!("cat")); + assert_eq!(result["function"]["parameters"]["properties"]["filename"]["type"], json!("string")); + } + + #[test] + fn test_is_strict_compatible_all_required() { + let schema = json!({ + "type": "object", + "properties": { + "path": {"type": "string"}, + "content": {"type": "string"} + }, + "required": ["path", "content"] + }); + assert!(is_strict_compatible(&schema)); + } + + #[test] + fn test_is_strict_compatible_optional_param() { + let schema = json!({ + "type": "object", + "properties": { + "command": {"type": "string"}, + "timeout": {"type": "string"} + }, + "required": ["command"] + }); + assert!(!is_strict_compatible(&schema)); + } + + #[test] + fn test_is_strict_compatible_no_params() { + let schema = json!({"type": "object", "properties": {}, "required": []}); + assert!(is_strict_compatible(&schema)); + } + + #[test] + fn test_is_strict_compatible_unstructured_nested_object() { + let schema = json!({ + "type": "object", + "properties": { + "url": {"type": "string"}, + "options": {"type": "object"} + }, + "required": ["url", "options"] + }); + assert!(!is_strict_compatible(&schema)); + } + + #[test] + fn test_is_strict_compatible_nested_array_of_objects_all_required() { + let schema = json!({ + "type": "object", + "properties": { + "tasks": { + "type": "array", + "items": { + "type": "object", + "properties": { + "id": {"type": "string"}, + "status": {"type": "string"} + }, + "required": ["id", "status"] + } + } + }, + "required": ["tasks"] + }); + assert!(is_strict_compatible(&schema)); + } + + #[test] + fn test_is_strict_compatible_nested_array_of_objects_optional_field() { + let schema = json!({ + "type": "object", + "properties": { + "tasks": { + "type": "array", + "items": { + "type": "object", + "properties": { + "id": {"type": "string"}, + "options": {"type": "string"} + }, + "required": ["id"] + } + } + }, + "required": ["tasks"] + }); + assert!(!is_strict_compatible(&schema)); + } + + #[test] + fn test_apply_strict_schema_top_level() { + let schema = json!({ + "type": "object", + "properties": {"x": {"type": "string"}}, + "required": ["x"] + }); + let result = apply_strict_schema(schema); + assert_eq!(result["additionalProperties"], json!(false)); + } + + #[test] + fn test_apply_strict_schema_recursive_nested_object() { + let schema = json!({ + "type": "object", + "properties": { + "config": { + "type": "object", + "properties": {"verbose": {"type": "boolean"}}, + "required": ["verbose"] + } + }, + "required": ["config"] + }); + let result = apply_strict_schema(schema); + assert_eq!(result["additionalProperties"], json!(false)); + assert_eq!(result["properties"]["config"]["additionalProperties"], json!(false)); + } + + #[test] + fn test_apply_strict_schema_recursive_array_items() { + let schema = json!({ + "type": "object", + "properties": { + "items": { + "type": "array", + "items": { + "type": "object", + "properties": {"id": {"type": "string"}}, + "required": ["id"] + } + } + }, + "required": ["items"] + }); + let result = apply_strict_schema(schema); + assert_eq!(result["additionalProperties"], json!(false)); + assert_eq!(result["properties"]["items"]["items"]["additionalProperties"], json!(false)); + } + + #[test] + fn test_make_openai_tool_value_strict_skipped_for_optional_params() { + let schema = json!({ + "type": "object", + "properties": { + "command": {"type": "string"}, + "timeout": {"type": "string"} + }, + "required": ["command"] + }); + let result = make_openai_tool_value("shell".to_string(), "Run".to_string(), schema, true); + assert!(result["function"]["strict"].is_null()); + assert!(result["function"]["parameters"]["additionalProperties"].is_null()); + } + + #[test] + fn test_make_openai_tool_value_strict_applied_recursively() { + let schema = json!({ + "type": "object", + "properties": { + "tasks": { + "type": "array", + "items": { + "type": "object", + "properties": { + "id": {"type": "string"}, + "status": {"type": "string"} + }, + "required": ["id", "status"] + } + } + }, + "required": ["tasks"] + }); + let result = make_openai_tool_value("tasks_set".to_string(), "Set tasks".to_string(), schema, true); + assert_eq!(result["function"]["strict"], json!(true)); + assert_eq!(result["function"]["parameters"]["additionalProperties"], json!(false)); + assert_eq!(result["function"]["parameters"]["properties"]["tasks"]["items"]["additionalProperties"], json!(false)); } } diff --git a/refact-agent/engine/src/tools/tools_list.rs b/refact-agent/engine/src/tools/tools_list.rs index 1bd614003c..3f30aa37e4 100644 --- a/refact-agent/engine/src/tools/tools_list.rs +++ b/refact-agent/engine/src/tools/tools_list.rs @@ -8,9 +8,76 @@ use crate::integrations::running_integrations::load_integrations; use crate::yaml_configs::customization_registry::get_project_registry; use crate::caps::resolve_chat_model; -use super::tools_description::{Tool, ToolGroup, ToolGroupCategory}; +use super::tools_description::{Tool, ToolGroup, ToolGroupCategory, ToolSourceType}; use super::tool_config_subagent::ToolConfigSubagent; +/// When MCP tool count exceeds this threshold, lazy loading activates. +/// The full MCP schemas are replaced by two fixed proxy tools: +/// - `mcp_tool_search` — discover MCP tools by regex, returns schema text +/// - `mcp_call` — execute any MCP tool by name + args JSON +/// +/// The tool list is FIXED for the entire session (cache-safe). +const MCP_LAZY_THRESHOLD: usize = 15; + +/// Result of applying MCP lazy-loading logic on a tool list. +pub struct ToolsForMode { + /// Tool list to send to the LLM as schemas. Fixed for the session lifetime. + pub tools: Vec>, + /// True when lazy mode replaced MCP schemas with the two proxy tools. + pub mcp_lazy_mode: bool, + /// Total count of all MCP tools (for the hint message). + pub mcp_total_count: usize, + /// (name, description) index for ALL MCP tools — used to build the `cd_instruction` hint. + /// Empty when lazy mode is inactive. + pub mcp_tool_index: Vec<(String, String)>, +} + +/// Returns true for real MCP integration tools, false for the proxy builtins +/// (`mcp_call`, `mcp_tool_search`) which share the "mcp" name prefix but have +/// `ToolSourceType::Builtin`. This makes `apply_mcp_lazy_filter` idempotent. +fn is_integration_mcp_tool(t: &Box) -> bool { + let d = t.tool_description(); + d.name.starts_with("mcp") && matches!(d.source.source_type, ToolSourceType::Integration) +} + +/// Apply MCP lazy-loading to a flat tool list returned by `get_tools_for_mode`. +/// +/// When there are more than `MCP_LAZY_THRESHOLD` MCP tools, ALL individual MCP +/// schemas are replaced by two fixed proxy tools (`mcp_tool_search` + `mcp_call`). +/// The tool list produced here NEVER changes during the session — cache-safe. +/// +/// Safe to call multiple times: proxy tools have `ToolSourceType::Builtin` so they +/// are never counted or removed by subsequent calls. +pub fn apply_mcp_lazy_filter(mut tools: Vec>) -> ToolsForMode { + // Collect the index of ALL real MCP integration tools before filtering. + // Proxy builtins (mcp_call / mcp_tool_search) are excluded via source_type check. + let mcp_tool_index: Vec<(String, String)> = tools.iter() + .filter(|t| is_integration_mcp_tool(t)) + .map(|t| { + let d = t.tool_description(); + (d.name, d.description) + }) + .collect(); + + let mcp_total_count = mcp_tool_index.len(); + let mcp_lazy_mode = mcp_total_count > MCP_LAZY_THRESHOLD; + + if mcp_lazy_mode { + // Drop ALL individual MCP tool schemas (integration tools only). + tools.retain(|t| !is_integration_mcp_tool(t)); + // Inject two fixed proxies — tool list is now stable for the session. + tools.push(Box::new(crate::tools::tool_mcp_search::ToolMcpSearch {})); + tools.push(Box::new(crate::tools::tool_mcp_call::ToolMcpCall {})); + } + + ToolsForMode { + tools, + mcp_lazy_mode, + mcp_total_count, + mcp_tool_index: if mcp_lazy_mode { mcp_tool_index } else { vec![] }, + } +} + fn tool_available( tool: &Box, ast_on: bool, @@ -195,6 +262,12 @@ async fn get_builtin_tools(gcx: Arc>) -> Vec { ]; let knowledge_tools: Vec> = vec![ + Box::new(crate::tools::tool_activate_skill::ToolActivateSkill { + config_path: config_path.clone(), + }), + Box::new(crate::tools::tool_activate_skill::ToolDeactivateSkill { + config_path: config_path.clone(), + }), Box::new(crate::tools::tool_knowledge::ToolGetKnowledge { config_path: config_path.clone(), }), @@ -222,6 +295,18 @@ async fn get_builtin_tools(gcx: Arc>) -> Vec { }), ]; + let chat_management_tools: Vec> = vec![ + Box::new(crate::tools::tool_compress_chat::ToolCompressChatProbe { + config_path: config_path.clone(), + }), + Box::new(crate::tools::tool_compress_chat::ToolCompressChatApply { + config_path: config_path.clone(), + }), + Box::new(crate::tools::tool_handoff_to_mode::ToolHandoffToMode { + config_path: config_path.clone(), + }), + ]; + let task_tools: Vec> = vec![ Box::new(crate::tools::tool_task_init::ToolTaskInit::new()), Box::new(crate::tools::tool_task_board::ToolTaskBoardGet::new()), @@ -288,6 +373,12 @@ async fn get_builtin_tools(gcx: Arc>) -> Vec { category: ToolGroupCategory::Builtin, tools: interaction_tools, }, + ToolGroup { + name: "Chat Management".to_string(), + description: "Chat compression and handoff tools".to_string(), + category: ToolGroupCategory::Builtin, + tools: chat_management_tools, + }, ToolGroup { name: "Task Management".to_string(), description: "Task workspace and kanban board tools".to_string(), @@ -303,7 +394,7 @@ async fn get_builtin_tools(gcx: Arc>) -> Vec { tool_groups } -async fn get_integration_tools(gcx: Arc>) -> Vec { +pub async fn get_integration_tools(gcx: Arc>) -> Vec { let mut integrations_group = ToolGroup { name: "Integrations".to_string(), description: "Integration tools".to_string(), @@ -344,8 +435,11 @@ async fn get_integration_tools(gcx: Arc>) -> Vec = mcp_groups.into_iter().collect(); + sorted_mcp.sort_by(|(a, _), (b, _)| a.cmp(b)); + let mut tool_groups = vec![integrations_group]; - tool_groups.extend(mcp_groups.into_values()); + tool_groups.extend(sorted_mcp.into_iter().map(|(_, group)| group)); for tool_group in tool_groups.iter_mut() { tool_group.retain_available_tools(gcx.clone()).await; @@ -358,7 +452,9 @@ async fn get_config_subagent_tools(gcx: Arc>) -> ToolGrou let mut subagent_tools: Vec> = vec![]; if let Some(registry) = get_project_registry(gcx.clone()).await { - for (_, subagent_config) in registry.subagents { + let mut subagents: Vec<(String, _)> = registry.subagents.into_iter().collect(); + subagents.sort_by(|(a, _), (b, _)| a.cmp(b)); + for (_, subagent_config) in subagents { if subagent_config.expose_as_tool && !subagent_config.has_code { subagent_tools.push(Box::new(ToolConfigSubagent::new(subagent_config))); } @@ -472,8 +568,10 @@ pub async fn get_tools_for_mode( .map(|(_, tool)| tool) .collect(); - result.sort_by_key(|tool| { - tool_order.get(tool.tool_description().name.as_str()).copied().unwrap_or(usize::MAX) + result.sort_by(|a, b| { + let a_order = tool_order.get(a.tool_description().name.as_str()).copied().unwrap_or(usize::MAX); + let b_order = tool_order.get(b.tool_description().name.as_str()).copied().unwrap_or(usize::MAX); + a_order.cmp(&b_order).then_with(|| a.tool_description().name.cmp(&b.tool_description().name)) }); result diff --git a/refact-agent/engine/src/trajectory_memos.rs b/refact-agent/engine/src/trajectory_memos.rs index cec5bbee50..4020dc808a 100644 --- a/refact-agent/engine/src/trajectory_memos.rs +++ b/refact-agent/engine/src/trajectory_memos.rs @@ -22,7 +22,18 @@ const SUBAGENT_ID: &str = "memo_extraction"; pub async fn trajectory_memos_background_task(gcx: Arc>) { loop { - tokio::time::sleep(tokio::time::Duration::from_secs(CHECK_INTERVAL_SECS)).await; + let shutdown_flag = gcx.read().await.shutdown_flag.clone(); + tokio::select! { + _ = tokio::time::sleep(tokio::time::Duration::from_secs(CHECK_INTERVAL_SECS)) => {} + _ = async { + while !shutdown_flag.load(std::sync::atomic::Ordering::SeqCst) { + tokio::time::sleep(tokio::time::Duration::from_millis(200)).await; + } + } => { + tracing::info!("Trajectory memos: shutdown detected, stopping"); + return; + } + } if let Err(e) = process_abandoned_trajectories(gcx.clone()).await { warn!("trajectory_memos: error processing trajectories: {}", e); @@ -210,7 +221,7 @@ async fn process_single_trajectory( } fn build_chat_messages(messages: &[Value]) -> Vec { - messages + let msgs: Vec = messages .iter() .filter_map(|msg| { let role = msg.get("role").and_then(|v| v.as_str())?; @@ -231,7 +242,13 @@ fn build_chat_messages(messages: &[Value]) -> Vec { ..Default::default() }) }) - .collect() + .collect(); + + // Drop leading assistant messages — validate_chat_history requires the first message + // to be 'user' or 'system'. This can happen when a subchat trajectory starts with a + // system message (filtered above) followed by an assistant message. + let start = msgs.iter().position(|m| m.role == "user").unwrap_or(msgs.len()); + msgs[start..].to_vec() } struct ExtractedMemo { diff --git a/refact-agent/engine/src/vecdb/vdb_highlev.rs b/refact-agent/engine/src/vecdb/vdb_highlev.rs index 2bb2840c6a..39d0bf4fbf 100644 --- a/refact-agent/engine/src/vecdb/vdb_highlev.rs +++ b/refact-agent/engine/src/vecdb/vdb_highlev.rs @@ -143,6 +143,9 @@ pub async fn vecdb_background_reload(gcx: Arc>) { let mut background_tasks = BackgroundTasksHolder::new(vec![]); loop { + if gcx.read().await.shutdown_flag.load(std::sync::atomic::Ordering::Relaxed) { + break; + } let (need_reload, consts) = do_i_need_to_reload_vecdb(gcx.clone()).await; if need_reload { background_tasks.abort().await; @@ -150,7 +153,6 @@ pub async fn vecdb_background_reload(gcx: Arc>) { if need_reload && consts.is_some() { background_tasks = BackgroundTasksHolder::new(vec![]); - // Use the fail-safe initialization with retries let init_config = crate::vecdb::vdb_init::VecDbInitConfig { max_attempts: 5, initial_delay_ms: 10, @@ -169,15 +171,21 @@ pub async fn vecdb_background_reload(gcx: Arc>) { gcx.write().await.vec_db_error = "".to_string(); info!("vecdb: initialization successful"); } + Err(crate::vecdb::vdb_init::VecDbInitError::ShutdownRequested) => break, Err(err) => { let err_msg = err.to_string(); gcx.write().await.vec_db_error = err_msg.clone(); error!("vecdb init failed: {}", err_msg); - // gcx.vec_db stays None, the rest of the system continues working } } } - tokio::time::sleep(tokio::time::Duration::from_secs(60)).await; + let shutdown_flag = gcx.read().await.shutdown_flag.clone(); + tokio::select! { + _ = tokio::time::sleep(tokio::time::Duration::from_secs(60)) => {} + _ = async move { while !shutdown_flag.load(std::sync::atomic::Ordering::Relaxed) { tokio::time::sleep(tokio::time::Duration::from_millis(50)).await; } } => { + break; + } + } } } diff --git a/refact-agent/engine/src/vecdb/vdb_init.rs b/refact-agent/engine/src/vecdb/vdb_init.rs index 0efd141956..75551e9575 100644 --- a/refact-agent/engine/src/vecdb/vdb_init.rs +++ b/refact-agent/engine/src/vecdb/vdb_init.rs @@ -1,5 +1,6 @@ use std::path::PathBuf; use std::sync::Arc; +use std::sync::atomic::{AtomicBool, Ordering}; use std::time::Duration; use tokio::sync::Mutex as AMutex; use tokio::time::sleep; @@ -43,6 +44,7 @@ impl Default for VecDbInitConfig { pub enum VecDbInitError { InitializationError(String), TestSearchError(String), + ShutdownRequested, } impl std::fmt::Display for VecDbInitError { @@ -50,6 +52,7 @@ impl std::fmt::Display for VecDbInitError { match self { VecDbInitError::InitializationError(msg) => write!(f, "Initialization error: {}", msg), VecDbInitError::TestSearchError(msg) => write!(f, "Test search error: {}", msg), + VecDbInitError::ShutdownRequested => write!(f, "shutdown requested"), } } } @@ -60,11 +63,16 @@ pub async fn init_vecdb_fail_safe( cmdline: CommandLine, constants: VecdbConstants, init_config: VecDbInitConfig, + shutdown_flag: Arc, ) -> Result { let mut attempt: usize = 0; let mut delay = Duration::from_millis(init_config.initial_delay_ms); loop { + if shutdown_flag.load(Ordering::Relaxed) { + return Err(VecDbInitError::ShutdownRequested); + } + attempt += 1; info!( "VecDb init attempt {}/{}", @@ -111,14 +119,20 @@ pub async fn init_vecdb_fail_safe( "VecDb initialization attempt {} failed with error: {}. Retrying in {:?}...", attempt, err, delay ); - sleep(delay).await; - - let new_delay_ms = - (delay.as_millis() as f64 * init_config.backoff_factor) as u64; - delay = Duration::from_millis(new_delay_ms.min(init_config.max_delay_ms)); } } } + + let flag = shutdown_flag.clone(); + tokio::select! { + _ = sleep(delay) => {} + _ = async move { while !flag.load(Ordering::Relaxed) { tokio::time::sleep(Duration::from_millis(50)).await; } } => { + return Err(VecDbInitError::ShutdownRequested); + } + } + + let new_delay_ms = (delay.as_millis() as f64 * init_config.backoff_factor) as u64; + delay = Duration::from_millis(new_delay_ms.min(init_config.max_delay_ms)); } } @@ -138,9 +152,9 @@ pub async fn initialize_vecdb_with_context( constants: VecdbConstants, init_config: Option, ) -> Result<(), VecDbInitError> { - let (legacy_cache_dir, cmdline) = { + let (legacy_cache_dir, cmdline, shutdown_flag) = { let gcx_locked = gcx.read().await; - (gcx_locked.cache_dir.clone(), gcx_locked.cmdline.clone()) + (gcx_locked.cache_dir.clone(), gcx_locked.cmdline.clone(), gcx_locked.shutdown_flag.clone()) }; let vecdb_dir = if !cmdline.vecdb_force_path.is_empty() { @@ -158,6 +172,7 @@ pub async fn initialize_vecdb_with_context( cmdline.clone(), constants, config, + shutdown_flag, ) .await?; diff --git a/refact-agent/engine/src/vecdb/vdb_sqlite.rs b/refact-agent/engine/src/vecdb/vdb_sqlite.rs index 92c295a9fc..c15eca27bd 100644 --- a/refact-agent/engine/src/vecdb/vdb_sqlite.rs +++ b/refact-agent/engine/src/vecdb/vdb_sqlite.rs @@ -402,9 +402,15 @@ impl VecDBSqlite { // (scope = "/abs/file") // but `vecdb_search()` treated its argument as a plain exact scope value. // - // To keep existing callers working AND remain safe, we only accept - // these two patterns and translate them into parameterized SQL. - fn parse_scope_filter(filter: &str) -> Option<(String, String)> { + // vec0 KNN queries only allow EQUALS / comparison operators on metadata columns — + // LIKE is rejected at the SQLite level. For prefix ("directory") filtering we + // therefore skip the SQL predicate and apply it in Rust after the query. + enum ScopeFilter { + SqlExact(String), // use `AND scope = ?` in the KNN query + RustPrefix(String), // strip trailing '%', filter results in Rust + } + + fn parse_scope_filter(filter: &str) -> Option { // Accept: (scope LIKE '...%') or scope LIKE "...%" let like_re = Regex::new( r#"(?i)\bscope\s+like\s+['\"]([^'\"]+)['\"]\s*\)?\s*$"#, @@ -412,7 +418,8 @@ impl VecDBSqlite { .ok()?; if let Some(caps) = like_re.captures(filter.trim()) { let pattern = caps.get(1)?.as_str().to_string(); - return Some(("AND scope LIKE ?".to_string(), pattern)); + let prefix = pattern.trim_end_matches('%').to_string(); + return Some(ScopeFilter::RustPrefix(prefix)); } // Accept: (scope = '...') or scope = "..." @@ -422,29 +429,35 @@ impl VecDBSqlite { .ok()?; if let Some(caps) = eq_re.captures(filter.trim()) { let value = caps.get(1)?.as_str().to_string(); - return Some(("AND scope = ?".to_string(), value)); + return Some(ScopeFilter::SqlExact(value)); } None } - let (scope_condition, scope_param) = match vecdb_scope_filter_mb.as_deref() { - Some(filter_str) => match parse_scope_filter(filter_str) { - Some((cond, param)) => (cond, Some(param)), - None => { - tracing::warn!( - "vecdb_search: unsupported scope filter format, ignoring: {}", - filter_str - ); - (String::new(), None) - } - }, - None => (String::new(), None), - }; + let (scope_condition, scope_param, scope_prefix) = + match vecdb_scope_filter_mb.as_deref() { + Some(filter_str) => match parse_scope_filter(filter_str) { + Some(ScopeFilter::SqlExact(val)) => { + ("AND scope = ?".to_string(), Some(val), None) + } + Some(ScopeFilter::RustPrefix(prefix)) => { + (String::new(), None, Some(prefix)) + } + None => { + tracing::warn!( + "vecdb_search: unsupported scope filter format, ignoring: {}", + filter_str + ); + (String::new(), None, None) + } + }, + None => (String::new(), None, None), + }; let embedding_owned = embedding.clone(); let emb_table_name = self.emb_table_name.clone(); // Wrap the database call in retry logic - with_retry( + let mut results = with_retry( || { let embedding_owned = embedding_owned.clone(); let emb_table_name = emb_table_name.clone(); @@ -503,7 +516,14 @@ impl VecDBSqlite { Duration::from_millis(100), // Retry delay "vector search", ) - .await + .await?; + + // Apply prefix filter in Rust — vec0 does not support LIKE in KNN queries + if let Some(prefix) = scope_prefix { + results.retain(|r| r.file_path.to_string_lossy().starts_with(prefix.as_str())); + } + + Ok(results) } pub async fn vecdb_records_remove( diff --git a/refact-agent/engine/src/vecdb/vdb_thread.rs b/refact-agent/engine/src/vecdb/vdb_thread.rs index f1fc626a0f..a8c6430e34 100644 --- a/refact-agent/engine/src/vecdb/vdb_thread.rs +++ b/refact-agent/engine/src/vecdb/vdb_thread.rs @@ -186,8 +186,13 @@ async fn vectorize_thread( ) }; + let shutdown_flag = gcx.read().await.shutdown_flag.clone(); let mut last_updated: HashMap = HashMap::new(); loop { + if shutdown_flag.load(std::sync::atomic::Ordering::SeqCst) { + tracing::info!("VecDB thread: shutdown detected, stopping"); + return; + } let mut work_on_one: Option = None; let current_time = SystemTime::now(); let mut vstatus_changed = false; diff --git a/refact-agent/engine/src/yaml_configs/customization_registry.rs b/refact-agent/engine/src/yaml_configs/customization_registry.rs index c7de008b1f..14b64f9b61 100644 --- a/refact-agent/engine/src/yaml_configs/customization_registry.rs +++ b/refact-agent/engine/src/yaml_configs/customization_registry.rs @@ -513,7 +513,6 @@ pub fn map_legacy_mode_to_id(mode_str: &str) -> &str { "EXPLORE" => "explore", "AGENT" => "agent", "CONFIGURE" => "configurator", - "PROJECT_SUMMARY" => "project_summary", "TASK_PLANNER" => "task_planner", "TASK_AGENT" => "task_agent", _ => { @@ -605,7 +604,6 @@ mod tests { assert_eq!(map_legacy_mode_to_id("EXPLORE"), "explore"); assert_eq!(map_legacy_mode_to_id("NO_TOOLS"), "explore"); assert_eq!(map_legacy_mode_to_id("CONFIGURE"), "configurator"); - assert_eq!(map_legacy_mode_to_id("PROJECT_SUMMARY"), "project_summary"); assert_eq!(map_legacy_mode_to_id("TASK_PLANNER"), "task_planner"); assert_eq!(map_legacy_mode_to_id("TASK_AGENT"), "task_agent"); } diff --git a/refact-agent/engine/src/yaml_configs/default_indexing.yaml b/refact-agent/engine/src/yaml_configs/default_indexing.yaml index f806ae975d..9cd56eb3ad 100644 --- a/refact-agent/engine/src/yaml_configs/default_indexing.yaml +++ b/refact-agent/engine/src/yaml_configs/default_indexing.yaml @@ -37,5 +37,6 @@ blocklist: - "*/_trajectories/*" - "*/.gradle/*" -additional_indexing_dirs: - - "~/my_favorite_library/" +additional_indexing_dirs: [] +# additional_indexing_dirs: +# - "~/path/to/external/library/" diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/agent.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/agent.yaml index aae19836b3..1c852cc70b 100644 --- a/refact-agent/engine/src/yaml_configs/defaults/modes/agent.yaml +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/agent.yaml @@ -1,4 +1,4 @@ -schema_version: 8 +schema_version: 11 id: agent title: Agent description: Full multi-step workflow with tools and editing capabilities @@ -183,13 +183,18 @@ prompt: | - %CD_INSTRUCTIONS% - %SHELL_INSTRUCTIONS% + %COMPRESS_HANDOFF_INSTRUCTIONS% + + %RICH_CONTENT_INSTRUCTIONS% + %SYSTEM_INFO% %ENVIRONMENT_INFO% %WORKSPACE_INFO% - %PROJECT_SUMMARY% + + %SKILLS_INSTRUCTIONS% %PROJECT_CONFIGS% @@ -208,6 +213,8 @@ tools: - search_pattern - search_symbol_definition - search_semantic + - activate_skill + - deactivate_skill - knowledge - create_knowledge - search_trajectories @@ -230,6 +237,9 @@ tools: - tasks_set - task_done - ask_questions + - compress_chat_probe + - compress_chat_apply + - handoff_to_mode tool_confirm: rules: @@ -239,6 +249,10 @@ tool_confirm: action: auto - match: "search_*" action: auto + - match: "activate_skill" + action: auto + - match: "deactivate_skill" + action: auto - match: "knowledge" action: auto - match: "web*" @@ -249,3 +263,7 @@ tool_confirm: action: auto - match: "ask_questions" action: auto + - match: "compress_chat_*" + action: ask + - match: "handoff_to_mode" + action: ask diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/ask.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/ask.yaml index 53e5cd387d..676e78b29c 100644 --- a/refact-agent/engine/src/yaml_configs/defaults/modes/ask.yaml +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/ask.yaml @@ -1,4 +1,4 @@ -schema_version: 7 +schema_version: 8 id: ask title: Ask description: Quick Q&A with web research capability @@ -42,6 +42,8 @@ prompt: | Example: `ask_questions(questions='[{"id":"q1","type":"free_text","text":"Can you be more specific about what you need?"}]')` + %RICH_CONTENT_INSTRUCTIONS% + %SYSTEM_INFO% allow_integrations: false diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/configurator.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/configurator.yaml index 21add454fa..498278a551 100644 --- a/refact-agent/engine/src/yaml_configs/defaults/modes/configurator.yaml +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/configurator.yaml @@ -1,4 +1,4 @@ -schema_version: 5 +schema_version: 7 id: configurator title: Configurator description: Integration configuration wizard @@ -18,9 +18,10 @@ prompt: | [mode3config] You are Refact Agent, a coding assistant. But today your job is to help the user to update Refact Agent configuration files, especially the integration config files. + %RICH_CONTENT_INSTRUCTIONS% + %WORKSPACE_INFO% - %PROJECT_SUMMARY% The first couple of messages will have all the existing configs and the current config file schema. @@ -53,7 +54,7 @@ tools: - search_pattern - create_textdoc - update_textdoc - - + tool_confirm: rules: - match: "tree" diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/debug.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/debug.yaml index 1fb904a94e..97ad7a49da 100644 --- a/refact-agent/engine/src/yaml_configs/defaults/modes/debug.yaml +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/debug.yaml @@ -1,4 +1,4 @@ -schema_version: 7 +schema_version: 11 id: debug title: Debug description: Systematic bug diagnosis and root cause analysis @@ -72,14 +72,17 @@ prompt: | - Use `shell` to run tests, check logs, reproduce issues - To apply fixes, suggest switching to Agent mode + %RICH_CONTENT_INSTRUCTIONS% + %SYSTEM_INFO% %WORKSPACE_INFO% - %PROJECT_SUMMARY% + + %SKILLS_INSTRUCTIONS% %GIT_INFO% - + allow_integrations: false allow_mcp: true allow_subagents: true @@ -91,6 +94,8 @@ tools: - search_pattern - search_symbol_definition - search_semantic + - activate_skill + - deactivate_skill - knowledge - search_trajectories - get_trajectory_context diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/explore.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/explore.yaml index 9a79e17db3..799fd7e7b3 100644 --- a/refact-agent/engine/src/yaml_configs/defaults/modes/explore.yaml +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/explore.yaml @@ -1,4 +1,4 @@ -schema_version: 7 +schema_version: 10 id: explore title: Explore description: Read-only exploration for context gathering without editing @@ -50,13 +50,18 @@ prompt: | %CD_INSTRUCTIONS% + %COMPRESS_HANDOFF_INSTRUCTIONS% + + %RICH_CONTENT_INSTRUCTIONS% + %SYSTEM_INFO% %ENVIRONMENT_INFO% %WORKSPACE_INFO% - %PROJECT_SUMMARY% + + %SKILLS_INSTRUCTIONS% %PROJECT_CONFIGS% @@ -73,13 +78,18 @@ tools: - search_pattern - search_symbol_definition - search_semantic + - activate_skill + - deactivate_skill - knowledge - web - web_search - subagent - ask_questions + - handoff_to_mode tool_confirm: rules: + - match: "handoff_to_mode" + action: ask - match: "*" action: auto diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/learn.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/learn.yaml index a0863f52c1..da5519df9c 100644 --- a/refact-agent/engine/src/yaml_configs/defaults/modes/learn.yaml +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/learn.yaml @@ -1,4 +1,4 @@ -schema_version: 7 +schema_version: 11 id: learn title: Learn description: Understand code with clear explanations @@ -69,11 +69,14 @@ prompt: | - Use `shell` to demonstrate behavior (run examples, show output) - Explore codebase thoroughly before explaining + %RICH_CONTENT_INSTRUCTIONS% + %SYSTEM_INFO% %WORKSPACE_INFO% - %PROJECT_SUMMARY% + + %SKILLS_INSTRUCTIONS% allow_integrations: false allow_mcp: true @@ -86,6 +89,8 @@ tools: - search_pattern - search_symbol_definition - search_semantic + - activate_skill + - deactivate_skill - knowledge - search_trajectories - get_trajectory_context diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/openai_agent.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/openai_agent.yaml index 0a1ee75f5f..da5b4ec3f2 100644 --- a/refact-agent/engine/src/yaml_configs/defaults/modes/openai_agent.yaml +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/openai_agent.yaml @@ -1,4 +1,4 @@ -schema_version: 6 +schema_version: 10 id: openai_agent title: OpenAI Agent description: Optimized for GPT-4o/GPT-5 models using OpenAI Codex-style agentic workflow @@ -194,13 +194,16 @@ override: %CD_INSTRUCTIONS% %SHELL_INSTRUCTIONS% + %RICH_CONTENT_INSTRUCTIONS% + %SYSTEM_INFO% %ENVIRONMENT_INFO% %WORKSPACE_INFO% - %PROJECT_SUMMARY% + + %SKILLS_INSTRUCTIONS% %PROJECT_CONFIGS% @@ -214,6 +217,8 @@ override: - search_pattern - search_symbol_definition - search_semantic + - activate_skill + - deactivate_skill - knowledge - create_knowledge - search_trajectories diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/past_work.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/past_work.yaml index 24a4e99635..375364c7ec 100644 --- a/refact-agent/engine/src/yaml_configs/defaults/modes/past_work.yaml +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/past_work.yaml @@ -1,4 +1,4 @@ -schema_version: 7 +schema_version: 8 id: past_work title: Past Work description: Search conversation history and project knowledge @@ -58,8 +58,10 @@ prompt: | - Note when something was done vs just discussed - If nothing found, say so clearly + %RICH_CONTENT_INSTRUCTIONS% + %SYSTEM_INFO% - + allow_integrations: false allow_mcp: false allow_subagents: true diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/plan.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/plan.yaml index 33c5de7c77..a2c64285c5 100644 --- a/refact-agent/engine/src/yaml_configs/defaults/modes/plan.yaml +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/plan.yaml @@ -1,4 +1,4 @@ -schema_version: 7 +schema_version: 11 id: plan title: Plan description: Design implementation plans through questions and strategic analysis @@ -69,14 +69,17 @@ prompt: | - Ask questions early and often - Deliver final plan via `task_done` + %RICH_CONTENT_INSTRUCTIONS% + %SYSTEM_INFO% %WORKSPACE_INFO% - %PROJECT_SUMMARY% + + %SKILLS_INSTRUCTIONS% %GIT_INFO% - + allow_integrations: true allow_mcp: true allow_subagents: true @@ -88,6 +91,8 @@ tools: - search_pattern - search_symbol_definition - search_semantic + - activate_skill + - deactivate_skill - knowledge - search_trajectories - get_trajectory_context diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/project_summary.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/project_summary.yaml deleted file mode 100644 index a0afc1a68a..0000000000 --- a/refact-agent/engine/src/yaml_configs/defaults/modes/project_summary.yaml +++ /dev/null @@ -1,92 +0,0 @@ -schema_version: 4 -id: project_summary -title: Project Summary -description: Generate project summary and integrations -specific: true - -thread_defaults: - include_project_info: true - checkpoints_enabled: false - auto_approve_editing_tools: false - auto_approve_dangerous_commands: false - -ui: - order: 80 - tags: [read-only] - -prompt: | - [mode3summary] You are Refact Agent, a coding assistant. Your task today is to create a config file with a summary of the project and integrations for it. - - %WORKSPACE_INFO% - - All potential Refact Agent integrations: - %ALL_INTEGRATIONS% - - Already configured integrations: - %AVAILABLE_INTEGRATIONS% - - Guidelines to recommend integrations: - - Most integrations (e.g., `github`, `gitlab`, `pdb`) only require listing them by name. - - Two special integrations, `cmdline_TEMPLATE` and `service_TEMPLATE`, apply to blocking processes: - - `cmdline_TEMPLATE` is for command-line utilities that run and then exit (e.g., a one-time compile step like `cmake`). - - For example, "cargo build" would become "cmdline_cargo_build." - - `service_TEMPLATE` is for background processes (e.g., a webserver like Hypercorn) that continue running until explicitly stopped with Ctrl+C or similar. - - Identify any commands or processes that fit either category: - - If your project needs a compile/build step, recommend a `cmdline_...` integration. - - If your project runs a background server for web or API access, recommend a `service_...` integration. - - Replace `_TEMPLATE` with a lowercase, underscore-separated name: - - Example: `cmdline_cargo_build` or `service_django_server`. - - If you find no background service necessary in the project, you can skip using `service_...`. - - Don't recommend integrations that are already available. - - Plan to follow: - 1. **Inspect Project Structure** - - Use `tree()` to explore the project's directory structure and identify which files exist. - 2. **Gather Key Files** - - Use `cat()` to read any critical documentation or configuration files, typically including: - - `README.md` or other `.md` files - - Build or config manifests such as `Cargo.toml`, `package.json`, or `requirements.txt` - - Look at 5-10 source code files that look important using `cat()` to understand - the purpose of folders within the project. - - If these do not exist, fall back to available files for relevant information. - 3. **Determine Sufficiency** - - Once enough data has been collected to understand the project scope and objectives, stop further file gathering. - 4. **Generate Summary and Integrations** - - Propose a natural-language summary of the project. - - Write a paragraph about file tree structure, especially the likely purpose of folders within the project. - - Recommend relevant integrations, explaining briefly why each might be useful. - 5. **Request Feedback** - - Ask the user if they want to modify the summary or integrations. - - Make sure you finish with a question mark. - 6. **Refine if Needed** - - If the user dislikes some part of the proposal, incorporate their feedback and regenerate the summary and integrations. - 7. **Finalize and Save** - - If the user approves, create the project configuration file containing the summary and integrations using `create_textdoc()`. - - The project summary must be saved using format like this: - ``` - project_summary: > - Natural language summary of the - project, paragraph no wider than 50 - characters. - - Summary of file tree in this project - another paragraph. - - recommended_integrations: ["integr1", "integr2", "cmdline_something_useful", "service_something_background"] - ``` - - Strictly follow the plan! - -tools: - - tree - - cat - - add_workspace_folder - - create_textdoc - -tool_confirm: - rules: - - match: "tree" - action: auto - - match: "cat" - action: auto diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/quick_agent.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/quick_agent.yaml index d32e6134b9..1e425aeb89 100644 --- a/refact-agent/engine/src/yaml_configs/defaults/modes/quick_agent.yaml +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/quick_agent.yaml @@ -1,4 +1,4 @@ -schema_version: 7 +schema_version: 11 id: quick_agent title: Quick Agent description: Fast autonomous coding with minimal overhead @@ -43,11 +43,14 @@ prompt: | %CD_INSTRUCTIONS% %SHELL_INSTRUCTIONS% + %RICH_CONTENT_INSTRUCTIONS% + %SYSTEM_INFO% %WORKSPACE_INFO% - %PROJECT_SUMMARY% + + %SKILLS_INSTRUCTIONS% %GIT_INFO% @@ -62,6 +65,8 @@ tools: - search_pattern - search_symbol_definition - search_semantic + - activate_skill + - deactivate_skill - knowledge - create_knowledge - search_trajectories diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/review.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/review.yaml index c1b7b32fbd..a139bc253c 100644 --- a/refact-agent/engine/src/yaml_configs/defaults/modes/review.yaml +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/review.yaml @@ -1,4 +1,4 @@ -schema_version: 7 +schema_version: 11 id: review title: Review description: Autonomous code review with correctness validation @@ -72,14 +72,17 @@ prompt: | - Verify API usage against current documentation - ALWAYS deliver findings via `task_done` + %RICH_CONTENT_INSTRUCTIONS% + %SYSTEM_INFO% %WORKSPACE_INFO% - %PROJECT_SUMMARY% + + %SKILLS_INSTRUCTIONS% %GIT_INFO% - + allow_integrations: true allow_mcp: true allow_subagents: true @@ -91,6 +94,8 @@ tools: - search_pattern - search_symbol_definition - search_semantic + - activate_skill + - deactivate_skill - knowledge - search_trajectories - get_trajectory_context diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/setup.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/setup.yaml new file mode 100644 index 0000000000..14848583fb --- /dev/null +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/setup.yaml @@ -0,0 +1,81 @@ +schema_version: 12 +id: setup +title: Setup Project +description: Analyze project and configure Refact (AGENTS.md, integrations, tools, knowledge) +specific: false + +thread_defaults: + include_project_info: true + checkpoints_enabled: false + auto_approve_editing_tools: false + auto_approve_dangerous_commands: false + +ui: + order: 1 + tags: [setup] + +prompt: | + [setup] You are Refact Agent, a project setup assistant. Your goal is to onboard this repository and configure Refact optimally. + + %RICH_CONTENT_INSTRUCTIONS% + + %WORKSPACE_INFO% + + All potential Refact Agent integrations: + %ALL_INTEGRATIONS% + + Already configured integrations: + %AVAILABLE_INTEGRATIONS% + + Setup quality principles: + - Prefer repo-specific, executable configuration over generic documentation. + - Start minimal and iterate: install only what delivers immediate value. + - Require approval before writing files, grouped by artifact category. + - Keep security explicit: least privilege, consent, and secret hygiene. + + Setup flow: + 1. **Analyze** the repo (tree + key config files + README/docs) to understand stack, build/test commands, CI/CD, services, and coding style. + 2. **Propose** concrete artifacts grouped by category: + - `AGENTS.md` with project guidelines and conventions + - `.refact/integrations.d/*.yaml` for detected services (use variables + secrets where needed) + - `.refact/toolbox_commands/*.yaml` for /build, /test, /lint, /deploy based on tooling + - `.refact/subagents/*.yaml` for project-tuned reviewers or helpers + - `.refact/skills/*/SKILL.md` for reusable focused instructions + - Knowledge entries via `create_knowledge()` (architecture, dev setup, CI/CD) + 3. **Ask approval** before writing each group of files. + 4. **Apply** approved changes using `create_textdoc()` / `update_textdoc()` / `create_knowledge()`. + 5. **Verify**: summarize what was written, how to validate each artifact, and suggest next steps. + + When suggesting integrations or commands: + - Prefer cmdline_* for one-shot build/test commands. + - Prefer service_* for long-running dev servers. + - Include explicit env var placeholders for any secrets. + - Do not overwrite existing configs without explicit approval. + +tools: + - tree + - cat + - search_pattern + - search_symbol_definition + - search_semantic + - create_textdoc + - update_textdoc + - create_knowledge + - knowledge + - ask_questions + - subagent + +tool_confirm: + rules: + - match: "tree" + action: auto + - match: "cat" + action: auto + - match: "search_*" + action: auto + - match: "create_textdoc" + action: ask + - match: "update_textdoc" + action: ask + - match: "create_knowledge" + action: ask diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/setup_agents_md.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/setup_agents_md.yaml new file mode 100644 index 0000000000..f3cefcaafe --- /dev/null +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/setup_agents_md.yaml @@ -0,0 +1,76 @@ +schema_version: 12 +id: setup_agents_md +title: Setup AGENTS.md +description: Guided creation or update of AGENTS.md project instructions +specific: true + +thread_defaults: + include_project_info: true + checkpoints_enabled: false + auto_approve_editing_tools: false + auto_approve_dangerous_commands: false + +ui: + order: 92 + tags: [setup, instructions] + +prompt: | + [setup_agents_md] You are Refact Agent, focused on project instruction files. + + %RICH_CONTENT_INSTRUCTIONS% + + %WORKSPACE_INFO% + + Your mission: create or improve project `AGENTS.md` guidance using AGENTS.md best practices. + + AGENTS.md principles to follow: + - Treat `AGENTS.md` as a "README for coding agents" with practical, executable guidance. + - Prefer repo-specific instructions over generic advice. + - In monorepos, design root + nested `AGENTS.md` where needed; nearest file to edited code should carry the most specific rules. + - Keep conflict handling explicit: user instructions override AGENTS.md, and deeper AGENTS.md overrides higher-level ones. + + Workflow: + 1. Inspect repository structure and existing instruction files first (`AGENTS.md`, `README`, CI workflows, build scripts). + 2. Ask targeted questions only for missing policy decisions (quality gates, review bar, branching, security constraints). + 3. Propose a concrete file plan: + - Which `AGENTS.md` files to create/update (root and/or nested) + - Exact section outline per file + - Which commands and checks will be documented + 4. Ask approval before creating or updating any `AGENTS.md` file. + 5. Apply approved edits. + 6. Summarize changes and provide a short maintenance checklist. + + Guardrails: + - Keep instructions practical and repo-specific. + - Do not add generic filler or duplicate obvious defaults. + - Include copy-pasteable verification commands where possible. + - Prefer concise sections with clear "when to do X" guidance. + - Never overwrite existing AGENTS.md content without explicit confirmation. + +tools: + - tree + - cat + - search_pattern + - search_symbol_definition + - search_semantic + - create_textdoc + - update_textdoc + - create_knowledge + - knowledge + - ask_questions + - subagent + +tool_confirm: + rules: + - match: "tree" + action: auto + - match: "cat" + action: auto + - match: "search_*" + action: auto + - match: "create_textdoc" + action: ask + - match: "update_textdoc" + action: ask + - match: "create_knowledge" + action: ask diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/setup_commands.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/setup_commands.yaml new file mode 100644 index 0000000000..5a4aa6efff --- /dev/null +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/setup_commands.yaml @@ -0,0 +1,76 @@ +schema_version: 12 +id: setup_commands +title: Setup Commands +description: Create project-specific slash/toolbox commands +specific: true + +thread_defaults: + include_project_info: true + checkpoints_enabled: false + auto_approve_editing_tools: false + auto_approve_dangerous_commands: false + +ui: + order: 94 + tags: [setup, commands] + +prompt: | + [setup_commands] You are Refact Agent, focused on project command setup. + + %RICH_CONTENT_INSTRUCTIONS% + + %WORKSPACE_INFO% + + Your mission: define useful project commands (slash commands and toolbox command configs) for common workflows. + + Command design principles to follow: + - Prefer focused, composable commands over large multi-purpose command prompts. + - Prioritize high-frequency workflows first (build/test/lint/format/review/release diagnostics). + - Make command intent obvious from the command id and description. + - Ensure commands are safe by default and explicit about destructive actions. + + Workflow: + 1. Inspect existing scripts, CI, and repeated dev workflows. + 2. Ask targeted questions for missing workflow intent. + 3. Propose a command catalog grouped by type: + - Slash commands (`.refact/commands/*.md` with frontmatter + body) + - Toolbox commands (`.refact/toolbox_commands/*.yaml`) + For each command include purpose, trigger, inputs, and expected output. + 4. Ask approval before writing command files. + 5. Create/update command files and summarize usage examples. + 6. Provide a short "first 5 commands to adopt" recommendation. + + Guardrails: + - Prefer small, reliable commands over complex multi-purpose ones. + - Align command names with existing team conventions. + - Keep prompts deterministic when command output format matters. + - Avoid commands that silently execute risky operations. + - Never overwrite existing command configs without explicit confirmation. + +tools: + - tree + - cat + - search_pattern + - search_symbol_definition + - search_semantic + - create_textdoc + - update_textdoc + - create_knowledge + - knowledge + - ask_questions + - subagent + +tool_confirm: + rules: + - match: "tree" + action: auto + - match: "cat" + action: auto + - match: "search_*" + action: auto + - match: "create_textdoc" + action: ask + - match: "update_textdoc" + action: ask + - match: "create_knowledge" + action: ask diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/setup_mcp.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/setup_mcp.yaml new file mode 100644 index 0000000000..d9feb15e7d --- /dev/null +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/setup_mcp.yaml @@ -0,0 +1,80 @@ +schema_version: 12 +id: setup_mcp +title: Setup MCP +description: Discover and configure suitable MCP servers for the project +specific: true + +thread_defaults: + include_project_info: true + checkpoints_enabled: false + auto_approve_editing_tools: false + auto_approve_dangerous_commands: false + +ui: + order: 93 + tags: [setup, mcp, integrations] + +prompt: | + [setup_mcp] You are Refact Agent, focused on MCP setup for this project. + + %RICH_CONTENT_INSTRUCTIONS% + + %WORKSPACE_INFO% + + Your mission: identify high-value MCP servers and prepare project-ready integration configs. + + MCP principles to follow: + - Start with a minimal, high-value server set; expand only when justified. + - Apply least privilege: only required servers, scopes, and capabilities. + - Require explicit user understanding/approval for data access and tool execution. + - Treat tool/server metadata as untrusted until verified. + - Use secure defaults: env vars for secrets, no credential hardcoding, and explicit trust boundaries. + + Workflow: + 1. Inspect project signals first (CI files, infra manifests, package/dependency files, docs) to infer likely integrations. + 2. Ask targeted workflow questions to confirm priorities and constraints. + 3. Propose a phased MCP plan: + - Phase 1: essential servers only + - Phase 2: optional/advanced servers + Include rationale, expected tools, and security implications per server. + 4. For each proposed server, provide: + - Required credentials and exact env var placeholders + - Access scope and risk level + - Validation step (how user confirms it works) + 5. Ask approval before writing integration config files. + 6. Create/update integration configs and provide a post-setup verification checklist. + + Guardrails: + - Prefer minimal, high-signal MCP set first. + - Use env vars/placeholders for secrets; never hardcode credentials. + - Explicitly call out data-sharing implications for each integration. + - Avoid broad "god-mode" integrations when narrower alternatives exist. + - Do not overwrite existing integration files without explicit confirmation. + +tools: + - tree + - cat + - search_pattern + - search_symbol_definition + - search_semantic + - create_textdoc + - update_textdoc + - create_knowledge + - knowledge + - ask_questions + - subagent + +tool_confirm: + rules: + - match: "tree" + action: auto + - match: "cat" + action: auto + - match: "search_*" + action: auto + - match: "create_textdoc" + action: ask + - match: "update_textdoc" + action: ask + - match: "create_knowledge" + action: ask diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/setup_skills.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/setup_skills.yaml new file mode 100644 index 0000000000..23e649f75e --- /dev/null +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/setup_skills.yaml @@ -0,0 +1,77 @@ +schema_version: 12 +id: setup_skills +title: Setup Skills +description: Guided setup for project-specific skills +specific: true + +thread_defaults: + include_project_info: true + checkpoints_enabled: false + auto_approve_editing_tools: false + auto_approve_dangerous_commands: false + +ui: + order: 91 + tags: [setup, skills] + +prompt: | + [setup_skills] You are Refact Agent, a focused setup assistant for project skills. + + %RICH_CONTENT_INSTRUCTIONS% + + %WORKSPACE_INFO% + + Your mission: help the user create or refine project-specific skills under `.refact/skills/`. + + Skill authoring principles to follow: + - Prefer a few high-impact, narrowly scoped skills over many broad ones. + - Keep each skill concise: metadata should be discoverable, body should be actionable. + - Each skill must have a clear trigger condition ("use when...") and clear success criteria. + - Optimize discoverability with specific names/descriptions, not vague labels. + - Design skills to complement the base agent, not duplicate global behavior. + + Workflow: + 1. Inspect current workflows and pain points from repo signals (CI, scripts, repetitive docs/runbooks, repeated user intents). + 2. Ask targeted questions only for missing priorities. + 3. Propose 3-5 candidate skills with: + - Skill id (directory name) + - Frontmatter fields (`name`, `description`, optional `allowed-tools`, `agent`, `model`) + - Trigger condition, expected output shape, and example invocation + 4. Ask for approval before writing any files. + 5. Create/update `SKILL.md` files in `.refact/skills//SKILL.md`. + 6. Summarize what was added and recommend first skills to test. + + Guardrails: + - Prefer a few high-impact skills over many generic ones. + - Keep skill instructions concrete and action-oriented. + - Ensure `name` matches the skill directory name exactly. + - Use explicit frontmatter and avoid ambiguous descriptions. + - Never overwrite existing files without explicit confirmation. + +tools: + - tree + - cat + - search_pattern + - search_symbol_definition + - search_semantic + - create_textdoc + - update_textdoc + - create_knowledge + - knowledge + - ask_questions + - subagent + +tool_confirm: + rules: + - match: "tree" + action: auto + - match: "cat" + action: auto + - match: "search_*" + action: auto + - match: "create_textdoc" + action: ask + - match: "update_textdoc" + action: ask + - match: "create_knowledge" + action: ask diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/setup_subagents.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/setup_subagents.yaml new file mode 100644 index 0000000000..5c3811f483 --- /dev/null +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/setup_subagents.yaml @@ -0,0 +1,77 @@ +schema_version: 12 +id: setup_subagents +title: Setup Subagents +description: Guided setup for project-specific subagents +specific: true + +thread_defaults: + include_project_info: true + checkpoints_enabled: false + auto_approve_editing_tools: false + auto_approve_dangerous_commands: false + +ui: + order: 95 + tags: [setup, subagents] + +prompt: | + [setup_subagents] You are Refact Agent, focused on project subagent design. + + %RICH_CONTENT_INSTRUCTIONS% + + %WORKSPACE_INFO% + + Your mission: help the user define practical project-specific subagents under `.refact/subagents/`. + + Subagent design principles to follow: + - Each subagent should own a narrow responsibility with clear boundaries. + - Tool access must be minimal and explicitly justified per subagent. + - Prompts should define success criteria and stopping conditions. + - Prefer deterministic behavior for analysis/review agents and low-variance outputs. + - Avoid overlapping subagents that duplicate responsibilities. + + Workflow: + 1. Inspect current workflows to find delegation bottlenecks (large searches, focused reviews, repetitive synthesis tasks). + 2. Ask targeted questions only for unresolved specialization priorities. + 3. Propose a compact subagent catalog; for each subagent include: + - `id`, `title`, `description` + - Whether it should be `expose_as_tool` + - Tool allowlist and why each tool is needed + - `subchat` limits (`max_steps`, context mode) and expected output format + 4. Ask approval before writing any subagent config files. + 5. Create/update subagent files and summarize intended usage with example calls. + + Guardrails: + - Favor clear specialization and limited scope per subagent. + - Keep prompts concise and operational. + - Ensure each subagent has explicit failure behavior (what to report when blocked). + - Do not grant edit or shell-like tools unless explicitly justified. + - Never overwrite existing subagent files without explicit confirmation. + +tools: + - tree + - cat + - search_pattern + - search_symbol_definition + - search_semantic + - create_textdoc + - update_textdoc + - create_knowledge + - knowledge + - ask_questions + - subagent + +tool_confirm: + rules: + - match: "tree" + action: auto + - match: "cat" + action: auto + - match: "search_*" + action: auto + - match: "create_textdoc" + action: ask + - match: "update_textdoc" + action: ask + - match: "create_knowledge" + action: ask diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/shell.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/shell.yaml index 6951df812d..97f3fead5b 100644 --- a/refact-agent/engine/src/yaml_configs/defaults/modes/shell.yaml +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/shell.yaml @@ -1,4 +1,4 @@ -schema_version: 6 +schema_version: 7 id: shell title: Shell description: Execute shell commands for system tasks @@ -33,6 +33,8 @@ prompt: | **Purpose**: why running this **Result**: summary of output + %RICH_CONTENT_INSTRUCTIONS% + %SYSTEM_INFO% %SHELL_INSTRUCTIONS% diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/task_agent.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/task_agent.yaml index 8500bf3a27..024d297e42 100644 --- a/refact-agent/engine/src/yaml_configs/defaults/modes/task_agent.yaml +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/task_agent.yaml @@ -1,4 +1,4 @@ -schema_version: 8 +schema_version: 9 id: task_agent title: Task Agent description: Execute single task card @@ -85,6 +85,8 @@ prompt: | %AGENT_WORKTREE% + %RICH_CONTENT_INSTRUCTIONS% + %SYSTEM_INFO% allow_integrations: true diff --git a/refact-agent/engine/src/yaml_configs/defaults/modes/task_planner.yaml b/refact-agent/engine/src/yaml_configs/defaults/modes/task_planner.yaml index f56fac7f7f..53dbd58c3c 100644 --- a/refact-agent/engine/src/yaml_configs/defaults/modes/task_planner.yaml +++ b/refact-agent/engine/src/yaml_configs/defaults/modes/task_planner.yaml @@ -1,4 +1,4 @@ -schema_version: 8 +schema_version: 12 id: task_planner title: Task Planner description: Task board management mode @@ -196,13 +196,16 @@ prompt: | %CD_INSTRUCTIONS% + %RICH_CONTENT_INSTRUCTIONS% + %SYSTEM_INFO% %ENVIRONMENT_INFO% %WORKSPACE_INFO% - %PROJECT_SUMMARY% + + %SKILLS_INSTRUCTIONS% %PROJECT_CONFIGS% @@ -221,6 +224,8 @@ tools: - search_pattern - search_symbol_definition - search_semantic + - activate_skill + - deactivate_skill - knowledge - search_trajectories - get_trajectory_context diff --git a/refact-agent/engine/src/yaml_configs/defaults/subagents/mcp_sampling.yaml b/refact-agent/engine/src/yaml_configs/defaults/subagents/mcp_sampling.yaml new file mode 100644 index 0000000000..897fcf0bbb --- /dev/null +++ b/refact-agent/engine/src/yaml_configs/defaults/subagents/mcp_sampling.yaml @@ -0,0 +1,20 @@ +schema_version: 2 +id: mcp_sampling +title: MCP Sampling +description: Handles LLM calls initiated by MCP servers via the sampling/createMessage protocol +expose_as_tool: false +has_code: false + +subchat: + context_mode: bare + stateful: false + max_steps: 1 + model_type: light + n_ctx: 32000 + max_new_tokens: 4096 + temperature: 0.2 + +messages: + system_prompt: | + You are a helpful assistant responding to a request from an MCP server. + Respond concisely and accurately to the provided messages. diff --git a/refact-agent/engine/src/yaml_configs/mcp_marketplace_index.json b/refact-agent/engine/src/yaml_configs/mcp_marketplace_index.json new file mode 100644 index 0000000000..ebba138902 --- /dev/null +++ b/refact-agent/engine/src/yaml_configs/mcp_marketplace_index.json @@ -0,0 +1,1872 @@ +{ + "version": 1, + "updated_at": "2026-03-06", + "total": 120, + "servers": [ + { + "id": "github", + "name": "GitHub", + "description": "Create issues, PRs, manage repos, search code on GitHub", + "publisher": "github", + "tags": ["vcs", "github", "code"], + "icon_url": "https://github.githubassets.com/favicons/favicon.svg", + "homepage": "https://github.com/github/github-mcp-server", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @modelcontextprotocol/server-github", + "env": { + "GITHUB_PERSONAL_ACCESS_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "filesystem", + "name": "Filesystem", + "description": "Read, write, and manage local files and directories", + "publisher": "anthropic", + "tags": ["filesystem", "files"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @modelcontextprotocol/server-filesystem /path/to/workspace", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "brave-search", + "name": "Brave Search", + "description": "Web search using Brave Search API", + "publisher": "anthropic", + "tags": ["search", "web"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @modelcontextprotocol/server-brave-search", + "env": { + "BRAVE_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "postgres", + "name": "PostgreSQL", + "description": "Query and manage PostgreSQL databases", + "publisher": "anthropic", + "tags": ["database", "sql", "postgres"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @modelcontextprotocol/server-postgres", + "env": { + "DATABASE_URL": "postgresql://user:pass@localhost:5432/db" + }, + "args_from_env": ["DATABASE_URL"] + }, + "confirmation_default": ["*"] + }, + { + "id": "slack", + "name": "Slack", + "description": "Read messages, post to channels, and manage Slack workspaces", + "publisher": "anthropic", + "tags": ["communication", "slack"], + "homepage": "https://github.com/modelcontextprotocol/servers/tree/main/src/slack", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @modelcontextprotocol/server-slack", + "env": { + "SLACK_BOT_TOKEN": "", + "SLACK_TEAM_ID": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "notion", + "name": "Notion", + "description": "Read and write Notion pages, databases, and blocks", + "publisher": "makenotion", + "tags": ["productivity", "notion", "documents"], + "homepage": "https://github.com/makenotion/notion-mcp-server", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @notionhq/notion-mcp-server", + "env": { + "OPENAPI_MCP_HEADERS": "{\"Authorization\": \"Bearer \", \"Notion-Version\": \"2022-06-28\"}" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "google-maps", + "name": "Google Maps", + "description": "Search places, get directions, and access Google Maps data", + "publisher": "anthropic", + "tags": ["maps", "location", "google"], + "homepage": "https://github.com/modelcontextprotocol/servers/tree/main/src/google-maps", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @modelcontextprotocol/server-google-maps", + "env": { + "GOOGLE_MAPS_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "google-drive", + "name": "Google Drive", + "description": "Read, write, and manage Google Drive files and folders", + "publisher": "anthropic", + "tags": ["storage", "google", "drive"], + "homepage": "https://github.com/modelcontextprotocol/servers/tree/main/src/gdrive", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @modelcontextprotocol/server-gdrive", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "puppeteer", + "name": "Puppeteer", + "description": "Browser automation: navigate pages, click elements, take screenshots", + "publisher": "anthropic", + "tags": ["browser", "automation", "web"], + "homepage": "https://github.com/modelcontextprotocol/servers/tree/main/src/puppeteer", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @modelcontextprotocol/server-puppeteer", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "memory", + "name": "Memory", + "description": "Persistent memory using a local knowledge graph", + "publisher": "anthropic", + "tags": ["memory", "knowledge", "persistence"], + "homepage": "https://github.com/modelcontextprotocol/servers/tree/main/src/memory", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @modelcontextprotocol/server-memory", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "fetch", + "name": "Fetch", + "description": "Fetch web content and convert HTML to markdown for LLM consumption", + "publisher": "anthropic", + "tags": ["web", "fetch", "http"], + "homepage": "https://github.com/modelcontextprotocol/servers/tree/main/src/fetch", + "transport": "stdio", + "install_recipe": { + "command": "uvx mcp-server-fetch", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "sequential-thinking", + "name": "Sequential Thinking", + "description": "Dynamic and reflective problem-solving through structured thought sequences", + "publisher": "anthropic", + "tags": ["thinking", "reasoning", "problem-solving"], + "homepage": "https://github.com/modelcontextprotocol/servers/tree/main/src/sequentialthinking", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @modelcontextprotocol/server-sequential-thinking", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "gitlab", + "name": "GitLab", + "description": "Manage GitLab projects, issues, merge requests, and pipelines", + "publisher": "anthropic", + "tags": ["vcs", "gitlab", "ci-cd"], + "homepage": "https://github.com/modelcontextprotocol/servers/tree/main/src/gitlab", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @modelcontextprotocol/server-gitlab", + "env": { + "GITLAB_PERSONAL_ACCESS_TOKEN": "", + "GITLAB_API_URL": "https://gitlab.com" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "aws-kb-retrieval", + "name": "AWS Knowledge Base", + "description": "Retrieve information from AWS Bedrock Knowledge Bases using RAG", + "publisher": "anthropic", + "tags": ["aws", "knowledge-base", "rag"], + "homepage": "https://github.com/modelcontextprotocol/servers/tree/main/src/aws-kb-retrieval-server", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @modelcontextprotocol/server-aws-kb-retrieval", + "env": { + "AWS_ACCESS_KEY_ID": "", + "AWS_SECRET_ACCESS_KEY": "", + "AWS_REGION": "us-east-1", + "BEDROCK_KNOWLEDGE_BASE_ID": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "sentry", + "name": "Sentry", + "description": "Retrieve and analyze issues from your Sentry organization", + "publisher": "getsentry", + "tags": ["monitoring", "errors", "debugging"], + "homepage": "https://github.com/getsentry/sentry-mcp", + "transport": "stdio", + "install_recipe": { + "command": "uvx mcp-server-sentry", + "env": { + "SENTRY_TOKEN": "", + "SENTRY_ORG_SLUG": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "playwright", + "name": "Playwright", + "description": "Browser automation with Playwright: navigate, interact, screenshot web pages", + "publisher": "microsoft", + "tags": ["browser", "automation", "testing"], + "homepage": "https://github.com/microsoft/playwright-mcp", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @playwright/mcp", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "linear", + "name": "Linear", + "description": "Manage issues, projects, and workflows in Linear", + "publisher": "linear", + "tags": ["project-management", "issues", "linear"], + "homepage": "https://github.com/linear/linear/tree/main/packages/mcp", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @linear/mcp-server", + "env": { + "LINEAR_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "jira", + "name": "Jira", + "description": "Search issues, manage projects and epics in Atlassian Jira", + "publisher": "atlassian", + "tags": ["project-management", "issues", "jira"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @atlassian/mcp-server-jira", + "env": { + "JIRA_URL": "https://your-org.atlassian.net", + "JIRA_EMAIL": "", + "JIRA_API_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "confluence", + "name": "Confluence", + "description": "Read and write Confluence pages, spaces, and comments", + "publisher": "atlassian", + "tags": ["documentation", "wiki", "confluence"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @atlassian/mcp-server-confluence", + "env": { + "CONFLUENCE_URL": "https://your-org.atlassian.net/wiki", + "CONFLUENCE_EMAIL": "", + "CONFLUENCE_API_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "sqlite", + "name": "SQLite", + "description": "Query and manage local SQLite databases", + "publisher": "anthropic", + "tags": ["database", "sql", "sqlite"], + "homepage": "https://github.com/modelcontextprotocol/servers/tree/main/src/sqlite", + "transport": "stdio", + "install_recipe": { + "command": "uvx mcp-server-sqlite --db-path /path/to/database.db", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "redis", + "name": "Redis", + "description": "Read and write keys, lists, hashes, sets in Redis", + "publisher": "community", + "tags": ["database", "cache", "redis"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/redis", + "env": { + "REDIS_URL": "redis://localhost:6379" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "mongodb", + "name": "MongoDB", + "description": "Query and manage MongoDB databases and collections", + "publisher": "community", + "tags": ["database", "nosql", "mongodb"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/mongodb", + "env": { + "MONGODB_URI": "mongodb://localhost:27017" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "docker", + "name": "Docker", + "description": "Manage Docker containers, images, volumes, and networks", + "publisher": "community", + "tags": ["docker", "containers", "devops"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/docker", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "kubernetes", + "name": "Kubernetes", + "description": "Manage Kubernetes clusters, pods, deployments, and services", + "publisher": "community", + "tags": ["kubernetes", "k8s", "devops"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/kubernetes", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "aws-s3", + "name": "AWS S3", + "description": "Read, write, and manage files in AWS S3 buckets", + "publisher": "community", + "tags": ["aws", "storage", "s3"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/aws-s3", + "env": { + "AWS_ACCESS_KEY_ID": "", + "AWS_SECRET_ACCESS_KEY": "", + "AWS_REGION": "us-east-1" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "todoist", + "name": "Todoist", + "description": "Manage tasks, projects, and labels in Todoist", + "publisher": "community", + "tags": ["productivity", "tasks", "todo"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/todoist", + "env": { + "TODOIST_API_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "twilio", + "name": "Twilio", + "description": "Send SMS, make calls, and manage communication with Twilio", + "publisher": "twilio", + "tags": ["communication", "sms", "twilio"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @twilio/mcp-server", + "env": { + "TWILIO_ACCOUNT_SID": "", + "TWILIO_AUTH_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "sendgrid", + "name": "SendGrid", + "description": "Send transactional emails and manage email templates via SendGrid", + "publisher": "community", + "tags": ["email", "communication", "sendgrid"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/sendgrid", + "env": { + "SENDGRID_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "obsidian", + "name": "Obsidian", + "description": "Read and write notes in your Obsidian vault", + "publisher": "community", + "tags": ["notes", "knowledge", "obsidian"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/obsidian", + "env": { + "OBSIDIAN_VAULT_PATH": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "terraform", + "name": "Terraform", + "description": "Manage infrastructure with Terraform: plan, apply, inspect state", + "publisher": "community", + "tags": ["devops", "infrastructure", "terraform"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/terraform", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "google-calendar", + "name": "Google Calendar", + "description": "Read and create events in Google Calendar", + "publisher": "community", + "tags": ["productivity", "calendar", "google"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/google-calendar", + "env": { + "GOOGLE_CALENDAR_CREDENTIALS": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "excel", + "name": "Excel / Spreadsheets", + "description": "Read and write Excel files and spreadsheet data", + "publisher": "community", + "tags": ["spreadsheet", "excel", "data"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/excel", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "openapi", + "name": "OpenAPI", + "description": "Interact with any REST API described by an OpenAPI spec", + "publisher": "community", + "tags": ["api", "rest", "openapi"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/openapi", + "env": { + "OPENAPI_SPEC_URL": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "exa", + "name": "Exa Search", + "description": "Search the web with Exa's neural search engine", + "publisher": "exa", + "tags": ["search", "web", "neural"], + "homepage": "https://docs.exa.ai/reference/mcp", + "transport": "stdio", + "install_recipe": { + "command": "npx -y exa-mcp-server", + "env": { + "EXA_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "tavily", + "name": "Tavily Search", + "description": "Real-time web search and research tool optimized for AI agents", + "publisher": "tavily", + "tags": ["search", "web", "research"], + "homepage": "https://github.com/tavily-ai/tavily-mcp", + "transport": "stdio", + "install_recipe": { + "command": "npx -y tavily-mcp@latest", + "env": { + "TAVILY_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "firecrawl", + "name": "Firecrawl", + "description": "Crawl and scrape websites, extract structured content from any URL", + "publisher": "mendable", + "tags": ["web", "scraping", "crawling"], + "homepage": "https://github.com/mendableai/firecrawl-mcp-server", + "transport": "stdio", + "install_recipe": { + "command": "npx -y firecrawl-mcp", + "env": { + "FIRECRAWL_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "context7", + "name": "Context7", + "description": "Fetch up-to-date library docs and code examples for any package", + "publisher": "upstash", + "tags": ["documentation", "search", "libraries"], + "homepage": "https://github.com/upstash/context7-mcp", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @upstash/context7-mcp", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "stripe", + "name": "Stripe", + "description": "Manage payments, subscriptions, invoices, and customers via Stripe", + "publisher": "stripe", + "tags": ["payments", "finance", "stripe"], + "homepage": "https://github.com/stripe/agent-toolkit", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @stripe/mcp", + "env": { + "STRIPE_SECRET_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "grafana", + "name": "Grafana", + "description": "Query metrics, logs, traces, and manage dashboards and alerts in Grafana", + "publisher": "grafana", + "tags": ["monitoring", "observability", "dashboards"], + "homepage": "https://github.com/grafana/mcp-grafana", + "transport": "stdio", + "install_recipe": { + "command": "uvx mcp-grafana", + "env": { + "GRAFANA_URL": "http://localhost:3000", + "GRAFANA_SERVICE_ACCOUNT_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "qdrant", + "name": "Qdrant", + "description": "Store and retrieve semantic memories using Qdrant vector search engine", + "publisher": "qdrant", + "tags": ["vector-db", "memory", "ai", "semantic-search"], + "homepage": "https://github.com/qdrant/mcp-server-qdrant", + "transport": "stdio", + "install_recipe": { + "command": "uvx mcp-server-qdrant", + "env": { + "QDRANT_URL": "http://localhost:6333", + "QDRANT_API_KEY": "", + "COLLECTION_NAME": "mcp-memory" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "perplexity", + "name": "Perplexity", + "description": "AI-powered web search with citations using Perplexity API", + "publisher": "perplexity", + "tags": ["search", "web", "ai", "research"], + "homepage": "https://github.com/ppl-ai/modelcontextprotocol", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @perplexity-ai/mcp-server", + "env": { + "PERPLEXITY_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "mysql", + "name": "MySQL", + "description": "Execute queries and manage MySQL databases", + "publisher": "community", + "tags": ["database", "sql", "mysql"], + "homepage": "https://github.com/xiangma9712/mysql-mcp-server", + "transport": "stdio", + "install_recipe": { + "command": "docker run --rm -i --add-host=host.docker.internal:host-gateway ghcr.io/xiangma9712/mcp/mysql", + "env": { + "MYSQL_HOST": "host.docker.internal", + "MYSQL_PORT": "3306", + "MYSQL_USER": "root", + "MYSQL_PASSWORD": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "supabase", + "name": "Supabase", + "description": "Manage Supabase projects, databases, edge functions, and storage", + "publisher": "supabase", + "tags": ["database", "backend", "supabase"], + "homepage": "https://github.com/supabase-community/supabase-mcp", + "transport": "http", + "install_recipe": { + "url": "https://mcp.supabase.com/mcp", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "neon", + "name": "Neon", + "description": "Manage serverless Postgres databases on Neon: branches, queries, migrations", + "publisher": "neondatabase", + "tags": ["database", "postgres", "serverless"], + "homepage": "https://github.com/neondatabase/mcp-server-neon", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @neondatabase/mcp-server-neon", + "env": { + "NEON_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "figma", + "name": "Figma", + "description": "Access Figma designs, components, and variables for design-to-code workflows", + "publisher": "figma", + "tags": ["design", "ui", "figma", "code-generation"], + "homepage": "https://www.figma.com/blog/introducing-figmas-dev-mode-mcp-server/", + "transport": "http", + "install_recipe": { + "url": "https://mcp.figma.com/mcp", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "zapier", + "name": "Zapier", + "description": "Trigger Zapier automations and connect to 8,000+ apps", + "publisher": "zapier", + "tags": ["automation", "integrations", "zapier"], + "homepage": "https://zapier.com/mcp", + "transport": "http", + "install_recipe": { + "url": "https://mcp.zapier.com/mcp", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "n8n", + "name": "n8n", + "description": "Trigger n8n workflows and manage workflow automation", + "publisher": "community", + "tags": ["automation", "workflows", "n8n"], + "homepage": "https://github.com/czlonkowski/n8n-mcp", + "transport": "stdio", + "install_recipe": { + "command": "npx -y n8n-mcp", + "env": { + "N8N_API_URL": "http://localhost:5678", + "N8N_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "searxng", + "name": "SearXNG", + "description": "Privacy-preserving meta-search across multiple engines via self-hosted SearXNG", + "publisher": "community", + "tags": ["search", "web", "privacy"], + "homepage": "https://github.com/ihor-sokoliuk/mcp-searxng", + "transport": "stdio", + "install_recipe": { + "command": "npx -y mcp-searxng", + "env": { + "SEARXNG_URL": "http://localhost:8080" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "webflow", + "name": "Webflow", + "description": "Manage Webflow CMS content, collections, and site publishing", + "publisher": "webflow", + "tags": ["cms", "web", "design", "webflow"], + "homepage": "https://github.com/webflow/mcp-server", + "transport": "http", + "install_recipe": { + "url": "https://mcp.webflow.com/mcp", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "airtable", + "name": "Airtable", + "description": "Read, write, and manage Airtable bases, tables, and records", + "publisher": "airtable", + "tags": ["database", "spreadsheet", "airtable", "productivity"], + "homepage": "https://support.airtable.com/docs/using-the-airtable-mcp-server", + "transport": "http", + "install_recipe": { + "url": "https://mcp.airtable.com/mcp", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "discord", + "name": "Discord", + "description": "Send messages, manage channels, and interact with Discord servers", + "publisher": "community", + "tags": ["communication", "discord", "chat"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/discord", + "env": { + "DISCORD_BOT_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "asana", + "name": "Asana", + "description": "Manage tasks, projects, and teams in Asana", + "publisher": "community", + "tags": ["project-management", "tasks", "asana"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/asana", + "env": { + "ASANA_ACCESS_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "hubspot", + "name": "HubSpot", + "description": "Manage CRM contacts, deals, companies, and marketing in HubSpot", + "publisher": "community", + "tags": ["crm", "marketing", "hubspot"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/hubspot", + "env": { + "HUBSPOT_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "salesforce", + "name": "Salesforce", + "description": "Query, update, and manage Salesforce CRM data via SOQL and REST API", + "publisher": "community", + "tags": ["crm", "salesforce", "enterprise"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/salesforce", + "env": { + "SALESFORCE_INSTANCE_URL": "https://your-instance.salesforce.com", + "SALESFORCE_ACCESS_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "shopify", + "name": "Shopify", + "description": "Manage Shopify store products, orders, customers, and inventory", + "publisher": "community", + "tags": ["ecommerce", "shopify", "store"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/shopify", + "env": { + "SHOPIFY_SHOP_NAME": "", + "SHOPIFY_ACCESS_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "datadog", + "name": "Datadog", + "description": "Query metrics, logs, traces, and manage monitors in Datadog", + "publisher": "community", + "tags": ["monitoring", "observability", "datadog"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/datadog", + "env": { + "DATADOG_API_KEY": "", + "DATADOG_APP_KEY": "", + "DATADOG_SITE": "datadoghq.com" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "pagerduty", + "name": "PagerDuty", + "description": "Manage incidents, alerts, and on-call schedules in PagerDuty", + "publisher": "community", + "tags": ["monitoring", "incidents", "pagerduty"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/pagerduty", + "env": { + "PAGERDUTY_API_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "elasticsearch", + "name": "Elasticsearch", + "description": "Search, index, and manage data in Elasticsearch clusters", + "publisher": "community", + "tags": ["search", "database", "elasticsearch"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/elasticsearch", + "env": { + "ELASTICSEARCH_URL": "http://localhost:9200", + "ELASTICSEARCH_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "bigquery", + "name": "BigQuery", + "description": "Query and analyze data in Google BigQuery data warehouse", + "publisher": "community", + "tags": ["database", "analytics", "google", "bigquery"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/bigquery", + "env": { + "GOOGLE_CLOUD_PROJECT": "", + "GOOGLE_APPLICATION_CREDENTIALS": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "snowflake", + "name": "Snowflake", + "description": "Query and manage data in Snowflake cloud data warehouse", + "publisher": "community", + "tags": ["database", "analytics", "snowflake", "data-warehouse"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/snowflake", + "env": { + "SNOWFLAKE_ACCOUNT": "", + "SNOWFLAKE_USER": "", + "SNOWFLAKE_PASSWORD": "", + "SNOWFLAKE_WAREHOUSE": "", + "SNOWFLAKE_DATABASE": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "pinecone", + "name": "Pinecone", + "description": "Store and query vector embeddings in Pinecone vector database", + "publisher": "community", + "tags": ["vector-db", "ai", "embeddings", "pinecone"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/pinecone", + "env": { + "PINECONE_API_KEY": "", + "PINECONE_INDEX_NAME": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "milvus", + "name": "Milvus", + "description": "Manage vector collections and perform semantic search in Milvus", + "publisher": "milvus", + "tags": ["vector-db", "ai", "embeddings", "milvus"], + "homepage": "https://github.com/milvus-io/mcp-server-milvus", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @zilliz/mcp-server-milvus", + "env": { + "MILVUS_ADDRESS": "http://localhost:19530", + "MILVUS_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "openai", + "name": "OpenAI", + "description": "Access OpenAI APIs: chat completions, image generation, embeddings, and more", + "publisher": "community", + "tags": ["ai", "llm", "openai"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/openai", + "env": { + "OPENAI_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "anthropic-api", + "name": "Anthropic API", + "description": "Access Claude models and Anthropic APIs for AI tasks", + "publisher": "community", + "tags": ["ai", "llm", "anthropic", "claude"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/anthropic", + "env": { + "ANTHROPIC_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "huggingface", + "name": "Hugging Face", + "description": "Search models, datasets, and spaces; run inference on Hugging Face Hub", + "publisher": "community", + "tags": ["ai", "ml", "huggingface", "models"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/huggingface", + "env": { + "HF_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "aws-cli", + "name": "AWS", + "description": "Interact with AWS services: EC2, Lambda, DynamoDB, CloudFormation, and more", + "publisher": "community", + "tags": ["aws", "cloud", "infrastructure"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/aws", + "env": { + "AWS_ACCESS_KEY_ID": "", + "AWS_SECRET_ACCESS_KEY": "", + "AWS_REGION": "us-east-1" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "azure", + "name": "Azure", + "description": "Manage Azure resources, subscriptions, and services", + "publisher": "microsoft", + "tags": ["azure", "cloud", "infrastructure", "microsoft"], + "homepage": "https://github.com/microsoft/mcp", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @azure/mcp", + "env": { + "AZURE_SUBSCRIPTION_ID": "", + "AZURE_TENANT_ID": "", + "AZURE_CLIENT_ID": "", + "AZURE_CLIENT_SECRET": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "vercel", + "name": "Vercel", + "description": "Deploy projects, manage domains, and view deployments on Vercel", + "publisher": "community", + "tags": ["deployment", "hosting", "vercel"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/vercel", + "env": { + "VERCEL_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "cloudflare", + "name": "Cloudflare", + "description": "Manage Cloudflare DNS, Workers, KV, R2, and security settings", + "publisher": "cloudflare", + "tags": ["cloud", "cdn", "dns", "cloudflare"], + "homepage": "https://github.com/cloudflare/mcp-server-cloudflare", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @cloudflare/mcp-server-cloudflare", + "env": { + "CLOUDFLARE_API_TOKEN": "", + "CLOUDFLARE_ACCOUNT_ID": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "serper", + "name": "Serper", + "description": "Google Search API: search, news, images, and places via Serper", + "publisher": "community", + "tags": ["search", "web", "google"], + "homepage": "https://github.com/serper-dev/serper-mcp", + "transport": "stdio", + "install_recipe": { + "command": "npx -y serper-mcp", + "env": { + "SERPER_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "github-actions", + "name": "GitHub Actions", + "description": "Trigger workflows, view runs, and manage GitHub Actions CI/CD pipelines", + "publisher": "community", + "tags": ["ci-cd", "github", "automation"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/github-actions", + "env": { + "GITHUB_TOKEN": "", + "GITHUB_OWNER": "", + "GITHUB_REPO": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "circleci", + "name": "CircleCI", + "description": "Manage pipelines, jobs, and workflows in CircleCI", + "publisher": "community", + "tags": ["ci-cd", "automation", "circleci"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/circleci", + "env": { + "CIRCLECI_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "jenkins", + "name": "Jenkins", + "description": "Trigger and monitor builds and pipelines in Jenkins", + "publisher": "community", + "tags": ["ci-cd", "automation", "jenkins"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/jenkins", + "env": { + "JENKINS_URL": "http://localhost:8080", + "JENKINS_USER": "", + "JENKINS_API_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "prometheus", + "name": "Prometheus", + "description": "Query metrics and alerts from Prometheus monitoring system", + "publisher": "community", + "tags": ["monitoring", "metrics", "prometheus"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/prometheus", + "env": { + "PROMETHEUS_URL": "http://localhost:9090" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "microsoft-teams", + "name": "Microsoft Teams", + "description": "Send messages, manage channels, and collaborate in Microsoft Teams", + "publisher": "community", + "tags": ["communication", "teams", "microsoft"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/microsoft-teams", + "env": { + "TEAMS_BOT_ID": "", + "TEAMS_BOT_PASSWORD": "", + "TEAMS_TENANT_ID": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "gmail", + "name": "Gmail", + "description": "Read, send, and manage emails in Gmail", + "publisher": "community", + "tags": ["email", "communication", "google", "gmail"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/gmail", + "env": { + "GOOGLE_OAUTH_CREDENTIALS": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "outlook", + "name": "Outlook / Microsoft 365", + "description": "Read and send emails, manage calendar events in Microsoft Outlook", + "publisher": "community", + "tags": ["email", "calendar", "microsoft", "outlook"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/outlook", + "env": { + "MICROSOFT_CLIENT_ID": "", + "MICROSOFT_CLIENT_SECRET": "", + "MICROSOFT_TENANT_ID": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "spotify", + "name": "Spotify", + "description": "Control Spotify playback, search music, and manage playlists", + "publisher": "community", + "tags": ["music", "spotify", "entertainment"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/spotify", + "env": { + "SPOTIFY_CLIENT_ID": "", + "SPOTIFY_CLIENT_SECRET": "", + "SPOTIFY_REDIRECT_URI": "http://localhost:8888/callback" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "github-copilot-metrics", + "name": "GitHub Copilot Metrics", + "description": "View GitHub Copilot usage metrics and seat assignments for your organization", + "publisher": "community", + "tags": ["github", "metrics", "ai", "analytics"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/github-copilot-metrics", + "env": { + "GITHUB_TOKEN": "", + "GITHUB_ORG": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "posthog", + "name": "PostHog", + "description": "Query product analytics, feature flags, and session recordings in PostHog", + "publisher": "community", + "tags": ["analytics", "product", "posthog"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/posthog", + "env": { + "POSTHOG_API_KEY": "", + "POSTHOG_HOST": "https://app.posthog.com" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "mixpanel", + "name": "Mixpanel", + "description": "Query events, user profiles, and funnels from Mixpanel analytics", + "publisher": "community", + "tags": ["analytics", "product", "mixpanel"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/mixpanel", + "env": { + "MIXPANEL_PROJECT_TOKEN": "", + "MIXPANEL_SERVICE_ACCOUNT_USERNAME": "", + "MIXPANEL_SERVICE_ACCOUNT_SECRET": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "meilisearch", + "name": "Meilisearch", + "description": "Search and manage indexes in Meilisearch search engine", + "publisher": "community", + "tags": ["search", "database", "meilisearch"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/meilisearch", + "env": { + "MEILISEARCH_URL": "http://localhost:7700", + "MEILISEARCH_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "duckdb", + "name": "DuckDB", + "description": "Run analytical SQL queries on DuckDB in-process database", + "publisher": "community", + "tags": ["database", "analytics", "sql", "duckdb"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/duckdb", + "env": { + "DUCKDB_PATH": ":memory:" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "clickhouse", + "name": "ClickHouse", + "description": "Query and analyze large datasets in ClickHouse columnar database", + "publisher": "community", + "tags": ["database", "analytics", "clickhouse"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/clickhouse", + "env": { + "CLICKHOUSE_URL": "http://localhost:8123", + "CLICKHOUSE_USER": "default", + "CLICKHOUSE_PASSWORD": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "cassandra", + "name": "Cassandra", + "description": "Query and manage Apache Cassandra distributed NoSQL database", + "publisher": "community", + "tags": ["database", "nosql", "cassandra"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/cassandra", + "env": { + "CASSANDRA_CONTACT_POINTS": "localhost", + "CASSANDRA_DATACENTER": "datacenter1", + "CASSANDRA_KEYSPACE": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "monday", + "name": "Monday.com", + "description": "Manage boards, items, and workflows in Monday.com", + "publisher": "community", + "tags": ["project-management", "tasks", "monday"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/monday", + "env": { + "MONDAY_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "trello", + "name": "Trello", + "description": "Manage Trello boards, lists, and cards", + "publisher": "community", + "tags": ["project-management", "kanban", "trello"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/trello", + "env": { + "TRELLO_API_KEY": "", + "TRELLO_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "clickup", + "name": "ClickUp", + "description": "Manage tasks, spaces, lists, and docs in ClickUp", + "publisher": "community", + "tags": ["project-management", "tasks", "clickup"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/clickup", + "env": { + "CLICKUP_API_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "stagehand", + "name": "Stagehand", + "description": "AI-native browser automation using Browserbase cloud browsers", + "publisher": "browserbase", + "tags": ["browser", "automation", "web", "ai"], + "homepage": "https://github.com/browserbase/stagehand", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @browserbasehq/mcp-stagehand", + "env": { + "BROWSERBASE_API_KEY": "", + "BROWSERBASE_PROJECT_ID": "", + "OPENAI_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "agentql", + "name": "AgentQL", + "description": "Scrape and interact with any website using natural language queries", + "publisher": "agentql", + "tags": ["web", "scraping", "automation", "browser"], + "homepage": "https://github.com/AgentQL/agentql-mcp", + "transport": "stdio", + "install_recipe": { + "command": "npx -y agentql-mcp", + "env": { + "AGENTQL_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "wolframalpha", + "name": "WolframAlpha", + "description": "Compute answers to mathematical, scientific, and factual questions via WolframAlpha", + "publisher": "community", + "tags": ["math", "science", "computation", "knowledge"], + "transport": "stdio", + "install_recipe": { + "command": "uvx wolfram-alpha-mcp-server", + "env": { + "WOLFRAM_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "wikipedia", + "name": "Wikipedia", + "description": "Search and retrieve content from Wikipedia articles", + "publisher": "community", + "tags": ["knowledge", "search", "encyclopedia"], + "transport": "stdio", + "install_recipe": { + "command": "uvx wikipedia-mcp-server", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "arxiv", + "name": "arXiv", + "description": "Search and retrieve academic papers from arXiv preprint server", + "publisher": "community", + "tags": ["research", "papers", "science", "academic"], + "transport": "stdio", + "install_recipe": { + "command": "uvx arxiv-mcp-server", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "youtube-transcript", + "name": "YouTube Transcript", + "description": "Fetch transcripts and captions from YouTube videos", + "publisher": "community", + "tags": ["youtube", "video", "transcription"], + "transport": "stdio", + "install_recipe": { + "command": "uvx youtube-transcript-mcp", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "git", + "name": "Git", + "description": "Read git history, diffs, branches, and commits in local repositories", + "publisher": "community", + "tags": ["vcs", "git", "code"], + "transport": "stdio", + "install_recipe": { + "command": "uvx git-mcp-server", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "bitbucket", + "name": "Bitbucket", + "description": "Manage Bitbucket repos, pull requests, pipelines, and issues", + "publisher": "community", + "tags": ["vcs", "bitbucket", "ci-cd"], + "transport": "stdio", + "install_recipe": { + "command": "uvx bitbucket-mcp-server", + "env": { + "BITBUCKET_EMAIL": "", + "BITBUCKET_APP_PASSWORD": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "cloudinary", + "name": "Cloudinary", + "description": "Upload, transform, and manage media assets in Cloudinary", + "publisher": "community", + "tags": ["media", "images", "cdn", "cloudinary"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/cloudinary", + "env": { + "CLOUDINARY_URL": "cloudinary://api_key:api_secret@cloud_name" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "resend", + "name": "Resend", + "description": "Send transactional and marketing emails via Resend API", + "publisher": "community", + "tags": ["email", "communication", "resend"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y resend-mcp", + "env": { + "RESEND_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "mailchimp", + "name": "Mailchimp", + "description": "Manage email campaigns, audiences, and automations in Mailchimp", + "publisher": "community", + "tags": ["email", "marketing", "mailchimp"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @agentx-ai/mailchimp-mcp-server", + "env": { + "MAILCHIMP_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "intercom", + "name": "Intercom", + "description": "Manage customer conversations, contacts, and support tickets in Intercom", + "publisher": "community", + "tags": ["customer-support", "chat", "crm", "intercom"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mseep/mcp-intercom", + "env": { + "INTERCOM_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "zendesk", + "name": "Zendesk", + "description": "Manage support tickets, users, and knowledge base in Zendesk", + "publisher": "community", + "tags": ["customer-support", "helpdesk", "zendesk"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y zd-mcp-server", + "env": { + "ZENDESK_EMAIL": "", + "ZENDESK_TOKEN": "", + "ZENDESK_SUBDOMAIN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "freshdesk", + "name": "Freshdesk", + "description": "Manage tickets, contacts, and agents in Freshdesk customer support", + "publisher": "community", + "tags": ["customer-support", "helpdesk", "freshdesk"], + "transport": "stdio", + "install_recipe": { + "command": "uvx freshdesk-mcp-support", + "env": { + "FRESHDESK_API_KEY": "", + "FRESHDESK_DOMAIN": "yourcompany.freshdesk.com" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "amplitude", + "name": "Amplitude", + "description": "Query product analytics, user funnels, and events from Amplitude", + "publisher": "community", + "tags": ["analytics", "product", "amplitude"], + "transport": "stdio", + "install_recipe": { + "command": "uvx mcp-amplitude", + "env": { + "AMPLITUDE_API_KEY": "", + "AMPLITUDE_SECRET_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "metabase", + "name": "Metabase", + "description": "Query and explore dashboards and data in Metabase BI tool", + "publisher": "community", + "tags": ["analytics", "bi", "dashboards", "metabase"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @easecloudio/mcp-metabase-server", + "env": { + "METABASE_URL": "https://your-metabase.com", + "METABASE_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "tableau", + "name": "Tableau", + "description": "Query views, workbooks, and data sources in Tableau", + "publisher": "community", + "tags": ["analytics", "bi", "visualization", "tableau"], + "transport": "stdio", + "install_recipe": { + "command": "uvx tableau-mcp-server", + "env": { + "TABLEAU_SERVER_URL": "", + "TABLEAU_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "dbt", + "name": "dbt", + "description": "Run and inspect dbt models, tests, and lineage for data transformations", + "publisher": "community", + "tags": ["data", "analytics", "sql", "dbt"], + "transport": "stdio", + "install_recipe": { + "command": "uvx dbt-mcp", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "kafka", + "name": "Apache Kafka", + "description": "Produce and consume messages on Apache Kafka topics", + "publisher": "community", + "tags": ["messaging", "streaming", "kafka", "data-pipelines"], + "transport": "stdio", + "install_recipe": { + "command": "uvx kafka-mcp-server", + "env": { + "KAFKA_BOOTSTRAP_SERVERS": "localhost:9092", + "TOPIC_NAME": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "rabbitmq", + "name": "RabbitMQ", + "description": "Publish and consume messages on RabbitMQ message broker", + "publisher": "community", + "tags": ["messaging", "queues", "rabbitmq"], + "transport": "stdio", + "install_recipe": { + "command": "uvx rabbitmq-mcp-server", + "env": { + "RABBITMQ_URL": "amqp://guest:guest@localhost:5672" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "opentelemetry", + "name": "OpenTelemetry", + "description": "Query distributed traces, metrics, and logs via OpenTelemetry backends", + "publisher": "community", + "tags": ["monitoring", "observability", "tracing", "opentelemetry"], + "transport": "stdio", + "install_recipe": { + "command": "uvx opentelemetry-mcp", + "env": { + "BACKEND_TYPE": "jaeger", + "BACKEND_URL": "http://localhost:16686" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "vault", + "name": "HashiCorp Vault", + "description": "Read and manage secrets, policies, and auth in HashiCorp Vault", + "publisher": "hashicorp", + "tags": ["security", "secrets", "vault", "hashicorp"], + "homepage": "https://github.com/hashicorp/vault-mcp-server", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @hashicorp/vault-mcp-server", + "env": { + "VAULT_ADDR": "http://127.0.0.1:8200", + "VAULT_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "pulumi", + "name": "Pulumi", + "description": "Manage cloud infrastructure with Pulumi IaC via natural language", + "publisher": "pulumi", + "tags": ["infrastructure", "iac", "cloud", "pulumi"], + "homepage": "https://www.pulumi.com/docs/iac/using-pulumi/mcp-server/", + "transport": "http", + "install_recipe": { + "url": "https://mcp.ai.pulumi.com/mcp", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "ansible", + "name": "Ansible", + "description": "Run Ansible playbooks and manage automation tasks", + "publisher": "community", + "tags": ["devops", "automation", "ansible", "infrastructure"], + "transport": "stdio", + "install_recipe": { + "command": "uvx ansible-mcp-server", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "consul", + "name": "HashiCorp Consul", + "description": "Service discovery, health checks, and key-value store via Consul", + "publisher": "community", + "tags": ["infrastructure", "service-mesh", "consul", "devops"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @mcp-server/consul", + "env": { + "CONSUL_HOST": "localhost", + "CONSUL_PORT": "8500" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "home-assistant", + "name": "Home Assistant", + "description": "Control smart home devices, automations, and scenes via Home Assistant", + "publisher": "community", + "tags": ["iot", "smart-home", "home-assistant", "automation"], + "transport": "stdio", + "install_recipe": { + "command": "npx -y @guilhermelirio/homeassistant-mpc", + "env": { + "HOME_ASSISTANT_URL": "http://your-home-assistant:8123", + "HOME_ASSISTANT_TOKEN": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "blender", + "name": "Blender", + "description": "Create and manipulate 3D scenes and objects in Blender via scripts", + "publisher": "community", + "tags": ["3d", "blender", "design", "creative"], + "transport": "stdio", + "install_recipe": { + "command": "uvx iflow-mcp-cwahlfeldt-blender-mcp", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "openstreetmap", + "name": "OpenStreetMap", + "description": "Geocoding, routing, POI search, and location analysis using OpenStreetMap", + "publisher": "community", + "tags": ["maps", "location", "geo", "openstreetmap"], + "homepage": "https://github.com/jagan-shanmugam/open-streetmap-mcp", + "transport": "stdio", + "install_recipe": { + "command": "uvx osm-mcp-server", + "env": {} + }, + "confirmation_default": ["*"] + }, + { + "id": "alphavantage", + "name": "Alpha Vantage", + "description": "Real-time and historical stock, forex, and crypto market data", + "publisher": "alphavantage", + "tags": ["finance", "stocks", "trading", "market-data"], + "homepage": "https://github.com/alphavantage/alpha_vantage_mcp", + "transport": "stdio", + "install_recipe": { + "command": "uvx alphavantage-mcp", + "env": { + "ALPHA_VANTAGE_API_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "alpaca", + "name": "Alpaca Trading", + "description": "Trade stocks and crypto, manage portfolio and orders via Alpaca Markets", + "publisher": "alpacahq", + "tags": ["finance", "trading", "stocks", "crypto"], + "homepage": "https://github.com/alpacahq/alpaca-mcp-server", + "transport": "stdio", + "install_recipe": { + "command": "uvx alpaca-mcp-server", + "env": { + "ALPACA_API_KEY": "", + "ALPACA_SECRET_KEY": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "godot", + "name": "Godot", + "description": "Control the Godot game engine: launch projects, run scripts, manage scenes", + "publisher": "community", + "tags": ["game-dev", "godot", "3d", "scripting"], + "homepage": "https://github.com/Coding-Solo/godot-mcp", + "transport": "stdio", + "install_recipe": { + "command": "npx -y @coding-solo/godot-mcp", + "env": { + "GODOT_PATH": "" + } + }, + "confirmation_default": ["*"] + }, + { + "id": "dns-recon", + "name": "DNS Recon", + "description": "DNS reconnaissance: query A, CNAME, MX, TXT, NS records and subdomains", + "publisher": "community", + "tags": ["security", "dns", "recon", "networking"], + "transport": "stdio", + "install_recipe": { + "command": "uvx mcp-dnsdumpster", + "env": { + "DNSDUMPSTER_API_KEY": "" + } + }, + "confirmation_default": ["*"] + } + ] +} diff --git a/refact-agent/gui/package-lock.json b/refact-agent/gui/package-lock.json index a58674e0ed..ba4d2b3f5e 100644 --- a/refact-agent/gui/package-lock.json +++ b/refact-agent/gui/package-lock.json @@ -1,12 +1,12 @@ { "name": "refact-chat-js", - "version": "7.0.2", + "version": "7.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "refact-chat-js", - "version": "7.0.2", + "version": "7.1.0", "hasInstallScript": true, "license": "BSD-3-Clause", "dependencies": { @@ -15,8 +15,10 @@ "@tanstack/react-table": "^8.20.6", "@types/react": "^18.2.43", "debug": "^4.3.7", + "dompurify": "^3.3.1", "framer-motion": "^12.10.4", "graphql": "^16.11.0", + "mermaid": "^11.12.3", "react-arborist": "^3.4.3", "react-redux": "^9.1.2", "react-virtuoso": "^4.18.1", @@ -50,6 +52,7 @@ "@types/cytoscape": "^3.31.0", "@types/debug": "^4.1.12", "@types/diff": "^7.0.1", + "@types/dompurify": "^3.2.0", "@types/js-cookie": "^3.0.6", "@types/lodash.groupby": "^4.6.9", "@types/lodash.isequal": "^4.5.8", @@ -167,6 +170,26 @@ "node": ">=6.0.0" } }, + "node_modules/@antfu/install-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@antfu/install-pkg/-/install-pkg-1.1.0.tgz", + "integrity": "sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ==", + "dependencies": { + "package-manager-detector": "^1.3.0", + "tinyexec": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, + "node_modules/@antfu/install-pkg/node_modules/tinyexec": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.2.tgz", + "integrity": "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==", + "engines": { + "node": ">=18" + } + }, "node_modules/@ardatan/relay-compiler": { "version": "12.0.3", "resolved": "https://registry.npmjs.org/@ardatan/relay-compiler/-/relay-compiler-12.0.3.tgz", @@ -2223,6 +2246,11 @@ "node": ">=18" } }, + "node_modules/@braintree/sanitize-url": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-7.1.2.tgz", + "integrity": "sha512-jigsZK+sMF/cuiB7sERuo9V7N9jx+dhmHHnQyDSVdpZwVutaBu7WvNYqMDLSgFgfB30n452TP3vjDAvFC973mA==" + }, "node_modules/@bundled-es-modules/cookie": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@bundled-es-modules/cookie/-/cookie-2.0.1.tgz", @@ -2260,6 +2288,40 @@ "tough-cookie": "^4.1.4" } }, + "node_modules/@chevrotain/cst-dts-gen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/@chevrotain/cst-dts-gen/-/cst-dts-gen-11.1.1.tgz", + "integrity": "sha512-fRHyv6/f542qQqiRGalrfJl/evD39mAvbJLCekPazhiextEatq1Jx1K/i9gSd5NNO0ds03ek0Cbo/4uVKmOBcw==", + "dependencies": { + "@chevrotain/gast": "11.1.1", + "@chevrotain/types": "11.1.1", + "lodash-es": "4.17.23" + } + }, + "node_modules/@chevrotain/gast": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/@chevrotain/gast/-/gast-11.1.1.tgz", + "integrity": "sha512-Ko/5vPEYy1vn5CbCjjvnSO4U7GgxyGm+dfUZZJIWTlQFkXkyym0jFYrWEU10hyCjrA7rQtiHtBr0EaZqvHFZvg==", + "dependencies": { + "@chevrotain/types": "11.1.1", + "lodash-es": "4.17.23" + } + }, + "node_modules/@chevrotain/regexp-to-ast": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/@chevrotain/regexp-to-ast/-/regexp-to-ast-11.1.1.tgz", + "integrity": "sha512-ctRw1OKSXkOrR8VTvOxrQ5USEc4sNrfwXHa1NuTcR7wre4YbjPcKw+82C2uylg/TEwFRgwLmbhlln4qkmDyteg==" + }, + "node_modules/@chevrotain/types": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/@chevrotain/types/-/types-11.1.1.tgz", + "integrity": "sha512-wb2ToxG8LkgPYnKe9FH8oGn3TMCBdnwiuNC5l5y+CtlaVRbCytU0kbVsk6CGrqTL4ZN4ksJa0TXOYbxpbthtqw==" + }, + "node_modules/@chevrotain/utils": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/@chevrotain/utils/-/utils-11.1.1.tgz", + "integrity": "sha512-71eTYMzYXYSFPrbg/ZwftSaSDld7UYlS8OQa3lNnn9jzNtpFbaReRRyghzqS7rI3CDaorqpPJJcXGHK+FE1TVQ==" + }, "node_modules/@colors/colors": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", @@ -4134,6 +4196,21 @@ "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", "dev": true }, + "node_modules/@iconify/types": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz", + "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==" + }, + "node_modules/@iconify/utils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-3.1.0.tgz", + "integrity": "sha512-Zlzem1ZXhI1iHeeERabLNzBHdOa4VhQbqAcOQaMKuTuyZCpwKbC2R4Dd0Zo3g9EAc+Y4fiarO8HIHRAth7+skw==", + "dependencies": { + "@antfu/install-pkg": "^1.1.0", + "@iconify/types": "^2.0.0", + "mlly": "^1.8.0" + } + }, "node_modules/@inquirer/confirm": { "version": "5.1.9", "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.9.tgz", @@ -4610,6 +4687,14 @@ "react": ">=16" } }, + "node_modules/@mermaid-js/parser": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-1.0.0.tgz", + "integrity": "sha512-vvK0Hi/VWndxoh03Mmz6wa1KDriSPjS2XMZL/1l19HFwygiObEEoEwSDxOqyLzzAI6J2PU3261JjTMTO7x+BPw==", + "dependencies": { + "langium": "^4.0.0" + } + }, "node_modules/@microsoft/api-extractor": { "version": "7.39.0", "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.39.0.tgz", @@ -10990,6 +11075,228 @@ "cytoscape": "*" } }, + "node_modules/@types/d3": { + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz", + "integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==", + "dependencies": { + "@types/d3-array": "*", + "@types/d3-axis": "*", + "@types/d3-brush": "*", + "@types/d3-chord": "*", + "@types/d3-color": "*", + "@types/d3-contour": "*", + "@types/d3-delaunay": "*", + "@types/d3-dispatch": "*", + "@types/d3-drag": "*", + "@types/d3-dsv": "*", + "@types/d3-ease": "*", + "@types/d3-fetch": "*", + "@types/d3-force": "*", + "@types/d3-format": "*", + "@types/d3-geo": "*", + "@types/d3-hierarchy": "*", + "@types/d3-interpolate": "*", + "@types/d3-path": "*", + "@types/d3-polygon": "*", + "@types/d3-quadtree": "*", + "@types/d3-random": "*", + "@types/d3-scale": "*", + "@types/d3-scale-chromatic": "*", + "@types/d3-selection": "*", + "@types/d3-shape": "*", + "@types/d3-time": "*", + "@types/d3-time-format": "*", + "@types/d3-timer": "*", + "@types/d3-transition": "*", + "@types/d3-zoom": "*" + } + }, + "node_modules/@types/d3-array": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz", + "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==" + }, + "node_modules/@types/d3-axis": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz", + "integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==", + "dependencies": { + "@types/d3-selection": "*" + } + }, + "node_modules/@types/d3-brush": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz", + "integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==", + "dependencies": { + "@types/d3-selection": "*" + } + }, + "node_modules/@types/d3-chord": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz", + "integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==" + }, + "node_modules/@types/d3-color": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz", + "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==" + }, + "node_modules/@types/d3-contour": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz", + "integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==", + "dependencies": { + "@types/d3-array": "*", + "@types/geojson": "*" + } + }, + "node_modules/@types/d3-delaunay": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz", + "integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==" + }, + "node_modules/@types/d3-dispatch": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.7.tgz", + "integrity": "sha512-5o9OIAdKkhN1QItV2oqaE5KMIiXAvDWBDPrD85e58Qlz1c1kI/J0NcqbEG88CoTwJrYe7ntUCVfeUl2UJKbWgA==" + }, + "node_modules/@types/d3-drag": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz", + "integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==", + "dependencies": { + "@types/d3-selection": "*" + } + }, + "node_modules/@types/d3-dsv": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz", + "integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==" + }, + "node_modules/@types/d3-ease": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz", + "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==" + }, + "node_modules/@types/d3-fetch": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz", + "integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==", + "dependencies": { + "@types/d3-dsv": "*" + } + }, + "node_modules/@types/d3-force": { + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.10.tgz", + "integrity": "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==" + }, + "node_modules/@types/d3-format": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz", + "integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==" + }, + "node_modules/@types/d3-geo": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz", + "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==", + "dependencies": { + "@types/geojson": "*" + } + }, + "node_modules/@types/d3-hierarchy": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz", + "integrity": "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==" + }, + "node_modules/@types/d3-interpolate": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz", + "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==", + "dependencies": { + "@types/d3-color": "*" + } + }, + "node_modules/@types/d3-path": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz", + "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==" + }, + "node_modules/@types/d3-polygon": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz", + "integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==" + }, + "node_modules/@types/d3-quadtree": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz", + "integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==" + }, + "node_modules/@types/d3-random": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz", + "integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==" + }, + "node_modules/@types/d3-scale": { + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz", + "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==", + "dependencies": { + "@types/d3-time": "*" + } + }, + "node_modules/@types/d3-scale-chromatic": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz", + "integrity": "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==" + }, + "node_modules/@types/d3-selection": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz", + "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==" + }, + "node_modules/@types/d3-shape": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.8.tgz", + "integrity": "sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w==", + "dependencies": { + "@types/d3-path": "*" + } + }, + "node_modules/@types/d3-time": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz", + "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==" + }, + "node_modules/@types/d3-time-format": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz", + "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==" + }, + "node_modules/@types/d3-timer": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz", + "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==" + }, + "node_modules/@types/d3-transition": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.9.tgz", + "integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==", + "dependencies": { + "@types/d3-selection": "*" + } + }, + "node_modules/@types/d3-zoom": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz", + "integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==", + "dependencies": { + "@types/d3-interpolate": "*", + "@types/d3-selection": "*" + } + }, "node_modules/@types/debug": { "version": "4.1.12", "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", @@ -11018,6 +11325,16 @@ "integrity": "sha512-w5jZ0ee+HaPOaX25X2/2oGR/7rgAQSYII7X7pp0m9KgBfMP7uKfMfTvcpl5Dj+eDBbpxKGiqE+flqDr6XTd2RA==", "dev": true }, + "node_modules/@types/dompurify": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.2.0.tgz", + "integrity": "sha512-Fgg31wv9QbLDA0SpTOXO3MaxySc4DKGLi8sna4/Utjo4r3ZRPdCt4UQee8BWr+Q5z21yifghREPJGYaEOEIACg==", + "deprecated": "This is a stub types definition. dompurify provides its own type definitions, so you do not need this installed.", + "dev": true, + "dependencies": { + "dompurify": "*" + } + }, "node_modules/@types/ejs": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz", @@ -11091,6 +11408,11 @@ "integrity": "sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==", "dev": true }, + "node_modules/@types/geojson": { + "version": "7946.0.16", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz", + "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==" + }, "node_modules/@types/glob": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", @@ -11409,6 +11731,12 @@ "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==", "dev": true }, + "node_modules/@types/trusted-types": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", + "optional": true + }, "node_modules/@types/unist": { "version": "2.0.10", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz", @@ -13364,6 +13692,30 @@ "node": "*" } }, + "node_modules/chevrotain": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/chevrotain/-/chevrotain-11.1.1.tgz", + "integrity": "sha512-f0yv5CPKaFxfsPTBzX7vGuim4oIC1/gcS7LUGdBSwl2dU6+FON6LVUksdOo1qJjoUvXNn45urgh8C+0a24pACQ==", + "dependencies": { + "@chevrotain/cst-dts-gen": "11.1.1", + "@chevrotain/gast": "11.1.1", + "@chevrotain/regexp-to-ast": "11.1.1", + "@chevrotain/types": "11.1.1", + "@chevrotain/utils": "11.1.1", + "lodash-es": "4.17.23" + } + }, + "node_modules/chevrotain-allstar": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/chevrotain-allstar/-/chevrotain-allstar-0.3.1.tgz", + "integrity": "sha512-b7g+y9A0v4mxCW1qUhf3BSVPg+/NvGErk/dOkrDaHA0nQIQGAtrOjlX//9OQtRlSCy+x9rfB5N8yC71lH1nvMw==", + "dependencies": { + "lodash-es": "^4.17.21" + }, + "peerDependencies": { + "chevrotain": "^11.0.0" + } + }, "node_modules/chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -13898,8 +14250,7 @@ "node_modules/confbox": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz", - "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==", - "dev": true + "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==" }, "node_modules/consola": { "version": "3.2.3", @@ -13999,7 +14350,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-2.2.0.tgz", "integrity": "sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==", - "dev": true, "dependencies": { "layout-base": "^2.0.0" } @@ -14139,16 +14489,38 @@ "version": "3.33.1", "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.33.1.tgz", "integrity": "sha512-iJc4TwyANnOGR1OmWhsS9ayRS3s+XQ185FmuHObThD+5AeJCakAAbWv8KimMTt08xCCLNgneQwFp+JRJOr9qGQ==", - "dev": true, "engines": { "node": ">=0.10" } }, + "node_modules/cytoscape-cose-bilkent": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cytoscape-cose-bilkent/-/cytoscape-cose-bilkent-4.1.0.tgz", + "integrity": "sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ==", + "dependencies": { + "cose-base": "^1.0.0" + }, + "peerDependencies": { + "cytoscape": "^3.2.0" + } + }, + "node_modules/cytoscape-cose-bilkent/node_modules/cose-base": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-1.0.3.tgz", + "integrity": "sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg==", + "dependencies": { + "layout-base": "^1.0.0" + } + }, + "node_modules/cytoscape-cose-bilkent/node_modules/layout-base": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-1.0.2.tgz", + "integrity": "sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==" + }, "node_modules/cytoscape-fcose": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz", "integrity": "sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==", - "dev": true, "dependencies": { "cose-base": "^2.2.0" }, @@ -14156,6 +14528,439 @@ "cytoscape": "^3.2.0" } }, + "node_modules/d3": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz", + "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==", + "dependencies": { + "d3-array": "3", + "d3-axis": "3", + "d3-brush": "3", + "d3-chord": "3", + "d3-color": "3", + "d3-contour": "4", + "d3-delaunay": "6", + "d3-dispatch": "3", + "d3-drag": "3", + "d3-dsv": "3", + "d3-ease": "3", + "d3-fetch": "3", + "d3-force": "3", + "d3-format": "3", + "d3-geo": "3", + "d3-hierarchy": "3", + "d3-interpolate": "3", + "d3-path": "3", + "d3-polygon": "3", + "d3-quadtree": "3", + "d3-random": "3", + "d3-scale": "4", + "d3-scale-chromatic": "3", + "d3-selection": "3", + "d3-shape": "3", + "d3-time": "3", + "d3-time-format": "4", + "d3-timer": "3", + "d3-transition": "3", + "d3-zoom": "3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-array": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz", + "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==", + "dependencies": { + "internmap": "1 - 2" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-axis": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz", + "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-brush": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz", + "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==", + "dependencies": { + "d3-dispatch": "1 - 3", + "d3-drag": "2 - 3", + "d3-interpolate": "1 - 3", + "d3-selection": "3", + "d3-transition": "3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-chord": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz", + "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==", + "dependencies": { + "d3-path": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-color": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", + "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-contour": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz", + "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==", + "dependencies": { + "d3-array": "^3.2.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-delaunay": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz", + "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==", + "dependencies": { + "delaunator": "5" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-dispatch": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz", + "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-drag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz", + "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==", + "dependencies": { + "d3-dispatch": "1 - 3", + "d3-selection": "3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-dsv": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz", + "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==", + "dependencies": { + "commander": "7", + "iconv-lite": "0.6", + "rw": "1" + }, + "bin": { + "csv2json": "bin/dsv2json.js", + "csv2tsv": "bin/dsv2dsv.js", + "dsv2dsv": "bin/dsv2dsv.js", + "dsv2json": "bin/dsv2json.js", + "json2csv": "bin/json2dsv.js", + "json2dsv": "bin/json2dsv.js", + "json2tsv": "bin/json2dsv.js", + "tsv2csv": "bin/dsv2dsv.js", + "tsv2json": "bin/dsv2json.js" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-dsv/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "engines": { + "node": ">= 10" + } + }, + "node_modules/d3-dsv/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/d3-ease": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz", + "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-fetch": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz", + "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==", + "dependencies": { + "d3-dsv": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-force": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz", + "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==", + "dependencies": { + "d3-dispatch": "1 - 3", + "d3-quadtree": "1 - 3", + "d3-timer": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-format": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.2.tgz", + "integrity": "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-geo": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz", + "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==", + "dependencies": { + "d3-array": "2.5.0 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-hierarchy": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz", + "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-interpolate": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", + "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", + "dependencies": { + "d3-color": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-path": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz", + "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-polygon": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz", + "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-quadtree": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz", + "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-random": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz", + "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-sankey": { + "version": "0.12.3", + "resolved": "https://registry.npmjs.org/d3-sankey/-/d3-sankey-0.12.3.tgz", + "integrity": "sha512-nQhsBRmM19Ax5xEIPLMY9ZmJ/cDvd1BG3UVvt5h3WRxKg5zGRbvnteTyWAbzeSvlh3tW7ZEmq4VwR5mB3tutmQ==", + "dependencies": { + "d3-array": "1 - 2", + "d3-shape": "^1.2.0" + } + }, + "node_modules/d3-sankey/node_modules/d3-array": { + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", + "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==", + "dependencies": { + "internmap": "^1.0.0" + } + }, + "node_modules/d3-sankey/node_modules/d3-path": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz", + "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==" + }, + "node_modules/d3-sankey/node_modules/d3-shape": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz", + "integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==", + "dependencies": { + "d3-path": "1" + } + }, + "node_modules/d3-sankey/node_modules/internmap": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz", + "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==" + }, + "node_modules/d3-scale": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz", + "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==", + "dependencies": { + "d3-array": "2.10.0 - 3", + "d3-format": "1 - 3", + "d3-interpolate": "1.2.0 - 3", + "d3-time": "2.1.1 - 3", + "d3-time-format": "2 - 4" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-scale-chromatic": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz", + "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==", + "dependencies": { + "d3-color": "1 - 3", + "d3-interpolate": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-selection": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz", + "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-shape": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz", + "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==", + "dependencies": { + "d3-path": "^3.1.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-time": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz", + "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==", + "dependencies": { + "d3-array": "2 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-time-format": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz", + "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==", + "dependencies": { + "d3-time": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-timer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz", + "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-transition": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz", + "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==", + "dependencies": { + "d3-color": "1 - 3", + "d3-dispatch": "1 - 3", + "d3-ease": "1 - 3", + "d3-interpolate": "1 - 3", + "d3-timer": "1 - 3" + }, + "engines": { + "node": ">=12" + }, + "peerDependencies": { + "d3-selection": "2 - 3" + } + }, + "node_modules/d3-zoom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz", + "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==", + "dependencies": { + "d3-dispatch": "1 - 3", + "d3-drag": "2 - 3", + "d3-interpolate": "1 - 3", + "d3-selection": "2 - 3", + "d3-transition": "2 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/dagre-d3-es": { + "version": "7.0.13", + "resolved": "https://registry.npmjs.org/dagre-d3-es/-/dagre-d3-es-7.0.13.tgz", + "integrity": "sha512-efEhnxpSuwpYOKRm/L5KbqoZmNNukHa/Flty4Wp62JRvgH2ojwVgPgdYyr4twpieZnyRDdIH7PY2mopX26+j2Q==", + "dependencies": { + "d3": "^7.9.0", + "lodash-es": "^4.17.21" + } + }, "node_modules/data-uri-to-buffer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", @@ -14228,6 +15033,11 @@ "dev": true, "license": "MIT" }, + "node_modules/dayjs": { + "version": "1.11.19", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz", + "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==" + }, "node_modules/de-indent": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", @@ -14455,6 +15265,14 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/delaunator": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz", + "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==", + "dependencies": { + "robust-predicates": "^3.0.2" + } + }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -14638,6 +15456,14 @@ "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", "dev": true }, + "node_modules/dompurify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.1.tgz", + "integrity": "sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==", + "optionalDependencies": { + "@types/trusted-types": "^2.0.7" + } + }, "node_modules/dot-case": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", @@ -16962,6 +17788,11 @@ "gunzip-maybe": "bin.js" } }, + "node_modules/hachure-fill": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/hachure-fill/-/hachure-fill-0.5.2.tgz", + "integrity": "sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==" + }, "node_modules/handlebars": { "version": "4.7.8", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", @@ -17896,6 +18727,14 @@ "node": ">= 0.4" } }, + "node_modules/internmap": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz", + "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==", + "engines": { + "node": ">=12" + } + }, "node_modules/invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", @@ -19138,10 +19977,9 @@ } }, "node_modules/katex": { - "version": "0.16.10", - "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.10.tgz", - "integrity": "sha512-ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA==", - "dev": true, + "version": "0.16.33", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.33.tgz", + "integrity": "sha512-q3N5u+1sY9Bu7T4nlXoiRBXWfwSefNGoKeOwekV+gw0cAXQlz2Ww6BLcmBxVDeXBMUDQv6fK5bcNaJLxob3ZQA==", "funding": [ "https://opencollective.com/katex", "https://github.com/sponsors/katex" @@ -19157,7 +19995,6 @@ "version": "8.3.0", "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", - "dev": true, "engines": { "node": ">= 12" } @@ -19171,6 +20008,11 @@ "json-buffer": "3.0.1" } }, + "node_modules/khroma": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/khroma/-/khroma-2.1.0.tgz", + "integrity": "sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==" + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -19205,11 +20047,26 @@ "integrity": "sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==", "dev": true }, + "node_modules/langium": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/langium/-/langium-4.2.1.tgz", + "integrity": "sha512-zu9QWmjpzJcomzdJQAHgDVhLGq5bLosVak1KVa40NzQHXfqr4eAHupvnPOVXEoLkg6Ocefvf/93d//SB7du4YQ==", + "dependencies": { + "chevrotain": "~11.1.1", + "chevrotain-allstar": "~0.3.1", + "vscode-languageserver": "~9.0.1", + "vscode-languageserver-textdocument": "~1.0.11", + "vscode-uri": "~3.1.0" + }, + "engines": { + "node": ">=20.10.0", + "npm": ">=10.2.3" + } + }, "node_modules/layout-base": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-2.0.1.tgz", - "integrity": "sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==", - "dev": true + "integrity": "sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==" }, "node_modules/lazy-universal-dotenv": { "version": "4.0.0", @@ -19643,6 +20500,11 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, + "node_modules/lodash-es": { + "version": "4.17.23", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.23.tgz", + "integrity": "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==" + }, "node_modules/lodash.camelcase": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", @@ -20001,6 +20863,17 @@ "react": ">= 0.14.0" } }, + "node_modules/marked": { + "version": "16.4.2", + "resolved": "https://registry.npmjs.org/marked/-/marked-16.4.2.tgz", + "integrity": "sha512-TI3V8YYWvkVf3KJe1dRkpnjs68JUPyEa5vjKrp1XEEJUAOaQc+Qj+L1qWbPd0SJuAdQkFU0h73sXXqwDYxsiDA==", + "bin": { + "marked": "bin/marked.js" + }, + "engines": { + "node": ">= 20" + } + }, "node_modules/math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", @@ -20565,6 +21438,45 @@ "node": ">= 8" } }, + "node_modules/mermaid": { + "version": "11.12.3", + "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.12.3.tgz", + "integrity": "sha512-wN5ZSgJQIC+CHJut9xaKWsknLxaFBwCPwPkGTSUYrTiHORWvpT8RxGk849HPnpUAQ+/9BPRqYb80jTpearrHzQ==", + "dependencies": { + "@braintree/sanitize-url": "^7.1.1", + "@iconify/utils": "^3.0.1", + "@mermaid-js/parser": "^1.0.0", + "@types/d3": "^7.4.3", + "cytoscape": "^3.29.3", + "cytoscape-cose-bilkent": "^4.1.0", + "cytoscape-fcose": "^2.2.0", + "d3": "^7.9.0", + "d3-sankey": "^0.12.3", + "dagre-d3-es": "7.0.13", + "dayjs": "^1.11.18", + "dompurify": "^3.2.5", + "katex": "^0.16.22", + "khroma": "^2.1.0", + "lodash-es": "^4.17.23", + "marked": "^16.2.1", + "roughjs": "^4.6.6", + "stylis": "^4.3.6", + "ts-dedent": "^2.2.0", + "uuid": "^11.1.0" + } + }, + "node_modules/mermaid/node_modules/uuid": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz", + "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/esm/bin/uuid" + } + }, "node_modules/meros": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/meros/-/meros-1.3.0.tgz", @@ -21331,22 +22243,20 @@ "dev": true }, "node_modules/mlly": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.4.tgz", - "integrity": "sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==", - "dev": true, + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.8.0.tgz", + "integrity": "sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==", "dependencies": { - "acorn": "^8.14.0", - "pathe": "^2.0.1", - "pkg-types": "^1.3.0", - "ufo": "^1.5.4" + "acorn": "^8.15.0", + "pathe": "^2.0.3", + "pkg-types": "^1.3.1", + "ufo": "^1.6.1" } }, "node_modules/mlly/node_modules/acorn": { - "version": "8.14.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", - "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", - "dev": true, + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", + "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "bin": { "acorn": "bin/acorn" }, @@ -21357,8 +22267,7 @@ "node_modules/mlly/node_modules/pathe": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", - "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==", - "dev": true + "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==" }, "node_modules/motion-dom": { "version": "12.15.0", @@ -22248,6 +23157,11 @@ "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", "dev": true }, + "node_modules/package-manager-detector": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.6.0.tgz", + "integrity": "sha512-61A5ThoTiDG/C8s8UMZwSorAGwMJ0ERVGj2OjoW5pAalsNOg15+iQiPzrLJ4jhZ1HJzmC2PIHT2oEiH3R5fzNA==" + }, "node_modules/pako": { "version": "0.2.9", "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", @@ -22511,6 +23425,11 @@ "tslib": "^2.0.3" } }, + "node_modules/path-data-parser": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/path-data-parser/-/path-data-parser-0.1.0.tgz", + "integrity": "sha512-NOnmBpt5Y2RWbuv0LMzsayp3lVylAHLPUTut412ZA3l+C4uw4ZVkQbjShYCQ8TCpUMdPapr4YjUqLYD6v68j+w==" + }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -22699,7 +23618,6 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz", "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==", - "dev": true, "dependencies": { "confbox": "^0.1.8", "mlly": "^1.7.4", @@ -22709,8 +23627,21 @@ "node_modules/pkg-types/node_modules/pathe": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", - "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==", - "dev": true + "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==" + }, + "node_modules/points-on-curve": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/points-on-curve/-/points-on-curve-0.2.0.tgz", + "integrity": "sha512-0mYKnYYe9ZcqMCWhUjItv/oHjvgEsfKvnUTg8sAtnHr3GVy7rGkXCb6d5cSyqrWqL4k81b9CPg3urd+T7aop3A==" + }, + "node_modules/points-on-path": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/points-on-path/-/points-on-path-0.2.1.tgz", + "integrity": "sha512-25ClnWWuw7JbWZcgqY/gJ4FQWadKxGWk+3kR/7kD0tCaDtPPMj7oHu2ToLaVhfpnHrZzYby2w6tUA0eOIuUg8g==", + "dependencies": { + "path-data-parser": "0.1.0", + "points-on-curve": "0.2.0" + } }, "node_modules/polished": { "version": "4.2.2", @@ -24381,6 +25312,11 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/robust-predicates": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz", + "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==" + }, "node_modules/rollup": { "version": "4.18.0", "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz", @@ -24422,6 +25358,17 @@ "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", "dev": true }, + "node_modules/roughjs": { + "version": "4.6.6", + "resolved": "https://registry.npmjs.org/roughjs/-/roughjs-4.6.6.tgz", + "integrity": "sha512-ZUz/69+SYpFN/g/lUlo2FXcIjRkSu3nDarreVdGGndHEBJ6cXPdKguS8JGxwj5HA5xIbVKSmLgr5b3AWxtRfvQ==", + "dependencies": { + "hachure-fill": "^0.5.2", + "path-data-parser": "^0.1.0", + "points-on-curve": "^0.2.0", + "points-on-path": "^0.2.1" + } + }, "node_modules/rrweb-cssom": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz", @@ -24463,6 +25410,11 @@ "queue-microtask": "^1.2.2" } }, + "node_modules/rw": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", + "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==" + }, "node_modules/rxjs": { "version": "7.8.2", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", @@ -24528,8 +25480,7 @@ "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/sass": { "version": "1.69.5", @@ -25354,6 +26305,11 @@ "inline-style-parser": "0.2.2" } }, + "node_modules/stylis": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.6.tgz", + "integrity": "sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==" + }, "node_modules/stylus": { "version": "0.59.0", "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.59.0.tgz", @@ -26014,7 +26970,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz", "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==", - "dev": true, "engines": { "node": ">=6.10" } @@ -26274,8 +27229,7 @@ "node_modules/ufo": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.1.tgz", - "integrity": "sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==", - "dev": true + "integrity": "sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==" }, "node_modules/uglify-js": { "version": "3.17.4", @@ -28119,6 +29073,49 @@ "node": ">=14.0.0" } }, + "node_modules/vscode-jsonrpc": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", + "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/vscode-languageserver": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz", + "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==", + "dependencies": { + "vscode-languageserver-protocol": "3.17.5" + }, + "bin": { + "installServerIntoExtension": "bin/installServerIntoExtension" + } + }, + "node_modules/vscode-languageserver-protocol": { + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", + "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==", + "dependencies": { + "vscode-jsonrpc": "8.2.0", + "vscode-languageserver-types": "3.17.5" + } + }, + "node_modules/vscode-languageserver-textdocument": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz", + "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==" + }, + "node_modules/vscode-languageserver-types": { + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==" + }, + "node_modules/vscode-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz", + "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==" + }, "node_modules/vue-template-compiler": { "version": "2.7.16", "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz", diff --git a/refact-agent/gui/package.json b/refact-agent/gui/package.json index 143940816c..dcba0d985c 100644 --- a/refact-agent/gui/package.json +++ b/refact-agent/gui/package.json @@ -1,6 +1,6 @@ { "name": "refact-chat-js", - "version": "7.0.2", + "version": "7.1.0", "type": "module", "license": "BSD-3-Clause", "files": [ @@ -31,7 +31,7 @@ }, "scripts": { "dev": "vite", - "build": "tsc && vite build && vite build -c vite.node.config.ts", + "build": "NODE_OPTIONS=--max-old-space-size=8192 tsc && NODE_OPTIONS=--max-old-space-size=8192 vite build && NODE_OPTIONS=--max-old-space-size=8192 vite build -c vite.node.config.ts", "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview", "test": "vitest --exclude 'src/__tests__/integration/**'", @@ -60,8 +60,10 @@ "@tanstack/react-table": "^8.20.6", "@types/react": "^18.2.43", "debug": "^4.3.7", + "dompurify": "^3.3.1", "framer-motion": "^12.10.4", "graphql": "^16.11.0", + "mermaid": "^11.12.3", "react-arborist": "^3.4.3", "react-redux": "^9.1.2", "react-virtuoso": "^4.18.1", @@ -95,6 +97,7 @@ "@types/cytoscape": "^3.31.0", "@types/debug": "^4.1.12", "@types/diff": "^7.0.1", + "@types/dompurify": "^3.2.0", "@types/js-cookie": "^3.0.6", "@types/lodash.groupby": "^4.6.9", "@types/lodash.isequal": "^4.5.8", diff --git a/refact-agent/gui/src/__fixtures__/chat_links_response.ts b/refact-agent/gui/src/__fixtures__/chat_links_response.ts index c2ba4470f8..e0142a807a 100644 --- a/refact-agent/gui/src/__fixtures__/chat_links_response.ts +++ b/refact-agent/gui/src/__fixtures__/chat_links_response.ts @@ -2,7 +2,7 @@ import { LinksForChatResponse } from "../services/refact/links"; export const STUB_LINKS_FOR_CHAT_RESPONSE: LinksForChatResponse = { uncommited_changes_warning: - "You have uncommitted changes:\n```\nIn project refact-lsp: A tests/emergency_frog_situation/.refact/project_summary.yaml, M tests/emergency_frog_situation/frog.py, M tests/emergency_frog_situation/jump_to_conclusions.py, ...\n```\n⚠️ You might have a problem rolling back agent's changes.", + "You have uncommitted changes:\n```\nIn project refact-lsp: A tests/emergency_frog_situation/.refact/integrations.d/github.yaml, M tests/emergency_frog_situation/frog.py, M tests/emergency_frog_situation/jump_to_conclusions.py, ...\n```\n⚠️ You might have a problem rolling back agent's changes.", new_chat_suggestion: false, links: [ { @@ -24,11 +24,6 @@ export const STUB_LINKS_FOR_CHAT_RESPONSE: LinksForChatResponse = { }, // { text: 'git commit -m "message"', action: "commit", link_tooltip: "" }, // { text: "Save and return", goto: "SETTINGS:postgres", link_tooltip: "" }, - { - link_text: "Investigate Project", - link_action: "summarize-project", - link_tooltip: "", - }, { link_action: "post-chat", link_text: "Stop recommending integrations", @@ -39,7 +34,7 @@ export const STUB_LINKS_FOR_CHAT_RESPONSE: LinksForChatResponse = { chat_remote: false, chat_mode: "CONFIGURE", current_config_file: - "/Users/kot/code_aprojects/demotest/.refact/project_summary.yaml", + "/Users/kot/code_aprojects/demotest/.refact/integrations.d/github.yaml", }, messages: [ { @@ -50,11 +45,6 @@ export const STUB_LINKS_FOR_CHAT_RESPONSE: LinksForChatResponse = { ], }, }, - // { - // text: "long long long long long long long long long long long long long long long long long long ", - // action: "summarize-project", - // link_tooltip: "", - // }, { link_action: "commit", link_text: "Commit 4 files in `refact-lsp`", diff --git a/refact-agent/gui/src/__fixtures__/tools_response.ts b/refact-agent/gui/src/__fixtures__/tools_response.ts index 09afe2e724..799b44ccae 100644 --- a/refact-agent/gui/src/__fixtures__/tools_response.ts +++ b/refact-agent/gui/src/__fixtures__/tools_response.ts @@ -12,21 +12,21 @@ export const STUB_TOOL_RESPONSE: ToolGroup[] = [ name: "definition", display_name: "Definition", description: "Find definition of a symbol in the project using AST", - - parameters: [ - { - name: "symbol", - description: - "The exact name of a function, method, class, type alias. No spaces allowed.", - type: "string", + input_schema: { + type: "object", + properties: { + symbol: { + type: "string", + description: + "The exact name of a function, method, class, type alias. No spaces allowed.", + }, }, - ], + required: ["symbol"], + }, source: { source_type: "builtin", config_path: "~/.config/refact/builtin_tools.yaml", }, - - parameters_required: ["symbol"], agentic: false, experimental: false, }, @@ -37,22 +37,22 @@ export const STUB_TOOL_RESPONSE: ToolGroup[] = [ name: "definition2", display_name: "Definition Two", description: "Find definition of a symbol in the project using AST", - - parameters: [ - { - name: "symbol", - description: - "The exact name of a function, method, class, type alias. No spaces allowed.", - type: "string", + input_schema: { + type: "object", + properties: { + symbol: { + type: "string", + description: + "The exact name of a function, method, class, type alias. No spaces allowed.", + }, }, - ], + required: ["symbol"], + }, source: { source_type: "integration", config_path: "~/.config/refact/integrations.d/youShouldNotCare.yaml", }, - - parameters_required: ["symbol"], agentic: false, experimental: false, }, @@ -70,21 +70,21 @@ export const STUB_TOOL_RESPONSE: ToolGroup[] = [ name: "mcp_fetch", display_name: "MCP Fetch", description: "Find definition of a symbol in the project using AST", - - parameters: [ - { - name: "symbol", - description: - "The exact name of a function, method, class, type alias. No spaces allowed.", - type: "string", + input_schema: { + type: "object", + properties: { + symbol: { + type: "string", + description: + "The exact name of a function, method, class, type alias. No spaces allowed.", + }, }, - ], + required: ["symbol"], + }, source: { source_type: "integration", config_path: "~/.config/refact/integration_tools.yaml", }, - - parameters_required: ["symbol"], agentic: false, experimental: false, }, @@ -95,22 +95,22 @@ export const STUB_TOOL_RESPONSE: ToolGroup[] = [ name: "definition2", display_name: "Definition Two", description: "Find definition of a symbol in the project using AST", - - parameters: [ - { - name: "symbol", - description: - "The exact name of a function, method, class, type alias. No spaces allowed.", - type: "string", + input_schema: { + type: "object", + properties: { + symbol: { + type: "string", + description: + "The exact name of a function, method, class, type alias. No spaces allowed.", + }, }, - ], + required: ["symbol"], + }, source: { source_type: "integration", config_path: "~/.config/refact/integrations.d/youShouldNotCare.yaml", }, - - parameters_required: ["symbol"], agentic: false, experimental: false, }, @@ -121,22 +121,22 @@ export const STUB_TOOL_RESPONSE: ToolGroup[] = [ name: "definition3", display_name: "Definition Three", description: "Find definition of a symbol in the project using AST", - - parameters: [ - { - name: "symbol", - description: - "The exact name of a function, method, class, type alias. No spaces allowed.", - type: "string", + input_schema: { + type: "object", + properties: { + symbol: { + type: "string", + description: + "The exact name of a function, method, class, type alias. No spaces allowed.", + }, }, - ], + required: ["symbol"], + }, source: { source_type: "integration", config_path: "~/.config/refact/integrations.d/youShouldNotCare.yaml", }, - - parameters_required: ["symbol"], agentic: false, experimental: false, }, @@ -147,22 +147,22 @@ export const STUB_TOOL_RESPONSE: ToolGroup[] = [ name: "definition4", display_name: "Definition Four", description: "Find definition of a symbol in the project using AST", - - parameters: [ - { - name: "symbol", - description: - "The exact name of a function, method, class, type alias. No spaces allowed.", - type: "string", + input_schema: { + type: "object", + properties: { + symbol: { + type: "string", + description: + "The exact name of a function, method, class, type alias. No spaces allowed.", + }, }, - ], + required: ["symbol"], + }, source: { source_type: "integration", config_path: "~/.config/refact/integrations.d/youShouldNotCare.yaml", }, - - parameters_required: ["symbol"], agentic: false, experimental: false, }, @@ -173,22 +173,22 @@ export const STUB_TOOL_RESPONSE: ToolGroup[] = [ name: "definition5", display_name: "Definition Five", description: "Find definition of a symbol in the project using AST", - - parameters: [ - { - name: "symbol", - description: - "The exact name of a function, method, class, type alias. No spaces allowed.", - type: "string", + input_schema: { + type: "object", + properties: { + symbol: { + type: "string", + description: + "The exact name of a function, method, class, type alias. No spaces allowed.", + }, }, - ], + required: ["symbol"], + }, source: { source_type: "integration", config_path: "~/.config/refact/integrations.d/youShouldNotCare.yaml", }, - - parameters_required: ["symbol"], agentic: false, experimental: false, }, @@ -199,22 +199,22 @@ export const STUB_TOOL_RESPONSE: ToolGroup[] = [ name: "definition6", display_name: "Definition Six", description: "Find definition of a symbol in the project using AST", - - parameters: [ - { - name: "symbol", - description: - "The exact name of a function, method, class, type alias. No spaces allowed.", - type: "string", + input_schema: { + type: "object", + properties: { + symbol: { + type: "string", + description: + "The exact name of a function, method, class, type alias. No spaces allowed.", + }, }, - ], + required: ["symbol"], + }, source: { source_type: "integration", config_path: "~/.config/refact/integrations.d/youShouldNotCare.yaml", }, - - parameters_required: ["symbol"], agentic: false, experimental: false, }, diff --git a/refact-agent/gui/src/__tests__/MarketplacePluginCard.test.tsx b/refact-agent/gui/src/__tests__/MarketplacePluginCard.test.tsx new file mode 100644 index 0000000000..15150a7535 --- /dev/null +++ b/refact-agent/gui/src/__tests__/MarketplacePluginCard.test.tsx @@ -0,0 +1,42 @@ +import { describe, expect, test } from "vitest"; +import { render, screen } from "../utils/test-utils"; +import { MarketplacePluginCard } from "../features/Extensions/components/MarketplacePluginCard"; +import type { PluginEntry } from "../services/refact/plugins"; + +const mockPlugin: PluginEntry = { + name: "Test Plugin", + description: "A plugin for testing", + marketplace: "test-marketplace", +}; + +describe("MarketplacePluginCard", () => { + test("renders install button when not installed", () => { + render(); + expect( + screen.getByRole("button", { name: /install/i }), + ).toBeInTheDocument(); + expect(screen.queryByText(/Installed ✓/)).not.toBeInTheDocument(); + }); + + test("renders installed state with uninstall button when installed", () => { + render(); + expect(screen.getByText(/Installed ✓/)).toBeInTheDocument(); + expect( + screen.getByRole("button", { name: /uninstall/i }), + ).toBeInTheDocument(); + expect( + screen.queryByRole("button", { name: /^install$/i }), + ).not.toBeInTheDocument(); + }); + + test("renders plugin name and description", () => { + render(); + expect(screen.getByText("Test Plugin")).toBeInTheDocument(); + expect(screen.getByText("A plugin for testing")).toBeInTheDocument(); + }); + + test("renders marketplace badge", () => { + render(); + expect(screen.getByText("test-marketplace")).toBeInTheDocument(); + }); +}); diff --git a/refact-agent/gui/src/__tests__/chatReducer.test.ts b/refact-agent/gui/src/__tests__/chatReducer.test.ts index 8290bd90f2..e9766bfe43 100644 --- a/refact-agent/gui/src/__tests__/chatReducer.test.ts +++ b/refact-agent/gui/src/__tests__/chatReducer.test.ts @@ -9,6 +9,8 @@ import { addThreadImage, removeThreadImageByIndex, applyChatEvent, + setTemperature, + setMaxTokens, } from "../features/Chat/Thread/actions"; import type { ChatEventEnvelope } from "../services/refact/chatSubscription"; @@ -288,6 +290,193 @@ describe("Chat Thread Reducer - Core Functionality", () => { }); }); + describe("Snapshot params sync (stale-state regression)", () => { + test("snapshot_with_temperature_absent_should_not_restore_stale_ui_temperature", () => { + // User had temperature=0.9 set locally + const withTemp = chatReducer( + initialState, + setTemperature({ chatId, value: 0.9 }), + ); + expect(withTemp.threads[chatId]?.thread.temperature).toBe(0.9); + + // Backend sends snapshot WITHOUT temperature field (None in Rust → absent in JSON) + const snapshotEvent: ChatEventEnvelope = { + chat_id: chatId, + seq: "1", + type: "snapshot", + thread: { + id: chatId, + title: "Test", + model: "gpt-4o", + mode: "agent", + tool_use: "agent", + boost_reasoning: false, + include_project_info: true, + checkpoints_enabled: false, + context_tokens_cap: 8192, + is_title_generated: false, + // temperature intentionally absent — backend has None + }, + runtime: { + state: "idle", + paused: false, + error: null, + queue_size: 0, + pause_reasons: [], + queued_items: [], + }, + messages: [], + }; + + const afterSnapshot = chatReducer( + withTemp, + applyChatEvent(snapshotEvent), + ); + // Should be undefined (backend authoritative), not the stale 0.9 + expect(afterSnapshot.threads[chatId]?.thread.temperature).toBeUndefined(); + }); + + test("snapshot_with_max_tokens_absent_should_not_restore_stale_ui_max_tokens", () => { + const withMaxTokens = chatReducer( + initialState, + setMaxTokens({ chatId, value: 2048 }), + ); + expect(withMaxTokens.threads[chatId]?.thread.max_tokens).toBe(2048); + + const snapshotEvent: ChatEventEnvelope = { + chat_id: chatId, + seq: "1", + type: "snapshot", + thread: { + id: chatId, + title: "Test", + model: "gpt-4o", + mode: "agent", + tool_use: "agent", + boost_reasoning: false, + include_project_info: true, + checkpoints_enabled: false, + context_tokens_cap: 8192, + is_title_generated: false, + // max_tokens intentionally absent + }, + runtime: { + state: "idle", + paused: false, + error: null, + queue_size: 0, + pause_reasons: [], + queued_items: [], + }, + messages: [], + }; + + const afterSnapshot = chatReducer( + withMaxTokens, + applyChatEvent(snapshotEvent), + ); + expect(afterSnapshot.threads[chatId]?.thread.max_tokens).toBeUndefined(); + }); + + test("snapshot_with_temperature_present_should_apply_backend_value", () => { + const snapshotEvent: ChatEventEnvelope = { + chat_id: chatId, + seq: "1", + type: "snapshot", + thread: { + id: chatId, + title: "Test", + model: "gpt-4o", + mode: "agent", + tool_use: "agent", + boost_reasoning: false, + include_project_info: true, + checkpoints_enabled: false, + context_tokens_cap: 8192, + is_title_generated: false, + temperature: 0.7, + }, + runtime: { + state: "idle", + paused: false, + error: null, + queue_size: 0, + pause_reasons: [], + queued_items: [], + }, + messages: [], + }; + + const afterSnapshot = chatReducer( + initialState, + applyChatEvent(snapshotEvent), + ); + expect(afterSnapshot.threads[chatId]?.thread.temperature).toBe(0.7); + }); + }); + + describe("Caps default model initialization", () => { + test("caps_fulfilled_sets_default_model_when_thread_model_is_empty", () => { + expect(initialState.threads[chatId]?.thread.model).toBe(""); + + const capsPayload = { + chat_default_model: "gpt-4o", + chat_models: { + "gpt-4o": { n_ctx: 128000 }, + }, + }; + + // RTK Query matchFulfilled checks: meta.requestStatus === "fulfilled" + // AND meta.arg.endpointName === "getCaps" + const action = { + type: "caps/executeQuery/fulfilled", + payload: capsPayload, + meta: { + requestId: "test", + requestStatus: "fulfilled" as const, + arg: { endpointName: "getCaps" }, + }, + }; + + const afterCaps = chatReducer(initialState, action); + expect(afterCaps.threads[chatId]?.thread.model).toBe("gpt-4o"); + }); + + test("caps_fulfilled_does_not_override_existing_model", () => { + const withModel = chatReducer( + initialState, + createChatWithId({ id: "other", model: "claude-3-5-sonnet" }), + ); + const otherChatId = "other"; + + const capsPayload = { + chat_default_model: "gpt-4o", + chat_models: { + "gpt-4o": { n_ctx: 128000 }, + "claude-3-5-sonnet": { n_ctx: 200000 }, + }, + }; + + const action = { + type: "caps/executeQuery/fulfilled", + payload: capsPayload, + meta: { + requestId: "test", + requestStatus: "fulfilled" as const, + arg: { endpointName: "getCaps" }, + }, + }; + + // Switch to 'other' chat so it becomes the current thread + const withOtherCurrent = { ...withModel, current_thread_id: otherChatId }; + const afterCaps = chatReducer(withOtherCurrent, action); + // claude-3-5-sonnet should be preserved, not overridden by gpt-4o + expect(afterCaps.threads[otherChatId]?.thread.model).toBe( + "claude-3-5-sonnet", + ); + }); + }); + describe("Edge Cases", () => { test("should_handle_operations_on_nonexistent_thread_gracefully", () => { const state = chatReducer( diff --git a/refact-agent/gui/src/__tests__/extensions.test.tsx b/refact-agent/gui/src/__tests__/extensions.test.tsx new file mode 100644 index 0000000000..fd3dbf1f19 --- /dev/null +++ b/refact-agent/gui/src/__tests__/extensions.test.tsx @@ -0,0 +1,313 @@ +import { render, screen, fireEvent, waitFor } from "../utils/test-utils"; +import { http, HttpResponse } from "msw"; +import { describe, expect, it, vi } from "vitest"; +import { server } from "../utils/mockServer"; +import { ExtItemList } from "../features/Extensions/components/ExtItemList"; +import { SkillEditor } from "../features/Extensions/components/SkillEditor"; +import { MarketplacePluginCard } from "../features/Extensions/components/MarketplacePluginCard"; +import { Extensions } from "../features/Extensions/Extensions"; +import type { SkillRegistryItem } from "../services/refact/extensions"; +import type { PluginEntry } from "../services/refact/plugins"; + +const MOCK_ITEMS: SkillRegistryItem[] = [ + { + name: "my_skill", + description: "A global skill", + source: "global", + source_label: "Global", + scope: "global", + read_only: false, + file_path: "/home/.config/refact/skills/my_skill/SKILL.md", + }, + { + name: "local_skill", + description: "A local project skill", + source: "local", + source_label: "Local", + scope: "local", + read_only: false, + file_path: "/project/.refact/skills/local_skill/SKILL.md", + }, + { + name: "plugin_skill", + description: "A plugin skill", + source: "plugin:my-plugin", + source_label: "my-plugin", + scope: "plugin", + read_only: true, + file_path: + "/home/.config/refact/plugins/installed/my-plugin/skills/plugin_skill/SKILL.md", + }, +]; + +describe("ExtItemList", () => { + it("renders items with correct source badges", () => { + render( + undefined} + onCreate={() => undefined} + onDelete={() => undefined} + />, + ); + + expect(screen.getByText("my_skill")).toBeDefined(); + expect(screen.getByText("local_skill")).toBeDefined(); + expect(screen.getByText("plugin_skill")).toBeDefined(); + + expect(screen.getByText("Global")).toBeDefined(); + expect(screen.getByText("Local")).toBeDefined(); + expect(screen.getByText("Plugin")).toBeDefined(); + }); + + it("shows delete button only for non-read-only items", () => { + render( + undefined} + onCreate={() => undefined} + onDelete={() => undefined} + />, + ); + + expect(screen.getByLabelText("Delete my_skill")).toBeDefined(); + expect(screen.getByLabelText("Delete local_skill")).toBeDefined(); + expect(screen.queryByLabelText("Delete plugin_skill")).toBeNull(); + }); + + it("marks selected item", () => { + const { container } = render( + undefined} + onCreate={() => undefined} + onDelete={() => undefined} + />, + ); + + const selectedEl = container.querySelector( + '[aria-label="Select my_skill"]', + ); + expect(selectedEl?.className).toContain("selected"); + }); + + it("renders empty state when no items", () => { + render( + undefined} + onCreate={() => undefined} + onDelete={() => undefined} + />, + ); + expect(screen.getByText("No items found")).toBeDefined(); + }); + + it("calls onDelete with name and scope when delete button clicked", () => { + const onDelete = vi.fn(); + render( + undefined} + onCreate={() => undefined} + onDelete={onDelete} + />, + ); + const deleteBtn = screen.getByLabelText("Delete local_skill"); + fireEvent.click(deleteBtn); + expect(onDelete).toHaveBeenCalledWith("local_skill", "local"); + }); +}); + +describe("MarketplacePluginCard", () => { + const ENGINE_PLUGIN: PluginEntry = { + name: "my-plugin", + description: "A useful plugin", + version: "1.2.3", + tags: ["search", "code"], + marketplace: "test-market", + }; + + it("renders plugin name, description, version and tags from engine payload", () => { + server.use( + http.post("http://127.0.0.1:8001/v1/plugins/install", () => { + return HttpResponse.json({ ok: true }); + }), + ); + render( + , + { + preloadedState: { + config: { + apiKey: "test", + lspPort: 8001, + themeProps: {}, + host: "vscode", + addressURL: "Refact", + }, + }, + }, + ); + expect(screen.getByText("my-plugin")).toBeDefined(); + expect(screen.getByText("A useful plugin")).toBeDefined(); + expect(screen.getByText("1.2.3")).toBeDefined(); + expect(screen.getByText("search")).toBeDefined(); + expect(screen.getByText("code")).toBeDefined(); + expect(screen.getByText("test-market")).toBeDefined(); + }); + + it("shows Installed and Uninstall button when isInstalled", () => { + server.use( + http.delete( + "http://127.0.0.1:8001/v1/plugins/installed/my-plugin", + () => { + return HttpResponse.json({ deleted: true }); + }, + ), + ); + render( + , + { + preloadedState: { + config: { + apiKey: "test", + lspPort: 8001, + themeProps: {}, + host: "vscode", + addressURL: "Refact", + }, + }, + }, + ); + expect(screen.getByText("Installed ✓")).toBeDefined(); + expect(screen.getByText("Uninstall")).toBeDefined(); + }); +}); + +describe("SkillEditor", () => { + it("renders form fields reflecting loaded skill data", async () => { + server.use( + http.get("http://127.0.0.1:8001/v1/ext/skills/my_skill", () => { + return HttpResponse.json({ + name: "my_skill", + description: "A test skill", + user_invocable: true, + disable_model_invocation: false, + allowed_tools: ["shell"], + model: null, + context: null, + agent: null, + argument_hint: "[arg]", + body: "# My Skill\nDo something.", + raw_content: + "---\ndescription: A test skill\n---\n# My Skill\nDo something.", + source: "global", + file_path: "/home/.config/refact/skills/my_skill/SKILL.md", + }); + }), + ); + + render( undefined} />, { + preloadedState: { + config: { + apiKey: "test", + lspPort: 8001, + themeProps: {}, + host: "vscode", + addressURL: "Refact", + }, + }, + }); + + const nameInput = await screen.findByDisplayValue("my_skill"); + expect(nameInput).toBeDefined(); + + const description = await screen.findByDisplayValue("A test skill"); + expect(description).toBeDefined(); + }); +}); + +const CONFIG_STATE = { + config: { + apiKey: "test", + lspPort: 8001, + themeProps: {}, + host: "vscode" as const, + addressURL: "Refact", + }, +}; + +describe("Extensions", () => { + it("shows error state when registry fails to load", async () => { + server.use( + http.get("http://127.0.0.1:8001/v1/ext/registry", () => { + return new HttpResponse(null, { status: 500 }); + }), + ); + + render( + undefined} + />, + { preloadedState: CONFIG_STATE }, + ); + + const errorMsg = await screen.findByText( + "Failed to load extensions registry", + ); + expect(errorMsg).toBeDefined(); + expect(screen.getByText("Retry")).toBeDefined(); + }); + + it("shows delete confirmation dialog and can be cancelled", async () => { + server.use( + http.get("http://127.0.0.1:8001/v1/ext/registry", () => { + return HttpResponse.json({ + skills: [ + { + name: "my_skill", + description: "A global skill", + source: "global", + source_label: "Global", + scope: "global", + read_only: false, + file_path: "/home/.config/refact/skills/my_skill/SKILL.md", + }, + ], + slash_commands: [], + hooks: [], + }); + }), + ); + + render( + undefined} + />, + { preloadedState: CONFIG_STATE }, + ); + + const deleteBtn = await screen.findByLabelText("Delete my_skill"); + fireEvent.click(deleteBtn); + + const confirmTitle = await screen.findByText("Confirm Delete"); + expect(confirmTitle).toBeDefined(); + const cancelBtn = screen.getByText("Cancel"); + expect(cancelBtn).toBeDefined(); + + fireEvent.click(cancelBtn); + + await waitFor(() => { + expect(screen.queryByText("Confirm Delete")).toBeNull(); + }); + }); +}); diff --git a/refact-agent/gui/src/__tests__/integration/DeleteChat.test.tsx b/refact-agent/gui/src/__tests__/integration/DeleteChat.test.tsx index e035020ede..8cbe23a0e1 100644 --- a/refact-agent/gui/src/__tests__/integration/DeleteChat.test.tsx +++ b/refact-agent/gui/src/__tests__/integration/DeleteChat.test.tsx @@ -80,12 +80,15 @@ describe("Delete a Chat form history", () => { const restoreButtonText = await app.findByText(itemTitleToDelete); - // Find the delete button - in compact view, it uses aria-label="Delete" + // Find the delete button - uses aria-label="Delete chat" let container = restoreButtonText.parentElement; - while (container && !container.querySelector('[aria-label="Delete"]')) { + while ( + container && + !container.querySelector('[aria-label="Delete chat"]') + ) { container = container.parentElement; } - const deleteButton = container?.querySelector('[aria-label="Delete"]'); + const deleteButton = container?.querySelector('[aria-label="Delete chat"]'); expect(deleteButton).not.toBeNull(); diff --git a/refact-agent/gui/src/__tests__/mcpMarketplace.test.tsx b/refact-agent/gui/src/__tests__/mcpMarketplace.test.tsx new file mode 100644 index 0000000000..46087416b8 --- /dev/null +++ b/refact-agent/gui/src/__tests__/mcpMarketplace.test.tsx @@ -0,0 +1,418 @@ +import { describe, expect, it } from "vitest"; +import { render, screen, fireEvent } from "../utils/test-utils"; +import { http, HttpResponse } from "msw"; +import { server } from "../utils/mockServer"; +import { MCPMarketplace } from "../features/MCPMarketplace"; +import { ServerCard } from "../features/MCPMarketplace/ServerCard"; +import { SourceSelector } from "../features/MCPMarketplace/SourceSelector"; +import type { + MCPServer, + MarketplaceResponse, + MarketplaceSource, +} from "../services/refact/mcpMarketplace"; + +const MOCK_SERVER: MCPServer = { + id: "test-server", + source_id: "refact-bundled", + name: "Test Server", + description: "A test MCP server for unit tests", + publisher: "Test Publisher", + tags: ["search", "code"], + transport: "stdio", + install_recipe: { + command: "npx test-server", + env: { API_KEY: "" }, + }, + confirmation_default: [], +}; + +const MOCK_SOURCES: MarketplaceSource[] = [ + { + id: "refact-bundled", + label: "Refact Built-in", + type: "refact_index", + enabled: true, + removable: false, + server_count: 1, + status: "ok", + }, + { + id: "smithery", + label: "Smithery.ai", + type: "smithery", + enabled: false, + removable: false, + server_count: 0, + needs_api_key: true, + has_api_key: false, + }, + { + id: "official-mcp", + label: "MCP Registry", + type: "official_mcp", + enabled: true, + removable: false, + server_count: 50, + status: "ok", + }, +]; + +const MOCK_RESPONSE: MarketplaceResponse = { + servers: [MOCK_SERVER], + sources: MOCK_SOURCES, +}; + +const PRELOADED_STATE = { + config: { + apiKey: "test", + lspPort: 8001, + themeProps: {}, + host: "vscode" as const, + addressURL: "Refact", + }, +}; + +describe("ServerCard", () => { + it("renders server name, publisher and description", () => { + render( + undefined} + onViewDetail={() => undefined} + />, + ); + expect(screen.getByText("Test Server")).toBeDefined(); + expect(screen.getByText("Test Publisher")).toBeDefined(); + expect(screen.getByText("A test MCP server for unit tests")).toBeDefined(); + }); + + it("renders Install button when not installed", () => { + render( + undefined} + onViewDetail={() => undefined} + />, + ); + expect(screen.getByRole("button", { name: /install/i })).toBeDefined(); + expect(screen.queryByText("Installed")).toBeNull(); + }); + + it("renders Installed text when installed", () => { + render( + undefined} + onViewDetail={() => undefined} + />, + ); + expect(screen.getByText("Installed")).toBeDefined(); + expect(screen.queryByRole("button", { name: /^install$/i })).toBeNull(); + }); + + it("renders tags as badges", () => { + render( + undefined} + onViewDetail={() => undefined} + />, + ); + expect(screen.getByText("search")).toBeDefined(); + expect(screen.getByText("code")).toBeDefined(); + }); + + it("calls onInstall with server when Install button clicked", () => { + const calledWith: MCPServer[] = []; + render( + { + calledWith.push(s); + }} + onViewDetail={() => undefined} + />, + ); + fireEvent.click(screen.getByRole("button", { name: /install/i })); + expect(calledWith.length).toBe(1); + expect(calledWith[0]?.id).toBe("test-server"); + }); + + it("renders source badge when sourceLabel is provided", () => { + render( + undefined} + onViewDetail={() => undefined} + sourceLabel="Refact Built-in" + />, + ); + expect(screen.getByText("Refact Built-in")).toBeDefined(); + }); + + it("renders verified badge when server is verified", () => { + const verifiedServer = { ...MOCK_SERVER, verified: true }; + render( + undefined} + onViewDetail={() => undefined} + />, + ); + expect(screen.getByText("Verified")).toBeDefined(); + }); + + it("renders use count when provided", () => { + const countedServer = { ...MOCK_SERVER, use_count: 42 }; + render( + undefined} + onViewDetail={() => undefined} + />, + ); + expect(screen.getByText("42 installs")).toBeDefined(); + }); +}); + +describe("SourceSelector", () => { + it("renders source tabs with correct counts", () => { + const onSelectSource = (id: string | null) => id; + render( + undefined} + />, + ); + expect(screen.getByText(/All \(51\)/)).toBeDefined(); + expect(screen.getByText(/Refact Built-in/)).toBeDefined(); + expect(screen.getByText(/Smithery\.ai/)).toBeDefined(); + }); + + it("calls onSelectSource when a source tab is clicked", () => { + const selected: (string | null)[] = []; + render( + selected.push(id)} + onOpenSettings={() => undefined} + />, + ); + const builtinBadge = screen.getByText(/Refact Built-in/); + fireEvent.click(builtinBadge); + expect(selected.length).toBe(1); + expect(selected[0]).toBe("refact-bundled"); + }); + + it("calls onOpenSettings when gear icon is clicked", () => { + const opened: boolean[] = []; + render( + undefined} + onOpenSettings={() => opened.push(true)} + />, + ); + const gearButton = screen.getByTitle("Manage marketplace sources"); + fireEvent.click(gearButton); + expect(opened.length).toBe(1); + }); +}); + +describe("MCPMarketplace", () => { + it("renders marketplace page with server cards from API", async () => { + server.use( + http.get("http://127.0.0.1:8001/v1/mcp/marketplace", () => { + return HttpResponse.json(MOCK_RESPONSE); + }), + http.get("http://127.0.0.1:8001/v1/mcp/marketplace/installed", () => { + return HttpResponse.json({ installed: [] }); + }), + ); + + render( + undefined} + />, + { preloadedState: PRELOADED_STATE }, + ); + + expect(await screen.findByText("Test Server")).toBeDefined(); + expect(screen.getByText("MCP Marketplace")).toBeDefined(); + }); + + it("renders source selector tabs when sources are returned", async () => { + server.use( + http.get("http://127.0.0.1:8001/v1/mcp/marketplace", () => { + return HttpResponse.json(MOCK_RESPONSE); + }), + http.get("http://127.0.0.1:8001/v1/mcp/marketplace/installed", () => { + return HttpResponse.json({ installed: [] }); + }), + ); + + render( + undefined} + />, + { preloadedState: PRELOADED_STATE }, + ); + + await screen.findByText("Test Server"); + expect(screen.getAllByText(/Refact Built-in/).length).toBeGreaterThan(0); + expect(screen.getByTitle("Manage marketplace sources")).toBeDefined(); + }); + + it("filters servers by search query", async () => { + const secondServer: MCPServer = { + ...MOCK_SERVER, + id: "other-server", + name: "Other Service", + description: "Another service", + tags: ["database"], + }; + server.use( + http.get("http://127.0.0.1:8001/v1/mcp/marketplace", () => { + return HttpResponse.json({ + servers: [MOCK_SERVER, secondServer], + sources: MOCK_SOURCES, + }); + }), + http.get("http://127.0.0.1:8001/v1/mcp/marketplace/installed", () => { + return HttpResponse.json({ installed: [] }); + }), + ); + + render( + undefined} + />, + { preloadedState: PRELOADED_STATE }, + ); + + await screen.findByText("Test Server"); + expect(screen.getByText("Other Service")).toBeDefined(); + + const searchInput = screen.getByPlaceholderText("Search servers…"); + fireEvent.change(searchInput, { target: { value: "Other" } }); + + expect(screen.queryByText("Test Server")).toBeNull(); + expect(screen.getByText("Other Service")).toBeDefined(); + }); + + it("shows installed indicator for installed servers", async () => { + server.use( + http.get("http://127.0.0.1:8001/v1/mcp/marketplace", () => { + return HttpResponse.json(MOCK_RESPONSE); + }), + http.get("http://127.0.0.1:8001/v1/mcp/marketplace/installed", () => { + return HttpResponse.json({ + installed: [ + { + id: "test-server", + name: "Test Server", + config_path: "/tmp/test.yaml", + }, + ], + }); + }), + ); + + render( + undefined} + />, + { preloadedState: PRELOADED_STATE }, + ); + + await screen.findByText("Test Server"); + expect(screen.getByText("Installed")).toBeDefined(); + }); + + it("shows Smithery configure callout when Smithery source lacks API key", async () => { + server.use( + http.get("http://127.0.0.1:8001/v1/mcp/marketplace", () => { + return HttpResponse.json({ + servers: [MOCK_SERVER], + sources: [ + ...MOCK_SOURCES.filter((s) => s.id !== "smithery"), + { ...MOCK_SOURCES[1], enabled: true }, + ], + }); + }), + http.get("http://127.0.0.1:8001/v1/mcp/marketplace/installed", () => { + return HttpResponse.json({ installed: [] }); + }), + ); + + render( + undefined} + />, + { preloadedState: PRELOADED_STATE }, + ); + + await screen.findByText("Test Server"); + expect( + screen.getByText(/Smithery source requires an API key/), + ).toBeDefined(); + }); + + it("source settings dialog opens and closes", async () => { + server.use( + http.get("http://127.0.0.1:8001/v1/mcp/marketplace", () => { + return HttpResponse.json(MOCK_RESPONSE); + }), + http.get("http://127.0.0.1:8001/v1/mcp/marketplace/installed", () => { + return HttpResponse.json({ installed: [] }); + }), + ); + + render( + undefined} + />, + { preloadedState: PRELOADED_STATE }, + ); + + await screen.findByText("Test Server"); + const gearButton = screen.getByTitle("Manage marketplace sources"); + fireEvent.click(gearButton); + expect(await screen.findByText("Marketplace Sources")).toBeDefined(); + + const closeButton = screen.getByRole("button", { name: /close/i }); + fireEvent.click(closeButton); + }); +}); diff --git a/refact-agent/gui/src/__tests__/mcpOauth.test.tsx b/refact-agent/gui/src/__tests__/mcpOauth.test.tsx new file mode 100644 index 0000000000..e4a0d6802b --- /dev/null +++ b/refact-agent/gui/src/__tests__/mcpOauth.test.tsx @@ -0,0 +1,347 @@ +import { describe, expect, test, vi, beforeEach } from "vitest"; +import { render, screen, waitFor, fireEvent } from "../utils/test-utils"; +import { http, HttpResponse } from "msw"; +import { server } from "../utils/mockServer"; +import { MCPOAuth } from "../components/IntegrationsView/MCPServerView/MCPOAuth"; + +const CONFIG_PATH = + "/home/user/.config/refact/integrations.d/mcp_http_myserver.yaml"; + +const PRELOADED_STATE = { + config: { + apiKey: "test", + lspPort: 8001, + themeProps: {}, + host: "vscode" as const, + addressURL: "Refact", + }, +}; + +function mockStatus(body: object) { + server.use( + http.get("http://127.0.0.1:8001/v1/mcp/oauth/status", () => { + return HttpResponse.json(body); + }), + ); +} + +describe("MCPOAuth", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + + test("renders nothing when auth_type is not oauth2_pkce", async () => { + mockStatus({ auth_type: "bearer", authenticated: false }); + + render(, { + preloadedState: PRELOADED_STATE, + }); + + await new Promise((resolve) => setTimeout(resolve, 300)); + expect( + screen.queryByRole("button", { name: /Login with OAuth/i }), + ).toBeNull(); + expect(screen.queryByText("Authenticated")).toBeNull(); + expect(screen.queryByText("Not authenticated")).toBeNull(); + }); + + test("renders Login button when not authenticated", async () => { + mockStatus({ auth_type: "oauth2_pkce", authenticated: false }); + + render(, { + preloadedState: PRELOADED_STATE, + }); + + await waitFor(() => { + expect( + screen.getByRole("button", { name: /Login with OAuth/i }), + ).toBeInTheDocument(); + }); + }); + + test("shows not authenticated badge when auth_type is oauth2_pkce and not authenticated", async () => { + mockStatus({ auth_type: "oauth2_pkce", authenticated: false }); + + render(, { + preloadedState: PRELOADED_STATE, + }); + + await waitFor(() => { + expect(screen.getByText("Not authenticated")).toBeInTheDocument(); + }); + }); + + test("shows waiting state after login click", async () => { + mockStatus({ auth_type: "oauth2_pkce", authenticated: false }); + server.use( + http.post("http://127.0.0.1:8001/v1/mcp/oauth/start", () => { + return HttpResponse.json({ + session_id: "test-session-123", + authorize_url: + "https://auth.example.com/authorize?code_challenge=abc", + }); + }), + ); + + const { user } = render(, { + preloadedState: PRELOADED_STATE, + }); + + await waitFor(() => { + expect( + screen.getByRole("button", { name: /Login with OAuth/i }), + ).toBeInTheDocument(); + }); + + await user.click(screen.getByRole("button", { name: /Login with OAuth/i })); + + await waitFor(() => { + expect( + screen.getByText("Waiting for authorization..."), + ).toBeInTheDocument(); + }); + }); + + test("shows authenticated state with logout button", async () => { + mockStatus({ + auth_type: "oauth2_pkce", + authenticated: true, + expires_at: Date.now() + 3600000, + }); + + render(, { + preloadedState: PRELOADED_STATE, + }); + + await waitFor(() => { + expect(screen.getByText("Authenticated")).toBeInTheDocument(); + expect( + screen.getByRole("button", { name: /Logout/i }), + ).toBeInTheDocument(); + }); + }); + + test("shows session expired badge when expires_at is in the past", async () => { + mockStatus({ + auth_type: "oauth2_pkce", + authenticated: false, + expires_at: Date.now() - 10000, + }); + + render(, { + preloadedState: PRELOADED_STATE, + }); + + await waitFor(() => { + expect(screen.getByText("Session expired")).toBeInTheDocument(); + expect( + screen.getByText(/Session expired, please re-login/i), + ).toBeInTheDocument(); + }); + }); + + test("manual code entry shows Submit Code button in waiting state", async () => { + mockStatus({ auth_type: "oauth2_pkce", authenticated: false }); + server.use( + http.post("http://127.0.0.1:8001/v1/mcp/oauth/start", () => { + return HttpResponse.json({ + session_id: "test-session-456", + authorize_url: "https://auth.example.com/authorize", + }); + }), + ); + + const { user } = render(, { + preloadedState: PRELOADED_STATE, + }); + + await waitFor(() => { + expect( + screen.getByRole("button", { name: /Login with OAuth/i }), + ).toBeInTheDocument(); + }); + + await user.click(screen.getByRole("button", { name: /Login with OAuth/i })); + + await waitFor(() => { + expect(screen.getByLabelText("Authorization code")).toBeInTheDocument(); + }); + + const codeInput = screen.getByLabelText("Authorization code"); + fireEvent.change(codeInput, { target: { value: "test-auth-code" } }); + + expect( + screen.getByRole("button", { name: /Submit Code/i }), + ).toBeInTheDocument(); + expect( + screen.getByRole("button", { name: /Submit Code/i }), + ).not.toBeDisabled(); + }); + + test("logout calls logout endpoint", async () => { + let logoutCalled = false; + + mockStatus({ + auth_type: "oauth2_pkce", + authenticated: true, + }); + server.use( + http.post("http://127.0.0.1:8001/v1/mcp/oauth/logout", () => { + logoutCalled = true; + return HttpResponse.json({ success: true }); + }), + ); + + const { user } = render(, { + preloadedState: PRELOADED_STATE, + }); + + await waitFor(() => { + expect( + screen.getByRole("button", { name: /Logout/i }), + ).toBeInTheDocument(); + }); + + await user.click(screen.getByRole("button", { name: /Logout/i })); + + await waitFor(() => { + expect(logoutCalled).toBe(true); + }); + }); + + test("shows error message on failed login start", async () => { + mockStatus({ auth_type: "oauth2_pkce", authenticated: false }); + server.use( + http.post("http://127.0.0.1:8001/v1/mcp/oauth/start", () => { + return HttpResponse.json( + { detail: "Server unreachable" }, + { status: 500 }, + ); + }), + ); + + const { user } = render(, { + preloadedState: PRELOADED_STATE, + }); + + await waitFor(() => { + expect( + screen.getByRole("button", { name: /Login with OAuth/i }), + ).toBeInTheDocument(); + }); + + await user.click(screen.getByRole("button", { name: /Login with OAuth/i })); + + await waitFor(() => { + expect(screen.getByText(/Failed to start OAuth/i)).toBeInTheDocument(); + }); + }); + + test("cancel button shown during waiting state", async () => { + mockStatus({ auth_type: "oauth2_pkce", authenticated: false }); + server.use( + http.post("http://127.0.0.1:8001/v1/mcp/oauth/start", () => { + return HttpResponse.json({ + session_id: "test-session-cancel-show", + authorize_url: "https://auth.example.com/authorize", + }); + }), + ); + + const { user } = render(, { + preloadedState: PRELOADED_STATE, + }); + + await waitFor(() => { + expect( + screen.getByRole("button", { name: /Login with OAuth/i }), + ).toBeInTheDocument(); + }); + + await user.click(screen.getByRole("button", { name: /Login with OAuth/i })); + + await waitFor(() => { + expect( + screen.getByRole("button", { name: /Cancel/i }), + ).toBeInTheDocument(); + }); + }); + + test("cancel calls backend with session_id", async () => { + let cancelledSessionId: string | null = null; + + mockStatus({ auth_type: "oauth2_pkce", authenticated: false }); + server.use( + http.post("http://127.0.0.1:8001/v1/mcp/oauth/start", () => { + return HttpResponse.json({ + session_id: "test-session-to-cancel", + authorize_url: "https://auth.example.com/authorize", + }); + }), + http.post( + "http://127.0.0.1:8001/v1/mcp/oauth/cancel", + async ({ request }) => { + const body = (await request.json()) as { session_id: string }; + cancelledSessionId = body.session_id; + return HttpResponse.json({ cancelled: true }); + }, + ), + ); + + const { user } = render(, { + preloadedState: PRELOADED_STATE, + }); + + await waitFor(() => { + expect( + screen.getByRole("button", { name: /Login with OAuth/i }), + ).toBeInTheDocument(); + }); + + await user.click(screen.getByRole("button", { name: /Login with OAuth/i })); + + await waitFor(() => { + expect( + screen.getByText("Waiting for authorization..."), + ).toBeInTheDocument(); + }); + + await user.click(screen.getByRole("button", { name: /Cancel/i })); + + await waitFor(() => { + expect(cancelledSessionId).toBe("test-session-to-cancel"); + }); + + await waitFor(() => { + expect(screen.getByText("Not authenticated")).toBeInTheDocument(); + }); + }); + + test("polling stops when authenticated", async () => { + let callCount = 0; + + server.use( + http.get("http://127.0.0.1:8001/v1/mcp/oauth/status", () => { + callCount++; + return HttpResponse.json({ + auth_type: "oauth2_pkce", + authenticated: true, + expires_at: Date.now() + 3600000, + scopes: [], + }); + }), + ); + + render(, { + preloadedState: PRELOADED_STATE, + }); + + await waitFor(() => { + expect(screen.getByText("Authenticated")).toBeInTheDocument(); + }); + + const countAfterAuth = callCount; + await new Promise((r) => setTimeout(r, 100)); + expect(callCount).toBe(countAfterAuth); + }); +}); diff --git a/refact-agent/gui/src/__tests__/mcpServerView.test.tsx b/refact-agent/gui/src/__tests__/mcpServerView.test.tsx new file mode 100644 index 0000000000..1c26d4a415 --- /dev/null +++ b/refact-agent/gui/src/__tests__/mcpServerView.test.tsx @@ -0,0 +1,288 @@ +import { describe, expect, test, vi, beforeEach } from "vitest"; +import { render, screen } from "../utils/test-utils"; +import { MCPConnectionStatus } from "../components/IntegrationsView/MCPServerView/MCPConnectionStatus"; +import { MCPToolsList } from "../components/IntegrationsView/MCPServerView/MCPToolsList"; +import { MCPResourcesList } from "../components/IntegrationsView/MCPServerView/MCPResourcesList"; +import { MCPPromptsList } from "../components/IntegrationsView/MCPServerView/MCPPromptsList"; +import type { + MCPToolInfo, + MCPResourceInfo, + MCPPromptInfo, +} from "../services/refact/mcpServerInfo"; + +describe("MCPConnectionStatus", () => { + test("renders connected status as green badge", () => { + render( + , + ); + expect(screen.getByText("connected")).toBeInTheDocument(); + expect( + screen.getByRole("button", { name: /reconnect/i }), + ).toBeInTheDocument(); + }); + + test("renders string status", () => { + render( + , + ); + expect(screen.getByText("connecting")).toBeInTheDocument(); + }); + + test("shows reconnecting state on button when reconnecting", () => { + render( + , + ); + expect(screen.getByText("Reconnecting...")).toBeInTheDocument(); + expect(screen.getByRole("button")).toBeDisabled(); + }); + + test("shows error message from status object", () => { + render( + , + ); + expect(screen.getByText("Connection refused")).toBeInTheDocument(); + }); + + test("calls onReconnect when button clicked", async () => { + const onReconnect = vi.fn(); + const { user } = render( + , + ); + await user.click(screen.getByRole("button", { name: /reconnect/i })); + expect(onReconnect).toHaveBeenCalledOnce(); + }); + + test("string connected shows green badge and no spinner", () => { + render( + , + ); + expect(screen.getByText("connected")).toBeInTheDocument(); + expect(screen.queryByRole("status")).toBeNull(); + }); + + test("string reconnecting shows yellow badge and spinner", () => { + render( + , + ); + expect(screen.getByText("reconnecting")).toBeInTheDocument(); + const spinner = document.querySelector("pre"); + expect(spinner).toBeTruthy(); + }); + + test("string disconnected shows red badge and no spinner", () => { + const { container } = render( + , + ); + const badge = container.querySelector("[data-accent-color='red']"); + expect(badge).toBeTruthy(); + expect(screen.getByText("disconnected")).toBeInTheDocument(); + }); + + test("object status with attempt and max_attempts shows attempt info", () => { + render( + , + ); + expect(screen.getByText("Attempt 2/7")).toBeInTheDocument(); + }); + + test("object status with next_retry_seconds shows retry info", () => { + render( + , + ); + expect(screen.getByText("Next retry in 3s")).toBeInTheDocument(); + }); + + test("isReconnecting=true shows spinner", () => { + render( + , + ); + const spinner = document.querySelector("pre"); + expect(spinner).toBeTruthy(); + }); +}); + +describe("MCPToolsList", () => { + const tools: MCPToolInfo[] = [ + { + name: "create_issue", + description: "Create a GitHub issue", + input_schema: { + type: "object", + properties: { title: { type: "string" } }, + }, + internal_name: "mcp_github_create_issue", + }, + { + name: "delete_repo", + description: "Delete a repository", + input_schema: { type: "object" }, + annotations: { destructiveHint: true }, + internal_name: "mcp_github_delete_repo", + }, + ]; + + test("renders tool names", () => { + render(); + expect(screen.getByText("create_issue")).toBeInTheDocument(); + expect(screen.getByText("delete_repo")).toBeInTheDocument(); + }); + + test("renders tool descriptions", () => { + render(); + expect(screen.getByText("Create a GitHub issue")).toBeInTheDocument(); + expect(screen.getByText("Delete a repository")).toBeInTheDocument(); + }); + + test("renders destructive badge for destructive tools", () => { + render(); + expect(screen.getByText("⚠️ destructive")).toBeInTheDocument(); + }); + + test("renders empty state when no tools", () => { + render(); + expect(screen.getByText("No tools available")).toBeInTheDocument(); + }); + + test("shows toggle switch for each tool", () => { + render(); + const switches = screen.getAllByRole("switch"); + expect(switches).toHaveLength(2); + }); + + test("expands schema when show schema clicked", async () => { + const { user } = render(); + await user.click(screen.getByText("Show schema")); + expect(screen.getByText("Hide schema")).toBeInTheDocument(); + expect(screen.getByText(/"type":/)).toBeInTheDocument(); + }); +}); + +describe("MCPResourcesList", () => { + const resources: MCPResourceInfo[] = [ + { + uri: "repo://owner/repo", + name: "Repository", + description: "Repository content", + mime_type: "application/json", + }, + ]; + + test("renders resource URIs", () => { + render(); + expect(screen.getByText("repo://owner/repo")).toBeInTheDocument(); + }); + + test("renders resource descriptions", () => { + render(); + expect(screen.getByText("Repository content")).toBeInTheDocument(); + }); + + test("renders mime types", () => { + render(); + expect(screen.getByText("application/json")).toBeInTheDocument(); + }); + + test("shows empty state when no resources", () => { + render(); + expect(screen.getByText("No resources available")).toBeInTheDocument(); + }); +}); + +describe("MCPPromptsList", () => { + const prompts: MCPPromptInfo[] = [ + { + name: "commit_message", + description: "Generate a commit message", + }, + ]; + + test("renders prompt names", () => { + render(); + expect(screen.getByText("commit_message")).toBeInTheDocument(); + }); + + test("renders prompt descriptions", () => { + render(); + expect(screen.getByText("Generate a commit message")).toBeInTheDocument(); + }); + + test("shows empty state when no prompts", () => { + render(); + expect(screen.getByText("No prompts available")).toBeInTheDocument(); + }); +}); + +describe("mcpServerInfo API types", () => { + test("MCPServerInfo type has expected shape", () => { + const serverInfo = { + config_path: "/path/to/config.yaml", + status: { status: "connected" }, + server_name: "GitHub MCP", + server_version: "1.0.0", + protocol_version: "2024-11-05", + tools: [] as MCPToolInfo[], + resources: [] as MCPResourceInfo[], + prompts: [] as MCPPromptInfo[], + capabilities: { + tools: true, + resources: false, + prompts: false, + sampling: false, + }, + logs_tail: ["server started"], + }; + + expect(serverInfo.config_path).toBe("/path/to/config.yaml"); + expect(serverInfo.tools).toHaveLength(0); + expect(serverInfo.capabilities.tools).toBe(true); + expect(serverInfo.logs_tail).toContain("server started"); + }); +}); + +beforeEach(() => { + vi.clearAllMocks(); +}); diff --git a/refact-agent/gui/src/__tests__/mcpSetupWizard.test.tsx b/refact-agent/gui/src/__tests__/mcpSetupWizard.test.tsx new file mode 100644 index 0000000000..3d3f29f682 --- /dev/null +++ b/refact-agent/gui/src/__tests__/mcpSetupWizard.test.tsx @@ -0,0 +1,268 @@ +import { describe, expect, it, vi } from "vitest"; +import { render, screen, fireEvent, waitFor } from "../utils/test-utils"; +import { http, HttpResponse } from "msw"; +import { server } from "../utils/mockServer"; +import { MCPSetupWizard } from "../components/IntegrationsView/MCPSetupWizard"; +import type { NotConfiguredIntegrationWithIconRecord } from "../services/refact"; + +const MOCK_INTEGRATION: NotConfiguredIntegrationWithIconRecord = { + integr_name: "mcp_TEMPLATE", + integr_config_path: ["/home/user/.config/refact/integrations.d/mcp_TEMPLATE"], + project_path: [""], + icon_path: "/icons/mcp.svg", + integr_config_exists: false, + wasOpenedThroughChat: false, + when_isolated: false, + on_your_laptop: false, +}; + +const PRELOADED_STATE = { + config: { + apiKey: "test", + lspPort: 8001, + themeProps: {}, + host: "vscode" as const, + addressURL: "Refact", + }, +}; + +describe("MCPSetupWizard", () => { + it("typing a command shows Local server (stdio) detection", () => { + render( + undefined} + />, + { preloadedState: PRELOADED_STATE }, + ); + + const input = screen.getByTestId("mcp-wizard-input"); + fireEvent.change(input, { + target: { value: "npx -y @notionhq/notion-mcp-server" }, + }); + + expect(screen.getByText(/Local server \(stdio\)/)).toBeDefined(); + }); + + it("typing a URL shows Remote server (HTTP) detection", () => { + render( + undefined} + />, + { preloadedState: PRELOADED_STATE }, + ); + + const input = screen.getByTestId("mcp-wizard-input"); + fireEvent.change(input, { + target: { value: "https://api.example.com/mcp" }, + }); + + expect(screen.getByText(/Remote server \(HTTP\)/)).toBeDefined(); + }); + + it("name auto-populated from auto-name API response", async () => { + server.use( + http.post("http://127.0.0.1:8001/v1/mcp/auto-name", () => { + return HttpResponse.json({ + suggested_name: "notion_mcp_server", + transport: "stdio", + config_prefix: "mcp_stdio_", + }); + }), + ); + + render( + undefined} + />, + { preloadedState: PRELOADED_STATE }, + ); + + const input = screen.getByTestId("mcp-wizard-input"); + fireEvent.change(input, { + target: { value: "npx -y @notionhq/notion-mcp-server" }, + }); + + await waitFor( + () => { + const nameField = screen.getByTestId("mcp-wizard-name"); + expect((nameField as HTMLInputElement).value).toBe("notion_mcp_server"); + }, + { timeout: 2000 }, + ); + }); + + it("name validation rejects invalid snake_case", async () => { + server.use( + http.post("http://127.0.0.1:8001/v1/mcp/auto-name", () => { + return HttpResponse.json({ + suggested_name: "notion_mcp_server", + transport: "stdio", + config_prefix: "mcp_stdio_", + }); + }), + ); + + render( + undefined} + />, + { preloadedState: PRELOADED_STATE }, + ); + + const input = screen.getByTestId("mcp-wizard-input"); + fireEvent.change(input, { target: { value: "npx test" } }); + + const nameField = await screen.findByTestId("mcp-wizard-name"); + fireEvent.change(nameField, { target: { value: "Invalid Name!" } }); + + expect(screen.getByText(/snake_case/i)).toBeDefined(); + }); + + it("Continue with setup creates correct config path for stdio command", async () => { + const calls: { + configPath: string; + integrName: string; + initialInput?: { input: string; transport: string }; + }[] = []; + + server.use( + http.post("http://127.0.0.1:8001/v1/mcp/auto-name", () => { + return HttpResponse.json({ + suggested_name: "notion_server", + transport: "stdio", + config_prefix: "mcp_stdio_", + }); + }), + ); + + render( + { + calls.push({ configPath, integrName, initialInput }); + }} + />, + { preloadedState: PRELOADED_STATE }, + ); + + const input = screen.getByTestId("mcp-wizard-input"); + fireEvent.change(input, { target: { value: "npx notion" } }); + + const nameField = await screen.findByTestId("mcp-wizard-name"); + fireEvent.change(nameField, { target: { value: "notion_server" } }); + + const submitBtn = screen.getByTestId("mcp-wizard-submit"); + fireEvent.click(submitBtn); + + expect(calls.length).toBe(1); + expect(calls[0]?.integrName).toBe("mcp_stdio_notion_server"); + expect(calls[0]?.configPath).toContain("mcp_stdio_notion_server"); + expect(calls[0]?.initialInput?.input).toBe("npx notion"); + expect(calls[0]?.initialInput?.transport).toBe("stdio"); + }); + + it("Continue with setup passes initialInput with http transport for URL inputs", async () => { + const calls: { + configPath: string; + integrName: string; + initialInput?: { input: string; transport: string }; + }[] = []; + + server.use( + http.post("http://127.0.0.1:8001/v1/mcp/auto-name", () => { + return HttpResponse.json({ + suggested_name: "example_mcp", + transport: "http", + config_prefix: "mcp_http_", + }); + }), + ); + + render( + { + calls.push({ configPath, integrName, initialInput }); + }} + />, + { preloadedState: PRELOADED_STATE }, + ); + + const input = screen.getByTestId("mcp-wizard-input"); + fireEvent.change(input, { + target: { value: "https://api.example.com/mcp" }, + }); + + const nameField = await screen.findByTestId("mcp-wizard-name"); + fireEvent.change(nameField, { target: { value: "example_mcp" } }); + + const submitBtn = screen.getByTestId("mcp-wizard-submit"); + fireEvent.click(submitBtn); + + expect(calls.length).toBe(1); + expect(calls[0]?.initialInput?.input).toBe("https://api.example.com/mcp"); + expect(calls[0]?.initialInput?.transport).toBe("http"); + }); + + it("fallback name used when auto-name API unavailable", async () => { + server.use( + http.post("http://127.0.0.1:8001/v1/mcp/auto-name", () => { + return HttpResponse.error(); + }), + ); + + render( + undefined} + />, + { preloadedState: PRELOADED_STATE }, + ); + + const input = screen.getByTestId("mcp-wizard-input"); + fireEvent.change(input, { target: { value: "npx my-server" } }); + + await waitFor( + () => { + const nameField = screen.getByTestId("mcp-wizard-name"); + expect((nameField as HTMLInputElement).value).toBeTruthy(); + }, + { timeout: 2000 }, + ); + }); +}); + +describe("MCPSetupWizard - SSE advanced toggle", () => { + it("shows SSE checkbox under Advanced for stdio commands", () => { + render( + , + { preloadedState: PRELOADED_STATE }, + ); + + const input = screen.getByTestId("mcp-wizard-input"); + fireEvent.change(input, { target: { value: "npx some-server" } }); + + const advancedBtn = screen.getByText(/Advanced: Use SSE transport/i); + fireEvent.click(advancedBtn); + + expect(screen.getByTestId("mcp-wizard-sse-checkbox")).toBeDefined(); + }); + + it("does not show SSE checkbox for URL inputs", () => { + render( + , + { preloadedState: PRELOADED_STATE }, + ); + + const input = screen.getByTestId("mcp-wizard-input"); + fireEvent.change(input, { + target: { value: "https://api.example.com/mcp" }, + }); + + expect(screen.queryByText(/Advanced: Use SSE transport/i)).toBeNull(); + }); +}); diff --git a/refact-agent/gui/src/__tests__/toolSchema.test.ts b/refact-agent/gui/src/__tests__/toolSchema.test.ts new file mode 100644 index 0000000000..4df1f63893 --- /dev/null +++ b/refact-agent/gui/src/__tests__/toolSchema.test.ts @@ -0,0 +1,113 @@ +import { describe, it, expect } from "vitest"; +import { + extractParamsFromSchema, + toInputSchema, + fromInputSchema, +} from "../utils/toolSchema"; + +describe("extractParamsFromSchema", () => { + it("extracts params from a valid schema", () => { + const schema = { + type: "object", + properties: { + symbol: { type: "string", description: "A symbol name" }, + count: { type: "integer", description: "Count value" }, + }, + required: ["symbol"], + }; + const params = extractParamsFromSchema(schema); + expect(params).toHaveLength(2); + expect(params[0]).toEqual({ + name: "symbol", + type: "string", + description: "A symbol name", + }); + expect(params[1]).toEqual({ + name: "count", + type: "integer", + description: "Count value", + }); + }); + + it("returns empty array for schema with no properties", () => { + const schema = { type: "object" }; + expect(extractParamsFromSchema(schema)).toEqual([]); + }); + + it("returns empty array for empty schema", () => { + expect(extractParamsFromSchema({})).toEqual([]); + }); + + it("defaults type to string when missing", () => { + const schema = { + type: "object", + properties: { + path: { description: "File path" }, + }, + }; + const params = extractParamsFromSchema(schema); + expect(params[0].type).toBe("string"); + }); + + it("defaults description to empty string when missing", () => { + const schema = { + type: "object", + properties: { + flag: { type: "boolean" }, + }, + }; + const params = extractParamsFromSchema(schema); + expect(params[0].description).toBe(""); + }); +}); + +describe("toInputSchema", () => { + it("produces valid JSON Schema from params", () => { + const params = [ + { name: "query", type: "string", description: "Search query" }, + { name: "limit", type: "integer", description: "Max results" }, + ]; + const schema = toInputSchema(params, ["query"]); + expect(schema).toEqual({ + type: "object", + properties: { + query: { type: "string", description: "Search query" }, + limit: { type: "integer", description: "Max results" }, + }, + required: ["query"], + }); + }); + + it("handles empty params", () => { + const schema = toInputSchema([], []); + expect(schema).toEqual({ type: "object", properties: {}, required: [] }); + }); +}); + +describe("fromInputSchema round-trip", () => { + it("round-trips params and required through toInputSchema/fromInputSchema", () => { + const originalParams = [ + { name: "path", type: "string", description: "File path" }, + { name: "content", type: "string", description: "File content" }, + ]; + const originalRequired = ["path"]; + + const schema = toInputSchema(originalParams, originalRequired); + const { params, required } = fromInputSchema(schema); + + expect(params).toEqual(originalParams); + expect(required).toEqual(originalRequired); + }); + + it("handles schema without required field", () => { + const schema = { + type: "object", + properties: { + name: { type: "string", description: "Name" }, + }, + }; + const { params, required } = fromInputSchema(schema); + expect(params).toHaveLength(1); + expect(required).toEqual([]); + }); +}); diff --git a/refact-agent/gui/src/__tests__/useAllChatsSubscription.test.ts b/refact-agent/gui/src/__tests__/useAllChatsSubscription.test.ts new file mode 100644 index 0000000000..67c0c402e7 --- /dev/null +++ b/refact-agent/gui/src/__tests__/useAllChatsSubscription.test.ts @@ -0,0 +1,47 @@ +import { describe, it, expect } from "vitest"; +import { pickDesiredChatSubscriptions } from "../hooks/useAllChatsSubscription"; + +describe("pickDesiredChatSubscriptions", () => { + it("keeps active chat first and limits to default size", () => { + const result = pickDesiredChatSubscriptions({ + openThreadIds: ["chat-1", "chat-2", "chat-3", "chat-4", "chat-5"], + activeChatId: "chat-5", + subscribedThreadIds: [], + }); + + expect(result).toEqual(["chat-5", "chat-4", "chat-3", "chat-2"]); + }); + + it("prefers currently subscribed chats after active to reduce churn", () => { + const result = pickDesiredChatSubscriptions({ + openThreadIds: ["chat-1", "chat-2", "chat-3", "chat-4", "chat-5"], + activeChatId: "chat-3", + subscribedThreadIds: ["chat-1", "chat-2"], + maxSubscriptions: 4, + }); + + expect(result).toEqual(["chat-3", "chat-1", "chat-2", "chat-5"]); + }); + + it("includes active chat even when it is not in open tabs", () => { + const result = pickDesiredChatSubscriptions({ + openThreadIds: ["chat-1", "chat-2", "chat-3", "chat-4"], + activeChatId: "chat-external", + subscribedThreadIds: [], + maxSubscriptions: 4, + }); + + expect(result).toEqual(["chat-external", "chat-4", "chat-3", "chat-2"]); + }); + + it("returns full ordered list when maxSubscriptions is non-positive", () => { + const result = pickDesiredChatSubscriptions({ + openThreadIds: ["chat-1", "chat-2", "chat-3"], + activeChatId: "chat-2", + subscribedThreadIds: ["chat-1"], + maxSubscriptions: 0, + }); + + expect(result).toEqual(["chat-2", "chat-1", "chat-3"]); + }); +}); diff --git a/refact-agent/gui/src/app/store.ts b/refact-agent/gui/src/app/store.ts index 83a9256aef..d19ac5d01b 100644 --- a/refact-agent/gui/src/app/store.ts +++ b/refact-agent/gui/src/app/store.ts @@ -35,6 +35,9 @@ import { import { chatModesApi } from "../services/refact/chatModes"; import { customizationApi } from "../services/refact/customization"; import { projectInformationApi } from "../services/refact/projectInformation"; +import { setupStatusApi } from "../services/refact/setupStatus"; +import { extensionsApi } from "../services/refact/extensions"; +import { pluginsApi } from "../services/refact/plugins"; import { smallCloudApi } from "../services/smallcloud"; import { reducer as fimReducer } from "../features/FIM/reducer"; import { tipOfTheDaySlice } from "../features/TipOfTheDay"; @@ -64,6 +67,9 @@ import { coinBallanceSlice } from "../features/CoinBalance"; import { tasksSlice } from "../features/Tasks"; import { connectionSlice } from "../features/Connection"; import { browserSlice } from "../features/Browser"; +import { skillsStatusApi } from "../services/refact/skillsStatus"; +import { mcpServerInfoApi } from "../services/refact/mcpServerInfo"; +import { mcpMarketplaceApi } from "../services/refact/mcpMarketplace"; const tipOfTheDayPersistConfig = { key: "totd", @@ -109,9 +115,15 @@ const rootReducer = combineSlices( [trajectoryApi.reducerPath]: trajectoryApi.reducer, [tasksApi.reducerPath]: tasksApi.reducer, [browserApi.reducerPath]: browserApi.reducer, + [skillsStatusApi.reducerPath]: skillsStatusApi.reducer, + [mcpServerInfoApi.reducerPath]: mcpServerInfoApi.reducer, [chatModesApi.reducerPath]: chatModesApi.reducer, [customizationApi.reducerPath]: customizationApi.reducer, [projectInformationApi.reducerPath]: projectInformationApi.reducer, + [setupStatusApi.reducerPath]: setupStatusApi.reducer, + [extensionsApi.reducerPath]: extensionsApi.reducer, + [pluginsApi.reducerPath]: pluginsApi.reducer, + [mcpMarketplaceApi.reducerPath]: mcpMarketplaceApi.reducer, }, historySlice, errorSlice, @@ -200,9 +212,15 @@ export function setUpStore(preloadedState?: Partial) { trajectoryApi.middleware, tasksApi.middleware, browserApi.middleware, + skillsStatusApi.middleware, chatModesApi.middleware, customizationApi.middleware, projectInformationApi.middleware, + setupStatusApi.middleware, + extensionsApi.middleware, + pluginsApi.middleware, + mcpServerInfoApi.middleware, + mcpMarketplaceApi.middleware, ) .prepend(historyMiddleware.middleware) .prepend(listenerMiddleware.middleware); diff --git a/refact-agent/gui/src/components/Chat/Chat.tsx b/refact-agent/gui/src/components/Chat/Chat.tsx index d3e2f494f4..a6fab46143 100644 --- a/refact-agent/gui/src/components/Chat/Chat.tsx +++ b/refact-agent/gui/src/components/Chat/Chat.tsx @@ -20,6 +20,7 @@ import { selectBrowserContextOversize, selectBrowserUiOpen, } from "../../features/Browser/browserSlice"; +import { SkillsIndicator } from "../ChatContent/SkillsIndicator"; export type ChatProps = { host: Config["host"]; @@ -95,6 +96,10 @@ export const Chat: React.FC = ({ + + + + diff --git a/refact-agent/gui/src/components/ChatContent/AssistantInput.tsx b/refact-agent/gui/src/components/ChatContent/AssistantInput.tsx index 578ec907b4..bf23d04153 100644 --- a/refact-agent/gui/src/components/ChatContent/AssistantInput.tsx +++ b/refact-agent/gui/src/components/ChatContent/AssistantInput.tsx @@ -149,7 +149,11 @@ const _AssistantInput: React.FC = ({ )} {message && ( - + {message} diff --git a/refact-agent/gui/src/components/ChatContent/ChatContent.module.css b/refact-agent/gui/src/components/ChatContent/ChatContent.module.css index b9957e1d55..2c4139f582 100644 --- a/refact-agent/gui/src/components/ChatContent/ChatContent.module.css +++ b/refact-agent/gui/src/components/ChatContent/ChatContent.module.css @@ -215,6 +215,14 @@ word-break: break-word; } +.queuedMessageEditable { + cursor: pointer; +} + +.queuedMessageEditable:hover { + color: var(--gray-12); +} + .plainTextTrigger { cursor: pointer; color: var(--gray-10); diff --git a/refact-agent/gui/src/components/ChatContent/ChatContent.tsx b/refact-agent/gui/src/components/ChatContent/ChatContent.tsx index f1bacc9358..a16d398553 100644 --- a/refact-agent/gui/src/components/ChatContent/ChatContent.tsx +++ b/refact-agent/gui/src/components/ChatContent/ChatContent.tsx @@ -47,6 +47,7 @@ import { GroupedDiffs } from "./DiffContent"; import { popBackTo } from "../../features/Pages/pagesSlice"; import { ChatLinks, UncommittedChangesWarning } from "../ChatLinks"; import { PlaceHolderText } from "./PlaceHolderText"; +import { SkillActivatedCard } from "./SkillActivatedCard"; import { QueuedMessage } from "./QueuedMessage"; import { selectSseStatusForChat } from "../../features/Connection"; import { LogoAnimation } from "../LogoAnimation/LogoAnimation.tsx"; @@ -99,7 +100,7 @@ export const ChatContent: React.FC = ({ selectSseStatusForChat(s, renderChatId), ); - const isConfig = thread !== null && thread.mode === "CONFIGURE"; + const isConfig = thread !== null && thread.mode === "configurator"; const isWaiting = useAppSelector((s) => selectIsWaitingById(s, renderChatId)); const integrationMeta = useAppSelector(selectIntegration); const isWaitingForConfirmation = useAppSelector((s) => @@ -193,7 +194,11 @@ export const ChatContent: React.FC = ({ ]); const shouldConfigButtonBeVisible = useMemo(() => { - return isConfig && !integrationMeta?.path?.includes("project_summary"); + return ( + isConfig && + !integrationMeta?.path?.includes("project_summary") && + !integrationMeta?.path?.includes("setup") + ); }, [isConfig, integrationMeta?.path]); useDiffFileReload(); @@ -318,6 +323,17 @@ export const ChatContent: React.FC = ({ case "system": return ; + case "skill_activated": + return ( + + ); + default: return null; } @@ -491,13 +507,50 @@ type DisplayItemPlainText = { content: string; }; +type DisplayItemSkillActivated = { + type: "skill_activated"; + key: string; + name: string; + body: string; + allowedTools: string[]; + modelOverride: string | null; +}; + type DisplayItem = | DisplayItemAssistant | DisplayItemUser | DisplayItemContextFiles | DisplayItemDiffGroup | DisplayItemSystem - | DisplayItemPlainText; + | DisplayItemPlainText + | DisplayItemSkillActivated; + +function tryParseSkillActivated( + content: string, +): Omit | null { + const prefix = "💿 SKILL_ACTIVATED "; + const firstNewline = content.indexOf("\n"); + const headerLine = + firstNewline === -1 ? content : content.slice(0, firstNewline); + if (!headerLine.startsWith(prefix)) return null; + try { + const meta = JSON.parse(headerLine.slice(prefix.length)) as { + name?: string; + allowed_tools?: string[]; + model_override?: string | null; + }; + const body = + firstNewline === -1 ? "" : content.slice(firstNewline + 1).trimStart(); + return { + name: meta.name ?? "", + body, + allowedTools: meta.allowed_tools ?? [], + modelOverride: meta.model_override ?? null, + }; + } catch { + return null; + } +} function buildDisplayItems( messages: ChatMessages, @@ -536,13 +589,21 @@ function buildDisplayItems( } if (head.role === "assistant") { + const toolCalls = "tool_calls" in head ? head.tool_calls ?? [] : []; + const isOnlyActivateSkill = + toolCalls.length > 0 && + toolCalls.every((tc) => tc.function.name === "activate_skill") && + !("content" in head && head.content && String(head.content).trim()); + if (isOnlyActivateSkill) { + continue; + } + const key = getMessageKey(head, i); const contextFilesAfter: DisplayItemContextFiles[] = []; const diffMessagesAfter: DiffMessage[] = []; const contextFilesByToolId: Record = {}; const diffsByToolId: Record = {}; - const toolCalls = head.tool_calls ?? []; const eligibleToolCalls = toolCalls.filter( (tc) => tc.id && tc.function.name && READ_TOOLS.has(tc.function.name), ); @@ -668,6 +729,18 @@ function buildDisplayItems( continue; } + if (head.role === "cd_instruction" && typeof head.content === "string") { + const parsed = tryParseSkillActivated(head.content); + if (parsed) { + items.push({ + type: "skill_activated", + key: getMessageKey(head, i), + ...parsed, + }); + } + continue; + } + if (isChatContextFileMessage(head)) { items.push({ type: "context_files", diff --git a/refact-agent/gui/src/components/ChatContent/ContextFiles.tsx b/refact-agent/gui/src/components/ChatContent/ContextFiles.tsx index c3fee839d5..ceb0566915 100644 --- a/refact-agent/gui/src/components/ChatContent/ContextFiles.tsx +++ b/refact-agent/gui/src/components/ChatContent/ContextFiles.tsx @@ -12,7 +12,8 @@ import { import { ChatContextFile } from "../../services/refact"; import { ShikiCodeBlock } from "../Markdown/ShikiCodeBlock"; import { filename } from "../../utils"; -import { useEventsBusForIDE } from "../../hooks"; +import { useEventsBusForIDE, useAppDispatch } from "../../hooks"; +import { push } from "../../features/Pages/pagesSlice"; import { useDelayedUnmount } from "../shared/useDelayedUnmount"; import styles from "./ContextFiles.module.css"; @@ -58,7 +59,6 @@ function isInstructionFile(filePath: string): boolean { lower.includes("copilot-instructions") || lower.includes(".github/instructions") || lower.includes(".aider.conf") || - lower.includes(".refact/project_summary") || lower.includes(".refact/instructions") ); } @@ -366,6 +366,25 @@ const _ContextFiles: React.FC<{ }> = ({ files, toolCallId, open: controlledOpen, onOpenChange }) => { const [internalOpen, setInternalOpen] = useState(false); const { queryPathThenOpenFile } = useEventsBusForIDE(); + const dispatch = useAppDispatch(); + + const handleOpenFile = useCallback( + async (file: { file_path: string; line?: number }) => { + if (file.file_path.startsWith("skill://")) { + const skillName = file.file_path.slice("skill://".length); + dispatch( + push({ name: "extensions", tab: "skills", itemId: skillName }), + ); + return; + } + if (file.file_path.startsWith("skills://")) { + dispatch(push({ name: "extensions", tab: "skills" })); + return; + } + await queryPathThenOpenFile(file); + }, + [dispatch, queryPathThenOpenFile], + ); const isControlled = controlledOpen !== undefined; const isOpen = isControlled ? controlledOpen : internalOpen; @@ -437,7 +456,7 @@ const _ContextFiles: React.FC<{ diff --git a/refact-agent/gui/src/components/ChatContent/QueuedMessage.tsx b/refact-agent/gui/src/components/ChatContent/QueuedMessage.tsx index c46c7ae40e..5882f6c97a 100644 --- a/refact-agent/gui/src/components/ChatContent/QueuedMessage.tsx +++ b/refact-agent/gui/src/components/ChatContent/QueuedMessage.tsx @@ -1,12 +1,17 @@ -import React, { useCallback } from "react"; -import { Flex, Text, IconButton, Card, Badge } from "@radix-ui/themes"; +import React, { useCallback, useState } from "react"; +import { Flex, Text, IconButton, Card, Badge, Tooltip } from "@radix-ui/themes"; import { Cross1Icon, ClockIcon, LightningBoltIcon, } from "@radix-ui/react-icons"; -import { QueuedItem } from "../../features/Chat"; +import type { QueuedItem } from "../../features/Chat"; import { useChatActions } from "../../hooks"; +import { useAppSelector } from "../../hooks"; +import { selectLspPort, selectApiKey } from "../../features/Config/configSlice"; +import { selectChatId } from "../../features/Chat/Thread/selectors"; +import { sendUserMessage } from "../../services/refact/chatCommands"; +import { setInputValue } from "../ChatForm/actions"; import styles from "./ChatContent.module.css"; import classNames from "classnames"; @@ -15,56 +20,180 @@ type QueuedMessageProps = { position: number; }; +function postInputValue(text: string, sendImmediately: boolean) { + window.postMessage( + setInputValue({ value: text, send_immediately: sendImmediately }), + window.location.origin || "*", + ); +} + export const QueuedMessage: React.FC = ({ queuedItem, position, }) => { const { cancelQueued } = useChatActions(); + const port = useAppSelector(selectLspPort); + const apiKey = useAppSelector(selectApiKey); + const chatId = useAppSelector(selectChatId); + const [isWorking, setIsWorking] = useState(false); + + const content = queuedItem.content ?? ""; + const isEditable = + queuedItem.command_type === "user_message" && content.length > 0; + + const handleCancel = useCallback(async () => { + if (isWorking) return; + setIsWorking(true); + try { + await cancelQueued(queuedItem.client_request_id); + } catch { + // ignore cancel errors + } finally { + setIsWorking(false); + } + }, [isWorking, cancelQueued, queuedItem.client_request_id]); + + const handleEdit = useCallback(async () => { + if (isWorking || !isEditable) return; + setIsWorking(true); + try { + const ok = await cancelQueued(queuedItem.client_request_id); + if (!ok) return; + postInputValue(content, queuedItem.priority); + } catch { + // ignore edit errors + } finally { + setIsWorking(false); + } + }, [ + isWorking, + isEditable, + cancelQueued, + queuedItem.client_request_id, + queuedItem.priority, + content, + ]); + + const handleEditKeyDown = useCallback( + (e: React.KeyboardEvent) => { + if (e.key === "Enter" || e.key === " ") { + e.preventDefault(); + void handleEdit(); + } + }, + [handleEdit], + ); + + const handleTogglePriority = useCallback(async () => { + if (isWorking || !isEditable || !chatId || !port) return; + setIsWorking(true); + try { + const ok = await cancelQueued(queuedItem.client_request_id); + if (!ok) return; + try { + await sendUserMessage( + chatId, + content, + port, + apiKey ?? undefined, + !queuedItem.priority, + ); + } catch { + postInputValue(content, queuedItem.priority); + } + } catch { + // ignore toggle errors + } finally { + setIsWorking(false); + } + }, [ + isWorking, + isEditable, + chatId, + port, + apiKey, + cancelQueued, + queuedItem.client_request_id, + queuedItem.priority, + content, + ]); - const handleCancel = useCallback(() => { - void cancelQueued(queuedItem.client_request_id); - }, [cancelQueued, queuedItem.client_request_id]); + const tooltipContent = content || queuedItem.preview; return ( - - - - - {queuedItem.priority ? ( - - ) : ( - + + + + + + {queuedItem.priority ? ( + + ) : ( + + )} + {position} + + void handleEdit() : undefined} + onKeyDown={isEditable ? handleEditKeyDown : undefined} + > + {queuedItem.preview || `[${queuedItem.command_type}]`} + + + + {isEditable && ( + void handleTogglePriority()} + title={ + queuedItem.priority + ? "Change to normal queue" + : "Change to send next" + } + > + {queuedItem.priority ? ( + + ) : ( + + )} + )} - {position} - - - {queuedItem.preview || `[${queuedItem.command_type}]`} - + void handleCancel()} + title="Cancel queued message" + > + + + - - - - - + + ); }; diff --git a/refact-agent/gui/src/components/ChatContent/SkillActivatedCard.module.css b/refact-agent/gui/src/components/ChatContent/SkillActivatedCard.module.css new file mode 100644 index 0000000000..7bdb5d85ee --- /dev/null +++ b/refact-agent/gui/src/components/ChatContent/SkillActivatedCard.module.css @@ -0,0 +1,16 @@ +.skillCard { + border-left: 2px solid var(--accent-6); + padding-left: var(--space-2); +} + +.skillText { + color: var(--accent-11); +} + +.skillName { + font-weight: 500; +} + +.body { + padding: var(--space-2) 0; +} diff --git a/refact-agent/gui/src/components/ChatContent/SkillActivatedCard.tsx b/refact-agent/gui/src/components/ChatContent/SkillActivatedCard.tsx new file mode 100644 index 0000000000..d09f687a95 --- /dev/null +++ b/refact-agent/gui/src/components/ChatContent/SkillActivatedCard.tsx @@ -0,0 +1,54 @@ +import React, { useMemo } from "react"; +import { LightningBoltIcon } from "@radix-ui/react-icons"; +import { Box, Text } from "@radix-ui/themes"; +import { ToolCard } from "./ToolCard/ToolCard"; +import { useStoredOpen } from "./useStoredOpen"; +import { Markdown } from "../Markdown"; +import styles from "./SkillActivatedCard.module.css"; + +interface SkillActivatedCardProps { + name: string; + body: string; + allowedTools: string[]; + modelOverride: string | null; +} + +export const SkillActivatedCard: React.FC = ({ + name, + body, + allowedTools, + modelOverride, +}) => { + const storeKey = `skill:${name}`; + const [isOpen, handleToggle] = useStoredOpen(storeKey, false); + + const meta = useMemo(() => { + const parts: string[] = []; + if (modelOverride) parts.push(modelOverride); + if (allowedTools.length > 0) + parts.push(`tools: ${allowedTools.join(", ")}`); + return parts.length > 0 ? parts.join(" · ") : undefined; + }, [allowedTools, modelOverride]); + + return ( + } + summary={ + + Skill active: {name} + + } + meta={meta} + status="success" + isOpen={isOpen} + onToggle={handleToggle} + className={styles.skillCard} + > + {body && ( + + {body} + + )} + + ); +}; diff --git a/refact-agent/gui/src/components/ChatContent/SkillsIndicator.module.css b/refact-agent/gui/src/components/ChatContent/SkillsIndicator.module.css new file mode 100644 index 0000000000..1c40f11863 --- /dev/null +++ b/refact-agent/gui/src/components/ChatContent/SkillsIndicator.module.css @@ -0,0 +1,16 @@ +.indicator { + height: 28px; + background: var(--gray-2); + border: 1px solid var(--gray-4); + border-radius: var(--radius-2); + padding: var(--space-1) var(--space-3); + margin: var(--space-1) 0; + cursor: pointer; + font-size: var(--font-size-1); + color: var(--gray-11); + box-sizing: border-box; +} + +.indicator:hover { + background: var(--gray-3); +} diff --git a/refact-agent/gui/src/components/ChatContent/SkillsIndicator.test.tsx b/refact-agent/gui/src/components/ChatContent/SkillsIndicator.test.tsx new file mode 100644 index 0000000000..22616b2bbc --- /dev/null +++ b/refact-agent/gui/src/components/ChatContent/SkillsIndicator.test.tsx @@ -0,0 +1,147 @@ +import { describe, test, expect } from "vitest"; +import { render } from "../../utils/test-utils"; +import { SkillsIndicator } from "./SkillsIndicator"; +import type { RootState } from "../../app/store"; + +function makeSkillsState(data: { + skills_available: number; + skills_included: string[]; + skills_enabled: boolean; + active_skill: string | null; +}): Partial { + return { + skillsStatusApi: { + queries: { + 'getSkillsStatus("test-chat-id")': { + status: "fulfilled", + data, + error: undefined, + endpointName: "getSkillsStatus", + requestId: "test", + startedTimeStamp: Date.now(), + fulfilledTimeStamp: Date.now(), + originalArgs: "test-chat-id", + }, + }, + mutations: {}, + provided: {}, + subscriptions: {}, + config: { + online: true, + focused: true, + middlewareRegistered: true, + refetchOnFocus: false, + refetchOnReconnect: false, + refetchOnMountOrArgChange: false, + keepUnusedDataFor: 60, + reducerPath: "skillsStatusApi", + invalidationBehavior: "delayed", + }, + }, + } as unknown as Partial; +} + +describe("SkillsIndicator", () => { + test("renders correctly with skills data", () => { + const preloadedState = makeSkillsState({ + skills_available: 5, + skills_included: ["review", "docs"], + skills_enabled: true, + active_skill: null, + }); + + const { getByRole, getByText } = render( + , + { preloadedState }, + ); + + const indicator = getByRole("button"); + expect(indicator).toBeTruthy(); + expect(getByText(/5 available/)).toBeTruthy(); + }); + + test("renders null when no skills available and no active skill", () => { + const preloadedState = makeSkillsState({ + skills_available: 0, + skills_included: [], + skills_enabled: false, + active_skill: null, + }); + + const { container } = render(, { + preloadedState, + }); + expect(container.querySelector('[role="button"]')).toBeNull(); + }); + + test("clicking navigates to extensions page", async () => { + const preloadedState = makeSkillsState({ + skills_available: 3, + skills_included: [], + skills_enabled: true, + active_skill: null, + }); + + const { getByRole, store, user } = render( + , + { preloadedState }, + ); + + const indicator = getByRole("button"); + await user.click(indicator); + + const pages = store.getState().pages; + const lastPage = pages[pages.length - 1]; + expect(lastPage).toEqual({ name: "extensions", tab: "skills" }); + }); + + test("renders active skill badge when active_skill is set", () => { + const preloadedState = makeSkillsState({ + skills_available: 3, + skills_included: [], + skills_enabled: true, + active_skill: "review-skill", + }); + + const { getByRole, getByText } = render( + , + { preloadedState }, + ); + + expect(getByRole("button")).toBeTruthy(); + expect(getByText("review-skill")).toBeTruthy(); + expect(getByText(/Active skill:/)).toBeTruthy(); + }); + + test("renders only available count when no active skill", () => { + const preloadedState = makeSkillsState({ + skills_available: 4, + skills_included: [], + skills_enabled: true, + active_skill: null, + }); + + const { getByRole, getByText, queryByText } = render( + , + { preloadedState }, + ); + + expect(getByRole("button")).toBeTruthy(); + expect(getByText(/Skills: 4 available/)).toBeTruthy(); + expect(queryByText(/Active skill:/)).toBeNull(); + }); + + test("renders nothing when no skills available and no active skill", () => { + const preloadedState = makeSkillsState({ + skills_available: 0, + skills_included: [], + skills_enabled: false, + active_skill: null, + }); + + const { container } = render(, { + preloadedState, + }); + expect(container.querySelector('[role="button"]')).toBeNull(); + }); +}); diff --git a/refact-agent/gui/src/components/ChatContent/SkillsIndicator.tsx b/refact-agent/gui/src/components/ChatContent/SkillsIndicator.tsx new file mode 100644 index 0000000000..46f23a3ec7 --- /dev/null +++ b/refact-agent/gui/src/components/ChatContent/SkillsIndicator.tsx @@ -0,0 +1,67 @@ +import React from "react"; +import { Badge, Flex, Text } from "@radix-ui/themes"; +import { useAppDispatch } from "../../hooks"; +import { push } from "../../features/Pages/pagesSlice"; +import { useSkillsStatus } from "../../hooks/useSkillsStatus"; +import styles from "./SkillsIndicator.module.css"; + +export type SkillsIndicatorProps = { + chatId: string; +}; + +export const SkillsIndicator: React.FC = ({ chatId }) => { + const dispatch = useAppDispatch(); + const { skillsAvailable, activeSkill } = useSkillsStatus(chatId); + + if (activeSkill === null && skillsAvailable === 0) { + return null; + } + + const handleClick = () => { + dispatch(push({ name: "extensions", tab: "skills" })); + }; + + const handleKeyDown = (event: React.KeyboardEvent) => { + if (event.key === "Enter" || event.key === " ") { + event.preventDefault(); + handleClick(); + } + }; + + return ( + + + 🧠 + + {activeSkill !== null ? ( + <> + + Active skill: + + + {activeSkill} + + {skillsAvailable > 0 && ( + + · {skillsAvailable} available + + )} + + ) : ( + + Skills: {skillsAvailable} available + + )} + + ); +}; diff --git a/refact-agent/gui/src/components/ChatContent/ToolsContent.tsx b/refact-agent/gui/src/components/ChatContent/ToolsContent.tsx index 79b1295760..4f232eaa0d 100644 --- a/refact-agent/gui/src/components/ChatContent/ToolsContent.tsx +++ b/refact-agent/gui/src/components/ChatContent/ToolsContent.tsx @@ -642,6 +642,17 @@ function processToolCalls( ); } + if (head.function.name === "activate_skill") { + return processToolCalls( + tail, + toolResults, + features, + processed, + contextFilesByToolId, + diffsByToolId, + ); + } + if (head.function.name === "web") { const elem = ( = ({ /> + @@ -545,7 +550,7 @@ export const ChatForm: React.FC = ({ isVoiceActive ? "Listening..." : commands.completions.length < 1 - ? "Type @ for commands" + ? "Type @ or / for commands" : "" } render={(props) => ( diff --git a/refact-agent/gui/src/components/ChatForm/useInputValue.ts b/refact-agent/gui/src/components/ChatForm/useInputValue.ts index 70b0da5703..301c53e45a 100644 --- a/refact-agent/gui/src/components/ChatForm/useInputValue.ts +++ b/refact-agent/gui/src/components/ChatForm/useInputValue.ts @@ -30,6 +30,15 @@ export function useInputValue( const handleEvent = useCallback( (event: MessageEvent) => { + const isSameWindowPost = + event.source === window && window.location.origin !== "null"; + const isSameOrigin = + window.location.origin !== "null" && + event.origin === window.location.origin; + if (isSameWindowPost && !isSameOrigin) { + return; + } + if (addInputValue.match(event.data) || setInputValue.match(event.data)) { const { payload } = event.data; debugRefact( diff --git a/refact-agent/gui/src/components/ChatHistory/ChatHistory.tsx b/refact-agent/gui/src/components/ChatHistory/ChatHistory.tsx deleted file mode 100644 index 88cccd24fb..0000000000 --- a/refact-agent/gui/src/components/ChatHistory/ChatHistory.tsx +++ /dev/null @@ -1,424 +0,0 @@ -import { memo, useState, useCallback, useRef, useEffect, useMemo } from "react"; -import { Flex, Box, Text, Spinner, Button } from "@radix-ui/themes"; -import { ChatLoading } from "../ChatContent/ChatLoading"; -import { ScrollArea } from "../ScrollArea"; -import { HistoryItem } from "./HistoryItem"; -import { HistoryItemCompact } from "./HistoryItemCompact"; -import { TaskItemCompact } from "./TaskItemCompact"; -import { - ChatHistoryItem, - HistoryTreeNode, - buildHistoryTree, - isTaskChatLike, -} from "../../features/History/historySlice"; -import type { TaskMeta } from "../../services/refact/tasks"; - -export type ChatHistoryProps = { - history: Record; - tasks?: TaskMeta[]; - isLoading?: boolean; - onHistoryItemClick: (id: ChatHistoryItem) => void; - onDeleteHistoryItem: (id: string) => void; - onRenameHistoryItem?: (id: string, newTitle: string) => void; - onOpenChatInTab?: (id: string) => void; - onTaskClick?: (taskId: string) => void; - onDeleteTask?: (taskId: string) => void; - onRenameTask?: (taskId: string, newName: string) => void; - currentChatId?: string; - treeView?: boolean; - compactView?: boolean; - onLoadMore?: () => void; - hasMore?: boolean; - isLoadingMore?: boolean; - loadMoreError?: string | null; - onRetryLoadMore?: () => void; - hasConnectionError?: boolean; - noScroll?: boolean; - scrollContainerRef?: React.RefObject; -}; - -type TreeNodeProps = { - node: HistoryTreeNode; - depth: number; - onHistoryItemClick: (id: ChatHistoryItem) => void; - onDeleteHistoryItem: (id: string) => void; - onRenameHistoryItem?: (id: string, newTitle: string) => void; - onOpenChatInTab?: (id: string) => void; - currentChatId?: string; - expandedIds: Set; - onToggleExpand: (id: string) => void; - compactView?: boolean; -}; - -function getBadgeForNode( - node: HistoryTreeNode, - depth: number, -): string | undefined { - const isTask = !!node.task_id; - const linkType = node.link_type; - const isHandoffParent = depth > 0 && !linkType && !isTask; - - if (isTask) { - return node.task_role === "planner" - ? "Planner" - : node.task_role === "agents" - ? "Agent" - : undefined; - } - if (linkType === "subagent") return "Subagent"; - if (linkType === "handoff") return "Handoff"; - if (linkType === "mode_transition") return "Mode Switch"; - if (linkType === "branch") return "Branched"; - if (isHandoffParent) return "Original"; - return undefined; -} - -const TreeNode = memo( - ({ - node, - depth, - onHistoryItemClick, - onDeleteHistoryItem, - onRenameHistoryItem, - onOpenChatInTab, - currentChatId, - expandedIds, - onToggleExpand, - compactView = false, - }: TreeNodeProps) => { - const hasChildren = node.children.length > 0; - const isExpanded = expandedIds.has(node.id); - const badge = getBadgeForNode(node, depth); - - return ( - - {compactView ? ( - onHistoryItemClick(node)} - onDelete={onDeleteHistoryItem} - onRename={onRenameHistoryItem} - disabled={node.id === currentChatId} - badge={badge} - childCount={hasChildren ? node.children.length : undefined} - isExpanded={isExpanded} - onToggleExpand={ - hasChildren ? () => onToggleExpand(node.id) : undefined - } - isChild={depth > 0} - /> - ) : ( - - onHistoryItemClick(node)} - onOpenInTab={onOpenChatInTab} - onDelete={onDeleteHistoryItem} - historyItem={node} - disabled={node.id === currentChatId} - badge={badge} - childCount={hasChildren ? node.children.length : undefined} - isExpanded={isExpanded} - onToggleExpand={ - hasChildren ? () => onToggleExpand(node.id) : undefined - } - /> - - )} - {hasChildren && isExpanded && ( - - {node.children.map((child) => ( - - ))} - - )} - - ); - }, -); - -TreeNode.displayName = "TreeNode"; - -type UnifiedItem = - | { type: "chat"; item: ChatHistoryItem } - | { type: "tree"; item: HistoryTreeNode } - | { type: "task"; item: TaskMeta }; - -function getActiveTasks(tasks: TaskMeta[] = []): TaskMeta[] { - return tasks.filter( - (t) => - t.status === "active" || t.status === "planning" || t.status === "paused", - ); -} - -function getUpdatedAt(item: UnifiedItem): string { - switch (item.type) { - case "chat": - case "tree": - return item.item.updatedAt; - case "task": - return item.item.updated_at; - } -} - -function getSortedUnifiedList( - history: Record, - tasks: TaskMeta[] = [], - useTree: boolean, - historyTree: HistoryTreeNode[], -): UnifiedItem[] { - const activeTasks = getActiveTasks(tasks); - - if (useTree) { - // In tree mode, merge tree root nodes with tasks - const treeItems: UnifiedItem[] = historyTree.map((item) => ({ - type: "tree" as const, - item, - })); - - const taskItems: UnifiedItem[] = activeTasks.map((item) => ({ - type: "task" as const, - item, - })); - - return [...treeItems, ...taskItems].sort((a, b) => - getUpdatedAt(b).localeCompare(getUpdatedAt(a)), - ); - } - - // In flat mode, merge chats with tasks - const chatItems: UnifiedItem[] = Object.values(history) - .filter((item) => !isTaskChatLike(item)) - .map((item) => ({ type: "chat" as const, item })); - - const taskItems: UnifiedItem[] = activeTasks.map((item) => ({ - type: "task" as const, - item, - })); - - return [...chatItems, ...taskItems].sort((a, b) => - getUpdatedAt(b).localeCompare(getUpdatedAt(a)), - ); -} - -function hasChildChatsInHistory( - history: Record, -): boolean { - return Object.values(history).some((item) => !!item.parent_id); -} - -export const ChatHistory = memo( - ({ - history, - tasks = [], - onHistoryItemClick, - onDeleteHistoryItem, - onRenameHistoryItem, - onOpenChatInTab, - onTaskClick, - onDeleteTask, - onRenameTask, - currentChatId, - treeView = false, - compactView = true, - isLoading = false, - onLoadMore, - hasMore = false, - isLoadingMore = false, - loadMoreError, - onRetryLoadMore, - hasConnectionError = false, - noScroll = false, - scrollContainerRef, - }: ChatHistoryProps) => { - const historyTree = useMemo(() => buildHistoryTree(history), [history]); - const hasChildChats = useMemo( - () => hasChildChatsInHistory(history), - [history], - ); - const showTree = treeView || hasChildChats; - const unifiedList = useMemo( - () => getSortedUnifiedList(history, tasks, showTree, historyTree), - [history, tasks, showTree, historyTree], - ); - const [expandedIds, setExpandedIds] = useState>(new Set()); - const loadMoreRef = useRef(null); - - const handleToggleExpand = useCallback((id: string) => { - setExpandedIds((prev) => { - const next = new Set(prev); - if (next.has(id)) { - next.delete(id); - } else { - next.add(id); - } - return next; - }); - }, []); - - useEffect(() => { - if (!onLoadMore || !hasMore || isLoadingMore) return; - - const loadMoreElement = loadMoreRef.current; - if (!loadMoreElement) return; - - // Find the scroll container - either passed ref or use viewport - const root = scrollContainerRef?.current ?? null; - - const observer = new IntersectionObserver( - (entries) => { - if (entries[0]?.isIntersecting) { - onLoadMore(); - } - }, - { - threshold: 0.1, - root, - }, - ); - - observer.observe(loadMoreElement); - - return () => { - observer.disconnect(); - }; - }, [onLoadMore, hasMore, isLoadingMore, scrollContainerRef]); - - const content = ( - 0 ? "center" : "start"} - pl="1" - pr="1" - gap="1" - direction="column" - > - {isLoading ? ( - - - - ) : unifiedList.length !== 0 ? ( - <> - {unifiedList.map((unified) => { - if (unified.type === "task") { - return ( - - onTaskClick?.(unified.item.id)} - onDelete={(id) => onDeleteTask?.(id)} - onRename={onRenameTask} - badge="Task" - /> - - ); - } - if (unified.type === "tree") { - return ( - - ); - } - // type === "chat" - return compactView ? ( - - onHistoryItemClick(unified.item)} - onDelete={onDeleteHistoryItem} - onRename={onRenameHistoryItem} - disabled={unified.item.id === currentChatId} - /> - - ) : ( - - onHistoryItemClick(unified.item)} - onOpenInTab={onOpenChatInTab} - onDelete={onDeleteHistoryItem} - historyItem={unified.item} - disabled={unified.item.id === currentChatId} - /> - - ); - })} - {loadMoreError && onRetryLoadMore && ( - - - {loadMoreError} - - - - )} - {hasMore && !loadMoreError && ( - - {isLoadingMore ? ( - - - - ) : ( - - )} - - )} - - ) : ( - - {hasConnectionError ? "Unable to load" : "No chats yet"} - - )} - - ); - - if (noScroll) { - return {content}; - } - - return ( - - {content} - - ); - }, -); - -ChatHistory.displayName = "ChatHistory"; diff --git a/refact-agent/gui/src/components/ChatHistory/HistoryItem.tsx b/refact-agent/gui/src/components/ChatHistory/HistoryItem.tsx deleted file mode 100644 index ecac85b054..0000000000 --- a/refact-agent/gui/src/components/ChatHistory/HistoryItem.tsx +++ /dev/null @@ -1,222 +0,0 @@ -import React, { useMemo } from "react"; -import { Card, Flex, Text, Box, Spinner, Badge } from "@radix-ui/themes"; -import { - ChatBubbleIcon, - ChevronDownIcon, - ChevronRightIcon, - PauseIcon, - CrossCircledIcon, - CheckCircledIcon, -} from "@radix-ui/react-icons"; -import { CloseButton } from "../Buttons/Buttons"; -import { IconButton } from "@radix-ui/themes"; -import { OpenInNewWindowIcon } from "@radix-ui/react-icons"; -import type { ChatHistoryItem } from "../../features/History/historySlice"; -import { - getTotalCostMeteringForMessages, - getTotalUsdMeteringForMessages, - formatUsd, -} from "../../utils/getMetering"; -import { Coin } from "../../images"; -import { getStatusFromSessionState } from "../../utils/sessionStatus"; - -export const HistoryItem: React.FC<{ - historyItem: ChatHistoryItem; - onClick: () => void; - onDelete: (id: string) => void; - onOpenInTab?: (id: string) => void; - disabled: boolean; - badge?: string; - childCount?: number; - isExpanded?: boolean; - onToggleExpand?: () => void; -}> = ({ - historyItem, - onClick, - onDelete, - onOpenInTab, - disabled, - badge, - childCount, - isExpanded, - onToggleExpand, -}) => { - const dateCreated = new Date(historyItem.createdAt); - const dateTimeString = dateCreated.toLocaleString(); - const totalCoins = useMemo(() => { - const totals = getTotalCostMeteringForMessages(historyItem.messages); - if (totals === null) return null; - const sum = - totals.metering_coins_cache_creation + - totals.metering_coins_cache_read + - totals.metering_coins_generated + - totals.metering_coins_prompt; - return sum > 0 ? sum : null; - }, [historyItem.messages]); - - const totalUsd = useMemo(() => { - const usd = getTotalUsdMeteringForMessages(historyItem.messages); - if (usd === null || usd.total_usd <= 0) return null; - return usd.total_usd; - }, [historyItem.messages]); - - const statusState = getStatusFromSessionState(historyItem.session_state); - const isWorking = statusState === "in_progress"; - const isPaused = statusState === "needs_attention"; - const isError = statusState === "error"; - const isCompleted = statusState === "completed"; - return ( - - - - - - {childCount !== undefined && onToggleExpand && ( - { - e.stopPropagation(); - onToggleExpand(); - }} - style={{ - cursor: "pointer", - padding: "4px 8px", - borderRadius: "0 0 4px 4px", - marginTop: "-2px", - background: "var(--gray-a3)", - }} - > - - - {childCount} related {childCount === 1 ? "chat" : "chats"} - - {isExpanded ? ( - - ) : ( - - )} - - - )} - - - {onOpenInTab && ( - { - event.preventDefault(); - event.stopPropagation(); - onOpenInTab(historyItem.id); - }} - variant="ghost" - > - - - )} - - { - event.preventDefault(); - event.stopPropagation(); - onDelete(historyItem.id); - }} - iconSize={10} - title="delete chat" - /> - - - ); -}; diff --git a/refact-agent/gui/src/components/ChatHistory/HistoryItemCompact.module.css b/refact-agent/gui/src/components/ChatHistory/HistoryItemCompact.module.css deleted file mode 100644 index 0bd9f9f1b0..0000000000 --- a/refact-agent/gui/src/components/ChatHistory/HistoryItemCompact.module.css +++ /dev/null @@ -1,238 +0,0 @@ -/* Container query context - apply to parent wrapper */ -.itemContainer { - container-type: inline-size; -} - -.item { - position: relative; - display: grid; - /* Columns: [chevronArea] [dot+badge] [title] [stats] [date] [actions] */ - grid-template-columns: 20px auto 1fr auto auto auto; - align-items: center; - gap: var(--space-2); - padding: var(--space-2) var(--space-2) var(--space-2) var(--space-2); - border-radius: var(--radius-2); - background: var(--gray-a2); - cursor: pointer; - transition: background-color 0.15s ease; - width: 100%; - min-height: 32px; -} - -.item:hover { - background: var(--gray-a4); -} - -.item.disabled { - opacity: 0.7; - cursor: default; - background: var(--gray-a3); -} - -.chevronArea { - display: flex; - align-items: center; - justify-content: center; - width: 20px; - min-width: 20px; -} - -.leftSection { - display: flex; - align-items: center; - gap: var(--space-2); - flex-shrink: 0; -} - -.modeBadge { - flex-shrink: 0; - max-width: 100px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -.titleSection { - display: flex; - align-items: center; - gap: var(--space-2); - min-width: 0; - overflow: hidden; -} - -.title { - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - min-width: 60px; /* Ensure at least some title is visible */ -} - -.stats { - display: flex; - align-items: center; - gap: var(--space-1); - color: var(--gray-11); - flex-shrink: 0; -} - -.messagesCount { - display: contents; -} - -.coinsStats { - display: contents; -} - -.diffStats { - display: contents; -} - -.taskProgress { - display: contents; -} - -.statsSeparator { - width: 1px; - height: 10px; - background: var(--gray-a6); - margin: 0 var(--space-1); - flex-shrink: 0; -} - -.failedCount { - flex-shrink: 0; -} - -.linesAdded { - color: var(--green-11); - flex-shrink: 0; -} - -.linesRemoved { - color: var(--red-11); - flex-shrink: 0; -} - -.date { - min-width: 50px; - text-align: right; - flex-shrink: 0; -} - -.actions { - display: flex; - align-items: center; - gap: var(--space-2); - flex-shrink: 0; - min-width: 48px; -} - -.actionButton { - opacity: 0.5; - flex-shrink: 0; - transition: opacity 0.15s ease; -} - -.actionButton:hover { - opacity: 1; -} - -.item:hover .actionButton { - opacity: 0.7; -} - -.item:hover .actionButton:hover { - opacity: 1; -} - -.editInput { - flex: 1; - min-width: 0; -} - -.expandChevron { - display: flex; - align-items: center; - justify-content: center; - width: 16px; - height: 16px; - color: var(--gray-11); - cursor: pointer; - border-radius: var(--radius-1); - transition: - background-color 0.15s ease, - color 0.15s ease; -} - -.expandChevron:hover { - background: var(--gray-a4); - color: var(--gray-12); -} - -/* Child items - subtle visual distinction without width-breaking indentation */ -.childItem { - background: transparent; -} - -.childItem:hover { - background: var(--gray-a3); -} - -/* For touch devices, always show actions */ -@media (hover: none) { - .actions { - opacity: 1; - } -} - -@container (max-width: 650px) { - .diffStats { - display: none; - } -} - -@container (max-width: 550px) { - .messagesCount { - display: none; - } -} - -@container (max-width: 500px) { - .modeBadge { - display: none; - } -} - -@container (max-width: 450px) { - .coinsStats { - display: none; - } -} - -@container (max-width: 380px) { - .date { - display: none; - } -} - -@container (max-width: 320px) { - .taskProgress { - display: none; - } -} - -@container (max-width: 280px) { - .actions { - display: none; - } -} - -/* Extreme narrow - hide chevron area too */ -@container (max-width: 200px) { - .chevronArea { - display: none; - } - .item { - grid-template-columns: auto 1fr; - } -} diff --git a/refact-agent/gui/src/components/ChatHistory/HistoryItemCompact.tsx b/refact-agent/gui/src/components/ChatHistory/HistoryItemCompact.tsx deleted file mode 100644 index f65eb8c798..0000000000 --- a/refact-agent/gui/src/components/ChatHistory/HistoryItemCompact.tsx +++ /dev/null @@ -1,411 +0,0 @@ -import React, { useState, useCallback } from "react"; -import { - Text, - IconButton, - TextField, - Badge, - HoverCard, -} from "@radix-ui/themes"; -import { - ChatBubbleIcon, - Pencil1Icon, - Cross1Icon, - CheckIcon, - ChevronDownIcon, - ChevronRightIcon, -} from "@radix-ui/react-icons"; -import { StatusDot } from "../StatusDot"; -import { Coin } from "../../images"; -import type { ChatHistoryItem } from "../../features/History/historySlice"; -import { - getStatusFromSessionState, - getStatusTooltip, -} from "../../utils/sessionStatus"; -import { CircularProgress } from "./CircularProgress"; -import { useGetChatModesQuery } from "../../services/refact/chatModes"; -import { getModeColor } from "../../utils/modeColors"; -import styles from "./HistoryItemCompact.module.css"; - -export interface HistoryItemCompactProps { - historyItem: ChatHistoryItem; - onClick: () => void; - onDelete: (id: string) => void; - onRename?: (id: string, newTitle: string) => void; - disabled: boolean; - badge?: string; - childCount?: number; - isExpanded?: boolean; - onToggleExpand?: () => void; - isChild?: boolean; -} - -function formatDateTime(dateString: string): string { - const date = new Date(dateString); - const now = new Date(); - const diffMs = now.getTime() - date.getTime(); - const diffDays = Math.floor(diffMs / (1000 * 60 * 60 * 24)); - - if (diffDays === 0) { - return date.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }); - } - if (diffDays === 1) { - return "Yesterday"; - } - if (diffDays < 7) { - return date.toLocaleDateString([], { weekday: "short" }); - } - return date.toLocaleDateString([], { month: "short", day: "numeric" }); -} - -function formatCoins(coins: number): string { - if (coins >= 1000000) { - return `${(coins / 1000000).toFixed(1)}M`; - } - if (coins >= 1000) { - return `${(coins / 1000).toFixed(1)}K`; - } - if (coins >= 1) { - return coins.toFixed(0); - } - return coins.toFixed(2); -} - -interface TooltipButtonProps { - onClick: (e: React.MouseEvent) => void; - tooltip: string; - children: React.ReactNode; - className?: string; -} - -const TooltipButton: React.FC = ({ - onClick, - tooltip, - children, - className, -}) => ( - - - - {children} - - - - - {tooltip} - - - -); - -export const HistoryItemCompact: React.FC = ({ - historyItem, - onClick, - onDelete, - onRename, - disabled, - badge, - childCount, - isExpanded, - onToggleExpand, - isChild = false, -}) => { - const [isEditing, setIsEditing] = useState(false); - const [editValue, setEditValue] = useState(historyItem.title); - const { data: modesData } = useGetChatModesQuery(undefined); - const statusState = getStatusFromSessionState(historyItem.session_state); - const statusTooltip = getStatusTooltip(historyItem.session_state); - - const modeId = historyItem.mode; - const modeInfo = modesData?.modes.find((m) => m.id === modeId); - const modeTitle = modeInfo?.title; - const dateTimeString = formatDateTime(historyItem.updatedAt); - const messageCount = historyItem.message_count ?? historyItem.messages.length; - const totalCoins = historyItem.total_coins; - const linesAdded = historyItem.total_lines_added ?? 0; - const linesRemoved = historyItem.total_lines_removed ?? 0; - const hasLineChanges = linesAdded > 0 || linesRemoved > 0; - const hasChildren = childCount !== undefined && childCount > 0; - const taskProgress = - historyItem.tasks_total && historyItem.tasks_total > 0 - ? { - done: historyItem.tasks_done ?? 0, - total: historyItem.tasks_total, - failed: historyItem.tasks_failed ?? 0, - } - : null; - - const handleStartEdit = useCallback( - (e: React.MouseEvent) => { - e.preventDefault(); - e.stopPropagation(); - setEditValue(historyItem.title); - setIsEditing(true); - }, - [historyItem.title], - ); - - const handleCancelEdit = useCallback( - (e: React.MouseEvent) => { - e.preventDefault(); - e.stopPropagation(); - setIsEditing(false); - setEditValue(historyItem.title); - }, - [historyItem.title], - ); - - const handleConfirmEdit = useCallback( - (e: React.MouseEvent) => { - e.preventDefault(); - e.stopPropagation(); - if (editValue.trim() && onRename) { - onRename(historyItem.id, editValue.trim()); - } - setIsEditing(false); - }, - [editValue, historyItem.id, onRename], - ); - - const handleKeyDown = useCallback( - (e: React.KeyboardEvent) => { - if (e.key === "Enter") { - e.preventDefault(); - if (editValue.trim() && onRename) { - onRename(historyItem.id, editValue.trim()); - } - setIsEditing(false); - } else if (e.key === "Escape") { - setIsEditing(false); - setEditValue(historyItem.title); - } - }, - [editValue, historyItem.id, historyItem.title, onRename], - ); - - const handleDelete = useCallback( - (e: React.MouseEvent) => { - e.preventDefault(); - e.stopPropagation(); - onDelete(historyItem.id); - }, - [historyItem.id, onDelete], - ); - - const handleClick = useCallback(() => { - if (!isEditing && !disabled) { - onClick(); - } - }, [isEditing, disabled, onClick]); - - const handleRowKeyDown = useCallback( - (e: React.KeyboardEvent) => { - if (e.target !== e.currentTarget) return; - if (disabled) return; - if ((e.key === "Enter" || e.key === " ") && !isEditing) { - e.preventDefault(); - onClick(); - } - }, - [disabled, isEditing, onClick], - ); - - const handleToggleExpand = useCallback( - (e: React.MouseEvent) => { - e.preventDefault(); - e.stopPropagation(); - onToggleExpand?.(); - }, - [onToggleExpand], - ); - - const handleChevronKeyDown = useCallback( - (e: React.KeyboardEvent) => { - if (e.key === "Enter" || e.key === " ") { - e.preventDefault(); - e.stopPropagation(); - onToggleExpand?.(); - } - }, - [onToggleExpand], - ); - - const itemClasses = [ - styles.item, - disabled ? styles.disabled : "", - isChild ? styles.childItem : "", - ] - .filter(Boolean) - .join(" "); - - const chevronTooltip = `${childCount} related ${ - childCount === 1 ? "chat" : "chats" - }`; - - return ( -
-
-
- {hasChildren && onToggleExpand && ( - - -
- {isExpanded ? ( - - ) : ( - - )} -
- - - - {chevronTooltip} - - - - )} -
- -
- - {modeTitle && modeTitle.toLowerCase() !== badge?.toLowerCase() && ( - - {modeTitle} - - )} - {badge && ( - - {badge} - - )} -
- -
- {isEditing ? ( - setEditValue(e.target.value)} - onKeyDown={handleKeyDown} - onClick={(e) => e.stopPropagation()} - autoFocus - className={styles.editInput} - /> - ) : ( - - {historyItem.title} - - )} -
- -
- - - - {messageCount} - - - {totalCoins !== undefined && totalCoins > 0 && ( - - - - - {formatCoins(totalCoins)} - - - )} - {hasLineChanges && ( - - - - +{linesAdded} - - - -{linesRemoved} - - - )} - {taskProgress && ( - - - - - )} -
- - - {dateTimeString} - - -
- {isEditing ? ( - <> - - - - - - - - ) : ( - <> - {onRename && ( - - - - )} - - - - - )} -
-
-
- ); -}; diff --git a/refact-agent/gui/src/components/ChatHistory/TaskItemCompact.tsx b/refact-agent/gui/src/components/ChatHistory/TaskItemCompact.tsx deleted file mode 100644 index 8d4f5d781e..0000000000 --- a/refact-agent/gui/src/components/ChatHistory/TaskItemCompact.tsx +++ /dev/null @@ -1,284 +0,0 @@ -import React, { useState, useCallback } from "react"; -import { - Text, - IconButton, - TextField, - HoverCard, - Badge, -} from "@radix-ui/themes"; -import { Cross1Icon, Pencil1Icon, CheckIcon } from "@radix-ui/react-icons"; -import { StatusDot } from "../StatusDot"; -import { getTaskStatusDotState } from "../../utils/sessionStatus"; -import { CircularProgress } from "./CircularProgress"; -import type { TaskMeta } from "../../services/refact/tasks"; -import styles from "./HistoryItemCompact.module.css"; - -export interface TaskItemCompactProps { - task: TaskMeta; - onClick: () => void; - onDelete: (id: string) => void; - onRename?: (id: string, newName: string) => void; - badge?: string; -} - -function getTaskTooltip(task: TaskMeta): string { - const plannerState = task.planner_session_state; - - if (plannerState === "generating" || plannerState === "executing_tools") { - return "Planner is working..."; - } - if (plannerState === "paused" || plannerState === "waiting_ide") { - return "Waiting for confirmation"; - } - if (plannerState === "error") { - return "Planner error"; - } - if (task.status === "abandoned") { - return "Task failed"; - } - if (task.status === "completed") { - return "Task completed"; - } - if (task.agents_active > 0) { - return `${task.agents_active} agent${ - task.agents_active > 1 ? "s" : "" - } working...`; - } - if (task.status === "paused") { - return "Task paused"; - } - return "Task active"; -} - -function formatDateTime(dateString: string): string { - const date = new Date(dateString); - const now = new Date(); - const diffMs = now.getTime() - date.getTime(); - const diffDays = Math.floor(diffMs / (1000 * 60 * 60 * 24)); - - if (diffDays === 0) { - return date.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }); - } - if (diffDays === 1) { - return "Yesterday"; - } - if (diffDays < 7) { - return date.toLocaleDateString([], { weekday: "short" }); - } - return date.toLocaleDateString([], { month: "short", day: "numeric" }); -} - -interface TooltipButtonProps { - onClick: (e: React.MouseEvent) => void; - tooltip: string; - children: React.ReactNode; - className?: string; -} - -const TooltipButton: React.FC = ({ - onClick, - tooltip, - children, - className, -}) => ( - - - - {children} - - - - - {tooltip} - - - -); - -export const TaskItemCompact: React.FC = ({ - task, - onClick, - onDelete, - onRename, - badge, -}) => { - const [isEditing, setIsEditing] = useState(false); - const [editValue, setEditValue] = useState(task.name); - const statusState = getTaskStatusDotState(task); - const tooltipText = getTaskTooltip(task); - const dateTimeString = formatDateTime(task.updated_at); - - const handleStartEdit = useCallback( - (e: React.MouseEvent) => { - e.preventDefault(); - e.stopPropagation(); - setEditValue(task.name); - setIsEditing(true); - }, - [task.name], - ); - - const handleCancelEdit = useCallback( - (e: React.MouseEvent) => { - e.preventDefault(); - e.stopPropagation(); - setIsEditing(false); - setEditValue(task.name); - }, - [task.name], - ); - - const handleConfirmEdit = useCallback( - (e: React.MouseEvent) => { - e.preventDefault(); - e.stopPropagation(); - if (editValue.trim() && onRename) { - onRename(task.id, editValue.trim()); - } - setIsEditing(false); - }, - [editValue, task.id, onRename], - ); - - const handleKeyDown = useCallback( - (e: React.KeyboardEvent) => { - if (e.key === "Enter") { - e.preventDefault(); - if (editValue.trim() && onRename) { - onRename(task.id, editValue.trim()); - } - setIsEditing(false); - } else if (e.key === "Escape") { - setIsEditing(false); - setEditValue(task.name); - } - }, - [editValue, task.id, task.name, onRename], - ); - - const handleDelete = useCallback( - (e: React.MouseEvent) => { - e.preventDefault(); - e.stopPropagation(); - onDelete(task.id); - }, - [task.id, onDelete], - ); - - const handleClick = useCallback(() => { - if (!isEditing) { - onClick(); - } - }, [isEditing, onClick]); - - const handleRowKeyDown = useCallback( - (e: React.KeyboardEvent) => { - if (e.target !== e.currentTarget) return; - if ((e.key === "Enter" || e.key === " ") && !isEditing) { - e.preventDefault(); - onClick(); - } - }, - [isEditing, onClick], - ); - - return ( -
-
-
- -
- - {badge && ( - - {badge} - - )} -
- -
- {isEditing ? ( - setEditValue(e.target.value)} - onKeyDown={handleKeyDown} - onClick={(e) => e.stopPropagation()} - autoFocus - className={styles.editInput} - /> - ) : ( - - {task.name} - - )} -
- -
- -
- - - {dateTimeString} - - -
- {isEditing ? ( - <> - - - - - - - - ) : ( - <> - {onRename && ( - - - - )} - - - - - )} -
-
-
- ); -}; diff --git a/refact-agent/gui/src/components/ChatHistory/index.tsx b/refact-agent/gui/src/components/ChatHistory/index.tsx deleted file mode 100644 index 971e32e707..0000000000 --- a/refact-agent/gui/src/components/ChatHistory/index.tsx +++ /dev/null @@ -1,7 +0,0 @@ -export { ChatHistory, type ChatHistoryProps } from "./ChatHistory"; -export { HistoryItem } from "./HistoryItem"; -export { - HistoryItemCompact, - type HistoryItemCompactProps, -} from "./HistoryItemCompact"; -export { TaskItemCompact, type TaskItemCompactProps } from "./TaskItemCompact"; diff --git a/refact-agent/gui/src/components/ChatHistory/CircularProgress.tsx b/refact-agent/gui/src/components/CircularProgress/CircularProgress.tsx similarity index 100% rename from refact-agent/gui/src/components/ChatHistory/CircularProgress.tsx rename to refact-agent/gui/src/components/CircularProgress/CircularProgress.tsx diff --git a/refact-agent/gui/src/components/ComboBox/ComboBox.module.css b/refact-agent/gui/src/components/ComboBox/ComboBox.module.css index ce9f342025..da4bdbadcd 100644 --- a/refact-agent/gui/src/components/ComboBox/ComboBox.module.css +++ b/refact-agent/gui/src/components/ComboBox/ComboBox.module.css @@ -2,10 +2,7 @@ position: relative; z-index: 50; min-width: 180px; - /* max-width: 280px; */ - /* JB doesn't support dvw */ - max-width: 50vw; - max-width: 50dvw; + max-width: 400px; border-radius: max(var(--radius-2), var(--radius-full)); /* Force GPU compositing to fix JCEF repaint issues in JetBrains IDEs */ transform: translateZ(0); @@ -40,6 +37,8 @@ .combobox__item { display: flex; - align-items: flex-start !important; - flex-direction: column !important; + align-items: center !important; + flex-direction: row !important; + width: 100%; + overflow: hidden; } diff --git a/refact-agent/gui/src/components/ComboBox/ComboBox.test.tsx b/refact-agent/gui/src/components/ComboBox/ComboBox.test.tsx index 7f61243a31..1b3983b15b 100644 --- a/refact-agent/gui/src/components/ComboBox/ComboBox.test.tsx +++ b/refact-agent/gui/src/components/ComboBox/ComboBox.test.tsx @@ -491,3 +491,187 @@ describe("ComboBox", () => { // expect(textarea.textContent).toEqual(""); // }); }); + +const SlashApp = (props: Partial) => { + const [value, setValue] = React.useState(props.value ?? ""); + const [commands, setCommands] = React.useState({ + completions: [], + replace: [0, 0], + is_cmd_executable: false, + }); + + // eslint-disable-next-line react-hooks/exhaustive-deps + const fakeRequestCommands = React.useCallback( + useDebounceCallback( + (query: string, cursor: number) => { + if (query === "/" && cursor === 1) { + setCommands({ + completions: ["/optimize", "/review"], + completion_details: { + "/optimize": { + description: "Optimize code for performance", + argument_hint: "[file-path]", + source: "project_refact", + kind: "cmd", + }, + "/review": { + description: "Review code for issues", + source: "global_refact", + kind: "skill", + }, + }, + replace: [0, cursor], + is_cmd_executable: false, + }); + return; + } + + if (query === "/opt" && cursor === 4) { + setCommands({ + completions: ["/optimize"], + completion_details: { + "/optimize": { + description: "Optimize code for performance", + argument_hint: "[file-path]", + source: "project_refact", + kind: "cmd", + }, + }, + replace: [0, cursor], + is_cmd_executable: false, + }); + return; + } + + if (query === "@" && cursor === 1) { + setCommands({ + completions: defaultCommands, + replace: [0, cursor], + is_cmd_executable: false, + }); + return; + } + + setCommands({ + completions: [], + replace: [-1, -1], + is_cmd_executable: false, + }); + }, + 0, + { leading: true }, + ), + [], + ); + + const defaultProps: ComboBoxProps = { + commands, + requestCommandsCompletion: fakeRequestCommands, + onSubmit: () => ({}), + value: value, + onChange: setValue, + placeholder: "Type @ or / for commands", + render: (props: TextAreaProps) =>