mirror of
https://github.com/patriceckhart/zot.git
synced 2026-07-02 16:19:51 +02:00
You see the file being composed in real time now. While the model is typing the tool_use JSON, the TUI renders a rules-wrapped syntax-highlighted preview that grows as deltas arrive. When the tool actually runs, the preview transitions to the final result without flicker. Before: the tool header appeared post-response, then "wrote N bytes" for write / "applied 1 edit" for edit. No live feedback. Now: as soon as the `path` field parses out of the partial JSON, the header shows `▸ write /Users/pat/Desktop/demo.ts`. As the `content` / `newText` string streams in, each delta extends the highlighted preview body immediately. Collapsed at the usual preview height with the standard `ctrl+o to expand` footer. Implementation: - internal/core/events.go: three new AgentEvent types, EvToolUseStart / EvToolUseArgs / EvToolUseEnd. They carry the tool id, name, and raw JSON deltas from the provider stream. - internal/core/agent.go: forwards the equivalent provider events instead of dropping them. EvToolCall (with fully-parsed args) still fires at EventDone as before, so existing consumers don't need to change. - internal/tui/partialjson.go: small escape-aware extractor that pulls one string field's value out of a partial JSON buffer as it grows. Handles \\ \" \n \t \r \b \f \/ and \uXXXX escapes; tolerates trailing incomplete escapes (returns the complete prefix and waits for more bytes). Second helper, ExtractLastNewText, walks to the most recent "newText":"..." inside an edits array so edit's streaming preview shows the edit currently being composed (not an earlier one that's already finished). - internal/tui/view.go: ToolCallView gains Streaming, RawJSONBuf, LivePath fields. renderToolCall dispatches to renderLiveToolBody while Streaming=true and Result=="". For `write` it shows the partial `content`; for `edit` it shows ` edit N (streaming)` plus the partial `newText`. Shared wrapLiveBody keeps the rule + collapse boilerplate in one place. - internal/agent/modes/interactive.go: handles the three new events. EvToolUseStart pre-creates the ToolCallView so the header appears instantly; EvToolUseArgs appends the delta and refreshes LivePath; EvToolUseEnd flips Streaming off. The pre-existing EvToolCall branch now updates the already-created view rather than replacing it. - internal/agent/modes/json.go: emits tool_use_start / tool_use_args / tool_use_end events so `zot --json` consumers can build their own live previews. - internal/agent/tools/write.go: tool result is now the written file body (same shape as read's result) with total_lines + start_line details. Keeps the visual transition from streaming preview to final result seamless, and gives the model the file contents in its own tool_result for follow-up turns. Tests: - internal/tui/partialjson_test.go: 9 cases on ExtractPartialStringField (complete, partial mid-word, escape variants, unfinished escapes) and 4 on ExtractLastNewText (no newText, partial, complete, multi-edit). Verified end-to-end via `zot --json "write ..."` and `zot --json "edit ..."` against the real API: 246 tool_use_args delta events on a 30-line write, preview fields extracted live, final file written correctly.
155 lines
3.4 KiB
Go
155 lines
3.4 KiB
Go
package tui
|
|
|
|
import "testing"
|
|
|
|
func TestExtractLastNewText(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
raw string
|
|
wantValue string
|
|
wantOK bool
|
|
wantDone bool
|
|
wantIdx int
|
|
}{
|
|
{
|
|
name: "no newText yet",
|
|
raw: `{"path":"/x","edits":[{"oldText":"a"}`,
|
|
wantValue: "",
|
|
wantOK: false,
|
|
wantDone: false,
|
|
wantIdx: 0,
|
|
},
|
|
{
|
|
name: "single newText partial",
|
|
raw: `{"edits":[{"oldText":"a","newText":"b`,
|
|
wantValue: "b",
|
|
wantOK: true,
|
|
wantDone: false,
|
|
wantIdx: 1,
|
|
},
|
|
{
|
|
name: "single newText complete",
|
|
raw: `{"edits":[{"oldText":"a","newText":"b"}]`,
|
|
wantValue: "b",
|
|
wantOK: true,
|
|
wantDone: true,
|
|
wantIdx: 1,
|
|
},
|
|
{
|
|
name: "two edits, second still streaming",
|
|
raw: `{"edits":[{"oldText":"x","newText":"y"},{"oldText":"a","newText":"hello wor`,
|
|
wantValue: "hello wor",
|
|
wantOK: true,
|
|
wantDone: false,
|
|
wantIdx: 2,
|
|
},
|
|
}
|
|
for _, c := range cases {
|
|
t.Run(c.name, func(t *testing.T) {
|
|
v, ok, done, idx := ExtractLastNewText(c.raw)
|
|
if v != c.wantValue || ok != c.wantOK || done != c.wantDone || idx != c.wantIdx {
|
|
t.Errorf("want (v=%q ok=%v done=%v idx=%d), got (v=%q ok=%v done=%v idx=%d)",
|
|
c.wantValue, c.wantOK, c.wantDone, c.wantIdx, v, ok, done, idx)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestExtractPartialStringField(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
raw string
|
|
field string
|
|
wantValue string
|
|
wantOK bool
|
|
wantDone bool
|
|
}{
|
|
{
|
|
name: "empty buffer",
|
|
raw: "",
|
|
field: "content",
|
|
wantValue: "",
|
|
wantOK: false,
|
|
wantDone: false,
|
|
},
|
|
{
|
|
name: "no such field",
|
|
raw: `{"path":"/x","foo":"bar"}`,
|
|
field: "content",
|
|
wantValue: "",
|
|
wantOK: false,
|
|
wantDone: false,
|
|
},
|
|
{
|
|
name: "complete",
|
|
raw: `{"path":"/x","content":"hello"}`,
|
|
field: "content",
|
|
wantValue: "hello",
|
|
wantOK: true,
|
|
wantDone: true,
|
|
},
|
|
{
|
|
name: "partial mid-word",
|
|
raw: `{"path":"/x","content":"hel`,
|
|
field: "content",
|
|
wantValue: "hel",
|
|
wantOK: true,
|
|
wantDone: false,
|
|
},
|
|
{
|
|
name: "escaped quote",
|
|
raw: `{"content":"say \"hi\""}`,
|
|
field: "content",
|
|
wantValue: `say "hi"`,
|
|
wantOK: true,
|
|
wantDone: true,
|
|
},
|
|
{
|
|
name: "escaped newline inside string",
|
|
raw: `{"content":"line1\nline2"}`,
|
|
field: "content",
|
|
wantValue: "line1\nline2",
|
|
wantOK: true,
|
|
wantDone: true,
|
|
},
|
|
{
|
|
name: "trailing backslash (unfinished escape)",
|
|
raw: `{"content":"line1\`,
|
|
field: "content",
|
|
wantValue: "line1",
|
|
wantOK: true,
|
|
wantDone: false,
|
|
},
|
|
{
|
|
name: "incomplete unicode escape",
|
|
raw: `{"content":"before\u00`,
|
|
field: "content",
|
|
wantValue: "before",
|
|
wantOK: true,
|
|
wantDone: false,
|
|
},
|
|
{
|
|
name: "key before value",
|
|
raw: `{"content":`,
|
|
field: "content",
|
|
wantValue: "",
|
|
wantOK: false,
|
|
wantDone: false,
|
|
},
|
|
}
|
|
|
|
for _, c := range cases {
|
|
t.Run(c.name, func(t *testing.T) {
|
|
v, ok, done := ExtractPartialStringField(c.raw, c.field)
|
|
if v != c.wantValue {
|
|
t.Errorf("value: want %q, got %q", c.wantValue, v)
|
|
}
|
|
if ok != c.wantOK {
|
|
t.Errorf("ok: want %v, got %v", c.wantOK, ok)
|
|
}
|
|
if done != c.wantDone {
|
|
t.Errorf("done: want %v, got %v", c.wantDone, done)
|
|
}
|
|
})
|
|
}
|
|
}
|