DBT/clawgo
1
0
Fork 0
mirror of https://github.com/YspCoder/clawgo.git synced 2026-05-08 05:27:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

harden exec defaults and gate bootstrap loading to first-run context

Browse Source
This commit is contained in:
DBT
2026-02-24 08:28:41 +00:00
parent 9478161822
commit 1a6febffe7
4 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config.example.json
View File

@@ -143,6 +143,7 @@
"enabled": true, "enabled": true,
"working_dir": "", "working_dir": "",
"timeout": 60000000000, "timeout": 60000000000,
"auto_install_missing": false,
"sandbox": { "sandbox": {
"enabled": false, "enabled": false,
"image": "alpine:3.20" "image": "alpine:3.20"

24
pkg/agent/context.go
View File

@@ -137,7 +137,6 @@ func (cb *ContextBuilder) LoadBootstrapFiles() string {
bootstrapFiles := []string{ bootstrapFiles := []string{
"AGENTS.md", "AGENTS.md",
"BOOT.md", "BOOT.md",
"BOOTSTRAP.md",
"SOUL.md", "SOUL.md",
"USER.md", "USER.md",
"IDENTITY.md", "IDENTITY.md",
@@ -152,9 +151,32 @@ func (cb *ContextBuilder) LoadBootstrapFiles() string {
} }
} }
// BOOTSTRAP.md is first-run guidance; load only when identity/user is not initialized.
if cb.shouldLoadBootstrap() {
if data, err := os.ReadFile(filepath.Join(cb.workspace, "BOOTSTRAP.md")); err == nil {
result += fmt.Sprintf("## %s\n\n%s\n\n", "BOOTSTRAP.md", string(data))
}
}
return result return result
} }
func (cb *ContextBuilder) shouldLoadBootstrap() bool {
identityPath := filepath.Join(cb.workspace, "IDENTITY.md")
userPath := filepath.Join(cb.workspace, "USER.md")
identityData, idErr := os.ReadFile(identityPath)
userData, userErr := os.ReadFile(userPath)
if idErr != nil || userErr != nil {
return true
}
idText := strings.TrimSpace(string(identityData))
userText := strings.TrimSpace(string(userData))
if idText == "" || userText == "" {
return true
}
return false
}
func (cb *ContextBuilder) BuildMessages(history []providers.Message, summary string, currentMessage string, media []string, channel, chatID, responseLanguage string) []providers.Message { func (cb *ContextBuilder) BuildMessages(history []providers.Message, summary string, currentMessage string, media []string, channel, chatID, responseLanguage string) []providers.Message {
messages := []providers.Message{} messages := []providers.Message{}

14
pkg/config/config.go
View File

@@ -217,10 +217,11 @@ type WebToolsConfig struct {
} }
type ShellConfig struct { type ShellConfig struct {
Enabled bool `json:"enabled" env:"CLAWGO_TOOLS_SHELL_ENABLED"` Enabled bool `json:"enabled" env:"CLAWGO_TOOLS_SHELL_ENABLED"`
WorkingDir string `json:"working_dir" env:"CLAWGO_TOOLS_SHELL_WORKING_DIR"` WorkingDir string `json:"working_dir" env:"CLAWGO_TOOLS_SHELL_WORKING_DIR"`
Timeout time.Duration `json:"timeout" env:"CLAWGO_TOOLS_SHELL_TIMEOUT"` Timeout time.Duration `json:"timeout" env:"CLAWGO_TOOLS_SHELL_TIMEOUT"`
Sandbox SandboxConfig `json:"sandbox"` AutoInstallMissing bool `json:"auto_install_missing" env:"CLAWGO_TOOLS_SHELL_AUTO_INSTALL_MISSING"`
Sandbox SandboxConfig `json:"sandbox"`
} }
type SandboxConfig struct { type SandboxConfig struct {
@@ -441,8 +442,9 @@ func DefaultConfig() *Config {
}, },
}, },
Shell: ShellConfig{ Shell: ShellConfig{
Enabled: true, Enabled: true,
Timeout: 60 * time.Second, Timeout: 60 * time.Second,
AutoInstallMissing: false,
Sandbox: SandboxConfig{ Sandbox: SandboxConfig{
Enabled: false, Enabled: false,
Image: "alpine:3.20", Image: "alpine:3.20",

20
pkg/tools/shell.go
View File

@@ -18,18 +18,20 @@ import (
type ExecTool struct { type ExecTool struct {
workingDir string workingDir string
timeout time.Duration timeout time.Duration
sandboxEnabled bool sandboxEnabled bool
sandboxImage string sandboxImage string
procManager *ProcessManager autoInstallMissing bool
procManager *ProcessManager
} }
func NewExecTool(cfg config.ShellConfig, workspace string, pm *ProcessManager) *ExecTool { func NewExecTool(cfg config.ShellConfig, workspace string, pm *ProcessManager) *ExecTool {
return &ExecTool{ return &ExecTool{
workingDir: workspace, workingDir: workspace,
timeout: cfg.Timeout, timeout: cfg.Timeout,
sandboxEnabled: cfg.Sandbox.Enabled, sandboxEnabled: cfg.Sandbox.Enabled,
sandboxImage: cfg.Sandbox.Image, sandboxImage: cfg.Sandbox.Image,
procManager: pm, autoInstallMissing: cfg.AutoInstallMissing,
procManager: pm,
} }
} }
@@ -142,7 +144,7 @@ func (t *ExecTool) executeCommand(ctx context.Context, command, cwd string) (str
return fmt.Sprintf("Error: Command timed out after %v", t.timeout), nil return fmt.Sprintf("Error: Command timed out after %v", t.timeout), nil
} }
if err != nil { if err != nil && t.autoInstallMissing {
if missingCmd := detectMissingCommandFromOutput(output); missingCmd != "" { if missingCmd := detectMissingCommandFromOutput(output); missingCmd != "" {
if installLog, installed := t.tryAutoInstallMissingCommand(ctx, missingCmd, cwd); installed { if installLog, installed := t.tryAutoInstallMissingCommand(ctx, missingCmd, cwd); installed {
output += "\n[AUTO-INSTALL]\n" + installLog output += "\n[AUTO-INSTALL]\n" + installLog