2e108b040f
* feat: session resumption with ACP session ID support - Add useSessionResumption hook for automatic session recovery on page reload - Fix ACPSessionID not being set on AgentInstance in Launch() and createInstance() - Add task.session.status and task.session.resume WebSocket actions - Fix shell terminal retry logic for resumed sessions - Fix taskSessionState reading from Zustand store instead of local state - Remove dead code: unused stream handling functions in lifecycle/manager.go - Fix test mock interfaces (CleanupStaleInstanceByTaskID, NewManager signature) - Add enhanced logging for session resumption debugging - Simplify page-client.tsx state merging logic * refactor: remove unused AgentController (dead code) - Delete agent_controller.go - entirely unused duplicate of Manager methods - Remove agentController field from Manager struct - Remove AgentController initialization in NewManager The AgentController duplicated StartAgentProcess, initializeACPSession, and PromptAgent from Manager but was never called. All agent control operations go through Manager's own methods. * refactor: remove unused MemoryRepository (dead code) - Delete memory.go - entire MemoryRepository implementation unused (replaced by SQLite repository) - Delete memory_test.go - tests for removed MemoryRepository Found via 'deadcode' tool analysis. * refactor: consolidate agentctl packages into server/client structure Reorganize the confusing dual agentctl packages: - internal/agentctl/* → internal/agentctl/server/ - internal/agent/agentctl/* → internal/agentctl/client/ Structure is now: internal/agentctl/ ├── client/ - HTTP client for talking to agentctl servers │ ├── client.go │ ├── standalone.go │ ├── acp.go │ └── launcher/ ├── server/ - agentctl server implementation (runs in containers) │ ├── api/ │ ├── adapter/ │ ├── acp/ │ ├── config/ │ ├── instance/ │ ├── process/ │ └── shell/ └── types/ - Shared types used by both client and server Also consolidated shared types (GitStatusUpdate, FileInfo, etc.) from process/types.go into the shared types/ package. * refactor: rename AgentInstance to AgentExecution for clarity Rename AgentInstance -> AgentExecution across the entire codebase to better reflect what it represents: an agent actively working on a task, not just a generic 'instance'. Changes: - AgentInstance struct -> AgentExecution - InstanceStore -> ExecutionStore (new file: execution_store.go) - RecoveredInstance -> RecoveredExecution - All method names: GetInstance* -> GetExecution*, ListInstances -> ListExecutions, etc. - All parameters: instanceID -> executionID - All local variables: instance -> execution - DTOs and JSON tags: agent_instance_id -> agent_execution_id - Database columns: agent_instance_id -> agent_execution_id Also consolidates duplicate prompt logic: - Merge sendInitialPrompt and SendPrompt into single SendPrompt method - Add validateStatus parameter to differentiate initial vs follow-up prompts Also extracts ACP session management to session.go: - Move initializeACPSession logic to SessionManager.InitializeAndPrompt - Move PromptAgent logic to SessionManager.SendPrompt - Manager now delegates to SessionManager for all prompt operations Also removes duplicate event publishing: - Remove 9 duplicate m.publish*() methods from manager.go - Use existing EventPublisher methods via m.eventPublisher.Publish*() Also extracts types to dedicated file: - Move AgentExecution, LaunchRequest, PromptResult, etc. to types.go Net reduction: ~600 lines removed from manager.go through deduplication and better separation of concerns. * fix(backend): Docker runtime now creates instance via ControlServer The Docker runtime was incorrectly creating an agentctl.Client pointing directly to port 9999 (the ControlServer port), then trying to call instance-specific APIs like /api/v1/agent/configure which only exist on per-instance servers. Fixed by making Docker runtime follow the same flow as standalone mode: - LaunchContainer now uses StandaloneCtl to create an instance via the control API, then creates Client pointing to the instance port - RecoverInstances queries the ControlServer to get the instance port - Added waitForHealth helper to wait for agentctl to be ready Also improved HTTP error handling in agentctl client: - All client methods now check HTTP status codes before JSON decoding - Better error messages include status code and response body * fix: restore session resumption imports and variables * fix: add sessionId prop back to TaskLayout
138 lines
3.8 KiB
Go
138 lines
3.8 KiB
Go
// Package main is the entry point for the agentctl binary.
|
|
// agentctl is a sidecar process that manages agent subprocess communication
|
|
// via HTTP API, bridging the agent's ACP protocol with the kandev backend.
|
|
//
|
|
// agentctl is runtime-agnostic - it behaves identically whether running
|
|
// inside a Docker container or directly on the host machine. The caller
|
|
// (kandev backend) handles any Docker vs standalone differences.
|
|
package main
|
|
|
|
import (
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"net/http"
|
|
"os"
|
|
"os/signal"
|
|
"syscall"
|
|
"time"
|
|
|
|
"github.com/kandev/kandev/internal/agentctl/server/api"
|
|
"github.com/kandev/kandev/internal/agentctl/server/config"
|
|
"github.com/kandev/kandev/internal/agentctl/server/instance"
|
|
"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"
|
|
)
|
|
|
|
// Command-line flags
|
|
var (
|
|
protocolFlag = flag.String("protocol", "", "Protocol for agent communication (acp, codex, mcp)")
|
|
agentCommandFlag = flag.String("agent-command", "", "Command to run the agent")
|
|
workDirFlag = flag.String("workdir", "", "Working directory for the agent")
|
|
portFlag = flag.Int("port", 0, "HTTP server port")
|
|
maxInstancesFlag = flag.Int("max-instances", 0, "Maximum number of concurrent instances")
|
|
)
|
|
|
|
func main() {
|
|
flag.Parse()
|
|
|
|
// Load configuration
|
|
cfg := config.Load()
|
|
|
|
// Override with CLI flags if provided
|
|
if *protocolFlag != "" {
|
|
cfg.Defaults.Protocol = agent.Protocol(*protocolFlag)
|
|
}
|
|
if *agentCommandFlag != "" {
|
|
cfg.Defaults.AgentCommand = *agentCommandFlag
|
|
}
|
|
if *workDirFlag != "" {
|
|
cfg.Defaults.WorkDir = *workDirFlag
|
|
}
|
|
if *portFlag != 0 {
|
|
cfg.Port = *portFlag
|
|
}
|
|
if *maxInstancesFlag != 0 {
|
|
cfg.MaxInstances = *maxInstancesFlag
|
|
}
|
|
|
|
// Initialize logger
|
|
log, err := logger.NewLogger(logger.LoggingConfig{
|
|
Level: cfg.LogLevel,
|
|
Format: cfg.LogFormat,
|
|
OutputPath: "stdout",
|
|
})
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "failed to initialize logger: %v\n", err)
|
|
os.Exit(1)
|
|
}
|
|
defer func() {
|
|
_ = log.Sync()
|
|
}()
|
|
|
|
log.Info("starting agentctl",
|
|
zap.Int("port", cfg.Port),
|
|
zap.Int("max_instances", cfg.MaxInstances))
|
|
|
|
run(cfg, log)
|
|
}
|
|
|
|
// run starts the agentctl server.
|
|
// All instances are managed through the instance management API.
|
|
func run(cfg *config.Config, log *logger.Logger) {
|
|
// Create instance manager
|
|
instMgr := instance.NewManager(cfg, log)
|
|
|
|
// Set the server factory to create API servers for each instance
|
|
instMgr.SetServerFactory(func(instCfg *config.InstanceConfig, procMgr *process.Manager, instLog *logger.Logger) http.Handler {
|
|
return api.NewServer(instCfg, procMgr, instLog).Router()
|
|
})
|
|
|
|
// Create control server
|
|
controlServer := api.NewControlServer(cfg, instMgr, log)
|
|
|
|
// Start HTTP server
|
|
addr := fmt.Sprintf(":%d", cfg.Port)
|
|
httpServer := &http.Server{
|
|
Addr: addr,
|
|
Handler: controlServer.Router(),
|
|
}
|
|
|
|
go func() {
|
|
log.Info("HTTP server starting", zap.String("address", addr))
|
|
if err := httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
|
log.Error("HTTP server error", zap.Error(err))
|
|
os.Exit(1)
|
|
}
|
|
}()
|
|
|
|
// Wait for shutdown signal
|
|
waitForShutdown(log, func(ctx context.Context) {
|
|
// Shutdown all instances
|
|
if err := instMgr.Shutdown(ctx); err != nil {
|
|
log.Error("error shutting down instance manager", zap.Error(err))
|
|
}
|
|
if err := httpServer.Shutdown(ctx); err != nil {
|
|
log.Error("error shutting down HTTP server", zap.Error(err))
|
|
}
|
|
})
|
|
}
|
|
|
|
// waitForShutdown waits for shutdown signal and calls cleanup
|
|
func waitForShutdown(log *logger.Logger, cleanup func(ctx context.Context)) {
|
|
quit := make(chan os.Signal, 1)
|
|
signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
|
|
<-quit
|
|
|
|
log.Info("shutting down agentctl...")
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
|
defer cancel()
|
|
|
|
cleanup(ctx)
|
|
|
|
log.Info("agentctl stopped")
|
|
}
|