docs: sync AGENTS.md with gitea/gitea (#224)

Carries over the applicable rules from https://gitea.com/gitea/gitea `AGENTS.md`, covering test scope, linter escape hatches and PR conventions. Swaps `Co-Authored-By` for the `Assisted-by` trailer.

Reviewed-on: https://gitea.com/gitea/gitea-mcp/pulls/224
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "name": "Gitea MCP DevContainer",
-  "image": "mcr.microsoft.com/devcontainers/go:1.24-bookworm",
+  "image": "mcr.microsoft.com/devcontainers/go:1.26-bookworm",
   "features": {},
   "customizations": {
     "vscode": {

.golangci.yml

@@ -71,7 +71,10 @@ linters:
         - name: unexported-return
         - name: var-declaration
         - name: var-naming
-          disabled: true
+          arguments:
+            - [] # AllowList - do not remove as args for the rule are positional and won't work without lists first
+            - [] # DenyList
+            - - skip-package-name-checks: true
     staticcheck:
       checks:
         - all
@@ -91,20 +94,21 @@ linters:
       - common-false-positives
       - legacy
       - std-error-handling
-    rules:
-      - linters:
-          - errcheck
-          - staticcheck
-          - unparam
-        path: _test\.go
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
 formatters:
   enable:
-    - gofmt
+    - gci
     - gofumpt
   settings:
+    gci:
+      custom-order: true
+      sections:
+        - standard
+        - prefix(gitea.com/gitea/gitea-mcp)
+        - blank
+        - default
     gofumpt:
       extra-rules: true
   exclusions:

AGENTS.md

@@ -1,71 +1,16 @@
-# AGENTS.md
-
-This file provides guidance to AI coding agents 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 40+ MCP tools covering:
-
-- **User**: get_my_user_info, get_user_orgs, search_users
-- **Repository**: create_repo, fork_repo, list_my_repos, search_repos
-- **Branches/Tags**: create_branch, delete_branch, list_branches, create_tag, list_tags
-- **Files**: get_file_content, create_file, update_file, delete_file, get_dir_content
-- **Issues**: create_issue, list_repo_issues, create_issue_comment, edit_issue
-- **Pull Requests**: create_pull_request, list_repo_pull_requests, get_pull_request_by_index
-- **Releases**: create_release, list_releases, get_latest_release
-- **Wiki**: create_wiki_page, update_wiki_page, list_wiki_pages
-- **Search**: search_repos, search_users, search_org_teams
-- **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
+- Never assume, verify before claiming
+- Use `make help` to find available development targets
+- PR descriptions: minimal, only what and why, no task lists or file listings
+- Reference issues and PRs by full URL, not by number
+- 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.
+- 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
+- Keep comments short, prefer same-line, explain why, never narrate code. Preserve existing ones that still apply
+- 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
-
-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
+@AGENTS.md

Dockerfile

@@ -22,11 +22,14 @@ RUN --mount=type=cache,target=/go/pkg/mod \
 # Final stage
 FROM gcr.io/distroless/static-debian12:nonroot
 
+ARG VERSION=dev
+
 WORKDIR /app
 COPY --from=builder --chown=nonroot:nonroot /app/gitea-mcp .
 
 USER nonroot:nonroot
 
 LABEL org.opencontainers.image.version="${VERSION}"
+LABEL org.opencontainers.image.source="https://gitea.com/gitea/gitea-mcp"
 
 CMD ["/app/gitea-mcp"]

Makefile

@@ -3,12 +3,11 @@ 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.10.1
-GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1
-GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.9.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 # renovate: datasource=go
 
 .PHONY: help
-help: ## Print this help message.
+help: ## print this help message
 	@echo "Usage: make [target]"
 	@echo ""
 	@echo "Targets:"
@@ -16,7 +15,7 @@ help: ## Print this help message.
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 .PHONY: install
-install: build ## Install the application.
+install: build ## install the application
 	@echo "Installing $(EXECUTABLE)..."
 	@mkdir -p $(GOPATH)/bin
 	@cp $(EXECUTABLE) $(GOPATH)/bin/$(EXECUTABLE)
@@ -24,23 +23,23 @@ install: build ## Install the application.
 	@echo "Please add $(GOPATH)/bin to your PATH if it is not already there."
 
 .PHONY: uninstall
-uninstall: ## Uninstall the application.
+uninstall: ## uninstall the application
 	@echo "Uninstalling $(EXECUTABLE)..."
 	@rm -f $(GOPATH)/bin/$(EXECUTABLE)
 	@echo "Uninstalled $(EXECUTABLE) from $(GOPATH)/bin/$(EXECUTABLE)"
 
 .PHONY: clean
-clean: ## Clean the build artifacts.
+clean: ## delete build artifacts
 	@echo "Cleaning up build artifacts..."
 	@rm -f $(EXECUTABLE)
 	@echo "Cleaned up $(EXECUTABLE)"
 
 .PHONY: build
-build: ## Build the application.
+build: ## build the application
 	$(GO) build -v -ldflags '-s -w $(LDFLAGS)' -o $(EXECUTABLE)
 
 .PHONY: air
-air: ## Install air for hot reload.
+air: ## install air for hot reload
 	@hash air > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		$(GO) install github.com/air-verse/air@latest; \
 	fi
@@ -49,6 +48,19 @@ air: ## Install air for hot reload.
 dev: air ## run the application with hot reload
 	air --build.cmd "make build" --build.bin ./gitea-mcp
 
+.PHONY: fmt
+fmt: ## format the Go code
+	$(GO) run $(GOLANGCI_LINT_PACKAGE) fmt
+
+.PHONY: fmt-check
+fmt-check: fmt ## check that Go code is formatted
+	@diff=$$(git diff --color=always); \
+	if [ -n "$$diff" ]; then \
+		echo "Please run 'make fmt' and commit the result:"; \
+		printf "%s" "$${diff}"; \
+		exit 1; \
+	fi
+
 .PHONY: lint
 lint: lint-go ## lint everything
 

README.md

@@ -2,40 +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)
-  - [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)
-    - [📥 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)
+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:
 
-## What is Gitea?
+```bash
+git clone https://gitea.com/gitea/gitea-mcp.git
+cd gitea-mcp
+make install
+```
 
-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.
+## Configuration
 
-## What is MCP?
+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.
 
-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.
+### Claude Code
 
-## 🚧 Installation
-
-### Usage with Claude Code
-
-This method uses `go run` and requires [Go](https://go.dev) to be installed.
+Runs the server through `go run` and requires [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
 ```
 
-### Usage with VS Code
+### VS Code
 
-For quick installation, use one of the one-click install buttons at the top of this README.
-
-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.
+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.
 
 ```json
 {
@@ -68,14 +49,7 @@ Optionally, you can add it to a file called `.vscode/mcp.json` in your workspace
     "servers": {
       "gitea-mcp": {
         "command": "docker",
-        "args": [
-          "run",
-          "-i",
-          "--rm",
-          "-e",
-          "GITEA_ACCESS_TOKEN",
-          "docker.gitea.com/gitea-mcp-server"
-        ],
+        "args": ["run", "-i", "--rm", "-e", "GITEA_ACCESS_TOKEN", "docker.gitea.com/gitea-mcp-server"],
         "env": {
           "GITEA_ACCESS_TOKEN": "${input:gitea_token}"
         }
@@ -85,59 +59,50 @@ Optionally, you can add it to a file called `.vscode/mcp.json` in your workspace
 }
 ```
 
-### 📥 Download the official binary release
+### OpenCode
 
-You can download the official release from [official Gitea MCP binary releases](https://gitea.com/gitea/gitea-mcp/releases).
+Add the following to the top-level `mcp` object of your [OpenCode](https://opencode.ai) config:
 
-### 🔧 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
+```json
+    "gitea-mcp": {
+      "enabled": true,
+      "type": "local",
+      "command": [
+        "gitea-mcp",
+        "-t", "stdio",
+        "-H", "https://gitea.com",
+        "-T", "<your personal access token>"
+      ]
+    }
 ```
 
-Before building, make sure you have the following installed:
+### Mistral Vibe
 
-- make
-- Golang (Go 1.24 or later recommended)
+Add the following to `~/.vibe/config.toml`:
 
-Then run:
+```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
-make install
+[mcp_servers.env]
+GITEA_ACCESS_TOKEN = "TOKEN"
+GITEA_HOST = "https://gitea.com"
 ```
 
-### 📁 Add to PATH
+### Other clients
 
-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**
+Clients such as Cursor take either a stdio command:
 
 ```json
 {
   "mcpServers": {
     "gitea": {
       "command": "gitea-mcp",
-      "args": [
-        "-t",
-        "stdio",
-        "--host",
-        "https://gitea.com"
-        // "--token", "<your personal access token>"
-      ],
+      "args": ["-t", "stdio", "--host", "https://gitea.com"],
       "env": {
-        // "GITEA_HOST": "https://gitea.com",
-        // "GITEA_INSECURE": "true",
         "GITEA_ACCESS_TOKEN": "<your personal access token>"
       }
     }
@@ -145,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
 {
@@ -160,125 +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]
-> You can provide your Gitea host and access token either as command-line arguments or environment variables.
-> Command-line arguments have the highest priority
+## Available Tools
 
-Once everything is set up, try typing the following in your MCP-compatible chatbox:
+| Tool                         | Scope        | Access | Description                                                                                |
+| :--------------------------- | :----------- | :----- | :----------------------------------------------------------------------------------------- |
+| 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                                                                   |
 
-```text
-list all my repositories
+> **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`).
+
+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.
+
+```bash
+gitea-mcp -S issue,pull_request
+gitea-mcp --scope repository,branch --tools get_me
 ```
 
-## ✅ Available Tools
-
-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               |
-|   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!
+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.

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-服务器)
-  - [目录](#目录)
-  - [什么是 Gitea？](#什么是-gitea)
-  - [什么是 MCP？](#什么是-mcp)
-  - [🚧 安装](#-安装)
-    - [在 Claude Code 中使用](#在-claude-code-中使用)
-    - [在 VS Code 中使用](#在-vs-code-中使用)
-    - [📥 下载官方二进制版本](#-下载官方二进制版本)
-    - [🔧 从源码构建](#-从源码构建)
-    - [📁 加入 PATH](#-加入-path)
-  - [🚀 使用](#-使用)
-  - [✅ 可用工具](#-可用工具)
-  - [🐛 调试](#-调试)
-  - [🛠 疑难排解](#-疑难排解)
+可从 [发布页面](https://gitea.com/gitea/gitea-mcp/releases) 下载二进制文件并放入 `PATH`，或使用 `docker.gitea.com/gitea-mcp-server` 镜像，也可用 `make` 和 Go 1.26 及以上从源码构建到 `$GOPATH/bin`：
 
-## 什么是 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
 
-## 🚧 安装
-
-### 在 Claude Code 中使用
-
-此方式使用 `go run`，需要安装 [Go](https://go.dev)。
+通过 `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 顶部的安装按钮。
-
-如需手动安装，请将以下 JSON 块添加到 VS Code 的用户设置 (JSON) 文件。可通过按 `Ctrl + Shift + P` 并输入 `Preferences: Open User Settings (JSON)`。
-
-也可添加到工作区的 `.vscode/mcp.json` 文件，方便与他人共享配置。
-
-> `.vscode/mcp.json` 文件不需要 `mcp` 键。
+可使用本 README 顶部的安装按钮，或将下面的内容加入用户设置 (JSON)，按 `Ctrl + Shift + P` 并输入 `Preferences: Open User Settings (JSON)` 即可打开。也可放在工作区的 `.vscode/mcp.json` 中，此时无需 `mcp` 键。
 
 ```json
 {
@@ -68,14 +49,7 @@ claude mcp add --transport stdio --scope user gitea \
     "servers": {
       "gitea-mcp": {
         "command": "docker",
-        "args": [
-          "run",
-          "-i",
-          "--rm",
-          "-e",
-          "GITEA_ACCESS_TOKEN",
-          "docker.gitea.com/gitea-mcp-server"
-        ],
+        "args": ["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` 对象：
 
-### 🔧 从源码构建
-
-可用 Git 下载源码：
-
-```bash
-git clone https://gitea.com/gitea/gitea-mcp.git
+```json
+    "gitea-mcp": {
+      "enabled": true,
+      "type": "local",
+      "command": [
+        "gitea-mcp",
+        "-t", "stdio",
+        "-H", "https://gitea.com",
+        "-T", "<your personal access token>"
+      ]
+    }
 ```
 
-构建前请先安装：
+### Mistral Vibe
 
-- make
-- Golang（建议 Go 1.24 及以上）
+将下面的内容加入 `~/.vibe/config.toml`：
 
-然后运行：
+```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
-make install
+[mcp_servers.env]
+GITEA_ACCESS_TOKEN = "TOKEN"
+GITEA_HOST = "https://gitea.com"
 ```
 
-### 📁 加入 PATH
+### 其他客户端
 
-安装后，将 gitea-mcp 可执行文件复制到系统 PATH 目录，例如：
-
-```bash
-cp gitea-mcp /usr/local/bin/
-```
-
-## 🚀 使用
-
-此示例适用于 Cursor，也可在 VSCode 使用插件。  
-要配置 Gitea MCP 服务器，请将以下内容添加到 MCP 配置文件：
-
-- **stdio 模式**
+Cursor 等客户端可使用 stdio 命令：
 
 ```json
 {
   "mcpServers": {
     "gitea": {
       "command": "gitea-mcp",
-      "args": [
-        "-t",
-        "stdio",
-        "--host",
-        "https://gitea.com"
-        // "--token", "<your personal access token>"
-      ],
+      "args": ["-t", "stdio", "--host", "https://gitea.com"],
       "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,97 +125,74 @@ cp gitea-mcp /usr/local/bin/
 }
 ```
 
-**默认日志路径**: `$HOME/.gitea-mcp/gitea-mcp.log`
+配置完成后，可在聊天框输入 `列出我所有的仓库` 试试。
 
-> [!注意]
-> 可通过命令行参数或环境变量提供 Gitea 主机和访问令牌。  
-> 命令行参数优先。
+## 可用工具
 
-一切设置完成后，可在 MCP 聊天框输入：
+| 工具                           | 范围           | 访问 | 描述                                 |
+| :--------------------------- | :----------- | :- | :--------------------------------- |
+| 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      | 读取 | 列出仓库版本发布                           |
 
-```text
-列出我所有的仓库
+> **说明：** 部分工具是聚合的、基于操作的工具，单个工具通过 `method` 参数暴露多个操作。当服务器以只读模式运行时（`-r` / `GITEA_READONLY`），访问为「写入」的工具会被隐藏；可通过 `-S` / `--scope`（`GITEA_SCOPES`）按范围过滤，或通过 `-O` / `--tools`（`GITEA_TOOLS`）按工具名称过滤对外暴露的工具集合。
+
+未设置任一参数时，会加载所有工具；仅设置 `--scope` 时，会加载这些范围内的所有工具；仅设置 `--tools` 时，只会加载指定名称的工具；两者都设置时，会加载所选范围的工具与指定工具名称的并集。范围名称即上表「范围」列中的值，未知的范围名称仅会在启动时产生警告并被忽略。
+
+```bash
+gitea-mcp -S issue,pull_request
+gitea-mcp --scope repository,branch --tools get_me
 ```
 
-## ✅ 可用工具
-
-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 仓库！
+许多工具支持 `page` 和 `per_page` 分页参数。最大有效页面大小由 Gitea 服务器的 `[api].MAX_RESPONSE_ITEMS` 设置决定（默认 **50**），超出的值会被静默截断。

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-伺服器)
-  - [目錄](#目錄)
-  - [什麼是 Gitea？](#什麼是-gitea)
-  - [什麼是 MCP？](#什麼是-mcp)
-  - [🚧 安裝](#-安裝)
-    - [在 Claude Code 中使用](#在-claude-code-中使用)
-    - [在 VS Code 中使用](#在-vs-code-中使用)
-    - [📥 下載官方二進位版本](#-下載官方二進位版本)
-    - [🔧 從原始碼建置](#-從原始碼建置)
-    - [📁 加入 PATH](#-加入-path)
-  - [🚀 使用](#-使用)
-  - [✅ 可用工具](#-可用工具)
-  - [🐛 調試](#-調試)
-  - [🛠 疑難排解](#-疑難排解)
+可從 [發布頁面](https://gitea.com/gitea/gitea-mcp/releases) 下載二進位檔並放入 `PATH`，或使用 `docker.gitea.com/gitea-mcp-server` 映像檔，也可用 `make` 與 Go 1.26 以上從原始碼建置到 `$GOPATH/bin`：
 
-## 什麼是 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
 
-## 🚧 安裝
-
-### 在 Claude Code 中使用
-
-此方式使用 `go run`，需要安裝 [Go](https://go.dev)。
+透過 `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 頂部的安裝按鈕。
-
-如需手動安裝，請將下列 JSON 區塊加入 VS Code 的使用者設定 (JSON) 檔案。可按 `Ctrl + Shift + P` 並輸入 `Preferences: Open User Settings (JSON)`。
-
-也可加入至工作區的 `.vscode/mcp.json` 檔案，方便與他人共享設定。
-
-> `.vscode/mcp.json` 檔案不需 `mcp` 鍵。
+可使用本 README 頂部的安裝按鈕，或將下面的內容加入使用者設定 (JSON)，按 `Ctrl + Shift + P` 並輸入 `Preferences: Open User Settings (JSON)` 即可開啟。也可放在工作區的 `.vscode/mcp.json` 中，此時不需要 `mcp` 鍵。
 
 ```json
 {
@@ -68,14 +49,7 @@ claude mcp add --transport stdio --scope user gitea \
     "servers": {
       "gitea-mcp": {
         "command": "docker",
-        "args": [
-          "run",
-          "-i",
-          "--rm",
-          "-e",
-          "GITEA_ACCESS_TOKEN",
-          "docker.gitea.com/gitea-mcp-server"
-        ],
+        "args": ["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` 物件：
 
-### 🔧 從原始碼建置
-
-可用 Git 下載原始碼：
-
-```bash
-git clone https://gitea.com/gitea/gitea-mcp.git
+```json
+    "gitea-mcp": {
+      "enabled": true,
+      "type": "local",
+      "command": [
+        "gitea-mcp",
+        "-t", "stdio",
+        "-H", "https://gitea.com",
+        "-T", "<your personal access token>"
+      ]
+    }
 ```
 
-建置前請先安裝：
+### Mistral Vibe
 
-- make
-- Golang（建議 Go 1.24 以上）
+將下面的內容加入 `~/.vibe/config.toml`：
 
-然後執行：
+```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
-make install
+[mcp_servers.env]
+GITEA_ACCESS_TOKEN = "TOKEN"
+GITEA_HOST = "https://gitea.com"
 ```
 
-### 📁 加入 PATH
+### 其他客戶端
 
-安裝後，將 gitea-mcp 執行檔複製到系統 PATH 目錄，例如：
-
-```bash
-cp gitea-mcp /usr/local/bin/
-```
-
-## 🚀 使用
-
-此範例適用於 Cursor，也可在 VSCode 使用插件。  
-欲設定 Gitea MCP 伺服器，請將下列內容加入 MCP 設定檔：
-
-- **stdio 模式**
+Cursor 等客戶端可使用 stdio 命令：
 
 ```json
 {
   "mcpServers": {
     "gitea": {
       "command": "gitea-mcp",
-      "args": [
-        "-t",
-        "stdio",
-        "--host",
-        "https://gitea.com"
-        // "--token", "<your personal access token>"
-      ],
+      "args": ["-t", "stdio", "--host", "https://gitea.com"],
       "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,97 +125,74 @@ cp gitea-mcp /usr/local/bin/
 }
 ```
 
-**預設日誌路徑**: `$HOME/.gitea-mcp/gitea-mcp.log`
+設定完成後，可在聊天框輸入 `列出我所有的倉庫` 試試。
 
-> [!注意]
-> 可用命令列參數或環境變數提供 Gitea 主機與存取令牌。  
-> 命令列參數優先。
+## 可用工具
 
-一切設定完成後，可在 MCP 聊天框輸入：
+| 工具                           | 範圍           | 存取 | 描述                                 |
+| :--------------------------- | :----------- | :- | :--------------------------------- |
+| 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      | 讀取 | 列出倉庫版本發布                           |
 
-```text
-列出我所有的倉庫
+> **說明：** 部分工具是聚合的、基於操作的工具，單個工具透過 `method` 參數暴露多個操作。當伺服器以唯讀模式執行時（`-r` / `GITEA_READONLY`），存取為「寫入」的工具會被隱藏；可透過 `-S` / `--scope`（`GITEA_SCOPES`）依範圍過濾，或透過 `-O` / `--tools`（`GITEA_TOOLS`）依工具名稱過濾對外暴露的工具集合。
+
+未設定任一參數時，會載入所有工具；僅設定 `--scope` 時，會載入這些範圍內的所有工具；僅設定 `--tools` 時，只會載入指定名稱的工具；兩者皆設定時，會載入所選範圍的工具與指定工具名稱的聯集。範圍名稱即上表「範圍」欄中的值，未知的範圍名稱僅會在啟動時發出警告並被忽略。
+
+```bash
+gitea-mcp -S issue,pull_request
+gitea-mcp --scope repository,branch --tools get_me
 ```
 
-## ✅ 可用工具
-
-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 倉庫！
+許多工具支援 `page` 和 `per_page` 分頁參數。最大有效頁面大小由 Gitea 伺服器的 `[api].MAX_RESPONSE_ITEMS` 設定決定（預設 **50**），超出的值會被靜默截斷。

cmd/cmd.go

@@ -4,7 +4,10 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"io"
 	"os"
+	"strconv"
+	"strings"
 	"text/tabwriter"
 
 	"gitea.com/gitea/gitea-mcp/operation"
@@ -13,55 +16,83 @@ import (
 )
 
 var (
-	host    string
-	port    int
-	token   string
-	version bool
+	host                            string
+	port                            int
+	token                           string
+	tools                           string
+	scopes                          string
+	version                         bool
+	maxInlineAttachmentBytes        int
+	maxInlineAttachmentBytesFlagSet bool
+	osExit                          = os.Exit
 )
 
-func init() {
-	flag.StringVar(&flagPkg.Mode, "t", "stdio", "")
-	flag.StringVar(&flagPkg.Mode, "transport", "stdio", "")
-	flag.StringVar(&host, "H", os.Getenv("GITEA_HOST"), "")
-	flag.StringVar(&host, "host", os.Getenv("GITEA_HOST"), "")
-	flag.IntVar(&port, "p", 8080, "")
-	flag.IntVar(&port, "port", 8080, "")
-	flag.StringVar(&token, "T", "", "")
-	flag.StringVar(&token, "token", "", "")
-	flag.BoolVar(&flagPkg.ReadOnly, "r", false, "")
-	flag.BoolVar(&flagPkg.ReadOnly, "read-only", false, "")
-	flag.BoolVar(&flagPkg.Debug, "d", false, "")
-	flag.BoolVar(&flagPkg.Debug, "debug", false, "")
-	flag.BoolVar(&flagPkg.Insecure, "k", false, "")
-	flag.BoolVar(&flagPkg.Insecure, "insecure", false, "")
-	flag.BoolVar(&version, "v", false, "")
-	flag.BoolVar(&version, "version", false, "")
+func initFlagSet(fs *flag.FlagSet, args []string, getenv func(string) string, readFile func(string) ([]byte, error), stderr io.Writer) {
+	fs.StringVar(&flagPkg.Mode, "t", "stdio", "")
+	fs.StringVar(&flagPkg.Mode, "transport", "stdio", "")
+	fs.StringVar(&host, "H", getenv("GITEA_HOST"), "")
+	fs.StringVar(&host, "host", getenv("GITEA_HOST"), "")
+	fs.IntVar(&port, "p", 8080, "")
+	fs.IntVar(&port, "port", 8080, "")
+	fs.StringVar(&token, "T", "", "")
+	fs.StringVar(&token, "token", "", "")
+	fs.BoolVar(&flagPkg.ReadOnly, "r", false, "")
+	fs.BoolVar(&flagPkg.ReadOnly, "read-only", false, "")
+	defaultTools := getenv("GITEA_TOOLS")
+	fs.StringVar(&tools, "O", defaultTools, "")
+	fs.StringVar(&tools, "tools", defaultTools, "")
+	defaultScopes := getenv("GITEA_SCOPES")
+	fs.StringVar(&scopes, "S", defaultScopes, "")
+	fs.StringVar(&scopes, "scope", defaultScopes, "")
+	fs.BoolVar(&flagPkg.Debug, "d", false, "")
+	fs.BoolVar(&flagPkg.Debug, "debug", 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() {
-		w := tabwriter.NewWriter(os.Stderr, 0, 0, 3, ' ', 0)
-		fmt.Fprintln(os.Stderr, "Usage: gitea-mcp [options]")
-		fmt.Fprintln(os.Stderr)
-		fmt.Fprintln(os.Stderr, "Options:")
+	fs.Usage = func() {
+		w := tabwriter.NewWriter(stderr, 0, 0, 3, ' ', 0)
+		fmt.Fprintln(stderr, "Usage: gitea-mcp [options]")
+		fmt.Fprintln(stderr)
+		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:")
 		fmt.Fprintf(w, "  GITEA_ACCESS_TOKEN\tProvide access token\n")
+		fmt.Fprintf(w, "  GITEA_ACCESS_TOKEN_FILE\tPath to a file containing the access token (e.g. a Docker secret)\n")
 		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 == "" {
@@ -69,41 +100,92 @@ 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 := getenv("GITEA_ACCESS_TOKEN_FILE"); tokenFile != "" {
+			data, err := readFile(tokenFile)
+			if err != nil {
+				fmt.Fprintf(stderr, "error reading GITEA_ACCESS_TOKEN_FILE: %v\n", err)
+				osExit(1)
+			}
+			flagPkg.Token = strings.TrimRight(string(data), "\r\n")
+		}
 	}
 
-	if os.Getenv("MCP_MODE") != "" {
-		flagPkg.Mode = os.Getenv("MCP_MODE")
+	if getenv("MCP_MODE") != "" {
+		flagPkg.Mode = getenv("MCP_MODE")
 	}
-
-	if os.Getenv("GITEA_READONLY") == "true" {
+	if getenv("GITEA_READONLY") == "true" {
 		flagPkg.ReadOnly = true
 	}
 
-	if os.Getenv("GITEA_DEBUG") == "true" {
-		flagPkg.Debug = true
+	allowed := map[string]struct{}{}
+	for t := range strings.SplitSeq(tools, ",") {
+		if t = strings.TrimSpace(t); t != "" {
+			allowed[t] = struct{}{}
+		}
+	}
+	if len(allowed) > 0 {
+		flagPkg.AllowedTools = allowed
 	}
 
-	// Set insecure mode based on environment variable
-	if os.Getenv("GITEA_INSECURE") == "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" {
 		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

@@ -3,27 +3,24 @@ module gitea.com/gitea/gitea-mcp
 go 1.26.0
 
 require (
-	code.gitea.io/sdk/gitea v0.23.2
-	github.com/mark3labs/mcp-go v0.44.0
-	go.uber.org/zap v1.27.1
+	gitea.dev/sdk v1.2.0
+	github.com/mark3labs/mcp-go v0.56.0
+	go.uber.org/zap v1.28.0
+	go.uber.org/zap/exp v0.3.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 )
 
 require (
-	github.com/42wim/httpsig v1.2.3 // indirect
-	github.com/bahlo/generic-list-go v0.2.0 // indirect
-	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/42wim/httpsig v1.2.4 // indirect
 	github.com/davidmz/go-pageant v1.0.2 // indirect
-	github.com/go-fed/httpsig v1.1.0 // indirect
+	github.com/google/jsonschema-go v0.4.3 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/hashicorp/go-version v1.8.0 // indirect
-	github.com/invopop/jsonschema v0.13.0 // indirect
-	github.com/mailru/easyjson v0.9.1 // indirect
+	github.com/hashicorp/go-version v1.9.0 // indirect
+	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
 	github.com/spf13/cast v1.10.0 // indirect
-	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.48.0 // indirect
-	golang.org/x/sys v0.41.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	golang.org/x/crypto v0.54.0 // indirect
+	golang.org/x/sys v0.47.0 // indirect
+	golang.org/x/text v0.40.0 // indirect
 )

go.sum

@@ -1,73 +1,65 @@
-code.gitea.io/sdk/gitea v0.23.2 h1:iJB1FDmLegwfwjX8gotBDHdPSbk/ZR8V9VmEJaVsJYg=
-code.gitea.io/sdk/gitea v0.23.2/go.mod h1:yyF5+GhljqvA30sRDreoyHILruNiy4ASufugzYg0VHM=
-github.com/42wim/httpsig v1.2.3 h1:xb0YyWhkYj57SPtfSttIobJUPJZB9as1nsfo7KWVcEs=
-github.com/42wim/httpsig v1.2.3/go.mod h1:nZq9OlYKDrUBhptd77IHx4/sZZD+IxTBADvAPI9G/EM=
-github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
-github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
-github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
-github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
+gitea.dev/sdk v1.2.0 h1:avRtJl/nKCGispgSalo9czoZM9Rto1awnE0caNAoXGo=
+gitea.dev/sdk v1.2.0/go.mod h1:rfh5oNdIK24cbCREwIn1tqWKQW+IICXFGWJyebuOAOE=
+github.com/42wim/httpsig v1.2.4 h1:mI5bH0nm4xn7K18fo1K3okNDRq8CCJ0KbBYWyA6r8lU=
+github.com/42wim/httpsig v1.2.4/go.mod h1:yKsYfSyTBEohkPik224QPFylmzEBtda/kjyIAJjh3ps=
 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/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 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/go-fed/httpsig v1.1.0 h1:9M+hb0jkEICD8/cAiNqEB66R87tTINszBRTjwjQzWcI=
-github.com/go-fed/httpsig v1.1.0/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+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.8.0 h1:KAkNb1HAiZd1ukkxDFGmokVZe1Xy9HG6NUp+bPle2i4=
-github.com/hashicorp/go-version v1.8.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/invopop/jsonschema v0.13.0 h1:KvpoAJWEjR3uD9Kbm2HWJmqsEaHt8lBUpd0qHcIi21E=
-github.com/invopop/jsonschema v0.13.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
+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/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mailru/easyjson v0.9.1 h1:LbtsOm5WAswyWbvTEOqhypdPeZzHavpZx96/n553mR8=
-github.com/mailru/easyjson v0.9.1/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
-github.com/mark3labs/mcp-go v0.44.0 h1:OlYfcVviAnwNN40QZUrrzU0QZjq3En7rCU5X09a/B7I=
-github.com/mark3labs/mcp-go v0.44.0/go.mod h1:YnJfOL382MIWDx1kMY+2zsRHU/q78dBg9aFb8W6Thdw=
+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.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ=
+github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
 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.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
-github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
+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=
 github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
-go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo=
+go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q=
+go.uber.org/zap/exp v0.3.0 h1:6JYzdifzYkGmTdRR59oYH+Ng7k49H9qVpWwNSsGJj3U=
+go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ=
+go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
-golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
-golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+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/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
-golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
+golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
-golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+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/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 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=

main.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"runtime/debug"
+
 	"gitea.com/gitea/gitea-mcp/cmd"
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
 )
@@ -8,6 +10,11 @@ import (
 var Version = "dev"
 
 func init() {
+	if Version == "dev" {
+		if info, ok := debug.ReadBuildInfo(); ok && info.Main.Version != "" && info.Main.Version != "(devel)" {
+			Version = info.Main.Version
+		}
+	}
 	flag.Version = Version
 }
 

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

@@ -0,0 +1,195 @@
+package actions
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"net/http"
+	"net/url"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"gitea.com/gitea/gitea-mcp/pkg/gitea"
+	"gitea.com/gitea/gitea-mcp/pkg/params"
+	"gitea.com/gitea/gitea-mcp/pkg/to"
+
+	"github.com/mark3labs/mcp-go/mcp"
+)
+
+// Artifact endpoints require Gitea 1.25+. Older servers answer 404/405, which is
+// surfaced as a clear "not supported" message rather than a raw HTTP error.
+func artifactNotSupportedErr(err error) error {
+	var httpErr *gitea.HTTPError
+	if errors.As(err, &httpErr) && (httpErr.StatusCode == http.StatusNotFound || httpErr.StatusCode == http.StatusMethodNotAllowed) {
+		return fmt.Errorf("actions artifacts not supported on this Gitea version (endpoint returned %d, requires Gitea 1.25+). Check https://docs.gitea.com/api/1.25/ for available Actions endpoints", httpErr.StatusCode)
+	}
+	return err
+}
+
+func listRepoActionArtifactsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	owner, err := params.GetString(req.GetArguments(), "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	repo, err := params.GetString(req.GetArguments(), "repo")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	page, pageSize := params.GetPagination(req.GetArguments(), 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 != "" {
+		query.Set("name", name)
+	}
+
+	var result any
+	err = doJSONWithFallback(ctx, "GET",
+		[]string{
+			fmt.Sprintf("repos/%s/%s/actions/artifacts", url.PathEscape(owner), url.PathEscape(repo)),
+		},
+		query, nil, &result,
+	)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("list action artifacts err: %v", artifactNotSupportedErr(err)))
+	}
+	return to.TextResult(slimActionArtifacts(result))
+}
+
+func listRepoActionRunArtifactsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	owner, err := params.GetString(req.GetArguments(), "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	repo, err := params.GetString(req.GetArguments(), "repo")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	runID, err := params.GetIndex(req.GetArguments(), "run_id")
+	if err != nil || runID <= 0 {
+		return to.ErrorResult(errors.New("run_id is required"))
+	}
+	page, pageSize := params.GetPagination(req.GetArguments(), 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 != "" {
+		query.Set("name", name)
+	}
+
+	var result any
+	err = doJSONWithFallback(ctx, "GET",
+		[]string{
+			fmt.Sprintf("repos/%s/%s/actions/runs/%d/artifacts", url.PathEscape(owner), url.PathEscape(repo), runID),
+		},
+		query, nil, &result,
+	)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("list action run artifacts err: %v", artifactNotSupportedErr(err)))
+	}
+	return to.TextResult(slimActionArtifacts(result))
+}
+
+func getRepoActionArtifactFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	owner, err := params.GetString(req.GetArguments(), "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	repo, err := params.GetString(req.GetArguments(), "repo")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	artifactID, err := params.GetIndex(req.GetArguments(), "artifact_id")
+	if err != nil || artifactID <= 0 {
+		return to.ErrorResult(errors.New("artifact_id is required"))
+	}
+
+	var result any
+	err = doJSONWithFallback(ctx, "GET",
+		[]string{
+			fmt.Sprintf("repos/%s/%s/actions/artifacts/%d", url.PathEscape(owner), url.PathEscape(repo), artifactID),
+		},
+		nil, nil, &result,
+	)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get action artifact err: %v", artifactNotSupportedErr(err)))
+	}
+	return to.TextResult(slimActionArtifact(result))
+}
+
+func downloadRepoActionArtifactFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	owner, err := params.GetString(req.GetArguments(), "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	repo, err := params.GetString(req.GetArguments(), "repo")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	artifactID, err := params.GetIndex(req.GetArguments(), "artifact_id")
+	if err != nil || artifactID <= 0 {
+		return to.ErrorResult(errors.New("artifact_id is required"))
+	}
+	outputPath, _ := req.GetArguments()["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.
+	var meta map[string]any
+	_ = doJSONWithFallback(ctx, "GET",
+		[]string{fmt.Sprintf("repos/%s/%s/actions/artifacts/%d", url.PathEscape(owner), url.PathEscape(repo), artifactID)},
+		nil, nil, &meta,
+	)
+	if expired, ok := meta["expired"].(bool); ok && expired {
+		return to.ErrorResult(fmt.Errorf("artifact %d has expired and is no longer downloadable", artifactID))
+	}
+
+	// The zip endpoint answers with a 302 redirect to signed blob storage;
+	// DoBytes follows GET redirects and returns the archive bytes.
+	raw, _, err := gitea.DoBytes(ctx, "GET",
+		fmt.Sprintf("repos/%s/%s/actions/artifacts/%d/zip", url.PathEscape(owner), url.PathEscape(repo), artifactID),
+		nil, nil, "application/zip",
+	)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("download action artifact err: %v", artifactNotSupportedErr(err)))
+	}
+
+	if outputPath == "" {
+		home, _ := os.UserHomeDir()
+		if home == "" {
+			home = os.TempDir()
+		}
+		outputPath = filepath.Join(home, ".gitea-mcp", "artifacts", "actions-artifacts", owner, repo, artifactFilename(meta, artifactID))
+	}
+
+	if err := os.MkdirAll(filepath.Dir(outputPath), 0o700); err != nil {
+		return to.ErrorResult(fmt.Errorf("create output dir err: %v", err))
+	}
+	if err := os.WriteFile(outputPath, raw, 0o600); err != nil {
+		return to.ErrorResult(fmt.Errorf("write artifact file err: %v", err))
+	}
+
+	res := map[string]any{
+		"artifact_id": artifactID,
+		"path":        outputPath,
+		"bytes":       len(raw),
+	}
+	if name, ok := meta["name"].(string); ok && name != "" {
+		res["name"] = name
+	}
+	return to.TextResult(res)
+}
+
+// artifactFilename derives a safe "<name>.zip" filename from artifact metadata,
+// falling back to the artifact ID when the name is missing or path-unsafe.
+func artifactFilename(meta map[string]any, artifactID int64) string {
+	name, _ := meta["name"].(string)
+	name = strings.TrimSpace(name)
+	if name != "" && !strings.ContainsAny(name, `/\`) && name != "." && name != ".." {
+		return name + ".zip"
+	}
+	return fmt.Sprintf("%d.zip", artifactID)
+}

operation/actions/artifacts_test.go

@@ -0,0 +1,29 @@
+package actions
+
+import "testing"
+
+func TestArtifactFilename(t *testing.T) {
+	tests := []struct {
+		name       string
+		meta       map[string]any
+		artifactID int64
+		want       string
+	}{
+		{"uses name", map[string]any{"name": "build-output"}, 7, "build-output.zip"},
+		{"trims whitespace", map[string]any{"name": "  logs  "}, 7, "logs.zip"},
+		{"missing name falls back to id", map[string]any{}, 7, "7.zip"},
+		{"empty name falls back to id", map[string]any{"name": ""}, 7, "7.zip"},
+		{"non-string name falls back to id", map[string]any{"name": 42}, 7, "7.zip"},
+		{"rejects forward slash traversal", map[string]any{"name": "../etc/passwd"}, 7, "7.zip"},
+		{"rejects backslash traversal", map[string]any{"name": `..\win`}, 7, "7.zip"},
+		{"rejects dot", map[string]any{"name": "."}, 7, "7.zip"},
+		{"rejects dotdot", map[string]any{"name": ".."}, 7, "7.zip"},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := artifactFilename(tt.meta, tt.artifactID); got != tt.want {
+				t.Errorf("artifactFilename() = %q, want %q", got, tt.want)
+			}
+		})
+	}
+}

operation/actions/config.go

@@ -2,18 +2,17 @@ package actions
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"net/url"
 	"strconv"
 	"time"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
 )
@@ -47,27 +46,29 @@ func toSecretMetas(secrets []*gitea_sdk.Secret) []secretMeta {
 var (
 	ActionsConfigReadTool = mcp.NewTool(
 		ActionsConfigReadToolName,
-		mcp.WithDescription("Read Actions secrets and variables configuration."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("list_repo_secrets", "list_org_secrets", "list_repo_variables", "get_repo_variable", "list_org_variables", "get_org_variable")),
-		mcp.WithString("owner", mcp.Description("repository owner (required for repo methods)")),
-		mcp.WithString("repo", mcp.Description("repository name (required for repo methods)")),
-		mcp.WithString("org", mcp.Description("organization name (required for org methods)")),
-		mcp.WithString("name", mcp.Description("variable name (required for get methods)")),
-		mcp.WithNumber("page", mcp.Description("page number"), mcp.DefaultNumber(1), mcp.Min(1)),
-		mcp.WithNumber("perPage", mcp.Description("results per page"), mcp.DefaultNumber(30), mcp.Min(1)),
+		mcp.WithDescription("Read Actions secrets and variables."),
+		mcp.WithToolAnnotation(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")),
+		mcp.WithString("owner", mcp.Description("for repo methods")),
+		mcp.WithString("repo", mcp.Description("for repo methods")),
+		mcp.WithString("org", mcp.Description("for org methods")),
+		mcp.WithString("name", mcp.Description("for get methods")),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30), mcp.Min(1)),
 	)
 
 	ActionsConfigWriteTool = mcp.NewTool(
 		ActionsConfigWriteToolName,
-		mcp.WithDescription("Manage Actions secrets and variables: create, update, or delete."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), 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")),
-		mcp.WithString("owner", mcp.Description("repository owner (required for repo methods)")),
-		mcp.WithString("repo", mcp.Description("repository name (required for repo methods)")),
-		mcp.WithString("org", mcp.Description("organization name (required for org methods)")),
-		mcp.WithString("name", mcp.Description("secret or variable name (required for most methods)")),
-		mcp.WithString("data", mcp.Description("secret value (required for upsert secret methods)")),
-		mcp.WithString("value", mcp.Description("variable value (required for create/update variable methods)")),
-		mcp.WithString("description", mcp.Description("description for secret or variable")),
+		mcp.WithDescription("Write Actions secrets and variables: upsert, create, update, delete."),
+		mcp.WithToolAnnotation(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")),
+		mcp.WithString("owner", mcp.Description("for repo methods")),
+		mcp.WithString("repo", mcp.Description("for repo methods")),
+		mcp.WithString("org", mcp.Description("for org methods")),
+		mcp.WithString("name", mcp.Description("secret or variable name")),
+		mcp.WithString("data", mcp.Description("secret value (upsert)")),
+		mcp.WithString("value", mcp.Description("variable value")),
+		mcp.WithString("description"),
 	)
 )
 
@@ -130,17 +131,14 @@ func configWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolR
 	}
 }
 
-// Secret functions
-
 func listRepoActionSecretsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listRepoActionSecretsFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	page, pageSize := params.GetPagination(req.GetArguments(), 30)
 
@@ -149,7 +147,7 @@ func listRepoActionSecretsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 
-	secrets, _, err := client.ListRepoActionSecret(owner, repo, gitea_sdk.ListRepoActionSecretOption{
+	secrets, _, err := client.Actions.ListRepoSecrets(ctx, owner, repo, gitea_sdk.ListRepoActionsSecretOption{
 		ListOptions: gitea_sdk.ListOptions{Page: page, PageSize: pageSize},
 	})
 	if err != nil {
@@ -160,22 +158,21 @@ func listRepoActionSecretsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 }
 
 func upsertRepoActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called upsertRepoActionSecretFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	name, err := params.GetString(req.GetArguments(), "name")
-	if err != nil || name == "" {
-		return to.ErrorResult(errors.New("name is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	data, err := params.GetString(req.GetArguments(), "data")
-	if err != nil || data == "" {
-		return to.ErrorResult(errors.New("data is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	description, _ := req.GetArguments()["description"].(string)
 
@@ -183,8 +180,7 @@ func upsertRepoActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	resp, err := client.CreateRepoActionSecret(owner, repo, gitea_sdk.CreateSecretOption{
-		Name:        name,
+	resp, err := client.Actions.CreateRepoSecret(ctx, owner, repo, name, gitea_sdk.CreateOrUpdateSecretOption{
 		Data:        data,
 		Description: description,
 	})
@@ -195,25 +191,24 @@ func upsertRepoActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 }
 
 func deleteRepoActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called deleteRepoActionSecretFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	name, err := params.GetString(req.GetArguments(), "name")
-	if err != nil || name == "" {
-		return to.ErrorResult(errors.New("name is required"))
+	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))
 	}
-	resp, err := client.DeleteRepoActionSecret(owner, repo, name)
+	resp, err := client.Actions.DeleteRepoSecret(ctx, owner, repo, name)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("delete repo action secret err: %v", err))
 	}
@@ -221,10 +216,9 @@ func deleteRepoActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 }
 
 func listOrgActionSecretsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listOrgActionSecretsFn")
 	org, err := params.GetString(req.GetArguments(), "org")
-	if err != nil || org == "" {
-		return to.ErrorResult(errors.New("org is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	page, pageSize := params.GetPagination(req.GetArguments(), 30)
 
@@ -233,7 +227,7 @@ func listOrgActionSecretsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 
-	secrets, _, err := client.ListOrgActionSecret(org, gitea_sdk.ListOrgActionSecretOption{
+	secrets, _, err := client.Actions.ListOrgSecrets(ctx, org, gitea_sdk.ListOrgActionsSecretOption{
 		ListOptions: gitea_sdk.ListOptions{Page: page, PageSize: pageSize},
 	})
 	if err != nil {
@@ -244,18 +238,17 @@ func listOrgActionSecretsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 }
 
 func upsertOrgActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called upsertOrgActionSecretFn")
 	org, err := params.GetString(req.GetArguments(), "org")
-	if err != nil || org == "" {
-		return to.ErrorResult(errors.New("org is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	name, err := params.GetString(req.GetArguments(), "name")
-	if err != nil || name == "" {
-		return to.ErrorResult(errors.New("name is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	data, err := params.GetString(req.GetArguments(), "data")
-	if err != nil || data == "" {
-		return to.ErrorResult(errors.New("data is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	description, _ := req.GetArguments()["description"].(string)
 
@@ -263,8 +256,7 @@ func upsertOrgActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	resp, err := client.CreateOrgActionSecret(org, gitea_sdk.CreateSecretOption{
-		Name:        name,
+	resp, err := client.Actions.CreateOrgSecret(ctx, org, name, gitea_sdk.CreateOrUpdateSecretOption{
 		Data:        data,
 		Description: description,
 	})
@@ -275,14 +267,13 @@ func upsertOrgActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 }
 
 func deleteOrgActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called deleteOrgActionSecretFn")
 	org, err := params.GetString(req.GetArguments(), "org")
-	if err != nil || org == "" {
-		return to.ErrorResult(errors.New("org is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	name, err := params.GetString(req.GetArguments(), "name")
-	if err != nil || name == "" {
-		return to.ErrorResult(errors.New("name is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 
 	escapedOrg := url.PathEscape(org)
@@ -294,17 +285,14 @@ func deleteOrgActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	return to.TextResult(map[string]any{"message": "secret deleted"})
 }
 
-// Variable functions
-
 func listRepoActionVariablesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listRepoActionVariablesFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	page, pageSize := params.GetPagination(req.GetArguments(), 30)
 
@@ -321,25 +309,24 @@ func listRepoActionVariablesFn(ctx context.Context, req mcp.CallToolRequest) (*m
 }
 
 func getRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getRepoActionVariableFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	name, err := params.GetString(req.GetArguments(), "name")
-	if err != nil || name == "" {
-		return to.ErrorResult(errors.New("name is required"))
+	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))
 	}
-	variable, _, err := client.GetRepoActionVariable(owner, repo, name)
+	variable, _, err := client.Actions.GetRepoVariable(ctx, owner, repo, name)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get repo action variable err: %v", err))
 	}
@@ -347,29 +334,28 @@ func getRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 }
 
 func createRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called createRepoActionVariableFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	name, err := params.GetString(req.GetArguments(), "name")
-	if err != nil || name == "" {
-		return to.ErrorResult(errors.New("name is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	value, err := params.GetString(req.GetArguments(), "value")
-	if err != nil || value == "" {
-		return to.ErrorResult(errors.New("value is required"))
+	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))
 	}
-	resp, err := client.CreateRepoActionVariable(owner, repo, name, value)
+	resp, err := client.Actions.CreateRepoVariable(ctx, owner, repo, name, value)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("create repo action variable err: %v", err))
 	}
@@ -377,29 +363,28 @@ func createRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*
 }
 
 func updateRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called updateRepoActionVariableFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	name, err := params.GetString(req.GetArguments(), "name")
-	if err != nil || name == "" {
-		return to.ErrorResult(errors.New("name is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	value, err := params.GetString(req.GetArguments(), "value")
-	if err != nil || value == "" {
-		return to.ErrorResult(errors.New("value is required"))
+	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))
 	}
-	resp, err := client.UpdateRepoActionVariable(owner, repo, name, value)
+	resp, err := client.Actions.UpdateRepoVariable(ctx, owner, repo, name, value)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("update repo action variable err: %v", err))
 	}
@@ -407,25 +392,24 @@ func updateRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*
 }
 
 func deleteRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called deleteRepoActionVariableFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	name, err := params.GetString(req.GetArguments(), "name")
-	if err != nil || name == "" {
-		return to.ErrorResult(errors.New("name is required"))
+	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))
 	}
-	resp, err := client.DeleteRepoActionVariable(owner, repo, name)
+	resp, err := client.Actions.DeleteRepoVariable(ctx, owner, repo, name)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("delete repo action variable err: %v", err))
 	}
@@ -433,10 +417,9 @@ func deleteRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*
 }
 
 func listOrgActionVariablesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listOrgActionVariablesFn")
 	org, err := params.GetString(req.GetArguments(), "org")
-	if err != nil || org == "" {
-		return to.ErrorResult(errors.New("org is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	page, pageSize := params.GetPagination(req.GetArguments(), 30)
 
@@ -444,7 +427,7 @@ func listOrgActionVariablesFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	variables, _, err := client.ListOrgActionVariable(org, gitea_sdk.ListOrgActionVariableOption{
+	variables, _, err := client.Actions.ListOrgVariables(ctx, org, gitea_sdk.ListOrgActionsVariableOption{
 		ListOptions: gitea_sdk.ListOptions{Page: page, PageSize: pageSize},
 	})
 	if err != nil {
@@ -454,21 +437,20 @@ func listOrgActionVariablesFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 }
 
 func getOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getOrgActionVariableFn")
 	org, err := params.GetString(req.GetArguments(), "org")
-	if err != nil || org == "" {
-		return to.ErrorResult(errors.New("org is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	name, err := params.GetString(req.GetArguments(), "name")
-	if err != nil || name == "" {
-		return to.ErrorResult(errors.New("name is required"))
+	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))
 	}
-	variable, _, err := client.GetOrgActionVariable(org, name)
+	variable, _, err := client.Actions.GetOrgVariable(ctx, org, name)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get org action variable err: %v", err))
 	}
@@ -476,18 +458,17 @@ func getOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 }
 
 func createOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called createOrgActionVariableFn")
 	org, err := params.GetString(req.GetArguments(), "org")
-	if err != nil || org == "" {
-		return to.ErrorResult(errors.New("org is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	name, err := params.GetString(req.GetArguments(), "name")
-	if err != nil || name == "" {
-		return to.ErrorResult(errors.New("name is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	value, err := params.GetString(req.GetArguments(), "value")
-	if err != nil || value == "" {
-		return to.ErrorResult(errors.New("value is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	description, _ := req.GetArguments()["description"].(string)
 
@@ -495,8 +476,7 @@ func createOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	resp, err := client.CreateOrgActionVariable(org, gitea_sdk.CreateOrgActionVariableOption{
-		Name:        name,
+	resp, err := client.Actions.CreateOrgVariable(ctx, org, name, gitea_sdk.CreateActionsVariableOption{
 		Value:       value,
 		Description: description,
 	})
@@ -507,18 +487,17 @@ func createOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*m
 }
 
 func updateOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called updateOrgActionVariableFn")
 	org, err := params.GetString(req.GetArguments(), "org")
-	if err != nil || org == "" {
-		return to.ErrorResult(errors.New("org is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	name, err := params.GetString(req.GetArguments(), "name")
-	if err != nil || name == "" {
-		return to.ErrorResult(errors.New("name is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	value, err := params.GetString(req.GetArguments(), "value")
-	if err != nil || value == "" {
-		return to.ErrorResult(errors.New("value is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	description, _ := req.GetArguments()["description"].(string)
 
@@ -526,7 +505,8 @@ func updateOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	resp, err := client.UpdateOrgActionVariable(org, name, gitea_sdk.UpdateOrgActionVariableOption{
+	resp, err := client.Actions.UpdateOrgVariable(ctx, org, name, gitea_sdk.UpdateActionsVariableOption{
+		Name:        name,
 		Value:       value,
 		Description: description,
 	})
@@ -537,14 +517,13 @@ func updateOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*m
 }
 
 func deleteOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called deleteOrgActionVariableFn")
 	org, err := params.GetString(req.GetArguments(), "org")
-	if err != nil || org == "" {
-		return to.ErrorResult(errors.New("org is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	name, err := params.GetString(req.GetArguments(), "name")
-	if err != nil || name == "" {
-		return to.ErrorResult(errors.New("name is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 
 	_, err = gitea.DoJSON(ctx, "DELETE", fmt.Sprintf("orgs/%s/actions/variables/%s", url.PathEscape(org), url.PathEscape(name)), nil, nil, nil)

operation/actions/runs.go

@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"strconv"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 
@@ -27,31 +27,35 @@ const (
 var (
 	ActionsRunReadTool = mcp.NewTool(
 		ActionsRunReadToolName,
-		mcp.WithDescription("Read Actions workflow, run, and job data. Use method 'list_workflows'/'get_workflow' for workflows, 'list_runs'/'get_run' for runs, 'list_jobs'/'list_run_jobs' for jobs, 'get_job_log_preview'/'download_job_log' for logs."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("list_workflows", "get_workflow", "list_runs", "get_run", "list_jobs", "list_run_jobs", "get_job_log_preview", "download_job_log")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("workflow_id", mcp.Description("workflow ID or filename (required for 'get_workflow')")),
-		mcp.WithNumber("run_id", mcp.Description("run ID (required for 'get_run', 'list_run_jobs')")),
-		mcp.WithNumber("job_id", mcp.Description("job ID (required for 'get_job_log_preview', 'download_job_log')")),
-		mcp.WithString("status", mcp.Description("optional status filter (for 'list_runs', 'list_jobs')")),
-		mcp.WithNumber("tail_lines", mcp.Description("number of lines from end of log (for 'get_job_log_preview')"), mcp.DefaultNumber(200), mcp.Min(1)),
-		mcp.WithNumber("max_bytes", mcp.Description("max bytes to return (for 'get_job_log_preview')"), mcp.DefaultNumber(65536), mcp.Min(1024)),
-		mcp.WithString("output_path", mcp.Description("output file path (for 'download_job_log')")),
-		mcp.WithNumber("page", mcp.Description("page number"), mcp.DefaultNumber(1), mcp.Min(1)),
-		mcp.WithNumber("perPage", mcp.Description("results per page"), mcp.DefaultNumber(30), mcp.Min(1)),
+		mcp.WithDescription("Read Actions workflows, runs, jobs, logs, and artifacts."),
+		mcp.WithToolAnnotation(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", "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)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("workflow_id", mcp.Description("ID or filename (for 'get_workflow')")),
+		mcp.WithNumber("run_id", mcp.Description("for 'get_run'/'list_run_jobs'/'list_run_artifacts'")),
+		mcp.WithNumber("job_id", mcp.Description("for 'get_job'/log methods")),
+		mcp.WithNumber("artifact_id", mcp.Description("for 'get_artifact'/'download_artifact'")),
+		mcp.WithString("artifact_name", mcp.Description("name filter for 'list_artifacts'/'list_run_artifacts'")),
+		mcp.WithString("status", mcp.Description("filter for 'list_runs'/'list_jobs'")),
+		mcp.WithNumber("tail_lines", mcp.Description("log tail lines"), mcp.DefaultNumber(200), mcp.Min(1)),
+		mcp.WithNumber("max_bytes", mcp.Description("max log bytes"), mcp.DefaultNumber(65536), mcp.Min(1024)),
+		mcp.WithString("output_path", mcp.Description("for 'download_job_log'/'download_artifact'")),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30), mcp.Min(1)),
 	)
 
 	ActionsRunWriteTool = mcp.NewTool(
 		ActionsRunWriteToolName,
-		mcp.WithDescription("Trigger, cancel, or rerun Actions workflows."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("dispatch_workflow", "cancel_run", "rerun_run")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("workflow_id", mcp.Description("workflow ID or filename (required for 'dispatch_workflow')")),
-		mcp.WithString("ref", mcp.Description("git ref branch or tag (required for 'dispatch_workflow')")),
-		mcp.WithObject("inputs", mcp.Description("workflow inputs object (for 'dispatch_workflow')")),
-		mcp.WithNumber("run_id", mcp.Description("run ID (required for 'cancel_run', 'rerun_run')")),
+		mcp.WithDescription("Write Actions runs: dispatch, cancel, rerun."),
+		mcp.WithToolAnnotation(annotation.Write("Trigger, cancel, or rerun Actions workflows")),
+		mcp.WithString("method", mcp.Required(), mcp.Enum("dispatch_workflow", "cancel_run", "rerun_run")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("workflow_id", mcp.Description("ID or filename (for 'dispatch_workflow')")),
+		mcp.WithString("ref", mcp.Description("branch or tag (for 'dispatch_workflow')")),
+		mcp.WithObject("inputs", mcp.Description("for 'dispatch_workflow'")),
+		mcp.WithNumber("run_id", mcp.Description("for 'cancel_run'/'rerun_run'")),
 	)
 )
 
@@ -78,10 +82,20 @@ func runReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResul
 		return listRepoActionJobsFn(ctx, req)
 	case "list_run_jobs":
 		return listRepoActionRunJobsFn(ctx, req)
+	case "get_job":
+		return getRepoActionJobFn(ctx, req)
 	case "get_job_log_preview":
 		return getRepoActionJobLogPreviewFn(ctx, req)
 	case "download_job_log":
 		return downloadRepoActionJobLogFn(ctx, req)
+	case "list_artifacts":
+		return listRepoActionArtifactsFn(ctx, req)
+	case "list_run_artifacts":
+		return listRepoActionRunArtifactsFn(ctx, req)
+	case "get_artifact":
+		return getRepoActionArtifactFn(ctx, req)
+	case "download_artifact":
+		return downloadRepoActionArtifactFn(ctx, req)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
@@ -122,14 +136,13 @@ func doJSONWithFallback(ctx context.Context, method string, paths []string, quer
 }
 
 func listRepoActionWorkflowsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listRepoActionWorkflowsFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	page, pageSize := params.GetPagination(req.GetArguments(), 30)
 	query := url.Values{}
@@ -150,18 +163,17 @@ func listRepoActionWorkflowsFn(ctx context.Context, req mcp.CallToolRequest) (*m
 }
 
 func getRepoActionWorkflowFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getRepoActionWorkflowFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	workflowID, err := params.GetString(req.GetArguments(), "workflow_id")
-	if err != nil || workflowID == "" {
-		return to.ErrorResult(errors.New("workflow_id is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 
 	var result any
@@ -178,22 +190,21 @@ func getRepoActionWorkflowFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 }
 
 func dispatchRepoActionWorkflowFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called dispatchRepoActionWorkflowFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	workflowID, err := params.GetString(req.GetArguments(), "workflow_id")
-	if err != nil || workflowID == "" {
-		return to.ErrorResult(errors.New("workflow_id is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	ref, err := params.GetString(req.GetArguments(), "ref")
-	if err != nil || ref == "" {
-		return to.ErrorResult(errors.New("ref is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 
 	var inputs map[string]any
@@ -228,14 +239,13 @@ func dispatchRepoActionWorkflowFn(ctx context.Context, req mcp.CallToolRequest)
 }
 
 func listRepoActionRunsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listRepoActionRunsFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	page, pageSize := params.GetPagination(req.GetArguments(), 30)
 	statusFilter, _ := req.GetArguments()["status"].(string)
@@ -261,14 +271,13 @@ func listRepoActionRunsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 }
 
 func getRepoActionRunFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getRepoActionRunFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	runID, err := params.GetIndex(req.GetArguments(), "run_id")
 	if err != nil || runID <= 0 {
@@ -289,14 +298,13 @@ func getRepoActionRunFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 }
 
 func cancelRepoActionRunFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called cancelRepoActionRunFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	runID, err := params.GetIndex(req.GetArguments(), "run_id")
 	if err != nil || runID <= 0 {
@@ -316,14 +324,13 @@ func cancelRepoActionRunFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.C
 }
 
 func rerunRepoActionRunFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called rerunRepoActionRunFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	runID, err := params.GetIndex(req.GetArguments(), "run_id")
 	if err != nil || runID <= 0 {
@@ -348,14 +355,13 @@ func rerunRepoActionRunFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 }
 
 func listRepoActionJobsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listRepoActionJobsFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	page, pageSize := params.GetPagination(req.GetArguments(), 30)
 	statusFilter, _ := req.GetArguments()["status"].(string)
@@ -381,14 +387,13 @@ func listRepoActionJobsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 }
 
 func listRepoActionRunJobsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listRepoActionRunJobsFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
-	if err != nil || owner == "" {
-		return to.ErrorResult(errors.New("owner is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	repo, err := params.GetString(req.GetArguments(), "repo")
-	if err != nil || repo == "" {
-		return to.ErrorResult(errors.New("repo is required"))
+	if err != nil {
+		return to.ErrorResult(err)
 	}
 	runID, err := params.GetIndex(req.GetArguments(), "run_id")
 	if err != nil || runID <= 0 {
@@ -413,7 +418,36 @@ func listRepoActionRunJobsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	return to.TextResult(slimActionJobs(result))
 }
 
-// Log functions (merged from logs.go)
+func getRepoActionJobFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	owner, err := params.GetString(req.GetArguments(), "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	repo, err := params.GetString(req.GetArguments(), "repo")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	jobID, err := params.GetIndex(req.GetArguments(), "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{
@@ -470,7 +504,6 @@ func limitBytes(data []byte, maxBytes int) ([]byte, bool) {
 }
 
 func getRepoActionJobLogPreviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getRepoActionJobLogPreviewFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -505,7 +538,6 @@ func getRepoActionJobLogPreviewFn(ctx context.Context, req mcp.CallToolRequest)
 }
 
 func downloadRepoActionJobLogFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called downloadRepoActionJobLogFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)

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)
 }
@@ -90,3 +97,19 @@ func slimActionWorkflow(raw any) any {
 func slimActionWorkflows(raw any) any {
 	return slimPaginated(raw, slimWorkflow)
 }
+
+func slimArtifact(m map[string]any) map[string]any {
+	return pick(m, "id", "name", "size_in_bytes", "expired",
+		"created_at", "updated_at", "expires_at")
+}
+
+func slimActionArtifact(raw any) any {
+	if m, ok := raw.(map[string]any); ok {
+		return slimArtifact(m)
+	}
+	return raw
+}
+
+func slimActionArtifacts(raw any) any {
+	return slimPaginated(raw, slimArtifact)
+}

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,311 @@
+package issue
+
+import (
+	"bytes"
+	"context"
+	"encoding/base64"
+	"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_sdk "gitea.dev/sdk"
+	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/mark3labs/mcp-go/server"
+)
+
+const AttachmentReadToolName = "attachment_read"
+
+var AttachmentReadTool = mcp.NewTool(
+	AttachmentReadToolName,
+	mcp.WithDescription("Read issue/comment attachments: list metadata, get metadata, or download content."),
+	mcp.WithToolAnnotation(annotation.ReadOnly("Read issue or comment attachments")),
+	mcp.WithString("method", mcp.Required(), mcp.Enum("list", "get", "download")),
+	mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+	mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+	mcp.WithNumber("issue_number", mcp.Description("required for issue attachment list/get or issue-scoped metadata lookup")),
+	mcp.WithNumber("comment_id", mcp.Description("required for comment attachment list/get or comment-scoped metadata lookup")),
+	mcp.WithNumber("attachment_id", mcp.Description("required for get and for download when attachment_uuid is not provided")),
+	mcp.WithString("attachment_uuid", mcp.Description("attachment UUID for direct download path lookup")),
+	mcp.WithString("output_path", mcp.Description("write the attachment to this exact path")),
+)
+
+func init() {
+	Tool.RegisterRead(server.ServerTool{Tool: AttachmentReadTool, Handler: attachmentReadFn})
+}
+
+func attachmentReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	method, err := params.GetString(req.GetArguments(), "method")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	switch method {
+	case "list":
+		return listAttachmentsFn(ctx, req)
+	case "get":
+		return getAttachmentFn(ctx, req)
+	case "download":
+		return downloadAttachmentFn(ctx, req)
+	default:
+		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
+	}
+}
+
+func listAttachmentsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	owner, repo, issueNumber, commentID, err := attachmentScopeArgs(req)
+	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, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	att, err := lookupAttachment(ctx, req)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	return to.TextResult(slimAttachment(att))
+}
+
+func downloadAttachmentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	owner, err := params.GetString(req.GetArguments(), "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	repo, err := params.GetString(req.GetArguments(), "repo")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	explicitOutputPath := params.GetOptionalString(req.GetArguments(), "output_path", "")
+	attachmentUUID := strings.TrimSpace(params.GetOptionalString(req.GetArguments(), "attachment_uuid", ""))
+
+	var att *gitea_sdk.Attachment
+	if attachmentUUID == "" {
+		att, err = lookupAttachment(ctx, req)
+		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.NewToolResultImage(text, base64.StdEncoding.EncodeToString(limited), 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(req mcp.CallToolRequest) (owner, repo string, issueNumber, commentID int64, err error) {
+	owner, err = params.GetString(req.GetArguments(), "owner")
+	if err != nil {
+		return "", "", 0, 0, err
+	}
+	repo, err = params.GetString(req.GetArguments(), "repo")
+	if err != nil {
+		return "", "", 0, 0, err
+	}
+	issueNumber = params.GetOptionalInt(req.GetArguments(), "issue_number", 0)
+	commentID = params.GetOptionalInt(req.GetArguments(), "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, req mcp.CallToolRequest) (*gitea_sdk.Attachment, error) {
+	owner, repo, issueNumber, commentID, err := attachmentScopeArgs(req)
+	if err != nil {
+		return nil, err
+	}
+	attachmentID := params.GetOptionalInt(req.GetArguments(), "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,182 @@
+package issue
+
+import (
+	"context"
+	"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/mark3labs/mcp-go/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(), mcp.CallToolRequest{Params: mcp.CallToolParams{Arguments: 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(), mcp.CallToolRequest{Params: mcp.CallToolParams{Arguments: 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)
+	}
+}

operation/issue/issue.go

@@ -3,19 +3,33 @@ package issue
 import (
 	"context"
 	"fmt"
+	"net/url"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
+	"gitea.com/gitea/gitea-mcp/pkg/slim"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+// issueWithAssets / commentWithAssets wrap the SDK types to capture the
+// `assets` field that the SDK currently drops on these endpoints.
+type issueWithAssets struct {
+	gitea_sdk.Issue
+	Assets []*gitea_sdk.Attachment `json:"assets"`
+}
+
+type commentWithAssets struct {
+	gitea_sdk.Comment
+	Assets []*gitea_sdk.Attachment `json:"assets"`
+}
+
+var Tool = tool.New("issue")
 
 const (
 	ListRepoIssuesToolName = "list_issues"
@@ -26,38 +40,49 @@ const (
 var (
 	ListRepoIssuesTool = mcp.NewTool(
 		ListRepoIssuesToolName,
-		mcp.WithDescription("List repository issues"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("state", mcp.Description("issue state"), mcp.DefaultString("all")),
-		mcp.WithNumber("page", mcp.Description("page number"), mcp.DefaultNumber(1)),
-		mcp.WithNumber("perPage", mcp.Description("results per page"), mcp.DefaultNumber(30)),
+		mcp.WithDescription("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")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("state", mcp.DefaultString("all")),
+		mcp.WithString("type", mcp.Description("issues or pulls"), mcp.Enum("issues", "pulls")),
+		mcp.WithArray("labels", mcp.Description("label name filter"), mcp.Items(map[string]any{"type": "string"})),
+		mcp.WithArray("milestones", mcp.Description("milestone name or ID filter"), mcp.Items(map[string]any{"type": "string"})),
+		mcp.WithString("since", mcp.Description("updated after ISO 8601")),
+		mcp.WithString("before", mcp.Description("updated before ISO 8601")),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
 	)
 
 	IssueReadTool = mcp.NewTool(
 		IssueReadToolName,
-		mcp.WithDescription("Get information about a specific issue. Use method 'get' for issue details, 'get_comments' for issue comments, 'get_labels' for issue labels."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("get", "get_comments", "get_labels")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithNumber("index", mcp.Required(), mcp.Description("repository issue index")),
+		mcp.WithDescription("Read issue: details, comments, or labels."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Read issue details")),
+		mcp.WithString("method", mcp.Required(), mcp.Enum("get", "get_comments", "get_labels")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithNumber("issue_number", mcp.Required()),
 	)
 
 	IssueWriteTool = mcp.NewTool(
 		IssueWriteToolName,
-		mcp.WithDescription("Create or update issues and comments, manage labels. Use method 'create' to create an issue, 'update' to edit, 'add_comment'/'edit_comment' for comments, 'add_labels'/'remove_label'/'replace_labels'/'clear_labels' for label management."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("create", "update", "add_comment", "edit_comment", "add_labels", "remove_label", "replace_labels", "clear_labels")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithNumber("index", mcp.Description("issue index (required for all methods except 'create')")),
-		mcp.WithString("title", mcp.Description("issue title (required for 'create')")),
-		mcp.WithString("body", mcp.Description("issue/comment body (required for 'create', 'add_comment', 'edit_comment')")),
-		mcp.WithArray("assignees", mcp.Description("usernames to assign (for 'create', 'update')"), mcp.Items(map[string]any{"type": "string"})),
-		mcp.WithNumber("milestone", mcp.Description("milestone number (for 'create', 'update')")),
-		mcp.WithString("state", mcp.Description("issue state, one of open, closed, all (for 'update')")),
-		mcp.WithNumber("commentID", mcp.Description("id of issue comment (required for 'edit_comment')")),
-		mcp.WithArray("labels", mcp.Description("array of label IDs (for 'add_labels', 'replace_labels')"), mcp.Items(map[string]any{"type": "number"})),
-		mcp.WithNumber("label_id", mcp.Description("label ID to remove (required for 'remove_label')")),
+		mcp.WithDescription("Write issues: create, update, manage comments and labels."),
+		mcp.WithToolAnnotation(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")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithNumber("issue_number", mcp.Description("required except for 'create'")),
+		mcp.WithString("title", mcp.Description("required for 'create'")),
+		mcp.WithString("body", mcp.Description("required for 'create'/'add_comment'/'edit_comment'")),
+		mcp.WithArray("assignees", mcp.Items(map[string]any{"type": "string"})),
+		mcp.WithNumber("milestone"),
+		mcp.WithString("state", mcp.Enum("open", "closed", "all")),
+		mcp.WithNumber("commentID", mcp.Description("for 'edit_comment'")),
+		mcp.WithArray("labels", mcp.Description("label IDs"), mcp.Items(map[string]any{"type": "number"})),
+		mcp.WithNumber("label_id", mcp.Description("for 'remove_label'")),
+		mcp.WithString("ref", mcp.Description("branch to associate")),
+		mcp.WithString("deadline", mcp.Description("ISO 8601")),
+		mcp.WithBoolean("remove_deadline"),
 	)
 )
 
@@ -123,7 +148,6 @@ func issueWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
 }
 
 func getIssueByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getIssueByIndexFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -132,24 +156,21 @@ func getIssueByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "index")
+	index, err := params.GetIndex(req.GetArguments(), "issue_number")
 	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))
-	}
-	issue, _, err := client.GetIssue(owner, repo, index)
-	if err != nil {
+	var issue issueWithAssets
+	path := fmt.Sprintf("repos/%s/%s/issues/%d", url.PathEscape(owner), url.PathEscape(repo), index)
+	if _, err := gitea.DoJSON(ctx, "GET", path, nil, nil, &issue); err != nil {
 		return to.ErrorResult(fmt.Errorf("get %v/%v/issue/%v err: %v", owner, repo, index, err))
 	}
-
-	return to.TextResult(slimIssue(issue))
+	m := slimIssue(&issue.Issue)
+	m["body"] = slim.BodyWithAttachments(issue.Body, issue.Assets)
+	return to.TextResult(m)
 }
 
 func listRepoIssuesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called ListIssuesFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -162,19 +183,35 @@ func listRepoIssuesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if !ok {
 		state = "all"
 	}
+	labels := params.GetStringSlice(req.GetArguments(), "labels")
+	milestones := params.GetStringSlice(req.GetArguments(), "milestones")
 	page, pageSize := params.GetPagination(req.GetArguments(), 30)
 	opt := gitea_sdk.ListIssueOption{
-		State: gitea_sdk.StateType(state),
+		State:      gitea_sdk.StateType(state),
+		Labels:     labels,
+		Milestones: milestones,
 		ListOptions: gitea_sdk.ListOptions{
 			Page:     page,
 			PageSize: pageSize,
 		},
 	}
+	switch req.GetArguments()["type"] {
+	case "issues":
+		opt.Type = gitea_sdk.IssueTypeIssue
+	case "pulls":
+		opt.Type = gitea_sdk.IssueTypePull
+	}
+	if t := params.GetOptionalTime(req.GetArguments(), "since"); t != nil {
+		opt.Since = *t
+	}
+	if t := params.GetOptionalTime(req.GetArguments(), "before"); t != nil {
+		opt.Before = *t
+	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	issues, _, err := client.ListRepoIssues(owner, repo, opt)
+	issues, _, err := client.Issues.ListRepoIssues(ctx, owner, repo, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get %v/%v/issues err: %v", owner, repo, err))
 	}
@@ -182,7 +219,6 @@ func listRepoIssuesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 }
 
 func createIssueFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called createIssueFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -213,7 +249,14 @@ func createIssueFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolR
 			opt.Milestone = milestone
 		}
 	}
-	issue, _, err := client.CreateIssue(owner, repo, opt)
+	if labelIDs, err := params.GetInt64Slice(req.GetArguments(), "labels"); err == nil {
+		opt.Labels = labelIDs
+	}
+	if ref, ok := req.GetArguments()["ref"].(string); ok {
+		opt.Ref = ref
+	}
+	opt.Deadline = params.GetOptionalTime(req.GetArguments(), "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))
 	}
@@ -222,7 +265,6 @@ func createIssueFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolR
 }
 
 func createIssueCommentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called createIssueCommentFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -231,7 +273,7 @@ func createIssueCommentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "index")
+	index, err := params.GetIndex(req.GetArguments(), "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -246,7 +288,7 @@ func createIssueCommentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	issueComment, _, err := client.CreateIssueComment(owner, repo, index, opt)
+	issueComment, _, err := client.Issues.CreateIssueComment(ctx, owner, repo, index, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("create %v/%v/issue/%v/comment err: %v", owner, repo, index, err))
 	}
@@ -255,7 +297,6 @@ func createIssueCommentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 }
 
 func editIssueFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called editIssueFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -264,37 +305,37 @@ func editIssueFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRes
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "index")
+	index, err := params.GetIndex(req.GetArguments(), "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 
-	opt := gitea_sdk.EditIssueOption{}
-
-	title, ok := req.GetArguments()["title"].(string)
-	if ok {
+	args := req.GetArguments()
+	opt := gitea_sdk.EditIssueOption{
+		Body:           params.GetPresentStringPtr(args, "body"),
+		Ref:            params.GetPresentStringPtr(args, "ref"),
+		Assignees:      params.GetStringSlice(args, "assignees"),
+		Deadline:       params.GetOptionalTime(args, "deadline"),
+		RemoveDeadline: params.GetOptionalBoolPtr(args, "remove_deadline"),
+	}
+	if title, ok := args["title"].(string); ok {
 		opt.Title = title
 	}
-	body, ok := req.GetArguments()["body"].(string)
-	if ok {
-		opt.Body = new(body)
-	}
-	opt.Assignees = params.GetStringSlice(req.GetArguments(), "assignees")
-	if val, exists := req.GetArguments()["milestone"]; exists {
+	if val, exists := args["milestone"]; exists {
 		if milestone, ok := params.ToInt64(val); ok {
-			opt.Milestone = new(milestone)
+			opt.Milestone = &milestone
 		}
 	}
-	state, ok := req.GetArguments()["state"].(string)
-	if ok {
-		opt.State = new(gitea_sdk.StateType(state))
+	if state, ok := args["state"].(string); ok {
+		s := gitea_sdk.StateType(state)
+		opt.State = &s
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	issue, _, err := client.EditIssue(owner, repo, index, opt)
+	issue, _, err := client.Issues.EditIssue(ctx, owner, repo, index, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("edit %v/%v/issue/%v err: %v", owner, repo, index, err))
 	}
@@ -303,7 +344,6 @@ func editIssueFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRes
 }
 
 func editIssueCommentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called editIssueCommentFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -327,7 +367,7 @@ func editIssueCommentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	issueComment, _, err := client.EditIssueComment(owner, repo, commentID, opt)
+	issueComment, _, err := client.Issues.EditIssueComment(ctx, owner, repo, commentID, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("edit %v/%v/issues/comments/%v err: %v", owner, repo, commentID, err))
 	}
@@ -336,7 +376,6 @@ func editIssueCommentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 }
 
 func getIssueCommentsByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getIssueCommentsByIndexFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -345,25 +384,25 @@ func getIssueCommentsByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "index")
+	index, err := params.GetIndex(req.GetArguments(), "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	opt := gitea_sdk.ListIssueCommentOptions{}
-	client, err := gitea.ClientFromContext(ctx)
-	if err != nil {
-		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
-	}
-	issue, _, err := client.ListIssueComments(owner, repo, index, opt)
-	if err != nil {
+	var comments []commentWithAssets
+	path := fmt.Sprintf("repos/%s/%s/issues/%d/comments", url.PathEscape(owner), url.PathEscape(repo), index)
+	if _, err := gitea.DoJSON(ctx, "GET", path, nil, nil, &comments); err != nil {
 		return to.ErrorResult(fmt.Errorf("get %v/%v/issues/%v/comments err: %v", owner, repo, index, err))
 	}
-
-	return to.TextResult(slimComments(issue))
+	out := make([]map[string]any, 0, len(comments))
+	for i := range comments {
+		m := slimComment(&comments[i].Comment)
+		m["body"] = slim.BodyWithAttachments(comments[i].Body, comments[i].Assets)
+		out = append(out, m)
+	}
+	return to.TextResult(out)
 }
 
 func getIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getIssueLabelsFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -372,7 +411,7 @@ func getIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "index")
+	index, err := params.GetIndex(req.GetArguments(), "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -381,17 +420,14 @@ func getIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	labels, _, err := client.GetIssueLabels(owner, repo, index, gitea_sdk.ListLabelsOptions{})
+	labels, _, err := client.Issues.GetIssueLabels(ctx, owner, repo, index, gitea_sdk.ListLabelsOptions{})
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get %v/%v/issues/%v/labels err: %v", owner, repo, index, err))
 	}
-	return to.TextResult(slimLabels(labels))
+	return to.TextResult(slim.Labels(labels))
 }
 
-// Issue label operations (moved from label package)
-
 func addIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called addIssueLabelsFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -400,7 +436,7 @@ func addIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "index")
+	index, err := params.GetIndex(req.GetArguments(), "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -413,15 +449,14 @@ func addIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	issueLabels, _, err := client.AddIssueLabels(owner, repo, index, gitea_sdk.IssueLabelsOption{Labels: labels})
+	issueLabels, _, err := client.Issues.AddIssueLabels(ctx, owner, repo, index, gitea_sdk.IssueLabelsOption{Labels: labels})
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("add labels to %v/%v/issue/%v err: %v", owner, repo, index, err))
 	}
-	return to.TextResult(slimLabels(issueLabels))
+	return to.TextResult(slim.Labels(issueLabels))
 }
 
 func replaceIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called replaceIssueLabelsFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -430,7 +465,7 @@ func replaceIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "index")
+	index, err := params.GetIndex(req.GetArguments(), "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -443,15 +478,14 @@ func replaceIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	issueLabels, _, err := client.ReplaceIssueLabels(owner, repo, index, gitea_sdk.IssueLabelsOption{Labels: labels})
+	issueLabels, _, err := client.Issues.ReplaceIssueLabels(ctx, owner, repo, index, gitea_sdk.IssueLabelsOption{Labels: labels})
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("replace labels on %v/%v/issue/%v err: %v", owner, repo, index, err))
 	}
-	return to.TextResult(slimLabels(issueLabels))
+	return to.TextResult(slim.Labels(issueLabels))
 }
 
 func clearIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called clearIssueLabelsFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -460,7 +494,7 @@ func clearIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "index")
+	index, err := params.GetIndex(req.GetArguments(), "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -469,7 +503,7 @@ func clearIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, err = client.ClearIssueLabels(owner, repo, index)
+	_, err = client.Issues.ClearIssueLabels(ctx, owner, repo, index)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("clear labels on %v/%v/issue/%v err: %v", owner, repo, index, err))
 	}
@@ -477,7 +511,6 @@ func clearIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 }
 
 func removeIssueLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called removeIssueLabelFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -486,7 +519,7 @@ func removeIssueLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "index")
+	index, err := params.GetIndex(req.GetArguments(), "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -499,7 +532,7 @@ func removeIssueLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, err = client.DeleteIssueLabel(owner, repo, index, labelID)
+	_, err = client.Issues.DeleteIssueLabel(ctx, owner, repo, index, labelID)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("remove label %v from %v/%v/issue/%v err: %v", labelID, owner, repo, index, err))
 	}

operation/issue/issue_test.go

@@ -0,0 +1,324 @@
+package issue
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"sync"
+	"testing"
+
+	"gitea.com/gitea/gitea-mcp/pkg/flag"
+
+	"github.com/mark3labs/mcp-go/mcp"
+)
+
+func Test_listRepoIssuesFn_filters(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+	)
+
+	var (
+		mu       sync.Mutex
+		gotQuery string
+	)
+
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch {
+		case r.URL.Path == "/api/v1/version":
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{"version":"1.12.0"}`))
+		case r.URL.Path == fmt.Sprintf("/api/v1/repos/%s/%s", owner, repo):
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{"private":false}`))
+		case r.URL.Path == fmt.Sprintf("/api/v1/repos/%s/%s/issues", owner, repo):
+			mu.Lock()
+			gotQuery = r.URL.RawQuery
+			mu.Unlock()
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`[]`))
+		default:
+			http.NotFound(w, r)
+		}
+	})
+
+	server := httptest.NewServer(handler)
+	defer server.Close()
+
+	origHost := flag.Host
+	origToken := flag.Token
+	origVersion := flag.Version
+	flag.Host = server.URL
+	flag.Token = ""
+	flag.Version = "test"
+	defer func() {
+		flag.Host = origHost
+		flag.Token = origToken
+		flag.Version = origVersion
+	}()
+
+	req := mcp.CallToolRequest{
+		Params: mcp.CallToolParams{
+			Arguments: map[string]any{
+				"owner":      owner,
+				"repo":       repo,
+				"type":       "issues",
+				"labels":     []any{"bug", "enhancement"},
+				"milestones": []any{"v1.0", "2"},
+				"since":      "2026-01-01T00:00:00Z",
+			},
+		},
+	}
+
+	_, err := listRepoIssuesFn(context.Background(), req)
+	if err != nil {
+		t.Fatalf("listRepoIssuesFn() error = %v", err)
+	}
+
+	mu.Lock()
+	defer mu.Unlock()
+
+	if !strings.Contains(gotQuery, "labels=bug%2Cenhancement") {
+		t.Fatalf("expected labels query param, got %s", gotQuery)
+	}
+	if !strings.Contains(gotQuery, "since=2026-01-01") {
+		t.Fatalf("expected since query param, got %s", gotQuery)
+	}
+	if !strings.Contains(gotQuery, "milestones=v1.0%2C2") {
+		t.Fatalf("expected milestones query param, got %s", gotQuery)
+	}
+	if !strings.Contains(gotQuery, "type=issues") {
+		t.Fatalf("expected type query param, got %s", gotQuery)
+	}
+}
+
+func Test_listRepoIssuesFn_includesMilestone(t *testing.T) {
+	const (
+		owner = "octo"
+		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", owner, repo):
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`[
+				{"number": 1, "title": "with milestone", "state": "closed", "milestone": {"id": 5, "title": "v1.0"}},
+				{"number": 2, "title": "without milestone", "state": "open"}
+			]`))
+		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 }()
+
+	req := mcp.CallToolRequest{Params: mcp.CallToolParams{Arguments: map[string]any{
+		"owner": owner, "repo": repo,
+	}}}
+	res, err := listRepoIssuesFn(context.Background(), req)
+	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
+	if !strings.Contains(body, `"milestone"`) || !strings.Contains(body, `"v1.0"`) {
+		t.Fatalf("expected milestone in list output, got: %s", body)
+	}
+}
+
+func Test_createIssueFn_labels(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+	)
+
+	var (
+		mu      sync.Mutex
+		gotBody map[string]any
+	)
+
+	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", owner, repo):
+			mu.Lock()
+			var body map[string]any
+			_ = json.NewDecoder(r.Body).Decode(&body)
+			gotBody = body
+			mu.Unlock()
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{"number":1,"title":"test","state":"open"}`))
+		default:
+			http.NotFound(w, r)
+		}
+	})
+
+	server := httptest.NewServer(handler)
+	defer server.Close()
+
+	origHost := flag.Host
+	origToken := flag.Token
+	origVersion := flag.Version
+	flag.Host = server.URL
+	flag.Token = ""
+	flag.Version = "test"
+	defer func() {
+		flag.Host = origHost
+		flag.Token = origToken
+		flag.Version = origVersion
+	}()
+
+	req := mcp.CallToolRequest{
+		Params: mcp.CallToolParams{
+			Arguments: map[string]any{
+				"owner":    owner,
+				"repo":     repo,
+				"title":    "test issue",
+				"body":     "body",
+				"labels":   []any{float64(10), float64(20)},
+				"deadline": "2026-06-01T00:00:00Z",
+			},
+		},
+	}
+
+	_, err := createIssueFn(context.Background(), req)
+	if err != nil {
+		t.Fatalf("createIssueFn() error = %v", err)
+	}
+
+	mu.Lock()
+	defer mu.Unlock()
+
+	labels, ok := gotBody["labels"].([]any)
+	if !ok || len(labels) != 2 {
+		t.Fatalf("expected 2 labels, got %v", gotBody["labels"])
+	}
+	if labels[0] != float64(10) || labels[1] != float64(20) {
+		t.Fatalf("expected labels [10,20], got %v", labels)
+	}
+	if gotBody["due_date"] == nil {
+		t.Fatalf("expected due_date to be set")
+	}
+}
+
+func Test_getIssueByIndexFn_includesAttachments(t *testing.T) {
+	const (
+		owner = "octo"
+		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/issues/42", owner, repo):
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{
+				"number": 42,
+				"title": "bug with screenshot",
+				"body": "see attached",
+				"state": "open",
+				"assets": [
+					{"id": 1, "name": "shot.png", "size": 1024, "browser_download_url": "https://example/shot.png"}
+				]
+			}`))
+		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 }()
+
+	req := mcp.CallToolRequest{Params: mcp.CallToolParams{Arguments: map[string]any{
+		"owner": owner, "repo": repo, "issue_number": float64(42),
+	}}}
+	res, err := getIssueByIndexFn(context.Background(), req)
+	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
+	if !strings.Contains(body, `[shot.png](https://example/shot.png)`) {
+		t.Fatalf("expected attachment markdown inlined in body, got: %s", body)
+	}
+	if strings.Contains(body, `"attachments"`) {
+		t.Fatalf("attachments should be inlined into body, not a separate field: %s", body)
+	}
+}
+
+func Test_getIssueCommentsByIndexFn_includesAttachments(t *testing.T) {
+	const (
+		owner = "octo"
+		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/issues/7/comments", owner, repo):
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`[
+				{"id": 1, "body": "see this", "assets": [
+					{"id": 9, "name": "log.txt", "size": 200, "browser_download_url": "https://example/log.txt"}
+				]},
+				{"id": 2, "body": "no attachment", "assets": []}
+			]`))
+		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 }()
+
+	req := mcp.CallToolRequest{Params: mcp.CallToolParams{Arguments: map[string]any{
+		"owner": owner, "repo": repo, "issue_number": float64(7),
+	}}}
+	res, err := getIssueCommentsByIndexFn(context.Background(), req)
+	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
+	if !strings.Contains(body, `[log.txt](https://example/log.txt)`) {
+		t.Fatalf("expected attachment markdown inlined in body, got: %s", body)
+	}
+	if strings.Contains(body, `"attachments"`) {
+		t.Fatalf("attachments should be inlined into body, not a separate field: %s", body)
+	}
+}

operation/issue/slim.go

@@ -1,42 +1,11 @@
 package issue
 
 import (
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	"gitea.com/gitea/gitea-mcp/pkg/slim"
+
+	gitea_sdk "gitea.dev/sdk"
 )
 
-func userLogin(u *gitea_sdk.User) string {
-	if u == nil {
-		return ""
-	}
-	return u.UserName
-}
-
-func userLogins(users []*gitea_sdk.User) []string {
-	if len(users) == 0 {
-		return nil
-	}
-	out := make([]string, 0, len(users))
-	for _, u := range users {
-		if u != nil {
-			out = append(out, u.UserName)
-		}
-	}
-	return out
-}
-
-func labelNames(labels []*gitea_sdk.Label) []string {
-	if len(labels) == 0 {
-		return nil
-	}
-	out := make([]string, 0, len(labels))
-	for _, l := range labels {
-		if l != nil {
-			out = append(out, l.Name)
-		}
-	}
-	return out
-}
-
 func slimIssue(i *gitea_sdk.Issue) map[string]any {
 	if i == nil {
 		return nil
@@ -47,15 +16,15 @@ func slimIssue(i *gitea_sdk.Issue) map[string]any {
 		"body":       i.Body,
 		"state":      i.State,
 		"html_url":   i.HTMLURL,
-		"user":       userLogin(i.Poster),
-		"labels":     labelNames(i.Labels),
+		"user":       slim.UserLogin(i.Poster),
+		"labels":     slim.LabelNames(i.Labels),
 		"comments":   i.Comments,
 		"created_at": i.Created,
 		"updated_at": i.Updated,
 		"closed_at":  i.Closed,
 	}
 	if len(i.Assignees) > 0 {
-		m["assignees"] = userLogins(i.Assignees)
+		m["assignees"] = slim.UserLogins(i.Assignees)
 	}
 	if i.Milestone != nil {
 		m["milestone"] = map[string]any{
@@ -63,6 +32,12 @@ func slimIssue(i *gitea_sdk.Issue) map[string]any {
 			"title": i.Milestone.Title,
 		}
 	}
+	if i.Ref != "" {
+		m["ref"] = i.Ref
+	}
+	if i.Deadline != nil {
+		m["deadline"] = i.Deadline
+	}
 	if i.PullRequest != nil {
 		m["is_pull"] = true
 	}
@@ -80,13 +55,25 @@ func slimIssues(issues []*gitea_sdk.Issue) []map[string]any {
 			"title":      i.Title,
 			"state":      i.State,
 			"html_url":   i.HTMLURL,
-			"user":       userLogin(i.Poster),
+			"user":       slim.UserLogin(i.Poster),
 			"comments":   i.Comments,
 			"created_at": i.Created,
 			"updated_at": i.Updated,
 		}
 		if len(i.Labels) > 0 {
-			m["labels"] = labelNames(i.Labels)
+			m["labels"] = slim.LabelNames(i.Labels)
+		}
+		if i.Milestone != nil {
+			m["milestone"] = map[string]any{
+				"id":    i.Milestone.ID,
+				"title": i.Milestone.Title,
+			}
+		}
+		if i.Ref != "" {
+			m["ref"] = i.Ref
+		}
+		if i.Deadline != nil {
+			m["deadline"] = i.Deadline
 		}
 		out = append(out, m)
 	}
@@ -100,34 +87,9 @@ func slimComment(c *gitea_sdk.Comment) map[string]any {
 	return map[string]any{
 		"id":         c.ID,
 		"body":       c.Body,
-		"user":       userLogin(c.Poster),
+		"user":       slim.UserLogin(c.Poster),
 		"html_url":   c.HTMLURL,
 		"created_at": c.Created,
 		"updated_at": c.Updated,
 	}
 }
-
-func slimComments(comments []*gitea_sdk.Comment) []map[string]any {
-	out := make([]map[string]any, 0, len(comments))
-	for _, c := range comments {
-		out = append(out, slimComment(c))
-	}
-	return out
-}
-
-func slimLabels(labels []*gitea_sdk.Label) []map[string]any {
-	out := make([]map[string]any, 0, len(labels))
-	for _, l := range labels {
-		if l == nil {
-			continue
-		}
-		out = append(out, map[string]any{
-			"id":          l.ID,
-			"name":        l.Name,
-			"color":       l.Color,
-			"description": l.Description,
-			"exclusive":   l.Exclusive,
-		})
-	}
-	return out
-}

operation/issue/slim_test.go

@@ -3,7 +3,7 @@ package issue
 import (
 	"testing"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 )
 
 func TestSlimIssue(t *testing.T) {

operation/label/label.go

@@ -4,18 +4,19 @@ import (
 	"context"
 	"fmt"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
+	"gitea.com/gitea/gitea-mcp/pkg/slim"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("label")
 
 const (
 	LabelReadToolName  = "label_read"
@@ -25,28 +26,31 @@ const (
 var (
 	LabelReadTool = mcp.NewTool(
 		LabelReadToolName,
-		mcp.WithDescription("Read label information. Use method 'list_repo_labels' to list repository labels, 'get_repo_label' to get a specific repo label, 'list_org_labels' to list organization labels."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("list_repo_labels", "get_repo_label", "list_org_labels")),
-		mcp.WithString("owner", mcp.Description("repository owner (required for repo methods)")),
-		mcp.WithString("repo", mcp.Description("repository name (required for repo methods)")),
-		mcp.WithString("org", mcp.Description("organization name (required for 'list_org')")),
-		mcp.WithNumber("id", mcp.Description("label ID (required for 'get_repo')")),
-		mcp.WithNumber("page", mcp.Description("page number"), mcp.DefaultNumber(1)),
-		mcp.WithNumber("perPage", mcp.Description("results per page"), mcp.DefaultNumber(30)),
+		mcp.WithDescription("Read repo or org labels."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Read labels")),
+		mcp.WithString("method", mcp.Required(), mcp.Enum("list_repo_labels", "get_repo_label", "list_org_labels")),
+		mcp.WithString("owner", mcp.Description("for repo methods")),
+		mcp.WithString("repo", mcp.Description("for repo methods")),
+		mcp.WithString("org", mcp.Description("for org methods")),
+		mcp.WithNumber("id", mcp.Description("label ID (for 'get_repo_label')")),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
 	)
 
 	LabelWriteTool = mcp.NewTool(
 		LabelWriteToolName,
-		mcp.WithDescription("Create, edit, or delete labels for repositories or organizations."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("create_repo_label", "edit_repo_label", "delete_repo_label", "create_org_label", "edit_org_label", "delete_org_label")),
-		mcp.WithString("owner", mcp.Description("repository owner (required for repo methods)")),
-		mcp.WithString("repo", mcp.Description("repository name (required for repo methods)")),
-		mcp.WithString("org", mcp.Description("organization name (required for org methods)")),
-		mcp.WithNumber("id", mcp.Description("label ID (required for edit/delete methods)")),
-		mcp.WithString("name", mcp.Description("label name (required for create, optional for edit)")),
-		mcp.WithString("color", mcp.Description("label color hex code e.g. #RRGGBB (required for create, optional for edit)")),
-		mcp.WithString("description", mcp.Description("label description")),
-		mcp.WithBoolean("exclusive", mcp.Description("whether the label is exclusive (org labels only)")),
+		mcp.WithDescription("Write labels (repo or org): create, edit, delete."),
+		mcp.WithToolAnnotation(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")),
+		mcp.WithString("owner", mcp.Description("for repo methods")),
+		mcp.WithString("repo", mcp.Description("for repo methods")),
+		mcp.WithString("org", mcp.Description("for org methods")),
+		mcp.WithNumber("id", mcp.Description("for edit/delete")),
+		mcp.WithString("name", mcp.Description("required for create")),
+		mcp.WithString("color", mcp.Description("hex (#RRGGBB); required for create")),
+		mcp.WithString("description"),
+		mcp.WithBoolean("exclusive", mcp.Description("exclusive (org only)")),
+		mcp.WithBoolean("is_archived", mcp.Description("archived (repo only)")),
 	)
 )
 
@@ -104,7 +108,6 @@ func labelWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
 }
 
 func listRepoLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listRepoLabelsFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -125,15 +128,14 @@ func listRepoLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	labels, _, err := client.ListRepoLabels(owner, repo, opt)
+	labels, _, err := client.Repositories.ListRepoLabels(ctx, owner, repo, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("list %v/%v/labels err: %v", owner, repo, err))
 	}
-	return to.TextResult(slimLabels(labels))
+	return to.TextResult(slim.Labels(labels))
 }
 
 func getRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getRepoLabelFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -151,15 +153,14 @@ func getRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	label, _, err := client.GetRepoLabel(owner, repo, id)
+	label, _, err := client.Repositories.GetRepoLabel(ctx, owner, repo, id)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get %v/%v/label/%v err: %v", owner, repo, id, err))
 	}
-	return to.TextResult(slimLabel(label))
+	return to.TextResult(slim.Label(label))
 }
 
 func createRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called createRepoLabelFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -178,25 +179,27 @@ func createRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	}
 	description, _ := req.GetArguments()["description"].(string) // Optional
 
+	isArchived, _ := req.GetArguments()["is_archived"].(bool)
+
 	opt := gitea_sdk.CreateLabelOption{
 		Name:        name,
 		Color:       color,
 		Description: description,
+		IsArchived:  isArchived,
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	label, _, err := client.CreateLabel(owner, repo, opt)
+	label, _, err := client.Repositories.CreateLabel(ctx, owner, repo, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("create %v/%v/label err: %v", owner, repo, err))
 	}
-	return to.TextResult(slimLabel(label))
+	return to.TextResult(slim.Label(label))
 }
 
 func editRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called editRepoLabelFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -210,30 +213,26 @@ func editRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 		return to.ErrorResult(err)
 	}
 
-	opt := gitea_sdk.EditLabelOption{}
-	if name, ok := req.GetArguments()["name"].(string); ok {
-		opt.Name = new(name)
-	}
-	if color, ok := req.GetArguments()["color"].(string); ok {
-		opt.Color = new(color)
-	}
-	if description, ok := req.GetArguments()["description"].(string); ok {
-		opt.Description = new(description)
+	args := req.GetArguments()
+	opt := gitea_sdk.EditLabelOption{
+		Name:        params.GetOptionalStringPtr(args, "name"),
+		Color:       params.GetOptionalStringPtr(args, "color"),
+		Description: params.GetPresentStringPtr(args, "description"),
+		IsArchived:  params.GetOptionalBoolPtr(args, "is_archived"),
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	label, _, err := client.EditLabel(owner, repo, id, opt)
+	label, _, err := client.Repositories.EditLabel(ctx, owner, repo, id, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("edit %v/%v/label/%v err: %v", owner, repo, id, err))
 	}
-	return to.TextResult(slimLabel(label))
+	return to.TextResult(slim.Label(label))
 }
 
 func deleteRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called deleteRepoLabelFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -251,7 +250,7 @@ func deleteRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, err = client.DeleteLabel(owner, repo, id)
+	_, err = client.Repositories.DeleteLabel(ctx, owner, repo, id)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("delete %v/%v/label/%v err: %v", owner, repo, id, err))
 	}
@@ -259,7 +258,6 @@ func deleteRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 }
 
 func listOrgLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listOrgLabelsFn")
 	org, err := params.GetString(req.GetArguments(), "org")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -276,15 +274,14 @@ func listOrgLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	labels, _, err := client.ListOrgLabels(org, opt)
+	labels, _, err := client.Organizations.ListOrgLabels(ctx, org, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("list %v/labels err: %v", org, err))
 	}
-	return to.TextResult(slimLabels(labels))
+	return to.TextResult(slim.Labels(labels))
 }
 
 func createOrgLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called createOrgLabelFn")
 	org, err := params.GetString(req.GetArguments(), "org")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -311,15 +308,14 @@ func createOrgLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	label, _, err := client.CreateOrgLabel(org, opt)
+	label, _, err := client.Organizations.CreateOrgLabel(ctx, org, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("create %v/labels err: %v", org, err))
 	}
-	return to.TextResult(slimLabel(label))
+	return to.TextResult(slim.Label(label))
 }
 
 func editOrgLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called editOrgLabelFn")
 	org, err := params.GetString(req.GetArguments(), "org")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -329,33 +325,26 @@ func editOrgLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 		return to.ErrorResult(err)
 	}
 
-	opt := gitea_sdk.EditOrgLabelOption{}
-	if name, ok := req.GetArguments()["name"].(string); ok {
-		opt.Name = new(name)
-	}
-	if color, ok := req.GetArguments()["color"].(string); ok {
-		opt.Color = new(color)
-	}
-	if description, ok := req.GetArguments()["description"].(string); ok {
-		opt.Description = new(description)
-	}
-	if exclusive, ok := req.GetArguments()["exclusive"].(bool); ok {
-		opt.Exclusive = new(exclusive)
+	args := req.GetArguments()
+	opt := gitea_sdk.EditOrgLabelOption{
+		Name:        params.GetOptionalStringPtr(args, "name"),
+		Color:       params.GetOptionalStringPtr(args, "color"),
+		Description: params.GetPresentStringPtr(args, "description"),
+		Exclusive:   params.GetOptionalBoolPtr(args, "exclusive"),
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	label, _, err := client.EditOrgLabel(org, id, opt)
+	label, _, err := client.Organizations.EditOrgLabel(ctx, org, id, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("edit %v/labels/%v err: %v", org, id, err))
 	}
-	return to.TextResult(slimLabel(label))
+	return to.TextResult(slim.Label(label))
 }
 
 func deleteOrgLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called deleteOrgLabelFn")
 	org, err := params.GetString(req.GetArguments(), "org")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -369,7 +358,7 @@ func deleteOrgLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, err = client.DeleteOrgLabel(org, id)
+	_, err = client.Organizations.DeleteOrgLabel(ctx, org, id)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("delete %v/labels/%v err: %v", org, id, err))
 	}

operation/label/slim.go

@@ -1,26 +1 @@
 package label
-
-import (
-	gitea_sdk "code.gitea.io/sdk/gitea"
-)
-
-func slimLabel(l *gitea_sdk.Label) map[string]any {
-	if l == nil {
-		return nil
-	}
-	return map[string]any{
-		"id":          l.ID,
-		"name":        l.Name,
-		"color":       l.Color,
-		"description": l.Description,
-		"exclusive":   l.Exclusive,
-	}
-}
-
-func slimLabels(labels []*gitea_sdk.Label) []map[string]any {
-	out := make([]map[string]any, 0, len(labels))
-	for _, l := range labels {
-		out = append(out, slimLabel(l))
-	}
-	return out
-}

operation/label/slim_test.go

@@ -1,25 +0,0 @@
-package label
-
-import (
-	"testing"
-
-	gitea_sdk "code.gitea.io/sdk/gitea"
-)
-
-func TestSlimLabel(t *testing.T) {
-	l := &gitea_sdk.Label{
-		ID:          1,
-		Name:        "bug",
-		Color:       "#d73a4a",
-		Description: "Something isn't working",
-		Exclusive:   false,
-	}
-
-	m := slimLabel(l)
-	if m["name"] != "bug" {
-		t.Errorf("expected name bug, got %v", m["name"])
-	}
-	if m["color"] != "#d73a4a" {
-		t.Errorf("expected color, got %v", m["color"])
-	}
-}

operation/milestone/milestone.go

@@ -4,18 +4,18 @@ import (
 	"context"
 	"fmt"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("milestone")
 
 const (
 	MilestoneReadToolName  = "milestone_read"
@@ -25,28 +25,30 @@ const (
 var (
 	MilestoneReadTool = mcp.NewTool(
 		MilestoneReadToolName,
-		mcp.WithDescription("Read milestone information. Use method 'get' to get a specific milestone, 'list' to list milestones."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("get", "list")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithNumber("id", mcp.Description("milestone id (required for 'get')")),
-		mcp.WithString("state", mcp.Description("milestone state (for 'list')"), mcp.DefaultString("all")),
-		mcp.WithString("name", mcp.Description("milestone name filter (for 'list')")),
-		mcp.WithNumber("page", mcp.Description("page number"), mcp.DefaultNumber(1)),
-		mcp.WithNumber("perPage", mcp.Description("results per page"), mcp.DefaultNumber(30)),
+		mcp.WithDescription("Read milestones: get one or list."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Read milestones")),
+		mcp.WithString("method", mcp.Required(), mcp.Enum("get", "list")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithNumber("id", mcp.Description("for 'get'")),
+		mcp.WithString("state", mcp.DefaultString("all")),
+		mcp.WithString("name", mcp.Description("name filter (for 'list')")),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
 	)
 
 	MilestoneWriteTool = mcp.NewTool(
 		MilestoneWriteToolName,
-		mcp.WithDescription("Create, edit, or delete milestones."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("create", "edit", "delete")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithNumber("id", mcp.Description("milestone id (required for 'edit', 'delete')")),
-		mcp.WithString("title", mcp.Description("milestone title (required for 'create')")),
-		mcp.WithString("description", mcp.Description("milestone description")),
+		mcp.WithDescription("Write milestones: create, update, delete."),
+		mcp.WithToolAnnotation(annotation.Destructive("Create, update, or delete milestones")),
+		mcp.WithString("method", mcp.Required(), mcp.Enum("create", "update", "edit", "delete")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithNumber("id", mcp.Description("for 'update'/'delete'")),
+		mcp.WithString("title", mcp.Description("for 'create'")),
+		mcp.WithString("description"),
 		mcp.WithString("due_on", mcp.Description("due date")),
-		mcp.WithString("state", mcp.Description("milestone state, one of open, closed (for 'edit')")),
+		mcp.WithString("state", mcp.Enum("open", "closed")),
 	)
 )
 
@@ -84,6 +86,8 @@ func milestoneWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	switch method {
 	case "create":
 		return createMilestoneFn(ctx, req)
+	case "update":
+		return editMilestoneFn(ctx, req)
 	case "edit":
 		return editMilestoneFn(ctx, req)
 	case "delete":
@@ -94,7 +98,6 @@ func milestoneWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 }
 
 func getMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getMilestoneFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -111,7 +114,7 @@ func getMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	milestone, _, err := client.GetMilestone(owner, repo, id)
+	milestone, _, err := client.Repositories.GetMilestone(ctx, owner, repo, id)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get %v/%v/milestone/%v err: %v", owner, repo, id, err))
 	}
@@ -120,7 +123,6 @@ func getMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 }
 
 func listMilestonesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listMilestonesFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -144,7 +146,7 @@ func listMilestonesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	milestones, _, err := client.ListRepoMilestones(owner, repo, opt)
+	milestones, _, err := client.Repositories.ListMilestones(ctx, owner, repo, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get %v/%v/milestones err: %v", owner, repo, err))
 	}
@@ -152,7 +154,6 @@ func listMilestonesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 }
 
 func createMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called createMilestoneFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -174,12 +175,13 @@ func createMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	if ok {
 		opt.Description = description
 	}
+	opt.Deadline = params.GetOptionalTime(req.GetArguments(), "due_on")
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	milestone, _, err := client.CreateMilestone(owner, repo, opt)
+	milestone, _, err := client.Repositories.CreateMilestone(ctx, owner, repo, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("create %v/%v/milestone err: %v", owner, repo, err))
 	}
@@ -188,7 +190,6 @@ func createMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 }
 
 func editMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called editMilestoneFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -202,26 +203,24 @@ func editMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 		return to.ErrorResult(err)
 	}
 
-	opt := gitea_sdk.EditMilestoneOption{}
-
-	title, ok := req.GetArguments()["title"].(string)
-	if ok {
+	args := req.GetArguments()
+	opt := gitea_sdk.EditMilestoneOption{
+		Description: params.GetPresentStringPtr(args, "description"),
+		Deadline:    params.GetOptionalTime(args, "due_on"),
+	}
+	if title, ok := args["title"].(string); ok {
 		opt.Title = title
 	}
-	description, ok := req.GetArguments()["description"].(string)
-	if ok {
-		opt.Description = new(description)
-	}
-	state, ok := req.GetArguments()["state"].(string)
-	if ok {
-		opt.State = new(gitea_sdk.StateType(state))
+	if state, ok := args["state"].(string); ok {
+		s := gitea_sdk.StateType(state)
+		opt.State = &s
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	milestone, _, err := client.EditMilestone(owner, repo, id, opt)
+	milestone, _, err := client.Repositories.EditMilestone(ctx, owner, repo, id, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("edit %v/%v/milestone/%v err: %v", owner, repo, id, err))
 	}
@@ -230,7 +229,6 @@ func editMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 }
 
 func deleteMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called deleteMilestoneFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -247,7 +245,7 @@ func deleteMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, err = client.DeleteMilestone(owner, repo, id)
+	_, err = client.Repositories.DeleteMilestone(ctx, owner, repo, id)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("delete %v/%v/milestone/%v err: %v", owner, repo, id, err))
 	}

operation/milestone/milestone_test.go

@@ -0,0 +1,84 @@
+package milestone
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"maps"
+	"net/http"
+	"net/http/httptest"
+	"sync"
+	"testing"
+
+	"gitea.com/gitea/gitea-mcp/pkg/flag"
+
+	"github.com/mark3labs/mcp-go/mcp"
+)
+
+func Test_milestoneWriteFn_dueOn(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+		id    = 42
+		due   = "2026-05-18T23:59:59Z"
+	)
+
+	var (
+		mu     sync.Mutex
+		bodies = map[string]map[string]any{}
+	)
+
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/api/v1/version":
+			_, _ = w.Write([]byte(`{"version":"1.12.0"}`))
+		case fmt.Sprintf("/api/v1/repos/%s/%s/milestones", owner, repo),
+			fmt.Sprintf("/api/v1/repos/%s/%s/milestones/%d", owner, repo, id):
+			mu.Lock()
+			var body map[string]any
+			_ = json.NewDecoder(r.Body).Decode(&body)
+			bodies[r.Method] = body
+			mu.Unlock()
+			_, _ = w.Write(fmt.Appendf(nil, `{"id":%d,"title":"v1","due_on":%q}`, id, due))
+		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 }()
+
+	args := map[string]any{"owner": owner, "repo": repo, "due_on": due}
+
+	cases := []struct {
+		name   string
+		fn     func(context.Context, mcp.CallToolRequest) (*mcp.CallToolResult, error)
+		method string
+		extra  map[string]any
+	}{
+		{"create", createMilestoneFn, http.MethodPost, map[string]any{"title": "v1"}},
+		{"edit", editMilestoneFn, http.MethodPatch, map[string]any{"id": float64(id)}},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(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}})
+			if err != nil || res.IsError {
+				t.Fatalf("%s err=%v result=%v", tc.name, err, res)
+			}
+			mu.Lock()
+			body := bodies[tc.method]
+			mu.Unlock()
+			if got, _ := body["due_on"].(string); got != due {
+				t.Fatalf("%s: expected due_on=%q, got %v (body: %v)", tc.name, due, got, body)
+			}
+		})
+	}
+}

operation/milestone/slim.go

@@ -1,7 +1,7 @@
 package milestone
 
 import (
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 )
 
 func slimMilestone(m *gitea_sdk.Milestone) map[string]any {

operation/notification/notification.go

@@ -0,0 +1,213 @@
+package notification
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
+	"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/mark3labs/mcp-go/server"
+)
+
+var Tool = tool.New("notification")
+
+const (
+	NotificationReadToolName  = "notification_read"
+	NotificationWriteToolName = "notification_write"
+)
+
+var (
+	NotificationReadTool = mcp.NewTool(
+		NotificationReadToolName,
+		mcp.WithDescription("Read notifications: list (optionally scoped to a repo) or get a thread by ID."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Read notifications")),
+		mcp.WithString("method", mcp.Required(), mcp.Enum("list", "get")),
+		mcp.WithString("owner", mcp.Description("scope 'list' to a repo")),
+		mcp.WithString("repo", mcp.Description("scope 'list' to a repo")),
+		mcp.WithNumber("id", mcp.Description("thread ID (for 'get')")),
+		mcp.WithString("status", mcp.Enum("unread", "read", "pinned")),
+		mcp.WithString("subject_type", mcp.Enum("Issue", "Pull", "Commit", "Repository")),
+		mcp.WithString("since", mcp.Description("updated after ISO 8601")),
+		mcp.WithString("before", mcp.Description("updated before ISO 8601")),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+	)
+
+	NotificationWriteTool = mcp.NewTool(
+		NotificationWriteToolName,
+		mcp.WithDescription("Mark a notification or all notifications as read."),
+		mcp.WithToolAnnotation(annotation.Write("Manage notifications")),
+		mcp.WithString("method", mcp.Required(), mcp.Enum("mark_read", "mark_all_read")),
+		mcp.WithNumber("id", mcp.Description("thread ID (for 'mark_read')")),
+		mcp.WithString("owner", mcp.Description("scope 'mark_all_read' to a repo")),
+		mcp.WithString("repo", mcp.Description("scope 'mark_all_read' to a repo")),
+		mcp.WithString("last_read_at", mcp.Description("ISO 8601; defaults to now")),
+	)
+)
+
+func init() {
+	Tool.RegisterRead(server.ServerTool{
+		Tool:    NotificationReadTool,
+		Handler: notificationReadFn,
+	})
+	Tool.RegisterWrite(server.ServerTool{
+		Tool:    NotificationWriteTool,
+		Handler: notificationWriteFn,
+	})
+}
+
+func notificationReadFn(ctx context.Context, req mcp.CallToolRequest) (*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)
+	case "get":
+		return getNotificationFn(ctx, req)
+	default:
+		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
+	}
+}
+
+func notificationWriteFn(ctx context.Context, req mcp.CallToolRequest) (*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)
+	case "mark_all_read":
+		return markAllNotificationsReadFn(ctx, req)
+	default:
+		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
+	}
+}
+
+func listNotificationsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	args := req.GetArguments()
+	page, pageSize := params.GetPagination(args, 30)
+	opt := gitea_sdk.ListNotificationOptions{
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
+	}
+	if status, ok := args["status"].(string); ok {
+		opt.Status = []gitea_sdk.NotificationStatus{gitea_sdk.NotificationStatus(status)}
+	}
+	if subjectType, ok := args["subject_type"].(string); ok {
+		opt.SubjectTypes = []gitea_sdk.NotificationSubjectType{gitea_sdk.NotificationSubjectType(subjectType)}
+	}
+	if t := params.GetOptionalTime(args, "since"); t != nil {
+		opt.Since = *t
+	}
+	if t := params.GetOptionalTime(args, "before"); t != nil {
+		opt.Before = *t
+	}
+
+	client, err := gitea.ClientFromContext(ctx)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+	}
+
+	owner := params.GetOptionalString(args, "owner", "")
+	repo := params.GetOptionalString(args, "repo", "")
+	if owner != "" && repo != "" {
+		threads, _, err := client.Notifications.ListByRepo(ctx, owner, repo, opt)
+		if err != nil {
+			return to.ErrorResult(fmt.Errorf("list %v/%v/notifications err: %v", owner, repo, err))
+		}
+		return to.TextResult(slimThreads(threads))
+	}
+
+	threads, _, err := client.Notifications.List(ctx, opt)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("list notifications err: %v", err))
+	}
+	return to.TextResult(slimThreads(threads))
+}
+
+func getNotificationFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	id, err := params.GetIndex(req.GetArguments(), "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))
+	}
+	thread, _, err := client.Notifications.GetByID(ctx, id)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get notification/%v err: %v", id, err))
+	}
+	return to.TextResult(slimThread(thread))
+}
+
+func markNotificationReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	id, err := params.GetIndex(req.GetArguments(), "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))
+	}
+	thread, _, err := client.Notifications.MarkReadByID(ctx, id)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("mark notification/%v read err: %v", id, err))
+	}
+	if thread != nil {
+		return to.TextResult(slimThread(thread))
+	}
+	return to.TextResult("Notification marked as read")
+}
+
+func markAllNotificationsReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	args := req.GetArguments()
+	lastReadAt := time.Now()
+	if t := params.GetOptionalTime(args, "last_read_at"); t != nil {
+		lastReadAt = *t
+	}
+	opt := gitea_sdk.MarkNotificationOptions{
+		LastReadAt: lastReadAt,
+	}
+
+	client, err := gitea.ClientFromContext(ctx)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+	}
+
+	owner := params.GetOptionalString(args, "owner", "")
+	repo := params.GetOptionalString(args, "repo", "")
+	if owner != "" && repo != "" {
+		threads, _, err := client.Notifications.MarkReadByRepo(ctx, owner, repo, opt)
+		if err != nil {
+			return to.ErrorResult(fmt.Errorf("mark %v/%v/notifications read err: %v", owner, repo, err))
+		}
+		if threads != nil {
+			return to.TextResult(slimThreads(threads))
+		}
+		return to.TextResult("All repository notifications marked as read")
+	}
+
+	threads, _, err := client.Notifications.MarkRead(ctx, opt)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("mark all notifications read err: %v", err))
+	}
+	if threads != nil {
+		return to.TextResult(slimThreads(threads))
+	}
+	return to.TextResult("All notifications marked as read")
+}

operation/notification/slim.go

@@ -0,0 +1,66 @@
+package notification
+
+import (
+	gitea_sdk "gitea.dev/sdk"
+)
+
+func slimThread(t *gitea_sdk.NotificationThread) map[string]any {
+	if t == nil {
+		return nil
+	}
+	m := map[string]any{
+		"id":         t.ID,
+		"unread":     t.Unread,
+		"updated_at": t.UpdatedAt,
+	}
+	if t.Pinned {
+		m["pinned"] = true
+	}
+	if t.Repository != nil {
+		m["repository"] = t.Repository.FullName
+	}
+	if t.Subject != nil {
+		subject := map[string]any{
+			"title": t.Subject.Title,
+			"type":  t.Subject.Type,
+			"state": t.Subject.State,
+		}
+		if t.Subject.HTMLURL != "" {
+			subject["html_url"] = t.Subject.HTMLURL
+		}
+		if t.Subject.LatestCommentHTMLURL != "" {
+			subject["latest_comment_html_url"] = t.Subject.LatestCommentHTMLURL
+		}
+		m["subject"] = subject
+	}
+	return m
+}
+
+func slimThreads(threads []*gitea_sdk.NotificationThread) []map[string]any {
+	out := make([]map[string]any, 0, len(threads))
+	for _, t := range threads {
+		if t == nil {
+			continue
+		}
+		m := map[string]any{
+			"id":         t.ID,
+			"unread":     t.Unread,
+			"updated_at": t.UpdatedAt,
+		}
+		if t.Pinned {
+			m["pinned"] = true
+		}
+		if t.Repository != nil {
+			m["repository"] = t.Repository.FullName
+		}
+		if t.Subject != nil {
+			m["subject"] = map[string]any{
+				"title": t.Subject.Title,
+				"type":  t.Subject.Type,
+				"state": t.Subject.State,
+			}
+		}
+		out = append(out, m)
+	}
+	return out
+}

operation/operation.go

@@ -15,6 +15,8 @@ import (
 	"gitea.com/gitea/gitea-mcp/operation/issue"
 	"gitea.com/gitea/gitea-mcp/operation/label"
 	"gitea.com/gitea/gitea-mcp/operation/milestone"
+	"gitea.com/gitea/gitea-mcp/operation/notification"
+	"gitea.com/gitea/gitea-mcp/operation/packages"
 	"gitea.com/gitea/gitea-mcp/operation/pull"
 	"gitea.com/gitea/gitea-mcp/operation/repo"
 	"gitea.com/gitea/gitea-mcp/operation/search"
@@ -25,47 +27,28 @@ import (
 	mcpContext "gitea.com/gitea/gitea-mcp/pkg/context"
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
 	"gitea.com/gitea/gitea-mcp/pkg/log"
+	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	"github.com/mark3labs/mcp-go/server"
 )
 
-var mcpServer *server.MCPServer
+var (
+	mcpServer *server.MCPServer
+
+	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) {
-	// User Tool
-	s.AddTools(user.Tool.Tools()...)
-
-	// Actions Tool
-	s.AddTools(actions.Tool.Tools()...)
-
-	// Repo Tool
-	s.AddTools(repo.Tool.Tools()...)
-
-	// Issue Tool
-	s.AddTools(issue.Tool.Tools()...)
-
-	// Label Tool
-	s.AddTools(label.Tool.Tools()...)
-
-	// Milestone Tool
-	s.AddTools(milestone.Tool.Tools()...)
-
-	// Pull Tool
-	s.AddTools(pull.Tool.Tools()...)
-
-	// Search Tool
-	s.AddTools(search.Tool.Tools()...)
-
-	// Version Tool
-	s.AddTools(version.Tool.Tools()...)
-
-	// Wiki Tool
-	s.AddTools(wiki.Tool.Tools()...)
-
-	// Time Tracking Tool
-	s.AddTools(timetracking.Tool.Tools()...)
-
-	s.DeleteTools("")
+	for _, t := range domainTools {
+		s.AddTools(t.Tools()...)
+	}
+	tool.WarnUnmatchedAllowedTools(domainTools...)
+	tool.WarnUnmatchedAllowedScopes(domainTools...)
 }
 
 // parseAuthToken extracts the token from an Authorization header.
@@ -115,7 +98,7 @@ func Run() error {
 	case "http":
 		httpServer := server.NewStreamableHTTPServer(
 			mcpServer,
-			server.WithLogger(log.New()),
+			server.WithStreamableHTTPLogger(log.Slog()),
 			server.WithHeartbeatInterval(30*time.Second),
 			server.WithHTTPContextFunc(getContextWithToken),
 		)

operation/operation_test.go

@@ -2,8 +2,56 @@ package operation
 
 import (
 	"testing"
+
+	"gitea.com/gitea/gitea-mcp/pkg/flag"
 )
 
+// TestAllToolsHaveDescriptions ensures every registered tool sets a non-empty
+// 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 {
+		t.Errorf("tools missing a description: %v", missing)
+	}
+}
+
+// TestDomainToolsScopesAreUniqueAndNonEmpty ensures every entry registered in
+// domainTools has a canonical, non-empty scope name and that no two domains
+// share the same scope (each domain.Tools() call is filtered by exactly one
+// scope name via flag.AllowedScopes).
+func TestDomainToolsScopesAreUniqueAndNonEmpty(t *testing.T) {
+	seen := map[string]struct{}{}
+	for _, d := range domainTools {
+		scope := d.Scope()
+		if scope == "" {
+			t.Errorf("domainTools contains a domain with an empty scope")
+			continue
+		}
+		if _, ok := seen[scope]; ok {
+			t.Errorf("domainTools contains a duplicate scope %q", scope)
+			continue
+		}
+		seen[scope] = struct{}{}
+	}
+}
+
 func TestParseAuthToken(t *testing.T) {
 	tests := []struct {
 		name      string

operation/packages/packages.go

@@ -0,0 +1,220 @@
+package packages
+
+import (
+	"context"
+	"fmt"
+	"net/url"
+	"strconv"
+	"strings"
+
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
+	"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/mark3labs/mcp-go/server"
+)
+
+var Tool = tool.New("packages")
+
+const (
+	PackageReadToolName  = "package_read"
+	PackageWriteToolName = "package_write"
+)
+
+var (
+	PackageReadTool = mcp.NewTool(
+		PackageReadToolName,
+		mcp.WithToolAnnotation(annotation.ReadOnly("Read package registry")),
+		mcp.WithDescription("Read package registry: list packages (one entry per version, filter via 'q'/'type'), list versions, or get a version."),
+		mcp.WithString("method", mcp.Required(), mcp.Enum("list", "list_versions", "get")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description("user or org")),
+		mcp.WithString("type", mcp.Description("container/npm/maven/pypi/cargo/generic; required except 'list'")),
+		mcp.WithString("name", mcp.Description("slashes auto-encoded; required except 'list'")),
+		mcp.WithString("version", mcp.Description("for 'get'")),
+		mcp.WithString("q", mcp.Description("search query")),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30), mcp.Min(1)),
+	)
+
+	PackageWriteTool = mcp.NewTool(
+		PackageWriteToolName,
+		mcp.WithToolAnnotation(annotation.Destructive("Delete a package version")),
+		mcp.WithDescription("Delete a package version (irreversible)."),
+		mcp.WithString("method", mcp.Required(), mcp.Enum("delete")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description("user or org")),
+		mcp.WithString("type", mcp.Required(), mcp.Description("container/npm/maven/pypi/cargo/generic")),
+		mcp.WithString("name", mcp.Required(), mcp.Description("slashes auto-encoded")),
+		mcp.WithString("version", mcp.Required()),
+	)
+)
+
+func init() {
+	Tool.RegisterRead(server.ServerTool{
+		Tool:    PackageReadTool,
+		Handler: packageReadFn,
+	})
+	Tool.RegisterWrite(server.ServerTool{
+		Tool:    PackageWriteTool,
+		Handler: packageWriteFn,
+	})
+}
+
+func packageReadFn(ctx context.Context, req mcp.CallToolRequest) (*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)
+	case "list_versions":
+		return listPackageVersionsFn(ctx, req)
+	case "get":
+		return getPackageFn(ctx, req)
+	default:
+		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
+	}
+}
+
+func packageWriteFn(ctx context.Context, req mcp.CallToolRequest) (*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)
+	default:
+		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
+	}
+}
+
+// escapePackageName normalises a package name for use in URL paths. It
+// accepts both raw names (my-repo/my-image) and pre-encoded names
+// (my-repo%2Fmy-image), decoding first to avoid double-encoding. A literal
+// '%' followed by two hex digits in a raw name will be folded into its
+// decoded form, but package names typically do not contain '%'.
+func escapePackageName(name string) string {
+	if strings.Contains(name, "%") {
+		if decoded, err := url.PathUnescape(name); err == nil {
+			name = decoded
+		}
+	}
+	return url.PathEscape(name)
+}
+
+func listPackagesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	args := req.GetArguments()
+	owner, err := params.GetString(args, "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+
+	query := url.Values{}
+	if typ, ok := args["type"].(string); ok && typ != "" {
+		query.Set("type", typ)
+	}
+	if q, ok := args["q"].(string); ok && q != "" {
+		query.Set("q", q)
+	}
+	page, pageSize := params.GetPagination(args, 30)
+	query.Set("page", strconv.Itoa(page))
+	query.Set("limit", strconv.Itoa(pageSize))
+
+	var result any
+	_, err = gitea.DoJSON(ctx, "GET", "packages/"+url.PathEscape(owner), query, nil, &result)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("list packages err: %v", err))
+	}
+
+	return to.TextResult(slimPackages(result))
+}
+
+func listPackageVersionsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	args := req.GetArguments()
+	owner, err := params.GetString(args, "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	typ, err := params.GetString(args, "type")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	name, err := params.GetString(args, "name")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+
+	query := url.Values{}
+	page, pageSize := params.GetPagination(args, 30)
+	query.Set("page", strconv.Itoa(page))
+	query.Set("limit", strconv.Itoa(pageSize))
+
+	var result any
+	_, err = gitea.DoJSON(ctx, "GET", fmt.Sprintf("packages/%s/%s/%s", url.PathEscape(owner), url.PathEscape(typ), escapePackageName(name)), query, nil, &result)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("list package versions err: %v", err))
+	}
+
+	return to.TextResult(slimPackages(result))
+}
+
+func getPackageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	args := req.GetArguments()
+	owner, err := params.GetString(args, "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	typ, err := params.GetString(args, "type")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	name, err := params.GetString(args, "name")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	version, err := params.GetString(args, "version")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+
+	var result any
+	_, err = gitea.DoJSON(ctx, "GET", fmt.Sprintf("packages/%s/%s/%s/%s", url.PathEscape(owner), url.PathEscape(typ), escapePackageName(name), url.PathEscape(version)), nil, nil, &result)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get package err: %v", err))
+	}
+
+	return to.TextResult(slimPackage(result))
+}
+
+func deletePackageVersionFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	args := req.GetArguments()
+	owner, err := params.GetString(args, "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	typ, err := params.GetString(args, "type")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	name, err := params.GetString(args, "name")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	version, err := params.GetString(args, "version")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+
+	_, err = gitea.DoJSON(ctx, "DELETE", fmt.Sprintf("packages/%s/%s/%s/%s", url.PathEscape(owner), url.PathEscape(typ), escapePackageName(name), url.PathEscape(version)), nil, nil, nil)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("delete package version err: %v", err))
+	}
+
+	return to.TextResult("Package version deleted successfully")
+}

