From 765eda955eb811d08d867ff4d3914fc6d60c22dd Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 16 Aug 2025 23:16:54 +0300 Subject: refactor(config): drop env-based config (except OPENAI_API_KEY) - Switch to config-file-only; only OPENAI_API_KEY read from env.\n- llm: replace env autodetect with Config + NewFromConfig; add newOpenAI/newOllama.\n- lsp: NewServer now accepts injected llm.Client.\n- cli: remove env overrides; extend appConfig with provider-specific fields; build client from config + OPENAI_API_KEY.\n- docs: update README (config-only, defaults to OpenAI, minimal example); simplify flags table.\n- add config.json.example.\n- prompts: enforce ;text; (no spaces) and add ;;text; to remove entire line; tests added. --- internal/lsp/server.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'internal/lsp/server.go') diff --git a/internal/lsp/server.go b/internal/lsp/server.go index ef51636..bfdbca2 100644 --- a/internal/lsp/server.go +++ b/internal/lsp/server.go @@ -35,7 +35,7 @@ type Server struct { startTime time.Time } -func NewServer(r io.Reader, w io.Writer, logger *log.Logger, logContext bool, maxTokens int, contextMode string, windowLines int, maxContextTokens int, noDiskIO bool) *Server { +func NewServer(r io.Reader, w io.Writer, logger *log.Logger, logContext bool, maxTokens int, contextMode string, windowLines int, maxContextTokens int, noDiskIO bool, client llm.Client) *Server { s := &Server{in: bufio.NewReader(r), out: w, logger: logger, docs: make(map[string]*document), logContext: logContext} if maxTokens <= 0 { maxTokens = 500 @@ -55,12 +55,7 @@ func NewServer(r io.Reader, w io.Writer, logger *log.Logger, logContext bool, ma s.maxContextTokens = maxContextTokens s.noDiskIO = noDiskIO s.startTime = time.Now() - if c, err := llm.NewDefault(); err != nil { - logging.Logf("lsp ", "llm disabled: %v", err) - } else { - s.llmClient = c - logging.Logf("lsp ", "llm enabled provider=%s model=%s", c.Name(), c.DefaultModel()) - } + s.llmClient = client return s } -- cgit v1.2.3