6a684211fc
* fix(agentctl): reap disconnected ACP sessions + MCP child trees (#1247) Two independent leaks let opencode acp sessions accumulate indefinitely: 1. instance.Manager never reaped disconnected sessions. StopInstance only ran via the kandev DELETE route, so any session whose backend went away (UI closed mid-run, WS dropped, opencode failed to emit complete) was orphaned forever. 2. Even when DELETE fired, the ACP adapter unconditionally returned RequiresProcessKill=false. opencode acp keeps an HTTP server + MCP child tree alive after stdin EOF, so closing stdin was a no-op and the children re-parented to init. Fix both: - Plumb RuntimeConfig.RequiresProcessKill from agents.OpenCodeACP through the ExecutorCreateRequest -> CreateInstanceRequest -> InstanceConfig -> adapter.Config -> shared.Config chain. acp.Adapter now reads cfg.RequiresProcessKill instead of hardcoding false. - Belt-and-braces: process.Manager.waitForProcessExit timeout fallback now killProcessGroup first (only falls back to single-process kill if that errors), so any future ACP CLI that ignores stdin EOF still gets reaped. - Add an idle-instance reaper to instance.Manager. Per-instance activity middleware tracks inflight HTTP requests + lastActivity; a background goroutine sweeps every minute and StopInstance's any instance idle past KANDEV_ACP_IDLE_TIMEOUT (default 1h, set to 0 to disable). Long-lived /agent/stream WS connections keep the inflight counter above zero so active sessions are never reaped. - Validate stdio MCP commands at CreateInstance time via exec.LookPath; missing entries are dropped with a warn instead of spawning a permanently broken child every session (fixes the stale /snap/bin/brave MCP repro in the issue). Regression tests: process-group kill (parent+child fixture), idle reaper end-to-end, MCP validation, opencode-acp opt-in vs other ACP agents' default. * fix: address PR review feedback on #1247 fix - idle_reaper: extract reapSingleIdleInstance helper with defer cancel(), add reaperStop polling between sweep iterations so Shutdown drains in one StopInstance window instead of N * timeout (cubic, claude, greptile). - instance.Manager: use sync.Once instead of m.mu to gate reaper-stop channel close (claude). - mcpStdioValidationError: tolerate compound Command strings by resolving only the first whitespace-delimited token; reject entries with neither URL nor Command outright; document agentctl-vs-agent PATH skew in Docker/SSH executor modes (claude, greptile, cubic). - manager_killgroup_test: treat zombie state as dead via /proc/<pid>/stat on Linux + bump Eventually window to 15s — CI containers' PID 1 can delay harvesting orphans long enough to flake signal(0) probes. - instance package: add goleak TestMain for the new reaper goroutine (coderabbit). - AGENTS.md: correct SIGKILL vs SIGTERM wording; clarify the timeout fallback only fires on ctx.Done (coderabbit, cubic). --------- Co-authored-by: Kandev Agent <agent@kandev.dev>
541 lines
18 KiB
Go
541 lines
18 KiB
Go
// Package config provides unified configuration for agentctl.
|
|
//
|
|
// agentctl is runtime-agnostic - it behaves identically whether running
|
|
// inside a Docker container or directly on the host. The caller (kandev backend)
|
|
// handles any Docker vs standalone differences.
|
|
//
|
|
// Configuration hierarchy:
|
|
// - Config: Global server settings (ports, logging, instance limits)
|
|
// - Config.Defaults: Default values for new instances
|
|
// - InstanceConfig: Per-instance settings (derived from Defaults + overrides)
|
|
package config
|
|
|
|
import (
|
|
"crypto/rand"
|
|
"crypto/subtle"
|
|
"encoding/hex"
|
|
"os"
|
|
"strconv"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/kandev/kandev/pkg/agent"
|
|
)
|
|
|
|
// Config is the agentctl configuration.
|
|
// agentctl always exposes the same instance management API regardless of
|
|
// deployment context (Docker container or host machine).
|
|
type Config struct {
|
|
// Port is the control/API server port
|
|
Port int
|
|
|
|
// Ports configures the port range for instance allocation
|
|
Ports PortConfig
|
|
|
|
// Defaults provides default values for new instances
|
|
Defaults InstanceDefaults
|
|
|
|
// Shell configuration
|
|
ShellEnabled bool // Enable auto-shell feature (default: true)
|
|
|
|
// Logging configuration
|
|
LogLevel string
|
|
LogFormat string
|
|
McpLogFile string // Optional file path for MCP debug logs
|
|
|
|
// VS Code server configuration
|
|
VscodeCommand string // Command to run code-server (default: "code-server")
|
|
|
|
// AuthToken is a shared secret for authenticating requests from the kandev backend.
|
|
// Generated internally when AGENTCTL_BOOTSTRAP_NONCE is present.
|
|
// Empty means authentication is disabled (e.g. dev/test without nonce).
|
|
AuthToken string
|
|
|
|
// BootstrapNonce is a one-time-use nonce for the handshake protocol.
|
|
// When set (via AGENTCTL_BOOTSTRAP_NONCE), agentctl generates its own AuthToken.
|
|
// at startup and exposes POST /auth/handshake for the backend to retrieve it.
|
|
// The nonce is burned after a single successful handshake.
|
|
BootstrapNonce string
|
|
|
|
// IdleTimeout is the duration after which an instance with no in-flight
|
|
// requests and no recent HTTP activity is reaped by the instance
|
|
// manager. Sourced from KANDEV_ACP_IDLE_TIMEOUT (default 1h).
|
|
// Setting it to 0 disables the reaper.
|
|
IdleTimeout time.Duration
|
|
|
|
// IdleReaperInterval is how often the idle reaper scans for stale
|
|
// instances. Sourced from KANDEV_ACP_IDLE_REAPER_INTERVAL (default 1m).
|
|
// Only the test suite needs to override this; production code should
|
|
// rely on the default.
|
|
IdleReaperInterval time.Duration
|
|
|
|
// mu protects BootstrapNonce from concurrent access during handshake.
|
|
mu sync.Mutex
|
|
}
|
|
|
|
// PortConfig defines port allocation for instances
|
|
type PortConfig struct {
|
|
// Base is the starting port for instance allocation (multi-instance mode)
|
|
Base int
|
|
// Max is the maximum port for instance allocation
|
|
Max int
|
|
}
|
|
|
|
// InstanceDefaults provides default values for new instances.
|
|
// These can be overridden when creating an instance.
|
|
type InstanceDefaults struct {
|
|
// Protocol for agent communication (acp, codex, mcp)
|
|
Protocol agent.Protocol
|
|
|
|
// AgentCommand is the command to run the agent (e.g., "auggie --acp")
|
|
AgentCommand string
|
|
|
|
// WorkDir is the default working directory
|
|
WorkDir string
|
|
|
|
// AutoStart starts the agent automatically when the instance is created
|
|
AutoStart bool
|
|
|
|
// AutoApprovePermissions auto-approves permission requests (for testing/CI)
|
|
AutoApprovePermissions bool
|
|
|
|
// HealthCheckInterval is the interval in seconds for health checks
|
|
HealthCheckInterval int
|
|
|
|
// ProcessBufferMaxBytes is the max bytes per process output buffer (default 2MB)
|
|
ProcessBufferMaxBytes int64
|
|
}
|
|
|
|
// McpServerConfig holds configuration for an MCP server.
|
|
type McpServerConfig struct {
|
|
// Name is the human-readable name of the MCP server
|
|
Name string `json:"name"`
|
|
// URL is the URL for HTTP/SSE transport
|
|
URL string `json:"url,omitempty"`
|
|
// Type is the transport type: "stdio", "sse", "http", or "streamable_http"
|
|
Type string `json:"type,omitempty"`
|
|
// Command is the command for stdio transport
|
|
Command string `json:"command,omitempty"`
|
|
// Args are the arguments for stdio transport
|
|
Args []string `json:"args,omitempty"`
|
|
// Env holds environment variables for stdio transport
|
|
Env map[string]string `json:"env,omitempty"`
|
|
// Headers holds HTTP headers for SSE/HTTP transport
|
|
Headers map[string]string `json:"headers,omitempty"`
|
|
}
|
|
|
|
// InstanceConfig holds configuration for a single agent instance.
|
|
// This is passed to the process manager and API server.
|
|
type InstanceConfig struct {
|
|
// InstanceID is the stable identifier the InstanceManager assigned to
|
|
// this instance. Used by the API middleware to reject requests whose
|
|
// X-Instance-ID header doesn't match — a stale client that still
|
|
// targets a port that has since been recycled to a new instance
|
|
// (e.g. after the previous instance was deleted) gets 404 instead
|
|
// of accidentally configuring or starting the new instance's agent.
|
|
InstanceID string
|
|
|
|
// Port is the HTTP server port for this instance
|
|
Port int
|
|
|
|
// Protocol for agent communication
|
|
Protocol agent.Protocol
|
|
|
|
// AgentCommand is the command to run the agent
|
|
AgentCommand string
|
|
|
|
// AgentArgs is the parsed command (derived from AgentCommand)
|
|
AgentArgs []string
|
|
|
|
// WorkDir is the working directory for the agent process
|
|
WorkDir string
|
|
|
|
// AgentEnv is the environment variables to pass to the agent
|
|
AgentEnv []string
|
|
|
|
// AutoStart starts the agent automatically
|
|
AutoStart bool
|
|
|
|
// AutoApprovePermissions auto-approves permission requests
|
|
AutoApprovePermissions bool
|
|
|
|
// ApprovalPolicy controls when the agent requests approval.
|
|
// Valid values: "untrusted" (always), "on-failure", "on-request", "never".
|
|
// Defaults to "on-request" if empty.
|
|
ApprovalPolicy string
|
|
|
|
// ShellEnabled enables auto-shell feature
|
|
ShellEnabled bool
|
|
|
|
// LogLevel for this instance
|
|
LogLevel string
|
|
|
|
// LogFormat for this instance
|
|
LogFormat string
|
|
|
|
// AgentType identifies the agent (e.g., "auggie", "codex", "claude")
|
|
// Used for agent-specific adapter selection
|
|
AgentType string
|
|
|
|
// McpServers is a list of MCP servers to configure for the agent
|
|
McpServers []McpServerConfig
|
|
|
|
// ProcessBufferMaxBytes caps per-process output buffer size
|
|
ProcessBufferMaxBytes int64
|
|
|
|
// SessionID is the session ID for this agent instance (used in MCP tool calls)
|
|
SessionID string
|
|
|
|
// TaskID is the task ID for this agent instance (used in MCP plan tool calls)
|
|
TaskID string
|
|
|
|
// ContinueCommand is the command template for follow-up prompts in one-shot agents.
|
|
// When set, the adapter spawns a new process per prompt using this command for
|
|
// continuation (thread ID appended at runtime). Only used by Amp.
|
|
ContinueCommand string
|
|
|
|
// VscodeCommand is the command to run the VS Code server (e.g., "code-server")
|
|
VscodeCommand string
|
|
|
|
// DisableAskQuestion disables the ask_user_question MCP tool.
|
|
// Used for TUI/passthrough agents that don't need clarification tools.
|
|
DisableAskQuestion bool
|
|
|
|
// AssumeMcpSse overrides MCP capability filtering to assume the agent supports SSE.
|
|
AssumeMcpSse bool
|
|
|
|
// AssumeMcpHttp overrides MCP capability filtering to assume the agent supports HTTP.
|
|
AssumeMcpHttp bool
|
|
|
|
// McpMode controls which MCP tools are registered for this instance.
|
|
// "task" (default) registers kanban/plan tools; "config" registers config tools.
|
|
McpMode string
|
|
|
|
// AuthToken is a shared secret for authenticating requests.
|
|
// Inherited from the parent Config at instance creation time.
|
|
AuthToken string
|
|
|
|
// RequiresProcessKill forces the agent's process group to be killed on
|
|
// shutdown instead of relying on stdin close. Required for agents whose
|
|
// runtime keeps child processes alive when stdin closes (opencode acp).
|
|
RequiresProcessKill bool
|
|
}
|
|
|
|
// Load loads the configuration from environment variables.
|
|
func Load() *Config {
|
|
cfg := &Config{
|
|
Port: getEnvInt("AGENTCTL_PORT", 39429),
|
|
Ports: PortConfig{
|
|
Base: getEnvInt("AGENTCTL_INSTANCE_PORT_BASE", 41001),
|
|
Max: getEnvInt("AGENTCTL_INSTANCE_PORT_MAX", 41100),
|
|
},
|
|
Defaults: InstanceDefaults{
|
|
Protocol: agent.Protocol(getEnv("AGENTCTL_PROTOCOL", string(agent.ProtocolACP))),
|
|
AgentCommand: getEnv("AGENTCTL_AGENT_COMMAND", "auggie --acp"),
|
|
WorkDir: getEnv("AGENTCTL_WORKDIR", "/workspace"),
|
|
AutoStart: getEnvBool("AGENTCTL_AUTO_START", false),
|
|
AutoApprovePermissions: getEnvBool("AGENTCTL_AUTO_APPROVE_PERMISSIONS", false),
|
|
HealthCheckInterval: getEnvInt("AGENTCTL_HEALTH_CHECK_INTERVAL", 5),
|
|
ProcessBufferMaxBytes: getEnvInt64("AGENTCTL_PROCESS_BUFFER_MAX_BYTES", 2*1024*1024),
|
|
},
|
|
ShellEnabled: getEnvBool("AGENTCTL_SHELL_ENABLED", true),
|
|
LogLevel: getEnvWithFallback("AGENTCTL_LOG_LEVEL", "KANDEV_LOG_LEVEL", "info"),
|
|
LogFormat: getEnv("AGENTCTL_LOG_FORMAT", "json"),
|
|
McpLogFile: getEnv("KANDEV_MCP_LOG_FILE", ""),
|
|
VscodeCommand: getEnv("AGENTCTL_VSCODE_COMMAND", "code-server"),
|
|
IdleTimeout: getEnvDuration("KANDEV_ACP_IDLE_TIMEOUT", time.Hour),
|
|
IdleReaperInterval: getEnvDuration("KANDEV_ACP_IDLE_REAPER_INTERVAL", time.Minute),
|
|
}
|
|
|
|
// Bootstrap nonce mode: agentctl generates its own token and the backend
|
|
// retrieves it via handshake using the nonce as proof-of-parentage.
|
|
if nonce := os.Getenv("AGENTCTL_BOOTSTRAP_NONCE"); nonce != "" {
|
|
cfg.BootstrapNonce = nonce
|
|
cfg.AuthToken = generateSelfToken()
|
|
}
|
|
|
|
return cfg
|
|
}
|
|
|
|
// ConsumeNonce atomically validates and burns the bootstrap nonce.
|
|
// Returns the auth token if the nonce matches, empty string otherwise.
|
|
// The nonce is invalidated after a single successful call (one-shot).
|
|
func (c *Config) ConsumeNonce(nonce string) string {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
|
|
if c.BootstrapNonce == "" || nonce == "" {
|
|
return ""
|
|
}
|
|
if subtle.ConstantTimeCompare([]byte(c.BootstrapNonce), []byte(nonce)) != 1 {
|
|
return ""
|
|
}
|
|
|
|
// Burn the nonce — only one handshake allowed
|
|
c.BootstrapNonce = ""
|
|
return c.AuthToken
|
|
}
|
|
|
|
// generateSelfToken creates a cryptographically random 32-byte hex-encoded token.
|
|
func generateSelfToken() string {
|
|
b := make([]byte, 32)
|
|
if _, err := rand.Read(b); err != nil {
|
|
// Fallback should never happen; crypto/rand rarely fails.
|
|
panic("crypto/rand failed: " + err.Error())
|
|
}
|
|
return hex.EncodeToString(b)
|
|
}
|
|
|
|
// NewInstanceConfig creates an InstanceConfig from defaults with optional overrides.
|
|
// If port is 0, it should be allocated by the caller.
|
|
func (c *Config) NewInstanceConfig(port int, overrides *InstanceOverrides) *InstanceConfig {
|
|
cfg := &InstanceConfig{
|
|
Port: port,
|
|
Protocol: c.Defaults.Protocol,
|
|
AgentCommand: c.Defaults.AgentCommand,
|
|
WorkDir: c.Defaults.WorkDir,
|
|
AutoStart: c.Defaults.AutoStart,
|
|
AutoApprovePermissions: c.Defaults.AutoApprovePermissions,
|
|
ShellEnabled: c.ShellEnabled,
|
|
LogLevel: c.LogLevel,
|
|
LogFormat: c.LogFormat,
|
|
ProcessBufferMaxBytes: c.Defaults.ProcessBufferMaxBytes,
|
|
VscodeCommand: c.VscodeCommand,
|
|
McpMode: "task",
|
|
AuthToken: c.AuthToken,
|
|
}
|
|
|
|
applyOverrides(cfg, overrides)
|
|
|
|
// Inject local kandev MCP server for MCP tunneling through the agent stream
|
|
// This ensures the kandev MCP server is available for protocols that read MCP config
|
|
// at startup time (e.g., Codex via -c flags). The MCP server uses the agent stream
|
|
// WebSocket connection (bidirectional) to forward tool calls to the backend.
|
|
if port > 0 {
|
|
cfg.McpServers = injectKandevMcpServer(cfg.McpServers, port)
|
|
}
|
|
|
|
// Parse agent command into args
|
|
cfg.AgentArgs = ParseCommand(cfg.AgentCommand)
|
|
|
|
// Collect environment if not explicitly set
|
|
if cfg.AgentEnv == nil {
|
|
cfg.AgentEnv = CollectAgentEnv(nil)
|
|
}
|
|
|
|
return cfg
|
|
}
|
|
|
|
// applyOverrides applies non-zero fields from overrides to cfg.
|
|
func applyOverrides(cfg *InstanceConfig, overrides *InstanceOverrides) {
|
|
if overrides == nil {
|
|
return
|
|
}
|
|
if overrides.InstanceID != "" {
|
|
cfg.InstanceID = overrides.InstanceID
|
|
}
|
|
if overrides.Protocol != "" {
|
|
cfg.Protocol = overrides.Protocol
|
|
}
|
|
if overrides.AgentCommand != "" {
|
|
cfg.AgentCommand = overrides.AgentCommand
|
|
}
|
|
if overrides.WorkDir != "" {
|
|
cfg.WorkDir = overrides.WorkDir
|
|
}
|
|
if overrides.AutoStart != nil {
|
|
cfg.AutoStart = *overrides.AutoStart
|
|
}
|
|
if overrides.Env != nil {
|
|
cfg.AgentEnv = overrides.Env
|
|
}
|
|
if overrides.ApprovalPolicy != "" {
|
|
cfg.ApprovalPolicy = overrides.ApprovalPolicy
|
|
}
|
|
if overrides.AgentType != "" {
|
|
cfg.AgentType = overrides.AgentType
|
|
}
|
|
if len(overrides.McpServers) > 0 {
|
|
cfg.McpServers = overrides.McpServers
|
|
}
|
|
if overrides.SessionID != "" {
|
|
cfg.SessionID = overrides.SessionID
|
|
}
|
|
if overrides.TaskID != "" {
|
|
cfg.TaskID = overrides.TaskID
|
|
}
|
|
if overrides.DisableAskQuestion {
|
|
cfg.DisableAskQuestion = true
|
|
}
|
|
if overrides.AssumeMcpSse {
|
|
cfg.AssumeMcpSse = true
|
|
}
|
|
if overrides.AssumeMcpHttp {
|
|
cfg.AssumeMcpHttp = true
|
|
}
|
|
if overrides.McpMode != "" {
|
|
cfg.McpMode = overrides.McpMode
|
|
}
|
|
if overrides.RequiresProcessKill {
|
|
cfg.RequiresProcessKill = true
|
|
}
|
|
}
|
|
|
|
// InstanceOverrides allows overriding default values when creating an instance
|
|
type InstanceOverrides struct {
|
|
InstanceID string
|
|
Protocol agent.Protocol
|
|
AgentCommand string
|
|
WorkDir string
|
|
AutoStart *bool
|
|
Env []string
|
|
ApprovalPolicy string
|
|
AgentType string
|
|
McpServers []McpServerConfig
|
|
SessionID string
|
|
TaskID string
|
|
DisableAskQuestion bool
|
|
AssumeMcpSse bool
|
|
AssumeMcpHttp bool
|
|
McpMode string
|
|
RequiresProcessKill bool
|
|
}
|
|
|
|
// ParseCommand splits a command string into arguments
|
|
func ParseCommand(cmd string) []string {
|
|
return strings.Fields(cmd)
|
|
}
|
|
|
|
// CollectAgentEnv collects environment variables to pass to the agent.
|
|
// It filters out AGENTCTL_* variables and optionally merges additional env vars.
|
|
func CollectAgentEnv(additional map[string]string) []string {
|
|
envMap := make(map[string]string)
|
|
|
|
// Start with current environment, excluding AGENTCTL_* and npm_config_* vars.
|
|
// npm_config_* vars from the parent pnpm process cause "Unknown env config"
|
|
// warnings when the agent is launched via npx.
|
|
for _, e := range os.Environ() {
|
|
if idx := strings.Index(e, "="); idx > 0 {
|
|
key := e[:idx]
|
|
if !strings.HasPrefix(key, "AGENTCTL_") && !isNpmEnvVar(key) {
|
|
envMap[key] = e[idx+1:]
|
|
}
|
|
}
|
|
}
|
|
|
|
// Merge additional env vars
|
|
for k, v := range additional {
|
|
envMap[k] = v
|
|
}
|
|
|
|
// Convert back to slice
|
|
result := make([]string, 0, len(envMap))
|
|
for k, v := range envMap {
|
|
result = append(result, k+"="+v)
|
|
}
|
|
return result
|
|
}
|
|
|
|
// isNpmEnvVar returns true if the key is an npm-related environment variable
|
|
// that should be filtered out to prevent warnings in npx commands.
|
|
func isNpmEnvVar(key string) bool {
|
|
return strings.HasPrefix(key, "npm_config_") ||
|
|
strings.HasPrefix(key, "npm_package_") ||
|
|
strings.HasPrefix(key, "npm_lifecycle_") ||
|
|
strings.HasPrefix(key, "npm_execpath") ||
|
|
strings.HasPrefix(key, "npm_node_execpath")
|
|
}
|
|
|
|
func getEnv(key, defaultValue string) string {
|
|
if value := os.Getenv(key); value != "" {
|
|
return value
|
|
}
|
|
return defaultValue
|
|
}
|
|
|
|
// getEnvWithFallback checks the primary key, then the fallback key, then returns defaultValue.
|
|
func getEnvWithFallback(primary, fallback, defaultValue string) string {
|
|
if value := os.Getenv(primary); value != "" {
|
|
return value
|
|
}
|
|
if value := os.Getenv(fallback); value != "" {
|
|
return value
|
|
}
|
|
return defaultValue
|
|
}
|
|
|
|
func getEnvInt(key string, defaultValue int) int {
|
|
if value := os.Getenv(key); value != "" {
|
|
if i, err := strconv.Atoi(value); err == nil {
|
|
return i
|
|
}
|
|
}
|
|
return defaultValue
|
|
}
|
|
|
|
func getEnvInt64(key string, defaultValue int64) int64 {
|
|
if value := os.Getenv(key); value != "" {
|
|
if i, err := strconv.ParseInt(value, 10, 64); err == nil {
|
|
return i
|
|
}
|
|
}
|
|
return defaultValue
|
|
}
|
|
|
|
func getEnvBool(key string, defaultValue bool) bool {
|
|
if value := os.Getenv(key); value != "" {
|
|
return strings.ToLower(value) == "true" || value == "1"
|
|
}
|
|
return defaultValue
|
|
}
|
|
|
|
// getEnvDuration parses a duration value from an env var. Accepts any value
|
|
// time.ParseDuration accepts (e.g. "1h", "30m", "500ms"). "0" disables the
|
|
// feature. Invalid or missing values return defaultValue.
|
|
func getEnvDuration(key string, defaultValue time.Duration) time.Duration {
|
|
value := os.Getenv(key)
|
|
if value == "" {
|
|
return defaultValue
|
|
}
|
|
d, err := time.ParseDuration(value)
|
|
if err != nil {
|
|
return defaultValue
|
|
}
|
|
return d
|
|
}
|
|
|
|
// kandevMcpServerName is the name used for the local kandev MCP server.
|
|
const kandevMcpServerName = "kandev"
|
|
|
|
// injectKandevMcpServer prepends the local kandev MCP server to the list of MCP servers.
|
|
// This replaces any existing kandev server to avoid duplicates.
|
|
// The kandev MCP server provides tools like ask_user_question to the agent.
|
|
// Both HTTP and SSE variants are injected - agent capability filtering will select the
|
|
// appropriate one. HTTP is listed first so that when an agent advertises both transports
|
|
// the "first surviving entry wins" dedup keeps the HTTP entry (modern streamable MCP);
|
|
// SSE remains as a fallback for SSE-only agents.
|
|
func injectKandevMcpServer(servers []McpServerConfig, port int) []McpServerConfig {
|
|
portStr := strconv.Itoa(port)
|
|
kandevMcpSse := McpServerConfig{
|
|
Name: kandevMcpServerName,
|
|
Type: "sse",
|
|
URL: "http://localhost:" + portStr + "/sse",
|
|
}
|
|
kandevMcpHttp := McpServerConfig{
|
|
Name: kandevMcpServerName,
|
|
Type: "http",
|
|
URL: "http://localhost:" + portStr + "/mcp",
|
|
}
|
|
|
|
// Filter out any existing kandev server and prepend the local ones
|
|
result := make([]McpServerConfig, 0, len(servers)+2)
|
|
result = append(result, kandevMcpHttp, kandevMcpSse)
|
|
for _, srv := range servers {
|
|
if srv.Name != kandevMcpServerName {
|
|
result = append(result, srv)
|
|
}
|
|
}
|
|
return result
|
|
}
|