operation/packages/packages_test.go

@@ -0,0 +1,381 @@
+package packages
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"sync"
+	"testing"
+
+	mcpContext "gitea.com/gitea/gitea-mcp/pkg/context"
+	"gitea.com/gitea/gitea-mcp/pkg/flag"
+
+	"github.com/mark3labs/mcp-go/mcp"
+)
+
+func TestPackageReadList(t *testing.T) {
+	var mu sync.Mutex
+	var gotQuery map[string]string
+
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		mu.Lock()
+		gotQuery = map[string]string{}
+		for k, v := range r.URL.Query() {
+			gotQuery[k] = v[0]
+		}
+		mu.Unlock()
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`[{"id":1,"type":"container","name":"myrepo/myimage","version":"v1.0.0","html_url":"http://example.com","created_at":"2025-01-01T00:00:00Z","owner":{"login":"test-org"},"creator":{"login":"admin"}}]`))
+	}))
+	defer srv.Close()
+
+	origHost := flag.Host
+	flag.Host = srv.URL
+	defer func() { flag.Host = origHost }()
+
+	ctx := context.WithValue(context.Background(), mcpContext.TokenContextKey, "test-token")
+
+	t.Run("basic list", func(t *testing.T) {
+		req := mcp.CallToolRequest{}
+		req.Params.Arguments = map[string]any{
+			"method": "list",
+			"owner":  "test-org",
+		}
+
+		result, err := packageReadFn(ctx, req)
+		if err != nil {
+			t.Fatalf("packageReadFn() error: %v", err)
+		}
+		if result.IsError {
+			t.Fatal("packageReadFn() returned error result")
+		}
+
+		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)
+		}
+		if len(packages) != 1 {
+			t.Fatalf("expected 1 package, got %d", len(packages))
+		}
+		if packages[0]["name"] != "myrepo/myimage" {
+			t.Errorf("expected name 'myrepo/myimage', got %v", packages[0]["name"])
+		}
+		if packages[0]["owner"] != "test-org" {
+			t.Errorf("expected owner 'test-org', got %v", packages[0]["owner"])
+		}
+	})
+
+	t.Run("with type and query filters", func(t *testing.T) {
+		req := mcp.CallToolRequest{}
+		req.Params.Arguments = map[string]any{
+			"method": "list",
+			"owner":  "test-org",
+			"type":   "container",
+			"q":      "myimage",
+		}
+
+		_, err := packageReadFn(ctx, req)
+		if err != nil {
+			t.Fatalf("packageReadFn() error: %v", err)
+		}
+
+		mu.Lock()
+		defer mu.Unlock()
+		if gotQuery["type"] != "container" {
+			t.Errorf("expected type=container, got %q", gotQuery["type"])
+		}
+		if gotQuery["q"] != "myimage" {
+			t.Errorf("expected q=myimage, got %q", gotQuery["q"])
+		}
+	})
+
+	t.Run("with pagination", func(t *testing.T) {
+		req := mcp.CallToolRequest{}
+		req.Params.Arguments = map[string]any{
+			"method":   "list",
+			"owner":    "test-org",
+			"page":     float64(2),
+			"per_page": float64(10),
+		}
+
+		_, err := packageReadFn(ctx, req)
+		if err != nil {
+			t.Fatalf("packageReadFn() error: %v", err)
+		}
+
+		mu.Lock()
+		defer mu.Unlock()
+		if gotQuery["page"] != "2" {
+			t.Errorf("expected page=2, got %q", gotQuery["page"])
+		}
+		if gotQuery["limit"] != "10" {
+			t.Errorf("expected limit=10, got %q", gotQuery["limit"])
+		}
+	})
+}
+
+func TestPackageReadListVersions(t *testing.T) {
+	var mu sync.Mutex
+	var gotPath string
+
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		mu.Lock()
+		gotPath = r.URL.RawPath
+		if gotPath == "" {
+			gotPath = r.URL.Path
+		}
+		mu.Unlock()
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`[{"id":1,"type":"container","name":"myrepo/myimage","version":"v1.0.0"},{"id":2,"type":"container","name":"myrepo/myimage","version":"v2.0.0"}]`))
+	}))
+	defer srv.Close()
+
+	origHost := flag.Host
+	flag.Host = srv.URL
+	defer func() { flag.Host = origHost }()
+
+	ctx := context.WithValue(context.Background(), mcpContext.TokenContextKey, "test-token")
+
+	tests := []struct {
+		testName string
+		name     string
+	}{
+		{"raw slash", "myrepo/myimage"},
+		{"pre-encoded slash", "myrepo%2Fmyimage"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.testName, func(t *testing.T) {
+			req := mcp.CallToolRequest{}
+			req.Params.Arguments = map[string]any{
+				"method": "list_versions",
+				"owner":  "test-org",
+				"type":   "container",
+				"name":   tt.name,
+			}
+
+			result, err := packageReadFn(ctx, req)
+			if err != nil {
+				t.Fatalf("packageReadFn() error: %v", err)
+			}
+			if result.IsError {
+				t.Fatal("packageReadFn() returned error result")
+			}
+
+			mu.Lock()
+			wantPath := "/api/v1/packages/test-org/container/myrepo%2Fmyimage"
+			if gotPath != wantPath {
+				t.Errorf("request path = %q, want %q", gotPath, wantPath)
+			}
+			mu.Unlock()
+
+			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)
+			}
+			if len(versions) != 2 {
+				t.Fatalf("expected 2 versions, got %d", len(versions))
+			}
+		})
+	}
+}
+
+func TestPackageReadGet(t *testing.T) {
+	var mu sync.Mutex
+	var gotPath string
+
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		mu.Lock()
+		gotPath = r.URL.RawPath
+		if gotPath == "" {
+			gotPath = r.URL.Path
+		}
+		mu.Unlock()
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`{"id":1,"type":"container","name":"myrepo/myimage","version":"v1.0.0","html_url":"http://example.com","created_at":"2025-01-01T00:00:00Z","owner":{"login":"test-org"}}`))
+	}))
+	defer srv.Close()
+
+	origHost := flag.Host
+	flag.Host = srv.URL
+	defer func() { flag.Host = origHost }()
+
+	ctx := context.WithValue(context.Background(), mcpContext.TokenContextKey, "test-token")
+
+	tests := []struct {
+		testName string
+		name     string
+	}{
+		{"raw slash", "myrepo/myimage"},
+		{"pre-encoded slash", "myrepo%2Fmyimage"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.testName, func(t *testing.T) {
+			req := mcp.CallToolRequest{}
+			req.Params.Arguments = map[string]any{
+				"method":  "get",
+				"owner":   "test-org",
+				"type":    "container",
+				"name":    tt.name,
+				"version": "v1.0.0",
+			}
+
+			result, err := packageReadFn(ctx, req)
+			if err != nil {
+				t.Fatalf("packageReadFn() error: %v", err)
+			}
+			if result.IsError {
+				t.Fatal("packageReadFn() returned error result")
+			}
+
+			mu.Lock()
+			wantPath := "/api/v1/packages/test-org/container/myrepo%2Fmyimage/v1.0.0"
+			if gotPath != wantPath {
+				t.Errorf("request path = %q, want %q", gotPath, wantPath)
+			}
+			mu.Unlock()
+
+			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)
+			}
+			if pkg["name"] != "myrepo/myimage" {
+				t.Errorf("expected name 'myrepo/myimage', got %v", pkg["name"])
+			}
+			if pkg["version"] != "v1.0.0" {
+				t.Errorf("expected version 'v1.0.0', got %v", pkg["version"])
+			}
+		})
+	}
+}
+
+func TestPackageWriteDelete(t *testing.T) {
+	var mu sync.Mutex
+	var gotMethod string
+	var gotPath string
+
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		mu.Lock()
+		gotMethod = r.Method
+		gotPath = r.URL.RawPath
+		if gotPath == "" {
+			gotPath = r.URL.Path
+		}
+		mu.Unlock()
+		w.WriteHeader(http.StatusNoContent)
+	}))
+	defer srv.Close()
+
+	origHost := flag.Host
+	flag.Host = srv.URL
+	defer func() { flag.Host = origHost }()
+
+	ctx := context.WithValue(context.Background(), mcpContext.TokenContextKey, "test-token")
+
+	req := mcp.CallToolRequest{}
+	req.Params.Arguments = map[string]any{
+		"method":  "delete",
+		"owner":   "test-org",
+		"type":    "container",
+		"name":    "myrepo/myimage",
+		"version": "v1.0.0",
+	}
+
+	result, err := packageWriteFn(ctx, req)
+	if err != nil {
+		t.Fatalf("packageWriteFn() error: %v", err)
+	}
+	if result.IsError {
+		t.Fatal("packageWriteFn() returned error result")
+	}
+
+	mu.Lock()
+	defer mu.Unlock()
+	if gotMethod != "DELETE" {
+		t.Errorf("expected DELETE method, got %q", gotMethod)
+	}
+	wantPath := "/api/v1/packages/test-org/container/myrepo%2Fmyimage/v1.0.0"
+	if gotPath != wantPath {
+		t.Errorf("request path = %q, want %q", gotPath, wantPath)
+	}
+}
+
+func TestPackageReadUnknownMethod(t *testing.T) {
+	ctx := context.Background()
+	req := mcp.CallToolRequest{}
+	req.Params.Arguments = map[string]any{
+		"method": "bogus",
+		"owner":  "test-org",
+	}
+	if _, err := packageReadFn(ctx, req); err == nil {
+		t.Fatal("expected error for unknown method")
+	}
+}
+
+func TestPackageWriteUnknownMethod(t *testing.T) {
+	ctx := context.Background()
+	req := mcp.CallToolRequest{}
+	req.Params.Arguments = map[string]any{
+		"method": "bogus",
+		"owner":  "test-org",
+	}
+	if _, err := packageWriteFn(ctx, req); err == nil {
+		t.Fatal("expected error for unknown method")
+	}
+}
+
+func TestEscapePackageName(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+	}{
+		{"simple name", "mypackage", "mypackage"},
+		{"raw slash", "myrepo/myimage", "myrepo%2Fmyimage"},
+		{"pre-encoded slash", "myrepo%2Fmyimage", "myrepo%2Fmyimage"},
+		{"pre-encoded uppercase", "myrepo%2Fmyimage", "myrepo%2Fmyimage"},
+		{"multiple slashes", "a/b/c", "a%2Fb%2Fc"},
+		{"pre-encoded multiple slashes", "a%2Fb%2Fc", "a%2Fb%2Fc"},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := escapePackageName(tt.input)
+			if got != tt.expected {
+				t.Errorf("escapePackageName(%q) = %q, want %q", tt.input, got, tt.expected)
+			}
+		})
+	}
+}
+
+func TestSlimPackage(t *testing.T) {
+	raw := map[string]any{
+		"id":         float64(1),
+		"type":       "container",
+		"name":       "test-repo/test-image",
+		"version":    "v1.0.0",
+		"html_url":   "http://example.com/pkg",
+		"created_at": "2025-01-01T00:00:00Z",
+		"owner":      map[string]any{"login": "test-org", "id": float64(2), "email": ""},
+		"creator":    map[string]any{"login": "admin", "id": float64(1)},
+		"repository": map[string]any{"full_name": "test-org/test-repo", "id": float64(3)},
+	}
+
+	slim := slimPackage(raw)
+	if slim["owner"] != "test-org" {
+		t.Errorf("expected owner 'test-org', got %v", slim["owner"])
+	}
+	if slim["creator"] != "admin" {
+		t.Errorf("expected creator 'admin', got %v", slim["creator"])
+	}
+	if slim["repository"] != "test-org/test-repo" {
+		t.Errorf("expected repository 'test-org/test-repo', got %v", slim["repository"])
+	}
+	if _, ok := slim["owner"].(map[string]any); ok {
+		t.Error("expected owner to be a string, not a map")
+	}
+}

