diff --git a/internal/config/config.go b/internal/config/config.go index 561efcd2..61ca9884 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -607,6 +607,8 @@ type AgentConfig struct { ToolTimeoutMinutes int `yaml:"tool_timeout_minutes" json:"tool_timeout_minutes"` // 单次工具执行最大时长(分钟),超时自动终止,防止长时间挂起;0 表示不限制(不推荐) // ShellNoOutputTimeoutSeconds execute/exec 无任何 stdout/stderr 时的空闲终止秒数(通用防挂死,不维护命令黑名单);0=默认 300(5 分钟);-1=关闭。 ShellNoOutputTimeoutSeconds int `yaml:"shell_no_output_timeout_seconds" json:"shell_no_output_timeout_seconds"` + // WorkspaceRootDir 会话工作目录根路径(curl/wget 下载、read_file/glob/grep 本地分析);空=tmp/workspace,其下按 projects/{id} 或 conversations/{id} 隔离。 + WorkspaceRootDir string `yaml:"workspace_root_dir,omitempty" json:"workspace_root_dir,omitempty"` // SystemPromptPath 单代理系统提示 Markdown/文本文件路径(相对 config.yaml 所在目录,或可写绝对路径)。非空且可读时替换内置单代理提示;留空用内置。 SystemPromptPath string `yaml:"system_prompt_path,omitempty" json:"system_prompt_path,omitempty"` } diff --git a/internal/database/conversation.go b/internal/database/conversation.go index 507a54ab..cf2d59d8 100644 --- a/internal/database/conversation.go +++ b/internal/database/conversation.go @@ -640,6 +640,16 @@ func (db *DB) einoReductionBaseDir() string { return filepath.Join("tmp", "reduction") } +func (db *DB) einoWorkspaceBaseDir() string { + if db == nil { + return "" + } + if base := strings.TrimSpace(db.einoWorkspaceRootDir); base != "" { + return base + } + return filepath.Join("tmp", "workspace") +} + func (db *DB) removeConversationScopedDirs(conversationID, projectID string) { // summarization transcript, etc. db.removeConversationScopedDir(db.conversationArtifactsDir, conversationID, "conversation_artifacts") @@ -652,6 +662,8 @@ func (db *DB) removeConversationScopedDirs(conversationID, projectID string) { if strings.TrimSpace(projectID) == "" { reductionBase := filepath.Join(db.einoReductionBaseDir(), "conversations") db.removeConversationScopedDir(reductionBase, conversationID, "reduction") + workspaceBase := filepath.Join(db.einoWorkspaceBaseDir(), "conversations") + db.removeConversationScopedDir(workspaceBase, conversationID, "workspace") } } @@ -659,6 +671,9 @@ func (db *DB) removeProjectScopedDirs(projectID string) { // Eino reduction persisted tool outputs (tmp/reduction/projects//). reductionBase := filepath.Join(db.einoReductionBaseDir(), "projects") db.removeConversationScopedDir(reductionBase, projectID, "reduction") + // Agent download/analysis workspace (tmp/workspace/projects//). + workspaceBase := filepath.Join(db.einoWorkspaceBaseDir(), "projects") + db.removeConversationScopedDir(workspaceBase, projectID, "workspace") } // SaveAgentTrace 保存最后一轮代理消息轨迹与助手输出摘要。 diff --git a/internal/database/conversation_cleanup_test.go b/internal/database/conversation_cleanup_test.go index 77e9cfe9..a2bc384d 100644 --- a/internal/database/conversation_cleanup_test.go +++ b/internal/database/conversation_cleanup_test.go @@ -20,7 +20,8 @@ func TestDeleteConversationRemovesEinoScopedDirs(t *testing.T) { plantaskBase := filepath.Join(tmp, "skills", ".eino", "plantask") checkpointBase := filepath.Join(tmp, "eino-checkpoints") reductionBase := filepath.Join(tmp, "reduction") - db.SetEinoConversationDirs(plantaskBase, checkpointBase, reductionBase) + workspaceBase := filepath.Join(tmp, "workspace") + db.SetEinoConversationDirs(plantaskBase, checkpointBase, reductionBase, workspaceBase) conv, err := db.CreateConversation("cleanup test", ConversationCreateMeta{}) if err != nil { @@ -36,6 +37,7 @@ func TestDeleteConversationRemovesEinoScopedDirs(t *testing.T) { {plantaskBase, "task-1.json"}, {checkpointBase, "runner-deep.ckpt"}, {filepath.Join(reductionBase, "conversations"), "tool-output.txt"}, + {filepath.Join(workspaceBase, "conversations"), "page.html"}, } { dir := filepath.Join(base.root, seg) if err := os.MkdirAll(dir, 0o755); err != nil { @@ -50,7 +52,7 @@ func TestDeleteConversationRemovesEinoScopedDirs(t *testing.T) { t.Fatalf("DeleteConversation: %v", err) } - for _, base := range []string{db.conversationArtifactsDir, plantaskBase, checkpointBase, filepath.Join(reductionBase, "conversations")} { + for _, base := range []string{db.conversationArtifactsDir, plantaskBase, checkpointBase, filepath.Join(reductionBase, "conversations"), filepath.Join(workspaceBase, "conversations")} { dir := filepath.Join(base, seg) if _, statErr := os.Stat(dir); !os.IsNotExist(statErr) { t.Fatalf("expected removed dir %s, stat err=%v", dir, statErr) @@ -68,7 +70,8 @@ func TestDeleteProjectRemovesReductionDir(t *testing.T) { defer db.Close() reductionBase := filepath.Join(tmp, "reduction") - db.SetEinoConversationDirs("", "", reductionBase) + workspaceBase := filepath.Join(tmp, "workspace") + db.SetEinoConversationDirs("", "", reductionBase, workspaceBase) project, err := db.CreateProject(&Project{Name: "cleanup test"}) if err != nil { @@ -82,6 +85,13 @@ func TestDeleteProjectRemovesReductionDir(t *testing.T) { if err := os.WriteFile(filepath.Join(reductionDir, "call-1.txt"), []byte("x"), 0o644); err != nil { t.Fatalf("write: %v", err) } + workspaceDir := filepath.Join(workspaceBase, "projects", seg, "downloads") + if err := os.MkdirAll(workspaceDir, 0o755); err != nil { + t.Fatalf("mkdir %s: %v", workspaceDir, err) + } + if err := os.WriteFile(filepath.Join(workspaceDir, "app.js"), []byte("x"), 0o644); err != nil { + t.Fatalf("write workspace: %v", err) + } if err := db.DeleteProject(project.ID); err != nil { t.Fatalf("DeleteProject: %v", err) @@ -91,4 +101,8 @@ func TestDeleteProjectRemovesReductionDir(t *testing.T) { if _, statErr := os.Stat(projectReductionDir); !os.IsNotExist(statErr) { t.Fatalf("expected removed dir %s, stat err=%v", projectReductionDir, statErr) } + projectWorkspaceDir := filepath.Join(workspaceBase, "projects", seg) + if _, statErr := os.Stat(projectWorkspaceDir); !os.IsNotExist(statErr) { + t.Fatalf("expected removed dir %s, stat err=%v", projectWorkspaceDir, statErr) + } } diff --git a/internal/database/database.go b/internal/database/database.go index 55661e56..98e92425 100644 --- a/internal/database/database.go +++ b/internal/database/database.go @@ -52,6 +52,7 @@ type DB struct { einoPlantaskBaseDir string // skills_dir + plantask_rel_dir (per-conversation subdirs) einoCheckpointBaseDir string // checkpoint_dir root (per-conversation subdirs) einoReductionRootDir string // reduction_root_dir or default tmp/reduction (conversations/ subdirs) + einoWorkspaceRootDir string // workspace_root_dir or default tmp/workspace (projects|conversations/ subdirs) checkpointLoopName string checkpointStop chan struct{} checkpointDone chan struct{} @@ -161,13 +162,15 @@ func NewDB(dbPath string, logger *zap.Logger) (*DB, error) { // SetEinoConversationDirs configures best-effort filesystem cleanup on DeleteConversation. // plantaskBase is skills_root/plantask_rel (no conversation id); checkpointBase is checkpoint_dir root. // reductionRoot is reduction_root_dir from config; empty uses tmp/reduction (conversation-scoped subdirs only). -func (db *DB) SetEinoConversationDirs(plantaskBase, checkpointBase, reductionRoot string) { +// workspaceRoot is agent.workspace_root_dir from config; empty uses tmp/workspace. +func (db *DB) SetEinoConversationDirs(plantaskBase, checkpointBase, reductionRoot, workspaceRoot string) { if db == nil { return } db.einoPlantaskBaseDir = strings.TrimSpace(plantaskBase) db.einoCheckpointBaseDir = strings.TrimSpace(checkpointBase) db.einoReductionRootDir = strings.TrimSpace(reductionRoot) + db.einoWorkspaceRootDir = strings.TrimSpace(workspaceRoot) } // initTables 初始化数据库表