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
404 lines
8.8 KiB
Go
404 lines
8.8 KiB
Go
// Package shell provides an embedded PTY-based shell session for agentctl.
|
|
// The shell session is automatically created when agentctl starts and destroyed when it stops.
|
|
package shell
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"os/exec"
|
|
"runtime"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/creack/pty"
|
|
"github.com/kandev/kandev/internal/common/logger"
|
|
"go.uber.org/zap"
|
|
)
|
|
|
|
// Session represents the single embedded shell session for an agentctl instance.
|
|
// It is automatically created when agentctl starts and destroyed when it stops.
|
|
type Session struct {
|
|
logger *logger.Logger
|
|
workDir string
|
|
shell string // Shell command (detected based on OS)
|
|
shellArgs []string // Shell arguments
|
|
config Config // Stored config for respawn
|
|
|
|
// PTY and process
|
|
pty *os.File
|
|
cmd *exec.Cmd
|
|
|
|
// State
|
|
running bool
|
|
startedAt time.Time
|
|
mu sync.RWMutex
|
|
|
|
// Output subscribers (WebSocket connections)
|
|
subscribers map[chan<- []byte]struct{}
|
|
subMu sync.RWMutex
|
|
|
|
// Ring buffer for recent output (for new subscribers)
|
|
outputBuffer []byte
|
|
bufferMu sync.RWMutex
|
|
|
|
// Lifecycle
|
|
stopCh chan struct{}
|
|
doneCh chan struct{}
|
|
stopping bool // true when Stop() has been called (don't respawn)
|
|
}
|
|
|
|
// Maximum size of output buffer (16KB should be enough for recent history)
|
|
const maxOutputBufferSize = 16 * 1024
|
|
|
|
// Config holds shell session configuration
|
|
type Config struct {
|
|
WorkDir string // Working directory (default: workspace)
|
|
Cols int // Initial terminal columns (default: 80)
|
|
Rows int // Initial terminal rows (default: 24)
|
|
}
|
|
|
|
// DefaultConfig returns the default shell configuration
|
|
func DefaultConfig(workDir string) Config {
|
|
return Config{
|
|
WorkDir: workDir,
|
|
Cols: 80,
|
|
Rows: 24,
|
|
}
|
|
}
|
|
|
|
// Status represents the shell status
|
|
type Status struct {
|
|
Running bool
|
|
Pid int
|
|
Shell string
|
|
Cwd string
|
|
StartedAt time.Time
|
|
}
|
|
|
|
// detectShell returns the appropriate shell for the current OS
|
|
func detectShell() (string, []string) {
|
|
if runtime.GOOS == "windows" {
|
|
// Prefer PowerShell if available
|
|
if _, err := exec.LookPath("pwsh.exe"); err == nil {
|
|
return "pwsh.exe", []string{"-NoLogo", "-NoExit"}
|
|
}
|
|
if _, err := exec.LookPath("powershell.exe"); err == nil {
|
|
return "powershell.exe", []string{"-NoLogo", "-NoExit"}
|
|
}
|
|
return "cmd.exe", nil
|
|
}
|
|
|
|
// Unix-like systems (Linux, macOS)
|
|
if shell := os.Getenv("SHELL"); shell != "" {
|
|
return shell, []string{"-l"} // Login shell
|
|
}
|
|
|
|
// Try common shells
|
|
shells := []string{"/bin/bash", "/bin/zsh", "/bin/sh"}
|
|
for _, sh := range shells {
|
|
if _, err := os.Stat(sh); err == nil {
|
|
return sh, []string{"-l"}
|
|
}
|
|
}
|
|
|
|
return "/bin/sh", nil
|
|
}
|
|
|
|
// NewSession creates and starts a new shell session.
|
|
// This is called automatically when agentctl starts.
|
|
func NewSession(cfg Config, log *logger.Logger) (*Session, error) {
|
|
shell, args := detectShell()
|
|
|
|
s := &Session{
|
|
logger: log.WithFields(zap.String("component", "shell")),
|
|
workDir: cfg.WorkDir,
|
|
shell: shell,
|
|
shellArgs: args,
|
|
config: cfg,
|
|
subscribers: make(map[chan<- []byte]struct{}),
|
|
stopCh: make(chan struct{}),
|
|
doneCh: make(chan struct{}),
|
|
}
|
|
|
|
if err := s.start(cfg); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return s, nil
|
|
}
|
|
|
|
// start initializes and starts the shell process
|
|
func (s *Session) start(cfg Config) error {
|
|
s.mu.Lock()
|
|
defer s.mu.Unlock()
|
|
|
|
s.cmd = exec.Command(s.shell, s.shellArgs...)
|
|
s.cmd.Dir = cfg.WorkDir
|
|
s.cmd.Env = buildShellEnv(cfg.WorkDir)
|
|
|
|
// Start with PTY
|
|
var err error
|
|
s.pty, err = pty.StartWithSize(s.cmd, &pty.Winsize{
|
|
Cols: uint16(cfg.Cols),
|
|
Rows: uint16(cfg.Rows),
|
|
})
|
|
if err != nil {
|
|
return fmt.Errorf("failed to start PTY: %w", err)
|
|
}
|
|
|
|
s.running = true
|
|
s.startedAt = time.Now()
|
|
|
|
s.logger.Info("shell session started",
|
|
zap.String("shell", s.shell),
|
|
zap.String("cwd", cfg.WorkDir),
|
|
zap.Int("pid", s.cmd.Process.Pid))
|
|
|
|
// Start output reader
|
|
go s.readOutput()
|
|
|
|
// Wait for process exit
|
|
go s.waitForExit()
|
|
|
|
return nil
|
|
}
|
|
|
|
// Stop gracefully stops the shell session.
|
|
// Called automatically when agentctl stops.
|
|
func (s *Session) Stop() error {
|
|
s.mu.Lock()
|
|
if !s.running {
|
|
s.mu.Unlock()
|
|
return nil
|
|
}
|
|
s.running = false
|
|
s.stopping = true // Mark as stopping to prevent respawn
|
|
s.mu.Unlock()
|
|
|
|
s.logger.Info("stopping shell session")
|
|
|
|
// Signal stop
|
|
close(s.stopCh)
|
|
|
|
// Close PTY (sends SIGHUP to process on Unix)
|
|
if s.pty != nil {
|
|
_ = s.pty.Close()
|
|
}
|
|
|
|
// Wait for exit with timeout
|
|
select {
|
|
case <-s.doneCh:
|
|
s.logger.Info("shell session stopped gracefully")
|
|
case <-time.After(5 * time.Second):
|
|
s.logger.Warn("shell session stop timeout, force killing")
|
|
if s.cmd != nil && s.cmd.Process != nil {
|
|
_ = s.cmd.Process.Kill()
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// Write sends input to the shell
|
|
func (s *Session) Write(data []byte) (int, error) {
|
|
s.mu.RLock()
|
|
defer s.mu.RUnlock()
|
|
|
|
if !s.running || s.pty == nil {
|
|
return 0, fmt.Errorf("shell not running")
|
|
}
|
|
|
|
return s.pty.Write(data)
|
|
}
|
|
|
|
// Subscribe adds a subscriber for shell output
|
|
func (s *Session) Subscribe(ch chan<- []byte) {
|
|
s.subMu.Lock()
|
|
defer s.subMu.Unlock()
|
|
s.subscribers[ch] = struct{}{}
|
|
}
|
|
|
|
// Unsubscribe removes a subscriber
|
|
func (s *Session) Unsubscribe(ch chan<- []byte) {
|
|
s.subMu.Lock()
|
|
defer s.subMu.Unlock()
|
|
delete(s.subscribers, ch)
|
|
}
|
|
|
|
// Status returns the current shell status
|
|
func (s *Session) Status() Status {
|
|
s.mu.RLock()
|
|
defer s.mu.RUnlock()
|
|
|
|
pid := 0
|
|
if s.cmd != nil && s.cmd.Process != nil {
|
|
pid = s.cmd.Process.Pid
|
|
}
|
|
|
|
return Status{
|
|
Running: s.running,
|
|
Pid: pid,
|
|
Shell: s.shell,
|
|
Cwd: s.workDir,
|
|
StartedAt: s.startedAt,
|
|
}
|
|
}
|
|
|
|
// readOutput continuously reads from PTY and broadcasts to subscribers
|
|
func (s *Session) readOutput() {
|
|
buf := make([]byte, 4096)
|
|
|
|
for {
|
|
select {
|
|
case <-s.stopCh:
|
|
return
|
|
default:
|
|
}
|
|
|
|
n, err := s.pty.Read(buf)
|
|
if err != nil {
|
|
if err != io.EOF {
|
|
s.logger.Debug("shell read error", zap.Error(err))
|
|
}
|
|
return
|
|
}
|
|
|
|
if n > 0 {
|
|
data := make([]byte, n)
|
|
copy(data, buf[:n])
|
|
s.broadcast(data)
|
|
}
|
|
}
|
|
}
|
|
|
|
// broadcast sends data to all subscribers and stores in buffer
|
|
func (s *Session) broadcast(data []byte) {
|
|
// Store in ring buffer for new subscribers
|
|
s.appendToBuffer(data)
|
|
|
|
s.subMu.RLock()
|
|
defer s.subMu.RUnlock()
|
|
|
|
for ch := range s.subscribers {
|
|
select {
|
|
case ch <- data:
|
|
default:
|
|
// Subscriber channel full, skip
|
|
}
|
|
}
|
|
}
|
|
|
|
// appendToBuffer adds data to the output ring buffer
|
|
func (s *Session) appendToBuffer(data []byte) {
|
|
s.bufferMu.Lock()
|
|
defer s.bufferMu.Unlock()
|
|
|
|
s.outputBuffer = append(s.outputBuffer, data...)
|
|
|
|
// Trim if exceeds max size (keep the most recent data)
|
|
if len(s.outputBuffer) > maxOutputBufferSize {
|
|
s.outputBuffer = s.outputBuffer[len(s.outputBuffer)-maxOutputBufferSize:]
|
|
}
|
|
}
|
|
|
|
// GetBufferedOutput returns the buffered recent output
|
|
func (s *Session) GetBufferedOutput() []byte {
|
|
s.bufferMu.RLock()
|
|
defer s.bufferMu.RUnlock()
|
|
|
|
if len(s.outputBuffer) == 0 {
|
|
return nil
|
|
}
|
|
|
|
// Return a copy to avoid race conditions
|
|
result := make([]byte, len(s.outputBuffer))
|
|
copy(result, s.outputBuffer)
|
|
return result
|
|
}
|
|
|
|
// waitForExit waits for the shell process to exit and respawns if not stopping
|
|
func (s *Session) waitForExit() {
|
|
if s.cmd != nil {
|
|
_ = s.cmd.Wait()
|
|
}
|
|
|
|
s.mu.Lock()
|
|
stopping := s.stopping
|
|
s.running = false
|
|
s.mu.Unlock()
|
|
|
|
// If Stop() was called, don't respawn - just signal done
|
|
if stopping {
|
|
s.logger.Info("shell process exited (stopping)")
|
|
close(s.doneCh)
|
|
return
|
|
}
|
|
|
|
s.logger.Info("shell process exited unexpectedly, respawning...")
|
|
|
|
// Small delay before respawn to avoid tight loop on repeated failures
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
// Respawn the shell
|
|
if err := s.respawn(); err != nil {
|
|
s.logger.Error("failed to respawn shell", zap.Error(err))
|
|
close(s.doneCh)
|
|
}
|
|
}
|
|
|
|
// respawn restarts the shell process after an unexpected exit
|
|
func (s *Session) respawn() error {
|
|
s.mu.Lock()
|
|
defer s.mu.Unlock()
|
|
|
|
// Check if we're stopping (Stop() called during respawn)
|
|
if s.stopping {
|
|
return nil
|
|
}
|
|
|
|
s.cmd = exec.Command(s.shell, s.shellArgs...)
|
|
s.cmd.Dir = s.workDir
|
|
s.cmd.Env = buildShellEnv(s.workDir)
|
|
|
|
// Start with PTY
|
|
var err error
|
|
s.pty, err = pty.StartWithSize(s.cmd, &pty.Winsize{
|
|
Cols: uint16(s.config.Cols),
|
|
Rows: uint16(s.config.Rows),
|
|
})
|
|
if err != nil {
|
|
return fmt.Errorf("failed to start PTY: %w", err)
|
|
}
|
|
|
|
s.running = true
|
|
s.startedAt = time.Now()
|
|
|
|
s.logger.Info("shell session respawned",
|
|
zap.String("shell", s.shell),
|
|
zap.String("cwd", s.workDir),
|
|
zap.Int("pid", s.cmd.Process.Pid))
|
|
|
|
// Start output reader
|
|
go s.readOutput()
|
|
|
|
// Wait for process exit (recursive respawn on exit)
|
|
go s.waitForExit()
|
|
|
|
return nil
|
|
}
|
|
|
|
// buildShellEnv creates the environment for the shell process
|
|
func buildShellEnv(workDir string) []string {
|
|
env := os.Environ()
|
|
|
|
// Set working directory related vars
|
|
env = append(env, "PWD="+workDir)
|
|
|
|
// Set terminal type
|
|
env = append(env, "TERM=xterm-256color")
|
|
|
|
return env
|
|
}
|
|
|