Merge pull request #16 from beyond5959/dev

feat(agents): add Kimi CLI provider

Author: beyond5959

PROGRESS.md

@@ -4,20 +4,35 @@
 
 Code Agent Hub Server is a Go service that exposes HTTP/JSON APIs and SSE streaming for multi-client, multi-thread agent turns.
 The system targets ACP-compatible agent providers, lazily starts per-thread agents, persists interaction history in SQLite, and bridges runtime permission requests back to clients.
-Current built-in providers are `codex`, `claude`, `opencode`, `gemini`, and `qwen`.
+Current built-in providers are `codex`, `claude`, `opencode`, `gemini`, `kimi`, and `qwen`.
 This file is the source of milestone progress, validation commands, and next actions.
 
 ## Current Milestone
 
 - `Post-M8` ACP multi-agent readiness and maintenance.
 
-## Latest Update (2026-03-08)
-
-- release pipeline compatibility fix for GoReleaser v2:
-  - removed unsupported CLI argument `--skip=dirty` from `.github/workflows/release.yml` (`release --clean` only).
-  - keeps release workflow behavior unchanged while restoring successful tagged release builds.
+## Latest Update (2026-03-09)
+
+- Kimi CLI ACP integration completed:
+  - implemented `internal/agents/kimi` with one-turn ACP stdio lifecycle and fail-closed permission handling.
+  - wired `kimi` into startup preflight, `/v1/agents`, thread allowlist, turn factory, model discovery, and startup config-catalog refresh.
+  - added dual startup syntax fallback for current upstream docs drift: try `kimi acp`, then `kimi --acp` if ACP initialize closes immediately.
+  - added fake-process provider tests, fallback coverage, and server/httpapi allowlist coverage.
+  - fixed Kimi thread model switching: `POST /v1/threads/{threadId}/config-options` with `configId=model` now selects the target model via Kimi process startup `--model`, instead of assuming ACP `session/set_config_option(model)` is implemented.
+  - Kimi stream/config discovery paths now also pass the selected model through both process startup args and `session/new` hints for compatibility.
+- Shared agent config/state refactor completed:
+  - extracted common built-in agent fields `Dir`, `ModelID`, and `ConfigOverrides` into shared `internal/agents/agentutil.Config`.
+  - extracted shared thread-safe mutable agent state into `internal/agents/agentutil.State`.
+  - migrated `gemini`, `opencode`, `qwen`, `kimi`, `codex`, and `claude` to reuse the shared state helper instead of keeping duplicated per-provider copies of model/config override logic.
+  - kept protocol/runtime behavior provider-specific; only constructor validation and common mutable state handling were unified.
+- Web UI Kimi icon completed:
+  - downloaded the provided Kimi PNG asset into `internal/webui/web/public/kimi-icon.png`.
+  - wired `kimi` avatar rendering in the Web UI to use the new asset with the existing `--contain` image treatment.
+  - fixed the remaining New Thread modal agent-card icon map so Kimi now renders consistently there as well.
+  - removed the forced white background from all `--contain` agent icons in message/thread views and from the modal's Kimi/OpenCode icon markup.
 - validation:
-  - pass: `go test ./...` (in this repository)
+  - pass: `cd internal/webui/web && npm run build`
+  - pass: `go test ./...`
 
 ## Status
 
@@ -99,7 +114,7 @@ This file is the source of milestone progress, validation commands, and next act
   - updated docs and tests to reflect absolute-cwd policy.
 - `Post-M8` docs framing update completed:
   - adjusted README/SPEC/API/ARCHITECTURE wording to emphasize ACP-compatible multi-agent goal.
-  - kept current-state note explicit: built-in providers are `codex`, `claude`, `opencode`, `gemini`, and `qwen`.
+  - kept current-state note explicit: built-in providers are `codex`, `claude`, `opencode`, `gemini`, `kimi`, and `qwen`.
   - simplified README startup path to `agent-hub-server` with explicit `agent-hub-server --help` guidance.
 - `Post-M8` startup log UX simplification completed:
   - replaced startup JSON line with multi-line human-readable stderr summary (QR code + port and URL hint).
@@ -412,10 +427,11 @@ This file is the source of milestone progress, validation commands, and next act
   - successful thread option update closes cached per-thread provider, so next turn re-initializes with new model config.
   - wired runtime model discovery into all providers:
     - `codex`/`claude`: ACP embedded `session/new.configOptions`.