operation/packages/slim.go

@@ -0,0 +1,43 @@
+package packages
+
+func slimPackage(v any) map[string]any {
+	m, ok := v.(map[string]any)
+	if !ok {
+		return nil
+	}
+	out := map[string]any{
+		"id":         m["id"],
+		"type":       m["type"],
+		"name":       m["name"],
+		"version":    m["version"],
+		"html_url":   m["html_url"],
+		"created_at": m["created_at"],
+	}
+	if owner, ok := m["owner"].(map[string]any); ok {
+		out["owner"] = owner["login"]
+	}
+	if creator, ok := m["creator"].(map[string]any); ok {
+		out["creator"] = creator["login"]
+	}
+	if repo, ok := m["repository"].(map[string]any); ok {
+		out["repository"] = repo["full_name"]
+	}
+	return out
+}
+
+func slimPackages(v any) any {
+	switch val := v.(type) {
+	case []any:
+		out := make([]map[string]any, 0, len(val))
+		for _, item := range val {
+			if slim := slimPackage(item); slim != nil {
+				out = append(out, slim)
+			}
+		}
+		return out
+	case map[string]any:
+		return slimPackage(val)
+	default:
+		return v
+	}
+}

operation/pull/pull.go

@@ -3,19 +3,23 @@ package pull
 import (
 	"context"
 	"fmt"
+	"net/url"
+	"strings"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
 	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
+	"gitea.com/gitea/gitea-mcp/pkg/slim"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("pull_request")
 
 const (
 	ListRepoPullRequestsToolName   = "list_pull_requests"
@@ -27,71 +31,83 @@ const (
 var (
 	ListRepoPullRequestsTool = mcp.NewTool(
 		ListRepoPullRequestsToolName,
-		mcp.WithDescription("List repository pull requests"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("state", mcp.Description("state"), mcp.Enum("open", "closed", "all"), mcp.DefaultString("all")),
-		mcp.WithString("sort", mcp.Description("sort"), mcp.Enum("oldest", "recentupdate", "leastupdate", "mostcomment", "leastcomment", "priority"), mcp.DefaultString("recentupdate")),
-		mcp.WithNumber("milestone", mcp.Description("milestone")),
-		mcp.WithNumber("page", mcp.Description("page number"), mcp.DefaultNumber(1)),
-		mcp.WithNumber("perPage", mcp.Description("results per page"), mcp.DefaultNumber(30)),
+		mcp.WithDescription("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")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("state", mcp.Enum("open", "closed", "all"), mcp.DefaultString("all")),
+		mcp.WithString("sort", mcp.Enum("oldest", "recentupdate", "leastupdate", "mostcomment", "leastcomment", "priority"), mcp.DefaultString("recentupdate")),
+		mcp.WithNumber("milestone"),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
 	)
 
 	PullRequestReadTool = mcp.NewTool(
 		PullRequestReadToolName,
-		mcp.WithDescription("Get pull request information. Use method 'get' for PR details, 'get_diff' for diff, 'get_reviews'/'get_review'/'get_review_comments' for review data."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("get", "get_diff", "get_reviews", "get_review", "get_review_comments")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithNumber("index", mcp.Required(), mcp.Description("pull request index")),
-		mcp.WithNumber("review_id", mcp.Description("review ID (required for 'get_review', 'get_review_comments')")),
-		mcp.WithBoolean("binary", mcp.Description("whether to include binary file changes (for 'get_diff')")),
-		mcp.WithNumber("page", mcp.Description("page number"), mcp.DefaultNumber(1)),
-		mcp.WithNumber("perPage", mcp.Description("results per page"), mcp.DefaultNumber(30)),
+		mcp.WithDescription("Read pull request: details, diff, changed files, head commit status, reviews, review comments."),
+		mcp.WithToolAnnotation(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")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithNumber("pull_number", mcp.Required()),
+		mcp.WithNumber("review_id", mcp.Description("for 'get_review'; optional for 'get_review_comments', omit to list all")),
+		mcp.WithBoolean("binary", mcp.Description("include binary diff")),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
 	)
 
 	PullRequestWriteTool = mcp.NewTool(
 		PullRequestWriteToolName,
-		mcp.WithDescription("Create, update, or merge pull requests, manage reviewers."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("create", "update", "merge", "add_reviewers", "remove_reviewers")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithNumber("index", mcp.Description("pull request index (required for all methods except 'create')")),
-		mcp.WithString("title", mcp.Description("PR title (required for 'create', optional for 'update', 'merge')")),
-		mcp.WithString("body", mcp.Description("PR body (required for 'create', optional for 'update')")),
-		mcp.WithString("head", mcp.Description("PR head branch (required for 'create')")),
-		mcp.WithString("base", mcp.Description("PR base branch (required for 'create', optional for 'update')")),
-		mcp.WithString("assignee", mcp.Description("username to assign (for 'update')")),
-		mcp.WithArray("assignees", mcp.Description("usernames to assign (for 'update')"), mcp.Items(map[string]any{"type": "string"})),
-		mcp.WithNumber("milestone", mcp.Description("milestone number (for 'update')")),
-		mcp.WithString("state", mcp.Description("PR state (for 'update')"), mcp.Enum("open", "closed")),
-		mcp.WithBoolean("allow_maintainer_edit", mcp.Description("allow maintainer to edit (for 'update')")),
-		mcp.WithString("merge_style", mcp.Description("merge style (for 'merge')"), mcp.Enum("merge", "rebase", "rebase-merge", "squash", "fast-forward-only"), mcp.DefaultString("merge")),
-		mcp.WithString("message", mcp.Description("merge commit message (for 'merge') or dismissal reason")),
-		mcp.WithBoolean("delete_branch", mcp.Description("delete branch after merge (for 'merge')")),
-		mcp.WithArray("reviewers", mcp.Description("reviewer usernames (for 'add_reviewers', 'remove_reviewers')"), mcp.Items(map[string]any{"type": "string"})),
-		mcp.WithArray("team_reviewers", mcp.Description("team reviewer names (for 'add_reviewers', 'remove_reviewers')"), mcp.Items(map[string]any{"type": "string"})),
+		mcp.WithDescription("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")),
+		mcp.WithString("method", mcp.Required(), mcp.Enum("create", "update", "close", "reopen", "merge", "update_branch", "add_reviewers", "remove_reviewers")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithNumber("pull_number", mcp.Description("required except for 'create'")),
+		mcp.WithString("title", mcp.Description("required for 'create'; optional for 'update'/'merge'")),
+		mcp.WithString("body", mcp.Description("required for 'create'; optional for 'update'")),
+		mcp.WithString("head", mcp.Description("head branch (required for 'create')")),
+		mcp.WithString("base", mcp.Description("base branch (required for 'create')")),
+		mcp.WithString("assignee", mcp.Description("for 'update'")),
+		mcp.WithArray("assignees", mcp.Description("for 'update'"), mcp.Items(map[string]any{"type": "string"})),
+		mcp.WithNumber("milestone", mcp.Description("for 'update'")),
+		mcp.WithString("state", mcp.Description("for 'update'"), mcp.Enum("open", "closed")),
+		mcp.WithBoolean("allow_maintainer_edit", mcp.Description("for 'update'")),
+		mcp.WithArray("labels", mcp.Description("label IDs"), mcp.Items(map[string]any{"type": "number"})),
+		mcp.WithString("deadline", mcp.Description("ISO 8601")),
+		mcp.WithBoolean("remove_deadline", mcp.Description("for 'update'")),
+		mcp.WithString("merge_style", mcp.Description("for 'merge'"), mcp.Enum("merge", "rebase", "rebase-merge", "squash", "fast-forward-only"), mcp.DefaultString("merge")),
+		mcp.WithString("message", mcp.Description("merge commit message or dismissal reason")),
+		mcp.WithBoolean("delete_branch", mcp.Description("for 'merge'")),
+		mcp.WithBoolean("force_merge", mcp.Description("merge even if checks fail")),
+		mcp.WithBoolean("merge_when_checks_succeed", mcp.Description("for 'merge'")),
+		mcp.WithString("head_commit_id", mcp.Description("expected head SHA for conflict detection")),
+		mcp.WithArray("reviewers", mcp.Description("for 'add_reviewers'/'remove_reviewers'"), mcp.Items(map[string]any{"type": "string"})),
+		mcp.WithArray("team_reviewers", mcp.Description("for 'add_reviewers'/'remove_reviewers'"), mcp.Items(map[string]any{"type": "string"})),
+		mcp.WithBoolean("draft", mcp.Description("uses 'WIP: ' title prefix")),
 	)
 
 	PullRequestReviewWriteTool = mcp.NewTool(
 		PullRequestReviewWriteToolName,
-		mcp.WithDescription("Manage pull request reviews: create, submit, delete, or dismiss."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("create", "submit", "delete", "dismiss")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithNumber("index", mcp.Required(), mcp.Description("pull request index")),
-		mcp.WithNumber("review_id", mcp.Description("review ID (required for 'submit', 'delete', 'dismiss')")),
-		mcp.WithString("state", mcp.Description("review state"), mcp.Enum("APPROVED", "REQUEST_CHANGES", "COMMENT", "PENDING")),
-		mcp.WithString("body", mcp.Description("review body/comment")),
-		mcp.WithString("commit_id", mcp.Description("commit SHA to review (for 'create')")),
-		mcp.WithString("message", mcp.Description("dismissal reason (for 'dismiss')")),
-		mcp.WithArray("comments", mcp.Description("inline review comments (for 'create')"), mcp.Items(map[string]any{
+		mcp.WithDescription("Write PR reviews: create, submit, delete, dismiss, reply to and resolve review comments."),
+		mcp.WithToolAnnotation(annotation.Write("Write pull request reviews")),
+		mcp.WithString("method", mcp.Required(), mcp.Enum("create", "submit", "delete", "dismiss", "reply_comment", "resolve_thread", "unresolve_thread")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithNumber("pull_number", mcp.Description("required except for 'resolve_thread'/'unresolve_thread'")),
+		mcp.WithNumber("review_id", mcp.Description("for 'submit'/'delete'/'dismiss'")),
+		mcp.WithNumber("comment_id", mcp.Description("comment ID from 'get_review_comments'; resolve takes the thread's first")),
+		mcp.WithString("state", mcp.Enum("APPROVED", "REQUEST_CHANGES", "COMMENT", "PENDING")),
+		mcp.WithString("body", mcp.Description("review body, or reply text for 'reply_comment'")),
+		mcp.WithString("commit_id", mcp.Description("for 'create'")),
+		mcp.WithString("message", mcp.Description("dismissal reason")),
+		mcp.WithArray("comments", mcp.Description("inline comments (for 'create')"), mcp.Items(map[string]any{
 			"type": "object",
 			"properties": map[string]any{
-				"path":         map[string]any{"type": "string", "description": "file path to comment on"},
-				"body":         map[string]any{"type": "string", "description": "comment body"},
-				"old_line_num": map[string]any{"type": "number", "description": "line number in the old file (for deletions/changes)"},
-				"new_line_num": map[string]any{"type": "number", "description": "line number in the new file (for additions/changes)"},
+				"path":         map[string]any{"type": "string"},
+				"body":         map[string]any{"type": "string"},
+				"old_line_num": map[string]any{"type": "number", "description": "old-file line (deletions)"},
+				"new_line_num": map[string]any{"type": "number", "description": "new-file line (additions)"},
 			},
 		})),
 	)
@@ -126,6 +142,10 @@ func pullRequestReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 		return getPullRequestByIndexFn(ctx, req)
 	case "get_diff":
 		return getPullRequestDiffFn(ctx, req)
+	case "get_files":
+		return getPullRequestFilesFn(ctx, req)
+	case "get_status":
+		return getPullRequestStatusFn(ctx, req)
 	case "get_reviews":
 		return listPullRequestReviewsFn(ctx, req)
 	case "get_review":
@@ -147,8 +167,14 @@ func pullRequestWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 		return createPullRequestFn(ctx, req)
 	case "update":
 		return editPullRequestFn(ctx, req)
+	case "close":
+		return closePullRequestFn(ctx, req)
+	case "reopen":
+		return reopenPullRequestFn(ctx, req)
 	case "merge":
 		return mergePullRequestFn(ctx, req)
+	case "update_branch":
+		return updatePullRequestBranchFn(ctx, req)
 	case "add_reviewers":
 		return createPullRequestReviewerFn(ctx, req)
 	case "remove_reviewers":
@@ -158,6 +184,66 @@ func pullRequestWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	}
 }
 
+func closePullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	owner, err := params.GetString(req.GetArguments(), "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	repo, err := params.GetString(req.GetArguments(), "repo")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	index, err := params.GetIndex(req.GetArguments(), "pull_number")
+	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))
+	}
+
+	state := gitea_sdk.StateClosed
+	pr, _, err := client.PullRequests.EditPullRequest(ctx, owner, repo, index, gitea_sdk.EditPullRequestOption{
+		State: &state,
+	})
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("close %v/%v/pr/%v err: %v", owner, repo, index, err))
+	}
+
+	return to.TextResult(slimPullRequest(pr))
+}
+
+func reopenPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	owner, err := params.GetString(req.GetArguments(), "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	repo, err := params.GetString(req.GetArguments(), "repo")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	index, err := params.GetIndex(req.GetArguments(), "pull_number")
+	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))
+	}
+
+	state := gitea_sdk.StateOpen
+	pr, _, err := client.PullRequests.EditPullRequest(ctx, owner, repo, index, gitea_sdk.EditPullRequestOption{
+		State: &state,
+	})
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("reopen %v/%v/pr/%v err: %v", owner, repo, index, err))
+	}
+
+	return to.TextResult(slimPullRequest(pr))
+}
+
 func pullRequestReviewWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 	method, err := params.GetString(req.GetArguments(), "method")
 	if err != nil {
@@ -172,13 +258,18 @@ func pullRequestReviewWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 		return deletePullRequestReviewFn(ctx, req)
 	case "dismiss":
 		return dismissPullRequestReviewFn(ctx, req)
+	case "reply_comment":
+		return replyPullRequestReviewCommentFn(ctx, req)
+	case "resolve_thread":
+		return resolveReviewThreadFn(ctx, req)
+	case "unresolve_thread":
+		return unresolveReviewThreadFn(ctx, req)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
 }
 
 func getPullRequestByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getPullRequestByIndexFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -188,7 +279,7 @@ func getPullRequestByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(args, "index")
+	index, err := params.GetIndex(args, "pull_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -196,16 +287,25 @@ func getPullRequestByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	pr, _, err := client.GetPullRequest(owner, repo, index)
+	pr, _, err := client.PullRequests.GetPullRequest(ctx, owner, repo, index)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get %v/%v/pr/%v err: %v", owner, repo, index, err))
 	}
 
-	return to.TextResult(slimPullRequest(pr))
+	// /pulls/{n} omits `assets`; PRs are issues internally, so the issue
+	// assets endpoint surfaces description attachments.
+	var assets []*gitea_sdk.Attachment
+	assetsPath := fmt.Sprintf("repos/%s/%s/issues/%d/assets", url.PathEscape(owner), url.PathEscape(repo), index)
+	if _, err := gitea.DoJSON(ctx, "GET", assetsPath, nil, nil, &assets); err != nil {
+		log.Debugf("fetch %v/%v/issues/%v/assets err: %v", owner, repo, index, err)
+	}
+
+	m := slimPullRequest(pr)
+	m["body"] = slim.BodyWithAttachments(pr.Body, assets)
+	return to.TextResult(m)
 }
 
 func getPullRequestDiffFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getPullRequestDiffFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -215,7 +315,7 @@ func getPullRequestDiffFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(args, "index")
