feat(project): add project management tools

Add read and write tools for Gitea projects, including project and column CRUD and issue-to-project-column management. Bump gitea.dev/sdk to include ProjectsService. Assisted-by: Codet:codet-internal
2026-08-27 18:47:44 +00:00 · 2026-08-23 23:09:25 -07:00
42 changed files with 1370 additions and 445 deletions
@@ -22,7 +22,7 @@ jobs:
        uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4

      - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4

      - name: Login to DockerHub
        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4
@@ -66,7 +66,7 @@ jobs:
        uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4

      - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4

      - name: Login to DockerHub
        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4
@@ -74,7 +74,7 @@ linters:
          arguments:
            - [] # AllowList - do not remove as args for the rule are positional and won't work without lists first
            - [] # DenyList
-            - - skip-initialism-name-checks: true
+            - - skip-package-name-checks: true
    staticcheck:
      checks:
        - all
@@ -110,8 +110,7 @@ formatters:
        - blank
        - default
    gofumpt:
-      extra:
-        group-params: true
+      extra-rules: true
  exclusions:
    generated: lax
 run:
@@ -4,7 +4,7 @@ This project includes PowerShell and batch scripts to build the gitea-mcp applic

 ## Prerequisites

- Go 1.27 or later
+- Go 1.26 or later
 - Git (for version information)
 - PowerShell 5.1 or later (included with Windows 10/11)

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.26

 # Build stage
-FROM --platform=$BUILDPLATFORM golang:1.27-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.26-alpine AS builder

 ARG VERSION=dev
 ARG TARGETOS
@@ -32,7 +32,4 @@ USER nonroot:nonroot
 LABEL org.opencontainers.image.version="${VERSION}"
 LABEL org.opencontainers.image.source="https://gitea.com/gitea/gitea-mcp"

-HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
-    CMD ["/app/gitea-mcp", "-healthcheck"] || exit 1
-
 CMD ["/app/gitea-mcp"]
@@ -3,8 +3,8 @@ 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.13.1 # renovate: datasource=go
-GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1.7.0 # renovate: datasource=go
+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.6.0 # renovate: datasource=go

 GOTEST_FLAGS ?= -race -timeout 20m

@@ -8,7 +8,7 @@

 ## Installation

-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.27 or later:
+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:

 ```bash
 git clone https://gitea.com/gitea/gitea-mcp.git
@@ -26,8 +26,6 @@ The server supports MCP up to `2026-07-28` and negotiates down to the client's v

 HTTP is always stateless: `/mcp` accepts POST only, without `Mcp-Session-Id`, standalone SSE or `Last-Event-ID` resumability. Origins are validated, and reverse proxies must forward `Mcp-Protocol-Version`, `Mcp-Method` and `Mcp-Name` unchanged. `Authorization: Bearer <token>` and `Authorization: token <token>` pass a Gitea credential per request, which is credential passthrough rather than MCP OAuth.

-HTTP mode also serves `/healthz`, which returns `200 OK` when the server is up. The Docker image's built-in `HEALTHCHECK` runs `gitea-mcp -healthcheck`, which dials `http://127.0.0.1:<port>/healthz` using the same `-p`/`-port` value (or `8080` by default) and exits `0` on success or `1` on failure. Stdio deployments do not serve `/healthz`, so override or disable the image's `HEALTHCHECK` when running in stdio mode.
-
 ### Claude Code

 Runs the server through `go run` and requires [Go](https://go.dev):
@@ -158,6 +156,8 @@ Once configured, try `list all my repositories` in the chat box.
 | 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) |
+| project_read                 | project      | Read   | Read projects: list projects, get a project, list columns, get a column, or list issues in a column |
+| project_write                | project      | Write  | Write projects: create, update, or delete projects and columns; reorder columns; add, remove, or move issues |
 | 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 |
@@ -182,7 +182,6 @@ Once configured, try `list all my repositories` in the chat box.
 | create_branch                | branch       | Write  | Create a new branch |
 | delete_branch                | branch       | Write  | Delete a branch |
 | list_branches                | branch       | Read   | List repository branches |
-| rename_branch                | branch       | Write  | Rename a branch |
 | create_tag                   | tag          | Write  | Create a tag |
 | delete_tag                   | tag          | Write  | Delete a tag |
 | get_tag                      | tag          | Read   | Get tag details |
@@ -8,7 +8,7 @@

 ## 安装

