Skip to content

feat: enhance listing of third-party tools #7

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

Merged
aeroxy merged 3 commits into from
Jun 5, 2026
Merged

feat: enhance listing of third-party tools #7

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d66d516
feat: enhance listing of third-party tools and improve execution hand…
aeroxy Jun 5, 2026
2a6ea2d
fix: prevent empty tool list output in list_3p_tools function
aeroxy Jun 5, 2026
c314b42
fix: improve output formatting in list_3p_tools function
aeroxy Jun 5, 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
95 changes: 67 additions & 28 deletions src/commands/third_party.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,36 @@ pub async fn list_3p_tools(
) -> Result<CommandResult> {
let expr = r#"(() => {
const dtmcp = window.__dtmcp;
if (!dtmcp || !dtmcp.toolGroup) {
return JSON.stringify({ tools: [] });
if (!dtmcp) {
return JSON.stringify({ groups: [] });
}
return JSON.stringify({
name: dtmcp.toolGroup.name,
description: dtmcp.toolGroup.description,
tools: dtmcp.toolGroup.tools.map(t => ({
name: t.name,
description: t.description,
inputSchema: t.inputSchema
}))
});
if (Array.isArray(dtmcp.toolGroups) && dtmcp.toolGroups.length > 0) {
return JSON.stringify({
groups: dtmcp.toolGroups.map(g => ({
name: g.name,
description: g.description,
tools: (g.tools || []).map(t => ({
name: t.name,
description: t.description,
inputSchema: t.inputSchema
}))
Comment thread
aeroxy marked this conversation as resolved.
}))
});
}
Comment thread
aeroxy marked this conversation as resolved.
if (dtmcp.toolGroup) {
return JSON.stringify({
groups: [{
name: dtmcp.toolGroup.name,
description: dtmcp.toolGroup.description,
tools: (dtmcp.toolGroup.tools || []).map(t => ({
name: t.name,
description: t.description,
inputSchema: t.inputSchema
}))
Comment thread
aeroxy marked this conversation as resolved.
}]
});
}
Comment thread
aeroxy marked this conversation as resolved.
return JSON.stringify({ groups: [] });
})()"#;

let result = client
Expand All @@ -42,29 +60,39 @@ pub async fn list_3p_tools(
Ok(CommandResult::output(val_str.to_string()))
} else {
let val: serde_json::Value = serde_json::from_str(val_str)?;
let tools = val["tools"]
let groups = val["groups"]
.as_array()
.ok_or_else(|| anyhow::anyhow!("Invalid response from page"))?;

if tools.is_empty() {
let total_tools: usize = groups
.iter()
.filter_map(|g| g["tools"].as_array().map(|a| a.len()))
.sum();

if total_tools == 0 {
return Ok(CommandResult::output(
"No third-party developer tools found on this page.".to_string(),
));
}

let mut output = String::new();
if let Some(name) = val["name"].as_str() {
output.push_str(&format!("Tool Group: {}\n", name));
}
if let Some(desc) = val["description"].as_str() {
output.push_str(&format!("Description: {}\n", desc));
}
output.push_str("\nAvailable Tools:\n");

for tool in tools {
let name = tool["name"].as_str().unwrap_or("unknown");
let desc = tool["description"].as_str().unwrap_or("");
output.push_str(&format!("- {}: {}\n", name, desc));
for (i, group) in groups.iter().enumerate() {
if i > 0 {
output.push('\n');
}
let name = group["name"].as_str().unwrap_or("unknown");
let desc = group["description"].as_str().unwrap_or("");
output.push_str(&format!("{}: {}\n", name, desc));
if let Some(tools) = group["tools"].as_array() {
if !tools.is_empty() {
output.push_str("Available tools:\n");
for tool in tools {
let tname = tool["name"].as_str().unwrap_or("unknown");
let tdesc = tool["description"].as_str().unwrap_or("");
output.push_str(&format!(" - {}: {}\n", tname, tdesc));
}
}
}
Comment thread
aeroxy marked this conversation as resolved.
}

Ok(CommandResult::output(output))
Expand All @@ -91,13 +119,24 @@ pub async fn execute_3p_tool(
let expr = format!(
r#"(async () => {{
const dtmcp = window.__dtmcp;
if (!dtmcp || !dtmcp.executeTool) {{
if (!dtmcp) {{
return JSON.stringify({{ error: 'Third-party tools not supported on this page' }});
}}
try {{
const params = {safe_params_json};
const result = await dtmcp.executeTool({safe_name_json}, params);
return JSON.stringify({{ result }});
if (dtmcp.executeTool) {{
const result = await dtmcp.executeTool({safe_name_json}, params);
return JSON.stringify({{ result }});
}}
const groups = dtmcp.toolGroups || (dtmcp.toolGroup ? [dtmcp.toolGroup] : []);
for (const group of groups) {{
const tool = (group.tools || []).find(t => t.name === {safe_name_json});
Comment thread
aeroxy marked this conversation as resolved.
if (tool && typeof tool.execute === 'function') {{
const result = await tool.execute(params);
return JSON.stringify({{ result }});
}}
Comment thread
aeroxy marked this conversation as resolved.
}}
Comment thread
aeroxy marked this conversation as resolved.
return JSON.stringify({{ error: 'Tool ' + {safe_name_json} + ' not found' }});
}} catch (e) {{
return JSON.stringify({{ error: e.message || String(e) }});
}}
Expand Down