+	index, err := params.GetIndex(args, "pull_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -225,7 +325,7 @@ func getPullRequestDiffFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	diffBytes, _, err := client.GetPullRequestDiff(owner, repo, index, gitea_sdk.PullRequestDiffOptions{
+	diffBytes, _, err := client.PullRequests.GetPullRequestDiff(ctx, owner, repo, index, gitea_sdk.PullRequestDiffOptions{
 		Binary: binary,
 	})
 	if err != nil {
@@ -236,7 +336,6 @@ func getPullRequestDiffFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 }
 
 func listRepoPullRequestsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called ListRepoPullRequests")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -263,7 +362,7 @@ func listRepoPullRequestsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	pullRequests, _, err := client.ListRepoPullRequests(owner, repo, opt)
+	pullRequests, _, err := client.PullRequests.ListRepoPullRequests(ctx, owner, repo, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("list %v/%v/pull_requests err: %v", owner, repo, err))
 	}
@@ -271,8 +370,29 @@ func listRepoPullRequestsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 	return to.TextResult(slimPullRequests(pullRequests))
 }
 
+// defaultWIPPrefixes are the default Gitea title prefixes that mark a PR as
+// work-in-progress / draft. Gitea matches these case-insensitively.
+var defaultWIPPrefixes = []string{"WIP:", "[WIP]"}
+
+// applyDraftPrefix adds or removes a WIP title prefix that Gitea uses to mark
+// pull requests as drafts. When the title already carries a recognized prefix
+// and isDraft is true, the title is returned unchanged to avoid normalization.
+func applyDraftPrefix(title string, isDraft bool) string {
+	for _, prefix := range defaultWIPPrefixes {
+		if len(title) >= len(prefix) && strings.EqualFold(title[:len(prefix)], prefix) {
+			if isDraft {
+				return title
+			}
+			return strings.TrimLeft(title[len(prefix):], " ")
+		}
+	}
+	if isDraft {
+		return "WIP: " + title
+	}
+	return title
+}
+
 func createPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called createPullRequestFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -298,16 +418,26 @@ func createPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Cal
 	if err != nil {
 		return to.ErrorResult(err)
 	}
