Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions internal/tools/memo/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package memo

import (
"fmt"
"strings"

"neo-code/internal/memo"
"neo-code/internal/tools"
)

Expand All @@ -11,3 +13,40 @@ func nilServiceError(toolName string) (tools.ToolResult, error) {
err := fmt.Errorf("%s: service is nil", toolName)
return tools.NewErrorResult(toolName, tools.NormalizeErrorReason(toolName, err), "", nil), err
}

// invalidArgumentsError 构造 memo 工具参数解析失败时的统一错误结果。
func invalidArgumentsError(toolName string, err error) (tools.ToolResult, error) {
wrappedErr := fmt.Errorf("%s: %w", toolName, err)
return tools.NewErrorResult(toolName, "invalid arguments", wrappedErr.Error(), nil), wrappedErr
}

// memoScopePropertySchema 返回 memo 工具统一的 scope 参数 schema 描述。
func memoScopePropertySchema() map[string]any {
return map[string]any{
"type": "string",
"description": "Optional scope filter: all, user, or project.",
"enum": []string{"all", "user", "project"},
}
}

// parseMemoScope 解析 memo scope,并根据 allowAll 决定是否接受 all。
func parseMemoScope(raw string, allowAll bool) (memo.Scope, error) {
normalized := strings.ToLower(strings.TrimSpace(raw))
if normalized == "" {
if allowAll {
return memo.ScopeAll, nil
}
return memo.ScopeProject, fmt.Errorf("memo: scope is required")
}
switch memo.Scope(normalized) {
case memo.ScopeUser:
return memo.ScopeUser, nil
case memo.ScopeProject:
return memo.ScopeProject, nil
case memo.ScopeAll:
if allowAll {
return memo.ScopeAll, nil
}
}
return "", fmt.Errorf("memo: unsupported scope %q", raw)
}
9 changes: 2 additions & 7 deletions internal/tools/memo/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,7 @@ func (t *ListTool) Schema() map[string]any {
return map[string]any{
"type": "object",
"properties": map[string]any{
"scope": map[string]any{
"type": "string",
"description": "Optional scope filter: all, user, or project.",
"enum": []string{"all", "user", "project"},
},
"scope": memoScopePropertySchema(),
},
}
}
Expand All @@ -62,8 +58,7 @@ func (t *ListTool) Execute(ctx context.Context, call tools.ToolCallInput) (tools
var args listInput
if len(call.Arguments) > 0 {
if err := json.Unmarshal(call.Arguments, &args); err != nil {
err = fmt.Errorf("%s: %w", listToolName, err)
return tools.NewErrorResult(listToolName, "invalid arguments", err.Error(), nil), err
return invalidArgumentsError(listToolName, err)
}
}

Expand Down
9 changes: 2 additions & 7 deletions internal/tools/memo/recall.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,7 @@ func (t *RecallTool) Schema() map[string]any {
"type": "string",
"description": "Search keyword to find matching memory entries (searches title, type, content, and keywords).",
},
"scope": map[string]any{
"type": "string",
"description": "Optional scope filter: all, user, or project.",
"enum": []string{"all", "user", "project"},
},
"scope": memoScopePropertySchema(),
},
"required": []string{"keyword"},
}
Expand All @@ -69,8 +65,7 @@ func (t *RecallTool) MicroCompactPolicy() tools.MicroCompactPolicy {
func (t *RecallTool) Execute(ctx context.Context, call tools.ToolCallInput) (tools.ToolResult, error) {
var args recallInput
if err := json.Unmarshal(call.Arguments, &args); err != nil {
wrappedErr := fmt.Errorf("%s: %w", recallToolName, err)
return tools.NewErrorResult(recallToolName, "invalid arguments", wrappedErr.Error(), nil), wrappedErr
return invalidArgumentsError(recallToolName, err)
}

args.Keyword = strings.TrimSpace(args.Keyword)
Expand Down
3 changes: 1 addition & 2 deletions internal/tools/memo/remember.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ func (t *RememberTool) MicroCompactPolicy() tools.MicroCompactPolicy {
func (t *RememberTool) Execute(ctx context.Context, call tools.ToolCallInput) (tools.ToolResult, error) {
var args rememberInput
if err := json.Unmarshal(call.Arguments, &args); err != nil {
err = fmt.Errorf("%s: %w", rememberToolName, err)
return tools.NewErrorResult(rememberToolName, "invalid arguments", err.Error(), nil), err
return invalidArgumentsError(rememberToolName, err)
}

args.Type = strings.TrimSpace(args.Type)
Expand Down
31 changes: 2 additions & 29 deletions internal/tools/memo/remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@ func (t *RemoveTool) Schema() map[string]any {
"type": "string",
"description": "Keyword to match against memory title, type, keywords, or content.",
},
"scope": map[string]any{
"type": "string",
"description": "Optional scope filter: all, user, or project.",
"enum": []string{"all", "user", "project"},
},
"scope": memoScopePropertySchema(),
},
"required": []string{"keyword"},
}
Expand All @@ -63,8 +59,7 @@ func (t *RemoveTool) MicroCompactPolicy() tools.MicroCompactPolicy {
func (t *RemoveTool) Execute(ctx context.Context, call tools.ToolCallInput) (tools.ToolResult, error) {
var args removeInput
if err := json.Unmarshal(call.Arguments, &args); err != nil {
err = fmt.Errorf("%s: %w", removeToolName, err)
return tools.NewErrorResult(removeToolName, "invalid arguments", err.Error(), nil), err
return invalidArgumentsError(removeToolName, err)
}
if t.svc == nil {
return nilServiceError(removeToolName)
Expand Down Expand Up @@ -96,25 +91,3 @@ func (t *RemoveTool) Execute(ctx context.Context, call tools.ToolCallInput) (too
Content: fmt.Sprintf("Removed %d memo(s) matching %q.", removed, args.Keyword),
}, nil
}

// parseMemoScope 解析 memo scope,并根据 allowAll 决定是否接受 all。
func parseMemoScope(raw string, allowAll bool) (memo.Scope, error) {
normalized := strings.ToLower(strings.TrimSpace(raw))
if normalized == "" {
if allowAll {
return memo.ScopeAll, nil
}
return memo.ScopeProject, fmt.Errorf("memo: scope is required")
}
switch memo.Scope(normalized) {
case memo.ScopeUser:
return memo.ScopeUser, nil
case memo.ScopeProject:
return memo.ScopeProject, nil
case memo.ScopeAll:
if allowAll {
return memo.ScopeAll, nil
}
}
return "", fmt.Errorf("memo: unsupported scope %q", raw)
}
Loading