From 198d5f7b7d38c5c40e6b1b86debd421c81812c50 Mon Sep 17 00:00:00 2001 From: afjcjsbx Date: Fri, 20 Feb 2026 00:41:16 +0100 Subject: [PATCH] removed duplicated parameters --- pkg/agent/loop.go | 2 +- pkg/config/config.go | 18 +++++++----------- pkg/tools/vision.go | 6 +++--- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/pkg/agent/loop.go b/pkg/agent/loop.go index 79fcbfb04..980e202d3 100644 --- a/pkg/agent/loop.go +++ b/pkg/agent/loop.go @@ -107,7 +107,7 @@ func registerSharedTools(cfg *config.Config, msgBus *bus.MessageBus, registry *A // Vision tool if cfg.Tools.Vision.Enabled { - agent.Tools.Register(tools.NewAnalyzeImageTool(cfg.Tools.Vision)) + agent.Tools.Register(tools.NewAnalyzeImageTool(cfg.Tools.Vision, cfg.WorkspacePath(), cfg.Agents.Defaults.RestrictToWorkspace)) } // Message tool diff --git a/pkg/config/config.go b/pkg/config/config.go index 46d38e7ff..1fbef5ecb 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -316,12 +316,10 @@ type ExecConfig struct { } type VisionToolConfig struct { - Enabled bool `json:"enabled" env:"PICOCLAW_TOOLS_VISION_ENABLED"` - ApiKey string `json:"api_key" env:"PICOCLAW_TOOLS_VISION_API_KEY"` - ApiURL string `json:"api_url" env:"PICOCLAW_TOOLS_VISION_API_URL"` - Model string `json:"model" env:"PICOCLAW_TOOLS_VISION_MODEL"` - Workspace string `json:"workspace" env:"PICOCLAW_TOOLS_VISION_WORKSPACE"` - Restrict bool `json:"restrict" env:"PICOCLAW_TOOLS_VISION_RESTRICT"` + Enabled bool `json:"enabled" env:"PICOCLAW_TOOLS_VISION_ENABLED"` + ApiKey string `json:"api_key" env:"PICOCLAW_TOOLS_VISION_API_KEY"` + ApiURL string `json:"api_url" env:"PICOCLAW_TOOLS_VISION_API_URL"` + Model string `json:"model" env:"PICOCLAW_TOOLS_VISION_MODEL"` } type ToolsConfig struct { @@ -450,11 +448,9 @@ func DefaultConfig() *Config { EnableDenyPatterns: true, }, Vision: VisionToolConfig{ - Enabled: false, - ApiURL: "", - Model: "gpt-4o-mini", - Restrict: true, - Workspace: "", + Enabled: false, + ApiURL: "", + Model: "gpt-4o-mini", }, }, Heartbeat: HeartbeatConfig{ diff --git a/pkg/tools/vision.go b/pkg/tools/vision.go index 5b5ff394f..daeee23de 100644 --- a/pkg/tools/vision.go +++ b/pkg/tools/vision.go @@ -31,10 +31,10 @@ type AnalyzeImageTool struct { restrict bool } -func NewAnalyzeImageTool(opts config.VisionToolConfig) *AnalyzeImageTool { +func NewAnalyzeImageTool(opts config.VisionToolConfig, workspace string, restrict bool) *AnalyzeImageTool { return &AnalyzeImageTool{ - workspace: opts.Workspace, - restrict: opts.Restrict, + workspace: workspace, + restrict: restrict, apiKey: opts.ApiKey, apiURL: opts.ApiURL, model: opts.Model,