[dependencies] Update golang Docker tag to v1.26

2026-04-12 10:07:20 +10:00 · 2026-02-11 01:37:12 +00:00
61 changed files with 860 additions and 2556 deletions
--- a/.fpm_pacman
+++ b/.fpm_pacman
@@ -1,23 +0,0 @@
-s dir
--name sing-box
--category net
--license GPL-3.0-or-later
--description "The universal proxy platform."
--url "https://sing-box.sagernet.org/"
--maintainer "nekohasekai <contact-git@sekai.icu>"
--config-files etc/sing-box/config.json
--after-install release/config/sing-box.postinst
-
-release/config/config.json=/etc/sing-box/config.json
-
-release/config/sing-box.service=/usr/lib/systemd/system/sing-box.service
-release/config/sing-box@.service=/usr/lib/systemd/system/sing-box@.service
-release/config/sing-box.sysusers=/usr/lib/sysusers.d/sing-box.conf
-release/config/sing-box.rules=usr/share/polkit-1/rules.d/sing-box.rules
-release/config/sing-box-split-dns.xml=/usr/share/dbus-1/system.d/sing-box-split-dns.conf
-
-release/completions/sing-box.bash=/usr/share/bash-completion/completions/sing-box.bash
-release/completions/sing-box.fish=/usr/share/fish/vendor_completions.d/sing-box.fish
-release/completions/sing-box.zsh=/usr/share/zsh/site-functions/_sing-box
-
-LICENSE=/usr/share/licenses/sing-box/LICENSE
--- a/.github/CRONET_GO_VERSION
+++ b/.github/CRONET_GO_VERSION
@@ -1 +1 @@
-17c7ef18afa63b205e835c6270277b29382eb8e3
+dc1cda1fe28740ba069934ab62aeb8ef85388332
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,7 +46,7 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v5
        with:
-          go-version: ~1.25.7
+          go-version: ^1.25.7
      - name: Check input version
        if: github.event_name == 'workflow_dispatch'
        run: |-
@@ -85,27 +85,19 @@ jobs:
          - { os: linux, arch: arm, variant: glibc, naive: true, goarm: "7" }
          - { os: linux, arch: arm, variant: musl, naive: true, goarm: "7", debian: armhf, rpm: armv7hl, pacman: armv7hl, openwrt: "arm_cortex-a5_vfpv4 arm_cortex-a7_neon-vfpv4 arm_cortex-a7_vfpv4 arm_cortex-a8_vfpv3 arm_cortex-a9_neon arm_cortex-a9_vfpv3-d16 arm_cortex-a15_neon-vfpv4" }

-          - { os: linux, arch: mipsle, gomips: hardfloat, naive: true, variant: glibc }
-          - { os: linux, arch: mipsle, gomips: softfloat, naive: true, variant: musl, debian: mipsel, rpm: mipsel, openwrt: "mipsel_24kc mipsel_74kc mipsel_mips32" }
-          - { os: linux, arch: mips64le, gomips: hardfloat, naive: true, variant: glibc, debian: mips64el, rpm: mips64el }
-          - { os: linux, arch: riscv64, naive: true, variant: glibc }
-          - { os: linux, arch: riscv64, naive: true, variant: musl, debian: riscv64, rpm: riscv64, openwrt: "riscv64_generic" }
-          - { os: linux, arch: loong64, naive: true, variant: glibc }
-          - { os: linux, arch: loong64, naive: true, variant: musl, debian: loongarch64, rpm: loongarch64, openwrt: "loongarch64_generic" }
-
          - { os: linux, arch: "386", go386: softfloat, openwrt: "i386_pentium-mmx" }
          - { os: linux, arch: arm, goarm: "5", openwrt: "arm_arm926ej-s arm_cortex-a7 arm_cortex-a9 arm_fa526 arm_xscale" }
          - { os: linux, arch: arm, goarm: "6", debian: armel, rpm: armv6hl, openwrt: "arm_arm1176jzf-s_vfp" }
          - { os: linux, arch: mips, gomips: softfloat, openwrt: "mips_24kc mips_4kec mips_mips32" }
-          - { os: linux, arch: mipsle, gomips: hardfloat, openwrt: "mipsel_24kc_24kf" }
-          - { os: linux, arch: mipsle, gomips: softfloat }
+          - { os: linux, arch: mipsle, gomips: hardfloat, debian: mipsel, rpm: mipsel, openwrt: "mipsel_24kc_24kf" }
+          - { os: linux, arch: mipsle, gomips: softfloat, openwrt: "mipsel_24kc mipsel_74kc mipsel_mips32" }
          - { os: linux, arch: mips64, gomips: softfloat, openwrt: "mips64_mips64r2 mips64_octeonplus" }
-          - { os: linux, arch: mips64le, gomips: hardfloat }
+          - { os: linux, arch: mips64le, gomips: hardfloat, debian: mips64el, rpm: mips64el }
          - { os: linux, arch: mips64le, gomips: softfloat, openwrt: "mips64el_mips64r2" }
          - { os: linux, arch: s390x, debian: s390x, rpm: s390x }
          - { os: linux, arch: ppc64le, debian: ppc64el, rpm: ppc64le }
-          - { os: linux, arch: riscv64 }
-          - { os: linux, arch: loong64 }
+          - { os: linux, arch: riscv64, debian: riscv64, rpm: riscv64, openwrt: "riscv64_generic" }
+          - { os: linux, arch: loong64, debian: loongarch64, rpm: loongarch64, openwrt: "loongarch64_generic" }

          - { os: windows, arch: amd64, legacy_win7: true, legacy_name: "windows-7" }
          - { os: windows, arch: "386", legacy_win7: true, legacy_name: "windows-7" }
@@ -123,7 +115,7 @@ jobs:
        if: ${{ ! (matrix.legacy_win7 || matrix.legacy_go124) }}
        uses: actions/setup-go@v5
        with:
-          go-version: ~1.25.7
+          go-version: ^1.25.7
      - name: Setup Go 1.24
        if: matrix.legacy_go124
        uses: actions/setup-go@v5
@@ -162,23 +154,14 @@ jobs:
          git -C ~/cronet-go fetch --depth=1 origin "$CRONET_GO_VERSION"
          git -C ~/cronet-go checkout FETCH_HEAD
          git -C ~/cronet-go submodule update --init --recursive --depth=1
-      - name: Regenerate Debian keyring
-        if: matrix.naive
-        run: |
-          set -xeuo pipefail
-          rm -f ~/cronet-go/naiveproxy/src/build/linux/sysroot_scripts/keyring.gpg
-          cd ~/cronet-go
-          GPG_TTY=/dev/null ./naiveproxy/src/build/linux/sysroot_scripts/generate_keyring.sh
      - name: Cache Chromium toolchain
        if: matrix.naive
        id: cache-chromium-toolchain
        uses: actions/cache@v4
        with:
          path: |
-            ~/cronet-go/naiveproxy/src/third_party/llvm-build/
-            ~/cronet-go/naiveproxy/src/gn/out/
-            ~/cronet-go/naiveproxy/src/chrome/build/pgo_profiles/
-            ~/cronet-go/naiveproxy/src/out/sysroot-build/
+            ~/cronet-go/naiveproxy/src/third_party/llvm-build/Release+Asserts
+            ~/cronet-go/naiveproxy/src/out/sysroot-build
          key: chromium-toolchain-${{ matrix.arch }}-${{ matrix.variant }}-${{ hashFiles('.github/CRONET_GO_VERSION') }}
      - name: Download Chromium toolchain
        if: matrix.naive
@@ -253,8 +236,6 @@ jobs:
          GOARCH: ${{ matrix.arch }}
          GO386: ${{ matrix.go386 }}
          GOARM: ${{ matrix.goarm }}
