mirror of
https://github.com/Twigpine/zero.git
synced 2026-11-10 05:01:28 -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.
63 lines
2.2 KiB
Go
63 lines
2.2 KiB
Go
package agent
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/Gitlawb/zero/internal/lsp"
|
|
)
|
|
|
|
// fileDiagnosticsTimeout bounds one inline post-edit diagnostics check so a
|
|
// slow or wedged language server can never hang a tool call; on timeout the
|
|
// edit simply reports without a diagnostics block.
|
|
const fileDiagnosticsTimeout = 10 * time.Second
|
|
|
|
// NewFileDiagnostics adapts an *lsp.Manager to the per-edit inline diagnostics
|
|
// callback (tools.RunOptions.Diagnostics): it reads the just-written file,
|
|
// checks it against the file's language server, and formats error-severity
|
|
// diagnostics for the model. Warnings and hints are excluded — nagging about
|
|
// style on every edit is noise, while a type error the edit just introduced is
|
|
// exactly what the model should see before its next step. Diagnostics are
|
|
// rendered with workspace-relative paths: the absolute path would put the
|
|
// local username/home directory into the model prompt and session transcript
|
|
// on every edit. Returns nil when manager is nil, disabling inline diagnostics
|
|
// entirely.
|
|
func NewFileDiagnostics(manager *lsp.Manager, workspaceRoot string) func(context.Context, string) string {
|
|
if manager == nil {
|
|
return nil
|
|
}
|
|
return func(ctx context.Context, absPath string) string {
|
|
text, err := os.ReadFile(absPath)
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
checkCtx, cancel := context.WithTimeout(ctx, fileDiagnosticsTimeout)
|
|
defer cancel()
|
|
diagnostics, err := manager.Check(checkCtx, absPath, string(text))
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
errors := lsp.FilterBySeverity(diagnostics, lsp.SeverityError)
|
|
if len(errors) == 0 {
|
|
return ""
|
|
}
|
|
return lsp.FormatDiagnostics(diagnosticsDisplayPath(workspaceRoot, absPath), errors)
|
|
}
|
|
}
|
|
|
|
// diagnosticsDisplayPath renders absPath relative to the workspace root for
|
|
// model-facing output, falling back to the file's base name when the path is
|
|
// outside the workspace (a bare name still identifies the file without
|
|
// exposing the directory layout).
|
|
func diagnosticsDisplayPath(workspaceRoot, absPath string) string {
|
|
if workspaceRoot != "" {
|
|
if rel, err := filepath.Rel(workspaceRoot, absPath); err == nil && !strings.HasPrefix(rel, "..") {
|
|
return rel
|
|
}
|
|
}
|
|
return filepath.Base(absPath)
|
|
}
|