f98395f000
* fix(agentctl): start per-repo workspace trackers in passthrough mode CLI passthrough mode starts the agent CLI via the PTY-based InteractiveRunner instead of agentctl's startAgent / startOneShot, so the per-repo workspace trackers created for multi-repo task roots were never started. The bare root tracker exits immediately because it has no git index, leaving polling completely idle — file edits made by the agent never produced workspace-stream notifications and the Files panel stayed stale. Move the tracker startup to instance.Manager.CreateInstance via a new StartAllWorkspaceTrackers helper so polling fires for every repo regardless of whether the agent runs via ACP or passthrough. Fixes #982 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(lifecycle): serialize workspace poll-mode pushes to prevent slow-stuck mode When a session subscribes and then immediately focuses (the normal page-load sequence), the workspace poll aggregator used to spawn two independent goroutines — one pushing slow, one pushing fast — whose HTTP arrival order at agentctl was undefined. With the slow request landing after the fast request the tracker ended up in slow mode (~30s polling) while the aggregator's lastPushed claimed fast, and the suppress-duplicate guard then blocked any future focus event from reconciling the divergence. Multi-repo passthrough sessions hit this every page load: the Files panel saw ~30s-stale state even with the per-repo trackers running. Replace the fire-and-forget goroutine per push with a single in-flight pusher per workspace plus a last-write-wins pending slot — concurrent callers all converge on the same pusher, which drains the queue in order so the final queued mode is what reaches the wire last. Regression test in manager_subscription_test.go simulates the race with an httptest server that adds artificial latency on slow pushes; the test fails on the old parallel-goroutine implementation and passes on the serialized one. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(agentctl): address PR review feedback for passthrough tracker fix - Goroutine leak: extract stopWorkspaceTrackers() and call it unconditionally at the top of Manager.Stop(). Previously the early return when status==Stopped skipped tracker teardown in passthrough mode (where Start() never runs), leaking 2 goroutines per per-repo tracker per stopped instance. stopShellAndProcesses delegates to the same helper. - Trim multi-line doc comments to one-liners per CLAUDE.md (the StartAllWorkspaceTrackers docstring and the CreateInstance call-site comment). - Replace the fixed time.Sleep in the race regression test with a poll on len(calls), exiting as soon as the pusher has drained, plus a brief settle window after to keep the test sensitive to the late racing slow push the fix guards against. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(web): refresh expanded subtrees on polling-detected file changes The agentctl workspace tracker emits a generic `refresh` event with empty path when its poll cycle detects file changes (it knows something changed but not which file). The Files panel previously only refreshed the root folder on these events, so files added under an expanded subdir never became visible — the merge preserved the stale subtree, and the user had to manually collapse + re-expand to see new files. This is the user-visible symptom of #982 (Files panel does not refresh after agent makes changes in CLI passthrough mode): the backend fixes in this PR get the events flowing, but the frontend needs to act on them correctly. On a `refresh` event we now refresh every currently-expanded folder in addition to the root; for multi-repo task roots we scope to the affected repo's branch using `repository_name`. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix: address iteration-2 review feedback - Trim doc + inline comment blocks per CLAUDE.md (manager.go, file-browser-hooks.ts, workspace-files.ts). - Replace the hand-rolled fmtSscanf/numErr port parser with strconv.Atoi in the race regression test. - Assert on slowCalls in the race test to lock in the queue-collapse guarantee (at most one slow push lands). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix: address iteration-3 review feedback - Remove redundant stopWorkspaceTrackers call from stopShellAndProcesses (it's already invoked at the top of Manager.Stop), and drop the now- misleading "stopping workspace tracker" debug log from the regular shutdown path. - Trim three multi-line comment blocks in manager_subscription.go to one-liners per CLAUDE.md (workspacePushTarget, pushAsync, pushLoop). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix: trim multi-line comment block on pendingPush field * fix: trim test docstring on race regression test * fix(web): preserve sibling-repo subtrees on scoped refresh The setTree reducer ran patchNode(updated) at the root, which re-matched folderUpdates.has("") and overwrote the already-merged root children with the raw depth-1 server response — wiping the loaded children of every top-level repo that wasn't part of the refresh scope. Recurse over updated.children instead of updated itself: the root has already been merged in the block above, and each top-level repo either gets its targeted update (if folderUpdates.has(path)) or is left alone (preserving its loaded subtree). Includes a regression test that fails on the old code: a refresh scoped to "thm" used to discard "kandev"'s loaded README.md child. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(web): trim three more comment blocks to one-liners * fix: trim five more comment blocks to one-liners --------- Co-authored-by: Kandev Agent <agent@kandev.dev> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
319 lines
9.4 KiB
Go
319 lines
9.4 KiB
Go
// Package instance provides utilities for managing multi-agent instances.
|
|
package instance
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"net"
|
|
"net/http"
|
|
"strings"
|
|
"sync"
|
|
"syscall"
|
|
"time"
|
|
|
|
"github.com/google/uuid"
|
|
"github.com/kandev/kandev/internal/agentctl/server/config"
|
|
"github.com/kandev/kandev/internal/agentctl/server/process"
|
|
"github.com/kandev/kandev/internal/common/logger"
|
|
"github.com/kandev/kandev/pkg/agent"
|
|
"go.uber.org/zap"
|
|
)
|
|
|
|
// ServerFactory creates an HTTP handler for an instance given its config and process manager.
|
|
type ServerFactory func(cfg *config.InstanceConfig, procMgr *process.Manager, log *logger.Logger) http.Handler
|
|
|
|
// Manager manages multiple agent instances.
|
|
// It handles creation, tracking, and removal of agent instances,
|
|
// each with their own HTTP server on a dedicated port.
|
|
type Manager struct {
|
|
config *config.Config
|
|
logger *logger.Logger
|
|
instances map[string]*Instance
|
|
portAlloc *PortAllocator
|
|
serverFactory ServerFactory
|
|
mu sync.RWMutex
|
|
}
|
|
|
|
// NewManager creates a new instance manager.
|
|
func NewManager(cfg *config.Config, log *logger.Logger) *Manager {
|
|
// Clean up code-server processes orphaned by a previous session (safety net).
|
|
process.CleanupOrphanedCodeServers(log)
|
|
|
|
return &Manager{
|
|
config: cfg,
|
|
logger: log.WithFields(zap.String("component", "instance-manager")),
|
|
instances: make(map[string]*Instance),
|
|
portAlloc: NewPortAllocator(cfg.Ports.Base, cfg.Ports.Max),
|
|
}
|
|
}
|
|
|
|
// SetServerFactory sets the factory function for creating HTTP handlers for instances.
|
|
// This must be called before creating any instances.
|
|
func (m *Manager) SetServerFactory(factory ServerFactory) {
|
|
m.serverFactory = factory
|
|
}
|
|
|
|
// CreateInstance creates a new agent instance.
|
|
func (m *Manager) CreateInstance(ctx context.Context, req *CreateRequest) (*CreateResponse, error) {
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
|
|
id := req.ID
|
|
if id == "" {
|
|
id = uuid.New().String()
|
|
}
|
|
if _, exists := m.instances[id]; exists {
|
|
return nil, fmt.Errorf("instance with ID %s already exists", id)
|
|
}
|
|
|
|
port, listener, err := m.allocatePortAndListener(id)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
agentCmd := m.resolveAgentCommand(req)
|
|
autoStart := req.AutoStart
|
|
mcpServers := buildMcpServerConfigs(req.McpServers)
|
|
|
|
m.logger.Info("CreateInstance: received request",
|
|
zap.String("req_protocol", req.Protocol),
|
|
zap.String("workspace_path", req.WorkspacePath))
|
|
|
|
overrides := &config.InstanceOverrides{
|
|
InstanceID: id,
|
|
Protocol: agent.Protocol(req.Protocol),
|
|
AgentCommand: agentCmd,
|
|
WorkDir: req.WorkspacePath,
|
|
AutoStart: &autoStart,
|
|
Env: config.CollectAgentEnv(req.Env),
|
|
AgentType: req.AgentType,
|
|
McpServers: mcpServers,
|
|
SessionID: req.SessionID,
|
|
TaskID: req.TaskID,
|
|
DisableAskQuestion: req.DisableAskQuestion,
|
|
AssumeMcpSse: req.AssumeMcpSse,
|
|
McpMode: req.McpMode,
|
|
}
|
|
|
|
m.logger.Info("CreateInstance: applying overrides",
|
|
zap.String("override_protocol", string(overrides.Protocol)))
|
|
|
|
// Create instance config using the unified method
|
|
instanceCfg := m.config.NewInstanceConfig(port, overrides)
|
|
|
|
m.logger.Info("CreateInstance: instance config created",
|
|
zap.String("config_protocol", string(instanceCfg.Protocol)))
|
|
|
|
// Create process manager
|
|
procMgr := process.NewManager(instanceCfg, m.logger)
|
|
|
|
// Start root + per-repo trackers so file-change events fire even in passthrough mode.
|
|
procMgr.StartAllWorkspaceTrackers(context.Background())
|
|
|
|
handler := m.buildHTTPHandler(instanceCfg, procMgr)
|
|
httpServer := m.startHTTPServer(port, listener, handler, id)
|
|
|
|
// Create and store instance
|
|
inst := &Instance{
|
|
ID: id,
|
|
Port: port,
|
|
Status: "running",
|
|
WorkspacePath: req.WorkspacePath,
|
|
AgentCommand: agentCmd,
|
|
Env: req.Env,
|
|
CreatedAt: time.Now(),
|
|
manager: procMgr,
|
|
server: httpServer,
|
|
}
|
|
m.instances[id] = inst
|
|
|
|
m.logger.Info("created instance",
|
|
zap.String("instance_id", id),
|
|
zap.Int("port", port),
|
|
zap.String("workspace", req.WorkspacePath))
|
|
|
|
return &CreateResponse{
|
|
ID: id,
|
|
Port: port,
|
|
}, nil
|
|
}
|
|
|
|
// allocatePortAndListener allocates a free port and binds a TCP listener to it.
|
|
func (m *Manager) allocatePortAndListener(id string) (int, net.Listener, error) {
|
|
maxAttempts := m.config.Ports.Max - m.config.Ports.Base + 1
|
|
for attempt := 0; attempt < maxAttempts; attempt++ {
|
|
allocated, err := m.portAlloc.Allocate(id)
|
|
if err != nil {
|
|
return 0, nil, fmt.Errorf("failed to allocate port: %w", err)
|
|
}
|
|
ln, err := net.Listen("tcp", fmt.Sprintf(":%d", allocated))
|
|
if err != nil {
|
|
if errors.Is(err, syscall.EADDRINUSE) || strings.Contains(err.Error(), "address already in use") {
|
|
m.portAlloc.MarkUnavailable(allocated)
|
|
m.logger.Warn("port already in use; retrying",
|
|
zap.String("instance_id", id),
|
|
zap.Int("port", allocated))
|
|
continue
|
|
}
|
|
m.portAlloc.Release(allocated)
|
|
return 0, nil, fmt.Errorf("failed to bind instance port %d: %w", allocated, err)
|
|
}
|
|
return allocated, ln, nil
|
|
}
|
|
return 0, nil, fmt.Errorf("failed to allocate an available port for instance %s", id)
|
|
}
|
|
|
|
// resolveAgentCommand returns the effective agent command for a create request.
|
|
func (m *Manager) resolveAgentCommand(req *CreateRequest) string {
|
|
agentCmd := req.AgentCommand
|
|
if agentCmd == "" {
|
|
agentCmd = m.config.Defaults.AgentCommand
|
|
}
|
|
if req.WorkspacePath != "" && req.WorkspaceFlag != "" && !strings.Contains(agentCmd, req.WorkspaceFlag) {
|
|
agentCmd = agentCmd + " " + req.WorkspaceFlag + " " + req.WorkspacePath
|
|
}
|
|
return agentCmd
|
|
}
|
|
|
|
// buildMcpServerConfigs converts instance McpServerConfig entries to config.McpServerConfig.
|
|
func buildMcpServerConfigs(mcpServers []McpServerConfig) []config.McpServerConfig {
|
|
result := make([]config.McpServerConfig, 0, len(mcpServers))
|
|
for _, mcp := range mcpServers {
|
|
result = append(result, config.McpServerConfig{
|
|
Name: mcp.Name,
|
|
URL: mcp.URL,
|
|
Type: mcp.Type,
|
|
Command: mcp.Command,
|
|
Args: mcp.Args,
|
|
Env: mcp.Env,
|
|
Headers: mcp.Headers,
|
|
})
|
|
}
|
|
return result
|
|
}
|
|
|
|
// buildHTTPHandler creates the HTTP handler for an instance.
|
|
func (m *Manager) buildHTTPHandler(instanceCfg *config.InstanceConfig, procMgr *process.Manager) http.Handler {
|
|
if m.serverFactory != nil {
|
|
return m.serverFactory(instanceCfg, procMgr, m.logger)
|
|
}
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
w.WriteHeader(http.StatusServiceUnavailable)
|
|
if _, err := w.Write([]byte("server factory not configured")); err != nil {
|
|
m.logger.Debug("failed to write default response", zap.Error(err))
|
|
}
|
|
})
|
|
}
|
|
|
|
// startHTTPServer creates and starts an HTTP server on the given listener.
|
|
func (m *Manager) startHTTPServer(port int, listener net.Listener, handler http.Handler, id string) *http.Server {
|
|
httpServer := &http.Server{
|
|
Addr: fmt.Sprintf(":%d", port),
|
|
Handler: handler,
|
|
}
|
|
go func() {
|
|
if err := httpServer.Serve(listener); err != nil && err != http.ErrServerClosed {
|
|
m.logger.Error("instance server error",
|
|
zap.String("instance_id", id),
|
|
zap.Error(err))
|
|
}
|
|
}()
|
|
return httpServer
|
|
}
|
|
|
|
// GetInstance returns an instance by ID.
|
|
func (m *Manager) GetInstance(id string) (*Instance, bool) {
|
|
m.mu.RLock()
|
|
defer m.mu.RUnlock()
|
|
inst, ok := m.instances[id]
|
|
return inst, ok
|
|
}
|
|
|
|
// ListInstances returns info for all instances.
|
|
func (m *Manager) ListInstances() []*InstanceInfo {
|
|
m.mu.RLock()
|
|
defer m.mu.RUnlock()
|
|
|
|
result := make([]*InstanceInfo, 0, len(m.instances))
|
|
for _, inst := range m.instances {
|
|
result = append(result, inst.Info())
|
|
}
|
|
return result
|
|
}
|
|
|
|
// StopInstance stops and removes an instance by ID.
|
|
func (m *Manager) StopInstance(ctx context.Context, id string) error {
|
|
// Get instance and remove from map under lock (quick operation)
|
|
m.mu.Lock()
|
|
inst, ok := m.instances[id]
|
|
if !ok {
|
|
m.mu.Unlock()
|
|
return fmt.Errorf("instance %s not found", id)
|
|
}
|
|
// Remove from map immediately so new instances aren't blocked
|
|
delete(m.instances, id)
|
|
m.mu.Unlock()
|
|
|
|
m.logger.Debug("stopping instance", zap.String("instance_id", id))
|
|
|
|
// Stop the process manager (potentially slow, done without lock)
|
|
if inst.manager != nil {
|
|
if err := inst.manager.Stop(ctx); err != nil {
|
|
m.logger.Warn("error stopping process manager",
|
|
zap.String("instance_id", id),
|
|
zap.Error(err))
|
|
}
|
|
}
|
|
|
|
m.logger.Debug("StopInstance: shutting down HTTP server",
|
|
zap.String("instance_id", id),
|
|
zap.Int("port", inst.Port))
|
|
|
|
// Shutdown HTTP server (potentially slow, done without lock)
|
|
if inst.server != nil {
|
|
if err := inst.server.Shutdown(ctx); err != nil {
|
|
m.logger.Warn("error shutting down HTTP server",
|
|
zap.String("instance_id", id),
|
|
zap.Error(err))
|
|
}
|
|
}
|
|
|
|
m.logger.Debug("StopInstance: releasing port",
|
|
zap.String("instance_id", id),
|
|
zap.Int("port", inst.Port))
|
|
|
|
// Release port (quick operation, re-acquire lock)
|
|
m.mu.Lock()
|
|
m.portAlloc.Release(inst.Port)
|
|
m.mu.Unlock()
|
|
|
|
m.logger.Info("StopInstance completed",
|
|
zap.String("instance_id", id),
|
|
zap.Int("port", inst.Port))
|
|
|
|
return nil
|
|
}
|
|
|
|
// Shutdown stops all instances gracefully.
|
|
func (m *Manager) Shutdown(ctx context.Context) error {
|
|
m.mu.Lock()
|
|
ids := make([]string, 0, len(m.instances))
|
|
for id := range m.instances {
|
|
ids = append(ids, id)
|
|
}
|
|
m.mu.Unlock()
|
|
|
|
var lastErr error
|
|
for _, id := range ids {
|
|
if err := m.StopInstance(ctx, id); err != nil {
|
|
m.logger.Error("error stopping instance during shutdown",
|
|
zap.String("instance_id", id),
|
|
zap.Error(err))
|
|
lastErr = err
|
|
}
|
|
}
|
|
|
|
return lastErr
|
|
}
|