-    - `gemini`/`opencode`/`qwen`: ACP `session/new.models.availableModels`.
+    - `gemini`/`kimi`/`opencode`/`qwen`: ACP `session/new.models.availableModels`.
   - wired `agentOptions.modelId` forwarding into all providers:
     - embedded `codex`/`claude` now pass `model` in ACP `session/new`.
     - `gemini` now passes `model` in `session/new` and `session/prompt`.
+    - `kimi` passes `model` in `session/prompt`, and uses `model` + `modelId` during config/model discovery handshakes.
     - `opencode` passes `modelId` in `session/prompt`; `qwen` passes `model` in `session/prompt`.
   - Web UI updates:
     - new-thread modal model selector removed (create flow keeps agent/cwd/title/advanced JSON only).
@@ -432,7 +448,7 @@ This file is the source of milestone progress, validation commands, and next act
   - `POST` now applies model changes through ACP `session/set_config_option` (no separate apply endpoint/action).
   - provider-side config option support added across all built-in agents:
     - embedded: `codex`, `claude` (in-session `session/set_config_option` on cached runtime).
-    - stdio: `opencode`, `qwen`, `gemini` (ACP handshake + `session/set_config_option` apply path, then persist selected model for next turns).
+    - stdio: `opencode`, `qwen`, `gemini`, `kimi` (ACP handshake + `session/set_config_option` apply path, then persist selected model for next turns).
   - Web UI changes:
     - removed thread header `Apply` button.
     - model dropdown now applies immediately on selection.

README.md

@@ -10,7 +10,7 @@
 
 ## What is Ngent?
 
