Improve CLI help text and flags (#139)

## Summary
- Replace default `flag.Usage` with custom 2-column layout using `text/tabwriter`
- Add short and long aliases for all CLI flags
- Add environment variables section with sorted entries
- Handle `-version` flag in `Execute()`

## Sample output
```
Usage: gitea-mcp [options]

Options:
  -t, -transport <type>   Transport type: stdio or http (default: stdio)
  -H, -host <url>         Gitea host URL (default: https://gitea.com)
  -p, -port <number>      HTTP server port (default: 8080)
  -T, -token <token>      Personal access token
  -r, -read-only          Expose only read-only tools
  -d, -debug              Enable debug mode
  -k, -insecure           Ignore TLS certificate errors
  -v, -version            Print version and exit

Environment variables:
  GITEA_ACCESS_TOKEN   Provide access token
  GITEA_DEBUG          Set to 'true' for debug mode
  GITEA_HOST           Override Gitea host URL
  GITEA_INSECURE       Set to 'true' to ignore TLS errors
  GITEA_READONLY       Set to 'true' for read-only mode
  MCP_MODE             Override transport mode
```

*Created by Claude on behalf of @silverwind*

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

.gitea/workflows/release-nightly.yml

@@ -14,7 +14,7 @@ jobs:
       DOCKER_LATEST: nightly
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # all history for all branches and tags
 
@@ -37,7 +37,7 @@ jobs:
           echo REPO_VERSION=$(git describe --tags --always | sed 's/-/+/' | sed 's/^v//') >> $GITHUB_OUTPUT
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile

.gitea/workflows/release-tag.yml

@@ -10,20 +10,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: stable
+      - name: Install GoReleaser
+        run: go install github.com/goreleaser/goreleaser/v2@latest
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v6
+        run: goreleaser release --clean
-        with:
-          distribution: goreleaser
-          # 'latest', 'nightly', or a semver
-          version: "~> v2"
-          args: release --clean
         env:
           GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GORELEASER_FORCE_TOKEN: "gitea"
@@ -35,7 +32,7 @@ jobs:
       DOCKER_LATEST: latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # all history for all branches and tags
 
@@ -58,7 +55,7 @@ jobs:
           echo REPO_VERSION=${GITHUB_REF_NAME#v} >> $GITHUB_OUTPUT
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile

.gitea/workflows/test-pr.yml

@@ -7,20 +7,13 @@ jobs:
   check-and-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: 'go.mod'
+      - name: lint
+        run: make lint
       - name: build
-        run: |
+        run: make build
-          make build
+      - name: security-check
-
+        run: make security-check
-  govulncheck_job:
-    runs-on: ubuntu-latest
-    name: Run govulncheck
-    steps:
-      - id: govulncheck
-        uses: golang/govulncheck-action@v1
-        with:
-          go-version-file: 'go.mod'
-          go-package: ./...

.golangci.yml

@@ -0,0 +1,113 @@
+version: "2"
+output:
+  sort-order:
+    - file
+linters:
+  default: none
+  enable:
+    - bidichk
+    - bodyclose
+    - depguard
+    - errcheck
+    - forbidigo
+    - gocheckcompilerdirectives
+    - gocritic
+    - govet
+    - ineffassign
+    - mirror
+    - modernize
+    - nakedret
+    - nilnil
+    - nolintlint
+    - perfsprint
+    - revive
+    - staticcheck
+    - testifylint
+    - unconvert
+    - unparam
+    - unused
+    - usestdlibvars
+    - usetesting
+    - wastedassign
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: io/ioutil
+              desc: use os or io instead
+            - pkg: golang.org/x/exp
+              desc: it's experimental and unreliable
+            - pkg: github.com/pkg/errors
+              desc: use builtin errors package instead
+    nolintlint:
+      allow-unused: false
+      require-explanation: true
+      require-specific: true
+    gocritic:
+      enabled-checks:
+        - equalFold
+      disabled-checks: []
+    revive:
+      severity: error
+      rules:
+        - name: blank-imports
+        - name: constant-logical-expr
+        - name: context-as-argument
+        - name: context-keys-type
+        - name: dot-imports
+        - name: empty-lines
+        - name: error-return
+        - name: error-strings
+        - name: exported
+        - name: identical-branches
+        - name: if-return
+        - name: increment-decrement
+        - name: modifies-value-receiver
+        - name: package-comments
+        - name: redefines-builtin-id
+        - name: superfluous-else
+        - name: time-naming
+        - name: unexported-return
+        - name: var-declaration
+        - name: var-naming
+          disabled: true
+    staticcheck:
+      checks:
+        - all
+    testifylint: {}
+    usetesting:
+      os-temp-dir: true
+    perfsprint:
+      concat-loop: false
+    govet:
+      enable:
+        - nilness
+        - unusedwrite
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - 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
+    - gofumpt
+  settings:
+    gofumpt:
+      extra-rules: true
+  exclusions:
+    generated: lax
+run:
+  timeout: 10m

Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.4
 
 # Build stage
-FROM --platform=$BUILDPLATFORM golang:1.24-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.26-alpine AS builder
 
 ARG VERSION=dev
 ARG TARGETOS

Makefile

@@ -3,6 +3,10 @@ EXECUTABLE := gitea-mcp
 VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
 LDFLAGS := -X "main.Version=$(VERSION)"
 
+GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.10.1
+GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1
+GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.9.2
+
 .PHONY: help
 help: ## Print this help message.
 	@echo "Usage: make [target]"
@@ -45,8 +49,29 @@ air: ## Install air for hot reload.
 dev: air ## run the application with hot reload
 	air --build.cmd "make build" --build.bin ./gitea-mcp
 
+.PHONY: lint
+lint: lint-go ## lint everything
+
+.PHONY: lint-fix
+lint-fix: lint-go-fix ## lint everything and fix issues
+
+.PHONY: lint-go
+lint-go: ## lint go files
+	$(GO) run $(GOLANGCI_LINT_PACKAGE) run
+
+.PHONY: lint-go-fix
+lint-go-fix: ## lint go files and fix issues
+	$(GO) run $(GOLANGCI_LINT_PACKAGE) run --fix
+
+.PHONY: security-check
+security-check: ## run security check
+	$(GO) run $(GOVULNCHECK_PACKAGE) -show color ./... || true
+
+.PHONY: tidy
+tidy: ## run go mod tidy
+	$(eval MIN_GO_VERSION := $(shell grep -Eo '^go\s+[0-9]+\.[0-9.]+' go.mod | cut -d' ' -f2))
+	$(GO) mod tidy -compat=$(MIN_GO_VERSION)
+
 .PHONY: vendor
-vendor: ## tidy and verify module dependencies
+vendor: tidy ## tidy and verify module dependencies
-	@echo 'Tidying and verifying module dependencies...'
+	$(GO) mod verify
-	go mod tidy
-	go mod verify

cmd/cmd.go

@@ -3,7 +3,9 @@ package cmd
 import (
 	"context"
 	"flag"
+	"fmt"
 	"os"
+	"text/tabwriter"
 
 	"gitea.com/gitea/gitea-mcp/operation"
 	flagPkg "gitea.com/gitea/gitea-mcp/pkg/flag"
@@ -11,60 +13,53 @@ import (
 )
 
 var (
-	host  string
+	host    string
-	port  int
+	port    int
-	token string
+	token   string
+	version bool
 )
 
 func init() {
-	flag.StringVar(
+	flag.StringVar(&flagPkg.Mode, "t", "stdio", "")
-		&flagPkg.Mode,
+	flag.StringVar(&flagPkg.Mode, "transport", "stdio", "")
-		"t",
+	flag.StringVar(&host, "H", os.Getenv("GITEA_HOST"), "")
-		"stdio",
+	flag.StringVar(&host, "host", os.Getenv("GITEA_HOST"), "")
-		"Transport type (stdio or http)",
+	flag.IntVar(&port, "p", 8080, "")
-	)
+	flag.IntVar(&port, "port", 8080, "")
-	flag.StringVar(
+	flag.StringVar(&token, "T", "", "")
-		&flagPkg.Mode,
+	flag.StringVar(&token, "token", "", "")
-		"transport",
+	flag.BoolVar(&flagPkg.ReadOnly, "r", false, "")
-		"stdio",
+	flag.BoolVar(&flagPkg.ReadOnly, "read-only", false, "")
-		"Transport type (stdio or http)",
+	flag.BoolVar(&flagPkg.Debug, "d", false, "")
-	)
+	flag.BoolVar(&flagPkg.Debug, "debug", false, "")
-	flag.StringVar(
+	flag.BoolVar(&flagPkg.Insecure, "k", false, "")
-		&host,
+	flag.BoolVar(&flagPkg.Insecure, "insecure", false, "")
-		"host",
+	flag.BoolVar(&version, "v", false, "")
-		os.Getenv("GITEA_HOST"),
+	flag.BoolVar(&version, "version", false, "")
-		"Gitea host",
+
-	)
+	flag.Usage = func() {
-	flag.IntVar(
+		w := tabwriter.NewWriter(os.Stderr, 0, 0, 3, ' ', 0)
-		&port,
+		fmt.Fprintln(os.Stderr, "Usage: gitea-mcp [options]")
-		"port",
+		fmt.Fprintln(os.Stderr)
-		8080,
+		fmt.Fprintln(os.Stderr, "Options:")
-		"http port",
+		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")
-	flag.StringVar(
+		fmt.Fprintf(w, "  -p, -port <number>\tHTTP server port (default: 8080)\n")
-		&token,
+		fmt.Fprintf(w, "  -T, -token <token>\tPersonal access token\n")
-		"token",
+		fmt.Fprintf(w, "  -r, -read-only\tExpose only read-only tools\n")
-		"",
+		fmt.Fprintf(w, "  -d, -debug\tEnable debug mode\n")
-		"Your personal access token",
+		fmt.Fprintf(w, "  -k, -insecure\tIgnore TLS certificate errors\n")
-	)
+		fmt.Fprintf(w, "  -v, -version\tPrint version and exit\n")
-	flag.BoolVar(
+		fmt.Fprintln(w)
-		&flagPkg.ReadOnly,
+		fmt.Fprintln(w, "Environment variables:")
-		"read-only",
+		fmt.Fprintf(w, "  GITEA_ACCESS_TOKEN\tProvide access token\n")
-		false,
+		fmt.Fprintf(w, "  GITEA_DEBUG\tSet to 'true' for debug mode\n")
-		"Read-only mode",
+		fmt.Fprintf(w, "  GITEA_HOST\tOverride Gitea host URL\n")
-	)
+		fmt.Fprintf(w, "  GITEA_INSECURE\tSet to 'true' to ignore TLS errors\n")
-	flag.BoolVar(
+		fmt.Fprintf(w, "  GITEA_READONLY\tSet to 'true' for read-only mode\n")
-		&flagPkg.Debug,
+		fmt.Fprintf(w, "  MCP_MODE\tOverride transport mode\n")
-		"d",
+		w.Flush()
-		false,
+	}
-		"debug mode (If -d flag is provided, debug mode will be enabled by default)",
-	)
-	flag.BoolVar(
-		&flagPkg.Insecure,
-		"insecure",
-		false,
-		"ignore TLS certificate errors",
-	)
 
 	flag.Parse()
 
@@ -99,12 +94,16 @@ func init() {
 }
 
 func Execute() {
-	defer log.Default().Sync()
+	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")
 			return
 		}
-		log.Fatalf("Run Gitea MCP Server Error: %v", err)
+		log.Fatalf("Run Gitea MCP Server Error: %v", err) //nolint:gocritic // intentional exit after defer
 	}
 }

go.mod

@@ -1,11 +1,11 @@
 module gitea.com/gitea/gitea-mcp
 
-go 1.24.0
+go 1.26.0
 
 require (
-	code.gitea.io/sdk/gitea v0.22.1
+	code.gitea.io/sdk/gitea v0.23.2
-	github.com/mark3labs/mcp-go v0.42.0
+	github.com/mark3labs/mcp-go v0.44.0
-	go.uber.org/zap v1.27.0
+	go.uber.org/zap v1.27.1
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 )
 
@@ -16,14 +16,14 @@ require (
 	github.com/davidmz/go-pageant v1.0.2 // indirect
 	github.com/go-fed/httpsig v1.1.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/hashicorp/go-version v1.7.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/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.43.0 // indirect
+	golang.org/x/crypto v0.48.0 // indirect
-	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/sys v0.41.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,5 +1,5 @@
-code.gitea.io/sdk/gitea v0.22.1 h1:7K05KjRORyTcTYULQ/AwvlVS6pawLcWyXZcTr7gHFyA=
+code.gitea.io/sdk/gitea v0.23.2 h1:iJB1FDmLegwfwjX8gotBDHdPSbk/ZR8V9VmEJaVsJYg=
-code.gitea.io/sdk/gitea v0.22.1/go.mod h1:yyF5+GhljqvA30sRDreoyHILruNiy4ASufugzYg0VHM=
+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=
@@ -18,8 +18,8 @@ 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/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.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
+github.com/hashicorp/go-version v1.8.0 h1:KAkNb1HAiZd1ukkxDFGmokVZe1Xy9HG6NUp+bPle2i4=
-github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+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/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -28,8 +28,8 @@ 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.42.0 h1:gk/8nYJh8t3yroCAOBhNbYsM9TCKvkM13I5t5Hfu6Ls=
+github.com/mark3labs/mcp-go v0.44.0 h1:OlYfcVviAnwNN40QZUrrzU0QZjq3En7rCU5X09a/B7I=
-github.com/mark3labs/mcp-go v0.42.0/go.mod h1:YnJfOL382MIWDx1kMY+2zsRHU/q78dBg9aFb8W6Thdw=
+github.com/mark3labs/mcp-go v0.44.0/go.mod h1:YnJfOL382MIWDx1kMY+2zsRHU/q78dBg9aFb8W6Thdw=
 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=
@@ -46,23 +46,23 @@ 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.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
+go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
-go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+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=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
-golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
+golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
-golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
+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/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.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
-golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
+golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
-golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
+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/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

main.go

@@ -5,9 +5,7 @@ import (
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
 )
 
-var (
+var Version = "dev"
-	Version = "dev"
-)
 
 func init() {
 	flag.Version = Version

operation/actions/actions.go

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

operation/actions/logs.go

@@ -4,12 +4,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"net/http"
 	"net/url"
 	"os"
 	"path/filepath"
 
 	"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"
 
 	"github.com/mark3labs/mcp-go/mcp"
@@ -67,7 +69,7 @@ func fetchJobLogBytes(ctx context.Context, owner, repo string, jobID int64) ([]b
 		}
 		lastErr = err
 		var httpErr *gitea.HTTPError
-		if errors.As(err, &httpErr) && (httpErr.StatusCode == 404 || httpErr.StatusCode == 405) {
+		if errors.As(err, &httpErr) && (httpErr.StatusCode == http.StatusNotFound || httpErr.StatusCode == http.StatusMethodNotAllowed) {
 			continue
 		}
 		return nil, p, err
@@ -109,28 +111,18 @@ func GetRepoActionJobLogPreviewFn(ctx context.Context, req mcp.CallToolRequest)
 	log.Debugf("Called GetRepoActionJobLogPreviewFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	jobIDFloat, ok := req.GetArguments()["job_id"].(float64)
+	jobID, err := params.GetIndex(req.GetArguments(), "job_id")
-	if !ok || jobIDFloat <= 0 {
+	if err != nil || jobID <= 0 {
-		return to.ErrorResult(fmt.Errorf("job_id is required"))
+		return to.ErrorResult(errors.New("job_id is required"))
 	}
-	tailLinesFloat, _ := req.GetArguments()["tail_lines"].(float64)
+	tailLines := int(params.GetOptionalInt(req.GetArguments(), "tail_lines", 200))
-	maxBytesFloat, _ := req.GetArguments()["max_bytes"].(float64)
+	maxBytes := int(params.GetOptionalInt(req.GetArguments(), "max_bytes", 65536))
-	tailLines := int(tailLinesFloat)
-	if tailLines <= 0 {
-		tailLines = 200
-	}
-	maxBytes := int(maxBytesFloat)
-	if maxBytes <= 0 {
-		maxBytes = 65536
-	}
-
-	jobID := int64(jobIDFloat)
 	raw, usedPath, err := fetchJobLogBytes(ctx, owner, repo, jobID)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get job log err: %v", err))
@@ -140,13 +132,13 @@ func GetRepoActionJobLogPreviewFn(ctx context.Context, req mcp.CallToolRequest)
 	limited, truncated := limitBytes(tailed, maxBytes)
 
 	return to.TextResult(map[string]any{
-		"endpoint":     usedPath,
+		"endpoint":   usedPath,
-		"job_id":       jobID,
+		"job_id":     jobID,
-		"bytes":        len(raw),
+		"bytes":      len(raw),
-		"tail_lines":   tailLines,
+		"tail_lines": tailLines,
-		"max_bytes":    maxBytes,
+		"max_bytes":  maxBytes,
-		"truncated":    truncated,
+		"truncated":  truncated,
-		"log":          string(limited),
+		"log":        string(limited),
 	})
 }
 
@@ -154,18 +146,17 @@ func DownloadRepoActionJobLogFn(ctx context.Context, req mcp.CallToolRequest) (*
 	log.Debugf("Called DownloadRepoActionJobLogFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	jobIDFloat, ok := req.GetArguments()["job_id"].(float64)
+	jobID, err := params.GetIndex(req.GetArguments(), "job_id")
-	if !ok || jobIDFloat <= 0 {
+	if err != nil || jobID <= 0 {
-		return to.ErrorResult(fmt.Errorf("job_id is required"))
+		return to.ErrorResult(errors.New("job_id is required"))
 	}
 	outputPath, _ := req.GetArguments()["output_path"].(string)
-	jobID := int64(jobIDFloat)
 
 	raw, usedPath, err := fetchJobLogBytes(ctx, owner, repo, jobID)
 	if err != nil {
@@ -194,5 +185,3 @@ func DownloadRepoActionJobLogFn(ctx context.Context, req mcp.CallToolRequest) (*
 		"bytes":    len(raw),
 	})
 }
-
-

operation/actions/logs_test.go

@@ -20,5 +20,3 @@ func TestLimitBytesKeepsTail(t *testing.T) {
 		t.Fatalf("limitBytes tail = %q, want %q", string(out), "6789")
 	}
 }
-
-

operation/actions/runs.go

@@ -4,10 +4,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"maps"
+	"net/http"
 	"net/url"
+	"strconv"
 
 	"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"
 
 	"github.com/mark3labs/mcp-go/mcp"
@@ -125,47 +129,41 @@ func init() {
 	Tool.RegisterRead(server.ServerTool{Tool: ListRepoActionRunJobsTool, Handler: ListRepoActionRunJobsFn})
 }
 
-func doJSONWithFallback(ctx context.Context, method string, paths []string, query url.Values, body any, respOut any) (string, int, error) {
+func doJSONWithFallback(ctx context.Context, method string, paths []string, query url.Values, body, respOut any) error {
 	var lastErr error
 	for _, p := range paths {
-		status, err := gitea.DoJSON(ctx, method, p, query, body, respOut)
+		_, err := gitea.DoJSON(ctx, method, p, query, body, respOut)
 		if err == nil {
-			return p, status, nil
+			return nil
 		}
 		lastErr = err
 		var httpErr *gitea.HTTPError
-		if errors.As(err, &httpErr) && (httpErr.StatusCode == 404 || httpErr.StatusCode == 405) {
+		if errors.As(err, &httpErr) && (httpErr.StatusCode == http.StatusNotFound || httpErr.StatusCode == http.StatusMethodNotAllowed) {
 			continue
 		}
-		return p, status, err
+		return err
 	}
-	return "", 0, lastErr
+	return lastErr
 }
 
 func ListRepoActionWorkflowsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 	log.Debugf("Called ListRepoActionWorkflowsFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
-	}
-	page, _ := req.GetArguments()["page"].(float64)
-	if page <= 0 {
-		page = 1
-	}
-	pageSize, _ := req.GetArguments()["pageSize"].(float64)
-	if pageSize <= 0 {
-		pageSize = 50
 	}
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 50)
 	query := url.Values{}
-	query.Set("page", fmt.Sprintf("%d", int(page)))
+	query.Set("page", strconv.Itoa(int(page)))
-	query.Set("limit", fmt.Sprintf("%d", int(pageSize)))
+	query.Set("limit", strconv.Itoa(int(pageSize)))
 
 	var result any
-	_, _, err := doJSONWithFallback(ctx, "GET",
+	err := doJSONWithFallback(ctx, "GET",
 		[]string{
 			fmt.Sprintf("repos/%s/%s/actions/workflows", url.PathEscape(owner), url.PathEscape(repo)),
 		},
@@ -181,19 +179,19 @@ func GetRepoActionWorkflowFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	log.Debugf("Called GetRepoActionWorkflowFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	workflowID, ok := req.GetArguments()["workflow_id"].(string)
 	if !ok || workflowID == "" {
-		return to.ErrorResult(fmt.Errorf("workflow_id is required"))
+		return to.ErrorResult(errors.New("workflow_id is required"))
 	}
 
 	var result any
-	_, _, err := doJSONWithFallback(ctx, "GET",
+	err := doJSONWithFallback(ctx, "GET",
 		[]string{
 			fmt.Sprintf("repos/%s/%s/actions/workflows/%s", url.PathEscape(owner), url.PathEscape(repo), url.PathEscape(workflowID)),
 		},
@@ -209,30 +207,28 @@ func DispatchRepoActionWorkflowFn(ctx context.Context, req mcp.CallToolRequest)
 	log.Debugf("Called DispatchRepoActionWorkflowFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	workflowID, ok := req.GetArguments()["workflow_id"].(string)
 	if !ok || workflowID == "" {
-		return to.ErrorResult(fmt.Errorf("workflow_id is required"))
+		return to.ErrorResult(errors.New("workflow_id is required"))
 	}
 	ref, ok := req.GetArguments()["ref"].(string)
 	if !ok || ref == "" {
-		return to.ErrorResult(fmt.Errorf("ref is required"))
+		return to.ErrorResult(errors.New("ref is required"))
 	}
 
 	var inputs map[string]any
 	if raw, exists := req.GetArguments()["inputs"]; exists {
 		if m, ok := raw.(map[string]any); ok {
 			inputs = m
-		} else if m, ok := raw.(map[string]interface{}); ok {
+		} else if m, ok := raw.(map[string]any); ok {
 			inputs = make(map[string]any, len(m))
-			for k, v := range m {
+			maps.Copy(inputs, m)
-				inputs[k] = v
-			}
 		}
 	}
 
@@ -243,7 +239,7 @@ func DispatchRepoActionWorkflowFn(ctx context.Context, req mcp.CallToolRequest)
 		body["inputs"] = inputs
 	}
 
-	_, _, err := doJSONWithFallback(ctx, "POST",
+	err := doJSONWithFallback(ctx, "POST",
 		[]string{
 			fmt.Sprintf("repos/%s/%s/actions/workflows/%s/dispatches", url.PathEscape(owner), url.PathEscape(repo), url.PathEscape(workflowID)),
 			fmt.Sprintf("repos/%s/%s/actions/workflows/%s/dispatch", url.PathEscape(owner), url.PathEscape(repo), url.PathEscape(workflowID)),
@@ -252,7 +248,7 @@ func DispatchRepoActionWorkflowFn(ctx context.Context, req mcp.CallToolRequest)
 	)
 	if err != nil {
 		var httpErr *gitea.HTTPError
-		if errors.As(err, &httpErr) && (httpErr.StatusCode == 404 || httpErr.StatusCode == 405) {
+		if errors.As(err, &httpErr) && (httpErr.StatusCode == http.StatusNotFound || httpErr.StatusCode == http.StatusMethodNotAllowed) {
 			return to.ErrorResult(fmt.Errorf("workflow dispatch not supported on this Gitea version (endpoint returned %d). Check https://docs.gitea.com/api/1.24/ for available Actions endpoints", httpErr.StatusCode))
 		}
 		return to.ErrorResult(fmt.Errorf("dispatch action workflow err: %v", err))
@@ -264,31 +260,25 @@ func ListRepoActionRunsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	log.Debugf("Called ListRepoActionRunsFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
-	}
-	page, _ := req.GetArguments()["page"].(float64)
-	if page <= 0 {
-		page = 1
-	}
-	pageSize, _ := req.GetArguments()["pageSize"].(float64)
-	if pageSize <= 0 {
-		pageSize = 50
 	}
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 50)
 	statusFilter, _ := req.GetArguments()["status"].(string)
 
 	query := url.Values{}
-	query.Set("page", fmt.Sprintf("%d", int(page)))
+	query.Set("page", strconv.Itoa(int(page)))
-	query.Set("limit", fmt.Sprintf("%d", int(pageSize)))
+	query.Set("limit", strconv.Itoa(int(pageSize)))
 	if statusFilter != "" {
 		query.Set("status", statusFilter)
 	}
 
 	var result any
-	_, _, err := doJSONWithFallback(ctx, "GET",
+	err := doJSONWithFallback(ctx, "GET",
 		[]string{
 			fmt.Sprintf("repos/%s/%s/actions/runs", url.PathEscape(owner), url.PathEscape(repo)),
 		},
@@ -304,21 +294,21 @@ func GetRepoActionRunFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	log.Debugf("Called GetRepoActionRunFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	runID, ok := req.GetArguments()["run_id"].(float64)
+	runID, err := params.GetIndex(req.GetArguments(), "run_id")
-	if !ok || runID <= 0 {
+	if err != nil || runID <= 0 {
-		return to.ErrorResult(fmt.Errorf("run_id is required"))
+		return to.ErrorResult(errors.New("run_id is required"))
 	}
 
 	var result any
-	_, _, err := doJSONWithFallback(ctx, "GET",
+	err = doJSONWithFallback(ctx, "GET",
 		[]string{
-			fmt.Sprintf("repos/%s/%s/actions/runs/%d", url.PathEscape(owner), url.PathEscape(repo), int64(runID)),
+			fmt.Sprintf("repos/%s/%s/actions/runs/%d", url.PathEscape(owner), url.PathEscape(repo), runID),
 		},
 		nil, nil, &result,
 	)
@@ -332,20 +322,20 @@ func CancelRepoActionRunFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.C
 	log.Debugf("Called CancelRepoActionRunFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	runID, ok := req.GetArguments()["run_id"].(float64)
+	runID, err := params.GetIndex(req.GetArguments(), "run_id")
-	if !ok || runID <= 0 {
+	if err != nil || runID <= 0 {
-		return to.ErrorResult(fmt.Errorf("run_id is required"))
+		return to.ErrorResult(errors.New("run_id is required"))
 	}
 
-	_, _, err := doJSONWithFallback(ctx, "POST",
+	err = doJSONWithFallback(ctx, "POST",
 		[]string{
-			fmt.Sprintf("repos/%s/%s/actions/runs/%d/cancel", url.PathEscape(owner), url.PathEscape(repo), int64(runID)),
+			fmt.Sprintf("repos/%s/%s/actions/runs/%d/cancel", url.PathEscape(owner), url.PathEscape(repo), runID),
 		},
 		nil, nil, nil,
 	)
@@ -359,27 +349,27 @@ func RerunRepoActionRunFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	log.Debugf("Called RerunRepoActionRunFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	runID, ok := req.GetArguments()["run_id"].(float64)
+	runID, err := params.GetIndex(req.GetArguments(), "run_id")
-	if !ok || runID <= 0 {
+	if err != nil || runID <= 0 {
-		return to.ErrorResult(fmt.Errorf("run_id is required"))
+		return to.ErrorResult(errors.New("run_id is required"))
 	}
 
-	_, _, err := doJSONWithFallback(ctx, "POST",
+	err = doJSONWithFallback(ctx, "POST",
 		[]string{
-			fmt.Sprintf("repos/%s/%s/actions/runs/%d/rerun", url.PathEscape(owner), url.PathEscape(repo), int64(runID)),
+			fmt.Sprintf("repos/%s/%s/actions/runs/%d/rerun", url.PathEscape(owner), url.PathEscape(repo), runID),
-			fmt.Sprintf("repos/%s/%s/actions/runs/%d/rerun-failed-jobs", url.PathEscape(owner), url.PathEscape(repo), int64(runID)),
+			fmt.Sprintf("repos/%s/%s/actions/runs/%d/rerun-failed-jobs", url.PathEscape(owner), url.PathEscape(repo), runID),
 		},
 		nil, nil, nil,
 	)
 	if err != nil {
 		var httpErr *gitea.HTTPError
-		if errors.As(err, &httpErr) && (httpErr.StatusCode == 404 || httpErr.StatusCode == 405) {
+		if errors.As(err, &httpErr) && (httpErr.StatusCode == http.StatusNotFound || httpErr.StatusCode == http.StatusMethodNotAllowed) {
 			return to.ErrorResult(fmt.Errorf("workflow rerun not supported on this Gitea version (endpoint returned %d). Check https://docs.gitea.com/api/1.24/ for available Actions endpoints", httpErr.StatusCode))
 		}
 		return to.ErrorResult(fmt.Errorf("rerun action run err: %v", err))
@@ -391,31 +381,25 @@ func ListRepoActionJobsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	log.Debugf("Called ListRepoActionJobsFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
-	}
-	page, _ := req.GetArguments()["page"].(float64)
-	if page <= 0 {
-		page = 1
-	}
-	pageSize, _ := req.GetArguments()["pageSize"].(float64)
-	if pageSize <= 0 {
-		pageSize = 50
 	}
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 50)
 	statusFilter, _ := req.GetArguments()["status"].(string)
 
 	query := url.Values{}
-	query.Set("page", fmt.Sprintf("%d", int(page)))
+	query.Set("page", strconv.Itoa(int(page)))
-	query.Set("limit", fmt.Sprintf("%d", int(pageSize)))
+	query.Set("limit", strconv.Itoa(int(pageSize)))
 	if statusFilter != "" {
 		query.Set("status", statusFilter)
 	}
 
 	var result any
-	_, _, err := doJSONWithFallback(ctx, "GET",
+	err := doJSONWithFallback(ctx, "GET",
 		[]string{
 			fmt.Sprintf("repos/%s/%s/actions/jobs", url.PathEscape(owner), url.PathEscape(repo)),
 		},
@@ -431,33 +415,27 @@ func ListRepoActionRunJobsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	log.Debugf("Called ListRepoActionRunJobsFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	runID, ok := req.GetArguments()["run_id"].(float64)
+	runID, err := params.GetIndex(req.GetArguments(), "run_id")
-	if !ok || runID <= 0 {
+	if err != nil || runID <= 0 {
-		return to.ErrorResult(fmt.Errorf("run_id is required"))
+		return to.ErrorResult(errors.New("run_id is required"))
-	}
-	page, _ := req.GetArguments()["page"].(float64)
-	if page <= 0 {
-		page = 1
-	}
-	pageSize, _ := req.GetArguments()["pageSize"].(float64)
-	if pageSize <= 0 {
-		pageSize = 50
 	}
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 50)
 
 	query := url.Values{}
-	query.Set("page", fmt.Sprintf("%d", int(page)))
+	query.Set("page", strconv.Itoa(int(page)))
-	query.Set("limit", fmt.Sprintf("%d", int(pageSize)))
+	query.Set("limit", strconv.Itoa(int(pageSize)))
 
 	var result any
-	_, _, err := doJSONWithFallback(ctx, "GET",
+	err = doJSONWithFallback(ctx, "GET",
 		[]string{
-			fmt.Sprintf("repos/%s/%s/actions/runs/%d/jobs", url.PathEscape(owner), url.PathEscape(repo), int64(runID)),
+			fmt.Sprintf("repos/%s/%s/actions/runs/%d/jobs", url.PathEscape(owner), url.PathEscape(repo), runID),
 		},
 		query, nil, &result,
 	)

operation/actions/secrets.go

@@ -2,12 +2,14 @@ package actions
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/url"
 	"time"
 
 	"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"
@@ -27,7 +29,7 @@ const (
 type secretMeta struct {
 	Name        string    `json:"name"`
 	Description string    `json:"description,omitempty"`
-	CreatedAt   time.Time `json:"created_at,omitempty"`
+	CreatedAt   time.Time `json:"created_at,omitzero"`
 }
 
 var (
@@ -97,20 +99,14 @@ func ListRepoActionSecretsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	log.Debugf("Called ListRepoActionSecretsFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
-	}
-	page, _ := req.GetArguments()["page"].(float64)
-	if page <= 0 {
-		page = 1
-	}
-	pageSize, _ := req.GetArguments()["pageSize"].(float64)
-	if pageSize <= 0 {
-		pageSize = 100
 	}
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -142,19 +138,19 @@ func UpsertRepoActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 	log.Debugf("Called UpsertRepoActionSecretFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	name, ok := req.GetArguments()["name"].(string)
 	if !ok || name == "" {
-		return to.ErrorResult(fmt.Errorf("name is required"))
+		return to.ErrorResult(errors.New("name is required"))
 	}
 	data, ok := req.GetArguments()["data"].(string)
 	if !ok || data == "" {
-		return to.ErrorResult(fmt.Errorf("data is required"))
+		return to.ErrorResult(errors.New("data is required"))
 	}
 	description, _ := req.GetArguments()["description"].(string)
 
@@ -177,15 +173,15 @@ func DeleteRepoActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 	log.Debugf("Called DeleteRepoActionSecretFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	secretName, ok := req.GetArguments()["secretName"].(string)
 	if !ok || secretName == "" {
-		return to.ErrorResult(fmt.Errorf("secretName is required"))
+		return to.ErrorResult(errors.New("secretName is required"))
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
@@ -203,16 +199,10 @@ func ListOrgActionSecretsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 	log.Debugf("Called ListOrgActionSecretsFn")
 	org, ok := req.GetArguments()["org"].(string)
 	if !ok || org == "" {
-		return to.ErrorResult(fmt.Errorf("org is required"))
+		return to.ErrorResult(errors.New("org is required"))
-	}
-	page, _ := req.GetArguments()["page"].(float64)
-	if page <= 0 {
-		page = 1
-	}
-	pageSize, _ := req.GetArguments()["pageSize"].(float64)
-	if pageSize <= 0 {
-		pageSize = 100
 	}
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -244,15 +234,15 @@ func UpsertOrgActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	log.Debugf("Called UpsertOrgActionSecretFn")
 	org, ok := req.GetArguments()["org"].(string)
 	if !ok || org == "" {
-		return to.ErrorResult(fmt.Errorf("org is required"))
+		return to.ErrorResult(errors.New("org is required"))
 	}
 	name, ok := req.GetArguments()["name"].(string)
 	if !ok || name == "" {
-		return to.ErrorResult(fmt.Errorf("name is required"))
+		return to.ErrorResult(errors.New("name is required"))
 	}
 	data, ok := req.GetArguments()["data"].(string)
 	if !ok || data == "" {
-		return to.ErrorResult(fmt.Errorf("data is required"))
+		return to.ErrorResult(errors.New("data is required"))
 	}
 	description, _ := req.GetArguments()["description"].(string)
 
@@ -275,11 +265,11 @@ func DeleteOrgActionSecretFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	log.Debugf("Called DeleteOrgActionSecretFn")
 	org, ok := req.GetArguments()["org"].(string)
 	if !ok || org == "" {
-		return to.ErrorResult(fmt.Errorf("org is required"))
+		return to.ErrorResult(errors.New("org is required"))
 	}
 	secretName, ok := req.GetArguments()["secretName"].(string)
 	if !ok || secretName == "" {
-		return to.ErrorResult(fmt.Errorf("secretName is required"))
+		return to.ErrorResult(errors.New("secretName is required"))
 	}
 
 	escapedOrg := url.PathEscape(org)

operation/actions/variables.go

@@ -2,11 +2,14 @@ package actions
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/url"
+	"strconv"
 
 	"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"
@@ -21,11 +24,11 @@ const (
 	UpdateRepoActionVariableToolName = "update_repo_action_variable"
 	DeleteRepoActionVariableToolName = "delete_repo_action_variable"
 
-	ListOrgActionVariablesToolName   = "list_org_action_variables"
+	ListOrgActionVariablesToolName  = "list_org_action_variables"
-	GetOrgActionVariableToolName     = "get_org_action_variable"
+	GetOrgActionVariableToolName    = "get_org_action_variable"
-	CreateOrgActionVariableToolName  = "create_org_action_variable"
+	CreateOrgActionVariableToolName = "create_org_action_variable"
-	UpdateOrgActionVariableToolName  = "update_org_action_variable"
+	UpdateOrgActionVariableToolName = "update_org_action_variable"
-	DeleteOrgActionVariableToolName  = "delete_org_action_variable"
+	DeleteOrgActionVariableToolName = "delete_org_action_variable"
 )
 
 var (
@@ -131,24 +134,18 @@ func ListRepoActionVariablesFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	log.Debugf("Called ListRepoActionVariablesFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
-	}
-	page, _ := req.GetArguments()["page"].(float64)
-	if page <= 0 {
-		page = 1
-	}
-	pageSize, _ := req.GetArguments()["pageSize"].(float64)
-	if pageSize <= 0 {
-		pageSize = 100
 	}
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
 
 	query := url.Values{}
-	query.Set("page", fmt.Sprintf("%d", int(page)))
+	query.Set("page", strconv.Itoa(int(page)))
-	query.Set("limit", fmt.Sprintf("%d", int(pageSize)))
+	query.Set("limit", strconv.Itoa(int(pageSize)))
 
 	var result any
 	_, err := gitea.DoJSON(ctx, "GET", fmt.Sprintf("repos/%s/%s/actions/variables", url.PathEscape(owner), url.PathEscape(repo)), query, nil, &result)
@@ -162,15 +159,15 @@ func GetRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	log.Debugf("Called GetRepoActionVariableFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	name, ok := req.GetArguments()["name"].(string)
 	if !ok || name == "" {
-		return to.ErrorResult(fmt.Errorf("name is required"))
+		return to.ErrorResult(errors.New("name is required"))
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
@@ -188,19 +185,19 @@ func CreateRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*
 	log.Debugf("Called CreateRepoActionVariableFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	name, ok := req.GetArguments()["name"].(string)
 	if !ok || name == "" {
-		return to.ErrorResult(fmt.Errorf("name is required"))
+		return to.ErrorResult(errors.New("name is required"))
 	}
 	value, ok := req.GetArguments()["value"].(string)
 	if !ok || value == "" {
-		return to.ErrorResult(fmt.Errorf("value is required"))
+		return to.ErrorResult(errors.New("value is required"))
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
@@ -218,19 +215,19 @@ func UpdateRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*
 	log.Debugf("Called UpdateRepoActionVariableFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	name, ok := req.GetArguments()["name"].(string)
 	if !ok || name == "" {
-		return to.ErrorResult(fmt.Errorf("name is required"))
+		return to.ErrorResult(errors.New("name is required"))
 	}
 	value, ok := req.GetArguments()["value"].(string)
 	if !ok || value == "" {
-		return to.ErrorResult(fmt.Errorf("value is required"))
+		return to.ErrorResult(errors.New("value is required"))
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
@@ -248,15 +245,15 @@ func DeleteRepoActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*
 	log.Debugf("Called DeleteRepoActionVariableFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok || owner == "" {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok || repo == "" {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	name, ok := req.GetArguments()["name"].(string)
 	if !ok || name == "" {
-		return to.ErrorResult(fmt.Errorf("name is required"))
+		return to.ErrorResult(errors.New("name is required"))
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
@@ -274,16 +271,10 @@ func ListOrgActionVariablesFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 	log.Debugf("Called ListOrgActionVariablesFn")
 	org, ok := req.GetArguments()["org"].(string)
 	if !ok || org == "" {
-		return to.ErrorResult(fmt.Errorf("org is required"))
+		return to.ErrorResult(errors.New("org is required"))
-	}
-	page, _ := req.GetArguments()["page"].(float64)
-	if page <= 0 {
-		page = 1
-	}
-	pageSize, _ := req.GetArguments()["pageSize"].(float64)
-	if pageSize <= 0 {
-		pageSize = 100
 	}
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -302,11 +293,11 @@ func GetOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 	log.Debugf("Called GetOrgActionVariableFn")
 	org, ok := req.GetArguments()["org"].(string)
 	if !ok || org == "" {
-		return to.ErrorResult(fmt.Errorf("org is required"))
+		return to.ErrorResult(errors.New("org is required"))
 	}
 	name, ok := req.GetArguments()["name"].(string)
 	if !ok || name == "" {
-		return to.ErrorResult(fmt.Errorf("name is required"))
+		return to.ErrorResult(errors.New("name is required"))
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
@@ -324,15 +315,15 @@ func CreateOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	log.Debugf("Called CreateOrgActionVariableFn")
 	org, ok := req.GetArguments()["org"].(string)
 	if !ok || org == "" {
-		return to.ErrorResult(fmt.Errorf("org is required"))
+		return to.ErrorResult(errors.New("org is required"))
 	}
 	name, ok := req.GetArguments()["name"].(string)
 	if !ok || name == "" {
-		return to.ErrorResult(fmt.Errorf("name is required"))
+		return to.ErrorResult(errors.New("name is required"))
 	}
 	value, ok := req.GetArguments()["value"].(string)
 	if !ok || value == "" {
-		return to.ErrorResult(fmt.Errorf("value is required"))
+		return to.ErrorResult(errors.New("value is required"))
 	}
 	description, _ := req.GetArguments()["description"].(string)
 
@@ -355,15 +346,15 @@ func UpdateOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	log.Debugf("Called UpdateOrgActionVariableFn")
 	org, ok := req.GetArguments()["org"].(string)
 	if !ok || org == "" {
-		return to.ErrorResult(fmt.Errorf("org is required"))
+		return to.ErrorResult(errors.New("org is required"))
 	}
 	name, ok := req.GetArguments()["name"].(string)
 	if !ok || name == "" {
-		return to.ErrorResult(fmt.Errorf("name is required"))
+		return to.ErrorResult(errors.New("name is required"))
 	}
 	value, ok := req.GetArguments()["value"].(string)
 	if !ok || value == "" {
-		return to.ErrorResult(fmt.Errorf("value is required"))
+		return to.ErrorResult(errors.New("value is required"))
 	}
 	description, _ := req.GetArguments()["description"].(string)
 
@@ -385,11 +376,11 @@ func DeleteOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	log.Debugf("Called DeleteOrgActionVariableFn")
 	org, ok := req.GetArguments()["org"].(string)
 	if !ok || org == "" {
-		return to.ErrorResult(fmt.Errorf("org is required"))
+		return to.ErrorResult(errors.New("org is required"))
 	}
 	name, ok := req.GetArguments()["name"].(string)
 	if !ok || name == "" {
-		return to.ErrorResult(fmt.Errorf("name is required"))
+		return to.ErrorResult(errors.New("name is required"))
 	}
 
 	_, err := gitea.DoJSON(ctx, "DELETE", fmt.Sprintf("orgs/%s/actions/variables/%s", url.PathEscape(org), url.PathEscape(name)), nil, nil, nil)
@@ -398,5 +389,3 @@ func DeleteOrgActionVariableFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	}
 	return to.TextResult(map[string]any{"message": "variable deleted"})
 }
-
-

operation/issue/issue.go

@@ -2,12 +2,12 @@ package issue
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"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/ptr"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
@@ -73,7 +73,7 @@ var (
 		mcp.WithNumber("index", mcp.Required(), mcp.Description("repository issue index")),
 		mcp.WithString("title", mcp.Description("issue title"), mcp.DefaultString("")),
 		mcp.WithString("body", mcp.Description("issue body content")),
-		mcp.WithArray("assignees", mcp.Description("usernames to assign to this issue"), mcp.Items(map[string]interface{}{"type": "string"})),
+		mcp.WithArray("assignees", mcp.Description("usernames to assign to this issue"), mcp.Items(map[string]any{"type": "string"})),
 		mcp.WithNumber("milestone", mcp.Description("milestone number")),
 		mcp.WithString("state", mcp.Description("issue state, one of open, closed, all")),
 	)
@@ -131,11 +131,11 @@ func GetIssueByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	log.Debugf("Called GetIssueByIndexFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
@@ -157,24 +157,18 @@ func ListRepoIssuesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	log.Debugf("Called ListIssuesFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	state, ok := req.GetArguments()["state"].(string)
 	if !ok {
 		state = "all"
 	}
-	page, ok := req.GetArguments()["page"].(float64)
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
-	if !ok {
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
-		page = 1
-	}
-	pageSize, ok := req.GetArguments()["pageSize"].(float64)
-	if !ok {
-		pageSize = 100
-	}
 	opt := gitea_sdk.ListIssueOption{
 		State: gitea_sdk.StateType(state),
 		ListOptions: gitea_sdk.ListOptions{
@@ -197,19 +191,19 @@ func CreateIssueFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolR
 	log.Debugf("Called CreateIssueFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	title, ok := req.GetArguments()["title"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("title is required"))
+		return to.ErrorResult(errors.New("title is required"))
 	}
 	body, ok := req.GetArguments()["body"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("body is required"))
+		return to.ErrorResult(errors.New("body is required"))
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -230,11 +224,11 @@ func CreateIssueCommentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	log.Debugf("Called CreateIssueCommentFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
@@ -242,7 +236,7 @@ func CreateIssueCommentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	}
 	body, ok := req.GetArguments()["body"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("body is required"))
+		return to.ErrorResult(errors.New("body is required"))
 	}
 	opt := gitea_sdk.CreateIssueCommentOption{
 		Body: body,
@@ -263,11 +257,11 @@ func EditIssueFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRes
 	log.Debugf("Called EditIssueFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
@@ -282,11 +276,11 @@ func EditIssueFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRes
 	}
 	body, ok := req.GetArguments()["body"].(string)
 	if ok {
-		opt.Body = ptr.To(body)
+		opt.Body = new(body)
 	}
 	var assignees []string
 	if assigneesArg, exists := req.GetArguments()["assignees"]; exists {
-		if assigneesSlice, ok := assigneesArg.([]interface{}); ok {
+		if assigneesSlice, ok := assigneesArg.([]any); ok {
 			for _, assignee := range assigneesSlice {
 				if assigneeStr, ok := assignee.(string); ok {
 					assignees = append(assignees, assigneeStr)
@@ -295,13 +289,14 @@ func EditIssueFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRes
 		}
 	}
 	opt.Assignees = assignees
-	milestone, ok := req.GetArguments()["milestone"].(float64)
+	if val, exists := req.GetArguments()["milestone"]; exists {
-	if ok {
+		if milestone, ok := params.ToInt64(val); ok {
-		opt.Milestone = ptr.To(int64(milestone))
+			opt.Milestone = new(milestone)
+		}
 	}
 	state, ok := req.GetArguments()["state"].(string)
 	if ok {
-		opt.State = ptr.To(gitea_sdk.StateType(state))
+		opt.State = new(gitea_sdk.StateType(state))
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
@@ -320,19 +315,19 @@ func EditIssueCommentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	log.Debugf("Called EditIssueCommentFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	commentID, ok := req.GetArguments()["commentID"].(float64)
+	commentID, err := params.GetIndex(req.GetArguments(), "commentID")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("comment ID is required"))
+		return to.ErrorResult(err)
 	}
 	body, ok := req.GetArguments()["body"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("body is required"))
+		return to.ErrorResult(errors.New("body is required"))
 	}
 	opt := gitea_sdk.EditIssueCommentOption{
 		Body: body,
@@ -341,9 +336,9 @@ 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, int64(commentID), opt)
+	issueComment, _, err := client.EditIssueComment(owner, repo, commentID, opt)
 	if err != nil {
-		return to.ErrorResult(fmt.Errorf("edit %v/%v/issues/comments/%v err: %v", owner, repo, int64(commentID), err))
+		return to.ErrorResult(fmt.Errorf("edit %v/%v/issues/comments/%v err: %v", owner, repo, commentID, err))
 	}
 
 	return to.TextResult(issueComment)
@@ -353,11 +348,11 @@ func GetIssueCommentsByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	log.Debugf("Called GetIssueCommentsByIndexFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {

operation/label/label.go

@@ -2,12 +2,12 @@ package label
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"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/ptr"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
@@ -28,10 +28,10 @@ const (
 	ReplaceIssueLabelsToolName = "replace_issue_labels"
 	ClearIssueLabelsToolName   = "clear_issue_labels"
 	RemoveIssueLabelToolName   = "remove_issue_label"
-    ListOrgLabelsToolName      = "list_org_labels"
+	ListOrgLabelsToolName      = "list_org_labels"
-    CreateOrgLabelToolName     = "create_org_label"
+	CreateOrgLabelToolName     = "create_org_label"
-    EditOrgLabelToolName       = "edit_org_label"
+	EditOrgLabelToolName       = "edit_org_label"
-    DeleteOrgLabelToolName     = "delete_org_label"
+	DeleteOrgLabelToolName     = "delete_org_label"
 )
 
 var (
@@ -87,7 +87,7 @@ var (
 		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("issue index")),
-		mcp.WithArray("labels", mcp.Required(), mcp.Description("array of label IDs to add"), mcp.Items(map[string]interface{}{"type": "number"})),
+		mcp.WithArray("labels", mcp.Required(), mcp.Description("array of label IDs to add"), mcp.Items(map[string]any{"type": "number"})),
 	)
 
 	ReplaceIssueLabelsTool = mcp.NewTool(
@@ -96,7 +96,7 @@ var (
 		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("issue index")),
-		mcp.WithArray("labels", mcp.Required(), mcp.Description("array of label IDs to replace with"), mcp.Items(map[string]interface{}{"type": "number"})),
+		mcp.WithArray("labels", mcp.Required(), mcp.Description("array of label IDs to replace with"), mcp.Items(map[string]any{"type": "number"})),
 	)
 
 	ClearIssueLabelsTool = mcp.NewTool(
@@ -116,42 +116,41 @@ var (
 		mcp.WithNumber("label_id", mcp.Required(), mcp.Description("label ID to remove")),
 	)
 
-    ListOrgLabelsTool = mcp.NewTool(
+	ListOrgLabelsTool = mcp.NewTool(
-        ListOrgLabelsToolName,
+		ListOrgLabelsToolName,
-        mcp.WithDescription("Lists labels defined at organization level"),
+		mcp.WithDescription("Lists labels defined at organization level"),
-        mcp.WithString("org", mcp.Required(), mcp.Description("organization name")),
+		mcp.WithString("org", mcp.Required(), mcp.Description("organization name")),
-        mcp.WithNumber("page", mcp.Description("page number"), mcp.DefaultNumber(1)),
+		mcp.WithNumber("page", mcp.Description("page number"), mcp.DefaultNumber(1)),
-        mcp.WithNumber("pageSize", mcp.Description("page size"), mcp.DefaultNumber(100)),
+		mcp.WithNumber("pageSize", mcp.Description("page size"), mcp.DefaultNumber(100)),
-    )
+	)
 
-    CreateOrgLabelTool = mcp.NewTool(
+	CreateOrgLabelTool = mcp.NewTool(
-        CreateOrgLabelToolName,
+		CreateOrgLabelToolName,
-        mcp.WithDescription("Creates a new label for an organization"),
+		mcp.WithDescription("Creates a new label for an organization"),
-        mcp.WithString("org", mcp.Required(), mcp.Description("organization name")),
+		mcp.WithString("org", mcp.Required(), mcp.Description("organization name")),
-        mcp.WithString("name", mcp.Required(), mcp.Description("label name")),
+		mcp.WithString("name", mcp.Required(), mcp.Description("label name")),
-        mcp.WithString("color", mcp.Required(), mcp.Description("label color (hex code, e.g., #RRGGBB)")),
+		mcp.WithString("color", mcp.Required(), mcp.Description("label color (hex code, e.g., #RRGGBB)")),
-        mcp.WithString("description", mcp.Description("label description")),
+		mcp.WithString("description", mcp.Description("label description")),
-        mcp.WithBoolean("exclusive", mcp.Description("whether the label is exclusive"), mcp.DefaultBool(false)),
+		mcp.WithBoolean("exclusive", mcp.Description("whether the label is exclusive"), mcp.DefaultBool(false)),
-    )
+	)
 
-    EditOrgLabelTool = mcp.NewTool(
+	EditOrgLabelTool = mcp.NewTool(
-        EditOrgLabelToolName,
+		EditOrgLabelToolName,
-        mcp.WithDescription("Edits an existing organization label"),
+		mcp.WithDescription("Edits an existing organization label"),
-        mcp.WithString("org", mcp.Required(), mcp.Description("organization name")),
+		mcp.WithString("org", mcp.Required(), mcp.Description("organization name")),
-        mcp.WithNumber("id", mcp.Required(), mcp.Description("label ID")),
+		mcp.WithNumber("id", mcp.Required(), mcp.Description("label ID")),
-        mcp.WithString("name", mcp.Description("new label name")),
+		mcp.WithString("name", mcp.Description("new label name")),
-        mcp.WithString("color", mcp.Description("new label color (hex code, e.g., #RRGGBB)")),
+		mcp.WithString("color", mcp.Description("new label color (hex code, e.g., #RRGGBB)")),
-        mcp.WithString("description", mcp.Description("new label description")),
+		mcp.WithString("description", mcp.Description("new label description")),
-        mcp.WithBoolean("exclusive", mcp.Description("whether the label is exclusive")),
+		mcp.WithBoolean("exclusive", mcp.Description("whether the label is exclusive")),
-    )
+	)
-
-    DeleteOrgLabelTool = mcp.NewTool(
-        DeleteOrgLabelToolName,
-        mcp.WithDescription("Deletes an organization label by ID"),
-        mcp.WithString("org", mcp.Required(), mcp.Description("organization name")),
-        mcp.WithNumber("id", mcp.Required(), mcp.Description("label ID")),
-    )
 
+	DeleteOrgLabelTool = mcp.NewTool(
+		DeleteOrgLabelToolName,
+		mcp.WithDescription("Deletes an organization label by ID"),
+		mcp.WithString("org", mcp.Required(), mcp.Description("organization name")),
+		mcp.WithNumber("id", mcp.Required(), mcp.Description("label ID")),
+	)
 )
 
 func init() {
@@ -191,42 +190,36 @@ func init() {
 		Tool:    RemoveIssueLabelTool,
 		Handler: RemoveIssueLabelFn,
 	})
-    Tool.RegisterRead(server.ServerTool{
+	Tool.RegisterRead(server.ServerTool{
-        Tool:    ListOrgLabelsTool,
+		Tool:    ListOrgLabelsTool,
-        Handler: ListOrgLabelsFn,
+		Handler: ListOrgLabelsFn,
-    })
+	})
-    Tool.RegisterWrite(server.ServerTool{
+	Tool.RegisterWrite(server.ServerTool{
-        Tool:    CreateOrgLabelTool,
+		Tool:    CreateOrgLabelTool,
-        Handler: CreateOrgLabelFn,
+		Handler: CreateOrgLabelFn,
-    })
+	})
-    Tool.RegisterWrite(server.ServerTool{
+	Tool.RegisterWrite(server.ServerTool{
-        Tool:    EditOrgLabelTool,
+		Tool:    EditOrgLabelTool,
-        Handler: EditOrgLabelFn,
+		Handler: EditOrgLabelFn,
-    })
+	})
-    Tool.RegisterWrite(server.ServerTool{
+	Tool.RegisterWrite(server.ServerTool{
-        Tool:    DeleteOrgLabelTool,
+		Tool:    DeleteOrgLabelTool,
-        Handler: DeleteOrgLabelFn,
+		Handler: DeleteOrgLabelFn,
-    })
+	})
 }
 
 func ListRepoLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 	log.Debugf("Called ListRepoLabelsFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
-	}
-	page, ok := req.GetArguments()["page"].(float64)
-	if !ok {
-		page = 1
-	}
-	pageSize, ok := req.GetArguments()["pageSize"].(float64)
-	if !ok {
-		pageSize = 100
 	}
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
 
 	opt := gitea_sdk.ListLabelsOptions{
 		ListOptions: gitea_sdk.ListOptions{
@@ -249,24 +242,24 @@ func GetRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	log.Debugf("Called GetRepoLabelFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	id, ok := req.GetArguments()["id"].(float64)
+	id, err := params.GetIndex(req.GetArguments(), "id")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("label ID is required"))
+		return to.ErrorResult(err)
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	label, _, err := client.GetRepoLabel(owner, repo, int64(id))
+	label, _, err := client.GetRepoLabel(owner, repo, id)
 	if err != nil {
-		return to.ErrorResult(fmt.Errorf("get %v/%v/label/%v err: %v", owner, repo, int64(id), err))
+		return to.ErrorResult(fmt.Errorf("get %v/%v/label/%v err: %v", owner, repo, id, err))
 	}
 	return to.TextResult(label)
 }
@@ -275,19 +268,19 @@ func CreateRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	log.Debugf("Called CreateRepoLabelFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	name, ok := req.GetArguments()["name"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("name is required"))
+		return to.ErrorResult(errors.New("name is required"))
 	}
 	color, ok := req.GetArguments()["color"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("color is required"))
+		return to.ErrorResult(errors.New("color is required"))
 	}
 	description, _ := req.GetArguments()["description"].(string) // Optional
 
@@ -312,35 +305,35 @@ func EditRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	log.Debugf("Called EditRepoLabelFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	id, ok := req.GetArguments()["id"].(float64)
+	id, err := params.GetIndex(req.GetArguments(), "id")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("label ID is required"))
+		return to.ErrorResult(err)
 	}
 
 	opt := gitea_sdk.EditLabelOption{}
 	if name, ok := req.GetArguments()["name"].(string); ok {
-		opt.Name = ptr.To(name)
+		opt.Name = new(name)
 	}
 	if color, ok := req.GetArguments()["color"].(string); ok {
-		opt.Color = ptr.To(color)
+		opt.Color = new(color)
 	}
 	if description, ok := req.GetArguments()["description"].(string); ok {
-		opt.Description = ptr.To(description)
+		opt.Description = new(description)
 	}
 
 	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, int64(id), opt)
+	label, _, err := client.EditLabel(owner, repo, id, opt)
 	if err != nil {
-		return to.ErrorResult(fmt.Errorf("edit %v/%v/label/%v err: %v", owner, repo, int64(id), err))
+		return to.ErrorResult(fmt.Errorf("edit %v/%v/label/%v err: %v", owner, repo, id, err))
 	}
 	return to.TextResult(label)
 }
@@ -349,24 +342,24 @@ func DeleteRepoLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	log.Debugf("Called DeleteRepoLabelFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	id, ok := req.GetArguments()["id"].(float64)
+	id, err := params.GetIndex(req.GetArguments(), "id")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("label ID is required"))
+		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.DeleteLabel(owner, repo, int64(id))
+	_, err = client.DeleteLabel(owner, repo, id)
 	if err != nil {
-		return to.ErrorResult(fmt.Errorf("delete %v/%v/label/%v err: %v", owner, repo, int64(id), err))
+		return to.ErrorResult(fmt.Errorf("delete %v/%v/label/%v err: %v", owner, repo, id, err))
 	}
 	return to.TextResult("Label deleted successfully")
 }
@@ -375,26 +368,26 @@ func AddIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	log.Debugf("Called AddIssueLabelsFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	labelsRaw, ok := req.GetArguments()["labels"].([]interface{})
+	labelsRaw, ok := req.GetArguments()["labels"].([]any)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("labels (array of IDs) is required"))
+		return to.ErrorResult(errors.New("labels (array of IDs) is required"))
 	}
 	var labels []int64
 	for _, l := range labelsRaw {
-		if labelID, ok := l.(float64); ok {
+		if labelID, ok := params.ToInt64(l); ok {
-			labels = append(labels, int64(labelID))
+			labels = append(labels, labelID)
 		} else {
-			return to.ErrorResult(fmt.Errorf("invalid label ID in labels array"))
+			return to.ErrorResult(errors.New("invalid label ID in labels array"))
 		}
 	}
 
@@ -417,26 +410,26 @@ func ReplaceIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	log.Debugf("Called ReplaceIssueLabelsFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	labelsRaw, ok := req.GetArguments()["labels"].([]interface{})
+	labelsRaw, ok := req.GetArguments()["labels"].([]any)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("labels (array of IDs) is required"))
+		return to.ErrorResult(errors.New("labels (array of IDs) is required"))
 	}
 	var labels []int64
 	for _, l := range labelsRaw {
-		if labelID, ok := l.(float64); ok {
+		if labelID, ok := params.ToInt64(l); ok {
-			labels = append(labels, int64(labelID))
+			labels = append(labels, labelID)
 		} else {
-			return to.ErrorResult(fmt.Errorf("invalid label ID in labels array"))
+			return to.ErrorResult(errors.New("invalid label ID in labels array"))
 		}
 	}
 
@@ -459,11 +452,11 @@ func ClearIssueLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	log.Debugf("Called ClearIssueLabelsFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
@@ -485,153 +478,147 @@ func RemoveIssueLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	log.Debugf("Called RemoveIssueLabelFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	labelID, ok := req.GetArguments()["label_id"].(float64)
+	labelID, err := params.GetIndex(req.GetArguments(), "label_id")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("label ID is required"))
+		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.DeleteIssueLabel(owner, repo, index, int64(labelID))
+	_, err = client.DeleteIssueLabel(owner, repo, index, labelID)
 	if err != nil {
-		return to.ErrorResult(fmt.Errorf("remove label %v from %v/%v/issue/%v err: %v", int64(labelID), owner, repo, index, err))
+		return to.ErrorResult(fmt.Errorf("remove label %v from %v/%v/issue/%v err: %v", labelID, owner, repo, index, err))
 	}
 	return to.TextResult("Label removed successfully")
 }
 
 func ListOrgLabelsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-    log.Debugf("Called ListOrgLabelsFn")
+	log.Debugf("Called ListOrgLabelsFn")
-    org, ok := req.GetArguments()["org"].(string)
+	org, ok := req.GetArguments()["org"].(string)
-    if !ok {
+	if !ok {
-        return to.ErrorResult(fmt.Errorf("org is required"))
+		return to.ErrorResult(errors.New("org is required"))
-    }
+	}
-    page, ok := req.GetArguments()["page"].(float64)
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
-    if !ok {
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
-        page = 1
-    }
-    pageSize, ok := req.GetArguments()["pageSize"].(float64)
-    if !ok {
-        pageSize = 100
-    }
 
-    opt := gitea_sdk.ListOrgLabelsOptions{
+	opt := gitea_sdk.ListOrgLabelsOptions{
-        ListOptions: gitea_sdk.ListOptions{
+		ListOptions: gitea_sdk.ListOptions{
-            Page:     int(page),
+			Page:     int(page),
-            PageSize: int(pageSize),
+			PageSize: int(pageSize),
-        },
+		},
-    }
+	}
-    client, err := gitea.ClientFromContext(ctx)
+	client, err := gitea.ClientFromContext(ctx)
-    if err != nil {
+	if err != nil {
-        return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
-    }
+	}
-    labels, _, err := client.ListOrgLabels(org, opt)
+	labels, _, err := client.ListOrgLabels(org, opt)
-    if err != nil {
+	if err != nil {
-        return to.ErrorResult(fmt.Errorf("list %v/labels err: %v", org, err))
+		return to.ErrorResult(fmt.Errorf("list %v/labels err: %v", org, err))
-    }
+	}
-    return to.TextResult(labels)
+	return to.TextResult(labels)
 }
 
 func CreateOrgLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-    log.Debugf("Called CreateOrgLabelFn")
+	log.Debugf("Called CreateOrgLabelFn")
-    org, ok := req.GetArguments()["org"].(string)
+	org, ok := req.GetArguments()["org"].(string)
-    if !ok {
+	if !ok {
-        return to.ErrorResult(fmt.Errorf("org is required"))
+		return to.ErrorResult(errors.New("org is required"))
-    }
+	}
-    name, ok := req.GetArguments()["name"].(string)
+	name, ok := req.GetArguments()["name"].(string)
-    if !ok {
+	if !ok {
-        return to.ErrorResult(fmt.Errorf("name is required"))
+		return to.ErrorResult(errors.New("name is required"))
-    }
+	}
-    color, ok := req.GetArguments()["color"].(string)
+	color, ok := req.GetArguments()["color"].(string)
-    if !ok {
+	if !ok {
-        return to.ErrorResult(fmt.Errorf("color is required"))
+		return to.ErrorResult(errors.New("color is required"))
-    }
+	}
-    description, _ := req.GetArguments()["description"].(string)
+	description, _ := req.GetArguments()["description"].(string)
-    exclusive, _ := req.GetArguments()["exclusive"].(bool)
+	exclusive, _ := req.GetArguments()["exclusive"].(bool)
 
-    opt := gitea_sdk.CreateOrgLabelOption{
+	opt := gitea_sdk.CreateOrgLabelOption{
-        Name:        name,
+		Name:        name,
-        Color:       color,
+		Color:       color,
-        Description: description,
+		Description: description,
-        Exclusive:   exclusive,
+		Exclusive:   exclusive,
-    }
+	}
 
-    client, err := gitea.ClientFromContext(ctx)
+	client, err := gitea.ClientFromContext(ctx)
-    if err != nil {
+	if err != nil {
-        return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
-    }
+	}
-    label, _, err := client.CreateOrgLabel(org, opt)
+	label, _, err := client.CreateOrgLabel(org, opt)
-    if err != nil {
+	if err != nil {
-        return to.ErrorResult(fmt.Errorf("create %v/labels err: %v", org, err))
+		return to.ErrorResult(fmt.Errorf("create %v/labels err: %v", org, err))
-    }
+	}
-    return to.TextResult(label)
+	return to.TextResult(label)
 }
 
 func EditOrgLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-    log.Debugf("Called EditOrgLabelFn")
+	log.Debugf("Called EditOrgLabelFn")
-    org, ok := req.GetArguments()["org"].(string)
+	org, ok := req.GetArguments()["org"].(string)
-    if !ok {
+	if !ok {
-        return to.ErrorResult(fmt.Errorf("org is required"))
+		return to.ErrorResult(errors.New("org is required"))
-    }
+	}
-    id, ok := req.GetArguments()["id"].(float64)
+	id, err := params.GetIndex(req.GetArguments(), "id")
-    if !ok {
+	if err != nil {
-        return to.ErrorResult(fmt.Errorf("label ID is required"))
+		return to.ErrorResult(err)
-    }
+	}
 
-    opt := gitea_sdk.EditOrgLabelOption{}
+	opt := gitea_sdk.EditOrgLabelOption{}
-    if name, ok := req.GetArguments()["name"].(string); ok {
+	if name, ok := req.GetArguments()["name"].(string); ok {
-        opt.Name = ptr.To(name)
+		opt.Name = new(name)
-    }
+	}
-    if color, ok := req.GetArguments()["color"].(string); ok {
+	if color, ok := req.GetArguments()["color"].(string); ok {
-        opt.Color = ptr.To(color)
+		opt.Color = new(color)
-    }
+	}
-    if description, ok := req.GetArguments()["description"].(string); ok {
+	if description, ok := req.GetArguments()["description"].(string); ok {
-        opt.Description = ptr.To(description)
+		opt.Description = new(description)
-    }
+	}
-    if exclusive, ok := req.GetArguments()["exclusive"].(bool); ok {
+	if exclusive, ok := req.GetArguments()["exclusive"].(bool); ok {
-        opt.Exclusive = ptr.To(exclusive)
+		opt.Exclusive = new(exclusive)
-    }
+	}
 
-    client, err := gitea.ClientFromContext(ctx)
+	client, err := gitea.ClientFromContext(ctx)
-    if err != nil {
+	if err != nil {
-        return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
-    }
+	}
-    label, _, err := client.EditOrgLabel(org, int64(id), opt)
+	label, _, err := client.EditOrgLabel(org, id, opt)
-    if err != nil {
+	if err != nil {
-        return to.ErrorResult(fmt.Errorf("edit %v/labels/%v err: %v", org, int64(id), err))
+		return to.ErrorResult(fmt.Errorf("edit %v/labels/%v err: %v", org, id, err))
-    }
+	}
-    return to.TextResult(label)
+	return to.TextResult(label)
 }
 
 func DeleteOrgLabelFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-    log.Debugf("Called DeleteOrgLabelFn")
+	log.Debugf("Called DeleteOrgLabelFn")
-    org, ok := req.GetArguments()["org"].(string)
+	org, ok := req.GetArguments()["org"].(string)
-    if !ok {
+	if !ok {
-        return to.ErrorResult(fmt.Errorf("org is required"))
+		return to.ErrorResult(errors.New("org is required"))
-    }
+	}
-    id, ok := req.GetArguments()["id"].(float64)
+	id, err := params.GetIndex(req.GetArguments(), "id")
-    if !ok {
+	if err != nil {
-        return to.ErrorResult(fmt.Errorf("label ID is required"))
+		return to.ErrorResult(err)
-    }
+	}
 
-    client, err := gitea.ClientFromContext(ctx)
+	client, err := gitea.ClientFromContext(ctx)
-    if err != nil {
+	if err != nil {
-        return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
+		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
-    }
+	}
-    _, err = client.DeleteOrgLabel(org, int64(id))
+	_, err = client.DeleteOrgLabel(org, id)
-    if err != nil {
+	if err != nil {
-        return to.ErrorResult(fmt.Errorf("delete %v/labels/%v err: %v", org, int64(id), err))
+		return to.ErrorResult(fmt.Errorf("delete %v/labels/%v err: %v", org, id, err))
-    }
+	}
-    return to.TextResult("Label deleted successfully")
+	return to.TextResult("Label deleted successfully")
-}
+}

operation/milestone/milestone.go

@@ -2,11 +2,12 @@ package milestone
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
 	"gitea.com/gitea/gitea-mcp/pkg/log"
-	"gitea.com/gitea/gitea-mcp/pkg/ptr"
+	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
@@ -103,23 +104,23 @@ func GetMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	log.Debugf("Called GetMilestoneFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	id, ok := req.GetArguments()["id"].(float64)
+	id, err := params.GetIndex(req.GetArguments(), "id")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("id is required"))
+		return to.ErrorResult(err)
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	milestone, _, err := client.GetMilestone(owner, repo, int64(id))
+	milestone, _, err := client.GetMilestone(owner, repo, id)
 	if err != nil {
-		return to.ErrorResult(fmt.Errorf("get %v/%v/milestone/%v err: %v", owner, repo, int64(id), err))
+		return to.ErrorResult(fmt.Errorf("get %v/%v/milestone/%v err: %v", owner, repo, id, err))
 	}
 
 	return to.TextResult(milestone)
@@ -129,11 +130,11 @@ func ListMilestonesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	log.Debugf("Called ListMilestonesFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	state, ok := req.GetArguments()["state"].(string)
 	if !ok {
@@ -143,14 +144,8 @@ func ListMilestonesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	if !ok {
 		name = ""
 	}
-	page, ok := req.GetArguments()["page"].(float64)
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
-	if !ok {
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
-		page = 1
-	}
-	pageSize, ok := req.GetArguments()["pageSize"].(float64)
-	if !ok {
-		pageSize = 100
-	}
 	opt := gitea_sdk.ListMilestoneOption{
 		State: gitea_sdk.StateType(state),
 		Name:  name,
@@ -174,15 +169,15 @@ func CreateMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	log.Debugf("Called CreateMilestoneFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	title, ok := req.GetArguments()["title"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("title is required"))
+		return to.ErrorResult(errors.New("title is required"))
 	}
 
 	opt := gitea_sdk.CreateMilestoneOption{
@@ -210,15 +205,15 @@ func EditMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	log.Debugf("Called EditMilestoneFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	id, ok := req.GetArguments()["id"].(float64)
+	id, err := params.GetIndex(req.GetArguments(), "id")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("id is required"))
+		return to.ErrorResult(err)
 	}
 
 	opt := gitea_sdk.EditMilestoneOption{}
@@ -229,20 +224,20 @@ func EditMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	}
 	description, ok := req.GetArguments()["description"].(string)
 	if ok {
-		opt.Description = ptr.To(description)
+		opt.Description = new(description)
 	}
 	state, ok := req.GetArguments()["state"].(string)
 	if ok {
-		opt.State = ptr.To(gitea_sdk.StateType(state))
+		opt.State = new(gitea_sdk.StateType(state))
 	}
 
 	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, int64(id), opt)
+	milestone, _, err := client.EditMilestone(owner, repo, id, opt)
 	if err != nil {
-		return to.ErrorResult(fmt.Errorf("edit %v/%v/milestone/%v err: %v", owner, repo, int64(id), err))
+		return to.ErrorResult(fmt.Errorf("edit %v/%v/milestone/%v err: %v", owner, repo, id, err))
 	}
 
 	return to.TextResult(milestone)
@@ -252,23 +247,23 @@ func DeleteMilestoneFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	log.Debugf("Called DeleteMilestoneFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	id, ok := req.GetArguments()["id"].(float64)
+	id, err := params.GetIndex(req.GetArguments(), "id")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("id is required"))
+		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.DeleteMilestone(owner, repo, int64(id))
+	_, err = client.DeleteMilestone(owner, repo, id)
 	if err != nil {
-		return to.ErrorResult(fmt.Errorf("delete %v/%v/milestone/%v err: %v", owner, repo, int64(id), err))
+		return to.ErrorResult(fmt.Errorf("delete %v/%v/milestone/%v err: %v", owner, repo, id, err))
 	}
 
 	return to.TextResult("Milestone deleted successfully")

operation/operation.go

@@ -10,14 +10,14 @@ import (
 	"syscall"
 	"time"
 
+	"gitea.com/gitea/gitea-mcp/operation/actions"
 	"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/timetracking"
-	"gitea.com/gitea/gitea-mcp/operation/actions"
 	"gitea.com/gitea/gitea-mcp/operation/pull"
 	"gitea.com/gitea/gitea-mcp/operation/repo"
 	"gitea.com/gitea/gitea-mcp/operation/search"
+	"gitea.com/gitea/gitea-mcp/operation/timetracking"
 	"gitea.com/gitea/gitea-mcp/operation/user"
 	"gitea.com/gitea/gitea-mcp/operation/version"
 	"gitea.com/gitea/gitea-mcp/operation/wiki"
@@ -67,20 +67,24 @@ func RegisterTool(s *server.MCPServer) {
 	s.DeleteTools("")
 }
 
-// parseBearerToken extracts the Bearer token from an Authorization header.
+// parseAuthToken extracts the token from an Authorization header.
+// Supports "Bearer <token>" (case-insensitive per RFC 7235) and
+// Gitea-style "token <token>" formats.
 // Returns the token and true if valid, empty string and false otherwise.
-func parseBearerToken(authHeader string) (string, bool) {
+func parseAuthToken(authHeader string) (string, bool) {
-	const bearerPrefix = "Bearer "
+	if len(authHeader) > 7 && strings.EqualFold(authHeader[:7], "Bearer ") {
-	if len(authHeader) < len(bearerPrefix) || !strings.HasPrefix(authHeader, bearerPrefix) {
+		token := strings.TrimSpace(authHeader[7:])
-		return "", false
+		if token != "" {
+			return token, true
+		}
 	}
-
+	if len(authHeader) > 6 && strings.EqualFold(authHeader[:6], "token ") {
-	token := strings.TrimSpace(authHeader[len(bearerPrefix):])
+		token := strings.TrimSpace(authHeader[6:])
-	if token == "" {
+		if token != "" {
-		return "", false
+			return token, true
+		}
 	}
-
+	return "", false
-	return token, true
 }
 
 func getContextWithToken(ctx context.Context, r *http.Request) context.Context {
@@ -89,7 +93,7 @@ func getContextWithToken(ctx context.Context, r *http.Request) context.Context {
 		return ctx
 	}
 
-	token, ok := parseBearerToken(authHeader)
+	token, ok := parseAuthToken(authHeader)
 	if !ok {
 		return ctx
 	}

operation/operation_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 )
 
-func TestParseBearerToken(t *testing.T) {
+func TestParseAuthToken(t *testing.T) {
 	tests := []struct {
 		name      string
 		header    string
@@ -12,23 +12,29 @@ func TestParseBearerToken(t *testing.T) {
 		wantOK    bool
 	}{
 		{
-			name:      "valid token",
+			name:      "valid Bearer token",
 			header:    "Bearer validtoken",
 			wantToken: "validtoken",
 			wantOK:    true,
 		},
+		{
+			name:      "lowercase bearer",
+			header:    "bearer lowercase",
+			wantToken: "lowercase",
+			wantOK:    true,
+		},
+		{
+			name:      "uppercase BEARER",
+			header:    "BEARER uppercase",
+			wantToken: "uppercase",
+			wantOK:    true,
+		},
 		{
 			name:      "token with spaces trimmed",
 			header:    "Bearer   spacedToken ",
 			wantToken: "spacedToken",
 			wantOK:    true,
 		},
-		{
-			name:      "lowercase bearer should fail",
-			header:    "bearer lowercase",
-			wantToken: "",
-			wantOK:    false,
-		},
 		{
 			name:      "bearer with no token",
 			header:    "Bearer ",
@@ -47,6 +53,24 @@ func TestParseBearerToken(t *testing.T) {
 			wantToken: "",
 			wantOK:    false,
 		},
+		{
+			name:      "Gitea token format",
+			header:    "token giteaapitoken",
+			wantToken: "giteaapitoken",
+			wantOK:    true,
+		},
+		{
+			name:      "Gitea Token format capitalized",
+			header:    "Token giteaapitoken",
+			wantToken: "giteaapitoken",
+			wantOK:    true,
+		},
+		{
+			name:      "token with no value",
+			header:    "token ",
+			wantToken: "",
+			wantOK:    false,
+		},
 		{
 			name:      "different auth type",
 			header:    "Basic dXNlcjpwYXNz",
@@ -60,7 +84,7 @@ func TestParseBearerToken(t *testing.T) {
 			wantOK:    false,
 		},
 		{
-			name:      "token with internal spaces",
+			name:      "bearer token with internal spaces",
 			header:    "Bearer token with spaces",
 			wantToken: "token with spaces",
 			wantOK:    true,
@@ -69,12 +93,12 @@ func TestParseBearerToken(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			gotToken, gotOK := parseBearerToken(tt.header)
+			gotToken, gotOK := parseAuthToken(tt.header)
 			if gotToken != tt.wantToken {
-				t.Errorf("parseBearerToken() token = %q, want %q", gotToken, tt.wantToken)
+				t.Errorf("parseAuthToken() token = %q, want %q", gotToken, tt.wantToken)
 			}
 			if gotOK != tt.wantOK {
-				t.Errorf("parseBearerToken() ok = %v, want %v", gotOK, tt.wantOK)
+				t.Errorf("parseAuthToken() ok = %v, want %v", gotOK, tt.wantOK)
 			}
 		})
 	}

operation/pull/pull.go

@@ -2,12 +2,12 @@ package pull
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"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/ptr"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
@@ -83,8 +83,8 @@ var (
 		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.WithArray("reviewers", mcp.Description("list of reviewer usernames"), mcp.Items(map[string]interface{}{"type": "string"})),
+		mcp.WithArray("reviewers", mcp.Description("list of reviewer usernames"), mcp.Items(map[string]any{"type": "string"})),
-		mcp.WithArray("team_reviewers", mcp.Description("list of team reviewer names"), mcp.Items(map[string]interface{}{"type": "string"})),
+		mcp.WithArray("team_reviewers", mcp.Description("list of team reviewer names"), mcp.Items(map[string]any{"type": "string"})),
 	)
 
 	DeletePullRequestReviewerTool = mcp.NewTool(
@@ -93,8 +93,8 @@ var (
 		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.WithArray("reviewers", mcp.Description("list of reviewer usernames to remove"), mcp.Items(map[string]interface{}{"type": "string"})),
+		mcp.WithArray("reviewers", mcp.Description("list of reviewer usernames to remove"), mcp.Items(map[string]any{"type": "string"})),
-		mcp.WithArray("team_reviewers", mcp.Description("list of team reviewer names to remove"), mcp.Items(map[string]interface{}{"type": "string"})),
+		mcp.WithArray("team_reviewers", mcp.Description("list of team reviewer names to remove"), mcp.Items(map[string]any{"type": "string"})),
 	)
 
 	ListPullRequestReviewsTool = mcp.NewTool(
@@ -134,13 +134,13 @@ var (
 		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")),
-		mcp.WithArray("comments", mcp.Description("inline review comments (objects with path, body, old_line_num, new_line_num)"), mcp.Items(map[string]interface{}{
+		mcp.WithArray("comments", mcp.Description("inline review comments (objects with path, body, old_line_num, new_line_num)"), mcp.Items(map[string]any{
 			"type": "object",
-			"properties": map[string]interface{}{
+			"properties": map[string]any{
-				"path":         map[string]interface{}{"type": "string", "description": "file path to comment on"},
+				"path":         map[string]any{"type": "string", "description": "file path to comment on"},
-				"body":         map[string]interface{}{"type": "string", "description": "comment body"},
+				"body":         map[string]any{"type": "string", "description": "comment body"},
-				"old_line_num": map[string]interface{}{"type": "number", "description": "line number in the old file (for deletions/changes)"},
+				"old_line_num": map[string]any{"type": "number", "description": "line number in the old file (for deletions/changes)"},
-				"new_line_num": map[string]interface{}{"type": "number", "description": "line number in the new file (for additions/changes)"},
+				"new_line_num": map[string]any{"type": "number", "description": "line number in the new file (for additions/changes)"},
 			},
 		})),
 	)
@@ -182,7 +182,8 @@ var (
 		mcp.WithString("repo", mcp.Required(), mcp.Description("repository name")),
 		mcp.WithNumber("index", mcp.Required(), mcp.Description("pull request index")),
 		mcp.WithString("merge_style", mcp.Description("merge style: merge, rebase, rebase-merge, squash, fast-forward-only"), mcp.Enum("merge", "rebase", "rebase-merge", "squash", "fast-forward-only"), mcp.DefaultString("merge")),
-		mcp.WithString("message", mcp.Description("custom merge commit message (optional)")),
+		mcp.WithString("title", mcp.Description("custom merge commit title")),
+		mcp.WithString("message", mcp.Description("custom merge commit message")),
 		mcp.WithBoolean("delete_branch", mcp.Description("delete the branch after merge"), mcp.DefaultBool(false)),
 	)
 
@@ -196,7 +197,7 @@ var (
 		mcp.WithString("body", mcp.Description("pull request body content")),
 		mcp.WithString("base", mcp.Description("pull request base branch")),
 		mcp.WithString("assignee", mcp.Description("username to assign")),
-		mcp.WithArray("assignees", mcp.Description("usernames to assign"), mcp.Items(map[string]interface{}{"type": "string"})),
+		mcp.WithArray("assignees", mcp.Description("usernames to assign"), mcp.Items(map[string]any{"type": "string"})),
 		mcp.WithNumber("milestone", mcp.Description("milestone number")),
 		mcp.WithString("state", mcp.Description("pull request state"), mcp.Enum("open", "closed")),
 		mcp.WithBoolean("allow_maintainer_edit", mcp.Description("allow maintainer to edit the pull request")),
@@ -270,11 +271,11 @@ func GetPullRequestByIndexFn(ctx context.Context, req mcp.CallToolRequest) (*mcp
 	log.Debugf("Called GetPullRequestByIndexFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
@@ -296,11 +297,11 @@ func GetPullRequestDiffFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 	log.Debugf("Called GetPullRequestDiffFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
@@ -319,7 +320,7 @@ func GetPullRequestDiffFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Ca
 		return to.ErrorResult(fmt.Errorf("get %v/%v/pr/%v diff err: %v", owner, repo, index, err))
 	}
 
-	result := map[string]interface{}{
+	result := map[string]any{
 		"diff":   string(diffBytes),
 		"binary": binary,
 		"index":  index,
@@ -333,30 +334,24 @@ func ListRepoPullRequestsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 	log.Debugf("Called ListRepoPullRequests")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	state, _ := req.GetArguments()["state"].(string)
 	sort, ok := req.GetArguments()["sort"].(string)
 	if !ok {
 		sort = "recentupdate"
 	}
-	milestone, _ := req.GetArguments()["milestone"].(float64)
+	milestone := params.GetOptionalInt(req.GetArguments(), "milestone", 0)
-	page, ok := req.GetArguments()["page"].(float64)
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
-	if !ok {
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
-		page = 1
-	}
-	pageSize, ok := req.GetArguments()["pageSize"].(float64)
-	if !ok {
-		pageSize = 100
-	}
 	opt := gitea_sdk.ListPullRequestsOptions{
 		State:     gitea_sdk.StateType(state),
 		Sort:      sort,
-		Milestone: int64(milestone),
+		Milestone: milestone,
 		ListOptions: gitea_sdk.ListOptions{
 			Page:     int(page),
 			PageSize: int(pageSize),
@@ -378,27 +373,27 @@ func CreatePullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Cal
 	log.Debugf("Called CreatePullRequestFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	title, ok := req.GetArguments()["title"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("title is required"))
+		return to.ErrorResult(errors.New("title is required"))
 	}
 	body, ok := req.GetArguments()["body"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("body is required"))
+		return to.ErrorResult(errors.New("body is required"))
 	}
 	head, ok := req.GetArguments()["head"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("head is required"))
+		return to.ErrorResult(errors.New("head is required"))
 	}
 	base, ok := req.GetArguments()["base"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("base is required"))
+		return to.ErrorResult(errors.New("base is required"))
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -421,11 +416,11 @@ func CreatePullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest) (
 	log.Debugf("Called CreatePullRequestReviewerFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
@@ -434,7 +429,7 @@ func CreatePullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest) (
 
 	var reviewers []string
 	if reviewersArg, exists := req.GetArguments()["reviewers"]; exists {
-		if reviewersSlice, ok := reviewersArg.([]interface{}); ok {
+		if reviewersSlice, ok := reviewersArg.([]any); ok {
 			for _, reviewer := range reviewersSlice {
 				if reviewerStr, ok := reviewer.(string); ok {
 					reviewers = append(reviewers, reviewerStr)
@@ -445,7 +440,7 @@ func CreatePullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest) (
 
 	var teamReviewers []string
 	if teamReviewersArg, exists := req.GetArguments()["team_reviewers"]; exists {
-		if teamReviewersSlice, ok := teamReviewersArg.([]interface{}); ok {
+		if teamReviewersSlice, ok := teamReviewersArg.([]any); ok {
 			for _, teamReviewer := range teamReviewersSlice {
 				if teamReviewerStr, ok := teamReviewer.(string); ok {
 					teamReviewers = append(teamReviewers, teamReviewerStr)
@@ -468,7 +463,7 @@ func CreatePullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest) (
 	}
 
 	// Return a success message instead of the Response object which contains non-serializable functions
-	successMsg := map[string]interface{}{
+	successMsg := map[string]any{
 		"message":        "Successfully created review requests",
 		"reviewers":      reviewers,
 		"team_reviewers": teamReviewers,
@@ -483,11 +478,11 @@ func DeletePullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest) (
 	log.Debugf("Called DeletePullRequestReviewerFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
@@ -496,7 +491,7 @@ func DeletePullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest) (
 
 	var reviewers []string
 	if reviewersArg, exists := req.GetArguments()["reviewers"]; exists {
-		if reviewersSlice, ok := reviewersArg.([]interface{}); ok {
+		if reviewersSlice, ok := reviewersArg.([]any); ok {
 			for _, reviewer := range reviewersSlice {
 				if reviewerStr, ok := reviewer.(string); ok {
 					reviewers = append(reviewers, reviewerStr)
@@ -507,7 +502,7 @@ func DeletePullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest) (
 
 	var teamReviewers []string
 	if teamReviewersArg, exists := req.GetArguments()["team_reviewers"]; exists {
-		if teamReviewersSlice, ok := teamReviewersArg.([]interface{}); ok {
+		if teamReviewersSlice, ok := teamReviewersArg.([]any); ok {
 			for _, teamReviewer := range teamReviewersSlice {
 				if teamReviewerStr, ok := teamReviewer.(string); ok {
 					teamReviewers = append(teamReviewers, teamReviewerStr)
@@ -529,7 +524,7 @@ func DeletePullRequestReviewerFn(ctx context.Context, req mcp.CallToolRequest) (
 		return to.ErrorResult(fmt.Errorf("delete review requests for %v/%v/pr/%v err: %v", owner, repo, index, err))
 	}
 
-	successMsg := map[string]interface{}{
+	successMsg := map[string]any{
 		"message":        "Successfully deleted review requests",
 		"reviewers":      reviewers,
 		"team_reviewers": teamReviewers,
@@ -544,24 +539,18 @@ func ListPullRequestReviewsFn(ctx context.Context, req mcp.CallToolRequest) (*mc
 	log.Debugf("Called ListPullRequestReviewsFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, ok := req.GetArguments()["page"].(float64)
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
-	if !ok {
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
-		page = 1
-	}
-	pageSize, ok := req.GetArguments()["pageSize"].(float64)
-	if !ok {
-		pageSize = 100
-	}
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -585,19 +574,19 @@ func GetPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.
 	log.Debugf("Called GetPullRequestReviewFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	reviewID, ok := req.GetArguments()["review_id"].(float64)
+	reviewID, err := params.GetIndex(req.GetArguments(), "review_id")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("review_id is required"))
+		return to.ErrorResult(err)
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
@@ -605,9 +594,9 @@ 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, int64(reviewID))
+	review, _, err := client.GetPullReview(owner, repo, index, reviewID)
 	if err != nil {
-		return to.ErrorResult(fmt.Errorf("get review %v for %v/%v/pr/%v err: %v", int64(reviewID), owner, repo, index, err))
+		return to.ErrorResult(fmt.Errorf("get review %v for %v/%v/pr/%v err: %v", reviewID, owner, repo, index, err))
 	}
 
 	return to.TextResult(review)
@@ -617,19 +606,19 @@ func ListPullRequestReviewCommentsFn(ctx context.Context, req mcp.CallToolReques
 	log.Debugf("Called ListPullRequestReviewCommentsFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	reviewID, ok := req.GetArguments()["review_id"].(float64)
+	reviewID, err := params.GetIndex(req.GetArguments(), "review_id")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("review_id is required"))
+		return to.ErrorResult(err)
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
@@ -637,9 +626,9 @@ func ListPullRequestReviewCommentsFn(ctx context.Context, req mcp.CallToolReques
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 
-	comments, _, err := client.ListPullReviewComments(owner, repo, index, int64(reviewID))
+	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", int64(reviewID), owner, repo, index, err))
+		return to.ErrorResult(fmt.Errorf("list review comments for review %v on %v/%v/pr/%v err: %v", reviewID, owner, repo, index, err))
 	}
 
 	return to.TextResult(comments)
@@ -649,11 +638,11 @@ func CreatePullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	log.Debugf("Called CreatePullRequestReviewFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
@@ -674,9 +663,9 @@ func CreatePullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 
 	// Parse inline comments
 	if commentsArg, exists := req.GetArguments()["comments"]; exists {
-		if commentsSlice, ok := commentsArg.([]interface{}); ok {
+		if commentsSlice, ok := commentsArg.([]any); ok {
 			for _, comment := range commentsSlice {
-				if commentMap, ok := comment.(map[string]interface{}); ok {
+				if commentMap, ok := comment.(map[string]any); ok {
 					reviewComment := gitea_sdk.CreatePullReviewComment{}
 					if path, ok := commentMap["path"].(string); ok {
 						reviewComment.Path = path
@@ -684,11 +673,11 @@ func CreatePullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 					if body, ok := commentMap["body"].(string); ok {
 						reviewComment.Body = body
 					}
-					if oldLineNum, ok := commentMap["old_line_num"].(float64); ok {
+					if oldLineNum, ok := params.ToInt64(commentMap["old_line_num"]); ok {
-						reviewComment.OldLineNum = int64(oldLineNum)
+						reviewComment.OldLineNum = oldLineNum
 					}
-					if newLineNum, ok := commentMap["new_line_num"].(float64); ok {
+					if newLineNum, ok := params.ToInt64(commentMap["new_line_num"]); ok {
-						reviewComment.NewLineNum = int64(newLineNum)
+						reviewComment.NewLineNum = newLineNum
 					}
 					opt.Comments = append(opt.Comments, reviewComment)
 				}
@@ -713,23 +702,23 @@ func SubmitPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	log.Debugf("Called SubmitPullRequestReviewFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	reviewID, ok := req.GetArguments()["review_id"].(float64)
+	reviewID, err := params.GetIndex(req.GetArguments(), "review_id")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("review_id is required"))
+		return to.ErrorResult(err)
 	}
 	state, ok := req.GetArguments()["state"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("state is required"))
+		return to.ErrorResult(errors.New("state is required"))
 	}
 
 	opt := gitea_sdk.SubmitPullReviewOptions{
@@ -744,9 +733,9 @@ 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, int64(reviewID), opt)
+	review, _, err := client.SubmitPullReview(owner, repo, index, reviewID, opt)
 	if err != nil {
-		return to.ErrorResult(fmt.Errorf("submit review %v for %v/%v/pr/%v err: %v", int64(reviewID), owner, repo, index, err))
+		return to.ErrorResult(fmt.Errorf("submit review %v for %v/%v/pr/%v err: %v", reviewID, owner, repo, index, err))
 	}
 
 	return to.TextResult(review)
@@ -756,19 +745,19 @@ func DeletePullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*m
 	log.Debugf("Called DeletePullRequestReviewFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	reviewID, ok := req.GetArguments()["review_id"].(float64)
+	reviewID, err := params.GetIndex(req.GetArguments(), "review_id")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("review_id is required"))
+		return to.ErrorResult(err)
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
@@ -776,14 +765,14 @@ 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, int64(reviewID))
+	_, err = client.DeletePullReview(owner, repo, index, reviewID)
 	if err != nil {
-		return to.ErrorResult(fmt.Errorf("delete review %v for %v/%v/pr/%v err: %v", int64(reviewID), owner, repo, index, err))
+		return to.ErrorResult(fmt.Errorf("delete review %v for %v/%v/pr/%v err: %v", reviewID, owner, repo, index, err))
 	}
 
-	successMsg := map[string]interface{}{
+	successMsg := map[string]any{
 		"message":    "Successfully deleted review",
-		"review_id":  int64(reviewID),
+		"review_id":  reviewID,
 		"pr_index":   index,
 		"repository": fmt.Sprintf("%s/%s", owner, repo),
 	}
@@ -795,19 +784,19 @@ func DismissPullRequestReviewFn(ctx context.Context, req mcp.CallToolRequest) (*
 	log.Debugf("Called DismissPullRequestReviewFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	reviewID, ok := req.GetArguments()["review_id"].(float64)
+	reviewID, err := params.GetIndex(req.GetArguments(), "review_id")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("review_id is required"))
+		return to.ErrorResult(err)
 	}
 
 	opt := gitea_sdk.DismissPullReviewOptions{}
@@ -820,14 +809,14 @@ 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, int64(reviewID), opt)
+	_, err = client.DismissPullReview(owner, repo, index, reviewID, opt)
 	if err != nil {
-		return to.ErrorResult(fmt.Errorf("dismiss review %v for %v/%v/pr/%v err: %v", int64(reviewID), owner, repo, index, err))
+		return to.ErrorResult(fmt.Errorf("dismiss review %v for %v/%v/pr/%v err: %v", reviewID, owner, repo, index, err))
 	}
 
-	successMsg := map[string]interface{}{
+	successMsg := map[string]any{
 		"message":    "Successfully dismissed review",
-		"review_id":  int64(reviewID),
+		"review_id":  reviewID,
 		"pr_index":   index,
 		"repository": fmt.Sprintf("%s/%s", owner, repo),
 	}
@@ -839,15 +828,15 @@ func MergePullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	log.Debugf("Called MergePullRequestFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	index, ok := req.GetArguments()["index"].(float64)
+	index, err := params.GetIndex(req.GetArguments(), "index")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("index is required"))
+		return to.ErrorResult(err)
 	}
 
 	mergeStyle := "merge"
@@ -855,6 +844,11 @@ func MergePullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 		mergeStyle = style
 	}
 
+	title := ""
+	if t, exists := req.GetArguments()["title"].(string); exists {
+		title = t
+	}
+
 	message := ""
 	if msg, exists := req.GetArguments()["message"].(string); exists {
 		message = msg
@@ -872,26 +866,27 @@ func MergePullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 
 	opt := gitea_sdk.MergePullRequestOption{
 		Style:                  gitea_sdk.MergeStyle(mergeStyle),
+		Title:                  title,
 		Message:                message,
 		DeleteBranchAfterMerge: deleteBranch,
 	}
 
-	merged, resp, err := client.MergePullRequest(owner, repo, int64(index), opt)
+	merged, resp, err := client.MergePullRequest(owner, repo, index, opt)
 	if err != nil {
-		return to.ErrorResult(fmt.Errorf("merge %v/%v/pr/%v err: %v", owner, repo, int64(index), err))
+		return to.ErrorResult(fmt.Errorf("merge %v/%v/pr/%v err: %v", owner, repo, index, err))
 	}
 
 	if !merged && resp != nil && resp.StatusCode >= 400 {
-		return to.ErrorResult(fmt.Errorf("merge %v/%v/pr/%v failed: HTTP %d %s", owner, repo, int64(index), resp.StatusCode, resp.Status))
+		return to.ErrorResult(fmt.Errorf("merge %v/%v/pr/%v failed: HTTP %d %s", owner, repo, index, resp.StatusCode, resp.Status))
 	}
 
 	if !merged {
-		return to.ErrorResult(fmt.Errorf("merge %v/%v/pr/%v returned merged=false", owner, repo, int64(index)))
+		return to.ErrorResult(fmt.Errorf("merge %v/%v/pr/%v returned merged=false", owner, repo, index))
 	}
 
-	successMsg := map[string]interface{}{
+	successMsg := map[string]any{
 		"merged":         merged,
-		"pr_index":       int64(index),
+		"pr_index":       index,
 		"repository":     fmt.Sprintf("%s/%s", owner, repo),
 		"merge_style":    mergeStyle,
 		"branch_deleted": deleteBranch,
@@ -904,15 +899,15 @@ func EditPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	log.Debugf("Called EditPullRequestFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	index, ok := req.GetArguments()["index"].(float64)
+	index, err := params.GetIndex(req.GetArguments(), "index")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("index is required"))
+		return to.ErrorResult(err)
 	}
 
 	opt := gitea_sdk.EditPullRequestOption{}
@@ -921,7 +916,7 @@ func EditPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 		opt.Title = title
 	}
 	if body, ok := req.GetArguments()["body"].(string); ok {
-		opt.Body = ptr.To(body)
+		opt.Body = new(body)
 	}
 	if base, ok := req.GetArguments()["base"].(string); ok {
 		opt.Base = base
@@ -930,7 +925,7 @@ func EditPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 		opt.Assignee = assignee
 	}
 	if assigneesArg, exists := req.GetArguments()["assignees"]; exists {
-		if assigneesSlice, ok := assigneesArg.([]interface{}); ok {
+		if assigneesSlice, ok := assigneesArg.([]any); ok {
 			var assignees []string
 			for _, a := range assigneesSlice {
 				if s, ok := a.(string); ok {
@@ -940,14 +935,16 @@ func EditPullRequestFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 			opt.Assignees = assignees
 		}
 	}
-	if milestone, ok := req.GetArguments()["milestone"].(float64); ok {
+	if val, exists := req.GetArguments()["milestone"]; exists {
-		opt.Milestone = int64(milestone)
+		if milestone, ok := params.ToInt64(val); ok {
+			opt.Milestone = milestone
+		}
 	}
 	if state, ok := req.GetArguments()["state"].(string); ok {
-		opt.State = ptr.To(gitea_sdk.StateType(state))
+		opt.State = new(gitea_sdk.StateType(state))
 	}
 	if allowMaintainerEdit, ok := req.GetArguments()["allow_maintainer_edit"].(bool); ok {
-		opt.AllowMaintainerEdit = ptr.To(allowMaintainerEdit)
+		opt.AllowMaintainerEdit = new(allowMaintainerEdit)
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
@@ -955,9 +952,9 @@ 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, int64(index), opt)
+	pr, _, err := client.EditPullRequest(owner, repo, index, opt)
 	if err != nil {
-		return to.ErrorResult(fmt.Errorf("edit %v/%v/pr/%v err: %v", owner, repo, int64(index), err))
+		return to.ErrorResult(fmt.Errorf("edit %v/%v/pr/%v err: %v", owner, repo, index, err))
 	}
 
 	return to.TextResult(pr)

operation/pull/pull_test.go

@@ -20,100 +20,241 @@ func TestEditPullRequestFn(t *testing.T) {
 		index = 7
 	)
 
-	var (
+	indexInputs := []struct {
-		mu          sync.Mutex
+		name string
-		gotMethod   string
+		val  any
-		gotPath     string
+	}{
-		gotBody     map[string]any
+		{"float64", float64(index)},
+		{"string", "7"},
+	}
+
+	for _, ii := range indexInputs {
+		t.Run(ii.name, func(t *testing.T) {
+			var (
+				mu        sync.Mutex
+				gotMethod string
+				gotPath   string
+				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):
+					mu.Lock()
+					gotMethod = r.Method
+					gotPath = r.URL.Path
+					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":%d,"title":"%s","state":"open"}`, index, 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
+			}()
+
+			req := mcp.CallToolRequest{
+				Params: mcp.CallToolParams{
+					Arguments: map[string]any{
+						"owner": owner,
+						"repo":  repo,
+						"index": ii.val,
+						"title": "WIP: my feature",
+						"state": "open",
+					},
+				},
+			}
+
+			result, err := EditPullRequestFn(context.Background(), req)
+			if err != nil {
+				t.Fatalf("EditPullRequestFn() error = %v", err)
+			}
+
+			mu.Lock()
+			defer mu.Unlock()
+
+			if gotMethod != http.MethodPatch {
+				t.Fatalf("expected PATCH request, got %s", gotMethod)
+			}
+			if gotPath != fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d", owner, repo, index) {
+				t.Fatalf("unexpected path: %s", gotPath)
+			}
+			if gotBody["title"] != "WIP: my feature" {
+				t.Fatalf("expected title 'WIP: my feature', got %v", gotBody["title"])
+			}
+			if gotBody["state"] != "open" {
+				t.Fatalf("expected state 'open', got %v", gotBody["state"])
+			}
+
+			if len(result.Content) == 0 {
+				t.Fatalf("expected content in result")
+			}
+			textContent, ok := mcp.AsTextContent(result.Content[0])
+			if !ok {
+				t.Fatalf("expected text content, got %T", result.Content[0])
+			}
+
+			var parsed struct {
+				Result map[string]any `json:"Result"`
+			}
+			if err := json.Unmarshal([]byte(textContent.Text), &parsed); err != nil {
+				t.Fatalf("unmarshal result text: %v", err)
+			}
+			if got := parsed.Result["title"].(string); got != "WIP: my feature" {
+				t.Fatalf("result title = %q, want %q", got, "WIP: my feature")
+			}
+		})
+	}
+}
+
+func TestMergePullRequestFn(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+		index = 5
 	)
 
-	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	indexInputs := []struct {
-		switch r.URL.Path {
+		name string
-		case "/api/v1/version":
+		val  any
-			w.Header().Set("Content-Type", "application/json")
+	}{
-			_, _ = w.Write([]byte(`{"version":"1.12.0"}`))
+		{"float64", float64(index)},
-		case fmt.Sprintf("/api/v1/repos/%s/%s", owner, repo):
+		{"string", "5"},
-			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):
+	for _, ii := range indexInputs {
+		t.Run(ii.name, func(t *testing.T) {
+			var (
+				mu        sync.Mutex
+				gotMethod string
+				gotPath   string
+				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()
+					gotMethod = r.Method
+					gotPath = r.URL.Path
+					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,
+						"index":         ii.val,
+						"merge_style":   "squash",
+						"title":         "feat: my squashed commit",
+						"message":       "Squash merge of PR #5",
+						"delete_branch": true,
+					},
+				},
+			}
+
+			result, err := MergePullRequestFn(context.Background(), req)
+			if err != nil {
+				t.Fatalf("MergePullRequestFn() error = %v", err)
+			}
+
 			mu.Lock()
-			gotMethod = r.Method
+			defer mu.Unlock()
-			gotPath = r.URL.Path
-			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(fmt.Sprintf(`{"number":%d,"title":"%s","state":"open"}`, index, body["title"])))
-		default:
-			http.NotFound(w, r)
-		}
-	})
 
-	server := httptest.NewServer(handler)
+			if gotMethod != http.MethodPost {
-	defer server.Close()
+				t.Fatalf("expected POST request, got %s", gotMethod)
+			}
+			if gotPath != fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge", owner, repo, index) {
+				t.Fatalf("unexpected path: %s", gotPath)
+			}
+			if gotBody["Do"] != "squash" {
+				t.Fatalf("expected Do 'squash', got %v", gotBody["Do"])
+			}
+			if gotBody["MergeTitleField"] != "feat: my squashed commit" {
+				t.Fatalf("expected MergeTitleField 'feat: my squashed commit', got %v", gotBody["MergeTitleField"])
+			}
+			if gotBody["MergeMessageField"] != "Squash merge of PR #5" {
+				t.Fatalf("expected MergeMessageField 'Squash merge of PR #5', got %v", gotBody["MergeMessageField"])
+			}
+			if gotBody["delete_branch_after_merge"] != true {
+				t.Fatalf("expected delete_branch_after_merge true, got %v", gotBody["delete_branch_after_merge"])
+			}
 
-	origHost := flag.Host
+			if len(result.Content) == 0 {
-	origToken := flag.Token
+				t.Fatalf("expected content in result")
-	origVersion := flag.Version
+			}
-	flag.Host = server.URL
+			textContent, ok := mcp.AsTextContent(result.Content[0])
-	flag.Token = ""
+			if !ok {
-	flag.Version = "test"
+				t.Fatalf("expected text content, got %T", result.Content[0])
-	defer func() {
+			}
-		flag.Host = origHost
-		flag.Token = origToken
-		flag.Version = origVersion
-	}()
 
-	req := mcp.CallToolRequest{
+			var parsed struct {
-		Params: mcp.CallToolParams{
+				Result map[string]any `json:"Result"`
-			Arguments: map[string]any{
+			}
-				"owner": owner,
+			if err := json.Unmarshal([]byte(textContent.Text), &parsed); err != nil {
-				"repo":  repo,
+				t.Fatalf("unmarshal result text: %v", err)
-				"index": float64(index),
+			}
-				"title": "WIP: my feature",
+			if parsed.Result["merged"] != true {
-				"state": "open",
+				t.Fatalf("expected merged=true, got %v", parsed.Result["merged"])
-			},
+			}
-		},
+			if parsed.Result["merge_style"] != "squash" {
-	}
+				t.Fatalf("expected merge_style 'squash', got %v", parsed.Result["merge_style"])
-
+			}
-	result, err := EditPullRequestFn(context.Background(), req)
+			if parsed.Result["branch_deleted"] != true {
-	if err != nil {
+				t.Fatalf("expected branch_deleted=true, got %v", parsed.Result["branch_deleted"])
-		t.Fatalf("EditPullRequestFn() error = %v", err)
+			}
-	}
+		})
-
-	mu.Lock()
-	defer mu.Unlock()
-
-	if gotMethod != http.MethodPatch {
-		t.Fatalf("expected PATCH request, got %s", gotMethod)
-	}
-	if gotPath != fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d", owner, repo, index) {
-		t.Fatalf("unexpected path: %s", gotPath)
-	}
-	if gotBody["title"] != "WIP: my feature" {
-		t.Fatalf("expected title 'WIP: my feature', got %v", gotBody["title"])
-	}
-	if gotBody["state"] != "open" {
-		t.Fatalf("expected state 'open', got %v", gotBody["state"])
-	}
-
-	if len(result.Content) == 0 {
-		t.Fatalf("expected content in result")
-	}
-	textContent, ok := mcp.AsTextContent(result.Content[0])
-	if !ok {
-		t.Fatalf("expected text content, got %T", result.Content[0])
-	}
-
-	var parsed struct {
-		Result map[string]any `json:"Result"`
-	}
-	if err := json.Unmarshal([]byte(textContent.Text), &parsed); err != nil {
-		t.Fatalf("unmarshal result text: %v", err)
-	}
-	if got := parsed.Result["title"].(string); got != "WIP: my feature" {
-		t.Fatalf("result title = %q, want %q", got, "WIP: my feature")
 	}
 }
 
@@ -125,120 +266,132 @@ func TestGetPullRequestDiffFn(t *testing.T) {
 		diffRaw = "diff --git a/file.txt b/file.txt\n+line\n"
 	)
 
-	var (
+	indexInputs := []struct {
-		mu            sync.Mutex
+		name string
-		diffRequested bool
+		val  any
-		binaryValue   string
+	}{
-	)
+		{"float64", float64(index)},
-	errCh := make(chan error, 1)
+		{"string", "12"},
+	}
 
-	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	for _, ii := range indexInputs {
-		switch r.URL.Path {
+		t.Run(ii.name, func(t *testing.T) {
-		case "/api/v1/version":
+			var (
-			w.Header().Set("Content-Type", "application/json")
+				mu            sync.Mutex
-			_, _ = w.Write([]byte(`{"version":"1.12.0"}`))
+				diffRequested bool
-		case fmt.Sprintf("/api/v1/repos/%s/%s", owner, repo):
+				binaryValue   string
-			w.Header().Set("Content-Type", "application/json")
+			)
-			_, _ = w.Write([]byte(`{"private":false}`))
+			errCh := make(chan error, 1)
-		case fmt.Sprintf("/%s/%s/pulls/%d.diff", owner, repo, index):
+
-			if r.Method != http.MethodGet {
+			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				select {
+				switch r.URL.Path {
-				case errCh <- fmt.Errorf("unexpected method: %s", r.Method):
+				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("/%s/%s/pulls/%d.diff", owner, repo, index):
+					if r.Method != http.MethodGet {
+						select {
+						case errCh <- fmt.Errorf("unexpected method: %s", r.Method):
+						default:
+						}
+					}
+					mu.Lock()
+					diffRequested = true
+					binaryValue = r.URL.Query().Get("binary")
+					mu.Unlock()
+					w.Header().Set("Content-Type", "text/plain")
+					_, _ = w.Write([]byte(diffRaw))
 				default:
+					select {
+					case errCh <- fmt.Errorf("unexpected request path: %s", r.URL.Path):
+					default:
+					}
 				}
+			})
+
+			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,
+						"index":  ii.val,
+						"binary": true,
+					},
+				},
 			}
-			mu.Lock()
+
-			diffRequested = true
+			result, err := GetPullRequestDiffFn(context.Background(), req)
-			binaryValue = r.URL.Query().Get("binary")
+			if err != nil {
-			mu.Unlock()
+				t.Fatalf("GetPullRequestDiffFn() error = %v", err)
-			w.Header().Set("Content-Type", "text/plain")
+			}
-			_, _ = w.Write([]byte(diffRaw))
+
-		default:
 			select {
-			case errCh <- fmt.Errorf("unexpected request path: %s", r.URL.Path):
+			case reqErr := <-errCh:
+				t.Fatalf("handler error: %v", reqErr)
 			default:
 			}
-		}
-	})
 
-	server := httptest.NewServer(handler)
+			mu.Lock()
-	defer server.Close()
+			requested := diffRequested
+			gotBinary := binaryValue
+			mu.Unlock()
 
-	origHost := flag.Host
+			if !requested {
-	origToken := flag.Token
+				t.Fatalf("expected diff request to be made")
-	origVersion := flag.Version
+			}
-	flag.Host = server.URL
+			if gotBinary != "true" {
-	flag.Token = ""
+				t.Fatalf("expected binary=true query param, got %q", gotBinary)
-	flag.Version = "test"
+			}
-	defer func() {
-		flag.Host = origHost
-		flag.Token = origToken
-		flag.Version = origVersion
-	}()
 
-	req := mcp.CallToolRequest{
+			if len(result.Content) == 0 {
-		Params: mcp.CallToolParams{
+				t.Fatalf("expected content in result")
-			Arguments: map[string]any{
+			}
-				"owner":  owner,
-				"repo":   repo,
-				"index":  float64(index),
-				"binary": true,
-			},
-		},
-	}
 
-	result, err := GetPullRequestDiffFn(context.Background(), req)
+			textContent, ok := mcp.AsTextContent(result.Content[0])
-	if err != nil {
+			if !ok {
-		t.Fatalf("GetPullRequestDiffFn() error = %v", err)
+				t.Fatalf("expected text content, got %T", result.Content[0])
-	}
+			}
 
-	select {
+			var parsed struct {
-	case reqErr := <-errCh:
+				Result map[string]any `json:"Result"`
-		t.Fatalf("handler error: %v", reqErr)
+			}
-	default:
+			if err := json.Unmarshal([]byte(textContent.Text), &parsed); err != nil {
-	}
+				t.Fatalf("unmarshal result text: %v", err)
+			}
 
-	mu.Lock()
+			if got, ok := parsed.Result["diff"].(string); !ok || got != diffRaw {
-	requested := diffRequested
+				t.Fatalf("diff = %q, want %q", got, diffRaw)
-	gotBinary := binaryValue
+			}
-	mu.Unlock()
+			if got, ok := parsed.Result["binary"].(bool); !ok || got != true {
-
+				t.Fatalf("binary = %v, want true", got)
-	if !requested {
+			}
-		t.Fatalf("expected diff request to be made")
+			if got, ok := parsed.Result["index"].(float64); !ok || int64(got) != int64(index) {
-	}
+				t.Fatalf("index = %v, want %d", got, index)
-	if gotBinary != "true" {
+			}
-		t.Fatalf("expected binary=true query param, got %q", gotBinary)
+			if got, ok := parsed.Result["owner"].(string); !ok || got != owner {
-	}
+				t.Fatalf("owner = %q, want %q", got, owner)
-
+			}
-	if len(result.Content) == 0 {
+			if got, ok := parsed.Result["repo"].(string); !ok || got != repo {
-		t.Fatalf("expected content in result")
+				t.Fatalf("repo = %q, want %q", got, repo)
-	}
+			}
-
+		})
-	textContent, ok := mcp.AsTextContent(result.Content[0])
-	if !ok {
-		t.Fatalf("expected text content, got %T", result.Content[0])
-	}
-
-	var parsed struct {
-		Result map[string]any `json:"Result"`
-	}
-	if err := json.Unmarshal([]byte(textContent.Text), &parsed); err != nil {
-		t.Fatalf("unmarshal result text: %v", err)
-	}
-
-	if got, ok := parsed.Result["diff"].(string); !ok || got != diffRaw {
-		t.Fatalf("diff = %q, want %q", got, diffRaw)
-	}
-	if got, ok := parsed.Result["binary"].(bool); !ok || got != true {
-		t.Fatalf("binary = %v, want true", got)
-	}
-	if got, ok := parsed.Result["index"].(float64); !ok || int64(got) != int64(index) {
-		t.Fatalf("index = %v, want %d", got, index)
-	}
-	if got, ok := parsed.Result["owner"].(string); !ok || got != owner {
-		t.Fatalf("owner = %q, want %q", got, owner)
-	}
-	if got, ok := parsed.Result["repo"].(string); !ok || got != repo {
-		t.Fatalf("repo = %q, want %q", got, repo)
 	}
 }

operation/repo/branch.go

@@ -2,6 +2,7 @@ package repo
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
@@ -64,15 +65,15 @@ func CreateBranchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	log.Debugf("Called CreateBranchFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	branch, ok := req.GetArguments()["branch"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("branch is required"))
+		return to.ErrorResult(errors.New("branch is required"))
 	}
 	oldBranch, _ := req.GetArguments()["old_branch"].(string)
 
@@ -95,15 +96,15 @@ func DeleteBranchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	log.Debugf("Called DeleteBranchFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	branch, ok := req.GetArguments()["branch"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("branch is required"))
+		return to.ErrorResult(errors.New("branch is required"))
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -121,11 +122,11 @@ func ListBranchesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	log.Debugf("Called ListBranchesFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	opt := gitea_sdk.ListRepoBranchesOptions{
 		ListOptions: gitea_sdk.ListOptions{

operation/repo/commit.go

@@ -2,10 +2,12 @@ package repo
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"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"
@@ -39,19 +41,19 @@ func ListRepoCommitsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	log.Debugf("Called ListRepoCommitsFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
-	page, ok := req.GetArguments()["page"].(float64)
+	page, err := params.GetIndex(req.GetArguments(), "page")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("page is required"))
+		return to.ErrorResult(err)
 	}
-	pageSize, ok := req.GetArguments()["page_size"].(float64)
+	pageSize, err := params.GetIndex(req.GetArguments(), "page_size")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("page_size is required"))
+		return to.ErrorResult(err)
 	}
 	sha, _ := req.GetArguments()["sha"].(string)
 	path, _ := req.GetArguments()["path"].(string)

operation/repo/file.go

@@ -6,6 +6,7 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
 
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
@@ -113,16 +114,16 @@ func GetFileContentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	log.Debugf("Called GetFileFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	ref, _ := req.GetArguments()["ref"].(string)
 	filePath, ok := req.GetArguments()["filePath"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("filePath is required"))
+		return to.ErrorResult(errors.New("filePath is required"))
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -151,7 +152,6 @@ func GetFileContentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 				LineNumber: line,
 				Content:    scanner.Text(),
 			})
-
 		}
 		if err := scanner.Err(); err != nil {
 			return to.ErrorResult(fmt.Errorf("scan content err: %v", err))
@@ -177,16 +177,16 @@ func GetDirContentFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	log.Debugf("Called GetDirContentFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	ref, _ := req.GetArguments()["ref"].(string)
 	filePath, ok := req.GetArguments()["filePath"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("filePath is required"))
+		return to.ErrorResult(errors.New("filePath is required"))
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
@@ -203,15 +203,15 @@ func CreateFileFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
 	log.Debugf("Called CreateFileFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	filePath, ok := req.GetArguments()["filePath"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("filePath is required"))
+		return to.ErrorResult(errors.New("filePath is required"))
 	}
 	content, _ := req.GetArguments()["content"].(string)
 	message, _ := req.GetArguments()["message"].(string)
@@ -239,19 +239,19 @@ func UpdateFileFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
 	log.Debugf("Called UpdateFileFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	filePath, ok := req.GetArguments()["filePath"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("filePath is required"))
+		return to.ErrorResult(errors.New("filePath is required"))
 	}
 	sha, ok := req.GetArguments()["sha"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("sha is required"))
+		return to.ErrorResult(errors.New("sha is required"))
 	}
 	content, _ := req.GetArguments()["content"].(string)
 	message, _ := req.GetArguments()["message"].(string)
@@ -280,21 +280,21 @@ func DeleteFileFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
 	log.Debugf("Called DeleteFileFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	filePath, ok := req.GetArguments()["filePath"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("filePath is required"))
+		return to.ErrorResult(errors.New("filePath is required"))
 	}
 	message, _ := req.GetArguments()["message"].(string)
 	branchName, _ := req.GetArguments()["branch_name"].(string)
 	sha, ok := req.GetArguments()["sha"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("sha is required"))
+		return to.ErrorResult(errors.New("sha is required"))
 	}
 	opt := gitea_sdk.DeleteFileOptions{
 		FileOptions: gitea_sdk.FileOptions{

operation/repo/release.go

@@ -2,12 +2,13 @@ package repo
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
 	"gitea.com/gitea/gitea-mcp/pkg/log"
-	"gitea.com/gitea/gitea-mcp/pkg/ptr"
+	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 
 	gitea_sdk "code.gitea.io/sdk/gitea"
@@ -112,23 +113,23 @@ func CreateReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	log.Debugf("Called CreateReleasesFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return nil, fmt.Errorf("owner is required")
+		return nil, errors.New("owner is required")
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return nil, fmt.Errorf("repo is required")
+		return nil, errors.New("repo is required")
 	}
 	tagName, ok := req.GetArguments()["tag_name"].(string)
 	if !ok {
-		return nil, fmt.Errorf("tag_name is required")
+		return nil, errors.New("tag_name is required")
 	}
 	target, ok := req.GetArguments()["target"].(string)
 	if !ok {
-		return nil, fmt.Errorf("target is required")
+		return nil, errors.New("target is required")
 	}
 	title, ok := req.GetArguments()["title"].(string)
 	if !ok {
-		return nil, fmt.Errorf("title is required")
+		return nil, errors.New("title is required")
 	}
 	isDraft, _ := req.GetArguments()["is_draft"].(bool)
 	isPreRelease, _ := req.GetArguments()["is_pre_release"].(bool)
@@ -157,22 +158,22 @@ func DeleteReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	log.Debugf("Called DeleteReleaseFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return nil, fmt.Errorf("owner is required")
+		return nil, errors.New("owner is required")
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return nil, fmt.Errorf("repo is required")
+		return nil, errors.New("repo is required")
 	}
-	id, ok := req.GetArguments()["id"].(float64)
+	id, err := params.GetIndex(req.GetArguments(), "id")
-	if !ok {
+	if err != nil {
-		return nil, fmt.Errorf("id is required")
+		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.DeleteRelease(owner, repo, int64(id))
+	_, err = client.DeleteRelease(owner, repo, id)
 	if err != nil {
 		return nil, fmt.Errorf("delete release error: %v", err)
 	}
@@ -184,22 +185,22 @@ func GetReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
 	log.Debugf("Called GetReleaseFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return nil, fmt.Errorf("owner is required")
+		return nil, errors.New("owner is required")
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return nil, fmt.Errorf("repo is required")
+		return nil, errors.New("repo is required")
 	}
-	id, ok := req.GetArguments()["id"].(float64)
+	id, err := params.GetIndex(req.GetArguments(), "id")
-	if !ok {
+	if err != nil {
-		return nil, fmt.Errorf("id is required")
+		return to.ErrorResult(err)
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	release, _, err := client.GetRelease(owner, repo, int64(id))
+	release, _, err := client.GetRelease(owner, repo, id)
 	if err != nil {
 		return nil, fmt.Errorf("get release error: %v", err)
 	}
@@ -211,11 +212,11 @@ func GetLatestReleaseFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	log.Debugf("Called GetLatestReleaseFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return nil, fmt.Errorf("owner is required")
+		return nil, errors.New("owner is required")
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return nil, fmt.Errorf("repo is required")
+		return nil, errors.New("repo is required")
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
@@ -234,24 +235,24 @@ func ListReleasesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
 	log.Debugf("Called ListReleasesFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return nil, fmt.Errorf("owner is required")
+		return nil, errors.New("owner is required")
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return nil, fmt.Errorf("repo is required")
+		return nil, errors.New("repo is required")
 	}
 	var pIsDraft *bool
 	isDraft, ok := req.GetArguments()["is_draft"].(bool)
 	if ok {
-		pIsDraft = ptr.To(isDraft)
+		pIsDraft = new(isDraft)
 	}
 	var pIsPreRelease *bool
 	isPreRelease, ok := req.GetArguments()["is_pre_release"].(bool)
 	if ok {
-		pIsPreRelease = ptr.To(isPreRelease)
+		pIsPreRelease = new(isPreRelease)
 	}
-	page, _ := req.GetArguments()["page"].(float64)
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
-	pageSize, _ := req.GetArguments()["pageSize"].(float64)
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 20)
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {

operation/repo/repo.go

@@ -7,7 +7,7 @@ import (
 
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
 	"gitea.com/gitea/gitea-mcp/pkg/log"
-	"gitea.com/gitea/gitea-mcp/pkg/ptr"
+	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
@@ -166,12 +166,12 @@ func ForkRepoFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResu
 		return to.ErrorResult(errors.New("repository name is required"))
 	}
 	organization, ok := req.GetArguments()["organization"].(string)
-	organizationPtr := ptr.To(organization)
+	organizationPtr := new(organization)
 	if !ok || organization == "" {
 		organizationPtr = nil
 	}
 	name, ok := req.GetArguments()["name"].(string)
-	namePtr := ptr.To(name)
+	namePtr := new(name)
 	if !ok || name == "" {
 		namePtr = nil
 	}
@@ -192,14 +192,8 @@ 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, ok := req.GetArguments()["page"].(float64)
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
-	if !ok {
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
-		page = 1
-	}
-	pageSize, ok := req.GetArguments()["pageSize"].(float64)
-	if !ok {
-		pageSize = 100
-	}
 	opt := gitea_sdk.ListReposOptions{
 		ListOptions: gitea_sdk.ListOptions{
 			Page:     int(page),

operation/repo/tag.go

@@ -2,10 +2,12 @@ package repo
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"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"
@@ -89,15 +91,15 @@ func CreateTagFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRes
 	log.Debugf("Called CreateTagFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return nil, fmt.Errorf("owner is required")
+		return nil, errors.New("owner is required")
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return nil, fmt.Errorf("repo is required")
+		return nil, errors.New("repo is required")
 	}
 	tagName, ok := req.GetArguments()["tag_name"].(string)
 	if !ok {
-		return nil, fmt.Errorf("tag_name is required")
+		return nil, errors.New("tag_name is required")
 	}
 	target, _ := req.GetArguments()["target"].(string)
 	message, _ := req.GetArguments()["message"].(string)
@@ -122,15 +124,15 @@ func DeleteTagFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRes
 	log.Debugf("Called DeleteTagFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return nil, fmt.Errorf("owner is required")
+		return nil, errors.New("owner is required")
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return nil, fmt.Errorf("repo is required")
+		return nil, errors.New("repo is required")
 	}
 	tagName, ok := req.GetArguments()["tag_name"].(string)
 	if !ok {
-		return nil, fmt.Errorf("tag_name is required")
+		return nil, errors.New("tag_name is required")
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
@@ -149,15 +151,15 @@ func GetTagFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult
 	log.Debugf("Called GetTagFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return nil, fmt.Errorf("owner is required")
+		return nil, errors.New("owner is required")
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return nil, fmt.Errorf("repo is required")
+		return nil, errors.New("repo is required")
 	}
 	tagName, ok := req.GetArguments()["tag_name"].(string)
 	if !ok {
-		return nil, fmt.Errorf("tag_name is required")
+		return nil, errors.New("tag_name is required")
 	}
 
 	client, err := gitea.ClientFromContext(ctx)
@@ -176,14 +178,14 @@ func ListTagsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResu
 	log.Debugf("Called ListTagsFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return nil, fmt.Errorf("owner is required")
+		return nil, errors.New("owner is required")
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return nil, fmt.Errorf("repo is required")
+		return nil, errors.New("repo is required")
 	}
-	page, _ := req.GetArguments()["page"].(float64)
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
-	pageSize, _ := req.GetArguments()["pageSize"].(float64)
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 20)
 
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {

operation/search/search.go

@@ -2,11 +2,12 @@ package search
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
 	"gitea.com/gitea/gitea-mcp/pkg/log"
-	"gitea.com/gitea/gitea-mcp/pkg/ptr"
+	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
@@ -27,7 +28,7 @@ var (
 	SearchUsersTool = mcp.NewTool(
 		SearchUsersToolName,
 		mcp.WithDescription("search users"),
-		mcp.WithString("keyword", mcp.Description("Keyword")),
+		mcp.WithString("keyword", mcp.Required(), mcp.Description("Keyword")),
 		mcp.WithNumber("page", mcp.Description("Page"), mcp.DefaultNumber(1)),
 		mcp.WithNumber("pageSize", mcp.Description("PageSize"), mcp.DefaultNumber(100)),
 	)
@@ -35,8 +36,8 @@ var (
 	SearOrgTeamsTool = mcp.NewTool(
 		SearchOrgTeamsToolName,
 		mcp.WithDescription("search organization teams"),
-		mcp.WithString("org", mcp.Description("organization name")),
+		mcp.WithString("org", mcp.Required(), mcp.Description("organization name")),
-		mcp.WithString("query", mcp.Description("search organization teams")),
+		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("pageSize", mcp.Description("PageSize"), mcp.DefaultNumber(100)),
@@ -45,7 +46,7 @@ var (
 	SearchReposTool = mcp.NewTool(
 		SearchReposToolName,
 		mcp.WithDescription("search repos"),
-		mcp.WithString("keyword", mcp.Description("Keyword")),
+		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")),
@@ -61,32 +62,26 @@ var (
 func init() {
 	Tool.RegisterRead(server.ServerTool{
 		Tool:    SearchUsersTool,
-		Handler: SearchUsersFn,
+		Handler: UsersFn,
 	})
 	Tool.RegisterRead(server.ServerTool{
 		Tool:    SearOrgTeamsTool,
-		Handler: SearchOrgTeamsFn,
+		Handler: OrgTeamsFn,
 	})
 	Tool.RegisterRead(server.ServerTool{
 		Tool:    SearchReposTool,
-		Handler: SearchReposFn,
+		Handler: ReposFn,
 	})
 }
 
-func SearchUsersFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func UsersFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called SearchUsersFn")
+	log.Debugf("Called UsersFn")
 	keyword, ok := req.GetArguments()["keyword"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("keyword is required"))
+		return to.ErrorResult(errors.New("keyword is required"))
-	}
-	page, ok := req.GetArguments()["page"].(float64)
-	if !ok {
-		page = 1
-	}
-	pageSize, ok := req.GetArguments()["pageSize"].(float64)
-	if !ok {
-		pageSize = 100
 	}
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
 	opt := gitea_sdk.SearchUsersOption{
 		KeyWord: keyword,
 		ListOptions: gitea_sdk.ListOptions{
@@ -105,25 +100,19 @@ func SearchUsersFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolR
 	return to.TextResult(users)
 }
 
-func SearchOrgTeamsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func OrgTeamsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called SearchOrgTeamsFn")
+	log.Debugf("Called OrgTeamsFn")
 	org, ok := req.GetArguments()["org"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("organization is required"))
+		return to.ErrorResult(errors.New("organization is required"))
 	}
 	query, ok := req.GetArguments()["query"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("query is required"))
+		return to.ErrorResult(errors.New("query is required"))
 	}
 	includeDescription, _ := req.GetArguments()["includeDescription"].(bool)
-	page, ok := req.GetArguments()["page"].(float64)
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
-	if !ok {
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
-		page = 1
-	}
-	pageSize, ok := req.GetArguments()["pageSize"].(float64)
-	if !ok {
-		pageSize = 100
-	}
 	opt := gitea_sdk.SearchTeamsOptions{
 		Query:              query,
 		IncludeDescription: includeDescription,
@@ -143,40 +132,34 @@ func SearchOrgTeamsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	return to.TextResult(teams)
 }
 
-func SearchReposFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func ReposFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	log.Debugf("Called SearchReposFn")
+	log.Debugf("Called ReposFn")
 	keyword, ok := req.GetArguments()["keyword"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("keyword is required"))
+		return to.ErrorResult(errors.New("keyword is required"))
 	}
 	keywordIsTopic, _ := req.GetArguments()["keywordIsTopic"].(bool)
 	keywordInDescription, _ := req.GetArguments()["keywordInDescription"].(bool)
-	ownerID, _ := req.GetArguments()["ownerID"].(float64)
+	ownerID := params.GetOptionalInt(req.GetArguments(), "ownerID", 0)
 	var pIsPrivate *bool
 	isPrivate, ok := req.GetArguments()["isPrivate"].(bool)
 	if ok {
-		pIsPrivate = ptr.To(isPrivate)
+		pIsPrivate = new(isPrivate)
 	}
 	var pIsArchived *bool
 	isArchived, ok := req.GetArguments()["isArchived"].(bool)
 	if ok {
-		pIsArchived = ptr.To(isArchived)
+		pIsArchived = new(isArchived)
 	}
 	sort, _ := req.GetArguments()["sort"].(string)
 	order, _ := req.GetArguments()["order"].(string)
-	page, ok := req.GetArguments()["page"].(float64)
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
-	if !ok {
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
-		page = 1
-	}
-	pageSize, ok := req.GetArguments()["pageSize"].(float64)
-	if !ok {
-		pageSize = 100
-	}
 	opt := gitea_sdk.SearchRepoOptions{
 		Keyword:              keyword,
 		KeywordIsTopic:       keywordIsTopic,
 		KeywordInDescription: keywordInDescription,
-		OwnerID:              int64(ownerID),
+		OwnerID:              ownerID,
 		IsPrivate:            pIsPrivate,
 		IsArchived:           pIsArchived,
 		Sort:                 sort,

operation/search/search_test.go

@@ -0,0 +1,42 @@
+package search
+
+import (
+	"slices"
+	"testing"
+
+	"github.com/mark3labs/mcp-go/mcp"
+)
+
+func TestSearchToolsRequiredFields(t *testing.T) {
+	tests := []struct {
+		name     string
+		tool     mcp.Tool
+		required []string
+	}{
+		{
+			name:     "search_users",
+			tool:     SearchUsersTool,
+			required: []string{"keyword"},
+		},
+		{
+			name:     "search_org_teams",
+			tool:     SearOrgTeamsTool,
+			required: []string{"org", "query"},
+		},
+		{
+			name:     "search_repos",
+			tool:     SearchReposTool,
+			required: []string{"keyword"},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			for _, field := range tt.required {
+				if !slices.Contains(tt.tool.InputSchema.Required, field) {
+					t.Errorf("tool %s: expected %q to be required, got required=%v", tt.name, field, tt.tool.InputSchema.Required)
+				}
+			}
+		})
+	}
+}

operation/timetracking/timetracking.go

@@ -3,6 +3,7 @@ package timetracking
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	gitea_sdk "code.gitea.io/sdk/gitea"
@@ -129,11 +130,11 @@ func StartStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	log.Debugf("Called StartStopwatchFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
@@ -154,11 +155,11 @@ func StopStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	log.Debugf("Called StopStopwatchFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
@@ -179,11 +180,11 @@ func DeleteStopwatchFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallT
 	log.Debugf("Called DeleteStopwatchFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
@@ -206,7 +207,7 @@ func GetMyStopwatchesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	stopwatches, _, err := client.GetMyStopwatches()
+	stopwatches, _, err := client.ListMyStopwatches(gitea_sdk.ListStopwatchesOptions{})
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get stopwatches err: %v", err))
 	}
@@ -222,24 +223,18 @@ func ListTrackedTimesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	log.Debugf("Called ListTrackedTimesFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	page, ok := req.GetArguments()["page"].(float64)
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
-	if !ok {
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
-		page = 1
-	}
-	pageSize, ok := req.GetArguments()["pageSize"].(float64)
-	if !ok {
-		pageSize = 100
-	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
@@ -264,27 +259,27 @@ func AddTrackedTimeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	log.Debugf("Called AddTrackedTimeFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
 
-	timeSeconds, ok := req.GetArguments()["time"].(float64)
+	timeSeconds, err := params.GetIndex(req.GetArguments(), "time")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("time is required"))
+		return to.ErrorResult(err)
 	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
 	trackedTime, _, err := client.AddTime(owner, repo, index, gitea_sdk.AddTimeOption{
-		Time: int64(timeSeconds),
+		Time: timeSeconds,
 	})
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("add tracked time to %s/%s#%d err: %v", owner, repo, index, err))
@@ -296,51 +291,45 @@ func DeleteTrackedTimeFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Cal
 	log.Debugf("Called DeleteTrackedTimeFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 
 	index, err := params.GetIndex(req.GetArguments(), "index")
 	if err != nil {
 		return to.ErrorResult(err)
 	}
-	id, ok := req.GetArguments()["id"].(float64)
+	id, err := params.GetIndex(req.GetArguments(), "id")
-	if !ok {
+	if err != nil {
-		return to.ErrorResult(fmt.Errorf("id is required"))
+		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.DeleteTime(owner, repo, index, int64(id))
+	_, err = client.DeleteTime(owner, repo, index, id)
 	if err != nil {
-		return to.ErrorResult(fmt.Errorf("delete tracked time %d from %s/%s#%d err: %v", int64(id), owner, repo, index, err))
+		return to.ErrorResult(fmt.Errorf("delete tracked time %d from %s/%s#%d err: %v", id, owner, repo, index, err))
 	}
-	return to.TextResult(fmt.Sprintf("Tracked time entry %d deleted from issue %s/%s#%d", int64(id), owner, repo, index))
+	return to.TextResult(fmt.Sprintf("Tracked time entry %d deleted from issue %s/%s#%d", id, owner, repo, index))
 }
 
 func ListRepoTimesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 	log.Debugf("Called ListRepoTimesFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 
-	page, ok := req.GetArguments()["page"].(float64)
+	page := params.GetOptionalInt(req.GetArguments(), "page", 1)
-	if !ok {
+	pageSize := params.GetOptionalInt(req.GetArguments(), "pageSize", 100)
-		page = 1
-	}
-	pageSize, ok := req.GetArguments()["pageSize"].(float64)
-	if !ok {
-		pageSize = 100
-	}
 	client, err := gitea.ClientFromContext(ctx)
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
@@ -366,7 +355,7 @@ func GetMyTimesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get gitea client err: %v", err))
 	}
-	times, _, err := client.GetMyTrackedTimes()
+	times, _, err := client.ListMyTrackedTimes(gitea_sdk.ListTrackedTimesOptions{})
 	if err != nil {
 		return to.ErrorResult(fmt.Errorf("get tracked times err: %v", err))
 	}

operation/user/user.go

@@ -6,6 +6,7 @@ import (
 
 	"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"
 
@@ -68,11 +69,11 @@ func registerTools() {
 // getIntArg parses an integer argument from the MCP request arguments map.
 // Returns def if missing, not a number, or less than 1. Used for pagination arguments.
 func getIntArg(req mcp.CallToolRequest, name string, def int) int {
-	val, ok := req.GetArguments()[name].(float64)
+	v := params.GetOptionalInt(req.GetArguments(), name, int64(def))
-	if !ok || val < 1 {
+	if v < 1 {
 		return def
 	}
-	return int(val)
+	return int(v)
 }
 
 // GetUserInfoFn is the handler for "get_my_user_info" MCP tool requests.

operation/wiki/wiki.go

@@ -2,6 +2,7 @@ package wiki
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/url"
 
@@ -110,11 +111,11 @@ func ListWikiPagesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToo
 	log.Debugf("Called ListWikiPagesFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 
 	// Use direct HTTP request because SDK does not support yet wikis
@@ -131,15 +132,15 @@ func GetWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolR
 	log.Debugf("Called GetWikiPageFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	pageName, ok := req.GetArguments()["pageName"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("pageName is required"))
+		return to.ErrorResult(errors.New("pageName is required"))
 	}
 
 	var result any
@@ -155,15 +156,15 @@ func GetWikiRevisionsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.Call
 	log.Debugf("Called GetWikiRevisionsFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	pageName, ok := req.GetArguments()["pageName"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("pageName is required"))
+		return to.ErrorResult(errors.New("pageName is required"))
 	}
 
 	var result any
@@ -179,19 +180,19 @@ func CreateWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	log.Debugf("Called CreateWikiPageFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	title, ok := req.GetArguments()["title"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("title is required"))
+		return to.ErrorResult(errors.New("title is required"))
 	}
 	contentBase64, ok := req.GetArguments()["content_base64"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("content_base64 is required"))
+		return to.ErrorResult(errors.New("content_base64 is required"))
 	}
 
 	message, _ := req.GetArguments()["message"].(string)
@@ -218,19 +219,19 @@ func UpdateWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	log.Debugf("Called UpdateWikiPageFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	pageName, ok := req.GetArguments()["pageName"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("pageName is required"))
+		return to.ErrorResult(errors.New("pageName is required"))
 	}
 	contentBase64, ok := req.GetArguments()["content_base64"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("content_base64 is required"))
+		return to.ErrorResult(errors.New("content_base64 is required"))
 	}
 
 	requestBody := map[string]string{
@@ -264,15 +265,15 @@ func DeleteWikiPageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTo
 	log.Debugf("Called DeleteWikiPageFn")
 	owner, ok := req.GetArguments()["owner"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("owner is required"))
+		return to.ErrorResult(errors.New("owner is required"))
 	}
 	repo, ok := req.GetArguments()["repo"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("repo is required"))
+		return to.ErrorResult(errors.New("repo is required"))
 	}
 	pageName, ok := req.GetArguments()["pageName"].(string)
 	if !ok {
-		return to.ErrorResult(fmt.Errorf("pageName is required"))
+		return to.ErrorResult(errors.New("pageName is required"))
 	}
 
 	_, err := gitea.DoJSON(ctx, "DELETE", fmt.Sprintf("repos/%s/%s/wiki/page/%s", url.QueryEscape(owner), url.QueryEscape(repo), url.QueryEscape(pageName)), nil, nil, nil)

pkg/gitea/gitea.go

@@ -34,7 +34,7 @@ func NewClient(token string) (*gitea.Client, error) {
 	}
 
 	// Set user agent for the client
-	client.SetUserAgent(fmt.Sprintf("gitea-mcp-server/%s", flag.Version))
+	client.SetUserAgent("gitea-mcp-server/" + flag.Version)
 	return client, nil
 }
 

pkg/gitea/rest.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"crypto/tls"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -40,7 +41,7 @@ func tokenFromContext(ctx context.Context) string {
 func newRESTHTTPClient() *http.Client {
 	transport := http.DefaultTransport.(*http.Transport).Clone()
 	if flag.Insecure {
-		transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} //nolint:gosec
+		transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} //nolint:gosec // user-requested insecure mode
 	}
 	return &http.Client{
 		Transport: transport,
@@ -51,7 +52,7 @@ func newRESTHTTPClient() *http.Client {
 func buildAPIURL(path string, query url.Values) (string, error) {
 	host := strings.TrimRight(flag.Host, "/")
 	if host == "" {
-		return "", fmt.Errorf("gitea host is empty")
+		return "", errors.New("gitea host is empty")
 	}
 	p := strings.TrimLeft(path, "/")
 	u, err := url.Parse(fmt.Sprintf("%s/api/v1/%s", host, p))
@@ -66,7 +67,7 @@ func buildAPIURL(path string, query url.Values) (string, error) {
 
 // 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 any, respOut any) (int, error) {
+func DoJSON(ctx context.Context, method, path string, query url.Values, body, respOut any) (int, error) {
 	var bodyReader io.Reader
 	if body != nil {
 		b, err := json.Marshal(body)
@@ -87,7 +88,7 @@ func DoJSON(ctx context.Context, method, path string, query url.Values, body any
 
 	token := tokenFromContext(ctx)
 	if token != "" {
-		req.Header.Set("Authorization", fmt.Sprintf("token %s", token))
+		req.Header.Set("Authorization", "token "+token)
 	}
 	req.Header.Set("Accept", "application/json")
 	if body != nil {
@@ -107,7 +108,7 @@ func DoJSON(ctx context.Context, method, path string, query url.Values, body any
 	}
 
 	if respOut == nil {
-		io.Copy(io.Discard, resp.Body) // best-effort
+		_, _ = io.Copy(io.Discard, resp.Body) // best-effort
 		return resp.StatusCode, nil
 	}
 
@@ -140,7 +141,7 @@ func DoBytes(ctx context.Context, method, path string, query url.Values, body an
 
 	token := tokenFromContext(ctx)
 	if token != "" {
-		req.Header.Set("Authorization", fmt.Sprintf("token %s", token))
+		req.Header.Set("Authorization", "token "+token)
 	}
 	if accept != "" {
 		req.Header.Set("Accept", accept)
@@ -171,5 +172,3 @@ func DoBytes(ctx context.Context, method, path string, query url.Values, body an
 
 	return respBytes, resp.StatusCode, nil
 }
-
-

pkg/gitea/rest_test.go

@@ -28,5 +28,3 @@ func TestTokenFromContext(t *testing.T) {
 		}
 	})
 }
-
-

pkg/log/log.go

@@ -1,7 +1,6 @@
 package log
 
 import (
-	"fmt"
 	"os"
 	"sync"
 	"time"
@@ -35,14 +34,14 @@ func Default() *zap.Logger {
 			home = os.TempDir()
 		}
 
-		logDir := fmt.Sprintf("%s/.gitea-mcp", home)
+		logDir := home + "/.gitea-mcp"
 		if err := os.MkdirAll(logDir, 0o700); err != nil {
 			// Fallback to temp directory if creation fails
 			logDir = os.TempDir()
 		}
 
 		wss = append(wss, zapcore.AddSync(&lumberjack.Logger{
-			Filename:   fmt.Sprintf("%s/gitea-mcp.log", logDir),
+			Filename:   logDir + "/gitea-mcp.log",
 			MaxSize:    100,
 			MaxBackups: 10,
 			MaxAge:     30,

pkg/params/params.go

@@ -5,29 +5,54 @@ import (
 	"strconv"
 )
 
-// GetIndex extracts an index parameter from MCP tool arguments.
+// ToInt64 converts a value to int64, accepting both float64 (JSON number) and
+// string representations. Returns false if the value cannot be converted.
+func ToInt64(val any) (int64, bool) {
+	switch v := val.(type) {
+	case float64:
+		return int64(v), true
+	case string:
+		i, err := strconv.ParseInt(v, 10, 64)
+		if err != nil {
+			return 0, false
+		}
+		return i, true
+	default:
+		return 0, false
+	}
+}
+
+// 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.
-func GetIndex(args map[string]interface{}, key string) (int64, error) {
+func GetIndex(args map[string]any, key string) (int64, error) {
 	val, exists := args[key]
 	if !exists {
 		return 0, fmt.Errorf("%s is required", key)
 	}
 
-	// Try float64 (JSON number type)
+	if i, ok := ToInt64(val); ok {
-	if f, ok := val.(float64); ok {
+		return i, nil
-		return int64(f), nil
 	}
 
-	// Try string and parse to integer
 	if s, ok := val.(string); ok {
-		i, err := strconv.ParseInt(s, 10, 64)
+		return 0, fmt.Errorf("%s must be a valid integer (got %q)", key, s)
-		if err != nil {
-			return 0, fmt.Errorf("%s must be a valid integer (got %q)", key, s)
-		}
-		return i, nil
 	}
 
 	return 0, fmt.Errorf("%s must be a number or numeric string", key)
 }
+
+// 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.
+func GetOptionalInt(args map[string]any, key string, defaultVal int64) int64 {
+	val, exists := args[key]
+	if !exists {
+		return defaultVal
+	}
+	if i, ok := ToInt64(val); ok {
+		return i
+	}
+	return defaultVal
+}

pkg/params/params_test.go

@@ -5,10 +5,67 @@ import (
 	"testing"
 )
 
+func TestToInt64(t *testing.T) {
+	tests := []struct {
+		name string
+		val  any
+		want int64
+		ok   bool
+	}{
+		{"float64", float64(42), 42, true},
+		{"float64 zero", float64(0), 0, true},
+		{"float64 negative", float64(-5), -5, true},
+		{"string", "123", 123, true},
+		{"string zero", "0", 0, true},
+		{"string negative", "-10", -10, true},
+		{"invalid string", "abc", 0, false},
+		{"decimal string", "1.5", 0, false},
+		{"bool", true, 0, false},
+		{"nil", nil, 0, false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, ok := ToInt64(tt.val)
+			if ok != tt.ok {
+				t.Errorf("ToInt64() ok = %v, want %v", ok, tt.ok)
+			}
+			if got != tt.want {
+				t.Errorf("ToInt64() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestGetOptionalInt(t *testing.T) {
+	tests := []struct {
+		name       string
+		args       map[string]any
+		key        string
+		defaultVal int64
+		want       int64
+	}{
+		{"present float64", map[string]any{"page": float64(3)}, "page", 1, 3},
+		{"present string", map[string]any{"page": "5"}, "page", 1, 5},
+		{"missing key", map[string]any{}, "page", 1, 1},
+		{"invalid string", map[string]any{"page": "abc"}, "page", 1, 1},
+		{"invalid type", map[string]any{"page": true}, "page", 1, 1},
+		{"zero value", map[string]any{"id": float64(0)}, "id", 99, 0},
+		{"string zero", map[string]any{"id": "0"}, "id", 99, 0},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := GetOptionalInt(tt.args, tt.key, tt.defaultVal)
+			if got != tt.want {
+				t.Errorf("GetOptionalInt() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
 func TestGetIndex(t *testing.T) {
 	tests := []struct {
 		name      string
-		args      map[string]interface{}
+		args      map[string]any
 		key       string
 		wantIndex int64
 		wantErr   bool
@@ -16,63 +73,63 @@ func TestGetIndex(t *testing.T) {
 	}{
 		{
 			name:      "valid float64",
-			args:      map[string]interface{}{"index": float64(123)},
+			args:      map[string]any{"index": float64(123)},
 			key:       "index",
 			wantIndex: 123,
 			wantErr:   false,
 		},
 		{
 			name:      "valid string",
-			args:      map[string]interface{}{"index": "456"},
+			args:      map[string]any{"index": "456"},
 			key:       "index",
 			wantIndex: 456,
 			wantErr:   false,
 		},
 		{
 			name:      "valid string with large number",
-			args:      map[string]interface{}{"index": "999999"},
+			args:      map[string]any{"index": "999999"},
 			key:       "index",
 			wantIndex: 999999,
 			wantErr:   false,
 		},
 		{
 			name:    "missing parameter",
-			args:    map[string]interface{}{},
+			args:    map[string]any{},
 			key:     "index",
 			wantErr: true,
 			errMsg:  "index is required",
 		},
 		{
 			name:    "invalid string (not a number)",
-			args:    map[string]interface{}{"index": "abc"},
+			args:    map[string]any{"index": "abc"},
 			key:     "index",
 			wantErr: true,
 			errMsg:  "must be a valid integer",
 		},
 		{
 			name:    "invalid string (decimal)",
-			args:    map[string]interface{}{"index": "12.34"},
+			args:    map[string]any{"index": "12.34"},
 			key:     "index",
 			wantErr: true,
 			errMsg:  "must be a valid integer",
 		},
 		{
 			name:    "invalid type (bool)",
-			args:    map[string]interface{}{"index": true},
+			args:    map[string]any{"index": true},
 			key:     "index",
 			wantErr: true,
 			errMsg:  "must be a number or numeric string",
 		},
 		{
 			name:    "invalid type (map)",
-			args:    map[string]interface{}{"index": map[string]string{"foo": "bar"}},
+			args:    map[string]any{"index": map[string]string{"foo": "bar"}},
 			key:     "index",
 			wantErr: true,
 			errMsg:  "must be a number or numeric string",
 		},
 		{
 			name:      "custom key name",
-			args:      map[string]interface{}{"pr_index": "789"},
+			args:      map[string]any{"pr_index": "789"},
 			key:       "pr_index",
 			wantIndex: 789,
 			wantErr:   false,

pkg/ptr/ptr.go

@@ -1,73 +0,0 @@
-/*
-Copyright 2023 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package ptr
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// AllPtrFieldsNil tests whether all pointer fields in a struct are nil.  This is useful when,
-// for example, an API struct is handled by plugins which need to distinguish
-// "no plugin accepted this spec" from "this spec is empty".
-//
-// This function is only valid for structs and pointers to structs.  Any other
-// type will cause a panic.  Passing a typed nil pointer will return true.
-func AllPtrFieldsNil(obj interface{}) bool {
-	v := reflect.ValueOf(obj)
-	if !v.IsValid() {
-		panic(fmt.Sprintf("reflect.ValueOf() produced a non-valid Value for %#v", obj))
-	}
-	if v.Kind() == reflect.Ptr {
-		if v.IsNil() {
-			return true
-		}
-		v = v.Elem()
-	}
-	for i := 0; i < v.NumField(); i++ {
-		if v.Field(i).Kind() == reflect.Ptr && !v.Field(i).IsNil() {
-			return false
-		}
-	}
-	return true
-}
-
-// To returns a pointer to the given value.
-func To[T any](v T) *T {
-	return &v
-}
-
-// Deref dereferences ptr and returns the value it points to if no nil, or else
-// returns def.
-func Deref[T any](ptr *T, def T) T {
-	if ptr != nil {
-		return *ptr
-	}
-	return def
-}
-
-// Equal returns true if both arguments are nil or both arguments
-// dereference to the same value.
-func Equal[T comparable](a, b *T) bool {
-	if (a == nil) != (b == nil) {
-		return false
-	}
-	if a == nil {
-		return true
-	}
-	return *a == *b
-}