+
+	if draft, ok := args["draft"].(bool); ok {
+		title = applyDraftPrefix(title, draft)
+	}
+
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	pr, _, err := client.CreatePullRequest(owner, repo, gitea_sdk.CreatePullRequestOption{
+	opt := gitea_sdk.CreatePullRequestOption{
 		Title: title,
 		Body:  body,
 		Head:  head,
 		Base:  base,
-	})
+	}
+	if labelIDs, err := params.GetInt64Slice(args, "labels"); err == nil {
+		opt.Labels = labelIDs
+	}
+	opt.Deadline = params.GetOptionalTime(args, "deadline")
+	pr, _, err := client.PullRequests.CreatePullRequest(ctx, owner, repo, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("create %v/%v/pull_request err: %v", owner, repo, err))
 	}
@@ -315,8 +445,9 @@ func createPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Cal
 	return to.TextResult(slimPullRequest(pr))
 }
 
-func createPullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called createPullRequestReviewerFn")
+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) {
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -326,7 +457,7 @@ func createPullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest) (
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(args, "index")
+	index, err := params.GetIndex(args, "pull_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -339,70 +470,31 @@ func createPullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest) (
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 
-	_, err = client.CreateReviewRequests(owner, repo, index, gitea_sdk.PullReviewRequestOptions{
+	if _, err := op(client.PullRequests, ctx, owner, repo, index, gitea_sdk.PullReviewRequestOptions{
 		Reviewers:     reviewers,
 		TeamReviewers: teamReviewers,
-	})
-	if err != nil {
-		return to.ErrorResult(fmt.Errorf("create review requests for %v/%v/pr/%v err: %v", owner, repo, index, err))
+	}); err != nil {
+		return to.ErrorResult(fmt.Errorf("%s review requests for %v/%v/pr/%v err: %v", verb, owner, repo, index, err))
 	}
 
-	successMsg := map[string]any{
-		"message":        "Successfully created review requests",
+	return to.TextResult(map[string]any{
+		"message":        fmt.Sprintf("Successfully %sd review requests", verb),
 		"reviewers":      reviewers,
 		"team_reviewers": teamReviewers,
 		"pr_index":       index,
 		"repository":     fmt.Sprintf("%s/%s", owner, repo),
-	}
+	})
+}
 
-	return to.TextResult(successMsg)
+func createPullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	return pullRequestReviewerFn(ctx, req, "create", (*gitea_sdk.PullRequestsService).CreateReviewRequests)
 }
 
 func deletePullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called deletePullRequestReviewerFn")
-	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, "index")
-	if err != nil {
-		return to.ErrorResult(err)
-	}
-
-	reviewers := params.GetStringSlice(args, "reviewers")
-	teamReviewers := params.GetStringSlice(args, "team_reviewers")
-
-	client, err := gitea.ClientFromContext(ctx)
-	if err != nil {
-		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
-	}
-
-	_, err = client.DeleteReviewRequests(owner, repo, index, gitea_sdk.PullReviewRequestOptions{
-		Reviewers:     reviewers,
-		TeamReviewers: teamReviewers,
-	})
-	if err != nil {
-		return to.ErrorResult(fmt.Errorf("delete review requests for %v/%v/pr/%v err: %v", owner, repo, index, err))
-	}
-
-	successMsg := map[string]any{
-		"message":        "Successfully deleted review requests",
-		"reviewers":      reviewers,
-		"team_reviewers": teamReviewers,
-		"pr_index":       index,
-		"repository":     fmt.Sprintf("%s/%s", owner, repo),
-	}
-
-	return to.TextResult(successMsg)
+	return pullRequestReviewerFn(ctx, req, "delete", (*gitea_sdk.PullRequestsService).DeleteReviewRequests)
 }
 
 func listPullRequestReviewsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listPullRequestReviewsFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -412,7 +504,7 @@ func listPullRequestReviewsFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(args, "index")
+	index, err := params.GetIndex(args, "pull_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -423,7 +515,7 @@ func listPullRequestReviewsFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 
-	reviews, _, err := client.ListPullReviews(owner, repo, index, gitea_sdk.ListPullReviewsOptions{
+	reviews, _, err := client.PullRequests.ListPullReviews(ctx, owner, repo, index, gitea_sdk.ListPullReviewsOptions{
 		ListOptions: gitea_sdk.ListOptions{
 			Page:     page,
 			PageSize: pageSize,
@@ -437,7 +529,6 @@ func listPullRequestReviewsFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 }
 
 func getPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getPullRequestReviewFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -447,7 +538,7 @@ func getPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(args, "index")
+	index, err := params.GetIndex(args, "pull_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -461,7 +552,7 @@ func getPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 
-	review, _, err := client.GetPullReview(owner, repo, index, reviewID)
+	review, _, err := client.PullRequests.GetPullReview(ctx, owner, repo, index, reviewID)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get review %v for %v/%v/pr/%v err: %v", reviewID, owner, repo, index, err))
 	}
@@ -470,7 +561,6 @@ func getPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 }
 
 func listPullRequestReviewCommentsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listPullRequestReviewCommentsFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -480,30 +570,49 @@ func listPullRequestReviewCommentsFn(ctx context.Context, req mcp.CallToolReques
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(args, "index")
+	index, err := params.GetIndex(args, "pull_number")
 	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.ListPullReviewComments(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))
+	// review comments hang off reviews, so without a review_id walk a page of
+	// reviews, keeping each thread and its replies together
+	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) {
-	log.Debugf("Called createPullRequestReviewFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -513,7 +622,7 @@ func createPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(args, "index")
+	index, err := params.GetIndex(args, "pull_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -559,7 +668,7 @@ func createPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 
-	review, _, err := client.CreatePullReview(owner, repo, index, opt)
+	review, _, err := client.PullRequests.CreatePullReview(ctx, owner, repo, index, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("create review for %v/%v/pr/%v err: %v", owner, repo, index, err))
 	}
@@ -568,7 +677,6 @@ func createPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 }
 
 func submitPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called submitPullRequestReviewFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -578,7 +686,7 @@ func submitPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(args, "index")
+	index, err := params.GetIndex(args, "pull_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -603,7 +711,7 @@ func submitPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 
-	review, _, err := client.SubmitPullReview(owner, repo, index, reviewID, opt)
+	review, _, err := client.PullRequests.SubmitPullReview(ctx, owner, repo, index, reviewID, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("submit review %v for %v/%v/pr/%v err: %v", reviewID, owner, repo, index, err))
 	}
@@ -612,7 +720,6 @@ func submitPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 }
 
 func deletePullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called deletePullRequestReviewFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -622,7 +729,7 @@ func deletePullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(args, "index")
+	index, err := params.GetIndex(args, "pull_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -636,7 +743,7 @@ func deletePullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 
-	_, err = client.DeletePullReview(owner, repo, index, reviewID)
+	_, err = client.PullRequests.DeletePullReview(ctx, owner, repo, index, reviewID)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("delete review %v for %v/%v/pr/%v err: %v", reviewID, owner, repo, index, err))
 	}
@@ -652,7 +759,6 @@ func deletePullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 }
 
 func dismissPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called dismissPullRequestReviewFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -662,7 +768,7 @@ func dismissPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(args, "index")
+	index, err := params.GetIndex(args, "pull_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -681,7 +787,7 @@ func dismissPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 
-	_, err = client.DismissPullReview(owner, repo, index, reviewID, opt)
+	_, err = client.PullRequests.DismissPullReview(ctx, owner, repo, index, reviewID, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("dismiss review %v for %v/%v/pr/%v err: %v", reviewID, owner, repo, index, err))
 	}
@@ -696,8 +802,7 @@ func dismissPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*
 	return to.TextResult(successMsg)
 }
 
-func mergePullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called mergePullRequestFn")
+func replyPullRequestReviewCommentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -707,7 +812,92 @@ func mergePullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(args, "index")
+	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, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	return setReviewThreadResolvedFn(ctx, req, true)
+}
+
+func unresolveReviewThreadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	return setReviewThreadResolvedFn(ctx, req, false)
+}
+
+func setReviewThreadResolvedFn(ctx context.Context, req mcp.CallToolRequest, resolved bool) (*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)
+	}
+	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, req mcp.CallToolRequest) (*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)
 	}
@@ -722,14 +912,22 @@ func mergePullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 
+	forceMerge, _ := args["force_merge"].(bool)
+	mergeWhenChecksSucceed, _ := args["merge_when_checks_succeed"].(bool)
+	headCommitID, _ := args["head_commit_id"].(string)
+	deleteBranchAfterMerge := &deleteBranch
+
 	opt := gitea_sdk.MergePullRequestOption{
 		Style:                  gitea_sdk.MergeStyle(mergeStyle),
 		Title:                  title,
 		Message:                message,
-		DeleteBranchAfterMerge: deleteBranch,
+		DeleteBranchAfterMerge: deleteBranchAfterMerge,
+		ForceMerge:             forceMerge,
+		MergeWhenChecksSucceed: mergeWhenChecksSucceed,
+		HeadCommitId:           headCommitID,
 	}
 
-	merged, resp, err := client.MergePullRequest(owner, repo, index, opt)
+	merged, resp, err := client.PullRequests.MergePullRequest(ctx, owner, repo, index, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("merge %v/%v/pr/%v err: %v", owner, repo, index, err))
 	}
@@ -754,7 +952,6 @@ func mergePullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 }
 
 func editPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called editPullRequestFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -764,7 +961,7 @@ func editPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(args, "index")
+	index, err := params.GetIndex(args, "pull_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -774,9 +971,26 @@ func editPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	if title, ok := args["title"].(string); ok {
 		opt.Title = title
 	}
-	if body, ok := args["body"].(string); ok {
-		opt.Body = new(body)
+	if draft, ok := args["draft"].(bool); ok {
+		if opt.Title == "" {
+			// Fetch current title so the caller doesn't have to provide it
+			// just to toggle draft status.
+			client, err := gitea.ClientFromContext(ctx)
+			if err != nil {
+				return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+			}
+			pr, _, err := client.PullRequests.GetPullRequest(ctx, owner, repo, index)
+			if err != nil {
+				return to.ErrorResult(fmt.Errorf("get %v/%v/pr/%v err: %v", owner, repo, index, err))
+			}
+			opt.Title = pr.Title
+		}
+		opt.Title = applyDraftPrefix(opt.Title, draft)
 	}
+	opt.Body = params.GetPresentStringPtr(args, "body")
+	opt.AllowMaintainerEdit = params.GetOptionalBoolPtr(args, "allow_maintainer_edit")
+	opt.RemoveDeadline = params.GetOptionalBoolPtr(args, "remove_deadline")
+	opt.Deadline = params.GetOptionalTime(args, "deadline")
 	if base, ok := args["base"].(string); ok {
 		opt.Base = base
 	}
@@ -792,10 +1006,11 @@ func editPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 		}
 	}
 	if state, ok := args["state"].(string); ok {
-		opt.State = new(gitea_sdk.StateType(state))
+		s := gitea_sdk.StateType(state)
+		opt.State = &s
 	}
-	if allowMaintainerEdit, ok := args["allow_maintainer_edit"].(bool); ok {
-		opt.AllowMaintainerEdit = new(allowMaintainerEdit)
+	if labelIDs, err := params.GetInt64Slice(args, "labels"); err == nil {
+		opt.Labels = labelIDs
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
@@ -803,10 +1018,93 @@ func editPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 
-	pr, _, err := client.EditPullRequest(owner, repo, index, opt)
+	pr, _, err := client.PullRequests.EditPullRequest(ctx, owner, repo, index, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("edit %v/%v/pr/%v err: %v", owner, repo, index, err))
 	}
 
 	return to.TextResult(slimPullRequest(pr))
 }
+
+func updatePullRequestBranchFn(ctx context.Context, req mcp.CallToolRequest) (*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)
+	}
+
+	path := fmt.Sprintf("repos/%s/%s/pulls/%d/update", url.PathEscape(owner), url.PathEscape(repo), index)
+	if _, err := gitea.DoJSON(ctx, "POST", path, nil, nil, nil); err != nil {
+		return to.ErrorResult(fmt.Errorf("update %v/%v/pr/%v branch err: %v", owner, repo, index, err))
+	}
+	return to.TextResult(map[string]any{"message": "branch updated from base"})
+}
+
+func getPullRequestFilesFn(ctx context.Context, req mcp.CallToolRequest) (*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)
+	}
+	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))
+	}
+	files, _, err := client.PullRequests.ListPullRequestFiles(ctx, owner, repo, index, gitea_sdk.ListPullRequestFilesOptions{
+		ListOptions: gitea_sdk.ListOptions{Page: page, PageSize: pageSize},
+	})
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get %v/%v/pr/%v files err: %v", owner, repo, index, err))
+	}
+	return to.TextResult(files)
+}
+
+func getPullRequestStatusFn(ctx context.Context, req mcp.CallToolRequest) (*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)
+	}
+	client, err := gitea.ClientFromContext(ctx)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+	}
+	pr, _, err := client.PullRequests.GetPullRequest(ctx, owner, repo, index)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get %v/%v/pr/%v err: %v", owner, repo, index, err))
+	}
+	if pr.Head == nil || pr.Head.Sha == "" {
+		return to.ErrorResult(fmt.Errorf("pr %v/%v/%v has no head SHA", owner, repo, index))
+	}
+
+	status, _, err := client.Repositories.GetCombinedStatus(ctx, owner, repo, pr.Head.Sha)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get %v/%v/pr/%v status err: %v", owner, repo, index, err))
+	}
+	return to.TextResult(status)
+}

operation/pull/pull_test.go

@@ -6,10 +6,12 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/httptest"
+	"strings"
 	"sync"
 	"testing"
 
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
+
 	"github.com/mark3labs/mcp-go/mcp"
 )
 
