Merge pull request #3060 from chengzhichao-xydt/codex/error-wrap-and-marshal
fix: use %w for error wrapping and handle json.MarshalIndent error
This commit is contained in:
commit
fa6ed714c4
2 changed files with 5 additions and 2 deletions
|
|
@ -79,7 +79,7 @@ func skillsInstallFromRegistry(cfg *config.Config, registryName, target string)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
if err = os.MkdirAll(filepath.Join(workspace, "skills"), 0o755); err != nil {
|
if err = os.MkdirAll(filepath.Join(workspace, "skills"), 0o755); err != nil {
|
||||||
return fmt.Errorf("\u2717 failed to create skills directory: %v", err)
|
return fmt.Errorf("\u2717 failed to create skills directory: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
result, err := registry.DownloadAndInstall(ctx, target, "", targetDir)
|
result, err := registry.DownloadAndInstall(ctx, target, "", targetDir)
|
||||||
|
|
|
||||||
|
|
@ -2275,7 +2275,10 @@ func (t *WebFetchTool) Execute(ctx context.Context, args map[string]any) *ToolRe
|
||||||
"text": text,
|
"text": text,
|
||||||
}
|
}
|
||||||
|
|
||||||
resultJSON, _ := json.MarshalIndent(result, "", " ")
|
resultJSON, marshalErr := json.MarshalIndent(result, "", " ")
|
||||||
|
if marshalErr != nil {
|
||||||
|
return ErrorResult(fmt.Sprintf("failed to marshal result: %v", marshalErr))
|
||||||
|
}
|
||||||
|
|
||||||
return &ToolResult{
|
return &ToolResult{
|
||||||
ForLLM: string(resultJSON),
|
ForLLM: string(resultJSON),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue