Skip to content

Refactor tool blocks with declarative macros #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tcdent wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Refactor tool blocks with declarative macros #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2ffe0e
Refactor tool blocks with declarative macros
claude Jan 30, 2026
27a321c
Update Cargo.lock
claude Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

163 changes: 23 additions & 140 deletions src/tools/impls/agent_management.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,161 +10,44 @@ use serde::{Deserialize, Serialize};
use serde_json::json;

use super::{handlers, Tool, ToolPipeline};
use crate::impl_tool_block;
use crate::define_simple_tool_block;
use crate::transcript::{render_approval_prompt, render_prefix, render_result, Block, BlockType, Status};

// =============================================================================
// ListAgents block
// =============================================================================

/// Block for list_agents - shows as `list_agents()`
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct ListAgentsBlock {
pub call_id: String,
pub tool_name: String,
pub params: serde_json::Value,
pub status: Status,
pub text: String,
#[serde(default)]
pub background: bool,
}

impl ListAgentsBlock {
pub fn new(call_id: impl Into<String>, tool_name: impl Into<String>, params: serde_json::Value, background: bool) -> Self {
Self {
call_id: call_id.into(),
tool_name: tool_name.into(),
params,
status: Status::Pending,
text: String::new(),
background,
define_simple_tool_block! {
/// Block for list_agents - shows as `list_agents()`
pub struct ListAgentsBlock {
max_lines: 10,
render_header(self, params) {
vec![
Span::styled("list_agents", Style::default().fg(Color::Magenta)),
Span::styled("()", Style::default().fg(Color::DarkGray)),
]
}
}
}

#[typetag::serde]
impl Block for ListAgentsBlock {
impl_tool_block!(BlockType::Tool);

fn render(&self, _width: u16) -> Vec<Line<'_>> {
let mut lines = Vec::new();

let spans = vec![
self.render_status(),
render_prefix(self.background),
Span::styled("list_agents", Style::default().fg(Color::Magenta)),
Span::styled("()", Style::default().fg(Color::DarkGray)),
];
lines.push(Line::from(spans));

if self.status == Status::Pending {
lines.push(render_approval_prompt());
}

if !self.text.is_empty() {
lines.extend(render_result(&self.text, 10));
}

if self.status == Status::Denied {
lines.push(Line::from(Span::styled(
" Denied by user",
Style::default().fg(Color::DarkGray),
)));
}

lines
}

fn call_id(&self) -> Option<&str> {
Some(&self.call_id)
}

fn tool_name(&self) -> Option<&str> {
Some(&self.tool_name)
}

fn params(&self) -> Option<&serde_json::Value> {
Some(&self.params)
}
}

// =============================================================================
// GetAgent block
// =============================================================================

/// Block for get_agent - shows as `get_agent(agent_id)`
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct GetAgentBlock {
pub call_id: String,
pub tool_name: String,
pub params: serde_json::Value,
pub status: Status,
pub text: String,
#[serde(default)]
pub background: bool,
}

impl GetAgentBlock {
pub fn new(call_id: impl Into<String>, tool_name: impl Into<String>, params: serde_json::Value, background: bool) -> Self {
Self {
call_id: call_id.into(),
tool_name: tool_name.into(),
params,
status: Status::Pending,
text: String::new(),
background,
}
}
}

#[typetag::serde]
impl Block for GetAgentBlock {
impl_tool_block!(BlockType::Tool);

fn render(&self, _width: u16) -> Vec<Line<'_>> {
let mut lines = Vec::new();

let label = self.params["label"].as_str()
.unwrap_or("?");

let spans = vec![
self.render_status(),
render_prefix(self.background),
Span::styled("get_agent", Style::default().fg(Color::Magenta)),
Span::styled("(", Style::default().fg(Color::DarkGray)),
Span::styled(label.to_string(), Style::default().fg(Color::Yellow)),
Span::styled(")", Style::default().fg(Color::DarkGray)),
];
lines.push(Line::from(spans));

if self.status == Status::Pending {
lines.push(render_approval_prompt());
}

if !self.text.is_empty() {
lines.extend(render_result(&self.text, 10));
}

if self.status == Status::Denied {
lines.push(Line::from(Span::styled(
" Denied by user",
Style::default().fg(Color::DarkGray),
)));
define_simple_tool_block! {
/// Block for get_agent - shows as `get_agent(agent_id)`
pub struct GetAgentBlock {
max_lines: 10,
render_header(self, params) {
let label = params["label"].as_str().unwrap_or("?");

vec![
Span::styled("get_agent", Style::default().fg(Color::Magenta)),
Span::styled("(", Style::default().fg(Color::DarkGray)),
Span::styled(label.to_string(), Style::default().fg(Color::Yellow)),
Span::styled(")", Style::default().fg(Color::DarkGray)),
]
}

lines
}

fn call_id(&self) -> Option<&str> {
Some(&self.call_id)
}

fn tool_name(&self) -> Option<&str> {
Some(&self.tool_name)
}

fn params(&self) -> Option<&serde_json::Value> {
Some(&self.params)
}
}

Expand Down
170 changes: 23 additions & 147 deletions src/tools/impls/background_tasks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,168 +10,44 @@ use serde::{Deserialize, Serialize};
use serde_json::json;

use super::{handlers, Tool, ToolPipeline};
use crate::impl_tool_block;
use crate::define_simple_tool_block;
use crate::transcript::{render_approval_prompt, render_prefix, render_result, Block, BlockType, Status};

// =============================================================================
// ListBackgroundTasks block
// =============================================================================

/// Block for list_background_tasks - shows as `list_background_tasks()`
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct ListBackgroundTasksBlock {
pub call_id: String,
pub tool_name: String,
pub params: serde_json::Value,
pub status: Status,
pub text: String,
#[serde(default)]
pub background: bool,
}

impl ListBackgroundTasksBlock {
pub fn new(call_id: impl Into<String>, tool_name: impl Into<String>, params: serde_json::Value, background: bool) -> Self {
Self {
call_id: call_id.into(),
tool_name: tool_name.into(),
params,
status: Status::Pending,
text: String::new(),
background,
define_simple_tool_block! {
/// Block for list_background_tasks - shows as `list_background_tasks()`
pub struct ListBackgroundTasksBlock {
max_lines: 10,
render_header(self, params) {
vec![
Span::styled("list_background_tasks", Style::default().fg(Color::Magenta)),
Span::styled("()", Style::default().fg(Color::DarkGray)),
]
}
}
}

#[typetag::serde]
impl Block for ListBackgroundTasksBlock {
impl_tool_block!(BlockType::Tool);

fn render(&self, _width: u16) -> Vec<Line<'_>> {
let mut lines = Vec::new();

// Format: list_background_tasks()
let spans = vec![
self.render_status(),
render_prefix(self.background),
Span::styled("list_background_tasks", Style::default().fg(Color::Magenta)),
Span::styled("()", Style::default().fg(Color::DarkGray)),
];
lines.push(Line::from(spans));

// Approval prompt if pending
if self.status == Status::Pending {
lines.push(render_approval_prompt());
}

// Output if completed
if !self.text.is_empty() {
lines.extend(render_result(&self.text, 10));
}

// Denied message
if self.status == Status::Denied {
lines.push(Line::from(Span::styled(
" Denied by user",
Style::default().fg(Color::DarkGray),
)));
}

lines
}

fn call_id(&self) -> Option<&str> {
Some(&self.call_id)
}

fn tool_name(&self) -> Option<&str> {
Some(&self.tool_name)
}

fn params(&self) -> Option<&serde_json::Value> {
Some(&self.params)
}
}

// =============================================================================
// GetBackgroundTask block
// =============================================================================

/// Block for get_background_task - shows as `get_background_task(task_id)`
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct GetBackgroundTaskBlock {
pub call_id: String,
pub tool_name: String,
pub params: serde_json::Value,
pub status: Status,
pub text: String,
#[serde(default)]
pub background: bool,
}

impl GetBackgroundTaskBlock {
pub fn new(call_id: impl Into<String>, tool_name: impl Into<String>, params: serde_json::Value, background: bool) -> Self {
Self {
call_id: call_id.into(),
tool_name: tool_name.into(),
params,
status: Status::Pending,
text: String::new(),
background,
}
}
}

#[typetag::serde]
impl Block for GetBackgroundTaskBlock {
impl_tool_block!(BlockType::Tool);

fn render(&self, _width: u16) -> Vec<Line<'_>> {
let mut lines = Vec::new();

let task_id = self.params["task_id"].as_str().unwrap_or("");

// Format: get_background_task(task_id)
let spans = vec![
self.render_status(),
render_prefix(self.background),
Span::styled("get_background_task", Style::default().fg(Color::Magenta)),
Span::styled("(", Style::default().fg(Color::DarkGray)),
Span::styled(task_id, Style::default().fg(Color::White)),
Span::styled(")", Style::default().fg(Color::DarkGray)),
];
lines.push(Line::from(spans));

// Approval prompt if pending
if self.status == Status::Pending {
lines.push(render_approval_prompt());
}

// Output if completed
if !self.text.is_empty() {
lines.extend(render_result(&self.text, 10));
}

// Denied message
if self.status == Status::Denied {
lines.push(Line::from(Span::styled(
" Denied by user",
Style::default().fg(Color::DarkGray),
)));
define_simple_tool_block! {
/// Block for get_background_task - shows as `get_background_task(task_id)`
pub struct GetBackgroundTaskBlock {
max_lines: 10,
render_header(self, params) {
let task_id = params["task_id"].as_str().unwrap_or("");

vec![
Span::styled("get_background_task", Style::default().fg(Color::Magenta)),
Span::styled("(", Style::default().fg(Color::DarkGray)),
Span::styled(task_id.to_string(), Style::default().fg(Color::White)),
Span::styled(")", Style::default().fg(Color::DarkGray)),
]
}

lines
}

fn call_id(&self) -> Option<&str> {
Some(&self.call_id)
}

fn tool_name(&self) -> Option<&str> {
Some(&self.tool_name)
}

fn params(&self) -> Option<&serde_json::Value> {
Some(&self.params)
}
}

Expand Down
Loading