mirror of
https://github.com/YspCoder/clawgo.git
synced 2026-05-19 23:47:29 +08:00
persist process session metadata for restart-safe process tool state
This commit is contained in:
@@ -63,7 +63,7 @@ func NewAgentLoop(cfg *config.Config, msgBus *bus.MessageBus, provider providers
|
|||||||
sessionsManager := session.NewSessionManager(filepath.Join(filepath.Dir(cfg.WorkspacePath()), "sessions"))
|
sessionsManager := session.NewSessionManager(filepath.Join(filepath.Dir(cfg.WorkspacePath()), "sessions"))
|
||||||
|
|
||||||
toolsRegistry := tools.NewToolRegistry()
|
toolsRegistry := tools.NewToolRegistry()
|
||||||
processManager := tools.NewProcessManager()
|
processManager := tools.NewProcessManager(workspace)
|
||||||
readTool := tools.NewReadFileTool(workspace)
|
readTool := tools.NewReadFileTool(workspace)
|
||||||
writeTool := tools.NewWriteFileTool(workspace)
|
writeTool := tools.NewWriteFileTool(workspace)
|
||||||
listTool := tools.NewListDirTool(workspace)
|
listTool := tools.NewListDirTool(workspace)
|
||||||
|
|||||||
@@ -2,10 +2,14 @@ package tools
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
"path/filepath"
|
||||||
"sort"
|
"sort"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
@@ -27,10 +31,18 @@ type ProcessManager struct {
|
|||||||
mu sync.RWMutex
|
mu sync.RWMutex
|
||||||
sessions map[string]*processSession
|
sessions map[string]*processSession
|
||||||
seq uint64
|
seq uint64
|
||||||
|
metaPath string
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewProcessManager() *ProcessManager {
|
func NewProcessManager(workspace string) *ProcessManager {
|
||||||
return &ProcessManager{sessions: map[string]*processSession{}}
|
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) {
|
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.mu.Lock()
|
||||||
m.sessions[id] = s
|
m.sessions[id] = s
|
||||||
m.mu.Unlock()
|
m.mu.Unlock()
|
||||||
|
m.persist()
|
||||||
|
|
||||||
if err := cmd.Start(); err != nil {
|
if err := cmd.Start(); err != nil {
|
||||||
m.mu.Lock()
|
m.mu.Lock()
|
||||||
@@ -76,6 +89,7 @@ func (m *ProcessManager) Start(command, cwd string) (string, error) {
|
|||||||
s.EndedAt = time.Now().UTC()
|
s.EndedAt = time.Now().UTC()
|
||||||
s.ExitCode = &code
|
s.ExitCode = &code
|
||||||
s.mu.Unlock()
|
s.mu.Unlock()
|
||||||
|
m.persist()
|
||||||
close(s.done)
|
close(s.done)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
@@ -162,5 +176,91 @@ func (m *ProcessManager) Kill(id string) error {
|
|||||||
if cmd.Process == nil {
|
if cmd.Process == nil {
|
||||||
return fmt.Errorf("process not started")
|
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
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user