persist process session metadata for restart-safe process tool state

This commit is contained in:
DBT
2026-02-24 08:10:53 +00:00
parent 0d72492309
commit 9478161822
2 changed files with 104 additions and 4 deletions

View File

@@ -63,7 +63,7 @@ func NewAgentLoop(cfg *config.Config, msgBus *bus.MessageBus, provider providers
sessionsManager := session.NewSessionManager(filepath.Join(filepath.Dir(cfg.WorkspacePath()), "sessions"))
toolsRegistry := tools.NewToolRegistry()
processManager := tools.NewProcessManager()
processManager := tools.NewProcessManager(workspace)
readTool := tools.NewReadFileTool(workspace)
writeTool := tools.NewWriteFileTool(workspace)
listTool := tools.NewListDirTool(workspace)

View File

@@ -2,10 +2,14 @@ package tools
import (
"bytes"
"encoding/json"
"fmt"
"os"
"os/exec"
"path/filepath"
"sort"
"strconv"
"strings"
"sync"
"sync/atomic"
"time"
@@ -27,10 +31,18 @@ type ProcessManager struct {
mu sync.RWMutex
sessions map[string]*processSession
seq uint64
metaPath string
}
func NewProcessManager() *ProcessManager {
return &ProcessManager{sessions: map[string]*processSession{}}
func NewProcessManager(workspace string) *ProcessManager {
m := &ProcessManager{sessions: map[string]*processSession{}}
if workspace != "" {
memDir := filepath.Join(workspace, "memory")
_ = os.MkdirAll(memDir, 0755)
m.metaPath = filepath.Join(memDir, "process-sessions.json")
m.load()
}
return m
}
func (m *ProcessManager) Start(command, cwd string) (string, error) {
@@ -52,6 +64,7 @@ func (m *ProcessManager) Start(command, cwd string) (string, error) {
m.mu.Lock()
m.sessions[id] = s
m.mu.Unlock()
m.persist()
if err := cmd.Start(); err != nil {
m.mu.Lock()
@@ -76,6 +89,7 @@ func (m *ProcessManager) Start(command, cwd string) (string, error) {
s.EndedAt = time.Now().UTC()
s.ExitCode = &code
s.mu.Unlock()
m.persist()
close(s.done)
}()
@@ -162,5 +176,91 @@ func (m *ProcessManager) Kill(id string) error {
if cmd.Process == nil {
return fmt.Errorf("process not started")
}
return cmd.Process.Kill()
err := cmd.Process.Kill()
m.persist()
return err
}
type processSessionMeta struct {
ID string `json:"id"`
Command string `json:"command"`
StartedAt string `json:"started_at"`
EndedAt string `json:"ended_at,omitempty"`
ExitCode *int `json:"exit_code,omitempty"`
Recovered bool `json:"recovered"`
}
func (m *ProcessManager) persist() {
if m.metaPath == "" {
return
}
m.mu.RLock()
items := make([]processSessionMeta, 0, len(m.sessions))
for _, s := range m.sessions {
s.mu.RLock()
row := processSessionMeta{
ID: s.ID,
Command: s.Command,
StartedAt: s.StartedAt.Format(time.RFC3339),
Recovered: s.cmd == nil,
}
if !s.EndedAt.IsZero() {
row.EndedAt = s.EndedAt.Format(time.RFC3339)
}
if s.ExitCode != nil {
code := *s.ExitCode
row.ExitCode = &code
}
s.mu.RUnlock()
items = append(items, row)
}
m.mu.RUnlock()
data, err := json.MarshalIndent(items, "", " ")
if err != nil {
return
}
_ = os.WriteFile(m.metaPath, data, 0644)
}
func (m *ProcessManager) load() {
if m.metaPath == "" {
return
}
data, err := os.ReadFile(m.metaPath)
if err != nil {
return
}
var items []processSessionMeta
if err := json.Unmarshal(data, &items); err != nil {
return
}
maxSeq := uint64(0)
for _, it := range items {
s := &processSession{ID: it.ID, Command: it.Command, done: make(chan struct{})}
if t, err := time.Parse(time.RFC3339, it.StartedAt); err == nil {
s.StartedAt = t
}
if it.EndedAt != "" {
if t, err := time.Parse(time.RFC3339, it.EndedAt); err == nil {
s.EndedAt = t
}
}
if it.ExitCode != nil {
code := *it.ExitCode
s.ExitCode = &code
close(s.done)
} else {
code := -2
s.ExitCode = &code
s.EndedAt = time.Now().UTC()
close(s.done)
}
m.sessions[s.ID] = s
if strings.HasPrefix(s.ID, "p-") {
if n, err := strconv.ParseUint(strings.TrimPrefix(s.ID, "p-"), 10, 64); err == nil && n > maxSeq {
maxSeq = n
}
}
}
m.seq = maxSeq
}