CalculatorTools and CurrentTimeTool refactored

Author: AdamBien

zsmith/src/main/java/airhacks/zsmith/tools/boundary/Tools.java

@@ -18,8 +18,8 @@
 
 public enum Tools implements Tool {
 
-    CALCULATOR(new CalculatorTool()),
-    CURRENT_TIME(new CurrentTimeTool()),
+    CALCULATOR(CalculatorTool.create()),
+    CURRENT_TIME(CurrentTimeTool.create()),
     READ_CLIPBOARD(new ReadClipboardTool()),
     WRITE_CLIPBOARD(new WriteClipboardTool()),
     READ_ANY_FILE(new ReadAnyFileTool()),

zsmith/src/main/java/airhacks/zsmith/tools/control/CalculatorTool.java

@@ -2,32 +2,23 @@
 
 import org.json.JSONObject;
 
-public class CalculatorTool implements Tool {
-
-    @Override
-    public String toolName() {
-        return "calculator";
-    }
-
-    @Override
-    public String description() {
-        return "Performs basic arithmetic operations: add, subtract, multiply, divide";
-    }
+public interface CalculatorTool {
 
     enum Field { operation, a, b }
 
-    @Override
-    public String inputSchema() {
-        return Tool.schema(
-                Prop.stringEnum(Field.operation, "The arithmetic operation to perform",
-                        "add", "subtract", "multiply", "divide"),
-                Prop.number(Field.a, "First operand"),
-                Prop.number(Field.b, "Second operand")
-        );
+    static Tool create() {
+        return Tool.of(
+                "calculator",
+                "Performs basic arithmetic operations: add, subtract, multiply, divide",
+                Tool.schema(
+                        Tool.Prop.stringEnum(Field.operation, "The arithmetic operation to perform",
+                                "add", "subtract", "multiply", "divide"),
+                        Tool.Prop.number(Field.a, "First operand"),
+                        Tool.Prop.number(Field.b, "Second operand")),
+                CalculatorTool::run);
     }
 
-    @Override
-    public String execute(JSONObject input) {
+    private static String run(JSONObject input) {
         var operation = input.getString(Field.operation.name());
         var a = input.getDouble(Field.a.name());
         var b = input.getDouble(Field.b.name());

zsmith/src/main/java/airhacks/zsmith/tools/control/CurrentTimeTool.java

@@ -3,29 +3,15 @@
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
-import org.json.JSONObject;
+public interface CurrentTimeTool {
 
-public class CurrentTimeTool implements Tool {
+    DateTimeFormatter FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
-    @Override
-    public String toolName() {
-        return "current_time";
-    }
-
-    @Override
-    public String description() {
-        return "Returns the current date and time";
-    }
-
-    @Override
-    public String inputSchema() {
-        return Tool.emptySchema();
-    }
-
-    @Override
-    public String execute(JSONObject input) {
-        var now = LocalDateTime.now();
-        var formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        return now.format(formatter);
+    static Tool create() {
+        return Tool.of(
+                "current_time",
+                "Returns the current date and time",
+                Tool.emptySchema(),
+                input -> LocalDateTime.now().format(FORMAT));
     }
 }

zsmith/src/test/java/LinkCheckerToolRegistrationTest.java

@@ -11,7 +11,7 @@ void main() {
 
     // can be registered alongside other tools
     var multi = new Agent().withSystemPrompt("You are a helpful assistant.")
-            .withTool(new CalculatorTool())
+            .withTool(CalculatorTool.create())
             .withTool(new LinkCheckerTool());
     assert multi.tools().containsKey("check_link") : "agent should contain 'check_link' tool";
     assert multi.tools().containsKey("calculator") : "agent should contain 'calculator' tool";

zsmith/version.txt

@@ -1 +1 @@
-2026.06.13.01
+2026.06.13.02