mirror of
https://github.com/Twigpine/zero.git
synced 2026-11-11 18:00:54 -10:00
Kevin Codex
3c81fea228
* feat: agent quality, caching, retry, and tooling upgrades Ten self-contained improvements to the core agent engine and tools: - edit_file: fuzzy fallback matching (7-strategy cascade with uniqueness protection and a disproportion guard) when old_string does not match byte-for-byte; exact match remains the fast path - edit_file/write_file: inline error-severity LSP diagnostics in tool output so the model sees a break it introduced in the same turn - lsp: expand server registry from 4 to 28 languages; doctor grades only tier-1 servers and lists the long tail informationally - agent: consecutive read-only tool calls execute concurrently (bounded at 8), consumed in original order, never spanning a mutating call - anthropic: cache_control breakpoints on the last two conversation messages so the transcript prefix stays a prompt-cache hit - providerio: retry schedule raised to 6 attempts with exponential 2s-30s backoff when the server sends no Retry-After - tools: truncated exec/bash output spills to a redacted temp file referenced in the truncation notice; bash output (previously unbounded) now shares exec_command's token budget - web_fetch: dependency-free HTML-to-markdown conversion (format: auto|raw|markdown) and larger limits (256KiB default, 2MiB max, 30s) - modelregistry: live models.dev overlay refreshes context limits and base pricing from a TTL-cached fetch; opt-in at the CLI entrypoint - tools: opt-in format-on-write (ZERO_FORMAT_ON_WRITE=1) runs standard formatters across 27 extensions, ordered before the file-tracker re-baseline so conflict detection is preserved * fix: address PR review feedback on fuzzy edits, diagnostics, spill - edit_file: adapt the replacement to the fuzzy-resolved span — when the span is a uniformly deeper-indented copy of old_string (line-trimmed / indentation-flexible matches), the same indentation delta is applied to new_string, and a span ending in a bare CR keeps its CR so CRLF files never gain a mixed line ending; block-anchor matches with drifted interiors are deliberately left untouched - diagnostics: render workspace-relative paths in inline post-edit diagnostics (base name outside the workspace) so absolute paths never leak the local username or directory layout into the model prompt or session transcript - spill: harden the spill directory for shared temp dirs — per-uid name, reject symlinked or non-directory paths (MkdirAll follows symlinks), and on Unix require current-user ownership - bash: the branch's output cap and truncation-flag threading are superseded by main's capture-time bounding (boundedBuffer + budgetBashCapture), which already sets Result.Truncated; this rebase adopts that design and keeps spill-to-disk on exec_command, where the full output is still buffered and a spill is genuinely complete * fix: address review round 2 — permission-event race, fuzzy ambiguity, spill reachability - agent: serialize OnPermission behind the same mutex as OnPermissionRequest in the parallel read batch. buildPermissionEvent fires for batched reads with a non-trivial sandbox decision (e.g. a grant-matched extra root), and front-end handlers append to shared session-recording state without their own locking — two batched reads emitting concurrently was a data race the pre-batch serial loop never allowed. - edit_file: reject two or more DISTINCT candidate spans from one fuzzy strategy as ambiguous instead of silently editing the first. Duplicate blocks at different indentation each resolve to a unique literal, so the previous occurrence-uniqueness check passed and wrote the wrong span. A single candidate occurring at multiple positions still cascades to stricter strategies as before. - tools: make spill files actually reachable by the recovery path the truncation notice advertises — resolveScopedReadPath now recognizes files inside the per-uid spill dir (containment verified after symlink resolution, so a planted link cannot smuggle an out-of-scope file through the gate); read_file/grep can follow the notice instead of re-running the command. * fix: surface competing block-anchor spans; make write-barrier test observe cross-probe order - edit_file: blockAnchorReplacer now returns every span clearing the similarity threshold (best first) instead of silently picking the single most-similar block. Hiding competitors from the cascade's distinct-candidate check could edit the wrong block when two blocks share anchors and both interiors are plausible; one clear winner still resolves, two plausible blocks now report ambiguity (covered by a two-block test that asserts the file is untouched). - agent tests: the parallel write-barrier test now records both probes into one mutex-guarded shared log and asserts the cross-probe ordering it always claimed to (write starts after the first read batch ends; second read batch starts after the write ends). The previous version only compared indices within the read probe's own log, which a regression letting the write overlap a batch could still pass; the stray no-op mutex assignment is gone.
98 lines
3.8 KiB
Go
98 lines
3.8 KiB
Go
package tools
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// Format-on-write for the mutating file tools. When enabled, a successful
|
|
// edit_file/write_file runs the language's standard formatter on the file it
|
|
// just wrote, so the model's output always lands in project-canonical style
|
|
// and never fails a CI format check it cannot see. Off by default (set
|
|
// ZERO_FORMAT_ON_WRITE=1): auto-reformatting changes bytes the model did not
|
|
// write, which strict workflows may not want.
|
|
//
|
|
// Ordering matters: formatting runs BEFORE the FileTracker re-baseline, and
|
|
// the caller records the POST-format content. Formatting after the baseline
|
|
// would make the very next edit look like an external modification and trip
|
|
// the conflict guard.
|
|
|
|
// formatOnWriteTimeout bounds one formatter run; a wedged formatter must never
|
|
// hang a tool call. On timeout the unformatted write stands.
|
|
const formatOnWriteTimeout = 10 * time.Second
|
|
|
|
// formatterCommands maps a file extension to the formatter argv; the file path
|
|
// is appended as the final argument. Only in-place, config-respecting,
|
|
// community-standard formatters — a missing binary silently skips formatting.
|
|
var formatterCommands = map[string][]string{
|
|
".go": {"gofmt", "-w"},
|
|
".rs": {"rustfmt"},
|
|
".py": {"ruff", "format", "--quiet"},
|
|
".ts": {"prettier", "--log-level", "silent", "--write"},
|
|
".tsx": {"prettier", "--log-level", "silent", "--write"},
|
|
".js": {"prettier", "--log-level", "silent", "--write"},
|
|
".jsx": {"prettier", "--log-level", "silent", "--write"},
|
|
".json": {"prettier", "--log-level", "silent", "--write"},
|
|
".css": {"prettier", "--log-level", "silent", "--write"},
|
|
".scss": {"prettier", "--log-level", "silent", "--write"},
|
|
".html": {"prettier", "--log-level", "silent", "--write"},
|
|
".md": {"prettier", "--log-level", "silent", "--write"},
|
|
".yaml": {"prettier", "--log-level", "silent", "--write"},
|
|
".yml": {"prettier", "--log-level", "silent", "--write"},
|
|
".zig": {"zig", "fmt"},
|
|
".dart": {"dart", "format"},
|
|
".tf": {"terraform", "fmt"},
|
|
".gleam": {"gleam", "format"},
|
|
".sh": {"shfmt", "-w"},
|
|
".bash": {"shfmt", "-w"},
|
|
".c": {"clang-format", "-i"},
|
|
".h": {"clang-format", "-i"},
|
|
".cpp": {"clang-format", "-i"},
|
|
".hpp": {"clang-format", "-i"},
|
|
".cc": {"clang-format", "-i"},
|
|
".kt": {"ktlint", "-F"},
|
|
".swift": {"swiftformat"},
|
|
".lua": {"stylua"},
|
|
}
|
|
|
|
// formatOnWriteEnabled reports whether the opt-in env toggle is set.
|
|
func formatOnWriteEnabled() bool {
|
|
value := strings.TrimSpace(os.Getenv("ZERO_FORMAT_ON_WRITE"))
|
|
return value != "" && value != "0" && !strings.EqualFold(value, "false")
|
|
}
|
|
|
|
// maybeFormatWrittenFile runs the configured formatter for absolutePath (when
|
|
// enabled and on PATH) and returns the file's content afterwards. Best-effort
|
|
// throughout: any failure — no formatter, formatter error, timeout, unreadable
|
|
// result — returns writtenContent so the caller's state matches the last write
|
|
// it performed itself.
|
|
func maybeFormatWrittenFile(ctx context.Context, absolutePath string, writtenContent string) string {
|
|
if !formatOnWriteEnabled() {
|
|
return writtenContent
|
|
}
|
|
command, ok := formatterCommands[strings.ToLower(filepath.Ext(absolutePath))]
|
|
if !ok {
|
|
return writtenContent
|
|
}
|
|
if _, err := exec.LookPath(command[0]); err != nil {
|
|
return writtenContent
|
|
}
|
|
formatCtx, cancel := context.WithTimeout(ctx, formatOnWriteTimeout)
|
|
defer cancel()
|
|
arguments := append(append([]string(nil), command[1:]...), absolutePath)
|
|
formatter := exec.CommandContext(formatCtx, command[0], arguments...)
|
|
formatter.Dir = filepath.Dir(absolutePath)
|
|
if err := formatter.Run(); err != nil {
|
|
return writtenContent
|
|
}
|
|
formatted, err := os.ReadFile(absolutePath)
|
|
if err != nil {
|
|
return writtenContent
|
|
}
|
|
return string(formatted)
|
|
}
|