-可从 [发布页面](https://gitea.com/gitea/gitea-mcp/releases) 下载二进制文件并放入 `PATH`，或使用 `docker.gitea.com/gitea-mcp-server` 镜像，也可用 `make` 和 Go 1.27 及以上从源码构建到 `$GOPATH/bin`：
+可从 [发布页面](https://gitea.com/gitea/gitea-mcp/releases) 下载二进制文件并放入 `PATH`，或使用 `docker.gitea.com/gitea-mcp-server` 镜像，也可用 `make` 和 Go 1.26 及以上从源码构建到 `$GOPATH/bin`：

 ```bash
 git clone https://gitea.com/gitea/gitea-mcp.git
@@ -26,8 +26,6 @@ Gitea 主机和访问令牌可通过命令行参数或环境变量提供，命

 HTTP 传输固定为无状态：`/mcp` 仅接受 POST，没有 `Mcp-Session-Id`、独立 SSE 和 `Last-Event-ID` 断点续传。服务器会验证来源，反向代理必须原样转发 `Mcp-Protocol-Version`、`Mcp-Method` 和 `Mcp-Name`。`Authorization: Bearer <令牌>` 和 `Authorization: token <令牌>` 会在每个请求中传递 Gitea 凭据，这是凭据透传，而不是 MCP OAuth。

-HTTP 模式还提供 `/healthz` 端点，服务器正常运行时返回 `200 OK`。Docker 镜像内置的 `HEALTHCHECK` 会运行 `gitea-mcp -healthcheck`，它使用与 `-p`/`-port` 相同的端口（默认 `8080`）请求 `http://127.0.0.1:<端口>/healthz`，成功时退出码为 `0`，失败时为 `1`。stdio 部署不提供 `/healthz`，因此在 stdio 模式下运行时应覆盖或禁用镜像自带的 `HEALTHCHECK`。
-
 ### Claude Code

 通过 `go run` 运行服务器，需要安装 [Go](https://go.dev)：
@@ -158,6 +156,8 @@ Cursor 等客户端可使用 stdio 命令：
 | timetracking_write           | timetracking | 写入 | 写入时间跟踪：计时器和记录条目 |
 | package_read                 | packages     | 读取 | 读取软件包注册表：列出软件包、列出版本或获取某个版本 |
 | package_write                | packages     | 写入 | 删除软件包版本（不可恢复） |
+| project_read                 | project      | 读取 | 读取项目：列出项目、获取项目、列出列、获取列或列出列中的议题 |
+| project_write                | project      | 写入 | 写入项目：创建、更新或删除项目与列；重新排序列；添加、移除或移动议题 |
 | list_issues                  | issue        | 读取 | 列出仓库问题 |
 | attachment_read              | issue        | 读取 | 读取问题/评论附件：列出元数据、获取元数据或下载内容 |
 | issue_read                   | issue        | 读取 | 读取问题：详情、评论或标签 |
@@ -182,7 +182,6 @@ Cursor 等客户端可使用 stdio 命令：
 | create_branch                | branch       | 写入 | 创建新分支 |
 | delete_branch                | branch       | 写入 | 删除分支 |
 | list_branches                | branch       | 读取 | 列出仓库分支 |
-| rename_branch                | branch       | 写入 | 重命名分支 |
 | create_tag                   | tag          | 写入 | 创建标签 |
 | delete_tag                   | tag          | 写入 | 删除标签 |
 | get_tag                      | tag          | 读取 | 获取标签详情 |
@@ -8,7 +8,7 @@

 ## 安裝

-可從 [發布頁面](https://gitea.com/gitea/gitea-mcp/releases) 下載二進位檔並放入 `PATH`，或使用 `docker.gitea.com/gitea-mcp-server` 映像檔，也可用 `make` 與 Go 1.27 以上從原始碼建置到 `$GOPATH/bin`：
+可從 [發布頁面](https://gitea.com/gitea/gitea-mcp/releases) 下載二進位檔並放入 `PATH`，或使用 `docker.gitea.com/gitea-mcp-server` 映像檔，也可用 `make` 與 Go 1.26 以上從原始碼建置到 `$GOPATH/bin`：

 ```bash
 git clone https://gitea.com/gitea/gitea-mcp.git
@@ -26,8 +26,6 @@ Gitea 主機與存取令牌可透過命令列參數或環境變數提供，命

 HTTP 傳輸固定為無狀態：`/mcp` 只接受 POST，沒有 `Mcp-Session-Id`、獨立 SSE 與 `Last-Event-ID` 斷點續傳。伺服器會驗證來源，反向代理必須原樣轉發 `Mcp-Protocol-Version`、`Mcp-Method` 與 `Mcp-Name`。`Authorization: Bearer <令牌>` 與 `Authorization: token <令牌>` 會在每次請求中傳遞 Gitea 憑證，這是憑證透傳，而不是 MCP OAuth。

-HTTP 模式也會提供 `/healthz` 端點，伺服器正常運作時回傳 `200 OK`。Docker 映像內建的 `HEALTHCHECK` 會執行 `gitea-mcp -healthcheck`，它使用與 `-p`/`-port` 相同的連接埠（預設 `8080`）連線 `http://127.0.0.1:<連接埠>/healthz`，成功時結束碼為 `0`，失敗時為 `1`。stdio 部署不會提供 `/healthz`，因此在 stdio 模式下運作時應覆寫或停用映像內建的 `HEALTHCHECK`。
-
 ### Claude Code

 透過 `go run` 執行伺服器，需要安裝 [Go](https://go.dev)：
@@ -158,6 +156,8 @@ Cursor 等客戶端可使用 stdio 命令：
 | timetracking_write           | timetracking | 寫入 | 寫入時間追蹤：計時器和記錄項目 |
 | package_read                 | packages     | 讀取 | 讀取軟體套件註冊表：列出套件、列出版本或取得某個版本 |
 | package_write                | packages     | 寫入 | 刪除軟體套件版本（不可復原） |
+| project_read                 | project      | 讀取 | 讀取專案：列出專案、取得專案、列出欄、取得欄或列出欄中的議題 |
+| project_write                | project      | 寫入 | 寫入專案：建立、更新或刪除專案與欄；重新排序欄；新增、移除或移動議題 |
 | list_issues                  | issue        | 讀取 | 列出倉庫問題 |
 | attachment_read              | issue        | 讀取 | 讀取問題/評論附件：列出中繼資料、取得中繼資料或下載內容 |
 | issue_read                   | issue        | 讀取 | 讀取問題：詳情、評論或標籤 |
@@ -182,7 +182,6 @@ Cursor 等客戶端可使用 stdio 命令：
 | create_branch                | branch       | 寫入 | 創建新分支 |
 | delete_branch                | branch       | 寫入 | 刪除分支 |
 | list_branches                | branch       | 讀取 | 列出倉庫分支 |
-| rename_branch                | branch       | 寫入 | 重新命名分支 |
 | create_tag                   | tag          | 寫入 | 創建標籤 |
 | delete_tag                   | tag          | 寫入 | 刪除標籤 |
 | get_tag                      | tag          | 讀取 | 取得標籤詳情 |
@@ -5,7 +5,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"net/http"
 	"os"
 	"strconv"
 	"strings"
@@ -24,11 +23,9 @@ var (
 	tools                           string
 	scopes                          string
 	version                         bool
-	healthcheck                     bool
 	maxInlineAttachmentBytes        int
 	maxInlineAttachmentBytesFlagSet bool
 	osExit                          = os.Exit
-	healthcheckClient               = http.DefaultClient
 )

 func initFlagSet(fs *flag.FlagSet, args []string, getenv func(string) string, readFile func(string) ([]byte, error), stderr io.Writer) {
@@ -56,7 +53,6 @@ func initFlagSet(fs *flag.FlagSet, args []string, getenv func(string) string, re
 	fs.BoolVar(&flagPkg.Insecure, "insecure", false, "")
 	fs.BoolVar(&version, "v", false, "")
 	fs.BoolVar(&version, "version", false, "")
-	fs.BoolVar(&healthcheck, "healthcheck", false, "")
 	maxInlineAttachmentBytes = 5 * 1024 * 1024
 	fs.Func("max-inline-attachment-bytes", "", func(val string) error {
 		parsed, err := strconv.Atoi(val)
@@ -85,7 +81,6 @@ func initFlagSet(fs *flag.FlagSet, args []string, getenv func(string) string, re
 		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.Fprintf(w, "  -healthcheck\tCheck a running HTTP server's /healthz endpoint and exit\n")
 		fmt.Fprintln(w)
 		fmt.Fprintln(w, "Environment variables:")
 		fmt.Fprintf(w, "  GITEA_ACCESS_TOKEN\tProvide access token\n")
@@ -188,14 +183,6 @@ func Execute() {
 		fmt.Fprintln(os.Stdout, flagPkg.Version)
 		return
 	}
-	if healthcheck {
-		if runHealthcheck(healthcheckClient, flagPkg.Port, os.Stdout, os.Stderr) {
-			osExit(0)
-		} else {
-			osExit(1)
-		}
-		return
-	}
 	if err := operation.Run(); err != nil {
 		if err == context.Canceled {
 			log.Info("Server shutdown due to context cancellation")
@@ -95,12 +95,3 @@ func TestInitFlagSetScopes(t *testing.T) {
 		})
 	}
 }
-
-func TestInitFlagSetHealthcheck(t *testing.T) {
-	t.Cleanup(func() { healthcheck = false })
-	fs := flag.NewFlagSet("test", flag.ContinueOnError)
-	initFlagSet(fs, []string{"-healthcheck"}, func(string) string { return "" }, func(string) ([]byte, error) { return nil, nil }, &bytes.Buffer{})
-	if !healthcheck {
-		t.Error("healthcheck = false, want true")
-	}
-}
@@ -1,29 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-)
-
-// runHealthcheck dials the /healthz endpoint on 127.0.0.1:port and reports
-// success or failure. It returns true when the server responds with a 2xx
-// status.
-func runHealthcheck(client *http.Client, port int, stdout, stderr io.Writer) bool {
-	url := fmt.Sprintf("http://127.0.0.1:%d/healthz", port)
-
-	resp, err := client.Get(url)
-	if err != nil {
-		fmt.Fprintf(stderr, "healthcheck failed: %v\n", err)
-		return false
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode < http.StatusOK || resp.StatusCode >= http.StatusMultipleChoices {
-		fmt.Fprintf(stderr, "healthcheck failed: unexpected status %s\n", resp.Status)
-		return false
-	}
-
-	fmt.Fprintln(stdout, "healthy")
-	return true
-}
@@ -1,81 +0,0 @@
-package cmd
-
-import (
-	"bytes"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"strconv"
-	"strings"
-	"testing"
-)
-
-func TestRunHealthcheck(t *testing.T) {
-	tests := []struct {
-		name       string
-		handler    http.HandlerFunc
-		port       func(server *httptest.Server) int
-		wantOK     bool
-		wantStdout string
-	}{
-		{
-			name: "server responds 200 OK",
-			handler: func(w http.ResponseWriter, r *http.Request) {
-				w.WriteHeader(http.StatusOK)
-			},
-			port:       serverPort,
-			wantOK:     true,
-			wantStdout: "healthy",
-		},
-		{
-			name: "server responds with an error status",
-			handler: func(w http.ResponseWriter, r *http.Request) {
-				w.WriteHeader(http.StatusInternalServerError)
-			},
-			port:   serverPort,
-			wantOK: false,
-		},
-		{
-			name:   "nothing listening on the port",
-			port:   func(*httptest.Server) int { return 1 },
-			wantOK: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var server *httptest.Server
-			if tt.handler != nil {
-				server = httptest.NewServer(tt.handler)
-				defer server.Close()
-			}
-
-			var stdout, stderr bytes.Buffer
-			ok := runHealthcheck(http.DefaultClient, tt.port(server), &stdout, &stderr)
-
-			if ok != tt.wantOK {
-				t.Errorf("runHealthcheck() = %v, want %v", ok, tt.wantOK)
-			}
-			if tt.wantStdout != "" && !strings.Contains(stdout.String(), tt.wantStdout) {
-				t.Errorf("stdout = %q, want it to contain %q", stdout.String(), tt.wantStdout)
-			}
-			if tt.wantOK && stderr.Len() != 0 {
-				t.Errorf("stderr = %q, want empty on success", stderr.String())
-			}
-			if !tt.wantOK && stderr.Len() == 0 {
-				t.Error("stderr is empty, want a failure message")
-			}
-		})
-	}
-}
-
-func serverPort(server *httptest.Server) int {
-	_, portStr, err := net.SplitHostPort(server.Listener.Addr().String())
-	if err != nil {
-		panic(err)
-	}
-	port, err := strconv.Atoi(portStr)
-	if err != nil {
-		panic(err)
-	}
-	return port
-}
@@ -1,11 +1,11 @@
 module gitea.com/gitea/gitea-mcp

-go 1.27
+go 1.26.0

-toolchain go1.27.0
+toolchain go1.26.6

 require (
-	gitea.dev/sdk v1.2.0
+	gitea.dev/sdk v1.2.1-0.20260822201514-76e7eafcee4b
 	github.com/modelcontextprotocol/go-sdk v1.7.0
 	go.uber.org/zap v1.28.0
 	go.uber.org/zap/exp v0.3.0
@@ -17,14 +17,14 @@ require (
 	github.com/davidmz/go-pageant v1.0.2 // indirect
 	github.com/google/jsonschema-go v0.4.3 // indirect
 	github.com/hashicorp/go-version v1.9.0 // indirect
-	github.com/segmentio/asm v1.2.1 // indirect
+	github.com/segmentio/asm v1.1.3 // indirect
 	github.com/segmentio/encoding v0.5.4 // indirect
 	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.55.0 // indirect
-	golang.org/x/oauth2 v0.36.0 // indirect
+	golang.org/x/crypto v0.54.0 // indirect
+	golang.org/x/oauth2 v0.35.0 // indirect
 	golang.org/x/sync v0.22.0 // indirect
 	golang.org/x/sys v0.47.0 // indirect
 	golang.org/x/time v0.15.0 // indirect
-	golang.org/x/tools v0.49.0 // indirect
+	golang.org/x/tools v0.47.0 // indirect
 )
@@ -1,5 +1,5 @@
-gitea.dev/sdk v1.2.0 h1:avRtJl/nKCGispgSalo9czoZM9Rto1awnE0caNAoXGo=
-gitea.dev/sdk v1.2.0/go.mod h1:rfh5oNdIK24cbCREwIn1tqWKQW+IICXFGWJyebuOAOE=
+gitea.dev/sdk v1.2.1-0.20260822201514-76e7eafcee4b h1:Ub2tRd59s7zBxalMyaNyuwl2JA9/ZV4svGVbmV7itcU=
+gitea.dev/sdk v1.2.1-0.20260822201514-76e7eafcee4b/go.mod h1:McaA1Vd+POnguz48vHfgD9jWmeInt10eH/bKaCIVGDA=
 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=
@@ -18,8 +18,8 @@ github.com/modelcontextprotocol/go-sdk v1.7.0 h1:yqjY2dsbKAC0LSuWZVBMrHgiG8ukXv6
 github.com/modelcontextprotocol/go-sdk v1.7.0/go.mod h1:dL7u98E/zjJTGzEq+j30jQ8K2k1mb6LeAH4inEcSGts=
 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/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0=
-github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
+github.com/segmentio/asm v1.1.3 h1:WM03sfUOENvvKexOLp+pCqgb/WDjsi7EK8gIsICtzhc=
+github.com/segmentio/asm v1.1.3/go.mod h1:Ld3L4ZXGNcSLRg4JBsZ3//1+f/TjYl0Mzen/DQy1EJg=
 github.com/segmentio/encoding v0.5.4 h1:OW1VRern8Nw6ITAtwSZ7Idrl3MXCFwXHPgqESYfvNt0=
 github.com/segmentio/encoding v0.5.4/go.mod h1:HS1ZKa3kSN32ZHVZ7ZLPLXWvOVIiZtyJnO1gPH1sKt0=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
@@ -37,11 +37,11 @@ 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.55.0 h1:+KWHjbgOaAQ66dh/YlkZKHlz9ZUlq61AFirAR9ntP8M=
-golang.org/x/crypto v0.55.0/go.mod h1:uq0V9dE/fzQuJtbnL+2EhWOE63vo164FY8xqEnV9xis=
+golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw=
+golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
-golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
+golang.org/x/oauth2 v0.35.0 h1:Mv2mzuHuZuY2+bkyWXIHMfhNdJAdwW3FuWeCPYN5GVQ=
+golang.org/x/oauth2 v0.35.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
 golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
 golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -54,8 +54,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
 golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.49.0 h1:3NI7VXzL9+1WZD52Dx2ttoPwD5DWrFGpl9mFZDlmisI=
-golang.org/x/tools v0.49.0/go.mod h1:SJNXV9DBKT0UbdttsQjbfJlAE/q+y36++zo3uL3N0Oo=
+golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q=
+golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
@@ -148,7 +148,7 @@ func listRepoActionSecretsFn(ctx context.Context, args map[string]any) (*mcp.Cal
 	}

 	secrets, _, err := client.Actions.ListRepoSecrets(ctx, owner, repo, gitea_sdk.ListRepoActionsSecretOption{
-		Page: page, PageSize: pageSize,
+		ListOptions: gitea_sdk.ListOptions{Page: page, PageSize: pageSize},
 	})
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("list repo action secrets err: %v", err))
@@ -228,7 +228,7 @@ func listOrgActionSecretsFn(ctx context.Context, args map[string]any) (*mcp.Call
 	}

 	secrets, _, err := client.Actions.ListOrgSecrets(ctx, org, gitea_sdk.ListOrgActionsSecretOption{
-		Page: page, PageSize: pageSize,
+		ListOptions: gitea_sdk.ListOptions{Page: page, PageSize: pageSize},
 	})
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("list org action secrets err: %v", err))
@@ -428,7 +428,7 @@ func listOrgActionVariablesFn(ctx context.Context, args map[string]any) (*mcp.Ca
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 	variables, _, err := client.Actions.ListOrgVariables(ctx, org, gitea_sdk.ListOrgActionsVariableOption{
-		Page: page, PageSize: pageSize,
+		ListOptions: gitea_sdk.ListOptions{Page: page, PageSize: pageSize},
 	})
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("list org action variables err: %v", err))
@@ -187,8 +187,10 @@ func listRepoIssuesFn(ctx context.Context, args map[string]any) (*mcp.CallToolRe
 		State:      gitea_sdk.StateType(state),
 		Labels:     labels,
 		Milestones: milestones,
-		Page:       page,
-		PageSize:   pageSize,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	}
 	switch args["type"] {
 	case "issues":
@@ -11,6 +11,7 @@ func slimIssue(i *gitea_sdk.Issue) map[string]any {
 		return nil
 	}
 	m := map[string]any{
+		"id":         i.ID,
 		"number":     i.Index,
 		"title":      i.Title,
 		"body":       i.Body,
@@ -51,6 +52,7 @@ func slimIssues(issues []*gitea_sdk.Issue) []map[string]any {
 			continue
 		}
 		m := map[string]any{
+			"id":         i.ID,
 			"number":     i.Index,
 			"title":      i.Title,
 			"state":      i.State,
@@ -8,6 +8,7 @@ import (

 func TestSlimIssue(t *testing.T) {
 	i := &gitea_sdk.Issue{
+		ID:      99,
 		Index:   42,
 		Title:   "Bug report",
 		Body:    "Something is broken",
@@ -24,6 +25,9 @@ func TestSlimIssue(t *testing.T) {

 	m := slimIssue(i)

+	if m["id"] != int64(99) {
+		t.Errorf("expected id 99, got %v", m["id"])
+	}
 	if m["number"] != int64(42) {
 		t.Errorf("expected number 42, got %v", m["number"])
 	}
@@ -116,8 +116,10 @@ func listRepoLabelsFn(ctx context.Context, args map[string]any) (*mcp.CallToolRe
 	page, pageSize := params.GetPagination(args, 30)

 	opt := gitea_sdk.ListLabelsOptions{
-		Page:     page,
-		PageSize: pageSize,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -259,8 +261,10 @@ func listOrgLabelsFn(ctx context.Context, args map[string]any) (*mcp.CallToolRes
 	page, pageSize := params.GetPagination(args, 30)

 	opt := gitea_sdk.ListOrgLabelsOptions{
-		Page:     page,
-		PageSize: pageSize,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -134,10 +134,12 @@ func listMilestonesFn(ctx context.Context, args map[string]any) (*mcp.CallToolRe
 	name := params.GetOptionalString(args, "name", "")
 	page, pageSize := params.GetPagination(args, 30)
 	opt := gitea_sdk.ListMilestoneOption{
-		State:    gitea_sdk.StateType(state),
-		Name:     name,
-		Page:     page,
-		PageSize: pageSize,
+		State: gitea_sdk.StateType(state),
+		Name:  name,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -95,8 +95,10 @@ func notificationWriteFn(ctx context.Context, args map[string]any) (*mcp.CallToo
 func listNotificationsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
 	page, pageSize := params.GetPagination(args, 30)
 	opt := gitea_sdk.ListNotificationOptions{
-		Page:     page,
-		PageSize: pageSize,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	}
 	if status, ok := args["status"].(string); ok {
 		opt.Status = []gitea_sdk.NotificationStatus{gitea_sdk.NotificationStatus(status)}
@@ -19,6 +19,7 @@ import (
 	"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/project"
 	"gitea.com/gitea/gitea-mcp/operation/pull"
 	"gitea.com/gitea/gitea-mcp/operation/repo"
 	"gitea.com/gitea/gitea-mcp/operation/search"
@@ -47,7 +48,7 @@ var (
 	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,
+		project.Tool, version.Tool, wiki.Tool, timetracking.Tool,
 		repo.FileTool, repo.BranchTool, repo.TagTool, repo.CommitTool, repo.ReleaseTool,
 	}
 )
@@ -133,7 +134,6 @@ func newHTTPServer(addr string, s *mcp.Server) *http.Server {
 			PropagateRequestCancellation: true,
 		},
 	)))
-	mux.HandleFunc("/healthz", handleHealthz)
 	return &http.Server{
 		Addr:              addr,
 		Handler:           mux,
@@ -141,12 +141,6 @@ func newHTTPServer(addr string, s *mcp.Server) *http.Server {
 	}
 }

-func handleHealthz(w http.ResponseWriter, _ *http.Request) {
-	w.Header().Set("Content-Type", "text/plain; charset=utf-8")
-	w.WriteHeader(http.StatusOK)
-	_, _ = w.Write([]byte("ok\n"))
-}
-
 func Run() error {
 	mcpServer = newMCPServer(flag.Version)
 	RegisterTool(mcpServer)
@@ -1,10 +1,6 @@
 package operation

-import (
-	"net/http"
-	"net/http/httptest"
-	"testing"
-)
+import "testing"

 func TestNewHTTPServerConfig(t *testing.T) {
 	server := newHTTPServer(":12345", newMCPServer("test"))
@@ -22,21 +18,6 @@ func TestNewHTTPServerConfig(t *testing.T) {
 	}
 }

-func TestHealthzEndpoint(t *testing.T) {
-	server := newHTTPServer(":0", newMCPServer("test"))
-
-	req := httptest.NewRequest(http.MethodGet, "/healthz", nil)
-	rec := httptest.NewRecorder()
-	server.Handler.ServeHTTP(rec, req)
-
-	if rec.Code != http.StatusOK {
-		t.Errorf("status = %d, want %d", rec.Code, http.StatusOK)
-	}
-	if body := rec.Body.String(); body == "" {
-		t.Error("body is empty, want a non-empty health message")
-	}
-}
-
 func TestParseAuthToken(t *testing.T) {
 	tests := []struct {
 		name      string
@@ -0,0 +1,608 @@
+package project
+
+import (
+	"context"
+	"errors"
+	"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.com/gitea/gitea-mcp/pkg/tool"
+
+	gitea_sdk "gitea.dev/sdk"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+var Tool = tool.New("project")
+
+const (
+	ProjectReadToolName  = "project_read"
+	ProjectWriteToolName = "project_write"
+)
+
+var (
+	ProjectReadTool = tool.NewDefinition(
+		ProjectReadToolName,
+		"Read projects: list projects, get a project, list columns, get a column, or list issues in a column.",
+		annotation.ReadOnly("Read projects"),
+		tool.String("method", tool.Required(), tool.Enum("list", "get", "list_columns", "get_column", "list_column_issues")),
+		tool.String("scope", tool.Required(), tool.Enum("repo", "org", "user", "current_user")),
+		tool.String("owner", tool.Description("repo owner for 'repo' scope, org name for 'org' scope, username for 'user' scope")),
+		tool.String("repo", tool.Description("repo name for 'repo' scope")),
+		tool.String("state", tool.Default("all"), tool.Enum("open", "closed", "all")),
+		tool.Number("project_id", tool.Description("project ID for 'get' and column methods")),
+		tool.Number("column_id", tool.Description("column ID for 'get_column' and 'list_column_issues'")),
+		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1), tool.Minimum(1)),
+		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30), tool.Minimum(1)),
+	)
+
+	ProjectWriteTool = tool.NewDefinition(
+		ProjectWriteToolName,
+		"Write projects: create, update, or delete projects and columns; reorder columns; add, remove, or move issues.",
+		annotation.Destructive("Create, update, or delete projects and project columns"),
+		tool.String("method", tool.Required(), tool.Enum("create", "update", "delete", "create_column", "update_column", "delete_column", "set_default_column", "move_columns", "add_issue", "remove_issue", "move_issue")),
+		tool.String("scope", tool.Required(), tool.Enum("repo", "org", "current_user")),
+		tool.String("owner", tool.Description("repo owner for 'repo' scope, org name for 'org' scope")),
+		tool.String("repo", tool.Description("repo name for 'repo' scope")),
+		tool.Number("project_id", tool.Description("project ID (required except for 'create')")),
+		tool.Number("column_id", tool.Description("column ID (required for column and issue methods)")),
+		tool.Number("issue_id", tool.Description("global issue ID (required for 'add_issue', 'remove_issue', and 'move_issue')")),
+		tool.String("title", tool.Description("for 'create', 'update', 'create_column', and 'update_column'")),
+		tool.String("description", tool.Description("for 'create' and 'update'")),
+		tool.String("template_type", tool.Enum("none", "basic_kanban", "bug_triage")),
+		tool.String("card_type", tool.Enum("text_only", "images_and_text")),
+		tool.String("state", tool.Enum("open", "closed")),
+		tool.String("color", tool.Description("6-digit hex column color, e.g. #FF0000")),
+		tool.Number("sorting", tool.Description("position for 'update_column' and 'move_issue'")),
+		tool.Array("column_ids", tool.Description("ordered column IDs for 'move_columns'"), tool.Items(map[string]any{"type": "number"})),
+	)
+)
+
+func init() {
+	Tool.RegisterRead(tool.ServerTool{
+		Tool:    ProjectReadTool,
+		Handler: projectReadFn,
+	})
+	Tool.RegisterWrite(tool.ServerTool{
+		Tool:    ProjectWriteTool,
+		Handler: projectWriteFn,
+	})
+}
+
+type projectScopeInfo struct {
+	scope gitea_sdk.ProjectScope
+	kind  string
+}
+
+func getProjectScope(args map[string]any, writable bool) (projectScopeInfo, error) {
+	scopeName := params.GetOptionalString(args, "scope", "")
+	switch scopeName {
+	case "repo":
+		owner, err := params.GetString(args, "owner")
+		if err != nil {
+			return projectScopeInfo{}, err
+		}
+		repo, err := params.GetString(args, "repo")
+		if err != nil {
+			return projectScopeInfo{}, err
+		}
+		return projectScopeInfo{scope: gitea_sdk.RepoProjectScope(owner, repo), kind: "repo"}, nil
+	case "org":
+		owner, err := params.GetString(args, "owner")
+		if err != nil {
+			return projectScopeInfo{}, err
+		}
+		return projectScopeInfo{scope: gitea_sdk.OrgProjectScope(owner), kind: "org"}, nil
+	case "user":
+		owner, err := params.GetString(args, "owner")
+		if err != nil {
+			return projectScopeInfo{}, err
+		}
+		if writable {
+			return projectScopeInfo{}, errors.New("scope 'user' only supports listing projects")
+		}
+		return projectScopeInfo{scope: gitea_sdk.UserProjectScope(owner), kind: "user"}, nil
+	case "current_user":
+		return projectScopeInfo{scope: gitea_sdk.CurrentUserProjectScope(), kind: "current_user"}, nil
+	default:
+		if scopeName == "" {
+			return projectScopeInfo{}, errors.New("scope is required")
+		}
+		return projectScopeInfo{}, fmt.Errorf("unknown scope: %s", scopeName)
+	}
+}
+
+func projectReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	method, err := params.GetString(args, "method")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	switch method {
+	case "list":
+		return listProjectsFn(ctx, args)
+	case "get":
+		return getProjectFn(ctx, args)
+	case "list_columns":
+		return listProjectColumnsFn(ctx, args)
+	case "get_column":
+		return getProjectColumnFn(ctx, args)
+	case "list_column_issues":
+		return listProjectColumnIssuesFn(ctx, args)
+	default:
+		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
+	}
+}
+
+func projectWriteFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	method, err := params.GetString(args, "method")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	switch method {
+	case "create":
+		return createProjectFn(ctx, args)
+	case "update":
+		return updateProjectFn(ctx, args)
+	case "delete":
+		return deleteProjectFn(ctx, args)
+	case "create_column":
+		return createProjectColumnFn(ctx, args)
+	case "update_column":
+		return updateProjectColumnFn(ctx, args)
+	case "delete_column":
+		return deleteProjectColumnFn(ctx, args)
+	case "set_default_column":
+		return setDefaultProjectColumnFn(ctx, args)
+	case "move_columns":
+		return moveProjectColumnsFn(ctx, args)
+	case "add_issue":
+		return addIssueToProjectColumnFn(ctx, args)
+	case "remove_issue":
+		return removeIssueFromProjectColumnFn(ctx, args)
+	case "move_issue":
+		return moveProjectIssueFn(ctx, args)
+	default:
+		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
+	}
+}
+
+func listProjectsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, false)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	state := params.GetOptionalString(args, "state", "all")
+	page, pageSize := params.GetPagination(args, 30)
+	opt := gitea_sdk.ListProjectsOptions{
+		State: gitea_sdk.StateType(state),
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
+	}
+	client, err := gitea.ClientFromContext(ctx)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+	}
+	projects, _, err := client.Projects.ListProjects(ctx, info.scope, opt)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("list projects err: %v", err))
+	}
+	return to.TextResult(slimProjects(projects))
+}
+
+func getProjectFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, false)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	projectID, err := params.GetIndex(args, "project_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))
+	}
+	project, _, err := client.Projects.GetProject(ctx, info.scope, projectID)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get project/%d err: %v", projectID, err))
+	}
+	return to.TextResult(slimProject(project))
+}
+
+func listProjectColumnsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, false)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	projectID, err := params.GetIndex(args, "project_id")
+	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))
+	}
+	columns, _, err := client.Projects.ListProjectColumns(ctx, info.scope, projectID, gitea_sdk.ListOptions{
+		Page:     page,
+		PageSize: pageSize,
+	})
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("list project/%d/columns err: %v", projectID, err))
+	}
+	return to.TextResult(slimProjectColumns(columns))
+}
+
+func getProjectColumnFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, false)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	projectID, err := params.GetIndex(args, "project_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	columnID, err := params.GetIndex(args, "column_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))
+	}
+	column, _, err := client.Projects.GetProjectColumn(ctx, info.scope, projectID, columnID)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get project/%d/columns/%d err: %v", projectID, columnID, err))
+	}
+	return to.TextResult(slimProjectColumn(column))
+}
+
+func listProjectColumnIssuesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, false)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	projectID, err := params.GetIndex(args, "project_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	columnID, err := params.GetIndex(args, "column_id")
+	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))
+	}
+	issues, _, err := client.Projects.ListProjectColumnIssues(ctx, info.scope, projectID, columnID, gitea_sdk.ListOptions{
+		Page:     page,
+		PageSize: pageSize,
+	})
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("list project/%d/columns/%d/issues err: %v", projectID, columnID, err))
+	}
+	return to.TextResult(slimProjectIssues(issues))
+}
+
+func createProjectFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, true)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	title, err := params.GetString(args, "title")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	opt := gitea_sdk.CreateProjectOption{Title: title}
+	if description, ok := args["description"].(string); ok {
+		opt.Description = description
+	}
+	if templateType, ok := args["template_type"].(string); ok {
+		opt.TemplateType = gitea_sdk.ProjectTemplateType(templateType)
+	}
+	if cardType, ok := args["card_type"].(string); ok {
+		opt.CardType = gitea_sdk.ProjectCardType(cardType)
+	}
+	client, err := gitea.ClientFromContext(ctx)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+	}
+	project, _, err := client.Projects.CreateProject(ctx, info.scope, opt)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("create project err: %v", err))
+	}
+	return to.TextResult(slimProject(project))
+}
+
+func updateProjectFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, true)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	projectID, err := params.GetIndex(args, "project_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	opt := gitea_sdk.EditProjectOption{
+		Title:       params.GetPresentStringPtr(args, "title"),
+		Description: params.GetPresentStringPtr(args, "description"),
+	}
+	if cardType, ok := args["card_type"].(string); ok {
+		value := gitea_sdk.ProjectCardType(cardType)
+		opt.CardType = &value
+	}
+	if state, ok := args["state"].(string); ok {
+		value := gitea_sdk.StateType(state)
+		opt.State = &value
+	}
+	client, err := gitea.ClientFromContext(ctx)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+	}
+	project, _, err := client.Projects.EditProject(ctx, info.scope, projectID, opt)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("update project/%d err: %v", projectID, err))
+	}
+	return to.TextResult(slimProject(project))
+}
+
+func deleteProjectFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, true)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	projectID, err := params.GetIndex(args, "project_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))
+	}
+	_, err = client.Projects.DeleteProject(ctx, info.scope, projectID)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("delete project/%d err: %v", projectID, err))
+	}
+	return to.TextResult("Project deleted successfully")
+}
+
+func createProjectColumnFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, true)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	projectID, err := params.GetIndex(args, "project_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	title, err := params.GetString(args, "title")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	opt := gitea_sdk.CreateProjectColumnOption{Title: title}
+	if color, ok := args["color"].(string); ok {
+		opt.Color = color
+	}
+	client, err := gitea.ClientFromContext(ctx)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+	}
+	column, _, err := client.Projects.CreateProjectColumn(ctx, info.scope, projectID, opt)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("create project/%d/column err: %v", projectID, err))
+	}
+	return to.TextResult(slimProjectColumn(column))
+}
+
+func updateProjectColumnFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, true)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	projectID, err := params.GetIndex(args, "project_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	columnID, err := params.GetIndex(args, "column_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	opt := gitea_sdk.EditProjectColumnOption{
+		Title: params.GetPresentStringPtr(args, "title"),
+		Color: params.GetPresentStringPtr(args, "color"),
+	}
+	if sorting, ok := optionalIntPtr(args, "sorting"); ok {
+		opt.Sorting = sorting
+	}
+	client, err := gitea.ClientFromContext(ctx)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+	}
+	column, _, err := client.Projects.EditProjectColumn(ctx, info.scope, projectID, columnID, opt)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("update project/%d/columns/%d err: %v", projectID, columnID, err))
+	}
+	return to.TextResult(slimProjectColumn(column))
+}
+
+func deleteProjectColumnFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, true)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	projectID, err := params.GetIndex(args, "project_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	columnID, err := params.GetIndex(args, "column_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))
+	}
+	_, err = client.Projects.DeleteProjectColumn(ctx, info.scope, projectID, columnID)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("delete project/%d/columns/%d err: %v", projectID, columnID, err))
+	}
+	return to.TextResult("Project column deleted successfully")
+}
+
+func setDefaultProjectColumnFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, true)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	projectID, err := params.GetIndex(args, "project_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	columnID, err := params.GetIndex(args, "column_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))
+	}
+	_, err = client.Projects.SetDefaultProjectColumn(ctx, info.scope, projectID, columnID)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("set project/%d default column/%d err: %v", projectID, columnID, err))
+	}
+	return to.TextResult("Project default column set successfully")
+}
+
+func moveProjectColumnsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, true)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	projectID, err := params.GetIndex(args, "project_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	columnIDs, err := params.GetInt64Slice(args, "column_ids")
+	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))
+	}
+	_, err = client.Projects.MoveProjectColumns(ctx, info.scope, projectID, gitea_sdk.MoveProjectColumnsOption{ColumnIDs: columnIDs})
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("move project/%d columns err: %v", projectID, err))
+	}
+	return to.TextResult("Project columns moved successfully")
+}
+
+func addIssueToProjectColumnFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, true)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	projectID, err := params.GetIndex(args, "project_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	columnID, err := params.GetIndex(args, "column_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	issueID, err := params.GetIndex(args, "issue_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))
+	}
+	_, err = client.Projects.AddIssueToProjectColumn(ctx, info.scope, projectID, columnID, issueID)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("add issue/%d to project/%d/columns/%d err: %v", issueID, projectID, columnID, err))
+	}
+	return to.TextResult("Issue added to project column successfully")
+}
+
+func removeIssueFromProjectColumnFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, true)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	projectID, err := params.GetIndex(args, "project_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	columnID, err := params.GetIndex(args, "column_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	issueID, err := params.GetIndex(args, "issue_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))
+	}
+	_, err = client.Projects.RemoveIssueFromProjectColumn(ctx, info.scope, projectID, columnID, issueID)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("remove issue/%d from project/%d/columns/%d err: %v", issueID, projectID, columnID, err))
+	}
+	return to.TextResult("Issue removed from project column successfully")
+}
+
+func moveProjectIssueFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	info, err := getProjectScope(args, true)
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	projectID, err := params.GetIndex(args, "project_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	issueID, err := params.GetIndex(args, "issue_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	columnID, err := params.GetIndex(args, "column_id")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	opt := gitea_sdk.MoveProjectIssueOption{ColumnID: columnID}
+	if sorting, ok := optionalInt64Ptr(args, "sorting"); ok {
+		opt.Sorting = sorting
+	}
+	client, err := gitea.ClientFromContext(ctx)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+	}
+	_, err = client.Projects.MoveProjectIssue(ctx, info.scope, projectID, issueID, opt)
+	if err != nil {
+		return to.ErrorResult(fmt.Errorf("move issue/%d in project/%d err: %v", issueID, projectID, err))
+	}
+	return to.TextResult("Project issue moved successfully")
+}
+
+func optionalIntPtr(args map[string]any, key string) (*int, bool) {
+	value, ok := params.ToInt64(args[key])
+	if !ok {
+		return nil, false
+	}
+	converted := int(value)
+	return &converted, true
+}
+
+func optionalInt64Ptr(args map[string]any, key string) (*int64, bool) {
+	value, ok := params.ToInt64(args[key])
+	if !ok {
+		return nil, false
+	}
+	return &value, true
+}
@@ -0,0 +1,517 @@
+package project
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"sync"
+	"testing"
+
+	mcpContext "gitea.com/gitea/gitea-mcp/pkg/context"
+	"gitea.com/gitea/gitea-mcp/pkg/flag"
+
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+func TestGetProjectScope(t *testing.T) {
+	tests := []struct {
+		name     string
+		args     map[string]any
+		writable bool
+		wantKind string
+		wantErr  bool
+	}{
+		{
+			name:     "repo",
+			args:     map[string]any{"scope": "repo", "owner": "octo", "repo": "demo"},
+			wantKind: "repo",
+		},
+		{
+			name:     "org",
+			args:     map[string]any{"scope": "org", "owner": "acme"},
+			wantKind: "org",
+		},
+		{
+			name:     "user read",
+			args:     map[string]any{"scope": "user", "owner": "octo"},
+			wantKind: "user",
+		},
+		{
+			name:     "user write",
+			args:     map[string]any{"scope": "user", "owner": "octo"},
+			writable: true,
+			wantErr:  true,
+		},
+		{
+			name:     "current user",
+			args:     map[string]any{"scope": "current_user"},
+			wantKind: "current_user",
+		},
+		{
+			name:    "missing scope",
+			args:    map[string]any{},
+			wantErr: true,
+		},
+		{
+			name:    "repo missing owner",
+			args:    map[string]any{"scope": "repo", "repo": "demo"},
+			wantErr: true,
+		},
+		{
+			name:    "repo missing repo",
+			args:    map[string]any{"scope": "repo", "owner": "octo"},
+			wantErr: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			info, err := getProjectScope(tt.args, tt.writable)
+			if tt.wantErr {
+				if err == nil {
+					t.Fatal("expected an error, got nil")
+				}
+				return
+			}
+			if err != nil {
+				t.Fatalf("getProjectScope() error = %v", err)
+			}
+			if info.kind != tt.wantKind {
+				t.Fatalf("scope kind = %q, want %q", info.kind, tt.wantKind)
+			}
+		})
+	}
+}
+
+func TestProjectReadFn(t *testing.T) {
+	const (
+		owner     = "octo"
+		repo      = "demo"
+		projectID = 10
+		columnID  = 20
+	)
+
+	var (
+		mu     sync.Mutex
+		gotReq = struct {
+			method string
+			path   string
+			query  string
+		}{}
+	)
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		mu.Lock()
+		gotReq.method = r.Method
+		gotReq.path = r.URL.Path
+		gotReq.query = r.URL.RawQuery
+		mu.Unlock()
+
+		switch r.URL.Path {
+		case "/api/v1/version":
+			_, _ = w.Write([]byte(`{"version":"1.28.0"}`))
+		case fmt.Sprintf("/api/v1/repos/%s/%s/projects", owner, repo):
+			_, _ = w.Write(fmt.Appendf(nil, `[{"id":%d,"title":"Board","state":"open"}]`, projectID))
+		case fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d", owner, repo, projectID):
+			_, _ = w.Write(fmt.Appendf(nil, `{"id":%d,"title":"Board","state":"open"}`, projectID))
+		case fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d/columns", owner, repo, projectID):
+			_, _ = w.Write(fmt.Appendf(nil, `[{"id":%d,"title":"Todo","project_id":%d}]`, columnID, projectID))
+		case fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d/columns/%d/issues", owner, repo, projectID, columnID):
+			_, _ = w.Write([]byte(`[{"id":5,"number":1,"title":"An issue","state":"open","html_url":"https://example.com/1","user":{"login":"octo"}}]`))
+		case fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d/columns/%d", owner, repo, projectID, columnID):
+			_, _ = w.Write(fmt.Appendf(nil, `{"id":%d,"title":"Todo","project_id":%d}`, columnID, projectID))
+		default:
+			http.NotFound(w, r)
+		}
+	}))
+	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 }()
+
+	ctx := context.WithValue(context.Background(), mcpContext.TokenContextKey, "project-read-token")
+
+	tests := []struct {
+		name     string
+		args     map[string]any
+		wantPath string
+		wantID   float64
+	}{
+		{
+			name: "list",
+			args: map[string]any{
+				"method": "list",
+				"scope":  "repo",
+				"owner":  owner,
+				"repo":   repo,
+				"state":  "open",
+			},
+			wantPath: fmt.Sprintf("/api/v1/repos/%s/%s/projects", owner, repo),
+			wantID:   projectID,
+		},
+		{
+			name: "get",
+			args: map[string]any{
+				"method":     "get",
+				"scope":      "repo",
+				"owner":      owner,
+				"repo":       repo,
+				"project_id": float64(projectID),
+			},
+			wantPath: fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d", owner, repo, projectID),
+			wantID:   projectID,
+		},
+		{
+			name: "list columns",
+			args: map[string]any{
+				"method":     "list_columns",
+				"scope":      "repo",
+				"owner":      owner,
+				"repo":       repo,
+				"project_id": float64(projectID),
+			},
+			wantPath: fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d/columns", owner, repo, projectID),
+			wantID:   columnID,
+		},
+		{
+			name: "get column",
+			args: map[string]any{
+				"method":     "get_column",
+				"scope":      "repo",
+				"owner":      owner,
+				"repo":       repo,
+				"project_id": float64(projectID),
+				"column_id":  float64(columnID),
+			},
+			wantPath: fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d/columns/%d", owner, repo, projectID, columnID),
+			wantID:   columnID,
+		},
+		{
+			name: "list column issues",
+			args: map[string]any{
+				"method":     "list_column_issues",
+				"scope":      "repo",
+				"owner":      owner,
+				"repo":       repo,
+				"project_id": float64(projectID),
+				"column_id":  float64(columnID),
+			},
+			wantPath: fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d/columns/%d/issues", owner, repo, projectID, columnID),
+			wantID:   5,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result, err := projectReadFn(ctx, tt.args)
+			if err != nil {
+				t.Fatalf("projectReadFn() error = %v", err)
+			}
+			if result.IsError {
+				t.Fatalf("projectReadFn() returned error result: %v", result)
+			}
+
+			mu.Lock()
+			path := gotReq.path
+			query := gotReq.query
+			mu.Unlock()
+			if path != tt.wantPath {
+				t.Fatalf("request path = %q, want %q", path, tt.wantPath)
+			}
+			if tt.name == "list" && query == "" {
+				t.Fatal("expected list query parameters, got none")
+			}
+
+			if len(result.Content) == 0 {
+				t.Fatal("expected result content")
+			}
+			text, ok := result.Content[0].(*mcp.TextContent)
+			if !ok {
+				t.Fatalf("result content type = %T, want text content", result.Content[0])
+			}
+			assertFirstID(t, []byte(text.Text), tt.wantID)
+		})
+	}
+}
+
+func TestProjectWriteFn(t *testing.T) {
+	const (
+		owner     = "octo"
+		repo      = "demo"
+		projectID = 10
+		columnID  = 20
+		issueID   = 5
+	)
+
+	type request struct {
+		method string
+		path   string
+		body   map[string]any
+	}
+
+	var (
+		mu       sync.Mutex
+		requests []request
+	)
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		if r.URL.Path == "/api/v1/version" {
+			_, _ = w.Write([]byte(`{"version":"1.28.0"}`))
+			return
+		}
+
+		var body map[string]any
+		if r.Body != nil && r.ContentLength > 0 {
+			_ = json.NewDecoder(r.Body).Decode(&body)
+		}
+		mu.Lock()
+		requests = append(requests, request{method: r.Method, path: r.URL.Path, body: body})
+		mu.Unlock()
+
+		switch r.Method {
+		case http.MethodGet:
+			_, _ = w.Write([]byte(`[]`))
+		case http.MethodPost, http.MethodPatch:
+			_, _ = w.Write([]byte(`{}`))
+		default:
+			w.WriteHeader(http.StatusNoContent)
+		}
+	}))
+	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 }()
+
+	ctx := context.WithValue(context.Background(), mcpContext.TokenContextKey, "project-write-token")
+
+	tests := []struct {
+		name       string
+		args       map[string]any
+		wantMethod string
+		wantPath   string
+		wantBody   map[string]any
+	}{
+		{
+			name: "create",
+			args: map[string]any{
+				"method":        "create",
+				"scope":         "repo",
+				"owner":         owner,
+				"repo":          repo,
+				"title":         "Board",
+				"description":   "Project board",
+				"template_type": "basic_kanban",
+				"card_type":     "images_and_text",
+			},
+			wantMethod: http.MethodPost,
+			wantPath:   fmt.Sprintf("/api/v1/repos/%s/%s/projects", owner, repo),
+			wantBody:   map[string]any{"title": "Board", "description": "Project board", "template_type": "basic_kanban", "card_type": "images_and_text"},
+		},
+		{
+			name: "update",
+			args: map[string]any{
+				"method":     "update",
+				"scope":      "repo",
+				"owner":      owner,
+				"repo":       repo,
+				"project_id": float64(projectID),
+				"title":      "Updated Board",
+				"state":      "closed",
+			},
+			wantMethod: http.MethodPatch,
+			wantPath:   fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d", owner, repo, projectID),
+			wantBody:   map[string]any{"title": "Updated Board", "state": "closed"},
+		},
+		{
+			name: "delete",
+			args: map[string]any{
+				"method":     "delete",
+				"scope":      "repo",
+				"owner":      owner,
+				"repo":       repo,
+				"project_id": float64(projectID),
+			},
+			wantMethod: http.MethodDelete,
+			wantPath:   fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d", owner, repo, projectID),
+		},
+		{
+			name: "create column",
+			args: map[string]any{
+				"method":     "create_column",
+				"scope":      "repo",
+				"owner":      owner,
+				"repo":       repo,
+				"project_id": float64(projectID),
+				"title":      "Todo",
+				"color":      "#FF0000",
+			},
+			wantMethod: http.MethodPost,
+			wantPath:   fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d/columns", owner, repo, projectID),
+			wantBody:   map[string]any{"title": "Todo", "color": "#FF0000"},
+		},
+		{
+			name: "update column",
+			args: map[string]any{
+				"method":     "update_column",
+				"scope":      "repo",
+				"owner":      owner,
+				"repo":       repo,
+				"project_id": float64(projectID),
+				"column_id":  float64(columnID),
+				"title":      "Doing",
+				"sorting":    float64(2),
+			},
+			wantMethod: http.MethodPatch,
+			wantPath:   fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d/columns/%d", owner, repo, projectID, columnID),
+			wantBody:   map[string]any{"title": "Doing", "sorting": float64(2)},
+		},
+		{
+			name: "delete column",
+			args: map[string]any{
+				"method":     "delete_column",
+				"scope":      "repo",
+				"owner":      owner,
+				"repo":       repo,
+				"project_id": float64(projectID),
+				"column_id":  float64(columnID),
+			},
+			wantMethod: http.MethodDelete,
+			wantPath:   fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d/columns/%d", owner, repo, projectID, columnID),
+		},
+		{
+			name: "set default column",
+			args: map[string]any{
+				"method":     "set_default_column",
+				"scope":      "repo",
+				"owner":      owner,
+				"repo":       repo,
+				"project_id": float64(projectID),
+				"column_id":  float64(columnID),
+			},
+			wantMethod: http.MethodPost,
+			wantPath:   fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d/columns/%d/default", owner, repo, projectID, columnID),
+		},
+		{
+			name: "move columns",
+			args: map[string]any{
+				"method":     "move_columns",
+				"scope":      "repo",
+				"owner":      owner,
+				"repo":       repo,
+				"project_id": float64(projectID),
+				"column_ids": []any{float64(20), float64(21)},
+			},
+			wantMethod: http.MethodPost,
+			wantPath:   fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d/columns/move", owner, repo, projectID),
+			wantBody:   map[string]any{"column_ids": []any{float64(20), float64(21)}},
+		},
+		{
+			name: "add issue",
+			args: map[string]any{
+				"method":     "add_issue",
+				"scope":      "repo",
+				"owner":      owner,
+				"repo":       repo,
+				"project_id": float64(projectID),
+				"column_id":  float64(columnID),
+				"issue_id":   float64(issueID),
+			},
+			wantMethod: http.MethodPost,
+			wantPath:   fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d/columns/%d/issues/%d", owner, repo, projectID, columnID, issueID),
+		},
+		{
+			name: "remove issue",
+			args: map[string]any{
+				"method":     "remove_issue",
+				"scope":      "repo",
+				"owner":      owner,
+				"repo":       repo,
+				"project_id": float64(projectID),
+				"column_id":  float64(columnID),
+				"issue_id":   float64(issueID),
+			},
+			wantMethod: http.MethodDelete,
+			wantPath:   fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d/columns/%d/issues/%d", owner, repo, projectID, columnID, issueID),
+		},
+		{
+			name: "move issue",
+			args: map[string]any{
+				"method":     "move_issue",
+				"scope":      "repo",
+				"owner":      owner,
+				"repo":       repo,
+				"project_id": float64(projectID),
+				"issue_id":   float64(issueID),
+				"column_id":  float64(columnID),
+				"sorting":    float64(3),
+			},
+			wantMethod: http.MethodPost,
+			wantPath:   fmt.Sprintf("/api/v1/repos/%s/%s/projects/%d/issues/%d/move", owner, repo, projectID, issueID),
+			wantBody:   map[string]any{"column_id": float64(columnID), "sorting": float64(3)},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result, err := projectWriteFn(ctx, tt.args)
+			if err != nil {
+				t.Fatalf("projectWriteFn() error = %v", err)
+			}
+			if result.IsError {
+				t.Fatalf("projectWriteFn() returned error result: %v", result)
+			}
+
+			mu.Lock()
+			request := requests[len(requests)-1]
+			mu.Unlock()
+			if request.method != tt.wantMethod {
+				t.Fatalf("request method = %q, want %q", request.method, tt.wantMethod)
+			}
+			if request.path != tt.wantPath {
+				t.Fatalf("request path = %q, want %q", request.path, tt.wantPath)
+			}
+			if tt.wantBody != nil {
+				if len(request.body) != len(tt.wantBody) {
+					t.Fatalf("request body = %v, want %v", request.body, tt.wantBody)
+				}
+				for key, want := range tt.wantBody {
+					if got := request.body[key]; fmt.Sprint(got) != fmt.Sprint(want) {
+						t.Fatalf("request body[%q] = %v, want %v", key, got, want)
+					}
+				}
+			}
+		})
+	}
+}
+
+func assertFirstID(t *testing.T, data []byte, want float64) {
+	t.Helper()
+
+	if len(data) > 0 && data[0] == '[' {
+		var items []map[string]any
+		if err := json.Unmarshal(data, &items); err != nil {
+			t.Fatalf("unmarshal result text: %v", err)
+		}
+		if len(items) == 0 {
+			t.Fatal("expected at least one result item")
+		}
+		if items[0]["id"] != want {
+			t.Fatalf("first result id = %v, want %v", items[0]["id"], want)
+		}
+		return
+	}
+
+	var item map[string]any
+	if err := json.Unmarshal(data, &item); err != nil {
+		t.Fatalf("unmarshal result text: %v", err)
+	}
+	if item["id"] != want {
+		t.Fatalf("result id = %v, want %v", item["id"], want)
+	}
+}
@@ -0,0 +1,96 @@
+package project
+
+import (
+	"gitea.com/gitea/gitea-mcp/pkg/slim"
+
+	gitea_sdk "gitea.dev/sdk"
+)
+
+func slimProject(p *gitea_sdk.Project) map[string]any {
+	if p == nil {
+		return nil
+	}
+	return map[string]any{
+		"id":                p.ID,
+		"title":             p.Title,
+		"description":       p.Description,
+		"state":             string(p.State),
+		"type":              string(p.Type),
+		"template_type":     string(p.TemplateType),
+		"card_type":         string(p.CardType),
+		"owner_id":          p.OwnerID,
+		"repo_id":           p.RepoID,
+		"creator":           slim.UserLogin(p.Creator),
+		"num_open_issues":   p.NumOpenIssues,
+		"num_closed_issues": p.NumClosedIssues,
+		"num_issues":        p.NumIssues,
+		"html_url":          p.HTMLURL,
+		"created_at":        p.Created,
+		"updated_at":        p.Updated,
+		"closed_at":         p.Closed,
+	}
+}
+
+func slimProjects(projects []*gitea_sdk.Project) []map[string]any {
+	out := make([]map[string]any, 0, len(projects))
+	for _, p := range projects {
+		if p == nil {
+			continue
+		}
+		out = append(out, slimProject(p))
+	}
+	return out
+}
+
+func slimProjectColumn(c *gitea_sdk.ProjectColumn) map[string]any {
+	if c == nil {
+		return nil
+	}
+	return map[string]any{
+		"id":         c.ID,
+		"title":      c.Title,
+		"default":    c.Default,
+		"sorting":    c.Sorting,
+		"color":      c.Color,
+		"project_id": c.ProjectID,
+		"creator":    slim.UserLogin(c.Creator),
+		"created_at": c.Created,
+		"updated_at": c.Updated,
+	}
+}
+
+func slimProjectColumns(columns []*gitea_sdk.ProjectColumn) []map[string]any {
+	out := make([]map[string]any, 0, len(columns))
+	for _, c := range columns {
+		if c == nil {
+			continue
+		}
+		out = append(out, slimProjectColumn(c))
+	}
+	return out
+}
+
+func slimProjectIssue(i *gitea_sdk.Issue) map[string]any {
+	if i == nil {
+		return nil
+	}
+	return map[string]any{
+		"id":       i.ID,
+		"number":   i.Index,
+		"title":    i.Title,
+		"state":    string(i.State),
+		"html_url": i.HTMLURL,
+		"user":     slim.UserLogin(i.Poster),
+	}
+}
+
+func slimProjectIssues(issues []*gitea_sdk.Issue) []map[string]any {
+	out := make([]map[string]any, 0, len(issues))
+	for _, i := range issues {
+		if i == nil {
+			continue
+		}
+		out = append(out, slimProjectIssue(i))
+	}
+	return out
+}
@@ -349,8 +349,10 @@ func listRepoPullRequestsFn(ctx context.Context, args map[string]any) (*mcp.Call
 		State:     gitea_sdk.StateType(state),
 		Sort:      sort,
 		Milestone: milestone,
-		Page:      page,
-		PageSize:  pageSize,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -507,8 +509,10 @@ func listPullRequestReviewsFn(ctx context.Context, args map[string]any) (*mcp.Ca
 	}

 	reviews, _, err := client.PullRequests.ListPullReviews(ctx, owner, repo, index, gitea_sdk.ListPullReviewsOptions{
-		Page:     page,
-		PageSize: pageSize,
+		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))
@@ -574,7 +578,7 @@ func listPullRequestReviewCommentsFn(ctx context.Context, args map[string]any) (
 	} else {
 		page, pageSize := params.GetPagination(args, 30)
 		reviews, _, err := client.PullRequests.ListPullReviews(ctx, owner, repo, index, gitea_sdk.ListPullReviewsOptions{
-			Page: page, PageSize: pageSize,
+			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))
@@ -1045,7 +1049,7 @@ func getPullRequestFilesFn(ctx context.Context, args map[string]any) (*mcp.CallT
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 	files, _, err := client.PullRequests.ListPullRequestFiles(ctx, owner, repo, index, gitea_sdk.ListPullRequestFilesOptions{
-		Page: page, PageSize: pageSize,
+		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))
@@ -2,7 +2,6 @@ package repo

 import (
 	"context"
-	"errors"
 	"fmt"

 	"gitea.com/gitea/gitea-mcp/pkg/annotation"
@@ -22,7 +21,6 @@ const (
 	CreateBranchToolName = "create_branch"
 	DeleteBranchToolName = "delete_branch"
 	ListBranchesToolName = "list_branches"
-	RenameBranchToolName = "rename_branch"
 )

 var (
@@ -54,16 +52,6 @@ var (
 		tool.Number("page", tool.Description(params.PageDesc), tool.Default(1)),
 		tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30)),
 	)
-
-	RenameBranchTool = tool.NewDefinition(
-		RenameBranchToolName,
-		"Rename an existing branch in a repository.",
-		annotation.Write("Rename a branch"),
-		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
-		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
-		tool.String("branch", tool.Required()),
-		tool.String("new_name", tool.Required()),
-	)
 )

 func init() {
@@ -79,10 +67,6 @@ func init() {
 		Tool:    ListBranchesTool,
 		Handler: ListBranchesFn,
 	})
-	BranchTool.RegisterWrite(tool.ServerTool{
-		Tool:    RenameBranchTool,
-		Handler: RenameBranchFn,
-	})
 }

 func CreateBranchFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
@@ -151,8 +135,10 @@ func ListBranchesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResu
 	}
 	page, pageSize := params.GetPagination(args, 30)
 	opt := gitea_sdk.ListRepoBranchesOptions{
-		Page:     page,
-		PageSize: pageSize,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -165,36 +151,3 @@ func ListBranchesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResu

 	return to.TextResult(slimBranches(branches))
 }
