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
206 lines
4.7 KiB
Go
206 lines
4.7 KiB
Go
package api
|
|
|
|
import (
|
|
"encoding/json"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/gorilla/websocket"
|
|
"github.com/kandev/kandev/internal/agentctl/types"
|
|
"go.uber.org/zap"
|
|
)
|
|
|
|
// handleGitStatusStreamWS streams git status updates via WebSocket
|
|
func (s *Server) handleGitStatusStreamWS(c *gin.Context) {
|
|
conn, err := s.upgrader.Upgrade(c.Writer, c.Request, nil)
|
|
if err != nil {
|
|
s.logger.Error("WebSocket upgrade failed", zap.Error(err))
|
|
return
|
|
}
|
|
defer func() {
|
|
if err := conn.Close(); err != nil {
|
|
s.logger.Debug("failed to close git status websocket", zap.Error(err))
|
|
}
|
|
}()
|
|
|
|
// Subscribe to git status updates
|
|
sub := s.procMgr.GetWorkspaceTracker().SubscribeGitStatus()
|
|
defer s.procMgr.GetWorkspaceTracker().UnsubscribeGitStatus(sub)
|
|
|
|
// Handle WebSocket close
|
|
closeCh := make(chan struct{})
|
|
go func() {
|
|
for {
|
|
_, _, err := conn.ReadMessage()
|
|
if err != nil {
|
|
close(closeCh)
|
|
return
|
|
}
|
|
}
|
|
}()
|
|
|
|
// Stream git status updates to client
|
|
for {
|
|
select {
|
|
case update, ok := <-sub:
|
|
if !ok {
|
|
return
|
|
}
|
|
data, err := json.Marshal(update)
|
|
if err != nil {
|
|
s.logger.Error("failed to marshal git status update", zap.Error(err))
|
|
continue
|
|
}
|
|
if err := conn.WriteMessage(websocket.TextMessage, data); err != nil {
|
|
return
|
|
}
|
|
case <-closeCh:
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// handleFilesStreamWS streams file listing updates via WebSocket
|
|
func (s *Server) handleFilesStreamWS(c *gin.Context) {
|
|
conn, err := s.upgrader.Upgrade(c.Writer, c.Request, nil)
|
|
if err != nil {
|
|
s.logger.Error("WebSocket upgrade failed", zap.Error(err))
|
|
return
|
|
}
|
|
defer func() {
|
|
if err := conn.Close(); err != nil {
|
|
s.logger.Debug("failed to close files websocket", zap.Error(err))
|
|
}
|
|
}()
|
|
|
|
// Subscribe to file updates
|
|
sub := s.procMgr.GetWorkspaceTracker().SubscribeFiles()
|
|
defer s.procMgr.GetWorkspaceTracker().UnsubscribeFiles(sub)
|
|
|
|
// Handle WebSocket close
|
|
closeCh := make(chan struct{})
|
|
go func() {
|
|
for {
|
|
_, _, err := conn.ReadMessage()
|
|
if err != nil {
|
|
close(closeCh)
|
|
return
|
|
}
|
|
}
|
|
}()
|
|
|
|
// Stream file updates to client
|
|
for {
|
|
select {
|
|
case update, ok := <-sub:
|
|
if !ok {
|
|
return
|
|
}
|
|
data, err := json.Marshal(update)
|
|
if err != nil {
|
|
s.logger.Error("failed to marshal file update", zap.Error(err))
|
|
continue
|
|
}
|
|
if err := conn.WriteMessage(websocket.TextMessage, data); err != nil {
|
|
return
|
|
}
|
|
case <-closeCh:
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// handleFileChangesStreamWS streams filesystem change notifications via WebSocket
|
|
func (s *Server) handleFileChangesStreamWS(c *gin.Context) {
|
|
conn, err := s.upgrader.Upgrade(c.Writer, c.Request, nil)
|
|
if err != nil {
|
|
s.logger.Error("WebSocket upgrade failed", zap.Error(err))
|
|
return
|
|
}
|
|
defer func() {
|
|
if err := conn.Close(); err != nil {
|
|
s.logger.Debug("failed to close file changes websocket", zap.Error(err))
|
|
}
|
|
}()
|
|
|
|
// Subscribe to file change notifications
|
|
sub := s.procMgr.GetWorkspaceTracker().SubscribeFileChanges()
|
|
defer s.procMgr.GetWorkspaceTracker().UnsubscribeFileChanges(sub)
|
|
|
|
// Handle WebSocket close
|
|
closeCh := make(chan struct{})
|
|
go func() {
|
|
for {
|
|
_, _, err := conn.ReadMessage()
|
|
if err != nil {
|
|
close(closeCh)
|
|
return
|
|
}
|
|
}
|
|
}()
|
|
|
|
// Stream file change notifications to client
|
|
for {
|
|
select {
|
|
case notification, ok := <-sub:
|
|
if !ok {
|
|
return
|
|
}
|
|
data, err := json.Marshal(notification)
|
|
if err != nil {
|
|
s.logger.Error("failed to marshal file change notification", zap.Error(err))
|
|
continue
|
|
}
|
|
if err := conn.WriteMessage(websocket.TextMessage, data); err != nil {
|
|
return
|
|
}
|
|
case <-closeCh:
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// handleFileTree handles file tree requests via HTTP GET
|
|
func (s *Server) handleFileTree(c *gin.Context) {
|
|
path := c.Query("path")
|
|
depth := 1
|
|
if d := c.Query("depth"); d != "" {
|
|
if _, err := json.Number(d).Int64(); err == nil {
|
|
depth = int(mustParseInt(d))
|
|
}
|
|
}
|
|
|
|
tree, err := s.procMgr.GetWorkspaceTracker().GetFileTree(path, depth)
|
|
if err != nil {
|
|
c.JSON(400, types.FileTreeResponse{Error: err.Error()})
|
|
return
|
|
}
|
|
|
|
c.JSON(200, types.FileTreeResponse{Root: tree})
|
|
}
|
|
|
|
// handleFileContent handles file content requests via HTTP GET
|
|
func (s *Server) handleFileContent(c *gin.Context) {
|
|
path := c.Query("path")
|
|
if path == "" {
|
|
c.JSON(400, types.FileContentResponse{Error: "path is required"})
|
|
return
|
|
}
|
|
|
|
content, size, err := s.procMgr.GetWorkspaceTracker().GetFileContent(path)
|
|
if err != nil {
|
|
c.JSON(400, types.FileContentResponse{Path: path, Error: err.Error(), Size: size})
|
|
return
|
|
}
|
|
|
|
c.JSON(200, types.FileContentResponse{Path: path, Content: content, Size: size})
|
|
}
|
|
|
|
// mustParseInt parses a string to int, returns 0 on error
|
|
func mustParseInt(s string) int {
|
|
var n int
|
|
if err := json.Unmarshal([]byte(s), &n); err != nil {
|
|
return 0
|
|
}
|
|
return n
|
|
}
|