merge: integrate github/main — LocalRunner, real GeminiRunner, llm clientHEADmain

Merges 12 commits from github/main (formerly master) that were developed
independently. Key additions:
- LocalRunner: OpenAI-compatible local LLM execution (Ollama, LM Studio)
- Real GeminiRunner with full sandbox parity to ClaudeRunner
- llm.Client for enriching CI failures and elaboration via local model
- retry.ParseRetryAfter moved to shared package
- tokens_in/tokens_out columns in executions table

Conflict resolutions:
- Kept local main's VAPID/push, stories, projects, agent events schema
- Merged both sets of Config fields (local + LocalModel from github/main)
- Unified activePerAgent accounting (decActiveAgent helper)
- Removed duplicate helpers from claude.go (now in helpers.go)
- Fixed double-decrement bug in handleRunResult vs decActiveAgent

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

1 files changed, 22 insertions, 2 deletions

diff --git a/internal/cli/serve.go b/internal/cli/serve.go
index 581a064..459c35b 100644
--- a/internal/cli/serve.go
+++ b/internal/cli/serve.go
@@ -117,9 +117,25 @@ func serve(addr string) error {
 		},
 	}
 
+	localClient := buildLocalLLMClient(cfg.LocalModel, logger)
+	if localClient != nil {
+		runners["local"] = &executor.LocalRunner{
+			Client:             localClient,
+			Logger:             logger,
+			LogDir:             cfg.LogDir,
+			DefaultTemperature: cfg.LocalModel.DefaultTemperature,
+		}
+		logger.Info("local runner registered", "endpoint", cfg.LocalModel.Endpoint, "model", cfg.LocalModel.Model)
+	}
+
+
 	pool := executor.NewPool(cfg.MaxConcurrent, runners, store, logger)
-	if cfg.GeminiBinaryPath != "" {
-		pool.Classifier = &executor.Classifier{GeminiBinaryPath: cfg.GeminiBinaryPath}
+	pool.Classifier = &executor.Classifier{
+		LLM:              localClient,
+		GeminiBinaryPath: cfg.GeminiBinaryPath,
+	}
+	if localClient != nil {
+		pool.LLM = localClient
 	}
 
 	if err := store.SeedProjects(); err != nil {
@@ -154,6 +170,10 @@ func serve(addr string) error {
 	if cfg.WorkspaceRoot != "" {
 		srv.SetWorkspaceRoot(cfg.WorkspaceRoot)
 	}
+	if cfg.LocalModel.UseForElaborate() {
+		srv.SetLLM(localClient)
+		logger.Info("elaboration prefers local llm", "endpoint", cfg.LocalModel.Endpoint)
+	}
 	srv.SetGitHubWebhookConfig(cfg.WebhookSecret, cfg.Projects)
 
 	// Register scripts.