dcdpr / jp / 24551603658

66%

push

github

fix(llm): Replace `AutoEscape::Json` with custom formatter (#575)

The previous null-rendering fix set `AutoEscape::Json` globally on the
minijinja environment used by `run_tool_command`. That stopped null
values rendering as Jinja2's `none`, but introduced a new regression:
every string scalar was JSON-quoted at the point of interpolation. A
template like `just rfd-draft {{tool.arguments.title}}` would produce
`"Assistant-Initiated ..."` with literal surrounding quotes, breaking
downstream shell commands.

The fix replaces `AutoEscape::Json` with a custom formatter
(`format_tool_template_value`) that applies different rules depending on
the value kind. Scalars (strings, numbers, booleans) render raw so that
`{{tool.arguments.title}}` produces the bare string, matching what tool
authors expect. Composite values (maps, sequences) serialize as JSON,
preserving the original fix for `{{tool}}` interpolations. Null and
undefined values render as the literal `null` regardless of context.
Safe strings — produced by an explicit `| tojson` filter — pass through
unchanged, so opt-in JSON encoding still works without double-encoding.

Signed-off-by: Jean Mertz <git@jeanmertz.com>

15 of 19 new or added lines in 1 file covered. (78.95%)

22967 of 35743 relevant lines covered (64.26%)

192.21 hits per line