api: add json-verbose output format support + test

Author: psyb0t

api_server.py

@@ -11,6 +11,8 @@
 from fastapi.responses import FileResponse, Response
 from pydantic import BaseModel, ConfigDict, Field
 
+from jsonverbose import assemble  # noqa: E402
+
 app = FastAPI()
 
 
@@ -98,6 +100,7 @@ class RunRequest(BaseModel):
     append_system_prompt: Optional[str] = Field(None, alias="appendSystemPrompt")
     json_schema: Optional[str] = Field(None, alias="jsonSchema")
     effort: Optional[str] = None
+    output_format: Optional[str] = Field(None, alias="outputFormat")
     no_continue: bool = Field(False, alias="noContinue")
     resume: Optional[str] = None
     fire_and_forget: bool = Field(False, alias="fireAndForget")
@@ -109,7 +112,10 @@ def _build_args(req: RunRequest, with_continue: bool = False):
         args += ["--resume", req.resume]
     elif with_continue and not req.no_continue:
         args.append("--continue")
-    args += ["-p", req.prompt, "--output-format", "json"]
+    if req.output_format == "json-verbose":
+        args += ["-p", req.prompt, "--output-format", "stream-json", "--verbose"]
+    else:
+        args += ["-p", req.prompt, "--output-format", "json"]
     if req.model:
         args += ["--model", req.model]
     if req.system_prompt:
@@ -242,7 +248,14 @@ async def _disconnect_watcher():
     if not req.fire_and_forget and await request.is_disconnected():
         return Response(status_code=499)
 
-    return Response(content=_normalize_response(output), media_type="application/json")
+    if req.output_format == "json-verbose":
+        lines = output.decode().splitlines()
+        assembled = assemble(lines)
+        content = json.dumps(assembled).encode()
+    else:
+        content = _normalize_response(output)
+
+    return Response(content=content, media_type="application/json")
 
 
 @app.get("/files/{path:path}")

tests/test_api.sh

@@ -243,6 +243,23 @@ test_api_continue_fallback() {
     _api_stop "${API_CONTAINER}-cont"
 }
 
+# ── json-verbose output format ──────────────────────────────────────────────
+
+test_api_json_verbose() {
+    _api_start "${API_CONTAINER}-jv" || return 1
+
+    local out
+    out=$(post "$API_BASE/run" \
+        "{\"prompt\": \"read the file /etc/hostname and tell me what it says\", \"model\": \"$TEST_MODEL\", \"noContinue\": true, \"outputFormat\": \"json-verbose\"}")
+    assert_contains "$out" '"turns"' "json-verbose has turns array" || { _api_stop "${API_CONTAINER}-jv"; return 1; }
+    assert_contains "$out" '"tool_use"' "json-verbose has tool_use in turns" || { _api_stop "${API_CONTAINER}-jv"; return 1; }
+    assert_contains "$out" '"tool_result"' "json-verbose has tool_result in turns" || { _api_stop "${API_CONTAINER}-jv"; return 1; }
+    assert_contains "$out" '"system"' "json-verbose has system init" || { _api_stop "${API_CONTAINER}-jv"; return 1; }
+
+    echo "OK: api_json_verbose"
+    _api_stop "${API_CONTAINER}-jv"
+}
+
 ALL_TESTS+=(
     test_api_endpoints
     test_api_run
@@ -254,4 +271,5 @@ ALL_TESTS+=(
     test_api_no_continue
     test_api_append_system_prompt
     test_api_continue_fallback
+    test_api_json_verbose
 )