-
-func RenameBranchFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(args, "owner")
-	if err != nil {
-		return to.ErrorResult(err)
-	}
-	repo, err := params.GetString(args, "repo")
-	if err != nil {
-		return to.ErrorResult(err)
-	}
-	branch, err := params.GetString(args, "branch")
-	if err != nil {
-		return to.ErrorResult(err)
-	}
-	newName, err := params.GetString(args, "new_name")
-	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))
-	}
-	successful, _, err := client.Repositories.RenameRepoBranch(ctx, owner, repo, branch, gitea_sdk.RenameRepoBranchOption{Name: newName})
-	if err != nil {
-		return to.ErrorResult(fmt.Errorf("rename branch error: %v", err))
-	}
-	if !successful {
-		return to.ErrorResult(errors.New("rename branch error: unsuccessful"))
-	}
-
-	return to.TextResult("Branch renamed")
-}
@@ -1,136 +0,0 @@
-package repo
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"sync"
-	"testing"
-
-	"gitea.com/gitea/gitea-mcp/pkg/flag"
-
-	"github.com/modelcontextprotocol/go-sdk/mcp"
-)
-
-func TestRenameBranchFnMissingArgs(t *testing.T) {
-	fullArgs := map[string]any{
-		"owner":    "octo",
-		"repo":     "demo",
-		"branch":   "old-name",
-		"new_name": "new-name",
-	}
-
-	for _, missing := range []string{"owner", "repo", "branch", "new_name"} {
-		t.Run(missing, func(t *testing.T) {
-			args := map[string]any{}
-			for k, v := range fullArgs {
-				if k != missing {
-					args[k] = v
-				}
-			}
-
-			result, err := RenameBranchFn(context.Background(), args)
-			if err != nil {
-				t.Fatalf("RenameBranchFn() error = %v", err)
-			}
-			if !result.IsError {
-				t.Fatalf("RenameBranchFn() with missing %q, want error result", missing)
-			}
-		})
-	}
-}
-
-func TestRenameBranchFn(t *testing.T) {
-	const (
-		owner   = "octo"
-		repo    = "demo"
-		branch  = "old-name"
-		newName = "new-name"
-	)
-
-	for _, tc := range []struct {
-		name         string
-		serverStatus int
-		wantErr      bool
-		wantContains string
-	}{
-		{"success", http.StatusNoContent, false, "Branch renamed"},
-		{"server error", http.StatusInternalServerError, true, "rename branch error"},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			var (
-				mu      sync.Mutex
-				gotBody map[string]any
-			)
-
-			renamePath := fmt.Sprintf("/api/v1/repos/%s/%s/branches/%s", owner, repo, branch)
-			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				switch r.URL.Path {
-				case "/api/v1/version":
-					_, _ = w.Write([]byte(`{"version":"1.24.0"}`))
-				case renamePath:
-					mu.Lock()
-					_ = json.NewDecoder(r.Body).Decode(&gotBody)
-					mu.Unlock()
-					w.WriteHeader(tc.serverStatus)
-				default:
-					http.NotFound(w, r)
-				}
-			}))
-			defer server.Close()
-
-			origHost, origToken := flag.Host, flag.Token
-			flag.Host, flag.Token = server.URL, ""
-			defer func() { flag.Host, flag.Token = origHost, origToken }()
-
-			result, err := RenameBranchFn(context.Background(), map[string]any{
-				"owner":    owner,
-				"repo":     repo,
-				"branch":   branch,
-				"new_name": newName,
-			})
-			if err != nil {
-				t.Fatalf("RenameBranchFn() error = %v", err)
-			}
-
-			if result.IsError != tc.wantErr {
-				t.Fatalf("RenameBranchFn() IsError = %v, want %v (result: %v)", result.IsError, tc.wantErr, result)
-			}
-
-			text := result.Content[0].(*mcp.TextContent).Text
-			if !strings.Contains(text, tc.wantContains) {
-				t.Fatalf("result = %s, want it to contain %q", text, tc.wantContains)
-			}
-
-			if !tc.wantErr {
-				mu.Lock()
-				defer mu.Unlock()
-				if gotBody["name"] != newName {
-					t.Fatalf("request body name = %v, want %s", gotBody["name"], newName)
-				}
-			}
-		})
-	}
-}
-
-func TestRenameBranchToolRegistration(t *testing.T) {
-	found := false
-	for _, registered := range BranchTool.WriteTools() {
-		if registered.Tool.Name == RenameBranchToolName {
-			found = true
-			break
-		}
-	}
-	if !found {
-		t.Fatalf("%q is not registered as a write tool", RenameBranchToolName)
-	}
-
-	for _, registered := range BranchTool.ReadTools() {
-		if registered.Tool.Name == RenameBranchToolName {
-			t.Fatalf("%q is registered as a read tool, want write only", RenameBranchToolName)
-		}
-	}
-}
@@ -69,10 +69,12 @@ func ListRepoCommitsFn(ctx context.Context, args map[string]any) (*mcp.CallToolR
 	sha, _ := args["sha"].(string)
 	path, _ := args["path"].(string)
 	opt := gitea_sdk.ListCommitOptions{
-		Page:     page,
-		PageSize: pageSize,
-		SHA:      sha,
-		Path:     path,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
+		SHA:  sha,
+		Path: path,
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -266,9 +266,11 @@ func DeleteFileFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult
 		return to.ErrorResult(err)
 	}
 	opt := gitea_sdk.DeleteFileOptions{
-		Message:    message,
-		BranchName: branchName,
-		SHA:        sha,
+		FileOptions: gitea_sdk.FileOptions{
+			Message:    message,
+			BranchName: branchName,
+		},
+		SHA: sha,
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -236,8 +236,10 @@ func ListReleasesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResu
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 	releases, _, err := client.Releases.ListReleases(ctx, owner, repo, gitea_sdk.ListReleasesOptions{
-		Page:         page,
-		PageSize:     pageSize,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 		IsDraft:      params.GetOptionalBoolPtr(args, "is_draft"),
 		IsPreRelease: params.GetOptionalBoolPtr(args, "is_pre_release"),
 	})
@@ -170,8 +170,10 @@ func ForkRepoFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult,
 func ListMyReposFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
 	page, pageSize := params.GetPagination(args, 30)
 	opt := gitea_sdk.ListReposOptions{
-		Page:     page,
-		PageSize: pageSize,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -192,8 +194,10 @@ func ListOrgReposFn(ctx context.Context, args map[string]any) (*mcp.CallToolResu
 	}
 	page, pageSize := params.GetPagination(args, 100)
 	opt := gitea_sdk.ListOrgReposOptions{
-		Page:     page,
-		PageSize: pageSize,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -185,8 +185,10 @@ func ListTagsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult,
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 	tags, _, err := client.Repositories.ListRepoTags(ctx, owner, repo, gitea_sdk.ListRepoTagsOptions{
-		Page:     int(page),
-		PageSize: int(pageSize),
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     int(page),
+			PageSize: int(pageSize),
+		},
 	})
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("list tags error: %v", err))
@@ -54,8 +54,10 @@ func GetRepoTreeFn(ctx context.Context, args map[string]any) (*mcp.CallToolResul
 	page, pageSize := params.GetPagination(args, 30)

 	opt := gitea_sdk.ListTreeOptions{
-		Page:      page,
-		PageSize:  pageSize,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 		Ref:       treeSHA,
 		Recursive: recursive,
 	}
@@ -102,9 +102,11 @@ func UsersFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, err
 	}
 	page, pageSize := params.GetPagination(args, 30)
 	opt := gitea_sdk.SearchUsersOption{
-		KeyWord:  keyword,
-		Page:     page,
-		PageSize: pageSize,
+		KeyWord: keyword,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -131,8 +133,10 @@ func OrgTeamsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult,
 	opt := gitea_sdk.SearchTeamsOptions{
 		Query:              query,
 		IncludeDescription: includeDescription,
-		Page:               page,
-		PageSize:           pageSize,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -164,8 +168,10 @@ func ReposFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, err
 		IsArchived:           params.GetOptionalBoolPtr(args, "isArchived"),
 		Sort:                 sort,
 		Order:                order,
-		Page:                 page,
-		PageSize:             pageSize,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -186,9 +192,11 @@ func IssuesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, er
 	page, pageSize := params.GetPagination(args, 30)

 	opt := gitea_sdk.ListIssueOption{
-		KeyWord:  query,
-		Page:     page,
-		PageSize: pageSize,
+		KeyWord: query,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	}
 	if state, ok := args["state"].(string); ok {
 		opt.State = gitea_sdk.StateType(state)
@@ -200,8 +200,10 @@ func listTrackedTimesFn(ctx context.Context, args map[string]any) (*mcp.CallTool
 	}

 	times, _, err := client.Issues.ListIssueTrackedTimes(ctx, owner, repo, index, gitea_sdk.ListTrackedTimesOptions{
-		Page:     page,
-		PageSize: pageSize,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	})
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("list tracked times for %s/%s#%d err: %v", owner, repo, index, err))
@@ -288,8 +290,10 @@ func listRepoTimesFn(ctx context.Context, args map[string]any) (*mcp.CallToolRes
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 	times, _, err := client.Issues.ListRepoTrackedTimes(ctx, owner, repo, gitea_sdk.ListTrackedTimesOptions{
-		Page:     page,
-		PageSize: pageSize,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	})
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("list repo tracked times for %s/%s err: %v", owner, repo, err))
@@ -59,8 +59,10 @@ func GetUserOrgsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResul
 	page, pageSize := params.GetPagination(args, 30)

 	opt := gitea_sdk.ListOrgsOptions{
-		Page:     page,
-		PageSize: pageSize,
+		ListOptions: gitea_sdk.ListOptions{
+			Page:     page,
+			PageSize: pageSize,
+		},
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -191,7 +191,8 @@ func TestDownloadAttachmentErrorsOnNon2xx(t *testing.T) {
 	if status != http.StatusForbidden {
 		t.Fatalf("status = %d, want %d", status, http.StatusForbidden)
 	}
-	if _, ok := errors.AsType[*HTTPError](err); !ok {
+	var httpErr *HTTPError
+	if !errors.As(err, &httpErr) {
 		t.Fatalf("expected HTTPError, got %T", err)
 	}
 }
@@ -236,7 +236,8 @@ func OpenAttachment(ctx context.Context, attachmentPath, accept string) (*Attach
 func DownloadAttachment(ctx context.Context, attachmentPath, accept string) ([]byte, string, int, error) {
 	resp, err := OpenAttachment(ctx, attachmentPath, accept)
 	if err != nil {
-		if httpErr, ok := errors.AsType[*HTTPError](err); ok {
+		var httpErr *HTTPError
+		if errors.As(err, &httpErr) {
 			return nil, "", httpErr.StatusCode, err
 		}
 		return nil, "", 0, err
@@ -102,7 +102,8 @@ func (s ServerTool) MCPHandler() mcp.ToolHandler {

 		result, err = s.Handler(ctx, arguments)
 		if err != nil {
-			if _, ok := errors.AsType[*jsonrpc.Error](err); ok {
+			var protocolErr *jsonrpc.Error
+			if errors.As(err, &protocolErr) {
 				return nil, err
 			}
 			return to.ErrorResult(err)