@@ -78,11 +80,11 @@ func Test_editPullRequestFn(t *testing.T) {
 			req := mcp.CallToolRequest{
 				Params: mcp.CallToolParams{
 					Arguments: map[string]any{
-						"owner": owner,
-						"repo":  repo,
-						"index": ii.val,
-						"title": "WIP: my feature",
-						"state": "open",
+						"owner":       owner,
+						"repo":        repo,
+						"pull_number": ii.val,
+						"title":       "WIP: my feature",
+						"state":       "open",
 					},
 				},
 			}
@@ -156,6 +158,9 @@ func Test_mergePullRequestFn(t *testing.T) {
 				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/pulls/%d", owner, repo, index):
+					w.Header().Set("Content-Type", "application/json")
+					_, _ = w.Write([]byte(`{"head":{"sha":"abc123"}}`))
 				case fmt.Sprintf("/api/v1/repos/%s/%s", owner, repo):
 					w.Header().Set("Content-Type", "application/json")
 					_, _ = w.Write([]byte(`{"private":false}`))
@@ -193,7 +198,7 @@ func Test_mergePullRequestFn(t *testing.T) {
 					Arguments: map[string]any{
 						"owner":         owner,
 						"repo":          repo,
-						"index":         ii.val,
+						"pull_number":   ii.val,
 						"merge_style":   "squash",
 						"title":         "feat: my squashed commit",
 						"message":       "Squash merge of PR #5",
@@ -254,6 +259,398 @@ func Test_mergePullRequestFn(t *testing.T) {
 	}
 }
 
+func Test_mergePullRequestFn_newParams(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+		index = 8
+	)
+
+	var (
+		mu      sync.Mutex
+		gotBody map[string]any
+	)
+
+	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/pulls/%d/merge", owner, repo, index):
+			mu.Lock()
+			var body map[string]any
+			_ = json.NewDecoder(r.Body).Decode(&body)
+			gotBody = body
+			mu.Unlock()
+			w.WriteHeader(http.StatusOK)
+		default:
+			http.NotFound(w, r)
+		}
+	})
+
+	server := httptest.NewServer(handler)
+	defer server.Close()
+
+	origHost := flag.Host
+	origToken := flag.Token
+	origVersion := flag.Version
+	flag.Host = server.URL
+	flag.Token = ""
+	flag.Version = "test"
+	defer func() {
+		flag.Host = origHost
+		flag.Token = origToken
+		flag.Version = origVersion
+	}()
+
+	req := mcp.CallToolRequest{
+		Params: mcp.CallToolParams{
+			Arguments: map[string]any{
+				"owner":                     owner,
+				"repo":                      repo,
+				"pull_number":               float64(index),
+				"merge_style":               "merge",
+				"force_merge":               true,
+				"merge_when_checks_succeed": true,
+				"head_commit_id":            "abc123",
+			},
+		},
+	}
+
+	_, err := mergePullRequestFn(context.Background(), req)
+	if err != nil {
+		t.Fatalf("mergePullRequestFn() error = %v", err)
+	}
+
+	mu.Lock()
+	defer mu.Unlock()
+
+	if gotBody["force_merge"] != true {
+		t.Fatalf("expected force_merge true, got %v", gotBody["force_merge"])
+	}
+	if gotBody["merge_when_checks_succeed"] != true {
+		t.Fatalf("expected merge_when_checks_succeed true, got %v", gotBody["merge_when_checks_succeed"])
+	}
+	if gotBody["head_commit_id"] != "abc123" {
+		t.Fatalf("expected head_commit_id 'abc123', got %v", gotBody["head_commit_id"])
+	}
+}
+
+func Test_createPullRequestFn_labels(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+	)
+
+	var (
+		mu      sync.Mutex
+		gotBody map[string]any
+	)
+
+	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/pulls", owner, repo):
+			mu.Lock()
+			var body map[string]any
+			_ = json.NewDecoder(r.Body).Decode(&body)
+			gotBody = body
+			mu.Unlock()
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{"number":1,"title":"test","state":"open"}`))
+		default:
+			http.NotFound(w, r)
+		}
+	})
+
+	server := httptest.NewServer(handler)
+	defer server.Close()
+
+	origHost := flag.Host
+	origToken := flag.Token
+	origVersion := flag.Version
+	flag.Host = server.URL
+	flag.Token = ""
+	flag.Version = "test"
+	defer func() {
+		flag.Host = origHost
+		flag.Token = origToken
+		flag.Version = origVersion
+	}()
+
+	req := mcp.CallToolRequest{
+		Params: mcp.CallToolParams{
+			Arguments: map[string]any{
+				"owner":    owner,
+				"repo":     repo,
+				"title":    "test",
+				"body":     "body",
+				"head":     "feature",
+				"base":     "main",
+				"labels":   []any{float64(1), float64(2)},
+				"deadline": "2026-06-01T00:00:00Z",
+			},
+		},
+	}
+
+	_, err := createPullRequestFn(context.Background(), req)
+	if err != nil {
+		t.Fatalf("createPullRequestFn() error = %v", err)
+	}
+
+	mu.Lock()
+	defer mu.Unlock()
+
+	labels, ok := gotBody["labels"].([]any)
+	if !ok || len(labels) != 2 {
+		t.Fatalf("expected 2 labels, got %v", gotBody["labels"])
+	}
+	if labels[0] != float64(1) || labels[1] != float64(2) {
+		t.Fatalf("expected labels [1,2], got %v", labels)
+	}
+	if gotBody["due_date"] == nil {
+		t.Fatalf("expected due_date to be set")
+	}
+}
+
+func Test_applyDraftPrefix(t *testing.T) {
+	tests := []struct {
+		name    string
+		title   string
+		isDraft bool
+		want    string
+	}{
+		{"add prefix", "my feature", true, "WIP: my feature"},
+		{"already prefixed WIP:", "WIP: my feature", true, "WIP: my feature"},
+		{"already prefixed WIP: no space", "WIP:my feature", true, "WIP:my feature"},
+		{"already prefixed [WIP]", "[WIP] my feature", true, "[WIP] my feature"},
+		{"already prefixed case insensitive", "wip: my feature", true, "wip: my feature"},
+		{"already prefixed [wip]", "[wip] my feature", true, "[wip] my feature"},
+		{"remove WIP: prefix", "WIP: my feature", false, "my feature"},
+		{"remove WIP: no space", "WIP:my feature", false, "my feature"},
+		{"remove [WIP] prefix", "[WIP] my feature", false, "my feature"},
+		{"remove [wip] prefix", "[wip] my feature", false, "my feature"},
+		{"remove wip: lowercase", "wip: my feature", false, "my feature"},
+		{"no prefix not draft", "my feature", false, "my feature"},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := applyDraftPrefix(tt.title, tt.isDraft)
+			if got != tt.want {
+				t.Fatalf("applyDraftPrefix(%q, %v) = %q, want %q", tt.title, tt.isDraft, got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_createPullRequestFn_draft(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+	)
+
+	tests := []struct {
+		name      string
+		title     string
+		draft     any // bool or nil (omitted)
+		wantTitle string
+	}{
+		{"draft true", "my feature", true, "WIP: my feature"},
+		{"draft false strips WIP:", "WIP: my feature", false, "my feature"},
+		{"draft false strips [WIP]", "[WIP] my feature", false, "my feature"},
+		{"draft omitted preserves title", "WIP: my feature", nil, "WIP: my feature"},
+		{"draft true already prefixed", "WIP: my feature", true, "WIP: my feature"},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			var (
+				mu      sync.Mutex
+				gotBody map[string]any
+			)
+
+			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/pulls", owner, repo):
+					mu.Lock()
+					var body map[string]any
+					_ = json.NewDecoder(r.Body).Decode(&body)
+					gotBody = body
+					mu.Unlock()
+					w.Header().Set("Content-Type", "application/json")
+					_, _ = w.Write(fmt.Appendf(nil, `{"number":1,"title":%q,"state":"open"}`, body["title"]))
+				default:
+					http.NotFound(w, r)
+				}
+			})
+
+			server := httptest.NewServer(handler)
+			defer server.Close()
+
+			origHost := flag.Host
+			origToken := flag.Token
+			origVersion := flag.Version
+			flag.Host = server.URL
+			flag.Token = ""
+			flag.Version = "test"
+			defer func() {
+				flag.Host = origHost
+				flag.Token = origToken
+				flag.Version = origVersion
+			}()
+
+			args := map[string]any{
+				"owner": owner,
+				"repo":  repo,
+				"title": tc.title,
+				"body":  "test body",
+				"head":  "feature",
+				"base":  "main",
+			}
+			if tc.draft != nil {
+				args["draft"] = tc.draft
+			}
+
+			req := mcp.CallToolRequest{
+				Params: mcp.CallToolParams{
+					Arguments: args,
+				},
+			}
+
+			_, err := createPullRequestFn(context.Background(), req)
+			if err != nil {
+				t.Fatalf("createPullRequestFn() error = %v", err)
+			}
+
+			mu.Lock()
+			defer mu.Unlock()
+
+			if gotBody["title"] != tc.wantTitle {
+				t.Fatalf("expected title %q, got %v", tc.wantTitle, gotBody["title"])
+			}
+		})
+	}
+}
+
+func Test_editPullRequestFn_draft(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+		index = 7
+	)
+
+	tests := []struct {
+		name      string
+		title     string // title arg passed to the tool; empty means omitted
+		draft     any
+		wantTitle string
+	}{
+		{"set draft with title", "my feature", true, "WIP: my feature"},
+		{"unset draft with title", "WIP: my feature", false, "my feature"},
+		{"set draft without title fetches current", "", true, "WIP: existing title"},
+		{"unset draft without title fetches current", "", false, "existing title"},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			var (
+				mu      sync.Mutex
+				gotBody map[string]any
+			)
+
+			prPath := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d", owner, repo, index)
+			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 prPath:
+					w.Header().Set("Content-Type", "application/json")
+					if r.Method == http.MethodGet {
+						// Auto-fetch: return the existing PR with its current title
+						_, _ = w.Write(fmt.Appendf(nil, `{"number":%d,"title":"existing title","state":"open"}`, index))
+						return
+					}
+					mu.Lock()
+					var body map[string]any
+					_ = json.NewDecoder(r.Body).Decode(&body)
+					gotBody = body
+					mu.Unlock()
+					title := "existing title"
+					if s, ok := body["title"].(string); ok {
+						title = s
+					}
+					_, _ = w.Write(fmt.Appendf(nil, `{"number":%d,"title":%q,"state":"open"}`, index, title))
+				default:
+					http.NotFound(w, r)
+				}
+			})
+
+			server := httptest.NewServer(handler)
+			defer server.Close()
+
+			origHost := flag.Host
+			origToken := flag.Token
+			origVersion := flag.Version
+			flag.Host = server.URL
+			flag.Token = ""
+			flag.Version = "test"
+			defer func() {
+				flag.Host = origHost
+				flag.Token = origToken
+				flag.Version = origVersion
+			}()
+
+			args := map[string]any{
+				"owner":       owner,
+				"repo":        repo,
+				"pull_number": float64(index),
+			}
+			if tc.title != "" {
+				args["title"] = tc.title
+			}
+			if tc.draft != nil {
+				args["draft"] = tc.draft
+			}
+
+			req := mcp.CallToolRequest{
+				Params: mcp.CallToolParams{
+					Arguments: args,
+				},
+			}
+
+			_, err := editPullRequestFn(context.Background(), req)
+			if err != nil {
+				t.Fatalf("editPullRequestFn() error = %v", err)
+			}
+
+			mu.Lock()
+			defer mu.Unlock()
+
+			if gotBody["title"] != tc.wantTitle {
+				t.Fatalf("expected title %q, got %v", tc.wantTitle, gotBody["title"])
+			}
+		})
+	}
+}
+
 func Test_getPullRequestDiffFn(t *testing.T) {
 	const (
 		owner   = "octo"
@@ -326,10 +723,10 @@ func Test_getPullRequestDiffFn(t *testing.T) {
 			req := mcp.CallToolRequest{
 				Params: mcp.CallToolParams{
 					Arguments: map[string]any{
-						"owner":  owner,
-						"repo":   repo,
-						"index":  ii.val,
-						"binary": true,
+						"owner":       owner,
+						"repo":        repo,
+						"pull_number": ii.val,
+						"binary":      true,
 					},
 				},
 			}
@@ -377,3 +774,415 @@ func Test_getPullRequestDiffFn(t *testing.T) {
 		})
 	}
 }
+
+func Test_getPullRequestByIndexFn_includesAttachments(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+		index = 9
+	)
+
+	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/pulls/%d", owner, repo, index):
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{"number":9,"title":"feat","body":"see screenshot","state":"open"}`))
+		case fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/assets", owner, repo, index):
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`[{"id":1,"name":"shot.png","browser_download_url":"https://example/shot.png"}]`))
+		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 }()
+
+	req := mcp.CallToolRequest{Params: mcp.CallToolParams{Arguments: map[string]any{
+		"owner": owner, "repo": repo, "pull_number": float64(index),
+	}}}
+	res, err := getPullRequestByIndexFn(context.Background(), req)
+	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
+	if !strings.Contains(body, `[shot.png](https://example/shot.png)`) {
+		t.Fatalf("expected attachment markdown inlined in body, got: %s", body)
+	}
+}
+
+func Test_getPullRequestByIndexFn_emptyAssetsLeavesBody(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+		index = 9
+	)
+
+	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/pulls/%d", owner, repo, index):
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{"number":9,"title":"feat","body":"plain body","state":"open"}`))
+		case fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/assets", owner, repo, index):
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`[]`))
+		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 }()
+
+	req := mcp.CallToolRequest{Params: mcp.CallToolParams{Arguments: map[string]any{
+		"owner": owner, "repo": repo, "pull_number": float64(index),
+	}}}
+	res, err := getPullRequestByIndexFn(context.Background(), req)
+	if err != nil {
+		t.Fatalf("getPullRequestByIndexFn() error = %v", err)
+	}
+	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)
+	}
+}
+
+func Test_getPullRequestByIndexFn_assetsFailureNonFatal(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+		index = 9
+	)
+
+	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/pulls/%d", owner, repo, index):
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{"number":9,"title":"feat","body":"plain body","state":"open"}`))
+		case fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/assets", owner, repo, index):
+			http.Error(w, "boom", http.StatusInternalServerError)
+		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 }()
+
+	req := mcp.CallToolRequest{Params: mcp.CallToolParams{Arguments: map[string]any{
+		"owner": owner, "repo": repo, "pull_number": float64(index),
+	}}}
+	res, err := getPullRequestByIndexFn(context.Background(), req)
+	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
+	if !strings.Contains(body, `"plain body"`) {
+		t.Fatalf("expected PR body preserved when assets fail, got: %s", body)
+	}
+}
+
+func Test_closePullRequestFn(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+		index = 7
+	)
+
+	var gotBody map[string]any
+
+	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/pulls/%d", owner, repo, index):
+			if r.Method != http.MethodPatch {
+				t.Errorf("expected PATCH method, got %s", r.Method)
+			}
+			_ = json.NewDecoder(r.Body).Decode(&gotBody)
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write(fmt.Appendf(nil, `{"index":%d,"title":"Fix bug","state":"closed","head":{"ref":"fix-branch"},"base":{"ref":"main"}}`, index))
+		default:
+			t.Errorf("unexpected request: %s %s", r.Method, r.URL.Path)
+			w.WriteHeader(http.StatusNotFound)
+		}
+	})
+
+	server := httptest.NewServer(handler)
+	t.Cleanup(server.Close)
+
+	origHost := flag.Host
+	origToken := flag.Token
+	flag.Host = server.URL
+	flag.Token = "test-token"
+	t.Cleanup(func() { flag.Host = origHost; flag.Token = origToken })
+
+	req := mcp.CallToolRequest{
+		Params: mcp.CallToolParams{
+			Arguments: map[string]any{
+				"method":      "close",
+				"owner":       owner,
+				"repo":        repo,
+				"pull_number": float64(index),
+			},
+		},
+	}
+
+	result, err := closePullRequestFn(context.Background(), req)
+	if err != nil {
+		t.Fatalf("closePullRequestFn() error = %v", err)
+	}
+
+	if gotBody["state"] != "closed" {
+		t.Errorf("expected state=closed, got %v", gotBody["state"])
+	}
+
+	if len(result.Content) == 0 {
+		t.Fatalf("expected content in result")
+	}
+}
+
+func Test_reopenPullRequestFn(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+		index = 7
+	)
+
+	var gotBody map[string]any
+
+	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/pulls/%d", owner, repo, index):
+			if r.Method != http.MethodPatch {
+				t.Errorf("expected PATCH method, got %s", r.Method)
+			}
+			_ = json.NewDecoder(r.Body).Decode(&gotBody)
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write(fmt.Appendf(nil, `{"index":%d,"title":"Fix bug","state":"open","head":{"ref":"fix-branch"},"base":{"ref":"main"}}`, index))
+		default:
+			t.Errorf("unexpected request: %s %s", r.Method, r.URL.Path)
+			w.WriteHeader(http.StatusNotFound)
+		}
+	})
+
+	server := httptest.NewServer(handler)
+	t.Cleanup(server.Close)
+
+	origHost := flag.Host
+	origToken := flag.Token
+	flag.Host = server.URL
+	flag.Token = "test-token"
+	t.Cleanup(func() { flag.Host = origHost; flag.Token = origToken })
+
+	req := mcp.CallToolRequest{
+		Params: mcp.CallToolParams{
+			Arguments: map[string]any{
+				"method":      "reopen",
+				"owner":       owner,
+				"repo":        repo,
+				"pull_number": float64(index),
+			},
+		},
+	}
+
+	result, err := reopenPullRequestFn(context.Background(), req)
+	if err != nil {
+		t.Fatalf("reopenPullRequestFn() error = %v", err)
+	}
+
+	if gotBody["state"] != "open" {
+		t.Errorf("expected state=open, got %v", gotBody["state"])
+	}
+
+	if len(result.Content) == 0 {
+		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}`))
+			})
+
+			req := mcp.CallToolRequest{
+				Params: mcp.CallToolParams{
+					Arguments: 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(), req)
+			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)
+		}
+	})
+
+	req := mcp.CallToolRequest{
+		Params: mcp.CallToolParams{
+			Arguments: map[string]any{
+				"method":      "get_review_comments",
+				"owner":       owner,
+				"repo":        repo,
+				"pull_number": float64(index),
+			},
+		},
+	}
+
+	result, err := pullRequestReadFn(context.Background(), req)
+	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

@@ -1,42 +1,11 @@
 package pull
 
 import (
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	"gitea.com/gitea/gitea-mcp/pkg/slim"
+
+	gitea_sdk "gitea.dev/sdk"
 )
 
-func userLogin(u *gitea_sdk.User) string {
-	if u == nil {
-		return ""
-	}
-	return u.UserName
-}
-
-func userLogins(users []*gitea_sdk.User) []string {
-	if len(users) == 0 {
-		return nil
-	}
-	out := make([]string, 0, len(users))
-	for _, u := range users {
-		if u != nil {
-			out = append(out, u.UserName)
-		}
-	}
-	return out
-}
-
-func labelNames(labels []*gitea_sdk.Label) []string {
-	if len(labels) == 0 {
-		return nil
-	}
-	out := make([]string, 0, len(labels))
-	for _, l := range labels {
-		if l != nil {
-			out = append(out, l.Name)
-		}
-	}
-	return out
-}
-
 func repoRef(r *gitea_sdk.Repository) map[string]any {
 	if r == nil {
 		return nil
@@ -60,8 +29,8 @@ func slimPullRequest(pr *gitea_sdk.PullRequest) map[string]any {
 		"merged":     pr.HasMerged,
 		"mergeable":  pr.Mergeable,
 		"html_url":   pr.HTMLURL,
-		"user":       userLogin(pr.Poster),
-		"labels":     labelNames(pr.Labels),
+		"user":       slim.UserLogin(pr.Poster),
+		"labels":     slim.LabelNames(pr.Labels),
 		"comments":   pr.Comments,
 		"created_at": pr.Created,
 		"updated_at": pr.Updated,
@@ -70,7 +39,7 @@ func slimPullRequest(pr *gitea_sdk.PullRequest) map[string]any {
 	if pr.HasMerged {
 		m["merged_at"] = pr.Merged
 		m["merge_commit_sha"] = pr.MergedCommitID
-		m["merged_by"] = userLogin(pr.MergedBy)
+		m["merged_by"] = slim.UserLogin(pr.MergedBy)
 	}
 	if pr.Head != nil {
 		head := map[string]any{"ref": pr.Head.Ref, "sha": pr.Head.Sha}
@@ -96,7 +65,7 @@ func slimPullRequest(pr *gitea_sdk.PullRequest) map[string]any {
 		m["changed_files"] = *pr.ChangedFiles
 	}
 	if len(pr.Assignees) > 0 {
-		m["assignees"] = userLogins(pr.Assignees)
+		m["assignees"] = slim.UserLogins(pr.Assignees)
 	}
 	if pr.Milestone != nil {
 		m["milestone"] = pr.Milestone.Title
@@ -120,7 +89,7 @@ func slimPullRequests(prs []*gitea_sdk.PullRequest) []map[string]any {
 			"draft":      pr.Draft,
 			"merged":     pr.HasMerged,
 			"html_url":   pr.HTMLURL,
-			"user":       userLogin(pr.Poster),
+			"user":       slim.UserLogin(pr.Poster),
 			"created_at": pr.Created,
 			"updated_at": pr.Updated,
 		}
@@ -131,7 +100,7 @@ func slimPullRequests(prs []*gitea_sdk.PullRequest) []map[string]any {
 			m["base"] = pr.Base.Ref
 		}
 		if len(pr.Labels) > 0 {
-			m["labels"] = labelNames(pr.Labels)
+			m["labels"] = slim.LabelNames(pr.Labels)
 		}
 		out = append(out, m)
 	}
@@ -146,7 +115,7 @@ func slimReview(r *gitea_sdk.PullReview) map[string]any {
 		"id":             r.ID,
 		"state":          r.State,
 		"body":           r.Body,
-		"user":           userLogin(r.Reviewer),
+		"user":           slim.UserLogin(r.Reviewer),
 		"comments_count": r.CodeCommentsCount,
 		"submitted_at":   r.Submitted,
 		"html_url":       r.HTMLURL,
@@ -168,18 +137,24 @@ 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,
 		"old_position": c.OldLineNum,
 		"diff_hunk":    c.DiffHunk,
-		"user":         userLogin(c.Reviewer),
+		"user":         slim.UserLogin(c.Reviewer),
 		"html_url":     c.HTMLURL,
 		"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/pull/slim_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 )
 
 func TestSlimPullRequest(t *testing.T) {

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

@@ -4,16 +4,20 @@ import (
 	"context"
 	"fmt"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
+	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 	"github.com/mark3labs/mcp-go/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"
@@ -23,46 +27,50 @@ const (
 var (
 	CreateBranchTool = mcp.NewTool(
 		CreateBranchToolName,
-		mcp.WithDescription("Create branch"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("branch", mcp.Required(), mcp.Description("Name of the branch to create")),
-		mcp.WithString("old_branch", mcp.Required(), mcp.Description("Name of the old branch to create from")),
+		mcp.WithDescription("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")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("branch", mcp.Required()),
+		mcp.WithString("old_branch", mcp.Description("source branch (default: repo default)")),
 	)
 
 	DeleteBranchTool = mcp.NewTool(
 		DeleteBranchToolName,
-		mcp.WithDescription("Delete branch"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("branch", mcp.Required(), mcp.Description("Name of the branch to delete")),
+		mcp.WithDescription("Permanently delete a branch from a repository. This action is destructive and cannot be undone."),
+		mcp.WithToolAnnotation(annotation.Destructive("Delete a branch")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("branch", mcp.Required()),
 	)
 
 	ListBranchesTool = mcp.NewTool(
 		ListBranchesToolName,
-		mcp.WithDescription("List branches"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
+		mcp.WithDescription("List all branches in a repository, paginated."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("List repository branches")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
 	)
 )
 
 func init() {
-	Tool.RegisterWrite(server.ServerTool{
+	BranchTool.RegisterWrite(server.ServerTool{
 		Tool:    CreateBranchTool,
 		Handler: CreateBranchFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	BranchTool.RegisterWrite(server.ServerTool{
 		Tool:    DeleteBranchTool,
 		Handler: DeleteBranchFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	BranchTool.RegisterRead(server.ServerTool{
 		Tool:    ListBranchesTool,
 		Handler: ListBranchesFn,
 	})
 }
 
 func CreateBranchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called CreateBranchFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -82,7 +90,7 @@ func CreateBranchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, _, err = client.CreateBranch(owner, repo, gitea_sdk.CreateBranchOption{
+	_, _, err = client.Repositories.CreateBranch(ctx, owner, repo, gitea_sdk.CreateBranchOption{
 		BranchName:    branch,
 		OldBranchName: oldBranch,
 	})
@@ -90,11 +98,10 @@ func CreateBranchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 		return to.ErrorResult(fmt.Errorf("create branch error: %v", err))
 	}
 
-	return mcp.NewToolResultText("Branch Created"), nil
+	return to.TextResult("Branch Created")
 }
 
 func DeleteBranchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called DeleteBranchFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -112,7 +119,7 @@ func DeleteBranchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, _, err = client.DeleteRepoBranch(owner, repo, branch)
+	_, _, err = client.Repositories.DeleteRepoBranch(ctx, owner, repo, branch)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("delete branch error: %v", err))
 	}
@@ -121,7 +128,6 @@ func DeleteBranchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 }
 
 func ListBranchesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called ListBranchesFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -131,17 +137,18 @@ func ListBranchesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	if err != nil {
 		return to.ErrorResult(err)
 	}
+	page, pageSize := params.GetPagination(args, 30)
 	opt := gitea_sdk.ListRepoBranchesOptions{
 		ListOptions: gitea_sdk.ListOptions{
-			Page:     1,
-			PageSize: 30,
+			Page:     page,
+			PageSize: pageSize,
 		},
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	branches, _, err := client.ListRepoBranches(owner, repo, opt)
+	branches, _, err := client.Repositories.ListRepoBranches(ctx, owner, repo, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("list branches error: %v", err))
 	}

operation/repo/commit.go

@@ -4,40 +4,60 @@ import (
 	"context"
 	"fmt"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
+	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 	"github.com/mark3labs/mcp-go/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(
-	ListRepoCommitsToolName,
-	mcp.WithDescription("List repository commits"),
-	mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-	mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-	mcp.WithString("sha", mcp.Description("SHA or branch to start listing commits from")),
-	mcp.WithString("path", mcp.Description("path indicates that only commits that include the path's file/dir should be returned.")),
-	mcp.WithNumber("page", mcp.Required(), mcp.Description("page number"), mcp.DefaultNumber(1), mcp.Min(1)),
-	mcp.WithNumber("perPage", mcp.Required(), mcp.Description("results per page"), mcp.DefaultNumber(30), mcp.Min(1)),
+var (
+	ListRepoCommitsTool = mcp.NewTool(
+		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."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("List repository commits")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("sha", mcp.Description("starting SHA or branch")),
+		mcp.WithString("path", mcp.Description("only commits touching this path")),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30), mcp.Min(1)),
+	)
+
+	GetCommitTool = mcp.NewTool(
+		GetCommitToolName,
+		mcp.WithDescription("Get details for a single commit in a repository by its SHA."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Get commit details")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("sha", mcp.Required()),
+	)
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{
+	CommitTool.RegisterRead(server.ServerTool{
 		Tool:    ListRepoCommitsTool,
 		Handler: ListRepoCommitsFn,
 	})
+	CommitTool.RegisterRead(server.ServerTool{
+		Tool:    GetCommitTool,
+		Handler: GetCommitFn,
+	})
 }
 
 func ListRepoCommitsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called ListRepoCommitsFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -47,20 +67,13 @@ func ListRepoCommitsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, err := params.GetIndex(args, "page")
-	if err != nil {
-		return to.ErrorResult(err)
-	}
-	pageSize, err := params.GetIndex(args, "perPage")
-	if err != nil {
-		return to.ErrorResult(err)
-	}
+	page, pageSize := params.GetPagination(args, 30)
 	sha, _ := args["sha"].(string)
 	path, _ := args["path"].(string)
 	opt := gitea_sdk.ListCommitOptions{
 		ListOptions: gitea_sdk.ListOptions{
-			Page:     int(page),
-			PageSize: int(pageSize),
+			Page:     page,
+			PageSize: pageSize,
 		},
 		SHA:  sha,
 		Path: path,
@@ -69,9 +82,34 @@ func ListRepoCommitsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	commits, _, err := client.ListRepoCommits(owner, repo, opt)
+	commits, _, err := client.Repositories.ListRepoCommits(ctx, owner, repo, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("list repo commits err: %v", err))
 	}
 	return to.TextResult(slimCommits(commits))
 }
+
+func GetCommitFn(ctx context.Context, req mcp.CallToolRequest) (*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)
+	}
+	sha, err := params.GetString(args, "sha")
+	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))
+	}
+	commit, _, err := client.Repositories.GetSingleCommit(ctx, owner, repo, sha)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get commit %v err: %v", sha, err))
+	}
+	return to.TextResult(slimCommit(commit))
+}

operation/repo/file.go

@@ -8,16 +8,20 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
+	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 	"github.com/mark3labs/mcp-go/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"
@@ -28,62 +32,66 @@ const (
 var (
 	GetFileContentTool = mcp.NewTool(
 		GetFileToolName,
-		mcp.WithDescription("Get file Content and Metadata"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("ref", mcp.Required(), mcp.Description("ref can be branch/tag/commit")),
-		mcp.WithString("filePath", mcp.Required(), mcp.Description("file path")),
-		mcp.WithBoolean("withLines", mcp.Description("whether to return file content with lines")),
+		mcp.WithDescription("Get file content and metadata"),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Get file content")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("ref", mcp.Required(), mcp.Description("branch, tag, or commit SHA")),
+		mcp.WithString("path", mcp.Required()),
+		mcp.WithBoolean("withLines", mcp.Description("return numbered lines")),
 	)
 
 	GetDirContentTool = mcp.NewTool(
 		GetDirToolName,
-		mcp.WithDescription("Get a list of entries in a directory"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("ref", mcp.Required(), mcp.Description("ref can be branch/tag/commit")),
-		mcp.WithString("filePath", mcp.Required(), mcp.Description("directory path")),
+		mcp.WithDescription("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")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("ref", mcp.Required(), mcp.Description("branch, tag, or commit SHA")),
+		mcp.WithString("path", mcp.Required()),
 	)
 
 	CreateOrUpdateFileTool = mcp.NewTool(
 		CreateOrUpdateFileToolName,
-		mcp.WithDescription("Create or update a file. If sha is provided, updates the existing file; otherwise creates a new file."),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("filePath", mcp.Required(), mcp.Description("file path")),
-		mcp.WithString("content", mcp.Required(), mcp.Description("file content")),
+		mcp.WithDescription("Create or update a file (provide sha to update an existing file)."),
+		mcp.WithToolAnnotation(annotation.Write("Create or update a file")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("path", mcp.Required()),
+		mcp.WithString("content", mcp.Required()),
 		mcp.WithString("message", mcp.Required(), mcp.Description("commit message")),
-		mcp.WithString("branch_name", mcp.Required(), mcp.Description("branch name")),
-		mcp.WithString("sha", mcp.Description("SHA of the existing file (required for update, omit for create)")),
-		mcp.WithString("new_branch_name", mcp.Description("new branch name (for create only)")),
+		mcp.WithString("branch_name", mcp.Required()),
+		mcp.WithString("sha", mcp.Description("existing file SHA (omit to create)")),
+		mcp.WithString("new_branch_name", mcp.Description("new branch (create only)")),
 	)
 
 	DeleteFileTool = mcp.NewTool(
 		DeleteFileToolName,
-		mcp.WithDescription("Delete file"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("filePath", mcp.Required(), mcp.Description("file path")),
+		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."),
+		mcp.WithToolAnnotation(annotation.Destructive("Delete a file")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("path", mcp.Required()),
 		mcp.WithString("message", mcp.Required(), mcp.Description("commit message")),
-		mcp.WithString("branch_name", mcp.Required(), mcp.Description("branch name")),
-		mcp.WithString("sha", mcp.Required(), mcp.Description("sha")),
+		mcp.WithString("branch_name", mcp.Required()),
+		mcp.WithString("sha", mcp.Required()),
 	)
 )
 
 func init() {
-	Tool.RegisterRead(server.ServerTool{
+	FileTool.RegisterRead(server.ServerTool{
 		Tool:    GetFileContentTool,
 		Handler: GetFileContentFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	FileTool.RegisterRead(server.ServerTool{
 		Tool:    GetDirContentTool,
 		Handler: GetDirContentFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	FileTool.RegisterWrite(server.ServerTool{
 		Tool:    CreateOrUpdateFileTool,
 		Handler: CreateOrUpdateFileFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	FileTool.RegisterWrite(server.ServerTool{
 		Tool:    DeleteFileTool,
 		Handler: DeleteFileFn,
 	})
@@ -95,7 +103,6 @@ type ContentLine struct {
 }
 
 func GetFileContentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called GetFileFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -106,7 +113,7 @@ func GetFileContentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 		return to.ErrorResult(err)
 	}
 	ref, _ := args["ref"].(string)
-	filePath, err := params.GetString(args, "filePath")
+	filePath, err := params.GetString(args, "path")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -114,7 +121,7 @@ func GetFileContentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	content, _, err := client.GetContents(owner, repo, ref, filePath)
+	content, _, err := client.Repositories.GetContents(ctx, owner, repo, ref, filePath)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get file err: %v", err))
 	}
@@ -159,7 +166,6 @@ func GetFileContentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 }
 
 func GetDirContentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called GetDirContentFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -170,7 +176,7 @@ func GetDirContentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 		return to.ErrorResult(err)
 	}
 	ref, _ := args["ref"].(string)
-	filePath, err := params.GetString(args, "filePath")
+	filePath, err := params.GetString(args, "path")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -178,7 +184,7 @@ func GetDirContentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	content, _, err := client.ListContents(owner, repo, ref, filePath)
+	content, _, err := client.Repositories.ListContents(ctx, owner, repo, ref, filePath)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get dir content err: %v", err))
 	}
@@ -186,7 +192,6 @@ func GetDirContentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 }
 
 func CreateOrUpdateFileFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called CreateOrUpdateFileFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -196,7 +201,7 @@ func CreateOrUpdateFileFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	filePath, err := params.GetString(args, "filePath")
+	filePath, err := params.GetString(args, "path")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -220,7 +225,7 @@ func CreateOrUpdateFileFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 				BranchName: branchName,
 			},
 		}
-		_, _, err = client.UpdateFile(owner, repo, filePath, opt)
+		_, _, err = client.Repositories.UpdateFile(ctx, owner, repo, filePath, opt)
 		if err != nil {
 			return to.ErrorResult(fmt.Errorf("update file err: %v", err))
 		}
@@ -238,7 +243,7 @@ func CreateOrUpdateFileFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	if newBranch, ok := args["new_branch_name"].(string); ok && newBranch != "" {
 		opt.NewBranchName = newBranch
 	}
-	_, _, err = client.CreateFile(owner, repo, filePath, opt)
+	_, _, err = client.Repositories.CreateFile(ctx, owner, repo, filePath, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("create file err: %v", err))
 	}
@@ -246,7 +251,6 @@ func CreateOrUpdateFileFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 }
 
 func DeleteFileFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called DeleteFileFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -256,7 +260,7 @@ func DeleteFileFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	filePath, err := params.GetString(args, "filePath")
+	filePath, err := params.GetString(args, "path")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -277,7 +281,7 @@ func DeleteFileFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, err = client.DeleteFile(owner, repo, filePath, opt)
+	_, err = client.Repositories.DeleteFile(ctx, owner, repo, filePath, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("delete file err: %v", err))
 	}

operation/repo/release.go

@@ -4,16 +4,20 @@ import (
 	"context"
 	"fmt"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
+	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 	"github.com/mark3labs/mcp-go/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"
@@ -25,77 +29,81 @@ const (
 var (
 	CreateReleaseTool = mcp.NewTool(
 		CreateReleaseToolName,
-		mcp.WithDescription("Create release"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("tag_name", mcp.Required(), mcp.Description("tag name")),
-		mcp.WithString("target", mcp.Required(), mcp.Description("target commitish")),
-		mcp.WithString("title", mcp.Required(), mcp.Description("release title")),
-		mcp.WithBoolean("is_draft", mcp.Description("Whether the release is draft"), mcp.DefaultBool(false)),
-		mcp.WithBoolean("is_pre_release", mcp.Description("Whether the release is pre-release"), mcp.DefaultBool(false)),
-		mcp.WithString("body", mcp.Description("release body")),
+		mcp.WithDescription("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")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("tag_name", mcp.Required()),
+		mcp.WithString("target", mcp.Required(), mcp.Description("commitish")),
+		mcp.WithString("title", mcp.Required()),
+		mcp.WithBoolean("is_draft"),
+		mcp.WithBoolean("is_pre_release"),
+		mcp.WithString("body"),
 	)
 
 	DeleteReleaseTool = mcp.NewTool(
 		DeleteReleaseToolName,
-		mcp.WithDescription("Delete release"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithNumber("id", mcp.Required(), mcp.Description("release id")),
+		mcp.WithDescription("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")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithNumber("id", mcp.Required()),
 	)
 
 	GetReleaseTool = mcp.NewTool(
 		GetReleaseToolName,
-		mcp.WithDescription("Get release"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithNumber("id", mcp.Required(), mcp.Description("release id")),
+		mcp.WithDescription("Get a release by ID"),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Get release details")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithNumber("id", mcp.Required()),
 	)
 
 	GetLatestReleaseTool = mcp.NewTool(
 		GetLatestReleaseToolName,
-		mcp.WithDescription("Get latest release"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
+		mcp.WithDescription("Get the most recent published (non-draft) release in a repository."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Get latest release")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
 	)
 
 	ListReleasesTool = mcp.NewTool(
 		ListReleasesToolName,
-		mcp.WithDescription("List releases"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithBoolean("is_draft", mcp.Description("Whether the release is draft"), mcp.DefaultBool(false)),
-		mcp.WithBoolean("is_pre_release", mcp.Description("Whether the release is pre-release"), mcp.DefaultBool(false)),
-		mcp.WithNumber("page", mcp.Description("page number"), mcp.DefaultNumber(1), mcp.Min(1)),
-		mcp.WithNumber("perPage", mcp.Description("results per page"), mcp.DefaultNumber(20), mcp.Min(1)),
+		mcp.WithDescription("List releases in a repository, optionally filtered to drafts or pre-releases."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("List releases")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithBoolean("is_draft"),
+		mcp.WithBoolean("is_pre_release"),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(20), mcp.Min(1)),
 	)
 )
 
 func init() {
-	Tool.RegisterWrite(server.ServerTool{
+	ReleaseTool.RegisterWrite(server.ServerTool{
 		Tool:    CreateReleaseTool,
 		Handler: CreateReleaseFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	ReleaseTool.RegisterWrite(server.ServerTool{
 		Tool:    DeleteReleaseTool,
 		Handler: DeleteReleaseFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	ReleaseTool.RegisterRead(server.ServerTool{
 		Tool:    GetReleaseTool,
 		Handler: GetReleaseFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	ReleaseTool.RegisterRead(server.ServerTool{
 		Tool:    GetLatestReleaseTool,
 		Handler: GetLatestReleaseFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	ReleaseTool.RegisterRead(server.ServerTool{
 		Tool:    ListReleasesTool,
 		Handler: ListReleasesFn,
 	})
 }
 
 func CreateReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called CreateReleasesFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -125,7 +133,7 @@ func CreateReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, _, err = client.CreateRelease(owner, repo, gitea_sdk.CreateReleaseOption{
+	_, _, err = client.Releases.CreateRelease(ctx, owner, repo, gitea_sdk.CreateReleaseOption{
 		TagName:      tagName,
 		Target:       target,
 		Title:        title,
@@ -134,14 +142,13 @@ func CreateReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 		IsPrerelease: isPreRelease,
 	})
 	if err != nil {
-		return nil, fmt.Errorf("create release error: %v", err)
+		return to.ErrorResult(fmt.Errorf("create release error: %v", err))
 	}
 
-	return mcp.NewToolResultText("Release Created"), nil
+	return to.TextResult("Release Created")
 }
 
 func DeleteReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called DeleteReleaseFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -160,16 +167,15 @@ func DeleteReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, err = client.DeleteRelease(owner, repo, id)
+	_, err = client.Releases.DeleteRelease(ctx, owner, repo, id)
 	if err != nil {
-		return nil, fmt.Errorf("delete release error: %v", err)
+		return to.ErrorResult(fmt.Errorf("delete release error: %v", err))
 	}
 
 	return to.TextResult("Release deleted successfully")
 }
 
 func GetReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called GetReleaseFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -188,16 +194,15 @@ func GetReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	release, _, err := client.GetRelease(owner, repo, id)
+	release, _, err := client.Releases.GetRelease(ctx, owner, repo, id)
 	if err != nil {
-		return nil, fmt.Errorf("get release error: %v", err)
+		return to.ErrorResult(fmt.Errorf("get release error: %v", err))
 	}
 
 	return to.TextResult(slimRelease(release))
 }
 
 func GetLatestReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called GetLatestReleaseFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -212,16 +217,15 @@ func GetLatestReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	release, _, err := client.GetLatestRelease(owner, repo)
+	release, _, err := client.Releases.GetLatestRelease(ctx, owner, repo)
 	if err != nil {
-		return nil, fmt.Errorf("get latest release error: %v", err)
+		return to.ErrorResult(fmt.Errorf("get latest release error: %v", err))
 	}
 
 	return to.TextResult(slimRelease(release))
 }
 
 func ListReleasesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called ListReleasesFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -231,33 +235,22 @@ func ListReleasesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	var pIsDraft *bool
-	isDraft, ok := args["is_draft"].(bool)
-	if ok {
-		pIsDraft = new(isDraft)
-	}
-	var pIsPreRelease *bool
-	isPreRelease, ok := args["is_pre_release"].(bool)
-	if ok {
-		pIsPreRelease = new(isPreRelease)
-	}
-	page := params.GetOptionalInt(args, "page", 1)
-	pageSize := params.GetOptionalInt(args, "perPage", 20)
+	page, pageSize := params.GetPagination(args, 20)
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	releases, _, err := client.ListReleases(owner, repo, gitea_sdk.ListReleasesOptions{
+	releases, _, err := client.Releases.ListReleases(ctx, owner, repo, gitea_sdk.ListReleasesOptions{
 		ListOptions: gitea_sdk.ListOptions{
-			Page:     int(page),
-			PageSize: int(pageSize),
+			Page:     page,
+			PageSize: pageSize,
 		},
-		IsDraft:      pIsDraft,
-		IsPreRelease: pIsPreRelease,
+		IsDraft:      params.GetOptionalBoolPtr(args, "is_draft"),
+		IsPreRelease: params.GetOptionalBoolPtr(args, "is_pre_release"),
 	})
 	if err != nil {
-		return nil, fmt.Errorf("list releases error: %v", err)
+		return to.ErrorResult(fmt.Errorf("list releases error: %v", err))
 	}
 
 	return to.TextResult(slimReleases(releases))

operation/repo/repo.go

@@ -2,21 +2,21 @@ package repo
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
+	"gitea.com/gitea/gitea-mcp/pkg/slim"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("repository")
 
 const (
 	CreateRepoToolName   = "create_repo"
@@ -28,42 +28,48 @@ const (
 var (
 	CreateRepoTool = mcp.NewTool(
 		CreateRepoToolName,
-		mcp.WithDescription("Create repository in personal account or organization"),
-		mcp.WithString("name", mcp.Required(), mcp.Description("Name of the repository to create")),
-		mcp.WithString("description", mcp.Description("Description of the repository to create")),
-		mcp.WithBoolean("private", mcp.Description("Whether the repository is private")),
-		mcp.WithString("issue_labels", mcp.Description("Issue Label set to use")),
-		mcp.WithBoolean("auto_init", mcp.Description("Whether the repository should be auto-intialized?")),
-		mcp.WithBoolean("template", mcp.Description("Whether the repository is template")),
-		mcp.WithString("gitignores", mcp.Description("Gitignores to use")),
-		mcp.WithString("license", mcp.Description("License to use")),
-		mcp.WithString("readme", mcp.Description("Readme of the repository to create")),
-		mcp.WithString("default_branch", mcp.Description("DefaultBranch of the repository (used when initializes and in template)")),
-		mcp.WithString("organization", mcp.Description("Organization name to create repository in (optional - defaults to personal account)")),
+		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."),
+		mcp.WithToolAnnotation(annotation.Write("Create a new repository")),
+		mcp.WithString("name", mcp.Required()),
+		mcp.WithString("description"),
+		mcp.WithBoolean("private"),
+		mcp.WithString("issue_labels"),
+		mcp.WithBoolean("auto_init"),
+		mcp.WithBoolean("template"),
+		mcp.WithString("gitignores"),
+		mcp.WithString("license"),
+		mcp.WithString("readme"),
+		mcp.WithString("default_branch"),
+		mcp.WithString("trust_model", mcp.Enum("default", "collaborator", "committer", "collaboratorcommitter")),
+		mcp.WithString("object_format_name", mcp.Enum("sha1", "sha256")),
+		mcp.WithString("organization", mcp.Description("defaults to personal account")),
 	)
 
 	ForkRepoTool = mcp.NewTool(
 		ForkRepoToolName,
-		mcp.WithDescription("Fork repository"),
-		mcp.WithString("user", mcp.Required(), mcp.Description("User name of the repository to fork")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("Repository name to fork")),
-		mcp.WithString("organization", mcp.Description("Organization name to fork")),
-		mcp.WithString("name", mcp.Description("Name of the forked repository")),
+		mcp.WithDescription("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")),
+		mcp.WithString("user", mcp.Required(), mcp.Description("owner of source repo")),
+		mcp.WithString("repo", mcp.Required()),
+		mcp.WithString("organization", mcp.Description("target org")),
+		mcp.WithString("name", mcp.Description("fork name")),
 	)
 
 	ListMyReposTool = mcp.NewTool(
 		ListMyReposToolName,
-		mcp.WithDescription("List my repositories"),
-		mcp.WithNumber("page", mcp.Required(), mcp.Description("Page number"), mcp.DefaultNumber(1), mcp.Min(1)),
-		mcp.WithNumber("perPage", mcp.Required(), mcp.Description("results per page"), mcp.DefaultNumber(30), mcp.Min(1)),
+		mcp.WithDescription("List repositories owned by the authenticated user."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("List my repositories")),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30), mcp.Min(1)),
 	)
 
 	ListOrgReposTool = mcp.NewTool(
 		ListOrgReposToolName,
-		mcp.WithDescription("List repositories of an organization"),
-		mcp.WithString("org", mcp.Required(), mcp.Description("Organization name")),
-		mcp.WithNumber("page", mcp.Required(), mcp.Description("Page number"), mcp.DefaultNumber(1), mcp.Min(1)),
-		mcp.WithNumber("pageSize", mcp.Required(), mcp.Description("Page size number"), mcp.DefaultNumber(100), mcp.Min(1)),
+		mcp.WithDescription("List repositories belonging to an organization."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("List organization repositories")),
+		mcp.WithString("org", mcp.Required()),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(100), mcp.Min(1)),
 	)
 )
 
@@ -87,7 +93,6 @@ func init() {
 }
 
 func CreateRepoFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called CreateRepoFn")
 	args := req.GetArguments()
 	name, err := params.GetString(args, "name")
 	if err != nil {
@@ -102,19 +107,23 @@ func CreateRepoFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
 	license, _ := args["license"].(string)
 	readme, _ := args["readme"].(string)
 	defaultBranch, _ := args["default_branch"].(string)
+	trustModel, _ := args["trust_model"].(string)
+	objectFormatName, _ := args["object_format_name"].(string)
 	organization, _ := args["organization"].(string)
 
 	opt := gitea_sdk.CreateRepoOption{
-		Name:          name,
-		Description:   description,
-		Private:       private,
-		IssueLabels:   issueLabels,
-		AutoInit:      autoInit,
-		Template:      template,
-		Gitignores:    gitignores,
-		License:       license,
-		Readme:        readme,
-		DefaultBranch: defaultBranch,
+		Name:             name,
+		Description:      description,
+		Private:          private,
+		IssueLabels:      issueLabels,
+		AutoInit:         autoInit,
+		Template:         template,
+		Gitignores:       gitignores,
+		License:          license,
+		Readme:           readme,
+		DefaultBranch:    defaultBranch,
+		TrustModel:       gitea_sdk.TrustModel(trustModel),
+		ObjectFormatName: objectFormatName,
 	}
 
 	var repo *gitea_sdk.Repository
@@ -123,21 +132,20 @@ func CreateRepoFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 	if organization != "" {
-		repo, _, err = client.CreateOrgRepo(organization, opt)
+		repo, _, err = client.Repositories.CreateOrgRepo(ctx, organization, opt)
 		if err != nil {
 			return to.ErrorResult(fmt.Errorf("create organization repository '%s' in '%s' err: %v", name, organization, err))
 		}
 	} else {
-		repo, _, err = client.CreateRepo(opt)
+		repo, _, err = client.Repositories.CreateRepo(ctx, opt)
 		if err != nil {
 			return to.ErrorResult(fmt.Errorf("create repository '%s' err: %v", name, err))
 		}
 	}
-	return to.TextResult(slimRepo(repo))
+	return to.TextResult(slim.Repo(repo))
 }
 
 func ForkRepoFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called ForkRepoFn")
 	args := req.GetArguments()
 	user, err := params.GetString(args, "user")
 	if err != nil {
@@ -147,25 +155,15 @@ func ForkRepoFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResu
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	organization, ok := args["organization"].(string)
-	organizationPtr := new(organization)
-	if !ok || organization == "" {
-		organizationPtr = nil
-	}
-	name, ok := args["name"].(string)
-	namePtr := new(name)
-	if !ok || name == "" {
-		namePtr = nil
-	}
 	opt := gitea_sdk.CreateForkOption{
-		Organization: organizationPtr,
-		Name:         namePtr,
+		Organization: params.GetOptionalStringPtr(args, "organization"),
+		Name:         params.GetOptionalStringPtr(args, "name"),
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, _, err = client.CreateFork(user, repo, opt)
+	_, _, err = client.Repositories.CreateFork(ctx, user, repo, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("fork repository error: %v", err))
 	}
@@ -173,7 +171,6 @@ func ForkRepoFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResu
 }
 
 func ListMyReposFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called ListMyReposFn")
 	page, pageSize := params.GetPagination(req.GetArguments(), 30)
 	opt := gitea_sdk.ListReposOptions{
 		ListOptions: gitea_sdk.ListOptions{
@@ -185,39 +182,31 @@ func ListMyReposFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolR
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	repos, _, err := client.ListMyRepos(opt)
+	repos, _, err := client.Repositories.ListMyRepos(ctx, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("list my repositories error: %v", err))
 	}
 
-	return to.TextResult(slimRepos(repos))
+	return to.TextResult(slim.Repos(repos))
 }
 
 func ListOrgReposFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called ListOrgReposFn")
-	org, ok := req.GetArguments()["org"].(string)
-	if !ok {
-		return to.ErrorResult(errors.New("organization name is required"))
-	}
-	page, ok := req.GetArguments()["page"].(float64)
-	if !ok {
-		page = 1
-	}
-	pageSize, ok := req.GetArguments()["pageSize"].(float64)
-	if !ok {
-		pageSize = 100
+	org, err := params.GetString(req.GetArguments(), "org")
+	if err != nil {
+		return to.ErrorResult(err)
 	}
+	page, pageSize := params.GetPagination(req.GetArguments(), 100)
 	opt := gitea_sdk.ListOrgReposOptions{
 		ListOptions: gitea_sdk.ListOptions{
-			Page:     int(page),
-			PageSize: int(pageSize),
+			Page:     page,
+			PageSize: pageSize,
 		},
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	repos, _, err := client.ListOrgRepos(org, opt)
+	repos, _, err := client.Repositories.ListOrgRepos(ctx, org, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("list organization '%s' repositories error: %v", org, err))
 	}

operation/repo/slim.go

@@ -1,56 +1,11 @@
 package repo
 
 import (
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	"gitea.com/gitea/gitea-mcp/pkg/slim"
+
+	gitea_sdk "gitea.dev/sdk"
 )
 
-func userLogin(u *gitea_sdk.User) string {
-	if u == nil {
-		return ""
-	}
-	return u.UserName
-}
-
-func slimRepo(r *gitea_sdk.Repository) map[string]any {
-	if r == nil {
-		return nil
-	}
-	m := map[string]any{
-		"id":                r.ID,
-		"full_name":         r.FullName,
-		"description":       r.Description,
-		"html_url":          r.HTMLURL,
-		"clone_url":         r.CloneURL,
-		"ssh_url":           r.SSHURL,
-		"default_branch":    r.DefaultBranch,
-		"private":           r.Private,
-		"fork":              r.Fork,
-		"archived":          r.Archived,
-		"language":          r.Language,
-		"stars_count":       r.Stars,
-		"forks_count":       r.Forks,
-		"open_issues_count": r.OpenIssues,
-		"open_pr_counter":   r.OpenPulls,
-		"created_at":        r.Created,
-		"updated_at":        r.Updated,
-	}
-	if r.Owner != nil {
-		m["owner"] = r.Owner.UserName
-	}
-	if len(r.Topics) > 0 {
-		m["topics"] = r.Topics
-	}
-	return m
-}
-
-func slimRepos(repos []*gitea_sdk.Repository) []map[string]any {
-	out := make([]map[string]any, 0, len(repos))
-	for _, r := range repos {
-		out = append(out, slimRepo(r))
-	}
-	return out
-}
-
 func slimBranch(b *gitea_sdk.Branch) map[string]any {
 	if b == nil {
 		return nil
@@ -144,7 +99,7 @@ func slimRelease(r *gitea_sdk.Release) map[string]any {
 		"draft":        r.IsDraft,
 		"prerelease":   r.IsPrerelease,
 		"html_url":     r.HTMLURL,
-		"author":       userLogin(r.Publisher),
+		"author":       slim.UserLogin(r.Publisher),
 		"created_at":   r.CreatedAt,
 		"published_at": r.PublishedAt,
 	}
@@ -184,6 +139,28 @@ func slimContents(c *gitea_sdk.ContentsResponse) map[string]any {
 	return m
 }
 
+func slimTree(t *gitea_sdk.GitTreeResponse) map[string]any {
+	if t == nil {
+		return nil
+	}
+	entries := make([]map[string]any, 0, len(t.Entries))
+	for _, e := range t.Entries {
+		entries = append(entries, map[string]any{
+			"path": e.Path,
+			"mode": e.Mode,
+			"type": e.Type,
+			"size": e.Size,
+			"sha":  e.SHA,
+		})
+	}
+	return map[string]any{
+		"sha":         t.SHA,
+		"truncated":   t.Truncated,
+		"total_count": t.TotalCount,
+		"tree":        entries,
+	}
+}
+
 func slimDirEntries(entries []*gitea_sdk.ContentsResponse) []map[string]any {
 	out := make([]map[string]any, 0, len(entries))
 	for _, c := range entries {

operation/repo/slim_test.go

@@ -3,42 +3,9 @@ package repo
 import (
 	"testing"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 )
 
-func TestSlimRepo(t *testing.T) {
-	r := &gitea_sdk.Repository{
-		ID:            1,
-		FullName:      "org/repo",
-		Description:   "A test repo",
-		HTMLURL:       "https://gitea.com/org/repo",
-		CloneURL:      "https://gitea.com/org/repo.git",
-		SSHURL:        "git@gitea.com:org/repo.git",
-		DefaultBranch: "main",
-		Private:       false,
-		Fork:          false,
-		Archived:      false,
-		Language:      "Go",
-		Stars:         10,
-		Forks:         2,
-		Owner:         &gitea_sdk.User{UserName: "org"},
-		Topics:        []string{"mcp", "gitea"},
-	}
-
-	m := slimRepo(r)
-
-	if m["full_name"] != "org/repo" {
-		t.Errorf("expected full_name org/repo, got %v", m["full_name"])
-	}
-	if m["owner"] != "org" {
-		t.Errorf("expected owner org, got %v", m["owner"])
-	}
-	topics := m["topics"].([]string)
-	if len(topics) != 2 {
-		t.Errorf("expected 2 topics, got %d", len(topics))
-	}
-}
-
 func TestSlimTag(t *testing.T) {
 	tag := &gitea_sdk.Tag{
 		Name:    "v1.0.0",

operation/repo/tag.go

@@ -4,16 +4,20 @@ import (
 	"context"
 	"fmt"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
+	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 	"github.com/mark3labs/mcp-go/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"
@@ -24,61 +28,64 @@ const (
 var (
 	CreateTagTool = mcp.NewTool(
 		CreateTagToolName,
-		mcp.WithDescription("Create tag"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("tag_name", mcp.Required(), mcp.Description("tag name")),
-		mcp.WithString("target", mcp.Description("target commitish"), mcp.DefaultString("")),
-		mcp.WithString("message", mcp.Description("tag message"), mcp.DefaultString("")),
+		mcp.WithDescription("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")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("tag_name", mcp.Required()),
+		mcp.WithString("target", mcp.Description("commitish")),
+		mcp.WithString("message", mcp.Description("tag message")),
 	)
 
 	DeleteTagTool = mcp.NewTool(
 		DeleteTagToolName,
-		mcp.WithDescription("Delete tag"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("tag_name", mcp.Required(), mcp.Description("tag name")),
+		mcp.WithDescription("Permanently delete a tag from a repository. This action is destructive and cannot be undone."),
+		mcp.WithToolAnnotation(annotation.Destructive("Delete a tag")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("tag_name", mcp.Required()),
 	)
 
 	GetTagTool = mcp.NewTool(
 		GetTagToolName,
-		mcp.WithDescription("Get tag"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("tag_name", mcp.Required(), mcp.Description("tag name")),
+		mcp.WithDescription("Get details for a single tag in a repository by name."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Get tag details")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("tag_name", mcp.Required()),
 	)
 
 	ListTagsTool = mcp.NewTool(
 		ListTagsToolName,
-		mcp.WithDescription("List tags"),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithNumber("page", mcp.Description("page number"), mcp.DefaultNumber(1), mcp.Min(1)),
-		mcp.WithNumber("perPage", mcp.Description("results per page"), mcp.DefaultNumber(20), mcp.Min(1)),
+		mcp.WithDescription("List all tags in a repository, paginated."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("List tags")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(20), mcp.Min(1)),
 	)
 )
 
 func init() {
-	Tool.RegisterWrite(server.ServerTool{
+	TagTool.RegisterWrite(server.ServerTool{
 		Tool:    CreateTagTool,
 		Handler: CreateTagFn,
 	})
-	Tool.RegisterWrite(server.ServerTool{
+	TagTool.RegisterWrite(server.ServerTool{
 		Tool:    DeleteTagTool,
 		Handler: DeleteTagFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	TagTool.RegisterRead(server.ServerTool{
 		Tool:    GetTagTool,
 		Handler: GetTagFn,
 	})
-	Tool.RegisterRead(server.ServerTool{
+	TagTool.RegisterRead(server.ServerTool{
 		Tool:    ListTagsTool,
 		Handler: ListTagsFn,
 	})
 }
 
 func CreateTagFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called CreateTagFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -99,20 +106,19 @@ func CreateTagFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRes
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, _, err = client.CreateTag(owner, repo, gitea_sdk.CreateTagOption{
+	_, _, err = client.Repositories.CreateTag(ctx, owner, repo, gitea_sdk.CreateTagOption{
 		TagName: tagName,
 		Target:  target,
 		Message: message,
 	})
 	if err != nil {
-		return nil, fmt.Errorf("create tag error: %v", err)
+		return to.ErrorResult(fmt.Errorf("create tag error: %v", err))
 	}
 
-	return mcp.NewToolResultText("Tag Created"), nil
+	return to.TextResult("Tag Created")
 }
 
 func DeleteTagFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called DeleteTagFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -131,16 +137,15 @@ func DeleteTagFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRes
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, err = client.DeleteTag(owner, repo, tagName)
+	_, err = client.Repositories.DeleteTag(ctx, owner, repo, tagName)
 	if err != nil {
-		return nil, fmt.Errorf("delete tag error: %v", err)
+		return to.ErrorResult(fmt.Errorf("delete tag error: %v", err))
 	}
 
 	return to.TextResult("Tag deleted")
 }
 
 func GetTagFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called GetTagFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -159,16 +164,15 @@ func GetTagFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	tag, _, err := client.GetTag(owner, repo, tagName)
+	tag, _, err := client.Repositories.GetTag(ctx, owner, repo, tagName)
 	if err != nil {
-		return nil, fmt.Errorf("get tag error: %v", err)
+		return to.ErrorResult(fmt.Errorf("get tag error: %v", err))
 	}
 
 	return to.TextResult(slimTag(tag))
 }
 
 func ListTagsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called ListTagsFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -179,20 +183,20 @@ func ListTagsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResu
 		return to.ErrorResult(err)
 	}
 	page := params.GetOptionalInt(args, "page", 1)
-	pageSize := params.GetOptionalInt(args, "perPage", 20)
+	pageSize := params.GetOptionalInt(args, "per_page", 20)
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	tags, _, err := client.ListRepoTags(owner, repo, gitea_sdk.ListRepoTagsOptions{
+	tags, _, err := client.Repositories.ListRepoTags(ctx, owner, repo, gitea_sdk.ListRepoTagsOptions{
 		ListOptions: gitea_sdk.ListOptions{
 			Page:     int(page),
 			PageSize: int(pageSize),
 		},
 	})
 	if err != nil {
-		return nil, fmt.Errorf("list tags error: %v", err)
+		return to.ErrorResult(fmt.Errorf("list tags error: %v", err))
 	}
 
 	return to.TextResult(slimTags(tags))

operation/repo/tree.go

@@ -0,0 +1,74 @@
+package repo
+
+import (
+	"context"
+	"fmt"
+
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
+	"gitea.com/gitea/gitea-mcp/pkg/gitea"
+	"gitea.com/gitea/gitea-mcp/pkg/params"
+	"gitea.com/gitea/gitea-mcp/pkg/to"
+
+	gitea_sdk "gitea.dev/sdk"
+	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/mark3labs/mcp-go/server"
+)
+
+const (
+	GetRepoTreeToolName = "get_repository_tree"
+)
+
+var GetRepoTreeTool = mcp.NewTool(
+	GetRepoTreeToolName,
+	mcp.WithDescription("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")),
+	mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+	mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+	mcp.WithString("tree_sha", mcp.Required(), mcp.Description("SHA, branch, or tag")),
+	mcp.WithBoolean("recursive"),
+	mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+	mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+)
+
+func init() {
+	Tool.RegisterRead(server.ServerTool{
+		Tool:    GetRepoTreeTool,
+		Handler: GetRepoTreeFn,
+	})
+}
+
+func GetRepoTreeFn(ctx context.Context, req mcp.CallToolRequest) (*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)
+	}
+	treeSHA, err := params.GetString(args, "tree_sha")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	recursive, _ := args["recursive"].(bool)
+	page, pageSize := params.GetPagination(args, 30)
+
+	opt := gitea_sdk.ListTreeOptions{
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
+		Ref:       treeSHA,
+		Recursive: recursive,
+	}
+	client, err := gitea.ClientFromContext(ctx)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+	}
+	tree, _, err := client.Git.GetTrees(ctx, owner, repo, opt)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get repository tree err: %v", err))
+	}
+	return to.TextResult(slimTree(tree))
+}

operation/repo/tree_test.go

@@ -0,0 +1,52 @@
+package repo
+
+import (
+	"slices"
+	"testing"
+
+	gitea_sdk "gitea.dev/sdk"
+)
+
+func TestSlimTree(t *testing.T) {
+	tree := &gitea_sdk.GitTreeResponse{
+		SHA:        "abc123",
+		TotalCount: 2,
+		Truncated:  false,
+		Entries: []gitea_sdk.GitEntry{
+			{Path: "src", Mode: "040000", Type: "tree", Size: 0, SHA: "def456"},
+			{Path: "main.go", Mode: "100644", Type: "blob", Size: 42, SHA: "789abc"},
+		},
+	}
+
+	m := slimTree(tree)
+	if m["sha"] != "abc123" {
+		t.Errorf("expected sha abc123, got %v", m["sha"])
+	}
+	if m["total_count"] != 2 {
+		t.Errorf("expected total_count 2, got %v", m["total_count"])
+	}
+	entries := m["tree"].([]map[string]any)
+	if len(entries) != 2 {
+		t.Fatalf("expected 2 entries, got %d", len(entries))
+	}
+	if entries[0]["path"] != "src" {
+		t.Errorf("expected first entry path src, got %v", entries[0]["path"])
+	}
+	if entries[1]["type"] != "blob" {
+		t.Errorf("expected second entry type blob, got %v", entries[1]["type"])
+	}
+}
+
+func TestSlimTreeNil(t *testing.T) {
+	if m := slimTree(nil); m != nil {
+		t.Errorf("expected nil, got %v", m)
+	}
+}
+
+func TestGetRepoTreeToolRequired(t *testing.T) {
+	for _, field := range []string{"owner", "repo", "tree_sha"} {
+		if !slices.Contains(GetRepoTreeTool.InputSchema.Required, field) {
+			t.Errorf("expected %q to be required", field)
+		}
+	}
+}

operation/search/search.go

@@ -3,58 +3,77 @@ package search
 import (
 	"context"
 	"fmt"
+	"strings"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
+	"gitea.com/gitea/gitea-mcp/pkg/slim"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("search")
 
 const (
 	SearchUsersToolName    = "search_users"
 	SearchOrgTeamsToolName = "search_org_teams"
 	SearchReposToolName    = "search_repos"
+	SearchIssuesToolName   = "search_issues"
 )
 
 var (
 	SearchUsersTool = mcp.NewTool(
 		SearchUsersToolName,
-		mcp.WithDescription("search users"),
-		mcp.WithString("keyword", mcp.Required(), mcp.Description("Keyword")),
-		mcp.WithNumber("page", mcp.Description("Page"), mcp.DefaultNumber(1)),
-		mcp.WithNumber("perPage", mcp.Description("results per page"), mcp.DefaultNumber(30)),
+		mcp.WithDescription("Search for Gitea users by username or full name."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Search users")),
+		mcp.WithString("query", mcp.Required()),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
 	)
 
 	SearOrgTeamsTool = mcp.NewTool(
 		SearchOrgTeamsToolName,
-		mcp.WithDescription("search organization teams"),
-		mcp.WithString("org", mcp.Required(), mcp.Description("organization name")),
-		mcp.WithString("query", mcp.Required(), mcp.Description("search organization teams")),
-		mcp.WithBoolean("includeDescription", mcp.Description("include description?")),
-		mcp.WithNumber("page", mcp.Description("Page"), mcp.DefaultNumber(1)),
-		mcp.WithNumber("perPage", mcp.Description("results per page"), mcp.DefaultNumber(30)),
+		mcp.WithDescription("Search for teams within an organization by name, optionally including each team's description in the results."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Search organization teams")),
+		mcp.WithString("org", mcp.Required()),
+		mcp.WithString("query", mcp.Required()),
+		mcp.WithBoolean("includeDescription"),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
 	)
 
 	SearchReposTool = mcp.NewTool(
 		SearchReposToolName,
-		mcp.WithDescription("search repos"),
-		mcp.WithString("keyword", mcp.Required(), mcp.Description("Keyword")),
-		mcp.WithBoolean("keywordIsTopic", mcp.Description("KeywordIsTopic")),
-		mcp.WithBoolean("keywordInDescription", mcp.Description("KeywordInDescription")),
-		mcp.WithNumber("ownerID", mcp.Description("OwnerID")),
-		mcp.WithBoolean("isPrivate", mcp.Description("IsPrivate")),
-		mcp.WithBoolean("isArchived", mcp.Description("IsArchived")),
-		mcp.WithString("sort", mcp.Description("Sort")),
-		mcp.WithString("order", mcp.Description("Order")),
-		mcp.WithNumber("page", mcp.Description("Page"), mcp.DefaultNumber(1)),
-		mcp.WithNumber("perPage", mcp.Description("results per page"), mcp.DefaultNumber(30)),
+		mcp.WithDescription("Search for repositories by keyword, with filters for topic/description matching, owner, visibility, archived status, and sort order."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Search repositories")),
+		mcp.WithString("query", mcp.Required()),
+		mcp.WithBoolean("keywordIsTopic"),
+		mcp.WithBoolean("keywordInDescription"),
+		mcp.WithNumber("ownerID"),
+		mcp.WithBoolean("isPrivate"),
+		mcp.WithBoolean("isArchived"),
+		mcp.WithString("sort"),
+		mcp.WithString("order"),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
+	)
+
+	SearchIssuesTool = mcp.NewTool(
+		SearchIssuesToolName,
+		mcp.WithDescription("Search issues and PRs across repositories"),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Search issues")),
+		mcp.WithString("query", mcp.Required()),
+		mcp.WithString("state", mcp.Enum("open", "closed", "all")),
+		mcp.WithString("type", mcp.Enum("issues", "pulls")),
+		mcp.WithString("labels", mcp.Description("comma-separated")),
+		mcp.WithString("owner", mcp.Description("filter by owner")),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
 	)
 )
 
@@ -71,11 +90,14 @@ func init() {
 		Tool:    SearchReposTool,
 		Handler: ReposFn,
 	})
+	Tool.RegisterRead(server.ServerTool{
+		Tool:    SearchIssuesTool,
+		Handler: IssuesFn,
+	})
 }
 
 func UsersFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called UsersFn")
-	keyword, err := params.GetString(req.GetArguments(), "keyword")
+	keyword, err := params.GetString(req.GetArguments(), "query")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -91,7 +113,7 @@ func UsersFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult,
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	users, _, err := client.SearchUsers(opt)
+	users, _, err := client.Users.SearchUsers(ctx, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("search users err: %v", err))
 	}
@@ -99,7 +121,6 @@ func UsersFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult,
 }
 
 func OrgTeamsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called OrgTeamsFn")
 	org, err := params.GetString(req.GetArguments(), "org")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -122,7 +143,7 @@ func OrgTeamsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResu
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	teams, _, err := client.SearchOrgTeams(org, &opt)
+	teams, _, err := client.Organizations.SearchOrgTeams(ctx, org, &opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("search organization teams error: %v", err))
 	}
@@ -130,34 +151,23 @@ func OrgTeamsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResu
 }
 
 func ReposFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called ReposFn")
-	keyword, err := params.GetString(req.GetArguments(), "keyword")
+	keyword, err := params.GetString(req.GetArguments(), "query")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	keywordIsTopic, _ := req.GetArguments()["keywordIsTopic"].(bool)
-	keywordInDescription, _ := req.GetArguments()["keywordInDescription"].(bool)
-	ownerID := params.GetOptionalInt(req.GetArguments(), "ownerID", 0)
-	var pIsPrivate *bool
-	isPrivate, ok := req.GetArguments()["isPrivate"].(bool)
-	if ok {
-		pIsPrivate = new(isPrivate)
-	}
-	var pIsArchived *bool
-	isArchived, ok := req.GetArguments()["isArchived"].(bool)
-	if ok {
-		pIsArchived = new(isArchived)
-	}
-	sort, _ := req.GetArguments()["sort"].(string)
-	order, _ := req.GetArguments()["order"].(string)
-	page, pageSize := params.GetPagination(req.GetArguments(), 30)
+	args := req.GetArguments()
+	keywordIsTopic, _ := args["keywordIsTopic"].(bool)
+	keywordInDescription, _ := args["keywordInDescription"].(bool)
+	sort, _ := args["sort"].(string)
+	order, _ := args["order"].(string)
+	page, pageSize := params.GetPagination(args, 30)
 	opt := gitea_sdk.SearchRepoOptions{
 		Keyword:              keyword,
 		KeywordIsTopic:       keywordIsTopic,
 		KeywordInDescription: keywordInDescription,
-		OwnerID:              ownerID,
-		IsPrivate:            pIsPrivate,
-		IsArchived:           pIsArchived,
+		OwnerID:              params.GetOptionalInt(args, "ownerID", 0),
+		IsPrivate:            params.GetOptionalBoolPtr(args, "isPrivate"),
+		IsArchived:           params.GetOptionalBoolPtr(args, "isArchived"),
 		Sort:                 sort,
 		Order:                order,
 		ListOptions: gitea_sdk.ListOptions{
@@ -169,9 +179,47 @@ func ReposFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult,
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	repos, _, err := client.SearchRepos(opt)
+	repos, _, err := client.Repositories.SearchRepos(ctx, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("search repos error: %v", err))
 	}
-	return to.TextResult(slimRepos(repos))
+	return to.TextResult(slim.Repos(repos))
+}
+
+func IssuesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	args := req.GetArguments()
+	query, err := params.GetString(args, "query")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	page, pageSize := params.GetPagination(args, 30)
+
+	opt := gitea_sdk.ListIssueOption{
+		KeyWord: query,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
+	}
+	if state, ok := args["state"].(string); ok {
+		opt.State = gitea_sdk.StateType(state)
+	}
+	if issueType, ok := args["type"].(string); ok {
+		opt.Type = gitea_sdk.IssueType(issueType)
+	}
+	if labels, ok := args["labels"].(string); ok && labels != "" {
+		opt.Labels = strings.Split(labels, ",")
+	}
+	if owner, ok := args["owner"].(string); ok {
+		opt.Owner = owner
+	}
+	client, err := gitea.ClientFromContext(ctx)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+	}
+	issues, _, err := client.Issues.ListIssues(ctx, opt)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("search issues err: %v", err))
+	}
+	return to.TextResult(slimIssues(issues))
 }

operation/search/search_test.go

@@ -16,7 +16,7 @@ func TestSearchToolsRequiredFields(t *testing.T) {
 		{
 			name:     "search_users",
 			tool:     SearchUsersTool,
-			required: []string{"keyword"},
+			required: []string{"query"},
 		},
 		{
 			name:     "search_org_teams",
@@ -26,7 +26,7 @@ func TestSearchToolsRequiredFields(t *testing.T) {
 		{
 			name:     "search_repos",
 			tool:     SearchReposTool,
-			required: []string{"keyword"},
+			required: []string{"query"},
 		},
 	}
 

operation/search/slim.go

@@ -1,28 +1,15 @@
 package search
 
 import (
-	gitea_sdk "code.gitea.io/sdk/gitea"
-)
+	"gitea.com/gitea/gitea-mcp/pkg/slim"
 
-func slimUserDetail(u *gitea_sdk.User) map[string]any {
-	if u == nil {
-		return nil
-	}
-	return map[string]any{
-		"id":         u.ID,
-		"login":      u.UserName,
-		"full_name":  u.FullName,
-		"email":      u.Email,
-		"avatar_url": u.AvatarURL,
-		"html_url":   u.HTMLURL,
-		"is_admin":   u.IsAdmin,
-	}
-}
+	gitea_sdk "gitea.dev/sdk"
+)
 
 func slimUserDetails(users []*gitea_sdk.User) []map[string]any {
 	out := make([]map[string]any, 0, len(users))
 	for _, u := range users {
-		out = append(out, slimUserDetail(u))
+		out = append(out, slim.UserDetail(u))
 	}
 	return out
 }
@@ -47,42 +34,38 @@ func slimTeams(teams []*gitea_sdk.Team) []map[string]any {
 	return out
 }
 
-func slimRepo(r *gitea_sdk.Repository) map[string]any {
-	if r == nil {
-		return nil
-	}
-	m := map[string]any{
-		"id":                r.ID,
-		"full_name":         r.FullName,
-		"description":       r.Description,
-		"html_url":          r.HTMLURL,
-		"clone_url":         r.CloneURL,
-		"ssh_url":           r.SSHURL,
-		"default_branch":    r.DefaultBranch,
-		"private":           r.Private,
-		"fork":              r.Fork,
-		"archived":          r.Archived,
-		"language":          r.Language,
-		"stars_count":       r.Stars,
-		"forks_count":       r.Forks,
-		"open_issues_count": r.OpenIssues,
-		"open_pr_counter":   r.OpenPulls,
-		"created_at":        r.Created,
-		"updated_at":        r.Updated,
-	}
-	if r.Owner != nil {
-		m["owner"] = r.Owner.UserName
-	}
-	if len(r.Topics) > 0 {
-		m["topics"] = r.Topics
-	}
-	return m
-}
-
-func slimRepos(repos []*gitea_sdk.Repository) []map[string]any {
-	out := make([]map[string]any, 0, len(repos))
-	for _, r := range repos {
-		out = append(out, slimRepo(r))
+func slimIssues(issues []*gitea_sdk.Issue) []map[string]any {
+	out := make([]map[string]any, 0, len(issues))
+	for _, i := range issues {
+		if i == nil {
+			continue
+		}
+		m := map[string]any{
+			"number":     i.Index,
+			"title":      i.Title,
+			"state":      i.State,
+			"html_url":   i.HTMLURL,
+			"user":       slim.UserLogin(i.Poster),
+			"comments":   i.Comments,
+			"created_at": i.Created,
+			"updated_at": i.Updated,
+		}
+		if len(i.Labels) > 0 {
+			m["labels"] = slim.LabelNames(i.Labels)
+		}
+		if i.Repository != nil {
+			m["repository"] = i.Repository.FullName
+		}
+		if i.Ref != "" {
+			m["ref"] = i.Ref
+		}
+		if i.Deadline != nil {
+			m["deadline"] = i.Deadline
+		}
+		if i.PullRequest != nil {
+			m["is_pull"] = true
+		}
+		out = append(out, m)
 	}
 	return out
 }

operation/search/slim_test.go

@@ -0,0 +1,54 @@
+package search
+
+import (
+	"slices"
+	"testing"
+
+	gitea_sdk "gitea.dev/sdk"
+)
+
+func TestSlimIssues(t *testing.T) {
+	issues := []*gitea_sdk.Issue{
+		{
+			Index:       1,
+			Title:       "Bug report",
+			State:       gitea_sdk.StateOpen,
+			HTMLURL:     "https://gitea.com/org/repo/issues/1",
+			Poster:      &gitea_sdk.User{UserName: "alice"},
+			Labels:      []*gitea_sdk.Label{{Name: "bug"}},
+			Repository:  &gitea_sdk.RepositoryMeta{FullName: "org/repo"},
+			PullRequest: nil,
+		},
+		{
+			Index:       2,
+			Title:       "Add feature",
+			State:       gitea_sdk.StateOpen,
+			Poster:      &gitea_sdk.User{UserName: "bob"},
+			Repository:  &gitea_sdk.RepositoryMeta{FullName: "org/repo"},
+			PullRequest: &gitea_sdk.PullRequestMeta{},
+		},
+	}
+
+	result := slimIssues(issues)
+	if len(result) != 2 {
+		t.Fatalf("expected 2 issues, got %d", len(result))
+	}
+	if result[0]["repository"] != "org/repo" {
+		t.Errorf("expected repository org/repo, got %v", result[0]["repository"])
+	}
+	if result[0]["labels"].([]string)[0] != "bug" {
+		t.Errorf("expected label bug, got %v", result[0]["labels"])
+	}
+	if _, ok := result[0]["is_pull"]; ok {
+		t.Error("issue should not have is_pull")
+	}
+	if result[1]["is_pull"] != true {
+		t.Error("PR should have is_pull=true")
+	}
+}
+
+func TestSearchIssuesToolRequired(t *testing.T) {
+	if !slices.Contains(SearchIssuesTool.InputSchema.Required, "query") {
+		t.Error("search_issues should require query")
+	}
+}

operation/timetracking/slim.go

@@ -1,7 +1,7 @@
 package timetracking
 
 import (
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 )
 
 func slimStopWatch(s *gitea_sdk.StopWatch) map[string]any {

operation/timetracking/timetracking.go

@@ -5,18 +5,18 @@ import (
 	"context"
 	"fmt"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"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/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("timetracking")
 
 const (
 	TimetrackingReadToolName  = "timetracking_read"
@@ -26,24 +26,26 @@ const (
 var (
 	TimetrackingReadTool = mcp.NewTool(
 		TimetrackingReadToolName,
-		mcp.WithDescription("Read time tracking data. Use method 'list_issue_times' for issue times, 'list_repo_times' for repository times, 'get_my_stopwatches' for active stopwatches, 'get_my_times' for all your tracked times."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("list_issue_times", "list_repo_times", "get_my_stopwatches", "get_my_times")),
-		mcp.WithString("owner", mcp.Description("repository owner (required for 'list_issue_times', 'list_repo_times')")),
-		mcp.WithString("repo", mcp.Description("repository name (required for 'list_issue_times', 'list_repo_times')")),
-		mcp.WithNumber("index", mcp.Description("issue index (required for 'list_issue_times')")),
-		mcp.WithNumber("page", mcp.Description("page number"), mcp.DefaultNumber(1)),
-		mcp.WithNumber("perPage", mcp.Description("results per page"), mcp.DefaultNumber(30)),
+		mcp.WithDescription("Read time tracking: issue times, repo times, active stopwatches, your tracked times."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Read tracked time")),
+		mcp.WithString("method", mcp.Required(), mcp.Enum("list_issue_times", "list_repo_times", "get_my_stopwatches", "get_my_times")),
+		mcp.WithString("owner", mcp.Description("for list_* methods")),
+		mcp.WithString("repo", mcp.Description("for list_* methods")),
+		mcp.WithNumber("issue_number", mcp.Description("for 'list_issue_times'")),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
 	)
 
 	TimetrackingWriteTool = mcp.NewTool(
 		TimetrackingWriteToolName,
-		mcp.WithDescription("Manage time tracking: stopwatches and tracked time entries."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("start_stopwatch", "stop_stopwatch", "delete_stopwatch", "add_time", "delete_time")),
-		mcp.WithString("owner", mcp.Description("repository owner (required for all methods)")),
-		mcp.WithString("repo", mcp.Description("repository name (required for all methods)")),
-		mcp.WithNumber("index", mcp.Description("issue index (required for all methods)")),
-		mcp.WithNumber("time", mcp.Description("time to add in seconds (required for 'add_time')")),
-		mcp.WithNumber("id", mcp.Description("tracked time entry ID (required for 'delete_time')")),
+		mcp.WithDescription("Write time tracking: stopwatches and entries."),
+		mcp.WithToolAnnotation(annotation.Write("Add or manage tracked time")),
+		mcp.WithString("method", mcp.Required(), mcp.Enum("start_stopwatch", "stop_stopwatch", "delete_stopwatch", "add_time", "delete_time")),
+		mcp.WithString("owner", mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Description(params.RepoDesc)),
+		mcp.WithNumber("issue_number"),
+		mcp.WithNumber("time", mcp.Description("seconds (for 'add_time')")),
+		mcp.WithNumber("id", mcp.Description("entry ID (for 'delete_time')")),
 	)
 )
 
@@ -92,10 +94,7 @@ func writeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult,
 	}
 }
 
-// Stopwatch handler functions
-
 func startStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called startStopwatchFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -104,7 +103,7 @@ func startStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "index")
+	index, err := params.GetIndex(req.GetArguments(), "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -112,7 +111,7 @@ func startStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, err = client.StartIssueStopWatch(owner, repo, index)
+	_, err = client.Issues.StartIssueStopWatch(ctx, owner, repo, index)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("start stopwatch on %s/%s#%d err: %v", owner, repo, index, err))
 	}
@@ -120,7 +119,6 @@ func startStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 }
 
 func stopStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called stopStopwatchFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -129,7 +127,7 @@ func stopStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "index")
+	index, err := params.GetIndex(req.GetArguments(), "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -137,7 +135,7 @@ func stopStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, err = client.StopIssueStopWatch(owner, repo, index)
+	_, err = client.Issues.StopIssueStopWatch(ctx, owner, repo, index)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("stop stopwatch on %s/%s#%d err: %v", owner, repo, index, err))
 	}
@@ -145,7 +143,6 @@ func stopStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 }
 
 func deleteStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called deleteStopwatchFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -154,7 +151,7 @@ func deleteStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "index")
+	index, err := params.GetIndex(req.GetArguments(), "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -162,7 +159,7 @@ func deleteStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, err = client.DeleteIssueStopwatch(owner, repo, index)
+	_, err = client.Issues.DeleteIssueStopwatch(ctx, owner, repo, index)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("delete stopwatch on %s/%s#%d err: %v", owner, repo, index, err))
 	}
@@ -170,12 +167,11 @@ func deleteStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 }
 
 func getMyStopwatchesFn(ctx context.Context, _ mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getMyStopwatchesFn")
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	stopwatches, _, err := client.ListMyStopwatches(gitea_sdk.ListStopwatchesOptions{})
+	stopwatches, _, err := client.Issues.ListMyStopwatches(ctx, gitea_sdk.ListStopwatchesOptions{})
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get stopwatches err: %v", err))
 	}
@@ -185,10 +181,7 @@ func getMyStopwatchesFn(ctx context.Context, _ mcp.CallToolRequest) (*mcp.CallTo
 	return to.TextResult(slimStopWatches(stopwatches))
 }
 
-// Tracked time handler functions
-
 func listTrackedTimesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listTrackedTimesFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -197,7 +190,7 @@ func listTrackedTimesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "index")
+	index, err := params.GetIndex(req.GetArguments(), "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -207,7 +200,7 @@ func listTrackedTimesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 
-	times, _, err := client.ListIssueTrackedTimes(owner, repo, index, gitea_sdk.ListTrackedTimesOptions{
+	times, _, err := client.Issues.ListIssueTrackedTimes(ctx, owner, repo, index, gitea_sdk.ListTrackedTimesOptions{
 		ListOptions: gitea_sdk.ListOptions{
 			Page:     page,
 			PageSize: pageSize,
@@ -223,7 +216,6 @@ func listTrackedTimesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 }
 
 func addTrackedTimeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called addTrackedTimeFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -232,7 +224,7 @@ func addTrackedTimeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	index, err := params.GetIndex(req.GetArguments(), "index")
+	index, err := params.GetIndex(req.GetArguments(), "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -245,7 +237,7 @@ func addTrackedTimeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	trackedTime, _, err := client.AddTime(owner, repo, index, gitea_sdk.AddTimeOption{
+	trackedTime, _, err := client.Issues.AddTime(ctx, owner, repo, index, gitea_sdk.AddTimeOption{
 		Time: timeSeconds,
 	})
 	if err != nil {
@@ -255,7 +247,6 @@ func addTrackedTimeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 }
 
 func deleteTrackedTimeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called deleteTrackedTimeFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -265,7 +256,7 @@ func deleteTrackedTimeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Cal
 		return to.ErrorResult(err)
 	}
 
-	index, err := params.GetIndex(req.GetArguments(), "index")
+	index, err := params.GetIndex(req.GetArguments(), "issue_number")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -277,7 +268,7 @@ func deleteTrackedTimeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Cal
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	_, err = client.DeleteTime(owner, repo, index, id)
+	_, err = client.Issues.DeleteTime(ctx, owner, repo, index, id)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("delete tracked time %d from %s/%s#%d err: %v", id, owner, repo, index, err))
 	}
@@ -285,7 +276,6 @@ func deleteTrackedTimeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Cal
 }
 
 func listRepoTimesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listRepoTimesFn")
 	owner, err := params.GetString(req.GetArguments(), "owner")
 	if err != nil {
 		return to.ErrorResult(err)
@@ -300,7 +290,7 @@ func listRepoTimesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	times, _, err := client.ListRepoTrackedTimes(owner, repo, gitea_sdk.ListTrackedTimesOptions{
+	times, _, err := client.Issues.ListRepoTrackedTimes(ctx, owner, repo, gitea_sdk.ListTrackedTimesOptions{
 		ListOptions: gitea_sdk.ListOptions{
 			Page:     page,
 			PageSize: pageSize,
@@ -316,12 +306,11 @@ func listRepoTimesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 }
 
 func getMyTimesFn(ctx context.Context, _ mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getMyTimesFn")
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	times, _, err := client.ListMyTrackedTimes(gitea_sdk.ListTrackedTimesOptions{})
+	times, _, err := client.Issues.ListMyTrackedTimes(ctx, gitea_sdk.ListTrackedTimesOptions{})
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get tracked times err: %v", err))
 	}

operation/user/slim.go

@@ -1,24 +1,9 @@
 package user
 
 import (
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 )
 
-func slimUserDetail(u *gitea_sdk.User) map[string]any {
-	if u == nil {
-		return nil
-	}
-	return map[string]any{
-		"id":         u.ID,
-		"login":      u.UserName,
-		"full_name":  u.FullName,
-		"email":      u.Email,
-		"avatar_url": u.AvatarURL,
-		"html_url":   u.HTMLURL,
-		"is_admin":   u.IsAdmin,
-	}
-}
-
 func slimOrg(o *gitea_sdk.Organization) map[string]any {
 	if o == nil {
 		return nil

operation/user/slim_test.go

@@ -1,39 +0,0 @@
-package user
-
-import (
-	"testing"
-
-	gitea_sdk "code.gitea.io/sdk/gitea"
-)
-
-func TestSlimUserDetail(t *testing.T) {
-	u := &gitea_sdk.User{
-		ID:        42,
-		UserName:  "alice",
-		FullName:  "Alice Smith",
-		Email:     "alice@example.com",
-		AvatarURL: "https://gitea.com/avatars/42",
-		HTMLURL:   "https://gitea.com/alice",
-		IsAdmin:   true,
-	}
-	m := slimUserDetail(u)
-
-	if m["id"] != int64(42) {
-		t.Errorf("expected id 42, got %v", m["id"])
-	}
-	if m["login"] != "alice" {
-		t.Errorf("expected login alice, got %v", m["login"])
-	}
-	if m["full_name"] != "Alice Smith" {
-		t.Errorf("expected full_name Alice Smith, got %v", m["full_name"])
-	}
-	if m["is_admin"] != true {
-		t.Errorf("expected is_admin true, got %v", m["is_admin"])
-	}
-}
-
-func TestSlimUserDetail_Nil(t *testing.T) {
-	if m := slimUserDetail(nil); m != nil {
-		t.Errorf("expected nil for nil user, got %v", m)
-	}
-}

operation/user/user.go

@@ -4,89 +4,60 @@ import (
 	"context"
 	"fmt"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
+	"gitea.com/gitea/gitea-mcp/pkg/slim"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
+	gitea_sdk "gitea.dev/sdk"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
 )
 
 const (
-	// GetMyUserInfoToolName is the unique tool name used for MCP registration and lookup of the get_me command.
 	GetMyUserInfoToolName = "get_me"
-	// GetUserOrgsToolName is the unique tool name used for MCP registration and lookup of the get_user_orgs command.
-	GetUserOrgsToolName = "get_user_orgs"
-
-	// defaultPage is the default starting page number used for paginated organization listings.
-	defaultPage = 1
-	// defaultPageSize is the default number of organizations per page for paginated queries.
-	defaultPageSize = 30
+	GetUserOrgsToolName   = "get_user_orgs"
 )
 
-// Tool is the MCP tool manager instance for registering all MCP tools in this package.
-var Tool = tool.New()
+var Tool = tool.New("user")
 
 var (
-	// GetMyUserInfoTool is the MCP tool for retrieving the current user's info.
-	// It is registered with a specific name and a description string.
 	GetMyUserInfoTool = mcp.NewTool(
 		GetMyUserInfoToolName,
-		mcp.WithDescription("Get my user info"),
+		mcp.WithDescription("Get current user"),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Get current user information")),
 	)
 
-	// GetUserOrgsTool is the MCP tool for listing organizations for the authenticated user.
-	// It supports pagination via "page" and "perPage" arguments with default values specified above.
 	GetUserOrgsTool = mcp.NewTool(
 		GetUserOrgsToolName,
-		mcp.WithDescription("Get organizations associated with the authenticated user"),
-		mcp.WithNumber("page", mcp.Description("page number"), mcp.DefaultNumber(defaultPage)),
-		mcp.WithNumber("perPage", mcp.Description("results per page"), mcp.DefaultNumber(defaultPageSize)),
+		mcp.WithDescription("List current user's organizations"),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Get user organizations")),
+		mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1)),
+		mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30)),
 	)
 )
 
-// init registers all MCP tools in Tool at package initialization.
-// This function ensures the handler functions are registered before server usage.
 func init() {
-	registerTools()
+	Tool.RegisterRead(server.ServerTool{Tool: GetMyUserInfoTool, Handler: GetUserInfoFn})
+	Tool.RegisterRead(server.ServerTool{Tool: GetUserOrgsTool, Handler: GetUserOrgsFn})
 }
 
-// registerTools registers all local MCP tool definitions and their handler functions.
-// To add new functionality, append your tool/handler pair to the tools slice below.
-func registerTools() {
-	tools := []server.ServerTool{
-		{Tool: GetMyUserInfoTool, Handler: GetUserInfoFn},
-		{Tool: GetUserOrgsTool, Handler: GetUserOrgsFn},
-	}
-	for _, t := range tools {
-		Tool.RegisterRead(t)
-	}
-}
-
-// GetUserInfoFn is the handler for "get_me" MCP tool requests.
-// Logs invocation, fetches current user info from gitea, wraps result for MCP.
 func GetUserInfoFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("[User] Called GetUserInfoFn")
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	user, _, err := client.GetMyUserInfo()
+	user, _, err := client.Users.GetMyUserInfo(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get user info err: %v", err))
 	}
-	return to.TextResult(slimUserDetail(user))
+	return to.TextResult(slim.UserDetail(user))
 }
 
-// GetUserOrgsFn is the handler for "get_user_orgs" MCP tool requests.
-// Logs invocation, pulls validated pagination arguments from request,
-// performs Gitea organization listing, and wraps the result for MCP.
 func GetUserOrgsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("[User] Called GetUserOrgsFn")
-	page, pageSize := params.GetPagination(req.GetArguments(), defaultPageSize)
+	page, pageSize := params.GetPagination(req.GetArguments(), 30)
 
 	opt := gitea_sdk.ListOrgsOptions{
 		ListOptions: gitea_sdk.ListOptions{
@@ -98,7 +69,7 @@ func GetUserOrgsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolR
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	orgs, _, err := client.ListMyOrgs(opt)
+	orgs, _, err := client.Organizations.ListMyOrgs(ctx, opt)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get user orgs err: %v", err))
 	}

operation/version/version.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
@@ -13,7 +13,7 @@ import (
 	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("version")
 
 const (
 	GetGiteaMCPServerVersion = "get_gitea_mcp_server_version"
@@ -21,7 +21,8 @@ const (
 
 var GetGiteaMCPServerVersionTool = mcp.NewTool(
 	GetGiteaMCPServerVersion,
-	mcp.WithDescription("Get Gitea MCP Server Version"),
+	mcp.WithDescription("Get the running version of the Gitea MCP Server itself (not the Gitea instance it connects to)."),
+	mcp.WithToolAnnotation(annotation.ReadOnly("Get server version")),
 )
 
 func init() {
@@ -32,7 +33,6 @@ func init() {
 }
 
 func GetGiteaMCPServerVersionFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called GetGiteaMCPServerVersionFn")
 	version := flag.Version
 	if version == "" {
 		version = "dev"

operation/wiki/wiki.go

@@ -2,11 +2,12 @@ package wiki
 
 import (
 	"context"
+	"encoding/base64"
 	"fmt"
 	"net/url"
 
+	"gitea.com/gitea/gitea-mcp/pkg/annotation"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
-	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
@@ -15,7 +16,7 @@ import (
 	"github.com/mark3labs/mcp-go/server"
 )
 
-var Tool = tool.New()
+var Tool = tool.New("wiki")
 
 const (
 	WikiReadToolName  = "wiki_read"
@@ -25,22 +26,24 @@ const (
 var (
 	WikiReadTool = mcp.NewTool(
 		WikiReadToolName,
-		mcp.WithDescription("Read wiki page information. Use method 'list' to list pages, 'get' to get page content, 'get_revisions' for revision history."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("list", "get", "get_revisions")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("pageName", mcp.Description("wiki page name (required for 'get', 'get_revisions')")),
+		mcp.WithDescription("Read wiki: list pages, get content, revision history."),
+		mcp.WithToolAnnotation(annotation.ReadOnly("Read wiki pages")),
+		mcp.WithString("method", mcp.Required(), mcp.Enum("list", "get", "get_revisions")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("pageName", mcp.Description("for 'get'/'get_revisions'")),
 	)
 
 	WikiWriteTool = mcp.NewTool(
 		WikiWriteToolName,
-		mcp.WithDescription("Create, update, or delete wiki pages."),
-		mcp.WithString("method", mcp.Required(), mcp.Description("operation to perform"), mcp.Enum("create", "update", "delete")),
-		mcp.WithString("owner", mcp.Required(), mcp.Description("repository owner")),
-		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
-		mcp.WithString("pageName", mcp.Description("wiki page name (required for 'update', 'delete')")),
-		mcp.WithString("title", mcp.Description("wiki page title (required for 'create', optional for 'update')")),
-		mcp.WithString("content_base64", mcp.Description("page content, base64 encoded (required for 'create', 'update')")),
+		mcp.WithDescription("Write wiki pages: create, update, delete."),
+		mcp.WithToolAnnotation(annotation.Destructive("Create, update, or delete wiki pages")),
+		mcp.WithString("method", mcp.Required(), mcp.Enum("create", "update", "delete")),
+		mcp.WithString("owner", mcp.Required(), mcp.Description(params.OwnerDesc)),
+		mcp.WithString("repo", mcp.Required(), mcp.Description(params.RepoDesc)),
+		mcp.WithString("pageName", mcp.Description("for 'update'/'delete'")),
+		mcp.WithString("title", mcp.Description("for 'create'")),
+		mcp.WithString("content", mcp.Description("for 'create'/'update'")),
 		mcp.WithString("message", mcp.Description("commit message")),
 	)
 )
@@ -91,7 +94,6 @@ func wikiWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRes
 }
 
 func listWikiPagesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called listWikiPagesFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -112,7 +114,6 @@ func listWikiPagesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 }
 
 func getWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getWikiPageFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -137,7 +138,6 @@ func getWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolR
 }
 
 func getWikiRevisionsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called getWikiRevisionsFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -162,7 +162,6 @@ func getWikiRevisionsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 }
 
 func createWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called createWikiPageFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -176,7 +175,7 @@ func createWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	contentBase64, err := params.GetString(args, "content_base64")
+	content, err := params.GetString(args, "content")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
@@ -188,7 +187,7 @@ func createWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 
 	requestBody := map[string]string{
 		"title":          title,
-		"content_base64": contentBase64,
+		"content_base64": base64.StdEncoding.EncodeToString([]byte(content)),
 		"message":        message,
 	}
 
@@ -202,7 +201,6 @@ func createWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 }
 
 func updateWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called updateWikiPageFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {
@@ -216,13 +214,13 @@ func updateWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	contentBase64, err := params.GetString(args, "content_base64")
+	content, err := params.GetString(args, "content")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 
 	requestBody := map[string]string{
-		"content_base64": contentBase64,
+		"content_base64": base64.StdEncoding.EncodeToString([]byte(content)),
 	}
 
 	// If title is given, use it. Otherwise, keep current page name
@@ -248,7 +246,6 @@ func updateWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 }
 
 func deleteWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called deleteWikiPageFn")
 	args := req.GetArguments()
 	owner, err := params.GetString(args, "owner")
 	if err != nil {

operation/wiki/wiki_test.go

@@ -0,0 +1,75 @@
+package wiki
+
+import (
+	"context"
+	"encoding/base64"
+	"encoding/json"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	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) {
+	tests := []struct {
+		name    string
+		method  string
+		content string
+	}{
+		{"create ascii", "create", "Hello, World!"},
+		{"create unicode", "create", "日本語テスト 🎉"},
+		{"create multiline", "create", "line1\nline2\nline3"},
+		{"update ascii", "update", "Updated content"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var gotBody map[string]string
+			srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				body, _ := io.ReadAll(r.Body)
+				_ = json.Unmarshal(body, &gotBody)
+				w.Header().Set("Content-Type", "application/json")
+				w.WriteHeader(http.StatusOK)
+				_, _ = w.Write([]byte(`{"title":"test"}`))
+			}))
+			defer srv.Close()
+
+			origHost := flag.Host
+			flag.Host = srv.URL
+			defer func() { flag.Host = origHost }()
+
+			ctx := context.WithValue(context.Background(), mcpContext.TokenContextKey, "test-token")
+
+			args := map[string]any{
+				"method":   tt.method,
+				"owner":    "org",
+				"repo":     "repo",
+				"content":  tt.content,
+				"pageName": "TestPage",
+				"title":    "TestPage",
+			}
+
+			req := mcp.CallToolRequest{}
+			req.Params.Arguments = args
+
+			result, err := wikiWriteFn(ctx, req)
+			if err != nil {
+				t.Fatalf("wikiWriteFn() error: %v", err)
+			}
+			if result.IsError {
+				t.Fatalf("wikiWriteFn() returned error result")
+			}
+
+			got := gotBody["content_base64"]
+			want := base64.StdEncoding.EncodeToString([]byte(tt.content))
+			if got != want {
+				t.Errorf("content_base64 = %q, want %q", got, want)
+			}
+		})
+	}
+}

pkg/annotation/annotation.go

@@ -0,0 +1,18 @@
+package annotation
+
+import "github.com/mark3labs/mcp-go/mcp"
+
+func ReadOnly(title string) mcp.ToolAnnotation {
+	t := true
+	return mcp.ToolAnnotation{Title: title, ReadOnlyHint: &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/flag/flag.go

@@ -7,7 +7,11 @@ var (
 	Version string
 	Mode    string
 
-	Insecure bool
-	ReadOnly bool
-	Debug    bool
+	MaxInlineAttachmentBytes int
+
+	Insecure      bool
+	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/gitea.go

@@ -6,27 +6,47 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"sync"
 
-	"code.gitea.io/sdk/gitea"
 	mcpContext "gitea.com/gitea/gitea-mcp/pkg/context"
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
+
+	"gitea.dev/sdk"
 )
 
+var (
+	clientCache     sync.Map // token -> *gitea.Client
+	sharedTransOnce sync.Once
+	sharedTrans     *http.Transport
+)
+
+func sharedTransport() *http.Transport {
+	sharedTransOnce.Do(func() {
+		sharedTrans = http.DefaultTransport.(*http.Transport).Clone()
+		if flag.Insecure {
+			sharedTrans.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} //nolint:gosec // user-requested insecure mode
+		}
+	})
+	return sharedTrans
+}
+
+// NewClient returns a cached *gitea.Client keyed by host+token. The SDK's per-client
+// version cache and the shared transport let us reuse keep-alive connections
+// and avoid the SDK's /api/v1/version preflight on every tool call.
 func NewClient(token string) (*gitea.Client, error) {
-	httpClient := &http.Client{
-		Transport:     http.DefaultTransport,
-		CheckRedirect: checkRedirect,
+	key := flag.Host + "\x00" + token
+	if v, ok := clientCache.Load(key); ok {
+		return v.(*gitea.Client), nil
 	}
 
+	httpClient := &http.Client{
+		Transport:     sharedTransport(),
+		CheckRedirect: checkRedirect,
+	}
 	opts := []gitea.ClientOption{
 		gitea.SetToken(token),
+		gitea.SetHTTPClient(httpClient),
 	}
-	if flag.Insecure {
-		httpClient.Transport.(*http.Transport).TLSClientConfig = &tls.Config{
-			InsecureSkipVerify: true,
-		}
-	}
-	opts = append(opts, gitea.SetHTTPClient(httpClient))
 	if flag.Debug {
 		opts = append(opts, gitea.SetDebugMode())
 	}
@@ -34,10 +54,10 @@ func NewClient(token string) (*gitea.Client, error) {
 	if err != nil {
 		return nil, fmt.Errorf("create gitea client err: %w", err)
 	}
-
-	// Set user agent for the client
 	client.SetUserAgent("gitea-mcp-server/" + flag.Version)
-	return client, nil
+
+	actual, _ := clientCache.LoadOrStore(key, client)
+	return actual.(*gitea.Client), nil
 }
 
 // checkRedirect prevents Go from silently changing mutating requests (POST, PATCH, etc.)

pkg/gitea/redirect_test.go

@@ -99,7 +99,7 @@ func TestDoJSON_GETRedirectFollowed(t *testing.T) {
 	mux.HandleFunc("GET /api/v1/repos/owner/new-name/pulls/1", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		json.NewEncoder(w).Encode(map[string]any{"id": 1, "title": "found"})
+		_ = json.NewEncoder(w).Encode(map[string]any{"id": 1, "title": "found"})
 	})
 	srv := httptest.NewServer(mux)
 	defer srv.Close()

pkg/gitea/rest.go

@@ -3,20 +3,27 @@ package gitea
 import (
 	"bytes"
 	"context"
-	"crypto/tls"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
+	"os"
+	"path"
 	"strings"
+	"sync"
 	"time"
 
 	mcpContext "gitea.com/gitea/gitea-mcp/pkg/context"
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
 )
 
+const (
+	httpClientTimeout  = 60 * time.Second
+	errBodySnippetSize = 8192
+)
+
 type HTTPError struct {
 	StatusCode int
 	Body       string
@@ -29,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 != "" {
@@ -38,16 +51,20 @@ func tokenFromContext(ctx context.Context) string {
 	return flag.Token
 }
 
-func newRESTHTTPClient() *http.Client {
-	transport := http.DefaultTransport.(*http.Transport).Clone()
-	if flag.Insecure {
-		transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} //nolint:gosec // user-requested insecure mode
-	}
-	return &http.Client{
-		Transport:     transport,
-		Timeout:       60 * time.Second,
-		CheckRedirect: checkRedirect,
-	}
+var (
+	restClientOnce sync.Once
+	restClient     *http.Client
+)
+
+func restHTTPClient() *http.Client {
+	restClientOnce.Do(func() {
+		restClient = &http.Client{
+			Transport:     sharedTransport(),
+			Timeout:       httpClientTimeout,
+			CheckRedirect: checkRedirect,
+		}
+	})
+	return restClient
 }
 
 func buildAPIURL(path string, query url.Values) (string, error) {
@@ -66,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) {
@@ -82,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 := newRESTHTTPClient()
-	resp, err := client.Do(req)
+	resp, err := restHTTPClient().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, 8192))
+		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 {
@@ -135,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 := newRESTHTTPClient()
-	resp, err := client.Do(req)
+	resp, err := restHTTPClient().Do(req)
 	if err != nil {
 		return nil, 0, fmt.Errorf("do request: %w", err)
 	}
@@ -162,14 +309,12 @@ 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) > 8192 {
-			bodySnippet = bodySnippet[:8192]
+		if len(bodySnippet) > errBodySnippetSize {
+			bodySnippet = bodySnippet[:errBodySnippetSize]
 		}
 		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/log/log.go

@@ -1,12 +1,15 @@
 package log
 
 import (
+	"log/slog"
 	"os"
 	"sync"
 	"time"
 
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
+
 	"go.uber.org/zap"
+	"go.uber.org/zap/exp/zapslog"
 	"go.uber.org/zap/zapcore"
 	"gopkg.in/natefinch/lumberjack.v2"
 )
@@ -78,22 +81,11 @@ func SetDefault(logger *zap.Logger) {
 	}
 }
 
-func New() *Logger {
-	return &Logger{
-		defaultLogger: Default(),
-	}
-}
-
-type Logger struct {
-	defaultLogger *zap.Logger
-}
-
-func (l *Logger) Infof(msg string, args ...any) {
-	l.defaultLogger.Sugar().Infof(msg, args...)
-}
-
-func (l *Logger) Errorf(msg string, args ...any) {
-	l.defaultLogger.Sugar().Errorf(msg, args...)
+// Slog returns a *slog.Logger that writes through the default zap logger,
+// so structured logging from dependencies (e.g. the MCP HTTP transport) shares
+// the same destination and formatting as the rest of the server.
+func Slog() *slog.Logger {
+	return slog.New(zapslog.NewHandler(Default().Core()))
 }
 
 func Debug(msg string, fields ...zap.Field) {

pkg/params/params.go

@@ -3,18 +3,28 @@ package params
 import (
 	"fmt"
 	"strconv"
+	"time"
 )
 
-// GetString extracts a required string parameter from MCP tool arguments.
+// Shared parameter description strings used across tools. Extracted to avoid
+// repeating the same boilerplate in every tool schema (saves tokens in the
+// tool list sent to MCP clients).
+const (
+	OwnerDesc      = "repo owner"
+	RepoDesc       = "repo name"
+	PageDesc       = "page"
+	PaginationDesc = "results per page"
+)
+
+// GetString extracts a required string parameter. Empty strings are treated as missing.
 func GetString(args map[string]any, key string) (string, error) {
 	val, ok := args[key].(string)
-	if !ok {
+	if !ok || val == "" {
 		return "", fmt.Errorf("%s is required", key)
 	}
 	return val, nil
 }
 
-// GetOptionalString extracts an optional string parameter with a default value.
 func GetOptionalString(args map[string]any, key, defaultVal string) string {
 	if val, ok := args[key].(string); ok {
 		return val
@@ -22,7 +32,6 @@ func GetOptionalString(args map[string]any, key, defaultVal string) string {
 	return defaultVal
 }
 
-// GetStringSlice extracts an optional string slice parameter from MCP tool arguments.
 func GetStringSlice(args map[string]any, key string) []string {
 	val, ok := args[key]
 	if !ok {
@@ -41,13 +50,11 @@ func GetStringSlice(args map[string]any, key string) []string {
 	return out
 }
 
-// GetPagination extracts page and perPage parameters, returning them as ints.
 func GetPagination(args map[string]any, defaultPageSize int64) (page, pageSize int) {
-	return int(GetOptionalInt(args, "page", 1)), int(GetOptionalInt(args, "perPage", defaultPageSize))
+	return int(GetOptionalInt(args, "page", 1)), int(GetOptionalInt(args, "per_page", defaultPageSize))
 }
 
-// ToInt64 converts a value to int64, accepting both float64 (JSON number) and
-// string representations. Returns false if the value cannot be converted.
+// ToInt64 accepts float64 (JSON number) and string representations.
 func ToInt64(val any) (int64, bool) {
 	switch v := val.(type) {
 	case float64:
@@ -63,10 +70,8 @@ func ToInt64(val any) (int64, bool) {
 	}
 }
 
-// GetIndex extracts a required integer parameter from MCP tool arguments.
-// It accepts both numeric (float64 from JSON) and string representations.
-// This provides better UX for LLM callers that may naturally use strings
-// for identifiers like issue/PR numbers.
+// GetIndex extracts a required integer. Accepts numeric or string forms — LLM callers
+// often pass identifiers like issue/PR numbers as strings.
 func GetIndex(args map[string]any, key string) (int64, error) {
 	val, exists := args[key]
 	if !exists {
@@ -84,7 +89,6 @@ func GetIndex(args map[string]any, key string) (int64, error) {
 	return 0, fmt.Errorf("%s must be a number or numeric string", key)
 }
 
-// GetInt64Slice extracts a required int64 slice parameter from MCP tool arguments.
 func GetInt64Slice(args map[string]any, key string) ([]int64, error) {
 	raw, ok := args[key].([]any)
 	if !ok {
@@ -101,9 +105,18 @@ func GetInt64Slice(args map[string]any, key string) ([]int64, error) {
 	return out, nil
 }
 
-// GetOptionalInt extracts an optional integer parameter from MCP tool arguments.
-// Returns defaultVal if the key is missing or the value cannot be parsed.
-// Accepts both float64 (JSON number) and string representations.
+// GetOptionalTime parses RFC3339, returning nil if missing or unparseable.
+func GetOptionalTime(args map[string]any, key string) *time.Time {
+	val, ok := args[key].(string)
+	if !ok {
+		return nil
+	}
+	if t, err := time.Parse(time.RFC3339, val); err == nil {
+		return &t
+	}
+	return nil
+}
+
 func GetOptionalInt(args map[string]any, key string, defaultVal int64) int64 {
 	val, exists := args[key]
 	if !exists {
@@ -114,3 +127,30 @@ func GetOptionalInt(args map[string]any, key string, defaultVal int64) int64 {
 	}
 	return defaultVal
 }
+
+// GetOptionalBoolPtr is for SDK fields where nil/false/true are distinct (e.g. "no change" vs "set to false").
+func GetOptionalBoolPtr(args map[string]any, key string) *bool {
+	if v, ok := args[key].(bool); ok {
+		return &v
+	}
+	return nil
+}
+
+// GetOptionalStringPtr returns nil when the key is missing OR the value is an empty string.
+// Use this for create/fork-style fields where "" is meaningless (e.g. fork target name).
+func GetOptionalStringPtr(args map[string]any, key string) *string {
+	if v, ok := args[key].(string); ok && v != "" {
+		return &v
+	}
+	return nil
+}
+
+// GetPresentStringPtr returns &v whenever the key is present as a string, including "".
+// Use this for PATCH-style fields where the SDK distinguishes "no change" (nil) from
+// "set to empty" (&""), e.g. clearing an issue body or label description.
+func GetPresentStringPtr(args map[string]any, key string) *string {
+	if v, ok := args[key].(string); ok {
+		return &v
+	}
+	return nil
+}

pkg/params/params_test.go

@@ -5,6 +5,17 @@ import (
 	"testing"
 )
 
+func TestGetPagination(t *testing.T) {
+	page, perPage := GetPagination(map[string]any{"page": float64(2), "per_page": float64(40)}, 30)
+	if page != 2 || perPage != 40 {
+		t.Errorf("GetPagination = (%d, %d), want (2, 40)", page, perPage)
+	}
+	page, perPage = GetPagination(map[string]any{}, 30)
+	if page != 1 || perPage != 30 {
+		t.Errorf("GetPagination defaults = (%d, %d), want (1, 30)", page, perPage)
+	}
+}
+
 func TestToInt64(t *testing.T) {
 	tests := []struct {
 		name string
@@ -62,6 +73,42 @@ func TestGetOptionalInt(t *testing.T) {
 	}
 }
 
+func TestGetOptionalStringPtr(t *testing.T) {
+	if p := GetOptionalStringPtr(map[string]any{}, "k"); p != nil {
+		t.Errorf("missing key: got %v, want nil", p)
+	}
+	if p := GetOptionalStringPtr(map[string]any{"k": ""}, "k"); p != nil {
+		t.Errorf("empty string: got %v, want nil", p)
+	}
+	if p := GetOptionalStringPtr(map[string]any{"k": 42}, "k"); p != nil {
+		t.Errorf("non-string: got %v, want nil", p)
+	}
+	if p := GetOptionalStringPtr(map[string]any{"k": nil}, "k"); p != nil {
+		t.Errorf("nil value (JSON null): got %v, want nil", p)
+	}
+	if p := GetOptionalStringPtr(map[string]any{"k": "x"}, "k"); p == nil || *p != "x" {
+		t.Errorf("non-empty: got %v, want &\"x\"", p)
+	}
+}
+
+func TestGetPresentStringPtr(t *testing.T) {
+	if p := GetPresentStringPtr(map[string]any{}, "k"); p != nil {
+		t.Errorf("missing key: got %v, want nil", p)
+	}
+	if p := GetPresentStringPtr(map[string]any{"k": 42}, "k"); p != nil {
+		t.Errorf("non-string: got %v, want nil", p)
+	}
+	if p := GetPresentStringPtr(map[string]any{"k": nil}, "k"); p != nil {
+		t.Errorf("nil value (JSON null): got %v, want nil", p)
+	}
+	if p := GetPresentStringPtr(map[string]any{"k": ""}, "k"); p == nil || *p != "" {
+		t.Errorf("empty string: got %v, want &\"\"", p)
+	}
+	if p := GetPresentStringPtr(map[string]any{"k": "x"}, "k"); p == nil || *p != "x" {
+		t.Errorf("non-empty: got %v, want &\"x\"", p)
+	}
+}
+
 func TestGetIndex(t *testing.T) {
 	tests := []struct {
 		name      string

pkg/slim/slim.go

@@ -0,0 +1,135 @@
+package slim
+
+import (
+	"fmt"
+	"strings"
+
+	gitea_sdk "gitea.dev/sdk"
+)
+
+func UserLogin(u *gitea_sdk.User) string {
+	if u == nil {
+		return ""
+	}
+	return u.UserName
+}
+
+func UserLogins(users []*gitea_sdk.User) []string {
+	if len(users) == 0 {
+		return nil
+	}
+	out := make([]string, 0, len(users))
+	for _, u := range users {
+		if u != nil {
+			out = append(out, u.UserName)
+		}
+	}
+	return out
+}
+
+func LabelNames(labels []*gitea_sdk.Label) []string {
+	if len(labels) == 0 {
+		return nil
+	}
+	out := make([]string, 0, len(labels))
+	for _, l := range labels {
+		if l != nil {
+			out = append(out, l.Name)
+		}
+	}
+	return out
+}
+
+func BodyWithAttachments(body string, atts []*gitea_sdk.Attachment) string {
+	links := make([]string, 0, len(atts))
+	for _, a := range atts {
+		if a == nil || a.DownloadURL == "" {
+			continue
+		}
+		links = append(links, fmt.Sprintf("[%s](%s)", a.Name, a.DownloadURL))
+	}
+	if len(links) == 0 {
+		return body
+	}
+	joined := strings.Join(links, "\n")
+	if body == "" {
+		return joined
+	}
+	return body + "\n\n" + joined
+}
+
+func UserDetail(u *gitea_sdk.User) map[string]any {
+	if u == nil {
+		return nil
+	}
+	return map[string]any{
+		"id":         u.ID,
+		"login":      u.UserName,
+		"full_name":  u.FullName,
+		"email":      u.Email,
+		"avatar_url": u.AvatarURL,
+		"html_url":   u.HTMLURL,
+		"is_admin":   u.IsAdmin,
+	}
+}
+
+func Repo(r *gitea_sdk.Repository) map[string]any {
+	if r == nil {
+		return nil
+	}
+	m := map[string]any{
+		"id":                r.ID,
+		"full_name":         r.FullName,
+		"description":       r.Description,
+		"html_url":          r.HTMLURL,
+		"clone_url":         r.CloneURL,
+		"ssh_url":           r.SSHURL,
+		"default_branch":    r.DefaultBranch,
+		"private":           r.Private,
+		"fork":              r.Fork,
+		"archived":          r.Archived,
+		"language":          r.Language,
+		"stars_count":       r.Stars,
+		"forks_count":       r.Forks,
+		"open_issues_count": r.OpenIssues,
+		"open_pr_counter":   r.OpenPulls,
+		"created_at":        r.Created,
+		"updated_at":        r.Updated,
+	}
+	if r.Owner != nil {
+		m["owner"] = r.Owner.UserName
+	}
+	if len(r.Topics) > 0 {
+		m["topics"] = r.Topics
+	}
+	return m
+}
+
+func Repos(repos []*gitea_sdk.Repository) []map[string]any {
+	out := make([]map[string]any, 0, len(repos))
+	for _, r := range repos {
+		out = append(out, Repo(r))
+	}
+	return out
+}
+
+func Label(l *gitea_sdk.Label) map[string]any {
+	if l == nil {
+		return nil
+	}
+	return map[string]any{
+		"id":          l.ID,
+		"name":        l.Name,
+		"color":       l.Color,
+		"description": l.Description,
+		"exclusive":   l.Exclusive,
+	}
+}
+
+func Labels(labels []*gitea_sdk.Label) []map[string]any {
+	out := make([]map[string]any, 0, len(labels))
+	for _, l := range labels {
+		out = append(out, Label(l))
+	}
+	return out
+}

pkg/slim/slim_test.go

@@ -0,0 +1,110 @@
+package slim
+
+import (
+	"testing"
+
+	gitea_sdk "gitea.dev/sdk"
+)
+
+func TestUserDetail(t *testing.T) {
+	u := &gitea_sdk.User{
+		ID:        42,
+		UserName:  "alice",
+		FullName:  "Alice Smith",
+		Email:     "alice@example.com",
+		AvatarURL: "https://gitea.com/avatars/42",
+		HTMLURL:   "https://gitea.com/alice",
+		IsAdmin:   true,
+	}
+	m := UserDetail(u)
+
+	if m["id"] != int64(42) {
+		t.Errorf("expected id 42, got %v", m["id"])
+	}
+	if m["login"] != "alice" {
+		t.Errorf("expected login alice, got %v", m["login"])
+	}
+	if m["full_name"] != "Alice Smith" {
+		t.Errorf("expected full_name Alice Smith, got %v", m["full_name"])
+	}
+	if m["is_admin"] != true {
+		t.Errorf("expected is_admin true, got %v", m["is_admin"])
+	}
+}
+
+func TestUserDetail_Nil(t *testing.T) {
+	if m := UserDetail(nil); m != nil {
+		t.Errorf("expected nil for nil user, got %v", m)
+	}
+}
+
+func TestLabel(t *testing.T) {
+	l := &gitea_sdk.Label{
+		ID:          1,
+		Name:        "bug",
+		Color:       "#d73a4a",
+		Description: "Something isn't working",
+		Exclusive:   false,
+	}
+
+	m := Label(l)
+	if m["name"] != "bug" {
+		t.Errorf("expected name bug, got %v", m["name"])
+	}
+	if m["color"] != "#d73a4a" {
+		t.Errorf("expected color, got %v", m["color"])
+	}
+}
+
+func TestRepo(t *testing.T) {
+	r := &gitea_sdk.Repository{
+		ID:            1,
+		FullName:      "org/repo",
+		Description:   "A test repo",
+		HTMLURL:       "https://gitea.com/org/repo",
+		CloneURL:      "https://gitea.com/org/repo.git",
+		SSHURL:        "git@gitea.com:org/repo.git",
+		DefaultBranch: "main",
+		Language:      "Go",
+		Stars:         10,
+		Forks:         2,
+		Owner:         &gitea_sdk.User{UserName: "org"},
+		Topics:        []string{"mcp", "gitea"},
+	}
+
+	m := Repo(r)
+
+	if m["full_name"] != "org/repo" {
+		t.Errorf("expected full_name org/repo, got %v", m["full_name"])
+	}
+	if m["owner"] != "org" {
+		t.Errorf("expected owner org, got %v", m["owner"])
+	}
+	topics := m["topics"].([]string)
+	if len(topics) != 2 {
+		t.Errorf("expected 2 topics, got %d", len(topics))
+	}
+}
+
+func TestBodyWithAttachments(t *testing.T) {
+	atts := []*gitea_sdk.Attachment{
+		{Name: "shot.png", DownloadURL: "https://example/shot.png"},
+		{Name: "log.txt", DownloadURL: "https://example/log.txt"},
+	}
+	got := BodyWithAttachments("see attached", atts)
+	want := "see attached\n\n[shot.png](https://example/shot.png)\n[log.txt](https://example/log.txt)"
+	if got != want {
+		t.Errorf("got %q, want %q", got, want)
+	}
+
+	if got := BodyWithAttachments("only body", nil); got != "only body" {
+		t.Errorf("nil attachments should return body unchanged, got %q", got)
+	}
+	if got := BodyWithAttachments("", atts); got != "[shot.png](https://example/shot.png)\n[log.txt](https://example/log.txt)" {
+		t.Errorf("empty body should drop separator, got %q", got)
+	}
+	skipped := []*gitea_sdk.Attachment{nil, {Name: "noop", DownloadURL: ""}}
+	if got := BodyWithAttachments("body", skipped); got != "body" {
+		t.Errorf("nil/empty-URL attachments should be skipped, got %q", got)
+	}
+}

pkg/to/to.go

@@ -4,7 +4,9 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"gitea.com/gitea/gitea-mcp/pkg/flag"
 	"gitea.com/gitea/gitea-mcp/pkg/log"
+
 	"github.com/mark3labs/mcp-go/mcp"
 )
 
@@ -13,11 +15,13 @@ func TextResult(v any) (*mcp.CallToolResult, error) {
 	if err != nil {
 		return nil, fmt.Errorf("marshal result err: %v", err)
 	}
-	log.Debugf("Text Result: %s", string(resultBytes))
+	if flag.Debug {
+		log.Debugf("Text Result: %s", string(resultBytes))
+	}
 	return mcp.NewToolResultText(string(resultBytes)), nil
 }
 
 func ErrorResult(err error) (*mcp.CallToolResult, error) {
-	log.Errorf(err.Error())
+	log.Errorf("%s", err.Error())
 	return nil, err
 }

pkg/tool/tool.go

@@ -1,22 +1,34 @@
 package tool
 
 import (
+	"slices"
+	"strings"
+
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
+	"gitea.com/gitea/gitea-mcp/pkg/log"
+
 	"github.com/mark3labs/mcp-go/server"
 )
 
 type Tool struct {
+	scope string
 	write []server.ServerTool
 	read  []server.ServerTool
 }
 
-func New() *Tool {
+func New(scope string) *Tool {
 	return &Tool{
+		scope: scope,
 		write: make([]server.ServerTool, 0, 100),
 		read:  make([]server.ServerTool, 0, 100),
 	}
 }
 
+// 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 server.ServerTool) {
 	t.write = append(t.write, s)
 }
@@ -25,13 +37,95 @@ func (t *Tool) RegisterRead(s server.ServerTool) {
 	t.read = append(t.read, s)
 }
 
-func (t *Tool) Tools() []server.ServerTool {
-	tools := make([]server.ServerTool, 0, len(t.write)+len(t.read))
-	if flag.ReadOnly {
-		tools = append(tools, t.read...)
-		return tools
-	}
-	tools = append(tools, t.write...)
-	tools = append(tools, t.read...)
-	return tools
+// ReadTools returns the read-only tools registered on this domain, ignoring
+// the read-only and allowlist flags that Tools applies.
+func (t *Tool) ReadTools() []server.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() []server.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() []server.ServerTool {
+	all := make([]server.ServerTool, 0, len(t.write)+len(t.read))
+	if !flag.ReadOnly {
+		all = append(all, t.write...)
+	}
+	all = append(all, t.read...)
+	if len(flag.AllowedScopes) == 0 && len(flag.AllowedTools) == 0 {
+		return all
+	}
+	_, scopeAllowed := flag.AllowedScopes[t.scope]
+	filtered := make([]server.ServerTool, 0, len(all))
+	for _, st := range all {
+		_, toolAllowed := flag.AllowedTools[st.Tool.Name]
+		if scopeAllowed || toolAllowed {
+			filtered = append(filtered, st)
+		}
+	}
+	return filtered
+}
+
+// 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) {
+	known := map[string]struct{}{}
+	for _, d := range domains {
+		for _, st := range d.read {
+			known[st.Tool.Name] = struct{}{}
+		}
+		for _, st := range d.write {
+			known[st.Tool.Name] = struct{}{}
+		}
+	}
+	warnUnmatched(flag.AllowedTools, known, func(unmatched []string) {
+		log.Warnf("Unknown tools in --tools allowlist (ignored): %s", strings.Join(unmatched, ", "))
+	})
+}
+
+// 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)
+		}
+	}
+	warnUnmatched(flag.AllowedScopes, knownSet, func(unmatched []string) {
+		slices.Sort(known)
+		log.Warnf("Unknown scopes in --scope allowlist (ignored): %s. Valid scopes: %s", strings.Join(unmatched, ", "), strings.Join(known, ", "))
+	})
 }

pkg/tool/tool_test.go

@@ -0,0 +1,227 @@
+package tool
+
+import (
+	"slices"
+	"testing"
+
+	"gitea.com/gitea/gitea-mcp/pkg/flag"
+
+	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/mark3labs/mcp-go/server"
+)
+
+func makeTool(name string) server.ServerTool {
+	return server.ServerTool{Tool: mcp.NewTool(name)}
+}
+
+func names(sts []server.ServerTool) []string {
+	out := make([]string, len(sts))
+	for i, st := range sts {
+		out[i] = st.Tool.Name
+	}
+	return out
+}
+
+func TestTools(t *testing.T) {
+	tests := []struct {
+		name     string
+		readOnly bool
+		allowed  map[string]struct{}
+		read     []string
+		write    []string
+		want     []string
+	}{
+		{
+			name:  "no filters returns write then read",
+			read:  []string{"r1", "r2"},
+			write: []string{"w1", "w2"},
+			want:  []string{"w1", "w2", "r1", "r2"},
+		},
+		{
+			name:     "read-only excludes write",
+			readOnly: true,
+			read:     []string{"r1", "r2"},
+			write:    []string{"w1"},
+			want:     []string{"r1", "r2"},
+		},
+		{
+			name:    "allowlist keeps only listed",
+			allowed: map[string]struct{}{"r1": {}, "w1": {}},
+			read:    []string{"r1", "r2"},
+			write:   []string{"w1", "w2"},
+			want:    []string{"w1", "r1"},
+		},
+		{
+			name:     "allowlist intersected with read-only drops write entries",
+			readOnly: true,
+			allowed:  map[string]struct{}{"r1": {}, "w1": {}},
+			read:     []string{"r1", "r2"},
+			write:    []string{"w1", "w2"},
+			want:     []string{"r1"},
+		},
+		{
+			name:    "allowlist with only unknown names returns empty",
+			allowed: map[string]struct{}{"unknown": {}},
+			read:    []string{"r1"},
+			write:   []string{"w1"},
+			want:    []string{},
+		},
+		{
+			name:    "empty allowlist map passes through",
+			allowed: map[string]struct{}{},
+			read:    []string{"r1"},
+			write:   []string{"w1"},
+			want:    []string{"w1", "r1"},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			origRO, origAllow := flag.ReadOnly, flag.AllowedTools
+			t.Cleanup(func() {
+				flag.ReadOnly, flag.AllowedTools = origRO, origAllow
+			})
+			flag.ReadOnly = tt.readOnly
+			flag.AllowedTools = tt.allowed
+
+			tr := New("scope1")
+			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 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"
+  ],
+}