-          GOMIPS: ${{ matrix.gomips }}
-          GOMIPS64: ${{ matrix.gomips }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Build (musl)
        if: matrix.variant == 'musl'
@@ -270,8 +251,6 @@ jobs:
          GOARCH: ${{ matrix.arch }}
          GO386: ${{ matrix.go386 }}
          GOARM: ${{ matrix.goarm }}
-          GOMIPS: ${{ matrix.gomips }}
-          GOMIPS64: ${{ matrix.gomips }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Build (non-variant)
        if: matrix.os != 'android' && matrix.variant == ''
@@ -373,7 +352,7 @@ jobs:
          sudo gem install fpm
          sudo apt-get update
          sudo apt-get install -y libarchive-tools
-          cp .fpm_pacman .fpm
+          cp .fpm_systemd .fpm
          fpm -t pacman \
            -v "$PKG_VERSION" \
            -p "dist/sing-box_${{ needs.calculate_version.outputs.version }}_${{ matrix.os }}_${{ matrix.pacman }}.pkg.tar.zst" \
@@ -592,7 +571,7 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v5
        with:
-          go-version: ~1.25.7
+          go-version: ^1.25.7
      - name: Setup Android NDK
        id: setup-ndk
        uses: nttld/setup-ndk@v1
@@ -682,7 +661,7 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v5
        with:
-          go-version: ~1.25.7
+          go-version: ^1.25.7
      - name: Setup Android NDK
        id: setup-ndk
        uses: nttld/setup-ndk@v1
@@ -781,7 +760,7 @@ jobs:
        if: matrix.if
        uses: actions/setup-go@v5
        with:
-          go-version: ~1.25.7
+          go-version: ^1.25.7
      - name: Set tag
        if: matrix.if
        run: |-
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -29,12 +29,10 @@ jobs:
          - { arch: arm64, naive: true, docker_platform: "linux/arm64" }
          - { arch: "386", naive: true, docker_platform: "linux/386" }
          - { arch: arm, goarm: "7", naive: true, docker_platform: "linux/arm/v7" }
-          - { arch: mipsle, gomips: softfloat, naive: true, docker_platform: "linux/mipsle" }
-          - { arch: riscv64, naive: true, docker_platform: "linux/riscv64" }
-          - { arch: loong64, naive: true, docker_platform: "linux/loong64" }
          # Non-naive builds
          - { arch: arm, goarm: "6", docker_platform: "linux/arm/v6" }
          - { arch: ppc64le, docker_platform: "linux/ppc64le" }
+          - { arch: riscv64, docker_platform: "linux/riscv64" }
          - { arch: s390x, docker_platform: "linux/s390x" }
    steps:
      - name: Get commit to build
@@ -55,7 +53,7 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v5
        with:
-          go-version: ~1.25.7
+          go-version: ^1.25.4
      - name: Clone cronet-go
        if: matrix.naive
        run: |
@@ -66,23 +64,14 @@ jobs:
          git -C ~/cronet-go fetch --depth=1 origin "$CRONET_GO_VERSION"
          git -C ~/cronet-go checkout FETCH_HEAD
          git -C ~/cronet-go submodule update --init --recursive --depth=1
-      - name: Regenerate Debian keyring
-        if: matrix.naive
-        run: |
-          set -xeuo pipefail
-          rm -f ~/cronet-go/naiveproxy/src/build/linux/sysroot_scripts/keyring.gpg
-          cd ~/cronet-go
-          GPG_TTY=/dev/null ./naiveproxy/src/build/linux/sysroot_scripts/generate_keyring.sh
      - name: Cache Chromium toolchain
        if: matrix.naive
        id: cache-chromium-toolchain
        uses: actions/cache@v4
        with:
          path: |
-            ~/cronet-go/naiveproxy/src/third_party/llvm-build/
-            ~/cronet-go/naiveproxy/src/gn/out/
-            ~/cronet-go/naiveproxy/src/chrome/build/pgo_profiles/
-            ~/cronet-go/naiveproxy/src/out/sysroot-build/
+            ~/cronet-go/naiveproxy/src/third_party/llvm-build/Release+Asserts
+            ~/cronet-go/naiveproxy/src/out/sysroot-build
          key: chromium-toolchain-${{ matrix.arch }}-musl-${{ hashFiles('.github/CRONET_GO_VERSION') }}
      - name: Download Chromium toolchain
        if: matrix.naive
@@ -121,7 +110,6 @@ jobs:
          GOOS: linux
          GOARCH: ${{ matrix.arch }}
          GOARM: ${{ matrix.goarm }}
-          GOMIPS: ${{ matrix.gomips }}
      - name: Build (non-naive)
        if: ${{ ! matrix.naive }}
        run: |
@@ -160,17 +148,15 @@ jobs:
    strategy:
      fail-fast: true
      matrix:
-        include:
-          - { platform: "linux/amd64" }
-          - { platform: "linux/arm/v6" }
-          - { platform: "linux/arm/v7" }
-          - { platform: "linux/arm64" }
-          - { platform: "linux/386" }
-          # mipsle: no base Docker image available for this platform
-          - { platform: "linux/ppc64le" }
-          - { platform: "linux/riscv64" }
-          - { platform: "linux/s390x" }
-          - { platform: "linux/loong64", base_image: "ghcr.io/loong64/alpine:edge" }
+        platform:
+          - linux/amd64
+          - linux/arm/v6
+          - linux/arm/v7
+          - linux/arm64
+          - linux/386
+          - linux/ppc64le
+          - linux/riscv64
+          - linux/s390x
    steps:
      - name: Get commit to build
        id: ref
@@ -223,8 +209,6 @@ jobs:
          platforms: ${{ matrix.platform }}
          context: .
          file: Dockerfile.binary
-          build-args: |
-            BASE_IMAGE=${{ matrix.base_image || 'alpine' }}
          labels: ${{ steps.meta.outputs.labels }}
          outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
      - name: Export digest
@@ -240,7 +224,6 @@ jobs:
          if-no-files-found: error
          retention-days: 1
  merge:
-    if: github.event_name != 'push'
    runs-on: ubuntu-latest
    needs:
      - build_docker
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -34,7 +34,7 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v5
        with:
-          go-version: ~1.25.7
+          go-version: ^1.25.7
      - name: Check input version
        if: github.event_name == 'workflow_dispatch'
        run: |-
@@ -61,14 +61,14 @@ jobs:
          - { os: linux, arch: arm64, naive: true, debian: arm64, rpm: aarch64, pacman: aarch64 }
          - { os: linux, arch: "386", naive: true, debian: i386, rpm: i386 }
          - { os: linux, arch: arm, goarm: "7", naive: true, debian: armhf, rpm: armv7hl, pacman: armv7hl }
-          - { os: linux, arch: mipsle, gomips: softfloat, naive: true, debian: mipsel, rpm: mipsel }
-          - { os: linux, arch: riscv64, naive: true, debian: riscv64, rpm: riscv64 }
-          - { os: linux, arch: loong64, naive: true, debian: loongarch64, rpm: loongarch64 }
          # Non-naive builds (unsupported architectures)
          - { os: linux, arch: arm, goarm: "6", debian: armel, rpm: armv6hl }
          - { os: linux, arch: mips64le, debian: mips64el, rpm: mips64el }
+          - { os: linux, arch: mipsle, debian: mipsel, rpm: mipsel }
          - { os: linux, arch: s390x, debian: s390x, rpm: s390x }
          - { os: linux, arch: ppc64le, debian: ppc64el, rpm: ppc64le }
+          - { os: linux, arch: riscv64, debian: riscv64, rpm: riscv64 }
+          - { os: linux, arch: loong64, debian: loongarch64, rpm: loongarch64 }
    steps:
      - name: Checkout
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
@@ -77,7 +77,7 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v5
        with:
-          go-version: ~1.25.7
+          go-version: ^1.25.7
      - name: Clone cronet-go
        if: matrix.naive
        run: |
@@ -88,23 +88,14 @@ jobs:
          git -C ~/cronet-go fetch --depth=1 origin "$CRONET_GO_VERSION"
          git -C ~/cronet-go checkout FETCH_HEAD
          git -C ~/cronet-go submodule update --init --recursive --depth=1
-      - name: Regenerate Debian keyring
-        if: matrix.naive
-        run: |
-          set -xeuo pipefail
-          rm -f ~/cronet-go/naiveproxy/src/build/linux/sysroot_scripts/keyring.gpg
-          cd ~/cronet-go
-          GPG_TTY=/dev/null ./naiveproxy/src/build/linux/sysroot_scripts/generate_keyring.sh
      - name: Cache Chromium toolchain
        if: matrix.naive
        id: cache-chromium-toolchain
        uses: actions/cache@v4
        with:
          path: |
-            ~/cronet-go/naiveproxy/src/third_party/llvm-build/
-            ~/cronet-go/naiveproxy/src/gn/out/
-            ~/cronet-go/naiveproxy/src/chrome/build/pgo_profiles/
-            ~/cronet-go/naiveproxy/src/out/sysroot-build/
+            ~/cronet-go/naiveproxy/src/third_party/llvm-build/Release+Asserts
+            ~/cronet-go/naiveproxy/src/out/sysroot-build
          key: chromium-toolchain-${{ matrix.arch }}-musl-${{ hashFiles('.github/CRONET_GO_VERSION') }}
      - name: Download Chromium toolchain
        if: matrix.naive
@@ -143,8 +134,6 @@ jobs:
          GOOS: linux
          GOARCH: ${{ matrix.arch }}
          GOARM: ${{ matrix.goarm }}
-          GOMIPS: ${{ matrix.gomips }}
-          GOMIPS64: ${{ matrix.gomips }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Build (non-naive)
        if: ${{ ! matrix.naive }}
--- a/.gitignore
+++ b/.gitignore
@@ -12,9 +12,6 @@
 /*.jar
 /*.aar
 /*.xcframework/
-/experimental/libbox/*.aar
-/experimental/libbox/*.xcframework/
-/experimental/libbox/*.nupkg
 .DS_Store
 /config.d/
 /venv/
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.26-alpine AS builder
 LABEL maintainer="nekohasekai <contact-git@sekai.icu>"
 COPY . /go/src/github.com/sagernet/sing-box
 WORKDIR /go/src/github.com/sagernet/sing-box
--- a/Dockerfile.binary
+++ b/Dockerfile.binary
@@ -1,14 +1,8 @@
-ARG BASE_IMAGE=alpine
-FROM ${BASE_IMAGE}
+FROM alpine
 ARG TARGETARCH
 ARG TARGETVARIANT
 LABEL maintainer="nekohasekai <contact-git@sekai.icu>"
 RUN set -ex \
-    && if command -v apk > /dev/null; then \
-        apk add --no-cache --upgrade bash tzdata ca-certificates nftables; \
-    else \
-        apt-get update && apt-get install -y --no-install-recommends bash tzdata ca-certificates nftables \
-        && rm -rf /var/lib/apt/lists/*; \
-    fi
+    && apk add --no-cache --upgrade bash tzdata ca-certificates nftables
 COPY sing-box-${TARGETARCH}${TARGETVARIANT} /usr/local/bin/sing-box
 ENTRYPOINT ["sing-box"]
--- a/13
+++ b/13
@@ -10,8 +10,6 @@ PARAMS = -v -trimpath -ldflags "-X 'github.com/sagernet/sing-box/constant.Versio
 MAIN_PARAMS = $(PARAMS) -tags "$(TAGS)"
 MAIN = ./cmd/sing-box
 PREFIX ?= $(shell go env GOPATH)
-SING_FFI ?= sing-ffi
-LIBBOX_FFI_CONFIG ?= ./experimental/libbox/ffi.json

 .PHONY: test release docs build

@@ -239,18 +237,15 @@ lib_android:
 lib_apple:
 	go run ./cmd/internal/build_libbox -target apple

-lib_windows:
-	$(SING_FFI) generate --config $(LIBBOX_FFI_CONFIG) --platform-type csharp
-
 lib_android_new:
-	$(SING_FFI) generate --config $(LIBBOX_FFI_CONFIG) --platform-type android
+	go run ./cmd/internal/build_libbox_newffi -target android

 lib_apple_new:
-	$(SING_FFI) generate --config $(LIBBOX_FFI_CONFIG) --platform-type apple
+	go run ./cmd/internal/build_libbox_newffi -target apple

 lib_install:
-	go install -v github.com/sagernet/gomobile/cmd/gomobile@v0.1.12
-	go install -v github.com/sagernet/gomobile/cmd/gobind@v0.1.12
+	go install -v github.com/sagernet/gomobile/cmd/gomobile@v0.1.11
+	go install -v github.com/sagernet/gomobile/cmd/gobind@v0.1.11

 docs:
 	venv/bin/mkdocs serve
--- a/adapter/connections.go
+++ b/adapter/connections.go
@@ -9,10 +9,6 @@ import (

 type ConnectionManager interface {
 	Lifecycle
-	Count() int
-	CloseAll()
-	TrackConn(conn net.Conn) net.Conn
-	TrackPacketConn(conn net.PacketConn) net.PacketConn
 	NewConnection(ctx context.Context, this N.Dialer, conn net.Conn, metadata InboundContext, onClose N.CloseHandlerFunc)
 	NewPacketConnection(ctx context.Context, this N.Dialer, conn N.PacketConn, metadata InboundContext, onClose N.CloseHandlerFunc)
 }
--- a/box.go
+++ b/box.go
@@ -125,10 +125,7 @@ func New(options Options) (*Box, error) {

 	ctx = pause.WithDefaultManager(ctx)
 	experimentalOptions := common.PtrValueOrDefault(options.Experimental)
-	err := applyDebugOptions(common.PtrValueOrDefault(experimentalOptions.Debug))
-	if err != nil {
-		return nil, err
-	}
+	applyDebugOptions(common.PtrValueOrDefault(experimentalOptions.Debug))
 	var needCacheFile bool
 	var needClashAPI bool
 	var needV2RayAPI bool
--- a/clients/android
+++ b/clients/android
--- a/clients/apple
+++ b/clients/apple
--- a/cmd/internal/build_libbox/main.go
+++ b/cmd/internal/build_libbox/main.go
@@ -63,7 +63,7 @@ func init() {
 	sharedFlags = append(sharedFlags, "-ldflags", "-X github.com/sagernet/sing-box/constant.Version="+currentTag+" -X internal/godebug.defaultGODEBUG=multipathtcp=0 -s -w -buildid=  -checklinkname=0")
 	debugFlags = append(debugFlags, "-ldflags", "-X github.com/sagernet/sing-box/constant.Version="+currentTag+" -X internal/godebug.defaultGODEBUG=multipathtcp=0 -checklinkname=0")

-	sharedTags = append(sharedTags, "with_gvisor", "with_quic", "with_wireguard", "with_utls", "with_naive_outbound", "with_clash_api", "badlinkname", "tfogo_checklinkname0")
+	sharedTags = append(sharedTags, "with_gvisor", "with_quic", "with_wireguard", "with_utls", "with_naive_outbound", "with_clash_api", "with_conntrack", "badlinkname", "tfogo_checklinkname0")
 	darwinTags = append(darwinTags, "with_dhcp", "grpcnotrace")
 	// memcTags = append(memcTags, "with_tailscale")
 	sharedTags = append(sharedTags, "with_tailscale", "ts_omit_logtail", "ts_omit_ssh", "ts_omit_drive", "ts_omit_taildrop", "ts_omit_webclient", "ts_omit_doctor", "ts_omit_capture", "ts_omit_kube", "ts_omit_aws", "ts_omit_synology", "ts_omit_bird")
--- a/cmd/internal/build_libbox_newffi/main.go
+++ b/cmd/internal/build_libbox_newffi/main.go
@@ -0,0 +1,93 @@
+package main
+
+import (
+	"flag"
+	"os"
+	"os/exec"
+	"path/filepath"
+
+	"github.com/sagernet/sing-box/log"
+	"github.com/sagernet/sing/common/rw"
+)
+
+var target string
+
+func init() {
+	flag.StringVar(&target, "target", "android", "target platform (android or apple)")
+}
+
+func main() {
+	flag.Parse()
+
+	args := []string{
+		"generate",
+		"-v",
+		"--config", "experimental/libbox/ffi.json",
+		"--platform-type", target,
+	}
+	command := exec.Command("sing-ffi", args...)
+	command.Stdout = os.Stdout
+	command.Stderr = os.Stderr
+	err := command.Run()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	copyArtifacts(target)
+}
+
+func copyArtifacts(target string) {
+	switch target {
+	case "android":
+		copyPath := filepath.Join("..", "sing-box-for-android", "app", "libs")
+		if rw.IsDir(copyPath) {
+			copyPath, _ = filepath.Abs(copyPath)
+			for _, name := range []string{"libbox.aar", "libbox-legacy.aar"} {
+				artifactPath, found := findArtifactPath(name)
+				if !found {
+					continue
+				}
+				targetPath := filepath.Join(target, artifactPath)
+				os.RemoveAll(targetPath)
+				err := os.Rename(artifactPath, targetPath)
+				if err != nil {
+					log.Fatal(err)
+				}
+				log.Info("copied ", name, " to ", copyPath)
+			}
+		}
+	case "apple":
+		copyPath := filepath.Join("..", "sing-box-for-apple")
+		if rw.IsDir(copyPath) {
+			sourceDir, found := findArtifactPath("Libbox.xcframework")
+			if !found {
+				log.Fatal("Libbox.xcframework not found in current directory or experimental/libbox")
+			}
+
+			targetDir := filepath.Join(copyPath, "Libbox.xcframework")
+			targetDir, _ = filepath.Abs(targetDir)
+			err := os.RemoveAll(targetDir)
+			if err != nil {
+				log.Fatal(err)
+			}
+			err = os.Rename(sourceDir, targetDir)
+			if err != nil {
+				log.Fatal(err)
+			}
+			log.Info("copied ", sourceDir, " to ", targetDir)
+		}
+	}
+}
+
+func findArtifactPath(name string) (string, bool) {
+	candidates := []string{
+		name,
+		filepath.Join("experimental", "libbox", name),
+	}
+	for _, candidate := range candidates {
+		if rw.IsFile(candidate) || rw.IsDir(candidate) {
+			return candidate, true
+		}
+	}
+	return "", false
+}
--- a/cmd/internal/update_apple_version/main.go
+++ b/cmd/internal/update_apple_version/main.go
@@ -71,12 +71,12 @@ func findAndReplace(objectsMap map[string]any, projectContent string, bundleIDLi
 		indexEnd := indexStart + strings.Index(projectContent[indexStart:], "}")
 		versionStart := indexStart + strings.Index(projectContent[indexStart:indexEnd], "MARKETING_VERSION = ") + 20
 		versionEnd := versionStart + strings.Index(projectContent[versionStart:indexEnd], ";")
-		version := strings.Trim(projectContent[versionStart:versionEnd], "\"")
+		version := projectContent[versionStart:versionEnd]
 		if version == newVersion {
 			continue
 		}
 		updated = true
-		projectContent = projectContent[:versionStart] + "\"" + newVersion + "\"" + projectContent[versionEnd:]
+		projectContent = projectContent[:versionStart] + newVersion + projectContent[versionEnd:]
 	}
 	return projectContent, updated
 }
--- a/common/conntrack/conn.go
+++ b/common/conntrack/conn.go
@@ -0,0 +1,54 @@
+package conntrack
+
+import (
+	"io"
+	"net"
+
+	"github.com/sagernet/sing/common/x/list"
+)
+
+type Conn struct {
+	net.Conn
+	element *list.Element[io.Closer]
+}
+
+func NewConn(conn net.Conn) (net.Conn, error) {
+	connAccess.Lock()
+	element := openConnection.PushBack(conn)
+	connAccess.Unlock()
+	if KillerEnabled {
+		err := KillerCheck()
+		if err != nil {
+			conn.Close()
+			return nil, err
+		}
+	}
+	return &Conn{
+		Conn:    conn,
+		element: element,
+	}, nil
+}
+
+func (c *Conn) Close() error {
+	if c.element.Value != nil {
+		connAccess.Lock()
+		if c.element.Value != nil {
+			openConnection.Remove(c.element)
+			c.element.Value = nil
+		}
+		connAccess.Unlock()
+	}
+	return c.Conn.Close()
+}
+
+func (c *Conn) Upstream() any {
+	return c.Conn
+}
+
+func (c *Conn) ReaderReplaceable() bool {
+	return true
+}
+
+func (c *Conn) WriterReplaceable() bool {
+	return true
+}
--- a/common/conntrack/killer.go
+++ b/common/conntrack/killer.go
@@ -0,0 +1,35 @@
+package conntrack
+
+import (
+	runtimeDebug "runtime/debug"
+	"time"
+
+	E "github.com/sagernet/sing/common/exceptions"
+	"github.com/sagernet/sing/common/memory"
+)
+
+var (
+	KillerEnabled   bool
+	MemoryLimit     uint64
+	killerLastCheck time.Time
+)
+
+func KillerCheck() error {
+	if !KillerEnabled {
+		return nil
+	}
+	nowTime := time.Now()
+	if nowTime.Sub(killerLastCheck) < 3*time.Second {
+		return nil
+	}
+	killerLastCheck = nowTime
+	if memory.Total() > MemoryLimit {
+		Close()
+		go func() {
+			time.Sleep(time.Second)
+			runtimeDebug.FreeOSMemory()
+		}()
+		return E.New("out of memory")
+	}
+	return nil
+}
--- a/common/conntrack/packet_conn.go
+++ b/common/conntrack/packet_conn.go
@@ -0,0 +1,55 @@
+package conntrack
+
+import (
+	"io"
+	"net"
+
+	"github.com/sagernet/sing/common/bufio"
+	"github.com/sagernet/sing/common/x/list"
+)
+
+type PacketConn struct {
+	net.PacketConn
+	element *list.Element[io.Closer]
+}
+
+func NewPacketConn(conn net.PacketConn) (net.PacketConn, error) {
+	connAccess.Lock()
+	element := openConnection.PushBack(conn)
+	connAccess.Unlock()
+	if KillerEnabled {
+		err := KillerCheck()
+		if err != nil {
+			conn.Close()
+			return nil, err
+		}
+	}
+	return &PacketConn{
+		PacketConn: conn,
+		element:    element,
+	}, nil
+}
+
+func (c *PacketConn) Close() error {
+	if c.element.Value != nil {
+		connAccess.Lock()
+		if c.element.Value != nil {
+			openConnection.Remove(c.element)
+			c.element.Value = nil
+		}
+		connAccess.Unlock()
+	}
+	return c.PacketConn.Close()
+}
+
+func (c *PacketConn) Upstream() any {
+	return bufio.NewPacketConn(c.PacketConn)
+}
+
+func (c *PacketConn) ReaderReplaceable() bool {
+	return true
+}
+
+func (c *PacketConn) WriterReplaceable() bool {
+	return true
+}
--- a/common/conntrack/track.go
+++ b/common/conntrack/track.go
@@ -0,0 +1,47 @@
+package conntrack
+
+import (
+	"io"
+	"sync"
+
+	"github.com/sagernet/sing/common"
+	"github.com/sagernet/sing/common/x/list"
+)
+
+var (
+	connAccess     sync.RWMutex
+	openConnection list.List[io.Closer]
+)
+
+func Count() int {
+	if !Enabled {
+		return 0
+	}
+	return openConnection.Len()
+}
+
+func List() []io.Closer {
+	if !Enabled {
+		return nil
+	}
+	connAccess.RLock()
+	defer connAccess.RUnlock()
+	connList := make([]io.Closer, 0, openConnection.Len())
+	for element := openConnection.Front(); element != nil; element = element.Next() {
+		connList = append(connList, element.Value)
+	}
+	return connList
+}
+
+func Close() {
+	if !Enabled {
+		return
+	}
+	connAccess.Lock()
+	defer connAccess.Unlock()
+	for element := openConnection.Front(); element != nil; element = element.Next() {
+		common.Close(element.Value)
+		element.Value = nil
+	}
+	openConnection.Init()
+}
--- a/common/conntrack/track_disable.go
+++ b/common/conntrack/track_disable.go
@@ -0,0 +1,5 @@
+//go:build !with_conntrack
+
+package conntrack
+
+const Enabled = false
--- a/common/conntrack/track_enable.go
+++ b/common/conntrack/track_enable.go
@@ -0,0 +1,5 @@
+//go:build with_conntrack
+
+package conntrack
+
+const Enabled = true
--- a/common/dialer/default.go
+++ b/common/dialer/default.go
@@ -9,6 +9,7 @@ import (
 	"time"

 	"github.com/sagernet/sing-box/adapter"
+	"github.com/sagernet/sing-box/common/conntrack"
 	"github.com/sagernet/sing-box/common/listener"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/option"
@@ -36,7 +37,6 @@ type DefaultDialer struct {
 	udpAddr4               string
 	udpAddr6               string
 	netns                  string
-	connectionManager      adapter.ConnectionManager
 	networkManager         adapter.NetworkManager
 	networkStrategy        *C.NetworkStrategy
 	defaultNetworkStrategy bool
@@ -47,7 +47,6 @@ type DefaultDialer struct {
 }

 func NewDefault(ctx context.Context, options option.DialerOptions) (*DefaultDialer, error) {
-	connectionManager := service.FromContext[adapter.ConnectionManager](ctx)
 	networkManager := service.FromContext[adapter.NetworkManager](ctx)
 	platformInterface := service.FromContext[adapter.PlatformInterface](ctx)

@@ -90,7 +89,7 @@ func NewDefault(ctx context.Context, options option.DialerOptions) (*DefaultDial

 	if networkManager != nil {
 		defaultOptions := networkManager.DefaultOptions()
-		if defaultOptions.BindInterface != "" && !disableDefaultBind {
+		if defaultOptions.BindInterface != "" {
 			bindFunc := control.BindToInterface(networkManager.InterfaceFinder(), defaultOptions.BindInterface, -1)
 			dialer.Control = control.Append(dialer.Control, bindFunc)
 			listener.Control = control.Append(listener.Control, bindFunc)
@@ -158,11 +157,8 @@ func NewDefault(ctx context.Context, options option.DialerOptions) (*DefaultDial
 		if keepInterval == 0 {
 			keepInterval = C.TCPKeepAliveInterval
 		}
-		dialer.KeepAliveConfig = net.KeepAliveConfig{
-			Enable:   true,
-			Idle:     keepIdle,
-			Interval: keepInterval,
-		}
+		dialer.KeepAlive = keepIdle
+		dialer.Control = control.Append(dialer.Control, control.SetKeepAlivePeriod(keepIdle, keepInterval))
 	}
 	var udpFragment bool
 	if options.UDPFragment != nil {
@@ -210,7 +206,6 @@ func NewDefault(ctx context.Context, options option.DialerOptions) (*DefaultDial
 		udpAddr4:               udpAddr4,
 		udpAddr6:               udpAddr6,
 		netns:                  options.NetNs,
-		connectionManager:      connectionManager,
 		networkManager:         networkManager,
 		networkStrategy:        networkStrategy,
 		defaultNetworkStrategy: defaultNetworkStrategy,
@@ -243,7 +238,7 @@ func (d *DefaultDialer) DialContext(ctx context.Context, network string, address
 		return nil, E.New("domain not resolved")
 	}
 	if d.networkStrategy == nil {
-		return d.trackConn(listener.ListenNetworkNamespace[net.Conn](d.netns, func() (net.Conn, error) {
+		return trackConn(listener.ListenNetworkNamespace[net.Conn](d.netns, func() (net.Conn, error) {
 			switch N.NetworkName(network) {
 			case N.NetworkUDP:
 				if !address.IsIPv6() {
@@ -308,12 +303,12 @@ func (d *DefaultDialer) DialParallelInterface(ctx context.Context, network strin
 	if !fastFallback && !isPrimary {
 		d.networkLastFallback.Store(time.Now())
 	}
-	return d.trackConn(conn, nil)
+	return trackConn(conn, nil)
 }

 func (d *DefaultDialer) ListenPacket(ctx context.Context, destination M.Socksaddr) (net.PacketConn, error) {
 	if d.networkStrategy == nil {
-		return d.trackPacketConn(listener.ListenNetworkNamespace[net.PacketConn](d.netns, func() (net.PacketConn, error) {
+		return trackPacketConn(listener.ListenNetworkNamespace[net.PacketConn](d.netns, func() (net.PacketConn, error) {
 			if destination.IsIPv6() {
 				return d.udpListener.ListenPacket(ctx, N.NetworkUDP, d.udpAddr6)
 			} else if destination.IsIPv4() && !destination.Addr.IsUnspecified() {
@@ -365,23 +360,23 @@ func (d *DefaultDialer) ListenSerialInterfacePacket(ctx context.Context, destina
 			return nil, err
 		}
 	}
-	return d.trackPacketConn(packetConn, nil)
+	return trackPacketConn(packetConn, nil)
 }

 func (d *DefaultDialer) WireGuardControl() control.Func {
 	return d.udpListener.Control
 }

-func (d *DefaultDialer) trackConn(conn net.Conn, err error) (net.Conn, error) {
-	if d.connectionManager == nil || err != nil {
+func trackConn(conn net.Conn, err error) (net.Conn, error) {
+	if !conntrack.Enabled || err != nil {
 		return conn, err
 	}
-	return d.connectionManager.TrackConn(conn), nil
+	return conntrack.NewConn(conn)
 }

-func (d *DefaultDialer) trackPacketConn(conn net.PacketConn, err error) (net.PacketConn, error) {
-	if d.connectionManager == nil || err != nil {
+func trackPacketConn(conn net.PacketConn, err error) (net.PacketConn, error) {
+	if !conntrack.Enabled || err != nil {
 		return conn, err
 	}
-	return d.connectionManager.TrackPacketConn(conn), nil
+	return conntrack.NewPacketConn(conn)
 }
--- a/constant/proxy.go
+++ b/constant/proxy.go
@@ -30,7 +30,6 @@ const (
 	TypeSSMAPI       = "ssm-api"
 	TypeCCM          = "ccm"
 	TypeOCM          = "ocm"
-	TypeOOMKiller    = "oom-killer"
 )

 const (
@@ -86,8 +85,6 @@ func ProxyDisplayName(proxyType string) string {
 		return "Hysteria2"
 	case TypeAnyTLS:
 		return "AnyTLS"
-	case TypeTailscale:
-		return "Tailscale"
 	case TypeSelector:
 		return "Selector"
 	case TypeURLTest:
--- a/daemon/instance.go
+++ b/daemon/instance.go
@@ -7,12 +7,10 @@ import (
 	"github.com/sagernet/sing-box"
 	"github.com/sagernet/sing-box/adapter"
 	"github.com/sagernet/sing-box/common/urltest"
-	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/experimental/deprecated"
 	"github.com/sagernet/sing-box/include"
 	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing-box/option"
-	"github.com/sagernet/sing/common"
 	E "github.com/sagernet/sing/common/exceptions"
 	"github.com/sagernet/sing/common/json"
 	"github.com/sagernet/sing/service"
@@ -23,7 +21,6 @@ type Instance struct {
 	ctx                   context.Context
 	cancel                context.CancelFunc
 	instance              *box.Box
-	connectionManager     adapter.ConnectionManager
 	clashServer           adapter.ClashServer
 	cacheFile             adapter.CacheFile
 	pauseManager          pause.Manager
@@ -87,15 +84,6 @@ func (s *StartedService) newInstance(profileContent string, overrideOptions *Ove
 			}
 		}
 	}
-	if s.oomKiller && C.IsIos {
-		if !common.Any(options.Services, func(it option.Service) bool {
-			return it.Type == C.TypeOOMKiller
-		}) {
-			options.Services = append(options.Services, option.Service{
-				Type: C.TypeOOMKiller,
-			})
-		}
-	}
 	urlTestHistoryStorage := urltest.NewHistoryStorage()
 	ctx = service.ContextWithPtr(ctx, urlTestHistoryStorage)
 	i := &Instance{
@@ -113,7 +101,6 @@ func (s *StartedService) newInstance(profileContent string, overrideOptions *Ove
 		return nil, err
 	}
 	i.instance = boxInstance
-	i.connectionManager = service.FromContext[adapter.ConnectionManager](ctx)
 	i.clashServer = service.FromContext[adapter.ClashServer](ctx)
 	i.pauseManager = service.FromContext[pause.Manager](ctx)
 	i.cacheFile = service.FromContext[adapter.CacheFile](ctx)
--- a/daemon/started_service.go
+++ b/daemon/started_service.go
@@ -8,6 +8,7 @@ import (
 	"time"

 	"github.com/sagernet/sing-box/adapter"
+	"github.com/sagernet/sing-box/common/conntrack"
 	"github.com/sagernet/sing-box/common/urltest"
 	"github.com/sagernet/sing-box/experimental/clashapi"
 	"github.com/sagernet/sing-box/experimental/clashapi/trafficontrol"
@@ -35,7 +36,6 @@ type StartedService struct {
 	handler     PlatformHandler
 	debug       bool
 	logMaxLines int
-	oomKiller   bool
 	// workingDirectory string
 	// tempDirectory    string
 	// userID           int
@@ -67,7 +67,6 @@ type ServiceOptions struct {
 	Handler     PlatformHandler
 	Debug       bool
 	LogMaxLines int
-	OOMKiller   bool
 	// WorkingDirectory   string
 	// TempDirectory      string
 	// UserID             int
@@ -82,7 +81,6 @@ func NewStartedService(options ServiceOptions) *StartedService {
 		handler:     options.Handler,
 		debug:       options.Debug,
 		logMaxLines: options.LogMaxLines,
-		oomKiller:   options.OOMKiller,
 		// workingDirectory: options.WorkingDirectory,
 		// tempDirectory:    options.TempDirectory,
 		// userID:           options.UserID,
@@ -209,14 +207,6 @@ func (s *StartedService) StartOrReloadService(profileContent string, options *Ov
 	return nil
 }

-func (s *StartedService) Close() {
-	s.serviceStatusSubscriber.Close()
-	s.logSubscriber.Close()
-	s.urlTestSubscriber.Close()
-	s.clashModeSubscriber.Close()
-	s.connectionEventSubscriber.Close()
-}
-
 func (s *StartedService) CloseService() error {
 	s.serviceAccess.Lock()
 	switch s.serviceStatus.Status {
@@ -409,14 +399,12 @@ func (s *StartedService) SubscribeStatus(request *SubscribeStatusRequest, server

 func (s *StartedService) readStatus() *Status {
 	var status Status
-	status.Memory = memory.Total()
+	status.Memory = memory.Inuse()
 	status.Goroutines = int32(runtime.NumGoroutine())
+	status.ConnectionsOut = int32(conntrack.Count())
 	s.serviceAccess.RLock()
 	nowService := s.instance
 	s.serviceAccess.RUnlock()
-	if nowService != nil && nowService.connectionManager != nil {
-		status.ConnectionsOut = int32(nowService.connectionManager.Count())
-	}
 	if nowService != nil {
 		if clashServer := nowService.clashServer; clashServer != nil {
 			status.TrafficAvailable = true
@@ -997,12 +985,7 @@ func (s *StartedService) CloseConnection(ctx context.Context, request *CloseConn
 }

 func (s *StartedService) CloseAllConnections(ctx context.Context, empty *emptypb.Empty) (*emptypb.Empty, error) {
-	s.serviceAccess.RLock()
-	nowService := s.instance
-	s.serviceAccess.RUnlock()
-	if nowService != nil && nowService.connectionManager != nil {
-		nowService.connectionManager.CloseAll()
-	}
+	conntrack.Close()
 	return &emptypb.Empty{}, nil
 }

--- a/debug.go
+++ b/debug.go
@@ -3,11 +3,11 @@ package box
 import (
 	"runtime/debug"

+	"github.com/sagernet/sing-box/common/conntrack"
 	"github.com/sagernet/sing-box/option"
-	E "github.com/sagernet/sing/common/exceptions"
 )

-func applyDebugOptions(options option.DebugOptions) error {
+func applyDebugOptions(options option.DebugOptions) {
 	applyDebugListenOption(options)
 	if options.GCPercent != nil {
 		debug.SetGCPercent(*options.GCPercent)
@@ -26,9 +26,9 @@ func applyDebugOptions(options option.DebugOptions) error {
 	}
 	if options.MemoryLimit.Value() != 0 {
 		debug.SetMemoryLimit(int64(float64(options.MemoryLimit.Value()) / 1.5))
+		conntrack.MemoryLimit = options.MemoryLimit.Value()
 	}
 	if options.OOMKiller != nil {
-		return E.New("legacy oom_killer in debug options is removed, use oom-killer service instead")
+		conntrack.KillerEnabled = *options.OOMKiller
 	}
-	return nil
 }
--- a/dns/router.go
+++ b/dns/router.go
@@ -377,11 +377,9 @@ func (r *Router) Lookup(ctx context.Context, domain string, options adapter.DNSQ
 				case *R.RuleActionReject:
 					return nil, &R.RejectedError{Cause: action.Error(ctx)}
 				case *R.RuleActionPredefined:
-					responseAddrs = nil
 					if action.Rcode != mDNS.RcodeSuccess {
 						err = RcodeError(action.Rcode)
 					} else {
-						err = nil
 						for _, answer := range action.Answer {
 							switch record := answer.(type) {
 							case *mDNS.A:
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -2,7 +2,9 @@
 icon: material/alert-decagram
 ---

-#### 1.13.0
+#### 1.13.0-rc.3
+
+* Fixes and improvements

 Important changes since 1.12:

@@ -20,7 +22,7 @@ Important changes since 1.12:
 * Improve `local` DNS server **12**
 * Add `disable_tcp_keep_alive`, `tcp_keep_alive` and `tcp_keep_alive_interval` options for listen and dial fields **13**
 * Add `bind_address_no_port` option for dial fields **14**
-* Add system interface, relay server and advertise tags options for Tailscale endpoint **15**
+* Add system interface and relay server options for Tailscale endpoint **15**
 * Add Claude Code Multiplexer service **16**
 * Add OpenAI Codex Multiplexer service **17**
 * Apple/Android: Refactor GUI
@@ -134,7 +136,6 @@ See [Dial Fields](/configuration/shared/dial/#bind_address_no_port).

 Tailscale endpoint can now create a system TUN interface to handle traffic directly.
 New `relay_server_port` and `relay_server_static_endpoints` options for incoming relay connections.
-New `advertise_tags` option for ACL tag advertisement.

 See [Tailscale endpoint](/configuration/endpoint/tailscale/).

@@ -168,22 +169,6 @@ Also, documentation has been updated with a warning about uTLS fingerprinting vu
 uTLS is not recommended for censorship circumvention due to fundamental architectural limitations;
 use NaiveProxy instead for TLS fingerprint resistance.

-#### 1.12.23
-
-* Fixes and improvements
-
-#### 1.13.0-rc.5
-
-* Add `mipsle`, `mips64le`, `riscv64` and `loong64` support for NaiveProxy outbound
-
-#### 1.12.22
-
-* Fixes and improvements
-
-#### 1.13.0-rc.3
-
-* Fixes and improvements
-
 #### 1.12.21

 * Fixes and improvements
--- a/docs/configuration/endpoint/tailscale.md
+++ b/docs/configuration/endpoint/tailscale.md
@@ -8,8 +8,7 @@ icon: material/new-box
    :material-plus: [relay_server_static_endpoints](#relay_server_static_endpoints)  
    :material-plus: [system_interface](#system_interface)  
    :material-plus: [system_interface_name](#system_interface_name)  
-    :material-plus: [system_interface_mtu](#system_interface_mtu)  
-    :material-plus: [advertise_tags](#advertise_tags)
+    :material-plus: [system_interface_mtu](#system_interface_mtu)

 !!! question "Since sing-box 1.12.0"

@@ -29,7 +28,6 @@ icon: material/new-box
  "exit_node_allow_lan_access": false,
  "advertise_routes": [],
  "advertise_exit_node": false,
-  "advertise_tags": [],
  "relay_server_port": 0,
  "relay_server_static_endpoints": [],
  "system_interface": false,
@@ -104,14 +102,6 @@ Example: `["192.168.1.1/24"]`

 Indicates whether the node should advertise itself as an exit node.

-#### advertise_tags
-
-!!! question "Since sing-box 1.13.0"
-
-Tags to advertise for this node, for ACL enforcement purposes.
-
-Example: `["tag:server"]`
-
 #### relay_server_port

 !!! question "Since sing-box 1.13.0"
--- a/docs/configuration/endpoint/tailscale.zh.md
+++ b/docs/configuration/endpoint/tailscale.zh.md
@@ -8,8 +8,7 @@ icon: material/new-box
    :material-plus: [relay_server_static_endpoints](#relay_server_static_endpoints)  
    :material-plus: [system_interface](#system_interface)  
    :material-plus: [system_interface_name](#system_interface_name)  
-    :material-plus: [system_interface_mtu](#system_interface_mtu)  
-    :material-plus: [advertise_tags](#advertise_tags)
+    :material-plus: [system_interface_mtu](#system_interface_mtu)

 !!! question "自 sing-box 1.12.0 起"

@@ -29,7 +28,6 @@ icon: material/new-box
  "exit_node_allow_lan_access": false,
  "advertise_routes": [],
  "advertise_exit_node": false,
-  "advertise_tags": [],
  "relay_server_port": 0,
  "relay_server_static_endpoints": [],
  "system_interface": false,
@@ -103,14 +101,6 @@ icon: material/new-box

 指示节点是否应将自己通告为出口节点。

-#### advertise_tags
-
-!!! question "自 sing-box 1.13.0 起"
-
-为此节点通告的标签，用于 ACL 执行。
-
-示例：`["tag:server"]`
-
 #### relay_server_port

 !!! question "自 sing-box 1.13.0 起"
--- a/experimental/libbox/command_client.go
+++ b/experimental/libbox/command_client.go
@@ -119,11 +119,7 @@ func dialTarget() (string, func(context.Context, string) (net.Conn, error)) {
 		}
 	}
 	if sCommandServerListenPort == 0 {
-		socketPath := filepath.Join(sBasePath, "command.sock")
-		return "passthrough:///command-socket", func(ctx context.Context, _ string) (net.Conn, error) {
-			var networkDialer net.Dialer
-			return networkDialer.DialContext(ctx, "unix", socketPath)
-		}
+		return "unix://" + filepath.Join(sBasePath, "command.sock"), nil
 	}
 	return net.JoinHostPort("127.0.0.1", strconv.Itoa(int(sCommandServerListenPort))), nil
 }
--- a/experimental/libbox/command_server.go
+++ b/experimental/libbox/command_server.go
@@ -60,7 +60,6 @@ func NewCommandServer(handler CommandServerHandler, platformInterface PlatformIn
 		Handler:     (*platformHandler)(server),
 		Debug:       sDebug,
 		LogMaxLines: sLogMaxLines,
-		OOMKiller:   memoryLimitEnabled,
 		// WorkingDirectory: sWorkingPath,
 		// TempDirectory:    sTempPath,
 		// UserID:           sUserID,
@@ -160,7 +159,6 @@ func (s *CommandServer) Close() {
 		s.grpcServer.Stop()
 	}
 	common.Close(s.listener)
-	s.StartedService.Close()
 }

 type OverrideOptions struct {
--- a/experimental/libbox/ffi.json
+++ b/experimental/libbox/ffi.json
@@ -1,19 +1,10 @@
 {
  "version": 1,
-  "variables": {
-    "VERSION": "$(go run github.com/sagernet/sing-box/cmd/internal/read_tag@latest)",
-    "WORKSPACE_ROOT": "../../..",
-    "DEPLOY_ANDROID": "${WORKSPACE_ROOT}/sing-box-for-android/app/libs",
-    "DEPLOY_APPLE": "${WORKSPACE_ROOT}/sing-box-for-apple",
-    "DEPLOY_WINDOWS": "${WORKSPACE_ROOT}/sing-box-for-windows/local-packages"
-  },
  "packages": [
    {
      "id": "libbox",
      "path": ".",
      "java_package": "io.nekohasekai.libbox",
-      "csharp_namespace": "SagerNet",
-      "csharp_entrypoint": "Libbox",
      "apple_prefix": "Libbox"
    }
  ],
@@ -29,6 +20,7 @@
          "with_utls",
          "with_naive_outbound",
          "with_clash_api",
+          "with_conntrack",
          "badlinkname",
          "tfogo_checklinkname0",
          "with_tailscale",
@@ -44,7 +36,7 @@
          "ts_omit_synology",
          "ts_omit_bird"
        ],
-        "ldflags": "-X github.com/sagernet/sing-box/constant.Version=${VERSION} -X internal/godebug.defaultGODEBUG=multipathtcp=0 -s -w -buildid= -checklinkname=0",
+        "ldflags": "-X github.com/sagernet/sing-box/constant.Version=$(CGO_ENABLED=0 go run github.com/sagernet/sing-box/cmd/internal/read_tag@latest) -X internal/godebug.defaultGODEBUG=multipathtcp=0 -s -w -buildid= -checklinkname=0",
        "trimpath": true
      }
    },
@@ -58,6 +50,7 @@
          "with_wireguard",
          "with_utls",
          "with_clash_api",
+          "with_conntrack",
          "badlinkname",
          "tfogo_checklinkname0",
          "with_tailscale",
@@ -73,7 +66,7 @@
          "ts_omit_synology",
          "ts_omit_bird"
        ],
-        "ldflags": "-X github.com/sagernet/sing-box/constant.Version=${VERSION} -X internal/godebug.defaultGODEBUG=multipathtcp=0 -s -w -buildid= -checklinkname=0",
+        "ldflags": "-X github.com/sagernet/sing-box/constant.Version=$(CGO_ENABLED=0 go run github.com/sagernet/sing-box/cmd/internal/read_tag@latest) -X internal/godebug.defaultGODEBUG=multipathtcp=0 -s -w -buildid= -checklinkname=0",
        "trimpath": true
      }
    },
@@ -88,6 +81,7 @@
          "with_utls",
          "with_naive_outbound",
          "with_clash_api",
+          "with_conntrack",
          "badlinkname",
          "tfogo_checklinkname0",
          "with_dhcp",
@@ -105,7 +99,7 @@
          "ts_omit_synology",
          "ts_omit_bird"
        ],
-        "ldflags": "-X github.com/sagernet/sing-box/constant.Version=${VERSION} -X internal/godebug.defaultGODEBUG=multipathtcp=0 -s -w -buildid= -checklinkname=0",
+        "ldflags": "-X github.com/sagernet/sing-box/constant.Version=$(CGO_ENABLED=0 go run github.com/sagernet/sing-box/cmd/internal/read_tag@latest) -X internal/godebug.defaultGODEBUG=multipathtcp=0 -s -w -buildid= -checklinkname=0",
        "trimpath": true
      },
      "overrides": [
@@ -118,37 +112,6 @@
          "tags_append": ["with_low_memory"]
        }
      ]
-    },
-    {
-      "id": "windows",
-      "packages": ["libbox"],
-      "default": {
-        "tags": [
-          "with_gvisor",
-          "with_quic",
-          "with_wireguard",
-          "with_utls",
-          "with_naive_outbound",
-          "with_purego",
-          "with_clash_api",
-          "badlinkname",
-          "tfogo_checklinkname0",
-          "with_tailscale",
-          "ts_omit_logtail",
-          "ts_omit_ssh",
-          "ts_omit_drive",
-          "ts_omit_taildrop",
-          "ts_omit_webclient",
-          "ts_omit_doctor",
-          "ts_omit_capture",
-          "ts_omit_kube",
-          "ts_omit_aws",
-          "ts_omit_synology",
-          "ts_omit_bird"
-        ],
-        "ldflags": "-X github.com/sagernet/sing-box/constant.Version=${VERSION} -X internal/godebug.defaultGODEBUG=multipathtcp=0 -s -w -buildid= -checklinkname=0",
-        "trimpath": true
-      }
    }
  ],
  "platforms": [
@@ -156,19 +119,12 @@
      "type": "android",
      "build": "android-main",
      "min_sdk": 23,
-      "ndk_version": "28.0.13004108",
      "lib_name": "box",
      "languages": [{ "type": "java" }],
      "artifacts": [
        {
          "type": "aar",
-          "output_path": "libbox.aar",
-          "execute_after": [
-            "if [ -d \"${DEPLOY_ANDROID}\" ]; then",
-            "  rm -f \"${DEPLOY_ANDROID}/$$(basename \"${OUTPUT_PATH}\")\"",
-            "  mv \"${OUTPUT_PATH}\" \"${DEPLOY_ANDROID}/\"",
-            "fi"
-          ]
+          "output_path": "libbox.aar"
        }
      ]
    },
@@ -176,19 +132,12 @@
      "type": "android",
      "build": "android-legacy",
      "min_sdk": 21,
-      "ndk_version": "28.0.13004108",
      "lib_name": "box",
      "languages": [{ "type": "java" }],
      "artifacts": [
        {
          "type": "aar",
-          "output_path": "libbox-legacy.aar",
-          "execute_after": [
-            "if [ -d \"${DEPLOY_ANDROID}\" ]; then",
-            "  rm -f \"${DEPLOY_ANDROID}/$$(basename \"${OUTPUT_PATH}\")\"",
-            "  mv \"${OUTPUT_PATH}\" \"${DEPLOY_ANDROID}/\"",
-            "fi"
-          ]
+          "output_path": "libbox-legacy.aar"
        }
      ]
    },
@@ -210,46 +159,7 @@
        {
          "type": "xcframework",
          "module_name": "Libbox",
-          "execute_after": [
-            "if [ -d \"${DEPLOY_APPLE}\" ]; then",
-            "  rm -rf \"${DEPLOY_APPLE}/${MODULE_NAME}.xcframework\"",
-            "  mv \"${OUTPUT_PATH}\" \"${DEPLOY_APPLE}/\"",
-            "fi"
-          ]
-        }
-      ]
-    },
-    {
-      "type": "csharp",
-      "build": "windows",
-      "targets": [
-        "windows/amd64"
-      ],
-      "languages": [{ "type": "csharp" }],
-      "artifacts": [
-        {
-          "type": "nuget",
-          "package_id": "SagerNet.Libbox",
-          "package_version": "0.0.0-local",
-          "execute_after": {
-            "windows": [
-              "$$deployPath = '${DEPLOY_WINDOWS}'",
-              "if (Test-Path $$deployPath) {",
-              "  Remove-Item \"$$deployPath\\${PACKAGE_ID}.*.nupkg\" -ErrorAction SilentlyContinue",
-              "  Move-Item -Force '${OUTPUT_PATH}' \"$$deployPath\\\"",
-              "  $$cachePath = if ($$env:NUGET_PACKAGES) { $$env:NUGET_PACKAGES } else { \"$$env:USERPROFILE\\.nuget\\packages\" }",
-              "  Remove-Item -Recurse -Force \"$$cachePath\\sagernet.libbox\\${PACKAGE_VERSION}\" -ErrorAction SilentlyContinue",
-              "}"
-            ],
-            "default": [
-              "if [ -d \"${DEPLOY_WINDOWS}\" ]; then",
-              "  rm -f \"${DEPLOY_WINDOWS}/${PACKAGE_ID}.*.nupkg\"",
-              "  mv \"${OUTPUT_PATH}\" \"${DEPLOY_WINDOWS}/\"",
-              "  cache_path=\"$${NUGET_PACKAGES:-$${HOME}/.nuget/packages}\"",
-              "  rm -rf \"$${cache_path}/sagernet.libbox/${PACKAGE_VERSION}\"",
-              "fi"
-            ]
-          }
+          "output_path": "Libbox.xcframework"
        }
      ]
    }
--- a/experimental/libbox/memory.go
+++ b/experimental/libbox/memory.go
@@ -4,23 +4,20 @@ import (
 	"math"
 	runtimeDebug "runtime/debug"

-	C "github.com/sagernet/sing-box/constant"
+	"github.com/sagernet/sing-box/common/conntrack"
 )

-var memoryLimitEnabled bool
-
 func SetMemoryLimit(enabled bool) {
-	memoryLimitEnabled = enabled
-	const memoryLimitGo = 45 * 1024 * 1024
+	const memoryLimit = 45 * 1024 * 1024
+	const memoryLimitGo = memoryLimit / 1.5
 	if enabled {
 		runtimeDebug.SetGCPercent(10)
-		if C.IsIos {
-			runtimeDebug.SetMemoryLimit(memoryLimitGo)
-		}
+		runtimeDebug.SetMemoryLimit(memoryLimitGo)
+		conntrack.KillerEnabled = true
+		conntrack.MemoryLimit = memoryLimit
 	} else {
 		runtimeDebug.SetGCPercent(100)
-		if C.IsIos {
-			runtimeDebug.SetMemoryLimit(math.MaxInt64)
-		}
+		runtimeDebug.SetMemoryLimit(math.MaxInt64)
+		conntrack.KillerEnabled = false
 	}
 }
--- a/experimental/libbox/semver.go
+++ b/experimental/libbox/semver.go
@@ -1,27 +0,0 @@
-package libbox
-
-import (
-	"strings"
-
-	"golang.org/x/mod/semver"
-)
-
-func CompareSemver(left string, right string) bool {
-	normalizedLeft := normalizeSemver(left)
-	if !semver.IsValid(normalizedLeft) {
-		return false
-	}
-	normalizedRight := normalizeSemver(right)
-	if !semver.IsValid(normalizedRight) {
-		return false
-	}
-	return semver.Compare(normalizedLeft, normalizedRight) > 0
-}
-
-func normalizeSemver(version string) string {
-	trimmedVersion := strings.TrimSpace(version)
-	if strings.HasPrefix(trimmedVersion, "v") {
-		return trimmedVersion
-	}
-	return "v" + trimmedVersion
-}
--- a/experimental/libbox/semver_test.go
+++ b/experimental/libbox/semver_test.go
@@ -1,16 +0,0 @@
-package libbox
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestCompareSemver(t *testing.T) {
-	t.Parallel()
-
-	require.False(t, CompareSemver("1.13.0-rc.4", "1.13.0"))
-	require.True(t, CompareSemver("1.13.1", "1.13.0"))
-	require.False(t, CompareSemver("v1.13.0", "1.13.0"))
-	require.False(t, CompareSemver("1.13.0-", "1.13.0"))
-}
--- a/go.mod
+++ b/go.mod
@@ -3,12 +3,12 @@ module github.com/sagernet/sing-box
 go 1.24.7

 require (
-	github.com/anthropics/anthropic-sdk-go v1.26.0
+	github.com/anthropics/anthropic-sdk-go v1.19.0
 	github.com/anytls/sing-anytls v0.0.11
 	github.com/caddyserver/certmagic v0.25.0
 	github.com/coder/websocket v1.8.14
 	github.com/cretz/bine v0.2.0
-	github.com/database64128/tfo-go/v2 v2.3.2
+	github.com/database64128/tfo-go/v2 v2.3.1
 	github.com/go-chi/chi/v5 v5.2.3
 	github.com/go-chi/render v1.0.3
 	github.com/godbus/dbus/v5 v5.2.1
@@ -22,28 +22,28 @@ require (
 	github.com/metacubex/utls v1.8.4
 	github.com/mholt/acmez/v3 v3.1.4
 	github.com/miekg/dns v1.1.69
-	github.com/openai/openai-go/v3 v3.23.0
+	github.com/openai/openai-go/v3 v3.15.0
 	github.com/oschwald/maxminddb-golang v1.13.1
 	github.com/sagernet/asc-go v0.0.0-20241217030726-d563060fe4e1
 	github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a
 	github.com/sagernet/cors v1.2.1
-	github.com/sagernet/cronet-go v0.0.0-20260227112944-17c7ef18afa6
-	github.com/sagernet/cronet-go/all v0.0.0-20260227112944-17c7ef18afa6
+	github.com/sagernet/cronet-go v0.0.0-20260117110918-dc1cda1fe287
+	github.com/sagernet/cronet-go/all v0.0.0-20260117110918-dc1cda1fe287
 	github.com/sagernet/fswatch v0.1.1
-	github.com/sagernet/gomobile v0.1.12
+	github.com/sagernet/gomobile v0.1.11
 	github.com/sagernet/gvisor v0.0.0-20250811.0-sing-box-mod.1
-	github.com/sagernet/quic-go v0.59.0-sing-box-mod.4
-	github.com/sagernet/sing v0.8.0-beta.16.0.20260227013657-e419e9875a07
+	github.com/sagernet/quic-go v0.59.0-sing-box-mod.2
+	github.com/sagernet/sing v0.8.0-beta.16
 	github.com/sagernet/sing-mux v0.3.4
-	github.com/sagernet/sing-quic v0.6.0-beta.13
+	github.com/sagernet/sing-quic v0.6.0-beta.12
 	github.com/sagernet/sing-shadowsocks v0.2.8
 	github.com/sagernet/sing-shadowsocks2 v0.2.1
 	github.com/sagernet/sing-shadowtls v0.2.1-0.20250503051639-fcd445d33c11
-	github.com/sagernet/sing-tun v0.8.0-beta.18
+	github.com/sagernet/sing-tun v0.8.0-beta.17
 	github.com/sagernet/sing-vmess v0.2.8-0.20250909125414-3aed155119a1
 	github.com/sagernet/smux v1.5.50-sing-box-mod.1
 	github.com/sagernet/tailscale v1.92.4-sing-box-1.13-mod.6
-	github.com/sagernet/wireguard-go v0.0.2-beta.1.0.20260224074747-506b7631853c
+	github.com/sagernet/wireguard-go v0.0.2-beta.1.0.20250917110311-16510ac47288
 	github.com/sagernet/ws v0.0.0-20231204124109-acfe8907c854
 	github.com/spf13/cobra v1.10.2
 	github.com/stretchr/testify v1.11.1
@@ -54,7 +54,7 @@ require (
 	golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93
 	golang.org/x/mod v0.31.0
 	golang.org/x/net v0.48.0
-	golang.org/x/sys v0.41.0
+	golang.org/x/sys v0.39.0
 	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10
 	google.golang.org/grpc v1.77.0
 	google.golang.org/protobuf v1.36.11
@@ -105,35 +105,28 @@ require (
 	github.com/prometheus-community/pro-bing v0.4.0 // indirect
 	github.com/quic-go/qpack v0.6.0 // indirect
 	github.com/safchain/ethtool v0.3.0 // indirect
-	github.com/sagernet/cronet-go/lib/android_386 v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/android_amd64 v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/android_arm v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/android_arm64 v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/darwin_amd64 v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/darwin_arm64 v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/ios_amd64_simulator v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/ios_arm64 v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/ios_arm64_simulator v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/linux_386 v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/linux_386_musl v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/linux_amd64 v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/linux_amd64_musl v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/linux_arm v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/linux_arm64 v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/linux_arm64_musl v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/linux_arm_musl v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/linux_loong64 v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/linux_loong64_musl v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/linux_mips64le v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/linux_mipsle v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/linux_mipsle_musl v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/linux_riscv64 v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/linux_riscv64_musl v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/tvos_amd64_simulator v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/tvos_arm64 v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/tvos_arm64_simulator v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/windows_amd64 v0.0.0-20260227112350-bf468eec914d // indirect
-	github.com/sagernet/cronet-go/lib/windows_arm64 v0.0.0-20260227112350-bf468eec914d // indirect
+	github.com/sagernet/cronet-go/lib/android_386 v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/android_amd64 v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/android_arm v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/android_arm64 v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/darwin_amd64 v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/darwin_arm64 v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/ios_amd64_simulator v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/ios_arm64 v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/ios_arm64_simulator v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/linux_386 v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/linux_386_musl v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/linux_amd64 v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/linux_amd64_musl v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/linux_arm v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/linux_arm64 v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/linux_arm64_musl v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/linux_arm_musl v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/tvos_amd64_simulator v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/tvos_arm64 v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/tvos_arm64_simulator v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/windows_amd64 v0.0.0-20260117110516-f21660bef13f // indirect
+	github.com/sagernet/cronet-go/lib/windows_arm64 v0.0.0-20260117110516-f21660bef13f // indirect
 	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
 	github.com/sagernet/nftables v0.3.0-beta.4 // indirect
 	github.com/spf13/pflag v1.0.9 // indirect
--- a/go.sum
+++ b/go.sum
@@ -8,8 +8,8 @@ github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7V
 github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
 github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
-github.com/anthropics/anthropic-sdk-go v1.26.0 h1:oUTzFaUpAevfuELAP1sjL6CQJ9HHAfT7CoSYSac11PY=
-github.com/anthropics/anthropic-sdk-go v1.26.0/go.mod h1:qUKmaW+uuPB64iy1l+4kOSvaLqPXnHTTBKH6RVZ7q5Q=
+github.com/anthropics/anthropic-sdk-go v1.19.0 h1:mO6E+ffSzLRvR/YUH9KJC0uGw0uV8GjISIuzem//3KE=
+github.com/anthropics/anthropic-sdk-go v1.19.0/go.mod h1:WTz31rIUHUHqai2UslPpw5CwXrQP3geYBioRV4WOLvE=
 github.com/anytls/sing-anytls v0.0.11 h1:w8e9Uj1oP3m4zxkyZDewPk0EcQbvVxb7Nn+rapEx4fc=
 github.com/anytls/sing-anytls v0.0.11/go.mod h1:7rjN6IukwysmdusYsrV51Fgu1uW6vsrdd6ctjnEAln8=
 github.com/caddyserver/certmagic v0.25.0 h1:VMleO/XA48gEWes5l+Fh6tRWo9bHkhwAEhx63i+F5ic=
@@ -29,8 +29,8 @@ github.com/cretz/bine v0.2.0 h1:8GiDRGlTgz+o8H9DSnsl+5MeBK4HsExxgl6WgzOCuZo=
 github.com/cretz/bine v0.2.0/go.mod h1:WU4o9QR9wWp8AVKtTM1XD5vUHkEqnf2vVSo6dBqbetI=
 github.com/database64128/netx-go v0.1.1 h1:dT5LG7Gs7zFZBthFBbzWE6K8wAHjSNAaK7wCYZT7NzM=
 github.com/database64128/netx-go v0.1.1/go.mod h1:LNlYVipaYkQArRFDNNJ02VkNV+My9A5XR/IGS7sIBQc=
-github.com/database64128/tfo-go/v2 v2.3.2 h1:UhZMKiMq3swZGUiETkLBDzQnZBPSAeBMClpJGlnJ5Fw=
-github.com/database64128/tfo-go/v2 v2.3.2/go.mod h1:GC3uB5oa4beGpCUbRb2ZOWP73bJJFmMyAVgQSO7r724=
+github.com/database64128/tfo-go/v2 v2.3.1 h1:EGE+ELd5/AQ0X6YBlQ9RgKs8+kciNhgN3d8lRvfEJQw=
+github.com/database64128/tfo-go/v2 v2.3.1/go.mod h1:k9wcpg/8i5zenspBkc9jUEYehpZZccBnCElzOJB++bU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -38,8 +38,6 @@ github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa h1:h8TfIT1xc8FWbww
 github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa/go.mod h1:Nx87SkVqTKd8UtT+xu7sM/l+LgXs6c0aHrlKusR+2EQ=
 github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1 h1:CaO/zOnF8VvUfEbhRatPcwKVWamvbYd8tQGRWacE9kU=
 github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1/go.mod h1:+hnT3ywWDTAFrW5aE+u2Sa/wT555ZqwoCS+pk3p6ry4=
-github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
-github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A=
 github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/florianl/go-nfqueue/v2 v2.0.2 h1:FL5lQTeetgpCvac1TRwSfgaXUn0YSO7WzGvWNIp3JPE=
@@ -128,8 +126,8 @@ github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc
 github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
-github.com/openai/openai-go/v3 v3.23.0 h1:FRFwTcB4FoWFtIunTY/8fgHvzSHgqbfWjiCwOMVrsvw=
-github.com/openai/openai-go/v3 v3.23.0/go.mod h1:cdufnVK14cWcT9qA1rRtrXx4FTRsgbDPW7Ia7SS5cZo=
+github.com/openai/openai-go/v3 v3.15.0 h1:hk99rM7YPz+M99/5B/zOQcVwFRLLMdprVGx1vaZ8XMo=
+github.com/openai/openai-go/v3 v3.15.0/go.mod h1:cdufnVK14cWcT9qA1rRtrXx4FTRsgbDPW7Ia7SS5cZo=
 github.com/oschwald/maxminddb-golang v1.13.1 h1:G3wwjdN9JmIK2o/ermkHM+98oX5fS+k5MbwsmL4MRQE=
 github.com/oschwald/maxminddb-golang v1.13.1/go.mod h1:K4pgV9N/GcK694KSTmVSDTODk4IsCNThNdTmnaBZ/F8=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
@@ -152,102 +150,88 @@ github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a h1:+NkI2670SQpQWvkk
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a/go.mod h1:63s7jpZqcDAIpj8oI/1v4Izok+npJOHACFCU6+huCkM=
 github.com/sagernet/cors v1.2.1 h1:Cv5Z8y9YSD6Gm+qSpNrL3LO4lD3eQVvbFYJSG7JCMHQ=
 github.com/sagernet/cors v1.2.1/go.mod h1:O64VyOjjhrkLmQIjF4KGRrJO/5dVXFdpEmCW/eISRAI=
-github.com/sagernet/cronet-go v0.0.0-20260227112944-17c7ef18afa6 h1:Ato+guxmEL4uezcYV1UUUDpAv9HlcJQ7BZt2zpnzjuw=
-github.com/sagernet/cronet-go v0.0.0-20260227112944-17c7ef18afa6/go.mod h1:hwFHBEjjthyEquDULbr4c4ucMedp8Drb6Jvm2kt/0Bw=
-github.com/sagernet/cronet-go/all v0.0.0-20260227112944-17c7ef18afa6 h1:0ldSjcR5Gt/o+otTvUAmJ28FCLab9lnlpEhxRCMQpRA=
-github.com/sagernet/cronet-go/all v0.0.0-20260227112944-17c7ef18afa6/go.mod h1:xVwYoNCyv9tF7W1RJlUdDbT4bn5tyqtyTe1P1ZY2VP8=
-github.com/sagernet/cronet-go/lib/android_386 v0.0.0-20260227112350-bf468eec914d h1:tudlBYdQHIWctKIdf7pceBOFIUIISK6yFivwsxhxDk0=
-github.com/sagernet/cronet-go/lib/android_386 v0.0.0-20260227112350-bf468eec914d/go.mod h1:XXDwdjX/T8xftoeJxQmbBoYXZp8MAPFR2CwbFuTpEtw=
-github.com/sagernet/cronet-go/lib/android_amd64 v0.0.0-20260227112350-bf468eec914d h1:F5EsQlIknj0HlExBFR4EXW69dYj0MpK1HCpKhL/weEs=
-github.com/sagernet/cronet-go/lib/android_amd64 v0.0.0-20260227112350-bf468eec914d/go.mod h1:iNiUGoLtnr8/JTuVNj7XJbmpOAp2C6+B81KDrPxwaZM=
-github.com/sagernet/cronet-go/lib/android_arm v0.0.0-20260227112350-bf468eec914d h1:9SQ6I2Y2radd6RyWEfV+9s1Q9Kth54B6gBHuJWNzQas=
-github.com/sagernet/cronet-go/lib/android_arm v0.0.0-20260227112350-bf468eec914d/go.mod h1:19ILNUOGIzRdOqa2mq+iY0JoHxuieB7/lnjYeaA2vEc=
-github.com/sagernet/cronet-go/lib/android_arm64 v0.0.0-20260227112350-bf468eec914d h1:+XoeknBi6+s6epDAS3BkEsp5zGqEJsT9L8JEcaq+0nE=
-github.com/sagernet/cronet-go/lib/android_arm64 v0.0.0-20260227112350-bf468eec914d/go.mod h1:JxzGyQf94Cr6sBShKqODGDyRUlESfJK/Njcz9Lz6qMQ=
-github.com/sagernet/cronet-go/lib/darwin_amd64 v0.0.0-20260227112350-bf468eec914d h1:poqfhHJAg+7BtABn4cue7V4y8Kb2eZ1Cy0j+bhDangw=
-github.com/sagernet/cronet-go/lib/darwin_amd64 v0.0.0-20260227112350-bf468eec914d/go.mod h1:KN+9T9TBycGOLzmKU4QdcHAJEj6Nlx48ifnlTvvHMvs=
-github.com/sagernet/cronet-go/lib/darwin_arm64 v0.0.0-20260227112350-bf468eec914d h1:nH6rtfqWbui9zQPjd18cpvZncGvn21UcVLtmeUoQKXs=
-github.com/sagernet/cronet-go/lib/darwin_arm64 v0.0.0-20260227112350-bf468eec914d/go.mod h1:kojvtUc29KKnk8hs2QIANynVR59921SnGWA9kXohHc0=
-github.com/sagernet/cronet-go/lib/ios_amd64_simulator v0.0.0-20260227112350-bf468eec914d h1:HtnjWZzSQBaP29XJ5NoIps1TVZ7DUC7R0NH7IyhJ5Ag=
-github.com/sagernet/cronet-go/lib/ios_amd64_simulator v0.0.0-20260227112350-bf468eec914d/go.mod h1:hkQzRE5GDbaH1/ioqYh0Taho4L6i0yLRCVEZ5xHz5M0=
-github.com/sagernet/cronet-go/lib/ios_arm64 v0.0.0-20260227112350-bf468eec914d h1:E2DWx0Agrj8Fi745S+otYW+W0rL2I8+Z2rZCFqGYPvQ=
-github.com/sagernet/cronet-go/lib/ios_arm64 v0.0.0-20260227112350-bf468eec914d/go.mod h1:tzVJFTOm66UxLxy6K0ZN5Ic2PC79e+sKKnt+V9puEa4=
-github.com/sagernet/cronet-go/lib/ios_arm64_simulator v0.0.0-20260227112350-bf468eec914d h1:j7f/rBwPlO1RpFQeM35QVHymVXGVo6d8WTz4i4SjcPo=
-github.com/sagernet/cronet-go/lib/ios_arm64_simulator v0.0.0-20260227112350-bf468eec914d/go.mod h1:M/pN6m3j0HFU6/y83n0HU6GLYys3tYdr/xTE8hVEGMo=
-github.com/sagernet/cronet-go/lib/linux_386 v0.0.0-20260227112350-bf468eec914d h1:hz8kkcHGMe7QBTpbqkaw89ZFsfX+UN5F5RIDrroDkx8=
-github.com/sagernet/cronet-go/lib/linux_386 v0.0.0-20260227112350-bf468eec914d/go.mod h1:cGh5hO6eljCo6KMQ/Cel8Xgq4+etL0awZLRBDVG1EZQ=
-github.com/sagernet/cronet-go/lib/linux_386_musl v0.0.0-20260227112350-bf468eec914d h1:TNFaO19ySEyqG79j5+dYb+w4ivusrTXanWuogmC4VM0=
-github.com/sagernet/cronet-go/lib/linux_386_musl v0.0.0-20260227112350-bf468eec914d/go.mod h1:JFE0/cxaKkx0wqPMZU7MgaplQlU0zudv82dROJjClKU=
-github.com/sagernet/cronet-go/lib/linux_amd64 v0.0.0-20260227112350-bf468eec914d h1:Ewc/wR3yu/hOwG/p49nI9TwYmYv3Llm5DA6fSb1w8hY=
-github.com/sagernet/cronet-go/lib/linux_amd64 v0.0.0-20260227112350-bf468eec914d/go.mod h1:vU8VftFeSt7fURCa3JXD6+k6ss1YAX+idQjPvHmJ2tI=
-github.com/sagernet/cronet-go/lib/linux_amd64_musl v0.0.0-20260227112350-bf468eec914d h1:PJ24NkPNpMrLGNRdb6moEqJo8gfhYcIRZmQD8jPPCJk=
-github.com/sagernet/cronet-go/lib/linux_amd64_musl v0.0.0-20260227112350-bf468eec914d/go.mod h1:vCe4OUuL+XOUge9v3MyTD45BnuAXiH+DkjN9quDXJzQ=
-github.com/sagernet/cronet-go/lib/linux_arm v0.0.0-20260227112350-bf468eec914d h1:IaUghNA8cOmmwvzUPKPsfhiG0KmpWpE0mFZl85T5/Bw=
-github.com/sagernet/cronet-go/lib/linux_arm v0.0.0-20260227112350-bf468eec914d/go.mod h1:w9amBWrvjtohQzBGCKJ7LCh22LhTIJs4sE7cYaKQzM0=
-github.com/sagernet/cronet-go/lib/linux_arm64 v0.0.0-20260227112350-bf468eec914d h1:whbeDcr9dDWPr45Is9QV6OHAncrBWLJtPuo4uyEJFBg=
-github.com/sagernet/cronet-go/lib/linux_arm64 v0.0.0-20260227112350-bf468eec914d/go.mod h1:TqlsFtcYS/etTeck46kHBeT8Le0Igw1Q/AV88UnMS3s=
-github.com/sagernet/cronet-go/lib/linux_arm64_musl v0.0.0-20260227112350-bf468eec914d h1:ecHgaGMvikNYjsfULekdXjL/cQJXCS38yvHaKVMWtXc=
-github.com/sagernet/cronet-go/lib/linux_arm64_musl v0.0.0-20260227112350-bf468eec914d/go.mod h1:B6Qd0vys8sv9OKVRN6J9RqDzYRGE938Fb2zrYdBDyTQ=
-github.com/sagernet/cronet-go/lib/linux_arm_musl v0.0.0-20260227112350-bf468eec914d h1:no7Cb54+vv1bQ39zFp+JIHKO8Tu3sTwqz8SoOAuV/Ek=
-github.com/sagernet/cronet-go/lib/linux_arm_musl v0.0.0-20260227112350-bf468eec914d/go.mod h1:3tXMMFY7AHugOVBZ5Al7cL7JKsnFOe5bMVr0hZPk3ow=
-github.com/sagernet/cronet-go/lib/linux_loong64 v0.0.0-20260227112350-bf468eec914d h1:DqBSbam9KAzBgDInOoNy4K0baSJyxGWESxrDewU5aSs=
-github.com/sagernet/cronet-go/lib/linux_loong64 v0.0.0-20260227112350-bf468eec914d/go.mod h1:Wt5uFdU3tnmm8YzobYewwdF7Mt6SucRQg6xeTNWC3Tk=
-github.com/sagernet/cronet-go/lib/linux_loong64_musl v0.0.0-20260227112350-bf468eec914d h1:fOR5i+hRyjG8ZzPSG6URkoTKr5qYOJfxZ58zd8HBteM=
-github.com/sagernet/cronet-go/lib/linux_loong64_musl v0.0.0-20260227112350-bf468eec914d/go.mod h1:lyIF6wKBLwWa5ZXaAKbAoewewl+yCHo2iYev39Mbj4E=
-github.com/sagernet/cronet-go/lib/linux_mips64le v0.0.0-20260227112350-bf468eec914d h1:hEQGQI+PfUzYBVas4NWw8WiEUsATco6vwv+t4qTtgtw=
-github.com/sagernet/cronet-go/lib/linux_mips64le v0.0.0-20260227112350-bf468eec914d/go.mod h1:H46PnSTTZNcZokLLiDeMDaHiS1l14PH3tzWi0eykjD8=
-github.com/sagernet/cronet-go/lib/linux_mipsle v0.0.0-20260227112350-bf468eec914d h1:AzzJ5AtZlwTbU5QOSixZdPLTjzWKCun3AobQChKy0W8=
-github.com/sagernet/cronet-go/lib/linux_mipsle v0.0.0-20260227112350-bf468eec914d/go.mod h1:RBhSUDAKWq7fswtV4nQUQhuaTLcX3ettR7teA7/yf2w=
-github.com/sagernet/cronet-go/lib/linux_mipsle_musl v0.0.0-20260227112350-bf468eec914d h1:9Tp7s/WX4DZLx4ues8G38G2OV7eQbeuU2COEZEbGcF0=
-github.com/sagernet/cronet-go/lib/linux_mipsle_musl v0.0.0-20260227112350-bf468eec914d/go.mod h1:wRzoIOGG4xbpp3Gh3triLKwMwYriScXzFtunLYhY4w0=
-github.com/sagernet/cronet-go/lib/linux_riscv64 v0.0.0-20260227112350-bf468eec914d h1:T9EVZKTyZHOamwevomUZnJ6TQNc09I/BwK+L5HJCJj8=
-github.com/sagernet/cronet-go/lib/linux_riscv64 v0.0.0-20260227112350-bf468eec914d/go.mod h1:LNiZXmWil1OPwKCheqQjtakZlJuKGFz+iv2eGF76Hhs=
-github.com/sagernet/cronet-go/lib/linux_riscv64_musl v0.0.0-20260227112350-bf468eec914d h1:FZmThI7xScJRPERFiA4L2l9KCwA0oi8/lEOajIKEtUQ=
-github.com/sagernet/cronet-go/lib/linux_riscv64_musl v0.0.0-20260227112350-bf468eec914d/go.mod h1:YFDGKTkpkJGc5+hnX/RYosZyTWg9h+68VB55fYRRLYc=
-github.com/sagernet/cronet-go/lib/tvos_amd64_simulator v0.0.0-20260227112350-bf468eec914d h1:BCC/b8bL0dD9Q4ghgKABV/EsMe0J8GE/l7hcRdPkUXQ=
-github.com/sagernet/cronet-go/lib/tvos_amd64_simulator v0.0.0-20260227112350-bf468eec914d/go.mod h1:aaX0YGl8nhGmfRWI8bc3BtDjY8Vzx6O0cS/e1uqxDq4=
-github.com/sagernet/cronet-go/lib/tvos_arm64 v0.0.0-20260227112350-bf468eec914d h1:3l463BXnC/X42ow2zqHm9Y/K4GM6aRsKUIZBcFxr2+Q=
-github.com/sagernet/cronet-go/lib/tvos_arm64 v0.0.0-20260227112350-bf468eec914d/go.mod h1:EdzMKA96xITc42QEI+ct4SwqX8Dn3ltKK8wzdkLWpSc=
-github.com/sagernet/cronet-go/lib/tvos_arm64_simulator v0.0.0-20260227112350-bf468eec914d h1:+XHEZ/z5NgPfjOAzOwfbQzR+42qaDNB0nv+fAOcd6Pc=
-github.com/sagernet/cronet-go/lib/tvos_arm64_simulator v0.0.0-20260227112350-bf468eec914d/go.mod h1:qix4kv1TTAJ5tY4lJ9vjhe9EY4mM+B7H5giOhbxDVcc=
-github.com/sagernet/cronet-go/lib/windows_amd64 v0.0.0-20260227112350-bf468eec914d h1:sYWbP+qCt9Rhb1yGaIRY7HVLtaQZmrHWR0obc5+Q1qc=
-github.com/sagernet/cronet-go/lib/windows_amd64 v0.0.0-20260227112350-bf468eec914d/go.mod h1:lm9w/oCCRyBiUa3G8lDQTT8x/ONUvgVR2iV9fVzUZB8=
-github.com/sagernet/cronet-go/lib/windows_arm64 v0.0.0-20260227112350-bf468eec914d h1:r6eOVlAfmcUMD5nfz+mPd/aORevUKhcvxA1z1GdPnG8=
-github.com/sagernet/cronet-go/lib/windows_arm64 v0.0.0-20260227112350-bf468eec914d/go.mod h1:n34YyLgapgjWdKa0IoeczjAFCwD3/dxbsH5sucKw0bw=
+github.com/sagernet/cronet-go v0.0.0-20260117110918-dc1cda1fe287 h1:0BYNmr0ptjsII948U0oBFmrbo4qEaCFcrE2JPRg3Zlk=
+github.com/sagernet/cronet-go v0.0.0-20260117110918-dc1cda1fe287/go.mod h1:hwFHBEjjthyEquDULbr4c4ucMedp8Drb6Jvm2kt/0Bw=
+github.com/sagernet/cronet-go/all v0.0.0-20260117110918-dc1cda1fe287 h1:ghxhYSBQpzkakqWqJDvXr/Zmxe0WjTjKuALEGbjGiGY=
+github.com/sagernet/cronet-go/all v0.0.0-20260117110918-dc1cda1fe287/go.mod h1:M+4ZjPhLJXIvoxcQsbDofmc19Wrig59hZ+hLvj6S3To=
+github.com/sagernet/cronet-go/lib/android_386 v0.0.0-20260117110516-f21660bef13f h1:8jZbZ4KBTdcXDFLwUBNQt5Xci6ZuAKh255S8TwuBCaM=
+github.com/sagernet/cronet-go/lib/android_386 v0.0.0-20260117110516-f21660bef13f/go.mod h1:XXDwdjX/T8xftoeJxQmbBoYXZp8MAPFR2CwbFuTpEtw=
+github.com/sagernet/cronet-go/lib/android_amd64 v0.0.0-20260117110516-f21660bef13f h1:tG0hCx+0u5zca7qQ7AMkcv4DCrBG/DKW1ggs/P+BRRI=
+github.com/sagernet/cronet-go/lib/android_amd64 v0.0.0-20260117110516-f21660bef13f/go.mod h1:iNiUGoLtnr8/JTuVNj7XJbmpOAp2C6+B81KDrPxwaZM=
+github.com/sagernet/cronet-go/lib/android_arm v0.0.0-20260117110516-f21660bef13f h1:ZXp5hKJIA7iJ52ZShJCKMQEPLpp/7dDIVZmPGV9Il40=
+github.com/sagernet/cronet-go/lib/android_arm v0.0.0-20260117110516-f21660bef13f/go.mod h1:19ILNUOGIzRdOqa2mq+iY0JoHxuieB7/lnjYeaA2vEc=
+github.com/sagernet/cronet-go/lib/android_arm64 v0.0.0-20260117110516-f21660bef13f h1:gL7H8HS8s38adz4/HZtRHh79qMwsbLTRRPz4GQ9LcWI=
+github.com/sagernet/cronet-go/lib/android_arm64 v0.0.0-20260117110516-f21660bef13f/go.mod h1:JxzGyQf94Cr6sBShKqODGDyRUlESfJK/Njcz9Lz6qMQ=
+github.com/sagernet/cronet-go/lib/darwin_amd64 v0.0.0-20260117110516-f21660bef13f h1:Dchgc0pAY5Jwb5lzUlE+1nhHIzqLx+YOurXLHgvWd/0=
+github.com/sagernet/cronet-go/lib/darwin_amd64 v0.0.0-20260117110516-f21660bef13f/go.mod h1:KN+9T9TBycGOLzmKU4QdcHAJEj6Nlx48ifnlTvvHMvs=
+github.com/sagernet/cronet-go/lib/darwin_arm64 v0.0.0-20260117110516-f21660bef13f h1:+MOLSQoduuKDxF410i1LcSPaQGaiP0eZb0INvMlmjM4=
+github.com/sagernet/cronet-go/lib/darwin_arm64 v0.0.0-20260117110516-f21660bef13f/go.mod h1:kojvtUc29KKnk8hs2QIANynVR59921SnGWA9kXohHc0=
+github.com/sagernet/cronet-go/lib/ios_amd64_simulator v0.0.0-20260117110516-f21660bef13f h1:lIZna05Vn6n8k21p8OpSUnhwGm+E57PrMjiI4ZUfMSg=
+github.com/sagernet/cronet-go/lib/ios_amd64_simulator v0.0.0-20260117110516-f21660bef13f/go.mod h1:hkQzRE5GDbaH1/ioqYh0Taho4L6i0yLRCVEZ5xHz5M0=
+github.com/sagernet/cronet-go/lib/ios_arm64 v0.0.0-20260117110516-f21660bef13f h1:B2aFQ5CRHI20t8YsEizvtguS5W2QfK7D5XV/NzTIxPE=
+github.com/sagernet/cronet-go/lib/ios_arm64 v0.0.0-20260117110516-f21660bef13f/go.mod h1:tzVJFTOm66UxLxy6K0ZN5Ic2PC79e+sKKnt+V9puEa4=
+github.com/sagernet/cronet-go/lib/ios_arm64_simulator v0.0.0-20260117110516-f21660bef13f h1:qpSwJ1rFGYCfJDenNCZoWYjoG7N+xEa6ke+E7/JO1i4=
+github.com/sagernet/cronet-go/lib/ios_arm64_simulator v0.0.0-20260117110516-f21660bef13f/go.mod h1:M/pN6m3j0HFU6/y83n0HU6GLYys3tYdr/xTE8hVEGMo=
+github.com/sagernet/cronet-go/lib/linux_386 v0.0.0-20260117110516-f21660bef13f h1:cx7Ipg0tSvTDjS4maMEYz4vuzz93BMPAysmZ1YLrz80=
+github.com/sagernet/cronet-go/lib/linux_386 v0.0.0-20260117110516-f21660bef13f/go.mod h1:cGh5hO6eljCo6KMQ/Cel8Xgq4+etL0awZLRBDVG1EZQ=
+github.com/sagernet/cronet-go/lib/linux_386_musl v0.0.0-20260117110516-f21660bef13f h1:4jOHuUiBxD8pJEpBBVQfJqyLmxjpd3t4MLRzU7YLFyg=
+github.com/sagernet/cronet-go/lib/linux_386_musl v0.0.0-20260117110516-f21660bef13f/go.mod h1:JFE0/cxaKkx0wqPMZU7MgaplQlU0zudv82dROJjClKU=
+github.com/sagernet/cronet-go/lib/linux_amd64 v0.0.0-20260117110516-f21660bef13f h1:OpXBa2WlRU+Mam9oRe9Nn4/zf7gQ+qiBTNK8A5RwbfQ=
+github.com/sagernet/cronet-go/lib/linux_amd64 v0.0.0-20260117110516-f21660bef13f/go.mod h1:vU8VftFeSt7fURCa3JXD6+k6ss1YAX+idQjPvHmJ2tI=
+github.com/sagernet/cronet-go/lib/linux_amd64_musl v0.0.0-20260117110516-f21660bef13f h1:nJpGFi+6hI85tl4zoyNFEnFEQ5+xEV5gyvsUoMvd8g0=
+github.com/sagernet/cronet-go/lib/linux_amd64_musl v0.0.0-20260117110516-f21660bef13f/go.mod h1:vCe4OUuL+XOUge9v3MyTD45BnuAXiH+DkjN9quDXJzQ=
+github.com/sagernet/cronet-go/lib/linux_arm v0.0.0-20260117110516-f21660bef13f h1:SEy2rpmgOJgrqcEryJI/RSnqUWIsEsp0cfYoA8y21jc=
+github.com/sagernet/cronet-go/lib/linux_arm v0.0.0-20260117110516-f21660bef13f/go.mod h1:w9amBWrvjtohQzBGCKJ7LCh22LhTIJs4sE7cYaKQzM0=
+github.com/sagernet/cronet-go/lib/linux_arm64 v0.0.0-20260117110516-f21660bef13f h1:EW2TuFMLm0iBGqRZtuGwIZdeYmDtDsDmRcRRJQOMxUo=
+github.com/sagernet/cronet-go/lib/linux_arm64 v0.0.0-20260117110516-f21660bef13f/go.mod h1:TqlsFtcYS/etTeck46kHBeT8Le0Igw1Q/AV88UnMS3s=
+github.com/sagernet/cronet-go/lib/linux_arm64_musl v0.0.0-20260117110516-f21660bef13f h1:3U5woxrNCkzfv1+UX+mVoWh1228AE1qAiMG02F9oFbY=
+github.com/sagernet/cronet-go/lib/linux_arm64_musl v0.0.0-20260117110516-f21660bef13f/go.mod h1:B6Qd0vys8sv9OKVRN6J9RqDzYRGE938Fb2zrYdBDyTQ=
+github.com/sagernet/cronet-go/lib/linux_arm_musl v0.0.0-20260117110516-f21660bef13f h1:YwFTfuWG3mmctroeDYtFZ6LHjGsedVO+5wInYbbUuUY=
+github.com/sagernet/cronet-go/lib/linux_arm_musl v0.0.0-20260117110516-f21660bef13f/go.mod h1:3tXMMFY7AHugOVBZ5Al7cL7JKsnFOe5bMVr0hZPk3ow=
+github.com/sagernet/cronet-go/lib/tvos_amd64_simulator v0.0.0-20260117110516-f21660bef13f h1:r4V0ddPCRLgGu0VdgR3aUsO9NjpmyjAf+h+3oTD9D6E=
+github.com/sagernet/cronet-go/lib/tvos_amd64_simulator v0.0.0-20260117110516-f21660bef13f/go.mod h1:aaX0YGl8nhGmfRWI8bc3BtDjY8Vzx6O0cS/e1uqxDq4=
+github.com/sagernet/cronet-go/lib/tvos_arm64 v0.0.0-20260117110516-f21660bef13f h1:B8yf4gFvEYUnwWmtVK9sdwUsflYZ387MhYmlOP2ohFQ=
+github.com/sagernet/cronet-go/lib/tvos_arm64 v0.0.0-20260117110516-f21660bef13f/go.mod h1:EdzMKA96xITc42QEI+ct4SwqX8Dn3ltKK8wzdkLWpSc=
+github.com/sagernet/cronet-go/lib/tvos_arm64_simulator v0.0.0-20260117110516-f21660bef13f h1:9YyaMg4rO1/jIgrxmNb0LKH+X7frSYWfX2pFgW5JUVM=
+github.com/sagernet/cronet-go/lib/tvos_arm64_simulator v0.0.0-20260117110516-f21660bef13f/go.mod h1:qix4kv1TTAJ5tY4lJ9vjhe9EY4mM+B7H5giOhbxDVcc=
+github.com/sagernet/cronet-go/lib/windows_amd64 v0.0.0-20260117110516-f21660bef13f h1:B0fnGu0sh9yT/9JDN5u/GqThGoOzNN/daOAuGWFLXEk=
+github.com/sagernet/cronet-go/lib/windows_amd64 v0.0.0-20260117110516-f21660bef13f/go.mod h1:lm9w/oCCRyBiUa3G8lDQTT8x/ONUvgVR2iV9fVzUZB8=
+github.com/sagernet/cronet-go/lib/windows_arm64 v0.0.0-20260117110516-f21660bef13f h1:lxPcIXKSSI5JDhc7rx/6yufISWM4vtBS2FY9PavWQTs=
+github.com/sagernet/cronet-go/lib/windows_arm64 v0.0.0-20260117110516-f21660bef13f/go.mod h1:n34YyLgapgjWdKa0IoeczjAFCwD3/dxbsH5sucKw0bw=
 github.com/sagernet/fswatch v0.1.1 h1:YqID+93B7VRfqIH3PArW/XpJv5H4OLEVWDfProGoRQs=
 github.com/sagernet/fswatch v0.1.1/go.mod h1:nz85laH0mkQqJfaOrqPpkwtU1znMFNVTpT/5oRsVz/o=
-github.com/sagernet/gomobile v0.1.12 h1:XwzjZaclFF96deLqwAgK8gU3w0M2A8qxgDmhV+A0wjg=
-github.com/sagernet/gomobile v0.1.12/go.mod h1:A8l3FlHi2D/+mfcd4HHvk5DGFPW/ShFb9jHP5VmSiDY=
+github.com/sagernet/gomobile v0.1.11 h1:niMQAspvuThup5eRZQpsGcbM76zAvnsGr7RUIpnQMDQ=
+github.com/sagernet/gomobile v0.1.11/go.mod h1:A8l3FlHi2D/+mfcd4HHvk5DGFPW/ShFb9jHP5VmSiDY=
 github.com/sagernet/gvisor v0.0.0-20250811.0-sing-box-mod.1 h1:AzCE2RhBjLJ4WIWc/GejpNh+z30d5H1hwaB0nD9eY3o=
 github.com/sagernet/gvisor v0.0.0-20250811.0-sing-box-mod.1/go.mod h1:NJKBtm9nVEK3iyOYWsUlrDQuoGh4zJ4KOPhSYVidvQ4=
 github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
 github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
 github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
 github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
-github.com/sagernet/quic-go v0.59.0-sing-box-mod.4 h1:6qvrUW79S+CrPwWz6cMePXohgjHoKxLo3c+MDhNwc3o=
-github.com/sagernet/quic-go v0.59.0-sing-box-mod.4/go.mod h1:OqILvS182CyOol5zNNo6bguvOGgXzV459+chpRaUC+4=
-github.com/sagernet/sing v0.8.0-beta.16.0.20260227013657-e419e9875a07 h1:LQqb+xtR5uqF6bePmJQ3sAToF/kMCjxSnz17HnboXA8=
-github.com/sagernet/sing v0.8.0-beta.16.0.20260227013657-e419e9875a07/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
+github.com/sagernet/quic-go v0.59.0-sing-box-mod.2 h1:hJUL+HtxEOjxsa0CsucbBVqI/AMS4k52NwNU637zmdw=
+github.com/sagernet/quic-go v0.59.0-sing-box-mod.2/go.mod h1:OqILvS182CyOol5zNNo6bguvOGgXzV459+chpRaUC+4=
+github.com/sagernet/sing v0.8.0-beta.16 h1:Fe+6E9VHYky9Mx4cf0ugbZPWDcXRflpAu7JQ5bWXvaA=
+github.com/sagernet/sing v0.8.0-beta.16/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
 github.com/sagernet/sing-mux v0.3.4 h1:ZQplKl8MNXutjzbMVtWvWG31fohhgOfCuUZR4dVQ8+s=
 github.com/sagernet/sing-mux v0.3.4/go.mod h1:QvlKMyNBNrQoyX4x+gq028uPbLM2XeRpWtDsWBJbFSk=
-github.com/sagernet/sing-quic v0.6.0-beta.13 h1:umDr6GC5fVbOIoTvqV4544wY61zEN+ObQwVGNP8sX1M=
-github.com/sagernet/sing-quic v0.6.0-beta.13/go.mod h1:K5bWvITOm4vE10fwLfrWpw27bCoVJ+tfQ79tOWg+Ko8=
+github.com/sagernet/sing-quic v0.6.0-beta.12 h1:njyU2NYGBITShAu31wJRmqAtx7hQBcXqBPowDv+W0sk=
+github.com/sagernet/sing-quic v0.6.0-beta.12/go.mod h1:K5bWvITOm4vE10fwLfrWpw27bCoVJ+tfQ79tOWg+Ko8=
 github.com/sagernet/sing-shadowsocks v0.2.8 h1:PURj5PRoAkqeHh2ZW205RWzN9E9RtKCVCzByXruQWfE=
 github.com/sagernet/sing-shadowsocks v0.2.8/go.mod h1:lo7TWEMDcN5/h5B8S0ew+r78ZODn6SwVaFhvB6H+PTI=
 github.com/sagernet/sing-shadowsocks2 v0.2.1 h1:dWV9OXCeFPuYGHb6IRqlSptVnSzOelnqqs2gQ2/Qioo=
 github.com/sagernet/sing-shadowsocks2 v0.2.1/go.mod h1:RnXS0lExcDAovvDeniJ4IKa2IuChrdipolPYWBv9hWQ=
 github.com/sagernet/sing-shadowtls v0.2.1-0.20250503051639-fcd445d33c11 h1:tK+75l64tm9WvEFrYRE1t0YxoFdWQqw/h7Uhzj0vJ+w=
 github.com/sagernet/sing-shadowtls v0.2.1-0.20250503051639-fcd445d33c11/go.mod h1:sWqKnGlMipCHaGsw1sTTlimyUpgzP4WP3pjhCsYt9oA=
-github.com/sagernet/sing-tun v0.8.0-beta.18 h1:C6oHxP9BNBVEVdC9ABMTXmKej9mUVtcuw2v+IiBS8yw=
-github.com/sagernet/sing-tun v0.8.0-beta.18/go.mod h1:+HAK/y9GZljdT0KYKMYDR8MjjqnqDDQZYp5ZZQoRzS8=
+github.com/sagernet/sing-tun v0.8.0-beta.17 h1:6DdbNXeTFYj8Tb4FCh8Mp2boA3rVY6VNqzTOObj7Xis=
+github.com/sagernet/sing-tun v0.8.0-beta.17/go.mod h1:+HAK/y9GZljdT0KYKMYDR8MjjqnqDDQZYp5ZZQoRzS8=
 github.com/sagernet/sing-vmess v0.2.8-0.20250909125414-3aed155119a1 h1:aSwUNYUkVyVvdmBSufR8/nRFonwJeKSIROxHcm5br9o=
 github.com/sagernet/sing-vmess v0.2.8-0.20250909125414-3aed155119a1/go.mod h1:P11scgTxMxVVQ8dlM27yNm3Cro40mD0+gHbnqrNGDuY=
 github.com/sagernet/smux v1.5.50-sing-box-mod.1 h1:XkJcivBC9V4wBjiGXIXZ229aZCU1hzcbp6kSkkyQ478=
 github.com/sagernet/smux v1.5.50-sing-box-mod.1/go.mod h1:NjhsCEWedJm7eFLyhuBgIEzwfhRmytrUoiLluxs5Sk8=
 github.com/sagernet/tailscale v1.92.4-sing-box-1.13-mod.6 h1:eYz/OpMqWCvO2++iw3dEuzrlfC2xv78GdlGvprIM6O8=
 github.com/sagernet/tailscale v1.92.4-sing-box-1.13-mod.6/go.mod h1:m87GAn4UcesHQF3leaPFEINZETO5za1LGn1GJdNDgNc=
-github.com/sagernet/wireguard-go v0.0.2-beta.1.0.20260224074747-506b7631853c h1:f9cXNB+IOOPnR8DOLMTpr42jf7naxh5Un5Y09BBf5Cg=
-github.com/sagernet/wireguard-go v0.0.2-beta.1.0.20260224074747-506b7631853c/go.mod h1:WUxgxUDZoCF2sxVmW+STSxatP02Qn3FcafTiI2BLtE0=
+github.com/sagernet/wireguard-go v0.0.2-beta.1.0.20250917110311-16510ac47288 h1:E2tZFeg9mGYGQ7E7BbxMv1cU35HxwgRm6tPKI2Pp7DA=
+github.com/sagernet/wireguard-go v0.0.2-beta.1.0.20250917110311-16510ac47288/go.mod h1:WUxgxUDZoCF2sxVmW+STSxatP02Qn3FcafTiI2BLtE0=
 github.com/sagernet/ws v0.0.0-20231204124109-acfe8907c854 h1:6uUiZcDRnZSAegryaUGwPC/Fj13JSHwiTftrXhMmYOc=
 github.com/sagernet/ws v0.0.0-20231204124109-acfe8907c854/go.mod h1:LtfoSK3+NG57tvnVEHgcuBW9ujgE8enPSgzgwStwCAA=
 github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
@@ -346,8 +330,8 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
-golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
 golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
@@ -380,8 +364,6 @@ google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/include/oom_killer.go
+++ b/include/oom_killer.go
@@ -1,10 +0,0 @@
-package include
-
-import (
-	"github.com/sagernet/sing-box/adapter/service"
-	"github.com/sagernet/sing-box/service/oomkiller"
-)
-
-func registerOOMKillerService(registry *service.Registry) {
-	oomkiller.RegisterService(registry)
-}
--- a/include/registry.go
+++ b/include/registry.go
@@ -137,7 +137,6 @@ func ServiceRegistry() *service.Registry {
 	registerDERPService(registry)
 	registerCCMService(registry)
 	registerOCMService(registry)
-	registerOOMKillerService(registry)

 	return registry
 }
--- a/option/naive.go
+++ b/option/naive.go
@@ -2,7 +2,6 @@ package option

 import (
 	"github.com/sagernet/sing/common/auth"
-	"github.com/sagernet/sing/common/byteformats"
 	"github.com/sagernet/sing/common/json/badoption"
 )

@@ -27,14 +26,12 @@ type NaiveInboundOptions struct {
 type NaiveOutboundOptions struct {
 	DialerOptions
 	ServerOptions
-	Username                 string                   `json:"username,omitempty"`
-	Password                 string                   `json:"password,omitempty"`
-	InsecureConcurrency      int                      `json:"insecure_concurrency,omitempty"`
-	ExtraHeaders             badoption.HTTPHeader     `json:"extra_headers,omitempty"`
-	ReceiveWindow            *byteformats.MemoryBytes `json:"stream_receive_window,omitempty"`
-	UDPOverTCP               *UDPOverTCPOptions       `json:"udp_over_tcp,omitempty"`
-	QUIC                     bool                     `json:"quic,omitempty"`
-	QUICCongestionControl    string                   `json:"quic_congestion_control,omitempty"`
-	QUICSessionReceiveWindow *byteformats.MemoryBytes `json:"quic_session_receive_window,omitempty"`
+	Username              string               `json:"username,omitempty"`
+	Password              string               `json:"password,omitempty"`
+	InsecureConcurrency   int                  `json:"insecure_concurrency,omitempty"`
+	ExtraHeaders          badoption.HTTPHeader `json:"extra_headers,omitempty"`
+	UDPOverTCP            *UDPOverTCPOptions   `json:"udp_over_tcp,omitempty"`
+	QUIC                  bool                 `json:"quic,omitempty"`
+	QUICCongestionControl string               `json:"quic_congestion_control,omitempty"`
 	OutboundTLSOptionsContainer
 }
--- a/option/oom_killer.go
+++ b/option/oom_killer.go
@@ -1,14 +0,0 @@
-package option
-
-import (
-	"github.com/sagernet/sing/common/byteformats"
-	"github.com/sagernet/sing/common/json/badoption"
-)
-
-type OOMKillerServiceOptions struct {
-	MemoryLimit       *byteformats.MemoryBytes `json:"memory_limit,omitempty"`
-	SafetyMargin      *byteformats.MemoryBytes `json:"safety_margin,omitempty"`
-	MinInterval       badoption.Duration       `json:"min_interval,omitempty"`
-	MaxInterval       badoption.Duration       `json:"max_interval,omitempty"`
-	ChecksBeforeLimit int                      `json:"checks_before_limit,omitempty"`
-}
--- a/option/tailscale.go
+++ b/option/tailscale.go
@@ -12,23 +12,22 @@ import (

 type TailscaleEndpointOptions struct {
 	DialerOptions
-	StateDirectory             string                     `json:"state_directory,omitempty"`
-	AuthKey                    string                     `json:"auth_key,omitempty"`
-	ControlURL                 string                     `json:"control_url,omitempty"`
-	Ephemeral                  bool                       `json:"ephemeral,omitempty"`
-	Hostname                   string                     `json:"hostname,omitempty"`
-	AcceptRoutes               bool                       `json:"accept_routes,omitempty"`
-	ExitNode                   string                     `json:"exit_node,omitempty"`
-	ExitNodeAllowLANAccess     bool                       `json:"exit_node_allow_lan_access,omitempty"`
-	AdvertiseRoutes            []netip.Prefix             `json:"advertise_routes,omitempty"`
-	AdvertiseExitNode          bool                       `json:"advertise_exit_node,omitempty"`
-	AdvertiseTags              badoption.Listable[string] `json:"advertise_tags,omitempty"`
-	RelayServerPort            *uint16                    `json:"relay_server_port,omitempty"`
-	RelayServerStaticEndpoints []netip.AddrPort           `json:"relay_server_static_endpoints,omitempty"`
-	SystemInterface            bool                       `json:"system_interface,omitempty"`
-	SystemInterfaceName        string                     `json:"system_interface_name,omitempty"`
-	SystemInterfaceMTU         uint32                     `json:"system_interface_mtu,omitempty"`
-	UDPTimeout                 UDPTimeoutCompat           `json:"udp_timeout,omitempty"`
+	StateDirectory             string           `json:"state_directory,omitempty"`
+	AuthKey                    string           `json:"auth_key,omitempty"`
+	ControlURL                 string           `json:"control_url,omitempty"`
+	Ephemeral                  bool             `json:"ephemeral,omitempty"`
+	Hostname                   string           `json:"hostname,omitempty"`
+	AcceptRoutes               bool             `json:"accept_routes,omitempty"`
+	ExitNode                   string           `json:"exit_node,omitempty"`
+	ExitNodeAllowLANAccess     bool             `json:"exit_node_allow_lan_access,omitempty"`
+	AdvertiseRoutes            []netip.Prefix   `json:"advertise_routes,omitempty"`
+	AdvertiseExitNode          bool             `json:"advertise_exit_node,omitempty"`
+	RelayServerPort            *uint16          `json:"relay_server_port,omitempty"`
+	RelayServerStaticEndpoints []netip.AddrPort `json:"relay_server_static_endpoints,omitempty"`
+	SystemInterface            bool             `json:"system_interface,omitempty"`
+	SystemInterfaceName        string           `json:"system_interface_name,omitempty"`
+	SystemInterfaceMTU         uint32           `json:"system_interface_mtu,omitempty"`
+	UDPTimeout                 UDPTimeoutCompat `json:"udp_timeout,omitempty"`
 }

 type TailscaleDNSServerOptions struct {
--- a/protocol/naive/outbound.go
+++ b/protocol/naive/outbound.go
@@ -235,7 +235,7 @@ func (h *Outbound) DialContext(ctx context.Context, network string, destination
 	switch N.NetworkName(network) {
 	case N.NetworkTCP:
 		h.logger.InfoContext(ctx, "outbound connection to ", destination)
-		return h.client.DialEarly(ctx, destination)
+		return h.client.DialEarly(destination)
 	case N.NetworkUDP:
 		if h.uotClient == nil {
 			return nil, E.New("UDP is not supported unless UDP over TCP is enabled")
@@ -254,10 +254,6 @@ func (h *Outbound) ListenPacket(ctx context.Context, destination M.Socksaddr) (n
 	return h.uotClient.ListenPacket(ctx, destination)
 }

-func (h *Outbound) InterfaceUpdated() {
-	h.client.Engine().CloseAllConnections()
-}
-
 func (h *Outbound) Close() error {
 	return h.client.Close()
 }
@@ -271,5 +267,5 @@ type naiveDialer struct {
 }

 func (d *naiveDialer) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
-	return d.NaiveClient.DialEarly(ctx, destination)
+	return d.NaiveClient.DialEarly(destination)
 }
--- a/protocol/tailscale/endpoint.go
+++ b/protocol/tailscale/endpoint.go
@@ -97,7 +97,6 @@ type Endpoint struct {
 	exitNodeAllowLANAccess     bool
 	advertiseRoutes            []netip.Prefix
 	advertiseExitNode          bool
-	advertiseTags              []string
 	relayServerPort            *uint16
 	relayServerStaticEndpoints []netip.AddrPort

@@ -210,11 +209,10 @@ func NewEndpoint(ctx context.Context, router adapter.Router, logger log.ContextL
 		UserLogf: func(format string, args ...any) {
 			logger.Debug(fmt.Sprintf(format, args...))
 		},
-		Ephemeral:     options.Ephemeral,
-		AuthKey:       options.AuthKey,
-		ControlURL:    options.ControlURL,
-		AdvertiseTags: options.AdvertiseTags,
-		Dialer:        &endpointDialer{Dialer: outboundDialer, logger: logger},
+		Ephemeral:  options.Ephemeral,
+		AuthKey:    options.AuthKey,
+		ControlURL: options.ControlURL,
+		Dialer:     &endpointDialer{Dialer: outboundDialer, logger: logger},
 		LookupHook: func(ctx context.Context, host string) ([]netip.Addr, error) {
 			return dnsRouter.Lookup(ctx, host, outboundDialer.(dialer.ResolveDialer).QueryOptions())
 		},
@@ -246,7 +244,6 @@ func NewEndpoint(ctx context.Context, router adapter.Router, logger log.ContextL
 		exitNodeAllowLANAccess:     options.ExitNodeAllowLANAccess,
 		advertiseRoutes:            options.AdvertiseRoutes,
 		advertiseExitNode:          options.AdvertiseExitNode,
-		advertiseTags:              options.AdvertiseTags,
 		relayServerPort:            options.RelayServerPort,
 		relayServerStaticEndpoints: options.RelayServerStaticEndpoints,
 		udpTimeout:                 udpTimeout,
@@ -362,23 +359,25 @@ func (t *Endpoint) Start(stage adapter.StartStage) error {
 	localBackend := t.server.ExportLocalBackend()
 	perfs := &ipn.MaskedPrefs{
 		Prefs: ipn.Prefs{
-			RouteAll:        t.acceptRoutes,
-			AdvertiseRoutes: t.advertiseRoutes,
+			RouteAll: t.acceptRoutes,
 		},
-		RouteAllSet:                   true,
-		ExitNodeIPSet:                 true,
-		AdvertiseRoutesSet:            true,
-		RelayServerPortSet:            true,
-		RelayServerStaticEndpointsSet: true,
+		RouteAllSet:        true,
+		ExitNodeIPSet:      true,
+		AdvertiseRoutesSet: true,
+	}
+	if len(t.advertiseRoutes) > 0 {
+		perfs.AdvertiseRoutes = t.advertiseRoutes
 	}
 	if t.advertiseExitNode {
 		perfs.AdvertiseRoutes = append(perfs.AdvertiseRoutes, tsaddr.ExitRoutes()...)
 	}
 	if t.relayServerPort != nil {
 		perfs.RelayServerPort = t.relayServerPort
+		perfs.RelayServerPortSet = true
 	}
 	if len(t.relayServerStaticEndpoints) > 0 {
 		perfs.RelayServerStaticEndpoints = t.relayServerStaticEndpoints
+		perfs.RelayServerStaticEndpointsSet = true
 	}
 	_, err = localBackend.EditPrefs(perfs)
 	if err != nil {
--- a/route/conn.go
+++ b/route/conn.go
@@ -44,52 +44,16 @@ func (m *ConnectionManager) Start(stage adapter.StartStage) error {
 	return nil
 }

-func (m *ConnectionManager) Count() int {
-	return m.connections.Len()
-}
-
-func (m *ConnectionManager) CloseAll() {
-	m.access.Lock()
-	var closers []io.Closer
-	for element := m.connections.Front(); element != nil; {
-		nextElement := element.Next()
-		closers = append(closers, element.Value)
-		m.connections.Remove(element)
-		element = nextElement
-	}
-	m.access.Unlock()
-	for _, closer := range closers {
-		common.Close(closer)
-	}
-}
-
 func (m *ConnectionManager) Close() error {
-	m.CloseAll()
+	m.access.Lock()
+	defer m.access.Unlock()
+	for element := m.connections.Front(); element != nil; element = element.Next() {
+		common.Close(element.Value)
+	}
+	m.connections.Init()
 	return nil
 }

-func (m *ConnectionManager) TrackConn(conn net.Conn) net.Conn {
-	m.access.Lock()
-	element := m.connections.PushBack(conn)
-	m.access.Unlock()
-	return &trackedConn{
-		Conn:    conn,
-		manager: m,
-		element: element,
-	}
-}
-
-func (m *ConnectionManager) TrackPacketConn(conn net.PacketConn) net.PacketConn {
-	m.access.Lock()
-	element := m.connections.PushBack(conn)
-	m.access.Unlock()
-	return &trackedPacketConn{
-		PacketConn: conn,
-		manager:    m,
-		element:    element,
-	}
-}
-
 func (m *ConnectionManager) NewConnection(ctx context.Context, this N.Dialer, conn net.Conn, metadata adapter.InboundContext, onClose N.CloseHandlerFunc) {
 	ctx = adapter.WithContext(ctx, &metadata)
 	var (
@@ -128,6 +92,14 @@ func (m *ConnectionManager) NewConnection(ctx context.Context, this N.Dialer, co
 	if metadata.TLSFragment || metadata.TLSRecordFragment {
 		remoteConn = tf.NewConn(remoteConn, ctx, metadata.TLSFragment, metadata.TLSRecordFragment, metadata.TLSFragmentFallbackDelay)
 	}
+	m.access.Lock()
+	element := m.connections.PushBack(conn)
+	m.access.Unlock()
+	onClose = N.AppendClose(onClose, func(it error) {
+		m.access.Lock()
+		defer m.access.Unlock()
+		m.connections.Remove(element)
+	})
 	var done atomic.Bool
 	if m.kickWriteHandshake(ctx, conn, remoteConn, false, &done, onClose) {
 		return
@@ -244,6 +216,14 @@ func (m *ConnectionManager) NewPacketConnection(ctx context.Context, this N.Dial
 		ctx, conn = canceler.NewPacketConn(ctx, conn, udpTimeout)
 	}
 	destination := bufio.NewPacketConn(remotePacketConn)
+	m.access.Lock()
+	element := m.connections.PushBack(conn)
+	m.access.Unlock()
+	onClose = N.AppendClose(onClose, func(it error) {
+		m.access.Lock()
+		defer m.access.Unlock()
+		m.connections.Remove(element)
+	})
 	var done atomic.Bool
 	go m.packetConnectionCopy(ctx, conn, destination, false, &done, onClose)
 	go m.packetConnectionCopy(ctx, destination, conn, true, &done, onClose)
@@ -262,9 +242,7 @@ func (m *ConnectionManager) connectionCopy(ctx context.Context, source net.Conn,
 		destination.Close()
 	}
 	if done.Swap(true) {
-		if onClose != nil {
-			onClose(err)
-		}
+		onClose(err)
 		common.Close(source, destination)
 	}
 	if !direction {
@@ -325,9 +303,7 @@ func (m *ConnectionManager) kickWriteHandshake(ctx context.Context, source net.C
 		return false
 	}
 	if !done.Swap(true) {
-		if onClose != nil {
-			onClose(err)
-		}
+		onClose(err)
 	}
 	common.Close(source, destination)
 	if !direction {
@@ -358,59 +334,7 @@ func (m *ConnectionManager) packetConnectionCopy(ctx context.Context, source N.P
 		}
 	}
 	if !done.Swap(true) {
-		if onClose != nil {
-			onClose(err)
-		}
+		onClose(err)
 	}
 	common.Close(source, destination)
 }
-
-type trackedConn struct {
-	net.Conn
-	manager *ConnectionManager
-	element *list.Element[io.Closer]
-}
-
-func (c *trackedConn) Close() error {
-	c.manager.access.Lock()
-	c.manager.connections.Remove(c.element)
-	c.manager.access.Unlock()
-	return c.Conn.Close()
-}
-
-func (c *trackedConn) Upstream() any {
-	return c.Conn
-}
-
-func (c *trackedConn) ReaderReplaceable() bool {
-	return true
-}
-
-func (c *trackedConn) WriterReplaceable() bool {
-	return true
-}
-
-type trackedPacketConn struct {
-	net.PacketConn
-	manager *ConnectionManager
-	element *list.Element[io.Closer]
-}
-
-func (c *trackedPacketConn) Close() error {
-	c.manager.access.Lock()
-	c.manager.connections.Remove(c.element)
-	c.manager.access.Unlock()
-	return c.PacketConn.Close()
-}
-
-func (c *trackedPacketConn) Upstream() any {
-	return bufio.NewPacketConn(c.PacketConn)
-}
-
-func (c *trackedPacketConn) ReaderReplaceable() bool {
-	return true
-}
-
-func (c *trackedPacketConn) WriterReplaceable() bool {
-	return true
-}
--- a/route/network.go
+++ b/route/network.go
@@ -13,6 +13,7 @@ import (
 	"time"

 	"github.com/sagernet/sing-box/adapter"
+	"github.com/sagernet/sing-box/common/conntrack"
 	"github.com/sagernet/sing-box/common/settings"
 	"github.com/sagernet/sing-box/common/taskmonitor"
 	C "github.com/sagernet/sing-box/constant"
@@ -47,7 +48,6 @@ type NetworkManager struct {
 	powerListener          winpowrprof.EventListener
 	pauseManager           pause.Manager
 	platformInterface      adapter.PlatformInterface
-	connectionManager      adapter.ConnectionManager
 	endpoint               adapter.EndpointManager
 	inbound                adapter.InboundManager
 	outbound               adapter.OutboundManager
@@ -90,7 +90,6 @@ func NewNetworkManager(ctx context.Context, logger logger.ContextLogger, options
 		},
 		pauseManager:      service.FromContext[pause.Manager](ctx),
 		platformInterface: service.FromContext[adapter.PlatformInterface](ctx),
-		connectionManager: service.FromContext[adapter.ConnectionManager](ctx),
 		endpoint:          service.FromContext[adapter.EndpointManager](ctx),
 		inbound:           service.FromContext[adapter.InboundManager](ctx),
 		outbound:          service.FromContext[adapter.OutboundManager](ctx),
@@ -451,9 +450,7 @@ func (r *NetworkManager) UpdateWIFIState() {
 }

 func (r *NetworkManager) ResetNetwork() {
-	if r.connectionManager != nil {
-		r.connectionManager.CloseAll()
-	}
+	conntrack.Close()

 	for _, endpoint := range r.endpoint.Endpoints() {
 		listener, isListener := endpoint.(adapter.InterfaceUpdateListener)
--- a/route/route.go
+++ b/route/route.go
@@ -9,6 +9,7 @@ import (
 	"time"

 	"github.com/sagernet/sing-box/adapter"
+	"github.com/sagernet/sing-box/common/conntrack"
 	"github.com/sagernet/sing-box/common/process"
 	"github.com/sagernet/sing-box/common/sniff"
 	C "github.com/sagernet/sing-box/constant"
@@ -79,6 +80,7 @@ func (r *Router) routeConnection(ctx context.Context, conn net.Conn, metadata ad
 		injectable.NewConnectionEx(ctx, conn, metadata, onClose)
 		return nil
 	}
+	conntrack.KillerCheck()
 	metadata.Network = N.NetworkTCP
 	switch metadata.Destination.Fqdn {
 	case mux.Destination.Fqdn:
@@ -214,6 +216,8 @@ func (r *Router) routePacketConnection(ctx context.Context, conn N.PacketConn, m
 		injectable.NewPacketConnectionEx(ctx, conn, metadata, onClose)
 		return nil
 	}
+	conntrack.KillerCheck()
+
 	// TODO: move to UoT
 	metadata.Network = N.NetworkUDP

--- a/route/rule/rule_abstract.go
+++ b/route/rule/rule_abstract.go
@@ -107,7 +107,9 @@ func (r *abstractDefaultRule) Match(metadata *adapter.InboundContext) bool {
 	}

 	for _, item := range r.items {
-		metadata.DidMatch = true
+		if _, isRuleSet := item.(*RuleSetItem); !isRuleSet {
+			metadata.DidMatch = true
+		}
 		if !item.Match(metadata) {
 			return r.invert
 		}
--- a/route/rule/rule_abstract_test.go
+++ b/route/rule/rule_abstract_test.go
@@ -1,157 +0,0 @@
-package rule
-
-import (
-	"context"
-	"testing"
-
-	"github.com/sagernet/sing-box/adapter"
-	C "github.com/sagernet/sing-box/constant"
-	"github.com/sagernet/sing/common/x/list"
-
-	"github.com/stretchr/testify/require"
-	"go4.org/netipx"
-)
-
-type fakeRuleSet struct {
-	matched bool
-}
-
-func (f *fakeRuleSet) Name() string {
-	return "fake-rule-set"
-}
-
-func (f *fakeRuleSet) StartContext(context.Context, *adapter.HTTPStartContext) error {
-	return nil
-}
-
-func (f *fakeRuleSet) PostStart() error {
-	return nil
-}
-
-func (f *fakeRuleSet) Metadata() adapter.RuleSetMetadata {
-	return adapter.RuleSetMetadata{}
-}
-
-func (f *fakeRuleSet) ExtractIPSet() []*netipx.IPSet {
-	return nil
-}
-
-func (f *fakeRuleSet) IncRef() {}
-
-func (f *fakeRuleSet) DecRef() {}
-
-func (f *fakeRuleSet) Cleanup() {}
-
-func (f *fakeRuleSet) RegisterCallback(adapter.RuleSetUpdateCallback) *list.Element[adapter.RuleSetUpdateCallback] {
-	return nil
-}
-
-func (f *fakeRuleSet) UnregisterCallback(*list.Element[adapter.RuleSetUpdateCallback]) {}
-
-func (f *fakeRuleSet) Close() error {
-	return nil
-}
-
-func (f *fakeRuleSet) Match(*adapter.InboundContext) bool {
-	return f.matched
-}
-
-func (f *fakeRuleSet) String() string {
-	return "fake-rule-set"
-}
-
-type fakeRuleItem struct {
-	matched bool
-}
-
-func (f *fakeRuleItem) Match(*adapter.InboundContext) bool {
-	return f.matched
-}
-
-func (f *fakeRuleItem) String() string {
-	return "fake-rule-item"
-}
-
-func newRuleSetOnlyRule(ruleSetMatched bool, invert bool) *DefaultRule {
-	ruleSetItem := &RuleSetItem{
-		setList: []adapter.RuleSet{&fakeRuleSet{matched: ruleSetMatched}},
-	}
-	return &DefaultRule{
-		abstractDefaultRule: abstractDefaultRule{
-			items:    []RuleItem{ruleSetItem},
-			allItems: []RuleItem{ruleSetItem},
-			invert:   invert,
-		},
-	}
-}
-
-func newSingleItemRule(matched bool) *DefaultRule {
-	item := &fakeRuleItem{matched: matched}
-	return &DefaultRule{
-		abstractDefaultRule: abstractDefaultRule{
-			items:    []RuleItem{item},
-			allItems: []RuleItem{item},
-		},
-	}
-}
-
-func TestAbstractDefaultRule_RuleSetOnly_InvertFalse(t *testing.T) {
-	t.Parallel()
-	require.True(t, newRuleSetOnlyRule(true, false).Match(&adapter.InboundContext{}))
-	require.False(t, newRuleSetOnlyRule(false, false).Match(&adapter.InboundContext{}))
-}
-
-func TestAbstractDefaultRule_RuleSetOnly_InvertTrue(t *testing.T) {
-	t.Parallel()
-	require.False(t, newRuleSetOnlyRule(true, true).Match(&adapter.InboundContext{}))
-	require.True(t, newRuleSetOnlyRule(false, true).Match(&adapter.InboundContext{}))
-}
-
-func TestAbstractLogicalRule_And_WithRuleSetInvert(t *testing.T) {
-	t.Parallel()
-	testCases := []struct {
-		name          string
-		aMatched      bool
-		ruleSetBMatch bool
-		expected      bool
-	}{
-		{
-			name:          "A true B true",
-			aMatched:      true,
-			ruleSetBMatch: true,
-			expected:      false,
-		},
-		{
-			name:          "A true B false",
-			aMatched:      true,
-			ruleSetBMatch: false,
-			expected:      true,
-		},
-		{
-			name:          "A false B true",
-			aMatched:      false,
-			ruleSetBMatch: true,
-			expected:      false,
-		},
-		{
-			name:          "A false B false",
-			aMatched:      false,
-			ruleSetBMatch: false,
-			expected:      false,
-		},
-	}
-	for _, testCase := range testCases {
-		testCase := testCase
-		t.Run(testCase.name, func(t *testing.T) {
-			t.Parallel()
-			logicalRule := &abstractLogicalRule{
-				mode: C.LogicalTypeAnd,
-				rules: []adapter.HeadlessRule{
-					newSingleItemRule(testCase.aMatched),
-					newRuleSetOnlyRule(testCase.ruleSetBMatch, true),
-				},
-			}
-			require.Equal(t, testCase.expected, logicalRule.Match(&adapter.InboundContext{}))
-		})
-	}
-}
--- a/service/ccm/service.go
+++ b/service/ccm/service.go
@@ -10,7 +10,6 @@ import (
 	"mime"
 	"net"
 	"net/http"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -80,35 +79,6 @@ func isHopByHopHeader(header string) bool {
 	}
 }

-const (
-	weeklyWindowSeconds = 604800
-	weeklyWindowMinutes = weeklyWindowSeconds / 60
-)
-
-func parseInt64Header(headers http.Header, headerName string) (int64, bool) {
-	headerValue := strings.TrimSpace(headers.Get(headerName))
-	if headerValue == "" {
-		return 0, false
-	}
-	parsedValue, parseError := strconv.ParseInt(headerValue, 10, 64)
-	if parseError != nil {
-		return 0, false
-	}
-	return parsedValue, true
-}
-
-func extractWeeklyCycleHint(headers http.Header) *WeeklyCycleHint {
-	resetAtUnix, hasResetAt := parseInt64Header(headers, "anthropic-ratelimit-unified-7d-reset")
-	if !hasResetAt || resetAtUnix <= 0 {
-		return nil
-	}
-
-	return &WeeklyCycleHint{
-		WindowMinutes: weeklyWindowMinutes,
-		ResetAt:       time.Unix(resetAtUnix, 0).UTC(),
-	}
-}
-
 type Service struct {
 	boxService.Adapter
 	ctx            context.Context
@@ -422,7 +392,6 @@ func (s *Service) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }

 func (s *Service) handleResponseWithTracking(writer http.ResponseWriter, response *http.Response, requestModel string, anthropicBetaHeader string, messagesCount int, username string) {
-	weeklyCycleHint := extractWeeklyCycleHint(response.Header)
 	mediaType, _, err := mime.ParseMediaType(response.Header.Get("Content-Type"))
 	isStreaming := err == nil && mediaType == "text/event-stream"

@@ -448,7 +417,7 @@ func (s *Service) handleResponseWithTracking(writer http.ResponseWriter, respons
 		if usage.InputTokens > 0 || usage.OutputTokens > 0 {
 			if responseModel != "" {
 				contextWindow := detectContextWindow(anthropicBetaHeader, usage.InputTokens)
-				s.usageTracker.AddUsageWithCycleHint(
+				s.usageTracker.AddUsage(
 					responseModel,
 					contextWindow,
 					messagesCount,
@@ -456,11 +425,7 @@ func (s *Service) handleResponseWithTracking(writer http.ResponseWriter, respons
 					usage.OutputTokens,
 					usage.CacheReadInputTokens,
 					usage.CacheCreationInputTokens,
-					usage.CacheCreation.Ephemeral5mInputTokens,
-					usage.CacheCreation.Ephemeral1hInputTokens,
 					username,
-					time.Now(),
-					weeklyCycleHint,
 				)
 			}
 		}
@@ -520,8 +485,6 @@ func (s *Service) handleResponseWithTracking(writer http.ResponseWriter, respons
 							accumulatedUsage.InputTokens = messageStart.Message.Usage.InputTokens
 							accumulatedUsage.CacheReadInputTokens = messageStart.Message.Usage.CacheReadInputTokens
 							accumulatedUsage.CacheCreationInputTokens = messageStart.Message.Usage.CacheCreationInputTokens
-							accumulatedUsage.CacheCreation.Ephemeral5mInputTokens = messageStart.Message.Usage.CacheCreation.Ephemeral5mInputTokens
-							accumulatedUsage.CacheCreation.Ephemeral1hInputTokens = messageStart.Message.Usage.CacheCreation.Ephemeral1hInputTokens
 						}
 					case "message_delta":
 						messageDelta := event.AsMessageDelta()
@@ -548,7 +511,7 @@ func (s *Service) handleResponseWithTracking(writer http.ResponseWriter, respons
 			if accumulatedUsage.InputTokens > 0 || accumulatedUsage.OutputTokens > 0 {
 				if responseModel != "" {
 					contextWindow := detectContextWindow(anthropicBetaHeader, accumulatedUsage.InputTokens)
-					s.usageTracker.AddUsageWithCycleHint(
+					s.usageTracker.AddUsage(
 						responseModel,
 						contextWindow,
 						messagesCount,
@@ -556,11 +519,7 @@ func (s *Service) handleResponseWithTracking(writer http.ResponseWriter, respons
 						accumulatedUsage.OutputTokens,
 						accumulatedUsage.CacheReadInputTokens,
 						accumulatedUsage.CacheCreationInputTokens,
-						accumulatedUsage.CacheCreation.Ephemeral5mInputTokens,
-						accumulatedUsage.CacheCreation.Ephemeral1hInputTokens,
 						username,
-						time.Now(),
-						weeklyCycleHint,
 					)
 				}
 			}
--- a/service/ccm/service_usage.go
+++ b/service/ccm/service_usage.go
@@ -2,7 +2,6 @@ package ccm

 import (
 	"encoding/json"
-	"fmt"
 	"math"
 	"os"
 	"regexp"
@@ -14,20 +13,17 @@ import (
 )

 type UsageStats struct {
-	RequestCount                    int   `json:"request_count"`
-	MessagesCount                   int   `json:"messages_count"`
-	InputTokens                     int64 `json:"input_tokens"`
-	OutputTokens                    int64 `json:"output_tokens"`
-	CacheReadInputTokens            int64 `json:"cache_read_input_tokens"`
-	CacheCreationInputTokens        int64 `json:"cache_creation_input_tokens"`
-	CacheCreation5MinuteInputTokens int64 `json:"cache_creation_5m_input_tokens,omitempty"`
-	CacheCreation1HourInputTokens   int64 `json:"cache_creation_1h_input_tokens,omitempty"`
+	RequestCount             int   `json:"request_count"`
+	MessagesCount            int   `json:"messages_count"`
+	InputTokens              int64 `json:"input_tokens"`
+	OutputTokens             int64 `json:"output_tokens"`
+	CacheReadInputTokens     int64 `json:"cache_read_input_tokens"`
+	CacheCreationInputTokens int64 `json:"cache_creation_input_tokens"`
 }

 type CostCombination struct {
 	Model         string                `json:"model"`
 	ContextWindow int                   `json:"context_window"`
-	WeekStartUnix int64                 `json:"week_start_unix,omitempty"`
 	Total         UsageStats            `json:"total"`
 	ByUser        map[string]UsageStats `json:"by_user"`
 }
@@ -45,21 +41,18 @@ type AggregatedUsage struct {
 }

 type UsageStatsJSON struct {
-	RequestCount                    int     `json:"request_count"`
-	MessagesCount                   int     `json:"messages_count"`
-	InputTokens                     int64   `json:"input_tokens"`
-	OutputTokens                    int64   `json:"output_tokens"`
-	CacheReadInputTokens            int64   `json:"cache_read_input_tokens"`
-	CacheCreationInputTokens        int64   `json:"cache_creation_input_tokens"`
-	CacheCreation5MinuteInputTokens int64   `json:"cache_creation_5m_input_tokens,omitempty"`
-	CacheCreation1HourInputTokens   int64   `json:"cache_creation_1h_input_tokens,omitempty"`
-	CostUSD                         float64 `json:"cost_usd"`
+	RequestCount             int     `json:"request_count"`
+	MessagesCount            int     `json:"messages_count"`
+	InputTokens              int64   `json:"input_tokens"`
+	OutputTokens             int64   `json:"output_tokens"`
+	CacheReadInputTokens     int64   `json:"cache_read_input_tokens"`
+	CacheCreationInputTokens int64   `json:"cache_creation_input_tokens"`
+	CostUSD                  float64 `json:"cost_usd"`
 }

 type CostCombinationJSON struct {
 	Model         string                    `json:"model"`
 	ContextWindow int                       `json:"context_window"`
-	WeekStartUnix int64                     `json:"week_start_unix,omitempty"`
 	Total         UsageStatsJSON            `json:"total"`
 	ByUser        map[string]UsageStatsJSON `json:"by_user"`
 }
@@ -67,7 +60,6 @@ type CostCombinationJSON struct {
 type CostsSummaryJSON struct {
 	TotalUSD float64            `json:"total_usd"`
 	ByUser   map[string]float64 `json:"by_user"`
-	ByWeek   map[string]float64 `json:"by_week,omitempty"`
 }

 type AggregatedUsageJSON struct {
@@ -76,17 +68,11 @@ type AggregatedUsageJSON struct {
 	Combinations []CostCombinationJSON `json:"combinations"`
 }

-type WeeklyCycleHint struct {
-	WindowMinutes int64
-	ResetAt       time.Time
-}
-
 type ModelPricing struct {
-	InputPrice             float64
-	OutputPrice            float64
-	CacheReadPrice         float64
-	CacheWritePrice5Minute float64
-	CacheWritePrice1Hour   float64
+	InputPrice      float64
+	OutputPrice     float64
+	CacheReadPrice  float64
+	CacheWritePrice float64
 }

 type modelFamily struct {
@@ -96,205 +82,143 @@ type modelFamily struct {
 }

 var (
-	opus46StandardPricing = ModelPricing{
-		InputPrice:             5.0,
-		OutputPrice:            25.0,
-		CacheReadPrice:         0.5,
-		CacheWritePrice5Minute: 6.25,
-		CacheWritePrice1Hour:   10.0,
-	}
-
-	opus46PremiumPricing = ModelPricing{
-		InputPrice:             10.0,
-		OutputPrice:            37.5,
-		CacheReadPrice:         1.0,
-		CacheWritePrice5Minute: 12.5,
-		CacheWritePrice1Hour:   20.0,
-	}
-
-	opus45Pricing = ModelPricing{
-		InputPrice:             5.0,
-		OutputPrice:            25.0,
-		CacheReadPrice:         0.5,
-		CacheWritePrice5Minute: 6.25,
-		CacheWritePrice1Hour:   10.0,
-	}
-
 	opus4Pricing = ModelPricing{
-		InputPrice:             15.0,
-		OutputPrice:            75.0,
-		CacheReadPrice:         1.5,
-		CacheWritePrice5Minute: 18.75,
-		CacheWritePrice1Hour:   30.0,
-	}
-
-	sonnet46StandardPricing = ModelPricing{
-		InputPrice:             3.0,
-		OutputPrice:            15.0,
-		CacheReadPrice:         0.3,
-		CacheWritePrice5Minute: 3.75,
-		CacheWritePrice1Hour:   6.0,
-	}
-
-	sonnet46PremiumPricing = ModelPricing{
-		InputPrice:             6.0,
-		OutputPrice:            22.5,
-		CacheReadPrice:         0.6,
-		CacheWritePrice5Minute: 7.5,
-		CacheWritePrice1Hour:   12.0,
-	}
-
-	sonnet45StandardPricing = ModelPricing{
-		InputPrice:             3.0,
-		OutputPrice:            15.0,
-		CacheReadPrice:         0.3,
-		CacheWritePrice5Minute: 3.75,
-		CacheWritePrice1Hour:   6.0,
-	}
-
-	sonnet45PremiumPricing = ModelPricing{
-		InputPrice:             6.0,
-		OutputPrice:            22.5,
-		CacheReadPrice:         0.6,
-		CacheWritePrice5Minute: 7.5,
-		CacheWritePrice1Hour:   12.0,
+		InputPrice:      15.0,
+		OutputPrice:     75.0,
+		CacheReadPrice:  1.5,
+		CacheWritePrice: 18.75,
 	}

 	sonnet4StandardPricing = ModelPricing{
-		InputPrice:             3.0,
-		OutputPrice:            15.0,
-		CacheReadPrice:         0.3,
-		CacheWritePrice5Minute: 3.75,
-		CacheWritePrice1Hour:   6.0,
+		InputPrice:      3.0,
+		OutputPrice:     15.0,
+		CacheReadPrice:  0.3,
+		CacheWritePrice: 3.75,
 	}

 	sonnet4PremiumPricing = ModelPricing{
-		InputPrice:             6.0,
-		OutputPrice:            22.5,
-		CacheReadPrice:         0.6,
-		CacheWritePrice5Minute: 7.5,
-		CacheWritePrice1Hour:   12.0,
-	}
-
-	sonnet37Pricing = ModelPricing{
-		InputPrice:             3.0,
-		OutputPrice:            15.0,
-		CacheReadPrice:         0.3,
-		CacheWritePrice5Minute: 3.75,
-		CacheWritePrice1Hour:   6.0,
-	}
-
-	sonnet35Pricing = ModelPricing{
-		InputPrice:             3.0,
-		OutputPrice:            15.0,
-		CacheReadPrice:         0.3,
-		CacheWritePrice5Minute: 3.75,
-		CacheWritePrice1Hour:   6.0,
-	}
-
-	haiku45Pricing = ModelPricing{
-		InputPrice:             1.0,
-		OutputPrice:            5.0,
-		CacheReadPrice:         0.1,
-		CacheWritePrice5Minute: 1.25,
-		CacheWritePrice1Hour:   2.0,
+		InputPrice:      6.0,
+		OutputPrice:     22.5,
+		CacheReadPrice:  0.6,
+		CacheWritePrice: 7.5,
 	}

 	haiku4Pricing = ModelPricing{
-		InputPrice:             1.0,
-		OutputPrice:            5.0,
-		CacheReadPrice:         0.1,
-		CacheWritePrice5Minute: 1.25,
-		CacheWritePrice1Hour:   2.0,
+		InputPrice:      1.0,
+		OutputPrice:     5.0,
+		CacheReadPrice:  0.1,
+		CacheWritePrice: 1.25,
 	}

 	haiku35Pricing = ModelPricing{
-		InputPrice:             0.8,
-		OutputPrice:            4.0,
-		CacheReadPrice:         0.08,
-		CacheWritePrice5Minute: 1.0,
-		CacheWritePrice1Hour:   1.6,
+		InputPrice:      0.8,
+		OutputPrice:     4.0,
+		CacheReadPrice:  0.08,
+		CacheWritePrice: 1.0,
+	}
+
+	sonnet35Pricing = ModelPricing{
+		InputPrice:      3.0,
+		OutputPrice:     15.0,
+		CacheReadPrice:  0.3,
+		CacheWritePrice: 3.75,
+	}
+
+	opus45Pricing = ModelPricing{
+		InputPrice:      5.0,
+		OutputPrice:     25.0,
+		CacheReadPrice:  0.5,
+		CacheWritePrice: 6.25,
+	}
+
+	sonnet45StandardPricing = ModelPricing{
+		InputPrice:      3.0,
+		OutputPrice:     15.0,
+		CacheReadPrice:  0.3,
+		CacheWritePrice: 3.75,
+	}
+
+	sonnet45PremiumPricing = ModelPricing{
+		InputPrice:      6.0,
+		OutputPrice:     22.5,
+		CacheReadPrice:  0.6,
+		CacheWritePrice: 7.5,
+	}
+
+	haiku45Pricing = ModelPricing{
+		InputPrice:      1.0,
+		OutputPrice:     5.0,
+		CacheReadPrice:  0.1,
+		CacheWritePrice: 1.25,
 	}

 	haiku3Pricing = ModelPricing{
-		InputPrice:             0.25,
-		OutputPrice:            1.25,
-		CacheReadPrice:         0.03,
-		CacheWritePrice5Minute: 0.3,
-		CacheWritePrice1Hour:   0.5,
+		InputPrice:      0.25,
+		OutputPrice:     1.25,
+		CacheReadPrice:  0.03,
+		CacheWritePrice: 0.3,
 	}

 	opus3Pricing = ModelPricing{
-		InputPrice:             15.0,
-		OutputPrice:            75.0,
-		CacheReadPrice:         1.5,
-		CacheWritePrice5Minute: 18.75,
-		CacheWritePrice1Hour:   30.0,
+		InputPrice:      15.0,
+		OutputPrice:     75.0,
+		CacheReadPrice:  1.5,
+		CacheWritePrice: 18.75,
 	}

 	modelFamilies = []modelFamily{
 		{
-			pattern:         regexp.MustCompile(`^claude-opus-4-6(?:-|$)`),
-			standardPricing: opus46StandardPricing,
-			premiumPricing:  &opus46PremiumPricing,
-		},
-		{
-			pattern:         regexp.MustCompile(`^claude-opus-4-5(?:-|$)`),
+			pattern:         regexp.MustCompile(`^claude-opus-4-5-`),
 			standardPricing: opus45Pricing,
 			premiumPricing:  nil,
 		},
 		{
-			pattern:         regexp.MustCompile(`^claude-(?:opus-4(?:-|$)|4-opus-)`),
+			pattern:         regexp.MustCompile(`^claude-(?:opus-4-|4-opus-|opus-4-1-)`),
 			standardPricing: opus4Pricing,
 			premiumPricing:  nil,
 		},
 		{
-			pattern:         regexp.MustCompile(`^claude-(?:opus-3(?:-|$)|3-opus-)`),
+			pattern:         regexp.MustCompile(`^claude-(?:opus-3-|3-opus-)`),
 			standardPricing: opus3Pricing,
 			premiumPricing:  nil,
 		},
 		{
-			pattern:         regexp.MustCompile(`^claude-(?:sonnet-4-6(?:-|$)|4-6-sonnet-)`),
-			standardPricing: sonnet46StandardPricing,
-			premiumPricing:  &sonnet46PremiumPricing,
-		},
-		{
-			pattern:         regexp.MustCompile(`^claude-(?:sonnet-4-5(?:-|$)|4-5-sonnet-)`),
+			pattern:         regexp.MustCompile(`^claude-(?:sonnet-4-5-|4-5-sonnet-)`),
 			standardPricing: sonnet45StandardPricing,
 			premiumPricing:  &sonnet45PremiumPricing,
 		},
 		{
-			pattern:         regexp.MustCompile(`^claude-(?:sonnet-4(?:-|$)|4-sonnet-)`),
+			pattern:         regexp.MustCompile(`^claude-3-7-sonnet-`),
 			standardPricing: sonnet4StandardPricing,
 			premiumPricing:  &sonnet4PremiumPricing,
 		},
 		{
-			pattern:         regexp.MustCompile(`^claude-3-7-sonnet(?:-|$)`),
-			standardPricing: sonnet37Pricing,
-			premiumPricing:  nil,
+			pattern:         regexp.MustCompile(`^claude-(?:sonnet-4-|4-sonnet-)`),
+			standardPricing: sonnet4StandardPricing,
+			premiumPricing:  &sonnet4PremiumPricing,
 		},
 		{
-			pattern:         regexp.MustCompile(`^claude-3-5-sonnet(?:-|$)`),
+			pattern:         regexp.MustCompile(`^claude-3-5-sonnet-`),
 			standardPricing: sonnet35Pricing,
 			premiumPricing:  nil,
 		},
 		{
-			pattern:         regexp.MustCompile(`^claude-(?:haiku-4-5(?:-|$)|4-5-haiku-)`),
+			pattern:         regexp.MustCompile(`^claude-(?:haiku-4-5-|4-5-haiku-)`),
 			standardPricing: haiku45Pricing,
 			premiumPricing:  nil,
 		},
 		{
-			pattern:         regexp.MustCompile(`^claude-haiku-4(?:-|$)`),
+			pattern:         regexp.MustCompile(`^claude-haiku-4-`),
 			standardPricing: haiku4Pricing,
 			premiumPricing:  nil,
 		},
 		{
-			pattern:         regexp.MustCompile(`^claude-3-5-haiku(?:-|$)`),
+			pattern:         regexp.MustCompile(`^claude-3-5-haiku-`),
 			standardPricing: haiku35Pricing,
 			premiumPricing:  nil,
 		},
 		{
-			pattern:         regexp.MustCompile(`^claude-3-haiku(?:-|$)`),
+			pattern:         regexp.MustCompile(`^claude-3-haiku-`),
 			standardPricing: haiku3Pricing,
 			premiumPricing:  nil,
 		},
@@ -319,211 +243,68 @@ func getPricing(model string, contextWindow int) ModelPricing {
 func calculateCost(stats UsageStats, model string, contextWindow int) float64 {
 	pricing := getPricing(model, contextWindow)

-	cacheCreationCost := 0.0
-	if stats.CacheCreation5MinuteInputTokens > 0 || stats.CacheCreation1HourInputTokens > 0 {
-		cacheCreationCost = float64(stats.CacheCreation5MinuteInputTokens)*pricing.CacheWritePrice5Minute +
-			float64(stats.CacheCreation1HourInputTokens)*pricing.CacheWritePrice1Hour
-	} else {
-		// Backward compatibility for usage files generated before TTL split tracking.
-		cacheCreationCost = float64(stats.CacheCreationInputTokens) * pricing.CacheWritePrice5Minute
-	}
-
 	cost := (float64(stats.InputTokens)*pricing.InputPrice +
 		float64(stats.OutputTokens)*pricing.OutputPrice +
 		float64(stats.CacheReadInputTokens)*pricing.CacheReadPrice +
-		cacheCreationCost) / 1_000_000
+		float64(stats.CacheCreationInputTokens)*pricing.CacheWritePrice) / 1_000_000

 	return math.Round(cost*100) / 100
 }

-func roundCost(cost float64) float64 {
-	return math.Round(cost*100) / 100
-}
-
-func normalizeCombinations(combinations []CostCombination) {
-	for index := range combinations {
-		if combinations[index].ByUser == nil {
-			combinations[index].ByUser = make(map[string]UsageStats)
-		}
-	}
-}
-
-func addUsageToCombinations(
-	combinations *[]CostCombination,
-	model string,
-	contextWindow int,
-	weekStartUnix int64,
-	messagesCount int,
-	inputTokens, outputTokens, cacheReadTokens, cacheCreationTokens, cacheCreation5MinuteTokens, cacheCreation1HourTokens int64,
-	user string,
-) {
-	var matchedCombination *CostCombination
-	for index := range *combinations {
-		combination := &(*combinations)[index]
-		if combination.Model == model && combination.ContextWindow == contextWindow && combination.WeekStartUnix == weekStartUnix {
-			matchedCombination = combination
-			break
-		}
-	}
-
-	if matchedCombination == nil {
-		newCombination := CostCombination{
-			Model:         model,
-			ContextWindow: contextWindow,
-			WeekStartUnix: weekStartUnix,
-			Total:         UsageStats{},
-			ByUser:        make(map[string]UsageStats),
-		}
-		*combinations = append(*combinations, newCombination)
-		matchedCombination = &(*combinations)[len(*combinations)-1]
-	}
-
-	if cacheCreationTokens == 0 {
-		cacheCreationTokens = cacheCreation5MinuteTokens + cacheCreation1HourTokens
-	}
-
-	matchedCombination.Total.RequestCount++
-	matchedCombination.Total.MessagesCount += messagesCount
-	matchedCombination.Total.InputTokens += inputTokens
-	matchedCombination.Total.OutputTokens += outputTokens
-	matchedCombination.Total.CacheReadInputTokens += cacheReadTokens
-	matchedCombination.Total.CacheCreationInputTokens += cacheCreationTokens
-	matchedCombination.Total.CacheCreation5MinuteInputTokens += cacheCreation5MinuteTokens
-	matchedCombination.Total.CacheCreation1HourInputTokens += cacheCreation1HourTokens
-
-	if user != "" {
-		userStats := matchedCombination.ByUser[user]
-		userStats.RequestCount++
-		userStats.MessagesCount += messagesCount
-		userStats.InputTokens += inputTokens
-		userStats.OutputTokens += outputTokens
-		userStats.CacheReadInputTokens += cacheReadTokens
-		userStats.CacheCreationInputTokens += cacheCreationTokens
-		userStats.CacheCreation5MinuteInputTokens += cacheCreation5MinuteTokens
-		userStats.CacheCreation1HourInputTokens += cacheCreation1HourTokens
-		matchedCombination.ByUser[user] = userStats
-	}
-}
-
-func buildCombinationJSON(combinations []CostCombination, aggregateUserCosts map[string]float64) ([]CostCombinationJSON, float64) {
-	result := make([]CostCombinationJSON, len(combinations))
-	var totalCost float64
-
-	for index, combination := range combinations {
-		combinationTotalCost := calculateCost(combination.Total, combination.Model, combination.ContextWindow)
-		totalCost += combinationTotalCost
-
-		combinationJSON := CostCombinationJSON{
-			Model:         combination.Model,
-			ContextWindow: combination.ContextWindow,
-			WeekStartUnix: combination.WeekStartUnix,
-			Total: UsageStatsJSON{
-				RequestCount:                    combination.Total.RequestCount,
-				MessagesCount:                   combination.Total.MessagesCount,
-				InputTokens:                     combination.Total.InputTokens,
-				OutputTokens:                    combination.Total.OutputTokens,
-				CacheReadInputTokens:            combination.Total.CacheReadInputTokens,
-				CacheCreationInputTokens:        combination.Total.CacheCreationInputTokens,
-				CacheCreation5MinuteInputTokens: combination.Total.CacheCreation5MinuteInputTokens,
-				CacheCreation1HourInputTokens:   combination.Total.CacheCreation1HourInputTokens,
-				CostUSD:                         combinationTotalCost,
-			},
-			ByUser: make(map[string]UsageStatsJSON),
-		}
-
-		for user, userStats := range combination.ByUser {
-			userCost := calculateCost(userStats, combination.Model, combination.ContextWindow)
-			if aggregateUserCosts != nil {
-				aggregateUserCosts[user] += userCost
-			}
-
-			combinationJSON.ByUser[user] = UsageStatsJSON{
-				RequestCount:                    userStats.RequestCount,
-				MessagesCount:                   userStats.MessagesCount,
-				InputTokens:                     userStats.InputTokens,
-				OutputTokens:                    userStats.OutputTokens,
-				CacheReadInputTokens:            userStats.CacheReadInputTokens,
-				CacheCreationInputTokens:        userStats.CacheCreationInputTokens,
-				CacheCreation5MinuteInputTokens: userStats.CacheCreation5MinuteInputTokens,
-				CacheCreation1HourInputTokens:   userStats.CacheCreation1HourInputTokens,
-				CostUSD:                         userCost,
-			}
-		}
-
-		result[index] = combinationJSON
-	}
-
-	return result, roundCost(totalCost)
-}
-
-func formatUTCOffsetLabel(timestamp time.Time) string {
-	_, offsetSeconds := timestamp.Zone()
-	sign := "+"
-	if offsetSeconds < 0 {
-		sign = "-"
-		offsetSeconds = -offsetSeconds
-	}
-	offsetHours := offsetSeconds / 3600
-	offsetMinutes := (offsetSeconds % 3600) / 60
-	if offsetMinutes == 0 {
-		return fmt.Sprintf("UTC%s%d", sign, offsetHours)
-	}
-	return fmt.Sprintf("UTC%s%d:%02d", sign, offsetHours, offsetMinutes)
-}
-
-func formatWeekStartKey(cycleStartAt time.Time) string {
-	localCycleStart := cycleStartAt.In(time.Local)
-	return fmt.Sprintf("%s %s", localCycleStart.Format("2006-01-02 15:04:05"), formatUTCOffsetLabel(localCycleStart))
-}
-
-func buildByWeekCost(combinations []CostCombination) map[string]float64 {
-	byWeek := make(map[string]float64)
-	for _, combination := range combinations {
-		if combination.WeekStartUnix <= 0 {
-			continue
-		}
-		weekStartAt := time.Unix(combination.WeekStartUnix, 0).UTC()
-		weekKey := formatWeekStartKey(weekStartAt)
-		byWeek[weekKey] += calculateCost(combination.Total, combination.Model, combination.ContextWindow)
-	}
-	for weekKey, weekCost := range byWeek {
-		byWeek[weekKey] = roundCost(weekCost)
-	}
-	return byWeek
-}
-
-func deriveWeekStartUnix(cycleHint *WeeklyCycleHint) int64 {
-	if cycleHint == nil || cycleHint.WindowMinutes <= 0 || cycleHint.ResetAt.IsZero() {
-		return 0
-	}
-	windowDuration := time.Duration(cycleHint.WindowMinutes) * time.Minute
-	return cycleHint.ResetAt.UTC().Add(-windowDuration).Unix()
-}
-
 func (u *AggregatedUsage) ToJSON() *AggregatedUsageJSON {
 	u.mutex.Lock()
 	defer u.mutex.Unlock()

 	result := &AggregatedUsageJSON{
-		LastUpdated: u.LastUpdated,
+		LastUpdated:  u.LastUpdated,
+		Combinations: make([]CostCombinationJSON, len(u.Combinations)),
 		Costs: CostsSummaryJSON{
 			TotalUSD: 0,
 			ByUser:   make(map[string]float64),
-			ByWeek:   make(map[string]float64),
 		},
 	}

-	globalCombinationsJSON, totalCost := buildCombinationJSON(u.Combinations, result.Costs.ByUser)
-	result.Combinations = globalCombinationsJSON
-	result.Costs.TotalUSD = totalCost
-	result.Costs.ByWeek = buildByWeekCost(u.Combinations)
+	for i, combo := range u.Combinations {
+		totalCost := calculateCost(combo.Total, combo.Model, combo.ContextWindow)

-	if len(result.Costs.ByWeek) == 0 {
-		result.Costs.ByWeek = nil
+		result.Costs.TotalUSD += totalCost
+
+		comboJSON := CostCombinationJSON{
+			Model:         combo.Model,
+			ContextWindow: combo.ContextWindow,
+			Total: UsageStatsJSON{
+				RequestCount:             combo.Total.RequestCount,
+				MessagesCount:            combo.Total.MessagesCount,
+				InputTokens:              combo.Total.InputTokens,
+				OutputTokens:             combo.Total.OutputTokens,
+				CacheReadInputTokens:     combo.Total.CacheReadInputTokens,
+				CacheCreationInputTokens: combo.Total.CacheCreationInputTokens,
+				CostUSD:                  totalCost,
+			},
+			ByUser: make(map[string]UsageStatsJSON),
+		}
+
+		for user, userStats := range combo.ByUser {
+			userCost := calculateCost(userStats, combo.Model, combo.ContextWindow)
+			result.Costs.ByUser[user] += userCost
+
+			comboJSON.ByUser[user] = UsageStatsJSON{
+				RequestCount:             userStats.RequestCount,
+				MessagesCount:            userStats.MessagesCount,
+				InputTokens:              userStats.InputTokens,
+				OutputTokens:             userStats.OutputTokens,
+				CacheReadInputTokens:     userStats.CacheReadInputTokens,
+				CacheCreationInputTokens: userStats.CacheCreationInputTokens,
+				CostUSD:                  userCost,
+			}
+		}
+
+		result.Combinations[i] = comboJSON
 	}

+	result.Costs.TotalUSD = math.Round(result.Costs.TotalUSD*100) / 100
 	for user, cost := range result.Costs.ByUser {
-		result.Costs.ByUser[user] = roundCost(cost)
+		result.Costs.ByUser[user] = math.Round(cost*100) / 100
 	}

 	return result
@@ -533,9 +314,6 @@ func (u *AggregatedUsage) Load() error {
 	u.mutex.Lock()
 	defer u.mutex.Unlock()

-	u.LastUpdated = time.Time{}
-	u.Combinations = nil
-
 	data, err := os.ReadFile(u.filePath)
 	if err != nil {
 		if os.IsNotExist(err) {
@@ -556,7 +334,12 @@ func (u *AggregatedUsage) Load() error {

 	u.LastUpdated = temp.LastUpdated
 	u.Combinations = temp.Combinations
-	normalizeCombinations(u.Combinations)
+
+	for i := range u.Combinations {
+		if u.Combinations[i].ByUser == nil {
+			u.Combinations[i].ByUser = make(map[string]UsageStats)
+		}
+	}

 	return nil
 }
@@ -584,42 +367,58 @@ func (u *AggregatedUsage) Save() error {
 	return err
 }

-func (u *AggregatedUsage) AddUsage(
-	model string,
-	contextWindow int,
-	messagesCount int,
-	inputTokens, outputTokens, cacheReadTokens, cacheCreationTokens, cacheCreation5MinuteTokens, cacheCreation1HourTokens int64,
-	user string,
-) error {
-	return u.AddUsageWithCycleHint(model, contextWindow, messagesCount, inputTokens, outputTokens, cacheReadTokens, cacheCreationTokens, cacheCreation5MinuteTokens, cacheCreation1HourTokens, user, time.Now(), nil)
-}
-
-func (u *AggregatedUsage) AddUsageWithCycleHint(
-	model string,
-	contextWindow int,
-	messagesCount int,
-	inputTokens, outputTokens, cacheReadTokens, cacheCreationTokens, cacheCreation5MinuteTokens, cacheCreation1HourTokens int64,
-	user string,
-	observedAt time.Time,
-	cycleHint *WeeklyCycleHint,
-) error {
+func (u *AggregatedUsage) AddUsage(model string, contextWindow int, messagesCount int, inputTokens, outputTokens, cacheReadTokens, cacheCreationTokens int64, user string) error {
 	if model == "" {
 		return E.New("model cannot be empty")
 	}
 	if contextWindow <= 0 {
 		return E.New("contextWindow must be positive")
 	}
-	if observedAt.IsZero() {
-		observedAt = time.Now()
-	}

 	u.mutex.Lock()
 	defer u.mutex.Unlock()

-	u.LastUpdated = observedAt
-	weekStartUnix := deriveWeekStartUnix(cycleHint)
+	u.LastUpdated = time.Now()

-	addUsageToCombinations(&u.Combinations, model, contextWindow, weekStartUnix, messagesCount, inputTokens, outputTokens, cacheReadTokens, cacheCreationTokens, cacheCreation5MinuteTokens, cacheCreation1HourTokens, user)
+	// Find or create combination
+	var combo *CostCombination
+	for i := range u.Combinations {
+		if u.Combinations[i].Model == model && u.Combinations[i].ContextWindow == contextWindow {
+			combo = &u.Combinations[i]
+			break
+		}
+	}
+
+	if combo == nil {
+		newCombo := CostCombination{
+			Model:         model,
+			ContextWindow: contextWindow,
+			Total:         UsageStats{},
+			ByUser:        make(map[string]UsageStats),
+		}
+		u.Combinations = append(u.Combinations, newCombo)
+		combo = &u.Combinations[len(u.Combinations)-1]
+	}
+
+	// Update total stats
+	combo.Total.RequestCount++
+	combo.Total.MessagesCount += messagesCount
+	combo.Total.InputTokens += inputTokens
+	combo.Total.OutputTokens += outputTokens
+	combo.Total.CacheReadInputTokens += cacheReadTokens
+	combo.Total.CacheCreationInputTokens += cacheCreationTokens
+
+	// Update per-user stats if user is specified
+	if user != "" {
+		userStats := combo.ByUser[user]
+		userStats.RequestCount++
+		userStats.MessagesCount += messagesCount
+		userStats.InputTokens += inputTokens
+		userStats.OutputTokens += outputTokens
+		userStats.CacheReadInputTokens += cacheReadTokens
+		userStats.CacheCreationInputTokens += cacheCreationTokens
+		combo.ByUser[user] = userStats
+	}

 	go u.scheduleSave()

--- a/service/ocm/service.go
+++ b/service/ocm/service.go
@@ -10,7 +10,6 @@ import (
 	"mime"
 	"net"
 	"net/http"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -72,57 +71,6 @@ func isHopByHopHeader(header string) bool {
 	}
 }

-func normalizeRateLimitIdentifier(limitIdentifier string) string {
-	trimmedIdentifier := strings.TrimSpace(strings.ToLower(limitIdentifier))
-	if trimmedIdentifier == "" {
-		return ""
-	}
-	return strings.ReplaceAll(trimmedIdentifier, "_", "-")
-}
-
-func parseInt64Header(headers http.Header, headerName string) (int64, bool) {
-	headerValue := strings.TrimSpace(headers.Get(headerName))
-	if headerValue == "" {
-		return 0, false
-	}
-	parsedValue, parseError := strconv.ParseInt(headerValue, 10, 64)
-	if parseError != nil {
-		return 0, false
-	}
-	return parsedValue, true
-}
-
-func weeklyCycleHintForLimit(headers http.Header, limitIdentifier string) *WeeklyCycleHint {
-	normalizedLimitIdentifier := normalizeRateLimitIdentifier(limitIdentifier)
-	if normalizedLimitIdentifier == "" {
-		return nil
-	}
-
-	windowHeader := "x-" + normalizedLimitIdentifier + "-secondary-window-minutes"
-	resetHeader := "x-" + normalizedLimitIdentifier + "-secondary-reset-at"
-
-	windowMinutes, hasWindowMinutes := parseInt64Header(headers, windowHeader)
-	resetAtUnix, hasResetAt := parseInt64Header(headers, resetHeader)
-	if !hasWindowMinutes || !hasResetAt || windowMinutes <= 0 || resetAtUnix <= 0 {
-		return nil
-	}
-
-	return &WeeklyCycleHint{
-		WindowMinutes: windowMinutes,
-		ResetAt:       time.Unix(resetAtUnix, 0).UTC(),
-	}
-}
-
-func extractWeeklyCycleHint(headers http.Header) *WeeklyCycleHint {
-	activeLimitIdentifier := normalizeRateLimitIdentifier(headers.Get("x-codex-active-limit"))
-	if activeLimitIdentifier != "" {
-		if activeHint := weeklyCycleHintForLimit(headers, activeLimitIdentifier); activeHint != nil {
-			return activeHint
-		}
-	}
-	return weeklyCycleHintForLimit(headers, "codex")
-}
-
 type Service struct {
 	boxService.Adapter
 	ctx            context.Context
@@ -456,12 +404,9 @@ func (s *Service) ServeHTTP(w http.ResponseWriter, r *http.Request) {

 func (s *Service) handleResponseWithTracking(writer http.ResponseWriter, response *http.Response, path string, requestModel string, username string) {
 	isChatCompletions := path == "/v1/chat/completions"
-	weeklyCycleHint := extractWeeklyCycleHint(response.Header)
 	mediaType, _, err := mime.ParseMediaType(response.Header.Get("Content-Type"))
 	isStreaming := err == nil && mediaType == "text/event-stream"
-	if !isStreaming && !isChatCompletions && response.Header.Get("Content-Type") == "" {
-		isStreaming = true
-	}
+
 	if !isStreaming {
 		bodyBytes, err := io.ReadAll(response.Body)
 		if err != nil {
@@ -469,14 +414,13 @@ func (s *Service) handleResponseWithTracking(writer http.ResponseWriter, respons
 			return
 		}

-		var responseModel, serviceTier string
+		var responseModel string
 		var inputTokens, outputTokens, cachedTokens int64

 		if isChatCompletions {
 			var chatCompletion openai.ChatCompletion
 			if json.Unmarshal(bodyBytes, &chatCompletion) == nil {
 				responseModel = chatCompletion.Model
-				serviceTier = string(chatCompletion.ServiceTier)
 				inputTokens = chatCompletion.Usage.PromptTokens
 				outputTokens = chatCompletion.Usage.CompletionTokens
 				cachedTokens = chatCompletion.Usage.PromptTokensDetails.CachedTokens
@@ -485,7 +429,6 @@ func (s *Service) handleResponseWithTracking(writer http.ResponseWriter, respons
 			var responsesResponse responses.Response
 			if json.Unmarshal(bodyBytes, &responsesResponse) == nil {
 				responseModel = string(responsesResponse.Model)
-				serviceTier = string(responsesResponse.ServiceTier)
 				inputTokens = responsesResponse.Usage.InputTokens
 				outputTokens = responsesResponse.Usage.OutputTokens
 				cachedTokens = responsesResponse.Usage.InputTokensDetails.CachedTokens
@@ -497,16 +440,7 @@ func (s *Service) handleResponseWithTracking(writer http.ResponseWriter, respons
 				responseModel = requestModel
 			}
 			if responseModel != "" {
-				s.usageTracker.AddUsageWithCycleHint(
-					responseModel,
-					inputTokens,
-					outputTokens,
-					cachedTokens,
-					serviceTier,
-					username,
-					time.Now(),
-					weeklyCycleHint,
-				)
+				s.usageTracker.AddUsage(responseModel, inputTokens, outputTokens, cachedTokens, username)
 			}
 		}

@@ -521,7 +455,7 @@ func (s *Service) handleResponseWithTracking(writer http.ResponseWriter, respons
 	}

 	var inputTokens, outputTokens, cachedTokens int64
-	var responseModel, serviceTier string
+	var responseModel string
 	buffer := make([]byte, buf.BufferSize)
 	var leftover []byte

@@ -556,9 +490,6 @@ func (s *Service) handleResponseWithTracking(writer http.ResponseWriter, respons
 							if chatChunk.Model != "" {
 								responseModel = chatChunk.Model
 							}
-							if chatChunk.ServiceTier != "" {
-								serviceTier = string(chatChunk.ServiceTier)
-							}
 							if chatChunk.Usage.PromptTokens > 0 {
 								inputTokens = chatChunk.Usage.PromptTokens
 								cachedTokens = chatChunk.Usage.PromptTokensDetails.CachedTokens
@@ -575,9 +506,6 @@ func (s *Service) handleResponseWithTracking(writer http.ResponseWriter, respons
 								if string(completedEvent.Response.Model) != "" {
 									responseModel = string(completedEvent.Response.Model)
 								}
-								if completedEvent.Response.ServiceTier != "" {
-									serviceTier = string(completedEvent.Response.ServiceTier)
-								}
 								if completedEvent.Response.Usage.InputTokens > 0 {
 									inputTokens = completedEvent.Response.Usage.InputTokens
 									cachedTokens = completedEvent.Response.Usage.InputTokensDetails.CachedTokens
@@ -606,16 +534,7 @@ func (s *Service) handleResponseWithTracking(writer http.ResponseWriter, respons

 			if inputTokens > 0 || outputTokens > 0 {
 				if responseModel != "" {
-					s.usageTracker.AddUsageWithCycleHint(
-						responseModel,
-						inputTokens,
-						outputTokens,
-						cachedTokens,
-						serviceTier,
-						username,
-						time.Now(),
-						weeklyCycleHint,
-					)
+					s.usageTracker.AddUsage(responseModel, inputTokens, outputTokens, cachedTokens, username)
 				}
 			}
 			return
--- a/service/ocm/service_usage.go
+++ b/service/ocm/service_usage.go
@@ -2,11 +2,9 @@ package ocm

 import (
 	"encoding/json"
-	"fmt"
 	"math"
 	"os"
 	"regexp"
-	"strings"
 	"sync"
 	"time"

@@ -44,11 +42,9 @@ func (u *UsageStats) UnmarshalJSON(data []byte) error {
 }

 type CostCombination struct {
-	Model         string                `json:"model"`
-	ServiceTier   string                `json:"service_tier,omitempty"`
-	WeekStartUnix int64                 `json:"week_start_unix,omitempty"`
-	Total         UsageStats            `json:"total"`
-	ByUser        map[string]UsageStats `json:"by_user"`
+	Model  string                `json:"model"`
+	Total  UsageStats            `json:"total"`
+	ByUser map[string]UsageStats `json:"by_user"`
 }

 type AggregatedUsage struct {
@@ -72,17 +68,14 @@ type UsageStatsJSON struct {
 }

 type CostCombinationJSON struct {
-	Model         string                    `json:"model"`
-	ServiceTier   string                    `json:"service_tier,omitempty"`
-	WeekStartUnix int64                     `json:"week_start_unix,omitempty"`
-	Total         UsageStatsJSON            `json:"total"`
-	ByUser        map[string]UsageStatsJSON `json:"by_user"`
+	Model  string                    `json:"model"`
+	Total  UsageStatsJSON            `json:"total"`
+	ByUser map[string]UsageStatsJSON `json:"by_user"`
 }

 type CostsSummaryJSON struct {
 	TotalUSD float64            `json:"total_usd"`
 	ByUser   map[string]float64 `json:"by_user"`
-	ByWeek   map[string]float64 `json:"by_week,omitempty"`
 }

 type AggregatedUsageJSON struct {
@@ -91,11 +84,6 @@ type AggregatedUsageJSON struct {
 	Combinations []CostCombinationJSON `json:"combinations"`
 }

-type WeeklyCycleHint struct {
-	WindowMinutes int64
-	ResetAt       time.Time
-}
-
 type ModelPricing struct {
 	InputPrice       float64
 	OutputPrice      float64
@@ -107,123 +95,7 @@ type modelFamily struct {
 	pricing ModelPricing
 }

-const (
-	serviceTierAuto     = "auto"
-	serviceTierDefault  = "default"
-	serviceTierFlex     = "flex"
-	serviceTierPriority = "priority"
-	serviceTierScale    = "scale"
-)
-
 var (
-	gpt52Pricing = ModelPricing{
-		InputPrice:       1.75,
-		OutputPrice:      14.0,
-		CachedInputPrice: 0.175,
-	}
-
-	gpt5Pricing = ModelPricing{
-		InputPrice:       1.25,
-		OutputPrice:      10.0,
-		CachedInputPrice: 0.125,
-	}
-
-	gpt5MiniPricing = ModelPricing{
-		InputPrice:       0.25,
-		OutputPrice:      2.0,
-		CachedInputPrice: 0.025,
-	}
-
-	gpt5NanoPricing = ModelPricing{
-		InputPrice:       0.05,
-		OutputPrice:      0.4,
-		CachedInputPrice: 0.005,
-	}
-
-	gpt52CodexPricing = ModelPricing{
-		InputPrice:       1.75,
-		OutputPrice:      14.0,
-		CachedInputPrice: 0.175,
-	}
-
-	gpt51CodexPricing = ModelPricing{
-		InputPrice:       1.25,
-		OutputPrice:      10.0,
-		CachedInputPrice: 0.125,
-	}
-
-	gpt51CodexMiniPricing = ModelPricing{
-		InputPrice:       0.25,
-		OutputPrice:      2.0,
-		CachedInputPrice: 0.025,
-	}
-
-	gpt52ProPricing = ModelPricing{
-		InputPrice:       21.0,
-		OutputPrice:      168.0,
-		CachedInputPrice: 21.0,
-	}
-
-	gpt5ProPricing = ModelPricing{
-		InputPrice:       15.0,
-		OutputPrice:      120.0,
-		CachedInputPrice: 15.0,
-	}
-
-	gpt52FlexPricing = ModelPricing{
-		InputPrice:       0.875,
-		OutputPrice:      7.0,
-		CachedInputPrice: 0.0875,
-	}
-
-	gpt5FlexPricing = ModelPricing{
-		InputPrice:       0.625,
-		OutputPrice:      5.0,
-		CachedInputPrice: 0.0625,
-	}
-
-	gpt5MiniFlexPricing = ModelPricing{
-		InputPrice:       0.125,
-		OutputPrice:      1.0,
-		CachedInputPrice: 0.0125,
-	}
-
-	gpt5NanoFlexPricing = ModelPricing{
-		InputPrice:       0.025,
-		OutputPrice:      0.2,
-		CachedInputPrice: 0.0025,
-	}
-
-	gpt52PriorityPricing = ModelPricing{
-		InputPrice:       3.5,
-		OutputPrice:      28.0,
-		CachedInputPrice: 0.35,
-	}
-
-	gpt5PriorityPricing = ModelPricing{
-		InputPrice:       2.5,
-		OutputPrice:      20.0,
-		CachedInputPrice: 0.25,
-	}
-
-	gpt5MiniPriorityPricing = ModelPricing{
-		InputPrice:       0.45,
-		OutputPrice:      3.6,
-		CachedInputPrice: 0.045,
-	}
-
-	gpt52CodexPriorityPricing = ModelPricing{
-		InputPrice:       3.5,
-		OutputPrice:      28.0,
-		CachedInputPrice: 0.35,
-	}
-
-	gpt51CodexPriorityPricing = ModelPricing{
-		InputPrice:       2.5,
-		OutputPrice:      20.0,
-		CachedInputPrice: 0.25,
-	}
-
 	gpt4oPricing = ModelPricing{
 		InputPrice:       2.5,
 		OutputPrice:      10.0,
@@ -239,19 +111,7 @@ var (
 	gpt4oAudioPricing = ModelPricing{
 		InputPrice:       2.5,
 		OutputPrice:      10.0,
-		CachedInputPrice: 2.5,
-	}
-
-	gpt4oMiniAudioPricing = ModelPricing{
-		InputPrice:       0.15,
-		OutputPrice:      0.6,
-		CachedInputPrice: 0.15,
-	}
-
-	gptAudioMiniPricing = ModelPricing{
-		InputPrice:       0.6,
-		OutputPrice:      2.4,
-		CachedInputPrice: 0.6,
+		CachedInputPrice: 1.25,
 	}

 	o1Pricing = ModelPricing{
@@ -260,12 +120,6 @@ var (
 		CachedInputPrice: 7.5,
 	}

-	o1ProPricing = ModelPricing{
-		InputPrice:       150.0,
-		OutputPrice:      600.0,
-		CachedInputPrice: 150.0,
-	}
-
 	o1MiniPricing = ModelPricing{
 		InputPrice:       1.1,
 		OutputPrice:      4.4,
@@ -281,55 +135,13 @@ var (
 	o3Pricing = ModelPricing{
 		InputPrice:       2.0,
 		OutputPrice:      8.0,
-		CachedInputPrice: 0.5,
-	}
-
-	o3ProPricing = ModelPricing{
-		InputPrice:       20.0,
-		OutputPrice:      80.0,
-		CachedInputPrice: 20.0,
-	}
-
-	o3DeepResearchPricing = ModelPricing{
-		InputPrice:       10.0,
-		OutputPrice:      40.0,
-		CachedInputPrice: 2.5,
+		CachedInputPrice: 1.0,
 	}

 	o4MiniPricing = ModelPricing{
 		InputPrice:       1.1,
 		OutputPrice:      4.4,
-		CachedInputPrice: 0.275,
-	}
-
-	o4MiniDeepResearchPricing = ModelPricing{
-		InputPrice:       2.0,
-		OutputPrice:      8.0,
-		CachedInputPrice: 0.5,
-	}
-
-	o3FlexPricing = ModelPricing{
-		InputPrice:       1.0,
-		OutputPrice:      4.0,
-		CachedInputPrice: 0.25,
-	}
-
-	o4MiniFlexPricing = ModelPricing{
-		InputPrice:       0.55,
-		OutputPrice:      2.2,
-		CachedInputPrice: 0.138,
-	}
-
-	o3PriorityPricing = ModelPricing{
-		InputPrice:       3.5,
-		OutputPrice:      14.0,
-		CachedInputPrice: 0.875,
-	}
-
-	o4MiniPriorityPricing = ModelPricing{
-		InputPrice:       2.0,
-		OutputPrice:      8.0,
-		CachedInputPrice: 0.5,
+		CachedInputPrice: 0.55,
 	}

 	gpt41Pricing = ModelPricing{
@@ -350,374 +162,69 @@ var (
 		CachedInputPrice: 0.025,
 	}

-	gpt41PriorityPricing = ModelPricing{
-		InputPrice:       3.5,
-		OutputPrice:      14.0,
-		CachedInputPrice: 0.875,
-	}
-
-	gpt41MiniPriorityPricing = ModelPricing{
-		InputPrice:       0.7,
-		OutputPrice:      2.8,
-		CachedInputPrice: 0.175,
-	}
-
-	gpt41NanoPriorityPricing = ModelPricing{
-		InputPrice:       0.2,
-		OutputPrice:      0.8,
-		CachedInputPrice: 0.05,
-	}
-
-	gpt4oPriorityPricing = ModelPricing{
-		InputPrice:       4.25,
-		OutputPrice:      17.0,
-		CachedInputPrice: 2.125,
-	}
-
-	gpt4oMiniPriorityPricing = ModelPricing{
-		InputPrice:       0.25,
-		OutputPrice:      1.0,
-		CachedInputPrice: 0.125,
-	}
-
-	standardModelFamilies = []modelFamily{
+	modelFamilies = []modelFamily{
 		{
-			pattern: regexp.MustCompile(`^gpt-5\.3-codex(?:$|-)`),
-			pricing: gpt52CodexPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.2-codex(?:$|-)`),
-			pricing: gpt52CodexPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.1-codex-max(?:$|-)`),
-			pricing: gpt51CodexPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.1-codex-mini(?:$|-)`),
-			pricing: gpt51CodexMiniPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.1-codex(?:$|-)`),
-			pricing: gpt51CodexPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5-codex-mini(?:$|-)`),
-			pricing: gpt51CodexMiniPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5-codex(?:$|-)`),
-			pricing: gpt51CodexPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.2-chat-latest$`),
-			pricing: gpt52Pricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.1-chat-latest$`),
-			pricing: gpt5Pricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5-chat-latest$`),
-			pricing: gpt5Pricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.2-pro(?:$|-)`),
-			pricing: gpt52ProPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5-pro(?:$|-)`),
-			pricing: gpt5ProPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5-mini(?:$|-)`),
-			pricing: gpt5MiniPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5-nano(?:$|-)`),
-			pricing: gpt5NanoPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.2(?:$|-)`),
-			pricing: gpt52Pricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.1(?:$|-)`),
-			pricing: gpt5Pricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5(?:$|-)`),
-			pricing: gpt5Pricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^o4-mini-deep-research(?:$|-)`),
-			pricing: o4MiniDeepResearchPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^o4-mini(?:$|-)`),
-			pricing: o4MiniPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^o3-pro(?:$|-)`),
-			pricing: o3ProPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^o3-deep-research(?:$|-)`),
-			pricing: o3DeepResearchPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^o3-mini(?:$|-)`),
-			pricing: o3MiniPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^o3(?:$|-)`),
-			pricing: o3Pricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^o1-pro(?:$|-)`),
-			pricing: o1ProPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^o1-mini(?:$|-)`),
-			pricing: o1MiniPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^o1(?:$|-)`),
-			pricing: o1Pricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-4o-mini-audio(?:$|-)`),
-			pricing: gpt4oMiniAudioPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-audio-mini(?:$|-)`),
-			pricing: gptAudioMiniPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^(?:gpt-4o-audio|gpt-audio)(?:$|-)`),
-			pricing: gpt4oAudioPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-4\.1-nano(?:$|-)`),
+			pattern: regexp.MustCompile(`^gpt-4\.1-nano`),
 			pricing: gpt41NanoPricing,
 		},
 		{
-			pattern: regexp.MustCompile(`^gpt-4\.1-mini(?:$|-)`),
+			pattern: regexp.MustCompile(`^gpt-4\.1-mini`),
 			pricing: gpt41MiniPricing,
 		},
 		{
-			pattern: regexp.MustCompile(`^gpt-4\.1(?:$|-)`),
+			pattern: regexp.MustCompile(`^gpt-4\.1`),
 			pricing: gpt41Pricing,
 		},
 		{
-			pattern: regexp.MustCompile(`^gpt-4o-mini(?:$|-)`),
+			pattern: regexp.MustCompile(`^o4-mini`),
+			pricing: o4MiniPricing,
+		},
+		{
+			pattern: regexp.MustCompile(`^o3-mini`),
+			pricing: o3MiniPricing,
+		},
+		{
+			pattern: regexp.MustCompile(`^o3`),
+			pricing: o3Pricing,
+		},
+		{
+			pattern: regexp.MustCompile(`^o1-mini`),
+			pricing: o1MiniPricing,
+		},
+		{
+			pattern: regexp.MustCompile(`^o1`),
+			pricing: o1Pricing,
+		},
+		{
+			pattern: regexp.MustCompile(`^gpt-4o-audio`),
+			pricing: gpt4oAudioPricing,
+		},
+		{
+			pattern: regexp.MustCompile(`^gpt-4o-mini`),
 			pricing: gpt4oMiniPricing,
 		},
 		{
-			pattern: regexp.MustCompile(`^gpt-4o(?:$|-)`),
+			pattern: regexp.MustCompile(`^gpt-4o`),
 			pricing: gpt4oPricing,
 		},
 		{
-			pattern: regexp.MustCompile(`^chatgpt-4o(?:$|-)`),
+			pattern: regexp.MustCompile(`^chatgpt-4o`),
 			pricing: gpt4oPricing,
 		},
 	}
-
-	flexModelFamilies = []modelFamily{
-		{
-			pattern: regexp.MustCompile(`^gpt-5-mini(?:$|-)`),
-			pricing: gpt5MiniFlexPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5-nano(?:$|-)`),
-			pricing: gpt5NanoFlexPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.2(?:$|-)`),
-			pricing: gpt52FlexPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.1(?:$|-)`),
-			pricing: gpt5FlexPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5(?:$|-)`),
-			pricing: gpt5FlexPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^o4-mini(?:$|-)`),
-			pricing: o4MiniFlexPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^o3(?:$|-)`),
-			pricing: o3FlexPricing,
-		},
-	}
-
-	priorityModelFamilies = []modelFamily{
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.3-codex(?:$|-)`),
-			pricing: gpt52CodexPriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.2-codex(?:$|-)`),
-			pricing: gpt52CodexPriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.1-codex-max(?:$|-)`),
-			pricing: gpt51CodexPriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.1-codex(?:$|-)`),
-			pricing: gpt51CodexPriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5-codex-mini(?:$|-)`),
-			pricing: gpt5MiniPriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5-codex(?:$|-)`),
-			pricing: gpt51CodexPriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5-mini(?:$|-)`),
-			pricing: gpt5MiniPriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.2(?:$|-)`),
-			pricing: gpt52PriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5\.1(?:$|-)`),
-			pricing: gpt5PriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-5(?:$|-)`),
-			pricing: gpt5PriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^o4-mini(?:$|-)`),
-			pricing: o4MiniPriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^o3(?:$|-)`),
-			pricing: o3PriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-4\.1-nano(?:$|-)`),
-			pricing: gpt41NanoPriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-4\.1-mini(?:$|-)`),
-			pricing: gpt41MiniPriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-4\.1(?:$|-)`),
-			pricing: gpt41PriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-4o-mini(?:$|-)`),
-			pricing: gpt4oMiniPriorityPricing,
-		},
-		{
-			pattern: regexp.MustCompile(`^gpt-4o(?:$|-)`),
-			pricing: gpt4oPriorityPricing,
-		},
-	}
 )

-func modelFamiliesForTier(serviceTier string) []modelFamily {
-	switch serviceTier {
-	case serviceTierFlex:
-		return flexModelFamilies
-	case serviceTierPriority:
-		return priorityModelFamilies
-	default:
-		return standardModelFamilies
-	}
-}
-
-func findPricingInFamilies(model string, modelFamilies []modelFamily) (ModelPricing, bool) {
+func getPricing(model string) ModelPricing {
 	for _, family := range modelFamilies {
 		if family.pattern.MatchString(model) {
-			return family.pricing, true
+			return family.pricing
 		}
 	}
-	return ModelPricing{}, false
-}
-
-func normalizeServiceTier(serviceTier string) string {
-	switch strings.ToLower(strings.TrimSpace(serviceTier)) {
-	case "", serviceTierAuto, serviceTierDefault:
-		return serviceTierDefault
-	case serviceTierFlex:
-		return serviceTierFlex
-	case serviceTierPriority:
-		return serviceTierPriority
-	case serviceTierScale:
-		// Scale-tier requests are prepaid differently and not listed in this usage file.
-		return serviceTierDefault
-	default:
-		return serviceTierDefault
-	}
-}
-
-func getPricing(model string, serviceTier string) ModelPricing {
-	normalizedServiceTier := normalizeServiceTier(serviceTier)
-	modelFamilies := modelFamiliesForTier(normalizedServiceTier)
-
-	if pricing, found := findPricingInFamilies(model, modelFamilies); found {
-		return pricing
-	}
-
-	normalizedModel := normalizeGPT5Model(model)
-	if normalizedModel != model {
-		if pricing, found := findPricingInFamilies(normalizedModel, modelFamilies); found {
-			return pricing
-		}
-	}
-
-	if normalizedServiceTier != serviceTierDefault {
-		if pricing, found := findPricingInFamilies(model, standardModelFamilies); found {
-			return pricing
-		}
-		if normalizedModel != model {
-			if pricing, found := findPricingInFamilies(normalizedModel, standardModelFamilies); found {
-				return pricing
-			}
-		}
-	}
-
 	return gpt4oPricing
 }

-func normalizeGPT5Model(model string) string {
-	if !strings.HasPrefix(model, "gpt-5.") {
-		return model
-	}
-
-	switch {
-	case strings.Contains(model, "-codex-mini"):
-		return "gpt-5.1-codex-mini"
-	case strings.Contains(model, "-codex-max"):
-		return "gpt-5.1-codex-max"
-	case strings.Contains(model, "-codex"):
-		return "gpt-5.3-codex"
-	case strings.Contains(model, "-chat-latest"):
-		return "gpt-5.2-chat-latest"
-	case strings.Contains(model, "-pro"):
-		return "gpt-5.2-pro"
-	case strings.Contains(model, "-mini"):
-		return "gpt-5-mini"
-	case strings.Contains(model, "-nano"):
-		return "gpt-5-nano"
-	default:
-		return "gpt-5.2"
-	}
-}
-
-func calculateCost(stats UsageStats, model string, serviceTier string) float64 {
-	pricing := getPricing(model, serviceTier)
+func calculateCost(stats UsageStats, model string) float64 {
+	pricing := getPricing(model)

 	regularInputTokens := stats.InputTokens - stats.CachedTokens
 	if regularInputTokens < 0 {
@@ -731,89 +238,41 @@ func calculateCost(stats UsageStats, model string, serviceTier string) float64 {
 	return math.Round(cost*100) / 100
 }

-func roundCost(cost float64) float64 {
-	return math.Round(cost*100) / 100
-}
+func (u *AggregatedUsage) ToJSON() *AggregatedUsageJSON {
+	u.mutex.Lock()
+	defer u.mutex.Unlock()

-func normalizeCombinations(combinations []CostCombination) {
-	for index := range combinations {
-		combinations[index].ServiceTier = normalizeServiceTier(combinations[index].ServiceTier)
-		if combinations[index].ByUser == nil {
-			combinations[index].ByUser = make(map[string]UsageStats)
-		}
-	}
-}
-
-func addUsageToCombinations(combinations *[]CostCombination, model string, serviceTier string, weekStartUnix int64, user string, inputTokens, outputTokens, cachedTokens int64) {
-	var matchedCombination *CostCombination
-	for index := range *combinations {
-		combination := &(*combinations)[index]
-		combinationServiceTier := normalizeServiceTier(combination.ServiceTier)
-		if combination.ServiceTier != combinationServiceTier {
-			combination.ServiceTier = combinationServiceTier
-		}
-		if combination.Model == model && combinationServiceTier == serviceTier && combination.WeekStartUnix == weekStartUnix {
-			matchedCombination = combination
-			break
-		}
+	result := &AggregatedUsageJSON{
+		LastUpdated:  u.LastUpdated,
+		Combinations: make([]CostCombinationJSON, len(u.Combinations)),
+		Costs: CostsSummaryJSON{
+			TotalUSD: 0,
+			ByUser:   make(map[string]float64),
+		},
 	}

-	if matchedCombination == nil {
-		newCombination := CostCombination{
-			Model:         model,
-			ServiceTier:   serviceTier,
-			WeekStartUnix: weekStartUnix,
-			Total:         UsageStats{},
-			ByUser:        make(map[string]UsageStats),
-		}
-		*combinations = append(*combinations, newCombination)
-		matchedCombination = &(*combinations)[len(*combinations)-1]
-	}
+	for i, combo := range u.Combinations {
+		totalCost := calculateCost(combo.Total, combo.Model)

-	matchedCombination.Total.RequestCount++
-	matchedCombination.Total.InputTokens += inputTokens
-	matchedCombination.Total.OutputTokens += outputTokens
-	matchedCombination.Total.CachedTokens += cachedTokens
+		result.Costs.TotalUSD += totalCost

-	if user != "" {
-		userStats := matchedCombination.ByUser[user]
-		userStats.RequestCount++
-		userStats.InputTokens += inputTokens
-		userStats.OutputTokens += outputTokens
-		userStats.CachedTokens += cachedTokens
-		matchedCombination.ByUser[user] = userStats
-	}
-}
-
-func buildCombinationJSON(combinations []CostCombination, aggregateUserCosts map[string]float64) ([]CostCombinationJSON, float64) {
-	result := make([]CostCombinationJSON, len(combinations))
-	var totalCost float64
-
-	for index, combination := range combinations {
-		combinationTotalCost := calculateCost(combination.Total, combination.Model, combination.ServiceTier)
-		totalCost += combinationTotalCost
-
-		combinationJSON := CostCombinationJSON{
-			Model:         combination.Model,
-			ServiceTier:   combination.ServiceTier,
-			WeekStartUnix: combination.WeekStartUnix,
+		comboJSON := CostCombinationJSON{
+			Model: combo.Model,
 			Total: UsageStatsJSON{
-				RequestCount: combination.Total.RequestCount,
-				InputTokens:  combination.Total.InputTokens,
-				OutputTokens: combination.Total.OutputTokens,
-				CachedTokens: combination.Total.CachedTokens,
-				CostUSD:      combinationTotalCost,
+				RequestCount: combo.Total.RequestCount,
+				InputTokens:  combo.Total.InputTokens,
+				OutputTokens: combo.Total.OutputTokens,
+				CachedTokens: combo.Total.CachedTokens,
+				CostUSD:      totalCost,
 			},
 			ByUser: make(map[string]UsageStatsJSON),
 		}

-		for user, userStats := range combination.ByUser {
-			userCost := calculateCost(userStats, combination.Model, combination.ServiceTier)
-			if aggregateUserCosts != nil {
-				aggregateUserCosts[user] += userCost
-			}
+		for user, userStats := range combo.ByUser {
+			userCost := calculateCost(userStats, combo.Model)
+			result.Costs.ByUser[user] += userCost

-			combinationJSON.ByUser[user] = UsageStatsJSON{
+			comboJSON.ByUser[user] = UsageStatsJSON{
 				RequestCount: userStats.RequestCount,
 				InputTokens:  userStats.InputTokens,
 				OutputTokens: userStats.OutputTokens,
@@ -822,80 +281,12 @@ func buildCombinationJSON(combinations []CostCombination, aggregateUserCosts map
 			}
 		}

-		result[index] = combinationJSON
-	}
-
-	return result, roundCost(totalCost)
-}
-
-func formatUTCOffsetLabel(timestamp time.Time) string {
-	_, offsetSeconds := timestamp.Zone()
-	sign := "+"
-	if offsetSeconds < 0 {
-		sign = "-"
-		offsetSeconds = -offsetSeconds
-	}
-	offsetHours := offsetSeconds / 3600
-	offsetMinutes := (offsetSeconds % 3600) / 60
-	if offsetMinutes == 0 {
-		return fmt.Sprintf("UTC%s%d", sign, offsetHours)
-	}
-	return fmt.Sprintf("UTC%s%d:%02d", sign, offsetHours, offsetMinutes)
-}
-
-func formatWeekStartKey(cycleStartAt time.Time) string {
-	localCycleStart := cycleStartAt.In(time.Local)
-	return fmt.Sprintf("%s %s", localCycleStart.Format("2006-01-02 15:04:05"), formatUTCOffsetLabel(localCycleStart))
-}
-
-func buildByWeekCost(combinations []CostCombination) map[string]float64 {
-	byWeek := make(map[string]float64)
-	for _, combination := range combinations {
-		if combination.WeekStartUnix <= 0 {
-			continue
-		}
-		weekStartAt := time.Unix(combination.WeekStartUnix, 0).UTC()
-		weekKey := formatWeekStartKey(weekStartAt)
-		byWeek[weekKey] += calculateCost(combination.Total, combination.Model, combination.ServiceTier)
-	}
-	for weekKey, weekCost := range byWeek {
-		byWeek[weekKey] = roundCost(weekCost)
-	}
-	return byWeek
-}
-
-func deriveWeekStartUnix(cycleHint *WeeklyCycleHint) int64 {
-	if cycleHint == nil || cycleHint.WindowMinutes <= 0 || cycleHint.ResetAt.IsZero() {
-		return 0
-	}
-	windowDuration := time.Duration(cycleHint.WindowMinutes) * time.Minute
-	return cycleHint.ResetAt.UTC().Add(-windowDuration).Unix()
-}
-
-func (u *AggregatedUsage) ToJSON() *AggregatedUsageJSON {
-	u.mutex.Lock()
-	defer u.mutex.Unlock()
-
-	result := &AggregatedUsageJSON{
-		LastUpdated: u.LastUpdated,
-		Costs: CostsSummaryJSON{
-			TotalUSD: 0,
-			ByUser:   make(map[string]float64),
-			ByWeek:   make(map[string]float64),
-		},
-	}
-
-	globalCombinationsJSON, totalCost := buildCombinationJSON(u.Combinations, result.Costs.ByUser)
-	result.Combinations = globalCombinationsJSON
-	result.Costs.TotalUSD = totalCost
-	result.Costs.ByWeek = buildByWeekCost(u.Combinations)
-
-	if len(result.Costs.ByWeek) == 0 {
-		result.Costs.ByWeek = nil
+		result.Combinations[i] = comboJSON
 	}

+	result.Costs.TotalUSD = math.Round(result.Costs.TotalUSD*100) / 100
 	for user, cost := range result.Costs.ByUser {
-		result.Costs.ByUser[user] = roundCost(cost)
+		result.Costs.ByUser[user] = math.Round(cost*100) / 100
 	}

 	return result
@@ -905,9 +296,6 @@ func (u *AggregatedUsage) Load() error {
 	u.mutex.Lock()
 	defer u.mutex.Unlock()

-	u.LastUpdated = time.Time{}
-	u.Combinations = nil
-
 	data, err := os.ReadFile(u.filePath)
 	if err != nil {
 		if os.IsNotExist(err) {
@@ -928,7 +316,12 @@ func (u *AggregatedUsage) Load() error {

 	u.LastUpdated = temp.LastUpdated
 	u.Combinations = temp.Combinations
-	normalizeCombinations(u.Combinations)
+
+	for i := range u.Combinations {
+		if u.Combinations[i].ByUser == nil {
+			u.Combinations[i].ByUser = make(map[string]UsageStats)
+		}
+	}

 	return nil
 }
@@ -956,27 +349,47 @@ func (u *AggregatedUsage) Save() error {
 	return err
 }

-func (u *AggregatedUsage) AddUsage(model string, inputTokens, outputTokens, cachedTokens int64, serviceTier string, user string) error {
-	return u.AddUsageWithCycleHint(model, inputTokens, outputTokens, cachedTokens, serviceTier, user, time.Now(), nil)
-}
-
-func (u *AggregatedUsage) AddUsageWithCycleHint(model string, inputTokens, outputTokens, cachedTokens int64, serviceTier string, user string, observedAt time.Time, cycleHint *WeeklyCycleHint) error {
+func (u *AggregatedUsage) AddUsage(model string, inputTokens, outputTokens, cachedTokens int64, user string) error {
 	if model == "" {
 		return E.New("model cannot be empty")
 	}

-	normalizedServiceTier := normalizeServiceTier(serviceTier)
-	if observedAt.IsZero() {
-		observedAt = time.Now()
-	}
-
 	u.mutex.Lock()
 	defer u.mutex.Unlock()

-	u.LastUpdated = observedAt
-	weekStartUnix := deriveWeekStartUnix(cycleHint)
+	u.LastUpdated = time.Now()

-	addUsageToCombinations(&u.Combinations, model, normalizedServiceTier, weekStartUnix, user, inputTokens, outputTokens, cachedTokens)
+	var combo *CostCombination
+	for i := range u.Combinations {
+		if u.Combinations[i].Model == model {
+			combo = &u.Combinations[i]
+			break
+		}
+	}
+
+	if combo == nil {
+		newCombo := CostCombination{
+			Model:  model,
+			Total:  UsageStats{},
+			ByUser: make(map[string]UsageStats),
+		}
+		u.Combinations = append(u.Combinations, newCombo)
+		combo = &u.Combinations[len(u.Combinations)-1]
+	}
+
+	combo.Total.RequestCount++
+	combo.Total.InputTokens += inputTokens
+	combo.Total.OutputTokens += outputTokens
+	combo.Total.CachedTokens += cachedTokens
+
+	if user != "" {
+		userStats := combo.ByUser[user]
+		userStats.RequestCount++
+		userStats.InputTokens += inputTokens
+		userStats.OutputTokens += outputTokens
+		userStats.CachedTokens += cachedTokens
+		combo.ByUser[user] = userStats
+	}

 	go u.scheduleSave()

--- a/service/oomkiller/config.go
+++ b/service/oomkiller/config.go
@@ -1,51 +0,0 @@
-package oomkiller
-
-import (
-	"time"
-
-	"github.com/sagernet/sing-box/option"
-	E "github.com/sagernet/sing/common/exceptions"
-)
-
-func buildTimerConfig(options option.OOMKillerServiceOptions, memoryLimit uint64, useAvailable bool) (timerConfig, error) {
-	safetyMargin := uint64(defaultSafetyMargin)
-	if options.SafetyMargin != nil && options.SafetyMargin.Value() > 0 {
-		safetyMargin = options.SafetyMargin.Value()
-	}
-
-	minInterval := defaultMinInterval
-	if options.MinInterval != 0 {
-		minInterval = time.Duration(options.MinInterval.Build())
-		if minInterval <= 0 {
-			return timerConfig{}, E.New("min_interval must be greater than 0")
-		}
-	}
-
-	maxInterval := defaultMaxInterval
-	if options.MaxInterval != 0 {
-		maxInterval = time.Duration(options.MaxInterval.Build())
-		if maxInterval <= 0 {
-			return timerConfig{}, E.New("max_interval must be greater than 0")
-		}
-	}
-	if maxInterval < minInterval {
-		return timerConfig{}, E.New("max_interval must be greater than or equal to min_interval")
-	}
-
-	checksBeforeLimit := defaultChecksBeforeLimit
-	if options.ChecksBeforeLimit != 0 {
-		checksBeforeLimit = options.ChecksBeforeLimit
-		if checksBeforeLimit <= 0 {
-			return timerConfig{}, E.New("checks_before_limit must be greater than 0")
-		}
-	}
-
-	return timerConfig{
-		memoryLimit:       memoryLimit,
-		safetyMargin:      safetyMargin,
-		minInterval:       minInterval,
-		maxInterval:       maxInterval,
-		checksBeforeLimit: checksBeforeLimit,
-		useAvailable:      useAvailable,
-	}, nil
-}
--- a/service/oomkiller/service.go
+++ b/service/oomkiller/service.go
@@ -1,192 +0,0 @@
-//go:build darwin && cgo
-
-package oomkiller
-
-/*
-#include <dispatch/dispatch.h>
-
-static dispatch_source_t memoryPressureSource;
-
-extern void goMemoryPressureCallback(unsigned long status);
-
-static void startMemoryPressureMonitor() {
-	memoryPressureSource = dispatch_source_create(
-		DISPATCH_SOURCE_TYPE_MEMORYPRESSURE,
-		0,
-		DISPATCH_MEMORYPRESSURE_WARN | DISPATCH_MEMORYPRESSURE_CRITICAL,
-		dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0)
-	);
-	dispatch_source_set_event_handler(memoryPressureSource, ^{
-		unsigned long status = dispatch_source_get_data(memoryPressureSource);
-		goMemoryPressureCallback(status);
-	});
-	dispatch_activate(memoryPressureSource);
-}
-
-static void stopMemoryPressureMonitor() {
-	if (memoryPressureSource) {
-		dispatch_source_cancel(memoryPressureSource);
-		memoryPressureSource = NULL;
-	}
-}
-*/
-import "C"
-
-import (
-	"context"
-	runtimeDebug "runtime/debug"
-	"sync"
-
-	"github.com/sagernet/sing-box/adapter"
-	boxService "github.com/sagernet/sing-box/adapter/service"
-	boxConstant "github.com/sagernet/sing-box/constant"
-	"github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing-box/option"
-	"github.com/sagernet/sing/common/memory"
-	"github.com/sagernet/sing/service"
-)
-
-func RegisterService(registry *boxService.Registry) {
-	boxService.Register[option.OOMKillerServiceOptions](registry, boxConstant.TypeOOMKiller, NewService)
-}
-
-var (
-	globalAccess   sync.Mutex
-	globalServices []*Service
-)
-
-type Service struct {
-	boxService.Adapter
-	logger        log.ContextLogger
-	router        adapter.Router
-	memoryLimit   uint64
-	hasTimerMode  bool
-	useAvailable  bool
-	timerConfig   timerConfig
-	adaptiveTimer *adaptiveTimer
-}
-
-func NewService(ctx context.Context, logger log.ContextLogger, tag string, options option.OOMKillerServiceOptions) (adapter.Service, error) {
-	s := &Service{
-		Adapter: boxService.NewAdapter(boxConstant.TypeOOMKiller, tag),
-		logger:  logger,
-		router:  service.FromContext[adapter.Router](ctx),
-	}
-
-	if options.MemoryLimit != nil {
-		s.memoryLimit = options.MemoryLimit.Value()
-		if s.memoryLimit > 0 {
-			s.hasTimerMode = true
-		}
-	}
-
-	config, err := buildTimerConfig(options, s.memoryLimit, s.useAvailable)
-	if err != nil {
-		return nil, err
-	}
-	s.timerConfig = config
-
-	return s, nil
-}
-
-func (s *Service) Start(stage adapter.StartStage) error {
-	if stage != adapter.StartStateStart {
-		return nil
-	}
-
-	if s.hasTimerMode {
-		s.adaptiveTimer = newAdaptiveTimer(s.logger, s.router, s.timerConfig)
-		if s.memoryLimit > 0 {
-			s.logger.Info("started memory monitor with limit: ", s.memoryLimit/(1024*1024), " MiB")
-		} else {
-			s.logger.Info("started memory monitor with available memory detection")
-		}
-	} else {
-		s.logger.Info("started memory pressure monitor")
-	}
-
-	globalAccess.Lock()
-	isFirst := len(globalServices) == 0
-	globalServices = append(globalServices, s)
-	globalAccess.Unlock()
-
-	if isFirst {
-		C.startMemoryPressureMonitor()
-	}
-	return nil
-}
-
-func (s *Service) Close() error {
-	if s.adaptiveTimer != nil {
-		s.adaptiveTimer.stop()
-	}
-	globalAccess.Lock()
-	for i, svc := range globalServices {
-		if svc == s {
-			globalServices = append(globalServices[:i], globalServices[i+1:]...)
-			break
-		}
-	}
-	isLast := len(globalServices) == 0
-	globalAccess.Unlock()
-	if isLast {
-		C.stopMemoryPressureMonitor()
-	}
-	return nil
-}
-
-//export goMemoryPressureCallback
-func goMemoryPressureCallback(status C.ulong) {
-	globalAccess.Lock()
-	services := make([]*Service, len(globalServices))
-	copy(services, globalServices)
-	globalAccess.Unlock()
-	if len(services) == 0 {
-		return
-	}
-	criticalFlag := C.ulong(C.DISPATCH_MEMORYPRESSURE_CRITICAL)
-	warnFlag := C.ulong(C.DISPATCH_MEMORYPRESSURE_WARN)
-	isCritical := status&criticalFlag != 0
-	isWarning := status&warnFlag != 0
-	var level string
-	switch {
-	case isCritical:
-		level = "critical"
-	case isWarning:
-		level = "warning"
-	default:
-		level = "normal"
-	}
-	var freeOSMemory bool
-	for _, s := range services {
-		usage := memory.Total()
-		if s.hasTimerMode {
-			if isCritical {
-				s.logger.Warn("memory pressure: ", level, ", usage: ", usage/(1024*1024), " MiB")
-				if s.adaptiveTimer != nil {
-					s.adaptiveTimer.startNow()
-				}
-			} else if isWarning {
-				s.logger.Warn("memory pressure: ", level, ", usage: ", usage/(1024*1024), " MiB")
-			} else {
-				s.logger.Debug("memory pressure: ", level, ", usage: ", usage/(1024*1024), " MiB")
-				if s.adaptiveTimer != nil {
-					s.adaptiveTimer.stop()
-				}
-			}
-		} else {
-			if isCritical {
-				s.logger.Error("memory pressure: ", level, ", usage: ", usage/(1024*1024), " MiB, resetting network")
-				s.router.ResetNetwork()
-				freeOSMemory = true
-			} else if isWarning {
-				s.logger.Warn("memory pressure: ", level, ", usage: ", usage/(1024*1024), " MiB")
-			} else {
-				s.logger.Debug("memory pressure: ", level, ", usage: ", usage/(1024*1024), " MiB")
-			}
-		}
-	}
-	if freeOSMemory {
-		runtimeDebug.FreeOSMemory()
-	}
-}
--- a/service/oomkiller/service_stub.go
+++ b/service/oomkiller/service_stub.go
@@ -1,81 +0,0 @@
-//go:build !darwin || !cgo
-
-package oomkiller
-
-import (
-	"context"
-
-	"github.com/sagernet/sing-box/adapter"
-	boxService "github.com/sagernet/sing-box/adapter/service"
-	boxConstant "github.com/sagernet/sing-box/constant"
-	"github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing-box/option"
-	E "github.com/sagernet/sing/common/exceptions"
-	"github.com/sagernet/sing/common/memory"
-	"github.com/sagernet/sing/service"
-)
-
-func RegisterService(registry *boxService.Registry) {
-	boxService.Register[option.OOMKillerServiceOptions](registry, boxConstant.TypeOOMKiller, NewService)
-}
-
-type Service struct {
-	boxService.Adapter
-	logger        log.ContextLogger
-	router        adapter.Router
-	adaptiveTimer *adaptiveTimer
-	timerConfig   timerConfig
-	hasTimerMode  bool
-	useAvailable  bool
-	memoryLimit   uint64
-}
-
-func NewService(ctx context.Context, logger log.ContextLogger, tag string, options option.OOMKillerServiceOptions) (adapter.Service, error) {
-	s := &Service{
-		Adapter: boxService.NewAdapter(boxConstant.TypeOOMKiller, tag),
-		logger:  logger,
-		router:  service.FromContext[adapter.Router](ctx),
-	}
-
-	if options.MemoryLimit != nil {
-		s.memoryLimit = options.MemoryLimit.Value()
-	}
-	if s.memoryLimit > 0 {
-		s.hasTimerMode = true
-	} else if memory.AvailableSupported() {
-		s.useAvailable = true
-		s.hasTimerMode = true
-	}
-
-	config, err := buildTimerConfig(options, s.memoryLimit, s.useAvailable)
-	if err != nil {
-		return nil, err
-	}
-	s.timerConfig = config
-
-	return s, nil
-}
-
-func (s *Service) Start(stage adapter.StartStage) error {
-	if stage != adapter.StartStateStart {
-		return nil
-	}
-	if !s.hasTimerMode {
-		return E.New("memory pressure monitoring is not available on this platform without memory_limit")
-	}
-	s.adaptiveTimer = newAdaptiveTimer(s.logger, s.router, s.timerConfig)
-	s.adaptiveTimer.start(0)
-	if s.useAvailable {
-		s.logger.Info("started memory monitor with available memory detection")
-	} else {
-		s.logger.Info("started memory monitor with limit: ", s.memoryLimit/(1024*1024), " MiB")
-	}
-	return nil
-}
-
-func (s *Service) Close() error {
-	if s.adaptiveTimer != nil {
-		s.adaptiveTimer.stop()
-	}
-	return nil
-}
--- a/service/oomkiller/service_timer.go
+++ b/service/oomkiller/service_timer.go
@@ -1,158 +0,0 @@
-package oomkiller
-
-import (
-	runtimeDebug "runtime/debug"
-	"sync"
-	"time"
-
-	"github.com/sagernet/sing-box/adapter"
-	"github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing/common/memory"
-)
-
-const (
-	defaultChecksBeforeLimit = 4
-	defaultMinInterval       = 500 * time.Millisecond
-	defaultMaxInterval       = 10 * time.Second
-	defaultSafetyMargin      = 5 * 1024 * 1024
-)
-
-type adaptiveTimer struct {
-	logger            log.ContextLogger
-	router            adapter.Router
-	memoryLimit       uint64
-	safetyMargin      uint64
-	minInterval       time.Duration
-	maxInterval       time.Duration
-	checksBeforeLimit int
-	useAvailable      bool
-
-	access        sync.Mutex
-	timer         *time.Timer
-	previousUsage uint64
-	lastInterval  time.Duration
-}
-
-type timerConfig struct {
-	memoryLimit       uint64
-	safetyMargin      uint64
-	minInterval       time.Duration
-	maxInterval       time.Duration
-	checksBeforeLimit int
-	useAvailable      bool
-}
-
-func newAdaptiveTimer(logger log.ContextLogger, router adapter.Router, config timerConfig) *adaptiveTimer {
-	return &adaptiveTimer{
-		logger:            logger,
-		router:            router,
-		memoryLimit:       config.memoryLimit,
-		safetyMargin:      config.safetyMargin,
-		minInterval:       config.minInterval,
-		maxInterval:       config.maxInterval,
-		checksBeforeLimit: config.checksBeforeLimit,
-		useAvailable:      config.useAvailable,
-	}
-}
-
-func (t *adaptiveTimer) start(_ uint64) {
-	t.access.Lock()
-	defer t.access.Unlock()
-	t.startLocked()
-}
-
-func (t *adaptiveTimer) startNow() {
-	t.access.Lock()
-	t.startLocked()
-	t.access.Unlock()
-	t.poll()
-}
-
-func (t *adaptiveTimer) startLocked() {
-	if t.timer != nil {
-		return
-	}
-	t.previousUsage = memory.Total()
-	t.lastInterval = t.minInterval
-	t.timer = time.AfterFunc(t.minInterval, t.poll)
-}
-
-func (t *adaptiveTimer) stop() {
-	t.access.Lock()
-	defer t.access.Unlock()
-	t.stopLocked()
-}
-
-func (t *adaptiveTimer) stopLocked() {
-	if t.timer != nil {
-		t.timer.Stop()
-		t.timer = nil
-	}
-}
-
-func (t *adaptiveTimer) running() bool {
-	t.access.Lock()
-	defer t.access.Unlock()
-	return t.timer != nil
-}
-
-func (t *adaptiveTimer) poll() {
-	t.access.Lock()
-	defer t.access.Unlock()
-	if t.timer == nil {
-		return
-	}
-
-	usage := memory.Total()
-	delta := int64(usage) - int64(t.previousUsage)
-	t.previousUsage = usage
-
-	var remaining uint64
-	var triggered bool
-
-	if t.memoryLimit > 0 {
-		if usage >= t.memoryLimit {
-			remaining = 0
-			triggered = true
-		} else {
-			remaining = t.memoryLimit - usage
-		}
-	} else if t.useAvailable {
-		available := memory.Available()
-		if available <= t.safetyMargin {
-			remaining = 0
-			triggered = true
-		} else {
-			remaining = available - t.safetyMargin
-		}
-	} else {
-		remaining = 0
-	}
-
-	if triggered {
-		t.logger.Error("memory threshold reached, usage: ", usage/(1024*1024), " MiB, resetting network")
-		t.router.ResetNetwork()
-		runtimeDebug.FreeOSMemory()
-	}
-
-	var interval time.Duration
-	if triggered {
-		interval = t.maxInterval
-	} else if delta <= 0 {
-		interval = t.maxInterval
-	} else if t.checksBeforeLimit <= 0 {
-		interval = t.maxInterval
-	} else {
-		timeToLimit := time.Duration(float64(remaining) / float64(delta) * float64(t.lastInterval))
-		interval = timeToLimit / time.Duration(t.checksBeforeLimit)
-		if interval < t.minInterval {
-			interval = t.minInterval
-		}
-		if interval > t.maxInterval {
-			interval = t.maxInterval
-		}
-	}
-
-	t.lastInterval = interval
-	t.timer.Reset(interval)
-}
--- a/test/socks_test.go
+++ b/test/socks_test.go
@@ -123,6 +123,7 @@ func testUDPSessionIdleTimeout(t *testing.T, proxyPort uint16, echoPort uint16,

 	packetConn.SetReadDeadline(time.Now().Add(3 * time.Second))
 	n, _, err = packetConn.ReadFrom(buffer)
+
 	if err != nil {
 		t.Logf("Read after timeout correctly failed: %v", err)
 		return
--- a/transport/wireguard/device_system.go
+++ b/transport/wireguard/device_system.go
@@ -116,7 +116,7 @@ func (w *systemDevice) Start() error {
 	w.options.Logger.Info("started at ", w.options.Name)
 	w.device = tunInterface
 	batchTUN, isBatchTUN := tunInterface.(tun.LinuxTUN)
-	if isBatchTUN && batchTUN.BatchSize() > 1 {
+	if isBatchTUN {
 		w.batchDevice = batchTUN
 	}
 	w.events <- wgTun.EventUp