From 8e68313142272ab2007f6c92089ebb13abc9d34c Mon Sep 17 00:00:00 2001 From: Levi Neely <141506390+lneely@users.noreply.github.com> Date: Fri, 7 Aug 2026 07:38:09 +0200 Subject: [PATCH] =?UTF-8?q?remove=20agent/complete.go=20=E2=80=94=20comple?= =?UTF-8?q?tions=20now=20go=20through=20/generate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Delete agent/complete.go (110 lines) - The kate plugin builds the completion prompt inline and calls ollie-9p rdwr generate instead of ollie-9p rdwr complete --- agent/complete.go | 110 ---------------------------------------------- 1 file changed, 110 deletions(-) delete mode 100644 agent/complete.go diff --git a/agent/complete.go b/agent/complete.go deleted file mode 100644 index b79e636..0000000 --- a/agent/complete.go +++ /dev/null @@ -1,110 +0,0 @@ -package agent - -import ( - "context" - "fmt" - "os" - "strings" - - "ollie/backend" - "ollie/paths" -) - -// Complete performs a stateless one-shot code completion. -// -// TRANSITIONAL: This is an ephemeral agent — no history, no lifecycle, just -// prompt→completion. The intent is to unify this with the Agent struct such -// that one composes the other (a full Agent IS-A one-shot with state layered on). -func Complete(cwd, filePath, prefix, suffix, extraContext string) (string, error) { - if cwd == "" { - cwd, _ = os.Getwd() - } - cwd = paths.ExpandHome(os.ExpandEnv(cwd)) - - model := os.Getenv("OLLIE_COMPLETE_MODEL") - backendName := os.Getenv("OLLIE_COMPLETE_BACKEND") - if model == "" || backendName == "" { - cfg := loadModelsConfig() - if model == "" && cfg.Completion.Model != "" { - model = cfg.Completion.Model - } - if backendName == "" && cfg.Completion.Backend != "" { - backendName = cfg.Completion.Backend - } - } - if model == "" || backendName == "" { - return "", fmt.Errorf("OLLIE_COMPLETE_MODEL and OLLIE_COMPLETE_BACKEND must be set (or configured in models.yaml)") - } - - const prefixMax = 12000 - const suffixMax = 1000 - if len(prefix) > prefixMax { - prefix = prefix[len(prefix)-prefixMax:] - } - if len(suffix) > suffixMax { - suffix = suffix[:suffixMax] - } - - fileHint := "" - if filePath != "" { - fileHint = " in " + filePath - } - contextBlock := "" - if extraContext != "" { - contextBlock = "\n" + extraContext - } - prompt := fmt.Sprintf(`Implement the code at the cursor%s. The prefix ends at the point where new code is needed. Write the implementation — do not echo stubs, TODOs, or placeholder returns from the prefix. Output ONLY raw code. No reasoning, no shell commands, no explanations, no markdown fences, no backticks, no preamble. Your entire response must be valid code that can be inserted directly into the file. -%s - -%s - - -%s -`, fileHint, contextBlock, prefix, suffix) - - result, err := backend.Generate(context.Background(), backend.GenerateRequest{ - Prompt: prompt, - Backend: backendName, - Model: model, - }) - if err != nil { - return "", err - } - - result = stripCompletionNoise(result) - result = stripPrefixEcho(prefix, result) - return result, nil -} - -func stripCompletionNoise(s string) string { - var lines []string - for _, line := range strings.Split(s, "\n") { - trimmed := strings.TrimSpace(line) - if strings.HasPrefix(trimmed, "```") { - continue - } - if trimmed == "" || trimmed == "" || - trimmed == "" || trimmed == "" { - continue - } - if strings.HasPrefix(trimmed, ":: ") { - continue - } - lines = append(lines, line) - } - return strings.Join(lines, "\n") -} - -func stripPrefixEcho(prefix, result string) string { - tailMax := 200 - if len(prefix) < tailMax { - tailMax = len(prefix) - } - for i := tailMax; i > 0; i-- { - tail := prefix[len(prefix)-i:] - if strings.HasPrefix(result, tail) { - return result[len(tail):] - } - } - return result -}