Merge branch 'main' into refactor/migrate-official-mcp-go-sdk

Co-Authored-By: OpenAI Codex (GPT-5) <noreply@openai.com>

.gitea/workflows/test-pr.yml

@@ -13,6 +13,8 @@ jobs:
           go-version-file: 'go.mod'
       - name: lint
         run: make lint
+      - name: test
+        run: make test
       - name: build
         run: make build
       - name: security-check

AGENTS.md

@@ -1,8 +1,16 @@
+- Never assume, verify before claiming
 - Use `make help` to find available development targets
-- Run `make fmt` to format `.go` files, and run `make lint-go` to lint them
+- PR descriptions: minimal, only what and why, no task lists or file listings
-- Run `make tidy` after any `go.mod` changes
+- Reference issues and PRs by full URL, not by number
-- Ensure no trailing whitespace in edited files
+- Use Conventional Commits for commit messages and PR titles, e.g. `type(scope): subject`; `!` before the colon if breaking. Use `test` type for test-only changes.
-- Use Conventional Commits format for commit messages and PR titles (e.g. `type(scope): subject`)
+- Add an `Assisted-by: AGENT_NAME:MODEL_VERSION` trailer to commit messages, never `Co-Authored-By` or `Signed-off-by`
+- Attribute agent authorship on one trailing line in issue and pull request comments, never as a PR description section
 - Never force-push, amend, or squash unless asked. Use new commits and normal push for pull request updates
-- Include authorship attribution in issue and pull request comments
+- Keep comments short, prefer same-line, explain why, never narrate code. Preserve existing ones that still apply
-- Add `Co-Authored-By` lines to all commits, indicating name and model used
+- Ensure no trailing whitespace in edited files
+- Run `make fmt` to format `.go` files, `make lint-go` to lint them, and `make tidy` after any `go.mod` changes
+- Fix the cause rather than disabling a linter or weakening a test. Where unavoidable, use the narrowest scope with a trailing comment giving the reason
+- Register new tools with `Tool.RegisterRead` or `Tool.RegisterWrite`, and add them to the tool tables in `README.md`, `README.zh-cn.md` and `README.zh-tw.md`
+- Run single go tests with `go test -run '^TestName$' ./modulepath/`
+- Write the fewest, fastest tests covering the behavior, extending an existing one where possible. Prefer unit tests where logic is testable in isolation
+- Wait on a deterministic condition rather than `sleep`

BUILDING.md

@@ -4,7 +4,7 @@ This project includes PowerShell and batch scripts to build the gitea-mcp applic
 
 ## Prerequisites
 
-- Go 1.24 or later
+- Go 1.26 or later
 - Git (for version information)
 - PowerShell 5.1 or later (included with Windows 10/11)
 

CLAUDE.md

@@ -1,78 +1 @@
-# CLAUDE.md
+@AGENTS.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Development Commands
-
-**Build**: `make build` - Build the gitea-mcp binary
-**Install**: `make install` - Build and install to GOPATH/bin
-**Clean**: `make clean` - Remove build artifacts
-**Test**: `go test ./...` - Run all tests
-**Hot reload**: `make dev` - Start development server with hot reload (requires air)
-**Dependencies**: `make vendor` - Tidy and verify module dependencies
-
-## Architecture Overview
-
-This is a **Gitea MCP (Model Context Protocol) Server** written in Go that provides MCP tools for interacting with Gitea repositories, issues, pull requests, users, and more.
-
-**Core Components**:
-
-- `main.go` + `cmd/cmd.go`: CLI entry point and flag parsing
-- `operation/operation.go`: Main server setup and tool registration
-- `pkg/tool/tool.go`: Tool registry with read/write categorization
-- `operation/*/`: Individual tool modules (user, repo, issue, pull, search, wiki, etc.)
-
-**Transport Modes**:
-
-- **stdio** (default): Standard input/output for MCP clients
-- **http**: HTTP server mode on configurable port (default 8080)
-
-**Authentication**:
-
-- Global token via `--token` flag or `GITEA_ACCESS_TOKEN` env var
-- HTTP mode supports per-request Bearer token override in Authorization header
-- Token precedence: HTTP Authorization header > CLI flag > environment variable
-
-**Tool Organization**:
-
-- Tools are categorized as read-only or write operations
-- `--read-only` flag exposes only read tools
-- Tool modules register via `Tool.RegisterRead()` and `Tool.RegisterWrite()`
-
-**Key Configuration**:
-
-- Default Gitea host: `https://gitea.com` (override with `--host` or `GITEA_HOST`)
-- Environment variables can override CLI flags: `MCP_MODE`, `GITEA_READONLY`, `GITEA_DEBUG`, `GITEA_INSECURE`
-- Logs are written to `~/.gitea-mcp/gitea-mcp.log` with rotation
-
-## Available Tools
-
-The server provides 45 MCP tools covering:
-
-- **User**: get_me, get_user_orgs
-- **Search**: search_users, search_repos, search_org_teams
-- **Repository**: create_repo, fork_repo, list_my_repos
-- **Branches**: list_branches, create_branch, delete_branch
-- **Tags**: list_tags, get_tag, create_tag, delete_tag
-- **Files**: get_file_contents, get_dir_contents, create_or_update_file, delete_file
-- **Commits**: list_commits
-- **Issues**: list_issues, issue_read, issue_write
-- **Pull Requests**: list_pull_requests, pull_request_read, pull_request_write, pull_request_review_write
-- **Labels**: label_read, label_write
-- **Milestones**: milestone_read, milestone_write
-- **Releases**: list_releases, get_release, get_latest_release, create_release, delete_release
-- **Wiki**: wiki_read, wiki_write
-- **Time Tracking**: timetracking_read, timetracking_write
-- **Actions Runs**: actions_run_read, actions_run_write
-- **Actions Config**: actions_config_read, actions_config_write
-- **Version**: get_gitea_mcp_server_version
-
-## Common Development Patterns
-
-**Testing**: Use `go test ./operation -run TestFunctionName` for specific tests
-
-**Token Context**: HTTP requests use `pkg/context.TokenContextKey` for request-scoped token access
-
-**Flag Access**: All packages access configuration via global variables in `pkg/flag/flag.go`
-
-**Graceful Shutdown**: HTTP mode implements graceful shutdown with 10-second timeout on SIGTERM/SIGINT

Makefile

@@ -3,8 +3,10 @@ EXECUTABLE := gitea-mcp
 VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
 LDFLAGS := -X "main.Version=$(VERSION)"
 
-GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2
+GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2 # renovate: datasource=go
-GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1.3.0
+GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1.3.0 # renovate: datasource=go
+
+GOTEST_FLAGS ?= -race -timeout 20m
 
 .PHONY: help
 help: ## print this help message
@@ -38,6 +40,10 @@ clean: ## delete build artifacts
 build: ## build the application
 	$(GO) build -v -ldflags '-s -w $(LDFLAGS)' -o $(EXECUTABLE)
 
+.PHONY: test
+test: ## run Go tests
+	$(GO) test $(GOTEST_FLAGS) ./...
+
 .PHONY: air
 air: ## install air for hot reload
 	@hash air > /dev/null 2>&1; if [ $$? -ne 0 ]; then \

README.md

@@ -2,58 +2,27 @@
 
 [繁體中文](README.zh-tw.md) | [简体中文](README.zh-cn.md)
 
-**Gitea MCP Server** is an integration plugin designed to connect Gitea with Model Context Protocol (MCP) systems. This allows for seamless command execution and repository management through an MCP-compatible chat interface.
+**Gitea MCP Server** connects a [Gitea](https://about.gitea.com) instance to [Model Context Protocol](https://modelcontextprotocol.io) clients, so repositories, issues, pull requests and more can be browsed and managed from an MCP-compatible chat interface.
 
 [![Install with Docker in VS Code](https://img.shields.io/badge/VS_Code-Install_Server-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=gitea&inputs=[{%22id%22:%22gitea_token%22,%22type%22:%22promptString%22,%22description%22:%22Gitea%20Personal%20Access%20Token%22,%22password%22:true}]&config={%22command%22:%22docker%22,%22args%22:[%22run%22,%22-i%22,%22--rm%22,%22-e%22,%22GITEA_ACCESS_TOKEN%22,%22docker.gitea.com/gitea-mcp-server%22],%22env%22:{%22GITEA_ACCESS_TOKEN%22:%22${input:gitea_token}%22}}) [![Install with Docker in VS Code Insiders](https://img.shields.io/badge/VS_Code_Insiders-Install_Server-24bfa5?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=gitea&inputs=[{%22id%22:%22gitea_token%22,%22type%22:%22promptString%22,%22description%22:%22Gitea%20Personal%20Access%20Token%22,%22password%22:true}]&config={%22command%22:%22docker%22,%22args%22:[%22run%22,%22-i%22,%22--rm%22,%22-e%22,%22GITEA_ACCESS_TOKEN%22,%22docker.gitea.com/gitea-mcp-server%22],%22env%22:{%22GITEA_ACCESS_TOKEN%22:%22${input:gitea_token}%22}}&quality=insiders)
 
-## Table of Contents
+## Installation
 
-- [Gitea MCP Server](#gitea-mcp-server)
+Download a binary from the [releases page](https://gitea.com/gitea/gitea-mcp/releases) and put it in your `PATH`, use the `docker.gitea.com/gitea-mcp-server` image, or build from source into `$GOPATH/bin` with `make` and Go 1.26 or later:
-  - [Table of Contents](#table-of-contents)
-  - [What is Gitea?](#what-is-gitea)
-  - [What is MCP?](#what-is-mcp)
-  - [🚧 Installation](#-installation)
-    - [Usage with Claude Code](#usage-with-claude-code)
-    - [Usage with VS Code](#usage-with-vs-code)
-    - [Usage with Mistral Vibe](#usage-with-mistral-vibe)
-    - [📥 Download the official binary release](#-download-the-official-binary-release)
-    - [🔧 Build from Source](#-build-from-source)
-    - [📁 Add to PATH](#-add-to-path)
-  - [🚀 Usage](#-usage)
-  - [✅ Available Tools](#-available-tools)
-  - [🐛 Debugging](#-debugging)
-  - [🛠 Troubleshooting](#-troubleshooting)
 
-## What is Gitea?
+```bash
-
+git clone https://gitea.com/gitea/gitea-mcp.git
-Gitea is a community-managed lightweight code hosting solution written in Go. It is published under the MIT license. Gitea provides Git hosting including a repository viewer, issue tracking, pull requests, and more.
+cd gitea-mcp
-
+make install
-## What is MCP?
-
-Model Context Protocol (MCP) is a protocol that allows for the integration of various tools and systems through a chat interface. It enables seamless command execution and management of repositories, users, and other resources.
-
-## 🚧 Installation
-
-### Usage with OpenCode (opencode.ai)
-
-Add a snippet like the following in the "mcp" top-level object (add one if you don't have any):
-
-```json
-    "gitea-mcp": {
-      "enabled": true,
-      "type": "local",
-      "command": [
-        "gitea-mcp",
-        "-t", "stdio",
-        "-H", "https://git.your-domain.org",
-        "-T", "<your personal access token>"
-      ]
-    }
 ```
 
-### Usage with Claude Code
+## Configuration
 
-This method uses `go run` and requires [Go](https://go.dev) to be installed.
+Pass the Gitea host and access token as command-line flags or environment variables, flags take precedence. Run `gitea-mcp --help` for the full list of flags and environment variables. Logs are written to `$HOME/.gitea-mcp/gitea-mcp.log`, add `-d` for debug logging.
+
+### Claude Code
+
+Runs the server through `go run` and requires [Go](https://go.dev):
 
 ```bash
 claude mcp add --transport stdio --scope user gitea \
@@ -62,15 +31,9 @@ claude mcp add --transport stdio --scope user gitea \
   -- go run gitea.com/gitea/gitea-mcp@latest -t stdio
 ```
 
-### Usage with VS Code
+### VS Code
 
-For quick installation, use one of the one-click install buttons at the top of this README.
+Use the install buttons at the top of this README, or add the block below to your User Settings (JSON), reachable via `Ctrl + Shift + P` and `Preferences: Open User Settings (JSON)`. It also works in a workspace `.vscode/mcp.json`, where the `mcp` key is omitted.
-
-For manual installation, add the following JSON block to your User Settings (JSON) file in VS Code. You can do this by pressing `Ctrl + Shift + P` and typing `Preferences: Open User Settings (JSON)`.
-
-Optionally, you can add it to a file called `.vscode/mcp.json` in your workspace. This will allow you to share the configuration with others.
-
-> Note that the `mcp` key is not needed in the `.vscode/mcp.json` file.
 
 ```json
 {
@@ -86,14 +49,7 @@ Optionally, you can add it to a file called `.vscode/mcp.json` in your workspace
     "servers": {
       "gitea-mcp": {
         "command": "docker",
-        "args": [
+        "args": ["run", "-i", "--rm", "-e", "GITEA_ACCESS_TOKEN", "docker.gitea.com/gitea-mcp-server"],
-          "run",
-          "-i",
-          "--rm",
-          "-e",
-          "GITEA_ACCESS_TOKEN",
-          "docker.gitea.com/gitea-mcp-server"
-        ],
         "env": {
           "GITEA_ACCESS_TOKEN": "${input:gitea_token}"
         }
@@ -103,84 +59,50 @@ Optionally, you can add it to a file called `.vscode/mcp.json` in your workspace
 }
 ```
 
-### Usage with Mistral Vibe
+### OpenCode
 
-Add the following configuration to your Mistral Vibe MCP configuration file (`~/.vibe/config.toml`):
+Add the following to the top-level `mcp` object of your [OpenCode](https://opencode.ai) config:
+
+```json
+    "gitea-mcp": {
+      "enabled": true,
+      "type": "local",
+      "command": [
+        "gitea-mcp",
+        "-t", "stdio",
+        "-H", "https://gitea.com",
+        "-T", "<your personal access token>"
+      ]
+    }
+```
+
+### Mistral Vibe
+
+Add the following to `~/.vibe/config.toml`:
 
 ```toml
 [[mcp_servers]]
 name = "gitea"
 transport = "stdio"
 command = "docker"
-args = [
+args = ["run", "--rm", "-i", "-e", "GITEA_ACCESS_TOKEN", "-e", "GITEA_HOST", "docker.gitea.com/gitea-mcp-server"]
-    "run",
-    "--rm",
-    "-i",
-    "-e",
-    "GITEA_ACCESS_TOKEN",
-    "-e",
-    "GITEA_HOST",
-    "docker.gitea.com/gitea-mcp-server",
-]
 
 [mcp_servers.env]
 GITEA_ACCESS_TOKEN = "TOKEN"
 GITEA_HOST = "https://gitea.com"
 ```
 
-### 📥 Download the official binary release
+### Other clients
 
-You can download the official release from [official Gitea MCP binary releases](https://gitea.com/gitea/gitea-mcp/releases).
+Clients such as Cursor take either a stdio command:
-
-### 🔧 Build from Source
-
-You can download the source code by cloning the repository using Git:
-
-```bash
-git clone https://gitea.com/gitea/gitea-mcp.git
-```
-
-Before building, make sure you have the following installed:
-
-- make
-- Golang (Go 1.24 or later recommended)
-
-Then run:
-
-```bash
-make install
-```
-
-### 📁 Add to PATH
-
-After installing, copy the binary gitea-mcp to a directory included in your system's PATH. For example:
-
-```bash
-cp gitea-mcp /usr/local/bin/
-```
-
-## 🚀 Usage
-
-This example is for Cursor, you can also use plugins in VSCode.
-To configure the MCP server for Gitea, add the following to your MCP configuration file:
-
-- **stdio mode**
 
 ```json
 {
   "mcpServers": {
     "gitea": {
       "command": "gitea-mcp",
-      "args": [
+      "args": ["-t", "stdio", "--host", "https://gitea.com"],
-        "-t",
-        "stdio",
-        "--host",
-        "https://gitea.com"
-        // "--token", "<your personal access token>"
-      ],
       "env": {
-        // "GITEA_HOST": "https://gitea.com",
-        // "GITEA_INSECURE": "true",
         "GITEA_ACCESS_TOKEN": "<your personal access token>"
       }
     }
@@ -188,7 +110,7 @@ To configure the MCP server for Gitea, add the following to your MCP configurati
 }
 ```
 
-- **http mode**
+or an http endpoint, for a server started with `gitea-mcp -t http --port 8080`:
 
 ```json
 {
@@ -203,132 +125,74 @@ To configure the MCP server for Gitea, add the following to your MCP configurati
 }
 ```
 
-**Default log path**: `$HOME/.gitea-mcp/gitea-mcp.log`
+Once configured, try `list all my repositories` in the chat box.
 
-> [!NOTE]
+## Available Tools
-> You can provide your Gitea host and access token either as command-line arguments or environment variables.
-> Command-line arguments have the highest priority
 
-> [!NOTE]
+| Tool                         | Scope        | Access | Description                                                                                |
-> Many tools support `page` and `perPage` parameters for pagination. The maximum effective page size is determined by the Gitea server's `[api].MAX_RESPONSE_ITEMS` setting (default: **50**). Requesting a `perPage` value higher than this limit will be silently capped by the server.
+| :--------------------------- | :----------- | :----- | :----------------------------------------------------------------------------------------- |
+| get_gitea_mcp_server_version | version      | Read   | Get the Gitea MCP server version                                                           |
+| get_me                       | user         | Read   | Get the current authenticated user                                                         |
+| get_user_orgs                | user         | Read   | List the current user's organizations                                                      |
+| search_users                 | search       | Read   | Search for users                                                                           |
+| search_org_teams             | search       | Read   | Search teams within an organization                                                        |
+| search_repos                 | search       | Read   | Search for repositories                                                                    |
+| search_issues                | search       | Read   | Search issues and pull requests across repositories                                        |
+| notification_read            | notification | Read   | Read notifications: list (optionally scoped to a repo) or get a thread by ID               |
+| notification_write           | notification | Write  | Mark a notification or all notifications as read                                           |
+| label_read                   | label        | Read   | Read repository or organization labels                                                     |
+| label_write                  | label        | Write  | Write labels (repo or org): create, edit, delete                                           |
+| milestone_read               | milestone    | Read   | Read milestones: get one or list                                                           |
+| milestone_write              | milestone    | Write  | Write milestones: create, update, delete                                                   |
+| wiki_read                    | wiki         | Read   | Read wiki: list pages, get content, revision history                                       |
+| wiki_write                   | wiki         | Write  | Write wiki pages: create, update, delete                                                   |
+| timetracking_read            | timetracking | Read   | Read time tracking: issue/repo times, active stopwatches, your tracked times               |
+| timetracking_write           | timetracking | Write  | Write time tracking: stopwatches and entries                                               |
+| package_read                 | packages     | Read   | Read package registry: list packages, list versions, or get a version                      |
+| package_write                | packages     | Write  | Delete a package version (irreversible)                                                    |
+| list_issues                  | issue        | Read   | List repository issues                                                                     |
+| attachment_read              | issue        | Read   | Read issue/comment attachments: list metadata, get metadata, or download content           |
+| issue_read                   | issue        | Read   | Read issue: details, comments, or labels                                                   |
+| issue_write                  | issue        | Write  | Write issues: create, update, manage comments and labels                                   |
+| list_pull_requests           | pull_request | Read   | List repository pull requests                                                              |
+| pull_request_read            | pull_request | Read   | Read pull request: details, diff, files, status, reviews, review comments                  |
+| pull_request_write           | pull_request | Write  | Write pull requests: create, update, close, reopen, merge, update branch, manage reviewers |
+| pull_request_review_write    | pull_request | Write  | Write PR reviews: create, submit, delete, dismiss, reply to and resolve review comments    |
+| actions_config_read          | actions      | Read   | Read Actions secrets and variables                                                         |
+| actions_config_write         | actions      | Write  | Write Actions secrets and variables: upsert, create, update, delete                        |
+| actions_run_read             | actions      | Read   | Read Actions workflows, runs, jobs, logs, and artifacts                                    |
+| actions_run_write            | actions      | Write  | Write Actions runs: dispatch, cancel, rerun                                                |
+| create_repo                  | repository   | Write  | Create a new repository                                                                    |
+| fork_repo                    | repository   | Write  | Fork a repository                                                                          |
+| list_my_repos                | repository   | Read   | List repositories owned by the current user                                                |
+| list_org_repos               | repository   | Read   | List repositories in an organization                                                       |
+| get_repository_tree          | repository   | Read   | Get the repository file tree                                                               |
+| get_file_contents            | file         | Read   | Get file content and metadata                                                              |
+| get_dir_contents             | file         | Read   | Get the entries in a directory                                                             |
+| create_or_update_file        | file         | Write  | Create or update a file (provide sha to update an existing file)                           |
+| delete_file                  | file         | Write  | Delete a file                                                                              |
+| create_branch                | branch       | Write  | Create a new branch                                                                        |
+| delete_branch                | branch       | Write  | Delete a branch                                                                            |
+| list_branches                | branch       | Read   | List repository branches                                                                   |
+| create_tag                   | tag          | Write  | Create a tag                                                                               |
+| delete_tag                   | tag          | Write  | Delete a tag                                                                               |
+| get_tag                      | tag          | Read   | Get tag details                                                                            |
+| list_tags                    | tag          | Read   | List repository tags                                                                       |
+| list_commits                 | commit       | Read   | List repository commits                                                                    |
+| get_commit                   | commit       | Read   | Get commit details                                                                         |
+| create_release               | release      | Write  | Create a release                                                                           |
+| delete_release               | release      | Write  | Delete a release                                                                           |
+| get_release                  | release      | Read   | Get a release by ID                                                                        |
+| get_latest_release           | release      | Read   | Get the latest release                                                                     |
+| list_releases                | release      | Read   | List repository releases                                                                   |
 
-Once everything is set up, try typing the following in your MCP-compatible chatbox:
+> **Note:** Several tools are consolidated, action-based tools, a single tool exposes multiple operations through a `method` parameter. Tools with `Write` access are hidden when the server runs in read-only mode (`-r` / `GITEA_READONLY`), and the exposed tool set can be filtered by scope with `-S` / `--scope` (`GITEA_SCOPES`) and/or by individual tool name with `-O` / `--tools` (`GITEA_TOOLS`).
 
-```text
+With neither flag set, every tool loads. `--scope` limits loading to tools whose Scope column value is in the given list; `--tools` limits loading to the named tools; setting both loads the union of the selected scopes and the individually named tools. Unknown scope names are ignored with a startup warning.
-list all my repositories
+
+```bash
+gitea-mcp -S issue,pull_request
+gitea-mcp --scope repository,branch --tools get_me
 ```
 
-## ✅ Available Tools
+Many tools accept `page` and `per_page` for pagination. The maximum effective page size is the Gitea server's `[api].MAX_RESPONSE_ITEMS` setting (default **50**), larger values are silently capped.
-
-The Gitea MCP Server supports the following tools:
-
-|               Tool                |    Scope     |                       Description                        |
-| :-------------------------------: | :----------: | :------------------------------------------------------: |
-|         get_my_user_info          |     User     |      Get the information of the authenticated user       |
-|           get_user_orgs           |     User     | Get organizations associated with the authenticated user |
-|            create_repo            |  Repository  |                 Create a new repository                  |
-|             fork_repo             |  Repository  |                    Fork a repository                     |
-|           list_my_repos           |  Repository  |  List all repositories owned by the authenticated user   |
-|           create_branch           |    Branch    |                   Create a new branch                    |
-|           delete_branch           |    Branch    |                     Delete a branch                      |
-|           list_branches           |    Branch    |            List all branches in a repository             |
-|          create_release           |   Release    |           Create a new release in a repository           |
-|          delete_release           |   Release    |            Delete a release from a repository            |
-|            get_release            |   Release    |                      Get a release                       |
-|        get_latest_release         |   Release    |          Get the latest release in a repository          |
-|           list_releases           |   Release    |            List all releases in a repository             |
-|            create_tag             |     Tag      |                     Create a new tag                     |
-|            delete_tag             |     Tag      |                       Delete a tag                       |
-|              get_tag              |     Tag      |                        Get a tag                         |
-|             list_tags             |     Tag      |              List all tags in a repository               |
-|         list_repo_commits         |    Commit    |             List all commits in a repository             |
-|         get_file_content          |     File     |          Get the content and metadata of a file          |
-|          get_dir_content          |     File     |           Get a list of entries in a directory           |
-|            create_file            |     File     |                    Create a new file                     |
-|            update_file            |     File     |                 Update an existing file                  |
-|            delete_file            |     File     |                      Delete a file                       |
-|        get_issue_by_index         |    Issue     |                Get an issue by its index                 |
-|         list_repo_issues          |    Issue     |             List all issues in a repository              |
-|           create_issue            |    Issue     |                    Create a new issue                    |
-|       create_issue_comment        |    Issue     |               Create a comment on an issue               |
-|            edit_issue             |    Issue     |                       Edit a issue                       |
-|        edit_issue_comment         |    Issue     |                Edit a comment on an issue                |
-|    get_issue_comments_by_index    |    Issue     |          Get comments of an issue by its index           |
-|     get_pull_request_by_index     | Pull Request |             Get a pull request by its index              |
-|       get_pull_request_diff       | Pull Request |                 Get a pull request diff                  |
-|      list_repo_pull_requests      | Pull Request |          List all pull requests in a repository          |
-|        create_pull_request        | Pull Request |                Create a new pull request                 |
-|   create_pull_request_reviewer    | Pull Request |             Add reviewers to a pull request              |
-|   delete_pull_request_reviewer    | Pull Request |           Remove reviewers from a pull request           |
-|     list_pull_request_reviews     | Pull Request |           List all reviews for a pull request            |
-|      get_pull_request_review      | Pull Request |               Get a specific review by ID                |
-| list_pull_request_review_comments | Pull Request |            List inline comments for a review             |
-|    create_pull_request_review     | Pull Request |      Create a review with optional inline comments       |
-|    submit_pull_request_review     | Pull Request |                 Submit a pending review                  |
-|    delete_pull_request_review     | Pull Request |                     Delete a review                      |
-|    dismiss_pull_request_review    | Pull Request |          Dismiss a review with optional message          |
-|        merge_pull_request         | Pull Request |                  Merge a pull request                    |
-|           search_users            |     User     |                     Search for users                     |
-|         search_org_teams          | Organization |           Search for teams in an organization            |
-|          list_org_labels          | Organization |        List labels defined at organization level         |
-|         create_org_label          | Organization |            Create a label in an organization             |
-|          edit_org_label           | Organization |             Edit a label in an organization              |
-|         delete_org_label          | Organization |            Delete a label in an organization             |
-|           search_repos            |  Repository  |                 Search for repositories                  |
-|     list_repo_action_secrets      |   Actions    |     List repository Actions secrets (metadata only)      |
-|     upsert_repo_action_secret     |   Actions    |    Create/update (upsert) a repository Actions secret    |
-|     delete_repo_action_secret     |   Actions    |            Delete a repository Actions secret            |
-|      list_org_action_secrets      |   Actions    |    List organization Actions secrets (metadata only)     |
-|     upsert_org_action_secret      |   Actions    |  Create/update (upsert) an organization Actions secret   |
-|     delete_org_action_secret      |   Actions    |          Delete an organization Actions secret           |
-|    list_repo_action_variables     |   Actions    |            List repository Actions variables             |
-|     get_repo_action_variable      |   Actions    |            Get a repository Actions variable             |
-|    create_repo_action_variable    |   Actions    |           Create a repository Actions variable           |
-|    update_repo_action_variable    |   Actions    |           Update a repository Actions variable           |
-|    delete_repo_action_variable    |   Actions    |           Delete a repository Actions variable           |
-|     list_org_action_variables     |   Actions    |           List organization Actions variables            |
-|      get_org_action_variable      |   Actions    |           Get an organization Actions variable           |
-|    create_org_action_variable     |   Actions    |         Create an organization Actions variable          |
-|    update_org_action_variable     |   Actions    |         Update an organization Actions variable          |
-|    delete_org_action_variable     |   Actions    |         Delete an organization Actions variable          |
-|    list_repo_action_workflows     |   Actions    |            List repository Actions workflows             |
-|     get_repo_action_workflow      |   Actions    |            Get a repository Actions workflow             |
-|   dispatch_repo_action_workflow   |   Actions    |     Trigger (dispatch) a repository Actions workflow     |
-|       list_repo_action_runs       |   Actions    |               List repository Actions runs               |
-|        get_repo_action_run        |   Actions    |               Get a repository Actions run               |
-|      cancel_repo_action_run       |   Actions    |             Cancel a repository Actions run              |
-|       rerun_repo_action_run       |   Actions    |              Rerun a repository Actions run              |
-|       list_repo_action_jobs       |   Actions    |               List repository Actions jobs               |
-|     list_repo_action_run_jobs     |   Actions    |               List Actions jobs for a run                |
-|  get_repo_action_job_log_preview  |   Actions    |           Get a job log preview (tail/limited)           |
-|   download_repo_action_job_log    |   Actions    |               Download a job log to a file               |
-|     list_repo_action_artifacts     |   Actions    |          List repository Actions artifacts               |
-|   list_repo_action_run_artifacts   |   Actions    |            List Actions artifacts for a run              |
-|      get_repo_action_artifact      |   Actions    |            Get a repository Actions artifact             |
-|   download_repo_action_artifact    |   Actions    |         Download an Actions artifact zip to a file       |
-|   get_gitea_mcp_server_version    |    Server    |         Get the version of the Gitea MCP Server          |
-|          list_wiki_pages          |     Wiki     |           List all wiki pages in a repository            |
-|           get_wiki_page           |     Wiki     |           Get a wiki page content and metadata           |
-|        get_wiki_revisions         |     Wiki     |           Get revisions history of a wiki page           |
-|         create_wiki_page          |     Wiki     |                  Create a new wiki page                  |
-|         update_wiki_page          |     Wiki     |               Update an existing wiki page               |
-|         delete_wiki_page          |     Wiki     |                    Delete a wiki page                    |
-
-## 🐛 Debugging
-
-To enable debug mode, add the `-d` flag when running the Gitea MCP Server with http mode:
-
-```sh
-./gitea-mcp -t http [--port 8080] --token <your personal access token> -d
-```
-
-## 🛠 Troubleshooting
-
-If you encounter any issues, here are some common troubleshooting steps:
-
-1. **Check your PATH**: Ensure that the `gitea-mcp` binary is in a directory included in your system's PATH.
-2. **Verify dependencies**: Make sure you have all the required dependencies installed, such as `make` and `Golang`.
-3. **Review configuration**: Double-check your MCP configuration file for any errors or missing information.
-4. **Consult logs**: Check the logs for any error messages or warnings that can provide more information about the issue.
-
-Enjoy exploring and managing your Gitea repositories via chat!

README.zh-cn.md

@@ -2,40 +2,27 @@
 
 [English](README.md) | [繁體中文](README.zh-tw.md)
 
-**Gitea MCP 服务器** 是一个集成插件，旨在将 Gitea 与 Model Context Protocol (MCP) 系统连接起来。这允许通过 MCP 兼容的聊天界面无缝执行命令和管理仓库。
+**Gitea MCP 服务器** 将 [Gitea](https://about.gitea.com) 实例接入 [Model Context Protocol](https://modelcontextprotocol.io) 客户端，让仓库、问题、拉取请求等都能在兼容 MCP 的聊天界面中浏览和管理。
 
 [![在 VS Code 中使用 Docker 安装](https://img.shields.io/badge/VS_Code-Install_Server-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=gitea&inputs=[{%22id%22:%22gitea_token%22,%22type%22:%22promptString%22,%22description%22:%22Gitea%20Personal%20Access%20Token%22,%22password%22:true}]&config={%22command%22:%22docker%22,%22args%22:[%22run%22,%22-i%22,%22--rm%22,%22-e%22,%22GITEA_ACCESS_TOKEN%22,%22docker.gitea.com/gitea-mcp-server%22],%22env%22:{%22GITEA_ACCESS_TOKEN%22:%22${input:gitea_token}%22}}) [![在 VS Code Insiders 中使用 Docker 安装](https://img.shields.io/badge/VS_Code_Insiders-Install_Server-24bfa5?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=gitea&inputs=[{%22id%22:%22gitea_token%22,%22type%22:%22promptString%22,%22description%22:%22Gitea%20Personal%20Access%20Token%22,%22password%22:true}]&config={%22command%22:%22docker%22,%22args%22:[%22run%22,%22-i%22,%22--rm%22,%22-e%22,%22GITEA_ACCESS_TOKEN%22,%22docker.gitea.com/gitea-mcp-server%22],%22env%22:{%22GITEA_ACCESS_TOKEN%22:%22${input:gitea_token}%22}}&quality=insiders)
 
-## 目录
+## 安装
 
-- [Gitea MCP 服务器](#gitea-mcp-服务器)
+可从 [发布页面](https://gitea.com/gitea/gitea-mcp/releases) 下载二进制文件并放入 `PATH`，或使用 `docker.gitea.com/gitea-mcp-server` 镜像，也可用 `make` 和 Go 1.26 及以上从源码构建到 `$GOPATH/bin`：
-  - [目录](#目录)
-  - [什么是 Gitea？](#什么是-gitea)
-  - [什么是 MCP？](#什么是-mcp)
-  - [🚧 安装](#-安装)
-    - [在 Claude Code 中使用](#在-claude-code-中使用)
-    - [在 VS Code 中使用](#在-vs-code-中使用)
-    - [📥 下载官方二进制版本](#-下载官方二进制版本)
-    - [🔧 从源码构建](#-从源码构建)
-    - [📁 加入 PATH](#-加入-path)
-  - [🚀 使用](#-使用)
-  - [✅ 可用工具](#-可用工具)
-  - [🐛 调试](#-调试)
-  - [🛠 疑难排解](#-疑难排解)
 
-## 什么是 Gitea？
+```bash
+git clone https://gitea.com/gitea/gitea-mcp.git
+cd gitea-mcp
+make install
+```
 
-Gitea 是一个由社区管理的轻量级代码托管解决方案，使用 Go 语言编写，采用 MIT 许可证。Gitea 提供 Git 托管，包括仓库浏览、问题追踪、拉取请求等功能。
+## 配置
 
-## 什么是 MCP？
+Gitea 主机和访问令牌可通过命令行参数或环境变量提供，命令行参数优先。运行 `gitea-mcp --help` 可查看完整的参数与环境变量列表。日志写入 `$HOME/.gitea-mcp/gitea-mcp.log`，加上 `-d` 可启用调试日志。
 
-Model Context Protocol (MCP) 是一种协议，允许通过聊天界面整合各种工具和系统。它能够无缝执行命令并管理仓库、用户及其他资源。
+### Claude Code
 
-## 🚧 安装
+通过 `go run` 运行服务器，需要安装 [Go](https://go.dev)：
-
-### 在 Claude Code 中使用
-
-此方式使用 `go run`，需要安装 [Go](https://go.dev)。
 
 ```bash
 claude mcp add --transport stdio --scope user gitea \
@@ -44,15 +31,9 @@ claude mcp add --transport stdio --scope user gitea \
   -- go run gitea.com/gitea/gitea-mcp@latest -t stdio
 ```
 
-### 在 VS Code 中使用
+### VS Code
 
-要快速安装，请使用本 README 顶部的安装按钮。
+可使用本 README 顶部的安装按钮，或将下面的内容加入用户设置 (JSON)，按 `Ctrl + Shift + P` 并输入 `Preferences: Open User Settings (JSON)` 即可打开。也可放在工作区的 `.vscode/mcp.json` 中，此时无需 `mcp` 键。
-
-如需手动安装，请将以下 JSON 块添加到 VS Code 的用户设置 (JSON) 文件。可通过按 `Ctrl + Shift + P` 并输入 `Preferences: Open User Settings (JSON)`。
-
-也可添加到工作区的 `.vscode/mcp.json` 文件，方便与他人共享配置。
-
-> `.vscode/mcp.json` 文件不需要 `mcp` 键。
 
 ```json
 {
@@ -68,14 +49,7 @@ claude mcp add --transport stdio --scope user gitea \
     "servers": {
       "gitea-mcp": {
         "command": "docker",
-        "args": [
+        "args": ["run", "-i", "--rm", "-e", "GITEA_ACCESS_TOKEN", "docker.gitea.com/gitea-mcp-server"],
-          "run",
-          "-i",
-          "--rm",
-          "-e",
-          "GITEA_ACCESS_TOKEN",
-          "docker.gitea.com/gitea-mcp-server"
-        ],
         "env": {
           "GITEA_ACCESS_TOKEN": "${input:gitea_token}"
         }
@@ -85,59 +59,50 @@ claude mcp add --transport stdio --scope user gitea \
 }
 ```
 
-### 📥 下载官方二进制版本
+### OpenCode
 
-可在 [官方 Gitea MCP 二进制版本](https://gitea.com/gitea/gitea-mcp/releases) 下载。
+将下面的内容加入 [OpenCode](https://opencode.ai) 配置的顶层 `mcp` 对象：
 
-### 🔧 从源码构建
+```json
-
+    "gitea-mcp": {
-可用 Git 下载源码：
+      "enabled": true,
-
+      "type": "local",
-```bash
+      "command": [
-git clone https://gitea.com/gitea/gitea-mcp.git
+        "gitea-mcp",
+        "-t", "stdio",
+        "-H", "https://gitea.com",
+        "-T", "<your personal access token>"
+      ]
+    }
 ```
 
-构建前请先安装：
+### Mistral Vibe
 
-- make
+将下面的内容加入 `~/.vibe/config.toml`：
-- Golang（建议 Go 1.24 及以上）
 
-然后运行：
+```toml
+[[mcp_servers]]
+name = "gitea"
+transport = "stdio"
+command = "docker"
+args = ["run", "--rm", "-i", "-e", "GITEA_ACCESS_TOKEN", "-e", "GITEA_HOST", "docker.gitea.com/gitea-mcp-server"]
 
-```bash
+[mcp_servers.env]
-make install
+GITEA_ACCESS_TOKEN = "TOKEN"
+GITEA_HOST = "https://gitea.com"
 ```
 
-### 📁 加入 PATH
+### 其他客户端
 
-安装后，将 gitea-mcp 可执行文件复制到系统 PATH 目录，例如：
+Cursor 等客户端可使用 stdio 命令：
-
-```bash
-cp gitea-mcp /usr/local/bin/
-```
-
-## 🚀 使用
-
-此示例适用于 Cursor，也可在 VSCode 使用插件。  
-要配置 Gitea MCP 服务器，请将以下内容添加到 MCP 配置文件：
-
-- **stdio 模式**
 
 ```json
 {
   "mcpServers": {
     "gitea": {
       "command": "gitea-mcp",
-      "args": [
+      "args": ["-t", "stdio", "--host", "https://gitea.com"],
-        "-t",
-        "stdio",
-        "--host",
-        "https://gitea.com"
-        // "--token", "<your personal access token>"
-      ],
       "env": {
-        // "GITEA_HOST": "https://gitea.com",
-        // "GITEA_INSECURE": "true",
         "GITEA_ACCESS_TOKEN": "<your personal access token>"
       }
     }
@@ -145,7 +110,7 @@ cp gitea-mcp /usr/local/bin/
 }
 ```
 
-- **http 模式**
+或使用 http 端点，对应以 `gitea-mcp -t http --port 8080` 启动的服务器：
 
 ```json
 {
@@ -160,100 +125,74 @@ cp gitea-mcp /usr/local/bin/
 }
 ```
 
-**默认日志路径**: `$HOME/.gitea-mcp/gitea-mcp.log`
+配置完成后，可在聊天框输入 `列出我所有的仓库` 试试。
 
-> [!注意]
+## 可用工具
-> 可通过命令行参数或环境变量提供 Gitea 主机和访问令牌。
-> 命令行参数优先。
 
-> [!注意]
+| 工具                           | 范围           | 访问 | 描述                                 |
-> 许多工具支持 `page` 和 `perPage` 分页参数。最大有效页面大小由 Gitea 服务器的 `[api].MAX_RESPONSE_ITEMS` 设置决定（默认值：**50**）。请求超过此限制的 `perPage` 值将被服务器静默截断。
+| :--------------------------- | :----------- | :- | :--------------------------------- |
+| get_gitea_mcp_server_version | version      | 读取 | 获取 Gitea MCP 服务器版本                 |
+| get_me                       | user         | 读取 | 获取当前已认证用户                          |
+| get_user_orgs                | user         | 读取 | 列出当前用户的组织                          |
+| search_users                 | search       | 读取 | 搜索用户                               |
+| search_org_teams             | search       | 读取 | 搜索组织中的团队                           |
+| search_repos                 | search       | 读取 | 搜索仓库                               |
+| search_issues                | search       | 读取 | 跨仓库搜索问题和拉取请求                       |
+| notification_read            | notification | 读取 | 读取通知：列出（可限定仓库）或按 ID 获取会话           |
+| notification_write           | notification | 写入 | 将某条或全部通知标记为已读                      |
+| label_read                   | label        | 读取 | 读取仓库或组织标签                          |
+| label_write                  | label        | 写入 | 写入标签（仓库或组织）：创建、编辑、删除               |
+| milestone_read               | milestone    | 读取 | 读取里程碑：获取单个或列出                      |
+| milestone_write              | milestone    | 写入 | 写入里程碑：创建、更新、删除                     |
+| wiki_read                    | wiki         | 读取 | 读取 Wiki：列出页面、获取内容、修订历史             |
+| wiki_write                   | wiki         | 写入 | 写入 Wiki 页面：创建、更新、删除                |
+| timetracking_read            | timetracking | 读取 | 读取时间跟踪：问题/仓库耗时、活动计时器、我的跟踪记录        |
+| timetracking_write           | timetracking | 写入 | 写入时间跟踪：计时器和记录条目                    |
+| package_read                 | packages     | 读取 | 读取软件包注册表：列出软件包、列出版本或获取某个版本         |
+| package_write                | packages     | 写入 | 删除软件包版本（不可恢复）                      |
+| list_issues                  | issue        | 读取 | 列出仓库问题                             |
+| attachment_read              | issue        | 读取 | 读取问题/评论附件：列出元数据、获取元数据或下载内容         |
+| issue_read                   | issue        | 读取 | 读取问题：详情、评论或标签                      |
+| issue_write                  | issue        | 写入 | 写入问题：创建、更新、管理评论和标签                 |
+| list_pull_requests           | pull_request | 读取 | 列出仓库拉取请求                           |
+| pull_request_read            | pull_request | 读取 | 读取拉取请求：详情、差异、变更文件、头部提交状态、审查、审查评论   |
+| pull_request_write           | pull_request | 写入 | 写入拉取请求：创建、更新、关闭、重新打开、合并、更新分支、管理审查者 |
+| pull_request_review_write    | pull_request | 写入 | 写入 PR 审查：创建、提交、删除、驳回、回复和解决审查评论 |
+| actions_config_read          | actions      | 读取 | 读取 Actions 密钥和变量                   |
+| actions_config_write         | actions      | 写入 | 写入 Actions 密钥和变量：更新插入、创建、更新、删除     |
+| actions_run_read             | actions      | 读取 | 读取 Actions 工作流、运行、作业、日志和构件         |
+| actions_run_write            | actions      | 写入 | 写入 Actions 运行：触发、取消、重新运行           |
+| create_repo                  | repository   | 写入 | 创建新仓库                              |
+| fork_repo                    | repository   | 写入 | 复刻仓库                               |
+| list_my_repos                | repository   | 读取 | 列出当前用户拥有的仓库                        |
+| list_org_repos               | repository   | 读取 | 列出组织中的仓库                           |
+| get_repository_tree          | repository   | 读取 | 获取仓库文件树                            |
+| get_file_contents            | file         | 读取 | 获取文件内容和元数据                         |
+| get_dir_contents             | file         | 读取 | 获取目录中的条目                           |
+| create_or_update_file        | file         | 写入 | 创建或更新文件（提供 sha 以更新现有文件）            |
+| delete_file                  | file         | 写入 | 删除文件                               |
+| create_branch                | branch       | 写入 | 创建新分支                              |
+| delete_branch                | branch       | 写入 | 删除分支                               |
+| list_branches                | branch       | 读取 | 列出仓库分支                             |
+| create_tag                   | tag          | 写入 | 创建标签                               |
+| delete_tag                   | tag          | 写入 | 删除标签                               |
+| get_tag                      | tag          | 读取 | 获取标签详情                             |
+| list_tags                    | tag          | 读取 | 列出仓库标签                             |
+| list_commits                 | commit       | 读取 | 列出仓库提交                             |
+| get_commit                   | commit       | 读取 | 获取提交详情                             |
+| create_release               | release      | 写入 | 创建版本发布                             |
+| delete_release               | release      | 写入 | 删除版本发布                             |
+| get_release                  | release      | 读取 | 按 ID 获取版本发布                        |
+| get_latest_release           | release      | 读取 | 获取最新版本发布                           |
+| list_releases                | release      | 读取 | 列出仓库版本发布                           |
 
-一切设置完成后，可在 MCP 聊天框输入：
+> **说明：** 部分工具是聚合的、基于操作的工具，单个工具通过 `method` 参数暴露多个操作。当服务器以只读模式运行时（`-r` / `GITEA_READONLY`），访问为「写入」的工具会被隐藏；可通过 `-S` / `--scope`（`GITEA_SCOPES`）按范围过滤，或通过 `-O` / `--tools`（`GITEA_TOOLS`）按工具名称过滤对外暴露的工具集合。
 
-```text
+未设置任一参数时，会加载所有工具；仅设置 `--scope` 时，会加载这些范围内的所有工具；仅设置 `--tools` 时，只会加载指定名称的工具；两者都设置时，会加载所选范围的工具与指定工具名称的并集。范围名称即上表「范围」列中的值，未知的范围名称仅会在启动时产生警告并被忽略。
-列出我所有的仓库
+
+```bash
+gitea-mcp -S issue,pull_request
+gitea-mcp --scope repository,branch --tools get_me
 ```
 
-## ✅ 可用工具
+许多工具支持 `page` 和 `per_page` 分页参数。最大有效页面大小由 Gitea 服务器的 `[api].MAX_RESPONSE_ITEMS` 设置决定（默认 **50**），超出的值会被静默截断。
-
-Gitea MCP 服务器支持以下工具：
-
-|               工具                |   范围   |            描述            |
-| :-------------------------------: | :------: | :------------------------: |
-|         get_my_user_info          |   用户   |     获取已认证用户信息     |
-|           get_user_orgs           |   用户   |   获取已认证用户关联组织   |
-|            create_repo            |   仓库   |         创建新仓库         |
-|             fork_repo             |   仓库   |          复刻仓库          |
-|           list_my_repos           |   仓库   |      列出用户所有仓库      |
-|           create_branch           |   分支   |         创建新分支         |
-|           delete_branch           |   分支   |          删除分支          |
-|           list_branches           |   分支   |        列出所有分支        |
-|          create_release           | 版本发布 |       创建新版本发布       |
-|          delete_release           | 版本发布 |        删除版本发布        |
-|            get_release            | 版本发布 |        获取版本发布        |
-|        get_latest_release         | 版本发布 |      获取最新版本发布      |
-|           list_releases           | 版本发布 |      列出所有版本发布      |
-|            create_tag             |   标签   |         创建新标签         |
-|            delete_tag             |   标签   |          删除标签          |
-|              get_tag              |   标签   |          获取标签          |
-|             list_tags             |   标签   |        列出所有标签        |
-|         list_repo_commits         |   提交   |        列出所有提交        |
-|         get_file_content          |   文件   |    获取文件内容和元数据    |
-|          get_dir_content          |   文件   |      获取目录内容列表      |
-|            create_file            |   文件   |         创建新文件         |
-|            update_file            |   文件   |        更新现有文件        |
-|            delete_file            |   文件   |          删除文件          |
-|        get_issue_by_index         |   问题   |       按索引获取问题       |
-|         list_repo_issues          |   问题   |        列出所有问题        |
-|           create_issue            |   问题   |         创建新问题         |
-|       create_issue_comment        |   问题   |      在问题上创建评论      |
-|            edit_issue             |   问题   |          编辑问题          |
-|        edit_issue_comment         |   问题   |        编辑问题评论        |
-|    get_issue_comments_by_index    |   问题   |     按索引获取问题评论     |
-|     get_pull_request_by_index     | 拉取请求 |     按索引获取拉取请求     |
-|      list_repo_pull_requests      | 拉取请求 |      列出所有拉取请求      |
-|        create_pull_request        | 拉取请求 |       创建新拉取请求       |
-|   create_pull_request_reviewer    | 拉取请求 |    为拉取请求添加审查者    |
-|   delete_pull_request_reviewer    | 拉取请求 |    移除拉取请求的审查者    |
-|     list_pull_request_reviews     | 拉取请求 |   列出拉取请求的所有审查   |
-|      get_pull_request_review      | 拉取请求 |     按 ID 获取特定审查     |
-| list_pull_request_review_comments | 拉取请求 |     列出审查的行内评论     |
-|    create_pull_request_review     | 拉取请求 |  创建审查（可含行内评论）  |
-|    submit_pull_request_review     | 拉取请求 |      提交待处理的审查      |
-|    delete_pull_request_review     | 拉取请求 |          删除审查          |
-|    dismiss_pull_request_review    | 拉取请求 |    驳回审查（可附消息）    |
-|        merge_pull_request         | 拉取请求 |        合并拉取请求        |
-|           search_users            |   用户   |          搜索用户          |
-|         search_org_teams          |   组织   |        搜索组织团队        |
-|          list_org_labels          |   组织   |        列出组织标签        |
-|         create_org_label          |   组织   |        创建组织标签        |
-|          edit_org_label           |   组织   |        编辑组织标签        |
-|         delete_org_label          |   组织   |        删除组织标签        |
-|           search_repos            |   仓库   |          搜索仓库          |
-|   get_gitea_mcp_server_version    |  服务器  | 获取 Gitea MCP 服务器版本  |
-|          list_wiki_pages          |   Wiki   |     列出所有 Wiki 页面     |
-|           get_wiki_page           |   Wiki   | 获取 Wiki 页面内容和元数据 |
-|        get_wiki_revisions         |   Wiki   |     获取 Wiki 修订历史     |
-|         create_wiki_page          |   Wiki   |      创建新 Wiki 页面      |
-|         update_wiki_page          |   Wiki   |     更新现有 Wiki 页面     |
-|         delete_wiki_page          |   Wiki   |       删除 Wiki 页面       |
-
-## 🐛 调试
-
-启用调试模式时，请在 http 模式运行 Gitea MCP 服务器时加上 `-d` 标志：
-
-```sh
-./gitea-mcp -t http [--port 8080] --token <your personal access token> -d
-```
-
-## 🛠 疑难排解
-
-如遇问题，可参考以下步骤：
-
-1. **检查 PATH**：确保 `gitea-mcp` 可执行文件已在系统 PATH 目录中。
-2. **验证依赖**：确认已安装 `make` 和 `Golang` 等必要依赖。
-3. **检查配置**：仔细检查 MCP 配置文件是否有错误或遗漏。
-4. **查看日志**：检查日志消息或警告以获取更多信息。
-
-享受通过聊天探索和管理您的 Gitea 仓库！

README.zh-tw.md

@@ -2,40 +2,27 @@
 
 [English](README.md) | [简体中文](README.zh-cn.md)
 
-**Gitea MCP 伺服器** 是一個整合插件，旨在將 Gitea 與 Model Context Protocol (MCP) 系統連接起來。這允許通過 MCP 兼容的聊天界面無縫執行命令和管理倉庫。
+**Gitea MCP 伺服器** 將 [Gitea](https://about.gitea.com) 實例接入 [Model Context Protocol](https://modelcontextprotocol.io) 客戶端，讓倉庫、問題、拉取請求等都能在相容 MCP 的聊天介面中瀏覽與管理。
 
 [![在 VS Code 中使用 Docker 安裝](https://img.shields.io/badge/VS_Code-Install_Server-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=gitea&inputs=[{%22id%22:%22gitea_token%22,%22type%22:%22promptString%22,%22description%22:%22Gitea%20Personal%20Access%20Token%22,%22password%22:true}]&config={%22command%22:%22docker%22,%22args%22:[%22run%22,%22-i%22,%22--rm%22,%22-e%22,%22GITEA_ACCESS_TOKEN%22,%22docker.gitea.com/gitea-mcp-server%22],%22env%22:{%22GITEA_ACCESS_TOKEN%22:%22${input:gitea_token}%22}}) [![在 VS Code Insiders 中使用 Docker 安裝](https://img.shields.io/badge/VS_Code_Insiders-Install_Server-24bfa5?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=gitea&inputs=[{%22id%22:%22gitea_token%22,%22type%22:%22promptString%22,%22description%22:%22Gitea%20Personal%20Access%20Token%22,%22password%22:true}]&config={%22command%22:%22docker%22,%22args%22:[%22run%22,%22-i%22,%22--rm%22,%22-e%22,%22GITEA_ACCESS_TOKEN%22,%22docker.gitea.com/gitea-mcp-server%22],%22env%22:{%22GITEA_ACCESS_TOKEN%22:%22${input:gitea_token}%22}}&quality=insiders)
 
-## 目錄
+## 安裝
 
-- [Gitea MCP 伺服器](#gitea-mcp-伺服器)
+可從 [發布頁面](https://gitea.com/gitea/gitea-mcp/releases) 下載二進位檔並放入 `PATH`，或使用 `docker.gitea.com/gitea-mcp-server` 映像檔，也可用 `make` 與 Go 1.26 以上從原始碼建置到 `$GOPATH/bin`：
-  - [目錄](#目錄)
-  - [什麼是 Gitea？](#什麼是-gitea)
-  - [什麼是 MCP？](#什麼是-mcp)
-  - [🚧 安裝](#-安裝)
-    - [在 Claude Code 中使用](#在-claude-code-中使用)
-    - [在 VS Code 中使用](#在-vs-code-中使用)
-    - [📥 下載官方二進位版本](#-下載官方二進位版本)
-    - [🔧 從原始碼建置](#-從原始碼建置)
-    - [📁 加入 PATH](#-加入-path)
-  - [🚀 使用](#-使用)
-  - [✅ 可用工具](#-可用工具)
-  - [🐛 調試](#-調試)
-  - [🛠 疑難排解](#-疑難排解)
 
-## 什麼是 Gitea？
+```bash
+git clone https://gitea.com/gitea/gitea-mcp.git
+cd gitea-mcp
+make install
+```
 
-Gitea 是一個由社群管理的輕量級程式碼託管解決方案，使用 Go 語言編寫，採用 MIT 授權。Gitea 提供 Git 託管，包括倉庫瀏覽、議題追蹤、拉取請求等功能。
+## 設定
 
-## 什麼是 MCP？
+Gitea 主機與存取令牌可透過命令列參數或環境變數提供，命令列參數優先。執行 `gitea-mcp --help` 可查看完整的參數與環境變數列表。日誌寫入 `$HOME/.gitea-mcp/gitea-mcp.log`，加上 `-d` 可啟用除錯日誌。
 
-Model Context Protocol (MCP) 是一種協議，允許透過聊天介面整合各種工具與系統。它能夠無縫執行命令並管理倉庫、使用者及其他資源。
+### Claude Code
 
-## 🚧 安裝
+透過 `go run` 執行伺服器，需要安裝 [Go](https://go.dev)：
-
-### 在 Claude Code 中使用
-
-此方式使用 `go run`，需要安裝 [Go](https://go.dev)。
 
 ```bash
 claude mcp add --transport stdio --scope user gitea \
@@ -44,15 +31,9 @@ claude mcp add --transport stdio --scope user gitea \
   -- go run gitea.com/gitea/gitea-mcp@latest -t stdio
 ```
 
-### 在 VS Code 中使用
+### VS Code
 
-欲快速安裝，請使用本 README 頂部的安裝按鈕。
+可使用本 README 頂部的安裝按鈕，或將下面的內容加入使用者設定 (JSON)，按 `Ctrl + Shift + P` 並輸入 `Preferences: Open User Settings (JSON)` 即可開啟。也可放在工作區的 `.vscode/mcp.json` 中，此時不需要 `mcp` 鍵。
-
-如需手動安裝，請將下列 JSON 區塊加入 VS Code 的使用者設定 (JSON) 檔案。可按 `Ctrl + Shift + P` 並輸入 `Preferences: Open User Settings (JSON)`。
-
-也可加入至工作區的 `.vscode/mcp.json` 檔案，方便與他人共享設定。
-
-> `.vscode/mcp.json` 檔案不需 `mcp` 鍵。
 
 ```json
 {
@@ -68,14 +49,7 @@ claude mcp add --transport stdio --scope user gitea \
     "servers": {
       "gitea-mcp": {
         "command": "docker",
-        "args": [
+        "args": ["run", "-i", "--rm", "-e", "GITEA_ACCESS_TOKEN", "docker.gitea.com/gitea-mcp-server"],
-          "run",
-          "-i",
-          "--rm",
-          "-e",
-          "GITEA_ACCESS_TOKEN",
-          "docker.gitea.com/gitea-mcp-server"
-        ],
         "env": {
           "GITEA_ACCESS_TOKEN": "${input:gitea_token}"
         }
@@ -85,59 +59,50 @@ claude mcp add --transport stdio --scope user gitea \
 }
 ```
 
-### 📥 下載官方二進位版本
+### OpenCode
 
-可至 [官方 Gitea MCP 二進位版本](https://gitea.com/gitea/gitea-mcp/releases) 下載。
+將下面的內容加入 [OpenCode](https://opencode.ai) 設定的頂層 `mcp` 物件：
 
-### 🔧 從原始碼建置
+```json
-
+    "gitea-mcp": {
-可用 Git 下載原始碼：
+      "enabled": true,
-
+      "type": "local",
-```bash
+      "command": [
-git clone https://gitea.com/gitea/gitea-mcp.git
+        "gitea-mcp",
+        "-t", "stdio",
+        "-H", "https://gitea.com",
+        "-T", "<your personal access token>"
+      ]
+    }
 ```
 
-建置前請先安裝：
+### Mistral Vibe
 
-- make
+將下面的內容加入 `~/.vibe/config.toml`：
-- Golang（建議 Go 1.24 以上）
 
-然後執行：
+```toml
+[[mcp_servers]]
+name = "gitea"
+transport = "stdio"
+command = "docker"
+args = ["run", "--rm", "-i", "-e", "GITEA_ACCESS_TOKEN", "-e", "GITEA_HOST", "docker.gitea.com/gitea-mcp-server"]
 
-```bash
+[mcp_servers.env]
-make install
+GITEA_ACCESS_TOKEN = "TOKEN"
+GITEA_HOST = "https://gitea.com"
 ```
 
-### 📁 加入 PATH
+### 其他客戶端
 
-安裝後，將 gitea-mcp 執行檔複製到系統 PATH 目錄，例如：
+Cursor 等客戶端可使用 stdio 命令：
-
-```bash
-cp gitea-mcp /usr/local/bin/
-```
-
-## 🚀 使用
-
-此範例適用於 Cursor，也可在 VSCode 使用插件。  
-欲設定 Gitea MCP 伺服器，請將下列內容加入 MCP 設定檔：
-
-- **stdio 模式**
 
 ```json
 {
   "mcpServers": {
     "gitea": {
       "command": "gitea-mcp",
-      "args": [
+      "args": ["-t", "stdio", "--host", "https://gitea.com"],
-        "-t",
-        "stdio",
-        "--host",
-        "https://gitea.com"
-        // "--token", "<your personal access token>"
-      ],
       "env": {
-        // "GITEA_HOST": "https://gitea.com",
-        // "GITEA_INSECURE": "true",
         "GITEA_ACCESS_TOKEN": "<your personal access token>"
       }
     }
@@ -145,7 +110,7 @@ cp gitea-mcp /usr/local/bin/
 }
 ```
 
-- **http 模式**
+或使用 http 端點，對應以 `gitea-mcp -t http --port 8080` 啟動的伺服器：
 
 ```json
 {
@@ -160,100 +125,74 @@ cp gitea-mcp /usr/local/bin/
 }
 ```
 
-**預設日誌路徑**: `$HOME/.gitea-mcp/gitea-mcp.log`
+設定完成後，可在聊天框輸入 `列出我所有的倉庫` 試試。
 
-> [!注意]
+## 可用工具
-> 可用命令列參數或環境變數提供 Gitea 主機與存取令牌。
-> 命令列參數優先。
 
-> [!注意]
+| 工具                           | 範圍           | 存取 | 描述                                 |
-> 許多工具支援 `page` 和 `perPage` 分頁參數。最大有效頁面大小由 Gitea 伺服器的 `[api].MAX_RESPONSE_ITEMS` 設定決定（預設值：**50**）。請求超過此限制的 `perPage` 值將被伺服器靜默截斷。
+| :--------------------------- | :----------- | :- | :--------------------------------- |
+| get_gitea_mcp_server_version | version      | 讀取 | 取得 Gitea MCP 伺服器版本                 |
+| get_me                       | user         | 讀取 | 取得目前已認證用戶                          |
+| get_user_orgs                | user         | 讀取 | 列出目前用戶的組織                          |
+| search_users                 | search       | 讀取 | 搜尋用戶                               |
+| search_org_teams             | search       | 讀取 | 搜尋組織中的團隊                           |
+| search_repos                 | search       | 讀取 | 搜尋倉庫                               |
+| search_issues                | search       | 讀取 | 跨倉庫搜尋問題和拉取請求                       |
+| notification_read            | notification | 讀取 | 讀取通知：列出（可限定倉庫）或依 ID 取得會話           |
+| notification_write           | notification | 寫入 | 將某條或全部通知標記為已讀                      |
+| label_read                   | label        | 讀取 | 讀取倉庫或組織標籤                          |
+| label_write                  | label        | 寫入 | 寫入標籤（倉庫或組織）：創建、編輯、刪除               |
+| milestone_read               | milestone    | 讀取 | 讀取里程碑：取得單個或列出                      |
+| milestone_write              | milestone    | 寫入 | 寫入里程碑：創建、更新、刪除                     |
+| wiki_read                    | wiki         | 讀取 | 讀取 Wiki：列出頁面、取得內容、修訂歷史             |
+| wiki_write                   | wiki         | 寫入 | 寫入 Wiki 頁面：創建、更新、刪除                |
+| timetracking_read            | timetracking | 讀取 | 讀取時間追蹤：問題/倉庫耗時、活動計時器、我的追蹤記錄        |
+| timetracking_write           | timetracking | 寫入 | 寫入時間追蹤：計時器和記錄項目                    |
+| package_read                 | packages     | 讀取 | 讀取軟體套件註冊表：列出套件、列出版本或取得某個版本         |
+| package_write                | packages     | 寫入 | 刪除軟體套件版本（不可復原）                     |
+| list_issues                  | issue        | 讀取 | 列出倉庫問題                             |
+| attachment_read              | issue        | 讀取 | 讀取問題/評論附件：列出中繼資料、取得中繼資料或下載內容       |
+| issue_read                   | issue        | 讀取 | 讀取問題：詳情、評論或標籤                      |
+| issue_write                  | issue        | 寫入 | 寫入問題：創建、更新、管理評論和標籤                 |
+| list_pull_requests           | pull_request | 讀取 | 列出倉庫拉取請求                           |
+| pull_request_read            | pull_request | 讀取 | 讀取拉取請求：詳情、差異、變更檔案、頭部提交狀態、審查、審查評論   |
+| pull_request_write           | pull_request | 寫入 | 寫入拉取請求：創建、更新、關閉、重新開啟、合併、更新分支、管理審查者 |
+| pull_request_review_write    | pull_request | 寫入 | 寫入 PR 審查：創建、提交、刪除、駁回、回覆和解決審查評論 |
+| actions_config_read          | actions      | 讀取 | 讀取 Actions 密鑰和變數                   |
+| actions_config_write         | actions      | 寫入 | 寫入 Actions 密鑰和變數：更新插入、創建、更新、刪除     |
+| actions_run_read             | actions      | 讀取 | 讀取 Actions 工作流程、執行、作業、日誌和產物        |
+| actions_run_write            | actions      | 寫入 | 寫入 Actions 執行：觸發、取消、重新執行           |
+| create_repo                  | repository   | 寫入 | 創建新倉庫                              |
+| fork_repo                    | repository   | 寫入 | 復刻倉庫                               |
+| list_my_repos                | repository   | 讀取 | 列出目前用戶擁有的倉庫                        |
+| list_org_repos               | repository   | 讀取 | 列出組織中的倉庫                           |
+| get_repository_tree          | repository   | 讀取 | 取得倉庫檔案樹                            |
+| get_file_contents            | file         | 讀取 | 取得檔案內容與中繼資料                        |
+| get_dir_contents             | file         | 讀取 | 取得目錄中的項目                           |
+| create_or_update_file        | file         | 寫入 | 創建或更新檔案（提供 sha 以更新現有檔案）            |
+| delete_file                  | file         | 寫入 | 刪除檔案                               |
+| create_branch                | branch       | 寫入 | 創建新分支                              |
+| delete_branch                | branch       | 寫入 | 刪除分支                               |
+| list_branches                | branch       | 讀取 | 列出倉庫分支                             |
+| create_tag                   | tag          | 寫入 | 創建標籤                               |
+| delete_tag                   | tag          | 寫入 | 刪除標籤                               |
+| get_tag                      | tag          | 讀取 | 取得標籤詳情                             |
+| list_tags                    | tag          | 讀取 | 列出倉庫標籤                             |
+| list_commits                 | commit       | 讀取 | 列出倉庫提交                             |
+| get_commit                   | commit       | 讀取 | 取得提交詳情                             |
+| create_release               | release      | 寫入 | 創建版本發布                             |
+| delete_release               | release      | 寫入 | 刪除版本發布                             |
+| get_release                  | release      | 讀取 | 依 ID 取得版本發布                        |
+| get_latest_release           | release      | 讀取 | 取得最新版本發布                           |
+| list_releases                | release      | 讀取 | 列出倉庫版本發布                           |
 
-一切設定完成後，可在 MCP 聊天框輸入：
+> **說明：** 部分工具是聚合的、基於操作的工具，單個工具透過 `method` 參數暴露多個操作。當伺服器以唯讀模式執行時（`-r` / `GITEA_READONLY`），存取為「寫入」的工具會被隱藏；可透過 `-S` / `--scope`（`GITEA_SCOPES`）依範圍過濾，或透過 `-O` / `--tools`（`GITEA_TOOLS`）依工具名稱過濾對外暴露的工具集合。
 
-```text
+未設定任一參數時，會載入所有工具；僅設定 `--scope` 時，會載入這些範圍內的所有工具；僅設定 `--tools` 時，只會載入指定名稱的工具；兩者皆設定時，會載入所選範圍的工具與指定工具名稱的聯集。範圍名稱即上表「範圍」欄中的值，未知的範圍名稱僅會在啟動時發出警告並被忽略。
-列出我所有的倉庫
+
+```bash
+gitea-mcp -S issue,pull_request
+gitea-mcp --scope repository,branch --tools get_me
 ```
 
-## ✅ 可用工具
+許多工具支援 `page` 和 `per_page` 分頁參數。最大有效頁面大小由 Gitea 伺服器的 `[api].MAX_RESPONSE_ITEMS` 設定決定（預設 **50**），超出的值會被靜默截斷。
-
-Gitea MCP 伺服器支援以下工具：
-
-|               工具                |   範圍   |             描述             |
-| :-------------------------------: | :------: | :--------------------------: |
-|         get_my_user_info          |   用戶   |      取得已認證用戶資訊      |
-|           get_user_orgs           |   用戶   |    取得已認證用戶所屬組織    |
-|            create_repo            |   倉庫   |          創建新倉庫          |
-|             fork_repo             |   倉庫   |           復刻倉庫           |
-|           list_my_repos           |   倉庫   |       列出用戶所有倉庫       |
-|           create_branch           |   分支   |          創建新分支          |
-|           delete_branch           |   分支   |           刪除分支           |
-|           list_branches           |   分支   |         列出所有分支         |
-|          create_release           | 版本發布 |        創建新版本發布        |
-|          delete_release           | 版本發布 |         刪除版本發布         |
-|            get_release            | 版本發布 |         取得版本發布         |
-|        get_latest_release         | 版本發布 |       取得最新版本發布       |
-|           list_releases           | 版本發布 |       列出所有版本發布       |
-|            create_tag             |   標籤   |          創建新標籤          |
-|            delete_tag             |   標籤   |           刪除標籤           |
-|              get_tag              |   標籤   |           取得標籤           |
-|             list_tags             |   標籤   |         列出所有標籤         |
-|         list_repo_commits         |   提交   |         列出所有提交         |
-|         get_file_content          |   文件   |    取得文件內容與中繼資料    |
-|          get_dir_content          |   文件   |       取得目錄內容列表       |
-|            create_file            |   文件   |          創建新文件          |
-|            update_file            |   文件   |         更新現有文件         |
-|            delete_file            |   文件   |           刪除文件           |
-|        get_issue_by_index         |   問題   |        依索引取得問題        |
-|         list_repo_issues          |   問題   |         列出所有問題         |
-|           create_issue            |   問題   |          創建新問題          |
-|       create_issue_comment        |   問題   |       在問題上創建評論       |
-|            edit_issue             |   問題   |           編輯問題           |
-|        edit_issue_comment         |   問題   |         編輯問題評論         |
-|    get_issue_comments_by_index    |   問題   |      依索引取得問題評論      |
-|     get_pull_request_by_index     | 拉取請求 |      依索引取得拉取請求      |
-|      list_repo_pull_requests      | 拉取請求 |       列出所有拉取請求       |
-|        create_pull_request        | 拉取請求 |        創建新拉取請求        |
-|   create_pull_request_reviewer    | 拉取請求 |     為拉取請求添加審查者     |
-|   delete_pull_request_reviewer    | 拉取請求 |     移除拉取請求的審查者     |
-|     list_pull_request_reviews     | 拉取請求 |    列出拉取請求的所有審查    |
-|      get_pull_request_review      | 拉取請求 |      依 ID 取得特定審查      |
-| list_pull_request_review_comments | 拉取請求 |      列出審查的行內評論      |
-|    create_pull_request_review     | 拉取請求 |   創建審查（可含行內評論）   |
-|    submit_pull_request_review     | 拉取請求 |       提交待處理的審查       |
-|    delete_pull_request_review     | 拉取請求 |           刪除審查           |
-|    dismiss_pull_request_review    | 拉取請求 |     駁回審查（可附訊息）     |
-|        merge_pull_request         | 拉取請求 |        合併拉取請求        |
-|           search_users            |   用戶   |           搜尋用戶           |
-|         search_org_teams          |   組織   |         搜尋組織團隊         |
-|          list_org_labels          |   組織   |         列出組織標籤         |
-|         create_org_label          |   組織   |         創建組織標籤         |
-|          edit_org_label           |   組織   |         編輯組織標籤         |
-|         delete_org_label          |   組織   |         刪除組織標籤         |
-|           search_repos            |   倉庫   |           搜尋倉庫           |
-|   get_gitea_mcp_server_version    |  伺服器  |  取得 Gitea MCP 伺服器版本   |
-|          list_wiki_pages          |   Wiki   |      列出所有 Wiki 頁面      |
-|           get_wiki_page           |   Wiki   | 取得 Wiki 頁面內容與中繼資料 |
-|        get_wiki_revisions         |   Wiki   |      取得 Wiki 修訂歷史      |
-|         create_wiki_page          |   Wiki   |       創建新 Wiki 頁面       |
-|         update_wiki_page          |   Wiki   |      更新現有 Wiki 頁面      |
-|         delete_wiki_page          |   Wiki   |        刪除 Wiki 頁面        |
-
-## 🐛 調試
-
-啟用調試模式時，請在 http 模式執行 Gitea MCP 伺服器時加上 `-d` 旗標：
-
-```sh
-./gitea-mcp -t http [--port 8080] --token <your personal access token> -d
-```
-
-## 🛠 疑難排解
-
-如遇問題，可參考以下步驟：
-
-1. **檢查 PATH**：確保 `gitea-mcp` 執行檔已在系統 PATH 目錄中。
-2. **驗證依賴**：確認已安裝 `make` 與 `Golang` 等必要依賴。
-3. **檢查設定**：仔細檢查 MCP 設定檔是否有錯誤或遺漏。
-4. **查看日誌**：檢查日誌訊息或警告以獲取更多資訊。
-
-享受透過聊天探索與管理您的 Gitea 倉庫！

cmd/cmd.go

@@ -4,7 +4,9 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"io"
 	"os"
+	"strconv"
 	"strings"
 	"text/tabwriter"
 
@@ -14,47 +16,66 @@ import (
 )
 
 var (
-	host    string
+	host                            string
-	port    int
+	port                            int
-	token   string
+	token                           string
-	tools   string
+	tools                           string
-	version bool
+	scopes                          string
+	version                         bool
+	maxInlineAttachmentBytes        int
+	maxInlineAttachmentBytesFlagSet bool
+	osExit                          = os.Exit
 )
 
-func init() {
+func initFlagSet(fs *flag.FlagSet, args []string, getenv func(string) string, readFile func(string) ([]byte, error), stderr io.Writer) {
-	flag.StringVar(&flagPkg.Mode, "t", "stdio", "")
+	fs.StringVar(&flagPkg.Mode, "t", "stdio", "")
-	flag.StringVar(&flagPkg.Mode, "transport", "stdio", "")
+	fs.StringVar(&flagPkg.Mode, "transport", "stdio", "")
-	flag.StringVar(&host, "H", os.Getenv("GITEA_HOST"), "")
+	fs.StringVar(&host, "H", getenv("GITEA_HOST"), "")
-	flag.StringVar(&host, "host", os.Getenv("GITEA_HOST"), "")
+	fs.StringVar(&host, "host", getenv("GITEA_HOST"), "")
-	flag.IntVar(&port, "p", 8080, "")
+	fs.IntVar(&port, "p", 8080, "")
-	flag.IntVar(&port, "port", 8080, "")
+	fs.IntVar(&port, "port", 8080, "")
-	flag.StringVar(&token, "T", "", "")
+	fs.StringVar(&token, "T", "", "")
-	flag.StringVar(&token, "token", "", "")
+	fs.StringVar(&token, "token", "", "")
-	flag.BoolVar(&flagPkg.ReadOnly, "r", false, "")
+	fs.BoolVar(&flagPkg.ReadOnly, "r", false, "")
-	flag.BoolVar(&flagPkg.ReadOnly, "read-only", false, "")
+	fs.BoolVar(&flagPkg.ReadOnly, "read-only", false, "")
-	defaultTools := os.Getenv("GITEA_TOOLS")
+	defaultTools := getenv("GITEA_TOOLS")
-	flag.StringVar(&tools, "O", defaultTools, "")
+	fs.StringVar(&tools, "O", defaultTools, "")
-	flag.StringVar(&tools, "tools", defaultTools, "")
+	fs.StringVar(&tools, "tools", defaultTools, "")
-	flag.BoolVar(&flagPkg.Debug, "d", false, "")
+	defaultScopes := getenv("GITEA_SCOPES")
-	flag.BoolVar(&flagPkg.Debug, "debug", false, "")
+	fs.StringVar(&scopes, "S", defaultScopes, "")
-	flag.BoolVar(&flagPkg.Insecure, "k", false, "")
+	fs.StringVar(&scopes, "scope", defaultScopes, "")
-	flag.BoolVar(&flagPkg.Insecure, "insecure", false, "")
+	fs.BoolVar(&flagPkg.Debug, "d", false, "")
-	flag.BoolVar(&version, "v", false, "")
+	fs.BoolVar(&flagPkg.Debug, "debug", false, "")
-	flag.BoolVar(&version, "version", false, "")
+	fs.BoolVar(&flagPkg.Insecure, "k", false, "")
+	fs.BoolVar(&flagPkg.Insecure, "insecure", false, "")
+	fs.BoolVar(&version, "v", false, "")
+	fs.BoolVar(&version, "version", false, "")
+	maxInlineAttachmentBytes = 5 * 1024 * 1024
+	fs.Func("max-inline-attachment-bytes", "", func(val string) error {
+		parsed, err := strconv.Atoi(val)
+		if err != nil || parsed < 0 {
+			return fmt.Errorf("invalid value %q", val)
+		}
+		maxInlineAttachmentBytes = parsed
+		maxInlineAttachmentBytesFlagSet = true
+		return nil
+	})
 
-	flag.Usage = func() {
+	fs.Usage = func() {
-		w := tabwriter.NewWriter(os.Stderr, 0, 0, 3, ' ', 0)
+		w := tabwriter.NewWriter(stderr, 0, 0, 3, ' ', 0)
-		fmt.Fprintln(os.Stderr, "Usage: gitea-mcp [options]")
+		fmt.Fprintln(stderr, "Usage: gitea-mcp [options]")
-		fmt.Fprintln(os.Stderr)
+		fmt.Fprintln(stderr)
-		fmt.Fprintln(os.Stderr, "Options:")
+		fmt.Fprintln(stderr, "Options:")
 		fmt.Fprintf(w, "  -t, -transport <type>\tTransport type: stdio or http (default: stdio)\n")
 		fmt.Fprintf(w, "  -H, -host <url>\tGitea host URL (default: https://gitea.com)\n")
 		fmt.Fprintf(w, "  -p, -port <number>\tHTTP server port (default: 8080)\n")
 		fmt.Fprintf(w, "  -T, -token <token>\tPersonal access token\n")
 		fmt.Fprintf(w, "  -r, -read-only\tExpose only read-only tools\n")
 		fmt.Fprintf(w, "  -O, -tools <names>\tComma-separated list of tool names to expose\n")
+		fmt.Fprintf(w, "  -S, -scope <names>\tComma-separated list of tool scopes to expose\n")
 		fmt.Fprintf(w, "  -d, -debug\tEnable debug mode\n")
 		fmt.Fprintf(w, "  -k, -insecure\tIgnore TLS certificate errors\n")
+		fmt.Fprintf(w, "  -max-inline-attachment-bytes <bytes>\tInline image attachments up to this size (default: 5242880)\n")
 		fmt.Fprintf(w, "  -v, -version\tPrint version and exit\n")
 		fmt.Fprintln(w)
 		fmt.Fprintln(w, "Environment variables:")
@@ -63,13 +84,15 @@ func init() {
 		fmt.Fprintf(w, "  GITEA_DEBUG\tSet to 'true' for debug mode\n")
 		fmt.Fprintf(w, "  GITEA_HOST\tOverride Gitea host URL\n")
 		fmt.Fprintf(w, "  GITEA_INSECURE\tSet to 'true' to ignore TLS errors\n")
+		fmt.Fprintf(w, "  GITEA_MAX_INLINE_ATTACHMENT_BYTES\tOverride inline image attachment size limit in bytes\n")
 		fmt.Fprintf(w, "  GITEA_READONLY\tSet to 'true' for read-only mode\n")
+		fmt.Fprintf(w, "  GITEA_SCOPES\tComma-separated list of tool scopes to expose\n")
 		fmt.Fprintf(w, "  GITEA_TOOLS\tComma-separated list of tool names to expose\n")
 		fmt.Fprintf(w, "  MCP_MODE\tOverride transport mode\n")
-		w.Flush()
+		_ = w.Flush()
 	}
 
-	flag.Parse()
+	_ = fs.Parse(args)
 
 	flagPkg.Host = host
 	if flagPkg.Host == "" {
@@ -77,27 +100,27 @@ func init() {
 	}
 
 	flagPkg.Port = port
+	flagPkg.MaxInlineAttachmentBytes = maxInlineAttachmentBytes
 
 	flagPkg.Token = token
 	if flagPkg.Token == "" {
-		flagPkg.Token = os.Getenv("GITEA_ACCESS_TOKEN")
+		flagPkg.Token = getenv("GITEA_ACCESS_TOKEN")
 	}
 	if flagPkg.Token == "" {
-		if tokenFile := os.Getenv("GITEA_ACCESS_TOKEN_FILE"); tokenFile != "" {
+		if tokenFile := getenv("GITEA_ACCESS_TOKEN_FILE"); tokenFile != "" {
-			data, err := os.ReadFile(tokenFile)
+			data, err := readFile(tokenFile)
 			if err != nil {
-				fmt.Fprintf(os.Stderr, "error reading GITEA_ACCESS_TOKEN_FILE: %v\n", err)
+				fmt.Fprintf(stderr, "error reading GITEA_ACCESS_TOKEN_FILE: %v\n", err)
-				os.Exit(1)
+				osExit(1)
 			}
 			flagPkg.Token = strings.TrimRight(string(data), "\r\n")
 		}
 	}
 
-	if os.Getenv("MCP_MODE") != "" {
+	if getenv("MCP_MODE") != "" {
-		flagPkg.Mode = os.Getenv("MCP_MODE")
+		flagPkg.Mode = getenv("MCP_MODE")
 	}
-
+	if getenv("GITEA_READONLY") == "true" {
-	if os.Getenv("GITEA_READONLY") == "true" {
 		flagPkg.ReadOnly = true
 	}
 
@@ -111,27 +134,58 @@ func init() {
 		flagPkg.AllowedTools = allowed
 	}
 
-	if os.Getenv("GITEA_DEBUG") == "true" {
+	allowedScopes := map[string]struct{}{}
+	for s := range strings.SplitSeq(scopes, ",") {
+		if s = normalizeScope(s); s != "" {
+			allowedScopes[s] = struct{}{}
+		}
+	}
+	if len(allowedScopes) > 0 {
+		flagPkg.AllowedScopes = allowedScopes
+	}
+	if getenv("GITEA_DEBUG") == "true" {
 		flagPkg.Debug = true
 	}
-
+	if getenv("GITEA_INSECURE") == "true" {
-	// Set insecure mode based on environment variable
-	if os.Getenv("GITEA_INSECURE") == "true" {
 		flagPkg.Insecure = true
 	}
+	if !maxInlineAttachmentBytesFlagSet {
+		if val := getenv("GITEA_MAX_INLINE_ATTACHMENT_BYTES"); val != "" {
+			parsed, err := strconv.Atoi(val)
+			if err != nil || parsed < 0 {
+				fmt.Fprintf(stderr, "invalid GITEA_MAX_INLINE_ATTACHMENT_BYTES: %q\n", val)
+				osExit(1)
+			}
+			flagPkg.MaxInlineAttachmentBytes = parsed
+		}
+	}
+}
+
+// normalizeScope trims whitespace, lowercases, and converts internal spaces
+// and hyphens to underscores, so "Pull Request", "pull-request", and
+// "PULL_REQUEST" all normalize to "pull_request".
+func normalizeScope(s string) string {
+	s = strings.TrimSpace(s)
+	s = strings.ToLower(s)
+	s = strings.ReplaceAll(s, " ", "_")
+	s = strings.ReplaceAll(s, "-", "_")
+	return s
 }
 
 func Execute() {
+	initFlagSet(flag.CommandLine, os.Args[1:], os.Getenv, os.ReadFile, os.Stderr)
 	if version {
 		fmt.Fprintln(os.Stdout, flagPkg.Version)
 		return
 	}
-	defer log.Default().Sync() //nolint:errcheck // best-effort flush
 	if err := operation.Run(); err != nil {
 		if err == context.Canceled {
 			log.Info("Server shutdown due to context cancellation")
+			_ = log.Default().Sync() // best-effort flush
 			return
 		}
-		log.Fatalf("Run Gitea MCP Server Error: %v", err) //nolint:gocritic // intentional exit after defer
+		_ = log.Default().Sync() // best-effort flush
+		log.Fatalf("Run Gitea MCP Server Error: %v", err)
 	}
+	_ = log.Default().Sync() // best-effort flush
 }

cmd/cmd_test.go

@@ -0,0 +1,76 @@
+package cmd
+
+import (
+	"bytes"
+	"flag"
+	"maps"
+	"slices"
+	"testing"
+
+	flagPkg "gitea.com/gitea/gitea-mcp/pkg/flag"
+)
+
+func TestInitFlagSetScopes(t *testing.T) {
+	tests := []struct {
+		name string
+		args []string
+		env  map[string]string
+		want []string
+	}{
+		{
+			name: "no scope flag or env leaves AllowedScopes unset",
+			args: []string{},
+			want: nil,
+		},
+		{
+			name: "-S sets a single scope",
+			args: []string{"-S", "repository"},
+			want: []string{"repository"},
+		},
+		{
+			name: "-scope sets a comma-separated list",
+			args: []string{"-scope", "repository,file"},
+			want: []string{"file", "repository"},
+		},
+		{
+			name: "GITEA_SCOPES env sets the default",
+			args: []string{},
+			env:  map[string]string{"GITEA_SCOPES": "issue,pull_request"},
+			want: []string{"issue", "pull_request"},
+		},
+		{
+			name: "-S flag takes precedence over GITEA_SCOPES env",
+			args: []string{"-S", "file"},
+			env:  map[string]string{"GITEA_SCOPES": "issue"},
+			want: []string{"file"},
+		},
+		{
+			name: "normalizes case, whitespace, and hyphens/spaces to underscores",
+			args: []string{"-S", " Pull Request , pull-request , PULL_REQUEST "},
+			want: []string{"pull_request"},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			origScopes := flagPkg.AllowedScopes
+			t.Cleanup(func() {
+				flagPkg.AllowedScopes = origScopes
+			})
+			flagPkg.AllowedScopes = nil
+
+			getenv := func(key string) string { return tt.env[key] }
+			readFile := func(string) ([]byte, error) { return nil, nil }
+			fs := flag.NewFlagSet("test", flag.ContinueOnError)
+			var stderr bytes.Buffer
+
+			initFlagSet(fs, tt.args, getenv, readFile, &stderr)
+
+			got := slices.Sorted(maps.Keys(flagPkg.AllowedScopes))
+			want := slices.Clone(tt.want)
+			slices.Sort(want)
+			if !slices.Equal(got, want) {
+				t.Errorf("AllowedScopes = %v, want %v", got, want)
+			}
+		})
+	}
+}

go.mod

@@ -4,7 +4,7 @@ go 1.26.0
 
 require (
 	gitea.dev/sdk v1.2.0
-	github.com/mark3labs/mcp-go v0.56.0
+	github.com/modelcontextprotocol/go-sdk v1.7.0
 	go.uber.org/zap v1.28.0
 	go.uber.org/zap/exp v0.3.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
@@ -14,13 +14,15 @@ require (
 	github.com/42wim/httpsig v1.2.4 // indirect
 	github.com/davidmz/go-pageant v1.0.2 // indirect
 	github.com/google/jsonschema-go v0.4.3 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-version v1.9.0 // indirect
-	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
+	github.com/segmentio/asm v1.1.3 // indirect
-	github.com/spf13/cast v1.10.0 // indirect
+	github.com/segmentio/encoding v0.5.4 // indirect
 	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.54.0 // indirect
+	golang.org/x/oauth2 v0.35.0 // indirect
+	golang.org/x/sync v0.22.0 // indirect
 	golang.org/x/sys v0.47.0 // indirect
-	golang.org/x/text v0.40.0 // indirect
+	golang.org/x/time v0.15.0 // indirect
+	golang.org/x/tools v0.47.0 // indirect
 )

go.sum

@@ -6,32 +6,22 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davidmz/go-pageant v1.0.2 h1:bPblRCh5jGU+Uptpz6LgMZGD5hJoOt7otgT454WvHn0=
 github.com/davidmz/go-pageant v1.0.2/go.mod h1:P2EDDnMqIwG5Rrp05dTRITj9z2zpGcD9efWSkTNKLIE=
-github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
+github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
-github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
-github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/jsonschema-go v0.4.3 h1:/DBOLZTfDow7pe2GmaJNhltueGTtDKICi8V8p+DQPd0=
 github.com/google/jsonschema-go v0.4.3/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/go-version v1.9.0 h1:CeOIz6k+LoN3qX9Z0tyQrPtiB1DFYRPfCIBtaXPSCnA=
 github.com/hashicorp/go-version v1.9.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/modelcontextprotocol/go-sdk v1.7.0 h1:yqjY2dsbKAC0LSuWZVBMrHgiG8ukXv6NRo0JiALay44=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/modelcontextprotocol/go-sdk v1.7.0/go.mod h1:dL7u98E/zjJTGzEq+j30jQ8K2k1mb6LeAH4inEcSGts=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mark3labs/mcp-go v0.56.0 h1:7aCj2wODCskMi08f923ADG+EfELZBdiKILny415cIS8=
-github.com/mark3labs/mcp-go v0.56.0/go.mod h1:+8WclSK1ZUweCP3hvktSji8n8ABG/95QaEkeVE/Uwas=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/segmentio/asm v1.1.3 h1:WM03sfUOENvvKexOLp+pCqgb/WDjsi7EK8gIsICtzhc=
-github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/segmentio/asm v1.1.3/go.mod h1:Ld3L4ZXGNcSLRg4JBsZ3//1+f/TjYl0Mzen/DQy1EJg=
-github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ=
+github.com/segmentio/encoding v0.5.4 h1:OW1VRern8Nw6ITAtwSZ7Idrl3MXCFwXHPgqESYfvNt0=
-github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
+github.com/segmentio/encoding v0.5.4/go.mod h1:HS1ZKa3kSN32ZHVZ7ZLPLXWvOVIiZtyJnO1gPH1sKt0=
-github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
-github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
@@ -50,6 +40,10 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5
 golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw=
 golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/oauth2 v0.35.0 h1:Mv2mzuHuZuY2+bkyWXIHMfhNdJAdwW3FuWeCPYN5GVQ=
+golang.org/x/oauth2 v0.35.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
+golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
+golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
 golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
@@ -57,9 +51,11 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0=
 golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=
+golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
-golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
+golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q=
+golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

operation/actions/actions.go

@@ -5,4 +5,4 @@ import (
 )
 
 // Tool is the registry for all Actions-related MCP tools.
-var Tool = tool.New()
+var Tool = tool.New("actions")

operation/actions/artifacts.go

@@ -15,7 +15,7 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 
 // Artifact endpoints require Gitea 1.25+. Older servers answer 404/405, which is
@@ -28,21 +28,21 @@ func artifactNotSupportedErr(err error) error {
 	return err
 }
 
-func listRepoActionArtifactsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listRepoActionArtifactsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 
 	query := url.Values{}
 	query.Set("page", strconv.Itoa(page))
 	query.Set("limit", strconv.Itoa(pageSize))
-	if name := params.GetOptionalString(req.GetArguments(), "artifact_name", ""); name != "" {
+	if name := params.GetOptionalString(args, "artifact_name", ""); name != "" {
 		query.Set("name", name)
 	}
 
@@ -59,25 +59,25 @@ func listRepoActionArtifactsFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	return to.TextResult(slimActionArtifacts(result))
 }
 
-func listRepoActionRunArtifactsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listRepoActionRunArtifactsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	runID, err := params.GetIndex(req.GetArguments(), "run_id")
+	runID, err := params.GetIndex(args, "run_id")
 	if err != nil || runID <= 0 {
 		return to.ErrorResult(errors.New("run_id is required"))
 	}
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 
 	query := url.Values{}
 	query.Set("page", strconv.Itoa(page))
 	query.Set("limit", strconv.Itoa(pageSize))
-	if name := params.GetOptionalString(req.GetArguments(), "artifact_name", ""); name != "" {
+	if name := params.GetOptionalString(args, "artifact_name", ""); name != "" {
 		query.Set("name", name)
 	}
 
@@ -94,16 +94,16 @@ func listRepoActionRunArtifactsFn(ctx context.Context, req mcp.CallToolRequest)
 	return to.TextResult(slimActionArtifacts(result))
 }
 
-func getRepoActionArtifactFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getRepoActionArtifactFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	artifactID, err := params.GetIndex(req.GetArguments(), "artifact_id")
+	artifactID, err := params.GetIndex(args, "artifact_id")
 	if err != nil || artifactID <= 0 {
 		return to.ErrorResult(errors.New("artifact_id is required"))
 	}
@@ -121,20 +121,20 @@ func getRepoActionArtifactFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	return to.TextResult(slimActionArtifact(result))
 }
 
-func downloadRepoActionArtifactFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func downloadRepoActionArtifactFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	artifactID, err := params.GetIndex(req.GetArguments(), "artifact_id")
+	artifactID, err := params.GetIndex(args, "artifact_id")
 	if err != nil || artifactID <= 0 {
 		return to.ErrorResult(errors.New("artifact_id is required"))
 	}
-	outputPath, _ := req.GetArguments()["output_path"].(string)
+	outputPath, _ := args["output_path"].(string)
 
 	// Best-effort metadata lookup: gives a friendly filename and lets us fail
 	// early with a clear message when the artifact has expired.

operation/actions/config.go

@@ -11,10 +11,10 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
+	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
 const (
@@ -44,103 +44,103 @@ func toSecretMetas(secrets []*gitea_sdk.Secret) []secretMeta {
 }
 
 var (
-	ActionsConfigReadTool = mcp.NewTool(
+	ActionsConfigReadTool = tool.NewDefinition(
 		ActionsConfigReadToolName,
-		mcp.WithDescription("Read Actions secrets and variables."),
+		"Read Actions secrets and variables.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Read Actions secrets and variables")),
+		annotation.ReadOnly("Read Actions secrets and variables"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("list_repo_secrets", "list_org_secrets", "list_repo_variables", "get_repo_variable", "list_org_variables", "get_org_variable")),
+		tool.String("method", tool.Required(), tool.Enum("list_repo_secrets", "list_org_secrets", "list_repo_variables", "get_repo_variable", "list_org_variables", "get_org_variable")),
-		mcp.WithString("owner", mcp.Description("for repo methods")),
+		tool.String("owner", tool.Description("for repo methods")),
-		mcp.WithString("repo", mcp.Description("for repo methods")),
+		tool.String("repo", tool.Description("for repo methods")),
-		mcp.WithString("org", mcp.Description("for org methods")),
+		tool.String("org", tool.Description("for org methods")),
-		mcp.WithString("name", mcp.Description("for get methods")),
+		tool.String("name", tool.Description("for get methods")),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1), tool.Minimum(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30), mcp.Min(1)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30), tool.Minimum(1)),
 	)
 
-	ActionsConfigWriteTool = mcp.NewTool(
+	ActionsConfigWriteTool = tool.NewDefinition(
 		ActionsConfigWriteToolName,
-		mcp.WithDescription("Write Actions secrets and variables: upsert, create, update, delete."),
+		"Write Actions secrets and variables: upsert, create, update, delete.",
-		mcp.WithToolAnnotation(annotation.Destructive("Manage Actions secrets and variables")),
+		annotation.Destructive("Manage Actions secrets and variables"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("upsert_repo_secret", "delete_repo_secret", "upsert_org_secret", "delete_org_secret", "create_repo_variable", "update_repo_variable", "delete_repo_variable", "create_org_variable", "update_org_variable", "delete_org_variable")),
+		tool.String("method", tool.Required(), tool.Enum("upsert_repo_secret", "delete_repo_secret", "upsert_org_secret", "delete_org_secret", "create_repo_variable", "update_repo_variable", "delete_repo_variable", "create_org_variable", "update_org_variable", "delete_org_variable")),
-		mcp.WithString("owner", mcp.Description("for repo methods")),
+		tool.String("owner", tool.Description("for repo methods")),
-		mcp.WithString("repo", mcp.Description("for repo methods")),
+		tool.String("repo", tool.Description("for repo methods")),
-		mcp.WithString("org", mcp.Description("for org methods")),
+		tool.String("org", tool.Description("for org methods")),
-		mcp.WithString("name", mcp.Description("secret or variable name")),
+		tool.String("name", tool.Description("secret or variable name")),
-		mcp.WithString("data", mcp.Description("secret value (upsert)")),
+		tool.String("data", tool.Description("secret value (upsert)")),
-		mcp.WithString("value", mcp.Description("variable value")),
+		tool.String("value", tool.Description("variable value")),
-		mcp.WithString("description"),
+		tool.String("description"),
 	)
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{Tool: ActionsConfigReadTool, Handler: configReadFn})
+	Tool.RegisterRead(tool.ServerTool{Tool: ActionsConfigReadTool, Handler: configReadFn})
-	Tool.RegisterWrite(server.ServerTool{Tool: ActionsConfigWriteTool, Handler: configWriteFn})
+	Tool.RegisterWrite(tool.ServerTool{Tool: ActionsConfigWriteTool, Handler: configWriteFn})
 }
 
-func configReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func configReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	method, err := params.GetString(req.GetArguments(), "method")
+	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "list_repo_secrets":
-		return listRepoActionSecretsFn(ctx, req)
+		return listRepoActionSecretsFn(ctx, args)
 	case "list_org_secrets":
-		return listOrgActionSecretsFn(ctx, req)
+		return listOrgActionSecretsFn(ctx, args)
 	case "list_repo_variables":
-		return listRepoActionVariablesFn(ctx, req)
+		return listRepoActionVariablesFn(ctx, args)
 	case "get_repo_variable":
-		return getRepoActionVariableFn(ctx, req)
+		return getRepoActionVariableFn(ctx, args)
 	case "list_org_variables":
-		return listOrgActionVariablesFn(ctx, req)
+		return listOrgActionVariablesFn(ctx, args)
 	case "get_org_variable":
-		return getOrgActionVariableFn(ctx, req)
+		return getOrgActionVariableFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func configWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func configWriteFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	method, err := params.GetString(req.GetArguments(), "method")
+	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "upsert_repo_secret":
-		return upsertRepoActionSecretFn(ctx, req)
+		return upsertRepoActionSecretFn(ctx, args)
 	case "delete_repo_secret":
-		return deleteRepoActionSecretFn(ctx, req)
+		return deleteRepoActionSecretFn(ctx, args)
 	case "upsert_org_secret":
-		return upsertOrgActionSecretFn(ctx, req)
+		return upsertOrgActionSecretFn(ctx, args)
 	case "delete_org_secret":
-		return deleteOrgActionSecretFn(ctx, req)
+		return deleteOrgActionSecretFn(ctx, args)
 	case "create_repo_variable":
-		return createRepoActionVariableFn(ctx, req)
+		return createRepoActionVariableFn(ctx, args)
 	case "update_repo_variable":
-		return updateRepoActionVariableFn(ctx, req)
+		return updateRepoActionVariableFn(ctx, args)
 	case "delete_repo_variable":
-		return deleteRepoActionVariableFn(ctx, req)
+		return deleteRepoActionVariableFn(ctx, args)
 	case "create_org_variable":
-		return createOrgActionVariableFn(ctx, req)
+		return createOrgActionVariableFn(ctx, args)
 	case "update_org_variable":
-		return updateOrgActionVariableFn(ctx, req)
+		return updateOrgActionVariableFn(ctx, args)
 	case "delete_org_variable":
-		return deleteOrgActionVariableFn(ctx, req)
+		return deleteOrgActionVariableFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func listRepoActionSecretsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listRepoActionSecretsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -157,24 +157,24 @@ func listRepoActionSecretsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	return to.TextResult(toSecretMetas(secrets))
 }
 
-func upsertRepoActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func upsertRepoActionSecretFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	name, err := params.GetString(req.GetArguments(), "name")
+	name, err := params.GetString(args, "name")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	data, err := params.GetString(req.GetArguments(), "data")
+	data, err := params.GetString(args, "data")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	description, _ := req.GetArguments()["description"].(string)
+	description, _ := args["description"].(string)
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -190,16 +190,16 @@ func upsertRepoActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 	return to.TextResult(map[string]any{"message": "secret upserted", "status": resp.StatusCode})
 }
 
-func deleteRepoActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func deleteRepoActionSecretFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	name, err := params.GetString(req.GetArguments(), "name")
+	name, err := params.GetString(args, "name")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -215,12 +215,12 @@ func deleteRepoActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 	return to.TextResult(map[string]any{"message": "secret deleted", "status": resp.StatusCode})
 }
 
-func listOrgActionSecretsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listOrgActionSecretsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	org, err := params.GetString(req.GetArguments(), "org")
+	org, err := params.GetString(args, "org")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -237,20 +237,20 @@ func listOrgActionSecretsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 	return to.TextResult(toSecretMetas(secrets))
 }
 
-func upsertOrgActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func upsertOrgActionSecretFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	org, err := params.GetString(req.GetArguments(), "org")
+	org, err := params.GetString(args, "org")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	name, err := params.GetString(req.GetArguments(), "name")
+	name, err := params.GetString(args, "name")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	data, err := params.GetString(req.GetArguments(), "data")
+	data, err := params.GetString(args, "data")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	description, _ := req.GetArguments()["description"].(string)
+	description, _ := args["description"].(string)
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -266,12 +266,12 @@ func upsertOrgActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	return to.TextResult(map[string]any{"message": "secret upserted", "status": resp.StatusCode})
 }
 
-func deleteOrgActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func deleteOrgActionSecretFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	org, err := params.GetString(req.GetArguments(), "org")
+	org, err := params.GetString(args, "org")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	name, err := params.GetString(req.GetArguments(), "name")
+	name, err := params.GetString(args, "name")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -285,16 +285,16 @@ func deleteOrgActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	return to.TextResult(map[string]any{"message": "secret deleted"})
 }
 
-func listRepoActionVariablesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listRepoActionVariablesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 
 	query := url.Values{}
 	query.Set("page", strconv.Itoa(page))
@@ -308,16 +308,16 @@ func listRepoActionVariablesFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	return to.TextResult(result)
 }
 
-func getRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getRepoActionVariableFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	name, err := params.GetString(req.GetArguments(), "name")
+	name, err := params.GetString(args, "name")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -333,20 +333,20 @@ func getRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	return to.TextResult(variable)
 }
 
-func createRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func createRepoActionVariableFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	name, err := params.GetString(req.GetArguments(), "name")
+	name, err := params.GetString(args, "name")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	value, err := params.GetString(req.GetArguments(), "value")
+	value, err := params.GetString(args, "value")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -362,20 +362,20 @@ func createRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*
 	return to.TextResult(map[string]any{"message": "variable created", "status": resp.StatusCode})
 }
 
-func updateRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func updateRepoActionVariableFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	name, err := params.GetString(req.GetArguments(), "name")
+	name, err := params.GetString(args, "name")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	value, err := params.GetString(req.GetArguments(), "value")
+	value, err := params.GetString(args, "value")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -391,16 +391,16 @@ func updateRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*
 	return to.TextResult(map[string]any{"message": "variable updated", "status": resp.StatusCode})
 }
 
-func deleteRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func deleteRepoActionVariableFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	name, err := params.GetString(req.GetArguments(), "name")
+	name, err := params.GetString(args, "name")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -416,12 +416,12 @@ func deleteRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*
 	return to.TextResult(map[string]any{"message": "variable deleted", "status": resp.StatusCode})
 }
 
-func listOrgActionVariablesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listOrgActionVariablesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	org, err := params.GetString(req.GetArguments(), "org")
+	org, err := params.GetString(args, "org")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -436,12 +436,12 @@ func listOrgActionVariablesFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 	return to.TextResult(variables)
 }
 
-func getOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getOrgActionVariableFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	org, err := params.GetString(req.GetArguments(), "org")
+	org, err := params.GetString(args, "org")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	name, err := params.GetString(req.GetArguments(), "name")
+	name, err := params.GetString(args, "name")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -457,20 +457,20 @@ func getOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 	return to.TextResult(variable)
 }
 
-func createOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func createOrgActionVariableFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	org, err := params.GetString(req.GetArguments(), "org")
+	org, err := params.GetString(args, "org")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	name, err := params.GetString(req.GetArguments(), "name")
+	name, err := params.GetString(args, "name")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	value, err := params.GetString(req.GetArguments(), "value")
+	value, err := params.GetString(args, "value")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	description, _ := req.GetArguments()["description"].(string)
+	description, _ := args["description"].(string)
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -486,20 +486,20 @@ func createOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	return to.TextResult(map[string]any{"message": "variable created", "status": resp.StatusCode})
 }
 
-func updateOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func updateOrgActionVariableFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	org, err := params.GetString(req.GetArguments(), "org")
+	org, err := params.GetString(args, "org")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	name, err := params.GetString(req.GetArguments(), "name")
+	name, err := params.GetString(args, "name")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	value, err := params.GetString(req.GetArguments(), "value")
+	value, err := params.GetString(args, "value")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	description, _ := req.GetArguments()["description"].(string)
+	description, _ := args["description"].(string)
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -516,12 +516,12 @@ func updateOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	return to.TextResult(map[string]any{"message": "variable updated", "status": resp.StatusCode})
 }
 
-func deleteOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func deleteOrgActionVariableFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	org, err := params.GetString(req.GetArguments(), "org")
+	org, err := params.GetString(args, "org")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	name, err := params.GetString(req.GetArguments(), "name")
+	name, err := params.GetString(args, "name")
 	if err != nil {
 		return to.ErrorResult(err)
 	}

operation/actions/runs.go

@@ -14,9 +14,9 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
+	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
 const (
@@ -25,92 +25,94 @@ const (
 )
 
 var (
-	ActionsRunReadTool = mcp.NewTool(
+	ActionsRunReadTool = tool.NewDefinition(
 		ActionsRunReadToolName,
-		mcp.WithDescription("Read Actions workflows, runs, jobs, logs, and artifacts."),
+		"Read Actions workflows, runs, jobs, logs, and artifacts.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Read Actions workflow, run, job, and artifact data")),
+		annotation.ReadOnly("Read Actions workflow, run, job, and artifact data"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("list_workflows", "get_workflow", "list_runs", "get_run", "list_jobs", "list_run_jobs", "get_job_log_preview", "download_job_log", "list_artifacts", "list_run_artifacts", "get_artifact", "download_artifact")),
+		tool.String("method", tool.Required(), tool.Enum("list_workflows", "get_workflow", "list_runs", "get_run", "list_jobs", "list_run_jobs", "get_job", "get_job_log_preview", "download_job_log", "list_artifacts", "list_run_artifacts", "get_artifact", "download_artifact")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("workflow_id", mcp.Description("ID or filename (for 'get_workflow')")),
+		tool.String("workflow_id", tool.Description("ID or filename (for 'get_workflow')")),
-		mcp.WithNumber("run_id", mcp.Description("for 'get_run'/'list_run_jobs'/'list_run_artifacts'")),
+		tool.Number("run_id", tool.Description("for 'get_run'/'list_run_jobs'/'list_run_artifacts'")),
-		mcp.WithNumber("job_id", mcp.Description("for log methods")),
+		tool.Number("job_id", tool.Description("for 'get_job'/log methods")),
-		mcp.WithNumber("artifact_id", mcp.Description("for 'get_artifact'/'download_artifact'")),
+		tool.Number("artifact_id", tool.Description("for 'get_artifact'/'download_artifact'")),
-		mcp.WithString("artifact_name", mcp.Description("name filter for 'list_artifacts'/'list_run_artifacts'")),
+		tool.String("artifact_name", tool.Description("name filter for 'list_artifacts'/'list_run_artifacts'")),
-		mcp.WithString("status", mcp.Description("filter for 'list_runs'/'list_jobs'")),
+		tool.String("status", tool.Description("filter for 'list_runs'/'list_jobs'")),
-		mcp.WithNumber("tail_lines", mcp.Description("log tail lines"), mcp.DefaultNumber(200), mcp.Min(1)),
+		tool.Number("tail_lines", tool.Description("log tail lines"), tool.Default(200), tool.Minimum(1)),
-		mcp.WithNumber("max_bytes", mcp.Description("max log bytes"), mcp.DefaultNumber(65536), mcp.Min(1024)),
+		tool.Number("max_bytes", tool.Description("max log bytes"), tool.Default(65536), tool.Minimum(1024)),
-		mcp.WithString("output_path", mcp.Description("for 'download_job_log'/'download_artifact'")),
+		tool.String("output_path", tool.Description("for 'download_job_log'/'download_artifact'")),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1), tool.Minimum(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30), mcp.Min(1)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30), tool.Minimum(1)),
 	)
 
-	ActionsRunWriteTool = mcp.NewTool(
+	ActionsRunWriteTool = tool.NewDefinition(
 		ActionsRunWriteToolName,
-		mcp.WithDescription("Write Actions runs: dispatch, cancel, rerun."),
+		"Write Actions runs: dispatch, cancel, rerun.",
-		mcp.WithToolAnnotation(annotation.Write("Trigger, cancel, or rerun Actions workflows")),
+		annotation.Write("Trigger, cancel, or rerun Actions workflows"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("dispatch_workflow", "cancel_run", "rerun_run")),
+		tool.String("method", tool.Required(), tool.Enum("dispatch_workflow", "cancel_run", "rerun_run")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("workflow_id", mcp.Description("ID or filename (for 'dispatch_workflow')")),
+		tool.String("workflow_id", tool.Description("ID or filename (for 'dispatch_workflow')")),
-		mcp.WithString("ref", mcp.Description("branch or tag (for 'dispatch_workflow')")),
+		tool.String("ref", tool.Description("branch or tag (for 'dispatch_workflow')")),
-		mcp.WithObject("inputs", mcp.Description("for 'dispatch_workflow'")),
+		tool.Object("inputs", tool.Description("for 'dispatch_workflow'")),
-		mcp.WithNumber("run_id", mcp.Description("for 'cancel_run'/'rerun_run'")),
+		tool.Number("run_id", tool.Description("for 'cancel_run'/'rerun_run'")),
 	)
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{Tool: ActionsRunReadTool, Handler: runReadFn})
+	Tool.RegisterRead(tool.ServerTool{Tool: ActionsRunReadTool, Handler: runReadFn})
-	Tool.RegisterWrite(server.ServerTool{Tool: ActionsRunWriteTool, Handler: runWriteFn})
+	Tool.RegisterWrite(tool.ServerTool{Tool: ActionsRunWriteTool, Handler: runWriteFn})
 }
 
-func runReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func runReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	method, err := params.GetString(req.GetArguments(), "method")
+	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "list_workflows":
-		return listRepoActionWorkflowsFn(ctx, req)
+		return listRepoActionWorkflowsFn(ctx, args)
 	case "get_workflow":
-		return getRepoActionWorkflowFn(ctx, req)
+		return getRepoActionWorkflowFn(ctx, args)
 	case "list_runs":
-		return listRepoActionRunsFn(ctx, req)
+		return listRepoActionRunsFn(ctx, args)
 	case "get_run":
-		return getRepoActionRunFn(ctx, req)
+		return getRepoActionRunFn(ctx, args)
 	case "list_jobs":
-		return listRepoActionJobsFn(ctx, req)
+		return listRepoActionJobsFn(ctx, args)
 	case "list_run_jobs":
-		return listRepoActionRunJobsFn(ctx, req)
+		return listRepoActionRunJobsFn(ctx, args)
+	case "get_job":
+		return getRepoActionJobFn(ctx, args)
 	case "get_job_log_preview":
-		return getRepoActionJobLogPreviewFn(ctx, req)
+		return getRepoActionJobLogPreviewFn(ctx, args)
 	case "download_job_log":
-		return downloadRepoActionJobLogFn(ctx, req)
+		return downloadRepoActionJobLogFn(ctx, args)
 	case "list_artifacts":
-		return listRepoActionArtifactsFn(ctx, req)
+		return listRepoActionArtifactsFn(ctx, args)
 	case "list_run_artifacts":
-		return listRepoActionRunArtifactsFn(ctx, req)
+		return listRepoActionRunArtifactsFn(ctx, args)
 	case "get_artifact":
-		return getRepoActionArtifactFn(ctx, req)
+		return getRepoActionArtifactFn(ctx, args)
 	case "download_artifact":
-		return downloadRepoActionArtifactFn(ctx, req)
+		return downloadRepoActionArtifactFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func runWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func runWriteFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	method, err := params.GetString(req.GetArguments(), "method")
+	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "dispatch_workflow":
-		return dispatchRepoActionWorkflowFn(ctx, req)
+		return dispatchRepoActionWorkflowFn(ctx, args)
 	case "cancel_run":
-		return cancelRepoActionRunFn(ctx, req)
+		return cancelRepoActionRunFn(ctx, args)
 	case "rerun_run":
-		return rerunRepoActionRunFn(ctx, req)
+		return rerunRepoActionRunFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
@@ -133,16 +135,16 @@ func doJSONWithFallback(ctx context.Context, method string, paths []string, quer
 	return lastErr
 }
 
-func listRepoActionWorkflowsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listRepoActionWorkflowsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 	query := url.Values{}
 	query.Set("page", strconv.Itoa(page))
 	query.Set("limit", strconv.Itoa(pageSize))
@@ -160,16 +162,16 @@ func listRepoActionWorkflowsFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	return to.TextResult(slimActionWorkflows(result))
 }
 
-func getRepoActionWorkflowFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getRepoActionWorkflowFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	workflowID, err := params.GetString(req.GetArguments(), "workflow_id")
+	workflowID, err := params.GetString(args, "workflow_id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -187,26 +189,26 @@ func getRepoActionWorkflowFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	return to.TextResult(slimActionWorkflow(result))
 }
 
-func dispatchRepoActionWorkflowFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func dispatchRepoActionWorkflowFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	workflowID, err := params.GetString(req.GetArguments(), "workflow_id")
+	workflowID, err := params.GetString(args, "workflow_id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	ref, err := params.GetString(req.GetArguments(), "ref")
+	ref, err := params.GetString(args, "ref")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 
 	var inputs map[string]any
-	if raw, exists := req.GetArguments()["inputs"]; exists {
+	if raw, exists := args["inputs"]; exists {
 		if m, ok := raw.(map[string]any); ok {
 			inputs = m
 		}
@@ -236,17 +238,17 @@ func dispatchRepoActionWorkflowFn(ctx context.Context, req mcp.CallToolRequest)
 	return to.TextResult(map[string]any{"message": "workflow dispatched"})
 }
 
-func listRepoActionRunsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listRepoActionRunsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
-	statusFilter, _ := req.GetArguments()["status"].(string)
+	statusFilter, _ := args["status"].(string)
 
 	query := url.Values{}
 	query.Set("page", strconv.Itoa(page))
@@ -268,16 +270,16 @@ func listRepoActionRunsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	return to.TextResult(slimActionRuns(result))
 }
 
-func getRepoActionRunFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getRepoActionRunFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	runID, err := params.GetIndex(req.GetArguments(), "run_id")
+	runID, err := params.GetIndex(args, "run_id")
 	if err != nil || runID <= 0 {
 		return to.ErrorResult(errors.New("run_id is required"))
 	}
@@ -295,16 +297,16 @@ func getRepoActionRunFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	return to.TextResult(slimActionRun(result))
 }
 
-func cancelRepoActionRunFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func cancelRepoActionRunFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	runID, err := params.GetIndex(req.GetArguments(), "run_id")
+	runID, err := params.GetIndex(args, "run_id")
 	if err != nil || runID <= 0 {
 		return to.ErrorResult(errors.New("run_id is required"))
 	}
@@ -321,16 +323,16 @@ func cancelRepoActionRunFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.C
 	return to.TextResult(map[string]any{"message": "run cancellation requested"})
 }
 
-func rerunRepoActionRunFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func rerunRepoActionRunFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	runID, err := params.GetIndex(req.GetArguments(), "run_id")
+	runID, err := params.GetIndex(args, "run_id")
 	if err != nil || runID <= 0 {
 		return to.ErrorResult(errors.New("run_id is required"))
 	}
@@ -352,17 +354,17 @@ func rerunRepoActionRunFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	return to.TextResult(map[string]any{"message": "run rerun requested"})
 }
 
-func listRepoActionJobsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listRepoActionJobsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
-	statusFilter, _ := req.GetArguments()["status"].(string)
+	statusFilter, _ := args["status"].(string)
 
 	query := url.Values{}
 	query.Set("page", strconv.Itoa(page))
@@ -384,20 +386,20 @@ func listRepoActionJobsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	return to.TextResult(slimActionJobs(result))
 }
 
-func listRepoActionRunJobsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listRepoActionRunJobsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	runID, err := params.GetIndex(req.GetArguments(), "run_id")
+	runID, err := params.GetIndex(args, "run_id")
 	if err != nil || runID <= 0 {
 		return to.ErrorResult(errors.New("run_id is required"))
 	}
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 
 	query := url.Values{}
 	query.Set("page", strconv.Itoa(page))
@@ -416,6 +418,37 @@ func listRepoActionRunJobsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	return to.TextResult(slimActionJobs(result))
 }
 
+func getRepoActionJobFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	owner, err := params.GetString(args, "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	repo, err := params.GetString(args, "repo")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	jobID, err := params.GetIndex(args, "job_id")
+	if err != nil || jobID <= 0 {
+		return to.ErrorResult(errors.New("job_id is required"))
+	}
+
+	var result any
+	err = doJSONWithFallback(ctx, "GET",
+		[]string{
+			fmt.Sprintf("repos/%s/%s/actions/jobs/%d", url.PathEscape(owner), url.PathEscape(repo), jobID),
+		},
+		nil, nil, &result,
+	)
+	if err != nil {
+		var httpErr *gitea.HTTPError
+		if errors.As(err, &httpErr) && (httpErr.StatusCode == http.StatusNotFound || httpErr.StatusCode == http.StatusMethodNotAllowed) {
+			return to.ErrorResult(fmt.Errorf("get action job not supported on this Gitea version (endpoint returned %d, requires Gitea 1.26+). Check https://docs.gitea.com/api/1.26/ for available Actions endpoints", httpErr.StatusCode))
+		}
+		return to.ErrorResult(fmt.Errorf("get action job err: %v", err))
+	}
+	return to.TextResult(slimActionJob(result))
+}
+
 func logPaths(owner, repo string, jobID int64) []string {
 	return []string{
 		fmt.Sprintf("repos/%s/%s/actions/jobs/%d/logs", url.PathEscape(owner), url.PathEscape(repo), jobID),
@@ -470,21 +503,21 @@ func limitBytes(data []byte, maxBytes int) ([]byte, bool) {
 	return data[len(data)-maxBytes:], true
 }
 
-func getRepoActionJobLogPreviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getRepoActionJobLogPreviewFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	jobID, err := params.GetIndex(req.GetArguments(), "job_id")
+	jobID, err := params.GetIndex(args, "job_id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	tailLines := int(params.GetOptionalInt(req.GetArguments(), "tail_lines", 200))
+	tailLines := int(params.GetOptionalInt(args, "tail_lines", 200))
-	maxBytes := int(params.GetOptionalInt(req.GetArguments(), "max_bytes", 65536))
+	maxBytes := int(params.GetOptionalInt(args, "max_bytes", 65536))
 	raw, usedPath, err := fetchJobLogBytes(ctx, owner, repo, jobID)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get job log err: %v", err))
@@ -504,20 +537,20 @@ func getRepoActionJobLogPreviewFn(ctx context.Context, req mcp.CallToolRequest)
 	})
 }
 
-func downloadRepoActionJobLogFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func downloadRepoActionJobLogFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	jobID, err := params.GetIndex(req.GetArguments(), "job_id")
+	jobID, err := params.GetIndex(args, "job_id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	outputPath, _ := req.GetArguments()["output_path"].(string)
+	outputPath, _ := args["output_path"].(string)
 
 	raw, usedPath, err := fetchJobLogBytes(ctx, owner, repo, jobID)
 	if err != nil {

operation/actions/slim.go

@@ -76,6 +76,13 @@ func slimActionRuns(raw any) any {
 	return slimPaginated(raw, slimRun)
 }
 
+func slimActionJob(raw any) any {
+	if m, ok := raw.(map[string]any); ok {
+		return slimJob(m)
+	}
+	return raw
+}
+
 func slimActionJobs(raw any) any {
 	return slimPaginated(raw, slimJob)
 }

operation/actions/slim_test.go

@@ -0,0 +1,57 @@
+package actions
+
+import "testing"
+
+func TestSlimActionJobKeepsExpectedKeys(t *testing.T) {
+	raw := map[string]any{
+		"id":            float64(42),
+		"run_id":        float64(7),
+		"name":          "build",
+		"workflow_name": "CI",
+		"status":        "completed",
+		"conclusion":    "success",
+		"html_url":      "https://gitea.example/x",
+		"started_at":    "2026-01-01T00:00:00Z",
+		"completed_at":  "2026-01-01T00:01:00Z",
+		"steps": []any{
+			map[string]any{"name": "checkout", "number": float64(1), "status": "completed", "conclusion": "success", "extra": "drop me"},
+		},
+		// fields that must be dropped
+		"head_sha":    "deadbeef",
+		"runner_name": "runner-1",
+	}
+
+	out, ok := slimActionJob(raw).(map[string]any)
+	if !ok {
+		t.Fatalf("slimActionJob did not return a map, got %T", slimActionJob(raw))
+	}
+
+	for _, k := range []string{"id", "run_id", "name", "workflow_name", "status", "conclusion", "html_url", "started_at", "completed_at", "steps"} {
+		if _, present := out[k]; !present {
+			t.Errorf("expected key %q to be kept", k)
+		}
+	}
+	for _, k := range []string{"head_sha", "runner_name"} {
+		if _, present := out[k]; present {
+			t.Errorf("expected key %q to be dropped", k)
+		}
+	}
+
+	steps, ok := out["steps"].([]any)
+	if !ok || len(steps) != 1 {
+		t.Fatalf("expected 1 slimmed step, got %v", out["steps"])
+	}
+	step := steps[0].(map[string]any)
+	if _, present := step["extra"]; present {
+		t.Errorf("expected step field 'extra' to be dropped")
+	}
+	if step["name"] != "checkout" {
+		t.Errorf("expected step name 'checkout', got %v", step["name"])
+	}
+}
+
+func TestSlimActionJobPassesThroughNonMap(t *testing.T) {
+	if got := slimActionJob("not-a-map"); got != "not-a-map" {
+		t.Errorf("expected passthrough, got %v", got)
+	}
+}

operation/issue/attachment.go

@@ -0,0 +1,313 @@
+package issue
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"fmt"
+	"io"
+	"mime"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
+	"gitea.com/gitea/gitea-mcp/pkg/flag"
+	"gitea.com/gitea/gitea-mcp/pkg/gitea"
+	"gitea.com/gitea/gitea-mcp/pkg/params"
+	"gitea.com/gitea/gitea-mcp/pkg/to"
+	"gitea.com/gitea/gitea-mcp/pkg/tool"
+
+	gitea_sdk "gitea.dev/sdk"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+const AttachmentReadToolName = "attachment_read"
+
+var AttachmentReadTool = tool.NewDefinition(
+	AttachmentReadToolName,
+	"Read issue/comment attachments: list metadata, get metadata, or download content.",
+	annotation.ReadOnly("Read issue or comment attachments"),
+	tool.String("method", tool.Required(), tool.Enum("list", "get", "download")),
+	tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
+	tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
+	tool.Number("issue_number", tool.Description("required for issue attachment list/get or issue-scoped metadata lookup")),
+	tool.Number("comment_id", tool.Description("required for comment attachment list/get or comment-scoped metadata lookup")),
+	tool.Number("attachment_id", tool.Description("required for get and for download when attachment_uuid is not provided")),
+	tool.String("attachment_uuid", tool.Description("attachment UUID for direct download path lookup")),
+	tool.String("output_path", tool.Description("write the attachment to this exact path")),
+)
+
+func init() {
+	Tool.RegisterRead(tool.ServerTool{Tool: AttachmentReadTool, Handler: attachmentReadFn})
+}
+
+func attachmentReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	method, err := params.GetString(args, "method")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	switch method {
+	case "list":
+		return listAttachmentsFn(ctx, args)
+	case "get":
+		return getAttachmentFn(ctx, args)
+	case "download":
+		return downloadAttachmentFn(ctx, args)
+	default:
+		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
+	}
+}
+
+func listAttachmentsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	owner, repo, issueNumber, commentID, err := attachmentScopeArgs(args)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	client, err := gitea.ClientFromContext(ctx)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+	}
+	var attachments []*gitea_sdk.Attachment
+	if issueNumber > 0 {
+		attachments, _, err = client.Issues.ListIssueAttachments(ctx, owner, repo, issueNumber)
+	} else {
+		attachments, _, err = client.Issues.ListIssueCommentAttachments(ctx, owner, repo, commentID)
+	}
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("list attachments err: %v", err))
+	}
+	return to.TextResult(slimAttachments(attachments))
+}
+
+func getAttachmentFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	att, err := lookupAttachment(ctx, args)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	return to.TextResult(slimAttachment(att))
+}
+
+func downloadAttachmentFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	owner, err := params.GetString(args, "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	repo, err := params.GetString(args, "repo")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	explicitOutputPath := params.GetOptionalString(args, "output_path", "")
+	attachmentUUID := strings.TrimSpace(params.GetOptionalString(args, "attachment_uuid", ""))
+
+	var att *gitea_sdk.Attachment
+	if attachmentUUID == "" {
+		att, err = lookupAttachment(ctx, args)
+		if err != nil {
+			return to.ErrorResult(err)
+		}
+		attachmentUUID = strings.TrimSpace(att.UUID)
+	}
+	if attachmentUUID == "" {
+		return to.ErrorResult(errors.New("attachment_uuid or attachment metadata with uuid is required"))
+	}
+
+	name := attachmentUUID
+	if att != nil && strings.TrimSpace(att.Name) != "" {
+		name = strings.TrimSpace(att.Name)
+	}
+
+	resp, err := gitea.OpenAttachment(ctx, "/attachments/"+attachmentUUID, "*/*")
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("download attachment err: %v", err))
+	}
+	defer resp.Body.Close()
+
+	mimeType := normalizeAttachmentContentType(resp.ContentType, name)
+	if explicitOutputPath == "" && shouldInlineAttachment(att, mimeType) {
+		limited, readErr := io.ReadAll(io.LimitReader(resp.Body, int64(flag.MaxInlineAttachmentBytes)+1))
+		if readErr != nil {
+			return to.ErrorResult(fmt.Errorf("read attachment err: %v", readErr))
+		}
+		if len(limited) <= flag.MaxInlineAttachmentBytes {
+			text := fmt.Sprintf("attachment %s (%s, %d bytes, %s)", name, attachmentUUID, len(limited), mimeType)
+			return &mcp.CallToolResult{Content: []mcp.Content{
+				&mcp.TextContent{Text: text},
+				&mcp.ImageContent{Data: limited, MIMEType: mimeType},
+			}}, nil
+		}
+		outputPath := defaultAttachmentPath(owner, repo, name, attachmentUUID)
+		if err := os.MkdirAll(filepath.Dir(outputPath), 0o700); err != nil {
+			return to.ErrorResult(fmt.Errorf("create output dir err: %v", err))
+		}
+		reader := io.MultiReader(bytes.NewReader(limited), resp.Body)
+		written, err := gitea.WriteAttachment(reader, outputPath)
+		if err != nil {
+			return to.ErrorResult(fmt.Errorf("write attachment file err: %v", err))
+		}
+		return attachmentFileResult(att, outputPath, written, name, attachmentUUID, mimeType)
+	}
+
+	outputPath := explicitOutputPath
+	if outputPath == "" {
+		outputPath = defaultAttachmentPath(owner, repo, name, attachmentUUID)
+	}
+	if err := os.MkdirAll(filepath.Dir(outputPath), 0o700); err != nil {
+		return to.ErrorResult(fmt.Errorf("create output dir err: %v", err))
+	}
+	written, err := gitea.WriteAttachment(resp.Body, outputPath)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("write attachment file err: %v", err))
+	}
+	return attachmentFileResult(att, outputPath, written, name, attachmentUUID, mimeType)
+}
+
+func shouldInlineAttachment(att *gitea_sdk.Attachment, mimeType string) bool {
+	if !strings.HasPrefix(mimeType, "image/") || flag.MaxInlineAttachmentBytes <= 0 {
+		return false
+	}
+	if att == nil || att.Size <= 0 {
+		return true
+	}
+	return att.Size <= int64(flag.MaxInlineAttachmentBytes)
+}
+
+func attachmentFileResult(att *gitea_sdk.Attachment, outputPath string, written int64, name, attachmentUUID, mimeType string) (*mcp.CallToolResult, error) {
+	res := map[string]any{
+		"path":         outputPath,
+		"bytes":        written,
+		"name":         name,
+		"uuid":         attachmentUUID,
+		"mime_type":    mimeType,
+		"content_type": mimeType,
+	}
+	if att != nil {
+		res["attachment_id"] = att.ID
+	}
+	return to.TextResult(res)
+}
+
+func attachmentScopeArgs(args map[string]any) (owner, repo string, issueNumber, commentID int64, err error) {
+	owner, err = params.GetString(args, "owner")
+	if err != nil {
+		return "", "", 0, 0, err
+	}
+	repo, err = params.GetString(args, "repo")
+	if err != nil {
+		return "", "", 0, 0, err
+	}
+	issueNumber = params.GetOptionalInt(args, "issue_number", 0)
+	commentID = params.GetOptionalInt(args, "comment_id", 0)
+	if (issueNumber > 0) == (commentID > 0) {
+		return "", "", 0, 0, errors.New("exactly one of issue_number or comment_id is required")
+	}
+	return owner, repo, issueNumber, commentID, nil
+}
+
+func lookupAttachment(ctx context.Context, args map[string]any) (*gitea_sdk.Attachment, error) {
+	owner, repo, issueNumber, commentID, err := attachmentScopeArgs(args)
+	if err != nil {
+		return nil, err
+	}
+	attachmentID := params.GetOptionalInt(args, "attachment_id", 0)
+	if attachmentID <= 0 {
+		return nil, errors.New("attachment_id is required")
+	}
+	client, err := gitea.ClientFromContext(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("get gitea client err: %v", err)
+	}
+	if issueNumber > 0 {
+		att, _, err := client.Issues.GetIssueAttachment(ctx, owner, repo, issueNumber, attachmentID)
+		if err != nil {
+			return nil, fmt.Errorf("get issue attachment err: %v", err)
+		}
+		return att, nil
+	}
+	att, _, err := client.Issues.GetIssueCommentAttachment(ctx, owner, repo, commentID, attachmentID)
+	if err != nil {
+		return nil, fmt.Errorf("get issue comment attachment err: %v", err)
+	}
+	return att, nil
+}
+
+func slimAttachments(atts []*gitea_sdk.Attachment) []map[string]any {
+	out := make([]map[string]any, 0, len(atts))
+	for _, att := range atts {
+		out = append(out, slimAttachment(att))
+	}
+	return out
+}
+
+func slimAttachment(att *gitea_sdk.Attachment) map[string]any {
+	if att == nil {
+		return nil
+	}
+	m := map[string]any{
+		"id":             att.ID,
+		"name":           att.Name,
+		"uuid":           att.UUID,
+		"size":           att.Size,
+		"download_count": att.DownloadCount,
+		"created_at":     att.Created,
+		"mime_type":      inferAttachmentMimeType(att.Name),
+	}
+	if att.DownloadURL != "" {
+		m["browser_download_url"] = att.DownloadURL
+	}
+	return m
+}
+
+func inferAttachmentMimeType(name string) string {
+	if ext := strings.ToLower(filepath.Ext(strings.TrimSpace(name))); ext != "" {
+		if mimeType := mime.TypeByExtension(ext); mimeType != "" {
+			return strings.Split(mimeType, ";")[0]
+		}
+	}
+	return "application/octet-stream"
+}
+
+func normalizeAttachmentContentType(contentType, name string) string {
+	mediaType, _, err := mime.ParseMediaType(contentType)
+	if err == nil && mediaType != "" && mediaType != "application/octet-stream" {
+		return mediaType
+	}
+	return inferAttachmentMimeType(name)
+}
+
+func defaultAttachmentPath(owner, repo, name, uuid string) string {
+	home, _ := os.UserHomeDir()
+	if home == "" {
+		home = os.TempDir()
+	}
+	filename := attachmentFilename(name, uuid)
+	ext := filepath.Ext(filename)
+	base := strings.TrimSuffix(filename, ext)
+	if uuid != "" {
+		filename = uuid
+		if base != "" && base != "attachment" {
+			filename = base + "-" + uuid
+		}
+		filename += ext
+	}
+	return filepath.Join(home, ".gitea-mcp", "attachments", safePathPart(owner), safePathPart(repo), filename)
+}
+
+func attachmentFilename(name, uuid string) string {
+	name = strings.TrimSpace(name)
+	if name != "" && !strings.ContainsAny(name, `/\\`) && name != "." && name != ".." {
+		return name
+	}
+	if uuid != "" {
+		return uuid + ".bin"
+	}
+	return "attachment.bin"
+}
+
+func safePathPart(name string) string {
+	name = strings.TrimSpace(name)
+	if name != "" && !strings.ContainsAny(name, `/\\`) && name != "." && name != ".." {
+		return name
+	}
+	return "unknown"
+}

operation/issue/attachment_test.go

@@ -0,0 +1,241 @@
+package issue
+
+import (
+	"bytes"
+	"context"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"gitea.com/gitea/gitea-mcp/pkg/flag"
+	"gitea.com/gitea/gitea-mcp/pkg/gitea"
+
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+func TestAttachmentFilename(t *testing.T) {
+	tests := []struct {
+		name string
+		file string
+		uuid string
+		want string
+	}{
+		{"uses attachment name", "screenshot.png", "abc", "screenshot.png"},
+		{"falls back for traversal", "../etc/passwd", "abc", "abc.bin"},
+		{"falls back for empty name", "", "abc", "abc.bin"},
+		{"uses generic fallback", "", "", "attachment.bin"},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := attachmentFilename(tt.file, tt.uuid); got != tt.want {
+				t.Fatalf("attachmentFilename() = %q, want %q", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestInferAttachmentMimeType(t *testing.T) {
+	if got := inferAttachmentMimeType("shot.png"); got != "image/png" {
+		t.Fatalf("inferAttachmentMimeType() = %q, want image/png", got)
+	}
+	if got := inferAttachmentMimeType("archive.unknownext"); got != "application/octet-stream" {
+		t.Fatalf("inferAttachmentMimeType() = %q, want application/octet-stream", got)
+	}
+}
+
+func TestDefaultAttachmentPath(t *testing.T) {
+	got := defaultAttachmentPath("octo", "demo", "shot.png", "uuid-1")
+	want := filepath.Join(".gitea-mcp", "attachments", "octo", "demo", "shot-uuid-1.png")
+	if !strings.HasSuffix(got, want) {
+		t.Fatalf("defaultAttachmentPath() = %q, want suffix %q", got, want)
+	}
+}
+
+func TestAttachmentReadListIssueAttachments(t *testing.T) {
+	const owner = "octo"
+	const repo = "demo"
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/api/v1/version":
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{"version":"1.12.0"}`))
+		case fmt.Sprintf("/api/v1/repos/%s/%s", owner, repo):
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{"private":false}`))
+		case fmt.Sprintf("/api/v1/repos/%s/%s/issues/42/assets", owner, repo):
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`[{"id":1,"name":"shot.png","uuid":"uuid-1","size":10,"download_count":2}]`))
+		default:
+			http.NotFound(w, r)
+		}
+	})
+	server := httptest.NewServer(handler)
+	defer server.Close()
+	origHost, origToken, origVersion := flag.Host, flag.Token, flag.Version
+	flag.Host, flag.Token, flag.Version = server.URL, "", "test"
+	defer func() { flag.Host, flag.Token, flag.Version = origHost, origToken, origVersion }()
+
+	res, err := attachmentReadFn(context.Background(), map[string]any{
+		"method": "list", "owner": owner, "repo": repo, "issue_number": float64(42),
+	})
+	if err != nil {
+		t.Fatalf("attachmentReadFn() error = %v", err)
+	}
+	body := res.Content[0].(*mcp.TextContent).Text
+	if !strings.Contains(body, `"mime_type":"image/png"`) || !strings.Contains(body, `"uuid":"uuid-1"`) {
+		t.Fatalf("unexpected body: %s", body)
+	}
+}
+
+func TestDownloadAttachmentRejectsRedirectLoopAtHopLimit(t *testing.T) {
+	var serverURL string
+	redirects := 0
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != "/attachments/uuid-1" {
+			t.Fatalf("path = %s", r.URL.Path)
+		}
+		redirects++
+		http.Redirect(w, r, serverURL+"/attachments/uuid-1", http.StatusFound)
+	}))
+	defer server.Close()
+	serverURL = server.URL
+
+	origHost := flag.Host
+	flag.Host = server.URL
+	defer func() { flag.Host = origHost }()
+
+	_, _, _, err := gitea.DownloadAttachment(context.Background(), "/attachments/uuid-1", "*/*")
+	if err == nil {
+		t.Fatal("expected redirect limit error")
+	}
+	if !strings.Contains(err.Error(), "stopped after 10 redirects") {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if redirects != 10 {
+		t.Fatalf("redirects = %d, want 10", redirects)
+	}
+}
+
+func TestAttachmentReadDownloadSavesLargeAttachmentToDefaultFile(t *testing.T) {
+	const owner = "octo"
+	const repo = "demo"
+	const uuid = "uuid-1"
+	const name = "large.bin"
+	payload := strings.Repeat("a", 32)
+
+	home := t.TempDir()
+	t.Setenv("HOME", home)
+
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/api/v1/version":
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{"version":"1.12.0"}`))
+		case fmt.Sprintf("/api/v1/repos/%s/%s", owner, repo):
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{"private":false}`))
+		case fmt.Sprintf("/api/v1/repos/%s/%s/issues/42/assets/1", owner, repo):
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(map[string]any{"id": 1, "name": name, "uuid": uuid, "size": len(payload)})
+		case "/attachments/" + uuid:
+			w.Header().Set("Content-Type", "application/octet-stream")
+			_, _ = w.Write([]byte(payload))
+		default:
+			http.NotFound(w, r)
+		}
+	})
+	server := httptest.NewServer(handler)
+	defer server.Close()
+
+	origHost, origToken, origVersion, origInline := flag.Host, flag.Token, flag.Version, flag.MaxInlineAttachmentBytes
+	flag.Host, flag.Token, flag.Version = server.URL, "", "test"
+	flag.MaxInlineAttachmentBytes = 8
+	defer func() {
+		flag.Host, flag.Token, flag.Version, flag.MaxInlineAttachmentBytes = origHost, origToken, origVersion, origInline
+	}()
+
+	res, err := attachmentReadFn(context.Background(), map[string]any{
+		"method": "download", "owner": owner, "repo": repo, "issue_number": float64(42), "attachment_id": float64(1),
+	})
+	if err != nil {
+		t.Fatalf("attachmentReadFn() error = %v", err)
+	}
+	body := res.Content[0].(*mcp.TextContent).Text
+	wantPath := filepath.Join(home, ".gitea-mcp", "attachments", owner, repo, "large-uuid-1.bin")
+	if !strings.Contains(body, wantPath) {
+		t.Fatalf("result missing path %q: %s", wantPath, body)
+	}
+	data, err := os.ReadFile(wantPath)
+	if err != nil {
+		t.Fatalf("ReadFile(%q): %v", wantPath, err)
+	}
+	if string(data) != payload {
+		t.Fatalf("saved payload mismatch")
+	}
+	if !strings.Contains(body, `"bytes":32`) {
+		t.Fatalf("result missing bytes: %s", body)
+	}
+}
+
+func TestAttachmentReadDownloadReturnsRawImageContent(t *testing.T) {
+	const uuid = "uuid-1"
+	payload := []byte{0, 1, 2, 250}
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != "/attachments/"+uuid {
+			http.NotFound(w, r)
+			return
+		}
+		w.Header().Set("Content-Type", "image/png")
+		_, _ = w.Write(payload)
+	}))
+	defer server.Close()
+
+	originalHost := flag.Host
+	originalLimit := flag.MaxInlineAttachmentBytes
+	flag.Host = server.URL
+	flag.MaxInlineAttachmentBytes = len(payload)
+	defer func() {
+		flag.Host = originalHost
+		flag.MaxInlineAttachmentBytes = originalLimit
+	}()
+
+	result, err := attachmentReadFn(context.Background(), map[string]any{
+		"method":          "download",
+		"owner":           "octo",
+		"repo":            "demo",
+		"attachment_uuid": uuid,
+	})
+	if err != nil {
+		t.Fatalf("attachmentReadFn() error = %v", err)
+	}
+	if len(result.Content) != 2 {
+		t.Fatalf("content count = %d, want 2", len(result.Content))
+	}
+	if _, ok := result.Content[0].(*mcp.TextContent); !ok {
+		t.Fatalf("first content type = %T, want *mcp.TextContent", result.Content[0])
+	}
+	image, ok := result.Content[1].(*mcp.ImageContent)
+	if !ok {
+		t.Fatalf("second content type = %T, want *mcp.ImageContent", result.Content[1])
+	}
+	if image.MIMEType != "image/png" {
+		t.Errorf("image MIME type = %q, want image/png", image.MIMEType)
+	}
+	if !bytes.Equal(image.Data, payload) {
+		t.Errorf("image data = %v, want raw payload %v", image.Data, payload)
+	}
+	wire, err := json.Marshal(image)
+	if err != nil {
+		t.Fatalf("json.Marshal() error = %v", err)
+	}
+	wantBase64 := base64.StdEncoding.EncodeToString(payload)
+	if !strings.Contains(string(wire), `"data":"`+wantBase64+`"`) {
+		t.Errorf("wire image = %s, want base64 data %q", wire, wantBase64)
+	}
+}

operation/issue/issue.go

@@ -13,8 +13,7 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
 // issueWithAssets / commentWithAssets wrap the SDK types to capture the
@@ -29,7 +28,7 @@ type commentWithAssets struct {
 	Assets []*gitea_sdk.Attachment `json:"assets"`
 }
 
-var Tool = tool.New()
+var Tool = tool.New("issue")
 
 const (
 	ListRepoIssuesToolName = "list_issues"
@@ -38,125 +37,123 @@ const (
 )
 
 var (
-	ListRepoIssuesTool = mcp.NewTool(
+	ListRepoIssuesTool = tool.NewDefinition(
 		ListRepoIssuesToolName,
-		mcp.WithDescription("List issues in a repository (or pull requests, via the 'type' filter), filterable by state, labels, milestones, and update time range."),
+		"List issues in a repository (or pull requests, via the 'type' filter), filterable by state, labels, milestones, and update time range.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("List repository issues")),
+		annotation.ReadOnly("List repository issues"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("state", mcp.DefaultString("all")),
+		tool.String("state", tool.Default("all")),
-		mcp.WithString("type", mcp.Description("issues or pulls"), mcp.Enum("issues", "pulls")),
+		tool.String("type", tool.Description("issues or pulls"), tool.Enum("issues", "pulls")),
-		mcp.WithArray("labels", mcp.Description("label name filter"), mcp.Items(map[string]any{"type": "string"})),
+		tool.Array("labels", tool.Description("label name filter"), tool.Items(map[string]any{"type": "string"})),
-		mcp.WithArray("milestones", mcp.Description("milestone name or ID filter"), mcp.Items(map[string]any{"type": "string"})),
+		tool.Array("milestones", tool.Description("milestone name or ID filter"), tool.Items(map[string]any{"type": "string"})),
-		mcp.WithString("since", mcp.Description("updated after ISO 8601")),
+		tool.String("since", tool.Description("updated after ISO 8601")),
-		mcp.WithString("before", mcp.Description("updated before ISO 8601")),
+		tool.String("before", tool.Description("updated before ISO 8601")),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30)),
 	)
 
-	IssueReadTool = mcp.NewTool(
+	IssueReadTool = tool.NewDefinition(
 		IssueReadToolName,
-		mcp.WithDescription("Read issue: details, comments, or labels."),
+		"Read issue: details, comments, or labels.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Read issue details")),
+		annotation.ReadOnly("Read issue details"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("get", "get_comments", "get_labels")),
+		tool.String("method", tool.Required(), tool.Enum("get", "get_comments", "get_labels")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithNumber("issue_number", mcp.Required()),
+		tool.Number("issue_number", tool.Required()),
 	)
 
-	IssueWriteTool = mcp.NewTool(
+	IssueWriteTool = tool.NewDefinition(
 		IssueWriteToolName,
-		mcp.WithDescription("Write issues: create, update, manage comments and labels."),
+		"Write issues: create, update, manage comments and labels.",
-		mcp.WithToolAnnotation(annotation.Write("Create or update issues, comments, and labels")),
+		annotation.Write("Create or update issues, comments, and labels"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("create", "update", "add_comment", "edit_comment", "add_labels", "remove_label", "replace_labels", "clear_labels")),
+		tool.String("method", tool.Required(), tool.Enum("create", "update", "add_comment", "edit_comment", "add_labels", "remove_label", "replace_labels", "clear_labels")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithNumber("issue_number", mcp.Description("required except for 'create'")),
+		tool.Number("issue_number", tool.Description("required except for 'create'")),
-		mcp.WithString("title", mcp.Description("required for 'create'")),
+		tool.String("title", tool.Description("required for 'create'")),
-		mcp.WithString("body", mcp.Description("required for 'create'/'add_comment'/'edit_comment'")),
+		tool.String("body", tool.Description("required for 'create'/'add_comment'/'edit_comment'")),
-		mcp.WithArray("assignees", mcp.Items(map[string]any{"type": "string"})),
+		tool.Array("assignees", tool.Items(map[string]any{"type": "string"})),
-		mcp.WithNumber("milestone"),
+		tool.Number("milestone"),
-		mcp.WithString("state", mcp.Enum("open", "closed", "all")),
+		tool.String("state", tool.Enum("open", "closed", "all")),
-		mcp.WithNumber("commentID", mcp.Description("for 'edit_comment'")),
+		tool.Number("commentID", tool.Description("for 'edit_comment'")),
-		mcp.WithArray("labels", mcp.Description("label IDs"), mcp.Items(map[string]any{"type": "number"})),
+		tool.Array("labels", tool.Description("label IDs"), tool.Items(map[string]any{"type": "number"})),
-		mcp.WithNumber("label_id", mcp.Description("for 'remove_label'")),
+		tool.Number("label_id", tool.Description("for 'remove_label'")),
-		mcp.WithString("ref", mcp.Description("branch to associate")),
+		tool.String("ref", tool.Description("branch to associate")),
-		mcp.WithString("deadline", mcp.Description("ISO 8601")),
+		tool.String("deadline", tool.Description("ISO 8601")),
-		mcp.WithBoolean("remove_deadline"),
+		tool.Boolean("remove_deadline"),
 	)
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    ListRepoIssuesTool,
 		Handler: listRepoIssuesFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    IssueReadTool,
 		Handler: issueReadFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	Tool.RegisterWrite(tool.ServerTool{
 		Tool:    IssueWriteTool,
 		Handler: issueWriteFn,
 	})
 }
 
-func issueReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func issueReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "get":
-		return getIssueByIndexFn(ctx, req)
+		return getIssueByIndexFn(ctx, args)
 	case "get_comments":
-		return getIssueCommentsByIndexFn(ctx, req)
+		return getIssueCommentsByIndexFn(ctx, args)
 	case "get_labels":
-		return getIssueLabelsFn(ctx, req)
+		return getIssueLabelsFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func issueWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func issueWriteFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "create":
-		return createIssueFn(ctx, req)
+		return createIssueFn(ctx, args)
 	case "update":
-		return editIssueFn(ctx, req)
+		return editIssueFn(ctx, args)
 	case "add_comment":
-		return createIssueCommentFn(ctx, req)
+		return createIssueCommentFn(ctx, args)
 	case "edit_comment":
-		return editIssueCommentFn(ctx, req)
+		return editIssueCommentFn(ctx, args)
 	case "add_labels":
-		return addIssueLabelsFn(ctx, req)
+		return addIssueLabelsFn(ctx, args)
 	case "remove_label":
-		return removeIssueLabelFn(ctx, req)
+		return removeIssueLabelFn(ctx, args)
 	case "replace_labels":
-		return replaceIssueLabelsFn(ctx, req)
+		return replaceIssueLabelsFn(ctx, args)
 	case "clear_labels":
-		return clearIssueLabelsFn(ctx, req)
+		return clearIssueLabelsFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func getIssueByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getIssueByIndexFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "issue_number")
+	index, err := params.GetIndex(args, "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -170,22 +167,22 @@ func getIssueByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	return to.TextResult(m)
 }
 
-func listRepoIssuesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listRepoIssuesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	state, ok := req.GetArguments()["state"].(string)
+	state, ok := args["state"].(string)
 	if !ok {
 		state = "all"
 	}
-	labels := params.GetStringSlice(req.GetArguments(), "labels")
+	labels := params.GetStringSlice(args, "labels")
-	milestones := params.GetStringSlice(req.GetArguments(), "milestones")
+	milestones := params.GetStringSlice(args, "milestones")
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 	opt := gitea_sdk.ListIssueOption{
 		State:      gitea_sdk.StateType(state),
 		Labels:     labels,
@@ -195,16 +192,16 @@ func listRepoIssuesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 			PageSize: pageSize,
 		},
 	}
-	switch req.GetArguments()["type"] {
+	switch args["type"] {
 	case "issues":
 		opt.Type = gitea_sdk.IssueTypeIssue
 	case "pulls":
 		opt.Type = gitea_sdk.IssueTypePull
 	}
-	if t := params.GetOptionalTime(req.GetArguments(), "since"); t != nil {
+	if t := params.GetOptionalTime(args, "since"); t != nil {
 		opt.Since = *t
 	}
-	if t := params.GetOptionalTime(req.GetArguments(), "before"); t != nil {
+	if t := params.GetOptionalTime(args, "before"); t != nil {
 		opt.Before = *t
 	}
 	client, err := gitea.ClientFromContext(ctx)
@@ -218,20 +215,20 @@ func listRepoIssuesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	return to.TextResult(slimIssues(issues))
 }
 
-func createIssueFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func createIssueFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	title, err := params.GetString(req.GetArguments(), "title")
+	title, err := params.GetString(args, "title")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	body, err := params.GetString(req.GetArguments(), "body")
+	body, err := params.GetString(args, "body")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -243,19 +240,19 @@ func createIssueFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolR
 		Title: title,
 		Body:  body,
 	}
-	opt.Assignees = params.GetStringSlice(req.GetArguments(), "assignees")
+	opt.Assignees = params.GetStringSlice(args, "assignees")
-	if val, exists := req.GetArguments()["milestone"]; exists {
+	if val, exists := args["milestone"]; exists {
 		if milestone, ok := params.ToInt64(val); ok {
 			opt.Milestone = milestone
 		}
 	}
-	if labelIDs, err := params.GetInt64Slice(req.GetArguments(), "labels"); err == nil {
+	if labelIDs, err := params.GetInt64Slice(args, "labels"); err == nil {
 		opt.Labels = labelIDs
 	}
-	if ref, ok := req.GetArguments()["ref"].(string); ok {
+	if ref, ok := args["ref"].(string); ok {
 		opt.Ref = ref
 	}
-	opt.Deadline = params.GetOptionalTime(req.GetArguments(), "deadline")
+	opt.Deadline = params.GetOptionalTime(args, "deadline")
 	issue, _, err := client.Issues.CreateIssue(ctx, owner, repo, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("create %v/%v/issue err: %v", owner, repo, err))
@@ -264,20 +261,20 @@ func createIssueFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolR
 	return to.TextResult(slimIssue(issue))
 }
 
-func createIssueCommentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func createIssueCommentFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "issue_number")
+	index, err := params.GetIndex(args, "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	body, err := params.GetString(req.GetArguments(), "body")
+	body, err := params.GetString(args, "body")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -296,21 +293,20 @@ func createIssueCommentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	return to.TextResult(slimComment(issueComment))
 }
 
-func editIssueFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func editIssueFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "issue_number")
+	index, err := params.GetIndex(args, "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 
-	args := req.GetArguments()
 	opt := gitea_sdk.EditIssueOption{
 		Body:           params.GetPresentStringPtr(args, "body"),
 		Ref:            params.GetPresentStringPtr(args, "ref"),
@@ -343,20 +339,20 @@ func editIssueFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRes
 	return to.TextResult(slimIssue(issue))
 }
 
-func editIssueCommentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func editIssueCommentFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	commentID, err := params.GetIndex(req.GetArguments(), "commentID")
+	commentID, err := params.GetIndex(args, "commentID")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	body, err := params.GetString(req.GetArguments(), "body")
+	body, err := params.GetString(args, "body")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -375,16 +371,16 @@ func editIssueCommentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	return to.TextResult(slimComment(issueComment))
 }
 
-func getIssueCommentsByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getIssueCommentsByIndexFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "issue_number")
+	index, err := params.GetIndex(args, "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -402,16 +398,16 @@ func getIssueCommentsByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	return to.TextResult(out)
 }
 
-func getIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getIssueLabelsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "issue_number")
+	index, err := params.GetIndex(args, "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -427,20 +423,20 @@ func getIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	return to.TextResult(slim.Labels(labels))
 }
 
-func addIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func addIssueLabelsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "issue_number")
+	index, err := params.GetIndex(args, "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	labels, err := params.GetInt64Slice(req.GetArguments(), "labels")
+	labels, err := params.GetInt64Slice(args, "labels")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -456,20 +452,20 @@ func addIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	return to.TextResult(slim.Labels(issueLabels))
 }
 
-func replaceIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func replaceIssueLabelsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "issue_number")
+	index, err := params.GetIndex(args, "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	labels, err := params.GetInt64Slice(req.GetArguments(), "labels")
+	labels, err := params.GetInt64Slice(args, "labels")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -485,16 +481,16 @@ func replaceIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	return to.TextResult(slim.Labels(issueLabels))
 }
 
-func clearIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func clearIssueLabelsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "issue_number")
+	index, err := params.GetIndex(args, "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -510,20 +506,20 @@ func clearIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	return to.TextResult("Labels cleared successfully")
 }
 
-func removeIssueLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func removeIssueLabelFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "issue_number")
+	index, err := params.GetIndex(args, "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	labelID, err := params.GetIndex(req.GetArguments(), "label_id")
+	labelID, err := params.GetIndex(args, "label_id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}

operation/issue/issue_test.go

@@ -12,7 +12,7 @@ import (
 
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
 
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 
 func Test_listRepoIssuesFn_filters(t *testing.T) {
@@ -60,20 +60,16 @@ func Test_listRepoIssuesFn_filters(t *testing.T) {
 		flag.Version = origVersion
 	}()
 
-	req := mcp.CallToolRequest{
+	args := map[string]any{
-		Params: mcp.CallToolParams{
+		"owner":      owner,
-			Arguments: map[string]any{
+		"repo":       repo,
-				"owner":      owner,
+		"type":       "issues",
-				"repo":       repo,
+		"labels":     []any{"bug", "enhancement"},
-				"type":       "issues",
+		"milestones": []any{"v1.0", "2"},
-				"labels":     []any{"bug", "enhancement"},
+		"since":      "2026-01-01T00:00:00Z",
-				"milestones": []any{"v1.0", "2"},
-				"since":      "2026-01-01T00:00:00Z",
-			},
-		},
 	}
 
-	_, err := listRepoIssuesFn(context.Background(), req)
+	_, err := listRepoIssuesFn(context.Background(), args)
 	if err != nil {
 		t.Fatalf("listRepoIssuesFn() error = %v", err)
 	}
@@ -126,17 +122,17 @@ func Test_listRepoIssuesFn_includesMilestone(t *testing.T) {
 	flag.Host, flag.Token, flag.Version = server.URL, "", "test"
 	defer func() { flag.Host, flag.Token, flag.Version = origHost, origToken, origVersion }()
 
-	req := mcp.CallToolRequest{Params: mcp.CallToolParams{Arguments: map[string]any{
+	args := map[string]any{
 		"owner": owner, "repo": repo,
-	}}}
+	}
-	res, err := listRepoIssuesFn(context.Background(), req)
+	res, err := listRepoIssuesFn(context.Background(), args)
 	if err != nil {
 		t.Fatalf("listRepoIssuesFn() error = %v", err)
 	}
 	if res.IsError {
 		t.Fatalf("unexpected error result: %v", res.Content)
 	}
-	body := res.Content[0].(mcp.TextContent).Text
+	body := res.Content[0].(*mcp.TextContent).Text
 	if !strings.Contains(body, `"milestone"`) || !strings.Contains(body, `"v1.0"`) {
 		t.Fatalf("expected milestone in list output, got: %s", body)
 	}
@@ -189,20 +185,16 @@ func Test_createIssueFn_labels(t *testing.T) {
 		flag.Version = origVersion
 	}()
 
-	req := mcp.CallToolRequest{
+	args := map[string]any{
-		Params: mcp.CallToolParams{
+		"owner":    owner,
-			Arguments: map[string]any{
+		"repo":     repo,
-				"owner":    owner,
+		"title":    "test issue",
-				"repo":     repo,
+		"body":     "body",
-				"title":    "test issue",
+		"labels":   []any{float64(10), float64(20)},
-				"body":     "body",
+		"deadline": "2026-06-01T00:00:00Z",
-				"labels":   []any{float64(10), float64(20)},
-				"deadline": "2026-06-01T00:00:00Z",
-			},
-		},
 	}
 
-	_, err := createIssueFn(context.Background(), req)
+	_, err := createIssueFn(context.Background(), args)
 	if err != nil {
 		t.Fatalf("createIssueFn() error = %v", err)
 	}
@@ -255,17 +247,17 @@ func Test_getIssueByIndexFn_includesAttachments(t *testing.T) {
 	flag.Host, flag.Token, flag.Version = server.URL, "", "test"
 	defer func() { flag.Host, flag.Token, flag.Version = origHost, origToken, origVersion }()
 
-	req := mcp.CallToolRequest{Params: mcp.CallToolParams{Arguments: map[string]any{
+	args := map[string]any{
 		"owner": owner, "repo": repo, "issue_number": float64(42),
-	}}}
+	}
-	res, err := getIssueByIndexFn(context.Background(), req)
+	res, err := getIssueByIndexFn(context.Background(), args)
 	if err != nil {
 		t.Fatalf("getIssueByIndexFn() error = %v", err)
 	}
 	if res.IsError {
 		t.Fatalf("unexpected error result: %v", res.Content)
 	}
-	body := res.Content[0].(mcp.TextContent).Text
+	body := res.Content[0].(*mcp.TextContent).Text
 	if !strings.Contains(body, `[shot.png](https://example/shot.png)`) {
 		t.Fatalf("expected attachment markdown inlined in body, got: %s", body)
 	}
@@ -304,17 +296,17 @@ func Test_getIssueCommentsByIndexFn_includesAttachments(t *testing.T) {
 	flag.Host, flag.Token, flag.Version = server.URL, "", "test"
 	defer func() { flag.Host, flag.Token, flag.Version = origHost, origToken, origVersion }()
 
-	req := mcp.CallToolRequest{Params: mcp.CallToolParams{Arguments: map[string]any{
+	args := map[string]any{
 		"owner": owner, "repo": repo, "issue_number": float64(7),
-	}}}
+	}
-	res, err := getIssueCommentsByIndexFn(context.Background(), req)
+	res, err := getIssueCommentsByIndexFn(context.Background(), args)
 	if err != nil {
 		t.Fatalf("getIssueCommentsByIndexFn() error = %v", err)
 	}
 	if res.IsError {
 		t.Fatalf("unexpected error result: %v", res.Content)
 	}
-	body := res.Content[0].(mcp.TextContent).Text
+	body := res.Content[0].(*mcp.TextContent).Text
 	if !strings.Contains(body, `[log.txt](https://example/log.txt)`) {
 		t.Fatalf("expected attachment markdown inlined in body, got: %s", body)
 	}

operation/label/label.go

@@ -12,11 +12,10 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("label")
 
 const (
 	LabelReadToolName  = "label_read"
@@ -24,99 +23,97 @@ const (
 )
 
 var (
-	LabelReadTool = mcp.NewTool(
+	LabelReadTool = tool.NewDefinition(
 		LabelReadToolName,
-		mcp.WithDescription("Read repo or org labels."),
+		"Read repo or org labels.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Read labels")),
+		annotation.ReadOnly("Read labels"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("list_repo_labels", "get_repo_label", "list_org_labels")),
+		tool.String("method", tool.Required(), tool.Enum("list_repo_labels", "get_repo_label", "list_org_labels")),
-		mcp.WithString("owner", mcp.Description("for repo methods")),
+		tool.String("owner", tool.Description("for repo methods")),
-		mcp.WithString("repo", mcp.Description("for repo methods")),
+		tool.String("repo", tool.Description("for repo methods")),
-		mcp.WithString("org", mcp.Description("for org methods")),
+		tool.String("org", tool.Description("for org methods")),
-		mcp.WithNumber("id", mcp.Description("label ID (for 'get_repo_label')")),
+		tool.Number("id", tool.Description("label ID (for 'get_repo_label')")),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30)),
 	)
 
-	LabelWriteTool = mcp.NewTool(
+	LabelWriteTool = tool.NewDefinition(
 		LabelWriteToolName,
-		mcp.WithDescription("Write labels (repo or org): create, edit, delete."),
+		"Write labels (repo or org): create, edit, delete.",
-		mcp.WithToolAnnotation(annotation.Destructive("Create, update, or delete labels")),
+		annotation.Destructive("Create, update, or delete labels"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("create_repo_label", "edit_repo_label", "delete_repo_label", "create_org_label", "edit_org_label", "delete_org_label")),
+		tool.String("method", tool.Required(), tool.Enum("create_repo_label", "edit_repo_label", "delete_repo_label", "create_org_label", "edit_org_label", "delete_org_label")),
-		mcp.WithString("owner", mcp.Description("for repo methods")),
+		tool.String("owner", tool.Description("for repo methods")),
-		mcp.WithString("repo", mcp.Description("for repo methods")),
+		tool.String("repo", tool.Description("for repo methods")),
-		mcp.WithString("org", mcp.Description("for org methods")),
+		tool.String("org", tool.Description("for org methods")),
-		mcp.WithNumber("id", mcp.Description("for edit/delete")),
+		tool.Number("id", tool.Description("for edit/delete")),
-		mcp.WithString("name", mcp.Description("required for create")),
+		tool.String("name", tool.Description("required for create")),
-		mcp.WithString("color", mcp.Description("hex (#RRGGBB); required for create")),
+		tool.String("color", tool.Description("hex (#RRGGBB); required for create")),
-		mcp.WithString("description"),
+		tool.String("description"),
-		mcp.WithBoolean("exclusive", mcp.Description("exclusive (org only)")),
+		tool.Boolean("exclusive", tool.Description("exclusive (org only)")),
-		mcp.WithBoolean("is_archived", mcp.Description("archived (repo only)")),
+		tool.Boolean("is_archived", tool.Description("archived (repo only)")),
 	)
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    LabelReadTool,
 		Handler: labelReadFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	Tool.RegisterWrite(tool.ServerTool{
 		Tool:    LabelWriteTool,
 		Handler: labelWriteFn,
 	})
 }
 
-func labelReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func labelReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "list_repo_labels":
-		return listRepoLabelsFn(ctx, req)
+		return listRepoLabelsFn(ctx, args)
 	case "get_repo_label":
-		return getRepoLabelFn(ctx, req)
+		return getRepoLabelFn(ctx, args)
 	case "list_org_labels":
-		return listOrgLabelsFn(ctx, req)
+		return listOrgLabelsFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func labelWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func labelWriteFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "create_repo_label":
-		return createRepoLabelFn(ctx, req)
+		return createRepoLabelFn(ctx, args)
 	case "edit_repo_label":
-		return editRepoLabelFn(ctx, req)
+		return editRepoLabelFn(ctx, args)
 	case "delete_repo_label":
-		return deleteRepoLabelFn(ctx, req)
+		return deleteRepoLabelFn(ctx, args)
 	case "create_org_label":
-		return createOrgLabelFn(ctx, req)
+		return createOrgLabelFn(ctx, args)
 	case "edit_org_label":
-		return editOrgLabelFn(ctx, req)
+		return editOrgLabelFn(ctx, args)
 	case "delete_org_label":
-		return deleteOrgLabelFn(ctx, req)
+		return deleteOrgLabelFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func listRepoLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listRepoLabelsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 
 	opt := gitea_sdk.ListLabelsOptions{
 		ListOptions: gitea_sdk.ListOptions{
@@ -135,16 +132,16 @@ func listRepoLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	return to.TextResult(slim.Labels(labels))
 }
 
-func getRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getRepoLabelFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	id, err := params.GetIndex(req.GetArguments(), "id")
+	id, err := params.GetIndex(args, "id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -160,26 +157,26 @@ func getRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	return to.TextResult(slim.Label(label))
 }
 
-func createRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func createRepoLabelFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	name, err := params.GetString(req.GetArguments(), "name")
+	name, err := params.GetString(args, "name")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	color, err := params.GetString(req.GetArguments(), "color")
+	color, err := params.GetString(args, "color")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	description, _ := req.GetArguments()["description"].(string) // Optional
+	description, _ := args["description"].(string) // Optional
 
-	isArchived, _ := req.GetArguments()["is_archived"].(bool)
+	isArchived, _ := args["is_archived"].(bool)
 
 	opt := gitea_sdk.CreateLabelOption{
 		Name:        name,
@@ -199,21 +196,20 @@ func createRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	return to.TextResult(slim.Label(label))
 }
 
-func editRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func editRepoLabelFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	id, err := params.GetIndex(req.GetArguments(), "id")
+	id, err := params.GetIndex(args, "id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 
-	args := req.GetArguments()
 	opt := gitea_sdk.EditLabelOption{
 		Name:        params.GetOptionalStringPtr(args, "name"),
 		Color:       params.GetOptionalStringPtr(args, "color"),
@@ -232,16 +228,16 @@ func editRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	return to.TextResult(slim.Label(label))
 }
 
-func deleteRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func deleteRepoLabelFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	id, err := params.GetIndex(req.GetArguments(), "id")
+	id, err := params.GetIndex(args, "id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -257,12 +253,12 @@ func deleteRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	return to.TextResult("Label deleted successfully")
 }
 
-func listOrgLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listOrgLabelsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	org, err := params.GetString(req.GetArguments(), "org")
+	org, err := params.GetString(args, "org")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 
 	opt := gitea_sdk.ListOrgLabelsOptions{
 		ListOptions: gitea_sdk.ListOptions{
@@ -281,21 +277,21 @@ func listOrgLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	return to.TextResult(slim.Labels(labels))
 }
 
-func createOrgLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func createOrgLabelFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	org, err := params.GetString(req.GetArguments(), "org")
+	org, err := params.GetString(args, "org")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	name, err := params.GetString(req.GetArguments(), "name")
+	name, err := params.GetString(args, "name")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	color, err := params.GetString(req.GetArguments(), "color")
+	color, err := params.GetString(args, "color")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	description, _ := req.GetArguments()["description"].(string)
+	description, _ := args["description"].(string)
-	exclusive, _ := req.GetArguments()["exclusive"].(bool)
+	exclusive, _ := args["exclusive"].(bool)
 
 	opt := gitea_sdk.CreateOrgLabelOption{
 		Name:        name,
@@ -315,17 +311,16 @@ func createOrgLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	return to.TextResult(slim.Label(label))
 }
 
-func editOrgLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func editOrgLabelFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	org, err := params.GetString(req.GetArguments(), "org")
+	org, err := params.GetString(args, "org")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	id, err := params.GetIndex(req.GetArguments(), "id")
+	id, err := params.GetIndex(args, "id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 
-	args := req.GetArguments()
 	opt := gitea_sdk.EditOrgLabelOption{
 		Name:        params.GetOptionalStringPtr(args, "name"),
 		Color:       params.GetOptionalStringPtr(args, "color"),
@@ -344,12 +339,12 @@ func editOrgLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	return to.TextResult(slim.Label(label))
 }
 
-func deleteOrgLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func deleteOrgLabelFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	org, err := params.GetString(req.GetArguments(), "org")
+	org, err := params.GetString(args, "org")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	id, err := params.GetIndex(req.GetArguments(), "id")
+	id, err := params.GetIndex(args, "id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}

operation/milestone/milestone.go

@@ -11,11 +11,10 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("milestone")
 
 const (
 	MilestoneReadToolName  = "milestone_read"
@@ -23,90 +22,90 @@ const (
 )
 
 var (
-	MilestoneReadTool = mcp.NewTool(
+	MilestoneReadTool = tool.NewDefinition(
 		MilestoneReadToolName,
-		mcp.WithDescription("Read milestones: get one or list."),
+		"Read milestones: get one or list.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Read milestones")),
+		annotation.ReadOnly("Read milestones"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("get", "list")),
+		tool.String("method", tool.Required(), tool.Enum("get", "list")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithNumber("id", mcp.Description("for 'get'")),
+		tool.Number("id", tool.Description("for 'get'")),
-		mcp.WithString("state", mcp.DefaultString("all")),
+		tool.String("state", tool.Default("all")),
-		mcp.WithString("name", mcp.Description("name filter (for 'list')")),
+		tool.String("name", tool.Description("name filter (for 'list')")),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30)),
 	)
 
-	MilestoneWriteTool = mcp.NewTool(
+	MilestoneWriteTool = tool.NewDefinition(
 		MilestoneWriteToolName,
-		mcp.WithDescription("Write milestones: create, update, delete."),
+		"Write milestones: create, update, delete.",
-		mcp.WithToolAnnotation(annotation.Destructive("Create, update, or delete milestones")),
+		annotation.Destructive("Create, update, or delete milestones"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("create", "update", "edit", "delete")),
+		tool.String("method", tool.Required(), tool.Enum("create", "update", "edit", "delete")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithNumber("id", mcp.Description("for 'update'/'delete'")),
+		tool.Number("id", tool.Description("for 'update'/'delete'")),
-		mcp.WithString("title", mcp.Description("for 'create'")),
+		tool.String("title", tool.Description("for 'create'")),
-		mcp.WithString("description"),
+		tool.String("description"),
-		mcp.WithString("due_on", mcp.Description("due date")),
+		tool.String("due_on", tool.Description("due date")),
-		mcp.WithString("state", mcp.Enum("open", "closed")),
+		tool.String("state", tool.Enum("open", "closed")),
 	)
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    MilestoneReadTool,
 		Handler: milestoneReadFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	Tool.RegisterWrite(tool.ServerTool{
 		Tool:    MilestoneWriteTool,
 		Handler: milestoneWriteFn,
 	})
 }
 
-func milestoneReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func milestoneReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	method, err := params.GetString(req.GetArguments(), "method")
+	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "get":
-		return getMilestoneFn(ctx, req)
+		return getMilestoneFn(ctx, args)
 	case "list":
-		return listMilestonesFn(ctx, req)
+		return listMilestonesFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func milestoneWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func milestoneWriteFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	method, err := params.GetString(req.GetArguments(), "method")
+	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "create":
-		return createMilestoneFn(ctx, req)
+		return createMilestoneFn(ctx, args)
 	case "update":
-		return editMilestoneFn(ctx, req)
+		return editMilestoneFn(ctx, args)
 	case "edit":
-		return editMilestoneFn(ctx, req)
+		return editMilestoneFn(ctx, args)
 	case "delete":
-		return deleteMilestoneFn(ctx, req)
+		return deleteMilestoneFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func getMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getMilestoneFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	id, err := params.GetIndex(req.GetArguments(), "id")
+	id, err := params.GetIndex(args, "id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -122,18 +121,18 @@ func getMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	return to.TextResult(slimMilestone(milestone))
 }
 
-func listMilestonesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listMilestonesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	state := params.GetOptionalString(req.GetArguments(), "state", "all")
+	state := params.GetOptionalString(args, "state", "all")
-	name := params.GetOptionalString(req.GetArguments(), "name", "")
+	name := params.GetOptionalString(args, "name", "")
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 	opt := gitea_sdk.ListMilestoneOption{
 		State: gitea_sdk.StateType(state),
 		Name:  name,
@@ -153,16 +152,16 @@ func listMilestonesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	return to.TextResult(slimMilestones(milestones))
 }
 
-func createMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func createMilestoneFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	title, err := params.GetString(req.GetArguments(), "title")
+	title, err := params.GetString(args, "title")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -171,11 +170,11 @@ func createMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 		Title: title,
 	}
 
-	description, ok := req.GetArguments()["description"].(string)
+	description, ok := args["description"].(string)
 	if ok {
 		opt.Description = description
 	}
-	opt.Deadline = params.GetOptionalTime(req.GetArguments(), "due_on")
+	opt.Deadline = params.GetOptionalTime(args, "due_on")
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -189,21 +188,20 @@ func createMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	return to.TextResult(slimMilestone(milestone))
 }
 
-func editMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func editMilestoneFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	id, err := params.GetIndex(req.GetArguments(), "id")
+	id, err := params.GetIndex(args, "id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 
-	args := req.GetArguments()
 	opt := gitea_sdk.EditMilestoneOption{
 		Description: params.GetPresentStringPtr(args, "description"),
 		Deadline:    params.GetOptionalTime(args, "due_on"),
@@ -228,16 +226,16 @@ func editMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	return to.TextResult(slimMilestone(milestone))
 }
 
-func deleteMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func deleteMilestoneFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	id, err := params.GetIndex(req.GetArguments(), "id")
+	id, err := params.GetIndex(args, "id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}

operation/milestone/milestone_test.go

@@ -12,7 +12,7 @@ import (
 
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
 
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 
 func Test_milestoneWriteFn_dueOn(t *testing.T) {
@@ -56,7 +56,7 @@ func Test_milestoneWriteFn_dueOn(t *testing.T) {
 
 	cases := []struct {
 		name   string
-		fn     func(context.Context, mcp.CallToolRequest) (*mcp.CallToolResult, error)
+		fn     func(context.Context, map[string]any) (*mcp.CallToolResult, error)
 		method string
 		extra  map[string]any
 	}{
@@ -69,7 +69,7 @@ func Test_milestoneWriteFn_dueOn(t *testing.T) {
 			a := map[string]any{}
 			maps.Copy(a, args)
 			maps.Copy(a, tc.extra)
-			res, err := tc.fn(context.Background(), mcp.CallToolRequest{Params: mcp.CallToolParams{Arguments: a}})
+			res, err := tc.fn(context.Background(), a)
 			if err != nil || res.IsError {
 				t.Fatalf("%s err=%v result=%v", tc.name, err, res)
 			}

operation/notification/notification.go

@@ -12,11 +12,10 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("notification")
 
 const (
 	NotificationReadToolName  = "notification_read"
@@ -24,79 +23,76 @@ const (
 )
 
 var (
-	NotificationReadTool = mcp.NewTool(
+	NotificationReadTool = tool.NewDefinition(
 		NotificationReadToolName,
-		mcp.WithDescription("Read notifications: list (optionally scoped to a repo) or get a thread by ID."),
+		"Read notifications: list (optionally scoped to a repo) or get a thread by ID.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Read notifications")),
+		annotation.ReadOnly("Read notifications"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("list", "get")),
+		tool.String("method", tool.Required(), tool.Enum("list", "get")),
-		mcp.WithString("owner", mcp.Description("scope 'list' to a repo")),
+		tool.String("owner", tool.Description("scope 'list' to a repo")),
-		mcp.WithString("repo", mcp.Description("scope 'list' to a repo")),
+		tool.String("repo", tool.Description("scope 'list' to a repo")),
-		mcp.WithNumber("id", mcp.Description("thread ID (for 'get')")),
+		tool.Number("id", tool.Description("thread ID (for 'get')")),
-		mcp.WithString("status", mcp.Enum("unread", "read", "pinned")),
+		tool.String("status", tool.Enum("unread", "read", "pinned")),
-		mcp.WithString("subject_type", mcp.Enum("Issue", "Pull", "Commit", "Repository")),
+		tool.String("subject_type", tool.Enum("Issue", "Pull", "Commit", "Repository")),
-		mcp.WithString("since", mcp.Description("updated after ISO 8601")),
+		tool.String("since", tool.Description("updated after ISO 8601")),
-		mcp.WithString("before", mcp.Description("updated before ISO 8601")),
+		tool.String("before", tool.Description("updated before ISO 8601")),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30)),
 	)
 
-	NotificationWriteTool = mcp.NewTool(
+	NotificationWriteTool = tool.NewDefinition(
 		NotificationWriteToolName,
-		mcp.WithDescription("Mark a notification or all notifications as read."),
+		"Mark a notification or all notifications as read.",
-		mcp.WithToolAnnotation(annotation.Write("Manage notifications")),
+		annotation.Write("Manage notifications"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("mark_read", "mark_all_read")),
+		tool.String("method", tool.Required(), tool.Enum("mark_read", "mark_all_read")),
-		mcp.WithNumber("id", mcp.Description("thread ID (for 'mark_read')")),
+		tool.Number("id", tool.Description("thread ID (for 'mark_read')")),
-		mcp.WithString("owner", mcp.Description("scope 'mark_all_read' to a repo")),
+		tool.String("owner", tool.Description("scope 'mark_all_read' to a repo")),
-		mcp.WithString("repo", mcp.Description("scope 'mark_all_read' to a repo")),
+		tool.String("repo", tool.Description("scope 'mark_all_read' to a repo")),
-		mcp.WithString("last_read_at", mcp.Description("ISO 8601; defaults to now")),
+		tool.String("last_read_at", tool.Description("ISO 8601; defaults to now")),
 	)
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    NotificationReadTool,
 		Handler: notificationReadFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	Tool.RegisterWrite(tool.ServerTool{
 		Tool:    NotificationWriteTool,
 		Handler: notificationWriteFn,
 	})
 }
 
-func notificationReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func notificationReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "list":
-		return listNotificationsFn(ctx, req)
+		return listNotificationsFn(ctx, args)
 	case "get":
-		return getNotificationFn(ctx, req)
+		return getNotificationFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func notificationWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func notificationWriteFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "mark_read":
-		return markNotificationReadFn(ctx, req)
+		return markNotificationReadFn(ctx, args)
 	case "mark_all_read":
-		return markAllNotificationsReadFn(ctx, req)
+		return markAllNotificationsReadFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func listNotificationsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listNotificationsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	page, pageSize := params.GetPagination(args, 30)
 	opt := gitea_sdk.ListNotificationOptions{
 		ListOptions: gitea_sdk.ListOptions{
@@ -139,8 +135,8 @@ func listNotificationsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Cal
 	return to.TextResult(slimThreads(threads))
 }
 
-func getNotificationFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getNotificationFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	id, err := params.GetIndex(req.GetArguments(), "id")
+	id, err := params.GetIndex(args, "id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -155,8 +151,8 @@ func getNotificationFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	return to.TextResult(slimThread(thread))
 }
 
-func markNotificationReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func markNotificationReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	id, err := params.GetIndex(req.GetArguments(), "id")
+	id, err := params.GetIndex(args, "id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -174,8 +170,7 @@ func markNotificationReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 	return to.TextResult("Notification marked as read")
 }
 
-func markAllNotificationsReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func markAllNotificationsReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	lastReadAt := time.Now()
 	if t := params.GetOptionalTime(args, "last_read_at"); t != nil {
 		lastReadAt = *t

operation/operation.go

@@ -29,24 +29,40 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	"github.com/mark3labs/mcp-go/server"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 
+// maxRequestBodyBytes raises the SDK's 4 MiB default, which is too tight for the
+// base64 file content create_or_update_file accepts.
+const maxRequestBodyBytes = 32 << 20
+
+// sessionTimeout expires idle sessions, which the SDK otherwise keeps for the
+// process lifetime: a client that goes away without DELETE /mcp leaks its
+// session, and initialize takes no token. Clients re-initialize on the 404.
+const sessionTimeout = 30 * time.Minute
+
+// httpReadHeaderTimeout bounds slow header reads without limiting SSE writes.
+const httpReadHeaderTimeout = 10 * time.Second
+
 var (
-	mcpServer *server.MCPServer
+	mcpServer *mcp.Server
 
 	domainTools = []*tool.Tool{
 		user.Tool, actions.Tool, repo.Tool, notification.Tool, issue.Tool,
 		label.Tool, milestone.Tool, packages.Tool, pull.Tool, search.Tool,
 		version.Tool, wiki.Tool, timetracking.Tool,
+		repo.FileTool, repo.BranchTool, repo.TagTool, repo.CommitTool, repo.ReleaseTool,
 	}
 )
 
-func RegisterTool(s *server.MCPServer) {
+func RegisterTool(s *mcp.Server) {
 	for _, t := range domainTools {
-		s.AddTools(t.Tools()...)
+		for _, registeredTool := range t.Tools() {
+			s.AddTool(registeredTool.Tool, registeredTool.MCPHandler())
+		}
 	}
 	tool.WarnUnmatchedAllowedTools(domainTools...)
+	tool.WarnUnmatchedAllowedScopes(domainTools...)
 }
 
 // parseAuthToken extracts the token from an Authorization header.
@@ -69,8 +85,7 @@ func parseAuthToken(authHeader string) (string, bool) {
 	return "", false
 }
 
-func getContextWithToken(ctx context.Context, r *http.Request) context.Context {
+func getContextWithToken(ctx context.Context, authHeader string) context.Context {
-	authHeader := r.Header.Get("Authorization")
 	if authHeader == "" {
 		return ctx
 	}
@@ -83,23 +98,43 @@ func getContextWithToken(ctx context.Context, r *http.Request) context.Context {
 	return context.WithValue(ctx, mcpContext.TokenContextKey, token)
 }
 
+func authTokenMiddleware(next mcp.MethodHandler) mcp.MethodHandler {
+	return func(ctx context.Context, method string, req mcp.Request) (mcp.Result, error) {
+		if extra := req.GetExtra(); extra != nil {
+			ctx = getContextWithToken(ctx, extra.Header.Get("Authorization"))
+		}
+		return next(ctx, method, req)
+	}
+}
+
+func newHTTPServer(addr string, s *mcp.Server) *http.Server {
+	mux := http.NewServeMux()
+	mux.Handle("/mcp", mcp.NewStreamableHTTPHandler(
+		func(*http.Request) *mcp.Server { return s },
+		&mcp.StreamableHTTPOptions{
+			Logger:              log.Slog(),
+			MaxRequestBodyBytes: maxRequestBodyBytes,
+			Stateless:           false, // SessionTimeout requires stateful sessions.
+			SessionTimeout:      sessionTimeout,
+		},
+	))
+	return &http.Server{
+		Addr:              addr,
+		Handler:           mux,
+		ReadHeaderTimeout: httpReadHeaderTimeout,
+	}
+}
+
 func Run() error {
 	mcpServer = newMCPServer(flag.Version)
 	RegisterTool(mcpServer)
 	switch flag.Mode {
 	case "stdio":
-		if err := server.ServeStdio(
+		if err := mcpServer.Run(context.Background(), &mcp.StdioTransport{}); err != nil {
-			mcpServer,
-		); err != nil {
 			return err
 		}
 	case "http":
-		httpServer := server.NewStreamableHTTPServer(
+		httpServer := newHTTPServer(fmt.Sprintf(":%d", flag.Port), mcpServer)
-			mcpServer,
-			server.WithStreamableHTTPLogger(log.Slog()),
-			server.WithHeartbeatInterval(30*time.Second),
-			server.WithHTTPContextFunc(getContextWithToken),
-		)
 		log.Infof("Gitea MCP HTTP server listening on :%d", flag.Port)
 
 		// Graceful shutdown setup
@@ -118,7 +153,7 @@ func Run() error {
 			close(shutdownDone)
 		}()
 
-		if err := httpServer.Start(fmt.Sprintf(":%d", flag.Port)); err != nil && !errors.Is(err, http.ErrServerClosed) {
+		if err := httpServer.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
 			return err
 		}
 		<-shutdownDone // Wait for shutdown to finish
@@ -128,12 +163,16 @@ func Run() error {
 	return nil
 }
 
-func newMCPServer(version string) *server.MCPServer {
+func newMCPServer(version string) *mcp.Server {
-	return server.NewMCPServer(
+	// SDK keepalives send MCP ping requests and disconnect clients without a
-		"Gitea MCP Server",
+	// server-to-client channel, so KeepAlive stays disabled.
-		version,
+	s := mcp.NewServer(
-		server.WithToolCapabilities(true),
+		&mcp.Implementation{
-		server.WithLogging(),
+			Name:    "Gitea MCP Server",
-		server.WithRecovery(),
+			Version: version,
+		},
+		&mcp.ServerOptions{Logger: log.Slog()},
 	)
+	s.AddReceivingMiddleware(authTokenMiddleware)
+	return s
 }

operation/operation_test.go

@@ -1,34 +1,20 @@
 package operation
 
-import (
+import "testing"
-	"testing"
 
-	"gitea.com/gitea/gitea-mcp/pkg/flag"
+func TestNewHTTPServerConfig(t *testing.T) {
-)
+	server := newHTTPServer(":12345", newMCPServer("test"))
-
+	if server.Addr != ":12345" {
-// TestAllToolsHaveDescriptions ensures every registered tool sets a non-empty
+		t.Errorf("Addr = %q, want %q", server.Addr, ":12345")
-// Tool.Description. mcp-go only serializes the "description" field of a tool
-// when it is non-empty, so an omitted description makes strict MCP clients
-// (e.g. mcp-probe) reject the tools/list response with "missing field
-// `description`".
-func TestAllToolsHaveDescriptions(t *testing.T) {
-	origRO, origAllow := flag.ReadOnly, flag.AllowedTools
-	t.Cleanup(func() {
-		flag.ReadOnly, flag.AllowedTools = origRO, origAllow
-	})
-	flag.ReadOnly = false
-	flag.AllowedTools = nil
-
-	var missing []string
-	for _, d := range domainTools {
-		for _, st := range d.Tools() {
-			if st.Tool.Description == "" {
-				missing = append(missing, st.Tool.Name)
-			}
-		}
 	}
-	if len(missing) > 0 {
+	if server.Handler == nil {
-		t.Errorf("tools missing a description: %v", missing)
+		t.Error("Handler is nil")
+	}
+	if server.ReadHeaderTimeout != httpReadHeaderTimeout {
+		t.Errorf("ReadHeaderTimeout = %v, want %v", server.ReadHeaderTimeout, httpReadHeaderTimeout)
+	}
+	if server.WriteTimeout != 0 {
+		t.Errorf("WriteTimeout = %v, want zero for SSE", server.WriteTimeout)
 	}
 }
 

operation/packages/packages.go

@@ -13,11 +13,10 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("packages")
 
 const (
 	PackageReadToolName  = "package_read"
@@ -25,70 +24,68 @@ const (
 )
 
 var (
-	PackageReadTool = mcp.NewTool(
+	PackageReadTool = tool.NewDefinition(
 		PackageReadToolName,
-		mcp.WithToolAnnotation(annotation.ReadOnly("Read package registry")),
+		"Read package registry: list packages (one entry per version, filter via 'q'/'type'), list versions, or get a version.",
-		mcp.WithDescription("Read package registry: list packages (one entry per version, filter via 'q'/'type'), list versions, or get a version."),
+		annotation.ReadOnly("Read package registry"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("list", "list_versions", "get")),
+		tool.String("method", tool.Required(), tool.Enum("list", "list_versions", "get")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("user or org")),
+		tool.String("owner", tool.Required(), tool.Description("user or org")),
-		mcp.WithString("type", mcp.Description("container/npm/maven/pypi/cargo/generic; required except 'list'")),
+		tool.String("type", tool.Description("container/npm/maven/pypi/cargo/generic; required except 'list'")),
-		mcp.WithString("name", mcp.Description("slashes auto-encoded; required except 'list'")),
+		tool.String("name", tool.Description("slashes auto-encoded; required except 'list'")),
-		mcp.WithString("version", mcp.Description("for 'get'")),
+		tool.String("version", tool.Description("for 'get'")),
-		mcp.WithString("q", mcp.Description("search query")),
+		tool.String("q", tool.Description("search query")),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1), tool.Minimum(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30), mcp.Min(1)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30), tool.Minimum(1)),
 	)
 
-	PackageWriteTool = mcp.NewTool(
+	PackageWriteTool = tool.NewDefinition(
 		PackageWriteToolName,
-		mcp.WithToolAnnotation(annotation.Destructive("Delete a package version")),
+		"Delete a package version (irreversible).",
-		mcp.WithDescription("Delete a package version (irreversible)."),
+		annotation.Destructive("Delete a package version"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("delete")),
+		tool.String("method", tool.Required(), tool.Enum("delete")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("user or org")),
+		tool.String("owner", tool.Required(), tool.Description("user or org")),
-		mcp.WithString("type", mcp.Required(), mcp.Description("container/npm/maven/pypi/cargo/generic")),
+		tool.String("type", tool.Required(), tool.Description("container/npm/maven/pypi/cargo/generic")),
-		mcp.WithString("name", mcp.Required(), mcp.Description("slashes auto-encoded")),
+		tool.String("name", tool.Required(), tool.Description("slashes auto-encoded")),
-		mcp.WithString("version", mcp.Required()),
+		tool.String("version", tool.Required()),
 	)
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    PackageReadTool,
 		Handler: packageReadFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	Tool.RegisterWrite(tool.ServerTool{
 		Tool:    PackageWriteTool,
 		Handler: packageWriteFn,
 	})
 }
 
-func packageReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func packageReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "list":
-		return listPackagesFn(ctx, req)
+		return listPackagesFn(ctx, args)
 	case "list_versions":
-		return listPackageVersionsFn(ctx, req)
+		return listPackageVersionsFn(ctx, args)
 	case "get":
-		return getPackageFn(ctx, req)
+		return getPackageFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func packageWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func packageWriteFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "delete":
-		return deletePackageVersionFn(ctx, req)
+		return deletePackageVersionFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
@@ -108,8 +105,7 @@ func escapePackageName(name string) string {
 	return url.PathEscape(name)
 }
 
-func listPackagesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listPackagesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -135,8 +131,7 @@ func listPackagesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	return to.TextResult(slimPackages(result))
 }
 
-func listPackageVersionsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listPackageVersionsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -164,8 +159,7 @@ func listPackageVersionsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.C
 	return to.TextResult(slimPackages(result))
 }
 
-func getPackageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getPackageFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -192,8 +186,7 @@ func getPackageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
 	return to.TextResult(slimPackage(result))
 }
 
-func deletePackageVersionFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func deletePackageVersionFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)

operation/packages/packages_test.go

@@ -11,7 +11,7 @@ import (
 	mcpContext "gitea.com/gitea/gitea-mcp/pkg/context"
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
 
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 
 func TestPackageReadList(t *testing.T) {
@@ -37,13 +37,12 @@ func TestPackageReadList(t *testing.T) {
 	ctx := context.WithValue(context.Background(), mcpContext.TokenContextKey, "test-token")
 
 	t.Run("basic list", func(t *testing.T) {
-		req := mcp.CallToolRequest{}
+		args := map[string]any{
-		req.Params.Arguments = map[string]any{
 			"method": "list",
 			"owner":  "test-org",
 		}
 
-		result, err := packageReadFn(ctx, req)
+		result, err := packageReadFn(ctx, args)
 		if err != nil {
 			t.Fatalf("packageReadFn() error: %v", err)
 		}
@@ -51,7 +50,7 @@ func TestPackageReadList(t *testing.T) {
 			t.Fatal("packageReadFn() returned error result")
 		}
 
-		text := result.Content[0].(mcp.TextContent).Text
+		text := result.Content[0].(*mcp.TextContent).Text
 		var packages []map[string]any
 		if err := json.Unmarshal([]byte(text), &packages); err != nil {
 			t.Fatalf("failed to unmarshal result: %v", err)
@@ -68,15 +67,14 @@ func TestPackageReadList(t *testing.T) {
 	})
 
 	t.Run("with type and query filters", func(t *testing.T) {
-		req := mcp.CallToolRequest{}
+		args := map[string]any{
-		req.Params.Arguments = map[string]any{
 			"method": "list",
 			"owner":  "test-org",
 			"type":   "container",
 			"q":      "myimage",
 		}
 
-		_, err := packageReadFn(ctx, req)
+		_, err := packageReadFn(ctx, args)
 		if err != nil {
 			t.Fatalf("packageReadFn() error: %v", err)
 		}
@@ -92,15 +90,14 @@ func TestPackageReadList(t *testing.T) {
 	})
 
 	t.Run("with pagination", func(t *testing.T) {
-		req := mcp.CallToolRequest{}
+		args := map[string]any{
-		req.Params.Arguments = map[string]any{
 			"method":   "list",
 			"owner":    "test-org",
 			"page":     float64(2),
 			"per_page": float64(10),
 		}
 
-		_, err := packageReadFn(ctx, req)
+		_, err := packageReadFn(ctx, args)
 		if err != nil {
 			t.Fatalf("packageReadFn() error: %v", err)
 		}
@@ -148,15 +145,14 @@ func TestPackageReadListVersions(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.testName, func(t *testing.T) {
-			req := mcp.CallToolRequest{}
+			args := map[string]any{
-			req.Params.Arguments = map[string]any{
 				"method": "list_versions",
 				"owner":  "test-org",
 				"type":   "container",
 				"name":   tt.name,
 			}
 
-			result, err := packageReadFn(ctx, req)
+			result, err := packageReadFn(ctx, args)
 			if err != nil {
 				t.Fatalf("packageReadFn() error: %v", err)
 			}
@@ -171,7 +167,7 @@ func TestPackageReadListVersions(t *testing.T) {
 			}
 			mu.Unlock()
 
-			text := result.Content[0].(mcp.TextContent).Text
+			text := result.Content[0].(*mcp.TextContent).Text
 			var versions []map[string]any
 			if err := json.Unmarshal([]byte(text), &versions); err != nil {
 				t.Fatalf("failed to unmarshal result: %v", err)
@@ -215,8 +211,7 @@ func TestPackageReadGet(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.testName, func(t *testing.T) {
-			req := mcp.CallToolRequest{}
+			args := map[string]any{
-			req.Params.Arguments = map[string]any{
 				"method":  "get",
 				"owner":   "test-org",
 				"type":    "container",
@@ -224,7 +219,7 @@ func TestPackageReadGet(t *testing.T) {
 				"version": "v1.0.0",
 			}
 
-			result, err := packageReadFn(ctx, req)
+			result, err := packageReadFn(ctx, args)
 			if err != nil {
 				t.Fatalf("packageReadFn() error: %v", err)
 			}
@@ -239,7 +234,7 @@ func TestPackageReadGet(t *testing.T) {
 			}
 			mu.Unlock()
 
-			text := result.Content[0].(mcp.TextContent).Text
+			text := result.Content[0].(*mcp.TextContent).Text
 			var pkg map[string]any
 			if err := json.Unmarshal([]byte(text), &pkg); err != nil {
 				t.Fatalf("failed to unmarshal result: %v", err)
@@ -277,8 +272,7 @@ func TestPackageWriteDelete(t *testing.T) {
 
 	ctx := context.WithValue(context.Background(), mcpContext.TokenContextKey, "test-token")
 
-	req := mcp.CallToolRequest{}
+	args := map[string]any{
-	req.Params.Arguments = map[string]any{
 		"method":  "delete",
 		"owner":   "test-org",
 		"type":    "container",
@@ -286,7 +280,7 @@ func TestPackageWriteDelete(t *testing.T) {
 		"version": "v1.0.0",
 	}
 
-	result, err := packageWriteFn(ctx, req)
+	result, err := packageWriteFn(ctx, args)
 	if err != nil {
 		t.Fatalf("packageWriteFn() error: %v", err)
 	}
@@ -307,24 +301,22 @@ func TestPackageWriteDelete(t *testing.T) {
 
 func TestPackageReadUnknownMethod(t *testing.T) {
 	ctx := context.Background()
-	req := mcp.CallToolRequest{}
+	args := map[string]any{
-	req.Params.Arguments = map[string]any{
 		"method": "bogus",
 		"owner":  "test-org",
 	}
-	if _, err := packageReadFn(ctx, req); err == nil {
+	if _, err := packageReadFn(ctx, args); err == nil {
 		t.Fatal("expected error for unknown method")
 	}
 }
 
 func TestPackageWriteUnknownMethod(t *testing.T) {
 	ctx := context.Background()
-	req := mcp.CallToolRequest{}
+	args := map[string]any{
-	req.Params.Arguments = map[string]any{
 		"method": "bogus",
 		"owner":  "test-org",
 	}
-	if _, err := packageWriteFn(ctx, req); err == nil {
+	if _, err := packageWriteFn(ctx, args); err == nil {
 		t.Fatal("expected error for unknown method")
 	}
 }

operation/pull/pull.go

@@ -15,11 +15,10 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("pull_request")
 
 const (
 	ListRepoPullRequestsToolName   = "list_pull_requests"
@@ -29,78 +28,79 @@ const (
 )
 
 var (
-	ListRepoPullRequestsTool = mcp.NewTool(
+	ListRepoPullRequestsTool = tool.NewDefinition(
 		ListRepoPullRequestsToolName,
-		mcp.WithDescription("List pull requests in a repository, filterable by state and milestone, with configurable sort order (e.g. recently updated, most commented)."),
+		"List pull requests in a repository, filterable by state and milestone, with configurable sort order (e.g. recently updated, most commented).",
-		mcp.WithToolAnnotation(annotation.ReadOnly("List pull requests")),
+		annotation.ReadOnly("List pull requests"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("state", mcp.Enum("open", "closed", "all"), mcp.DefaultString("all")),
+		tool.String("state", tool.Enum("open", "closed", "all"), tool.Default("all")),
-		mcp.WithString("sort", mcp.Enum("oldest", "recentupdate", "leastupdate", "mostcomment", "leastcomment", "priority"), mcp.DefaultString("recentupdate")),
+		tool.String("sort", tool.Enum("oldest", "recentupdate", "leastupdate", "mostcomment", "leastcomment", "priority"), tool.Default("recentupdate")),
-		mcp.WithNumber("milestone"),
+		tool.Number("milestone"),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30)),
 	)
 
-	PullRequestReadTool = mcp.NewTool(
+	PullRequestReadTool = tool.NewDefinition(
 		PullRequestReadToolName,
-		mcp.WithDescription("Read pull request: details, diff, changed files, head commit status, reviews."),
+		"Read pull request: details, diff, changed files, head commit status, reviews, review comments.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Read pull request details")),
+		annotation.ReadOnly("Read pull request details"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("get", "get_diff", "get_files", "get_status", "get_reviews", "get_review", "get_review_comments")),
+		tool.String("method", tool.Required(), tool.Enum("get", "get_diff", "get_files", "get_status", "get_reviews", "get_review", "get_review_comments")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithNumber("pull_number", mcp.Required()),
+		tool.Number("pull_number", tool.Required()),
-		mcp.WithNumber("review_id", mcp.Description("for 'get_review'/'get_review_comments'")),
+		tool.Number("review_id", tool.Description("for 'get_review'; optional for 'get_review_comments', omit to list all")),
-		mcp.WithBoolean("binary", mcp.Description("include binary diff")),
+		tool.Boolean("binary", tool.Description("include binary diff")),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30)),
 	)
 
-	PullRequestWriteTool = mcp.NewTool(
+	PullRequestWriteTool = tool.NewDefinition(
 		PullRequestWriteToolName,
-		mcp.WithDescription("Write pull requests: create, update, close, reopen, merge, update branch from base, manage reviewers."),
+		"Write pull requests: create, update, close, reopen, merge, update branch from base, manage reviewers.",
-		mcp.WithToolAnnotation(annotation.Write("Create, update, close, reopen, or merge pull requests")),
+		annotation.Write("Create, update, close, reopen, or merge pull requests"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("create", "update", "close", "reopen", "merge", "update_branch", "add_reviewers", "remove_reviewers")),
+		tool.String("method", tool.Required(), tool.Enum("create", "update", "close", "reopen", "merge", "update_branch", "add_reviewers", "remove_reviewers")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithNumber("pull_number", mcp.Description("required except for 'create'")),
+		tool.Number("pull_number", tool.Description("required except for 'create'")),
-		mcp.WithString("title", mcp.Description("required for 'create'; optional for 'update'/'merge'")),
+		tool.String("title", tool.Description("required for 'create'; optional for 'update'/'merge'")),
-		mcp.WithString("body", mcp.Description("required for 'create'; optional for 'update'")),
+		tool.String("body", tool.Description("required for 'create'; optional for 'update'")),
-		mcp.WithString("head", mcp.Description("head branch (required for 'create')")),
+		tool.String("head", tool.Description("head branch (required for 'create')")),
-		mcp.WithString("base", mcp.Description("base branch (required for 'create')")),
+		tool.String("base", tool.Description("base branch (required for 'create')")),
-		mcp.WithString("assignee", mcp.Description("for 'update'")),
+		tool.String("assignee", tool.Description("for 'update'")),
-		mcp.WithArray("assignees", mcp.Description("for 'update'"), mcp.Items(map[string]any{"type": "string"})),
+		tool.Array("assignees", tool.Description("for 'update'"), tool.Items(map[string]any{"type": "string"})),
-		mcp.WithNumber("milestone", mcp.Description("for 'update'")),
+		tool.Number("milestone", tool.Description("for 'update'")),
-		mcp.WithString("state", mcp.Description("for 'update'"), mcp.Enum("open", "closed")),
+		tool.String("state", tool.Description("for 'update'"), tool.Enum("open", "closed")),
-		mcp.WithBoolean("allow_maintainer_edit", mcp.Description("for 'update'")),
+		tool.Boolean("allow_maintainer_edit", tool.Description("for 'update'")),
-		mcp.WithArray("labels", mcp.Description("label IDs"), mcp.Items(map[string]any{"type": "number"})),
+		tool.Array("labels", tool.Description("label IDs"), tool.Items(map[string]any{"type": "number"})),
-		mcp.WithString("deadline", mcp.Description("ISO 8601")),
+		tool.String("deadline", tool.Description("ISO 8601")),
-		mcp.WithBoolean("remove_deadline", mcp.Description("for 'update'")),
+		tool.Boolean("remove_deadline", tool.Description("for 'update'")),
-		mcp.WithString("merge_style", mcp.Description("for 'merge'"), mcp.Enum("merge", "rebase", "rebase-merge", "squash", "fast-forward-only"), mcp.DefaultString("merge")),
+		tool.String("merge_style", tool.Description("for 'merge'"), tool.Enum("merge", "rebase", "rebase-merge", "squash", "fast-forward-only"), tool.Default("merge")),
-		mcp.WithString("message", mcp.Description("merge commit message or dismissal reason")),
+		tool.String("message", tool.Description("merge commit message or dismissal reason")),
-		mcp.WithBoolean("delete_branch", mcp.Description("for 'merge'")),
+		tool.Boolean("delete_branch", tool.Description("for 'merge'")),
-		mcp.WithBoolean("force_merge", mcp.Description("merge even if checks fail")),
+		tool.Boolean("force_merge", tool.Description("merge even if checks fail")),
-		mcp.WithBoolean("merge_when_checks_succeed", mcp.Description("for 'merge'")),
+		tool.Boolean("merge_when_checks_succeed", tool.Description("for 'merge'")),
-		mcp.WithString("head_commit_id", mcp.Description("expected head SHA for conflict detection")),
+		tool.String("head_commit_id", tool.Description("expected head SHA for conflict detection")),
-		mcp.WithArray("reviewers", mcp.Description("for 'add_reviewers'/'remove_reviewers'"), mcp.Items(map[string]any{"type": "string"})),
+		tool.Array("reviewers", tool.Description("for 'add_reviewers'/'remove_reviewers'"), tool.Items(map[string]any{"type": "string"})),
-		mcp.WithArray("team_reviewers", mcp.Description("for 'add_reviewers'/'remove_reviewers'"), mcp.Items(map[string]any{"type": "string"})),
+		tool.Array("team_reviewers", tool.Description("for 'add_reviewers'/'remove_reviewers'"), tool.Items(map[string]any{"type": "string"})),
-		mcp.WithBoolean("draft", mcp.Description("uses 'WIP: ' title prefix")),
+		tool.Boolean("draft", tool.Description("uses 'WIP: ' title prefix")),
 	)
 
-	PullRequestReviewWriteTool = mcp.NewTool(
+	PullRequestReviewWriteTool = tool.NewDefinition(
 		PullRequestReviewWriteToolName,
-		mcp.WithDescription("Write PR reviews: create, submit, delete, dismiss."),
+		"Write PR reviews: create, submit, delete, dismiss, reply to and resolve review comments.",
-		mcp.WithToolAnnotation(annotation.Write("Submit a pull request review")),
+		annotation.Write("Write pull request reviews"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("create", "submit", "delete", "dismiss")),
+		tool.String("method", tool.Required(), tool.Enum("create", "submit", "delete", "dismiss", "reply_comment", "resolve_thread", "unresolve_thread")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithNumber("pull_number", mcp.Required()),
+		tool.Number("pull_number", tool.Description("required except for 'resolve_thread'/'unresolve_thread'")),
-		mcp.WithNumber("review_id", mcp.Description("required except for 'create'")),
+		tool.Number("review_id", tool.Description("for 'submit'/'delete'/'dismiss'")),
-		mcp.WithString("state", mcp.Enum("APPROVED", "REQUEST_CHANGES", "COMMENT", "PENDING")),
+		tool.Number("comment_id", tool.Description("comment ID from 'get_review_comments'; resolve takes the thread's first")),
-		mcp.WithString("body"),
+		tool.String("state", tool.Enum("APPROVED", "REQUEST_CHANGES", "COMMENT", "PENDING")),
-		mcp.WithString("commit_id", mcp.Description("for 'create'")),
+		tool.String("body", tool.Description("review body, or reply text for 'reply_comment'")),
-		mcp.WithString("message", mcp.Description("dismissal reason")),
+		tool.String("commit_id", tool.Description("for 'create'")),
-		mcp.WithArray("comments", mcp.Description("inline comments (for 'create')"), mcp.Items(map[string]any{
+		tool.String("message", tool.Description("dismissal reason")),
+		tool.Array("comments", tool.Description("inline comments (for 'create')"), tool.Items(map[string]any{
 			"type": "object",
 			"properties": map[string]any{
 				"path":         map[string]any{"type": "string"},
@@ -113,86 +113,86 @@ var (
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    ListRepoPullRequestsTool,
 		Handler: listRepoPullRequestsFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    PullRequestReadTool,
 		Handler: pullRequestReadFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	Tool.RegisterWrite(tool.ServerTool{
 		Tool:    PullRequestWriteTool,
 		Handler: pullRequestWriteFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	Tool.RegisterWrite(tool.ServerTool{
 		Tool:    PullRequestReviewWriteTool,
 		Handler: pullRequestReviewWriteFn,
 	})
 }
 
-func pullRequestReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func pullRequestReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	method, err := params.GetString(req.GetArguments(), "method")
+	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "get":
-		return getPullRequestByIndexFn(ctx, req)
+		return getPullRequestByIndexFn(ctx, args)
 	case "get_diff":
-		return getPullRequestDiffFn(ctx, req)
+		return getPullRequestDiffFn(ctx, args)
 	case "get_files":
-		return getPullRequestFilesFn(ctx, req)
+		return getPullRequestFilesFn(ctx, args)
 	case "get_status":
-		return getPullRequestStatusFn(ctx, req)
+		return getPullRequestStatusFn(ctx, args)
 	case "get_reviews":
-		return listPullRequestReviewsFn(ctx, req)
+		return listPullRequestReviewsFn(ctx, args)
 	case "get_review":
-		return getPullRequestReviewFn(ctx, req)
+		return getPullRequestReviewFn(ctx, args)
 	case "get_review_comments":
-		return listPullRequestReviewCommentsFn(ctx, req)
+		return listPullRequestReviewCommentsFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func pullRequestWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func pullRequestWriteFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	method, err := params.GetString(req.GetArguments(), "method")
+	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "create":
-		return createPullRequestFn(ctx, req)
+		return createPullRequestFn(ctx, args)
 	case "update":
-		return editPullRequestFn(ctx, req)
+		return editPullRequestFn(ctx, args)
 	case "close":
-		return closePullRequestFn(ctx, req)
+		return closePullRequestFn(ctx, args)
 	case "reopen":
-		return reopenPullRequestFn(ctx, req)
+		return reopenPullRequestFn(ctx, args)
 	case "merge":
-		return mergePullRequestFn(ctx, req)
+		return mergePullRequestFn(ctx, args)
 	case "update_branch":
-		return updatePullRequestBranchFn(ctx, req)
+		return updatePullRequestBranchFn(ctx, args)
 	case "add_reviewers":
-		return createPullRequestReviewerFn(ctx, req)
+		return createPullRequestReviewerFn(ctx, args)
 	case "remove_reviewers":
-		return deletePullRequestReviewerFn(ctx, req)
+		return deletePullRequestReviewerFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func closePullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func closePullRequestFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "pull_number")
+	index, err := params.GetIndex(args, "pull_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -213,16 +213,16 @@ func closePullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	return to.TextResult(slimPullRequest(pr))
 }
 
-func reopenPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func reopenPullRequestFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "pull_number")
+	index, err := params.GetIndex(args, "pull_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -243,27 +243,32 @@ func reopenPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Cal
 	return to.TextResult(slimPullRequest(pr))
 }
 
-func pullRequestReviewWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func pullRequestReviewWriteFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	method, err := params.GetString(req.GetArguments(), "method")
+	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "create":
-		return createPullRequestReviewFn(ctx, req)
+		return createPullRequestReviewFn(ctx, args)
 	case "submit":
-		return submitPullRequestReviewFn(ctx, req)
+		return submitPullRequestReviewFn(ctx, args)
 	case "delete":
-		return deletePullRequestReviewFn(ctx, req)
+		return deletePullRequestReviewFn(ctx, args)
 	case "dismiss":
-		return dismissPullRequestReviewFn(ctx, req)
+		return dismissPullRequestReviewFn(ctx, args)
+	case "reply_comment":
+		return replyPullRequestReviewCommentFn(ctx, args)
+	case "resolve_thread":
+		return resolveReviewThreadFn(ctx, args)
+	case "unresolve_thread":
+		return unresolveReviewThreadFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func getPullRequestByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getPullRequestByIndexFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -298,8 +303,7 @@ func getPullRequestByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	return to.TextResult(m)
 }
 
-func getPullRequestDiffFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getPullRequestDiffFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -328,8 +332,7 @@ func getPullRequestDiffFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	return to.TextResult(string(diffBytes))
 }
 
-func listRepoPullRequestsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listRepoPullRequestsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -385,8 +388,7 @@ func applyDraftPrefix(title string, isDraft bool) string {
 	return title
 }
 
-func createPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func createPullRequestFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -440,8 +442,7 @@ func createPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Cal
 
 type reviewerOp func(client *gitea_sdk.PullRequestsService, ctx context.Context, owner, repo string, index int64, opt gitea_sdk.PullReviewRequestOptions) (*gitea_sdk.Response, error)
 
-func pullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest, verb string, op reviewerOp) (*mcp.CallToolResult, error) {
+func pullRequestReviewerFn(ctx context.Context, args map[string]any, verb string, op reviewerOp) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -479,16 +480,15 @@ func pullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest, verb st
 	})
 }
 
-func createPullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func createPullRequestReviewerFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	return pullRequestReviewerFn(ctx, req, "create", (*gitea_sdk.PullRequestsService).CreateReviewRequests)
+	return pullRequestReviewerFn(ctx, args, "create", (*gitea_sdk.PullRequestsService).CreateReviewRequests)
 }
 
-func deletePullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func deletePullRequestReviewerFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	return pullRequestReviewerFn(ctx, req, "delete", (*gitea_sdk.PullRequestsService).DeleteReviewRequests)
+	return pullRequestReviewerFn(ctx, args, "delete", (*gitea_sdk.PullRequestsService).DeleteReviewRequests)
 }
 
-func listPullRequestReviewsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listPullRequestReviewsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -521,8 +521,7 @@ func listPullRequestReviewsFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 	return to.TextResult(slimReviews(reviews))
 }
 
-func getPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getPullRequestReviewFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -553,8 +552,7 @@ func getPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 	return to.TextResult(slimReview(review))
 }
 
-func listPullRequestReviewCommentsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listPullRequestReviewCommentsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -567,26 +565,45 @@ func listPullRequestReviewCommentsFn(ctx context.Context, req mcp.CallToolReques
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	reviewID, err := params.GetIndex(args, "review_id")
-	if err != nil {
-		return to.ErrorResult(err)
-	}
-
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 
-	comments, _, err := client.PullRequests.ListPullReviewComments(ctx, owner, repo, index, reviewID)
+	// review comments hang off reviews, so without a review_id walk a page of
-	if err != nil {
+	// reviews, keeping each thread and its replies together
-		return to.ErrorResult(fmt.Errorf("list review comments for review %v on %v/%v/pr/%v err: %v", reviewID, owner, repo, index, err))
+	var reviewIDs []int64
+	if reviewID := params.GetOptionalInt(args, "review_id", 0); reviewID != 0 {
+		reviewIDs = append(reviewIDs, reviewID)
+	} else {
+		page, pageSize := params.GetPagination(args, 30)
+		reviews, _, err := client.PullRequests.ListPullReviews(ctx, owner, repo, index, gitea_sdk.ListPullReviewsOptions{
+			ListOptions: gitea_sdk.ListOptions{Page: page, PageSize: pageSize},
+		})
+		if err != nil {
+			return to.ErrorResult(fmt.Errorf("list reviews for %v/%v/pr/%v err: %v", owner, repo, index, err))
+		}
+		reviewIDs = make([]int64, 0, len(reviews))
+		for _, review := range reviews {
+			if review.CodeCommentsCount > 0 {
+				reviewIDs = append(reviewIDs, review.ID)
+			}
+		}
+	}
+
+	var comments []*gitea_sdk.PullReviewComment
+	for _, reviewID := range reviewIDs {
+		reviewComments, _, err := client.PullRequests.ListPullReviewComments(ctx, owner, repo, index, reviewID)
+		if err != nil {
+			return to.ErrorResult(fmt.Errorf("list review comments for review %v on %v/%v/pr/%v err: %v", reviewID, owner, repo, index, err))
+		}
+		comments = append(comments, reviewComments...)
 	}
 
 	return to.TextResult(slimReviewComments(comments))
 }
 
-func createPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func createPullRequestReviewFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -649,8 +666,7 @@ func createPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	return to.TextResult(slimReview(review))
 }
 
-func submitPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func submitPullRequestReviewFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -692,8 +708,7 @@ func submitPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	return to.TextResult(slimReview(review))
 }
 
-func deletePullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func deletePullRequestReviewFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -731,8 +746,7 @@ func deletePullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	return to.TextResult(successMsg)
 }
 
-func dismissPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func dismissPullRequestReviewFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -775,8 +789,90 @@ func dismissPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*
 	return to.TextResult(successMsg)
 }
 
-func mergePullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func replyPullRequestReviewCommentFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
+	owner, err := params.GetString(args, "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	repo, err := params.GetString(args, "repo")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	index, err := params.GetIndex(args, "pull_number")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	commentID, err := params.GetIndex(args, "comment_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	body, err := params.GetString(args, "body")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+
+	client, err := gitea.ClientFromContext(ctx)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+	}
+
+	comment, _, err := client.PullRequests.CreatePullReviewCommentReply(ctx, owner, repo, index, commentID, gitea_sdk.CreatePullReviewCommentReplyOptions{
+		Body: body,
+	})
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("reply to review comment %v on %v/%v/pr/%v err: %v", commentID, owner, repo, index, err))
+	}
+
+	return to.TextResult(slimReviewComment(comment))
+}
+
+func resolveReviewThreadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	return setReviewThreadResolvedFn(ctx, args, true)
+}
+
+func unresolveReviewThreadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	return setReviewThreadResolvedFn(ctx, args, false)
+}
+
+func setReviewThreadResolvedFn(ctx context.Context, args map[string]any, resolved bool) (*mcp.CallToolResult, error) {
+	owner, err := params.GetString(args, "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	repo, err := params.GetString(args, "repo")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	commentID, err := params.GetIndex(args, "comment_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+
+	client, err := gitea.ClientFromContext(ctx)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+	}
+
+	if resolved {
+		_, err = client.PullRequests.ResolvePullReviewComment(ctx, owner, repo, commentID)
+	} else {
+		_, err = client.PullRequests.UnresolvePullReviewComment(ctx, owner, repo, commentID)
+	}
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("set resolved=%v on review comment %v in %v/%v err: %v", resolved, commentID, owner, repo, err))
+	}
+
+	successMsg := map[string]any{
+		"message":    "Successfully updated review thread",
+		"comment_id": commentID,
+		"resolved":   resolved,
+		"repository": fmt.Sprintf("%s/%s", owner, repo),
+	}
+
+	return to.TextResult(successMsg)
+}
+
+func mergePullRequestFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -839,8 +935,7 @@ func mergePullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	return to.TextResult(successMsg)
 }
 
-func editPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func editPullRequestFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -914,8 +1009,7 @@ func editPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	return to.TextResult(slimPullRequest(pr))
 }
 
-func updatePullRequestBranchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func updatePullRequestBranchFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -936,8 +1030,7 @@ func updatePullRequestBranchFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	return to.TextResult(map[string]any{"message": "branch updated from base"})
 }
 
-func getPullRequestFilesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getPullRequestFilesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -964,8 +1057,7 @@ func getPullRequestFilesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.C
 	return to.TextResult(files)
 }
 
-func getPullRequestStatusFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getPullRequestStatusFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)

operation/pull/pull_test.go

@@ -12,7 +12,7 @@ import (
 
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
 
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 
 func Test_editPullRequestFn(t *testing.T) {
@@ -77,19 +77,15 @@ func Test_editPullRequestFn(t *testing.T) {
 				flag.Version = origVersion
 			}()
 
-			req := mcp.CallToolRequest{
+			args := map[string]any{
-				Params: mcp.CallToolParams{
+				"owner":       owner,
-					Arguments: map[string]any{
+				"repo":        repo,
-						"owner":       owner,
+				"pull_number": ii.val,
-						"repo":        repo,
+				"title":       "WIP: my feature",
-						"pull_number": ii.val,
+				"state":       "open",
-						"title":       "WIP: my feature",
-						"state":       "open",
-					},
-				},
 			}
 
-			result, err := editPullRequestFn(context.Background(), req)
+			result, err := editPullRequestFn(context.Background(), args)
 			if err != nil {
 				t.Fatalf("editPullRequestFn() error = %v", err)
 			}
@@ -113,7 +109,7 @@ func Test_editPullRequestFn(t *testing.T) {
 			if len(result.Content) == 0 {
 				t.Fatalf("expected content in result")
 			}
-			textContent, ok := mcp.AsTextContent(result.Content[0])
+			textContent, ok := result.Content[0].(*mcp.TextContent)
 			if !ok {
 				t.Fatalf("expected text content, got %T", result.Content[0])
 			}
@@ -193,21 +189,17 @@ func Test_mergePullRequestFn(t *testing.T) {
 				flag.Version = origVersion
 			}()
 
-			req := mcp.CallToolRequest{
+			args := map[string]any{
-				Params: mcp.CallToolParams{
+				"owner":         owner,
-					Arguments: map[string]any{
+				"repo":          repo,
-						"owner":         owner,
+				"pull_number":   ii.val,
-						"repo":          repo,
+				"merge_style":   "squash",
-						"pull_number":   ii.val,
+				"title":         "feat: my squashed commit",
-						"merge_style":   "squash",
+				"message":       "Squash merge of PR #5",
-						"title":         "feat: my squashed commit",
+				"delete_branch": true,
-						"message":       "Squash merge of PR #5",
-						"delete_branch": true,
-					},
-				},
 			}
 
-			result, err := mergePullRequestFn(context.Background(), req)
+			result, err := mergePullRequestFn(context.Background(), args)
 			if err != nil {
 				t.Fatalf("mergePullRequestFn() error = %v", err)
 			}
@@ -237,7 +229,7 @@ func Test_mergePullRequestFn(t *testing.T) {
 			if len(result.Content) == 0 {
 				t.Fatalf("expected content in result")
 			}
-			textContent, ok := mcp.AsTextContent(result.Content[0])
+			textContent, ok := result.Content[0].(*mcp.TextContent)
 			if !ok {
 				t.Fatalf("expected text content, got %T", result.Content[0])
 			}
@@ -306,21 +298,17 @@ func Test_mergePullRequestFn_newParams(t *testing.T) {
 		flag.Version = origVersion
 	}()
 
-	req := mcp.CallToolRequest{
+	args := map[string]any{
-		Params: mcp.CallToolParams{
+		"owner":                     owner,
-			Arguments: map[string]any{
+		"repo":                      repo,
-				"owner":                     owner,
+		"pull_number":               float64(index),
-				"repo":                      repo,
+		"merge_style":               "merge",
-				"pull_number":               float64(index),
+		"force_merge":               true,
-				"merge_style":               "merge",
+		"merge_when_checks_succeed": true,
-				"force_merge":               true,
+		"head_commit_id":            "abc123",
-				"merge_when_checks_succeed": true,
-				"head_commit_id":            "abc123",
-			},
-		},
 	}
 
-	_, err := mergePullRequestFn(context.Background(), req)
+	_, err := mergePullRequestFn(context.Background(), args)
 	if err != nil {
 		t.Fatalf("mergePullRequestFn() error = %v", err)
 	}
@@ -386,22 +374,18 @@ func Test_createPullRequestFn_labels(t *testing.T) {
 		flag.Version = origVersion
 	}()
 
-	req := mcp.CallToolRequest{
+	args := map[string]any{
-		Params: mcp.CallToolParams{
+		"owner":    owner,
-			Arguments: map[string]any{
+		"repo":     repo,
-				"owner":    owner,
+		"title":    "test",
-				"repo":     repo,
+		"body":     "body",
-				"title":    "test",
+		"head":     "feature",
-				"body":     "body",
+		"base":     "main",
-				"head":     "feature",
+		"labels":   []any{float64(1), float64(2)},
-				"base":     "main",
+		"deadline": "2026-06-01T00:00:00Z",
-				"labels":   []any{float64(1), float64(2)},
-				"deadline": "2026-06-01T00:00:00Z",
-			},
-		},
 	}
 
-	_, err := createPullRequestFn(context.Background(), req)
+	_, err := createPullRequestFn(context.Background(), args)
 	if err != nil {
 		t.Fatalf("createPullRequestFn() error = %v", err)
 	}
@@ -525,13 +509,7 @@ func Test_createPullRequestFn_draft(t *testing.T) {
 				args["draft"] = tc.draft
 			}
 
-			req := mcp.CallToolRequest{
+			_, err := createPullRequestFn(context.Background(), args)
-				Params: mcp.CallToolParams{
-					Arguments: args,
-				},
-			}
-
-			_, err := createPullRequestFn(context.Background(), req)
 			if err != nil {
 				t.Fatalf("createPullRequestFn() error = %v", err)
 			}
@@ -630,13 +608,7 @@ func Test_editPullRequestFn_draft(t *testing.T) {
 				args["draft"] = tc.draft
 			}
 
-			req := mcp.CallToolRequest{
+			_, err := editPullRequestFn(context.Background(), args)
-				Params: mcp.CallToolParams{
-					Arguments: args,
-				},
-			}
-
-			_, err := editPullRequestFn(context.Background(), req)
 			if err != nil {
 				t.Fatalf("editPullRequestFn() error = %v", err)
 			}
@@ -720,18 +692,14 @@ func Test_getPullRequestDiffFn(t *testing.T) {
 				flag.Version = origVersion
 			}()
 
-			req := mcp.CallToolRequest{
+			args := map[string]any{
-				Params: mcp.CallToolParams{
+				"owner":       owner,
-					Arguments: map[string]any{
+				"repo":        repo,
-						"owner":       owner,
+				"pull_number": ii.val,
-						"repo":        repo,
+				"binary":      true,
-						"pull_number": ii.val,
-						"binary":      true,
-					},
-				},
 			}
 
-			result, err := getPullRequestDiffFn(context.Background(), req)
+			result, err := getPullRequestDiffFn(context.Background(), args)
 			if err != nil {
 				t.Fatalf("getPullRequestDiffFn() error = %v", err)
 			}
@@ -758,7 +726,7 @@ func Test_getPullRequestDiffFn(t *testing.T) {
 				t.Fatalf("expected content in result")
 			}
 
-			textContent, ok := mcp.AsTextContent(result.Content[0])
+			textContent, ok := result.Content[0].(*mcp.TextContent)
 			if !ok {
 				t.Fatalf("expected text content, got %T", result.Content[0])
 			}
@@ -807,17 +775,17 @@ func Test_getPullRequestByIndexFn_includesAttachments(t *testing.T) {
 	flag.Host, flag.Token, flag.Version = server.URL, "", "test"
 	defer func() { flag.Host, flag.Token, flag.Version = origHost, origToken, origVersion }()
 
-	req := mcp.CallToolRequest{Params: mcp.CallToolParams{Arguments: map[string]any{
+	args := map[string]any{
 		"owner": owner, "repo": repo, "pull_number": float64(index),
-	}}}
+	}
-	res, err := getPullRequestByIndexFn(context.Background(), req)
+	res, err := getPullRequestByIndexFn(context.Background(), args)
 	if err != nil {
 		t.Fatalf("getPullRequestByIndexFn() error = %v", err)
 	}
 	if res.IsError {
 		t.Fatalf("unexpected error result: %v", res.Content)
 	}
-	body := res.Content[0].(mcp.TextContent).Text
+	body := res.Content[0].(*mcp.TextContent).Text
 	if !strings.Contains(body, `[shot.png](https://example/shot.png)`) {
 		t.Fatalf("expected attachment markdown inlined in body, got: %s", body)
 	}
@@ -855,14 +823,14 @@ func Test_getPullRequestByIndexFn_emptyAssetsLeavesBody(t *testing.T) {
 	flag.Host, flag.Token, flag.Version = server.URL, "", "test"
 	defer func() { flag.Host, flag.Token, flag.Version = origHost, origToken, origVersion }()
 
-	req := mcp.CallToolRequest{Params: mcp.CallToolParams{Arguments: map[string]any{
+	args := map[string]any{
 		"owner": owner, "repo": repo, "pull_number": float64(index),
-	}}}
+	}
-	res, err := getPullRequestByIndexFn(context.Background(), req)
+	res, err := getPullRequestByIndexFn(context.Background(), args)
 	if err != nil {
 		t.Fatalf("getPullRequestByIndexFn() error = %v", err)
 	}
-	body := res.Content[0].(mcp.TextContent).Text
+	body := res.Content[0].(*mcp.TextContent).Text
 	if !strings.Contains(body, `"body":"plain body"`) {
 		t.Fatalf("expected body unchanged when assets are empty, got: %s", body)
 	}
@@ -899,17 +867,17 @@ func Test_getPullRequestByIndexFn_assetsFailureNonFatal(t *testing.T) {
 	flag.Host, flag.Token, flag.Version = server.URL, "", "test"
 	defer func() { flag.Host, flag.Token, flag.Version = origHost, origToken, origVersion }()
 
-	req := mcp.CallToolRequest{Params: mcp.CallToolParams{Arguments: map[string]any{
+	args := map[string]any{
 		"owner": owner, "repo": repo, "pull_number": float64(index),
-	}}}
+	}
-	res, err := getPullRequestByIndexFn(context.Background(), req)
+	res, err := getPullRequestByIndexFn(context.Background(), args)
 	if err != nil {
 		t.Fatalf("getPullRequestByIndexFn() error = %v", err)
 	}
 	if res.IsError {
 		t.Fatalf("assets fetch failure should not fail the PR fetch: %v", res.Content)
 	}
-	body := res.Content[0].(mcp.TextContent).Text
+	body := res.Content[0].(*mcp.TextContent).Text
 	if !strings.Contains(body, `"plain body"`) {
 		t.Fatalf("expected PR body preserved when assets fail, got: %s", body)
 	}
@@ -954,18 +922,14 @@ func Test_closePullRequestFn(t *testing.T) {
 	flag.Token = "test-token"
 	t.Cleanup(func() { flag.Host = origHost; flag.Token = origToken })
 
-	req := mcp.CallToolRequest{
+	args := map[string]any{
-		Params: mcp.CallToolParams{
+		"method":      "close",
-			Arguments: map[string]any{
+		"owner":       owner,
-				"method":      "close",
+		"repo":        repo,
-				"owner":       owner,
+		"pull_number": float64(index),
-				"repo":        repo,
-				"pull_number": float64(index),
-			},
-		},
 	}
 
-	result, err := closePullRequestFn(context.Background(), req)
+	result, err := closePullRequestFn(context.Background(), args)
 	if err != nil {
 		t.Fatalf("closePullRequestFn() error = %v", err)
 	}
@@ -1018,18 +982,14 @@ func Test_reopenPullRequestFn(t *testing.T) {
 	flag.Token = "test-token"
 	t.Cleanup(func() { flag.Host = origHost; flag.Token = origToken })
 
-	req := mcp.CallToolRequest{
+	args := map[string]any{
-		Params: mcp.CallToolParams{
+		"method":      "reopen",
-			Arguments: map[string]any{
+		"owner":       owner,
-				"method":      "reopen",
+		"repo":        repo,
-				"owner":       owner,
+		"pull_number": float64(index),
-				"repo":        repo,
-				"pull_number": float64(index),
-			},
-		},
 	}
 
-	result, err := reopenPullRequestFn(context.Background(), req)
+	result, err := reopenPullRequestFn(context.Background(), args)
 	if err != nil {
 		t.Fatalf("reopenPullRequestFn() error = %v", err)
 	}
@@ -1042,3 +1002,139 @@ func Test_reopenPullRequestFn(t *testing.T) {
 		t.Fatalf("expected content in result")
 	}
 }
+
+// serveStub points the client at a test server that answers the SDK version
+// probe, leaving every other route to handler.
+func serveStub(t *testing.T, handler http.HandlerFunc) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/api/v1/version" {
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{"version":"1.27.0"}`))
+			return
+		}
+		handler(w, r)
+	}))
+	t.Cleanup(server.Close)
+
+	origHost, origToken := flag.Host, flag.Token
+	flag.Host, flag.Token = server.URL, "test-token"
+	t.Cleanup(func() { flag.Host, flag.Token = origHost, origToken })
+}
+
+func Test_pullRequestReviewWriteFn_comments(t *testing.T) {
+	const (
+		owner     = "octo"
+		repo      = "demo"
+		index     = 7
+		commentID = 42
+	)
+
+	for _, tc := range []struct {
+		method   string
+		path     string
+		wantBody string
+	}{
+		{"reply_comment", fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/comments/%d/replies", owner, repo, index, commentID), "sure"},
+		{"resolve_thread", fmt.Sprintf("/api/v1/repos/%s/%s/pulls/comments/%d/resolve", owner, repo, commentID), ""},
+		{"unresolve_thread", fmt.Sprintf("/api/v1/repos/%s/%s/pulls/comments/%d/unresolve", owner, repo, commentID), ""},
+	} {
+		t.Run(tc.method, func(t *testing.T) {
+			var gotPath, gotBody string
+
+			serveStub(t, func(w http.ResponseWriter, r *http.Request) {
+				if r.URL.Path != tc.path {
+					t.Errorf("unexpected request: %s %s", r.Method, r.URL.Path)
+					w.WriteHeader(http.StatusNotFound)
+					return
+				}
+				if r.Method != http.MethodPost {
+					t.Errorf("expected POST method, got %s", r.Method)
+				}
+				gotPath = r.URL.Path
+				var body map[string]any
+				_ = json.NewDecoder(r.Body).Decode(&body)
+				gotBody, _ = body["body"].(string)
+				if tc.wantBody == "" {
+					w.WriteHeader(http.StatusNoContent)
+					return
+				}
+				w.Header().Set("Content-Type", "application/json")
+				w.WriteHeader(http.StatusCreated)
+				_, _ = w.Write([]byte(`{"id":43,"body":"sure","path":"main.go","position":3}`))
+			})
+
+			args := map[string]any{
+				"method":      tc.method,
+				"owner":       owner,
+				"repo":        repo,
+				"pull_number": float64(index),
+				"comment_id":  float64(commentID),
+				"body":        "sure",
+			}
+
+			result, err := pullRequestReviewWriteFn(context.Background(), args)
+			if err != nil {
+				t.Fatalf("pullRequestReviewWriteFn() error = %v", err)
+			}
+
+			if gotPath != tc.path {
+				t.Errorf("expected request to %s, got %q", tc.path, gotPath)
+			}
+
+			// resolve and unresolve send no body, reply sends the reply text
+			if gotBody != tc.wantBody {
+				t.Errorf("expected body %q, got %q", tc.wantBody, gotBody)
+			}
+
+			if len(result.Content) == 0 {
+				t.Fatalf("expected content in result")
+			}
+		})
+	}
+}
+
+func Test_listPullRequestReviewCommentsFn_allReviews(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+		index = 7
+	)
+
+	var gotReviewPaths []string
+
+	serveStub(t, func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		switch r.URL.Path {
+		case fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews", owner, repo, index):
+			// the middle review has no review comments and must not be fetched
+			_, _ = w.Write([]byte(`[{"id":1,"comments_count":1},{"id":2,"comments_count":0},{"id":3,"comments_count":2}]`))
+		case fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews/1/comments", owner, repo, index),
+			fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews/3/comments", owner, repo, index):
+			gotReviewPaths = append(gotReviewPaths, r.URL.Path)
+			_, _ = w.Write([]byte(`[{"id":11,"body":"nit","path":"main.go","position":3}]`))
+		default:
+			t.Errorf("unexpected request: %s %s", r.Method, r.URL.Path)
+			w.WriteHeader(http.StatusNotFound)
+		}
+	})
+
+	args := map[string]any{
+		"method":      "get_review_comments",
+		"owner":       owner,
+		"repo":        repo,
+		"pull_number": float64(index),
+	}
+
+	result, err := pullRequestReadFn(context.Background(), args)
+	if err != nil {
+		t.Fatalf("pullRequestReadFn() error = %v", err)
+	}
+
+	if len(gotReviewPaths) != 2 {
+		t.Errorf("expected comments of 2 reviews to be fetched, got %v", gotReviewPaths)
+	}
+
+	if len(result.Content) == 0 {
+		t.Fatalf("expected content in result")
+	}
+}

operation/pull/slim.go

@@ -137,8 +137,9 @@ func slimReviewComment(c *gitea_sdk.PullReviewComment) map[string]any {
 	if c == nil {
 		return nil
 	}
-	return map[string]any{
+	m := map[string]any{
 		"id":           c.ID,
+		"review_id":    c.ReviewID,
 		"body":         c.Body,
 		"path":         c.Path,
 		"position":     c.LineNum,
@@ -149,6 +150,11 @@ func slimReviewComment(c *gitea_sdk.PullReviewComment) map[string]any {
 		"created_at":   c.Created,
 		"updated_at":   c.Updated,
 	}
+	// the thread's first comment carries the resolver
+	if c.Resolver != nil {
+		m["resolved_by"] = slim.UserLogin(c.Resolver)
+	}
+	return m
 }
 
 func slimReviewComments(comments []*gitea_sdk.PullReviewComment) []map[string]any {

operation/readme_test.go

@@ -0,0 +1,82 @@
+package operation
+
+import (
+	"maps"
+	"os"
+	"path/filepath"
+	"regexp"
+	"slices"
+	"strings"
+	"testing"
+)
+
+// toolTableRow matches a row of the "Available Tools" table in the README
+// files, capturing the tool name, the scope cell and the access cell, e.g.
+// "| get_me | user | Read | Get the current authenticated user |".
+var toolTableRow = regexp.MustCompile(`^\|\s*([a-z_]+)\s*\|\s*([a-z_]+)\s*\|\s*(\S+)\s*\|`)
+
+// readmeAccessLabels maps each README to the access-column labels it uses.
+var readmeAccessLabels = map[string]map[string]string{
+	"../README.md":       {"Read": "read", "Write": "write"},
+	"../README.zh-cn.md": {"读取": "read", "写入": "write"},
+	"../README.zh-tw.md": {"讀取": "read", "寫入": "write"},
+}
+
+// toolInfo is what TestReadmeToolTables tracks per tool, both as registered
+// in code and as documented in a README, so the two can be compared.
+type toolInfo struct {
+	scope  string
+	access string
+}
+
+// TestReadmeToolTables ensures the tool tables in the README files stay in sync
+// with the registered tools, in both directions and for every translation.
+// The tables listed tools that no longer existed for several releases before
+// anyone noticed.
+// The scope names in the README are the canonical, lowercase snake_case names
+// returned by (*tool.Tool).Scope(), so no translation is needed to compare them.
+func TestReadmeToolTables(t *testing.T) {
+	registered := map[string]toolInfo{}
+	for _, d := range domainTools {
+		scope := d.Scope()
+		for _, st := range d.ReadTools() {
+			registered[st.Tool.Name] = toolInfo{scope: scope, access: "read"}
+		}
+		for _, st := range d.WriteTools() {
+			registered[st.Tool.Name] = toolInfo{scope: scope, access: "write"}
+		}
+	}
+
+	for path, labels := range readmeAccessLabels {
+		t.Run(filepath.Base(path), func(t *testing.T) {
+			content, err := os.ReadFile(path)
+			if err != nil {
+				t.Fatal(err)
+			}
+			documented := map[string]toolInfo{}
+			for line := range strings.SplitSeq(string(content), "\n") {
+				if match := toolTableRow.FindStringSubmatch(line); match != nil {
+					documented[match[1]] = toolInfo{scope: match[2], access: labels[match[3]]}
+				}
+			}
+
+			for _, name := range slices.Sorted(maps.Keys(registered)) {
+				got, ok := documented[name]
+				want := registered[name]
+				switch {
+				case !ok:
+					t.Errorf("tool %q is registered but missing from the tool table", name)
+				case got.access != want.access:
+					t.Errorf("tool %q is documented with %q access, want %q", name, got.access, want.access)
+				case got.scope != want.scope:
+					t.Errorf("tool %q is documented with scope %q, want %q", name, got.scope, want.scope)
+				}
+			}
+			for _, name := range slices.Sorted(maps.Keys(documented)) {
+				if _, ok := registered[name]; !ok {
+					t.Errorf("tool %q is in the tool table but is not registered", name)
+				}
+			}
+		})
+	}
+}

operation/repo/branch.go

@@ -8,12 +8,15 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
+	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
+// BranchTool holds the branch-related tools (scope "branch").
+var BranchTool = tool.New("branch")
+
 const (
 	CreateBranchToolName = "create_branch"
 	DeleteBranchToolName = "delete_branch"
@@ -21,53 +24,52 @@ const (
 )
 
 var (
-	CreateBranchTool = mcp.NewTool(
+	CreateBranchTool = tool.NewDefinition(
 		CreateBranchToolName,
-		mcp.WithDescription("Create a new branch in a repository, optionally from a specific source branch (defaults to the repository's default branch)."),
+		"Create a new branch in a repository, optionally from a specific source branch (defaults to the repository's default branch).",
-		mcp.WithToolAnnotation(annotation.Write("Create a new branch")),
+		annotation.Write("Create a new branch"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("branch", mcp.Required()),
+		tool.String("branch", tool.Required()),
-		mcp.WithString("old_branch", mcp.Description("source branch (default: repo default)")),
+		tool.String("old_branch", tool.Description("source branch (default: repo default)")),
 	)
 
-	DeleteBranchTool = mcp.NewTool(
+	DeleteBranchTool = tool.NewDefinition(
 		DeleteBranchToolName,
-		mcp.WithDescription("Permanently delete a branch from a repository. This action is destructive and cannot be undone."),
+		"Permanently delete a branch from a repository. This action is destructive and cannot be undone.",
-		mcp.WithToolAnnotation(annotation.Destructive("Delete a branch")),
+		annotation.Destructive("Delete a branch"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("branch", mcp.Required()),
+		tool.String("branch", tool.Required()),
 	)
 
-	ListBranchesTool = mcp.NewTool(
+	ListBranchesTool = tool.NewDefinition(
 		ListBranchesToolName,
-		mcp.WithDescription("List all branches in a repository, paginated."),
+		"List all branches in a repository, paginated.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("List repository branches")),
+		annotation.ReadOnly("List repository branches"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30)),
 	)
 )
 
 func init() {
-	Tool.RegisterWrite(server.ServerTool{
+	BranchTool.RegisterWrite(tool.ServerTool{
 		Tool:    CreateBranchTool,
 		Handler: CreateBranchFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	BranchTool.RegisterWrite(tool.ServerTool{
 		Tool:    DeleteBranchTool,
 		Handler: DeleteBranchFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	BranchTool.RegisterRead(tool.ServerTool{
 		Tool:    ListBranchesTool,
 		Handler: ListBranchesFn,
 	})
 }
 
-func CreateBranchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func CreateBranchFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -97,8 +99,7 @@ func CreateBranchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	return to.TextResult("Branch Created")
 }
 
-func DeleteBranchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func DeleteBranchFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -123,8 +124,7 @@ func DeleteBranchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	return to.TextResult("Branch Deleted")
 }
 
-func ListBranchesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func ListBranchesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)

operation/repo/commit.go

@@ -8,53 +8,55 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
+	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
+// CommitTool holds the commit-related tools (scope "commit").
+var CommitTool = tool.New("commit")
+
 const (
 	ListRepoCommitsToolName = "list_commits"
 	GetCommitToolName       = "get_commit"
 )
 
 var (
-	ListRepoCommitsTool = mcp.NewTool(
+	ListRepoCommitsTool = tool.NewDefinition(
 		ListRepoCommitsToolName,
-		mcp.WithDescription("List commits in a repository, optionally starting from a specific branch or SHA and filtered to commits touching a given file path."),
+		"List commits in a repository, optionally starting from a specific branch or SHA and filtered to commits touching a given file path.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("List repository commits")),
+		annotation.ReadOnly("List repository commits"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("sha", mcp.Description("starting SHA or branch")),
+		tool.String("sha", tool.Description("starting SHA or branch")),
-		mcp.WithString("path", mcp.Description("only commits touching this path")),
+		tool.String("path", tool.Description("only commits touching this path")),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1), tool.Minimum(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30), mcp.Min(1)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30), tool.Minimum(1)),
 	)
 
-	GetCommitTool = mcp.NewTool(
+	GetCommitTool = tool.NewDefinition(
 		GetCommitToolName,
-		mcp.WithDescription("Get details for a single commit in a repository by its SHA."),
+		"Get details for a single commit in a repository by its SHA.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Get commit details")),
+		annotation.ReadOnly("Get commit details"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("sha", mcp.Required()),
+		tool.String("sha", tool.Required()),
 	)
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{
+	CommitTool.RegisterRead(tool.ServerTool{
 		Tool:    ListRepoCommitsTool,
 		Handler: ListRepoCommitsFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	CommitTool.RegisterRead(tool.ServerTool{
 		Tool:    GetCommitTool,
 		Handler: GetCommitFn,
 	})
 }
 
-func ListRepoCommitsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func ListRepoCommitsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -85,8 +87,7 @@ func ListRepoCommitsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	return to.TextResult(slimCommits(commits))
 }
 
-func GetCommitFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func GetCommitFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)

operation/repo/file.go

@@ -12,12 +12,15 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
+	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
+// FileTool holds the file-related tools (scope "file").
+var FileTool = tool.New("file")
+
 const (
 	GetFileToolName            = "get_file_contents"
 	GetDirToolName             = "get_dir_contents"
@@ -26,68 +29,68 @@ const (
 )
 
 var (
-	GetFileContentTool = mcp.NewTool(
+	GetFileContentTool = tool.NewDefinition(
 		GetFileToolName,
-		mcp.WithDescription("Get file content and metadata"),
+		"Get file content and metadata",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Get file content")),
+		annotation.ReadOnly("Get file content"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("ref", mcp.Required(), mcp.Description("branch, tag, or commit SHA")),
+		tool.String("ref", tool.Required(), tool.Description("branch, tag, or commit SHA")),
-		mcp.WithString("path", mcp.Required()),
+		tool.String("path", tool.Required()),
-		mcp.WithBoolean("withLines", mcp.Description("return numbered lines")),
+		tool.Boolean("withLines", tool.Description("return numbered lines")),
 	)
 
-	GetDirContentTool = mcp.NewTool(
+	GetDirContentTool = tool.NewDefinition(
 		GetDirToolName,
-		mcp.WithDescription("List the entries (files and subdirectories) in a repository directory at a given ref (branch, tag, or commit SHA)."),
+		"List the entries (files and subdirectories) in a repository directory at a given ref (branch, tag, or commit SHA).",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Get directory contents")),
+		annotation.ReadOnly("Get directory contents"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("ref", mcp.Required(), mcp.Description("branch, tag, or commit SHA")),
+		tool.String("ref", tool.Required(), tool.Description("branch, tag, or commit SHA")),
-		mcp.WithString("path", mcp.Required()),
+		tool.String("path", tool.Required()),
 	)
 
-	CreateOrUpdateFileTool = mcp.NewTool(
+	CreateOrUpdateFileTool = tool.NewDefinition(
 		CreateOrUpdateFileToolName,
-		mcp.WithDescription("Create or update a file (provide sha to update an existing file)."),
+		"Create or update a file (provide sha to update an existing file).",
-		mcp.WithToolAnnotation(annotation.Write("Create or update a file")),
+		annotation.Write("Create or update a file"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("path", mcp.Required()),
+		tool.String("path", tool.Required()),
-		mcp.WithString("content", mcp.Required()),
+		tool.String("content", tool.Required()),
-		mcp.WithString("message", mcp.Required(), mcp.Description("commit message")),
+		tool.String("message", tool.Required(), tool.Description("commit message")),
-		mcp.WithString("branch_name", mcp.Required()),
+		tool.String("branch_name", tool.Required()),
-		mcp.WithString("sha", mcp.Description("existing file SHA (omit to create)")),
+		tool.String("sha", tool.Description("existing file SHA (omit to create)")),
-		mcp.WithString("new_branch_name", mcp.Description("new branch (create only)")),
+		tool.String("new_branch_name", tool.Description("new branch (create only)")),
 	)
 
-	DeleteFileTool = mcp.NewTool(
+	DeleteFileTool = tool.NewDefinition(
 		DeleteFileToolName,
-		mcp.WithDescription("Delete a file from a repository by committing the removal to a branch. Requires the file's current SHA and a commit message."),
+		"Delete a file from a repository by committing the removal to a branch. Requires the file's current SHA and a commit message.",
-		mcp.WithToolAnnotation(annotation.Destructive("Delete a file")),
+		annotation.Destructive("Delete a file"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("path", mcp.Required()),
+		tool.String("path", tool.Required()),
-		mcp.WithString("message", mcp.Required(), mcp.Description("commit message")),
+		tool.String("message", tool.Required(), tool.Description("commit message")),
-		mcp.WithString("branch_name", mcp.Required()),
+		tool.String("branch_name", tool.Required()),
-		mcp.WithString("sha", mcp.Required()),
+		tool.String("sha", tool.Required()),
 	)
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{
+	FileTool.RegisterRead(tool.ServerTool{
 		Tool:    GetFileContentTool,
 		Handler: GetFileContentFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	FileTool.RegisterRead(tool.ServerTool{
 		Tool:    GetDirContentTool,
 		Handler: GetDirContentFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	FileTool.RegisterWrite(tool.ServerTool{
 		Tool:    CreateOrUpdateFileTool,
 		Handler: CreateOrUpdateFileFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	FileTool.RegisterWrite(tool.ServerTool{
 		Tool:    DeleteFileTool,
 		Handler: DeleteFileFn,
 	})
@@ -98,8 +101,7 @@ type ContentLine struct {
 	Content    string `json:"content"`
 }
 
-func GetFileContentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func GetFileContentFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -161,8 +163,7 @@ func GetFileContentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	return to.TextResult(slimContents(content))
 }
 
-func GetDirContentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func GetDirContentFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -187,8 +188,7 @@ func GetDirContentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	return to.TextResult(slimDirEntries(content))
 }
 
-func CreateOrUpdateFileFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func CreateOrUpdateFileFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -246,8 +246,7 @@ func CreateOrUpdateFileFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	return to.TextResult("Create file success")
 }
 
-func DeleteFileFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func DeleteFileFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)

operation/repo/release.go

@@ -8,12 +8,15 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
+	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
+// ReleaseTool holds the release-related tools (scope "release").
+var ReleaseTool = tool.New("release")
+
 const (
 	CreateReleaseToolName    = "create_release"
 	DeleteReleaseToolName    = "delete_release"
@@ -23,84 +26,83 @@ const (
 )
 
 var (
-	CreateReleaseTool = mcp.NewTool(
+	CreateReleaseTool = tool.NewDefinition(
 		CreateReleaseToolName,
-		mcp.WithDescription("Create a new release in a repository from a tag, optionally marking it as a draft or pre-release."),
+		"Create a new release in a repository from a tag, optionally marking it as a draft or pre-release.",
-		mcp.WithToolAnnotation(annotation.Write("Create a release")),
+		annotation.Write("Create a release"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("tag_name", mcp.Required()),
+		tool.String("tag_name", tool.Required()),
-		mcp.WithString("target", mcp.Required(), mcp.Description("commitish")),
+		tool.String("target", tool.Required(), tool.Description("commitish")),
-		mcp.WithString("title", mcp.Required()),
+		tool.String("title", tool.Required()),
-		mcp.WithBoolean("is_draft"),
+		tool.Boolean("is_draft"),
-		mcp.WithBoolean("is_pre_release"),
+		tool.Boolean("is_pre_release"),
-		mcp.WithString("body"),
+		tool.String("body"),
 	)
 
-	DeleteReleaseTool = mcp.NewTool(
+	DeleteReleaseTool = tool.NewDefinition(
 		DeleteReleaseToolName,
-		mcp.WithDescription("Delete a release from a repository by its numeric ID. This action is destructive and cannot be undone."),
+		"Delete a release from a repository by its numeric ID. This action is destructive and cannot be undone.",
-		mcp.WithToolAnnotation(annotation.Destructive("Delete a release")),
+		annotation.Destructive("Delete a release"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithNumber("id", mcp.Required()),
+		tool.Number("id", tool.Required()),
 	)
 
-	GetReleaseTool = mcp.NewTool(
+	GetReleaseTool = tool.NewDefinition(
 		GetReleaseToolName,
-		mcp.WithDescription("Get a release by ID"),
+		"Get a release by ID",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Get release details")),
+		annotation.ReadOnly("Get release details"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithNumber("id", mcp.Required()),
+		tool.Number("id", tool.Required()),
 	)
 
-	GetLatestReleaseTool = mcp.NewTool(
+	GetLatestReleaseTool = tool.NewDefinition(
 		GetLatestReleaseToolName,
-		mcp.WithDescription("Get the most recent published (non-draft) release in a repository."),
+		"Get the most recent published (non-draft) release in a repository.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Get latest release")),
+		annotation.ReadOnly("Get latest release"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
 	)
 
-	ListReleasesTool = mcp.NewTool(
+	ListReleasesTool = tool.NewDefinition(
 		ListReleasesToolName,
-		mcp.WithDescription("List releases in a repository, optionally filtered to drafts or pre-releases."),
+		"List releases in a repository, optionally filtered to drafts or pre-releases.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("List releases")),
+		annotation.ReadOnly("List releases"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithBoolean("is_draft"),
+		tool.Boolean("is_draft"),
-		mcp.WithBoolean("is_pre_release"),
+		tool.Boolean("is_pre_release"),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1), tool.Minimum(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(20), mcp.Min(1)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(20), tool.Minimum(1)),
 	)
 )
 
 func init() {
-	Tool.RegisterWrite(server.ServerTool{
+	ReleaseTool.RegisterWrite(tool.ServerTool{
 		Tool:    CreateReleaseTool,
 		Handler: CreateReleaseFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	ReleaseTool.RegisterWrite(tool.ServerTool{
 		Tool:    DeleteReleaseTool,
 		Handler: DeleteReleaseFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	ReleaseTool.RegisterRead(tool.ServerTool{
 		Tool:    GetReleaseTool,
 		Handler: GetReleaseFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	ReleaseTool.RegisterRead(tool.ServerTool{
 		Tool:    GetLatestReleaseTool,
 		Handler: GetLatestReleaseFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	ReleaseTool.RegisterRead(tool.ServerTool{
 		Tool:    ListReleasesTool,
 		Handler: ListReleasesFn,
 	})
 }
 
-func CreateReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func CreateReleaseFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -144,8 +146,7 @@ func CreateReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	return to.TextResult("Release Created")
 }
 
-func DeleteReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func DeleteReleaseFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -171,8 +172,7 @@ func DeleteReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	return to.TextResult("Release deleted successfully")
 }
 
-func GetReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func GetReleaseFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -198,8 +198,7 @@ func GetReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
 	return to.TextResult(slimRelease(release))
 }
 
-func GetLatestReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func GetLatestReleaseFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -221,8 +220,7 @@ func GetLatestReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	return to.TextResult(slimRelease(release))
 }
 
-func ListReleasesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func ListReleasesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)

operation/repo/repo.go

@@ -12,11 +12,10 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("repository")
 
 const (
 	CreateRepoToolName   = "create_repo"
@@ -26,74 +25,73 @@ const (
 )
 
 var (
-	CreateRepoTool = mcp.NewTool(
+	CreateRepoTool = tool.NewDefinition(
 		CreateRepoToolName,
-		mcp.WithDescription("Create a new Git repository, optionally under an organization (defaults to the authenticated user's account), with options for visibility, template, license, .gitignore, and initial README."),
+		"Create a new Git repository, optionally under an organization (defaults to the authenticated user's account), with options for visibility, template, license, .gitignore, and initial README.",
-		mcp.WithToolAnnotation(annotation.Write("Create a new repository")),
+		annotation.Write("Create a new repository"),
-		mcp.WithString("name", mcp.Required()),
+		tool.String("name", tool.Required()),
-		mcp.WithString("description"),
+		tool.String("description"),
-		mcp.WithBoolean("private"),
+		tool.Boolean("private"),
-		mcp.WithString("issue_labels"),
+		tool.String("issue_labels"),
-		mcp.WithBoolean("auto_init"),
+		tool.Boolean("auto_init"),
-		mcp.WithBoolean("template"),
+		tool.Boolean("template"),
-		mcp.WithString("gitignores"),
+		tool.String("gitignores"),
-		mcp.WithString("license"),
+		tool.String("license"),
-		mcp.WithString("readme"),
+		tool.String("readme"),
-		mcp.WithString("default_branch"),
+		tool.String("default_branch"),
-		mcp.WithString("trust_model", mcp.Enum("default", "collaborator", "committer", "collaboratorcommitter")),
+		tool.String("trust_model", tool.Enum("default", "collaborator", "committer", "collaboratorcommitter")),
-		mcp.WithString("object_format_name", mcp.Enum("sha1", "sha256")),
+		tool.String("object_format_name", tool.Enum("sha1", "sha256")),
-		mcp.WithString("organization", mcp.Description("defaults to personal account")),
+		tool.String("organization", tool.Description("defaults to personal account")),
 	)
 
-	ForkRepoTool = mcp.NewTool(
+	ForkRepoTool = tool.NewDefinition(
 		ForkRepoToolName,
-		mcp.WithDescription("Fork an existing repository into the authenticated user's account or a target organization, optionally under a new name."),
+		"Fork an existing repository into the authenticated user's account or a target organization, optionally under a new name.",
-		mcp.WithToolAnnotation(annotation.Write("Fork a repository")),
+		annotation.Write("Fork a repository"),
-		mcp.WithString("user", mcp.Required(), mcp.Description("owner of source repo")),
+		tool.String("user", tool.Required(), tool.Description("owner of source repo")),
-		mcp.WithString("repo", mcp.Required()),
+		tool.String("repo", tool.Required()),
-		mcp.WithString("organization", mcp.Description("target org")),
+		tool.String("organization", tool.Description("target org")),
-		mcp.WithString("name", mcp.Description("fork name")),
+		tool.String("name", tool.Description("fork name")),
 	)
 
-	ListMyReposTool = mcp.NewTool(
+	ListMyReposTool = tool.NewDefinition(
 		ListMyReposToolName,
-		mcp.WithDescription("List repositories owned by the authenticated user."),
+		"List repositories owned by the authenticated user.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("List my repositories")),
+		annotation.ReadOnly("List my repositories"),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1), tool.Minimum(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30), mcp.Min(1)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30), tool.Minimum(1)),
 	)
 
-	ListOrgReposTool = mcp.NewTool(
+	ListOrgReposTool = tool.NewDefinition(
 		ListOrgReposToolName,
-		mcp.WithDescription("List repositories belonging to an organization."),
+		"List repositories belonging to an organization.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("List organization repositories")),
+		annotation.ReadOnly("List organization repositories"),
-		mcp.WithString("org", mcp.Required()),
+		tool.String("org", tool.Required()),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1), tool.Minimum(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(100), mcp.Min(1)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(100), tool.Minimum(1)),
 	)
 )
 
 func init() {
-	Tool.RegisterWrite(server.ServerTool{
+	Tool.RegisterWrite(tool.ServerTool{
 		Tool:    CreateRepoTool,
 		Handler: CreateRepoFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	Tool.RegisterWrite(tool.ServerTool{
 		Tool:    ForkRepoTool,
 		Handler: ForkRepoFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    ListMyReposTool,
 		Handler: ListMyReposFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    ListOrgReposTool,
 		Handler: ListOrgReposFn,
 	})
 }
 
-func CreateRepoFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func CreateRepoFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	name, err := params.GetString(args, "name")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -145,8 +143,7 @@ func CreateRepoFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
 	return to.TextResult(slim.Repo(repo))
 }
 
-func ForkRepoFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func ForkRepoFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	user, err := params.GetString(args, "user")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -170,8 +167,8 @@ func ForkRepoFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResu
 	return to.TextResult("Fork success")
 }
 
-func ListMyReposFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func ListMyReposFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 	opt := gitea_sdk.ListReposOptions{
 		ListOptions: gitea_sdk.ListOptions{
 			Page:     page,
@@ -190,12 +187,12 @@ func ListMyReposFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolR
 	return to.TextResult(slim.Repos(repos))
 }
 
-func ListOrgReposFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func ListOrgReposFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	org, err := params.GetString(req.GetArguments(), "org")
+	org, err := params.GetString(args, "org")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, pageSize := params.GetPagination(req.GetArguments(), 100)
+	page, pageSize := params.GetPagination(args, 100)
 	opt := gitea_sdk.ListOrgReposOptions{
 		ListOptions: gitea_sdk.ListOptions{
 			Page:     page,

operation/repo/tag.go

@@ -8,12 +8,15 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
+	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
+// TagTool holds the tag-related tools (scope "tag").
+var TagTool = tool.New("tag")
+
 const (
 	CreateTagToolName = "create_tag"
 	DeleteTagToolName = "delete_tag"
@@ -22,67 +25,66 @@ const (
 )
 
 var (
-	CreateTagTool = mcp.NewTool(
+	CreateTagTool = tool.NewDefinition(
 		CreateTagToolName,
-		mcp.WithDescription("Create a new Git tag in a repository at a target commit, branch, or existing tag, with an optional annotation message."),
+		"Create a new Git tag in a repository at a target commit, branch, or existing tag, with an optional annotation message.",
-		mcp.WithToolAnnotation(annotation.Write("Create a tag")),
+		annotation.Write("Create a tag"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("tag_name", mcp.Required()),
+		tool.String("tag_name", tool.Required()),
-		mcp.WithString("target", mcp.Description("commitish")),
+		tool.String("target", tool.Description("commitish")),
-		mcp.WithString("message", mcp.Description("tag message")),
+		tool.String("message", tool.Description("tag message")),
 	)
 
-	DeleteTagTool = mcp.NewTool(
+	DeleteTagTool = tool.NewDefinition(
 		DeleteTagToolName,
-		mcp.WithDescription("Permanently delete a tag from a repository. This action is destructive and cannot be undone."),
+		"Permanently delete a tag from a repository. This action is destructive and cannot be undone.",
-		mcp.WithToolAnnotation(annotation.Destructive("Delete a tag")),
+		annotation.Destructive("Delete a tag"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("tag_name", mcp.Required()),
+		tool.String("tag_name", tool.Required()),
 	)
 
-	GetTagTool = mcp.NewTool(
+	GetTagTool = tool.NewDefinition(
 		GetTagToolName,
-		mcp.WithDescription("Get details for a single tag in a repository by name."),
+		"Get details for a single tag in a repository by name.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Get tag details")),
+		annotation.ReadOnly("Get tag details"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("tag_name", mcp.Required()),
+		tool.String("tag_name", tool.Required()),
 	)
 
-	ListTagsTool = mcp.NewTool(
+	ListTagsTool = tool.NewDefinition(
 		ListTagsToolName,
-		mcp.WithDescription("List all tags in a repository, paginated."),
+		"List all tags in a repository, paginated.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("List tags")),
+		annotation.ReadOnly("List tags"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1), tool.Minimum(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(20), mcp.Min(1)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(20), tool.Minimum(1)),
 	)
 )
 
 func init() {
-	Tool.RegisterWrite(server.ServerTool{
+	TagTool.RegisterWrite(tool.ServerTool{
 		Tool:    CreateTagTool,
 		Handler: CreateTagFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	TagTool.RegisterWrite(tool.ServerTool{
 		Tool:    DeleteTagTool,
 		Handler: DeleteTagFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	TagTool.RegisterRead(tool.ServerTool{
 		Tool:    GetTagTool,
 		Handler: GetTagFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	TagTool.RegisterRead(tool.ServerTool{
 		Tool:    ListTagsTool,
 		Handler: ListTagsFn,
 	})
 }
 
-func CreateTagFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func CreateTagFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -114,8 +116,7 @@ func CreateTagFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRes
 	return to.TextResult("Tag Created")
 }
 
-func DeleteTagFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func DeleteTagFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -141,8 +142,7 @@ func DeleteTagFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRes
 	return to.TextResult("Tag deleted")
 }
 
-func GetTagFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func GetTagFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -168,8 +168,7 @@ func GetTagFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult
 	return to.TextResult(slimTag(tag))
 }
 
-func ListTagsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func ListTagsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)

operation/repo/tree.go

@@ -8,37 +8,36 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
+	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
 const (
 	GetRepoTreeToolName = "get_repository_tree"
 )
 
-var GetRepoTreeTool = mcp.NewTool(
+var GetRepoTreeTool = tool.NewDefinition(
 	GetRepoTreeToolName,
-	mcp.WithDescription("Get the file tree of a repository at a given ref (SHA, branch, or tag), optionally recursively."),
+	"Get the file tree of a repository at a given ref (SHA, branch, or tag), optionally recursively.",
-	mcp.WithToolAnnotation(annotation.ReadOnly("Get repository file tree")),
+	annotation.ReadOnly("Get repository file tree"),
-	mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+	tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-	mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+	tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-	mcp.WithString("tree_sha", mcp.Required(), mcp.Description("SHA, branch, or tag")),
+	tool.String("tree_sha", tool.Required(), tool.Description("SHA, branch, or tag")),
-	mcp.WithBoolean("recursive"),
+	tool.Boolean("recursive"),
-	mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+	tool.Number("page", tool.Description(params.PageDesc), tool.Default(1)),
-	mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+	tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30)),
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    GetRepoTreeTool,
 		Handler: GetRepoTreeFn,
 	})
 }
 
-func GetRepoTreeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func GetRepoTreeFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)

operation/repo/tree_test.go

@@ -44,8 +44,10 @@ func TestSlimTreeNil(t *testing.T) {
 }
 
 func TestGetRepoTreeToolRequired(t *testing.T) {
+	inputSchema := GetRepoTreeTool.InputSchema.(map[string]any)
+	required, _ := inputSchema["required"].([]string)
 	for _, field := range []string{"owner", "repo", "tree_sha"} {
-		if !slices.Contains(GetRepoTreeTool.InputSchema.Required, field) {
+		if !slices.Contains(required, field) {
 			t.Errorf("expected %q to be required", field)
 		}
 	}

operation/sdk_integration_test.go

@@ -0,0 +1,404 @@
+package operation
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"sync"
+	"testing"
+	"time"
+
+	mcpContext "gitea.com/gitea/gitea-mcp/pkg/context"
+	"gitea.com/gitea/gitea-mcp/pkg/flag"
+
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+// Pin negotiated versions so SDK upgrades require compatibility review.
+const (
+	testServerVersion                   = "test-version"
+	expectedProtocolVersion             = "2026-07-28"
+	expectedStatefulHTTPProtocolVersion = "2025-11-25"
+)
+
+func exposeAllTools(t *testing.T) {
+	t.Helper()
+	originalReadOnly := flag.ReadOnly
+	originalAllowedTools := flag.AllowedTools
+	originalAllowedScopes := flag.AllowedScopes
+	originalVersion := flag.Version
+	t.Cleanup(func() {
+		flag.ReadOnly = originalReadOnly
+		flag.AllowedTools = originalAllowedTools
+		flag.AllowedScopes = originalAllowedScopes
+		flag.Version = originalVersion
+	})
+	flag.ReadOnly = false
+	flag.AllowedTools = nil
+	flag.AllowedScopes = nil
+	flag.Version = testServerVersion
+}
+
+// registeredToolCount is what the registry exposes under the current flags, so
+// the transport assertions track tool additions without being edited.
+func registeredToolCount() int {
+	count := 0
+	for _, domain := range domainTools {
+		count += len(domain.Tools())
+	}
+	return count
+}
+
+// stdioCommandEnvironment removes variables that override subprocess flags.
+func stdioCommandEnvironment() []string {
+	environment := os.Environ()
+	filtered := make([]string, 0, len(environment))
+	for _, entry := range environment {
+		name, _, _ := strings.Cut(entry, "=")
+		switch name {
+		case "GITEA_READONLY", "GITEA_SCOPES", "GITEA_TOOLS", "MCP_MODE":
+			continue
+		}
+		filtered = append(filtered, entry)
+	}
+	return filtered
+}
+
+func textContent(t *testing.T, result *mcp.CallToolResult) string {
+	t.Helper()
+	if len(result.Content) != 1 {
+		t.Fatalf("content count = %d, want 1", len(result.Content))
+	}
+	content, ok := result.Content[0].(*mcp.TextContent)
+	if !ok {
+		t.Fatalf("content type = %T, want *mcp.TextContent", result.Content[0])
+	}
+	return content.Text
+}
+
+// listAndCallVersion is the round trip every transport must support. wantText
+// differs per transport: the stdio subprocess resolves its version from the VCS
+// build info (main.go:14), so only the in-process servers have a known one.
+func listAndCallVersion(ctx context.Context, t *testing.T, session *mcp.ClientSession, wantText string) {
+	t.Helper()
+	result, err := session.ListTools(ctx, nil)
+	if err != nil {
+		t.Fatalf("ListTools() error = %v", err)
+	}
+	if want := registeredToolCount(); len(result.Tools) != want {
+		t.Fatalf("ListTools() count = %d, want %d", len(result.Tools), want)
+	}
+	callResult, err := session.CallTool(ctx, &mcp.CallToolParams{
+		Name: "get_gitea_mcp_server_version",
+	})
+	if err != nil {
+		t.Fatalf("CallTool() error = %v", err)
+	}
+	if got := textContent(t, callResult); !strings.Contains(got, wantText) {
+		t.Errorf("version tool result = %q, want it to contain %q", got, wantText)
+	}
+}
+
+func TestOfficialSDKInMemory(t *testing.T) {
+	exposeAllTools(t)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	serverTransport, clientTransport := mcp.NewInMemoryTransports()
+	server := newMCPServer(testServerVersion)
+	RegisterTool(server)
+	serverDone := make(chan error, 1)
+	go func() {
+		serverDone <- server.Run(ctx, serverTransport)
+	}()
+
+	client := mcp.NewClient(&mcp.Implementation{Name: "gitea-mcp-test", Version: "1"}, nil)
+	session, err := client.Connect(ctx, clientTransport, nil)
+	if err != nil {
+		t.Fatalf("Connect() error = %v", err)
+	}
+	if got := session.InitializeResult().ProtocolVersion; got != expectedProtocolVersion {
+		t.Errorf("protocol version = %q, want %q", got, expectedProtocolVersion)
+	}
+	listAndCallVersion(ctx, t, session, testServerVersion)
+	if err := session.Close(); err != nil {
+		t.Fatalf("Close() error = %v", err)
+	}
+	select {
+	case err := <-serverDone:
+		if err != nil && !errors.Is(err, context.Canceled) {
+			t.Fatalf("server Run() error = %v", err)
+		}
+	case <-ctx.Done():
+		t.Fatal("server did not stop after the client session closed")
+	}
+}
+
+func TestStreamableHTTPStateful(t *testing.T) {
+	exposeAllTools(t)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	server := newMCPServer(testServerVersion)
+	RegisterTool(server)
+	httpTestServer := httptest.NewServer(newHTTPServer("", server).Handler)
+	defer httpTestServer.Close()
+
+	client := mcp.NewClient(&mcp.Implementation{Name: "gitea-mcp-http-test", Version: "1"}, nil)
+	session, err := client.Connect(ctx, &mcp.StreamableClientTransport{
+		Endpoint:             httpTestServer.URL + "/mcp",
+		HTTPClient:           httpTestServer.Client(),
+		DisableStandaloneSSE: true,
+		MaxRetries:           -1,
+	}, nil)
+	if err != nil {
+		t.Fatalf("Connect() error = %v", err)
+	}
+	defer session.Close()
+	// Stateful Streamable HTTP cannot negotiate the sessionless 2026 protocol.
+	if got := session.InitializeResult().ProtocolVersion; got != expectedStatefulHTTPProtocolVersion {
+		t.Errorf("protocol version = %q, want %q", got, expectedStatefulHTTPProtocolVersion)
+	}
+	listAndCallVersion(ctx, t, session, testServerVersion)
+
+	response, err := httpTestServer.Client().Get(httpTestServer.URL + "/not-mcp")
+	if err != nil {
+		t.Fatalf("GET outside /mcp error = %v", err)
+	}
+	defer response.Body.Close()
+	if response.StatusCode != http.StatusNotFound {
+		t.Errorf("GET outside /mcp status = %d, want %d", response.StatusCode, http.StatusNotFound)
+	}
+}
+
+// spaceReader yields an endless run of spaces, so oversized bodies can be sent
+// without allocating them.
+type spaceReader struct{}
+
+func (spaceReader) Read(p []byte) (int, error) {
+	for index := range p {
+		p[index] = ' '
+	}
+	return len(p), nil
+}
+
+func TestStreamableHTTPRequestBodyLimit(t *testing.T) {
+	server := newMCPServer(testServerVersion)
+	httpTestServer := httptest.NewServer(newHTTPServer("", server).Handler)
+	defer httpTestServer.Close()
+
+	for _, test := range []struct {
+		name     string
+		size     int64
+		tooLarge bool
+	}{
+		{name: "above the SDK default", size: mcp.DefaultMaxRequestBodyBytes + 1},
+		{name: "above our own limit", size: maxRequestBodyBytes + 1, tooLarge: true},
+	} {
+		t.Run(test.name, func(t *testing.T) {
+			request, err := http.NewRequest(http.MethodPost, httpTestServer.URL+"/mcp", io.LimitReader(spaceReader{}, test.size))
+			if err != nil {
+				t.Fatalf("NewRequest() error = %v", err)
+			}
+			request.ContentLength = test.size
+			request.Header.Set("Content-Type", "application/json")
+			request.Header.Set("Accept", "application/json, text/event-stream")
+			response, err := httpTestServer.Client().Do(request)
+			if err != nil {
+				t.Fatalf("POST %d bytes error = %v", test.size, err)
+			}
+			defer response.Body.Close()
+			if gotTooLarge := response.StatusCode == http.StatusRequestEntityTooLarge; gotTooLarge != test.tooLarge {
+				t.Errorf("POST %d bytes status = %d, want %d = %v", test.size, response.StatusCode, http.StatusRequestEntityTooLarge, test.tooLarge)
+			}
+		})
+	}
+}
+
+type authorizationTransport struct {
+	base  http.RoundTripper
+	mu    sync.RWMutex
+	value string
+}
+
+func (t *authorizationTransport) set(value string) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	t.value = value
+}
+
+func (t *authorizationTransport) RoundTrip(request *http.Request) (*http.Response, error) {
+	clone := request.Clone(request.Context()) // Clone already copies the header
+	t.mu.RLock()
+	value := t.value
+	t.mu.RUnlock()
+	if value != "" {
+		clone.Header.Set("Authorization", value)
+	}
+	return t.base.RoundTrip(clone)
+}
+
+func authContextValue(ctx context.Context, session *mcp.ClientSession) (string, error) {
+	result, err := session.CallTool(ctx, &mcp.CallToolParams{Name: "test_auth_context"})
+	if err != nil {
+		return "", err
+	}
+	if len(result.Content) != 1 {
+		return "", fmt.Errorf("content count = %d, want 1", len(result.Content))
+	}
+	content, ok := result.Content[0].(*mcp.TextContent)
+	if !ok {
+		return "", fmt.Errorf("content type = %T, want *mcp.TextContent", result.Content[0])
+	}
+	return content.Text, nil
+}
+
+func TestHTTPAuthPerRequest(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	server := newMCPServer(testServerVersion)
+	server.AddTool(
+		&mcp.Tool{
+			Name:        "test_auth_context",
+			Description: "Return the request-scoped authentication token.",
+			InputSchema: map[string]any{"type": "object", "properties": map[string]any{}},
+		},
+		func(ctx context.Context, _ *mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+			token, _ := ctx.Value(mcpContext.TokenContextKey).(string)
+			return &mcp.CallToolResult{
+				Content: []mcp.Content{&mcp.TextContent{Text: token}},
+			}, nil
+		},
+	)
+	httpTestServer := httptest.NewServer(newHTTPServer("", server).Handler)
+	defer httpTestServer.Close()
+
+	baseTransport := httpTestServer.Client().Transport
+	auth := &authorizationTransport{base: baseTransport}
+	auth.set("Bearer first-token")
+	baseClient := &http.Client{Transport: auth}
+	client := mcp.NewClient(&mcp.Implementation{Name: "gitea-mcp-auth-test", Version: "1"}, nil)
+	session, err := client.Connect(ctx, &mcp.StreamableClientTransport{
+		Endpoint:             httpTestServer.URL + "/mcp",
+		HTTPClient:           baseClient,
+		DisableStandaloneSSE: true,
+		MaxRetries:           -1,
+	}, nil)
+	if err != nil {
+		t.Fatalf("Connect() error = %v", err)
+	}
+	defer session.Close()
+
+	for _, test := range []struct {
+		header string
+		want   string
+	}{
+		{header: "Bearer first-token", want: "first-token"},
+		{header: "token second-token", want: "second-token"},
+		{header: "Basic ignored", want: ""},
+	} {
+		auth.set(test.header)
+		token, err := authContextValue(ctx, session)
+		if err != nil {
+			t.Fatalf("CallTool() with %q error = %v", test.header, err)
+		}
+		if token != test.want {
+			t.Errorf("CallTool() token = %q, want %q", token, test.want)
+		}
+	}
+
+	type authenticatedSession struct {
+		session *mcp.ClientSession
+		want    string
+	}
+	concurrentSessions := make([]authenticatedSession, 0, 2)
+	for index, token := range []string{"parallel-one", "parallel-two"} {
+		transport := &authorizationTransport{base: baseTransport}
+		transport.set("Bearer " + token)
+		httpClient := &http.Client{Transport: transport}
+		parallelClient := mcp.NewClient(&mcp.Implementation{
+			Name:    fmt.Sprintf("gitea-mcp-auth-parallel-%d", index),
+			Version: "1",
+		}, nil)
+		parallelSession, err := parallelClient.Connect(ctx, &mcp.StreamableClientTransport{
+			Endpoint:             httpTestServer.URL + "/mcp",
+			HTTPClient:           httpClient,
+			DisableStandaloneSSE: true,
+			MaxRetries:           -1,
+		}, nil)
+		if err != nil {
+			t.Fatalf("parallel Connect() error = %v", err)
+		}
+		defer parallelSession.Close()
+		concurrentSessions = append(concurrentSessions, authenticatedSession{session: parallelSession, want: token})
+	}
+
+	var waitGroup sync.WaitGroup
+	errorsCh := make(chan error, 20)
+	for _, authenticated := range concurrentSessions {
+		for range 10 {
+			waitGroup.Go(func() {
+				got, err := authContextValue(ctx, authenticated.session)
+				if err != nil {
+					errorsCh <- err
+					return
+				}
+				if got != authenticated.want {
+					errorsCh <- fmt.Errorf("parallel token = %q, want %q", got, authenticated.want)
+				}
+			})
+		}
+	}
+	waitGroup.Wait()
+	close(errorsCh)
+	for err := range errorsCh {
+		t.Error(err)
+	}
+}
+
+func TestStdioCommandTransport(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping subprocess build in short mode")
+	}
+	for name, value := range map[string]string{
+		"GITEA_READONLY": "true",
+		"GITEA_SCOPES":   "user",
+		"GITEA_TOOLS":    "get_me",
+		"MCP_MODE":       "http",
+	} {
+		t.Setenv(name, value)
+	}
+	exposeAllTools(t)
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
+
+	binary := filepath.Join(t.TempDir(), "gitea-mcp")
+	build := exec.CommandContext(ctx, "go", "build", "-o", binary, "..")
+	if output, err := build.CombinedOutput(); err != nil {
+		t.Fatalf("build stdio test binary: %v\n%s", err, output)
+	}
+
+	client := mcp.NewClient(&mcp.Implementation{Name: "gitea-mcp-stdio-test", Version: "1"}, nil)
+	command := exec.CommandContext(ctx, binary, "--transport", "stdio")
+	command.Env = stdioCommandEnvironment()
+	session, err := client.Connect(ctx, &mcp.CommandTransport{
+		Command:           command,
+		TerminateDuration: 2 * time.Second,
+	}, nil)
+	if err != nil {
+		t.Fatalf("Connect() error = %v", err)
+	}
+	defer session.Close()
+	if got := session.InitializeResult().ProtocolVersion; got != expectedProtocolVersion {
+		t.Errorf("protocol version = %q, want %q", got, expectedProtocolVersion)
+	}
+	listAndCallVersion(ctx, t, session, "Gitea MCP Server version:")
+}

operation/search/search.go

@@ -13,11 +13,10 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("search")
 
 const (
 	SearchUsersToolName    = "search_users"
@@ -27,81 +26,81 @@ const (
 )
 
 var (
-	SearchUsersTool = mcp.NewTool(
+	SearchUsersTool = tool.NewDefinition(
 		SearchUsersToolName,
-		mcp.WithDescription("Search for Gitea users by username or full name."),
+		"Search for Gitea users by username or full name.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Search users")),
+		annotation.ReadOnly("Search users"),
-		mcp.WithString("query", mcp.Required()),
+		tool.String("query", tool.Required()),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30)),
 	)
 
-	SearOrgTeamsTool = mcp.NewTool(
+	SearOrgTeamsTool = tool.NewDefinition(
 		SearchOrgTeamsToolName,
-		mcp.WithDescription("Search for teams within an organization by name, optionally including each team's description in the results."),
+		"Search for teams within an organization by name, optionally including each team's description in the results.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Search organization teams")),
+		annotation.ReadOnly("Search organization teams"),
-		mcp.WithString("org", mcp.Required()),
+		tool.String("org", tool.Required()),
-		mcp.WithString("query", mcp.Required()),
+		tool.String("query", tool.Required()),
-		mcp.WithBoolean("includeDescription"),
+		tool.Boolean("includeDescription"),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30)),
 	)
 
-	SearchReposTool = mcp.NewTool(
+	SearchReposTool = tool.NewDefinition(
 		SearchReposToolName,
-		mcp.WithDescription("Search for repositories by keyword, with filters for topic/description matching, owner, visibility, archived status, and sort order."),
+		"Search for repositories by keyword, with filters for topic/description matching, owner, visibility, archived status, and sort order.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Search repositories")),
+		annotation.ReadOnly("Search repositories"),
-		mcp.WithString("query", mcp.Required()),
+		tool.String("query", tool.Required()),
-		mcp.WithBoolean("keywordIsTopic"),
+		tool.Boolean("keywordIsTopic"),
-		mcp.WithBoolean("keywordInDescription"),
+		tool.Boolean("keywordInDescription"),
-		mcp.WithNumber("ownerID"),
+		tool.Number("ownerID"),
-		mcp.WithBoolean("isPrivate"),
+		tool.Boolean("isPrivate"),
-		mcp.WithBoolean("isArchived"),
+		tool.Boolean("isArchived"),
-		mcp.WithString("sort"),
+		tool.String("sort"),
-		mcp.WithString("order"),
+		tool.String("order"),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30)),
 	)
 
-	SearchIssuesTool = mcp.NewTool(
+	SearchIssuesTool = tool.NewDefinition(
 		SearchIssuesToolName,
-		mcp.WithDescription("Search issues and PRs across repositories"),
+		"Search issues and PRs across repositories",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Search issues")),
+		annotation.ReadOnly("Search issues"),
-		mcp.WithString("query", mcp.Required()),
+		tool.String("query", tool.Required()),
-		mcp.WithString("state", mcp.Enum("open", "closed", "all")),
+		tool.String("state", tool.Enum("open", "closed", "all")),
-		mcp.WithString("type", mcp.Enum("issues", "pulls")),
+		tool.String("type", tool.Enum("issues", "pulls")),
-		mcp.WithString("labels", mcp.Description("comma-separated")),
+		tool.String("labels", tool.Description("comma-separated")),
-		mcp.WithString("owner", mcp.Description("filter by owner")),
+		tool.String("owner", tool.Description("filter by owner")),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30)),
 	)
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    SearchUsersTool,
 		Handler: UsersFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    SearOrgTeamsTool,
 		Handler: OrgTeamsFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    SearchReposTool,
 		Handler: ReposFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    SearchIssuesTool,
 		Handler: IssuesFn,
 	})
 }
 
-func UsersFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func UsersFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	keyword, err := params.GetString(req.GetArguments(), "query")
+	keyword, err := params.GetString(args, "query")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 	opt := gitea_sdk.SearchUsersOption{
 		KeyWord: keyword,
 		ListOptions: gitea_sdk.ListOptions{
@@ -120,17 +119,17 @@ func UsersFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult,
 	return to.TextResult(slimUserDetails(users))
 }
 
-func OrgTeamsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func OrgTeamsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	org, err := params.GetString(req.GetArguments(), "org")
+	org, err := params.GetString(args, "org")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	query, err := params.GetString(req.GetArguments(), "query")
+	query, err := params.GetString(args, "query")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	includeDescription, _ := req.GetArguments()["includeDescription"].(bool)
+	includeDescription, _ := args["includeDescription"].(bool)
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 	opt := gitea_sdk.SearchTeamsOptions{
 		Query:              query,
 		IncludeDescription: includeDescription,
@@ -150,12 +149,11 @@ func OrgTeamsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResu
 	return to.TextResult(slimTeams(teams))
 }
 
-func ReposFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func ReposFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	keyword, err := params.GetString(req.GetArguments(), "query")
+	keyword, err := params.GetString(args, "query")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	args := req.GetArguments()
 	keywordIsTopic, _ := args["keywordIsTopic"].(bool)
 	keywordInDescription, _ := args["keywordInDescription"].(bool)
 	sort, _ := args["sort"].(string)
@@ -186,8 +184,7 @@ func ReposFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult,
 	return to.TextResult(slim.Repos(repos))
 }
 
-func IssuesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func IssuesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	query, err := params.GetString(args, "query")
 	if err != nil {
 		return to.ErrorResult(err)

operation/search/search_test.go

@@ -4,13 +4,13 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 
 func TestSearchToolsRequiredFields(t *testing.T) {
 	tests := []struct {
 		name     string
-		tool     mcp.Tool
+		tool     *mcp.Tool
 		required []string
 	}{
 		{
@@ -32,9 +32,11 @@ func TestSearchToolsRequiredFields(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			inputSchema := tt.tool.InputSchema.(map[string]any)
+			required, _ := inputSchema["required"].([]string)
 			for _, field := range tt.required {
-				if !slices.Contains(tt.tool.InputSchema.Required, field) {
+				if !slices.Contains(required, field) {
-					t.Errorf("tool %s: expected %q to be required, got required=%v", tt.name, field, tt.tool.InputSchema.Required)
+					t.Errorf("tool %s: expected %q to be required, got required=%v", tt.name, field, required)
 				}
 			}
 		})

operation/search/slim_test.go

@@ -48,7 +48,9 @@ func TestSlimIssues(t *testing.T) {
 }
 
 func TestSearchIssuesToolRequired(t *testing.T) {
-	if !slices.Contains(SearchIssuesTool.InputSchema.Required, "query") {
+	inputSchema := SearchIssuesTool.InputSchema.(map[string]any)
+	required, _ := inputSchema["required"].([]string)
+	if !slices.Contains(required, "query") {
 		t.Error("search_issues should require query")
 	}
 }

operation/timetracking/timetracking.go

@@ -12,11 +12,10 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("timetracking")
 
 const (
 	TimetrackingReadToolName  = "timetracking_read"
@@ -24,86 +23,86 @@ const (
 )
 
 var (
-	TimetrackingReadTool = mcp.NewTool(
+	TimetrackingReadTool = tool.NewDefinition(
 		TimetrackingReadToolName,
-		mcp.WithDescription("Read time tracking: issue times, repo times, active stopwatches, your tracked times."),
+		"Read time tracking: issue times, repo times, active stopwatches, your tracked times.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Read tracked time")),
+		annotation.ReadOnly("Read tracked time"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("list_issue_times", "list_repo_times", "get_my_stopwatches", "get_my_times")),
+		tool.String("method", tool.Required(), tool.Enum("list_issue_times", "list_repo_times", "get_my_stopwatches", "get_my_times")),
-		mcp.WithString("owner", mcp.Description("for list_* methods")),
+		tool.String("owner", tool.Description("for list_* methods")),
-		mcp.WithString("repo", mcp.Description("for list_* methods")),
+		tool.String("repo", tool.Description("for list_* methods")),
-		mcp.WithNumber("issue_number", mcp.Description("for 'list_issue_times'")),
+		tool.Number("issue_number", tool.Description("for 'list_issue_times'")),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30)),
 	)
 
-	TimetrackingWriteTool = mcp.NewTool(
+	TimetrackingWriteTool = tool.NewDefinition(
 		TimetrackingWriteToolName,
-		mcp.WithDescription("Write time tracking: stopwatches and entries."),
+		"Write time tracking: stopwatches and entries.",
-		mcp.WithToolAnnotation(annotation.Write("Add or manage tracked time")),
+		annotation.Write("Add or manage tracked time"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("start_stopwatch", "stop_stopwatch", "delete_stopwatch", "add_time", "delete_time")),
+		tool.String("method", tool.Required(), tool.Enum("start_stopwatch", "stop_stopwatch", "delete_stopwatch", "add_time", "delete_time")),
-		mcp.WithString("owner", mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Description(params.RepoDesc)),
-		mcp.WithNumber("issue_number"),
+		tool.Number("issue_number"),
-		mcp.WithNumber("time", mcp.Description("seconds (for 'add_time')")),
+		tool.Number("time", tool.Description("seconds (for 'add_time')")),
-		mcp.WithNumber("id", mcp.Description("entry ID (for 'delete_time')")),
+		tool.Number("id", tool.Description("entry ID (for 'delete_time')")),
 	)
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{Tool: TimetrackingReadTool, Handler: readFn})
+	Tool.RegisterRead(tool.ServerTool{Tool: TimetrackingReadTool, Handler: readFn})
-	Tool.RegisterWrite(server.ServerTool{Tool: TimetrackingWriteTool, Handler: writeFn})
+	Tool.RegisterWrite(tool.ServerTool{Tool: TimetrackingWriteTool, Handler: writeFn})
 }
 
-func readFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func readFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	method, err := params.GetString(req.GetArguments(), "method")
+	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "list_issue_times":
-		return listTrackedTimesFn(ctx, req)
+		return listTrackedTimesFn(ctx, args)
 	case "list_repo_times":
-		return listRepoTimesFn(ctx, req)
+		return listRepoTimesFn(ctx, args)
 	case "get_my_stopwatches":
-		return getMyStopwatchesFn(ctx, req)
+		return getMyStopwatchesFn(ctx, args)
 	case "get_my_times":
-		return getMyTimesFn(ctx, req)
+		return getMyTimesFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func writeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func writeFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	method, err := params.GetString(req.GetArguments(), "method")
+	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "start_stopwatch":
-		return startStopwatchFn(ctx, req)
+		return startStopwatchFn(ctx, args)
 	case "stop_stopwatch":
-		return stopStopwatchFn(ctx, req)
+		return stopStopwatchFn(ctx, args)
 	case "delete_stopwatch":
-		return deleteStopwatchFn(ctx, req)
+		return deleteStopwatchFn(ctx, args)
 	case "add_time":
-		return addTrackedTimeFn(ctx, req)
+		return addTrackedTimeFn(ctx, args)
 	case "delete_time":
-		return deleteTrackedTimeFn(ctx, req)
+		return deleteTrackedTimeFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func startStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func startStopwatchFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "issue_number")
+	index, err := params.GetIndex(args, "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -118,16 +117,16 @@ func startStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	return to.TextResult(fmt.Sprintf("Stopwatch started on issue %s/%s#%d", owner, repo, index))
 }
 
-func stopStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func stopStopwatchFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "issue_number")
+	index, err := params.GetIndex(args, "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -142,16 +141,16 @@ func stopStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	return to.TextResult(fmt.Sprintf("Stopwatch stopped on issue %s/%s#%d - time recorded", owner, repo, index))
 }
 
-func deleteStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func deleteStopwatchFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "issue_number")
+	index, err := params.GetIndex(args, "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -166,7 +165,7 @@ func deleteStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	return to.TextResult(fmt.Sprintf("Stopwatch deleted/cancelled on issue %s/%s#%d", owner, repo, index))
 }
 
-func getMyStopwatchesFn(ctx context.Context, _ mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getMyStopwatchesFn(ctx context.Context, _ map[string]any) (*mcp.CallToolResult, error) {
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
@@ -181,20 +180,20 @@ func getMyStopwatchesFn(ctx context.Context, _ mcp.CallToolRequest) (*mcp.CallTo
 	return to.TextResult(slimStopWatches(stopwatches))
 }
 
-func listTrackedTimesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listTrackedTimesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "issue_number")
+	index, err := params.GetIndex(args, "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
@@ -215,21 +214,21 @@ func listTrackedTimesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	return to.TextResult(slimTrackedTimes(times))
 }
 
-func addTrackedTimeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func addTrackedTimeFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "issue_number")
+	index, err := params.GetIndex(args, "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 
-	timeSeconds, err := params.GetIndex(req.GetArguments(), "time")
+	timeSeconds, err := params.GetIndex(args, "time")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -246,21 +245,21 @@ func addTrackedTimeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	return to.TextResult(slimTrackedTime(trackedTime))
 }
 
-func deleteTrackedTimeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func deleteTrackedTimeFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 
-	index, err := params.GetIndex(req.GetArguments(), "issue_number")
+	index, err := params.GetIndex(args, "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	id, err := params.GetIndex(req.GetArguments(), "id")
+	id, err := params.GetIndex(args, "id")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -275,17 +274,17 @@ func deleteTrackedTimeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Cal
 	return to.TextResult(fmt.Sprintf("Tracked time entry %d deleted from issue %s/%s#%d", id, owner, repo, index))
 }
 
-func listRepoTimesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listRepoTimesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(req.GetArguments(), "owner")
+	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	repo, err := params.GetString(req.GetArguments(), "repo")
+	repo, err := params.GetString(args, "repo")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
@@ -305,7 +304,7 @@ func listRepoTimesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	return to.TextResult(slimTrackedTimes(times))
 }
 
-func getMyTimesFn(ctx context.Context, _ mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getMyTimesFn(ctx context.Context, _ map[string]any) (*mcp.CallToolResult, error) {
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))

operation/tool_contract_test.go

@@ -0,0 +1,142 @@
+package operation
+
+import (
+	"encoding/json"
+	"slices"
+	"testing"
+
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+// TestToolContract checks the properties every exposed tool must hold, rather
+// than a snapshot of the current surface, so adding a tool needs no fixture
+// update and a malformed schema fails here instead of panicking in AddTool.
+func TestToolContract(t *testing.T) {
+	scopeByName := map[string]string{}
+	seenScopes := map[string]struct{}{}
+	for _, domain := range domainTools {
+		scope := domain.Scope()
+		if scope == "" {
+			t.Error("domainTools contains a domain with an empty scope")
+		}
+		// Tools() filters one domain by exactly one scope name, so a shared
+		// scope would make --scope select more than the caller asked for.
+		if _, duplicate := seenScopes[scope]; duplicate {
+			t.Errorf("domainTools contains a duplicate scope %q", scope)
+		}
+		seenScopes[scope] = struct{}{}
+
+		for _, registered := range domain.ReadTools() {
+			assertToolContract(t, scope, registered.Tool, true, scopeByName)
+		}
+		for _, registered := range domain.WriteTools() {
+			assertToolContract(t, scope, registered.Tool, false, scopeByName)
+		}
+	}
+	if len(scopeByName) == 0 {
+		t.Fatal("no tools are registered")
+	}
+}
+
+func assertToolContract(t *testing.T, scope string, definition *mcp.Tool, readOnly bool, scopeByName map[string]string) {
+	t.Helper()
+
+	t.Run(definition.Name, func(t *testing.T) {
+		if previous, duplicate := scopeByName[definition.Name]; duplicate {
+			t.Errorf("tool name is already registered in scope %q; AddTool would silently replace it", previous)
+		}
+		scopeByName[definition.Name] = scope
+
+		// Strict MCP clients reject a tools/list entry without a description.
+		if definition.Description == "" {
+			t.Error("tool has no description")
+		}
+
+		// A write tool registered as read stays exposed under --read-only.
+		if definition.Annotations == nil || definition.Annotations.ReadOnlyHint != readOnly {
+			t.Errorf("annotations = %+v, want readOnlyHint %v", definition.Annotations, readOnly)
+		}
+
+		schema := decodeJSON(t, definition.InputSchema)
+		if schema["type"] != "object" {
+			t.Fatalf("input schema type = %v, want object", schema["type"])
+		}
+		properties, ok := schema["properties"].(map[string]any)
+		if !ok {
+			t.Fatalf("input schema properties = %T, want a JSON object", schema["properties"])
+		}
+
+		for name, raw := range properties {
+			property, ok := raw.(map[string]any)
+			if !ok {
+				t.Errorf("property %q = %T, want a JSON object", name, raw)
+				continue
+			}
+			assertPropertyContract(t, name, property)
+		}
+	})
+}
+
+func assertPropertyContract(t *testing.T, name string, property map[string]any) {
+	t.Helper()
+
+	propertyType, ok := property["type"].(string)
+	if !ok {
+		t.Errorf("property %q has no type", name)
+		return
+	}
+
+	enum, hasEnum := property["enum"].([]any)
+	if _, declared := property["enum"]; declared && len(enum) == 0 {
+		t.Errorf("property %q has an empty enum", name)
+	}
+
+	defaultValue, hasDefault := property["default"]
+	if !hasDefault {
+		return
+	}
+	if !matchesJSONType(defaultValue, propertyType) {
+		t.Errorf("property %q default %#v is not a %s", name, defaultValue, propertyType)
+	}
+	if hasEnum && !slices.Contains(enum, defaultValue) {
+		t.Errorf("property %q default %#v is not one of its enum values %#v", name, defaultValue, enum)
+	}
+}
+
+func matchesJSONType(value any, propertyType string) bool {
+	switch propertyType {
+	case "string":
+		_, ok := value.(string)
+		return ok
+	case "number":
+		_, ok := value.(float64)
+		return ok
+	case "boolean":
+		_, ok := value.(bool)
+		return ok
+	case "array":
+		_, ok := value.([]any)
+		return ok
+	case "object":
+		_, ok := value.(map[string]any)
+		return ok
+	default:
+		return false
+	}
+}
+
+// decodeJSON round-trips through JSON so the assertions see what an MCP client
+// receives rather than the Go values behind it.
+func decodeJSON(t *testing.T, value any) map[string]any {
+	t.Helper()
+
+	encoded, err := json.Marshal(value)
+	if err != nil {
+		t.Fatalf("marshal: %v", err)
+	}
+	var decoded map[string]any
+	if err := json.Unmarshal(encoded, &decoded); err != nil {
+		t.Fatalf("decode: %v", err)
+	}
+	return decoded
+}

operation/user/user.go

@@ -12,8 +12,7 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	gitea_sdk "gitea.dev/sdk"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
 const (
@@ -21,30 +20,30 @@ const (
 	GetUserOrgsToolName   = "get_user_orgs"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("user")
 
 var (
-	GetMyUserInfoTool = mcp.NewTool(
+	GetMyUserInfoTool = tool.NewDefinition(
 		GetMyUserInfoToolName,
-		mcp.WithDescription("Get current user"),
+		"Get current user",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Get current user information")),
+		annotation.ReadOnly("Get current user information"),
 	)
 
-	GetUserOrgsTool = mcp.NewTool(
+	GetUserOrgsTool = tool.NewDefinition(
 		GetUserOrgsToolName,
-		mcp.WithDescription("List current user's organizations"),
+		"List current user's organizations",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Get user organizations")),
+		annotation.ReadOnly("Get user organizations"),
-		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1)),
-		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30)),
 	)
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{Tool: GetMyUserInfoTool, Handler: GetUserInfoFn})
+	Tool.RegisterRead(tool.ServerTool{Tool: GetMyUserInfoTool, Handler: GetUserInfoFn})
-	Tool.RegisterRead(server.ServerTool{Tool: GetUserOrgsTool, Handler: GetUserOrgsFn})
+	Tool.RegisterRead(tool.ServerTool{Tool: GetUserOrgsTool, Handler: GetUserOrgsFn})
 }
 
-func GetUserInfoFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func GetUserInfoFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
@@ -56,8 +55,8 @@ func GetUserInfoFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolR
 	return to.TextResult(slim.UserDetail(user))
 }
 
-func GetUserOrgsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func GetUserOrgsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	page, pageSize := params.GetPagination(args, 30)
 
 	opt := gitea_sdk.ListOrgsOptions{
 		ListOptions: gitea_sdk.ListOptions{

operation/version/version.go

@@ -9,30 +9,29 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("version")
 
 const (
 	GetGiteaMCPServerVersion = "get_gitea_mcp_server_version"
 )
 
-var GetGiteaMCPServerVersionTool = mcp.NewTool(
+var GetGiteaMCPServerVersionTool = tool.NewDefinition(
 	GetGiteaMCPServerVersion,
-	mcp.WithDescription("Get the running version of the Gitea MCP Server itself (not the Gitea instance it connects to)."),
+	"Get the running version of the Gitea MCP Server itself (not the Gitea instance it connects to).",
-	mcp.WithToolAnnotation(annotation.ReadOnly("Get server version")),
+	annotation.ReadOnly("Get server version"),
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    GetGiteaMCPServerVersionTool,
 		Handler: GetGiteaMCPServerVersionFn,
 	})
 }
 
-func GetGiteaMCPServerVersionFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func GetGiteaMCPServerVersionFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
 	version := flag.Version
 	if version == "" {
 		version = "dev"

operation/wiki/wiki.go

@@ -12,11 +12,10 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("wiki")
 
 const (
 	WikiReadToolName  = "wiki_read"
@@ -24,77 +23,76 @@ const (
 )
 
 var (
-	WikiReadTool = mcp.NewTool(
+	WikiReadTool = tool.NewDefinition(
 		WikiReadToolName,
-		mcp.WithDescription("Read wiki: list pages, get content, revision history."),
+		"Read wiki: list pages, get content, revision history.",
-		mcp.WithToolAnnotation(annotation.ReadOnly("Read wiki pages")),
+		annotation.ReadOnly("Read wiki pages"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("list", "get", "get_revisions")),
+		tool.String("method", tool.Required(), tool.Enum("list", "get", "get_revisions")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("pageName", mcp.Description("for 'get'/'get_revisions'")),
+		tool.String("pageName", tool.Description("for 'get'/'get_revisions'")),
 	)
 
-	WikiWriteTool = mcp.NewTool(
+	WikiWriteTool = tool.NewDefinition(
 		WikiWriteToolName,
-		mcp.WithDescription("Write wiki pages: create, update, delete."),
+		"Write wiki pages: create, update, delete.",
-		mcp.WithToolAnnotation(annotation.Destructive("Create, update, or delete wiki pages")),
+		annotation.Destructive("Create, update, or delete wiki pages"),
-		mcp.WithString("method", mcp.Required(), mcp.Enum("create", "update", "delete")),
+		tool.String("method", tool.Required(), tool.Enum("create", "update", "delete")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		mcp.WithString("pageName", mcp.Description("for 'update'/'delete'")),
+		tool.String("pageName", tool.Description("for 'update'/'delete'")),
-		mcp.WithString("title", mcp.Description("for 'create'")),
+		tool.String("title", tool.Description("for 'create'")),
-		mcp.WithString("content", mcp.Description("for 'create'/'update'")),
+		tool.String("content", tool.Description("for 'create'/'update'")),
-		mcp.WithString("message", mcp.Description("commit message")),
+		tool.String("message", tool.Description("commit message")),
 	)
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(tool.ServerTool{
 		Tool:    WikiReadTool,
 		Handler: wikiReadFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	Tool.RegisterWrite(tool.ServerTool{
 		Tool:    WikiWriteTool,
 		Handler: wikiWriteFn,
 	})
 }
 
-func wikiReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func wikiReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	method, err := params.GetString(req.GetArguments(), "method")
+	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "list":
-		return listWikiPagesFn(ctx, req)
+		return listWikiPagesFn(ctx, args)
 	case "get":
-		return getWikiPageFn(ctx, req)
+		return getWikiPageFn(ctx, args)
 	case "get_revisions":
-		return getWikiRevisionsFn(ctx, req)
+		return getWikiRevisionsFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func wikiWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func wikiWriteFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	method, err := params.GetString(req.GetArguments(), "method")
+	method, err := params.GetString(args, "method")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 	switch method {
 	case "create":
-		return createWikiPageFn(ctx, req)
+		return createWikiPageFn(ctx, args)
 	case "update":
-		return updateWikiPageFn(ctx, req)
+		return updateWikiPageFn(ctx, args)
 	case "delete":
-		return deleteWikiPageFn(ctx, req)
+		return deleteWikiPageFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
-func listWikiPagesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func listWikiPagesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -113,8 +111,7 @@ func listWikiPagesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	return to.TextResult(result)
 }
 
-func getWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getWikiPageFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -137,8 +134,7 @@ func getWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolR
 	return to.TextResult(result)
 }
 
-func getWikiRevisionsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func getWikiRevisionsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -161,8 +157,7 @@ func getWikiRevisionsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	return to.TextResult(result)
 }
 
-func createWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func createWikiPageFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -200,8 +195,7 @@ func createWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	return to.TextResult(result)
 }
 
-func updateWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func updateWikiPageFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -245,8 +239,7 @@ func updateWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	return to.TextResult(result)
 }
 
-func deleteWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func deleteWikiPageFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
 		return to.ErrorResult(err)

operation/wiki/wiki_test.go

@@ -11,8 +11,6 @@ import (
 
 	mcpContext "gitea.com/gitea/gitea-mcp/pkg/context"
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
-
-	"github.com/mark3labs/mcp-go/mcp"
 )
 
 func TestWikiWriteBase64Encoding(t *testing.T) {
@@ -54,10 +52,7 @@ func TestWikiWriteBase64Encoding(t *testing.T) {
 				"title":    "TestPage",
 			}
 
-			req := mcp.CallToolRequest{}
+			result, err := wikiWriteFn(ctx, args)
-			req.Params.Arguments = args
-
-			result, err := wikiWriteFn(ctx, req)
 			if err != nil {
 				t.Fatalf("wikiWriteFn() error: %v", err)
 			}

pkg/annotation/annotation.go

@@ -1,18 +1,16 @@
 package annotation
 
-import "github.com/mark3labs/mcp-go/mcp"
+import "github.com/modelcontextprotocol/go-sdk/mcp"
 
-func ReadOnly(title string) mcp.ToolAnnotation {
+func ReadOnly(title string) *mcp.ToolAnnotations {
+	return &mcp.ToolAnnotations{Title: title, ReadOnlyHint: true}
+}
+
+func Write(title string) *mcp.ToolAnnotations {
+	return &mcp.ToolAnnotations{Title: title}
+}
+
+func Destructive(title string) *mcp.ToolAnnotations {
 	t := true
-	return mcp.ToolAnnotation{Title: title, ReadOnlyHint: &t}
+	return &mcp.ToolAnnotations{Title: title, DestructiveHint: &t}
-}
-
-func Write(title string) mcp.ToolAnnotation {
-	f := false
-	return mcp.ToolAnnotation{Title: title, ReadOnlyHint: &f}
-}
-
-func Destructive(title string) mcp.ToolAnnotation {
-	f, t := false, true
-	return mcp.ToolAnnotation{Title: title, ReadOnlyHint: &f, DestructiveHint: &t}
 }

pkg/annotation/annotation_test.go

@@ -0,0 +1,50 @@
+package annotation
+
+import (
+	"encoding/json"
+	"maps"
+	"testing"
+
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+// The hints are what clients use to decide whether a tool needs confirmation, so
+// assert the encoded form: an omitted readOnlyHint reads as false either way, but
+// only the explicit form survives a client that checks for the key.
+func TestAnnotations(t *testing.T) {
+	for _, test := range []struct {
+		name        string
+		annotations *mcp.ToolAnnotations
+		want        map[string]any
+	}{
+		{
+			name:        "ReadOnly",
+			annotations: ReadOnly("Read"),
+			want:        map[string]any{"title": "Read", "readOnlyHint": true, "idempotentHint": false},
+		},
+		{
+			name:        "Write",
+			annotations: Write("Write"),
+			want:        map[string]any{"title": "Write", "readOnlyHint": false, "idempotentHint": false},
+		},
+		{
+			name:        "Destructive",
+			annotations: Destructive("Delete"),
+			want:        map[string]any{"title": "Delete", "readOnlyHint": false, "idempotentHint": false, "destructiveHint": true},
+		},
+	} {
+		t.Run(test.name, func(t *testing.T) {
+			encoded, err := json.Marshal(test.annotations)
+			if err != nil {
+				t.Fatalf("json.Marshal() error = %v", err)
+			}
+			var got map[string]any
+			if err := json.Unmarshal(encoded, &got); err != nil {
+				t.Fatalf("json.Unmarshal() error = %v", err)
+			}
+			if !maps.Equal(got, test.want) {
+				t.Errorf("annotations = %s, want %v", encoded, test.want)
+			}
+		})
+	}
+}

pkg/flag/flag.go

@@ -7,8 +7,11 @@ var (
 	Version string
 	Mode    string
 
-	Insecure     bool
+	MaxInlineAttachmentBytes int
-	ReadOnly     bool
+
-	Debug        bool
+	Insecure      bool
-	AllowedTools map[string]struct{}
+	ReadOnly      bool
+	Debug         bool
+	AllowedTools  map[string]struct{}
+	AllowedScopes map[string]struct{}
 )

pkg/gitea/attachment_test.go

@@ -0,0 +1,208 @@
+package gitea
+
+import (
+	"context"
+	"errors"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"gitea.com/gitea/gitea-mcp/pkg/flag"
+)
+
+func TestBuildAttachmentURLRejectsExternalURL(t *testing.T) {
+	origHost := flag.Host
+	flag.Host = "https://example.com"
+	defer func() { flag.Host = origHost }()
+
+	if _, err := buildAttachmentURL("https://evil.example.com/attachments/1"); err == nil {
+		t.Fatal("expected error for full URL attachment path")
+	}
+}
+
+func TestBuildAttachmentURLPreservesHostPathPrefix(t *testing.T) {
+	origHost := flag.Host
+	flag.Host = "https://example.com/gitea"
+	defer func() { flag.Host = origHost }()
+
+	got, err := buildAttachmentURL("/attachments/uuid-1")
+	if err != nil {
+		t.Fatalf("buildAttachmentURL() error = %v", err)
+	}
+	if got != "https://example.com/gitea/attachments/uuid-1" {
+		t.Fatalf("buildAttachmentURL() = %q", got)
+	}
+}
+
+func TestDownloadAttachmentUsesTokenAndReturnsContentType(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != "/attachments/uuid-1" {
+			t.Fatalf("path = %s", r.URL.Path)
+		}
+		if got := r.Header.Get("Authorization"); got != "token secret-token" {
+			t.Fatalf("Authorization = %q", got)
+		}
+		if got := r.Header.Get("Accept"); got != "*/*" {
+			t.Fatalf("Accept = %q", got)
+		}
+		w.Header().Set("Content-Type", "image/png")
+		_, _ = w.Write([]byte("png-bytes"))
+	}))
+	defer server.Close()
+
+	origHost, origToken := flag.Host, flag.Token
+	flag.Host, flag.Token = server.URL, "secret-token"
+	defer func() { flag.Host, flag.Token = origHost, origToken }()
+
+	raw, contentType, status, err := DownloadAttachment(context.Background(), "/attachments/uuid-1", "*/*")
+	if err != nil {
+		t.Fatalf("DownloadAttachment() error = %v", err)
+	}
+	if status != http.StatusOK {
+		t.Fatalf("DownloadAttachment() status = %d, want %d", status, http.StatusOK)
+	}
+	if contentType != "image/png" {
+		t.Fatalf("contentType = %q", contentType)
+	}
+	if string(raw) != "png-bytes" {
+		t.Fatalf("body = %q", string(raw))
+	}
+}
+
+func TestDownloadAttachmentRejectsCrossOriginRedirect(t *testing.T) {
+	redirected := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		t.Fatalf("cross-origin redirect should not be followed: %s", r.URL.String())
+	}))
+	defer redirected.Close()
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		http.Redirect(w, r, redirected.URL+"/attachments/uuid-1", http.StatusFound)
+	}))
+	defer server.Close()
+
+	origHost, origToken := flag.Host, flag.Token
+	flag.Host, flag.Token = server.URL, "secret-token"
+	defer func() { flag.Host, flag.Token = origHost, origToken }()
+
+	_, _, _, err := DownloadAttachment(context.Background(), "/attachments/uuid-1", "*/*")
+	if err == nil {
+		t.Fatal("expected error for cross-origin redirect")
+	}
+	want := "do request: Get \"" + redirected.URL + "/attachments/uuid-1\": attachment redirect changed origin"
+	if err.Error() != want {
+		t.Fatalf("unexpected error: %v", err)
+	}
+}
+
+func TestDownloadAttachmentRejectsSameOriginRedirectLoopAtHopLimit(t *testing.T) {
+	var serverURL string
+	redirects := 0
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		redirects++
+		http.Redirect(w, r, serverURL+"/attachments/uuid-1", http.StatusFound)
+	}))
+	defer server.Close()
+	serverURL = server.URL
+
+	origHost := flag.Host
+	flag.Host = server.URL
+	defer func() { flag.Host = origHost }()
+
+	_, _, _, err := DownloadAttachment(context.Background(), "/attachments/uuid-1", "*/*")
+	if err == nil {
+		t.Fatal("expected redirect limit error")
+	}
+	if !strings.Contains(err.Error(), "stopped after 10 redirects") {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if redirects != 10 {
+		t.Fatalf("redirects = %d, want 10", redirects)
+	}
+}
+
+func TestWriteAttachmentStreamsBodyToFile(t *testing.T) {
+	path := filepath.Join(t.TempDir(), "attachment.bin")
+	written, err := WriteAttachment(strings.NewReader(strings.Repeat("z", 64)), path)
+	if err != nil {
+		t.Fatalf("WriteAttachment() error = %v", err)
+	}
+	if written != 64 {
+		t.Fatalf("written = %d, want 64", written)
+	}
+	data, err := os.ReadFile(path)
+	if err != nil {
+		t.Fatalf("ReadFile() error = %v", err)
+	}
+	if string(data) != strings.Repeat("z", 64) {
+		t.Fatalf("body mismatch")
+	}
+}
+
+func TestWriteAttachmentCreatesPrivateFile(t *testing.T) {
+	path := filepath.Join(t.TempDir(), "attachment.bin")
+
+	if _, err := WriteAttachment(strings.NewReader("secret"), path); err != nil {
+		t.Fatalf("WriteAttachment() error = %v", err)
+	}
+
+	info, err := os.Stat(path)
+	if err != nil {
+		t.Fatalf("Stat() error = %v", err)
+	}
+	if got := info.Mode().Perm() & 0o077; got != 0 {
+		t.Fatalf("permissions = %03o, want no group/other bits", info.Mode().Perm())
+	}
+}
+
+func TestWriteAttachmentTightensExistingFilePermissions(t *testing.T) {
+	path := filepath.Join(t.TempDir(), "attachment.bin")
+	if err := os.WriteFile(path, []byte("public"), 0o644); err != nil {
+		t.Fatalf("WriteFile() error = %v", err)
+	}
+
+	if _, err := WriteAttachment(strings.NewReader("secret"), path); err != nil {
+		t.Fatalf("WriteAttachment() error = %v", err)
+	}
+
+	info, err := os.Stat(path)
+	if err != nil {
+		t.Fatalf("Stat() error = %v", err)
+	}
+	if got := info.Mode().Perm(); got != 0o600 {
+		t.Fatalf("permissions = %03o, want 600", got)
+	}
+}
+
+func TestDownloadAttachmentErrorsOnNon2xx(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		http.Error(w, "nope", http.StatusForbidden)
+	}))
+	defer server.Close()
+
+	origHost := flag.Host
+	flag.Host = server.URL
+	defer func() { flag.Host = origHost }()
+
+	_, _, status, err := DownloadAttachment(context.Background(), "/attachments/uuid-1", "*/*")
+	if status != http.StatusForbidden {
+		t.Fatalf("status = %d, want %d", status, http.StatusForbidden)
+	}
+	var httpErr *HTTPError
+	if !errors.As(err, &httpErr) {
+		t.Fatalf("expected HTTPError, got %T", err)
+	}
+}
+
+func TestAttachmentHTTPClientHasNoTotalTimeout(t *testing.T) {
+	origin := &url.URL{Scheme: "https", Host: "example.com"}
+
+	client := attachmentHTTPClient(origin)
+
+	if client.Timeout != 0 {
+		t.Fatalf("Timeout = %v, want 0", client.Timeout)
+	}
+}

pkg/gitea/rest.go

@@ -9,6 +9,8 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"os"
+	"path"
 	"strings"
 	"sync"
 	"time"
@@ -34,6 +36,12 @@ func (e *HTTPError) Error() string {
 	return fmt.Sprintf("request failed with status %d: %s", e.StatusCode, e.Body)
 }
 
+type AttachmentResponse struct {
+	Body        io.ReadCloser
+	ContentType string
+	StatusCode  int
+}
+
 func tokenFromContext(ctx context.Context) string {
 	if ctx != nil {
 		if token, ok := ctx.Value(mcpContext.TokenContextKey).(string); ok && token != "" {
@@ -75,6 +83,40 @@ func buildAPIURL(path string, query url.Values) (string, error) {
 	return u.String(), nil
 }
 
+func buildAttachmentURL(attachmentPath string) (string, error) {
+	host := strings.TrimRight(flag.Host, "/")
+	if host == "" {
+		return "", errors.New("gitea host is empty")
+	}
+	baseURL, err := url.Parse(host)
+	if err != nil {
+		return "", err
+	}
+	if attachmentPath == "" {
+		return "", errors.New("attachment path is empty")
+	}
+	if strings.Contains(attachmentPath, "://") {
+		return "", errors.New("attachment path must not be a URL")
+	}
+	if !strings.HasPrefix(attachmentPath, "/attachments/") {
+		return "", errors.New("attachment path must start with /attachments/")
+	}
+	cleanPath := path.Clean(attachmentPath)
+	if !strings.HasPrefix(cleanPath, "/attachments/") {
+		return "", errors.New("attachment path must stay within /attachments/")
+	}
+	if cleanPath == "/attachments" || cleanPath == "/attachments/" {
+		return "", errors.New("attachment uuid is required")
+	}
+	joinedPath := strings.TrimRight(baseURL.Path, "/") + cleanPath
+	if joinedPath == "" {
+		joinedPath = cleanPath
+	}
+	baseURL.Path = joinedPath
+	baseURL.RawPath = joinedPath
+	return baseURL.String(), nil
+}
+
 // DoJSON performs an API request and decodes a JSON response into respOut (if non-nil).
 // It returns the HTTP status code.
 func DoJSON(ctx context.Context, method, path string, query url.Values, body, respOut any) (int, error) {
@@ -91,45 +133,142 @@ func DoJSON(ctx context.Context, method, path string, query url.Values, body, re
 	if err != nil {
 		return 0, err
 	}
+
 	req, err := http.NewRequestWithContext(ctx, method, u, bodyReader)
 	if err != nil {
 		return 0, fmt.Errorf("create request: %w", err)
 	}
-
 	token := tokenFromContext(ctx)
 	if token != "" {
 		req.Header.Set("Authorization", "token "+token)
 	}
-	req.Header.Set("Accept", "application/json")
 	if body != nil {
 		req.Header.Set("Content-Type", "application/json")
 	}
+	if respOut != nil {
+		req.Header.Set("Accept", "application/json")
+	}
 
-	client := restHTTPClient()
+	resp, err := restHTTPClient().Do(req)
-	resp, err := client.Do(req)
 	if err != nil {
 		return 0, fmt.Errorf("do request: %w", err)
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		bodySnippet, _ := io.ReadAll(io.LimitReader(resp.Body, errBodySnippetSize))
+		bodySnippet, err := io.ReadAll(io.LimitReader(resp.Body, errBodySnippetSize+1))
+		if err != nil {
+			return resp.StatusCode, fmt.Errorf("read response: %w", err)
+		}
+		if len(bodySnippet) > errBodySnippetSize {
+			bodySnippet = bodySnippet[:errBodySnippetSize]
+		}
 		return resp.StatusCode, &HTTPError{StatusCode: resp.StatusCode, Body: strings.TrimSpace(string(bodySnippet))}
 	}
 
 	if respOut == nil {
-		_, _ = io.Copy(io.Discard, resp.Body) // best-effort
+		_, _ = io.Copy(io.Discard, resp.Body)
 		return resp.StatusCode, nil
 	}
 
 	if err := json.NewDecoder(resp.Body).Decode(respOut); err != nil {
 		return resp.StatusCode, fmt.Errorf("decode response: %w", err)
 	}
+
 	return resp.StatusCode, nil
 }
 
+func attachmentHTTPClient(origin *url.URL) *http.Client {
+	return &http.Client{
+		Transport: sharedTransport(),
+		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+			if err := checkRedirect(req, via); err != nil {
+				return err
+			}
+			if req.URL.Scheme != origin.Scheme || req.URL.Host != origin.Host {
+				return errors.New("attachment redirect changed origin")
+			}
+			return nil
+		},
+	}
+}
+
+func OpenAttachment(ctx context.Context, attachmentPath, accept string) (*AttachmentResponse, error) {
+	u, err := buildAttachmentURL(attachmentPath)
+	if err != nil {
+		return nil, err
+	}
+	origin, err := url.Parse(u)
+	if err != nil {
+		return nil, err
+	}
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, u, nil)
+	if err != nil {
+		return nil, fmt.Errorf("create request: %w", err)
+	}
+	token := tokenFromContext(ctx)
+	if token != "" {
+		req.Header.Set("Authorization", "token "+token)
+	}
+	if accept != "" {
+		req.Header.Set("Accept", accept)
+	}
+
+	resp, err := attachmentHTTPClient(origin).Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("do request: %w", err)
+	}
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		defer resp.Body.Close()
+		bodySnippet, readErr := io.ReadAll(io.LimitReader(resp.Body, errBodySnippetSize+1))
+		if readErr != nil {
+			return nil, fmt.Errorf("read response: %w", readErr)
+		}
+		if len(bodySnippet) > errBodySnippetSize {
+			bodySnippet = bodySnippet[:errBodySnippetSize]
+		}
+		return nil, &HTTPError{StatusCode: resp.StatusCode, Body: strings.TrimSpace(string(bodySnippet))}
+	}
+	return &AttachmentResponse{Body: resp.Body, ContentType: resp.Header.Get("Content-Type"), StatusCode: resp.StatusCode}, nil
+}
+
+// DownloadAttachment downloads attachment bytes from a same-host attachment path.
+func DownloadAttachment(ctx context.Context, attachmentPath, accept string) ([]byte, string, int, error) {
+	resp, err := OpenAttachment(ctx, attachmentPath, accept)
+	if err != nil {
+		var httpErr *HTTPError
+		if errors.As(err, &httpErr) {
+			return nil, "", httpErr.StatusCode, err
+		}
+		return nil, "", 0, err
+	}
+	defer resp.Body.Close()
+
+	respBytes, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, "", resp.StatusCode, fmt.Errorf("read response: %w", err)
+	}
+	return respBytes, resp.ContentType, resp.StatusCode, nil
+}
+
+func WriteAttachment(body io.Reader, outputPath string) (int64, error) {
+	file, err := os.OpenFile(outputPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o600)
+	if err != nil {
+		return 0, err
+	}
+	defer file.Close()
+	if err := file.Chmod(0o600); err != nil {
+		return 0, err
+	}
+
+	written, err := io.Copy(file, body)
+	if err != nil {
+		return written, err
+	}
+	return written, file.Close()
+}
+
 // DoBytes performs an API request and returns the raw response bytes.
-// It returns the HTTP status code.
 func DoBytes(ctx context.Context, method, path string, query url.Values, body any, accept string) ([]byte, int, error) {
 	var bodyReader io.Reader
 	if body != nil {
@@ -144,24 +283,23 @@ func DoBytes(ctx context.Context, method, path string, query url.Values, body an
 	if err != nil {
 		return nil, 0, err
 	}
+
 	req, err := http.NewRequestWithContext(ctx, method, u, bodyReader)
 	if err != nil {
 		return nil, 0, fmt.Errorf("create request: %w", err)
 	}
-
 	token := tokenFromContext(ctx)
 	if token != "" {
 		req.Header.Set("Authorization", "token "+token)
 	}
-	if accept != "" {
-		req.Header.Set("Accept", accept)
-	}
 	if body != nil {
 		req.Header.Set("Content-Type", "application/json")
 	}
+	if accept != "" {
+		req.Header.Set("Accept", accept)
+	}
 
-	client := restHTTPClient()
+	resp, err := restHTTPClient().Do(req)
-	resp, err := client.Do(req)
 	if err != nil {
 		return nil, 0, fmt.Errorf("do request: %w", err)
 	}
@@ -171,7 +309,6 @@ func DoBytes(ctx context.Context, method, path string, query url.Values, body an
 	if err != nil {
 		return nil, resp.StatusCode, fmt.Errorf("read response: %w", err)
 	}
-
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
 		bodySnippet := respBytes
 		if len(bodySnippet) > errBodySnippetSize {
@@ -179,6 +316,5 @@ func DoBytes(ctx context.Context, method, path string, query url.Values, body an
 		}
 		return nil, resp.StatusCode, &HTTPError{StatusCode: resp.StatusCode, Body: strings.TrimSpace(string(bodySnippet))}
 	}
-
 	return respBytes, resp.StatusCode, nil
 }

pkg/gitea/rest_test.go

@@ -2,6 +2,11 @@ package gitea
 
 import (
 	"context"
+	"errors"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"strings"
 	"testing"
 
 	mcpContext "gitea.com/gitea/gitea-mcp/pkg/context"
@@ -28,3 +33,32 @@ func TestTokenFromContext(t *testing.T) {
 		}
 	})
 }
+
+func TestDoJSON_LimitsErrorResponseBody(t *testing.T) {
+	payload := strings.Repeat("x", errBodySnippetSize+100)
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusBadRequest)
+		_, _ = io.WriteString(w, payload)
+	}))
+	defer srv.Close()
+
+	origHost := flag.Host
+	defer func() { flag.Host = origHost }()
+	flag.Host = srv.URL
+
+	status, err := DoJSON(context.Background(), http.MethodGet, "repos/owner/repo", nil, nil, nil)
+	if err == nil {
+		t.Fatal("expected error")
+	}
+	if status != http.StatusBadRequest {
+		t.Fatalf("expected status %d, got %d", http.StatusBadRequest, status)
+	}
+
+	var httpErr *HTTPError
+	if !errors.As(err, &httpErr) {
+		t.Fatalf("expected HTTPError, got %T", err)
+	}
+	if len(httpErr.Body) != errBodySnippetSize {
+		t.Fatalf("expected body length %d, got %d", errBodySnippetSize, len(httpErr.Body))
+	}
+}

pkg/to/to.go

@@ -7,7 +7,7 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
 	"gitea.com/gitea/gitea-mcp/pkg/log"
 
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 
 func TextResult(v any) (*mcp.CallToolResult, error) {
@@ -18,7 +18,9 @@ func TextResult(v any) (*mcp.CallToolResult, error) {
 	if flag.Debug {
 		log.Debugf("Text Result: %s", string(resultBytes))
 	}
-	return mcp.NewToolResultText(string(resultBytes)), nil
+	return &mcp.CallToolResult{
+		Content: []mcp.Content{&mcp.TextContent{Text: string(resultBytes)}},
+	}, nil
 }
 
 func ErrorResult(err error) (*mcp.CallToolResult, error) {

pkg/to/to_test.go

@@ -0,0 +1,33 @@
+package to
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+func TestTextResult(t *testing.T) {
+	result, err := TextResult(map[string]any{"name": "gitea"})
+	if err != nil {
+		t.Fatalf("TextResult() error = %v", err)
+	}
+	if len(result.Content) != 1 {
+		t.Fatalf("len(Content) = %d, want 1", len(result.Content))
+	}
+	content, ok := result.Content[0].(*mcp.TextContent)
+	if !ok {
+		t.Fatalf("Content[0] type = %T, want *mcp.TextContent", result.Content[0])
+	}
+	if content.Text != `{"name":"gitea"}` {
+		t.Errorf("Text = %q, want JSON object", content.Text)
+	}
+}
+
+func TestErrorResult(t *testing.T) {
+	want := errors.New("failed")
+	result, err := ErrorResult(want)
+	if result != nil || !errors.Is(err, want) {
+		t.Errorf("ErrorResult() = (%#v, %v), want (nil, %v)", result, err, want)
+	}
+}

pkg/tool/definition.go

@@ -0,0 +1,106 @@
+package tool
+
+import "github.com/modelcontextprotocol/go-sdk/mcp"
+
+// Property describes one property in a tool's input schema.
+type Property struct {
+	name     string
+	schema   map[string]any
+	required bool
+}
+
+// PropertyOption configures one property in a tool's input schema.
+type PropertyOption func(*Property)
+
+// NewDefinition builds a tool definition without enabling SDK-side validation.
+func NewDefinition(name, description string, annotations *mcp.ToolAnnotations, properties ...Property) *mcp.Tool {
+	inputProperties := make(map[string]any, len(properties))
+	required := make([]string, 0, len(properties))
+	for _, property := range properties {
+		inputProperties[property.name] = property.schema
+		if property.required {
+			required = append(required, property.name)
+		}
+	}
+
+	inputSchema := map[string]any{
+		"type":       "object",
+		"properties": inputProperties,
+	}
+	if len(required) > 0 {
+		inputSchema["required"] = required
+	}
+
+	return &mcp.Tool{
+		Name:        name,
+		Description: description,
+		Annotations: annotations,
+		InputSchema: inputSchema,
+	}
+}
+
+func String(name string, options ...PropertyOption) Property {
+	return newProperty(name, map[string]any{"type": "string"}, options...)
+}
+
+func Number(name string, options ...PropertyOption) Property {
+	return newProperty(name, map[string]any{"type": "number"}, options...)
+}
+
+func Boolean(name string, options ...PropertyOption) Property {
+	return newProperty(name, map[string]any{"type": "boolean"}, options...)
+}
+
+func Array(name string, options ...PropertyOption) Property {
+	return newProperty(name, map[string]any{"type": "array"}, options...)
+}
+
+func Object(name string, options ...PropertyOption) Property {
+	return newProperty(name, map[string]any{"type": "object", "properties": map[string]any{}}, options...)
+}
+
+func newProperty(name string, schema map[string]any, options ...PropertyOption) Property {
+	property := Property{name: name, schema: schema}
+	for _, option := range options {
+		option(&property)
+	}
+	return property
+}
+
+// Required marks the property as required on the parent schema. It is not a
+// property-level keyword, so it never touches the emitted property schema.
+func Required() PropertyOption {
+	return func(property *Property) {
+		property.required = true
+	}
+}
+
+func Description(description string) PropertyOption {
+	return func(property *Property) {
+		property.schema["description"] = description
+	}
+}
+
+func Enum(values ...string) PropertyOption {
+	return func(property *Property) {
+		property.schema["enum"] = values
+	}
+}
+
+func Default(value any) PropertyOption {
+	return func(property *Property) {
+		property.schema["default"] = value
+	}
+}
+
+func Minimum(value float64) PropertyOption {
+	return func(property *Property) {
+		property.schema["minimum"] = value
+	}
+}
+
+func Items(schema any) PropertyOption {
+	return func(property *Property) {
+		property.schema["items"] = schema
+	}
+}

pkg/tool/definition_test.go

@@ -0,0 +1,71 @@
+package tool
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+func TestNewDefinition(t *testing.T) {
+	annotations := &mcp.ToolAnnotations{Title: "Example", ReadOnlyHint: true}
+	definition := NewDefinition(
+		"example",
+		"Example tool",
+		annotations,
+		String("owner", Required(), Description("repository owner"), Enum("one", "two"), Default("one")),
+		Number("page", Required(), Default(1), Minimum(1)),
+		Boolean("draft"),
+		Array("labels", Items(map[string]any{"type": "string"})),
+		Object("inputs", Description("workflow inputs")),
+	)
+
+	if definition.Name != "example" || definition.Description != "Example tool" {
+		t.Fatalf("definition = %#v", definition)
+	}
+	if definition.Annotations != annotations {
+		t.Fatal("NewDefinition did not preserve annotations")
+	}
+
+	want := map[string]any{
+		"type": "object",
+		"properties": map[string]any{
+			"owner": map[string]any{
+				"type":        "string",
+				"description": "repository owner",
+				"enum":        []string{"one", "two"},
+				"default":     "one",
+			},
+			"page": map[string]any{
+				"type":    "number",
+				"default": 1,
+				"minimum": float64(1),
+			},
+			"draft": map[string]any{"type": "boolean"},
+			"labels": map[string]any{
+				"type":  "array",
+				"items": map[string]any{"type": "string"},
+			},
+			"inputs": map[string]any{
+				"type":        "object",
+				"properties":  map[string]any{},
+				"description": "workflow inputs",
+			},
+		},
+		"required": []string{"owner", "page"},
+	}
+	if !reflect.DeepEqual(definition.InputSchema, want) {
+		t.Errorf("InputSchema = %#v, want %#v", definition.InputSchema, want)
+	}
+}
+
+func TestNewDefinitionWithoutRequiredProperties(t *testing.T) {
+	definition := NewDefinition("empty", "", nil)
+	schema := definition.InputSchema.(map[string]any)
+	if _, ok := schema["required"]; ok {
+		t.Errorf("InputSchema unexpectedly contains required: %#v", schema)
+	}
+	if got := schema["properties"]; !reflect.DeepEqual(got, map[string]any{}) {
+		t.Errorf("properties = %#v, want empty map", got)
+	}
+}

pkg/tool/handler_test.go

@@ -0,0 +1,105 @@
+package tool
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"testing"
+
+	"github.com/modelcontextprotocol/go-sdk/jsonrpc"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+func callTool(handler Handler, arguments json.RawMessage) (*mcp.CallToolResult, error) {
+	serverTool := ServerTool{Tool: &mcp.Tool{Name: "example"}, Handler: handler}
+	return serverTool.MCPHandler()(context.Background(), &mcp.CallToolRequest{
+		Params: &mcp.CallToolParamsRaw{Arguments: arguments},
+	})
+}
+
+func captureArguments(into *map[string]any) Handler {
+	return func(_ context.Context, arguments map[string]any) (*mcp.CallToolResult, error) {
+		*into = arguments
+		return &mcp.CallToolResult{}, nil
+	}
+}
+
+func TestMCPHandler(t *testing.T) {
+	var got map[string]any
+	result, err := callTool(captureArguments(&got), json.RawMessage(`{"count":2,"nested":{"enabled":true}}`))
+	if err != nil {
+		t.Fatalf("MCPHandler() error = %v", err)
+	}
+	if result == nil {
+		t.Fatal("MCPHandler() result is nil")
+	}
+	if got["count"] != float64(2) {
+		t.Errorf("count type/value = %T(%v), want float64(2)", got["count"], got["count"])
+	}
+}
+
+func TestMCPHandlerRejectsInvalidArguments(t *testing.T) {
+	called := false
+	handler := func(context.Context, map[string]any) (*mcp.CallToolResult, error) {
+		called = true
+		return &mcp.CallToolResult{}, nil
+	}
+
+	for _, arguments := range []json.RawMessage{json.RawMessage(`[]`), json.RawMessage(`"text"`), json.RawMessage(`{"broken"`)} {
+		_, err := callTool(handler, arguments)
+		assertProtocolErrorCode(t, err, jsonrpc.CodeInvalidParams)
+	}
+	if called {
+		t.Fatal("handler was called with invalid arguments")
+	}
+}
+
+// Tools without parameters are callable with an omitted or null "arguments",
+// which is what clients send and what mcp-go accepted before the SDK migration.
+func TestMCPHandlerAcceptsAbsentArguments(t *testing.T) {
+	for _, arguments := range []json.RawMessage{nil, json.RawMessage(`null`)} {
+		var got map[string]any
+		if _, err := callTool(captureArguments(&got), arguments); err != nil {
+			t.Fatalf("MCPHandler() with arguments %s error = %v", arguments, err)
+		}
+		if got == nil || len(got) != 0 {
+			t.Errorf("arguments = %#v, want an empty map", got)
+		}
+	}
+}
+
+func TestMCPHandlerConvertsErrorsAndRecoversPanics(t *testing.T) {
+	for _, test := range []struct {
+		name    string
+		handler Handler
+	}{
+		{
+			name: "handler error",
+			handler: func(context.Context, map[string]any) (*mcp.CallToolResult, error) {
+				return nil, errors.New("failed")
+			},
+		},
+		{
+			name: "panic",
+			handler: func(context.Context, map[string]any) (*mcp.CallToolResult, error) {
+				panic("failed")
+			},
+		},
+	} {
+		t.Run(test.name, func(t *testing.T) {
+			_, err := callTool(test.handler, nil)
+			assertProtocolErrorCode(t, err, jsonrpc.CodeInternalError)
+		})
+	}
+}
+
+func assertProtocolErrorCode(t *testing.T, err error, want int64) {
+	t.Helper()
+	var protocolErr *jsonrpc.Error
+	if !errors.As(err, &protocolErr) {
+		t.Fatalf("error = %v, want *jsonrpc.Error", err)
+	}
+	if protocolErr.Code != want {
+		t.Errorf("error code = %d, want %d", protocolErr.Code, want)
+	}
+}

pkg/tool/tool.go

@@ -1,60 +1,164 @@
 package tool
 
 import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
 	"slices"
 	"strings"
 
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
 	"gitea.com/gitea/gitea-mcp/pkg/log"
 
-	"github.com/mark3labs/mcp-go/server"
+	"github.com/modelcontextprotocol/go-sdk/jsonrpc"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 
-type Tool struct {
+type Handler func(context.Context, map[string]any) (*mcp.CallToolResult, error)
-	write []server.ServerTool
+
-	read  []server.ServerTool
+type ServerTool struct {
+	Tool    *mcp.Tool
+	Handler Handler
 }
 
-func New() *Tool {
+type Tool struct {
+	scope string
+	write []ServerTool
+	read  []ServerTool
+}
+
+func New(scope string) *Tool {
 	return &Tool{
-		write: make([]server.ServerTool, 0, 100),
+		scope: scope,
-		read:  make([]server.ServerTool, 0, 100),
+		write: make([]ServerTool, 0, 100),
+		read:  make([]ServerTool, 0, 100),
 	}
 }
 
-func (t *Tool) RegisterWrite(s server.ServerTool) {
+// Scope returns the canonical scope name this domain of tools was registered under.
+func (t *Tool) Scope() string {
+	return t.scope
+}
+
+func (t *Tool) RegisterWrite(s ServerTool) {
 	t.write = append(t.write, s)
 }
 
-func (t *Tool) RegisterRead(s server.ServerTool) {
+func (t *Tool) RegisterRead(s ServerTool) {
 	t.read = append(t.read, s)
 }
 
-func (t *Tool) Tools() []server.ServerTool {
+// ReadTools returns the read-only tools registered on this domain, ignoring
-	all := make([]server.ServerTool, 0, len(t.write)+len(t.read))
+// the read-only and allowlist flags that Tools applies.
+func (t *Tool) ReadTools() []ServerTool {
+	return t.read
+}
+
+// WriteTools returns the write tools registered on this domain, ignoring the
+// read-only and allowlist flags that Tools applies.
+func (t *Tool) WriteTools() []ServerTool {
+	return t.write
+}
+
+// Tools returns the tools registered on this domain after applying the
+// read-only filter and the scope/tool allowlists (union semantics: a tool is
+// kept if its domain's scope is in AllowedScopes OR its name is in
+// AllowedTools). With no allowlists set, all tools pass through unchanged.
+func (t *Tool) Tools() []ServerTool {
+	all := make([]ServerTool, 0, len(t.write)+len(t.read))
 	if !flag.ReadOnly {
 		all = append(all, t.write...)
 	}
 	all = append(all, t.read...)
-	if len(flag.AllowedTools) == 0 {
+	if len(flag.AllowedScopes) == 0 && len(flag.AllowedTools) == 0 {
 		return all
 	}
-	filtered := make([]server.ServerTool, 0, len(all))
+	_, scopeAllowed := flag.AllowedScopes[t.scope]
+	filtered := make([]ServerTool, 0, len(all))
 	for _, st := range all {
-		if _, ok := flag.AllowedTools[st.Tool.Name]; ok {
+		_, toolAllowed := flag.AllowedTools[st.Tool.Name]
+		if scopeAllowed || toolAllowed {
 			filtered = append(filtered, st)
 		}
 	}
 	return filtered
 }
 
+// MCPHandler adapts a project handler to the official SDK's low-level handler.
+func (s ServerTool) MCPHandler() mcp.ToolHandler {
+	return func(ctx context.Context, req *mcp.CallToolRequest) (result *mcp.CallToolResult, err error) {
+		defer func() {
+			if recovered := recover(); recovered != nil {
+				panicErr := fmt.Errorf("panic recovered in %s tool handler: %v", s.Tool.Name, recovered)
+				log.Errorf("%s", panicErr)
+				err = internalError(panicErr)
+			}
+		}()
+
+		arguments, err := decodeArguments(req.Params.Arguments)
+		if err != nil {
+			return nil, err
+		}
+
+		result, err = s.Handler(ctx, arguments)
+		if err != nil {
+			var protocolErr *jsonrpc.Error
+			if errors.As(err, &protocolErr) {
+				return nil, err
+			}
+			// Preserve mcp-go behavior; tool-result errors are a separate change.
+			return nil, internalError(err)
+		}
+		return result, nil
+	}
+}
+
+func decodeArguments(raw json.RawMessage) (map[string]any, error) {
+	// An omitted and a null "arguments" both mean the tool was called without any.
+	if len(raw) == 0 || string(raw) == "null" {
+		return map[string]any{}, nil
+	}
+
+	var arguments map[string]any
+	if err := json.Unmarshal(raw, &arguments); err != nil {
+		return nil, &jsonrpc.Error{
+			Code:    jsonrpc.CodeInvalidParams,
+			Message: fmt.Sprintf("invalid tool arguments: %v", err),
+		}
+	}
+	return arguments, nil
+}
+
+func internalError(err error) error {
+	return &jsonrpc.Error{Code: jsonrpc.CodeInternalError, Message: err.Error()}
+}
+
+// warnUnmatched logs the names present in allowlist but absent from known,
+// via logUnmatched, so WarnUnmatchedAllowedTools and WarnUnmatchedAllowedScopes
+// share the same "collect, sort, no-op when empty" logic and can't drift.
+// No-op if allowlist is empty or every name in it is known.
+func warnUnmatched(allowlist, known map[string]struct{}, logUnmatched func(unmatched []string)) {
+	if len(allowlist) == 0 {
+		return
+	}
+	var unmatched []string
+	for name := range allowlist {
+		if _, ok := known[name]; !ok {
+			unmatched = append(unmatched, name)
+		}
+	}
+	if len(unmatched) == 0 {
+		return
+	}
+	slices.Sort(unmatched)
+	logUnmatched(unmatched)
+}
+
 // WarnUnmatchedAllowedTools logs any names in flag.AllowedTools that don't
 // match a tool registered on any of the given domains. No-op if the allowlist
 // is empty.
 func WarnUnmatchedAllowedTools(domains ...*Tool) {
-	if len(flag.AllowedTools) == 0 {
-		return
-	}
 	known := map[string]struct{}{}
 	for _, d := range domains {
 		for _, st := range d.read {
@@ -64,15 +168,25 @@ func WarnUnmatchedAllowedTools(domains ...*Tool) {
 			known[st.Tool.Name] = struct{}{}
 		}
 	}
-	var unmatched []string
+	warnUnmatched(flag.AllowedTools, known, func(unmatched []string) {
-	for name := range flag.AllowedTools {
+		log.Warnf("Unknown tools in --tools allowlist (ignored): %s", strings.Join(unmatched, ", "))
-		if _, ok := known[name]; !ok {
+	})
-			unmatched = append(unmatched, name)
+}
+
+// WarnUnmatchedAllowedScopes logs any names in flag.AllowedScopes that don't
+// match the scope of any of the given domains. No-op if the allowlist is
+// empty.
+func WarnUnmatchedAllowedScopes(domains ...*Tool) {
+	knownSet := map[string]struct{}{}
+	known := make([]string, 0, len(domains))
+	for _, d := range domains {
+		if _, ok := knownSet[d.scope]; !ok {
+			knownSet[d.scope] = struct{}{}
+			known = append(known, d.scope)
 		}
 	}
-	if len(unmatched) == 0 {
+	warnUnmatched(flag.AllowedScopes, knownSet, func(unmatched []string) {
-		return
+		slices.Sort(known)
-	}
+		log.Warnf("Unknown scopes in --scope allowlist (ignored): %s. Valid scopes: %s", strings.Join(unmatched, ", "), strings.Join(known, ", "))
-	slices.Sort(unmatched)
+	})
-	log.Warnf("Unknown tools in --tools allowlist (ignored): %s", strings.Join(unmatched, ", "))
 }

pkg/tool/tool_test.go

@@ -6,15 +6,14 @@ import (
 
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
 
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/mark3labs/mcp-go/server"
 )
 
-func makeTool(name string) server.ServerTool {
+func makeTool(name string) ServerTool {
-	return server.ServerTool{Tool: mcp.NewTool(name)}
+	return ServerTool{Tool: &mcp.Tool{Name: name}}
 }
 
-func names(sts []server.ServerTool) []string {
+func names(sts []ServerTool) []string {
 	out := make([]string, len(sts))
 	for i, st := range sts {
 		out[i] = st.Tool.Name
@@ -83,7 +82,7 @@ func TestTools(t *testing.T) {
 			flag.ReadOnly = tt.readOnly
 			flag.AllowedTools = tt.allowed
 
-			tr := New()
+			tr := New("scope1")
 			for _, n := range tt.read {
 				tr.RegisterRead(makeTool(n))
 			}
@@ -98,3 +97,130 @@ func TestTools(t *testing.T) {
 		})
 	}
 }
+
+func TestToolsScopeFiltering(t *testing.T) {
+	tests := []struct {
+		name          string
+		toolScope     string
+		readOnly      bool
+		allowedScopes map[string]struct{}
+		allowedTools  map[string]struct{}
+		read          []string
+		write         []string
+		want          []string
+	}{
+		{
+			name:      "no scope or tool filters returns all",
+			toolScope: "repository",
+			read:      []string{"r1"},
+			write:     []string{"w1"},
+			want:      []string{"w1", "r1"},
+		},
+		{
+			name:          "matching scope keeps everything",
+			toolScope:     "repository",
+			allowedScopes: map[string]struct{}{"repository": {}},
+			read:          []string{"r1"},
+			write:         []string{"w1"},
+			want:          []string{"w1", "r1"},
+		},
+		{
+			name:          "non-matching scope drops everything not in allowed tools",
+			toolScope:     "repository",
+			allowedScopes: map[string]struct{}{"file": {}},
+			read:          []string{"r1"},
+			write:         []string{"w1"},
+			want:          []string{},
+		},
+		{
+			name:         "tools-only allowlist behaves as before scopes existed",
+			toolScope:    "repository",
+			allowedTools: map[string]struct{}{"r1": {}},
+			read:         []string{"r1", "r2"},
+			write:        []string{"w1"},
+			want:         []string{"r1"},
+		},
+		{
+			name:          "scope and tools allowlists are unioned",
+			toolScope:     "repository",
+			allowedScopes: map[string]struct{}{"file": {}},
+			allowedTools:  map[string]struct{}{"r1": {}},
+			read:          []string{"r1", "r2"},
+			write:         []string{"w1"},
+			want:          []string{"r1"},
+		},
+		{
+			name:          "matching scope combined with read-only drops write entries",
+			toolScope:     "repository",
+			readOnly:      true,
+			allowedScopes: map[string]struct{}{"repository": {}},
+			read:          []string{"r1"},
+			write:         []string{"w1"},
+			want:          []string{"r1"},
+		},
+		{
+			name:          "unknown scope name matches nothing",
+			toolScope:     "repository",
+			allowedScopes: map[string]struct{}{"unknown_scope": {}},
+			read:          []string{"r1"},
+			write:         []string{"w1"},
+			want:          []string{},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			origRO, origAllowScopes, origAllowTools := flag.ReadOnly, flag.AllowedScopes, flag.AllowedTools
+			t.Cleanup(func() {
+				flag.ReadOnly, flag.AllowedScopes, flag.AllowedTools = origRO, origAllowScopes, origAllowTools
+			})
+			flag.ReadOnly = tt.readOnly
+			flag.AllowedScopes = tt.allowedScopes
+			flag.AllowedTools = tt.allowedTools
+
+			tr := New(tt.toolScope)
+			for _, n := range tt.read {
+				tr.RegisterRead(makeTool(n))
+			}
+			for _, n := range tt.write {
+				tr.RegisterWrite(makeTool(n))
+			}
+
+			got := names(tr.Tools())
+			if !slices.Equal(got, tt.want) {
+				t.Errorf("Tools() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestScope(t *testing.T) {
+	tr := New("repository")
+	if got := tr.Scope(); got != "repository" {
+		t.Errorf("Scope() = %q, want %q", got, "repository")
+	}
+}
+
+func TestWarnUnmatchedAllowedScopes(t *testing.T) {
+	origAllowScopes := flag.AllowedScopes
+	t.Cleanup(func() {
+		flag.AllowedScopes = origAllowScopes
+	})
+
+	repoTool := New("repository")
+	fileTool := New("file")
+
+	t.Run("empty allowlist is a no-op", func(t *testing.T) {
+		flag.AllowedScopes = nil
+		WarnUnmatchedAllowedScopes(repoTool, fileTool)
+	})
+
+	t.Run("known scopes produce no warning", func(t *testing.T) {
+		flag.AllowedScopes = map[string]struct{}{"repository": {}, "file": {}}
+		WarnUnmatchedAllowedScopes(repoTool, fileTool)
+	})
+
+	t.Run("unknown scope is tolerated", func(t *testing.T) {
+		flag.AllowedScopes = map[string]struct{}{"not_a_real_scope": {}}
+		WarnUnmatchedAllowedScopes(repoTool, fileTool)
+	})
+}

renovate.json5

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>gitea/renovate-config"
+  ],
+}