Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e349a35716 | ||
|
|
f1f58b9996 | ||
|
|
f4c02fd64e | ||
|
|
e982cbeb04 | ||
|
|
20ce81a6be | ||
|
|
21e3ccc891 |
@@ -1,3 +1,24 @@
|
||||
## [1.20.2](https://github.com/asepharyana/zesdex/compare/v1.20.1...v1.20.2) (2026-08-28)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **agent:** recall search + memory_dir fallback + bersihkan dead llm_client ([f1f58b9](https://github.com/asepharyana/zesdex/commit/f1f58b9996f8eb58871d44fdd41c2d863874f253))
|
||||
|
||||
## [1.20.1](https://github.com/asepharyana/zesdex/compare/v1.20.0...v1.20.1) (2026-08-28)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **agent:** subagent patuhi tool-calling contract + truncation char-safe ([e982cbe](https://github.com/asepharyana/zesdex/commit/e982cbeb041baea9cd500e2a29862a7eca9e6e17))
|
||||
|
||||
# [1.20.0](https://github.com/asepharyana/zesdex/compare/v1.19.6...v1.20.0) (2026-08-28)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **agent:** subagent tool paralel + auto-load AGENTS.md + verify cek setelah edit ([21e3ccc](https://github.com/asepharyana/zesdex/commit/21e3ccc891ab886044a5f0a770db710769d1287b))
|
||||
|
||||
## [1.19.6](https://github.com/asepharyana/zesdex/compare/v1.19.5...v1.19.6) (2026-08-27)
|
||||
|
||||
|
||||
|
||||
Generated
+11
-11
@@ -4862,7 +4862,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zesdex-api"
|
||||
version = "1.19.4"
|
||||
version = "1.20.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"argon2",
|
||||
@@ -4885,7 +4885,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zesdex-application"
|
||||
version = "1.19.4"
|
||||
version = "1.20.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64",
|
||||
@@ -4903,7 +4903,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zesdex-bootstrap"
|
||||
version = "1.19.4"
|
||||
version = "1.20.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
@@ -4920,7 +4920,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zesdex-daemon"
|
||||
version = "1.19.4"
|
||||
version = "1.20.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64",
|
||||
@@ -4944,7 +4944,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zesdex-domain"
|
||||
version = "1.19.4"
|
||||
version = "1.20.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64",
|
||||
@@ -4960,7 +4960,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zesdex-gateway"
|
||||
version = "1.19.4"
|
||||
version = "1.20.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"axum",
|
||||
@@ -4987,7 +4987,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zesdex-grpc"
|
||||
version = "1.19.4"
|
||||
version = "1.20.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"axum",
|
||||
@@ -5004,7 +5004,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zesdex-infrastructure"
|
||||
version = "1.19.4"
|
||||
version = "1.20.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"argon2",
|
||||
@@ -5052,7 +5052,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zesdex-tui"
|
||||
version = "1.19.4"
|
||||
version = "1.20.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64",
|
||||
@@ -5078,7 +5078,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zesdex-web"
|
||||
version = "1.19.4"
|
||||
version = "1.20.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"axum",
|
||||
@@ -5098,7 +5098,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zesdex-ws"
|
||||
version = "1.19.4"
|
||||
version = "1.20.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"axum",
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ members = [
|
||||
]
|
||||
|
||||
[workspace.package]
|
||||
version = "1.19.6"
|
||||
version = "1.20.2"
|
||||
edition = "2021"
|
||||
authors = ["asepharyana <superaseph@gmail.com>"]
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ use tracing::{debug, info, warn};
|
||||
|
||||
use zesdex_domain::agent::{AgentTurnParams, TurnEvent};
|
||||
use zesdex_domain::core::{ChatMessage, StreamEvent, ToolDef};
|
||||
use zesdex_domain::main_agent_prompt;
|
||||
use zesdex_domain::main_agent_prompt_with_project_context;
|
||||
|
||||
use super::ToolExecutor;
|
||||
use crate::ports::ProviderService;
|
||||
@@ -111,6 +111,46 @@ fn conversation_chars(messages: &[ChatMessage]) -> usize {
|
||||
.sum()
|
||||
}
|
||||
|
||||
/// The maximum combined size (characters) of project-rule files injected into
|
||||
/// the system prompt, so a huge AGENTS.md cannot blow the context window.
|
||||
const PROJECT_CONTEXT_MAX_CHARS: usize = 12_000;
|
||||
|
||||
/// Case-insensitive rule filenames auto-loaded from the workspace root into
|
||||
/// the system prompt, matching the Claude-Code/AGENTS.md convention.
|
||||
const RULE_FILENAMES: [&str; 6] = [
|
||||
"AGENTS.md",
|
||||
"agent.md",
|
||||
"CLAUDE.md",
|
||||
"claude.md",
|
||||
".cursorrules",
|
||||
".zesdexrules",
|
||||
];
|
||||
|
||||
/// Build a compact "project context" block from the repo's convention files
|
||||
/// (AGENTS.md, CLAUDE.md, .cursorrules, …) found at the workspace root.
|
||||
///
|
||||
/// Follows the Claude-Code convention of loading AGENTS.md at startup so the
|
||||
/// model starts each turn with the repo's rules. Reads are best-effort and
|
||||
/// capped at [`PROJECT_CONTEXT_MAX_CHARS`] total; missing files are skipped.
|
||||
fn build_project_context(root: &std::path::Path) -> String {
|
||||
let mut ctx = String::new();
|
||||
for file in RULE_FILENAMES {
|
||||
let full = root.join(file);
|
||||
if let Ok(content) = std::fs::read_to_string(&full) {
|
||||
ctx.push_str(&format!("\n### {file}\n```\n{}\n```", content.trim()));
|
||||
}
|
||||
}
|
||||
let context = ctx.trim().to_string();
|
||||
if context.len() <= PROJECT_CONTEXT_MAX_CHARS {
|
||||
return context;
|
||||
}
|
||||
context
|
||||
.chars()
|
||||
.take(PROJECT_CONTEXT_MAX_CHARS)
|
||||
.collect::<String>()
|
||||
+ "\n...[project context truncated]"
|
||||
}
|
||||
|
||||
/// Track repeated tool-call errors so the loop can recover instead of
|
||||
/// burning iterations retrying the same failing tool.
|
||||
#[derive(Default)]
|
||||
@@ -341,9 +381,17 @@ impl<P: ProviderService, T: ToolExecutor> super::AgentTurnService for AgentTurnS
|
||||
|
||||
// Insert system prompt at position 0 once and keep it there for the
|
||||
// entire turn, avoiding per-iteration clones of the full message list.
|
||||
// Auto-load repo conventions (AGENTS.md / CLAUDE.md / .cursorrules)
|
||||
// from the first workspace root, like Claude Code does at startup.
|
||||
let project_context = params
|
||||
.workspace_roots
|
||||
.first()
|
||||
.map(|root| build_project_context(root))
|
||||
.unwrap_or_default();
|
||||
let system_prompt = main_agent_prompt_with_project_context(&project_context);
|
||||
params
|
||||
.messages
|
||||
.insert(0, ChatMessage::system(main_agent_prompt()));
|
||||
.insert(0, ChatMessage::system(system_prompt));
|
||||
let original_count = params.messages.len();
|
||||
|
||||
// Estimate request complexity from the last user message.
|
||||
|
||||
@@ -41,10 +41,43 @@ architectural plans and `todowrite` to maintain granular task checklists.
|
||||
4. TOOL EXECUTION: Execute individual tools (file edits, terminal commands) \
|
||||
within or guided by your workflows. If an error occurs, analyse and fix it.
|
||||
|
||||
VERIFY AFTER EDIT (CLAUDE-CODE STYLE):
|
||||
- After modifying code (edit/write), run the repo's check command via `bash` \
|
||||
before ending the turn: `cargo check` / `cargo clippy` / `cargo test` for Rust, \
|
||||
or the equivalent lint/test (`bun run lint && bun run test`, `npm test`, etc.) \
|
||||
for other stacks. Pick the project's actual verify command (see PROJECT \
|
||||
CONTEXT / AGENTS.md when present).
|
||||
- If the check fails, fix the errors you can see and re-run; only end the turn \
|
||||
after the check passes or you cannot resolve a failure yourself (then report it \
|
||||
explicitly).
|
||||
- Do NOT claim code compiles or works without running a real check.
|
||||
|
||||
Respond conversationally, concisely, and helpfully."
|
||||
.to_string()
|
||||
}
|
||||
|
||||
/// Build the main-agent system prompt including an injected block of project
|
||||
/// context (AGENTS.md / CLAUDE.md / project rules).
|
||||
///
|
||||
/// Like Claude Code, which loads AGENTS.md at startup so the model starts with
|
||||
/// the repo's conventions, this wraps [`main_agent_prompt`] and appends a
|
||||
/// clearly-delimited `## PROJECT CONTEXT` section carrying the rules the user
|
||||
/// keeps next to their code. When `project_context` is empty the returned
|
||||
/// prompt is identical to [`main_agent_prompt`], so callers can fall back
|
||||
/// safely.
|
||||
pub fn main_agent_prompt_with_project_context(project_context: &str) -> String {
|
||||
let base = main_agent_prompt();
|
||||
let context = project_context.trim();
|
||||
if context.is_empty() {
|
||||
return base;
|
||||
}
|
||||
format!(
|
||||
"{base}\n\n\
|
||||
## PROJECT CONTEXT (repo rules — follow these conventions)\n\
|
||||
{context}"
|
||||
)
|
||||
}
|
||||
|
||||
/// Build a subagent directive prompt.
|
||||
///
|
||||
/// The directive is embedded in a system message that also communicates the
|
||||
@@ -119,6 +152,25 @@ mod tests {
|
||||
assert!(prompt.contains("WORKFLOW FIRST"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn project_context_prompt_appends_context_and_keeps_base() {
|
||||
let base = main_agent_prompt();
|
||||
let with_ctx = main_agent_prompt_with_project_context("## AGENTS.md\nUse cargo clippy.");
|
||||
assert!(with_ctx.contains("Zesdex"), "base prompt must be preserved");
|
||||
assert!(with_ctx.contains("PROJECT CONTEXT"));
|
||||
assert!(with_ctx.contains("Use cargo clippy."));
|
||||
assert!(with_ctx.contains(&base));
|
||||
// The base section should appear before the context section.
|
||||
assert!(with_ctx.find("PROJECT CONTEXT").unwrap() > with_ctx.find("Zesdex").unwrap());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn empty_project_context_returns_base_prompt() {
|
||||
let base = main_agent_prompt();
|
||||
assert_eq!(main_agent_prompt_with_project_context(""), base);
|
||||
assert_eq!(main_agent_prompt_with_project_context(" "), base);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn subagent_directive_includes_directive_text() {
|
||||
let prompt = subagent_directive("test directive", "/home", "/home/project");
|
||||
|
||||
@@ -58,6 +58,9 @@ pub use agent::*;
|
||||
// Sub-module items need explicit re-exports
|
||||
pub use agent::defaults::*;
|
||||
pub use agent::progress::AgentProgress;
|
||||
pub use agent::prompt::{compaction_prompt, main_agent_prompt, subagent_directive};
|
||||
pub use agent::prompt::{
|
||||
compaction_prompt, main_agent_prompt, main_agent_prompt_with_project_context,
|
||||
subagent_directive,
|
||||
};
|
||||
pub use subagent::*;
|
||||
pub use workflow::*;
|
||||
|
||||
@@ -130,7 +130,7 @@ pub fn spawn_background_review(
|
||||
);
|
||||
format!(
|
||||
"{}...\n[diff truncated at {} characters]",
|
||||
&diff[..MAX_DIFF_CHARS],
|
||||
crate::utils::truncate_chars(&diff, MAX_DIFF_CHARS),
|
||||
MAX_DIFF_CHARS
|
||||
)
|
||||
} else {
|
||||
|
||||
@@ -14,7 +14,8 @@ use tracing::{debug, info, instrument};
|
||||
use crate::llm::provider::LlmClient;
|
||||
use crate::subagent::context::SubagentContext;
|
||||
use crate::subagent::division::{tools_for, AccessTier};
|
||||
use crate::tools::{tool_defs, ToolCtx};
|
||||
use crate::tools::{tool_defs, Tool, ToolCtx};
|
||||
use serde_json::Value;
|
||||
use zesdex_domain::agent::progress::AgentProgress;
|
||||
use zesdex_domain::core::tool_call::sanitize_tool_arguments;
|
||||
use zesdex_domain::core::ChatMessage;
|
||||
@@ -31,6 +32,95 @@ const TOOL_OUTPUT_MAX_CHARS: usize = 12_000;
|
||||
/// recovery note steering the model to a different approach.
|
||||
const MAX_CONSECUTIVE_TOOL_ERRORS: usize = 3;
|
||||
|
||||
/// Maximum number of read-only tool calls executed concurrently in a single
|
||||
/// subagent batch. Read-only tools (read/grep/glob/…) block on disk I/O, so
|
||||
/// running them on parallel OS threads removes the serial round-trip latency
|
||||
/// for a batch of independent lookups, mirroring the main turn loop.
|
||||
const MAX_PARALLEL_TOOLS: usize = 8;
|
||||
|
||||
/// Execute a batch of tool calls, running read-only tools concurrently when
|
||||
/// the whole batch is parallel-safe.
|
||||
///
|
||||
/// Returns one `(tool_call_id, tool_name, result)` per call **in the original
|
||||
/// call order** (OpenAI/Anthropic tool-result ordering contract). `Tool::run`
|
||||
/// is synchronous, so real parallelism comes from scoped OS threads; `Tool`
|
||||
/// and `ToolCtx` are `Send + Sync`, so the borrowed references can be shared
|
||||
/// across the short-lived scoped threads.
|
||||
///
|
||||
/// If any single tool in the batch mutates state (edit/write/bash/git/…), the
|
||||
/// whole batch falls back to the safe sequential path so writes never race.
|
||||
fn execute_tool_batch(
|
||||
tools: &[Box<dyn Tool>],
|
||||
tool_ctx: &ToolCtx,
|
||||
tool_calls: &[zesdex_domain::core::ToolCall],
|
||||
) -> Vec<(String, String, String)> {
|
||||
let parallel = tool_calls.len() > 1
|
||||
&& tool_calls
|
||||
.iter()
|
||||
.all(|tc| crate::tools::tool_is_parallel_safe(&tc.function.name));
|
||||
|
||||
if !parallel {
|
||||
// Sequential fallback (kept identical to the historical behavior).
|
||||
return tool_calls
|
||||
.iter()
|
||||
.map(|tc| {
|
||||
let tool_name = tc.function.name.clone();
|
||||
let args = sanitize_tool_arguments(&tc.function.arguments);
|
||||
let result = run_one_tool(tools, tool_ctx, &tool_name, &args);
|
||||
(tc.id.clone(), tool_name, result)
|
||||
})
|
||||
.collect();
|
||||
}
|
||||
|
||||
// Bounded parallel path: process the batch in windows of
|
||||
// `MAX_PARALLEL_TOOLS` so concurrency stays bounded, joining each window
|
||||
// before the next so results stay in original order.
|
||||
let mut ordered = Vec::with_capacity(tool_calls.len());
|
||||
for window in tool_calls.chunks(MAX_PARALLEL_TOOLS) {
|
||||
let window_results = std::thread::scope(|s| {
|
||||
let handles: Vec<_> = window
|
||||
.iter()
|
||||
.map(|tc| {
|
||||
let tool_name = tc.function.name.clone();
|
||||
let args = sanitize_tool_arguments(&tc.function.arguments);
|
||||
s.spawn(move || {
|
||||
debug!("Subagent executing tool: {tool_name}");
|
||||
run_one_tool(tools, tool_ctx, &tool_name, &args)
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
handles
|
||||
.into_iter()
|
||||
.map(|h| {
|
||||
h.join()
|
||||
.unwrap_or_else(|_| "Error: tool panicked".to_string())
|
||||
})
|
||||
.collect::<Vec<_>>()
|
||||
});
|
||||
for (tc, result) in window.iter().zip(window_results) {
|
||||
ordered.push((tc.id.clone(), tc.function.name.clone(), result));
|
||||
}
|
||||
}
|
||||
ordered
|
||||
}
|
||||
|
||||
/// Run a single synchronous tool call and capture its result string.
|
||||
fn run_one_tool(
|
||||
tools: &[Box<dyn Tool>],
|
||||
tool_ctx: &ToolCtx,
|
||||
tool_name: &str,
|
||||
args: &Value,
|
||||
) -> String {
|
||||
if let Some(tool) = tools.iter().find(|t| t.name() == tool_name) {
|
||||
match tool.run(tool_ctx, args) {
|
||||
Ok(output) => output,
|
||||
Err(e) => format!("Error: {e}"),
|
||||
}
|
||||
} else {
|
||||
format!("Unknown tool: {tool_name}")
|
||||
}
|
||||
}
|
||||
|
||||
/// Pick a `max_tokens` budget proportional to the directive's length.
|
||||
fn adaptive_max_tokens(directive_len: usize) -> u32 {
|
||||
if directive_len <= 80 {
|
||||
@@ -130,7 +220,7 @@ pub async fn run_agent(
|
||||
.await?;
|
||||
|
||||
let content = response_msg.content.clone().unwrap_or_default();
|
||||
let tool_calls = response_msg.tool_calls.unwrap_or_default();
|
||||
let tool_calls = response_msg.tool_calls.clone().unwrap_or_default();
|
||||
|
||||
// If no tool calls, we're done — return content
|
||||
if tool_calls.is_empty() {
|
||||
@@ -139,12 +229,18 @@ pub async fn run_agent(
|
||||
return Ok(content);
|
||||
}
|
||||
|
||||
// Execute tool calls
|
||||
for tc in &tool_calls {
|
||||
let tool_name = &tc.function.name;
|
||||
let args = sanitize_tool_arguments(&tc.function.arguments);
|
||||
// Push the assistant message (with its tool_calls) BEFORE executing
|
||||
// so the tool-calling contract is honoured: tool results reference
|
||||
// the calls declared in the preceding assistant message. Without
|
||||
// this, the history is malformed (`[...tool, tool, assistant]`).
|
||||
messages.push(response_msg);
|
||||
|
||||
debug!("Subagent executing tool: {tool_name}");
|
||||
// Execute tool calls — read-only batches run concurrently (bounded,
|
||||
// order preserved); any mutating tool forces the safe sequential path.
|
||||
let results = execute_tool_batch(&tools, &tool_ctx, &tool_calls);
|
||||
|
||||
for (id, tool_name, result) in results {
|
||||
debug!("Subagent tool {tool_name} finished");
|
||||
|
||||
report_progress(
|
||||
&tool_ctx,
|
||||
@@ -155,15 +251,6 @@ pub async fn run_agent(
|
||||
),
|
||||
);
|
||||
|
||||
let result = if let Some(tool) = tools.iter().find(|t| t.name() == tool_name) {
|
||||
match tool.run(&tool_ctx, &args) {
|
||||
Ok(output) => output,
|
||||
Err(e) => format!("Error: {e}"),
|
||||
}
|
||||
} else {
|
||||
format!("Unknown tool: {tool_name}")
|
||||
};
|
||||
|
||||
// Error-recovery: if the same tool keeps failing, inject a
|
||||
// system note steering the model to a different approach.
|
||||
if result.starts_with("Error:") {
|
||||
@@ -171,11 +258,11 @@ pub async fn run_agent(
|
||||
consecutive_errors += 1;
|
||||
} else {
|
||||
consecutive_errors = 1;
|
||||
last_tool = tool_name.to_string();
|
||||
last_tool = tool_name.clone();
|
||||
}
|
||||
if consecutive_errors >= MAX_CONSECUTIVE_TOOL_ERRORS {
|
||||
messages.push(ChatMessage::system(
|
||||
zesdex_domain::agent::prompt::error_recovery_note(tool_name, &result),
|
||||
zesdex_domain::agent::prompt::error_recovery_note(&tool_name, &result),
|
||||
));
|
||||
consecutive_errors = 0;
|
||||
}
|
||||
@@ -183,15 +270,7 @@ pub async fn run_agent(
|
||||
consecutive_errors = 0;
|
||||
}
|
||||
|
||||
messages.push(ChatMessage::tool(
|
||||
tc.id.clone(),
|
||||
truncate_tool_output(result),
|
||||
));
|
||||
}
|
||||
|
||||
// Add assistant response if there was text content
|
||||
if !content.is_empty() {
|
||||
messages.push(ChatMessage::assistant(Some(content)));
|
||||
messages.push(ChatMessage::tool(id, truncate_tool_output(result)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -208,3 +287,111 @@ pub async fn run_agent(
|
||||
"Subagent reached iteration limit ({MAX_ITERATIONS})"
|
||||
))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::tools::ToolCtxBuilder;
|
||||
use serde_json::json;
|
||||
|
||||
/// A deterministic mock tool whose `run` returns its own name (opting into
|
||||
/// an optional sleep to make parallel-vs-sequential observable).
|
||||
struct MockTool {
|
||||
name: &'static str,
|
||||
sleep_ms: u64,
|
||||
}
|
||||
|
||||
impl MockTool {
|
||||
fn new(name: &'static str, sleep_ms: u64) -> Self {
|
||||
Self { name, sleep_ms }
|
||||
}
|
||||
}
|
||||
|
||||
impl Tool for MockTool {
|
||||
fn name(&self) -> &'static str {
|
||||
self.name
|
||||
}
|
||||
fn description(&self) -> &'static str {
|
||||
"mock tool for tests"
|
||||
}
|
||||
fn parameters(&self) -> Value {
|
||||
json!({"type":"object","properties":{}})
|
||||
}
|
||||
fn run(&self, _ctx: &ToolCtx, _args: &Value) -> Result<String> {
|
||||
if self.sleep_ms > 0 {
|
||||
std::thread::sleep(std::time::Duration::from_millis(self.sleep_ms));
|
||||
}
|
||||
Ok(self.name.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
fn tc(name: &str, id: usize) -> zesdex_domain::core::ToolCall {
|
||||
zesdex_domain::core::ToolCall {
|
||||
id: format!("call_{id}"),
|
||||
type_: "function".to_string(),
|
||||
function: zesdex_domain::core::ToolFunction {
|
||||
name: name.to_string(),
|
||||
arguments: serde_json::Value::String(String::new()),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
fn ctx() -> ToolCtx {
|
||||
ToolCtxBuilder::default().build()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parallel_batch_preserves_original_order() {
|
||||
let tools: Vec<Box<dyn Tool>> = vec![
|
||||
Box::new(MockTool::new("read", 0)),
|
||||
Box::new(MockTool::new("grep", 0)),
|
||||
];
|
||||
let calls = vec![tc("read", 1), tc("grep", 2), tc("read", 3)];
|
||||
|
||||
let results = execute_tool_batch(&tools, &ctx(), &calls);
|
||||
|
||||
// Results keep the assistant's original call order.
|
||||
let names: Vec<&str> = results.iter().map(|(_, n, _)| n.as_str()).collect();
|
||||
assert_eq!(names, vec!["read", "grep", "read"]);
|
||||
// IDs follow the same original order (ordering contract).
|
||||
let ids: Vec<&str> = results.iter().map(|(id, _, _)| id.as_str()).collect();
|
||||
assert_eq!(ids, vec!["call_1", "call_2", "call_3"]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parallel_read_batch_is_faster_than_sequential() {
|
||||
// Both reads sleep 30ms each. Parallel should finish ~30ms (both run
|
||||
// at once), sequential would take ~60ms.
|
||||
let tools: Vec<Box<dyn Tool>> = vec![Box::new(MockTool::new("read", 30))];
|
||||
let calls = vec![tc("read", 1), tc("read", 2)];
|
||||
|
||||
let started = std::time::Instant::now();
|
||||
let results = execute_tool_batch(&tools, &ctx(), &calls);
|
||||
let elapsed = started.elapsed();
|
||||
|
||||
assert_eq!(results.len(), 2);
|
||||
assert!(
|
||||
elapsed < std::time::Duration::from_millis(55),
|
||||
"parallel read batch took {elapsed:?}, expected concurrent execution"
|
||||
);
|
||||
assert!(elapsed >= std::time::Duration::from_millis(25));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mutating_tool_forces_sequential_batch() {
|
||||
// A batch containing a mutating tool ("write") must NOT run in
|
||||
// parallel — the single 30ms read runs alone, then the write runs.
|
||||
let tools: Vec<Box<dyn Tool>> = vec![
|
||||
Box::new(MockTool::new("read", 30)),
|
||||
Box::new(MockTool::new("write", 0)),
|
||||
];
|
||||
let calls = vec![tc("read", 1), tc("write", 2)];
|
||||
|
||||
let results = execute_tool_batch(&tools, &ctx(), &calls);
|
||||
|
||||
let names: Vec<&str> = results.iter().map(|(_, n, _)| n.as_str()).collect();
|
||||
assert_eq!(names, vec!["read", "write"]);
|
||||
let ids: Vec<&str> = results.iter().map(|(id, _, _)| id.as_str()).collect();
|
||||
assert_eq!(ids, vec!["call_1", "call_2"]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,6 +66,14 @@ impl ToolCtxBuilder {
|
||||
self.session_dir = v;
|
||||
self
|
||||
}
|
||||
pub fn memory_dir(mut self, v: PathBuf) -> Self {
|
||||
self.memory_dir = v;
|
||||
self
|
||||
}
|
||||
pub fn worktrees_dir(mut self, v: PathBuf) -> Self {
|
||||
self.worktrees_dir = v;
|
||||
self
|
||||
}
|
||||
pub fn workspaces(mut self, v: Vec<PathBuf>) -> Self {
|
||||
self.workspaces = v;
|
||||
self
|
||||
|
||||
@@ -43,7 +43,8 @@ impl Tool for Forget {
|
||||
let name = crate::tools::arg_str(args, "name")?;
|
||||
info!(name, "forget invoked");
|
||||
let repo = crate::persistence::cms::memory_repo::MarkdownMemoryRepository::new();
|
||||
repo.delete(&ctx.memory_dir, &name)?;
|
||||
let memory_dir = crate::tools::memory::resolve_memory_dir(&ctx.memory_dir);
|
||||
repo.delete(&memory_dir, &name)?;
|
||||
info!(name, "memory deleted");
|
||||
Ok(format!("Memory '{}' deleted", name))
|
||||
}
|
||||
|
||||
@@ -1,5 +1,21 @@
|
||||
//! Memory management tools — remember, recall, forget.
|
||||
|
||||
use std::path::PathBuf;
|
||||
|
||||
pub mod forget;
|
||||
pub mod recall;
|
||||
pub mod remember;
|
||||
|
||||
/// Resolve the directory the memory tools should read/write.
|
||||
///
|
||||
/// Prefer an explicitly-configured `ToolCtx.memory_dir`. If that is empty
|
||||
/// (a `ToolCtx` is often built without setting `memory_dir`), fall back to
|
||||
/// the canonical persistent memory location from `Store` so memories are not
|
||||
/// silently written into the current working directory.
|
||||
pub fn resolve_memory_dir(ctx_memory_dir: &std::path::Path) -> PathBuf {
|
||||
if ctx_memory_dir.as_os_str().is_empty() {
|
||||
zesdex_domain::core::Store::new().memory_dir
|
||||
} else {
|
||||
ctx_memory_dir.to_path_buf()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,21 +45,132 @@ impl Tool for Recall {
|
||||
#[instrument(skip(self, ctx, args))]
|
||||
fn run(&self, ctx: &ToolCtx, args: &Value) -> Result<String> {
|
||||
let repo = crate::persistence::cms::memory_repo::MarkdownMemoryRepository::new();
|
||||
let memory_dir = crate::tools::memory::resolve_memory_dir(&ctx.memory_dir);
|
||||
|
||||
let specific_name = args.get("name").and_then(|v| v.as_str());
|
||||
let search = args.get("search").and_then(|v| v.as_str());
|
||||
|
||||
if let Some(name) = specific_name {
|
||||
info!(name, "recall loading specific memory");
|
||||
let memory = repo.load(&ctx.memory_dir, name)?;
|
||||
Ok(serde_json::to_string_pretty(&memory)?)
|
||||
} else {
|
||||
let memory = repo.load(&memory_dir, name)?;
|
||||
return Ok(serde_json::to_string_pretty(&memory)?);
|
||||
}
|
||||
|
||||
if let Some(query) = search {
|
||||
let query = query.trim().to_lowercase();
|
||||
info!(search = %query, "recall searching memories");
|
||||
if query.is_empty() {
|
||||
return Ok("Search query is empty".to_string());
|
||||
}
|
||||
let names = repo.list(&memory_dir)?;
|
||||
let mut matches: Vec<String> = Vec::new();
|
||||
for name in &names {
|
||||
// Load each memory and match against name/description/content.
|
||||
if let Ok(m) = repo.load(&memory_dir, name) {
|
||||
let haystack =
|
||||
format!("{} {} {}", m.name, m.description, m.content).to_lowercase();
|
||||
if haystack.contains(&query) {
|
||||
matches.push(m.name);
|
||||
}
|
||||
}
|
||||
}
|
||||
if matches.is_empty() {
|
||||
return Ok(format!("No memories match '{query}'"));
|
||||
}
|
||||
return Ok(format!(
|
||||
"Memories matching '{query}' ({}):\n{}",
|
||||
matches.len(),
|
||||
matches.join("\n")
|
||||
));
|
||||
}
|
||||
|
||||
info!("recall listing all memories");
|
||||
let names = repo.list(&ctx.memory_dir)?;
|
||||
let names = repo.list(&memory_dir)?;
|
||||
if names.is_empty() {
|
||||
info!("no memories found");
|
||||
return Ok("No memories saved yet".to_string());
|
||||
}
|
||||
Ok(format!("Available memories:\n{}", names.join("\n")))
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::tools::ToolCtxBuilder;
|
||||
use zesdex_domain::cms::MemoryRepository;
|
||||
|
||||
fn save_mem(name: &str, description: &str, content: &str, dir: &std::path::Path) {
|
||||
let repo = crate::persistence::cms::memory_repo::MarkdownMemoryRepository::new();
|
||||
let memory = zesdex_domain::cms::Memory {
|
||||
name: name.to_string(),
|
||||
description: description.to_string(),
|
||||
content: content.to_string(),
|
||||
kind: "reference".to_string(),
|
||||
created_at: 0,
|
||||
updated_at: 0,
|
||||
outcome: None,
|
||||
lifecycle: "active".to_string(),
|
||||
scope: None,
|
||||
before_snippet: None,
|
||||
after_snippet: None,
|
||||
provenances: Vec::new(),
|
||||
};
|
||||
repo.save(dir, &memory).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn search_filters_memories_by_keyword() {
|
||||
let dir = std::env::temp_dir().join(format!("zdx-mem-test-{}", uuid::Uuid::new_v4()));
|
||||
std::fs::create_dir_all(&dir).unwrap();
|
||||
save_mem(
|
||||
"rust-concurrency",
|
||||
"tokio spawn patterns",
|
||||
"how to use async tasks",
|
||||
&dir,
|
||||
);
|
||||
save_mem(
|
||||
"docker-deploy",
|
||||
"deploy via compose",
|
||||
"container orchestration",
|
||||
&dir,
|
||||
);
|
||||
|
||||
let tool_ctx = ToolCtxBuilder::default().memory_dir(dir.clone()).build();
|
||||
let args = serde_json::json!({ "search": "tokio" });
|
||||
|
||||
let out = Recall.run(&tool_ctx, &args).unwrap();
|
||||
assert!(
|
||||
out.contains("rust-concurrency"),
|
||||
"should match rust-concurrency, got: {out}"
|
||||
);
|
||||
assert!(
|
||||
!out.contains("docker-deploy"),
|
||||
"docker-deploy should not match tokio"
|
||||
);
|
||||
|
||||
// A query with no match reports so.
|
||||
let no_match = Recall
|
||||
.run(&tool_ctx, &serde_json::json!({ "search": "zzzznope" }))
|
||||
.unwrap();
|
||||
assert!(no_match.contains("No memories match"), "{no_match}");
|
||||
|
||||
std::fs::remove_dir_all(&dir).ok();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resolve_memory_dir_falls_back_to_store_when_empty() {
|
||||
// An empty ToolCtx.memory_dir is resolved to the canonical Store path.
|
||||
let resolved = crate::tools::memory::resolve_memory_dir(std::path::Path::new(""));
|
||||
assert!(!resolved.as_os_str().is_empty());
|
||||
assert!(
|
||||
resolved.ends_with("memory"),
|
||||
"expected memory dir, got {resolved:?}"
|
||||
);
|
||||
|
||||
// An explicit memory_dir is preserved.
|
||||
let explicit =
|
||||
crate::tools::memory::resolve_memory_dir(std::path::Path::new("/tmp/custom-memory"));
|
||||
assert_eq!(explicit, std::path::Path::new("/tmp/custom-memory"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -81,7 +81,8 @@ impl Tool for Remember {
|
||||
};
|
||||
|
||||
let repo = crate::persistence::cms::memory_repo::MarkdownMemoryRepository::new();
|
||||
repo.save(&ctx.memory_dir, &memory)?;
|
||||
let memory_dir = crate::tools::memory::resolve_memory_dir(&ctx.memory_dir);
|
||||
repo.save(&memory_dir, &memory)?;
|
||||
|
||||
info!(name, "memory saved");
|
||||
Ok(format!("Memory '{}' saved", name))
|
||||
|
||||
@@ -9,7 +9,6 @@ use anyhow::Result;
|
||||
use serde_json::{json, Value};
|
||||
use tracing::{debug, info, instrument, warn};
|
||||
|
||||
use crate::llm::provider::LlmClient;
|
||||
use crate::tools::{arg_str, Tool, ToolCtx};
|
||||
use crate::workflow::engine::execution::execute_workflow;
|
||||
use crate::workflow::hive_mind::cycle::execute_cycle;
|
||||
@@ -60,14 +59,8 @@ impl Tool for WorkflowRun {
|
||||
phase_names.join(", ")
|
||||
);
|
||||
|
||||
let llm_client = LlmClient::new(
|
||||
crate::llm::provider::DEFAULT_API_KEY.to_string(),
|
||||
zesdex_domain::agent::defaults::DEFAULT_MODEL.to_string(),
|
||||
None,
|
||||
);
|
||||
let rt = crate::runtime::runtime();
|
||||
let result: Vec<String> =
|
||||
rt.block_on(async { execute_workflow(&script, ctx, &llm_client).await })?;
|
||||
let result: Vec<String> = rt.block_on(async { execute_workflow(&script, ctx).await })?;
|
||||
|
||||
info!(phase_count = result.len(), "Workflow completed");
|
||||
Ok(format!(
|
||||
|
||||
@@ -221,7 +221,14 @@ pub fn build_rich_context(root: &Path) -> String {
|
||||
));
|
||||
|
||||
// 2. Custom Rules
|
||||
let rule_files = [".cursorrules", ".zesdexrules", "claude.md", "agent.md"];
|
||||
let rule_files = [
|
||||
"AGENTS.md",
|
||||
"CLAUDE.md",
|
||||
".cursorrules",
|
||||
".zesdexrules",
|
||||
"claude.md",
|
||||
"agent.md",
|
||||
];
|
||||
for file in rule_files {
|
||||
let p = root.join(file);
|
||||
if let Ok(content) = std::fs::read_to_string(&p) {
|
||||
@@ -268,7 +275,7 @@ pub fn build_rich_context(root: &Path) -> String {
|
||||
let p = root.join(file);
|
||||
if let Ok(content) = std::fs::read_to_string(&p) {
|
||||
let snippet = if content.len() > 1500 {
|
||||
format!("{}\n... (truncated)", &content[..1500])
|
||||
format!("{}\n... (truncated)", truncate_chars(&content, 1500))
|
||||
} else {
|
||||
content
|
||||
};
|
||||
@@ -294,7 +301,7 @@ pub fn build_rich_context(root: &Path) -> String {
|
||||
let readme_path = root.join("README.md");
|
||||
if let Ok(content) = std::fs::read_to_string(&readme_path) {
|
||||
let snippet = if content.len() > 1000 {
|
||||
format!("{}\n... (truncated)", &content[..1000])
|
||||
format!("{}\n... (truncated)", truncate_chars(&content, 1000))
|
||||
} else {
|
||||
content
|
||||
};
|
||||
@@ -341,3 +348,53 @@ pub fn build_rich_context(root: &Path) -> String {
|
||||
|
||||
ctx.trim_end().to_string()
|
||||
}
|
||||
|
||||
/// Truncate a string to at most `max_chars` **characters**, never cutting a
|
||||
/// multi-byte UTF-8 code point in half.
|
||||
///
|
||||
/// `&s[..n]` with `n` a raw byte index panics when `n` lands inside a
|
||||
/// multi-byte character (e.g. an emoji, `→`, or CJK in a README/diff). This
|
||||
/// helper slices on character boundaries so content is safely capped at a
|
||||
/// byte budget while remaining valid UTF-8.
|
||||
pub fn truncate_chars(s: &str, max_chars: usize) -> String {
|
||||
if s.chars().count() <= max_chars {
|
||||
return s.to_string();
|
||||
}
|
||||
s.chars().take(max_chars).collect()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn truncate_chars_leaves_short_strings_unchanged() {
|
||||
assert_eq!(truncate_chars("short", 100), "short");
|
||||
assert_eq!(truncate_chars("", 5), "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn truncate_chars_cuts_to_max_chars() {
|
||||
assert_eq!(truncate_chars("hello world", 5), "hello");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn truncate_chars_never_splits_multibyte_utf8() {
|
||||
// 4 chars each: '→' is 3 bytes. Byte-slicing at 5 would panic; char
|
||||
// slicing must not.
|
||||
let s = "a→b→c→d";
|
||||
let t = truncate_chars(s, 5);
|
||||
assert_eq!(t, "a→b→c");
|
||||
assert!(t.chars().count() <= 5);
|
||||
// No replacement char must appear (valid UTF-8 preserved).
|
||||
assert!(!t.contains('\u{FFFD}'));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn truncate_chars_handles_emoji() {
|
||||
let s = "🚀🚀🚀🚀";
|
||||
let t = truncate_chars(s, 2);
|
||||
assert_eq!(t, "🚀🚀");
|
||||
assert!(t.chars().count() == 2);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
use anyhow::Result;
|
||||
use tracing::{info, instrument};
|
||||
|
||||
use crate::llm::provider::LlmClient;
|
||||
use crate::tools::ToolCtx;
|
||||
use crate::workflow::engine::primitives::execute_primitive;
|
||||
use zesdex_domain::workflow::WorkflowScript;
|
||||
@@ -11,12 +10,8 @@ use zesdex_domain::workflow::WorkflowScript;
|
||||
/// Execute each phase of a workflow script sequentially.
|
||||
///
|
||||
/// Flow: for each phase → execute_primitive → collect result.
|
||||
#[instrument(skip(tool_ctx, _llm_client))]
|
||||
pub async fn execute_workflow(
|
||||
script: &WorkflowScript,
|
||||
tool_ctx: &ToolCtx,
|
||||
_llm_client: &LlmClient,
|
||||
) -> Result<Vec<String>> {
|
||||
#[instrument(skip(tool_ctx))]
|
||||
pub async fn execute_workflow(script: &WorkflowScript, tool_ctx: &ToolCtx) -> Result<Vec<String>> {
|
||||
info!(
|
||||
"Executing workflow: {} ({} phases)",
|
||||
script.name,
|
||||
|
||||
Reference in New Issue
Block a user