-Ngent acts as a bridge between **ACP-compatible agents** (like Claude Code, Codex, Gemini CLI) and **web clients**:
+Ngent acts as a bridge between **ACP-compatible agents** (like Claude Code, Codex, Gemini CLI, Kimi CLI) and **web clients**:
 
 ```
 ┌─────────────┐     HTTP/WebSocket     ┌─────────┐     JSON-RPC (ACP)     ┌──────────────┐
@@ -21,13 +21,13 @@ Ngent acts as a bridge between **ACP-compatible agents** (like Claude Code, Code
 
 ### How it Works
 
-1. **ACP Protocol**: Agents like Claude Code and Codex expose their capabilities through the Agent Client Protocol (ACP) — a JSON-RPC protocol over stdio
+1. **ACP Protocol**: Agents like Claude Code, Codex, and Kimi CLI expose their capabilities through the Agent Client Protocol (ACP) — a JSON-RPC protocol over stdio
 2. **Ngent Bridge**: Ngent spawns these CLI agents as child processes and translates their ACP protocol into HTTP/JSON APIs
 3. **Web Interface**: Provides a built-in Web UI and REST API for creating conversations, sending prompts, and managing permissions
 
 ### Features
 
-- 🔌 **Multi-Agent Support**: Works with any ACP-compatible agent (Codex, Claude Code, Gemini, Qwen, OpenCode)
+- 🔌 **Multi-Agent Support**: Works with any ACP-compatible agent (Codex, Claude Code, Gemini, Kimi, Qwen, OpenCode)
 - 🌐 **Web API**: HTTP/JSON endpoints with Server-Sent Events (SSE) for streaming responses
 - 🖥️ **Built-in UI**: No separate frontend deployment needed — the web UI is embedded in the binary
 - 🔒 **Permission Control**: Fine-grained approval system for agent file/system operations
@@ -42,6 +42,7 @@ Ngent acts as a bridge between **ACP-compatible agents** (like Claude Code, Code
 | Codex | ✅ |
 | Claude Code | ✅ |
 | Gemini CLI | ✅ |
+| Kimi CLI | ✅ |
 | Qwen Code | ✅ |
 | OpenCode | ✅ |
 

cmd/ngent/main.go

@@ -24,6 +24,7 @@ import (
 	claudeagent "github.com/beyond5959/ngent/internal/agents/claude"
 	codexagent "github.com/beyond5959/ngent/internal/agents/codex"
 	geminiagent "github.com/beyond5959/ngent/internal/agents/gemini"
+	kimiagent "github.com/beyond5959/ngent/internal/agents/kimi"
 	opencodeagent "github.com/beyond5959/ngent/internal/agents/opencode"
 	qwenagent "github.com/beyond5959/ngent/internal/agents/qwen"
 	"github.com/beyond5959/ngent/internal/httpapi"
@@ -58,6 +59,7 @@ func main() {
 	codexPreflightErr := codexagent.Preflight(codexRuntimeConfig)
 	opencodePreflightErr := opencodeagent.Preflight()
 	geminiPreflightErr := geminiagent.Preflight()
+	kimiPreflightErr := kimiagent.Preflight()
 	qwenPreflightErr := qwenagent.Preflight()
 	claudePreflightErr := claudeagent.Preflight()
 
@@ -85,6 +87,7 @@ func main() {
 	codexAvailable := codexPreflightErr == nil
 	opencodeAvailable := opencodePreflightErr == nil
 	geminiAvailable := geminiPreflightErr == nil
+	kimiAvailable := kimiPreflightErr == nil
 	qwenAvailable := qwenPreflightErr == nil
 	claudeAvailable := claudePreflightErr == nil
 	if codexPreflightErr != nil {
@@ -96,13 +99,16 @@ func main() {
 	if geminiPreflightErr != nil {
 		logger.Warn("startup.gemini_unavailable", "error", geminiPreflightErr.Error())
 	}
+	if kimiPreflightErr != nil {
+		logger.Warn("startup.kimi_unavailable", "error", kimiPreflightErr.Error())
+	}
 	if qwenPreflightErr != nil {
 		logger.Warn("startup.qwen_unavailable", "error", qwenPreflightErr.Error())
 	}
 	if claudePreflightErr != nil {
 		logger.Warn("startup.claude_unavailable", "error", claudePreflightErr.Error())
 	}
-	agents := supportedAgents(codexAvailable, opencodeAvailable, geminiAvailable, qwenAvailable, claudeAvailable)
+	agents := supportedAgents(codexAvailable, opencodeAvailable, geminiAvailable, kimiAvailable, qwenAvailable, claudeAvailable)
 
 	listenAddr, port, err := validateListenAddr(*listenAddrFlag, *allowPublic)
 	if err != nil {
@@ -136,7 +142,7 @@ func main() {
 	handler := httpapi.New(httpapi.Config{
 		AuthToken:       *authToken,
 		Agents:          agents,
-		AllowedAgentIDs: []string{"codex", "opencode", "gemini", "qwen", "claude"},
+		AllowedAgentIDs: []string{"codex", "opencode", "gemini", "kimi", "qwen", "claude"},
 		AllowedRoots:    allowedRoots,
 		Store:           store,
 		TurnController:  turnController,
@@ -164,6 +170,12 @@ func main() {
 					ModelID:         modelID,
 					ConfigOverrides: configOverrides,
 				})
+			case "kimi":
+				return kimiagent.New(kimiagent.Config{
+					Dir:             thread.CWD,
+					ModelID:         modelID,
+					ConfigOverrides: configOverrides,
+				})
 			case "qwen":
 				return qwenagent.New(qwenagent.Config{
 					Dir:             thread.CWD,
@@ -205,6 +217,11 @@ func main() {
 					return nil, geminiPreflightErr
 				}
 				return geminiagent.DiscoverModels(ctx, geminiagent.Config{Dir: modelDiscoveryDir})
+			case "kimi":
+				if kimiPreflightErr != nil {
+					return nil, kimiPreflightErr
+				}
+				return kimiagent.DiscoverModels(ctx, kimiagent.Config{Dir: modelDiscoveryDir})
 			case "qwen":
 				if qwenPreflightErr != nil {
 					return nil, qwenPreflightErr
@@ -236,6 +253,7 @@ func main() {
 		codexPreflightErr,
 		opencodePreflightErr,
 		geminiPreflightErr,
+		kimiPreflightErr,
 		qwenPreflightErr,
 		claudePreflightErr,
 	))
@@ -315,6 +333,7 @@ func buildAgentConfigCatalogRefresher(
 	codexPreflightErr error,
 	opencodePreflightErr error,
 	geminiPreflightErr error,
+	kimiPreflightErr error,
 	qwenPreflightErr error,
 	claudePreflightErr error,
 ) *agentConfigCatalogRefresher {
@@ -328,7 +347,7 @@ func buildAgentConfigCatalogRefresher(
 	return &agentConfigCatalogRefresher{
 		store:    store,
 		logger:   logger,
-		agentIDs: []string{"codex", "claude", "gemini", "qwen", "opencode"},
+		agentIDs: []string{"codex", "claude", "gemini", "kimi", "qwen", "opencode"},
 		fetchConfigOptions: func(ctx context.Context, agentID, modelID string) ([]agentimpl.ConfigOption, error) {
 			switch agentID {
 			case "codex":
@@ -370,6 +389,18 @@ func buildAgentConfigCatalogRefresher(
 					return nil, err
 				}
 				return queryAgentConfigOptions(ctx, client)
+			case "kimi":
+				if kimiPreflightErr != nil {
+					return nil, kimiPreflightErr
+				}
+				client, err := kimiagent.New(kimiagent.Config{
+					Dir:     modelDiscoveryDir,
+					ModelID: modelID,
+				})
+				if err != nil {
+					return nil, err
+				}
+				return queryAgentConfigOptions(ctx, client)
 			case "qwen":
 				if qwenPreflightErr != nil {
 					return nil, qwenPreflightErr
@@ -426,6 +457,11 @@ func buildAgentConfigCatalogRefresher(
 					return nil, geminiPreflightErr
 				}
 				return geminiagent.DiscoverModels(ctx, geminiagent.Config{Dir: modelDiscoveryDir})
+			case "kimi":
+				if kimiPreflightErr != nil {
+					return nil, kimiPreflightErr
+				}
+				return kimiagent.DiscoverModels(ctx, kimiagent.Config{Dir: modelDiscoveryDir})
 			case "qwen":
 				if qwenPreflightErr != nil {
 					return nil, qwenPreflightErr
@@ -668,7 +704,7 @@ func extractConfigOverrides(agentOptionsJSON string) map[string]string {
 	return normalized
 }
 
-func supportedAgents(codexAvailable, opencodeAvailable, geminiAvailable, qwenAvailable, claudeAvailable bool) []httpapi.AgentInfo {
+func supportedAgents(codexAvailable, opencodeAvailable, geminiAvailable, kimiAvailable, qwenAvailable, claudeAvailable bool) []httpapi.AgentInfo {
 	codexStatus := "unavailable"
 	if codexAvailable {
 		codexStatus = "available"
@@ -681,6 +717,10 @@ func supportedAgents(codexAvailable, opencodeAvailable, geminiAvailable, qwenAva
 	if geminiAvailable {
 		geminiStatus = "available"
 	}
+	kimiStatus := "unavailable"
+	if kimiAvailable {
+		kimiStatus = "available"
+	}
 	qwenStatus := "unavailable"
 	if qwenAvailable {
 		qwenStatus = "available"
@@ -694,6 +734,7 @@ func supportedAgents(codexAvailable, opencodeAvailable, geminiAvailable, qwenAva
 		{ID: "codex", Name: "Codex", Status: codexStatus},
 		{ID: "claude", Name: "Claude Code", Status: claudeStatus},
 		{ID: "gemini", Name: "Gemini CLI", Status: geminiStatus},
+		{ID: "kimi", Name: "Kimi CLI", Status: kimiStatus},
 		{ID: "qwen", Name: "Qwen Code", Status: qwenStatus},
 		{ID: "opencode", Name: "OpenCode", Status: opencodeStatus},
 	}

cmd/ngent/main_test.go

@@ -263,7 +263,7 @@ func TestAgentConfigCatalogRefresherPartialKeepsExistingRows(t *testing.T) {
 }
 
 func TestSupportedAgentsCodexStatus(t *testing.T) {
-	agentsUnavailable := supportedAgents(false, false, false, false, false)
+	agentsUnavailable := supportedAgents(false, false, false, false, false, false)
 	if len(agentsUnavailable) == 0 {
 		t.Fatalf("supportedAgents returned empty list")
 	}
@@ -279,23 +279,29 @@ func TestSupportedAgentsCodexStatus(t *testing.T) {
 	if agentsUnavailable[1].Status != "unavailable" {
 		t.Fatalf("claude unavailable status = %q, want %q", agentsUnavailable[1].Status, "unavailable")
 	}
-	if got, want := len(agentsUnavailable), 5; got != want {
+	if got, want := len(agentsUnavailable), 6; got != want {
 		t.Fatalf("len(agentsUnavailable) = %d, want %d", got, want)
 	}
-	if agentsUnavailable[3].ID != "qwen" {
-		t.Fatalf("agents[3].ID = %q, want %q", agentsUnavailable[3].ID, "qwen")
+	if agentsUnavailable[3].ID != "kimi" {
+		t.Fatalf("agents[3].ID = %q, want %q", agentsUnavailable[3].ID, "kimi")
 	}
 	if agentsUnavailable[3].Status != "unavailable" {
-		t.Fatalf("qwen unavailable status = %q, want %q", agentsUnavailable[3].Status, "unavailable")
+		t.Fatalf("kimi unavailable status = %q, want %q", agentsUnavailable[3].Status, "unavailable")
 	}
-	if agentsUnavailable[4].ID != "opencode" {
-		t.Fatalf("agents[4].ID = %q, want %q", agentsUnavailable[4].ID, "opencode")
+	if agentsUnavailable[4].ID != "qwen" {
+		t.Fatalf("agents[4].ID = %q, want %q", agentsUnavailable[4].ID, "qwen")
 	}
 	if agentsUnavailable[4].Status != "unavailable" {
-		t.Fatalf("opencode unavailable status = %q, want %q", agentsUnavailable[4].Status, "unavailable")
+		t.Fatalf("qwen unavailable status = %q, want %q", agentsUnavailable[4].Status, "unavailable")
+	}
+	if agentsUnavailable[5].ID != "opencode" {
+		t.Fatalf("agents[5].ID = %q, want %q", agentsUnavailable[5].ID, "opencode")
+	}
+	if agentsUnavailable[5].Status != "unavailable" {
+		t.Fatalf("opencode unavailable status = %q, want %q", agentsUnavailable[5].Status, "unavailable")
 	}
 
-	agentsAvailable := supportedAgents(true, true, true, true, true)
+	agentsAvailable := supportedAgents(true, true, true, true, true, true)
 	if agentsAvailable[0].Status != "available" {
 		t.Fatalf("codex available status = %q, want %q", agentsAvailable[0].Status, "available")
 	}
@@ -305,20 +311,26 @@ func TestSupportedAgentsCodexStatus(t *testing.T) {
 	if agentsAvailable[1].Status != "available" {
 		t.Fatalf("claude available status = %q, want %q", agentsAvailable[1].Status, "available")
 	}
-	if got, want := len(agentsAvailable), 5; got != want {
+	if got, want := len(agentsAvailable), 6; got != want {
 		t.Fatalf("len(agentsAvailable) = %d, want %d", got, want)
 	}
-	if agentsAvailable[3].ID != "qwen" {
-		t.Fatalf("agents[3].ID = %q, want %q", agentsAvailable[3].ID, "qwen")
+	if agentsAvailable[3].ID != "kimi" {
+		t.Fatalf("agents[3].ID = %q, want %q", agentsAvailable[3].ID, "kimi")
 	}
 	if agentsAvailable[3].Status != "available" {
-		t.Fatalf("qwen available status = %q, want %q", agentsAvailable[3].Status, "available")
+		t.Fatalf("kimi available status = %q, want %q", agentsAvailable[3].Status, "available")
 	}
-	if agentsAvailable[4].ID != "opencode" {
-		t.Fatalf("agents[4].ID = %q, want %q", agentsAvailable[4].ID, "opencode")
+	if agentsAvailable[4].ID != "qwen" {
+		t.Fatalf("agents[4].ID = %q, want %q", agentsAvailable[4].ID, "qwen")
 	}
 	if agentsAvailable[4].Status != "available" {
-		t.Fatalf("opencode available status = %q, want %q", agentsAvailable[4].Status, "available")
+		t.Fatalf("qwen available status = %q, want %q", agentsAvailable[4].Status, "available")
+	}
+	if agentsAvailable[5].ID != "opencode" {
+		t.Fatalf("agents[5].ID = %q, want %q", agentsAvailable[5].ID, "opencode")
+	}
+	if agentsAvailable[5].Status != "available" {
+		t.Fatalf("opencode available status = %q, want %q", agentsAvailable[5].Status, "available")
 	}
 }
 

docs/ACCEPTANCE.md

@@ -144,6 +144,19 @@ This checklist defines executable acceptance checks for requirements 1-16.
   - `E2E_QWEN=1 go test ./internal/agents/qwen -run TestQwenE2ESmoke -v -timeout 120s` (pass, real prompt returns `PONG`)
   - `go test ./cmd/ngent ./internal/httpapi -count=1` (pass)
 
+## Requirement 16A: Kimi CLI Agent
+
+- Operation: verify kimi provider is listed and can complete a turn over ACP.
+- Expected:
+  - `GET /v1/agents` includes `{"id":"kimi","name":"Kimi CLI","status":"available"}` when `kimi` is in PATH.
+  - thread creation accepts `agent=kimi`.
+  - turn streaming emits `message_delta` and finishes with `turn_completed` (or explicit upstream error envelope).
+  - provider tolerates current upstream ACP startup variants `kimi acp` and `kimi --acp`.
+- Verification commands:
+  - `go test ./internal/agents/kimi -count=1`
+  - `E2E_KIMI=1 go test ./internal/agents/kimi -run TestKimiE2ESmoke -v -timeout 120s`
+  - `go test ./cmd/ngent ./internal/httpapi -count=1`
+
 ## Requirement 17: Thread Delete Lifecycle
 
 - Operation: delete an existing thread from API/UI, verify ownership behavior, conflict behavior, and provider cleanup.