fix: remove redundant code in processing logic

internal/mcpserver/server.go

@@ -41,6 +41,7 @@ type ToolSet struct {
 	ChatHistory   *tools.ChatHistoryTool
 	Describe      *tools.DescribeTool
 	Learnings     *tools.LearningsTool
+	Plans         *tools.PlansTool
 }
 
 // Handlers groups the HTTP handlers produced for an MCP server instance.
@@ -85,6 +86,7 @@ func NewHandlers(cfg config.MCPConfig, logger *slog.Logger, toolSet ToolSet, onS
 		registerThoughtTools,
 		registerProjectTools,
 		registerLearningTools,
+		registerPlanTools,
 		registerFileTools,
 		registerMaintenanceTools,
 		registerSkillTools,
@@ -273,6 +275,100 @@ func registerLearningTools(server *mcp.Server, logger *slog.Logger, toolSet Tool
 	return nil
 }
 
+func registerPlanTools(server *mcp.Server, logger *slog.Logger, toolSet ToolSet) error {
+	if err := addTool(server, logger, &mcp.Tool{
+		Name:        "create_plan",
+		Description: "Create a structured plan linked to a project.",
+	}, toolSet.Plans.Create); err != nil {
+		return err
+	}
+	if err := addTool(server, logger, &mcp.Tool{
+		Name:        "get_plan",
+		Description: "Retrieve a plan with its dependencies, related plans, skills, and guardrails.",
+	}, toolSet.Plans.Get); err != nil {
+		return err
+	}
+	if err := addTool(server, logger, &mcp.Tool{
+		Name:        "update_plan",
+		Description: "Update plan fields; only provided fields are changed.",
+	}, toolSet.Plans.Update); err != nil {
+		return err
+	}
+	if err := addTool(server, logger, &mcp.Tool{
+		Name:        "delete_plan",
+		Description: "Hard-delete a plan by id.",
+	}, toolSet.Plans.Delete); err != nil {
+		return err
+	}
+	if err := addTool(server, logger, &mcp.Tool{
+		Name:        "list_plans",
+		Description: "List plans with optional project, status, priority, owner, tag, and text filters.",
+	}, toolSet.Plans.List); err != nil {
+		return err
+	}
+	if err := addTool(server, logger, &mcp.Tool{
+		Name:        "add_plan_dependency",
+		Description: "Mark plan_id as depending on depends_on_plan_id (must complete first).",
+	}, toolSet.Plans.AddDependency); err != nil {
+		return err
+	}
+	if err := addTool(server, logger, &mcp.Tool{
+		Name:        "remove_plan_dependency",
+		Description: "Remove a dependency between two plans.",
+	}, toolSet.Plans.RemoveDependency); err != nil {
+		return err
+	}
+	if err := addTool(server, logger, &mcp.Tool{
+		Name:        "add_related_plan",
+		Description: "Link two plans as thematically related (bidirectional).",
+	}, toolSet.Plans.AddRelated); err != nil {
+		return err
+	}
+	if err := addTool(server, logger, &mcp.Tool{
+		Name:        "remove_related_plan",
+		Description: "Unlink two related plans.",
+	}, toolSet.Plans.RemoveRelated); err != nil {
+		return err
+	}
+	if err := addTool(server, logger, &mcp.Tool{
+		Name:        "add_plan_skill",
+		Description: "Link an agent skill to a plan.",
+	}, toolSet.Plans.AddSkill); err != nil {
+		return err
+	}
+	if err := addTool(server, logger, &mcp.Tool{
+		Name:        "remove_plan_skill",
+		Description: "Unlink an agent skill from a plan.",
+	}, toolSet.Plans.RemoveSkill); err != nil {
+		return err
+	}
+	if err := addTool(server, logger, &mcp.Tool{
+		Name:        "list_plan_skills",
+		Description: "List skills linked to a plan.",
+	}, toolSet.Plans.ListSkills); err != nil {
+		return err
+	}
+	if err := addTool(server, logger, &mcp.Tool{
+		Name:        "add_plan_guardrail",
+		Description: "Link an agent guardrail to a plan.",
+	}, toolSet.Plans.AddGuardrail); err != nil {
+		return err
+	}
+	if err := addTool(server, logger, &mcp.Tool{
+		Name:        "remove_plan_guardrail",
+		Description: "Unlink an agent guardrail from a plan.",
+	}, toolSet.Plans.RemoveGuardrail); err != nil {
+		return err
+	}
+	if err := addTool(server, logger, &mcp.Tool{
+		Name:        "list_plan_guardrails",
+		Description: "List guardrails linked to a plan.",
+	}, toolSet.Plans.ListGuardrails); err != nil {
+		return err
+	}
+	return nil
+}
+
 func registerFileTools(server *mcp.Server, logger *slog.Logger, toolSet ToolSet) error {
 	server.AddResourceTemplate(&mcp.ResourceTemplate{
 		Name:        "stored_file",
@@ -460,7 +556,7 @@ func registerChatHistoryTools(server *mcp.Server, logger *slog.Logger, toolSet T
 func registerDescribeTools(server *mcp.Server, logger *slog.Logger, toolSet ToolSet) error {
 	if err := addTool(server, logger, &mcp.Tool{
 		Name:        "describe_tools",
-		Description: "Call first each session. All tools with categories and usage notes. Categories: system, thoughts, projects, files, admin, maintenance, skills, chat, meta.",
+		Description: "Call first each session. All tools with categories and usage notes. Categories: system, thoughts, projects, files, admin, maintenance, skills, plans, chat, meta.",
 	}, toolSet.Describe.Describe); err != nil {
 		return err
 	}
@@ -506,6 +602,23 @@ func BuildToolCatalog() []tools.ToolEntry {
 		{Name: "get_learning", Description: "Retrieve a structured learning by id.", Category: "projects"},
 		{Name: "list_learnings", Description: "List structured learnings with optional project, category, area, status, priority, tag, and text filters.", Category: "projects"},
 
+		// plans
+		{Name: "create_plan", Description: "Create a structured plan with status, priority, owner, due date, and optional project link.", Category: "plans"},
+		{Name: "get_plan", Description: "Retrieve a full plan including dependencies (depends_on/blocks), related plans, linked skills, and guardrails.", Category: "plans"},
+		{Name: "update_plan", Description: "Partially update a plan; only provided fields are changed. Use mark_reviewed to stamp last_reviewed_at.", Category: "plans"},
+		{Name: "delete_plan", Description: "Hard-delete a plan by id.", Category: "plans"},
+		{Name: "list_plans", Description: "List plans with optional filters: project, status, priority, owner, tag, and full-text query.", Category: "plans"},
+		{Name: "add_plan_dependency", Description: "Declare that plan_id cannot proceed until depends_on_plan_id is complete.", Category: "plans"},
+		{Name: "remove_plan_dependency", Description: "Remove a directional dependency between two plans.", Category: "plans"},
+		{Name: "add_related_plan", Description: "Link two plans as thematically related (bidirectional, order-independent).", Category: "plans"},
+		{Name: "remove_related_plan", Description: "Unlink two related plans.", Category: "plans"},
+		{Name: "add_plan_skill", Description: "Link an agent skill to a plan so it is loaded with the plan's context.", Category: "plans"},
+		{Name: "remove_plan_skill", Description: "Unlink an agent skill from a plan.", Category: "plans"},
+		{Name: "list_plan_skills", Description: "List all skills linked to a plan.", Category: "plans"},
+		{Name: "add_plan_guardrail", Description: "Link an agent guardrail to a plan so it applies during plan execution.", Category: "plans"},
+		{Name: "remove_plan_guardrail", Description: "Unlink an agent guardrail from a plan.", Category: "plans"},
+		{Name: "list_plan_guardrails", Description: "List all guardrails linked to a plan.", Category: "plans"},
+
 		// files
 		{Name: "upload_file", Description: "Stage a file and get an amcs://files/{id} resource URI. Use content_path (absolute server-side path, no size limit) for large or binary files, or content_base64 (≤10 MB) for small files. Pass thought_id/project to link immediately, or omit and pass the URI to save_file later.", Category: "files"},
 		{Name: "save_file", Description: "Store a file and optionally link it to a thought. Use content_base64 (≤10 MB) for small files, or content_uri (amcs://files/{id} from a prior upload_file) for previously staged files. For files larger than 10 MB, use upload_file with content_path first. If the goal is to retain the artifact, store the file directly instead of reading or summarising it first.", Category: "files"},
@@ -544,7 +657,7 @@ func BuildToolCatalog() []tools.ToolEntry {
 		{Name: "delete_chat_history", Description: "Permanently delete a saved chat history by id.", Category: "chat"},
 
 		// meta
-		{Name: "describe_tools", Description: "Call this first in every session. Returns all available MCP tools with names, descriptions, categories, and your accumulated usage notes. Filter by category to narrow results. Available categories: system, thoughts, projects, files, admin, household, maintenance, calendar, meals, crm, skills, chat, meta.", Category: "meta"},
+		{Name: "describe_tools", Description: "Call this first in every session. Returns all available MCP tools with names, descriptions, categories, and your accumulated usage notes. Filter by category to narrow results. Available categories: system, thoughts, projects, files, admin, household, maintenance, calendar, meals, crm, skills, plans, chat, meta.", Category: "meta"},
 		{Name: "annotate_tool", Description: "Persist usage notes, gotchas, or workflow patterns for a specific tool. Notes survive across sessions and are returned by describe_tools. Call this whenever you discover something non-obvious about a tool's behaviour. Pass an empty string to clear notes.", Category: "meta"},
 	}
 }