superfluous json conversion removed

AdamBien · AdamBien · commit 27646b27c4f5 · 2026-06-14T08:17:03.000+02:00
diff --git a/zsmith/src/main/java/airhacks/zsmith/episodicmemory/control/RecallMemoryTool.java b/zsmith/src/main/java/airhacks/zsmith/episodicmemory/control/RecallMemoryTool.java
@@ -30,7 +30,7 @@ public String description() {
     enum Field { type, limit }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(
                 Prop.stringEnum(Field.type, "Optional type to filter memories",
                         "user", "feedback", "project", "reference").optional(),
diff --git a/zsmith/src/main/java/airhacks/zsmith/episodicmemory/control/StoreMemoryTool.java b/zsmith/src/main/java/airhacks/zsmith/episodicmemory/control/StoreMemoryTool.java
@@ -34,7 +34,7 @@ public String description() {
     enum Field { content, type }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(
                 Prop.string(Field.content, "The information to remember"),
                 Prop.stringEnum(Field.type, "The memory type: user, feedback, project, or reference",
diff --git a/zsmith/src/main/java/airhacks/zsmith/skills/control/LoadSkillTool.java b/zsmith/src/main/java/airhacks/zsmith/skills/control/LoadSkillTool.java
@@ -27,7 +27,7 @@ public String description() {
     enum Field { name }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(Prop.string(Field.name, "The name of the skill to load"));
     }
 
diff --git a/zsmith/src/main/java/airhacks/zsmith/subagent/control/SubAgentTool.java b/zsmith/src/main/java/airhacks/zsmith/subagent/control/SubAgentTool.java
@@ -68,7 +68,7 @@ enum Field {
     }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(
                 Prop.string(Field.task, "The task to delegate to the sub-agent. Be specific and complete."));
     }
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/boundary/Tools.java b/zsmith/src/main/java/airhacks/zsmith/tools/boundary/Tools.java
@@ -44,7 +44,7 @@ public enum Tools implements Tool {
     public String description() { return delegate.description(); }
 
     @Override
-    public String inputSchema() { return delegate.inputSchema(); }
+    public JSONObject inputSchema() { return delegate.inputSchema(); }
 
     @Override
     public String execute(JSONObject input) { return delegate.execute(input); }
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/control/ExecuteScriptTool.java b/zsmith/src/main/java/airhacks/zsmith/tools/control/ExecuteScriptTool.java
@@ -36,7 +36,7 @@ public String description() {
     enum Field { path }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(Prop.string(Field.path, "Path to the script to execute"));
     }
 
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/control/FetchUrlTool.java b/zsmith/src/main/java/airhacks/zsmith/tools/control/FetchUrlTool.java
@@ -43,7 +43,7 @@ public String description() {
     enum Field { url }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(Prop.string(Field.url, "The URL to fetch"));
     }
 
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/control/LaunchAppTool.java b/zsmith/src/main/java/airhacks/zsmith/tools/control/LaunchAppTool.java
@@ -51,7 +51,7 @@ public String description() {
     enum Field { arguments }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(Prop.string(Field.arguments, "Arguments to pass to the application"));
     }
 
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/control/LinkCheckerTool.java b/zsmith/src/main/java/airhacks/zsmith/tools/control/LinkCheckerTool.java
@@ -43,7 +43,7 @@ public String description() {
     enum Field { url }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(Prop.string(Field.url, "The URL to check"));
     }
 
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/control/ListFilesTool.java b/zsmith/src/main/java/airhacks/zsmith/tools/control/ListFilesTool.java
@@ -28,7 +28,7 @@ public String description() {
     }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.emptySchema();
     }
 
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/control/ReadAnyFileTool.java b/zsmith/src/main/java/airhacks/zsmith/tools/control/ReadAnyFileTool.java
@@ -21,7 +21,7 @@ public String description() {
     enum Field { path }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(Prop.string(Field.path, "Absolute path to the file to read"));
     }
 
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/control/ReadClipboardTool.java b/zsmith/src/main/java/airhacks/zsmith/tools/control/ReadClipboardTool.java
@@ -18,7 +18,7 @@ public String description() {
     }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.emptySchema();
     }
 
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/control/ReadFileTool.java b/zsmith/src/main/java/airhacks/zsmith/tools/control/ReadFileTool.java
@@ -31,7 +31,7 @@ public String description() {
     enum Field { path }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(Prop.string(Field.path, "Relative path to the file to read"));
     }
 
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/control/Tool.java b/zsmith/src/main/java/airhacks/zsmith/tools/control/Tool.java
@@ -12,7 +12,7 @@ public interface Tool {
 
     String description();
 
-    String inputSchema();
+    JSONObject inputSchema();
 
     String execute(JSONObject input);
 
@@ -22,7 +22,7 @@ default JSONObject toToolDefinition() {
         return new JSONObject()
                 .put("name", toolName())
                 .put("description", description())
-                .put("input_schema", new JSONObject(inputSchema()));
+                .put("input_schema", inputSchema());
     }
 
     record Prop<E extends Enum<E>>(E name, String type, String description, List<String> enumValues, boolean required) {
@@ -48,22 +48,23 @@ public Prop<E> optional() {
         }
     }
 
-    static Tool of(String name, String description, String inputSchema,
+    static Tool of(String name, String description, JSONObject inputSchema,
                    Function<JSONObject, String> execute) {
-        record SimpleTool(String toolName, String description, String inputSchema,
+        record SimpleTool(String toolName, String description, JSONObject inputSchema,
                           Function<JSONObject, String> fn) implements Tool {
             @Override
             public String execute(JSONObject input) { return fn.apply(input); }
         }
         return new SimpleTool(name, description, inputSchema, execute);
     }
 
-    static String emptySchema() {
-        return """
-                {"type":"object","properties":{}}""";
+    static JSONObject emptySchema() {
+        return new JSONObject()
+                .put("type", "object")
+                .put("properties", new JSONObject());
     }
 
-    static String schema(Prop<?>... props) {
+    static JSONObject schema(Prop<?>... props) {
         var properties = new JSONObject();
         var required = new JSONArray();
         for (var prop : props) {
@@ -84,6 +85,6 @@ static String schema(Prop<?>... props) {
         if (!required.isEmpty()) {
             schema.put("required", required);
         }
-        return schema.toString();
+        return schema;
     }
 }
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/control/UserConfirmationTool.java b/zsmith/src/main/java/airhacks/zsmith/tools/control/UserConfirmationTool.java
@@ -29,7 +29,7 @@ public String description() {
     enum Field { question }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(Prop.string(Field.question, "The yes/no question to ask the user"));
     }
 
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/control/UserMessageTool.java b/zsmith/src/main/java/airhacks/zsmith/tools/control/UserMessageTool.java
@@ -31,7 +31,7 @@ public String description() {
     enum Field { message }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(Prop.string(Field.message, "The message to present to the user"));
     }
 
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/control/UserQuestionTool.java b/zsmith/src/main/java/airhacks/zsmith/tools/control/UserQuestionTool.java
@@ -29,7 +29,7 @@ public String description() {
     enum Field { question }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(Prop.string(Field.question, "The question to ask the user"));
     }
 
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/control/WriteAnyFileTool.java b/zsmith/src/main/java/airhacks/zsmith/tools/control/WriteAnyFileTool.java
@@ -25,7 +25,7 @@ public String description() {
     enum Field { path, content, append }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(
                 Prop.string(Field.path, "Absolute path to the file to write"),
                 Prop.string(Field.content, "Content to write to the file"),
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/control/WriteClipboardTool.java b/zsmith/src/main/java/airhacks/zsmith/tools/control/WriteClipboardTool.java
@@ -20,7 +20,7 @@ public String description() {
     enum Field { text }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(Prop.string(Field.text, "The text to write to the clipboard"));
     }
 
diff --git a/zsmith/src/main/java/airhacks/zsmith/tools/control/WriteFileTool.java b/zsmith/src/main/java/airhacks/zsmith/tools/control/WriteFileTool.java
@@ -34,7 +34,7 @@ public String description() {
     enum Field { path, content, append }
 
     @Override
-    public String inputSchema() {
+    public JSONObject inputSchema() {
         return Tool.schema(
                 Prop.string(Field.path, "Relative path to the file to write (sandboxed)"),
                 Prop.string(Field.content, "Content to write to the file"),
diff --git a/zsmith/src/test/java/ExecuteScriptToolTest.java b/zsmith/src/test/java/ExecuteScriptToolTest.java
@@ -15,7 +15,7 @@ void main() throws IOException {
         // tool definition
         assert "execute_script".equals(tool.toolName()) : "expected 'execute_script' but got: " + tool.toolName();
         assert !tool.description().isBlank() : "description should not be blank";
-        assert !tool.inputSchema().isBlank() : "inputSchema should not be blank";
+        assert tool.inputSchema().has("properties") : "inputSchema should have properties";
 
         // execute successful script
         var hello = createScript(tempDir, "hello.sh", "#!/bin/sh\necho hello world");
diff --git a/zsmith/src/test/java/FetchUrlToolTest.java b/zsmith/src/test/java/FetchUrlToolTest.java
@@ -17,7 +17,7 @@ void main() {
     assert !tool.description().isBlank() : "description should be non-empty";
 
     // input schema contains url and required
-    var schema = tool.inputSchema();
+    var schema = tool.inputSchema().toString();
     assert schema.contains("\"url\"") : "inputSchema should contain '\"url\"'";
     assert schema.contains("\"required\"") : "inputSchema should contain '\"required\"'";
 
diff --git a/zsmith/src/test/java/LaunchAppToolTest.java b/zsmith/src/test/java/LaunchAppToolTest.java
@@ -8,7 +8,7 @@ void main() {
     // tool definition
     assert "open_in_editor".equals(tool.toolName()) : "expected 'open_in_editor' but got: " + tool.toolName();
     assert "Opens a file in VS Code".equals(tool.description()) : "unexpected description: " + tool.description();
-    assert !tool.inputSchema().isBlank() : "inputSchema should not be blank";
+    assert tool.inputSchema().has("properties") : "inputSchema should have properties";
 
     // execute with arguments
     var result = tool.execute(new JSONObject().put("arguments", "hello world"));
diff --git a/zsmith/src/test/java/LinkCheckerToolTest.java b/zsmith/src/test/java/LinkCheckerToolTest.java
@@ -15,7 +15,7 @@ void main() {
     assert !tool.description().isBlank() : "description should be non-empty";
 
     // input schema contains url and required
-    var schema = tool.inputSchema();
+    var schema = tool.inputSchema().toString();
     assert schema.contains("\"url\"") : "inputSchema should contain '\"url\"'";
     assert schema.contains("\"required\"") : "inputSchema should contain '\"required\"'";
 
diff --git a/zsmith/src/test/java/LoadSkillToolTest.java b/zsmith/src/test/java/LoadSkillToolTest.java
@@ -35,7 +35,7 @@ void main() throws IOException {
         // tool definition
         assert "load_skill".equals(tool.toolName()) : "expected 'load_skill' but got: " + tool.toolName();
         assert !tool.description().isBlank() : "description should not be blank";
-        assert !tool.inputSchema().isBlank() : "inputSchema should not be blank";
+        assert tool.inputSchema().has("properties") : "inputSchema should have properties";
     } finally {
         try (var walk = Files.walk(tempDir)) {
             walk.sorted(Comparator.reverseOrder())
diff --git a/zsmith/src/test/java/SubAgentToolTest.java b/zsmith/src/test/java/SubAgentToolTest.java
@@ -18,8 +18,8 @@ void main() throws Exception {
             : "description should mention agent name: " + tool.description();
 
     // input schema is valid
-    assert !tool.inputSchema().isBlank() : "inputSchema should not be blank";
-    assert tool.inputSchema().contains("task") : "inputSchema should have 'task' field";
+    assert tool.inputSchema().has("properties") : "inputSchema should have properties";
+    assert tool.inputSchema().toString().contains("task") : "inputSchema should have 'task' field";
 
     // tool definition shape
     var definition = tool.toToolDefinition();
diff --git a/zsmith/src/test/java/UserConfirmationToolTest.java b/zsmith/src/test/java/UserConfirmationToolTest.java
@@ -11,7 +11,7 @@ void main() {
     assert tool.description() != null && !tool.description().isBlank() : "description should be non-empty";
 
     // input schema contains question and required
-    var schema = tool.inputSchema();
+    var schema = tool.inputSchema().toString();
     assert schema.contains("\"question\"") : "inputSchema should contain '\"question\"'";
     assert schema.contains("\"required\"") : "inputSchema should contain '\"required\"'";
 
diff --git a/zsmith/src/test/java/WriteAnyFileToolTest.java b/zsmith/src/test/java/WriteAnyFileToolTest.java
@@ -15,7 +15,7 @@ void main() throws IOException {
     Objects.requireNonNull(tool.description(), "description should not be null");
     assert !tool.description().isBlank() : "description should be non-empty";
 
-    var schema = tool.inputSchema();
+    var schema = tool.inputSchema().toString();
     assert schema.contains("\"path\"") : "inputSchema should contain '\"path\"'";
     assert schema.contains("\"content\"") : "inputSchema should contain '\"content\"'";
     assert schema.contains("\"append\"") : "inputSchema should contain '\"append\"'";

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public String description() {`
`27`	`27`	`enum Field { name }`
`28`	`28`
`29`	`29`	`@Override`
`30`		`- public String inputSchema() {`
	`30`	`+ public JSONObject inputSchema() {`
`31`	`31`	`return Tool.schema(Prop.string(Field.name, "The name of the skill to load"));`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ enum Field {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`@Override`
`71`		`- public String inputSchema() {`
	`71`	`+ public JSONObject inputSchema() {`
`72`	`72`	`return Tool.schema(`
`73`	`73`	`Prop.string(Field.task, "The task to delegate to the sub-agent. Be specific and complete."));`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public String description() {`
`36`	`36`	`enum Field { path }`
`37`	`37`
`38`	`38`	`@Override`
`39`		`- public String inputSchema() {`
	`39`	`+ public JSONObject inputSchema() {`
`40`	`40`	`return Tool.schema(Prop.string(Field.path, "Path to the script to execute"));`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public String description() {`
`43`	`43`	`enum Field { url }`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- public String inputSchema() {`
	`46`	`+ public JSONObject inputSchema() {`
`47`	`47`	`return Tool.schema(Prop.string(Field.url, "The URL to fetch"));`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public String description() {`
`51`	`51`	`enum Field { arguments }`
`52`	`52`
`53`	`53`	`@Override`
`54`		`- public String inputSchema() {`
	`54`	`+ public JSONObject inputSchema() {`
`55`	`55`	`return Tool.schema(Prop.string(Field.arguments, "Arguments to pass to the application"));`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public String description() {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Override`
`31`		`- public String inputSchema() {`
	`31`	`+ public JSONObject inputSchema() {`
`32`	`32`	`return Tool.emptySchema();`
`33`	`33`	`}`
`34`	`34`